123

igirl-channel-web/app/front/entry/index.ejs

@@ -15,6 +15,7 @@
 	<link rel="stylesheet" href="/css/cropper.css">
 	<link rel="stylesheet" href="/css/cropper.css">
 	<link rel="stylesheet" href="/css/index.css">
 	<link rel="stylesheet" href="/css/index.css">
 	<link rel="stylesheet" href="/css/jointjdcloud/iconfont.css">
 	<link rel="stylesheet" href="/css/jointjdcloud/iconfont.css">
+	<link rel="stylesheet" href="/css/animte.css">
 	<script src="/js/swiper/swiper.min.js"></script>
 	<script src="/js/swiper/swiper.min.js"></script>
 	<script src="/js/vue/vue.min_2.6.10.js"></script>
 	<script src="/js/vue/vue.min_2.6.10.js"></script>
 	<script src="/js/vue/vue-router.min.js"></script>
 	<script src="/js/vue/vue-router.min.js"></script>
@@ -63,6 +64,7 @@
 			<div class="jc_hd"></div>
 			<div class="jc_hd"></div>
 		</div>
 		</div>
 		<!-- 启服通公共头 -->
 		<!-- 启服通公共头 -->
+
 		<div class="commonchannel" v-if="channelName == 'bw' && !isLogin">
 		<div class="commonchannel" v-if="channelName == 'bw' && !isLogin">
 			<div>
 			<div>
 				<div @click="goHome">
 				<div @click="goHome">
@@ -78,7 +80,8 @@
 					</span>
 					</span>
 					<el-dropdown-menu slot="dropdown">
 					<el-dropdown-menu slot="dropdown">
 						<el-dropdown-item icon="el-icon-s-order" command="myIndent">我的订单</el-dropdown-item>
 						<el-dropdown-item icon="el-icon-s-order" command="myIndent">我的订单</el-dropdown-item>
-						<el-dropdown-item icon="el-icon-s-order" v-if="superAdmin" command="goSuperAdmin">后台管理</el-dropdown-item>
+						<el-dropdown-item icon="el-icon-s-order" v-if="superAdmin" command="goSuperAdmin">后台管理
+						</el-dropdown-item>
 						<el-dropdown-item icon="el-icon-bicycle" command="loginOut">退出登录</el-dropdown-item>
 						<el-dropdown-item icon="el-icon-bicycle" command="loginOut">退出登录</el-dropdown-item>
 					</el-dropdown-menu>
 					</el-dropdown-menu>
 				</el-dropdown>
 				</el-dropdown>
@@ -94,7 +97,9 @@
 
 
 
 
 		<!-- 根据渠道显示不同公共头end -->
 		<!-- 根据渠道显示不同公共头end -->
-		<transition name="slide-fade">
+		<transition name="custom-classes-transition" enter-active-class="animated fadeIn"
+			leave-active-class="animated fadeOut">
+
 			<router-view></router-view>
 			<router-view></router-view>
 		</transition>
 		</transition>
 		<!-- 根据渠道显示不同公共尾start -->
 		<!-- 根据渠道显示不同公共尾start -->

igirl-channel-web/app/front/vues/pages/jdtrademark/jdtrademark.js

@@ -182,12 +182,14 @@
           break;
           break;
         case "bw":
         case "bw":
           console.log($.cookie("channelUserId"), `llllllllllllllllllllllll`);
           console.log($.cookie("channelUserId"), `llllllllllllllllllllllll`);
-          if ($.cookie("channelUserId")) {
+
+          if ($.cookie("userpin")) {
             this.$router.push({
             this.$router.push({
               path: `/${this.$root.channelName}/jdindentlist`,
               path: `/${this.$root.channelName}/jdindentlist`,
               query: { channelUserId: $.cookie("channelUserId") }
               query: { channelUserId: $.cookie("channelUserId") }
             });
             });
           } else {
           } else {
+            this.$message.warning("请登录");
             this.$router.push({
             this.$router.push({
               path: `/${this.$root.channelName}/login`,
               path: `/${this.$root.channelName}/login`,
             });
             });

igirl-channel-web/app/front/vues/pages/nowbuy/nowbuy.js

@@ -70,7 +70,10 @@
         */
         */
     },
     },
     created: function() {
     created: function() {
-
+        let { OtherOrderParams } = localStorage;
+        if (OtherOrderParams) {
+            this.apply = JSON.parse(OtherOrderParams).apply;
+        }
     },
     },
     methods: {
     methods: {
         agreeContract(){
         agreeContract(){
@@ -99,8 +102,8 @@
                     var obj = this.$root.copyParams(this.params, "subOtherOrder", "/action/tmOrder/springBoard", 'yes', 'yes');
                     var obj = this.$root.copyParams(this.params, "subOtherOrder", "/action/tmOrder/springBoard", 'yes', 'yes');
                     this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
                     this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
                         console.log("---------submitOrder-------");
                         console.log("---------submitOrder-------");
-                        if (d.status == '-99') {
-                            localStorage.OtherOrderParams = this.params;
+                        if (d.data == '-99') {
+                            localStorage.OtherOrderParams = JSON.stringify(this.params);
                             this.$message.warning("未登录");
                             this.$message.warning("未登录");
                             this.$router.push({ path: `/${this.$root.channelName}/login`, });
                             this.$router.push({ path: `/${this.$root.channelName}/login`, });
                             return
                             return

igirl-channel-web/app/front/vues/pages/servicedetails/servicedetails.js

@@ -366,6 +366,10 @@
       console.log({ ...this.serviceItem });
       console.log({ ...this.serviceItem });
     },
     },
     sdsOp2(){
     sdsOp2(){
+      let { OtherOrderParams } = localStorage;
+      if (OtherOrderParams) {
+        localStorage.removeItem('OtherOrderParams');
+      }
       var sdsId = this.$route.query.sdsId;
       var sdsId = this.$route.query.sdsId;
       let routeUrl = this.$router.resolve({
       let routeUrl = this.$router.resolve({
         path: `/${this.$root.channelName}/nowbuy`,
         path: `/${this.$root.channelName}/nowbuy`,