From 3431a0921b4ab99cc86ad2b5eb5ee6a8878c5878 Mon Sep 17 00:00:00 2001
From: liudan <18634735655@163.com>
Date: Sat, 15 Jun 2024 23:12:39 +0800
Subject: [PATCH] 1

---
 components/productWindow/index.vue           |  2 +-
 pages/activity/combination_details/index.vue |  8 ++++----
 pages/activity/presell_details/index.vue     |  8 ++++----
 pages/goods_details/index.vue                | 12 +++++------
 pages/user/index.vue                         | 12 +++++------
 pages/users/order_confirm/index.vue          | 16 +++++++--------
 pages/users/order_list1/index.vue            | 21 ++++++++++----------
 pages/users/promoter-list/index.vue          | 18 ++++++++++++-----
 pages/users/user_cash/index.vue              |  6 +++---
 pages/users/user_info/index.vue              |  3 ++-
 utils/request.js                             |  9 +++++++++
 11 files changed, 67 insertions(+), 48 deletions(-)

diff --git a/components/productWindow/index.vue b/components/productWindow/index.vue
index f6b0ea0..0b98763 100644
--- a/components/productWindow/index.vue
+++ b/components/productWindow/index.vue
@@ -60,7 +60,7 @@
 			<view v-if="type !='points'" class="cart acea-row">
 				<view class="title">数量</view>
 				<view class="carnum acea-row row-left">
-					<view class="buy_limit" v-if="(minCount>0 || maxCount>0)&&productType!=1">
+					<view class="buy_limit" v-if="(minCount>0 || maxCount>0)&&productType!=2">
 						(<text v-if="minCount>0">{{minCount}}件起购<text v-if="minCount>0 && maxCount>0">，</text></text><text v-if="maxCount>0">最多{{maxCount}}件</text>)
 					</view>
 					<view class="item reduce" :class="(attr.productSelect.cart_num <= 1 || (minCount>0 && attr.productSelect.cart_num<=minCount)) ? 'on' : ''" @click="CartNumDes">
diff --git a/pages/activity/combination_details/index.vue b/pages/activity/combination_details/index.vue
index c7978a9..57e958a 100644
--- a/pages/activity/combination_details/index.vue
+++ b/pages/activity/combination_details/index.vue
@@ -290,10 +290,10 @@
 					</view>
 				</view>
 			</view>
-			<block v-if="sharePacket.max&&sharePacket.min">
+			<!-- <block v-if="sharePacket.max&&sharePacket.min">
 				<shareRedPackets :sharePacket="sharePacket" @listenerActionSheet="listenerActionSheet" @closeChange="closeChange"
 				 :showAnimate="showAnimate" @boxStatus="boxStatus"></shareRedPackets>
-			</block>
+			</block> -->
 			<!--商品参数-->
 			<specs :specsInfo="specsInfo" @myevent="mySpecs"></specs>
 			<!-- 组件 -->
@@ -378,7 +378,7 @@
 	import specs from '@/components/specs/index.vue';
 	import copyPassword from '@/components/copyPassword';
 	import userEvaluation from '@/components/userEvaluation';
-	import shareRedPackets from '@/components/shareRedPackets';
+	// import shareRedPackets from '@/components/shareRedPackets';
 	import { HTTP_REQUEST_UR } from '@/config/app';
 	import home from '@/components/home';
 	import { silenceBindingSpread, configMap } from "@/utils";
@@ -402,7 +402,7 @@
 			productWindow,
 			specs,
 			userEvaluation,
-			shareRedPackets,
+			// shareRedPackets,
 			home,
 			countDown,
 			guaranteeTemplate,
diff --git a/pages/activity/presell_details/index.vue b/pages/activity/presell_details/index.vue
index 6f72369..146b8c5 100644
--- a/pages/activity/presell_details/index.vue
+++ b/pages/activity/presell_details/index.vue
@@ -292,10 +292,10 @@
 					</view>
 				</view>
 			</view>
