vtest 1.1.64 & fix for tid1807

src/pages/menu/forth.vue

@@ -16,7 +16,7 @@
                 <template slot="default">账号管理</template>
                 <template slot="right">
                     <view class="ft-account">
-                        <view class="fc-name"  v-if="loginState">{{ extension.brand_name || '-' }}</view>
+                        <view class="fc-name"  v-if="loginState">{{ accountName || '-' }}</view>
                         <image class="fc-icon" mode="aspectFit" src="/static/images/icon/arrow_b2.png"></image>
                     </view>
                 </template>
@@ -53,7 +53,7 @@ import bottomLogo from "@/subpackage/menu/components/bottom_logo.vue";
 import authorizationLogin from "@/subpackage/authorization/components/login.vue";
 import authorizationUser from "@/subpackage/authorization/components/user_info/impower.vue";
 import { routeTo, debounce, showLoad, hideLoad, showModal, showNone, jsonStr } from "@/utils/util.js";
-import { mapGetters } from 'vuex';
+import { mapGetters, mapState } from 'vuex';
 import { servers } from '../../js/server';
 import { API } from '../../js/api';
 export default {
@@ -66,7 +66,6 @@ export default {
     },
     data(){
         return {
-            brand_id: '',
             // 异步组件加载完成状态
             menuPackageLoaded: false,
             userInfo: {},
@@ -80,12 +79,24 @@ export default {
     },
     computed: {
         ...mapGetters([ 'loginState' ]),
+        ...mapState([ 'brandInfo' ]),
         extension(){
             return this.userInfo?.extension || {}
         },
+        /**
+         * @param {string} permission_type 1:ADMIN-STADIUM 2:ADMIN-BRAND
+         * */ 
+        permissionType(){
+            return this.userInfo?.extension?.permission_type || '';
+        },
+        accountName(){
+            let { permissionType, extension } = this;
+            if(permissionType === 'ADMIN-STADIUM')return extension?.stadium_name ?? '';
+            if(permissionType === 'ADMIN-BRAND')return extension?.brand_name ?? '';
+            return '';
+        }
     },
     onLoad(options){
-        this.brand_id = options?.brand_id ?? '';
         if(this.loginState)this.getUserInfo();
     },
     methods: {
@@ -149,9 +160,9 @@ export default {
         },
         // 投诉建议
         toComplaint(){
-            let { brand_id, loginState, showAuthor } = this;
+            let { loginState, showAuthor, brandInfo } = this;
             if(!loginState)return showAuthor();
-            routeTo(`/subpackage/message/pages/complaint/list?brand_id=${brand_id}`, 'nT');
+            routeTo(`/subpackage/message/pages/complaint/list?brand_id=${brandInfo?.brand?.id}`, 'nT');
         },
         // 登录
         loginBtn(){

src/subpackage/verification/pages/record.vue

@@ -16,7 +16,7 @@
                 <view class="vt-txt">{{ showPeriodStr }}</view>
                 <image class="vt-icon" mode="aspectFit" src="/subpackage/verification/static/images/calendar.png"></image>
             </view>
-            <view class="vtb-num">核销数量：{{ recordLs.length || 0 }}</view>
+            <view class="vtb-num">核销数量：{{ verificationNum || 0 }}</view>
         </view>
 
         <view class="vr-list">
@@ -109,6 +109,7 @@ export default {
             curStadium: {},
             recordLs: [],
             page: 1,
+            verificationNum: 0,
         }
     },
     /**
@@ -123,6 +124,9 @@ export default {
             // 设置选中场馆
             let _selected = _stadiumLs.find(ele => +ele.id === +(options?.stadium_id ?? ''));
             if(_selected?.id)this.curStadium = _selected;
+        } else if(_stadiumLs?.length){
+            // 售后： 只要有门店就随便默认一个是吧
+            this.curStadium = _stadiumLs[0];
         }
         this.reloadRecordLs();
     },
@@ -158,12 +162,12 @@ export default {
             })
         }, 300, true),
         // 初始化时间段
-        initPeriodStr(){
+        initPeriodStr(dayNum = 1){
             let _today = new Date();
             let _todayTimestamp = _today.getTime();
             let _eStr = formatDate({ date: _today });
-            let _first30DaysTimestamp = _todayTimestamp - 30 * 24 * 60 * 60 * 1000;
-            let _sStr = formatDate({ date: new Date(_first30DaysTimestamp) });
+            let _firstDaysTimestamp = _todayTimestamp - dayNum * 24 * 60 * 60 * 1000;
+            let _sStr = formatDate({ date: new Date(_firstDaysTimestamp) });
             return this.periodStr = `${_sStr}_${_eStr}`;
         },
         showPeriodModal(){
@@ -243,6 +247,8 @@ export default {
                 let _data = res?.data || {};
                 if(_data.code === 0){
                     let _ls = this.formatRecordLs(_data?.data?.list || []);
+                    let _total = _data?.data?.total ?? 0;
+                    this.verificationNum  = _total;
                     if(page === 1)return this.recordLs = _ls;
                     if(!_ls.length)return showNone('没有更多！');
                     this.page = page;