订单处理0705

pagesA/getReadyDan/getReadyDan-two.vue

@@ -164,8 +164,8 @@
 				<view style="color: #f55255;font-size: 36rpx;">立即完成拼单?</view>
 				<view style="margin: 50rpx 0;font-size: 26rpx;">点击下方分享给朋友，完成拼单</view>
 				<view class="posir radius15 disjcac pad-sx20" style="background-color: #22cc3e;color: #FFFFFF;font-size: 36rpx;">
-					分享给朋友
+					邀请拼单
-					<button open-type="share" class="posia-op">分享给朋友</button>
+					<button open-type="share" class="posia-op">邀请拼单</button>
 				</view>
 			</view>
 		</view>
@@ -222,7 +222,8 @@
 					default_price:0
 				},
 				isVirtual:false,//是否是虚拟商品
-				payType:''//支付方式 wechat=微信支付;coin=孔雀币;hybrid=混合支付
+				payType:'',//支付方式 wechat=微信支付;coin=孔雀币;hybrid=混合支付
+				groupLast:'0', //是否拼团成功
 			}
 		},
 		computed: {
@@ -535,6 +536,7 @@
 								if(res.data.code==0){
 									this.times = 0;
 									this.payment(res.data.data);
+									this.groupLast = res.data.data.group_last;
 									// uni.setStorageSync('orderList',this.orderList);
 									// uni.setStorageSync('orderInfo',res.data.data);
 									// uni.navigateTo({
@@ -587,10 +589,15 @@
 				uni.removeStorageSync('chooseAddress')
 				this.isSuccess = true;
 				if(this.orderList[0].cateNum==1 && this.orderList.pin_user_id!=0){
-					this.isfen = true;
 					this.$requst.post('order/get-group-id',{order_coding:coding}).then(res=>{
 						if(res.code==0){
 							this.checkGrounpId = res.data.group_id;
+							if(this.groupLast !== 1){
+								this.isfen = true;
+							}
+							else{
+								this.$toolAll.tools.showToast('拼团成功');
+							}
 						}
 					})
 				}

pagesA/myOrder/myOrder.vue

@@ -49,17 +49,17 @@
 				<view class="fon28 col3">
 					<view class="mar-sx20 disjbac">
 						<view>
-							<view class="" v-if="item.group">
+							<view class="" v-if="1===2">
 								<!-- <view v-if="item.is_only==0 && item.open_one==1 && item.is_group_make==1 && item.open_one_success==0" class="posir disjcac flexs" style="color: #010101;font-size: 24rpx;"> -->
 								<view v-if="item.is_only==0 && item.group.surplus > 0" class="posir disjcac flexs" style="color: #010101;font-size: 24rpx;">
 									<image src="../../static/public/weix.png" mode="" class="flexs" style="width: 50rpx;height: 50rpx;"></image>
-									分享给朋友
+									邀请拼单
 									<button open-type="share" 
 										:data-title="item.childrenList[0].title"
 										:data-is_activity="item.childrenList[0].is_activity"
 										:data-imgsrc="item.childrenList[0].imgSrc"
 										:data-id="item.childrenList[0].spu_activity_id || item.childrenList[0].sku_id"
-										class="posia-op">分享给朋友</button>
+										class="posia-op">邀请拼单</button>
 								</view>
 							</view>
 						</view>
@@ -67,7 +67,29 @@
 							<span v-if="item.isShop==0">合计：<span v-if="item.is_only!=1">{{item.total}}</span><span v-if="item.is_only==1">{{item.total}}</span> <span v-if="item.coin!=0">+{{item.coin}}孔雀币</span></span><span v-else>合计积分：{{item.total}}</span>
 						</view>
 					</view> 
-					<view class="disjbac">
+					<view class="disjbac" v-if="item.group">
+						<view class="width100 disje">
+							<view class="" v-if="item.group">
+								<view v-if="item.group.surplus > 0">
+									<view @tap="comeing(item.orderNum)" v-if="item.is_only==0 && item.open_one==1 && item.is_group_make==1 && item.open_one_success==0" class="order-btn mar-y20">直接免拼</view>
+								</view>
+							</view>
+							<view @tap="transferFrame(index)" v-if="item.orderStatus != 0 && item.orderStatus != 5 && item.virtual_check==0 && item.orderStatus!=5" class="order-cancle">取消订单</view>
+							<view @tap="payMentEv(index)" v-if="item.orderStatus == 1" class="order-btn">付款</view>
+							<!-- <view class="order-btn" v-if="item.is_only==1">单人拼团</view> -->
+							<view v-if="item.group.surplus > 0" class="order-btn" style="background-color: #38CE51;position: relative;">
+							邀请拼单
+							<button open-type="share"
+								:data-title="item.childrenList[0].title"
+								:data-is_activity="item.childrenList[0].is_activity"
+								:data-imgsrc="item.childrenList[0].imgSrc"
+								:data-id="item.childrenList[0].spu_activity_id || item.childrenList[0].sku_id"
+								class="posia-op">邀请拼单</button>
+							</view>
+							<view @tap="confirmReceipt(item.id)" v-if="item.orderStatus == 4 && item.group.surplus == 0" class="order-btn">确认收货</view>
+						</view>
+					</view>
+					<view class="disjbac" v-else>
 						<view class="width100 disje">
 							<view class="" v-if="item.group">
 								<view v-if="item.group.surplus > 0">
@@ -80,6 +102,7 @@
 							<view @tap="confirmReceipt(item.id)" v-if="item.orderStatus == 4" class="order-btn">确认收货</view>
 						</view>
 					</view>
+					
 				</view>
 			</view>
 			<nothing-page v-if="orderList.length==0" :content="`暂无更多订单列表`"></nothing-page>

pagesB/orderDetail/orderDetail.vue

@@ -73,16 +73,19 @@
 				</view>
 				<!-- 消费 -->
 				<view class="fon28 col3 consumption-box">消费：<span class="fon36 bold colf8"><span v-if="orderInfo.is_score==0">￥{{orderInfo.price/100}}</span><span v-else>{{orderInfo.score}}积分</span> <span v-if="orderInfo.coin!=0">+{{orderInfo.coin}}孔雀币</span></span></view>
+				
 				<view class="disjbac posixzy bacf orderDetail-bottom-box">
 					<view class="posir">
-						<image src="/static/public/weix.png" mode=""></image>
+						<template v-if="1===2">
-						<view class="fon28 col3">分享</view>
+							<image src="/static/public/weix.png" mode=""></image>
-						<button open-type="share"
+							<view class="fon28 col3">分享</view>
-							:data-title="orderInfo.skus[0].spu_name"
+							<button open-type="share"
-							:data-is_activity="orderInfo.skus[0].is_activity"
+								:data-title="orderInfo.skus[0].spu_name"
-							:data-imgsrc="orderInfo.skus[0].spu_cover"
+								:data-is_activity="orderInfo.skus[0].is_activity"
-							:data-id="orderInfo.skus[0].spu_activity_id || orderInfo.skus[0].sku_id"
+								:data-imgsrc="orderInfo.skus[0].spu_cover"
-							class="posia-op"></button>
+								:data-id="orderInfo.skus[0].spu_activity_id || orderInfo.skus[0].sku_id"
+								class="posia-op"></button>
+						</template>
 					</view>
 					<view @tap="comeing(orderInfo.coding)" v-if="orderInfo.is_only==0 && orderInfo.open_one==1 && orderInfo.is_group_make==1 && orderInfo.open_one_success==0 " class="orderInfo-btn">直接免拼</view>
 					<!-- 待付款 -->
@@ -94,9 +97,24 @@
 					<view class="disac paid-btn-box" v-if="orderInfo.status=='paid' && orderInfo.virtual_check==0">
 						<view @tap="cancleEv">取消订单</view>
 					</view>
+					
 					<!-- 确认收货 -->
-					<view @tap="confirmReceipt(orderInfo.id)" class="orderInfo-btn" v-if="orderInfo.status=='shipped'">确认收货</view>
+					<view class="disac paid-btn-box" v-if="orderInfo.status=='shipped'">
+						<view @tap="cancleEv">取消订单</view>
+						<!-- 邀请拼单 -->
+						<view class="orderInfo-btn" v-if="groupMakeDone==0" style="background-color: #38CE51;position: relative;">
+							邀请拼单
+							<button open-type="share"
+								:data-title="orderInfo.skus[0].spu_name"
+								:data-is_activity="orderInfo.skus[0].is_activity"
+								:data-imgsrc="orderInfo.skus[0].spu_cover"
+								:data-id="orderInfo.skus[0].spu_activity_id || orderInfo.skus[0].sku_id"
+								class="posia-op"></button>
+						</view>
+						<view @tap="confirmReceipt(orderInfo.id)" class="orderInfo-btn" v-if="groupMakeDone==1">确认收货</view>
+					</view>
 				</view>
+				
 				<!-- 待核验弹框 -->
 				<view v-if="isHeyan" @tap="isHeyan=false" class="disjcac tc posAll" style="z-index: 3;" catchtouchmove="return">
 					<view class="bacf width100 radius20 pad30 posir" style="margin: 0 128rpx;" @tap.stop="isHeyan=true">
@@ -145,6 +163,7 @@
 				timer:null,
 				daoTime:'',
 				timerDao:null,
+				groupMakeDone:1,//是否拼单成功
 			}
 		},
 		computed:{
@@ -262,9 +281,11 @@
 			},
 			checkInfo(id){//查询订单信息
 				this.$requst.post('user/order-detail',{id:id}).then(res=>{
+					console.log(res,12121212)
 					if(res.code==0){
 						this.allPrice = 0;
 						this.allNum = 0;
+						this.groupMakeDone =res.data.group_make_done;
 						let narr = res.data;
 						narr.skus.forEach(item=>{
 							item.spu_cover = this.$http + item.spu_cover;