Skip to content

Z
zhichan
Commit edec4ab1 by 刘泽奇
Options

123

parent e240ac0f
Showing with 43 additions and 25 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.css
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
} }
.jdindentdetail-main-step-col .el-step.is-horizontal .el-step__line { .jdindentdetail-main-step-col .el-step.is-horizontal .el-step__line {
transform: scaleX(0.7); transform: scaleX(1);
} }
.jdindentdetail-main-step-col .el-step.is-horizontal .el-step__main .is-process { .jdindentdetail-main-step-col .el-step.is-horizontal .el-step__main .is-process {
...@@ -520,4 +520,12 @@ ...@@ -520,4 +520,12 @@
} }
.jdindentdetail-warpper .categoryFrom .el-form-item__error { .jdindentdetail-warpper .categoryFrom .el-form-item__error {
left: 0 !important; left: 0 !important;
} }
\ No newline at end of file
.jdindentdetail-diag .el-drawer__open .el-drawer.rtl{
width: 66%;
}
.jdindentdetail-drawer .selftmreg_main .el-form-item{
margin-bottom: 10px !important;
}
.jdindentdetail-drawer .selftmreg_main
\ No newline at end of file
igirl-channel-jdweb/app/front/vues/pages/jdindentdetail/jdindentdetail.js
...@@ -399,7 +399,7 @@ ...@@ -399,7 +399,7 @@
this.$refs.tree.setChecked(newVal[1].nclThree[0], false); this.$refs.tree.setChecked(newVal[1].nclThree[0], false);
newVal.pop(); newVal.pop();
this.message.show = !this.message.show; this.message.show = !this.message.show;
this.message.info = "只能选择同一个类别"; this.message.info = "只能修改一个类别";
var timer = setTimeout(() => { var timer = setTimeout(() => {
this.message.show = false; this.message.show = false;
clearTimeout(timer); clearTimeout(timer);
......
igirl-channel-jdweb/app/front/vues/pages/selftmreg/index.css
...@@ -429,7 +429,8 @@ ...@@ -429,7 +429,8 @@
} }
.upload-button>div>i { .upload-button>div>i {
font-size: 16px; font-size: 37px;
color: #dee0eb;
} }
.toViewImg { .toViewImg {
......
igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.html
...@@ -789,8 +789,10 @@ ...@@ -789,8 +789,10 @@
</div> </div>
</transition> </transition>
<el-dialog title="提示" :visible.sync="showConfrim" width="30%" style="z-Index:9999;"> <el-dialog title="提示" :visible.sync="showConfrim" width="30%" style="z-Index:9999;">
<span v-if="showConfrim">{{nclOne[0].code}}类{{nclOne[0].name}}，商品/服务项目<span <div v-for="(item, index) in nclOne" :key="index" style="margin-bottom:10px;">
style="color:red;">不足10项</span>，已选{{nclSelected}}项，还可选{{10-nclSelected}}个小项</span> {{item.code}}类{{item.name}}，商品/服务项目<span
style="color:red;">不足10项</span>，已选{{item.checked}}项，还可选{{10-item.checked}}个小项</span>
</div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button style="background:#66b1ff;border-color: #66b1ff;color: #FFF;" @click="closeConfrim()">修 改</el-button> <el-button style="background:#66b1ff;border-color: #66b1ff;color: #FFF;" @click="closeConfrim()">修 改</el-button>
<el-button style="background:#fff;border-color: #DCDFE6;color: #606266;" type="primary" <el-button style="background:#fff;border-color: #DCDFE6;color: #606266;" type="primary"
......
igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.js
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
}; };
return { return {
listPath: { listPath: {
path: '/1688/jdindentlist', path: '/1688/jdtrademark',
query: { query: {
channelUserId: this.$route.query.channelUserId, channelUserId: this.$route.query.channelUserId,
deliveryOrderNo: this.deliveryOrderNo, deliveryOrderNo: this.deliveryOrderNo,
...@@ -303,7 +303,7 @@ ...@@ -303,7 +303,7 @@
}, },
showConfrim: false, showConfrim: false,
agree: false, agree: false,
nclSelected: null, nclSelectedList: null,
orderSubInfo: null, orderSubInfo: null,
totalPrices: null, totalPrices: null,
} }
...@@ -354,7 +354,7 @@ ...@@ -354,7 +354,7 @@
nclOne: { nclOne: {
handler(newVal, oldVal){ handler(newVal, oldVal){
this.totalPrices = newVal.length * 300; this.totalPrices = newVal.length * 300;
console.log(this,newVal.length, '???????????????????'); console.log(this, newVal.length, '???????????????????');
if (newVal.length > 0) { if (newVal.length > 0) {
newVal.forEach((item, index) => { newVal.forEach((item, index) => {
if (item.nclThree.length > 10) { if (item.nclThree.length > 10) {
...@@ -1132,25 +1132,30 @@ ...@@ -1132,25 +1132,30 @@
this.showConfrim = false; this.showConfrim = false;
}, },
submitForm(formName, agree) { submitForm(formName, agree) {
/** this.step++; */ /** this.step++; */
var that = this; var that = this;
if (this.nclOne.length > 0) { if (this.nclOne.length > 0) {
if (this.nclOne[0].nclThree.length < 10 && formName == "form") { console.log(this.nclOne,",,,,,,,,,,,,,,,,,,,,,,,,");
this.showConfrim = true; this.nclOne.map((item, index) => {
this.nclSelected = this.nclOne[0].nclThree.length; if (item.nclThree.length < 10 && formName == "form") {
if (agree) { console.log(item,'111111111111111111111111111111111111111');
if (!this.form.tmName || !this.form.colorizedPicUrl) { item.checked = item.nclThree.length;
this.$message.warning("请完善信息"); this.showConfrim = true;
console.log('ppppppppppppppppppppp');
return; if (agree) {
if (!this.form.tmName || !this.form.colorizedPicUrl) {
this.$message.warning("请完善信息");
console.log('ppppppppppppppppppppp');
return;
} else {
this.showConfrim = false;
}
} else { } else {
this.showConfrim = false; return;
} }
} else {
return;
} }
} });
} }
if (!this.form.tmName || !this.form.colorizedPicUrl) { if (!this.form.tmName || !this.form.colorizedPicUrl) {
...@@ -1175,8 +1180,10 @@ ...@@ -1175,8 +1180,10 @@
that.$message.warning(`请选择商标分类`); that.$message.warning(`请选择商标分类`);
return false; return false;
} }
that.toTop(); if(!this.showConfrim){
that.step = Number(that.step) + 1; that.toTop();
that.step = Number(that.step) + 1;
}
} else { } else {
console.log('error submit!!'); console.log('error submit!!');
return false; return false;
......
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