-			<block v-if="sharePacket.max&&sharePacket.max>0">
+			<!-- <block v-if="sharePacket.max&&sharePacket.max>0">
 				<shareRedPackets :sharePacket="sharePacket" @listenerActionSheet="listenerActionSheet" @closeChange="closeChange"
 				 :showAnimate="showAnimate" @boxStatus="boxStatus"></shareRedPackets>
-			</block>
+			</block> -->
 			<!-- 组件 -->
 			<productWindow :attr="attr" :isShow='1' :iSplus='1' :isPresell='1' :presell_type="presellInfo.presell_type" :image="storeInfo.image"
 			 @myevent="onMyEvent" @ChangeAttr="ChangeAttr" @ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum"
@@ -388,7 +388,7 @@
 	import productWindow from '@/components/productWindow';
 	import couponListWindow from '@/components/couponListWindow';
 	import userEvaluation from '@/components/userEvaluation';
-	import shareRedPackets from '@/components/shareRedPackets';
+	// import shareRedPackets from '@/components/shareRedPackets';
 	import { HTTP_REQUEST_URL } from '@/config/app';
 	import { toLogin } from '@/libs/login.js';
 	import home from '@/components/home';
@@ -412,7 +412,7 @@
 			productWindow,
 			couponListWindow,
 			userEvaluation,
-			shareRedPackets,
+			// shareRedPackets,
 			home,
 			guaranteeTemplate,
 			copyPassword,
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index 29c57fa..ffa8e9e 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -351,10 +351,10 @@
 					</form>
 				</view>
 			</view>
-			<block v-if="sharePacket.max&&sharePacket.max>0">
+			<!-- <block v-if="sharePacket.max&&sharePacket.max>0">
 				<shareRedPackets :sharePacket="sharePacket" @listenerActionSheet="listenerActionSheet" @closeChange="closeChange"
 				 :showAnimate="showAnimate" @boxStatus="boxStatus"></shareRedPackets>
-			</block>
+			</block> -->
 			<!-- 组件 -->
 			<productWindow :attr="attr" :point="point" :productType="productType" :isShow='1' :iSplus='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr" @ChangeCartNum="ChangeCartNum"
 			 @attrVal="attrVal" @iptCartNum="iptCartNum" id='product-window' :payLimit="pay_limit" :maxCount="max_count" :minCount="min_count" :svipPrice="svipPrice" :image="storeInfo.image"></productWindow>
@@ -457,7 +457,7 @@
 	import copyPassword from '@/components/copyPassword';
 	import productWindow from '@/components/productWindow';
 	import userEvaluation from '@/components/userEvaluation';
-	import shareRedPackets from '@/components/shareRedPackets';
+	// import shareRedPackets from '@/components/shareRedPackets';
 	import specs from '@/components/specs/index.vue';
 	import Cache from '@/utils/cache';
 	import { toLogin } from '@/libs/login.js';
@@ -485,7 +485,7 @@
 			couponListWindow,
 			productWindow,
 			userEvaluation,
-			shareRedPackets,
+			// shareRedPackets,
 			home,
 			guaranteeTemplate,
 			copyPassword,
