Merge branch 'master' of http://git.jihengcc.cn/liubaiyan/qjd-user-uniapp

pages.json

@@ -111,12 +111,14 @@
 			"path": "entrustList",
 			"style": {
 				"navigationBarTitleText": "委托列表",
-				"enablePullDownRefresh": true
+				"enablePullDownRefresh": true,
+				"backgroundColor": "#f7f7f7"
 			}
 		}, {
 			"path": "entrustForm",
 			"style": {
-				"navigationBarTitleText": "发布委托"
+				"navigationBarTitleText": "发布委托",
+				"backgroundColor": "#f7f7f7"
 			}
 		}, {
 			"path": "addressList",
@@ -127,7 +129,8 @@
 		}, {
 			"path": "addressForm",
 			"style": {
-				"navigationBarTitleText": "新增地址"
+				"navigationBarTitleText": "新增地址",
+				"backgroundColor": "#f7f7f7"
 			}
 		}, {
 			"path": "couponList",
@@ -152,7 +155,8 @@
 		}, {
 			"path": "orderDetail",
 			"style": {
-				"navigationBarTitleText": "订单详情"
+				"navigationBarTitleText": "订单详情",
+				"backgroundColor": "#f7f7f7"
 			}
 		}, {
 			"path": "logisticsDeatil",

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/goodDetails.vue

@@ -495,7 +495,7 @@
 			.tab-col-active {
 				font-size: 15px;
 				color: #343434;
-				border-bottom: 1px solid #52A63A;
+				border-bottom: 2px solid #52A63A;
 			}
 		}
 

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() {

pagesGood/orderPay.vue

@@ -253,6 +253,7 @@
 						type: 'warning',
 					})
 				} else {
+					let paySum = this.orderType == 1 ? this.getAllGoodsPrice() : this.paySum
 					NET.request(API.submitOrder, {
 						//  会员
 						mid: this.userData.userId,
@@ -299,6 +300,19 @@
 						if (res.isSuccess) {
 							if (res.data) {
 								this.orderId = res.data.orderId
+								debugger
+								if (paySum == '0.00') {
+								    this.$refs.uTips.show({
+								    	title: '购买成功',
+								    	type: 'success',
+								    })
+								    setTimeout(() => {
+								    	uni.redirectTo({
+								    	    url: '/pagesMain/orderDetail?orderId=' + this.orderId + '&orderStatus=' + 1
+								    	});
+								    }, 1000)
+									return;
+								}
 								uni.requestPayment({
 									provider: 'wxpay',
 									timeStamp: res.data.timeStamp,

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>
@@ -134,6 +134,11 @@
 	}
 </script>
 
+<style>
+	page {
+		background-color: #f7f7f7;
+	}
+</style>
 <style lang="less" scoped>
 	page {
 		width: 100%;

pagesMain/couponList.vue

@@ -6,6 +6,7 @@
 		</view>
 		<view class="coupon-box" v-if="tabIndex == 0">
 			<view class="coupon-row" v-for="(site, index2) in couponList1" :key="index2">
+				<view class="coupon-mask" v-if="site.status == 0"></view>
 				<view class="coupon-left">
 					<view class="coupon-left-price"><text style="font-size: 16px;">￥</text>{{site.discountAmount}}</view>
 					<view class="coupon-left-text">满减金额</view>

pagesMain/entrustForm.vue

@@ -60,7 +60,6 @@
 			this.entrustForm.productName = options.productName
 			this.entrustForm.tenantCode = options.tenantCode
 			this.entrustForm.areaSize = options.areaSize
-			debugger
 			this.getPrice()
 		},
 		methods: {
@@ -86,7 +85,6 @@
 			},
 			//  支付
 			toPay() {
-				debugger
 				if (!this.entrustForm.remarks) {
 					this.$refs.uTips.show({
 						title: '请填写备注信息',
@@ -157,12 +155,14 @@
 	}
 </script>
 
-<style lang="less" scoped>
+<style>
 	page {
 		width: 100%;
 		height: 100%;
+		background-color: #f7f7f7;
 	}
-
+</style>
+<style lang="less" scoped>
 	.container {
 		width: 100%;
 		height: 100%;
@@ -172,7 +172,7 @@
 		padding-bottom: 70px;
 		overflow-y: auto;
 
-		.address-form {
+		.entrust-form {
 			width: 100%;
 			float: left;
 			box-sizing: border-box;
@@ -206,7 +206,15 @@
 			left: 15px;
 
 			.handle-custom {
-				background-color: #51A539;
+				background-color: #56a83a;
+				
+				/deep/button {
+					background-color: #56a83a;
+				}
+
+				/deep/.u-btn--success--disabled {
+					background-color: #74bd60 !important;
+				}
 			}
 		}
 	}

pagesMain/entrustList.vue

@@ -1,5 +1,5 @@
 <template>
-	<scroll-view class="container" :style="{backgroundColor: entrustTotle ? '#f7f7f7' : '#FFFFFF'}" scroll-y="true" @scrolltolower="handleLoadMore()">
+	<scroll-view class="container" :style="{backgroundColor: entrustTotle ? '#f7f7f7' : '#f7f7f7'}" scroll-y="true" @scrolltolower="handleLoadMore()">
 		<view class="entrust-info">
 			<view class="entrust-info-text">共{{entrustTotle}}个委托订单</view>
 		</view>

pagesMain/evaluateForm.vue

@@ -162,6 +162,14 @@
 
 			.handle-custom {
 				background-color: #51A539;
+
+				/deep/button {
+					background-color: #56a83a;
+				}
+
+				/deep/.u-btn--success--disabled {
+					background-color: #74bd60 !important;
+				}
 			}
 		}
 	}

pagesMain/messageForm.vue

@@ -131,6 +131,14 @@
 
 			.handle-custom {
 				background-color: #51A539;
+
+				/deep/button {
+					background-color: #56a83a;
+				}
+
+				/deep/.u-btn--success--disabled {
+					background-color: #74bd60 !important;
+				}
 			}
 		}
 	}

pagesMain/messageList.vue

@@ -188,6 +188,14 @@
 
 			.handle-custom {
 				background-color: #51A539;
+
+				/deep/button {
+					background-color: #56a83a;
+				}
+
+				/deep/.u-btn--success--disabled {
+					background-color: #74bd60 !important;
+				}
 			}
 		}
 	}

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>
@@ -125,8 +125,7 @@
 	const NET = require('@/utils/request')
 	const API = require('@/config/api')
 	export default {
-		components: {
-		},
+		components: {},
 		data() {
 			return {
 				orderType: {
@@ -174,17 +173,18 @@
 				this.orderData = res.data
 				if (this.orderData.addOrderTime) {
 					let tempTime = new Date(this.orderData.addOrderTime).getTime()
-					let addTempTime = new Date(tempTime + 1000*60*60*24)
+					let addTempTime = new Date(tempTime + 1000 * 60 * 60 * 24)
 					let addYear = addTempTime.getFullYear()
-					let addMonth = addTempTime.getMonth()+1
+					let addMonth = addTempTime.getMonth() + 1
 					let addDay = addTempTime.getDate()
 					let addHours = addTempTime.getHours()
 					let addMin = addTempTime.getMinutes()
 					let addSeconds = addTempTime.getSeconds()
-					this.orderData.overTime = addYear + '年' + addMonth + '月' + addDay + '日' + addHours + ':' + addMin + ':' + addSeconds
-				    // this.orderData.tempTimeArr = this.orderData.addOrderTime.split(' ')
-				    // let tempDate = new Date(this.orderData.tempTimeArr[0].replace(/-/g, "/"))
-				    // this.orderData.overTime = new Date(tempDate.setDate(tempDate.getDate() + 1))
+					this.orderData.overTime = addYear + '年' + addMonth + '月' + addDay + '日' + addHours + ':' + addMin + ':' +
+						addSeconds
+					// this.orderData.tempTimeArr = this.orderData.addOrderTime.split(' ')
+					// let tempDate = new Date(this.orderData.tempTimeArr[0].replace(/-/g, "/"))
+					// this.orderData.overTime = new Date(tempDate.setDate(tempDate.getDate() + 1))
 				}
 				if (this.orderData.merchantInfoResVO.products.length && this.orderData.merchantInfoResVO.products[0].productType !=
 					2 && this.orderData.merchantInfoResVO.products[0].productType != 4) {
@@ -211,18 +211,18 @@
 						})
 						if (!someVaule) {
 							if (this.orderData.merchantInfoResVO.products.every(v => {
-								Number(v.productType)
-								return v.productType == 3
-							})) {
-							    this.buttonGroup = [{
-							    	text: '申请售后',
-							    	backgroundColor: '#75BD60',
-							    	color: '#fff'
-							    }, {
-							    	text: '自助采摘',
-							    	backgroundColor: '#52A63A',
-							    	color: '#fff'
-							    }]
+									Number(v.productType)
+									return v.productType == 3
+								})) {
+								this.buttonGroup = [{
+									text: '申请售后',
+									backgroundColor: '#75BD60',
+									color: '#fff'
+								}, {
+									text: '自助采摘',
+									backgroundColor: '#52A63A',
+									color: '#fff'
+								}]
 							} else {
 								this.buttonGroup = [{
 									text: '申请售后',
@@ -483,6 +483,11 @@
 		}
 	}
 </script>
+<style>
+	page {
+		background-color: #f7f7f7;
+	}
+</style>
 <style lang="less" scoped>
 	page {
 		width: 100%;

pagesMain/orderItem.vue

@@ -24,20 +24,20 @@
 		</view>
 		<view class="pay-info">总价￥{{getAllPrice()}}，实付￥{{orderData.paySum}}</view>
 		<view class="handle-box" v-if="tabIndex > 1">
-			<view size="medium" class="handle-button"
-			 v-if="tabIndex == 2" @click.stop="handleOrder(1)">取消订单</view>
-			<view size="medium" class="handle-button"
-			 v-if="tabIndex == 2" @click.stop="handleOrder(2)">立即支付</view>
+			<u-button size="medium" :plain="true" type="success" shape="circle" :ripple="true" :hair-line="false" class="handle-button"
+			 v-if="tabIndex == 2" @click.stop="handleOrder(1)">取消订单</u-button>
+			<u-button size="medium" :plain="true" type="success" shape="circle" :ripple="true" :hair-line="false" class="handle-button"
+			 v-if="tabIndex == 2" @click.stop="handleOrder(2)">立即支付</u-button>
 			<!-- <u-button size="medium" :plain="true" type="success" shape="circle" :ripple="true" :hair-line="false" class="handle-button"
 			 v-if="tabIndex != 1 && tabIndex != 2" @click.stop="handleOrder(3)">申请售后</u-button> -->
-			<view size="medium" class="handle-button"
-			 v-if="tabIndex == 3 && pickHandle" @click.stop="handleOrder(4)">自助采摘</view>
-			<view size="medium" class="handle-button"
-			 v-if="tabIndex == 4" @click.stop="handleOrder(5)">确认收货</view>
-			<view size="medium" class="handle-button"
-			 v-if="tabIndex == 4" @click.stop="handleOrder(6)">追踪物流</view>
-			<view size="medium" class="handle-button"
-			 v-if="tabIndex == 5 && orderData.evaluateStatus == 1" @click.stop="handleOrder(7)">评价</view>
+			<u-button size="medium" :plain="true" type="success" shape="circle" :ripple="true" :hair-line="false" class="handle-button"
+			 v-if="tabIndex == 3 && pickHandle" @click.stop="handleOrder(4)">自助采摘</u-button>
+			<u-button size="medium" :plain="true" type="success" shape="circle" :ripple="true" :hair-line="false" class="handle-button"
+			 v-if="tabIndex == 4" @click.stop="handleOrder(5)">确认收货</u-button>
+			<u-button size="medium" :plain="true" type="success" shape="circle" :ripple="true" :hair-line="false" class="handle-button"
+			 v-if="tabIndex == 4" @click.stop="handleOrder(6)">追踪物流</u-button>
+			<u-button size="medium" :plain="true" type="success" shape="circle" :ripple="true" :hair-line="false" class="handle-button"
+			 v-if="tabIndex == 5 && orderData.evaluateStatus == 1" @click.stop="handleOrder(7)">评价</u-button>
 		</view>
 		<u-modal v-model="modalShow" :content="modalContent" @confirm="submitHandle" :async-close="true" :show-cancel-button="true"></u-modal>
 		<u-top-tips ref="uTips"></u-top-tips>
@@ -86,7 +86,7 @@
 			}
 		},
 		onReady() {
-			this.pickHandle = this.orderData.products.filter(site=> site.productType == 3).length > 0
+			this.pickHandle = this.orderData.products.filter(site => site.productType == 3).length > 0
 		},
 		methods: {
 			//  跳转商铺
@@ -411,11 +411,6 @@
 
 			.handle-button {
 				height: 30px;
-				width: 75px;
-				color: #333333 !important;
-				border: 1px solid #BFBFBF !important;
-				background-color: #FFFFFF !important;
-				padding: 0 10px;
 				margin-left: 8px;
 				margin-bottom: 10px;
 				line-height: 28px;
@@ -423,6 +418,13 @@
 				box-sizing: border-box;
 				display: inline-block;
 				border-radius: 15px;
+
+				/deep/button {
+					padding: 0 12px;
+					border: 1px solid #BFBFBF !important;
+					background-color: #FFFFFF!important;
+					color: #333333 !important;
+				}
 			}
 		}
 	}