Merge branch 'master' of http://47.98.226.240:3000/twt/txCar

* 'master' of http://47.98.226.240:3000/twt/txCar:
  订单
  Update .gitignore
  gitignor
  下单价格

.gitignore

@@ -1 +1,2 @@
-unpackage/
+unpackage/*
+dist/

pages/module/confirmOrder.vue

@@ -310,13 +310,12 @@ export default {
 			  itemCount:this.itemCount,
 			  couponMoney:this.couponMoney,
 			  couponID:this.couponID,
-			 // payMoney:this.payMoney,
-			  payMoney:0.01,
+			  payMoney:this.payMoney,
+			  //payMoney:0.01,
 			  packJsonArr:JSON.stringify(this.packJsonArr) ,
 			  shopID:this.orderShop.shopId,
 			 // unionID:this.orderShop.unionId,
 			 },'POST').then(res => {
-				 
 				  if(res.code==0){
 					   if(this.payMoney==0){
 						    uni.hideLoading();

pages/module/maintain.vue

@@ -298,11 +298,11 @@ export default {
 							}
 							if(i.listGoodsAll.length>0){
 								i.listGoodsAll.forEach((goods,goodsIndex)=>{
-									 goods.forEach(sp=>{
+									/* goods.forEach(sp=>{
 									    this.goodsTotal=Number(this.goodsTotal)
 										this.goodsTotal+=sp.salePrice*sp.qty
 										this.goodsTotal=this.goodsTotal.toFixed(2) 
-									}) 
+									}) */
 									//goods[0].salePrice=1;
 									this.goodsTotal=Number(this.goodsTotal)
 									this.goodsTotal+=goods[0].salePrice*goods[0].qty