Signed-off-by: liuboyan <632697560@qq.com>

bug

pages/index/index.vue

@@ -33,7 +33,8 @@
 					</view>
 				</view>
 				<view v-if="!liveTelecast.imgUrl">暂无直播</view>
-				<image class="video-img" :style="{height: (swiperHeight-30-12)+'px'}" :src="liveTelecast.imgUrl" v-if="liveTelecast" mode="aspectFill"></image>
+				<image class="video-img" :style="{height: (swiperHeight-30-12)+'px'}" :src="liveTelecast.imgUrl" v-if="liveTelecast"
+				 mode="aspectFill"></image>
 				<view class="video-name" v-if="liveTelecast">{{liveTelecast.liveName}}</view>
 			</view>
 			<view class="video-col" style="margin-left: 11px;" @click="goToLiveList(2)">
@@ -43,15 +44,16 @@
 					</view>
 				</view>
 				<view v-if="!shortVideo.coverUrl">暂无短视频</view>
-				<image class="video-img" :style="{height: (swiperHeight-30-12)+'px'}" :src="shortVideo.coverUrl" mode="aspectFill" v-if="shortVideo"></image>
+				<image class="video-img" :style="{height: (swiperHeight-30-12)+'px'}" :src="shortVideo.coverUrl" mode="aspectFill"
+				 v-if="shortVideo"></image>
 				<view class="video-name" v-if="shortVideo">{{shortVideo.videoName}}</view>
 			</view>
 		</view>
 		<view class="index-title">
 			<view class="title-text" @click="goToGoodList(null, 5)">今日特惠
-			    <view class="circular">
-			    	<text class="iconfont iconfangxiang"></text>
-			    </view>
+				<view class="circular">
+					<text class="iconfont iconfangxiang"></text>
+				</view>
 			</view>
 			<view class="title-tip">精品特价，限量抢购</view>
 		</view>
