Merge branch 'spp' into 'master'

Spp

See merge request !4

src/views/login/login.vue

@@ -77,7 +77,7 @@ export default {
         goLogin () {
             if (this.checkData()) return true
             const curParams = {
-                tel: this.tel,
+                tel: this.tel, 
                 code: this.code
             }
             this.$http.post(this.$myApi.BINDLOGIN, curParams)

src/views/my/charge.vue

@@ -125,17 +125,47 @@
                 >+新增耗材</div>
             </div>
         </div>
-        <div class="blank"></div>
-        <!-- 底部 -->
-        <div class="bottom flex-h flex-hb flex-vc">
-            <div class="left">
-                共
-                <span>{{addList.length}}</span>件，总金额:
-                <span>￥0</span>
-            </div>
-            <div class="sk-btn">发起收款</div>
+        <div class="item flex-h flex-vc">
+          <div class="title_left">耗材个数</div>
+          <input type="number" placeholder="请输入" v-model="item.sl" @input="changeInput($event)" />
         </div>
-    </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)"
+          />
+        </van-popup>
+        <van-popup v-model="item.mcSelect" round position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="hcName"
+            value-key="goods_name"
+            @confirm="(value)=>{hcConfirm(value,index)}"
+            @cancel="hcCancel(index)"
+          />
+        </van-popup>
+		</div>
+		<div class="line"></div>
+		<div class="math-btn flex-h flex-vc flex-hb">
+			<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>
+		<!-- 底部 -->
+		<div class="bottom flex-h flex-hb flex-vc">
+		<div class="left">
+			共
+			<span>{{addList.length}}</span>件，总金额:
+			<span>￥{{total_price}}</span>
+		</div>
+		<div class="skBtn" @click="launch(repair_order_id)">发起收款</div>
+		</div>
+	</div>
 </template>
 
 <script>
@@ -143,24 +173,27 @@ export default {
     name: 'charge',
     data () {
         return {
-            addList: [
-                {
-                    zl: '',
-                    mc: '',
-                    sl: '',
-                    zlSelect: false,
-                    mcSelect: false
-                }
-            ],
-            showPicker: false,
-            types: ['洁具', '木工类', '供暖类'],
-            type_name: '请选择',
-            hcName: ['水龙头', '桌子', '暖气管'],
-            hc_name: '请选择',
-            hcPicker: false,
-            hcNum: '',
-            repair_order_id: '',
-            order: ''
+            addList:[
+              {
+                zl:'',
+                mc:'',
+				sl:'',
+				price: '',
+				zlSelect:false,
+				mcSelect: false
+              }
+			],
+			showPicker: false,
+			types: [],
+			type_name: '请选择',
+			hcName: [],
+			hc_name: '请选择',
+			hcPicker: false,
+			hcNum: '',
+			repair_order_id: '',
+			order: '',
+			hcList: [],
+			total_price: 0,
         }
     },
     created () {
@@ -177,35 +210,56 @@ 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)
+            this.$http.get(this.$myApi.REPAIR_ORDER_DETAIL, curParams)
+                .then(res => {
+					this.order = res.order
+					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(() => {})
         },
-        showZl (index) {
-            this.addList[index].zlSelect = true
-        },
-        typeConfirm (value, index) {
-            this.addList[index].zl = value
-            this.addList[index].zlSelect = false
-        },
-        typeCancel (index) {
-            this.addList[index].zlSelect = false
-        },
-        showHc (index) {
-            this.addList[index].mcSelect = true
-        },
-        hcConfirm (value, index) {
-            this.addList[index].mc = value
-            this.addList[index].mcSelect = false
-        },
-        hcCancel () {
-            this.addList[index].mcSelect = false
-        },
+		showZl(index){
+			this.addList[index].zlSelect = true
+		},
+		typeConfirm(value, index) {
+			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
+		},
+		showHc(index){
+			this.addList[index].mcSelect = true
+		},
+		hcConfirm(value, index) {
+			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(index) {
+			this.addList[index].mcSelect = false
+		},
         addMeth () {
             this.addList.push({
                 zl: '',
@@ -215,10 +269,26 @@ export default {
                 mcSelect: false
             })
         },
-        delMeth (index) {
-            this.addList.splice(index, 1)
-        }
-    }
+        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>