2023-10-=18

manifest.json

@@ -2,8 +2,8 @@
     "name" : "壹柒科技",
     "appid" : "__UNI__B0B5BE7",
     "description" : "壹柒科技",
-    "versionName" : "2.6.4",
-    "versionCode" : 266,
+    "versionName" : "2.6.9",
+    "versionCode" : 269,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/index/index.vue

@@ -485,9 +485,18 @@
 			...mapMutations(['SET_AUTOPLAY']),
 			// #ifdef H5
 			domApp() {
-				getAppVersion().then((res)=>{
-					window.open(res.data.apk)
-				})
+				const bool = navigator.userAgent.toLowerCase().match(/MicroMessenger/i) == 'micromessenger';
+				if (bool) {
+					uni.showModal({
+						title: '提示',
+						content: '无法在微信中下载，请用浏览器打开下载',
+						showCancel: false,
+					});
+				} else {
+					getAppVersion().then((res) => {
+						window.open(res.data.apk)
+					})
+				}
 			},
 			// #endif
 			// 授权关闭

pages/user/index.vue

@@ -251,7 +251,22 @@
 							<text class="num">{{userInfo.now_money || 0}}</text>
 							<view class="txt">余额</view>
 						</view>
-						<view class="num-item" @click="goMenuPage('/pages/users/user_coupon/index')">
+						<view class="num-item"
+							@click="goMenuPage('/pages/users/user_spread_user/index')">
+							<text class="num">{{userInfo.commissionCount || 0}}</text>
+							<view class="txt">可提现</view>
+						</view>
+						<view class="num-item"
+							@click="goMenuPage('/pages/users/user_spread_user/index')">
+							<text class="num">{{userInfo.wait_brokerage || 0}}</text>
+							<view class="txt">待确认</view>
+						</view>
+						<view class="num-item"
+							@click="goMenuPage('/pages/users/user_spread_user/index')">
+							<text class="num">{{userInfo.extract_price || 0}}</text>
+							<view class="txt">已提现</view>
+						</view>
+						<!-- <view class="num-item" @click="goMenuPage('/pages/users/user_coupon/index')">
 							<text class="num">{{userInfo.couponCount || 0}}</text>
 							<view class="txt">优惠券</view>
 						</view>
@@ -266,7 +281,7 @@
 						<view class="num-item" @click="goMenuPage('/pages/users/visit_list/index')">
 							<text class="num">{{userInfo.visit_num || 0}}</text>
 							<view class="txt">浏览记录</view>
-						</view>
+						</view> -->
 					</view>
 					
 					<!-- 新人礼物 -->

pages/users/user_integral/base.vue

@@ -3,7 +3,7 @@
 	<view>
 		<view class='integral-details' :style="colorStyle">
 			<view class='header'>
-				<view class='currentScore'>当前积分</view>
+				<view class='currentScore'>当前母积分</view>
 				<view class="scoreNum">{{userInfo.base_integral}}</view>
 				<view class='line'></view>
 				<!-- <view class='nav acea-row'>
@@ -46,7 +46,7 @@
 						<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
 					</view>
 					<view v-if="integralList.length == 0">
-						<emptyPage title="暂无积分记录哦～"></emptyPage>
+						<emptyPage title="暂无母积分记录哦～"></emptyPage>
 					</view>
 				</view>
 				<!-- <view class='list2' :hidden='current!=1'>