bug修复

pagesGood/auctionDetail.vue

@@ -29,7 +29,7 @@
 				<view class="auction-point"></view>
 				<view class="auction-title" v-if="item.nickname || item.paySum">
 					<text class="auction-name" v-if="item.nickname">{{item.nickname}}出价：</text>
-					<text class="auction-price" v-if="item.paySum">￥{{item.paySum}}</text>
+					<text class="auction-price" v-if="item.paySum">￥{{item.paySum.slice(0,)}}</text>
 				</view>
 				<text class="auction-date" v-if="item.payTime">{{item.payTime}}</text>
 			</view>
@@ -93,6 +93,7 @@
 						auctionEndTime: res.data.auctionEndTime,
 					}
 					this.auctionBaseList[1].payTime = '竞拍截止时间：' + res.data.auctionEndTime
+					this.auctionBaseList[2].payTime = '竞拍于 '+res.data.auctionStartTime +' 正式开始!'
 					this.auctionList = res.data.userPriceResVOs.concat(this.auctionBaseList)
 					if (this.price <= this.goodData.currentPrice + this.goodData.auctionMinAddPrice) {
 						this.price = this.goodData.currentPrice + this.goodData.auctionMinAddPrice

pagesGood/liveDetail.vue

@@ -69,21 +69,23 @@
 				btn_top:0,
 				title:"888",
 				user_name:'1',
-				head_img:"../static/images/loginLogo.png"
+				head_img:"../static/images/loginLogo.png",
+				liveId: ''
 			}
 		},
 		onLoad(options) {
 			this.videoType = options.videoType
 			this.roomID = options.roomId
 			this.userID = "1323565280579813376"
-			NET.request(API.getLiveGoodsDetail + options.liveId, {}, 'GET').then(res => {
-				this.goodsList = res.data
-			}).catch(res => {
-				this.$refs.uTips.show({
-					title: '获取商品列表失败',
-					type: 'warning',
-				})
-			})
+			this.liveId = options.liveId
+			// NET.request(API.getLiveGoodsDetail + options.liveId, {}, 'GET').then(res => {
+			// 	this.goodsList = res.data
+			// }).catch(res => {
+			// 	this.$refs.uTips.show({
+			// 		title: '获取商品列表失败',
+			// 		type: 'warning',
+			// 	})
+			// })
 		},
 		onReady() {
 			let menuButtonObject = wx.getMenuButtonBoundingClientRect();
@@ -114,6 +116,14 @@
 			//  打开弹窗
 			showGoods() {
 				this.$refs.popup.open()
+				NET.request(API.getLiveGoodsDetail + this.liveId, {}, 'GET').then(res => {
+					this.goodsList = res.data
+				}).catch(res => {
+					this.$refs.uTips.show({
+						title: '获取商品列表失败',
+						type: 'warning',
+					})
+				})
 			},
 			//  关闭弹窗
 			closeGoods() {

pagesMain/addressForm.vue

@@ -21,7 +21,7 @@
 			</u-cell-group>
 		</view>
 		<view class="address-handle">
-			<u-button type="success" shape="circle" :ripple="true" @click="submitData" class="handle-custom" :disabled="!addressData.username || !addressData.phone || !addressData.address || !addressData.province ||!addressData.tag">保存</u-button>
+			<u-button type="success" shape="circle" :ripple="true" @click="submitData" class="handle-custom" :disabled="!addressData.username || !addressData.phone || !addressData.address || !addressData.province">保存</u-button>
 		</view>
 		<u-picker mode="region" v-model="regionShow" :area-code="defaultRegion" @confirm="setRegion"></u-picker>
 		<u-picker mode="selector" v-model="tagShow" :range="tagList" @confirm="setTag"></u-picker>

pagesMain/orderDetail.vue

@@ -61,7 +61,7 @@
 			</view>
 			<view class="info-content-box">
 				<view class="message-row" v-for="(item, index1) in orderData.leas" :key="index1">
-					<image class="message-head" :src="item.imgUrl" mode="aspectFill"></image>
+					<image class="message-head" :src="orderData.merchantInfoResVO.headImg" mode="aspectFill"></image>
 					<view class="message-info-box">
 						<view class="message-name">{{item.leaMsgType}}</view>
 						<view class="message-date">{{item.leaMsgTime}}</view>