@@ -96,8 +98,8 @@
 	export default {
 		data() {
 			return {
-				liveTelecast: null,
-				shortVideo: null,
+				liveTelecast: {},
+				shortVideo: {},
 				advertList: [],
 				discountList: [],
 				goodsList: [],
@@ -288,6 +290,7 @@
 				font-size: 15px;
 				font-family: PingFang SC;
 				color: #56a83a;
+
 				.circular {
 					width: 16px;
 					height: 16px;
@@ -296,7 +299,7 @@
 					margin-left: 6px;
 					text-align: right;
 					display: inline-grid;
-				
+
 					.iconfont {
 						font-size: 14px;
 						color: #FFFFFF;

pagesMain/orderDetail.vue

@@ -101,7 +101,8 @@
 						</view>
 						<view class="assess-text">{{orderData.evaluateResVO.evaluateContent ? orderData.evaluateResVO.evaluateContent : '暂无评价'}}</view>
 						<view class="assess-img-box">
-							<image class="img-col" mode="aspectFill" :src="item.imgUrl" v-for="(item,i) in orderData.evaluateResVO.evaluateImgs" :key="i" @tap="_previewImage(item.imgUrl,i)"></image>
+							<image class="img-col" mode="aspectFill" :src="item.imgUrl" v-for="(item,i) in orderData.evaluateResVO.evaluateImgs"
+							 :key="i" @tap="_previewImage(item.imgUrl,i)"></image>
 						</view>
 					</view>
 					<view class="shop-reply-box" v-if="orderData.evaluateResVO.replyContent">
@@ -115,7 +116,7 @@
 			</view>
 		</view>
 		<!-- </view> -->
-		<uni-goods-nav :fill="true" :options="[]" @click="" @buttonClick="orderHandle" class="order-handle" :buttonGroup="buttonGroup"/>
+		<uni-goods-nav :fill="true" :options="[]" @click="" @buttonClick="orderHandle" class="order-handle" :buttonGroup="buttonGroup" />
 		<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>
 		<view class="uni-popup-dialog" :hidden="show_qx">
@@ -130,7 +131,7 @@
 					设置权限
 				</button>
 			</view>
-		
+
 		</view>
 		<view class="qx_bg" :hidden="show_qx">
 		</view>
@@ -144,7 +145,7 @@
 		components: {},
 		data() {
 			return {
-				show_qx:true,
+				show_qx: true,
 				orderType: {
 					title: '',
 					text: '',
@@ -159,6 +160,7 @@
 						supplierName: '',
 						products: [],
 					},
+					evaluateResVO: {},
 					orderSum: 0,
 					integralAmount: 0,
 					couponDiscountAmount: 0,
@@ -205,11 +207,16 @@
 				}
 				// 1是普通商品类型；3是包含自助采摘+普通商品的类型；2是拍卖、共享种植
 				if (this.orderData.merchantInfoResVO.products.length) {
-					if (this.orderData.merchantInfoResVO.products.every(v=>{return (v.productType == 1)})) {
+					if (this.orderData.merchantInfoResVO.products.every(v => {
+							return (v.productType == 1)
+						})) {
 						this.goodType = 1
-					} else if (this.orderData.merchantInfoResVO.products.some(v=>{return(v.productType == 3)})) {
+					} else if (this.orderData.merchantInfoResVO.products.some(v => {
+							return (v.productType == 3)
+						})) {
 						this.goodType = 3
-					} else if (this.orderData.merchantInfoResVO.products[0].productType == 2 || this.orderData.merchantInfoResVO.products[0].productType == 4) {
+					} else if (this.orderData.merchantInfoResVO.products[0].productType == 2 || this.orderData.merchantInfoResVO.products[
+							0].productType == 4) {
 						this.goodType = 2
 					}
 				}
@@ -226,7 +233,7 @@
 				// }
 				switch (JSON.stringify(this.orderData.orderStatus)) {
 					case '1':
-					    if (this.goodType == 3) {
+						if (this.goodType == 3) {
 							this.buttonGroup = [{
 								text: '取消订单',
 								backgroundColor: '#75BD60',
@@ -306,15 +313,15 @@
 								Number(v.productType)
 								return v.productType == 4
 							})) {
-								this.buttonGroup = [{
-									text: '申请售后',
-									backgroundColor: '#75BD60',
-									color: '#fff'
-								}, {
-									text: '我的种植',
-									backgroundColor: '#52A63A',
-									color: '#fff'
-								}]
+							this.buttonGroup = [{
+								text: '申请售后',
+								backgroundColor: '#75BD60',
+								color: '#fff'
+							}, {
+								text: '我的种植',
+								backgroundColor: '#52A63A',
+								color: '#fff'
+							}]
 						} else {
 							this.buttonGroup = [{
 								text: '申请售后',
@@ -331,12 +338,12 @@
 						}]
 				}
 				if (this.orderData.orderStatus == 4 && this.orderData.evaluateReplyStatus == 1) {
-					if (this.orderData.orderType !=3 && this.orderData.orderType !=4)
-					this.buttonGroup.push({
-						text: '评价',
-						backgroundColor: '#52A63A',
-						color: '#fff'
-					})
+					if (this.orderData.orderType != 3 && this.orderData.orderType != 4)
+						this.buttonGroup.push({
+							text: '评价',
+							backgroundColor: '#52A63A',
+							color: '#fff'
+						})
 				}
 				this.getOrderType()
 			}).catch(error => {
@@ -349,8 +356,8 @@
 		},
 		onShow() {},
 		methods: {
-			closeSetting:function(){
-				this.show_qx=true;
+			closeSetting: function() {
+				this.show_qx = true;
 			},
 			//  获取订单类型
 			getOrderType() {
@@ -402,13 +409,13 @@
 							}
 							break;
 						case 2:
-						    switch (this.orderData.orderStatus) {
-						    	case 2:
-						    		this.orderType = {
-						    			title: '竞拍成功-等待卖家发货',
-						    			text: '您的商品正在打包等待发货',
-						    		}
-						    		break;
+							switch (this.orderData.orderStatus) {
+								case 2:
+									this.orderType = {
+										title: '竞拍成功-等待卖家发货',
+										text: '您的商品正在打包等待发货',
+									}
+									break;
 								case 3:
 									this.orderType = {
 										title: '竞拍成功-等待商品送达',
@@ -490,7 +497,8 @@
 							if (e.index == 1 && this.goodType == 2) {
 								//  去我的种植
 								uni.navigateTo({
-									url: '/pagesGood/goodDetails?minePlant=true&goodId=' + this.orderData.merchantInfoResVO.products[0].productId + '&orderId=' + this.orderData.orderId
+									url: '/pagesGood/goodDetails?minePlant=true&goodId=' + this.orderData.merchantInfoResVO.products[0].productId +
+										'&orderId=' + this.orderData.orderId
 								});
 							} else {
 								//  评价
@@ -543,12 +551,12 @@
 						mid: uni.getStorageSync("userData").userId,
 						orderCode: this.orderData.orderCode,
 						orderId: this.orderData.orderId,
-					    // #ifdef APP-PLUS
+						// #ifdef APP-PLUS
 						channel: 2
-					    //#endif
+						//#endif
 					}, 'POST').then(res => {
 						this.modalShow = false
-					// #ifdef MP-WEIXIN
+						// #ifdef MP-WEIXIN
 						uni.requestPayment({
 							provider: 'wxpay',
 							timeStamp: res.data.timeStamp,
@@ -563,9 +571,9 @@
 								// 		url: '/pagesMain/paySuccess?orderId=' + this.orderData.orderId + '&goodType=' + this.goodType + '&tenantCode=' + this.orderData.tenantCode
 								// 	});
 								// } else {
-									uni.navigateTo({
-										url: '/pagesMain/paySuccess?orderId=' + this.orderData.orderId
-									});
+								uni.navigateTo({
+									url: '/pagesMain/paySuccess?orderId=' + this.orderData.orderId
+								});
 								// }
 							},
 							fail: (error) => {
@@ -576,35 +584,35 @@
 								})
 							}
 						})
-					//#endif
-					
-					// #ifdef APP-PLUS
-					    uni.requestPayment({
-					    	provider: 'wxpay',
-					    	orderInfo:{
-					    		"package": res.data.packageValue,
-					    		"appid": res.data.appId,
-					    		"sign": res.data.paySign,
-					    		"partnerid": res.data.partnerId,
-					    		"prepayid": res.data.prepayId,
-					    		"noncestr": res.data.nonceStr,
-					    		"timestamp": res.data.timeStamp,
-					    	},
-					    	success: (payRes) => {
-					    		console.log('success:' + JSON.stringify(payRes));
-					    			uni.navigateTo({
-					    				url: '/pagesMain/paySuccess?orderId=' + this.orderData.orderId
-					    			});
-					    	},
-					    	fail: (error) => {
-					    		console.log('fail:' + JSON.stringify(error));
-					    		this.$refs.uTips.show({
-					    			title: '支付失败',
-					    			type: 'warning',
-					    		})
-					    	}
-					    })
-					// #endif
+						//#endif
+
+						// #ifdef APP-PLUS
+						uni.requestPayment({
+							provider: 'wxpay',
+							orderInfo: {
+								"package": res.data.packageValue,
+								"appid": res.data.appId,
+								"sign": res.data.paySign,
+								"partnerid": res.data.partnerId,
+								"prepayid": res.data.prepayId,
+								"noncestr": res.data.nonceStr,
+								"timestamp": res.data.timeStamp,
+							},
+							success: (payRes) => {
+								console.log('success:' + JSON.stringify(payRes));
+								uni.navigateTo({
+									url: '/pagesMain/paySuccess?orderId=' + this.orderData.orderId
+								});
+							},
+							fail: (error) => {
+								console.log('fail:' + JSON.stringify(error));
+								this.$refs.uTips.show({
+									title: '支付失败',
+									type: 'warning',
+								})
+							}
+						})
+						// #endif
 					}).catch(error => {
 						this.modalShow = false
 						this.$refs.uTips.show({
@@ -643,8 +651,8 @@
 			},
 			// 跳转自助采摘直播
 			goPickVideo() {
-				var that=this;
-				if(uni.getStorageSync("firstTimeLiveUser")==""){
+				var that = this;
+				if (uni.getStorageSync("firstTimeLiveUser") == "") {
 					uni.setStorage({
 						key: 'firstTimeLiveUser',
 						data: 1
@@ -652,20 +660,20 @@
 					uni.navigateTo({
 						url: '/pagesGood/pickVideo?orderId=' + that.orderData.orderId + '&tenantCode=' + that.orderData.tenantCode
 					});
-				}else{
+				} else {
 					wx.getSetting({
-					  success(res) {
-						/*if (!res.authSetting['scope.camera']){
-						  that.show_qx=false;
-						}else*/ 
-						if (!res.authSetting['scope.record']){
-						  that.show_qx=false;
-						}else{
-							uni.navigateTo({
-								url: '/pagesGood/pickVideo?orderId=' + that.orderData.orderId + '&tenantCode=' + that.orderData.tenantCode
-							});
+						success(res) {
+							/*if (!res.authSetting['scope.camera']){
+							  that.show_qx=false;
+							}else*/
+							if (!res.authSetting['scope.record']) {
+								that.show_qx = false;
+							} else {
+								uni.navigateTo({
+									url: '/pagesGood/pickVideo?orderId=' + that.orderData.orderId + '&tenantCode=' + that.orderData.tenantCode
+								});
+							}
 						}
-					  }
 					})
 				}
 			},
@@ -686,7 +694,7 @@
 				}
 			},
 			// 图片预览
-			_previewImage(image,index) {
+			_previewImage(image, index) {
 				var imgArr = [];
 				imgArr.push(image);
 				//预览图片
@@ -694,7 +702,7 @@
 					urls: imgArr,
 					current: imgArr[index]
 				});
-			} 
+			}
 		}
 	}
 </script>
@@ -1241,9 +1249,10 @@
 			border-top: 1px solid #cccccc;
 			position: fixed;
 			bottom: 0;
-			left:0;
+			left: 0;
 		}
 	}
+
 	.uni-popup-dialog {
 		width: 80vw;
 		border-radius: 15px;
@@ -1253,7 +1262,7 @@
 		top: 34vh;
 		z-index: 1001;
 	}
-	
+
 	.uni-dialog-title {
 		/* #ifndef APP-NVUE */
 		display: flex;
@@ -1263,12 +1272,12 @@
 		padding-top: 15px;
 		padding-bottom: 5px;
 	}
-	
+
 	.uni-dialog-title-text {
 		font-size: 16px;
 		font-weight: 500;
 	}
-	
+
 	.uni-dialog-content {
 		/* #ifndef APP-NVUE */
 		display: flex;
@@ -1279,12 +1288,12 @@
 		padding: 5px 15px 15px 15px;
 		text-align: center;
 	}
-	
+
 	.uni-dialog-content-text {
 		font-size: 14px;
 		color: #6e6e6e;
 	}
-	
+
 	.uni-dialog-button-group {
 		/* #ifndef APP-NVUE */
 		display: flex;
@@ -1294,55 +1303,56 @@
 		border-top-style: solid;
 		border-top-width: 1px;
 	}
-	
+
 	.uni-dialog-button {
 		/* #ifndef APP-NVUE */
 		display: flex;
 		/* #endif */
-		    background: rgba(0, 0, 0, 0);
-		    border: none;
+		background: rgba(0, 0, 0, 0);
+		border: none;
 		flex: 1;
 		flex-direction: row;
 		justify-content: center;
 		align-items: center;
 		height: 45px;
 	}
-	
+
 	.uni-border-left {
 		border-left-color: #f0f0f0;
 		border-left-style: solid;
 		border-left-width: 0px;
 	}
-	
+
 	.uni-dialog-button-text {
 		font-size: 14px;
 	}
-	
+
 	.uni-button-color {
 		color: #007aff;
 	}
-	
+
 	.uni-dialog-input {
 		flex: 1;
 		font-size: 14px;
 	}
-	
+
 	.uni-popup__success {
 		color: #4cd964;
 	}
-	
+
 	.uni-popup__warn {
 		color: #f0ad4e;
 	}
-	
+
 	.uni-popup__error {
 		color: #dd524d;
 	}
-	
+
 	.uni-popup__info {
 		color: #909399;
 	}
-	.qx_bg{
+
+	.qx_bg {
 		width: 100vw;
 		height: 100vh;
 		background: rgba(0, 0, 0, 0.25);
@@ -1351,10 +1361,12 @@
 		left: 0px;
 		z-index: 1000;
 	}
-	/deep/.uni-tab__cart-button-right{
+
+	/deep/.uni-tab__cart-button-right {
 		border-right: 1px solid #ffffff;
 	}
-	/deep/.uni-tab__cart-button-right:last-child{
+
+	/deep/.uni-tab__cart-button-right:last-child {
 		border-right: none;
 	}
 </style>

pagesMain/orderItem.vue

@@ -1,71 +1,69 @@
 <template>
-	<view class="container">
-	<view class="order-row" @click="goToOrderDetail()">
-		<view class="shop-info" v-if="orderData" @click.stop="gotoShop()">
-			<text class="iconfont icondianpu"></text>
-			<text class="shop-name">{{orderData.supplierName}}</text>
-			<text class="iconfont iconfangxiang" v-if="orderData.tenantCode != 'admin'"></text>
-			<text class="order-type">{{orderData.auctionStatus == null ? getOrderType(orderData.orderStatus) : getAuctionType(orderData.auctionStatus,orderData.orderStatus)}}</text>
-		</view>
-		<view class="goods-list" v-if="orderData">
-			<view class="goods-row" v-for="(site, index) in orderData.products" :key="index">
-				<image class="goods-img" :src="site.imgUrl" mode="aspectFill"></image>
-				<view class="goods-info">
-					<view class="goods-name">{{site.productName}}</view>
-					<view class="goods-type">
-						类型：{{site.productType == 1 ? '普通商品' : (site.productType == 2 ? '拍卖' : (site.productType == 3 ? '自助采摘' : '共享种植'))}}
-					</view>
-					<view class="goods-price-number">
-						<text class="goods-unit">￥</text>
-						<text class="goods-price">{{site.bizPrice}}</text>
-						<text class="goods-number">x{{site.buyNum}}</text>
+	<view>
+		<view class="order-row" @click="goToOrderDetail()">
+			<view class="shop-info" v-if="orderData" @click.stop="gotoShop()">
+				<text class="iconfont icondianpu"></text>
+				<text class="shop-name">{{orderData.supplierName}}</text>
+				<text class="iconfont iconfangxiang" v-if="orderData.tenantCode != 'admin'"></text>
+				<text class="order-type">{{orderData.auctionStatus == null ? getOrderType(orderData.orderStatus) : getAuctionType(orderData.auctionStatus,orderData.orderStatus)}}</text>
+			</view>
+			<view class="goods-list" v-if="orderData">
+				<view class="goods-row" v-for="(site, index) in orderData.products" :key="index">
+					<image class="goods-img" :src="site.imgUrl" mode="aspectFill"></image>
+					<view class="goods-info">
+						<view class="goods-name">{{site.productName}}</view>
+						<view class="goods-type">
+							类型：{{site.productType == 1 ? '普通商品' : (site.productType == 2 ? '拍卖' : (site.productType == 3 ? '自助采摘' : '共享种植'))}}
+						</view>
+						<view class="goods-price-number">
+							<text class="goods-unit">￥</text>
+							<text class="goods-price">{{site.bizPrice}}</text>
+							<text class="goods-number">x{{site.buyNum}}</text>
+						</view>
 					</view>
 				</view>
 			</view>
-		</view>
-		<view class="pay-info">总价￥{{getAllPrice()}}，实付￥{{orderData.paySum}}</view>
-		<view class="handle-box" v-if="tabIndex > 1">
-			<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"
+			<view class="pay-info">总价￥{{getAllPrice()}}，实付￥{{orderData.paySum}}</view>
+			<view class="handle-box" v-if="tabIndex > 1">
+				<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> -->
-			<u-button size="medium" :plain="true" type="success" shape="circle" :ripple="true" :hair-line="false" class="handle-button"
-			 v-if="(tabIndex == 2 || 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 == 3 && sharePlant" @click.stop="handleOrder(8)">我的种植</u-button>
-			  <u-button size="medium" :plain="true" type="success" shape="circle" :ripple="true" :hair-line="false" class="handle-button"
-			   v-if="tabIndex == 4 && sharePlant" @click.stop="handleOrder(8)">我的种植</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 && sharePlant" @click.stop="handleOrder(8)">我的种植</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>
-		
-	</view>
-	<view class="uni-popup-dialog" :hidden="show_qx">
-		<view class="uni-dialog-title">
-			<text class="uni-dialog-title-text">提示</text>
+				<u-button size="medium" :plain="true" type="success" shape="circle" :ripple="true" :hair-line="false" class="handle-button"
+				 v-if="(tabIndex == 2 || 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 == 3 && sharePlant" @click.stop="handleOrder(8)">我的种植</u-button>
+				<u-button size="medium" :plain="true" type="success" shape="circle" :ripple="true" :hair-line="false" class="handle-button"
+				 v-if="tabIndex == 4 && sharePlant" @click.stop="handleOrder(8)">我的种植</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 && sharePlant" @click.stop="handleOrder(8)">我的种植</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>
 		</view>
-		<view class="uni-dialog-content">
-			<text class="uni-dialog-content-text">请在设置中开启摄像头权限和麦克风权限</text>
+		<view class="uni-popup-dialog" :hidden="show_qx">
+			<view class="uni-dialog-title">
+				<text class="uni-dialog-title-text">提示</text>
+			</view>
+			<view class="uni-dialog-content">
+				<text class="uni-dialog-content-text">请在设置中开启摄像头权限和麦克风权限</text>
+			</view>
+			<view class="uni-dialog-button-group">
+				<button class="uni-dialog-button uni-border-left" open-type="openSetting" @click="closeSetting">
+					设置权限
+				</button>
+			</view>
 		</view>
-		<view class="uni-dialog-button-group">
-			<button class="uni-dialog-button uni-border-left" open-type="openSetting" @click="closeSetting">
-				设置权限
-			</button>
+		<view class="qx_bg" :hidden="show_qx">
 		</view>
-	
-	</view>
-	<view class="qx_bg" :hidden="show_qx">
-	</view>
 	</view>
 </template>
 
@@ -104,7 +102,7 @@
 		},
 		data() {
 			return {
-				show_qx:true,
+				show_qx: true,
 				pickHandle: false,
 				sharePlant: false,
 				modalShow: false,
@@ -119,17 +117,17 @@
 			this.goodType = this.pickHandle ? 3 : ''
 		},
 		methods: {
-			closeSetting:function(){
-				this.show_qx=true;
+			closeSetting: function() {
+				this.show_qx = true;
 			},
 			//  跳转商铺
 			gotoShop() {
 				if (this.orderData.tenantCode != 'admin') {
-				    if (this.orderData.products.length) {
-				    	uni.navigateTo({
-				    		url: '/pagesGood/shopDetails?goodId=' + this.orderData.products[0].productId
-				    	});
-				    }	
+					if (this.orderData.products.length) {
+						uni.navigateTo({
+							url: '/pagesGood/shopDetails?goodId=' + this.orderData.products[0].productId
+						});
+					}
 				}
 			},
 			//  获取订单总价
@@ -198,8 +196,8 @@
 				} else if (type == 4) {
 					//  自助采摘
 					// #ifdef MP-WEIXIN
-					var that=this;
-					if(uni.getStorageSync("firstTimeLiveUser")==""){
+					var that = this;
+					if (uni.getStorageSync("firstTimeLiveUser") == "") {
 						uni.setStorage({
 							key: 'firstTimeLiveUser',
 							data: 1
@@ -207,23 +205,23 @@
 						uni.navigateTo({
 							url: '/pagesGood/pickVideo?orderId=' + that.orderData.orderId + '&tenantCode=' + that.orderData.tenantCode
 						});
-					}else{
+					} else {
 						wx.getSetting({
-						  success(res) {
-							/*if (!res.authSetting['scope.camera']){
-							  that.show_qx=false;
-							}else*/ 
-							 if (!res.authSetting['scope.record']){
-							  that.show_qx=false;
-							}else{
-								uni.navigateTo({
-									url: '/pagesGood/pickVideo?orderId=' + that.orderData.orderId + '&tenantCode=' + that.orderData.tenantCode
-								});
+							success(res) {
+								/*if (!res.authSetting['scope.camera']){
+								  that.show_qx=false;
+								}else*/
+								if (!res.authSetting['scope.record']) {
+									that.show_qx = false;
+								} else {
+									uni.navigateTo({
+										url: '/pagesGood/pickVideo?orderId=' + that.orderData.orderId + '&tenantCode=' + that.orderData.tenantCode
+									});
+								}
 							}
-						  }
 						})
 					}
-					
+
 					return false;
 					// #endif
 					// #ifdef APP-PLUS
@@ -247,7 +245,8 @@
 				} else if (type == 8) {
 					//  去我的种植
 					uni.navigateTo({
-						url: '/pagesGood/goodDetails?minePlant=true&goodId=' + this.orderData.products[0].productId + '&orderId=' + this.orderData.orderId
+						url: '/pagesGood/goodDetails?minePlant=true&goodId=' + this.orderData.products[0].productId + '&orderId=' +
+							this.orderData.orderId
 					});
 				}
 			},
@@ -283,12 +282,12 @@
 						mid: uni.getStorageSync("userData").userId,
 						orderCode: this.orderData.orderCode,
 						orderId: this.orderData.orderId,
-					    // #ifdef APP-PLUS
+						// #ifdef APP-PLUS
 						channel: 2
-					    //#endif
+						//#endif
 					}, 'POST').then(res => {
 						this.modalShow = false
-					// #ifdef MP-WEIXIN
+						// #ifdef MP-WEIXIN
 						uni.requestPayment({
 							provider: 'wxpay',
 							timeStamp: res.data.timeStamp,
@@ -303,9 +302,9 @@
 								// 		url: '/pagesMain/paySuccess?orderId=' + this.orderData.orderId + '&goodType=' + this.goodType + '&tenantCode=' + this.orderData.tenantCode
 								// 	});
 								// } else {
-									uni.navigateTo({
-										url: '/pagesMain/paySuccess?orderId=' + this.orderData.orderId
-									});
+								uni.navigateTo({
+									url: '/pagesMain/paySuccess?orderId=' + this.orderData.orderId
+								});
 								// }
 							},
 							fail: (error) => {
@@ -316,12 +315,12 @@
 								})
 							}
 						})
-					//#endif
-					
-					// #ifdef APP-PLUS
+						//#endif
+
+						// #ifdef APP-PLUS
 						uni.requestPayment({
 							provider: 'wxpay',
-							orderInfo:{
+							orderInfo: {
 								"package": res.data.packageValue,
 								"appid": res.data.appId,
 								"sign": res.data.paySign,
@@ -344,7 +343,7 @@
 								})
 							}
 						})
-					//#endif
+						//#endif
 
 					}).catch(error => {
 						this.modalShow = false
@@ -533,7 +532,7 @@
 				/deep/button {
 					padding: 0 12px;
 					border: 1px solid #BFBFBF !important;
-					background-color: #FFFFFF!important;
+					background-color: #FFFFFF !important;
 					color: #333333 !important;
 				}
 			}
@@ -547,6 +546,7 @@
 	/deep/.u-round-circle {
 		padding: 0 12px;
 	}
+
 	.uni-popup-dialog {
 		width: 80vw;
 		border-radius: 15px;
@@ -557,7 +557,7 @@
 		z-index: 11;
 		left: 0px;
 	}
-	
+
 	.uni-dialog-title {
 		/* #ifndef APP-NVUE */
 		display: flex;
@@ -567,12 +567,12 @@
 		padding-top: 15px;
 		padding-bottom: 5px;
 	}
-	
+
 	.uni-dialog-title-text {
 		font-size: 16px;
 		font-weight: 500;
 	}
-	
+
 	.uni-dialog-content {
 		/* #ifndef APP-NVUE */
 		display: flex;
@@ -583,12 +583,12 @@
 		padding: 5px 15px 15px 15px;
 		text-align: center;
 	}
-	
+
 	.uni-dialog-content-text {
 		font-size: 14px;
 		color: #6e6e6e;
 	}
-	
+
 	.uni-dialog-button-group {
 		/* #ifndef APP-NVUE */
 		display: flex;
@@ -598,55 +598,56 @@
 		border-top-style: solid;
 		border-top-width: 1px;
 	}
-	
+
 	.uni-dialog-button {
 		/* #ifndef APP-NVUE */
 		display: flex;
 		/* #endif */
-		    background: rgba(0, 0, 0, 0);
-		    border: none;
+		background: rgba(0, 0, 0, 0);
+		border: none;
 		flex: 1;
 		flex-direction: row;
 		justify-content: center;
 		align-items: center;
 		height: 45px;
 	}
-	
+
 	.uni-border-left {
 		border-left-color: #f0f0f0;
 		border-left-style: solid;
 		border-left-width: 0px;
 	}
-	
+
 	.uni-dialog-button-text {
 		font-size: 14px;
 	}
-	
+
 	.uni-button-color {
 		color: #007aff;
 	}
-	
+
 	.uni-dialog-input {
 		flex: 1;
 		font-size: 14px;
 	}
-	
+
 	.uni-popup__success {
 		color: #4cd964;
 	}
-	
+
 	.uni-popup__warn {
 		color: #f0ad4e;
 	}
-	
+
 	.uni-popup__error {
 		color: #dd524d;
 	}
-	
+
 	.uni-popup__info {
 		color: #909399;
 	}
-	.qx_bg{
+
+	.qx_bg {
 		width: 100vw;
 		height: 100vh;
 		background: rgba(0, 0, 0, 0.25);