123

igirl-channel-web/app/front/entry/index.ejs

@@ -53,6 +53,7 @@
 	<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="admin-warpper" v-if="0">
+			
 			<div class="admin-menu">
 				<el-menu default-active="2" class="el-menu-vertical-demo" @open="handleOpen" @close="handleClose"
 					background-color="#545c64" text-color="#fff" active-text-color="#ffd04b">
@@ -91,6 +92,7 @@
 		<transition name="slide-fade" v-else>
 			<router-view></router-view>
 		</transition>
+		
 	</div>
 	<div class="jdc-footer"></div>
 	<script src="/js/vue/jquery.min.js"></script>

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

@@ -357,7 +357,7 @@
 									<span style="font-size:16px"><b>{{nclone.code}} {{nclone.name}}</b></span>
 									<span style="font-size:16px;float:right"><b>已选择<span
 												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;
 										<span @click="removeNclOne(index,nclone)" style="cursor: pointer;"><i
 												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 @@
                 case "ywc":
                     this.currentStep = 5;
                     break;
-
                 default:
                     break;
             }
@@ -418,12 +417,13 @@
                 console.log(d.data, `nclObj`);
                 if (d.status == 0 && d.data) {
                     this.nclInfo = d.data;
-                    /* 
-                    this.nclOne = this.nclInfo;
-                    */
                     this.nclInfo.map((item, index) => {
                         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));
                 }
@@ -433,10 +433,6 @@
                 }
             });
         },
-        /*订单流程 */
-        initOrderFlow(){
-
-        },
         showDialog(from, index){
             this.popupValue = from;
             this.nclIndex = index;
@@ -568,7 +564,6 @@
             } else if (this.loadingKey == 0) {
                 that.loading = true;
             }
-
             if (obj.flag == "picUrl") {
                 console.log("黑白图样------调整宽高", obj);
                 var uploadStandardTm = { "key": obj.result };
@@ -714,7 +709,7 @@
                 console.log(obj);
                 that.form.gzwtsUrl = obj.result;
                 that.editDeliveryInfo = JSON.parse(JSON.stringify(that.deliveryInfo));
-                console.log(that.editDeliveryInfo,`mmmmmmmmmmmmmmmmmmmmmmmmmmmmm`);
+                console.log(that.editDeliveryInfo, `mmmmmmmmmmmmmmmmmmmmmmmmmmmmm`);
                 /**that.apply["smwjUrl"] = obj.result; */
                 setTimeout(() => {
                     that.loading1 = false;
@@ -828,7 +823,7 @@
         },
         handleCheckChange(obj, a, b) {
             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) {
                 return
             }
@@ -880,7 +875,6 @@
                     })
                 }
                 this.updatePriceType = false;
-
             } else if (this.nclOne.length != 0 && !a) {
                 this.nclOne.forEach((item, index) => {
                     if (item.name == ppncl.name) {
@@ -894,6 +888,7 @@
             }
         },
         nodeClick(obj, e, a){
+            console.log(obj,e,a);
             if (e.level == 1) {
                 this.ppnclArr = obj;
             }
@@ -1282,9 +1277,7 @@
             this.checkedNcl = val ? this.nclOptions : [];
             this.isIndeterminate = false;
         },
-        handleCheckedNclChange(value)
-        {
-
+        handleCheckedNclChange(value){
             let checkedCount = value.length;
             this.checkAll = checkedCount === this.ncl.length;
             this.isIndeterminate = checkedCount > 0 && checkedCount < this.ncl.length;
@@ -1327,7 +1320,7 @@
                     this.editNcl.tbCode = this.nclInfo[this.nclIndex].tbCode;
                     this.editNcl.nclOneCodes = this.nclOne[0].code;
                     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");
                     this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => {
                         if (res.status == 0) {

igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.js

@@ -463,7 +463,7 @@
       }
 
       if (obj.flag == "picUrl") {
-        var uploadStandardTm = { "key": obj.key };
+        var uploadStandardTm = { "key": obj.result };
         var uploadStandardTm = this.$root.copyParams(uploadStandardTm, "uploadStandardTm", "/action/tmTools/springBoard");
         this.$root.postReq("/web/trademark/tmqueryCtl/doPost", uploadStandardTm).then(function (d) {
           console.log(d);