Merge branch 'master' of http://8.140.253.224:3000/root/school_uni

components/tab-bar/delivery.vue

@@ -21,6 +21,14 @@
 									alt=""
 									style="width: 80rpx;height: 14rpx;position: absolute;bottom: 4rpx;left: 32rpx;" />
 							</view>
+							<view class="tabs1" @tap="checkTab1('daisong')"
+								:style="{'color':tab1Checked == 'daisong'?'#000':'#777','font-size':tab1Checked== 'daisong'?'36rpx':'30rpx'}">
+								转单<text>()</text>
+								<img v-if="tab1Checked == 'daisong'"
+									src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4bb5fc7725cb4a7a84d1d3a15f05b39c.png"
+									alt=""
+									style="width: 80rpx;height: 14rpx;position: absolute;bottom: 4rpx;left: 32rpx;" />
+							</view>
 						</view>
 					</view>
 				</view>
@@ -173,9 +181,10 @@
 				</view>
 				<view v-else style="width: 100%;height: 100rpx;margin-top: 32rpx;">
 					<view style="width: 20%;" v-if="item.status == 1 && item.arriveTime == null" @tap="changeStatus(item,1)">已到店</view>
-					<img v-if="item.status == 1" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/c318cf292a4f40b296995c30e5e539ea.png"
+					<view style="width: 20%;"  @tap="changeOthers(item,1)">转单</view>
+					<img v-if="item.status == 1 && item.arriveTime != null" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/c318cf292a4f40b296995c30e5e539ea.png"
 						alt="" style="width: 80%;height: 100rpx;background-size: 100%;" @tap="changeStatus(item,2)"/>
-					<img v-if="item.status == 2" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png"
+					<img v-if="item.status == 2 && item.arriveTime != null" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png"
 						alt="" style="width: 100%;height: 100rpx;background-size: 100%;" @tap="changeStatus(item,3)" />
 				</view>
 			</view>

package1/group/groupBuySingle.vue

@@ -671,10 +671,12 @@
 				} catch(e) {
 					this.shopItem = JSON.parse(option.item);
 				}
-				this.shopRecommend = this.shopItem.products
-				for(let i=0;i<this.shopRecommend.length;i++){
-					this.shopRecommend[i].categoryId = '1'
-					this.shopRecommend[i].isChecked = false
+				if(this.shopItem.products){
+					this.shopRecommend = this.shopItem.products
+					for(let i=0;i<this.shopRecommend.length;i++){
+						this.shopRecommend[i].categoryId = '1'
+						this.shopRecommend[i].isChecked = false
+					}
 				}
 			} else {
 				try {

package1/order/orderDetail.vue

@@ -564,6 +564,7 @@
 				refundTypeStatus:4,
 				shopTime:'',
 				peisongTime:'',
+				shopItem:{},
 				orderId:'',
 				payData:{},
 				orderDetail:{
@@ -643,26 +644,17 @@
 		},
 		onShareAppMessage(res) {
 			let that = this
-			that.tui.request("/app/shop/getShopInfoById", "POST", {id:that.orderDetail.shopId,regionId:JSON.parse(uni.getStorageSync('area')).id}, false, true).then((res1) => {
-				if (res1.code == 200) {
-					let groupId = that.orderDetail.groupInfo.id;
-					let targetMembers = that.orderDetail.groupInfo.targetMembers;
-					let shopItemStr = encodeURIComponent(JSON.stringify(res1.result.shop));
-					let isFTF = that.orderDetail.orderType == 3 ? 1 : 0;
-					let path = `/package1/group/groupBuySingle?type=shop&item=${shopItemStr}&groupId=${groupId}&targetMembers=${targetMembers}&isFaceToFace=${isFTF}`;
-					
-					return {
-						title: '快来一起拼单吧！',
-						path: path,
-						imageUrl:'https://jewel-shop.oss-cn-beijing.aliyuncs.com/62c9aa038b2541ad9c400a76ddae7ef8.png'
-					}
-				} else {
-					that.tui.toast(res.message);
-					return;
-				}
-				uni.hideLoading();
-			}).catch((res1) => {});
+			let groupId = that.orderDetail.groupInfo.id;
+			let targetMembers = that.orderDetail.groupInfo.targetMembers;
+			let shopItemStr = encodeURIComponent(JSON.stringify(that.shopItem));
+			let isFTF = that.orderDetail.orderType == 3 ? 1 : 0;
+			let path = `/package1/group/groupBuySingle?type=shop&item=${shopItemStr}&groupId=${groupId}&targetMembers=${targetMembers}&isFaceToFace=${isFTF}`;
 			
+			return {
+				title: '快来一起拼单吧！',
+				path: path,
+				imageUrl:'https://jewel-shop.oss-cn-beijing.aliyuncs.com/62c9aa038b2541ad9c400a76ddae7ef8.png'
+			}
 		},
 		onUnload() {
 			uni.$off('updateDeliveryWorker');
@@ -895,6 +887,15 @@
 							//还没有拼团成功拼团状态 0:拼团中 1:拼团成功 2:拼团失败 3:面对面团(不公开)
 							if(that.orderDetail.groupInfo.status != 1 && that.orderDetail.groupInfo.status != 2){
 								that.pintuan = true;
+								that.tui.request("/app/shop/getShopInfoById", "POST", {id:that.orderDetail.shopId,regionId:JSON.parse(uni.getStorageSync('area')).id}, false, true).then((res1) => {
+									if (res1.code == 200) {
+										that.shopItem = res1.result.shop
+									} else {
+										that.tui.toast(res1.message);
+										return;
+									}
+									
+								}).catch((res1) => {});
 							}
 						}
 						that.orderDetail.userCouponNum = 0
@@ -909,6 +910,7 @@
 						return
 					}
 				}).catch((res) => {})
+				uni.hideLoading();
 			},
 			goAssignWorker() {
 				let shopAreaId = this.orderDetail.getAreaId || '';