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

pages/index/index.vue

@@ -27,7 +27,7 @@
 			<button
 				class="authorize-login" 
 				@click="getUserinfoApp">
-				登录4
+				登录
 			</button>
 			<!-- #endif -->
 			<view @click="showAgreement = true" class="agreement">点击登录视为同意<text class="underline">商家入驻协议</text></view>
@@ -300,7 +300,7 @@
 							uni.login({
 								provider: 'weixin',
 								success: (res2) => {
-									console.log("1234444",res2)
+									console.log("1234444",res2, data)
 									let wxLoginData = {
 										code: res2.code,
 										encryptedData: data.detail.encryptedData,

pagesMain/orderDetail.vue

@@ -212,7 +212,7 @@
 				}, 'GET').then(res => {
 					this.orderData = res.data
 					if (this.orderData.addOrderTime) {
-						let tempTime = new Date(this.orderData.addOrderTime).getTime()
+						let tempTime = new Date(this.orderData.addOrderTime.replace(/\-/g, '/')).getTime()
 						let addTempTime = new Date(tempTime + 1000 * 60 * 60 * 24)
 						let addYear = addTempTime.getFullYear()
 						let addMonth = addTempTime.getMonth() + 1

pagesMain/orderItem.vue

@@ -23,7 +23,7 @@
 			</view>
 		</view>
 		<view class="pay-info" v-if="!isPick">总价￥{{getAllPrice()}}，实付￥{{orderData.paySum}}</view>
-		<view class="handle-box" v-if="(tabIndex > 1 && tabIndex < 5) || (tabIndex == 5 && orderData.evaluateStatus == 2 && orderData.evaluateReplyStatus == 1)">
+		<view class="handle-box" v-if="(tabIndex >= 1 && tabIndex < 5) || (tabIndex == 5 && orderData.evaluateStatus == 2 && orderData.evaluateReplyStatus == 1)">
 			<u-button size="medium" :plain="true" type="success" shape="circle" :ripple="true" :hair-line="false" class="handle-button"
 			 v-if="tabIndex == 2 && orderData.auctionStatus != 1 && orderData.auctionStatus != 3" @click.stop="handleOrder(1)">发货</u-button>
 			<u-button size="medium" :plain="true" type="success" shape="circle" :ripple="true" :hair-line="false" class="handle-button"
@@ -31,7 +31,7 @@
 			<u-button size="medium" :plain="true" type="success" shape="circle" :ripple="true" :hair-line="false" class="handle-button"
 			 v-if="tabIndex == 5 && orderData.evaluateStatus == 2 && orderData.evaluateReplyStatus == 1" @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="!orderData.noPick && orderData.orderStatus == 2" @click.stop="handleOrder(6)">自助采摘</u-button>
+			  v-if="!orderData.noPick && (orderData.orderStatus == 1 || orderData.orderStatus == 2)" @click.stop="handleOrder(6)">自助采摘</u-button>
 		</view>
 		<u-top-tips ref="uTips"></u-top-tips>
 	</view>
@@ -164,6 +164,7 @@
 					});
 				} else if (type == 6) {
 					// 自助采摘
+					// #ifdef MP-WEIXIN
 					var that=this;
 					if(uni.getStorageSync("firstTimeLive")==""){
 						uni.setStorage({
@@ -188,6 +189,12 @@
 						  }
 						})
 					}
+					// #endif
+					// #ifdef APP-PLUS
+					uni.navigateTo({
+						url: '/pagesMedia/pickVideo?tenantCode=' + this.orderData.tenantCode + '&orderId=' + this.orderData.orderId
+					});
+					// #endif
 				}
 			},
 			//  跳转订单详情
@@ -208,6 +215,7 @@
 							url: '/pagesMedia/pickVideo?tenantCode=' + that.orderData.tenantCode + '&orderId=' + that.orderData.orderId
 						});
 					}else{
+						// #ifdef MP-WEIXIN
 						wx.getSetting({
 						  success(res) {
 							if (!res.authSetting['scope.camera']){
@@ -221,6 +229,13 @@
 							}
 						  }
 						})
+						// #endif
+
+						// #ifdef APP-PLUS
+						uni.navigateTo({
+							url: '/pagesMedia/pickVideo?tenantCode=' + this.orderData.tenantCode + '&orderId=' + this.orderData.orderId
+						});
+						// #endif
 					}
 				}
 			},