Skip to content

Z
zhichan
Commit 386e7525 by 刘泽奇
Options

123

parent 96ca0a3d
Showing with 143 additions and 11 deletions
igirl-channel-web/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-web/app/front/entry/public/imgs/zwtp.png
igirl-channel-web/app/front/entry/public/imgs/zwtp.png

937 Bytes | W: | H:

igirl-channel-web/app/front/entry/public/imgs/zwtp.png

2.54 KB | W: | H:

igirl-channel-web/app/front/entry/public/imgs/zwtp.png
igirl-channel-web/app/front/entry/public/imgs/zwtp.png
igirl-channel-web/app/front/entry/public/imgs/zwtp.png
igirl-channel-web/app/front/entry/public/imgs/zwtp.png
  • 2-up
  • Swipe
  • Onion skin
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html
...@@ -378,7 +378,7 @@ ...@@ -378,7 +378,7 @@
<div v-else <div v-else
style="overflow: auto;height: 100%;padding: 60px 20px 0px;box-sizing: border-box;text-align: center;"> style="overflow: auto;height: 100%;padding: 60px 20px 0px;box-sizing: border-box;text-align: center;">
<img src="/imgs/kong-2.png" style="margin-top: 124px;" alt=""> <img src="/imgs/kong-2.png" style="margin-top: 124px;" alt="">
<div style="color: #828282;margin-top: 10px;">请点击左侧选择商标类别</div> <div style="color: #828282;margin-top: 330px;text-align: center;">请点击左侧选择商标类别</div>
</div> </div>
</el-main> </el-main>
...@@ -832,4 +832,12 @@ ...@@ -832,4 +832,12 @@
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
<!-- -->
<transition name="message">
<div class="selftmreg-message" v-if="message.show">
<i class="el-icon-warning"></i>
{{message.info}}
</div>
</transition>
</div> </div>
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js
...@@ -312,6 +312,10 @@ ...@@ -312,6 +312,10 @@
editNcl: {}, editNcl: {},
editDeliveryInfo: {}, editDeliveryInfo: {},
editApply: {}, editApply: {},
message: {
info: "",
show: false,
},
} }
}, },
mounted: function() { mounted: function() {
...@@ -371,6 +375,42 @@ ...@@ -371,6 +375,42 @@
computed: { computed: {
}, },
watch: {
nclOne: {
handler(newVal, oldVal){
if (newVal.length > 0) {
if (newVal.length > 1) {
this.$refs.tree.setChecked(newVal[1], false);
this.$refs.tree.setChecked(newVal[1].nclThree[0], false);
newVal.pop();
this.message.show = !this.message.show;
this.message.info = "只能选择同一个类别";
var tiemr = setTimeout(() => {
this.message.show = false;
}, 2000);
clearTimeout(tiemr);
};
if (newVal[0].nclThree.length > 10) {
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 tiemr2 = setTimeout(() => {
this.message.show = false;
}, 2000);
clearTimeout(tiemr2);
}
}
},
deep: true
}
},
methods: { methods: {
/*初始化订单数据 */ /*初始化订单数据 */
...@@ -421,7 +461,7 @@ ...@@ -421,7 +461,7 @@
item.nclSmallCodes = JSON.parse(item.nclSmallCodes); item.nclSmallCodes = JSON.parse(item.nclSmallCodes);
console.log(item, item.nclSmallCodes, "////////////////////////////////"); console.log(item, item.nclSmallCodes, "////////////////////////////////");
item.code = item.nclOneCodes; item.code = item.nclOneCodes;
item.name = this.ncldata[item.nclOneCodes.replace(/\b(0+)/gi,"")-1].name; item.name = this.ncldata[item.nclOneCodes.replace(/\b(0+)/gi, "") - 1].name;
item.nclThree = item.nclSmallCodes; item.nclThree = item.nclSmallCodes;
this.nclOne.push(item); this.nclOne.push(item);
}); });
...@@ -888,7 +928,7 @@ ...@@ -888,7 +928,7 @@
} }
}, },
nodeClick(obj, e, a){ nodeClick(obj, e, a){
console.log(obj,e,a); console.log(obj, e, a);
if (e.level == 1) { if (e.level == 1) {
this.ppnclArr = obj; this.ppnclArr = obj;
} }
......
igirl-channel-web/app/front/vues/pages/selftmreg/index.css
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
height: 34px !important; height: 34px !important;
line-height: 34px !important; line-height: 34px !important;
} }
#selftmreg
#selftmreg .el-step__head.is-success { #selftmreg #selftmreg .el-step__head.is-success {
color: #409EFF; color: #409EFF;
border-color: #409EFF; border-color: #409EFF;
} }
...@@ -475,6 +475,10 @@ ...@@ -475,6 +475,10 @@
left: 100%; left: 100%;
} }
.categoryFrom .el-form-item__error {
left: 45% !important;
}
#selftmreg h4 { #selftmreg h4 {
font-size: 16px; font-size: 16px;
font-family: PingFangSC; font-family: PingFangSC;
...@@ -676,4 +680,34 @@ ...@@ -676,4 +680,34 @@
height: 40px; height: 40px;
border-radius: 0; border-radius: 0;
background: #0989C5; background: #0989C5;
}
.selftmreg-message {
position: fixed;
transform: translateX(-50%);
left: 50%;
top: 20px;
box-sizing: border-box;
min-width: 380px;
border-radius: 5px;
border: 1px solid #faecd8;
background-color: #fdf6ec;
color: #e6A23c;
padding: 15px 15px 15px 20px;
z-index: 8888;
}
.message-enter-active,
.message-leave-active {
transition: opacity .5s;
}
.message-enter,
.message-leave-to
/* .fade-leave-active below version 2.1.8 */
{
opacity: 0;
} }
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.js
...@@ -287,6 +287,11 @@ ...@@ -287,6 +287,11 @@
channelOrder: null, channelOrder: null,
channelParams: null, channelParams: null,
channelUser: null, channelUser: null,
nclTime: null,
message: {
info: "",
show: false,
},
} }
}, },
computed: Vuex.mapState({ computed: Vuex.mapState({
...@@ -331,6 +336,42 @@ ...@@ -331,6 +336,42 @@
} }
}, },
watch: {
nclOne: {
handler(newVal, oldVal){
if (newVal.length > 0) {
if (newVal.length > 1) {
this.$refs.tree.setChecked(newVal[1], false);
this.$refs.tree.setChecked(newVal[1].nclThree[0], false);
newVal.pop();
this.message.show = !this.message.show;
this.message.info = "只能选择同一个类别";
var tiemr = setTimeout(() => {
this.message.show = false;
}, 2000);
clearTimeout(tiemr);
};
if (newVal[0].nclThree.length > 10) {
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 tiemr2 = setTimeout(() => {
this.message.show = false;
}, 2000);
clearTimeout(tiemr2);
}
}
},
deep: true
}
},
mounted: function() { mounted: function() {
this.$root.getChannelPath(); this.$root.getChannelPath();
var that = this; var that = this;
...@@ -748,11 +789,12 @@ ...@@ -748,11 +789,12 @@
return false; return false;
} }
var publicExpense = this.serviceitem.publicExpense || 0; var publicExpense = this.serviceitem.publicExpense || 0;
console.log(this.serviceitem.publicExpense,'????????????????????'); console.log(this.serviceitem.publicExpense, '????????????????????', nclThree);
publicExpense = Number(publicExpense); publicExpense = Number(publicExpense);
var nclSmallPrice = publicExpense / 10; var nclSmallPrice = publicExpense / 10;
nclSmallPrice = Number(nclSmallPrice.toFixed(2)); nclSmallPrice = Number(nclSmallPrice.toFixed(2));
this.$refs.tree.setChecked(nclThree, false); this.$refs.tree.setChecked(nclThree, false);
this.nclOne[index].nclThree.splice(index2, 1); this.nclOne[index].nclThree.splice(index2, 1);
if (this.nclOne[index].nclThree.length > 10) { if (this.nclOne[index].nclThree.length > 10) {
this.nclOne[index].price = Number(publicExpense + (this.nclOne[index].nclThree.length - 10) * nclSmallPrice); this.nclOne[index].price = Number(publicExpense + (this.nclOne[index].nclThree.length - 10) * nclSmallPrice);
...@@ -820,7 +862,7 @@ ...@@ -820,7 +862,7 @@
}) })
}, },
handleCheckChange(obj, a, b) { handleCheckChange(obj, a, b) {
console.log(obj, a, b, '1233333333333333333333344444444444444444444'); console.log(obj, a, b, this.nclOne, '1233333333333333333333344444444444444444444');
let dataRecieve = this.$refs.tree.getCheckedNodes(); let dataRecieve = this.$refs.tree.getCheckedNodes();
if (obj.type) { if (obj.type) {
return return
...@@ -838,7 +880,7 @@ ...@@ -838,7 +880,7 @@
} }
var nclThree = [eData]; var nclThree = [eData];
var publicExpense = this.publicExpense || 0; var publicExpense = this.publicExpense || 0;
console.log(this.publicExpense,'/////////////////////'); console.log(this.publicExpense, '/////////////////////');
publicExpense = Number(publicExpense); publicExpense = Number(publicExpense);
var nclSmallPrice = publicExpense / 10; var nclSmallPrice = publicExpense / 10;
nclSmallPrice = Number(nclSmallPrice.toFixed(2)); nclSmallPrice = Number(nclSmallPrice.toFixed(2));
...@@ -884,6 +926,8 @@ ...@@ -884,6 +926,8 @@
} }
}) })
} }
}, },
nodeClick(obj, e, a){ nodeClick(obj, e, a){
if (e.level == 1) { if (e.level == 1) {
...@@ -894,6 +938,7 @@ ...@@ -894,6 +938,7 @@
this.$message.warning("已生成订单，不可修改"); this.$message.warning("已生成订单，不可修改");
return false; return false;
} }
/*节点层级 */
if (e.level < 3 && e.childNodes.length == 0) { if (e.level < 3 && e.childNodes.length == 0) {
this.nclSearchLoading = true; this.nclSearchLoading = true;
var getNcl = { var getNcl = {
...@@ -910,6 +955,7 @@ ...@@ -910,6 +955,7 @@
that.nclSearchLoading = false; that.nclSearchLoading = false;
} }
} }
/*节点层级 */
if (e.level == 2) { if (e.level == 2) {
that.nclSearchLoading = false; that.nclSearchLoading = false;
that.nclOne.forEach((item, index) => { that.nclOne.forEach((item, index) => {
...@@ -923,7 +969,7 @@ ...@@ -923,7 +969,7 @@
}); });
} }
/*节点层级 */
if (e.level == 3) { if (e.level == 3) {
this.$refs.tree.setChecked(e.data, true); this.$refs.tree.setChecked(e.data, true);
return; return;
...@@ -957,6 +1003,8 @@ ...@@ -957,6 +1003,8 @@
this.nclOne.push(data); this.nclOne.push(data);
} }
} }
}, },
nclThreeIsExist(name, nclThree){ nclThreeIsExist(name, nclThree){
if (nclThree.length < 1) { if (nclThree.length < 1) {
...@@ -1062,9 +1110,9 @@ ...@@ -1062,9 +1110,9 @@
if (formName == "form" || formName == "apply") { if (formName == "form" || formName == "apply") {
if (formName == "apply") { if (formName == "apply") {
console.log(this.apply); console.log(this.apply);
if (this.apply.customerType != 'person' && this.apply.sealAuthorizeStuff == '' || this.apply.businessLicensePic == '' ) { if (this.apply.customerType != 'person' && this.apply.sealAuthorizeStuff == '' || this.apply.businessLicensePic == '') {
return that.$message.warning(`请按要求上传资料`); return that.$message.warning(`请按要求上传资料`);
}else if ( this.apply.customerType == 'person' && this.apply.identityCardPic == '' || this.apply.sealAuthorizeStuff == '' || this.apply.businessLicensePic == '') { } else if (this.apply.customerType == 'person' && this.apply.identityCardPic == '' || this.apply.sealAuthorizeStuff == '' || this.apply.businessLicensePic == '') {
return that.$message.warning(`请按要求上传资料`); return that.$message.warning(`请按要求上传资料`);
} }
}; };
......
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