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

* 'master' of http://47.98.226.240:3000/twt/txCar:
  11
  价格

pages/module/goodsDetail.vue

@@ -17,10 +17,11 @@
 						</swiper-item>
 					   
 		 			 </swiper>
-		 		
 		 		 </view>
 		 		 <view class="priceBox">
-		 			 <span class="price1">￥{{goodsData.salePrice}}</span>
+		 			 <span class="price1">￥ <span v-if="goodsData.salePrice"> {{goodsData.salePrice}}</span>
+					 <span v-else> - </span>
+					 </span>
 		 		 </view>
 		 		 <view class="goodsName">
 		 			{{goodsData.ShowName}}

pages/module/maintain.vue

@@ -483,6 +483,14 @@ export default {
 			})
 		},
 		settlement(){
+			if(!this.isNull){
+				uni.showToast({
+				     title: '您选择的有未设置价格的商品，请重新选择',
+				 	 icon:'none',
+				     duration: 5000
+				 });
+				return false;
+			}
 			console.log(this.orderData)
 			//return false;
 			 uni.removeStorageSync('couponData');