添加：菜卡额度变更明细查看

添加：菜卡转赠功能

api/exchange.js

@@ -45,8 +45,8 @@ export function getUserExchangeQrcode() {
 	return request.get(`exchange/user_qr_code`);
 }
 // 额度变更记录 - 统计
-export function recordQuota() {
-	return request.get(`exchange/record_quota`);
+export function recordQuota(data) {
+	return request.get(`exchange/record_quota`,data);
 }
 // 额度变更记录 - 列表
 export function recordQuotaList(data) {

pages.json

@@ -560,13 +560,13 @@
 				{
 					"path": "online_payment/record/quota",
 					"style": {
-						"navigationBarTitleText": "酒卡额度变更记录"
+						"navigationBarTitleText": "额度变更记录"
 					}
 				},
 				{
 					"path": "online_payment/record/quota_transfer",
 					"style": {
-						"navigationBarTitleText": "酒卡额度转赠"
+						"navigationBarTitleText": "额度转赠"
 					}
 				},
 				{

pages/user/index.vue

@@ -68,10 +68,14 @@
 						<!--	<text class="num">{{userInfo.total_collect_store || 0}}</text>-->
 						<!--	<view class="txt">关注店铺</view>-->
 						<!--</view>-->
-						<view class="num-item" @click="goMenuPage('/pages/users/browsingHistory/index')">
-							<text class="num">{{userInfo.total_visit_product || 0}}</text>
-							<view class="txt">浏览记录</view>
-						</view>
+						<!--<view class="num-item" @click="goMenuPage('/pages/users/browsingHistory/index')">-->
+						<!--	<text class="num">{{userInfo.total_visit_product || 0}}</text>-->
+						<!--	<view class="txt">浏览记录</view>-->
+						<!--</view>-->
+            <view class="num-item" @click="goMenuPage('/pages/users/online_payment/record/quota?quota_type=2')">
+              <text class="num">{{userInfo.vegetable_available || 0}}</text>
+              <view class="txt">菜卡额度</view>
+            </view>
             <view class="num-item" @click="goMenuPage('/pages/users/online_payment/record/quota')">
               <text class="num">{{userInfo.available || 0}}</text>
               <view class="txt">酒卡额度</view>

pages/users/online_payment/record/quota.vue

@@ -10,7 +10,7 @@
       </view>
     </view>
     <!--转赠按钮-->
-    <view class="transfer-quota" @click="goMenuPage('/pages/users/online_payment/record/quota_transfer')">
+    <view class="transfer-quota" @click="goMenuPage">
       <view class="transfer-text">转赠</view>
     </view>
     <!--列表记录-->
@@ -51,22 +51,30 @@ export default{
       list: [],
       searchData: {
         page: 1,
-        limit: 20
+        limit: 20,
+        quota_type: 1,
       },
       total_page: 0,
       allow_page: false,
     }
   },
   onLoad(options){
+    this.searchData.quota_type = options.quota_type || 1;
+    uni.setNavigationBarTitle({
+      title: this.searchData.quota_type == 2 ? '菜卡额度变更记录' : '酒卡额度变更记录'
+    })
+    // this.getStatistics();
+    // this.getList();
+  },
+  onShow() {
     this.getStatistics();
     this.getList();
   },
-  onShow() {},
   methods:{
     // 统计获取
     getStatistics(){
       let _this = this;
-      recordQuota().then(res => {
+      recordQuota({ quota_type: _this.searchData.quota_type }).then(res => {
         this.statistics_list = res.data || {};
       });
     },
@@ -86,10 +94,10 @@ export default{
       })
     },
     // 页面跳转
-    goMenuPage(url) {
+    goMenuPage() {
       if (this.isLogin) {
         uni.navigateTo({
-          url
+          url: '/pages/users/online_payment/record/quota_transfer?quota_type=' + this.searchData.quota_type
         })
       } else {
         this.openAuto()

pages/users/online_payment/record/quota_transfer.vue

@@ -98,6 +98,7 @@ export default {
   },
   data() {
     return {
+      quota_type: 1,
       // 登录相关
       isAuto: false, //没有授权的不会自动授权
       isShowAuth: false,//是否隐藏授权
@@ -123,6 +124,10 @@ export default {
     ...mapGetters(['isLogin', 'uid', 'userInfo', 'viewColor'])
   },
   onLoad(options) {
+    this.quota_type = options.quota_type || 1;
+    uni.setNavigationBarTitle({
+      title: this.quota_type == 2 ? '菜卡额度转赠' : '酒卡额度转赠'
+    })
     // 判断：是否登录
     if (!this.isLogin) {
       // 未登录  授权登录
@@ -184,15 +189,13 @@ export default {
     // 获取用户持有信息
     getUserInfo(){
       let _this = this;
-      pointUserInfo()
-          .then(res => {
-            _this.pointUserInfo = res.data || {};
-          })
-          .catch(err => {
-            this.$util.Tips({
-              title: err
-            });
-          });
+      pointUserInfo({ quota_type: _this.quota_type }).then(res => {
+        _this.pointUserInfo = res.data || {};
+      }).catch(err => {
+        this.$util.Tips({
+          title: err
+        });
+      });
     },
     // 兑换用户选择 - 显示弹框
     showConsumePopup(){
@@ -230,11 +233,12 @@ export default {
       this.consume_info = item || {};
       this.consumeClosePopup();
     },
-    // 确认付款
+    // 确认转赠
     confirmPayment(){
       let _this = this;
       let payInfo = Object.assign({},_this.pay_info);
       payInfo.transfer_uid = _this.consume_info.uid;
+      payInfo.quota_type = _this.quota_type;
       quotaTransfer(payInfo).then(res => {
         uni.hideLoading();
         this.$util.Tips({