@@ -1108,11 +1108,11 @@
 					that.$set(that, 'svipPrice', res.data.show_svip_info && res.data.show_svip_info.show_svip_price || false);	
 					if(res.data.is_wholesale==1){
 						// 批发
-						that.productType = 1
+						that.productType = 2
 					}
 					if(res.data.is_retail==1){
 						// 零售
-						that.productType = 2
+						that.productType = 1
 					}
 					uni.setNavigationBarTitle({
 						title: storeInfo.store_name.substring(0, 7) + "..."
diff --git a/pages/user/index.vue b/pages/user/index.vue
index fe6879c..df86d31 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -60,9 +60,9 @@
 								<view class="icon">
 									<image src="/static/images/edit.png" mode=""></image>
 								</view>
-								<!-- <view style="margin-left: 30rpx;">
-									推荐人：{{recommendPeopleText}}
-								</view> -->
+								<view style="margin-left: 30rpx;" v-if="userInfo.spread_name">
+									推荐人：{{userInfo.spread_name}}
+								</view>
 							</view>
 							<view class="phone" v-if="!userInfo.phone && isLogin" @tap="bindPhone">绑定手机号</view>
 						</view>
@@ -162,14 +162,14 @@
 				</view>
 			
 				<view class="user-menus shequn" @click="goOtherPage('/pages/users/promoter-list/index')">
-					<view class="title skeleton-rect">我的社群<text class="iconfont icon-xiangyou" style="font-size:24rpx"></text></view>
+					<view class="title skeleton-rect">我的下级<text class="iconfont icon-xiangyou" style="font-size:24rpx"></text></view>
 					<view class="sqContent">
 						<view class="sqItem">
-							<view class="num">{{userInfo.bd_spread_count}}</view>
+							<view class="num">{{userInfo.bd_spread_count||0}}</view>
 							<view class="txt">累计人群</view>
 						</view>
 						<view class="sqItem">
-							<view class="num">{{userInfo.bd_spread_pay_price}}</view>
+							<view class="num">{{userInfo.bd_spread_pay_price||0}}</view>
 							<view class="txt">今日营业额</view>
 						</view>
 					</view>
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index f3af2a0..f4adfaf 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view :style="viewColor">
 		<view class='order-submission'>
-			<view v-if="allow_address && order_model == 0&&productType!=1" class="allAddress" @click="onAddress">
+			<view v-if="allow_address && order_model == 0&&productType!=2" class="allAddress" @click="onAddress">
 				<view class='address acea-row row-between-wrapper' v-if='shippingType == 0 '>
 					<view class='addressCon' v-if="addressInfo.real_name">
 						<view class='name'>
@@ -144,7 +144,7 @@
 							<view class='discount' v-else>免运费</view>
 						</view>
 						<view class='item acea-row row-between-wrapper'
-							v-if="order_type != 3 && order_type != 4 && item.order.enabledCoupon">
+							v-if="order_type != 3 && order_type != 4 && item.order.enabledCoupon &&productType==2">
 							<view>店铺优惠券</view>
 							<block v-if="item.coupon.length>0">
 							<!-- @tap='couponTap(item,index)' -->
@@ -343,7 +343,7 @@
 					</view>
 				</form>
 			</view>
-			<view class="orderType" v-if="productType!=1">
+			<view class="orderType" v-if="productType!=2">
 				<view class="orderTypeTitle">
 					订单类型
 				</view>
@@ -423,7 +423,7 @@
 					</view>
 				</view>
 				<view class='item acea-row row-between-wrapper'
-					v-if="order_type != 3 && order_type != 4 && enabledPlatformCoupon">
+					v-if="order_type != 3 && order_type != 4 && enabledPlatformCoupon &&productType==2">
 					<view>平台优惠券<text @tap="showCoupon" class="iconfont icon-wenhao1"></text></view>
 					<block v-if="platformCoupon.length > 0">
 					 <!-- @tap='couponTap2(platformCoupon,0)' -->
@@ -1074,10 +1074,10 @@
 					if(res.data.order[0]&&res.data.order[0].list[0]&&res.data.order[0].list[0].product){
 						if(res.data.order[0].list[0].product.is_retail==1){
 							// 零售
-							that.productType = 2
+							that.productType = 1
 						}else if(res.data.order[0].list[0].product.is_wholesale==1){
 							// 批发
-							that.productType = 1
+							that.productType = 2
 						}else{
 							// 普通
 							that.productType = null
@@ -1583,7 +1583,7 @@
 						title: '请阅读并勾选协议，否则无法进行操作'
 					});
 				}
-				if(!that.orderType&&that.productType!=1){
+				if(!that.orderType&&that.productType!=2){
 					return that.$util.Tips({
 						title: '请选择订单类型'
 					});
@@ -1689,7 +1689,7 @@
 					return_url: 'http://' + window.location.host + '/pages/users/order_list/index',
 					// #endif
 				};
-				if(this.productType==2){
+				if(this.productType==1){
 					// gift_type:this.orderType,
 					this.$set(data,'gift_type',this.orderType)
 				}
diff --git a/pages/users/order_list1/index.vue b/pages/users/order_list1/index.vue
index 4d22499..14ef556 100644
--- a/pages/users/order_list1/index.vue
+++ b/pages/users/order_list1/index.vue
@@ -11,16 +11,16 @@
 					<view>全部</view>
 					<view class='num'>{{orderData.all || 0}}</view>
 				</view>
-				<view class='item' :class='orderStatus==0 ? "on": ""' @click="statusClick(1)">
+				<view class='item' :class='orderStatus==0 ? "on": ""' @click="statusClick(0)">
 					<view>待付款</view>
 					<view class='num'>{{orderData.noPay || 0}}</view>
 				</view>
-				<view class='item' :class='orderStatus==1 ? "on": ""' @click="statusClick(12)">
+				<view class='item' :class='orderStatus==1 ? "on": ""' @click="statusClick(1)">
 					<view>寄售中</view>
 					<view class='num'>{{orderData.noPostage || 0}}</view>
 				</view>
-				<view class='item' :class='orderStatus==2 ? "on": ""' @click="statusClick(13)">
-					<view>已完成</view>
+				<view class='item' :class='orderStatus==2 ? "on": ""' @click="statusClick(2)">
+					<view>已完成</view> 
 					<view class='num '>{{orderData.noDeliver || 0}}</view>
 				</view>
 				
@@ -141,7 +141,7 @@
 									</view>
 									<view v-if="item.status == 0" class='t-color'>
 										<text v-if="item.order_type==1">{{item.takeOrderCount > 0 ? '部分核销' : '待核销'}}</text>
-										<text v-else>待发货</text>
+										<text v-else>寄售中</text>
 									</view>
 									<view v-if="item.status == 1" class='t-color'>待收货</view>
 									<view v-if="item.status == 2" class='t-color'>待评价</view>
@@ -404,7 +404,7 @@
 			 */
 			getOrderData: function() {
 				let that = this;
-				orderData({order_type:1}).then(res => {
+				orderData({order_type:2}).then(res => {
 					that.$set(that, 'orderData', res.data);
 				})
 			},
@@ -537,7 +537,7 @@
 							page: that.page,
 							limit: that.limit,
 							// is_burst:1,
-							order_type:1
+							order_type:2
 						}).then(res => {
 							that.isReady = true;
 							let list = res.data.list || [];
@@ -552,12 +552,12 @@
 						})
 					} else {
 						getOrderList({
-							// status: that.orderStatus - 1,
-							status: that.orderStatus ,
+							status: that.orderStatus - 1,
+							// status: that.orderStatus ,
 							page: that.page,
 							limit: that.limit,
 							// is_burst:1,
-							order_type:1
+							order_type:2
 						}).then(res => {
 							let list = res.data.list || [];
 							let loadend = list.length < that.limit;
@@ -585,6 +585,7 @@
 					status: 10,
 					page: 1,
 					limit: 1,
+					order_type:2
 				}).then(res => {
 					let list = res.data.list || [];
 					that.presellOrderCount = res.data.count;
diff --git a/pages/users/promoter-list/index.vue b/pages/users/promoter-list/index.vue
index 3e0b045..7c50fcf 100644
--- a/pages/users/promoter-list/index.vue
+++ b/pages/users/promoter-list/index.vue
@@ -15,8 +15,8 @@
 				<view :class="grade == 1 ? 'item on' : 'item'" @click='setType(1)'>二级({{userInfo.two_level_count}})</view>
 			</view> -->
 			<timeSlot @changeTime="changeTime"></timeSlot>
-			<view class='list'>
-				<view class="sortNav acea-row row-middle">	
+			 <view class='list'>
+				<!-- <view class="sortNav acea-row row-middle">	
 					<view class="sortItem" @click='setSort("spread_count ASC")' v-if="sort == 'spread_count DESC'">团队排序
 						<image :src="domain+'/static/diy/sort1'+keyColor+'.png'"></image>
 					</view>
@@ -44,7 +44,7 @@
 					<view class="sortItem" @click='setSort("pay_count DESC")' v-else>订单排序
 						<image :src="`${domain}/static/images/sort2.png`"></image>
 					</view>
-				</view>
+				</view> -->
 				<block v-for="(item,index) in recordList" :key="index">
 					<view class='item acea-row row-between-wrapper'>
 						<view class="picTxt acea-row row-between-wrapper">
@@ -128,7 +128,15 @@
 			getUserInfo(){
 				spreadInfo().then(res => {
 					this.userInfo = res.data
-				});
+				}).catch(res=>{
+					uni.showToast({
+						title: res,
+						icon: 'none'
+					})
+					setTimeout(()=>{
+						uni.navigateBack(-1)
+					},2000)
+				});;
 			},
 			setSort: function(sort) {
 				let that = this;
@@ -195,7 +203,7 @@
 					that.status = limit > len;
 					that.page = page + 1;
 					that.$set(that, 'recordList', recordListNew);
-				});
+				})
 			}
 		},
 		onReachBottom: function() {
diff --git a/pages/users/user_cash/index.vue b/pages/users/user_cash/index.vue
index 9416b3f..8c92463 100644
--- a/pages/users/user_cash/index.vue
+++ b/pages/users/user_cash/index.vue
@@ -47,8 +47,8 @@
 								 type='digit' v-model="extract_price"></input></view>
 						</view>
 						<view class='item acea-row row-between-wrapper'>
-							<view class='name'>提现手续费</view>
-							<view class='input'>1.2</view>
+							<view class='name'>提现手续费率</view>
+							<view class='input'>{{userInfo.extract_fee_rate}}%</view>
 						</view>
 						<view class='tip mt25'>
 							当前可提现金额: <text class="price">￥{{userInfo.brokerage_price}},</text>冻结佣金：￥{{userInfo.lock_brokerage}}
@@ -540,7 +540,7 @@
 		}
 	}
 	.cash-withdrawal .wrapper .list .item .name {
-		width: 160rpx;
+		width: 180rpx;
 	}
 	.cash-withdrawal .wrapper .list .item .input {
 		width: 505rpx;
diff --git a/pages/users/user_info/index.vue b/pages/users/user_info/index.vue
index fe99b17..367e8e8 100644
--- a/pages/users/user_info/index.vue
+++ b/pages/users/user_info/index.vue
@@ -122,7 +122,8 @@
 					<!--#endif-->
 				</view>
 				<!-- #ifdef H5 -->
-				<view class="logOut acea-row row-center-wrapper" @click="outLogin" v-if="!this.$wechat.isWeixin()">退出登录</view>
+				<!-- v-if="!this.$wechat.isWeixin()" -->
+				<view class="logOut acea-row row-center-wrapper" @click="outLogin">退出登录</view>
 				<!-- #endif -->
 				<!-- #ifdef MP || APP-PLUS -->
 				<view class="logOut acea-row row-center-wrapper" @click="outLogin">退出登录</view>
diff --git a/utils/request.js b/utils/request.js
index dc3c245..493e6e2 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -85,6 +85,7 @@ function baseRequest(url, method, data, {
 			header: header,
 			data: data || {},
 			success: (res) => {
+				
 				if (res.data && res.data.encode) {
 					try
 					{
@@ -97,6 +98,14 @@ function baseRequest(url, method, data, {
 					reslove(res.data, res);
 				else if (res.data.status == 200)
 					reslove(res.data, res);
+				else if (res.data.status != 200){
+					uni.showToast({
+						title:res.data.message ,
+						icon: 'none'
+					})
+					reject(res.data);
+				}
+					
 				else if ([410000, 410001, 410002, 40000].indexOf(res.data.status) !== -1) {
 					toLogin();
 					reject(res.data);