10-24-1

pages/order/order.vue

@@ -58,7 +58,7 @@
 							<button v-if="item._status._title == '未支付'" @click.stop="orderPay(item)" class="action-btn recom">立即支付</button>
 							<!-- <button v-if="item._status._title == '待评价'" class="action-btn">评价</button> -->
 							<button v-if="item._status._title == '待收货'" @click.stop="orderTake(item, index)" class="action-btn">确认收货</button>
-							<button v-if="item._status._title == '未发货'" class="action-btn" @click.stop="orderRefund(item)">申请退款</button>
+							<!-- <button v-if="item._status._title == '未发货'" class="action-btn" @click.stop="orderRefund(item)">申请退款</button> -->
 						</view>
 					</view>
 

pages/order/orderDetail.vue

@@ -42,8 +42,8 @@
 							</view>
 							<view>
 								<view v-if="status._type ==  3">
-									<view @click="evaluate(goodsItem)" class="yesevaluate" v-if="goodsItem.is_reply > 0"><text>已评价</text></view>
-									<view @click="evaluate(goodsItem)" class="evaluate" v-if="goodsItem.is_reply < 1"><text>去评价</text></view>
+									<!-- <view @click="evaluate(goodsItem)" class="yesevaluate" v-if="goodsItem.is_reply > 0"><text>已评价</text></view> -->
+									<!-- <view @click="evaluate(goodsItem)" class="evaluate" v-if="goodsItem.is_reply < 1"><text>去评价</text></view> -->
 								</view>
 							</view>
 						</view>

pages/user/team.vue

@@ -14,13 +14,13 @@
 				<image src="../../static/img/tg-bg.png" mode=""></image>
 			</view>
 			<view class="money-box">
-				<view class="money">{{ totalLevel|| '0' }}</view>
+				<view class="money">{{ totalLevel + all|| '0' }}</view>
 				<view>我的团队</view>
 			</view>
-			<view class="money-box" style="padding-top: 20rpx;" v-if="order*1 > 0">
+			<!-- <view class="money-box" style="padding-top: 20rpx;" v-if="order*1 > 0">
 				<view>直推：{{zt_order}}单</view>
 				<view>间推：{{jt_order}}单</view>
-			</view>
+			</view> -->
 		</view>
 		<view class="flex buttom-box">
 			<view class="buttom"  @click="tabClick(0)">

pages/user/xccg.vue

@@ -56,30 +56,30 @@
 						第一关
 					</view>
 					<view class="status">
-						{{pool.one_pool_sum >= 4 ? '已激活': '未激活'}}
+						{{pool.one_pool_order_sum >= 4 ? '已激活': '未激活'}}
 					</view>
 					<view class="val-wrap">
-						{{pool.one_pool_sum || '0'}}<text>人</text>
+						{{pool.one_pool_order_sum || '0'}}<text>单</text>
 					</view>
 				</view>
 			</swiper-item>
 			<swiper-item >
 				<view class="tab1 tab2" >
 					<view class="tip">
-						{{pool.two_pool? '恭喜进入': '未进入'}}
+						{{pool.two_pool_my && pool.two_pool_my.length > 0 ? '恭喜进入': '未进入'}}
 					</view>
 					<view class="tit">
 						第二关
 					</view>
 					
 					<view class="btn-list">
-						<view class="btn" v-for="item in 4" v-if="(item-1) == (pool.three_pool - pool.three_pool_out -1)">
-							{{item - 1}}
+						<view class="btn" v-if="pool.two_pool_my && pool.two_pool_my.length > 0">
+							{{pool.two_pool_my[0].no}}
 						</view>
 					</view>
-					<view class="val" v-if="pool.two_pool > 0">
-						当前排队共<text class="num">{{pool.two_pool}}</text>单，前方等待出局<text
-							class="num">{{pool.two_pool - pool.two_pool_out -1}}</text>人
+					<view class="val" v-if="pool.two_pool_my && pool.two_pool_my.length > 0">
+						当前排队共<text class="num">{{pool.two_pool_all.totel_count}}</text>单，前方等待出局<text
+							class="num">{{pool.two_pool_all.totel_count-1}}</text>单
 					</view>
 					<view class="val" v-else>
 						当前暂未进入第二关
@@ -89,20 +89,20 @@
 			<swiper-item >
 				<view class="tab1 tab2 tab3" >
 					<view class="tip">
-						{{pool.three_pool? '恭喜进入': '未进入'}}
+						{{pool.three_pool_my && pool.three_pool_my.length > 0 ? '恭喜进入': '未进入'}}
 					</view>
 					<view class="tit">
 						第三关
 					</view>
 					
 					<view class="btn-list">
-						<view class="btn" v-for="item in 4" v-if="(item-1) == (pool.three_pool - pool.three_pool_out -1)">
-							{{item - 1}}
+						<view class="btn" v-if="pool.three_pool_my && pool.three_pool_my.length > 0">
+							{{pool.three_pool_my[0].no}}
 						</view>
 					</view>
 					<view class="val" v-if="pool.three_pool> 0">
-						当前排队共<text class="num">{{pool.three_pool}}</text>单，前方等待出局<text
-							class="num">{{pool.three_pool - pool.three_pool_out -1}}</text>人
+						当前排队共<text class="num">{{pool.three_pool_all.totel_count}}</text>单，前方等待出局<text
+							class="num">{{pool.three_pool_all.totel_count-1}}</text>单
 					</view>
 					<view class="val" v-else>
 						当前暂未进入第二关
@@ -112,20 +112,20 @@
 			<swiper-item >
 				<view class="tab1 tab2 tab4" >
 					<view class="tip">
-							{{pool.for_pool? '恭喜进入': '未进入'}}
+							{{pool.for_pool_my && pool.for_pool_my.length > 0 ? '恭喜进入': '未进入'}}
 					</view>
 					<view class="tit">
 						第四关
 					</view>
 					
 					<view class="btn-list">
-						<view class="btn" v-for="item in 4" v-if="(item-1) == (pool.for_pool - pool.for_pool_out -1)">
-							{{item - 1}}
+						<view class="btn" v-if="pool.for_pool_my && pool.for_pool_my.length > 0">
+							{{pool.for_pool_my[0].no}}
 						</view>
 					</view>
-					<view class="val" v-if="pool.for_pool > 0">
-						当前排队共<text class="num">{{pool.for_pool}}</text>单，前方等待出局<text
-							class="num">{{pool.for_pool - pool.for_pool_out -1}}</text>人
+					<view class="val" v-if="pool.for_pool_my && pool.for_pool_my.length > 0">
+						当前排队共<text class="num">{{pool.for_pool_all.totel_count}}</text>单，前方等待出局<text
+							class="num">{{pool.for_pool_all.totel_count-1}}</text>单
 					</view>
 					<view class="val" v-else>
 						当前暂未进入第四关