Skip to content

Z
zhichan
Commit 5bd998e3 by 宋毅
Options

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
parents 7ead8c9e 7d4b3c5c
Showing with 13 additions and 13 deletions
igirl-channel-jdweb/app/front/entry/public/css/pagecom.css
This source diff could not be displayed because it is too large. You can view the blob instead.
igirl-channel-jdweb/app/front/vues/pages/jdindentdetail/jdindentdetail.html
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<div class="jdindentdetail-info"> <div class="jdindentdetail-info">
<div class="jdindentdetail-main-title"> <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>
<div> <div>
<p> <p>
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
{{item.nclOneCodes}} {{item.nclOneCodes}}
<span>{{item.tmRegistNum}}</span> <span>{{item.tmRegistNum}}</span>
<span>{{item.officialTypeName}}</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>
<div class="jdindentdetail-main-type-services"> <div class="jdindentdetail-main-type-services">
<p>商品服务项目：</p> <p>商品服务项目：</p>
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
<div class="jdindentdetail-main-official"> <div class="jdindentdetail-main-official">
<div class="jdindentdetail-main-title"> <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>
<div class="jdindentdetail-main-official-img"> <div class="jdindentdetail-main-official-img">
<div> <div>
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
<div class="jdindentdetail-main-infohr"></div> <div class="jdindentdetail-main-infohr"></div>
<div class="jdindentdetail-main-applicant"> <div class="jdindentdetail-main-applicant">
<div class="jdindentdetail-main-title"> <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> @click="showDialog(4)"><i class="el-icon-edit"></i> 修改</span>
</div> </div>
<ul> <ul>
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
<div class="jdindentdetail-main-infohr"></div> <div class="jdindentdetail-main-infohr"></div>
<div class="jdindentdetail-main-contact"> <div class="jdindentdetail-main-contact">
<div class="jdindentdetail-main-title"> <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> </div>
<ul> <ul>
<li><span>联系人：</span><span>{{applyInfo.contacts?applyInfo.contacts:\'-\'}}</span></li> <li><span>联系人：</span><span>{{applyInfo.contacts?applyInfo.contacts:\'-\'}}</span></li>
......
igirl-channel-jdweb/app/front/vues/pages/jdindentdetail/jdindentdetail.js
...@@ -413,7 +413,6 @@ ...@@ -413,7 +413,6 @@
this.$refs.tree.setChecked(newVal[0].nclThree[10], false); this.$refs.tree.setChecked(newVal[0].nclThree[10], false);
newVal[0].nclThree.pop(); newVal[0].nclThree.pop();
console.log(newVal, newVal[0].nclThree, `xxxxxxxxxxxxxxxxxxxxxxxxxxxxx`); console.log(newVal, newVal[0].nclThree, `xxxxxxxxxxxxxxxxxxxxxxxxxxxxx`);
this.message.show = !this.message.show; this.message.show = !this.message.show;
this.message.info = "最多只能选择10项"; this.message.info = "最多只能选择10项";
var timer2 = setTimeout(() => { var timer2 = setTimeout(() => {
......
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.js
...@@ -220,17 +220,18 @@ ...@@ -220,17 +220,18 @@
showUploadStuff: false, showUploadStuff: false,
currentOrderNo: "", currentOrderNo: "",
currentOrderType: "", currentOrderType: "",
navActive:'first', navActive: 'first',
toViewImgKey:"", toViewImgKey: "",
toViewImgType: false, toViewImgType: false,
toViewImgSrc: null, toViewImgSrc: null,
applyInfo:{}, applyInfo: {},
} }
}, },
created: function() { created: function() {
if (this.$route.query.channelUserId != "") { if (this.$route.query.channelUserId != "") {
this.$root.channelUserId = this.$route.query.channelUserId; this.$root.channelUserId = this.$route.query.channelUserId;
console.log(this.$route.query.channelUserId, "11111111111"); console.log(this.$route.query.channelUserId, "11111111111");
console.log(this.$route.fullPath.split("/")[this.$route.fullPath.split("/").length - 1]);
} }
}, },
mounted: function() { mounted: function() {
...@@ -272,8 +273,8 @@ ...@@ -272,8 +273,8 @@
this.floatBoxDemo = false; this.floatBoxDemo = false;
this.toViewImgKey = null this.toViewImgKey = null
}, },
navClick(tab,e){ navClick(tab, e){
console.log(tab,e,this.navActive); console.log(tab, e, this.navActive);
}, },
tableRowClassName({ row, rowIndex }) { tableRowClassName({ row, rowIndex }) {
if (rowIndex === 1) { if (rowIndex === 1) {
......
igirl-channel-jdweb/app/front/vues/pages/selftmreg/index.css
...@@ -648,7 +648,7 @@ ...@@ -648,7 +648,7 @@
border: 1px solid #D6DAEB; border: 1px solid #D6DAEB;
} }
.step3-submit input[type='checkbox'] { .step3-submit input[type=checkbox] {
width: 14px; width: 14px;
height: 14px; height: 14px;
background-color: #fff; background-color: #fff;
...@@ -656,7 +656,7 @@ ...@@ -656,7 +656,7 @@
border: 1px solid #0F8EE9; border: 1px solid #0F8EE9;
border-radius: 0px; border-radius: 0px;
outline: none; outline: none;
transform: translateY(5px); transform: translateY(2px);
cursor: pointer; cursor: pointer;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment