Browse Source

添加红色积分绿色积分明细页面

pangqijun 2 years ago
parent
commit
e6f7033c1c
5 changed files with 381 additions and 10 deletions
  1. 14 0
      api/user.js
  2. 40 3
      pages.json
  3. 7 7
      pages/user/index.vue
  4. 161 0
      pages/users/user_green_integral/index.vue
  5. 159 0
      pages/users/user_red_integral/index.vue

+ 14 - 0
api/user.js

@@ -159,6 +159,20 @@ export function getIntegralList(q) {
 	return request.get("integral/list", q);
 }
 
+/*
+ * 红色积分记录
+ * */
+export function getRedIntegralList(q) {
+	return request.get("/v1/re/integralList", q);
+}
+
+/*
+ * 红色积分记录
+ * */
+export function getGreenIntegralList(q) {
+	return request.get("/v1/userTicket-page", q);
+}
+
 /**
  * 获取分销海报图片
  * 

+ 40 - 3
pages.json

@@ -645,6 +645,44 @@
 						}
 					}
 				},
+				{
+					"path": "user_red_integral/index",
+					"style": {
+						"navigationBarTitleText": "红色积分明细"
+						// #ifdef MP
+					,
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#FFFFFF"
+						// #endif
+					,
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "user_green_integral/index",
+					"style": {
+						"navigationBarTitleText": "绿色积分明细"
+						// #ifdef MP
+					,
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#FFFFFF"
+						// #endif
+					,
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
 				{
 					"path": "user_coupon/index",
 					"style": {
@@ -973,8 +1011,7 @@
 						"navigationBarTextStyle": "#fff"
 						// #endif
 					}
-				}
-			]
+				}]
 		},
 		{
 			"root": "pages/goods_details",
@@ -1316,4 +1353,4 @@
 			}
 		]
 	}
-}
+}

+ 7 - 7
pages/user/index.vue

@@ -115,12 +115,12 @@
 								<text class="num">{{userInfo.collectCount || 0}}</text>
 								<view class="txt">{{$t('收藏')}}</view>
 							</view>
-							<view class="num-item" @click="goMenuPage('/pages/users/user_coupon/index')">
+							<view class="num-item" @click="goMenuPage('/pages/users/user_green_integral/index')">
 								<text class="num">{{userInfo.ticket || 0}}</text>
 								<view class="txt">{{$t('绿色积分')}}</view>
 							</view>
-							<view class="num-item" @click="goMenuPage('/pages/users/user_integral/index')">
-								<text class="num">{{userInfo.redMoney || 0}}</text>
+							<view class="num-item" @click="goMenuPage('/pages/users/user_red_integral/index')">
+								<text class="num">{{userInfo.integral || 0}}</text>
 								<view class="txt">{{$t('红色积分')}}</view>
 							</view>
 						</view>
@@ -237,9 +237,9 @@
 						<!-- #endif -->
 						<!-- #ifdef MP -->
 						<block v-for="(item,index) in MyMenus" :key="index">
-							<view class="item" v-if="item.url!='#' 
-							&& item.url!='/pages/service/index' 
-							&& item.url!='/pages/extension/customer_list/chat' 
+							<view class="item" v-if="item.url!='#'
+							&& item.url!='/pages/service/index'
+							&& item.url!='/pages/extension/customer_list/chat'
 							|| (item.url=='/pages/extension/customer_list/chat' && routineContact == 0)"
 								@click="goMenuPage(item.url, item.name)">
 								<image :src="item.pic"></image>
@@ -578,7 +578,7 @@ export default {
 			toLogin();
 		},
 		/**
-		 * 
+		 *
 		 * 获取个人中心图标
 		 */
 		switchTab(order) {

File diff suppressed because it is too large
+ 161 - 0
pages/users/user_green_integral/index.vue


File diff suppressed because it is too large
+ 159 - 0
pages/users/user_red_integral/index.vue


Some files were not shown because too many files changed in this diff