Merge branch 'igirl-channel-jdweb' of gitlab.gongsibao.com:jiangyong/zhichan…

Merge branch 'igirl-channel-jdweb' of gitlab.gongsibao.com:jiangyong/zhichan into igirl-channel-jdweb

igirl-channel-jdweb/app/front/vues/pages/jdindentdetail/jdindentdetail.html

@@ -69,7 +69,7 @@
 
 			<div class="jdindentdetail-info">
 				<div class="jdindentdetail-main-title">
-					商标信息 <span v-show="1" @click="showDialog(1)"><i class="el-icon-edit"></i> 修改</span>
+					商标信息 <span v-show="itemCode" @click="showDialog(1)"><i class="el-icon-edit"></i> 修改</span>
 				</div>
 				<div>
 					<p>
@@ -95,7 +95,7 @@
 						{{item.nclOneCodes}}
 						<span>{{item.tmRegistNum}}</span>
 						<span>{{item.officialTypeName}}</span>
-						<span v-show="1" @click="showDialog(2,index)"><i class="el-icon-edit"></i> 修改</span>
+						<span v-show="itemCode" @click="showDialog(2,index)"><i class="el-icon-edit"></i> 修改</span>
 					</div>
 					<div class="jdindentdetail-main-type-services">
 						<p>商品服务项目：</p>
@@ -116,7 +116,7 @@
 
 			<div class="jdindentdetail-main-official">
 				<div class="jdindentdetail-main-title">
-					交官文件 <span v-show="1" @click="showDialog(3)"><i class="el-icon-edit"></i> 修改</span>
+					交官文件 <span v-show="itemCode" @click="showDialog(3)"><i class="el-icon-edit"></i> 修改</span>
 				</div>
 				<div class="jdindentdetail-main-official-img">
 					<div>
@@ -165,7 +165,7 @@
 			<div class="jdindentdetail-main-infohr"></div>
 			<div class="jdindentdetail-main-applicant">
 				<div class="jdindentdetail-main-title">
-					申请人信息-（中国大陆-{{applyInfo.customerType == \"person\"?\"个体户\":\"企业"}}） <span v-show="1"
+					申请人信息-（中国大陆-{{applyInfo.customerType == \"person\"?\"个体户\":\"企业"}}） <span v-show="itemCode"
 						@click="showDialog(4)"><i class="el-icon-edit"></i> 修改</span>
 				</div>
 				<ul>
@@ -178,7 +178,7 @@
 			<div class="jdindentdetail-main-infohr"></div>
 			<div class="jdindentdetail-main-contact">
 				<div class="jdindentdetail-main-title">
-					订单联系人 <span v-show="1" @click="showDialog(5)"><i class="el-icon-edit"></i> 修改</span>
+					订单联系人 <span v-show="itemCode" @click="showDialog(5)"><i class="el-icon-edit"></i> 修改</span>
 				</div>
 				<ul>
 					<li><span>联系人：</span><span>{{applyInfo.contacts?applyInfo.contacts:\'-\'}}</span></li>

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

@@ -413,7 +413,6 @@
                         this.$refs.tree.setChecked(newVal[0].nclThree[10], false);
                         newVal[0].nclThree.pop();
                         console.log(newVal, newVal[0].nclThree, `xxxxxxxxxxxxxxxxxxxxxxxxxxxxx`);
-
                         this.message.show = !this.message.show;
                         this.message.info = "最多只能选择10项";
                         var timer2 = setTimeout(() => {

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

@@ -220,17 +220,18 @@
                 showUploadStuff: false,
                 currentOrderNo: "",
                 currentOrderType: "",
-                navActive:'first',
-                toViewImgKey:"",
+                navActive: 'first',
+                toViewImgKey: "",
                 toViewImgType: false,
                 toViewImgSrc: null,
-                applyInfo:{},
+                applyInfo: {},
             }
         },
     created: function() {
         if (this.$route.query.channelUserId != "") {
             this.$root.channelUserId = this.$route.query.channelUserId;
             console.log(this.$route.query.channelUserId, "11111111111");
+            console.log(this.$route.fullPath.split("/")[this.$route.fullPath.split("/").length - 1]);
         }
     },
     mounted: function() {
@@ -272,8 +273,8 @@
             this.floatBoxDemo = false;
             this.toViewImgKey = null
         },
-        navClick(tab,e){
-            console.log(tab,e,this.navActive);
+        navClick(tab, e){
+            console.log(tab, e, this.navActive);
         },
         tableRowClassName({ row, rowIndex }) {
             if (rowIndex === 1) {

igirl-channel-jdweb/app/front/vues/pages/selftmreg/index.css

@@ -648,7 +648,7 @@
     border: 1px solid #D6DAEB;
 }
 
-.step3-submit input[type='checkbox'] {
+.step3-submit input[type=checkbox] {
     width: 14px;
     height: 14px;
     background-color: #fff;
@@ -656,7 +656,7 @@
     border: 1px solid #0F8EE9;
     border-radius: 0px;
     outline: none;
-    transform: translateY(5px);
+    transform: translateY(2px);
     cursor: pointer;
 }