2024-4-9

pages.json

@@ -251,7 +251,7 @@
 		{
 			"path": "pages/user/award",
 			"style": {
-				"navigationBarTitleText": "我的佣金",
+				"navigationBarTitleText": "绿色积分",
 				"app-plus": {
 					"titleNView": {
 						"type": "transparent"
@@ -352,7 +352,7 @@
 		{
 			"path": "pages/money/withdrawal",
 			"style": {
-				"navigationBarTitleText": "提现"
+				"navigationBarTitleText": "绿色积分提现"
 			}
 		},
 		{

pages/index/index.vue

@@ -51,7 +51,7 @@
 			<view class="jx-box-title"><image src="../../static/sy/sy03.png" mode=""></image></view>
 			<view class="jx-box-img"><image src="../../static/sy/sy09.png" mode=""></image></view>
 		</view>
-		<view class="jx-box-content" v-for="(item, index) in bastList">
+		<!-- <view class="jx-box-content" v-for="(item, index) in bastList">
 			<view class="content-left"><image :src="item.image" mode=""></image></view>
 			<view class="content-right">
 				<view class="shop-name">{{ item.store_name }}</view>
@@ -67,11 +67,11 @@
 					<view class="shop-content-right" @click="navToDetailPagevip(item)">购买升级</view>
 				</view>
 			</view>
-		</view>
-		<view class="more" @click="navTo('/pages/product/vip')">
+		</view> -->
+		<!-- <view class="more" @click="navTo('/pages/product/vip')">
 			<view class="more-font">查看更多</view>
 			<image class="more-icon" src="../../static/img/img39.png" mode=""></image>
-		</view>
+		</view> -->
 		<view class="xian"></view>
 		<view class="product-box" v-if="shoplist.length != 0">
 			<view class="product-title">
@@ -82,7 +82,10 @@
 			<view class="hotgoods">
 				<view class="hotgoods-item" v-for="item in shoplist" :key="item.id" @click="navToDetailPage(item)">
 					<view class="image-wrapper"><image class="image" :src="item.image" mode="scaleToFill"></image></view>
-					<view class="title clamp2">{{ item.store_name }}</view>
+					<view class="title clamp">{{ item.store_name }}</view>
+					<view class="redRange">
+						分红额度：{{item.give_award_range}}
+					</view>
 					<view class="hot-price">
 						<!-- <view class="hotPrice-box">会员价</view> -->
 						<view class="price">
@@ -277,12 +280,12 @@ export default {
 					uni.stopPullDownRefresh();
 				});
 		},
-		getvip() {
-			getProducts({ cid: 52, page: 1, limit: 10 }).then(({ data }) => {
-				this.bastList = data; //会员礼包
-				console.log(this.bastList, '123456');
-			});
-		},
+		// getvip() {
+		// 	getProducts({ cid: 52, page: 1, limit: 10 }).then(({ data }) => {
+		// 		this.bastList = data; //会员礼包
+		// 		console.log(this.bastList, '123456');
+		// 	});
+		// },
 		//轮播图切换修改背景色
 		swiperChange(e) {
 			const index = e.detail.current;
@@ -634,6 +637,11 @@ page,
 				font-weight: 500;
 				color: #333333;
 			}
+			.redRange{
+				font-size: $font-sm;
+				margin-left: 15rpx;
+				color: #999999;
+			}
 
 			.titlee {
 				margin-left: 15rpx;

pages/money/trade.vue

@@ -28,7 +28,7 @@
 
 <script>
 import { getMoneyStyle } from '@/utils/rocessor.js';
-import { tradeList } from '@/api/wallet.js';
+import { trade } from '@/api/wallet.js';
 import { getUserInfo } from '@/api/user.js';
 import { mapState, mapMutations } from 'vuex';
 export default {
@@ -64,6 +64,13 @@ export default {
 				});
 				return
 			}
+			if(!this.withdrawal){
+				uni.showToast({
+					title: '请输入转账额度',
+					icon:'error'
+				});
+				return
+			}
 			let data = {
 				num: this.withdrawal, //金额
 				uid: this.userid //0佣金1余额

pages/money/withdrawal.vue

@@ -4,8 +4,8 @@
 		<view class="content-money">
 			<view class="flex " style="width: 750rpx;justify-content: space-around;margin-left: 0;">
 				<view class="buttom">
-					<view class="icon">{{ userInfo.cash | getMoneyStyle }}</view>
-					<text class="text">可提现现金</text>
+					<view class="icon">{{ userInfo.brokerage_price | getMoneyStyle }}</view>
+					<text class="text">可提现绿色积分</text>
 				</view>
 			</view>
 		</view>
@@ -15,7 +15,7 @@
 			<view class="row">
 				<text class="tit">￥</text>
 				<input class="input" type="number" v-model="withdrawal" :placeholder="'最低提现金额' + minPrice + '元'" placeholder-class="placeholder" />
-				<view class="buttom" @click="withdrawal = userInfo.cash">全部提现</view>
+				<view class="buttom" @click="withdrawal = userInfo.brokerage_price">全部提现</view>
 			</view>
 		</view>
 		<!-- #ifndef MP-WEIXIN -->
@@ -182,7 +182,6 @@ export default {
 				data.alipay_code = this.alipay_code;
 			}
 			if (this.type == 'bank') {
-				console.log(bank);
 				data.name = this.bank_people;
 				data.bankname = this.bank_name;
 				data.cardnum = this.bank_code;

pages/shoping/list.vue

@@ -42,7 +42,7 @@
 						<view class="shopm-title">
 							<view class="shopmt-font clamp">{{ item.name }}</view>
 						</view>
-						<view class="address">分红额度：{{+item.give_award_range_ratio}}</view>
+						<view class="address margin-t-10 text-success">分红额度：{{+item.give_award_range_ratio}}</view>
 						<view class="shopmt-tip">{{ item.detailed_address }}</view>
 					</view>
 					<view class="right">

pages/user/award.vue

@@ -4,7 +4,7 @@
 			<view class="status_bar"><!-- 这里是状态栏 --></view>
 			<view class="body-title">
 				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
-				<view class="header">我的佣金</view>
+				<view class="header">绿色积分</view>
 			</view>
 			<view class="content-bg"><image src="../../static/img/my-bg.png" mode=""></image></view>
 			<view class="money-box">
@@ -12,7 +12,7 @@
 				<view>余额</view>
 			</view>
 			<view class="money-btn" @click="navto('/pages/money/withdrawal')">
-				佣金提现
+				绿色积分提现
 				<text>></text>
 			</view>
 		</view>

pages/user/tradeList.vue

@@ -175,8 +175,8 @@
 					}) => {
 						obj.recharge = data.sr;
 						obj.orderStatusSum = data.zc;
+						navItem.orderList = navItem.orderList.concat(data.data);
 						if (data.data.length == navItem.limit) {
-							navItem.orderList = navItem.orderList.concat(data.data);
 							navItem.page++;
 							navItem.loadingType = 'more';
 						} else {
@@ -446,6 +446,7 @@
 		right: 0;
 		margin: 0 auto;
 	}
+
 	.money-btn {
 		position: relative;
 		z-index: 2;
@@ -456,7 +457,7 @@
 		font-family: PingFang SC;
 		font-weight: bold;
 		color: #ffffff;
-	
+
 		text {
 			display: inline-block;
 			padding-left: 10rpx;

pages/user/user.vue

@@ -13,6 +13,7 @@
 					<view class="user-font">
 						<view class="name clamp">{{ userInfo.nickname }}</view>
 						<view class="phone">{{ userInfo.phone }}</view>
+						<view class="phone uid">UID：{{ userInfo.uid }}</view>
 					</view>
 				</view>
 				<view class="kpi" v-if="userInfo.level != 0">
@@ -42,16 +43,16 @@
 			<view class="main flex">
 				<view class="item" @click="navTo('/pages/user/award')">
 					<view class="item-num">{{ userInfo.brokerage_price }}</view>
-					<view class="item-font">我的佣金</view>
+					<view class="item-font">绿色积分</view>
 				</view>
-				<view class="item" @click="navTo('/pages/user/scoreAccumulate')">
+				<!-- <view class="item" @click="navTo('/pages/user/scoreAccumulate')">
 					<view class="item-num">{{ userInfo.integral }}</view>
 					<view class="item-font">我的积分</view>
-				</view>
-				<view class="item" @click="navTo('/pages/user/cash')">
+				</view> -->
+				<!-- <view class="item" @click="navTo('/pages/user/cash')">
 					<view class="item-num">{{ userInfo.voucher }}</view>
 					<view class="item-font">抵用券</view>
-				</view>
+				</view> -->
 				<view class="item" @click="navTo('/pages/user/tradeList')">
 					<view class="item-num">{{ userInfo.award_range }}</view>
 					<view class="item-font">分红额度</view>
@@ -473,9 +474,12 @@ page {
 				.phone {
 					margin-top: 10rpx;
 					font-size: 20rpx;
-					font-family: PingFang SC;
 					font-weight: 500;
 					color: #999999;
+					&.uid{
+						font-size: 32rpx;
+						font-weight: bold;
+					}
 				}
 			}
 		}
@@ -578,6 +582,7 @@ page {
 		.item {
 			padding-bottom: 20rpx;
 			width: 33%;
+			flex-grow: 1;
 			display: flex;
 			flex-direction: column;
 			align-items: center;