Skip to content

Z
zhichan
Commit 1d6088d4 by 刘泽奇
Options

123

parent 0416bb93
Showing with 15 additions and 20 deletions
igirl-channel-web/app/front/entry/index.ejs
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
<div class="jc_hd"> </div> <div class="jc_hd"> </div>
<div id="app" v-loading.fullscreen.lock="loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="app-main" style="visibility:hidden"> <div id="app" v-loading.fullscreen.lock="loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="app-main" style="visibility:hidden">
<div id="admin-warpper" v-if="0"> <div id="admin-warpper" v-if="0">
<div class="admin-menu"> <div class="admin-menu">
<el-menu default-active="2" class="el-menu-vertical-demo" @open="handleOpen" @close="handleClose" <el-menu default-active="2" class="el-menu-vertical-demo" @open="handleOpen" @close="handleClose"
background-color="#545c64" text-color="#fff" active-text-color="#ffd04b"> background-color="#545c64" text-color="#fff" active-text-color="#ffd04b">
...@@ -91,6 +92,7 @@ ...@@ -91,6 +92,7 @@
<transition name="slide-fade" v-else> <transition name="slide-fade" v-else>
<router-view></router-view> <router-view></router-view>
</transition> </transition>
</div> </div>
<div class="jdc-footer"></div> <div class="jdc-footer"></div>
<script src="/js/vue/jquery.min.js"></script> <script src="/js/vue/jquery.min.js"></script>
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html
...@@ -357,7 +357,7 @@ ...@@ -357,7 +357,7 @@
<span style="font-size:16px"><b>{{nclone.code}} {{nclone.name}}</b></span> <span style="font-size:16px"><b>{{nclone.code}} {{nclone.name}}</b></span>
<span style="font-size:16px;float:right"><b>已选择<span <span style="font-size:16px;float:right"><b>已选择<span
style="color:#0F8EE9;">{{nclone.nclThree.length}}</span>项</b> style="color:#0F8EE9;">{{nclone.nclThree.length}}</span>项</b>
<span style="color:#FF2E22;">￥{{nclone.price}}</span> <!-- <span style="color:#FF2E22;">￥{{nclone.price}}</span> -->
&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
<span @click="removeNclOne(index,nclone)" style="cursor: pointer;"><i <span @click="removeNclOne(index,nclone)" style="cursor: pointer;"><i
class="el-icon-delete" style="font-size : 1.2em;"></i></span> class="el-icon-delete" style="font-size : 1.2em;"></i></span>
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js
...@@ -355,7 +355,6 @@ ...@@ -355,7 +355,6 @@
case "ywc": case "ywc":
this.currentStep = 5; this.currentStep = 5;
break; break;
default: default:
break; break;
} }
...@@ -418,12 +417,13 @@ ...@@ -418,12 +417,13 @@
console.log(d.data, `nclObj`); console.log(d.data, `nclObj`);
if (d.status == 0 && d.data) { if (d.status == 0 && d.data) {
this.nclInfo = d.data; this.nclInfo = d.data;
/*
this.nclOne = this.nclInfo;
*/
this.nclInfo.map((item, index) => { this.nclInfo.map((item, index) => {
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.name = this.ncldata[item.nclOneCodes.replace(/\b(0+)/gi,"")-1].name;
item.nclThree = item.nclSmallCodes;
this.nclOne.push(item);
}); });
this.ncl = JSON.parse(JSON.stringify(this.nclInfo)); this.ncl = JSON.parse(JSON.stringify(this.nclInfo));
} }
...@@ -433,10 +433,6 @@ ...@@ -433,10 +433,6 @@
} }
}); });
}, },
/*订单流程 */
initOrderFlow(){
},
showDialog(from, index){ showDialog(from, index){
this.popupValue = from; this.popupValue = from;
this.nclIndex = index; this.nclIndex = index;
...@@ -568,7 +564,6 @@ ...@@ -568,7 +564,6 @@
} else if (this.loadingKey == 0) { } else if (this.loadingKey == 0) {
that.loading = true; that.loading = true;
} }
if (obj.flag == "picUrl") { if (obj.flag == "picUrl") {
console.log("黑白图样------调整宽高", obj); console.log("黑白图样------调整宽高", obj);
var uploadStandardTm = { "key": obj.result }; var uploadStandardTm = { "key": obj.result };
...@@ -714,7 +709,7 @@ ...@@ -714,7 +709,7 @@
console.log(obj); console.log(obj);
that.form.gzwtsUrl = obj.result; that.form.gzwtsUrl = obj.result;
that.editDeliveryInfo = JSON.parse(JSON.stringify(that.deliveryInfo)); that.editDeliveryInfo = JSON.parse(JSON.stringify(that.deliveryInfo));
console.log(that.editDeliveryInfo,`mmmmmmmmmmmmmmmmmmmmmmmmmmmmm`); console.log(that.editDeliveryInfo, `mmmmmmmmmmmmmmmmmmmmmmmmmmmmm`);
/**that.apply["smwjUrl"] = obj.result; */ /**that.apply["smwjUrl"] = obj.result; */
setTimeout(() => { setTimeout(() => {
that.loading1 = false; that.loading1 = false;
...@@ -828,7 +823,7 @@ ...@@ -828,7 +823,7 @@
}, },
handleCheckChange(obj, a, b) { handleCheckChange(obj, a, b) {
let dataRecieve = this.$refs.tree.getCheckedNodes(); let dataRecieve = this.$refs.tree.getCheckedNodes();
console.log(obj, a, b, '1233333333333333333333344444444444444444444',dataRecieve,this.checkedNcl); console.log(obj, a, b, '1233333333333333333333344444444444444444444', dataRecieve, this.checkedNcl);
if (obj.type) { if (obj.type) {
return return
} }
...@@ -880,7 +875,6 @@ ...@@ -880,7 +875,6 @@
}) })
} }
this.updatePriceType = false; this.updatePriceType = false;
} else if (this.nclOne.length != 0 && !a) { } else if (this.nclOne.length != 0 && !a) {
this.nclOne.forEach((item, index) => { this.nclOne.forEach((item, index) => {
if (item.name == ppncl.name) { if (item.name == ppncl.name) {
...@@ -894,6 +888,7 @@ ...@@ -894,6 +888,7 @@
} }
}, },
nodeClick(obj, e, a){ nodeClick(obj, e, a){
console.log(obj,e,a);
if (e.level == 1) { if (e.level == 1) {
this.ppnclArr = obj; this.ppnclArr = obj;
} }
...@@ -1282,9 +1277,7 @@ ...@@ -1282,9 +1277,7 @@
this.checkedNcl = val ? this.nclOptions : []; this.checkedNcl = val ? this.nclOptions : [];
this.isIndeterminate = false; this.isIndeterminate = false;
}, },
handleCheckedNclChange(value) handleCheckedNclChange(value){
{
let checkedCount = value.length; let checkedCount = value.length;
this.checkAll = checkedCount === this.ncl.length; this.checkAll = checkedCount === this.ncl.length;
this.isIndeterminate = checkedCount > 0 && checkedCount < this.ncl.length; this.isIndeterminate = checkedCount > 0 && checkedCount < this.ncl.length;
...@@ -1327,7 +1320,7 @@ ...@@ -1327,7 +1320,7 @@
this.editNcl.tbCode = this.nclInfo[this.nclIndex].tbCode; this.editNcl.tbCode = this.nclInfo[this.nclIndex].tbCode;
this.editNcl.nclOneCodes = this.nclOne[0].code; this.editNcl.nclOneCodes = this.nclOne[0].code;
this.editNcl.nclSmallCodes = this.nclOne[0].nclThree; this.editNcl.nclSmallCodes = this.nclOne[0].nclThree;
console.log(this.nclInfo, this.nclOne,this.editNcl, `xxxxxxxxxxxxxxxxxxxxxxxx`); console.log(this.nclInfo, this.nclOne, this.editNcl, `xxxxxxxxxxxxxxxxxxxxxxxx`);
var obj = this.$root.copyParams(this.editNcl, "updateNclInfo", "/action/tmOrder/springBoard", "yes", "yes"); var obj = this.$root.copyParams(this.editNcl, "updateNclInfo", "/action/tmOrder/springBoard", "yes", "yes");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => {
if (res.status == 0) { if (res.status == 0) {
...@@ -1339,7 +1332,7 @@ ...@@ -1339,7 +1332,7 @@
}); });
this.$root.loading = false; this.$root.loading = false;
/** this.$router.go(0);*/ /** this.$router.go(0);*/
} else { } else {
this.$message(res.msg); this.$message(res.msg);
} }
......
igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.js
...@@ -463,7 +463,7 @@ ...@@ -463,7 +463,7 @@
} }
if (obj.flag == "picUrl") { if (obj.flag == "picUrl") {
var uploadStandardTm = { "key": obj.key }; var uploadStandardTm = { "key": obj.result };
var uploadStandardTm = this.$root.copyParams(uploadStandardTm, "uploadStandardTm", "/action/tmTools/springBoard"); var uploadStandardTm = this.$root.copyParams(uploadStandardTm, "uploadStandardTm", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", uploadStandardTm).then(function (d) { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", uploadStandardTm).then(function (d) {
console.log(d); console.log(d);
......
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