2024-7-5

api/user.js

@@ -839,4 +839,10 @@ export function energyExchange(q) {
 
 export function brokerageImport(q) {
 	return request.post("import/brokerage", q);
-}
+}
+
+// 获取首页信息
+export function loadIndexs(data) {
+	return request.get('index',data);
+}
+

manifest.json

@@ -1,9 +1,9 @@
 {
     "name" : "人人益生121",
-    "appid" : "__UNI__3F43051",
+    "appid" : "__UNI__70BC0AE",
     "description" : "人人益生121",
-    "versionName" : "3.0.0",
-    "versionCode" : 301,
+    "versionName" : "3.0.2",
+    "versionCode" : 302,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -71,7 +71,9 @@
                 "permissionPhoneState" : {
                     "request" : "none",
                     "prompt" : "为保证您正常、安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许"
-                }
+                },
+                "minSdkVersion" : 30,
+                "targetSdkVersion" : 31
             },
             /* ios打包配置 */
             "ios" : {

pages/order_addcart/order_addcart.vue

@@ -155,10 +155,10 @@
 				</view>
 			</view>
 		</view>
-		<view class='px-20'>
-			<!-- 热门推荐显示 -->
+		<!-- 热门推荐显示 -->
+		<!-- <view class='px-20'>
 			<recommend :hostProduct='hostProduct'></recommend>
-		</view>
+		</view> -->
 		<view v-if="cartList.valid.length == 0 && cartList.invalid.length == 0 && loadend"
 			class="h-30"></view>
 		<view v-else class="h-200"></view>

pages/user/index.vue

@@ -23,13 +23,22 @@
 				<view class="num-item">
 					<view class="txt flex">
 						<image class="userIcon" src="../../static/images/user02.png" mode="scaleToFill"></image>
-						<text>分红额度</text>
+						<text>提货额度</text>
 					</view>
-					<text class="num">{{userFhed}}%</text>
+					<text class="num">{{userInfo.award_range}}</text>
 				</view>
-				<view class="payGreenIn" @click="goMenuPage('/pages/users/user_integral/itemuser')">
-					购买绿积分
+				<view class="num-item">
+					<view class="txt flex">
+						<image class="userIcon" src="../../static/images/user04.png" mode="scaleToFill"></image>
+						<text>冻结金</text>
+					</view>
+					<text class="num">{{userInfo.freeze_award}}</text>
 				</view>
+				
+				
+				<!-- <view class="payGreenIn" @click="goMenuPage('/pages/users/user_integral/itemuser')">
+					购买绿积分
+				</view> -->
 				<!-- <view class="num-item" @click="goMenuPage('/pages/users/user_integral/integral')">
 					<text class="num">{{userInfo.static_integral || 0}}</text>
 					<view class="txt">消费分</view>
@@ -45,6 +54,13 @@
 					</view>
 					<text class="num">{{userInfo.red_integral || 0}}</text>
 				</view>
+				<view class="num-item" style="flex-grow: 0;" @click="goMenuPage('/pages/users/user_integral/red')">
+					<view class="txt flex" >
+						<image class="userIcon" src="../../static/images/user05.png" mode="scaleToFill"></image>
+						<text>价格</text>
+					</view>
+					<text class="num">{{indexData.price*1}}</text>
+				</view>
 				<view class="payRedIn ">
 					<view class="targetMoney" @click="goMenuPage('/pages/users/user_integral/redTarget')">
 						转佣金
@@ -117,7 +133,8 @@
 		updateUserInfo,
 		getRandCode,
 		updateWechatInfo,
-		getMenuData
+		getMenuData,
+		loadIndexs
 	} from '@/api/user.js';
 	import {
 		wechatAuthV2,
@@ -173,14 +190,14 @@
 				cartNum: 'cartNum',
 				isLogin: 'isLogin'
 			}),
-			userFhed() {
-				const userInfo = this.userInfo;
-				if (userInfo.award_range) {
-					return +(userInfo.award_range / (userInfo.award_range + userInfo.send_award_range) * 100).toFixed(2);
-				} else {
-					return 0
-				}
-			},
+			// userFhed() {
+			// 	const userInfo = this.userInfo;
+			// 	if (userInfo.award_range) {
+			// 		return +(userInfo.award_range / (userInfo.award_range + userInfo.send_award_range) * 100).toFixed(2);
+			// 	} else {
+			// 		return 0
+			// 	}
+			// },
 		},
 		filters: {},
 		mixins: [colors],
@@ -282,7 +299,8 @@
 						'icon-ic_daituikuan'
 					]
 				},
-				codeImg: ''
+				codeImg: '',
+				indexData:''
 			};
 		},
 		created() {
@@ -323,7 +341,14 @@
 			// #endif
 			this.colorData();
 		},
-		onReady() {},
+		onReady() {
+			loadIndexs().then(({data})=>{
+				this.indexData = data;
+				console.log(data,'data')
+			}).catch((err)=>{
+				console.log(err)
+			})
+		},
 		onShow() {
 			if (!this.isLogin) {
 				this.userInfo = '';
@@ -713,6 +738,7 @@
 		justify-content: flex-end;
 		padding: 0 30rpx;
 		line-height: 1;
+		flex-shrink: 0;
 		.targetMoney.openDetail{
 			padding: 10rpx 0rpx 10rpx 10rpx;
 		}

pages/users/user_address/index.vue

@@ -219,6 +219,23 @@
 			// 获取选中位置
 			chooseLocation: function() {
 				let self = this;
+				const openAddress = uni.getStorageSync('addressOpen')||false;
+				if(!openAddress){
+					uni.showModal({
+						title: '权限申请',
+						content: '是否允许APP使用定位功能用于配送货',
+						success: res => {
+							if(res.confirm){
+								this.openAddress();
+								uni.setStorageSync("addressOpen",true)
+							}
+						},
+					});
+				}else{
+					this.openAddress();
+				}
+			},
+			openAddress(){
 				uni.chooseLocation({
 					success: (res) => {
 						let latitude, longitude;

pages/users/user_integral/red.vue

@@ -10,6 +10,9 @@
 					</view>
 				</view>
 				<view class='line'></view>
+				<view class="leftMoney">
+					积分价值：{{userInfo.red_integral?userInfo.red_integral*indexData.price:0}}
+				</view>
 				<navigator url="./redTarget">
 					<view class="rightGm">
 						<image class="navIcon" src="../../../static/images/greedIcon.png" mode="scaleToFill"></image>
@@ -432,4 +435,12 @@
 			margin-right: 10rpx;
 		}
 	}
+	.leftMoney{
+		text-align: left;
+		font-weight: bold;
+		font-size: 24rpx;
+		padding-left: 30rpx;
+		padding-top: 40rpx;
+	}
+	
 </style>

pages/users/user_integral/redTarget.vue

@@ -27,9 +27,13 @@
 							:maxlength="moneyMaxLeng" placeholder="请输入转到佣金金额" type='digit'
 							placeholder-class='placeholder' v-model="number" name="number"></input></view>
 				</view>
+				<view class="tip">
+					手续费：{{number*userinfo.red_integral_commission/100}}
+				</view>
 				<button class='but bg-color' formType="submit">立即转佣金</button>
 			</view>
 		</form>
+		
 		<!-- 确认框 -->
 		<tuiModal :show="showModal" title="温馨提示" content="确认是否转到佣金？" :maskClosable="false" @click="handleClick">
 		</tuiModal>