2023-12-6

api/user.js

@@ -198,6 +198,19 @@ export function getIntegralList(q) {
 	return request.get("integral/list", q);
 }
 
+/*
+ * 活动积分
+ * */
+export function getIntegralListAction(q) {
+	return request.get(`award_integral/${q.type}`, q);
+}
+/*
+ * 立即出局
+ * */
+export function getIntegralListActionOut(q) {
+	return request.post(`award_integral/${q.id}`);
+}
+
 /**
  * 获取分销海报图片
  * 

manifest.json

@@ -208,7 +208,12 @@
     },
     "h5" : {
         "devServer" : {
-            "https" : false
+            "https" : false,
+            "proxy" : {
+                "^/api" : {
+                    "target" : "https://www.senyinkj.cn"
+                }
+            }
         },
         "router" : {
             "mode" : "history",

pages.json

@@ -395,6 +395,26 @@
             }
           }
         },
+		{
+		  "path": "user_integral/integral",
+		  "style": {
+		    "navigationBarTitleText": "积分详情"
+		
+		      // #ifdef MP
+		      ,
+		    "navigationBarTextStyle": "black",
+		    "navigationBarBackgroundColor": "#FFFFFF"
+		      // #endif
+		      ,
+		    "app-plus": {
+		      // #ifdef APP-PLUS
+		      "titleNView": {
+		        "type": "default"
+		      }
+		      // #endif
+		    }
+		  }
+		},
         {
           "path": "user_coupon/index",
           "style": {

pages/user/index.vue

@@ -193,27 +193,39 @@
           <view class="num-wrapper"
             :class="[member_style==3?'unNum-wrapper':member_style==2?'Tnum-wrapper':'',((vip_type==2 && stu) || (vip_type==1 && memberStatus))?'':'height']"
             v-if="userInfo.uid">
-            <view class="num-item" v-show="userInfo.balance_func_status"
+           <!-- <view class="num-item" v-show="userInfo.balance_func_status"
               @click="goMenuPage('/pages/users/user_money/index')">
               <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> -->
+            <!-- <view class="num-item" @click="goMenuPage('/pages/users/user_coupon/index')">
               <text class="num">{{userInfo.couponCount || 0}}</text>
               <view class="txt">优惠券</view>
+            </view> -->
+            <view class="num-item" @click="goMenuPage('/pages/users/user_integral/integral')">
+              <text class="num">{{userInfo.action_integral || 0}}</text>
+              <view class="txt">动态积分</view>
             </view>
-            <view class="num-item" @click="goMenuPage('/pages/users/user_integral/index')">
-              <text class="num">{{userInfo.integral || 0}}</text>
-              <view class="txt">积分</view>
-            </view>
-            <view class="num-item" @click="goMenuPage('/pages/users/user_goods_collection/index')">
+			<view class="num-item" @click="goMenuPage('/pages/users/user_integral/integral')">
+			  <text class="num">{{userInfo.static_integral || 0}}</text>
+			  <view class="txt">静态积分</view>
+			</view>
+			<view class="num-item">
+			  <text class="num">{{userInfo.integral_price || 0}}</text>
+			  <view class="txt">现价</view>
+			</view>
+			<view class="num-item">
+			  <text class="num">{{userInfo.award_lack || 0}}</text>
+			  <view class="txt">奖金池</view>
+			</view>
+           <!-- <view class="num-item" @click="goMenuPage('/pages/users/user_goods_collection/index')">
               <text class="num">{{userInfo.collectCount || 0}}</text>
               <view class="txt">收藏</view>
             </view>
             <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>
           <!-- 新人礼物 -->
           <view class="num-wrapper on" v-if="!userInfo.uid">
@@ -1023,7 +1035,10 @@
       getUserInfo: function() {
         let that = this;
         getUserInfo().then(res => {
-          that.userInfo = res.data
+          that.userInfo = res.data;
+		  that.userInfo.integral_price = (+res.data.integral_price).toFixed(2);
+		  that.userInfo.static_integral = (+res.data.static_integral).toFixed(2);
+		  that.userInfo.action_integral = (+res.data.action_integral).toFixed(2);
           that.stu = res.data.svip_open
 					that.memberStatus = parseInt(res.data.member_func_status)
           that.vipStatus = res.data.vip_status

pages/users/user_spread_user/index.vue

@@ -96,6 +96,17 @@
 					立即提现
 				</view>
 			</view>
+			<view class="price-box" >
+				<view class="box-top">
+					<view >
+						团队业绩
+					</view>
+				</view>
+				<view class="com-count">
+					{{userInfo.achievement || 0.00}}
+				</view>
+			</view>
+			
 			<view class="statistics">
 				<view class="item mb" @click="jumbPath(9)">
 					<view class="img">