1004749546@qq.com 4 years ago
parent
commit
2035142071
2 changed files with 17 additions and 3 deletions
  1. 1 0
      pages/index/index.vue
  2. 16 3
      pages/order/waitOrderDetail.vue

+ 1 - 0
pages/index/index.vue

@@ -67,6 +67,7 @@
 				<u-loadmore v-if="status=='loading'" :status="status" />
 				<u-loadmore v-if="status=='loading'" :status="status" />
 			</view>
 			</view>
 		</view>
 		</view>
+		
 		<!-- 筛选弹框 -->
 		<!-- 筛选弹框 -->
 		<search-modal v-if="openScreen" :visible="openScreen" :defaultParams="searchForm" @refresh="refresh" @close="openScreen=false"></search-modal>
 		<search-modal v-if="openScreen" :visible="openScreen" :defaultParams="searchForm" @refresh="refresh" @close="openScreen=false"></search-modal>
 	</view>
 	</view>

+ 16 - 3
pages/order/waitOrderDetail.vue

@@ -129,6 +129,18 @@
 					})
 					})
 				} 
 				} 
 				return total
 				return total
+			},
+			// 总重量
+			totalWeight() {
+				let total = 0
+				if(this.list.length){
+					this.list.map(item =>{
+						item.typeList.map(k =>{
+							total = total + k.rubbishWeight
+						})
+					})
+				} 
+				return total
 			}
 			}
 		},
 		},
 		methods: {
 		methods: {
@@ -214,9 +226,9 @@
 							let p = {
 							let p = {
 								rubbishType: item.typeCode,   //垃圾大类型
 								rubbishType: item.typeCode,   //垃圾大类型
 								rubbishTypeItem: k.code, //   垃圾细分类型
 								rubbishTypeItem: k.code, //   垃圾细分类型
-								rubbishWeight: k.rubbishWeight, //   垃圾重量(克)
-								rubbishPrice: k.rubbishPrice, //   单价
-								totalAmount: k.rubbishWeight* k.rubbishPrice // 总价金额
+								rubbishWeight: k.rubbishWeight*1000, //   垃圾重量(克)
+								rubbishPrice: k.customerPrice, //   单价
+								totalAmount: k.rubbishWeight* k.customerPrice // 总价金额
 							}
 							}
 							arr.push(p)
 							arr.push(p)
 						}
 						}
@@ -239,6 +251,7 @@
 				let params = {
 				let params = {
 					"payType": this.payType, //支付方式
 					"payType": this.payType, //支付方式
 					originalAmount: this.originalAmount, // 支付总金额
 					originalAmount: this.originalAmount, // 支付总金额
+					totalWeight: this.totalWeight*1000, // 总重量(g)
 					contactName:  this.orderInfo.contactName,  //联系人姓名
 					contactName:  this.orderInfo.contactName,  //联系人姓名
 					contactMobile:  this.orderInfo.contactMobile, //联系人手机号
 					contactMobile:  this.orderInfo.contactMobile, //联系人手机号
 					contactAddress:  this.orderInfo.contactAddress,//联系人地址
 					contactAddress:  this.orderInfo.contactAddress,//联系人地址