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

* 'master' of http://47.98.226.240:3000/twt/txCar:
  项目价格问题
  项目价格问题

pages/module/maintain.vue

@@ -81,7 +81,7 @@
 											<view class="goodsItemName">{{v.itemName}}</view>
 										</view>
 										<view class="goodsCOntBOttom">
-											<view class="salePrice" >￥{{v.salePrice?v.salePrice:0}}</view>
+											<view class="salePrice" >￥{{v.salePrice?v.salePrice:'-'}}</view>
 											<view class="itemNum">x1</view>
 										</view>
 									</view>
@@ -145,7 +145,7 @@
 								<view class="goodsItemRight" >
 									<view class="goodsItemName">{{v.itemName}}</view>
 									<view class="goodsItemBottom">
-										<view class="goodssalePrice">￥{{v.salePrice?v.salePrice:0}}</view>
+										<view class="goodssalePrice">￥{{v.salePrice?v.salePrice:'-'}}</view>
 										<view class="goodsNum">x{{v.qty}}</view>
 									</view>
 								</view>
@@ -365,9 +365,11 @@ export default {
 									}else{
 									   this.isNull=false
 							     	}
+									if(goods[0].salePrice==null){
+										this.isNull=false
+									}
 									obj.listGoodsAll.push(goods[0])
 									
-								
 								})
 								
 							}
@@ -387,6 +389,9 @@ export default {
 								}else{
 									this.isNull=false
 								}
+								if(xm.salePrice==null){
+									this.isNull=false
+								}
 								//xm.salePrice=1;
 								
 							})