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

pages/module/confirmOrder.vue

@@ -47,7 +47,7 @@
 					<image src="../../static/img/noimg.png" mode="" class="goodsImg" v-else></image>
 				</view>
 				<view class="goodsItemRight" >
-					<view class="goodsItemName">{{v.goodsName}}</view>
+					<view class="goodsItemName">{{v.showName}}</view>
 					<view class="goodsItemBottom">
 						<view class="goodssalePrice">￥{{v.salePrice?v.salePrice:'0.00'}}</view>
 						<view class="goodsNum">x{{v.qty}}</view>
@@ -57,7 +57,7 @@
 			<view class="goodsItem" v-for="(v,i) in item.listItem">
 				<view>
 					<image :src="v.picUrl" mode="" class="goodsImg" v-if="v.picUrl"></image>
-					<image src="../../static/img/noimg.png" mode="" class="goodsImg" v-else></image>
+					<image src="../../static/img/icon_xiangmu.png" mode="" class="goodsImg" v-else></image>
 				</view>
 				<view class="goodsItemRight" >
 					<view class="goodsItemName">{{v.itemName}}</view>
@@ -209,10 +209,13 @@ export default {
 			this.couponID=couponData.ID;
 			var ActMoney=couponData.ActMoney;
 			var payMoney=this.goodsMoney+this.itemMoney;
+			console.log('money',this.goodsMoney, this.itemMoney, payMoney);
 			if(payMoney<ActMoney){
-					this.couponMoney=payMoney
+					this.couponMoney=payMoney.toFixed(2)
+
 			}else{
-				this.couponMoney=ActMoney
+				this.couponMoney=ActMoney.toFixed(2)
+
 			}
 		
 		}

pages/module/goodsDetail.vue

@@ -52,7 +52,7 @@
 		 </view>
 		  <!-- 购物流程-->
 		  <!-- 详情-->
-		  <view class="goosDetal">
+		  <view class="goosDetal" v-if="MiniAppContent">
 		 		  <view class="goodsDetalTitle">详情</view>
 		 		  <rich-text :nodes="MiniAppContent" style="font-size: 0px;"></rich-text>
 		  </view>

pages/module/maintain.vue

@@ -73,7 +73,7 @@
 								</view>
 								<view class="goodsItemLIne" v-for="(v,i) in item.listItem"  >
 									 <image :src="v.picUrl" mode="" class="goodsImg" v-if="v.picUrl"></image>
-									 <image src="../../static/img/noimg.png" mode="" class="goodsImg sm" v-else></image>
+									 <image src="../../static/img/icon_xiangmu.png" mode="" class="goodsImg sm" v-else></image>
 									<view class="goodsCont">
 										<view class="goodsContTop">
 											<view class="goodsItemName">{{v.itemName}}</view>

pages/module/replaceGoods.vue

@@ -5,7 +5,7 @@
 				<view class="goodsItem" v-for="(v,i) in list" v-if='v.showr' @click="goGoods(v)">
 					<view>
 						<image :src="v.picUrl" mode="" class="goodsImg" v-if="v.picUrl"></image>
-						<image src="../../static/img/noimg.png" mode="" class="goodsImg" v-else></image>
+						<image src="../../static/img/icon_xiangmu.png" mode="" class="goodsImg" v-else></image>
 					</view>
 					<view class="goodsItemRight">
 						<view class="goodsItemName">{{v.showName}}</view>

pages/order/orderDetail.vue

@@ -175,7 +175,7 @@
 					<view class="detailedLine" v-for="(item,index) in orderData.items">
 						<view>
 							<image :src="item.Url" mode="" class="detailedImg" v-if="item.Url"></image>
-							<image src="../../static/img/noimg.png" mode="" class="detailedImg" v-else></image>
+							<image src="../../static/img/icon_xiangmu.png" mode="" class="detailedImg" v-else></image>
 						</view>
 						<view class="detailedCont">
 							<view class="detailedName">{{item.ItemName}}</view>