发起收费页修改

src/views/login/login.vue

@@ -85,6 +85,7 @@ export default {
             // const _this = this
             this.$http.post(this.$myApi.BINDLOGIN, curParams)
                 .then(res => {
+                    console.log('执行了吗');
                     this.$router.replace('/home')
                 })
                 .catch(() => {})

src/views/my/charge.vue

@@ -57,13 +57,14 @@
         </div>
         <div class="item flex-h flex-vc">
           <div class="title_left">耗材个数</div>
-          <input type="number" placeholder="请输入" v-model="item.sl" />
+          <input type="number" placeholder="请输入" v-model="item.sl" @input="changeInput($event)" />
         </div>
         <!-- 种类弹窗 -->
         <van-popup v-model="item.zlSelect" round position="bottom">
           <van-picker
             show-toolbar
             :columns="types"
+            value-key="goods_name"
             @confirm="(value)=>{typeConfirm(value,index)}"
             @cancel="typeCancel(index)"
           />
@@ -72,6 +73,7 @@
           <van-picker
             show-toolbar
             :columns="hcName"
+            value-key="goods_name"
             @confirm="(value)=>{hcConfirm(value,index)}"
             @cancel="hcCancel(index)"
           />
@@ -79,8 +81,8 @@
       </div>
       <div class="line"></div>
       <div class="math-btn flex-h flex-vc flex-hb">
-        <div class="del-btn" @click="delMeth">-删除耗材</div>
         <div class="add-btn" @click="addMeth">+新增耗材</div>
+        <div v-if="addList.length>1" class="del-btn" @click="delMeth">-删除耗材</div>
       </div>
     </div>
     <div class="blank"></div>
@@ -89,9 +91,9 @@
       <div class="left">
         共
         <span>{{addList.length}}</span>件，总金额:
-        <span>￥0</span>
+        <span>￥{{total_price}}</span>
       </div>
-      <div class="sk-btn">发起收款</div>
+      <div class="skBtn" @click="launch(repair_order_id)">发起收款</div>
     </div>
   </div>
 </template>
@@ -106,19 +108,22 @@ export default {
                 zl:'',
                 mc:'',
 				sl:'',
+				price: '',
 				zlSelect:false,
 				mcSelect: false
               }
 			],
 			showPicker: false,
-			types: ["洁具", "木工类","供暖类"],
+			types: [],
 			type_name: '请选择',
-			hcName: ["水龙头","桌子","暖气管"],
+			hcName: [],
 			hc_name: '请选择',
 			hcPicker: false,
 			hcNum: '',
 			repair_order_id: '',
 			order: '',
+			hcList: [],
+			total_price: 0,
         }
 	},
 	created(){
@@ -136,11 +141,18 @@ export default {
             const curParams = {
                 repair_order_id: this.repair_order_id
             }
-            // const _this = this
             this.$http.get(this.$myApi.REPAIR_ORDER_DETAIL, curParams)
                 .then(res => {
 					this.order = res.order
-					console.log(this.order,123456);
+					var arr = []
+					for(let i in res.material){
+						arr.push({
+							id: res.material[i].id,
+							goods_name: res.material[i].goods_name,
+							son: res.material[i].son
+						})
+					}
+					this.types = arr
                 })
                 .catch(() => {})
         },
@@ -148,8 +160,19 @@ export default {
 			this.addList[index].zlSelect = true
 		},
 		typeConfirm(value, index) {
-			this.addList[index].zl = value
+			this.hcList = value
+			this.addList[index].zl = value.goods_name
 			this.addList[index].zlSelect = false
+
+			var childArr = []
+			for(let i in value.son){
+				childArr.push({
+					id: value.son[i].id,
+					goods_name: value.son[i].goods_name,
+					price: value.son[i].price
+				})
+			}
+			this.hcName = childArr
 		},
 		typeCancel(index) {
 			this.addList[index].zlSelect = false
@@ -158,10 +181,14 @@ export default {
 			this.addList[index].mcSelect = true
 		},
 		hcConfirm(value, index) {
-			this.addList[index].mc = value
+			console.log(value,'耗材名称');
+			this.addList[index].mc = value.goods_name
+			this.addList[index].price = value.price
 			this.addList[index].mcSelect = false
+			console.log('家对的被动方法',this.addList[index].price);
+			this.total_price = this.addList[index].price
 		},
-		hcCancel() {
+		hcCancel(index) {
 			this.addList[index].mcSelect = false
 		},
         addMeth () {
@@ -176,6 +203,22 @@ export default {
         delMeth(index){
 			this.addList.splice(index,1)
 		},
+		changeInput(e){
+			this.hc_number = e.target.value
+		},
+		launch(id){
+			console.log('东西啊啊',this.addList[0].sl);
+			const curParams = {
+                repair_order_id: this.repair_order_id, 
+                goods: this.addList
+            }
+            // const _this = this
+            this.$http.post(this.$myApi.REPAIR_ORDER, curParams)
+                .then(res => {
+                    console.log('执行了吗');
+                })
+                .catch(() => {})
+		},
     },
 }
 </script>

src/views/tabbar/mine.vue

@@ -58,7 +58,7 @@ export default {
   position: relative;
 }
 .info-item {
-  width: 7.5rem;
+  width: 100%;
   height: 8.05rem;
   background: #ffffff;
   border-radius: 0.28rem 0.28rem 0rem 0rem;
@@ -74,7 +74,7 @@ export default {
   background: #f1f1f1;
   position: absolute;
   top: -1rem;
-  left: 2.9rem;
+  left: 3.2rem;
 }
 .btn {
   width: 1.38rem;