123

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

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

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

@@ -177,20 +177,13 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
     mounted() {
       setTimeout(() => {
         if (location.hash.split('/')[1] == "jd") {
-          console.log("zzzzzzzzzzzzzzz", location.hash.split('/'), this.headerHidden);
-          this.headerHidden = true;
           var find = location.hash.indexOf('/selftmreg');
-          if (find == -1) {
-            this.selfFooterShow = true;
-          } else {
+          if (find != -1) {
             $('.jdc-footer').hide();
-            this.selfFooterShow = false;
-          console.log(find,'...........................',this.selfFooterShow)
-            
           }
         } else {
-          this.headerHidden = false;
-          this.selfFooterShow = false;
+          $('.jc_hd').hide();
+          $('.jdc-footer').hide();
           console.log("zzzzzzzzzzzzzzz", location.hash.split('/')[1], this.headerHidden);
         }
       }, 500);

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

@@ -252,7 +252,7 @@
             { type: 'string', required: true, message: '请选择申请类型', trigger: 'change' }
           ],
           name: [
-            {  required: true ,message: '请输入公司/申请人名称',trigger: 'blur' },
+            { required: true, message: '请输入公司/申请人名称', trigger: 'blur' },
             { validator: validateIdConmpany, trigger: 'blur' }
           ],
           code: [
@@ -319,52 +319,52 @@
         options: [],
       }
     },
-  computed:{
-    
+  computed: {
+
   },
-  
-  
-  
-    created: function() {
-      var that = this;
-      var itemCode = this.$router.history.current.query.itemCode || 'zzsbzc';
-      var orderParams = this.$router.history.current.query.orderParams;
-      if (this.$route.query.channelUserId) {
-        this.$root.channelUserId = this.$route.query.channelUserId;
-        console.log(this.$route.query.channelUserId, "11111111111ddd");
-      }
-      if (orderParams) {
-        this.form = orderParams.tm;
-        this.apply = orderParams.apply;
-        this.nclOne = orderParams.nclones;
-        this.step = orderParams.step;
-      }
-      if (itemCode != null) {
-        this.itemCode = itemCode;
 
-      } else {
-        this.$message.warning('code参数错误');
-        return;
-      }
-      var company = this.$root.currentCompany;
 
-      if (company && company.companyType == "self") {
-        this.company = company;
-      } else {
-        /* 
-        this.$root.getReq("/web/companyCtl/findById", { cid: 1 }).then(function (d) {
-          if (d && d.status == 0 && d.data) {
-            that.company = d.data
-          }
-        });
-        */
-      }
 
-    },
+  created: function() {
+    var that = this;
+    var itemCode = this.$router.history.current.query.itemCode || 'zzsbzc';
+    var orderParams = this.$router.history.current.query.orderParams;
+    if (this.$route.query.channelUserId) {
+      this.$root.channelUserId = this.$route.query.channelUserId;
+      console.log(this.$route.query.channelUserId, "11111111111ddd");
+    }
+    if (orderParams) {
+      this.form = orderParams.tm;
+      this.apply = orderParams.apply;
+      this.nclOne = orderParams.nclones;
+      this.step = orderParams.step;
+    }
+    if (itemCode != null) {
+      this.itemCode = itemCode;
+
+    } else {
+      this.$message.warning('code参数错误');
+      return;
+    }
+    var company = this.$root.currentCompany;
+
+    if (company && company.companyType == "self") {
+      this.company = company;
+    } else {
+      /* 
+      this.$root.getReq("/web/companyCtl/findById", { cid: 1 }).then(function (d) {
+        if (d && d.status == 0 && d.data) {
+          that.company = d.data
+        }
+      });
+      */
+    }
+
+  },
   watch: {
     nclOne: {
       handler(newVal, oldVal){
-        this.totalPrices =  (newVal.length * 300).toFixed(2);
+        this.totalPrices = (newVal.length * 300).toFixed(2);
         if (newVal.length > 0) {
           if (newVal.length > 1) {
             this.$refs.tree.setChecked(newVal[1], false);
@@ -453,14 +453,14 @@
   },
   methods: {
     maxZipCode(){
-      if(this.apply.zipCode.length>6){
+      if (this.apply.zipCode.length > 6) {
         console.log(this.apply.zipCode);
-        this.apply.zipCode = this.apply.zipCode.substring(0,6);
+        this.apply.zipCode = this.apply.zipCode.substring(0, 6);
       }
     },
     maxPhoneNumber(){
-      if(this.apply.mobile.length>11){
-        this.apply.mobile = this.apply.mobile.substring(0,11);
+      if (this.apply.mobile.length > 11) {
+        this.apply.mobile = this.apply.mobile.substring(0, 11);
       }
     },
     getItemCode(){
@@ -1276,7 +1276,7 @@
         this.form.tmName = this.form.tmFormType == 5 ? this.form.tmName + '及图' : this.form.tmName;
         this.savehistory();
         console.log(this.$root.channelName, "///////////////");
-        if (this.$root.channelName == "jd") {
+        if (this.$root.channelName == "jd" ||this.$root.channelName == "gsb") {
           /**提报接口 */
           var obj = {
             tm: that.form,

igirl-channel-jdweb/package-lock.json

@@ -5615,6 +5615,22 @@
         "is-object": "^1.0.1"
       }
     },
+    "jdcloud-sdk-signer": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/jdcloud-sdk-signer/-/jdcloud-sdk-signer-2.0.1.tgz",
+      "integrity": "sha512-S/E39J2QR72d/bamnqrnvK5HlN7govBy0OPQC4dIm4Zp7y8T2awaJFOJYjGSDJrz8RlaPxyuNm3pq9RrLPEgdA==",
+      "requires": {
+        "type-detect": "^4.0.8",
+        "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "3.3.3",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
+          "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="
+        }
+      }
+    },
     "jpegtran-bin": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jpegtran-bin/-/jpegtran-bin-4.0.0.tgz",
@@ -9530,6 +9546,11 @@
         "prelude-ls": "~1.1.2"
       }
     },
+    "type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="
+    },
     "type-fest": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.5.2.tgz",