123

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

@@ -54,15 +54,11 @@
 
 
 	<div id="app" v-loading.fullscreen.lock="loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="app-main"
 	<div id="app" v-loading.fullscreen.lock="loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="app-main"
 		style="visibility:hidden">
 		style="visibility:hidden">
-		<div>
-			<el-scrollbar class="page-component__scroll" style="marginTop:0; height: 100%;">
-				<div class="jc_hd" v-show="headerHidden"></div>
-				<transition name="slide-fade">
-					<router-view></router-view>
-				</transition>
-				<div class="jdc-footer" v-show="headerHidden"></div>
-			</el-scrollbar>
-		</div>
+			<div class="jc_hd" v-show="headerHidden"></div>
+			<transition name="slide-fade">
+				<router-view></router-view>
+			</transition>
+			<div class="jdc-footer" v-show="headerHidden"></div>
 	</div>
 	</div>
 
 
 	<script src="/js/cropper/index.js"></script>
 	<script src="/js/cropper/index.js"></script>

igirl-channel-jdweb/app/front/entry/public/css/index.css

@@ -17,17 +17,3 @@
     width: 100%;
     width: 100%;
     min-height: 390px;
     min-height: 390px;
 }
 }
-
-.page-component__scroll {
-    height: calc(100% - 40px);
-    margin-top: 40px;
-}
-
-.page-component__scroll .el-scrollbar__wrap {
-    overflow-x: hidden;
-}
-
-#app>div {
-    height: 100vh;
-    overflow: hidden;
-}
\ No newline at end of file

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

@@ -202,7 +202,8 @@
           case "fzsbzc":
           case "fzsbzc":
 
 
           case "dbsbzc":
           case "dbsbzc":
-            let productId = code.channelItemCode.split('-')[code.channelItemCode.split('-').length - 1];
+            let productId = code.channelItemCode.split('-')[1];
+            console.log(code.channelItemCode.split('-'),"xxxxxxxxxxxxxx");
             window.open(`https://market.jdcloud.com/service/details/${productId}`);
             window.open(`https://market.jdcloud.com/service/details/${productId}`);
             break;
             break;
           default:
           default:

igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.js

@@ -306,6 +306,7 @@
         nclSelectedList: null,
         nclSelectedList: null,
         orderSubInfo: null,
         orderSubInfo: null,
         totalPrices: null,
         totalPrices: null,
+        dataList:[],
       }
       }
     },
     },
   computed: Vuex.mapState({
   computed: Vuex.mapState({
@@ -405,6 +406,7 @@
     }
     }
   },
   },
   mounted: function() {
   mounted: function() {
+    this.getItemCode();
     var that = this;
     var that = this;
     console.log(this.tm_form_type);
     console.log(this.tm_form_type);
     var obj = this.$root.copyParams("", "getOssConfig", "/action/tmTools/springBoard");
     var obj = this.$root.copyParams("", "getOssConfig", "/action/tmTools/springBoard");
@@ -432,7 +434,20 @@
     }
     }
   },
   },
   methods: {
   methods: {
-
+    getItemCode(){
+      var obj = this.$root.copyParams({ channelUserId: "", itemCode: "sbfu" }, "getProductListByTypeOneCode", "/action/tmOrder/springBoard");
+      this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
+        this.$root.loading = false;
+        console.log(d, "cccccccccccccccccc");
+        if (d.status == 0) {
+          this.dataList = d.data;
+          this.dataList.map((item, index) => {
+            console.log(item.productDesc);
+            item.productDesc = JSON.parse(item.productDesc);
+          });
+        }
+      });
+    },
     pointsRuleColor(i) {
     pointsRuleColor(i) {
       if (i < parseInt(this.step)) {
       if (i < parseInt(this.step)) {
         return 'color: #FFFFFF;'
         return 'color: #FFFFFF;'
@@ -1221,6 +1236,7 @@
               return false;
               return false;
             }
             }
             if (!this.showConfrim) {
             if (!this.showConfrim) {
+              console.log(that.toTop);
               that.toTop();
               that.toTop();
               that.step = Number(that.step) + 1;
               that.step = Number(that.step) + 1;
             }
             }
@@ -1241,7 +1257,7 @@
             tm: that.form,
             tm: that.form,
             apply: that.apply,
             apply: that.apply,
             nclones: that.nclOne,
             nclones: that.nclOne,
-            itemCode: that.itemCode,
+            itemCode: that.dataList[0].channelItemCode,
             channelUser: {
             channelUser: {
               channelUserId: that.$route.query.channelUserId
               channelUserId: that.$route.query.channelUserId
             },
             },
@@ -1498,6 +1514,7 @@
       if (scrollTop != 0) {
       if (scrollTop != 0) {
         let timer = setInterval(() => {
         let timer = setInterval(() => {
           window.scrollTo(0, scrollTop -= 20);
           window.scrollTo(0, scrollTop -= 20);
+          console.log(scrollTop);
           if (scrollTop <= 0) clearInterval(timer);
           if (scrollTop <= 0) clearInterval(timer);
         }, 0);
         }, 0);
       };
       };