From d85d0ace9ddce94fc88332d438d6eef0ea221297 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Wed, 13 Nov 2024 15:12:21 +0800
Subject: [PATCH 01/30] finish md241024

---
 src/pages.json                                     |   2 +-
 .../wallet/pages/douyin_withdraw/apply.vue         |  32 ++++--
 .../wallet/pages/douyin_withdraw/index.vue         |  81 +++++++-------
 .../douyin_withdraw/modules/platform_item.vue      | 117 +++++++++++++++++++++
 .../wallet/pages/douyin_withdraw/record.vue        |   5 +
 src/subpackage/wallet/pages/index/index.vue        |   5 +-
 .../wallet/pages/index/modules/wallet_info.vue     |   5 +-
 7 files changed, 192 insertions(+), 55 deletions(-)
 create mode 100644 src/subpackage/wallet/pages/douyin_withdraw/modules/platform_item.vue

diff --git a/src/pages.json b/src/pages.json
index 5dcf150..cc0c952 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -749,7 +749,7 @@
 				{
 					"path": "pages/douyin_withdraw/index",
 					"style" : {
-						"navigationBarTitleText": "抖音提现"
+						"navigationBarTitleText": "平台提现"
 					}
 				},
 				{
diff --git a/src/subpackage/wallet/pages/douyin_withdraw/apply.vue b/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
index f6a84ce..88bb058 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
@@ -83,13 +83,22 @@ export default {
                 bank_name: '',
                 bank_address: '',
                 mobile: ''
-            }
+            },
+            // md【241024】 241113新增
+            source: '', // 提现源：0抖音；1微信
         }
     },
     async onLoad(options){
         let _bid =  options.brand_id || '';
         this.brand_id = _bid;
-        await this.getDouyinWalletBalance(_bid);
+
+        // md【241024】 241113新增
+        let { source } = options;
+        if(![ 0, 1 ].includes(+source))return showNone('缺少参数 source');
+        this.source = +source;
+
+        await this.getDouyinWalletBalance(_bid, +source);
+
         if(this.isEmptyInfo())this.getStorageAndSet();
     },
     methods: {
@@ -144,8 +153,10 @@ export default {
         },
         // 提现申请确认
         dyConfirmExtract(e){
+            let { brand_id, source } = this;
             this.douyinWalletExtract({
-                brand_id: this.brand_id,
+                brand_id,
+                source,
                 ...e,
             })
         },
@@ -186,7 +197,7 @@ export default {
          * http://api.ouxuan.net:61080/project/11/interface/api/2195
          * @param {String} brand_id 品牌id
          * */ 
-        getDouyinWalletBalance(brand_id){
+        getDouyinWalletBalance(brand_id, source){
             showLoad();
             return servers.get({
                 url: WALLET_API.withdrawalOfDouyinOrg_totalAmount,
@@ -196,8 +207,11 @@ export default {
                 failMsg: '获取钱包余额失败'
             })
             .then(res=>{
+                
                 hideLoad();
-                let _balance = +res.total_amount ?? 0;
+                let _balance = 0;
+                if(source === 0)_balance = +res.total_amount_of_douyin ?? 0;
+                if(source === 1)_balance = +res.total_amount_of_wechat ?? 0;
                 return this.balance = _balance * 0.01;
             })
             .catch(hideLoad)
@@ -212,6 +226,8 @@ export default {
          * @param {String} bank_address // 银行地址
          * @param {String} mobile 手机号
          * @param {Number} status // 0未处理，1已处理
+         * md【241024】 241113新增
+         * @param {Number} source // 提现源：0抖音；1微信
          * */ 
         douyinWalletExtract({
             brand_id,
@@ -221,7 +237,8 @@ export default {
             bank_name,
             bank_address,
             mobile,
-            status = 0
+            status = 0,
+            source
         }){
             showLoad();
             servers.post({
@@ -235,6 +252,7 @@ export default {
                     bank_address,
                     mobile,
                     status,
+                    source
                 },
                 failMsg: '申请提现失败'
             })
@@ -242,7 +260,7 @@ export default {
                 hideLoad();
                 this.$refs.walletModalSuccess.alert();
                 setTimeout(_=>{
-                    this.getDouyinWalletBalance(brand_id);
+                    this.getDouyinWalletBalance(brand_id, source);
                 }, 1200);
             })
             .catch(hideLoad)
diff --git a/src/subpackage/wallet/pages/douyin_withdraw/index.vue b/src/subpackage/wallet/pages/douyin_withdraw/index.vue
index a5ec2cc..9c3665a 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/index.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/index.vue
@@ -1,11 +1,21 @@
 <template>
     <view class="douyin-withdraw">
-        <image class="dw-icon" mode="aspect" src="/subpackage/wallet/static/images/dy_logo.png"></image>
-        <view class="dw-tip">可提现资金</view>
-        <view class="dw-price">
-            <text class="dp-unit">¥</text>{{ balance.toFixed(2)||"0.00" }}
-        </view>
-        <view class="dw-btn" @click="applyBtn">申请提现</view>
+        <view class="dw-space"></view>
+        <platform-item
+            title="微信平台可提现资金"
+            :balance="formatMoney(balanceInfo.total_amount_of_wechat)"
+            type="wx"
+            @click:extract="applyBtn(1)"
+        ></platform-item>
+        <view class="dw-space"></view>
+        <platform-item
+            title="抖音平台可提现资金"
+            :balance="formatMoney(balanceInfo.total_amount_of_douyin)"
+            type="dy"
+            @click:extract="applyBtn(0)"
+        ></platform-item>
+
+        <view class="dw-space"></view>
         <view class="dw-link">
             <text class="dl-txt" @click="toDetailBtn">提现明细</text>
             <image class="dl-icon" mode="aspect" src="/subpackage/wallet/static/images/arrow_b2.png"></image>
@@ -17,11 +27,22 @@
 import { WALLET_API } from '../../js/api';
 import servers from '../../js/server';
 import { routeTo, showLoad, hideLoad } from '@/utils/util';
+
+import platformItem from "./modules/platform_item.vue";
 export default {
+    components: {
+        'platform-item': platformItem,
+    },
     data(){
         return {
             brand_id: '',
-            balance: 0,
+            balanceInfo: {
+                /**
+                 * total_amount 
+                 * total_amount_of_douyin
+                 * total_amount_of_wechat
+                 */
+            },
         }
     },
     onLoad(options){
@@ -36,8 +57,9 @@ export default {
             routeTo(`/subpackage/wallet/pages/douyin_withdraw/record?brand_id=${this.brand_id}`, 'nT');
         },
         // 申请提现
-        applyBtn(){
-            routeTo(`/subpackage/wallet/pages/douyin_withdraw/apply?brand_id=${this.brand_id}`, 'nT');
+        // md【241024】 241113新增 0抖音；1微信
+        applyBtn(source){
+            routeTo(`/subpackage/wallet/pages/douyin_withdraw/apply?brand_id=${this.brand_id}&source=${source}`, 'nT');
         },
         /**
          * http://api.ouxuan.net:61080/project/11/interface/api/2195
@@ -54,11 +76,13 @@ export default {
             })
             .then(res=>{
                 hideLoad();
-                let _balance = +res.total_amount ?? 0;
-                this.balance = _balance * 0.01;
+                this.balanceInfo = res || {};
             })
             .catch(hideLoad)
         },
+        formatMoney(money){
+            return ((money ?? 0) *0.01).toFixed(2);
+        }
     }
 
 }
@@ -66,40 +90,11 @@ export default {
 
 <style lang="scss">
     .douyin-withdraw{
-        padding-top: 88upx;
-        .dw-icon{
-            margin: 0 auto;
-            display: block;
-            width: 96upx;
-            height: 96upx;
-            background: #000;
-            border-radius: 24upx;
-        }
-        .dw-tip{
-            margin-top: 62upx;
-            text-align: center;
-            @include flcw(28upx, 40upx, #000000);
-        }
-        .dw-price{
-            padding: 0 20upx;
-            margin-top: 20upx;
-            text-align: center;
-            @include flcw(84upx, 96upx, #000000, 700);
-            @include tHide(1);
-            .dp-unit{
-                font-size: 64upx;
-            }
-        }
-        .dw-btn{
-            margin: 154upx auto 0;
-            width: 300upx;
-            border-radius: 10upx;
-            text-align: center;
-            background: #FF873D;
-            @include flcw(32upx, 112upx, #fff);
+        padding: 0 32upx;
+        .dw-space{
+            height: 32upx;
         }
         .dw-link{
-            margin-top: 88upx;
             @include flcw(28upx, 40upx, #9A9A9D);
             @include ctf(center);
             .dl-icon{
diff --git a/src/subpackage/wallet/pages/douyin_withdraw/modules/platform_item.vue b/src/subpackage/wallet/pages/douyin_withdraw/modules/platform_item.vue
new file mode 100644
index 0000000..903d00d
--- /dev/null
+++ b/src/subpackage/wallet/pages/douyin_withdraw/modules/platform_item.vue
@@ -0,0 +1,117 @@
+<template>
+    <view class="baofu-item">
+        <view class="bi-bar" :class="{ 'bb-dy': type === 'dy' }">
+            <view class="bb-name-bar">
+                <view class="bnb-left">
+                    <view class="bl-txt">{{ title }}</view>
+                </view>
+            </view>
+        </view>
+        
+        <view class="bi-info">
+            <view class="bi-balance">
+                <view class="bb-money">
+                    {{ balance || 0 }}
+                </view>
+                <view class="bb-btn" @click="$emit('click:extract')">提现</view>
+            </view>
+            <view class="bi-tip">
+                <view class="bt-txt" @click="showModalTip">可提现资金(元)</view>
+                <image class="bt-icon" mode="aspect" src="/subpackage/wallet/static/images/question_mark.png" @click="showModalTip(0)"></image>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+    props: {
+        title: {
+            default: ''
+        },
+        balance: {
+            default: '0'
+        },
+        type: {// dy: 抖音, wx: 微信
+            type: String,
+            default: 'dy', 
+        }
+    },
+    methods:{
+        showModalTip(){
+            let { type } = this;
+            let _str = '';
+            if(type === 'dy')_str = '抖音端与欧轩合作的平台小程序订单的结算金额';
+            if(type === 'wx')_str = '微信端与欧轩合作的平台小程序订单的结算金额';
+            uni.showModal({
+                title: '提示',
+                content: _str,
+                showCancel: false
+            })
+        },
+    }
+}
+</script>
+
+<style lang="scss">
+    .baofu-item{
+        border-radius: 30upx;
+        overflow: hidden;
+        background: #fff;
+        .bi-tip{
+            @include ctf;
+            .bt-txt{
+                @include flcw(24upx, 34upx, #9C9C9F);
+            }
+            .bt-icon{
+                margin-left: 6upx;
+                width: 28upx;
+                height: 28upx;
+            }
+        }
+        .bi-bar{
+            padding: 26upx 32upx 18upx;
+            padding-left: 32upx;
+            padding-right: 32upx;
+            background: $mColor;
+            &.bb-dy{
+                background: #585f69;
+            }
+            .bb-name-bar{
+                @include ctf(space-between);
+                .bnb-left{
+                    flex-grow: 1;
+                    @include ctf;
+                    .bl-txt{
+                        @include flcw(28upx, 44upx, #fff, 500);
+                        @include tHide;
+                    }
+                }
+            }
+        }
+        .bi-info{
+            padding: 40upx 32upx;
+            .bi-balance{
+                @include ctf(space-between);
+                .bb-money{
+                    @include flcw(84upx, 96upx, #000000, 700);
+                    @include tHide;
+                }
+                .bb-btn{
+                    flex-shrink: 0;
+                    margin-left: 10upx;
+                    width: 160upx;
+                    text-align: center;
+                    border-radius: 10upx;
+                    background: #FF873D;
+                    @include flcw(28upx, 72upx, #FFFFFF, 500);
+                }
+            }
+
+        }
+        .bi-status-mes{
+            padding: 40upx 32upx;
+            @include flcw(24upx, 34upx, #000000);
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/wallet/pages/douyin_withdraw/record.vue b/src/subpackage/wallet/pages/douyin_withdraw/record.vue
index 01941e7..3a336f4 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/record.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/record.vue
@@ -12,6 +12,7 @@
                     name="提现金额"
                     :tag="getTagTxt(e.status)"
                 >{{ formatAmount(e.amount || 0) }}</record-line>
+                <record-line name="提现金额来源">{{ getSourceTxt(e.source) }}</record-line>
                 <record-line name="提现单号">{{ e.number || '-' }}</record-line>
                 <record-line name="申请时间">{{ e.request_time || '-' }}</record-line>
                 <record-line name="收款人名称">{{ e.account_name_of_bank || '-' }}</record-line>
@@ -65,6 +66,10 @@ export default {
         });
     },
     methods: {
+        getSourceTxt(source = ''){
+            return source === 0 ? '抖音平台' : 
+                   source === 1 ? '微信平台' : '-';
+        },
         formatAmount(num = 0){
             let _num = Number(num) || 0;
             return _num * 0.01;
diff --git a/src/subpackage/wallet/pages/index/index.vue b/src/subpackage/wallet/pages/index/index.vue
index 7dd37cd..55d9589 100644
--- a/src/subpackage/wallet/pages/index/index.vue
+++ b/src/subpackage/wallet/pages/index/index.vue
@@ -10,9 +10,10 @@
             <view class="wt-tit">温馨提示：</view>
             <view class="wt-content">
                 <text class="wc-txt">
-                    如需要分账账户可以自己单独提现，请访问 {{ oxAddress }} 
+                    1、如需要宝付分账账户可以自己单独提现，请访问 {{ oxAddress }} 
                     <text class="wt-copy" @click="copyBtn">复制</text>
-                    \r\n账户为宝付的商户号，密码为申请时预留的手机号码
+                    \r\n 账户为宝付的商户号，密码为申请时预留的手机号码
+                    \r\n 2、平台提现为平台版抖音小程序、平台版微信小程序的分账结算金额提现。
                 </text>
             </view>
         </view>
diff --git a/src/subpackage/wallet/pages/index/modules/wallet_info.vue b/src/subpackage/wallet/pages/index/modules/wallet_info.vue
index 807e312..f450eb1 100644
--- a/src/subpackage/wallet/pages/index/modules/wallet_info.vue
+++ b/src/subpackage/wallet/pages/index/modules/wallet_info.vue
@@ -26,8 +26,9 @@
                 <text class="wi-txt">宝付提现</text>
             </view>
             <view class="wb-item" @click="$emit('click:douyin')">
-                <image class="wi-icon" mode="aspect" src="@/subpackage/wallet/static/images/dy_logo.png"></image>
-                <text class="wi-txt">抖音提现</text>
+                <!-- 【241024】 “抖音提现”文案改为“平台提现”，原有的抖音logo去掉 -->
+                <!-- <image class="wi-icon" mode="aspect" src="@/subpackage/wallet/static/images/dy_logo.png"></image> -->
+                <text class="wi-txt">平台提现</text>
             </view>
         </view>
     </view>

From 2b9522d7a2fd09f0d7f3b645be69e655a6747cd8 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Wed, 13 Nov 2024 18:29:12 +0800
Subject: [PATCH 02/30]  add tid1577

---
 .../wallet/pages/douyin_withdraw/apply.vue         | 26 ++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/subpackage/wallet/pages/douyin_withdraw/apply.vue b/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
index 88bb058..d187ef8 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
@@ -34,6 +34,11 @@
                 <view class="dol-name">联系电话</view>
                 <input maxlength="11" type="number" class="dol-ipt" placeholder="请输入联系电话" v-model="info.mobile">
             </view>
+            <!-- // 20241113 【ID1001577】商家助手小程序-抖音提现申请增加证件号码输入 -->
+            <view class="dwa-opt-line" :key="i">
+                <view class="dol-name">*证件号码</view>
+                <input type="idcard" class="dol-ipt" placeholder="请输入身份证/营业执照统一信用代码" v-model="info.credentials_number">
+            </view>
             
         </view>
         
@@ -82,7 +87,9 @@ export default {
                 account: '',
                 bank_name: '',
                 bank_address: '',
-                mobile: ''
+                mobile: '',
+                // 20241113 【ID1001577】商家助手小程序-抖音提现申请增加证件号码输入
+                credentials_number: '' // 证件号码
             },
             // md【241024】 241113新增
             source: '', // 提现源：0抖音；1微信
@@ -165,7 +172,7 @@ export default {
             return _infoValues.every(item=>item === '');
         },
         infoCheck(){
-            let { amount, account_name_of_bank, account, bank_name, bank_address, mobile } = this.info;
+            let { amount, account_name_of_bank, account, bank_name, bank_address, mobile, credentials_number } = this.info;
             let _amount = +(amount ?? 0);
             if(_amount <= 0){
                 showNone('提现金额不正确');
@@ -191,6 +198,12 @@ export default {
                 showNone('支行名称不能为空');
                 return false
             }
+
+            if(credentials_number === ''){
+                showNone('证件号码不能为空');
+                return false
+            }
+
             return true
         },
         /**
@@ -228,6 +241,9 @@ export default {
          * @param {Number} status // 0未处理，1已处理
          * md【241024】 241113新增
          * @param {Number} source // 提现源：0抖音；1微信
+         * // 20241113 【ID1001577】商家助手小程序-抖音提现申请增加证件号码输入
+         * @param {String} credentials_number // 证件号码
+         * 
          * */ 
         douyinWalletExtract({
             brand_id,
@@ -238,7 +254,8 @@ export default {
             bank_address,
             mobile,
             status = 0,
-            source
+            credentials_number,
+            source,
         }){
             showLoad();
             servers.post({
@@ -252,7 +269,8 @@ export default {
                     bank_address,
                     mobile,
                     status,
-                    source
+                    credentials_number,
+                    source,
                 },
                 failMsg: '申请提现失败'
             })

From d262039ac4587e958271f982984b7622bf17b121 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Thu, 12 Dec 2024 10:03:21 +0800
Subject: [PATCH 03/30] fix md1024

---
 src/subpackage/wallet/pages/douyin_withdraw/record.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/subpackage/wallet/pages/douyin_withdraw/record.vue b/src/subpackage/wallet/pages/douyin_withdraw/record.vue
index 3a336f4..5fd1d9e 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/record.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/record.vue
@@ -17,6 +17,7 @@
                 <record-line name="申请时间">{{ e.request_time || '-' }}</record-line>
                 <record-line name="收款人名称">{{ e.account_name_of_bank || '-' }}</record-line>
                 <record-line name="收款人账号">{{ e.account || '-' }}</record-line>
+                <record-line name="证件号码">{{ e.credentials_number || '-' }}</record-line>
                 <record-line name="处理时间">{{ e.updated_at || '-' }}</record-line>
                 <record-line name="备注">{{ e.remark || '-' }}</record-line>
             </view>

From db5ec88aa160c3a5d220264fe5fdac5142cb8879 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Mon, 30 Dec 2024 18:19:13 +0800
Subject: [PATCH 04/30] fix md1024

---
 src/subpackage/wallet/pages/douyin_withdraw/apply.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/subpackage/wallet/pages/douyin_withdraw/apply.vue b/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
index d187ef8..7c1557a 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
@@ -46,6 +46,7 @@
             <view class="dt-tit">温馨提示</view>
             <view class="dt-desc">1、账户请预留一定的余额，避免余额不足导致退款失败！</view>
             <view class="dt-desc">2、提现申请成功提交后，预计在3~7个工作日内进行处理。</view>
+            <view class="dt-desc">3、提现需要扣除1元/次手续费。</view>
         </view>
         <view class="dwa-btn">
             <wm-button green @click="confirmExtract">确认提现</wm-button>

From 34fcb18b42f3d0304760ac1f6006cf2b783fdcd3 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Tue, 31 Dec 2024 09:58:28 +0800
Subject: [PATCH 05/30] vtest 1.1.62 for tid1682

---
 src/subpackage/wallet/pages/douyin_withdraw/apply.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/subpackage/wallet/pages/douyin_withdraw/apply.vue b/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
index 7c1557a..8119da8 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/apply.vue
@@ -287,7 +287,6 @@ export default {
     }
 }
 </script>
-
 <style lang="scss">
     page{
         background: #fff;

From 47474446005d1b22151d2c445a889ca340ad5068 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Mon, 6 Jan 2025 18:27:07 +0800
Subject: [PATCH 06/30] add tid1803 style

---
 src/pages.json                                     |   6 +
 src/subpackage/verification/pages/index.vue        | 133 +++++++++++++++++++++
 .../verification/static/images/arrow_c9f.png       | Bin 0 -> 271 bytes
 src/subpackage/verification/static/images/scan.png | Bin 0 -> 429 bytes
 src/subpackage/verification/static/images/tab0.png | Bin 0 -> 1001 bytes
 src/subpackage/verification/static/images/tab1.png | Bin 0 -> 940 bytes
 src/subpackage/verification/static/images/tab2.png | Bin 0 -> 519 bytes
 7 files changed, 139 insertions(+)
 create mode 100644 src/subpackage/verification/pages/index.vue
 create mode 100644 src/subpackage/verification/static/images/arrow_c9f.png
 create mode 100644 src/subpackage/verification/static/images/scan.png
 create mode 100644 src/subpackage/verification/static/images/tab0.png
 create mode 100644 src/subpackage/verification/static/images/tab1.png
 create mode 100644 src/subpackage/verification/static/images/tab2.png

diff --git a/src/pages.json b/src/pages.json
index 807b35a..3d3361e 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -895,6 +895,12 @@
 			"root": "subpackage/verification",
 			"pages": [
 				{
+					"path": "pages/index",
+					"style" : {
+						"navigationBarTitleText": "核销查询" 
+					}
+				},
+				{
 					"path": "pages/site_people/index",
 					"style" : {
 						"navigationBarTitleText": "现场人数" 
diff --git a/src/subpackage/verification/pages/index.vue b/src/subpackage/verification/pages/index.vue
new file mode 100644
index 0000000..5e21149
--- /dev/null
+++ b/src/subpackage/verification/pages/index.vue
@@ -0,0 +1,133 @@
+<template>
+    <view class="write-off-index">
+        <view class="woi-stadium-bar">
+            <picker>
+                <view class="wsb-ipt-box">
+                    <input class="wib-ipt" type="text" placeholder="请选择场馆" disabled />
+                    <image class="wib-img" mode="aspectFit" src="/subpackage/verification/static/images/arrow_c9f.png"></image>
+                </view>
+            </picker>
+        </view>
+        <view class="woi-section">
+            <view class="ws-ipt-box">
+                <input class="wib-ipt" type="text" placeholder="请输入券码" />
+                <image class="wib-img" mode="aspectFit" src="/subpackage/verification/static/images/scan.png"></image>
+            </view>
+            <view class="ws-txt">可输入订场、次卡、年月卡、赛事、商城到店领取商品的验证码/券码进行核销，或点扫码图标进入扫描界面扫码核销。</view>
+            <view class="ws-btn">确认</view>
+        </view>
+
+        <view class="woi-btns">
+            <view class="wb-items">
+                <image class="wi-icon" mode="aspectFit" src="/subpackage/verification/static/images/tab0.png"></image>
+                <view class="wi-txt">进场人数异常</view>
+            </view>
+            <view class="wb-items">
+                <image class="wi-icon" mode="aspectFit" src="/subpackage/verification/static/images/tab1.png"></image>
+                <view class="wi-txt">现场人数</view>
+            </view>
+            <view class="wb-items">
+                <image class="wi-icon" mode="aspectFit" src="/subpackage/verification/static/images/tab2.png"></image>
+                <view class="wi-txt">核销记录</view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+    .write-off-index{
+        .woi-stadium-bar{
+            padding: 26upx 0;
+            background: #fff;
+            @include ctf(center);
+            .wsb-ipt-box{
+                padding: 0 20upx;
+                width: 702upx;
+                height: 92upx;
+                border-radius: 10upx;
+                background: #F2F2F7;
+                @include ctf;
+                .wib-ipt{
+                    flex-grow: 1;
+                    height: 100%;
+                    @include flcw(28upx, 40upx, #333);
+                }
+                .wib-img{
+                    flex-shrink: 0;
+                    margin-left: 20upx;
+                    width: 28upx;
+                    height: 28upx;
+                }
+            }
+        }
+        .woi-section{
+            margin-top: 24upx;
+            padding-top: 26upx;
+            padding-bottom: 80upx;
+            background: #fff;
+            .ws-ipt-box{
+                margin: 0 auto;
+                padding: 0 20upx;
+                width: 702upx;
+                height: 92upx;
+                background: #F2F2F7;
+                border-radius: 10upx;
+                @include ctf;
+                .wib-ipt{
+                    flex-grow: 1;
+                    height: 100%;
+                    @include flcw(28upx, 40upx, #333);
+                }
+                .wib-img{
+                    flex-shrink: 0;
+                    margin-left: 20upx;
+                    width: 60upx;
+                    height: 60upx;
+                }
+            }
+            .ws-txt{
+                margin-top: 24upx;
+                padding: 0 32upx;
+                @include flcw(28upx, 52upx, #333);
+            }
+            .ws-btn{
+                margin: 22upx auto 0;
+                text-align: center;
+                width: 240upx;
+                border-radius: 10upx;
+                background: $mColor;
+                @include flcw(32upx, 88upx, #fff);
+            }
+        }
+        .woi-btns{
+            margin-top: 24upx;
+            padding: 38upx 24upx;
+            background: #fff;
+            @include ctf(space-between);
+            .wb-items{
+                padding: 18upx 0;
+                flex-grow: 0;
+                flex-shrink: 0;
+                width: 226upx;
+                .wi-icon{
+                    display: block;
+                    margin: 0 auto;
+                    width: 64upx;
+                    height: 64upx;
+                }
+                .wi-txt{
+                    margin-top: 24upx;
+                    text-align: center;
+                    @include flcw(28upx, 40upx, #333);
+                    @include tHide;
+                }
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/verification/static/images/arrow_c9f.png b/src/subpackage/verification/static/images/arrow_c9f.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8471dd7715f4cff71e8615534e30b94e6108d75
GIT binary patch
literal 271
zcmeAS@N?(olHy`uVBq!ia0vp^G9b*s3?yAI>n{UR_5nU2u0VP-7;M?HW$V_hKoZD<
zkh^y6g0q1l5C9a}v}qHN4O9$dpUSk11sWkz666=m@P1Bcf&RB+4@JAur#1$v%JA-4
z>1nC13zX0Hba4#PIDhrDH(!H-i1S5uEv+AnZ~t9i)#LSoYsX@>vl|cYO5WqUyDwx-
zMMCV8*)mR>_AuS}RbIxxx0&O@CB}EZrt@#<Ee@W$dwK4i81=PQ8+(OsTWoxl;cvBd
pL9qAoX@1p>4%eriSHHQT*7_vJ%mpu3Dg&)$@O1TaS?83{1OQVDdhh@M

literal 0
HcmV?d00001

diff --git a/src/subpackage/verification/static/images/scan.png b/src/subpackage/verification/static/images/scan.png
new file mode 100644
index 0000000000000000000000000000000000000000..21cfa7668ee7ec98d7801d1aca370d86280dc454
GIT binary patch
literal 429
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw3=&b&bO2IL0X`wFK$>A@3B&X<h8ZOcGr{DH
zQU(Z`Rl+a}$Oei786^y}%NbTRfVdDevy@?GC6GPo*De#FA)+Nge!&b6&E9D5w@ZH!
zCcdu0SeEU3(Ft#n8|&XQF)%Q)db&7<cpQIw{q(wK1(DW=t+Tr;9M{Ia|G!GzeR9-P
z#uH02|1NtwU&5Dz`#=IOze>XLm6Zu^8tVN%9!Wg@*~OBfIr&J-+!ytC7*<!9WxZ*c
zn11R|LFnq<j}|j}Z(WIzEKr=gHtrXjy6^tKdDah^vR6-ZJso{VF?jpYt*&a(`;$Ty
zgO|Sh(P#WfZssptGhQRpw9Zx;+f6?wim;ex#w<`5|KMAqZ8ITEeH*`<&81h<0(FBp
z7BA7zt9r9YJnYNLeMc|<Zs2bE?5`1&mNMHtDAumci|;_c#rF3<)E_myPCj^a>yuM4
zC6WGfIPI*2FR^v?@lV;3X>xRV;4O{fkAc(7*qdFRKae+6bxpoHm7xO^?w+oGF6*2U
FngAAmuD<{P

literal 0
HcmV?d00001

diff --git a/src/subpackage/verification/static/images/tab0.png b/src/subpackage/verification/static/images/tab0.png
new file mode 100644
index 0000000000000000000000000000000000000000..c72f2c9fa3330473ac0f21d4000689600f48c4a9
GIT binary patch
literal 1001
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!CI|S0xB_X0nbiz4N*HFBGt4Rn
zF@R`JEr^_13KE%F1{H)zO$Q2=!URhhW)y>z%`O8Ag7t!Aiy5YsGC)*<bODu>{Qv*I
z_Vmt=zrIT@YWnu)*Ub;F4c7F#Z=0KbcwOY)rO&>8nsx1D>$!b}$2XnNzqlLdDy5Pj
zzhDNot18;B&hsDiknKNa_~l1?OZ}bgc3Bp4A8jfLkT?~#Dsqo1!+8b<rpKNxjv*0;
z&rZ8NZIuB}o35yasE7cg{{khe$1?Z-zcky@n!qh9e&@{{pJ`_MPhK~fd9yz6MaM_M
z-abDu>!iq(?H+O05A-#+Za3FoJG1)Ft$eF%MKd>UX3s8tdE=DT9)bMjIxkw%z9m&o
z%-Ol&e^2~}#geJ>lIk@Vgvi_}eRTHgEf&_j4a!|{R_$v4HSSg1Q|p_hwMFI`oBdO(
z8;|4)qjC?~Z!9U_C>~g`E#5RPdxrL!Z&FNqLd1>zk7#qLNvRzWUa`rq<@)bhBaH(G
zCtvG+!aVVxQqI5Hn5&zF=cO3#f3#3)#c8iQXVTo2Y)+c-@LKY5d{}L~=U8<0C(it}
zJ3Tn0)frSR7JF|f4_5Hof9z$i$=<2U?bRyI%`QA&`OBekVwsfrrGyni)mH*qH_q#m
ze7zyUC#gS5XTz-*E3TT=?(~a)?{1Usc2PLI%W!Kvhy9WxMl*KSEpFKJ!NutGsS}!C
zCfMD1E0oTq!MW`&|Mo_PiPCO*$Df<#8*Jaj{>uEJ!o$nEmgPS6G@a{e!=dnPV$w6o
zg&WG8zPQ|)aPFtZlaH&MI&{B=9$R#M8?VcpGN~PPzH_&UwX)u2@r$wXo0aWzTkRav
z^1AbW6HczY@yQ{6Ui85YmQ$(<PI=#6m1pke7^!I#q+G8y)qKUe@C6Ku&&)9AoH@rM
zW%cjrQ@{QD_Ki<Ogz-stqFeR0@FPMRUD^QwEJA%ZC)CLw$xjWO;@~LAVX?oafHA)N
zR6~<aLj_aj`^%gXjgRW|f!qg$OmXjzm_#x?J@3yclF~TgyZ`$fPRqtmA2k}AbPnt`
zx*(9i<lrc@fivD$is|Uz&!6KsxVjk5KG;9Gj%n%vcU=Y%2Z!A3sSLtDR<JfOaWt%d
z-T3JD?uNLG_{H9)Ob!b+efqxLi$$a3-S>%Z3>+cfzE;#2E??SEGrhN{mqB2KV#j_5
z#=x#6%cRs8*hCIAw0k+2ZhhI%o^otMgCR4sTrw+=z0*)){(t6pfkS6z{gM^~<ylWx
KKbLh*2~7Y86u~b5

literal 0
HcmV?d00001

diff --git a/src/subpackage/verification/static/images/tab1.png b/src/subpackage/verification/static/images/tab1.png
new file mode 100644
index 0000000000000000000000000000000000000000..79f4c0771f975c2c7d25ef0511f5f52195bc7502
GIT binary patch
literal 940
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!k^_7~T!A#hj1q>06%4b=8D^D%
z*gyni&nShmf!sNjV8JqmnI#|u6q#8HML;b;HdF*C4l@BH0yGCC)pka&7-)+^NswPK
z!&Odg=^w{cT3?+%B<Nu1?|EnTq%4c=n<AF?zI(K{s-$!G3mpaqrW>9vjv*0;&xXCc
zw90^|^%m=f)-D~T?tTA*;}mokdPz>5X&qlDdwGuY<Yg-l%9}g2E_jk&R=NJXXVJR%
zPoGOET|TtH{ZEWeUBvoxNA8(#ZZY)Zty<TkdUFf+Dai%7lYjcG@>EzqtxqUiazd5c
z&MzO<3!GZHM_FF<-K3(1>%Od$W}m3~`u9gsXL$7r-ZR@bo#5%t?4B38@KT8A)X)<q
zn_tYW=kjIpQfWAMYu!uZ3ZaD-3qE{NGcZW#e2^$`)Rl|tjUY#J+jcI8RWS@s`xXmK
zb|~nM3Er@^@cL5MzRVBPxP$bW!hgK!co(q$!O;biz6%~qTc<C1pvrL3Ev4&R7D-8g
zPoFX93Qae=9kG{d#f`9Ka|D;4Gm^Qh8moN$61R-XqQgwmnp<8?775usk!hv9uF|5#
z$18SB<lFw~;^~q<R=?T1KJkkj)wv~|*;~KF)Z$WETb6#UbLcmVkn&?y@8n-w_LaUr
zeCgYz{~J#1V|`+}Q1ou~treFZEkFLX-sXMCoV4OcopVH%JYEz$Wx@K`Df1^6n8^uB
z&*JkvKe^@m*$H~*I{X7qTAsgFvTxmwH4dj%L|gA(p<*l_TQhM-;@-Dw7J9gIa&6~2
z|E#ShykUo)ihzg%tI(q3O9Xb-sPuUEDbKm2#jyFDSfGi-!DY9Pd?;65&~f)ovm)2S
z+`wDOIbuxxUrOee9uYst*0)h7N<bxTf$@styUyj#TNl^5=csYhDZ}7`8jm}Z+RPt)
zd7^vdkR|_F%@Q{eR=d?tZl|u7&~Olrl4DYD?8-B#ZuP8SJ;nD;-<+K<<>FLpCc!K3
z#d2<~ZPoq3>d|g|*}mNRk*J5_>5|#~uj3jSf2n_vD!KANSfTgi#q5bM?fV(d)GqtW
zH0$8$jj9dxTc^Z3%(Rb?W6a6!Ph`&LQurq6rm#rH?CVm7PaZ6P{{ktuBbFcb3r2kA
zSgP_PilH)NhWM>;!PixPBpNIKiZxc&%6;TtIcuZulo_Gipls*q>gTe~DWM4f^XH{+

literal 0
HcmV?d00001

diff --git a/src/subpackage/verification/static/images/tab2.png b/src/subpackage/verification/static/images/tab2.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d552882aaf2128e213665a19ecfecefe0e96447
GIT binary patch
literal 519
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!`~rMJT!A#hj1q=f<scG*W><k3
zr3^EHA`r5KVQvLT5GVpfv&$HkG{Cr}4AYAk7FII!6#_*RUPKE34U{Yi@(X6Ts{Q%p
zQJII$Y0*LF#CKI&D6@MnpJ6D>nY%a<sEE<u)5S3);_%z)w~Ja7cpO?8y2`KbefqzC
zOYjzttpXF;&z*Z$S!|N-)8Q8+Q|WW(@E47YD;Kt(alXyp#ZiB)!Er$y8|zjFra<=l
z@)KB`B6%bZKH%J^VR!1O?#y;od&{Cy%eL36Q&eYEoVCqJZkTj(^*v3gHnC&e{C6r>
z<<=eL_7PoBz_a;431ipIdlM?$8ZN0duxY$hy7ipL-t*2iwY|sX9@pmnxGi+wQ+R!_
zlxK5bshh#p`{GY$TsoDU*;iELb-3ct@hwMph;N*~Ib7hkvm(nC{a%598kYA;FSHut
zT&_-R;xb?eS>li&Fj4n}pW^Ng{R`~>^)18%tFG6+lBjm&SmD-W89iaHQ=VY_YJR(>
za?u-x`i;3~irLR*Y;!C&fAz`Z&5GUf+agtNZ`iB!QRGsrg`YxN`BO{5`){VLbGh}b
mf2+RO?r(3!&u3f_`^P$Of4lC&1xw^WG3x2+=d#Wzp$Pycv(zg9

literal 0
HcmV?d00001


From 68f983fb0ddabef70de5fb477eb5e5b7a557a462 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Thu, 9 Jan 2025 18:17:46 +0800
Subject: [PATCH 07/30] add tid1803 logic

---
 src/subpackage/verification/pages/index.vue | 69 +++++++++++++++++++++++++++--
 src/utils/util.js                           |  2 +-
 2 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/src/subpackage/verification/pages/index.vue b/src/subpackage/verification/pages/index.vue
index 5e21149..3aaa749 100644
--- a/src/subpackage/verification/pages/index.vue
+++ b/src/subpackage/verification/pages/index.vue
@@ -1,9 +1,9 @@
 <template>
     <view class="write-off-index">
         <view class="woi-stadium-bar">
-            <picker>
+            <picker :range="stadiumList" range-key="name" @change="stadiumChange">
                 <view class="wsb-ipt-box">
-                    <input class="wib-ipt" type="text" placeholder="请选择场馆" disabled />
+                    <input class="wib-ipt" type="text" placeholder="请选择场馆" disabled v-model="curStadium.name" />
                     <image class="wib-img" mode="aspectFit" src="/subpackage/verification/static/images/arrow_c9f.png"></image>
                 </view>
             </picker>
@@ -11,7 +11,7 @@
         <view class="woi-section">
             <view class="ws-ipt-box">
                 <input class="wib-ipt" type="text" placeholder="请输入券码" />
-                <image class="wib-img" mode="aspectFit" src="/subpackage/verification/static/images/scan.png"></image>
+                <image @click="scanCode" class="wib-img" mode="aspectFit" src="/subpackage/verification/static/images/scan.png"></image>
             </view>
             <view class="ws-txt">可输入订场、次卡、年月卡、赛事、商城到店领取商品的验证码/券码进行核销，或点扫码图标进入扫描界面扫码核销。</view>
             <view class="ws-btn">确认</view>
@@ -35,8 +35,69 @@
 </template>
 
 <script>
-export default {
 
+import API from "../js/api.js";
+import server from "../js/server.js";
+import { showLoad, hideLoad, showModal, showNone, debounce, changeLowerCase } from "@/utils/util.js";
+export default {
+    data(){
+        return{
+            stadiumList: [],
+            curStadium: {},
+        }
+    },
+    onLoad(options){
+        this.getStadiumLs({ brand_id: options?.brand_id });
+    },
+    methods: {
+        scanCode: debounce(function(){
+            uni.scanCode({
+                onlyFromCamera: true,
+                scanType: 'qrCode',
+                success: res=> {
+                    if(changeLowerCase(res.scanType) !== 'qr_code')return showNone('不支持此类型！');
+                    console.log('扫码结果--->', res);
+                },
+                fail: function(err) {
+                    showNone('扫码失败！');
+                    console.warn('扫码失败--->', err);
+                }
+            })
+        }, 300, true),
+        stadiumChange(e){
+            let { stadiumList } = this;
+            this.curStadium = stadiumList[e.detail.value];
+        },
+        // 获取门店列表
+        getStadiumLs({ brand_id }){
+			showLoad();
+            return server.post({
+                url: API.stadiumList,
+                data: { page_size: 9999, page: 1, brand_id },
+                isDefaultGet: false,
+            })
+            .then(res => {
+				hideLoad();
+                let _data = res?.data || {};
+                if(_data.code === 0){
+                    let _ls = _data?.data?.list || [];
+                    this.stadiumList = _ls;
+					return _ls;
+                }else{
+                    return Promise.reject(_data);
+                }
+            })
+            .catch(err => {
+                hideLoad();
+                showModal({
+                    title: '提示',
+                    content: err.message || '加载店铺失败！'
+                })
+                console.warn('verification index getStadiumLs err --->', err);
+				// return Promise.reject(err);
+            })
+		},
+    }
 }
 </script>
 
diff --git a/src/utils/util.js b/src/utils/util.js
index cb9c6d4..b23a280 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -362,7 +362,7 @@ function isProfile(){
   return !!uni.getUserProfile
 }
 
-function changeLowerCase(str){
+export function changeLowerCase(str){
   return str.toString().toLocaleLowerCase();
 }
 

From b968001ee733c930ce220baf03c6fbee660d05c6 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Mon, 13 Jan 2025 18:27:24 +0800
Subject: [PATCH 08/30] add tid1803 style

---
 src/pages.json                                     |   6 +
 src/pages/write_off/operate/operate.vue            |   1 -
 .../verification/components/head_bar.vue           |  59 ++++++++++
 .../verification/components/record/dy_item.vue     |  71 +++++++++++
 .../verification/components/record/site_item.vue   |  82 +++++++++++++
 .../verification/components/stadium_picker.vue     |   0
 src/subpackage/verification/js/api.js              |   2 +
 src/subpackage/verification/pages/index.vue        | 131 +++++++++++++++------
 src/subpackage/verification/pages/record.vue       | 102 ++++++++++++++++
 .../verification/static/images/calendar.png        | Bin 0 -> 369 bytes
 .../verification/static/images/search.png          | Bin 0 -> 245 bytes
 src/utils/util.js                                  |   4 +-
 12 files changed, 418 insertions(+), 40 deletions(-)
 create mode 100644 src/subpackage/verification/components/head_bar.vue
 create mode 100644 src/subpackage/verification/components/record/dy_item.vue
 create mode 100644 src/subpackage/verification/components/record/site_item.vue
 create mode 100644 src/subpackage/verification/components/stadium_picker.vue
 create mode 100644 src/subpackage/verification/pages/record.vue
 create mode 100644 src/subpackage/verification/static/images/calendar.png
 create mode 100644 src/subpackage/verification/static/images/search.png

diff --git a/src/pages.json b/src/pages.json
index 3d3361e..fde19b2 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -905,6 +905,12 @@
 					"style" : {
 						"navigationBarTitleText": "现场人数" 
 					}
+				},
+				{
+					"path": "pages/record",
+					"style" : {
+						"navigationBarTitleText": "核销记录" 
+					}
 				}
 			]
 		}
diff --git a/src/pages/write_off/operate/operate.vue b/src/pages/write_off/operate/operate.vue
index 001bbe4..628e492 100644
--- a/src/pages/write_off/operate/operate.vue
+++ b/src/pages/write_off/operate/operate.vue
@@ -228,7 +228,6 @@ export default {
                     }
                 }else{
                     util.showNone(res.data.message || '操作失败！')
-                    // util.routeTo(`/pages/write_off/null/null?type=${vType}`, 'nT');
                 }
                 
             })
diff --git a/src/subpackage/verification/components/head_bar.vue b/src/subpackage/verification/components/head_bar.vue
new file mode 100644
index 0000000..ec64299
--- /dev/null
+++ b/src/subpackage/verification/components/head_bar.vue
@@ -0,0 +1,59 @@
+<template>
+    <view class="head-bar">
+        <picker class="hb-picker" :range="range" :range-key="rangeKey" @change="$emit('change', $event)">
+            <view class="hp-frame">
+                <input class="hf-ipt" type="text" disabled :value="value" :placeholder="placeholder">
+                <image class="hf-icon" mode="aspectFit" src="/subpackage/verification/static/images/arrow_c9f.png"></image>
+            </view>
+        </picker>
+        <image v-if="search" class="hb-icon" mode="aspectFit" src="/subpackage/verification/static/images/search.png"></image>
+    </view>
+</template>
+
+<script>
+export default {
+    props: {
+        value: { type: String, default: ''  },
+        placeholder: { type: String, default: '' },
+        range: { type: Array, default: [] },
+        rangeKey: { type: String, default: '' },
+        search: { type: Boolean, default: false }
+    }
+}
+</script>
+
+<style lang="scss">
+    .head-bar{
+        padding-left: 24upx;
+        padding-right: 24upx;
+        height: 144upx;
+        background: #fff;
+        @include ctf(space-between);
+        .hb-picker{
+            flex-grow: 1;
+            .hp-frame{
+                padding: 0 24upx;
+                height: 92upx;
+                background: #f2f2f7;
+                @include ctf(space-between);
+                .hf-ipt{
+                    flex-grow: 1;
+                    height: 100%;
+                    @include flcw(28upx, 40upx, #333);
+                }
+                .hf-icon{
+                    flex-shrink: 0;
+                    width: 28upx;
+                    height: 28upx;
+                }
+            }
+        }
+        .hb-icon{
+            flex-shrink: 0;
+            margin-right: 16upx;
+            margin-left: 26upx;
+            width: 40upx;
+            height: 40upx;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/verification/components/record/dy_item.vue b/src/subpackage/verification/components/record/dy_item.vue
new file mode 100644
index 0000000..9ef52f5
--- /dev/null
+++ b/src/subpackage/verification/components/record/dy_item.vue
@@ -0,0 +1,71 @@
+<template>
+    <view class="site-item">
+        <view class="si-stadium">欧轩智能羽毛球馆(永泰店)</view>
+        <view class="si-lines">
+            <view class="sl-item">
+                <view class="sl-left">订单编号：20195175645666</view>
+            </view>
+            <view class="sl-item">
+                <view class="sl-left">用户信息：18316553852(yiming)</view>
+            </view>
+            <view class="sl-item">
+                <view class="sl-left">券码：   200801108978</view>
+            </view>
+            <view class="sl-item">
+                <view class="sl-left">验证方式：扫码器验证(欧轩门闸)</view>
+            </view>
+            <view class="sl-item">
+                <view class="sl-left">核销时间：2021-05-17   11:12:58</view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+    .site-item{
+        position: relative;
+        padding: 0 20upx;
+        border-radius: 10upx;
+        background: #fff;
+        .si-stadium{
+            min-height: 100upx;
+            border-bottom: 2upx solid #D8D8D8;
+            @include flcw(28upx, 98upx, #1A1A1A, 500);
+            @include tHide;
+        }
+        .si-lines{
+            padding-top: 8upx;
+            padding-bottom: 32upx;
+            .sl-item{
+                display: flex;
+                .sl-left{
+                    @include flcw(28upx, 52upx, #9c9c9f);
+                    @include tHide;
+                }
+                .sl-right{
+                    max-width: 200upx;
+                    flex-shrink: 0;
+                    margin-left: 10upx;
+                    @include flcw(28upx, 52upx, $mColor);
+                    @include tHide;
+                }
+            }
+        }
+        .si-btn{
+            position: absolute;
+            right: 20upx;
+            bottom: 32upx;
+            width: 192upx;
+            text-align: center;
+            background-color: $mColor;
+            border-radius: 10upx;
+            @include flcw(32upx, 80upx, #fff, 500);
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/verification/components/record/site_item.vue b/src/subpackage/verification/components/record/site_item.vue
new file mode 100644
index 0000000..1d6ba60
--- /dev/null
+++ b/src/subpackage/verification/components/record/site_item.vue
@@ -0,0 +1,82 @@
+<template>
+    <view class="site-item">
+        <view class="si-stadium">欧轩智能羽毛球馆(永泰店)</view>
+        <view class="si-lines">
+            <view class="sl-item">
+                <view class="sl-left">订单编号：20195175645666</view>
+                <view class="sl-right">（租场）</view>
+            </view>
+            <view class="sl-item">
+                <view class="sl-left">用户信息：18316553852(yiming)</view>
+            </view>
+            <view class="sl-item">
+                <view class="sl-left">核销码：   200801108978</view>
+            </view>
+            <view class="sl-item">
+                <view class="sl-left">验证方式：扫码器验证(欧轩门闸)</view>
+            </view>
+            <view class="sl-item">
+                <view class="sl-left">核销时间：2021-05-17   11:12:58</view>
+            </view>
+            <view class="sl-item">
+                <view class="sl-left">离场时间：2021-05-17   11:12:58</view>
+            </view>
+        </view>
+        <view class="si-btn">手动离场</view>
+    </view>
+    <!-- 订单编号：20195175645666
+用户信息：18316553852(yiming)
+核销码：   200801108978
+验证方式：扫码器验证(欧轩门闸)
+核销时间：2021-05-17   11:12:58
+离场时间：2021-05-17   11:12:58 -->
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+    .site-item{
+        position: relative;
+        padding: 0 20upx;
+        border-radius: 10upx;
+        background: #fff;
+        .si-stadium{
+            min-height: 100upx;
+            border-bottom: 2upx solid #D8D8D8;
+            @include flcw(28upx, 98upx, #1A1A1A, 500);
+            @include tHide;
+        }
+        .si-lines{
+            padding-top: 8upx;
+            padding-bottom: 32upx;
+            .sl-item{
+                display: flex;
+                .sl-left{
+                    @include flcw(28upx, 52upx, #9c9c9f);
+                    @include tHide;
+                }
+                .sl-right{
+                    max-width: 200upx;
+                    flex-shrink: 0;
+                    margin-left: 10upx;
+                    @include flcw(28upx, 52upx, $mColor);
+                    @include tHide;
+                }
+            }
+        }
+        .si-btn{
+            position: absolute;
+            right: 20upx;
+            bottom: 32upx;
+            width: 192upx;
+            text-align: center;
+            background-color: $mColor;
+            border-radius: 10upx;
+            @include flcw(32upx, 80upx, #fff, 500);
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/verification/components/stadium_picker.vue b/src/subpackage/verification/components/stadium_picker.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/subpackage/verification/js/api.js b/src/subpackage/verification/js/api.js
index 306d14d..c2e5897 100644
--- a/src/subpackage/verification/js/api.js
+++ b/src/subpackage/verification/js/api.js
@@ -6,6 +6,8 @@ export const SUB_API = {
     skNotLeavingNums: `${ORIGIN}/stadium/sk/notLeavingNums`,  //  【1001536】散客人数 - 未离场订单数量
     setStadiumPresentNumber: `${ORIGIN}/admin/stadium/setStadiumPresentNumber`,  // 商家助手散客人数校正
     timingOpen: `${ORIGIN}/stadium/person/timing/open`,  // 【20220208】凌晨自动清零【开/关】
+    // tid1803
+    enterVerifyOrder: `${ORIGIN}/admin/stadium/order/enterVerifyOrder`,  // 商家助手-核销查询-输入验证码  
 
 }
 
diff --git a/src/subpackage/verification/pages/index.vue b/src/subpackage/verification/pages/index.vue
index 3aaa749..1a2c098 100644
--- a/src/subpackage/verification/pages/index.vue
+++ b/src/subpackage/verification/pages/index.vue
@@ -1,16 +1,12 @@
 <template>
     <view class="write-off-index">
-        <view class="woi-stadium-bar">
-            <picker :range="stadiumList" range-key="name" @change="stadiumChange">
-                <view class="wsb-ipt-box">
-                    <input class="wib-ipt" type="text" placeholder="请选择场馆" disabled v-model="curStadium.name" />
-                    <image class="wib-img" mode="aspectFit" src="/subpackage/verification/static/images/arrow_c9f.png"></image>
-                </view>
-            </picker>
-        </view>
+        <head-bar
+            :range="stadiumList" range-key="name" @change="stadiumChange"
+            placeholder="请选择场馆" :value="curStadium.name"
+        ></head-bar>
         <view class="woi-section">
             <view class="ws-ipt-box">
-                <input class="wib-ipt" type="text" placeholder="请输入券码" />
+                <input class="wib-ipt" type="text" placeholder="请输入券码" v-model="iptCode" />
                 <image @click="scanCode" class="wib-img" mode="aspectFit" src="/subpackage/verification/static/images/scan.png"></image>
             </view>
             <view class="ws-txt">可输入订场、次卡、年月卡、赛事、商城到店领取商品的验证码/券码进行核销，或点扫码图标进入扫描界面扫码核销。</view>
@@ -18,11 +14,11 @@
         </view>
 
         <view class="woi-btns">
-            <view class="wb-items">
+            <view class="wb-items" @click="toAbnormal">
                 <image class="wi-icon" mode="aspectFit" src="/subpackage/verification/static/images/tab0.png"></image>
                 <view class="wi-txt">进场人数异常</view>
             </view>
-            <view class="wb-items">
+            <view class="wb-items" @click="toSitePeople">
                 <image class="wi-icon" mode="aspectFit" src="/subpackage/verification/static/images/tab1.png"></image>
                 <view class="wi-txt">现场人数</view>
             </view>
@@ -38,25 +34,51 @@
 
 import API from "../js/api.js";
 import server from "../js/server.js";
-import { showLoad, hideLoad, showModal, showNone, debounce, changeLowerCase } from "@/utils/util.js";
+import { showLoad, hideLoad, showModal, showNone, debounce, changeLowerCase, $_emit, routeTo } from "@/utils/util.js";
+import { WRITE_OFF_ORDER_INFO } from '@/js/once_name';
+import headBar from "../components/head_bar.vue";
 export default {
+    components: { headBar },
     data(){
         return{
+            brand_id: '',
             stadiumList: [],
             curStadium: {},
+            iptCode: '',
+
         }
     },
     onLoad(options){
-        this.getStadiumLs({ brand_id: options?.brand_id });
+        let _brand_id = options?.brand_id || '';
+        this.brand_id = _brand_id;
+        this.getStadiumLs({ brand_id: _brand_id });
     },
     methods: {
+        // 现场人数
+        toSitePeople(){
+            let { brand_id } = this;
+            routeTo(`/subpackage/verification/pages/site_people/index?brand_id=${brand_id}`, 'nT');
+        },
+        // 人数异常
+        toAbnormal(){
+            let { brand_id } = this;
+            routeTo(`/subpackage/blacklist/pages/abnormal_list/abnormal_list?brand_id=${brand_id}`, 'nT');
+        },
         scanCode: debounce(function(){
+            let { curStadium } = this;
+            if(!curStadium?.id)return showModal({ content: '请选择场馆！' });
             uni.scanCode({
                 onlyFromCamera: true,
                 scanType: 'qrCode',
                 success: res=> {
                     if(changeLowerCase(res.scanType) !== 'qr_code')return showNone('不支持此类型！');
                     console.log('扫码结果--->', res);
+                    let { curStadium } = this;
+                    this.verifyOrder({
+                        brand_id: curStadium?.brand_id || '',
+                        stadium_id: curStadium?.id || '',
+                        decrypt_text: res?.result || '',
+                    })
                 },
                 fail: function(err) {
                     showNone('扫码失败！');
@@ -97,36 +119,71 @@ export default {
 				// return Promise.reject(err);
             })
 		},
+        /**
+         * 订单预检验
+         * @param {String} brand_id
+         * @param {String} stadium_id
+         * @param {String} verify_code 订单验证码
+         * @param {String} decrypt_text 二维码数据
+         * */ 
+        verifyOrder({ brand_id, stadium_id, verify_code = '', decrypt_text = '' }){
+            let _vType = verify_code ? 'verify_code' : decrypt_text ? 'decrypt_text' : '';
+			showLoad();
+            return server.post({
+                url: API.enterVerifyOrder,
+                data: { brand_id, stadium_id, verify_code, decrypt_text },
+                isDefaultGet: false,
+            })
+            .then(res => {
+				hideLoad();
+                let _data = res?.data || {};
+                if(_data.code === 0){
+                    let _orderData = _data?.data || {};
+                    // 商城订单
+                    if(_orderData?.extension?.verify_order_type === 'product_order'){
+                        $_emit(WRITE_OFF_MALL_ORDER_INFO, { data: _orderData });
+                        routeTo(`/pages/write_off/ym_confirm/ym_confirm?type=${_vType}`, 'nT');
+                        return
+                    }
+                     // 年月卡
+                    if(_orderData?.extension?.verify_order_type === 'monthly_card'){
+                        $_emit(WRITE_OFF_ORDER_INFO, { data: _orderData, query: { brand_id, stadium_id, verify_code, decrypt_text } });
+                        routeTo(`/pages/write_off/ym_confirm/ym_confirm?type=${_vType}`, 'nT');
+                        return
+                    }
+
+                    // 赛事
+                    if(_orderData?.extension?.verify_order_type === 'match_order'){
+                        $_emit(WRITE_OFF_ORDER_INFO, {..._orderData});
+                        routeTo(`/pages/write_off/events_order/events_order?type=${_vType}`, 'nT');
+                        return
+                    }
+                    
+                    $_emit(WRITE_OFF_ORDER_INFO, { ..._orderData });
+                    routeTo(`/pages/write_off/confirm_order/confirm_order?type=${_vType}`, 'nT');
+                }else{
+                    if(!_vType)return Promise.reject(_data);
+                    routeTo(`/pages/write_off/null/null?type=${_vType}`, 'nT');
+                    // return Promise.reject(_data);
+                }
+            })
+            .catch(err => {
+                hideLoad();
+                showModal({
+                    title: '提示',
+                    content: err.message || '核销查询失败！'
+                })
+                console.warn('verification index verifyOrder err --->', err);
+				// return Promise.reject(err);
+            })
+		},
     }
 }
 </script>
 
 <style lang="scss">
     .write-off-index{
-        .woi-stadium-bar{
-            padding: 26upx 0;
-            background: #fff;
-            @include ctf(center);
-            .wsb-ipt-box{
-                padding: 0 20upx;
-                width: 702upx;
-                height: 92upx;
-                border-radius: 10upx;
-                background: #F2F2F7;
-                @include ctf;
-                .wib-ipt{
-                    flex-grow: 1;
-                    height: 100%;
-                    @include flcw(28upx, 40upx, #333);
-                }
-                .wib-img{
-                    flex-shrink: 0;
-                    margin-left: 20upx;
-                    width: 28upx;
-                    height: 28upx;
-                }
-            }
-        }
+        
         .woi-section{
             margin-top: 24upx;
             padding-top: 26upx;
diff --git a/src/subpackage/verification/pages/record.vue b/src/subpackage/verification/pages/record.vue
new file mode 100644
index 0000000..dcfab7b
--- /dev/null
+++ b/src/subpackage/verification/pages/record.vue
@@ -0,0 +1,102 @@
+<template>
+    <view class="verification-record">
+        <view class="vr-header">
+            <head-bar search></head-bar>
+            <view class="vh-tabs">
+                <view class="vt-item" :class="{ active: curTab === 0 }" @click="curTab = 0">场地核销记录</view>
+                <view class="vt-item" :class="{ active: curTab === 1 }" @click="curTab = 1">抖音核销记录</view>
+                <view class="vt-item" :class="{ active: curTab === 2 }" @click="curTab = 2">商城核销记录</view>
+            </view>
+        </view>
+        <view class="vr-time-board">
+            <view class="vtb-time">
+                <view class="vt-txt">2024.04.09 至 2024.05.09</view>
+                <image class="vt-icon" mode="aspectFit" src="/subpackage/verification/static/images/calendar.png"></image>
+            </view>
+            <view class="vtb-num">核销数量：30</view>
+        </view>
+
+        <view class="vr-list">
+            <site-item></site-item>
+            <view class="vl-space" style="height: 24rpx;"></view>
+            <dy-item></dy-item>
+        </view>
+    </view>
+</template>
+
+<script>
+import headBar from "../components/head_bar.vue";
+import siteItem from "../components/record/site_item.vue";
+import dyItem from "../components/record/dy_item.vue";
+export default {
+    components: { headBar, siteItem, dyItem },
+    data(){
+        return {
+            curTab: 0,
+        }
+    },
+    methods: {
+        
+    }
+}
+</script>
+
+<style lang="scss">
+    .verification-record{
+
+    }
+    .vr-header{
+        background: #fff;
+        .vh-tabs{
+            @include ctf(space-around);
+            .vt-item{
+                position: relative;
+                @include flcw(28upx, 88upx, #2D2D2D);
+                &.active{
+                    color: $mColor;
+                    &::after{
+                        content: '';
+                        position: absolute;
+                        bottom: 0;
+                        left: 50%;
+                        transform: translateX(-50%);
+                        width: 100%;
+                        height: 4upx;
+                        background: $mColor;
+                    }
+                }
+            }
+        }
+    }
+    .vr-time-board{
+        padding: 24upx;
+        @include ctf(space-between);
+        .vtb-time{
+            flex-shrink: 0;
+            padding: 0 14upx;
+            height: 62upx;
+            background: #fff;
+            @include ctf;
+            .vt-txt{
+                max-width: 400upx;
+                @include flcw(24upx, 34upx, #1A1A1A, 500);
+                @include tHide;
+            }
+            .vt-icon{
+                flex-shrink: 0;
+                margin-left: 30upx;
+                width: 32upx;
+                height: 32upx;
+            }
+        }
+        .vtb-num{
+            margin-left: 20upx;
+            @include flcw(32upx, 44upx, #1A1A1A, 500);
+            @include tHide;
+        }
+    }
+    .vr-list{
+        padding: 0 24upx;
+
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/verification/static/images/calendar.png b/src/subpackage/verification/static/images/calendar.png
new file mode 100644
index 0000000000000000000000000000000000000000..63425c2f9edec6a850d46853893308e5bbe157e7
GIT binary patch
literal 369
zcmV-%0gnEOP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px$D@jB_R5(wqld(zzK@>&LTN4|R^nzd%8%sMY^9%k!gs7V>EoOtA*hzK@%h{*_
z^8@}utn4gpL?Z~+2C*@5N3wxzb^~HGQ{K6Ac<;V>LiRM&4v}o*1&66C<DcQ!8(e)o
zt_#L@!PbGo1ng&_3sMt|dSgDfN#*n@_8Y$pwuGlE=?YX6q>UG}V!e5^%4h#>0I+yk
zM&_1Upyw3WtG}iIm$fDGQJ1p*80kjYNx(FHi~!i@Y2GDXSs7MfbHzUaq~A$e2>mr8
zyNn|*RD(xCH;-N1iox=JOSRD>>q%u0s$(oAgf>-u!nrE)#YGI5W1j=vA?ul4h=VaU
z)D;nB99p<~7vryky&q;H8+gIPq-SPh9REnujAK?Aq<7)B6(qaxzis>m{cxFR1@X`|
P00000NkvXXu0mjfX@{Jg

literal 0
HcmV?d00001

diff --git a/src/subpackage/verification/static/images/search.png b/src/subpackage/verification/static/images/search.png
new file mode 100644
index 0000000000000000000000000000000000000000..de695bf10f5176df43b304fe52c79d4ffced39e9
GIT binary patch
literal 245
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAd3?%E9GuQzsg8-ipS0Ftd3}(-s4PnffF=OV;
znX_iiTD58wTm&cxVQ=@-y9m_7UlQaO%<ywE?+u-Pa|5;~drvBC=oPFI0!pQNx;Tb#
zTu(m0c}T`JNO6tl|3(MlBaiOrhvcmLQOz{r<d@Zrjg85BnI=f;Gfv9>!=>`6v1Y*?
zbA^ZT3`v{n8HGNvDX4vR4^eYsbdo+~prZXitbPwe`MIk29m=`?4%|KSN8~0uLv4lH
Vf{R<E%zzd$c)I$ztaD0e0s!f4UqJu>

literal 0
HcmV?d00001

diff --git a/src/utils/util.js b/src/utils/util.js
index b23a280..dd58f9d 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -371,7 +371,7 @@ export function changeLowerCase(str){
 // 大数据量跨页/跨组件传参------$_once && $_emit
 // 单次监听器
 // 到文件src\js\once_name.js，进行命名，防止命名冲突导致错误监听
-function $_once(name, cb){
+export function $_once(name, cb){
   uni.$once(name + '',function(data){
     cb&&cb(data);
   })
@@ -380,7 +380,7 @@ function $_once(name, cb){
   }, 50)
 }
 // 促发单次监听
-function $_emit(name, data){
+export function $_emit(name, data){
   uni.$once((name + '')+'1',function(){
       uni.$emit(name + '', data);
   })

From 64649e810034cdf16cd521eebc3030531408c022 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Tue, 14 Jan 2025 18:25:24 +0800
Subject: [PATCH 09/30] finish tid1803

---
 src/components/period_select.vue                   | 138 +++++++++
 src/pages.json                                     |  12 +
 src/pages/index/index.vue                          |   2 +-
 src/pages/order_search/order_search.vue            |   2 +-
 .../verification/components/head_bar.vue           |   2 +-
 .../verification/components/record/dy_item.vue     |  21 +-
 .../verification/components/record/mall_item.vue   |  95 +++++++
 .../verification/components/record/site_item.vue   |  37 +--
 .../verification/components/stadium_picker.vue     |  15 +
 src/subpackage/verification/js/api.js              |   5 +
 src/subpackage/verification/pages/index.vue        |  35 ++-
 src/subpackage/verification/pages/null.vue         |  62 +++++
 src/subpackage/verification/pages/record.vue       | 307 ++++++++++++++++++++-
 .../verification/pages/record_search.vue           | 244 ++++++++++++++++
 .../verification/static/images/order/null_code.png | Bin 0 -> 7779 bytes
 .../static/images/order/null_range.png             | Bin 0 -> 3718 bytes
 .../static/images/order/null_search.png            | Bin 0 -> 4502 bytes
 .../verification/static/images/round_close.png     | Bin 0 -> 369 bytes
 18 files changed, 927 insertions(+), 50 deletions(-)
 create mode 100644 src/components/period_select.vue
 create mode 100644 src/subpackage/verification/components/record/mall_item.vue
 create mode 100644 src/subpackage/verification/pages/null.vue
 create mode 100644 src/subpackage/verification/pages/record_search.vue
 create mode 100644 src/subpackage/verification/static/images/order/null_code.png
 create mode 100644 src/subpackage/verification/static/images/order/null_range.png
 create mode 100644 src/subpackage/verification/static/images/order/null_search.png
 create mode 100644 src/subpackage/verification/static/images/round_close.png

diff --git a/src/components/period_select.vue b/src/components/period_select.vue
new file mode 100644
index 0000000..9220387
--- /dev/null
+++ b/src/components/period_select.vue
@@ -0,0 +1,138 @@
+<template>
+    <!-- 时间段选择 -->
+    <view class="period-select-mask" v-if="isShow" @click="isShow = false">
+        <view class="ol-period" @click.stop="()=>false">
+              <view class="op-tit">日期范围</view>
+              <picker mode="date" class="op-picker" @change="startTimeChange" :value="startTime">
+                  <view class="op-time">
+                      <text class="ot-tit">开始时间</text>
+                      <view class="ot-right">
+                          <input class="or-ipt" placeholder="选择时间" disabled :value="startTime"/>
+                          <image class="or-icon" mode="aspectFit" src="/static/images/icon/arrow_b2.png"></image>
+                      </view>
+                  </view>
+              </picker>
+              <picker mode="date" class="op-picker" @change="endTimeChange" :value="endTime">
+                  <view class="op-time">
+                      <text class="ot-tit">截止时间</text>
+                      <view class="ot-right">
+                          <input class="or-ipt" placeholder="选择时间" disabled :value="endTime"/>
+                          <image class="or-icon" mode="aspectFit" src="/static/images/icon/arrow_b2.png"></image>
+                      </view>
+                  </view>
+              </picker>
+              <view class="pl-btn active" @click="confirmBtn">确定</view>
+          </view>
+    </view>
+</template>
+
+<script>
+import { showNone, showModal } from '@/utils/util';
+export default {
+    props: {
+        value: {
+            type: String,
+            default: ''
+        }
+    },
+    watch: {
+        value: {
+            handler(val) {
+                let [start, end] = val.split('_');
+                this.startTime = start;
+                this.endTime = end;
+            },
+            immediate: true
+        }
+    },
+    data(){
+        return {
+            isShow: false,
+            startTime: '',
+            endTime: '',
+        }
+    },
+    methods: {
+        show(){
+            this.isShow = true
+        },
+        hide(){
+            this.isShow = false
+        },
+        startTimeChange(e){
+            this.startTime = e.detail.value;
+        },
+        endTimeChange(e){
+            this.endTime = e.detail.value;
+        },
+        confirmBtn(){
+            let { startTime, endTime } = this;
+            let _sTimestemp = new Date(startTime.replace(/\-/g,'/')).getTime();
+            let _eTimestemp = new Date(endTime.replace(/\-/g,'/')).getTime();
+            if(_sTimestemp > _eTimestemp)return showModal({ content: '开始时间不能大于结束时间' });
+            this.$emit('input', `${startTime}_${endTime}`);
+            this.hide();
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+    .period-select-mask{
+        position: fixed;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background: rgba(0,0,0,0.4);
+        z-index: 9999;
+    }
+    .ol-period{
+        position: absolute;
+        left: 0;
+        top: 0;
+        padding-left: 38upx;
+        padding-top: 66upx;
+        height: 472upx;
+        width: 100%;
+        background-color: #fff;
+        .op-tit{
+            @include flcw(24upx, 34upx, #9c9c9f);
+        }
+        .op-picker{
+            width: 100%;
+
+        }
+        .op-time{
+            padding-right: 40upx;
+            height: 124upx;
+            border-bottom: 2upx solid #D8D8D8;
+            @include ctf(space-between);
+            .ot-tit{
+                flex-shrink: 0;
+                @include flcw(32upx, 44upx, #1a1a1a);
+            }
+            .ot-right{
+                flex-grow: 1;
+                @include ctf(flex-end);
+                .or-ipt{
+                    flex-grow: 1;
+                    height: 100%;
+                    text-align: right;
+                    @include flcw(32upx, 44upx, #1a1a1a);
+                }
+                .or-icon{
+                    flex-shrink: 0;
+                    margin-left: 36upx;
+                    width: 28upx;
+                    height: 28upx;
+                }
+            }
+        }
+        .pl-btn{
+            min-height: 124upx;
+            text-align: center;
+            @include flcw(32upx, 124upx, $mColor, 500);
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index fde19b2..5748c6f 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -895,6 +895,18 @@
 			"root": "subpackage/verification",
 			"pages": [
 				{
+					"path": "pages/null",
+					"style" : {
+						"navigationBarTitleText": "核销查询" 
+					}
+				},
+				{
+					"path": "pages/record_search",
+					"style" : {
+						"navigationBarTitleText": "核销查询" 
+					}
+				},
+				{
 					"path": "pages/index",
 					"style" : {
 						"navigationBarTitleText": "核销查询" 
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index bca99c3..f2cdedc 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -116,7 +116,7 @@
 		{
 			id: 4,
 			name: '核销查询',
-			path: '/pages/write_off/menu/menu',
+			path: '/subpackage/verification/pages/index',
 			serverKey: 1008  // 后端对应权限编号
 		},
 		{
diff --git a/src/pages/order_search/order_search.vue b/src/pages/order_search/order_search.vue
index 55704f9..db552fc 100644
--- a/src/pages/order_search/order_search.vue
+++ b/src/pages/order_search/order_search.vue
@@ -3,7 +3,7 @@
         <view class="os-bar">
                 <view>
                     <image mode="aspectFit" src="/static/images/icon/search.png"></image>
-                    <input placeholder="你输入订单号" v-model="searchTxt" confirm-type="search" @confirm="iptConfirm" />
+                    <input placeholder="请输入订单号" v-model="searchTxt" confirm-type="search" @confirm="iptConfirm" />
                     <image v-if="searchTxt!=''" mode="aspectFit" src="/static/images/icon/round_close.png" @click="clearSearch"></image>
                 </view>
             </view>
diff --git a/src/subpackage/verification/components/head_bar.vue b/src/subpackage/verification/components/head_bar.vue
index ec64299..b442c13 100644
--- a/src/subpackage/verification/components/head_bar.vue
+++ b/src/subpackage/verification/components/head_bar.vue
@@ -6,7 +6,7 @@
                 <image class="hf-icon" mode="aspectFit" src="/subpackage/verification/static/images/arrow_c9f.png"></image>
             </view>
         </picker>
-        <image v-if="search" class="hb-icon" mode="aspectFit" src="/subpackage/verification/static/images/search.png"></image>
+        <image v-if="search" class="hb-icon" mode="aspectFit" src="/subpackage/verification/static/images/search.png" @click="$emit('click:search')"></image>
     </view>
 </template>
 
diff --git a/src/subpackage/verification/components/record/dy_item.vue b/src/subpackage/verification/components/record/dy_item.vue
index 9ef52f5..95af761 100644
--- a/src/subpackage/verification/components/record/dy_item.vue
+++ b/src/subpackage/verification/components/record/dy_item.vue
@@ -1,21 +1,21 @@
 <template>
     <view class="site-item">
-        <view class="si-stadium">欧轩智能羽毛球馆(永泰店)</view>
+        <!-- <view class="si-stadium">{{ stadiumName || '-' }}</view> -->
         <view class="si-lines">
             <view class="sl-item">
-                <view class="sl-left">订单编号：20195175645666</view>
+                <view class="sl-left">订单编号：{{ orderNum || '-' }}</view>
             </view>
             <view class="sl-item">
-                <view class="sl-left">用户信息：18316553852(yiming)</view>
+                <view class="sl-left">用户信息：{{ userPhone || '-' }}</view>
             </view>
             <view class="sl-item">
-                <view class="sl-left">券码：   200801108978</view>
+                <view class="sl-left">券码：   {{ verifyCode || '-' }}</view>
             </view>
             <view class="sl-item">
-                <view class="sl-left">验证方式：扫码器验证(欧轩门闸)</view>
+                <view class="sl-left">验证方式：{{ verifyMethod || '-' }}</view>
             </view>
             <view class="sl-item">
-                <view class="sl-left">核销时间：2021-05-17   11:12:58</view>
+                <view class="sl-left">核销时间：{{ verifyTime || '-' }}</view>
             </view>
         </view>
     </view>
@@ -23,7 +23,14 @@
 
 <script>
 export default {
-
+    props: [
+        // 'stadiumName',
+        'orderNum',
+        'userPhone',
+        'verifyCode',
+        'verifyMethod',
+        'verifyTime',
+    ]
 }
 </script>
 
diff --git a/src/subpackage/verification/components/record/mall_item.vue b/src/subpackage/verification/components/record/mall_item.vue
new file mode 100644
index 0000000..a703a57
--- /dev/null
+++ b/src/subpackage/verification/components/record/mall_item.vue
@@ -0,0 +1,95 @@
+<template>
+    <view class="site-item">
+        <view class="si-order-num">
+            <view class="son-txt">订单编号：{{ orderNum || '-' }}</view>
+            <view class="son-copy" @click="copyBtn">复制</view>
+        </view>
+        <view class="si-lines">
+            <view class="sl-item">
+                <view class="sl-left">取货码：{{ orderCode || '-' }}</view>
+            </view>
+            <view class="sl-item">
+                <view class="sl-left">取货人：{{ userName || '-' }}    {{ userPhone || '-' }}</view>
+            </view>
+            <view class="sl-item">
+                <view class="sl-left">商品：{{ goodsStr || '-' }}</view>
+            </view>
+            <view class="sl-item">
+                <view class="sl-left">核验人：{{ optUser || '-' }}</view>
+            </view>
+            <view class="sl-item">
+                <view class="sl-left">取货时间：{{ createdAt || '-' }}</view>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+export default {
+    props: [
+        'orderNum',
+        'orderCode',
+        'userPhone',
+        'userName',
+        'goodsStr',
+        'optUser',
+        'createdAt',
+    ],
+    methods: {
+        copyBtn(){
+            uni.setClipboardData({ data: this.orderNum });
+        }
+    }
+}
+</script>
+<style lang="scss">
+    .site-item{
+        position: relative;
+        padding: 0 20upx;
+        border-radius: 10upx;
+        background: #fff;
+        .si-order-num{
+            min-height: 100upx;
+            border-bottom: 2upx solid #D8D8D8;
+            @include ctf;
+            .son-txt{
+                flex-grow: 1;
+                @include flcw(28upx, 98upx, #1A1A1A, 500);
+                @include tHide;
+            }
+            .son-copy{
+                padding-right: 20upx;
+                margin-left: 20upx;
+                flex-shrink: 0;
+                @include flcw(28upx, 98upx, $mColor, 500);
+            }
+        }
+        .si-lines{
+            padding-top: 8upx;
+            padding-bottom: 32upx;
+            .sl-item{
+                display: flex;
+                .sl-left{
+                    @include flcw(28upx, 52upx, #9c9c9f);
+                    @include tHide;
+                }
+                .sl-right{
+                    max-width: 200upx;
+                    flex-shrink: 0;
+                    margin-left: 10upx;
+                    @include flcw(28upx, 52upx, $mColor);
+                    @include tHide;
+                }
+            }
+        }
+        .si-btn{
+            position: absolute;
+            right: 20upx;
+            bottom: 32upx;
+            width: 192upx;
+            text-align: center;
+            background-color: $mColor;
+            border-radius: 10upx;
+            @include flcw(32upx, 80upx, #fff, 500);
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/verification/components/record/site_item.vue b/src/subpackage/verification/components/record/site_item.vue
index 1d6ba60..11345ae 100644
--- a/src/subpackage/verification/components/record/site_item.vue
+++ b/src/subpackage/verification/components/record/site_item.vue
@@ -1,40 +1,45 @@
 <template>
     <view class="site-item">
-        <view class="si-stadium">欧轩智能羽毛球馆(永泰店)</view>
+        <view class="si-stadium">{{ stadiumName || '-' }}</view>
         <view class="si-lines">
             <view class="sl-item">
-                <view class="sl-left">订单编号：20195175645666</view>
-                <view class="sl-right">（租场）</view>
+                <view class="sl-left">订单编号：{{ orderNum || '-' }}</view>
+                <view class="sl-right">（{{ orderType || '-' }}）</view>
             </view>
             <view class="sl-item">
-                <view class="sl-left">用户信息：18316553852(yiming)</view>
+                <view class="sl-left">用户信息：{{ userPhone || '-' }}({{ userNickname || '-' }})</view>
             </view>
             <view class="sl-item">
-                <view class="sl-left">核销码：   200801108978</view>
+                <view class="sl-left">核销码：   {{ verifyCode || '-' }}</view>
             </view>
             <view class="sl-item">
-                <view class="sl-left">验证方式：扫码器验证(欧轩门闸)</view>
+                <view class="sl-left">验证方式：{{ verifyMethod || '-' }}</view>
             </view>
             <view class="sl-item">
-                <view class="sl-left">核销时间：2021-05-17   11:12:58</view>
+                <view class="sl-left">核销时间：{{ verifyTime || '-' }}</view>
             </view>
             <view class="sl-item">
-                <view class="sl-left">离场时间：2021-05-17   11:12:58</view>
+                <view class="sl-left">离场时间：{{ verifyLeaveTime || '-' }}</view>
             </view>
         </view>
-        <view class="si-btn">手动离场</view>
+        <view class="si-btn" v-if="verifyLeaveTime === ''" @click="$emit('click:leave')">手动离场</view>
     </view>
-    <!-- 订单编号：20195175645666
-用户信息：18316553852(yiming)
-核销码：   200801108978
-验证方式：扫码器验证(欧轩门闸)
-核销时间：2021-05-17   11:12:58
-离场时间：2021-05-17   11:12:58 -->
+    
 </template>
 
 <script>
 export default {
-
+    props: [
+        'stadiumName',
+        'orderNum',
+        'orderType',
+        'userPhone',
+        'userNickname',
+        'verifyCode',
+        'verifyMethod',
+        'verifyTime',
+        'verifyLeaveTime',
+    ]
 }
 </script>
 
diff --git a/src/subpackage/verification/components/stadium_picker.vue b/src/subpackage/verification/components/stadium_picker.vue
index e69de29..95b9fa5 100644
--- a/src/subpackage/verification/components/stadium_picker.vue
+++ b/src/subpackage/verification/components/stadium_picker.vue
@@ -0,0 +1,15 @@
+<template>
+    <view class="stadium-picker">
+        
+    </view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+
+</style>
\ No newline at end of file
diff --git a/src/subpackage/verification/js/api.js b/src/subpackage/verification/js/api.js
index c2e5897..e354cda 100644
--- a/src/subpackage/verification/js/api.js
+++ b/src/subpackage/verification/js/api.js
@@ -8,6 +8,11 @@ export const SUB_API = {
     timingOpen: `${ORIGIN}/stadium/person/timing/open`,  // 【20220208】凌晨自动清零【开/关】
     // tid1803
     enterVerifyOrder: `${ORIGIN}/admin/stadium/order/enterVerifyOrder`,  // 商家助手-核销查询-输入验证码  
+    listVerifyRecord: `${ORIGIN}/admin/stadium/order/listVerifyRecord`,  // 商家助手-核销查询列表
+    leaveVerifyOrder:`${ORIGIN}/admin/stadium/order/leaveVerifyOrder`,  // 【20220208】核销记录列表 - 手动离场
+    dyPoiOrderList: `${ORIGIN}/admin/douyinPlatformProductOrder/list`,  // 商家助手-dypoi订单
+    shop2WriteoffList: `${ORIGIN}/admin/assistant/shop2/writeoffList`,  // 商城订单核销 - 列表
+
 
 }
 
diff --git a/src/subpackage/verification/pages/index.vue b/src/subpackage/verification/pages/index.vue
index 1a2c098..3a8f01e 100644
--- a/src/subpackage/verification/pages/index.vue
+++ b/src/subpackage/verification/pages/index.vue
@@ -10,7 +10,7 @@
                 <image @click="scanCode" class="wib-img" mode="aspectFit" src="/subpackage/verification/static/images/scan.png"></image>
             </view>
             <view class="ws-txt">可输入订场、次卡、年月卡、赛事、商城到店领取商品的验证码/券码进行核销，或点扫码图标进入扫描界面扫码核销。</view>
-            <view class="ws-btn">确认</view>
+            <view class="ws-btn" @click="confirmBtn">确认</view>
         </view>
 
         <view class="woi-btns">
@@ -22,7 +22,7 @@
                 <image class="wi-icon" mode="aspectFit" src="/subpackage/verification/static/images/tab1.png"></image>
                 <view class="wi-txt">现场人数</view>
             </view>
-            <view class="wb-items">
+            <view class="wb-items" @click="toRecord">
                 <image class="wi-icon" mode="aspectFit" src="/subpackage/verification/static/images/tab2.png"></image>
                 <view class="wi-txt">核销记录</view>
             </view>
@@ -34,7 +34,7 @@
 
 import API from "../js/api.js";
 import server from "../js/server.js";
-import { showLoad, hideLoad, showModal, showNone, debounce, changeLowerCase, $_emit, routeTo } from "@/utils/util.js";
+import { showLoad, hideLoad, showModal, showNone, debounce, changeLowerCase, $_emit, routeTo, jsonStr } from "@/utils/util.js";
 import { WRITE_OFF_ORDER_INFO } from '@/js/once_name';
 import headBar from "../components/head_bar.vue";
 export default {
@@ -64,6 +64,20 @@ export default {
             let { brand_id } = this;
             routeTo(`/subpackage/blacklist/pages/abnormal_list/abnormal_list?brand_id=${brand_id}`, 'nT');
         },
+        toRecord(){
+            let { brand_id } = this;
+            routeTo(`/subpackage/verification/pages/record?brand_id=${brand_id}`, 'nT');
+        },
+        confirmBtn: debounce(function(){
+            let { iptCode } = this;
+            let { curStadium } = this;
+            if(!curStadium?.id)return showModal({ content: '请选择场馆！' });
+            this.verifyOrder({
+                brand_id: curStadium?.brand_id ?? '',
+                stadium_id: curStadium?.id ?? '',
+                verify_code: iptCode ?? '',
+            })
+        }, 300, true),
         scanCode: debounce(function(){
             let { curStadium } = this;
             if(!curStadium?.id)return showModal({ content: '请选择场馆！' });
@@ -72,12 +86,11 @@ export default {
                 scanType: 'qrCode',
                 success: res=> {
                     if(changeLowerCase(res.scanType) !== 'qr_code')return showNone('不支持此类型！');
-                    console.log('扫码结果--->', res);
                     let { curStadium } = this;
                     this.verifyOrder({
-                        brand_id: curStadium?.brand_id || '',
-                        stadium_id: curStadium?.id || '',
-                        decrypt_text: res?.result || '',
+                        brand_id: curStadium?.brand_id ?? '',
+                        stadium_id: curStadium?.id ?? '',
+                        decrypt_text: res?.result ?? '',
                     })
                 },
                 fail: function(err) {
@@ -158,13 +171,13 @@ export default {
                         routeTo(`/pages/write_off/events_order/events_order?type=${_vType}`, 'nT');
                         return
                     }
-                    
+                    // 场次、次卡
                     $_emit(WRITE_OFF_ORDER_INFO, { ..._orderData });
                     routeTo(`/pages/write_off/confirm_order/confirm_order?type=${_vType}`, 'nT');
+                }else if(_data.code === 805){
+                    routeTo(`/subpackage/verification/pages/null?tip=${jsonStr(_data?.message ?? '')}`, 'nT');
                 }else{
-                    if(!_vType)return Promise.reject(_data);
-                    routeTo(`/pages/write_off/null/null?type=${_vType}`, 'nT');
-                    // return Promise.reject(_data);
+                    return Promise.reject(_data);
                 }
             })
             .catch(err => {
diff --git a/src/subpackage/verification/pages/null.vue b/src/subpackage/verification/pages/null.vue
new file mode 100644
index 0000000..1796319
--- /dev/null
+++ b/src/subpackage/verification/pages/null.vue
@@ -0,0 +1,62 @@
+<template>
+    <view class="null-container">
+        <image v-if="tipHas('二维码')" class="nc-pic" mode="aspectFit" src="/subpackage/verification/static/images/order/null_code.png"></image>
+        <image v-else-if="tipHas('范围')" class="nc-pic" mode="aspectFit" src="/subpackage/verification/static/images/order/null_range.png"></image>
+        <image v-else class="nc-pic" mode="aspectFit" src="/subpackage/verification/static/images/order/null_search.png"></image>
+        <view class="nc-txt">{{ tip || '很抱歉！获取找不到订单信息' }}</view>
+        <view class="nc-btn" @click="routeTo">返回</view>
+    </view>
+</template>
+
+<script>
+import { jsonPar, routeTo } from '@/utils/util';
+export default {
+    data(){
+        return {
+            tip: '',
+        }
+    },
+    onLoad(options){
+        let _tip = options?.tip ?? '';
+        this.tip = jsonPar(_tip);
+    },
+    methods: {
+        tipHas(txt){
+            let { tip } = this;
+            return tip.indexOf(txt) > -1;
+        },
+        routeTo,
+
+    }
+}
+</script>
+
+<style lang="scss">
+page{
+    background: #fff;
+}
+    .null-container{
+        padding-top: 220upx;
+        .nc-pic{
+            display: block;
+            width: 400upx;
+            height: 400upx;
+            margin: 0 auto;
+        }
+        .nc-txt{
+            padding: 0 30upx;
+            margin-top: 80upx;
+            text-align: center;
+            @include flcw(28upx, 40upx, #9C9C9F);
+        }
+        .nc-btn{
+            margin: 260upx auto 0;
+            width: 280upx;
+            text-align: center;
+            height: 92upx;
+            border-radius: 10upx;
+            border: 2upx solid $mColor;
+            @include flcw(32upx, 88upx, $mColor);
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/verification/pages/record.vue b/src/subpackage/verification/pages/record.vue
index dcfab7b..a0ad1f7 100644
--- a/src/subpackage/verification/pages/record.vue
+++ b/src/subpackage/verification/pages/record.vue
@@ -1,26 +1,63 @@
 <template>
     <view class="verification-record">
         <view class="vr-header">
-            <head-bar search></head-bar>
+            <head-bar 
+                :range="stadiumList" range-key="name" @change="stadiumChange"
+                placeholder="请选择场馆" :value="curStadium.name"
+                search
+                @click:search="toSearch"
+            ></head-bar>
             <view class="vh-tabs">
-                <view class="vt-item" :class="{ active: curTab === 0 }" @click="curTab = 0">场地核销记录</view>
-                <view class="vt-item" :class="{ active: curTab === 1 }" @click="curTab = 1">抖音核销记录</view>
-                <view class="vt-item" :class="{ active: curTab === 2 }" @click="curTab = 2">商城核销记录</view>
+                <view v-for="(e,i) in tabs" :key="i" :class="{ 'vt-item': true, active: curTab === i }" @click="curTab = i">{{ e }}</view>
             </view>
         </view>
         <view class="vr-time-board">
-            <view class="vtb-time">
-                <view class="vt-txt">2024.04.09 至 2024.05.09</view>
+            <view class="vtb-time" @click="showPeriodModal">
+                <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">核销数量：30</view>
+            <view class="vtb-num">核销数量：{{ recordLs.length || 0 }}</view>
         </view>
 
         <view class="vr-list">
-            <site-item></site-item>
-            <view class="vl-space" style="height: 24rpx;"></view>
-            <dy-item></dy-item>
+            <block v-for="(e, i) in recordLs" :key="i">
+                <site-item 
+                    v-if="curTab === 0"
+                    :stadium-name="e.extension&&e.extension.stadium_name"
+                    :order-num="e.order_no"
+                    :order-type="e.type"
+                    :user-phone="e.extension&&e.extension.user_phone"
+                    :user-nickname="e.extension&&e.extension.nickname"
+                    :verify-code="e.verify_code"
+                    :verify-method="e.desc"
+                    :verify-time="e.verify_time"
+                    :verify-leave-time="e.verify_leave_time"
+                    @click:leave="siteLeaveBtn(e, i)"
+                ></site-item>
+                <dy-item 
+                    v-if="curTab === 1"
+                    :order-num="e.order_no"
+                    :user-phone="e.user_phone"
+                    :verify-code="e.verify_code"
+                    :verify-method="e.verify_method"
+                    :verify-time="e.verify_time"
+                ></dy-item>
+                <mall-item 
+                    v-if="curTab === 2"
+                    :order-num="e.product_order_no"
+                    :order-code="e.product_order_self_pickup_info.gcode"
+                    :user-phone="e.product_order_self_pickup_info.phone"
+                    :user-name="e.product_order_self_pickup_info.name"
+                    :goods-str="e.product_order_goods.join('；')"
+                    :opt-user="e.optuname"
+                    :created-at="e.created_at"
+                ></mall-item>
+                <view class="vl-space" style="height: 24rpx;"></view>
+            </block>
+            
         </view>
+
+        <period-select ref="periodSelect" v-model="periodStr" ></period-select>
     </view>
 </template>
 
@@ -28,22 +65,266 @@
 import headBar from "../components/head_bar.vue";
 import siteItem from "../components/record/site_item.vue";
 import dyItem from "../components/record/dy_item.vue";
+import mallItem from "../components/record/mall_item.vue";
+import periodSelect from "@/components/period_select.vue";
+import { formatDate, showLoad, hideLoad, showModal, showNone, debounce, formatTime, routeTo } from "@/utils/util";
+import API from "../js/api.js";
+import server from "../js/server.js";
 export default {
-    components: { headBar, siteItem, dyItem },
+    components: { headBar, siteItem, dyItem, mallItem, periodSelect },
+    computed: {
+        // 展示时间段字符串
+        showPeriodStr(){
+            let { periodStr } = this;
+            return periodStr ? periodStr.replace(/\_/, ' 至 ').replace(/\-/g, '.') : ''
+        },
+        // 时间段对象
+        periodObj(){
+            let { periodStr } = this;
+            if(!periodStr)return {};
+            let [start, end] = periodStr.split('_');
+            return {
+                start: start ?? '',
+                end: end ?? '',
+            }
+        },
+    },
+    watch: {
+        periodStr(nVal, oVal){
+            if(oVal&&nVal&&nVal !== oVal)this.refreshRecordLs();
+        },
+        curTab(nVal, oVal){
+            if(nVal !== oVal)this.reloadRecordLs();
+        }
+    },
     data(){
         return {
+            brand_id: '',
+            tabs: [ '场地核销记录', '抖音核销记录', '商城核销记录' ],
             curTab: 0,
+            periodStr: '',/** ex: 2025-01-01_2025-01-02 */
+            stadiumList: [],
+            curStadium: {},
+            recordLs: [],
+            page: 1,
         }
     },
+    async onLoad(options){
+        this.brand_id = options?.brand_id ?? '';
+        this.getStadiumLs({ brand_id: options?.brand_id ?? '' });
+        this.reloadRecordLs();
+    },
+    onReachBottom(){
+        let { curStadium, periodObj, page, brand_id } = this;
+        this.getRecordLs({ 
+            brand_id: brand_id ?? '',
+            stadium_id: curStadium?.id ?? '',
+            start_time: periodObj?.start ?? '',
+            end_time: periodObj?.end ?? '',
+            page: page + 1,
+        });
+    },
     methods: {
-        
+        // 搜索
+        toSearch(){
+            let { brand_id, curTab } = this;
+            routeTo(`/subpackage/verification/pages/record_search?brand_id=${brand_id}&type=${curTab}`, 'nT');
+        },
+        // 手动离场
+        siteLeaveBtn: debounce(function(e, idx){
+            console.log(e, idx);
+            showModal({
+                content: '是否确认手动离场？',
+                showCancel: true,
+                success: async mRes=>{
+                    if(mRes.confirm){
+                        let _status = await this.leaveVerifyOrder({ brand_id: e?.brand_id ?? '', id: e?.id ?? '' });
+                        if(_status)this.recordLs[idx].verify_leave_time = formatTime(new Date());
+                        this.$forceUpdate();
+                    }
+                }
+            })
+        }, 300, true),
+        // 初始化时间段
+        initPeriodStr(){
+            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) });
+            return this.periodStr = `${_sStr}_${_eStr}`;
+        },
+        showPeriodModal(){
+            this.$refs?.periodSelect?.show?.();
+        },
+        // 门店切换
+        stadiumChange(e){
+            let { stadiumList } = this;
+            let _curStadium = stadiumList?.[e?.detail?.value ?? 0] ?? {};
+            this.curStadium = _curStadium;
+            this.refreshRecordLs();
+        },
+        // 加载/ 切换订单类型
+        reloadRecordLs(){
+            let { brand_id } = this;
+            this.page = 1;
+            this.recordLs = [];
+            this.initPeriodStr();
+            let { periodObj, curStadium } = this;
+            this.getRecordLs({ 
+                brand_id: brand_id ?? '' ,
+                stadium_id: curStadium.id ?? '',
+                start_time: periodObj.start,
+                end_time: periodObj.end,
+            });
+        },
+        // 切换门店/时间
+        refreshRecordLs(){
+            let { curStadium, periodObj, brand_id } = this;
+            this.page = 1;
+            this.recordLs = [];
+            this.getRecordLs({
+                brand_id: brand_id ?? '',
+                stadium_id: curStadium?.id ?? '',
+                start_time: periodObj?.start ?? '',
+                end_time: periodObj?.end ?? '',
+            });
+        },
+        // 获取门店列表
+        getStadiumLs({ brand_id }){
+			showLoad();
+            return server.post({
+                url: API.stadiumList,
+                data: { page_size: 9999, page: 1, brand_id },
+                isDefaultGet: false,
+            })
+            .then(res => {
+				hideLoad();
+                let _data = res?.data || {};
+                if(_data.code === 0){
+                    let _ls = _data?.data?.list || [];
+                    this.stadiumList = _ls;
+					return _ls;
+                }else{
+                    return Promise.reject(_data);
+                }
+            })
+            .catch(err => {
+                hideLoad();
+                showModal({
+                    title: '提示',
+                    content: err.message || '加载门店失败！'
+                })
+                console.warn('verification record getStadiumLs err --->', err);
+				// return Promise.reject(err);
+            })
+		},
+        // 商家助手-核销查询列表
+        getRecordLs({ brand_id, stadium_id = '', start_time = '', end_time = '', page = 1, page_size = 20 }){
+			showLoad();
+            return server.post({
+                url: this.getRecordLsAPI(),
+                data: this.formatQuery({ brand_id, stadium_id, start_time, end_time, page, page_size }),
+                isDefaultGet: false,
+            })
+            .then(res => {
+				hideLoad();
+                let _data = res?.data || {};
+                if(_data.code === 0){
+                    let _ls = this.formatRecordLs(_data?.data?.list || []);
+                    if(page === 1)return this.recordLs = _ls;
+                    if(!_ls.length)return showNone('没有更多！');
+                    this.page = page;
+                    this.recordLs = [ ...this.recordLs, ..._ls ];
+					return _ls;
+                }else{
+                    return Promise.reject(_data);
+                }
+            })
+            .catch(err => {
+                hideLoad();
+                showModal({
+                    title: '提示',
+                    content: err.message || '加载数据失败！'
+                })
+                console.warn('verification record getRecordLs err --->', err);
+				// return Promise.reject(err);
+            })
+		},
+        // 获取记录列表API
+        getRecordLsAPI(){
+            let { curTab } = this;
+            if(curTab === 0)return API.listVerifyRecord
+            if(curTab === 1)return API.dyPoiOrderList
+            if(curTab === 2)return API.shop2WriteoffList
+        },
+        // 格式化查询参数
+        formatQuery(query){
+            let { curTab } = this;
+            if(curTab === 1)query['order_status'] = 'used';
+            if(curTab === 2){
+                query['stime'] = query?.start_time ?? '';
+                query['etime'] = query?.end_time ?? '';
+                delete query.start_time
+                delete query.end_time
+            }
+            return query;
+        },
+        // 格式化数据
+        formatRecordLs(ls){
+            let { curTab } = this;
+            // 抖音
+            if(curTab === 1){
+                return ls.map(item=>{
+                    let _code = item?.order_codes?.find(e=>e?.code_status == 'used');
+                    console.log('_code',item);
+                    return {
+                        order_no: item?.order_no ?? '',
+                        user_phone: item?.mobile ?? '',
+                        verify_code: _code?.code ?? '',
+                        verify_method: _code?.verification_method ?? '',
+                        verify_time: _code?.verification_time ?? '',
+                    };
+                })
+            }
+            return ls;
+        },
+        // 核销记录列表 - 手动离场
+        leaveVerifyOrder({ brand_id, id }){
+			showLoad();
+            return server.post({
+                url: API.leaveVerifyOrder,
+                data: { brand_id, id },
+                isDefaultGet: false,
+            })
+            .then(res => {
+				hideLoad();
+                let _data = res?.data || {};
+                if(_data.code === 0){
+                    showNone(_data?.message || '操作成功！')
+					return true;
+                }else{
+                    return Promise.reject(_data);
+                }
+            })
+            .catch(err => {
+                hideLoad();
+                showModal({
+                    title: '提示',
+                    content: err.message || '操作失败！'
+                })
+                console.warn('verification record leaveVerifyOrder err --->', err);
+				// return Promise.reject(err);
+                return false;
+            })
+		},
     }
 }
 </script>
 
 <style lang="scss">
     .verification-record{
-
+        @include isPd(20upx);
     }
     .vr-header{
         background: #fff;
diff --git a/src/subpackage/verification/pages/record_search.vue b/src/subpackage/verification/pages/record_search.vue
new file mode 100644
index 0000000..8815cfc
--- /dev/null
+++ b/src/subpackage/verification/pages/record_search.vue
@@ -0,0 +1,244 @@
+<template>
+    <view class="record-search">
+        <view class="os-bar">
+            <view>
+                <image mode="aspectFit" src="/subpackage/verification/static/images/search.png"></image>
+                <input placeholder="请输入手机号/核销码" v-model="searchTxt" confirm-type="search" @confirm="iptConfirm" />
+                <image v-if="searchTxt!==''" mode="aspectFit" src="/subpackage/verification/static/images/round_close.png" @click="clearSearch"></image>
+            </view>
+        </view>
+        <view class="rs-ls">
+            <block v-for="(e, i) in searchLs" :key="i">
+                <site-item 
+                    v-if="orderType === 0"
+                    :stadium-name="e.extension&&e.extension.stadium_name"
+                    :order-num="e.order_no"
+                    :order-type="e.type"
+                    :user-phone="e.extension&&e.extension.user_phone"
+                    :user-nickname="e.extension&&e.extension.nickname"
+                    :verify-code="e.verify_code"
+                    :verify-method="e.desc"
+                    :verify-time="e.verify_time"
+                    :verify-leave-time="e.verify_leave_time"
+                    @click:leave="siteLeaveBtn(e, i)"
+                ></site-item>
+                <dy-item 
+                    v-if="orderType === 1"
+                    :order-num="e.order_no"
+                    :user-phone="e.user_phone"
+                    :verify-code="e.verify_code"
+                    :verify-method="e.verify_method"
+                    :verify-time="e.verify_time"
+                ></dy-item>
+                <mall-item 
+                    v-if="orderType === 2"
+                    :order-num="e.product_order_no"
+                    :order-code="e.product_order_self_pickup_info.gcode"
+                    :user-phone="e.product_order_self_pickup_info.phone"
+                    :user-name="e.product_order_self_pickup_info.name"
+                    :goods-str="e.product_order_goods.join('；')"
+                    :opt-user="e.optuname"
+                    :created-at="e.created_at"
+                ></mall-item>
+                <view class="vl-space" style="height: 24rpx;"></view>
+            </block>
+        </view>
+    </view>
+</template>
+
+<script>
+import { formatDate, showLoad, hideLoad, showModal, showNone, debounce, formatTime, routeTo } from "@/utils/util";
+import API from "../js/api.js";
+import server from "../js/server.js";
+import siteItem from "../components/record/site_item.vue";
+import dyItem from "../components/record/dy_item.vue";
+import mallItem from "../components/record/mall_item.vue";
+export default {
+    components: { siteItem, dyItem, mallItem },
+    data(){
+        return {
+            brand_id: '',
+            orderType: '',
+            searchTxt: '',
+            page: 1,
+            searchLs: [],
+        }   
+    },
+    onLoad(options){
+        this.brand_id = options?.brand_id ?? '';
+        this.orderType = +(options?.type ?? '');
+    },
+    onReachBottom(){
+        let { searchTxt, page } = this;
+        this.getRecordLs({
+            keyword: searchTxt,
+            page: ++page
+        })
+    },
+    methods: {
+        clearSearch(){
+            this.searchTxt = '';
+        },
+        iptConfirm(e){
+            let { brand_id } = this;
+            console.log(e);
+            this.page = 1;
+            this.searchLs = [];
+            this.getRecordLs({
+                brand_id,
+                keyword: e?.detail?.value || ''
+            })
+        },
+        // 手动离场
+        siteLeaveBtn: debounce(function(e, idx){
+            showModal({
+                content: '是否确认手动离场？',
+                showCancel: true,
+                success: async mRes=>{
+                    if(mRes.confirm){
+                        let _status = await this.leaveVerifyOrder({ brand_id: e?.brand_id ?? '', id: e?.id ?? '' });
+                        if(_status)this.searchLs[idx].verify_leave_time = formatTime(new Date());
+                        this.$forceUpdate();
+                    }
+                }
+            })
+        }, 300, true),
+        // 核销记录列表 - 手动离场
+        leaveVerifyOrder({ brand_id, id }){
+			showLoad();
+            return server.post({
+                url: API.leaveVerifyOrder,
+                data: { brand_id, id },
+                isDefaultGet: false,
+            })
+            .then(res => {
+				hideLoad();
+                let _data = res?.data || {};
+                if(_data.code === 0){
+                    showNone(_data?.message || '操作成功！')
+					return true;
+                }else{
+                    return Promise.reject(_data);
+                }
+            })
+            .catch(err => {
+                hideLoad();
+                showModal({
+                    title: '提示',
+                    content: err.message || '操作失败！'
+                })
+                console.warn('verification record_search leaveVerifyOrder err --->', err);
+				// return Promise.reject(err);
+                return false;
+            })
+		},
+        // 商家助手-核销查询列表
+        getRecordLs({ brand_id, stadium_id = '', start_time = '', end_time = '', page = 1, page_size = 20, keyword = '' }){
+			showLoad();
+            return server.post({
+                url: this.getRecordLsAPI(),
+                data: this.formatQuery({ brand_id, stadium_id, start_time, end_time, page, page_size, keyword }),
+                isDefaultGet: false,
+            })
+            .then(res => {
+				hideLoad();
+                let _data = res?.data || {};
+                if(_data.code === 0){
+                    let _ls = this.formatRecordLs(_data?.data?.list || []);
+                    if(page === 1)return this.searchLs = _ls;
+                    if(!_ls.length)return showNone('没有更多！');
+                    this.page = page;
+                    this.searchLs = [ ...this.searchLs, ..._ls ];
+					return _ls;
+                }else{
+                    return Promise.reject(_data);
+                }
+            })
+            .catch(err => {
+                hideLoad();
+                showModal({
+                    title: '提示',
+                    content: err.message || '加载数据失败！'
+                })
+                console.warn('verification record_search getRecordLs err --->', err);
+				// return Promise.reject(err);
+            })
+		},
+        getRecordLsAPI(){
+            let { orderType } = this;
+            if(orderType === 0)return API.listVerifyRecord
+            if(orderType === 1)return API.dyPoiOrderList
+            if(orderType === 2)return API.shop2WriteoffList
+        },
+        formatQuery(query){
+            let { orderType } = this;
+            if(orderType === 1)query['order_status'] = 'used';
+            if(orderType === 2){
+                query['stime'] = query?.start_time ?? '';
+                query['etime'] = query?.end_time ?? '';
+                delete query.start_time
+                delete query.end_time
+            }
+            return query;
+        },
+        formatRecordLs(ls){
+            let { orderType } = this;
+            // 抖音
+            if(orderType === 1){
+                return ls.map(item=>{
+                    let _code = item?.order_codes?.find(e=>e?.code_status == 'used');
+                    return {
+                        order_no: item?.order_no ?? '',
+                        user_phone: item?.mobile ?? '',
+                        verify_code: _code?.code ?? '',
+                        verify_method: _code?.verification_method ?? '',
+                        verify_time: _code?.verification_time ?? '',
+                    };
+                })
+            }
+            return ls;
+        },
+    }
+}
+</script>
+
+<style lang="scss">
+    .record-search{
+        @include isPd(20upx);
+    }
+    .os-bar{
+        margin-bottom: 24upx;
+        height: 144upx;
+        background-color: #fff;
+        @include ctf(center);
+        >view{
+            padding: 0 20upx;
+            height: 92upx;
+            width: 702upx;
+            border-radius: 10upx;
+            background-color: #f2f2f7;
+            @include ctf(center);
+            >image{
+                margin-right: 20upx;
+                flex-shrink: 0;
+                width: 40upx;
+                height: 40upx;
+            }
+            >input{
+                height: 100%;
+                flex-grow: 1;
+                @include flcw(32upx, 44upx, #1a1a1a);
+                &+image{
+                    flex-shrink: 0;
+                    margin-right: 0;
+                    margin-left: 20upx;
+                    width: 32upx;
+                    height: 32upx;
+                }
+            }
+        }
+    }
+    .rs-ls{
+        padding: 0 24upx;
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/verification/static/images/order/null_code.png b/src/subpackage/verification/static/images/order/null_code.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1e51345fedb3280659b4d7777550beabf680bc2
GIT binary patch
literal 7779
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

literal 0
HcmV?d00001

diff --git a/src/subpackage/verification/static/images/order/null_range.png b/src/subpackage/verification/static/images/order/null_range.png
new file mode 100644
index 0000000000000000000000000000000000000000..9dcfdcbca43a567dced12d27bdf925c226cb39d4
GIT binary patch
literal 3718
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

literal 0
HcmV?d00001

diff --git a/src/subpackage/verification/static/images/order/null_search.png b/src/subpackage/verification/static/images/order/null_search.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8a203786cc3537546fb028518164e5692f28e59
GIT binary patch
literal 4502
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

literal 0
HcmV?d00001

diff --git a/src/subpackage/verification/static/images/round_close.png b/src/subpackage/verification/static/images/round_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..c563ecb82bdcbb429388fcf903c0697c03e175c1
GIT binary patch
literal 369
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dymH|E?u0VSJ{8jVkubww=)q(}9
z7A{;5B!MCe7p?}9KsHc(&K!^km<v?4a?v6Xdxn>TF;KHmNswPK!^!0mvp73mCqKFw
zuA;l6$HjiuQu9YZ*{hx|jv*GOTZ7;79Z}$LZr^oxU*-Syy>E`J`YiP8^o?5qEUP%Q
zcdJa2S>NcEqr+QKeNpig_r~Ixb9f4ZpMH1!mvHlA+)u}aa*lu9cf_#2k`}E0*=2J`
zb8ei!e^l7KjxWEA4^HcJdi{*se|sEz6f0l9Q>Dl@A*(l=l|CC+`T143K1`gmB>c-B
zl}T)JHLY9|_#+iOnD1)}?d+2mS$FJ8&AxC0si{WsTDD$`FT4t_42{V!E$p@6chB2r
zeNUq2@hsCjX}mp_Mb|FOO3v5s+gtVR)2!G3Stp#<dH0&B{1?!J44$rjF6*2UngG*o
Bqh<gA

literal 0
HcmV?d00001


From 5bf4a61a0b46167e16707ead5e62a9526f08bb78 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Wed, 15 Jan 2025 11:18:40 +0800
Subject: [PATCH 10/30] del pages for tid1803

---
 src/pages.json                                     |  36 --
 src/pages/write_off/douyin/poi_list.vue            | 175 --------
 src/pages/write_off/mall/list/list.vue             | 237 ----------
 src/pages/write_off/menu/menu.vue                  | 131 ------
 src/pages/write_off/null/null.vue                  |  70 ---
 .../number_of_people/number_of_people.vue          | 496 ---------------------
 src/pages/write_off/operate/operate.vue            | 363 ---------------
 .../write_off/search_result/search_result.vue      | 339 --------------
 src/static/images/code_null.png                    | Bin 7565 -> 0 bytes
 src/static/images/countdown_bg.png                 | Bin 34246 -> 0 bytes
 src/static/images/order_null.png                   | Bin 8736 -> 0 bytes
 src/static/images/scan_null.png                    | Bin 11489 -> 0 bytes
 src/static/images/write_off/mall.png               | Bin 1400 -> 0 bytes
 src/static/images/write_off/order.png              | Bin 1025 -> 0 bytes
 src/static/images/write_off/people.png             | Bin 1833 -> 0 bytes
 src/static/images/write_off/site.png               | Bin 1438 -> 0 bytes
 src/subpackage/verification/pages/index.vue        |  10 +-
 .../pages/site_people/modules/not_leave_modal.vue  |   7 +-
 18 files changed, 12 insertions(+), 1852 deletions(-)
 delete mode 100644 src/pages/write_off/douyin/poi_list.vue
 delete mode 100644 src/pages/write_off/mall/list/list.vue
 delete mode 100644 src/pages/write_off/menu/menu.vue
 delete mode 100644 src/pages/write_off/null/null.vue
 delete mode 100644 src/pages/write_off/number_of_people/number_of_people.vue
 delete mode 100644 src/pages/write_off/operate/operate.vue
 delete mode 100644 src/pages/write_off/search_result/search_result.vue
 delete mode 100644 src/static/images/code_null.png
 delete mode 100644 src/static/images/countdown_bg.png
 delete mode 100644 src/static/images/order_null.png
 delete mode 100644 src/static/images/scan_null.png
 delete mode 100644 src/static/images/write_off/mall.png
 delete mode 100644 src/static/images/write_off/order.png
 delete mode 100644 src/static/images/write_off/people.png
 delete mode 100644 src/static/images/write_off/site.png

diff --git a/src/pages.json b/src/pages.json
index 5748c6f..51fe09c 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -171,18 +171,6 @@
 			}
 		},
 		{
-			"path": "pages/write_off/mall/list/list",
-			"style": {
-				"navigationBarTitleText": "商城订单核销"
-			}
-		},
-		{
-			"path": "pages/write_off/menu/menu",
-			"style": {
-				"navigationBarTitleText": "核销订单"
-			}
-		},
-		{
 			"path": "pages/write_off/ym_card_gated/ym_card_gated",
 			"style": {
 				"navigationBarTitleText": "核销订单"
@@ -195,36 +183,12 @@
 			}
 		},
 		{
-			"path": "pages/write_off/search_result/search_result",
-			"style": {
-				"navigationBarTitleText": "核销查询"
-			}
-		},
-		{
-			"path": "pages/write_off/operate/operate",
-			"style": {
-				"navigationBarTitleText": "核销订单"
-			}
-		},
-		{
 			"path": "pages/write_off/confirm_order/confirm_order",
 			"style": {
 				"navigationBarTitleText": "核销订单"
 			}
 		},
 		{
-			"path": "pages/write_off/null/null",
-			"style": {
-				"navigationBarTitleText": "确认订单信息"
-			}
-		},
-		{
-			"path": "pages/write_off/douyin/poi_list",
-			"style": {
-				"navigationBarTitleText": "核销订单"
-			}
-		},
-		{
 			"path": "pages/employee/review_list/review_list",
 			"style": {
 				"navigationBarTitleText": "员工管理"
diff --git a/src/pages/write_off/douyin/poi_list.vue b/src/pages/write_off/douyin/poi_list.vue
deleted file mode 100644
index 2ee4882..0000000
--- a/src/pages/write_off/douyin/poi_list.vue
+++ /dev/null
@@ -1,175 +0,0 @@
-<template>
-    <view class="dy-poi-ls">
-        <view class="dpl-header">
-            <stadium-picker
-                :stadium-list="stadiumList"
-                @change:stadium="stadiumChange"
-            ></stadium-picker>
-            <!-- <period-picker></period-picker> -->
-            <view class="dh-number">核销数量：{{ totalNum || 0 }}</view>
-        </view>
-        <view class="dpl-list">
-            <view class="dl-item" v-for="(e, i) in writeOffList" :key="i">
-                <list-item
-                    :order-no="e.order_no"
-                    :user-phone="e.user_phone"
-                    :verify-code="e.verify_code"
-                    :verify-method="e.verify_method"
-                    :verify-time="e.verify_time"
-                ></list-item>
-            </view>
-        </view>
-
-        <view class="r-bottom-btn"><view @click="toOperate">核销团购券</view></view>
-    </view>
-</template>
-
-<script>
-import periodPicker from "../all_components/period_picker.vue";
-import stadiumPicker from "../all_components/stadium_picker.vue";
-import listItem from "../all_components/list_item.vue";
-import { API } from '../../../js/api';
-import { servers } from '../../../js/server';
-import util from '../../../utils/util';
-import { mapState } from 'vuex';
-import { WRITE_OFF_STORE_NAME } from '../../../js/once_name';
-export default {
-    computed: {
-        ...mapState([ 'brandInfo' ]),
-    },
-    components: {
-        periodPicker,
-        stadiumPicker,
-        listItem
-    },
-    data() {
-        return {
-            totalNum: 0,
-            writeOffList: [],
-            stadiumList: [],
-            curStadium: {},
-            page: 1,
-        }
-    },
-    async onLoad() {
-        let _brand_id = this.brandInfo?.brand?.id || 63;
-        let _list = await this.getStoreList({ brand_id: _brand_id });
-        this.stadiumList = _list || [];
-        this.getList({ brand_id: _brand_id });
-
-    },
-    onReachBottom(){
-        let { page, curStadium } = this;
-        this.getList({
-            brand_id: curStadium?.brand_id,
-            stadium_id: curStadium?.id,
-            page: page + 1,
-        })
-    },
-    methods: {
-        toOperate(){
-            let { stadiumList, curStadium } = this;
-            util.$_emit(WRITE_OFF_STORE_NAME, {
-                stadiumList,
-                curStadium,
-            })
-            util.routeTo(`/pages/write_off/operate/operate?type=dypoi`, 'rT');
-        },
-        stadiumChange(stadium){
-            this.curStadium = stadium;
-            this.page = 1;
-            this.totalNum = 0;
-            this.writeOffList =  [];
-            this.getList({
-                brand_id: stadium?.brand_id,
-                stadium_id: stadium?.id,
-            })
-        },
-        getList({ brand_id, stadium_id = '', date = '', page = 1, page_size = 20, order_status = 'used' }){
-            util.showLoad();
-            servers.get({
-                url: API.writeOff.dyPoiOrderList,
-                data: { brand_id, stadium_id, date, page, page_size, order_status },
-                failMsg: '加载失败！',
-            })
-            .then(res=>{
-                util.hideLoad();
-                this.totalNum = res.total || 0;
-                let _list = (res.list || []).map(e=>this.formating(e));
-                if(page == 1)return this.writeOffList = _list;
-                if(!_list.length)return util.showNone('没有更多！');
-                this.page = page;
-                this.writeOffList = [...this.writeOffList, ..._list];
-            })
-        },
-        formating(data){
-            let _code = data?.order_codes?.find(e=>e?.code_status == 'used');
-            return {
-                order_no: data?.order_no || '',
-                user_phone: data?.mobile || '',
-                verify_code: _code?.code || '',
-                verify_method: _code?.verification_method || '',
-                verify_time: _code?.verification_time || '',
-            }
-        },
-        getStoreList({
-            page=1,
-            page_size=9999,
-            brand_id='',
-        }){
-            return servers.get({
-                url: API.stadiumList,
-                data: {
-                    page,
-                    page_size,
-                    brand_id,
-                },
-                failMsg: '获取列表失败！'
-            })
-            .then(res=>res.list || [])
-        },
-    }
-}
-</script>
-
-<style lang="scss">
-    .dy-poi-ls{
-        @include isPd(150upx);
-    }
-    .dpl-header{
-        position: sticky;
-        padding-bottom: 24upx;
-        background: #fff;
-        .dh-number{
-            padding: 0 24upx;
-            text-align: right;
-            @include flcw(32upx, 44upx);
-            @include tHide;
-        }
-    }
-    .dpl-list{
-        padding: 24upx;
-        .dl-item+ .dl-item{
-            margin-top: 24upx;
-        }
-    }
-    .r-bottom-btn{
-        position: fixed;
-        left: 0;
-        bottom: 0;
-        width: 100%;
-        padding: 10upx 24upx;
-        padding-bottom: calc( 10upx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
-        padding-bottom: calc( 10upx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
-        background-color: #f2f2f7;
-        >view{
-            height: 112upx;
-            line-height: 112upx;
-            text-align: center;
-            font-size: 32upx;
-            border-radius: 10upx;
-            color: #fff;
-            background-color: $mColor;
-        }
-    }
-</style>
\ No newline at end of file
diff --git a/src/pages/write_off/mall/list/list.vue b/src/pages/write_off/mall/list/list.vue
deleted file mode 100644
index d8379cd..0000000
--- a/src/pages/write_off/mall/list/list.vue
+++ /dev/null
@@ -1,237 +0,0 @@
-<template>
-    <view class="mall-order-ls">
-        <view class="mol-date">
-            <view class="md-txt">核销日期</view>
-            <view class="md-picker">
-                <picker mode="date" @change="stChange">
-                    <view>
-                        <input :value="startTime" disabled placeholder="请选择时间" />
-                        <image mode="aspectFit" src="/static/images/icon/arrow_c33.png"></image>
-                    </view>
-                </picker>
-            </view>
-            <view class="md-txt">至</view>
-            <view class="md-picker">
-                <picker mode="date" @change="edChange">
-                    <view>
-                        <input :value="endTime" disabled placeholder="请选择时间" />
-                        <image mode="aspectFit" src="/static/images/icon/arrow_c33.png"></image>
-                    </view>
-                </picker>
-            </view>
-        </view>
-        <view class="mol-list">
-            <view class="ml-item" v-for="(e, i) in writeOffList" :key="i">
-                <view class="mi-order-no">
-                    <view class="mon-num">订单编号：{{ e.product_order_no || '-' }}</view>
-                    <view class="mon-btn" @click="copyBtn(e.product_order_no || '-')">复制</view>
-                </view>
-                <view class="mi-info">
-                    <view class="mi-line">取货码：{{ e.product_order_no || '-' }}</view>
-                    <view class="mi-line">取货人：{{ e.product_order_self_pickup_info.name || '-' }} {{ e.product_order_self_pickup_info.phone || '-' }}</view>
-                    <view class="mi-line">商品：{{ e.product_order_goods.join('；') }}</view>
-                    <view class="mi-line">核验人：{{ e.optuname }}</view>
-                    <view class="mi-line">取货时间：{{ e.created_at || '-' }}</view>
-                </view>
-            </view>
-        </view>
-        
-        <view class="mol-fixed">
-            <view @click="toOperate">核销订单</view>
-        </view>
-    </view>
-</template>
-
-<script>
-import { API } from '../../../../js/api';
-import { servers } from '../../../../js/server';
-import util from '../../../../utils/util';
-import { mapState } from 'vuex';
-import { WRITE_OFF_STORE_NAME } from '../../../../js/once_name';
-export default {
-    computed: {
-        ...mapState([ 'brandInfo' ]),
-        
-    },
-    data(){
-        return {
-            writeOffList: [],
-            page: 1,
-            startTime: '',
-            endTime: '',
-
-        }
-    },
-    onReachBottom(){
-        let { brandInfo, startTime, endTime, page } = this;
-        this.getList({
-            brand_id: brandInfo.brand.id,
-            stime: startTime || '',
-            etime: endTime || '',
-            page: ++page
-        })
-    },  
-    onLoad(){
-        // 默认显示1个月内的日期
-        let _startDate = util.formatDate({ 
-            date: new Date().getTime() - 30*24*60*60*1000
-        }).substr(0, 10);
-        let _endDate = util.formatDate({ }).substr(0, 10);
-        this.startTime = _startDate;
-        this.endTime = _endDate;
-        // 默认显示1个月内的日期
-        
-        this.$nextTick(_=> this.refreshPage());
-    },
-    methods: {
-        refreshPage(){
-            let { brandInfo, startTime, endTime } = this;
-            this.page = 1;
-            this.writeOffList = [];
-            this.$nextTick(_=>{
-                this.getList({
-                    brand_id: brandInfo.brand.id,
-                    stime: startTime || '',
-                    etime: endTime || '',
-                })
-            })
-        },
-        copyBtn(data){
-            uni.setClipboardData({ data })
-        },
-        stChange(e){
-            console.warn(e)
-            this.startTime = e.detail.value;
-            this.$nextTick(_=>this.refreshPage());
-        },
-        edChange(e){
-            this.endTime = e.detail.value;
-            this.$nextTick(_=>this.refreshPage());
-        },
-        toOperate(){
-            util.$_emit(WRITE_OFF_STORE_NAME, null);
-            util.routeTo(`/pages/write_off/operate/operate?type=mall`, 'nT');
-        },
-        getList({ brand_id,  page = 1, page_size = 15, stime = '', etime = '' }){
-            util.showLoad();
-            servers.get({
-                url: API.writeOff.shop2WriteoffList,
-                data: { brand_id,  page, page_size, stime, etime },
-                failMsg: '加载失败！',
-            })
-            .then(res=>{
-                util.hideLoad();
-                this.totalNum = res.total || 0;
-                let _list = res.list || [];
-                if(page == 1)return this.writeOffList = _list;
-                if(!_list.length)return util.showNone('没有更多！');
-                this.page = page;
-                this.writeOffList = [...this.writeOffList, ..._list];
-                
-            })
-        },
-    }
-}
-</script>
-
-<style lang="scss">
-    @import '~style/public.scss';
-    .mall-order-ls{
-        padding-bottom: 122upx;
-        padding-bottom: calc( 122upx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
-        padding-bottom: calc( 122upx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
-    }
-    .mol-date{
-        padding: 0 28upx;
-        height: 148upx;
-        background-color: #fff;
-        @include centerFlex(flex-start);
-        .md-txt{
-            font-size: 32upx;
-            line-height: 44upx;
-            color: #1a1a1a;
-        }
-        .md-picker{
-            margin: 0 20upx;
-            width: 226upx;
-            border: 2upx solid #D8D8D8;
-            border-radius: 10upx;
-            overflow: hidden;
-            view{
-                padding: 0 10upx;
-                height: 88upx;
-                background-color: #f2f2f7;
-                @include centerFlex(space-between);
-                >input{
-                    flex-grow: 1;
-                    height: 100%;
-                    font-size: 28upx;
-                    color: #1a1a1a;
-                }
-                >image{
-                    margin-left: 10upx;
-                    flex-shrink: 0;
-                    width: 22upx;
-                    height: 22upx;
-                }
-            }
-        }
-    }
-
-    .mol-list{
-        padding: 24upx;
-        .ml-item{
-            margin-bottom: 24upx;
-            padding: 0 24upx;
-            background-color: #fff;
-            .mi-order-no{
-                padding: 30upx 4upx;
-                border-bottom: 2upx solid #f2f2f7;
-                @include centerFlex(space-between);
-                .mon-num{
-                    font-size: 28upx;
-                    font-weight: 500;
-                    line-height: 40upx;
-                    color: #1a1a1a;
-                }
-                .mon-btn{
-                    flex-shrink: 0;
-                    margin-left: 20upx;
-                    font-size: 28upx;
-                    line-height: 40upx;
-                    color: $themeColor;
-
-                }
-            }
-            .mi-info{
-                padding: 30upx 4upx;
-                .mi-line{
-                    font-size: 28upx;
-                    line-height: 52upx;
-                    color: #9C9C9F;
-                    @include textHide(1);
-                }
-            }
-        }
-    }
-
-    .mol-fixed{
-        position: fixed;
-        left: 0;
-        bottom: 0;
-        width: 100%;
-        background-color: #fff;
-        padding: 10upx 40upx;
-        padding-bottom: calc( 10upx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
-        padding-bottom: calc( 10upx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
-        >view{
-            height: 112upx;
-            line-height: 112upx;
-            text-align: center;
-            font-size: 32upx;
-            color: #fff;
-            background-color: $themeColor;
-            border-radius: 10upx;
-        }
-    }
-</style>
\ No newline at end of file
diff --git a/src/pages/write_off/menu/menu.vue b/src/pages/write_off/menu/menu.vue
deleted file mode 100644
index 5e75f0b..0000000
--- a/src/pages/write_off/menu/menu.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-<template>
-    <view class="write-off-menu">
-        <view class="wom-section">
-            <view class="ws-tit">场地订单核销</view>
-            <view class="ws-ls">
-                <view class="wl-item" @click="toOperate('site')">
-                    <image mode="aspectFit" src="/static/images/write_off/site.png"></image>
-                    <view>场地订单核销</view>
-                </view>
-                <view class="wl-item" @click="toSiteList">
-                    <image mode="aspectFit" src="/static/images/write_off/order.png"></image>
-                    <view>场地订单核销记录</view>
-                </view>
-            </view>
-        </view>
-        <view class="wom-section">
-            <view class="ws-tit">商城订单核销</view>
-            <view class="ws-ls">
-                <view class="wl-item" @click="toOperate('mall')">
-                    <image mode="aspectFit" src="/static/images/write_off/mall.png"></image>
-                    <view>商城订单核销</view>
-                </view>
-                <view class="wl-item" @click="toMallLs">
-                    <image mode="aspectFit" src="/static/images/write_off/order.png"></image>
-                    <view>商城订单核销记录</view>
-                </view>
-            </view>
-        </view>
-        <view class="wom-section">
-            <view class="ws-tit">抖音团购核销</view>
-            <view class="ws-ls">
-                <view class="wl-item" @click="toOperate('dypoi')">
-                    <image mode="aspectFit" src="/static/images/write_off/site.png"></image>
-                    <view>抖音团购核销</view>
-                </view>
-                <view class="wl-item" @click="toDypoiOrderLs">
-                    <image mode="aspectFit" src="/static/images/write_off/order.png"></image>
-                    <view>抖音团购核销记录</view>
-                </view>
-            </view>
-        </view>
-        <view class="wom-section">
-            <view class="ws-tit">现场散客人数</view>
-            <view class="ws-ls">
-                <view class="wl-item" @click="toPeopleNum">
-                    <image mode="aspectFit" src="/static/images/write_off/people.png"></image>
-                    <view>现场散客人数查询</view>
-                </view>
-            </view>
-        </view>
-        
-    </view>
-</template>
-
-<script>
-import util from '../../../utils/util';
-import { WRITE_OFF_STORE_NAME } from '../../../js/once_name';
-export default {
-    data(){
-        return {
-            brand_id: ''
-        }
-    },
-    onLoad(options){
-        this.brand_id = options?.brand_id || ''
-    },
-    methods: {
-        toPeopleNum(){
-            let _qryStr = `brand_id=${this.brand_id}`
-            util.routeTo(`/subpackage/verification/pages/site_people/index?${_qryStr}`, 'nT');
-        },
-        toOperate(type){
-            util.$_emit(WRITE_OFF_STORE_NAME, null);
-            util.routeTo(`/pages/write_off/operate/operate?type=${type}`, 'nT');
-        },
-        toSiteList(){
-            util.routeTo(`/pages/write_off/search_result/search_result`, 'nT');
-        },
-        toMallLs(){
-            util.routeTo(`/pages/write_off/mall/list/list`, 'nT');
-        },
-        toDypoiOrderLs(){
-            util.routeTo(`/pages/write_off/douyin/poi_list`, 'nT');
-        }
-    }
-}
-</script>
-
-<style lang="scss">
-    @import '~style/public.scss';
-    .write-off-menu{
-        padding: 60upx 68upx 0upx;
-        .wom-section{
-            margin-bottom: 30upx;
-            .ws-tit{
-                margin-bottom: 20upx;
-                font-size: 32upx;
-                font-weight: 500;
-                line-height: 44upx;
-                color: #1a1a1a;
-            }
-            .ws-ls{
-                @include centerFlex(space-between);
-                flex-wrap: wrap;
-                .wl-item{
-                    padding-top: 58upx;
-                    margin-bottom: 32upx;
-                    width: 288upx;
-                    height: 220upx;
-                    border-radius: 10upx;
-                    background-color: #fff;
-                    >image{
-                        margin: 0 auto 22upx;
-                        display: block;
-                        width: 60upx;
-                        height: 60upx;
-                    }
-                    >view{
-                        text-align: center;
-                        line-height: 40upx;
-                        font-size: 28upx;
-                        color: #9c9c9f;
-                        @include textHide(1);
-                    }
-
-                }
-            }
-
-        }
-    }
-</style>
\ No newline at end of file
diff --git a/src/pages/write_off/null/null.vue b/src/pages/write_off/null/null.vue
deleted file mode 100644
index 1bccb32..0000000
--- a/src/pages/write_off/null/null.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-<template>
-    <view class="null-container">
-        <image mode="aspectFit" :src="imgPath"></image>
-        <view class="c-tip" v-if="operateType == 'decrypt_text'">很抱歉！获取不到二维码订单信息</view>
-        <view class="c-tip" v-if="operateType == 'verify_code'">很抱歉！获取不到验证码订单信息</view>
-        <view class="c-btn" @click="toBlack">返回</view>
-    </view>
-</template>
-
-<script>
-import util from '../../../utils/util';
-export default {
-    computed: {
-        imgPath(){
-            let { operateType } = this;
-            if(operateType == 'verify_code')return '/static/images/code_null.png';
-            if(operateType == 'decrypt_text')return '/static/images/scan_null.png';
-        }
-    },
-    onLoad(options){
-        let { type } = options;
-        this.operateType = options.type
-    },
-    data(){
-        return {
-            isScan: false,
-            operateType: '', // verify_code(输入)/decrypt_text(扫码)
-        }
-    },
-    methods: {
-        toBlack(){
-            util.routeTo();
-        }
-    }
-}
-</script>
-
-<style lang="scss">
-    @import "~style/public.scss";
-    page{
-        background-color: #fff;
-    }
-    .null-container{
-        padding-top: 90upx;
-        >image{
-            display: block;
-            margin: 0 auto 86upx;
-            width: 420upx;
-            height: 420upx;
-        }
-        .c-tip{
-            margin-bottom: 260upx;
-            line-height: 40upx;
-            text-align: center;
-            font-size: 28upx;
-            color: #9c9c9f;
-        }
-        .c-btn{
-            margin: 0 auto;
-            width: 280upx;
-            text-align: center;
-            height: 92upx;
-            line-height: 88upx;
-            font-size: 32upx;
-            border: 2upx solid $themeColor;
-            color: $themeColor;
-            border-radius: 46upx;
-        }
-    }
-</style>
\ No newline at end of file
diff --git a/src/pages/write_off/number_of_people/number_of_people.vue b/src/pages/write_off/number_of_people/number_of_people.vue
deleted file mode 100644
index bdeb3c9..0000000
--- a/src/pages/write_off/number_of_people/number_of_people.vue
+++ /dev/null
@@ -1,496 +0,0 @@
-<template>
-    <view class="number-of-people">
-        <view class="nop-store-name">
-            <picker :range="stadiumList" range-key="name" @change="stadiumChange">
-                <view class="nsn-frame">
-                    <input placeholder="请选择店铺" :value="curStadium.name" disabled />
-                    <image mode="aspectFit" src="/static/images/icon/arrow_c33.png"></image>
-                </view>
-            </picker>
-        </view>
-        <view class="nop-main">
-            <view class="nm-date">日期：{{ dateStr || '-' }}</view>
-            <view class="nm-tit">现场散客人数</view>
-            <view class="nm-num">
-                <image mode="aspectFit" src="/static/images/countdown_bg.png"></image>
-                <view class="nn-txt-num">{{peopleInfo.present_person_number || 0}}</view>
-            </view>
-			<view class="nm-txt" @click="checkNotLeave">查看未离场订单</view>
-            <view class="nm-btn" @click="isChangeNum = true">修改人数</view>
-			<view class="nm-line">
-				<view class="nl-txt">凌晨自动清零</view>
-				<view class="nl-switch" @click="switchChange">
-					<switch color="#009777" disabled  style="transform:scale(0.8)" :checked="peopleInfo. present_person_number_clear"></switch>
-				</view>
-			</view>
-            <view class="nm-tip">
-                <text>* 不开启凌晨自动清零，则现场灯光按【现场散客人数】去判断是否开启或关闭；修改人数会直接影响现场灯光开关！\n\r* 开启凌晨自动清零，则现场灯光按【散客订单未离场数量】去判断是否开启或关闭；修改人数不会影响现场灯光开关！但如有散客订单一直未扫码离场，可能会无法关灯，需要将未离场的散客订单设置为已离场后才可关闭灯光！</text>
-            </view>
-        </view>
-        <view class="ox-dark-mask" v-if="isChangeNum">
-            <view class="nop-modifies-modal">
-                <image class="nmm-close" @click="isChangeNum = false" src="/static/images/icon/x_close.png"></image>
-                <view class="nmm-tit">修改现场散客人数</view>
-                <view class="nmm-info">
-                    <view class="ni-num">当前现场散客人数为：{{peopleInfo.present_person_number || 0}}</view>
-                    <view class="ni-ipt">
-                        <input placeholder="请输入散客人数" v-model="changeNum" type="number" />
-                    </view>
-                    <view class="ni-tip">修改现场人数可能会影响现场灯光开关，请谨慎操作！</view>
-                </view>
-                <view class="nmm-btns">
-                    <view @click="isChangeNum = false">取消</view>
-                    <view @click="confirmChange">确认</view>
-                </view>
-            </view>
-        </view>
-		
-		<view class="ox-dark-mask" v-if="isNotLeave">
-		    <view class="nop-modifies-modal">
-		        <image class="nmm-close" @click="isNotLeave = false" src="/static/images/icon/x_close.png"></image>
-		        <view class="nmm-tit nmm-btm">未离场订单</view>
-				<view class="nmm-line" v-if="orderNum.person_number>0">
-					<view>次卡未离场：{{orderNum.person_number || 0}}</view>
-					<view @click="checkBtn(0)">查看</view>
-				</view>
-				<view class="nmm-line" v-if="orderNum.person_timing>0">
-					<view>计时未离场：{{orderNum.person_timing || 0}}</view>
-					<view @click="checkBtn(1)">查看</view>
-				</view>
-				<view class="nmm-line">
-					<view>年月卡未离场：{{orderNum.monthly_card||0}}</view>
-					<view @click="checkBtn(0)">查看</view>
-				</view>
-		    </view>
-		</view>
-    </view>
-</template>
-
-<script>
-import { API } from '../../../js/api'
-import { servers } from '../../../js/server'
-import { mapState } from 'vuex';
-import util from '../../../utils/util';
-let timer = null;
-export default {
-    computed: {
-        ...mapState([ 'brandInfo' ]),
-    },
-    data(){
-        return {
-            isChangeNum: false,
-            stadiumList: [],
-            curStadium: {
-                name: ''
-            },
-            peopleInfo: {},
-            dateStr: '-',
-            changeNum: '',
-			
-			isNotLeave: false,
-			orderNum: {},  //未离场订单数量
-        }
-    },
-    onLoad(options){
-        this.initStore();
-        this.dateStr = util.formatDate({ partition: 'zh' }) || '-';
-    },
-	
-    onUnload(){
-        this.clearTime();
-    },
-    methods: {
-        confirmChange: util.debounce(function(){
-            let { changeNum } = this;
-            if(isNaN(changeNum))return util.showNone('请输入正确人数！');
-            this.isChangeNum = false;
-            this.setStadiumPresentNumber(changeNum);
-        }, 200, true),
-        setStadiumPresentNumber(num){
-            let { curStadium } = this;
-            util.showLoad();
-            servers.get({
-                url: API.writeOff.setStadiumPresentNumber,
-                data: {
-                    brand_id: curStadium.brand_id,
-                    stadium_id: curStadium.id,
-                    number: +num,
-                },
-                isDefaultGet: false,
-            })
-            .then(res=>{
-                util.hideLoad();
-                if(res.data.code == 0){
-                    util.showNone(res.data.message || '操作成功！');
-                    setTimeout(_=>{
-                        this.getUserNum({
-                            stadium_id: curStadium.id,
-                            brand_id: curStadium.brand_id
-                        })
-                        this.initInertval();
-                    }, 1200)
-                }else{
-                    util.showNone(res.data.message || '操作失败！');
-                }
-            })
-            .catch(util.hideLoad)
-        },
-        initInertval(){
-            this.clearTime();
-            let { curStadium } = this;
-            if(!curStadium.id || !curStadium.brand_id)return;
-            timer = setInterval(_=>{
-                if(!curStadium.id || !curStadium.brand_id)return this.clearTime();
-                this.getUserNum({
-                    stadium_id: curStadium.id,
-                    brand_id: curStadium.brand_id
-                })
-            }, 3000);
-        },
-        clearTime(){
-            clearInterval(timer);
-            timer = null;
-        },
-
-        stadiumChange(e){
-            let { stadiumList } = this;
-            let _curStadium = stadiumList[e.detail.value] || {};
-            if(!_curStadium.id || !_curStadium.brand_id)return;
-            this.curStadium = _curStadium;
-            this.getUserNum({
-                stadium_id: _curStadium.id,
-                brand_id: _curStadium.brand_id
-            })
-            this.initInertval();
-        },
-        async initStore(){
-            let { brandInfo } = this;
-            try{
-                util.showLoad();
-                let _storeList = await this.getStoreList({ brand_id: brandInfo.brand.id || '' });
-                if(!_storeList || !_storeList.length)return util.showNone('没有店铺信息');
-                this.stadiumList = _storeList || [];
-                let _curStadium = _storeList[0] || {};
-                this.curStadium = _curStadium;
-                this.initInertval();
-                this.getUserNum({
-                    stadium_id: _curStadium.id,
-                    brand_id: _curStadium.brand_id
-                })
-                util.hideLoad();
-            }catch(err){
-                util.hideLoad();
-                util.showNone('初始化店铺数据失败！');
-                console.warn('加载数据失败！', err);
-            }
-        },
-        // 获取店铺列表
-        getStoreList({
-            page=1,
-            page_size=9999,
-            brand_id='',
-        }){
-            return servers.get({
-                url: API.stadiumList,
-                data: {
-                    page,
-                    page_size,
-                    brand_id,
-                },
-                failMsg: '获取列表失败！'
-            })
-            .then(res=>{
-                let _list = res.list || [];
-                return _list
-            })
-        },
-        getUserNum({
-            stadium_id,
-            brand_id,
-        }){
-            servers.get({
-                url: API.writeOff.timingNumber,
-                data: { stadium_id, brand_id },
-                failMsg: '加载现场人数失败！'
-            })
-            .then(res=>{
-                this.peopleInfo = res
-            })
-        },
-		
-		// 凌晨自动清零 - 未离场订单数量
-		checkNotLeave(){
-			let { curStadium } = this;
-			util.showLoad();
-			servers.get({
-			    url: API.writeOff.notLeavingNums,
-			    data: {
-			        brand_id: curStadium.brand_id,
-			        stadium_id: curStadium.id,
-			    },
-			    // isDefaultGet: false,
-				failMsg: '请求失败！'
-			})
-			.then(res=>{
-			    util.hideLoad();
-				this.orderNum = res
-				this.$nextTick(_=>{
-					this.isNotLeave = true
-				})
-			})
-		},
-		
-		checkBtn(type){
-			if(type == 0)return util.routeTo(`/pages/write_off/search_result/search_result`, 'nT');
-			if(type == 1)return util.routeTo(`/pages/order_list/order_list?order_type=1`, 'nT');
-		},
-		
-		switchChange(){
-			let { peopleInfo, curStadium } = this
-		    this.$nextTick(_=>{
-		        util.showModal({
-		            title: '提示',
-		            content: peopleInfo.present_person_number_clear==false?'是否确认开启凌晨自动清零？':peopleInfo.present_person_number_clear==true?'是否确认关闭凌晨自动清零？':'',
-		            showCancel: true,
-		            success: modalRes=>{
-		                if(modalRes.confirm){
-							util.showLoad();
-							servers.get({
-							    url: API.writeOff.timingOpen,  //凌晨自动清零【开/关】
-							    data: {
-							        brand_id: curStadium.brand_id,
-							        stadium_id: curStadium.id,
-									status: peopleInfo.present_person_number_clear==false?1:peopleInfo.present_person_number_clear==true?0:'',
-							    },
-							   failMsg: '请求失败！'
-							})
-							.then(res=>{
-							    util.hideLoad();
-							    util.showNone('操作成功！');
-							})
-						}
-		            }
-		        })
-		    })
-		},
-		
-    }
-}
-</script>
-
-<style lang="scss">
-    @import '~style/public.scss';
-    page{
-        background-color: #fff;
-    }
-    .number-of-people{
-        .nop-store-name{
-            height: 144upx;
-            @include centerFlex(center);
-            .nsn-frame{
-                padding: 0 20upx;
-                width: 702upx;
-                height: 92upx;
-                border-radius: 10upx;
-                background-color: #F2F2F7;
-                @include centerFlex(space-between);
-                >input{
-                    flex-grow: 1;
-                    line-height: 40upx;
-                    font-size: 28upx;
-                    color: #1A1A1A;
-                }
-                >image{
-                    flex-shrink: 0;
-                    margin-left: 20upx;
-                    width: 28upx;
-                    height: 28upx;
-                }
-            }
-        }
-        .nop-main{
-            padding: 8upx 0upx 0;
-            .nm-date{
-				margin: 0 24rpx 86rpx;
-                line-height: 44upx;
-                font-size: 32upx;
-                color: #1a1a1a;
-            }
-            .nm-tit{
-				margin: 0 30rpx 16rpx;
-                text-align: center;
-                font-size: 32upx;
-                font-weight: 500;
-            }
-            .nm-num{
-                position: relative;
-                margin: 0 auto;
-                display: block;
-                width: 400upx;
-                height: 400upx;
-                .nn-txt-num{
-                    line-height: 400upx;
-                    text-align: center;
-                    font-size: 96upx;
-                    font-weight: 500;
-                    color: $themeColor;
-                }
-                >image {
-                    position: absolute;
-                    left: 50%;
-                    top: 50%;
-                    z-index: -1;
-                    margin-left: -250upx;
-                    margin-top: -250upx;
-                    display: block;
-                    width: 500upx;
-                    height: 500upx;
-                    animation: Rotate 6s linear infinite
-                }
-                @keyframes Rotate{
-                    0% {transform: rotate(360deg);}
-                    50% {transform: rotate(180deg);}
-                    100% {transform: rotate(0deg);}
-                }
-            }
-			.nm-txt{
-				margin: 10rpx auto 42rpx;
-				color: #9C9C9F;
-				font-size: 28rpx;
-				text-align: center;
-				line-height: 40rpx;
-				text-decoration: underline;
-			}
-            .nm-btn{
-                margin: 0 auto;
-                width: 618upx;
-                line-height: 112upx;
-                height: 112upx;
-                text-align: center;
-                border-radius: 10upx;
-                font-size: 38upx;
-                color: #fff;
-                background-color: $themeColor;
-            }
-			.nm-line{
-				margin: 46rpx 0 0;
-				padding: 34rpx 28rpx 20rpx 34rpx;
-				border-top: 2rpx solid #F2F2F7;
-				@include centerFlex(space-between);
-				.nl-txt{
-					color: #1A1A1A;
-					font-size: 32rpx;
-					line-height: 44rpx;
-				}
-				
-				.nl-switch{
-				    flex-shrink: 0;
-				    flex-grow: 0;
-				}
-			}
-            .nm-tip{
-				margin: 0 32rpx 30rpx 34rpx;
-                font-size: 28upx;
-                line-height: 52upx;
-                color: #9C9C9F;
-            }
-
-        }
-        .nop-modifies-modal{
-            position: absolute;
-            left: 50%;
-            top: 50%;
-            transform: translate(-50%, -50%);
-            padding-top: 78upx;
-            width: 620upx;
-            height: 706upx;
-            background-color: #fff;
-            border-radius: 10upx;
-            .nmm-close{
-                position: absolute;
-                right: 30upx;
-                top: 30upx;
-                width: 34upx;
-                height: 34upx;
-            }
-            .nmm-tit{
-                line-height: 44upx;
-                text-align: center;
-                font-weight: 500;
-                font-size: 32upx;
-                color: #1A1A1A;
-            }
-            .nmm-info{
-                padding: 54upx 80upx 80upx;
-                .ni-num{
-                    margin-bottom: 30upx;
-                    font-size: 28upx;
-                    line-height: 48upx;
-                    color: #1A1A1A;
-                    @include textHide(1);
-                }
-                .ni-ipt{
-                    margin-bottom: 26upx;
-                    padding: 0 20upx;
-                    height: 88upx;
-                    border-radius: 10upx;
-                    border: 2upx solid #D8D8D8;
-                    >input{
-                        flex-grow: 1;
-                        height: 100%;
-                        font-size: 28upx;
-                        color: #1A1A1A;
-                    }
-                }
-                .ni-tip{
-                    font-size: 24upx;
-                    line-height: 34upx;
-                    color: #EA5061;
-                }
-            }
-            .nmm-btns{
-                @include centerFlex(center);
-                >view{
-                    margin: 0 10upx;
-                    width: 240upx;
-                    height: 88upx;
-                    line-height: 84upx;
-                    text-align: center;
-                    font-size: 32upx;
-                    border-radius: 10upx;
-                    border: 2upx solid $themeColor;
-                    color: $themeColor;
-                    &+view{
-                        color: #fff;
-                        background-color: $themeColor;
-                    }
-                }
-            }
-			.nmm-btm{
-				margin-bottom: 8rpx;
-			}
-			.nmm-line{
-				margin: 78rpx 70rpx 0 74rpx;
-				@include centerFlex(space-between);
-				>view{
-					&:first-child{
-						color: #1A1A1A;
-						font-size: 28rpx;
-						line-height: 48rpx;
-					}
-					&:nth-child(2){
-						width: 156rpx;
-						height: 68rpx;
-						border: 2rpx solid #009874;
-						border-radius: 10rpx;
-						color: #009874;
-						font-size: 32rpx;
-						line-height: 64rpx;
-						text-align: center;
-					}
-				}
-			}
-
-        }
-    }
-</style>
\ No newline at end of file
diff --git a/src/pages/write_off/operate/operate.vue b/src/pages/write_off/operate/operate.vue
deleted file mode 100644
index 628e492..0000000
--- a/src/pages/write_off/operate/operate.vue
+++ /dev/null
@@ -1,363 +0,0 @@
-<template>
-    <view class="operate-container">
-        <view class="store-bar">
-            <text>当前门店</text>
-            <picker mode="selector" :range="stadiumList" range-key="name" @change="stadiumChange">
-                <view>
-                    <input disabled v-model="curStadium.name" />
-                    <image mode="aspectFit" src="/static/images/icon/arrow_c33.png"></image>
-                </view>
-            </picker>
-        </view>
-        <view class="c-scan-btn" @click="scanCodeBtn">
-            <image mode="aspectFit" src="/static/images/icon/scan_code_btn.png"></image>
-        </view>
-        <view class="c-verification-code">
-            <view><input placeholder="输入订单验证码" v-model="iptCode" /></view>
-            <view @click="confirmBtn">确认核销</view>
-        </view>
-    </view>
-</template>
-
-<script>
-import util from '../../../utils/util';
-import { API } from '../../../js/api';
-import { servers } from '../../../js/server';
-import { WRITE_OFF_STORE_NAME, WRITE_OFF_ORDER_INFO, WRITE_OFF_MALL_ORDER_INFO } from '../../../js/once_name';
-import { mapState } from 'vuex';
-export default {
-    data(){
-        return {
-            iptCode: '',
-            stadiumList: [],
-            curStadium: {},
-            
-            writeOffType: '', // 新增核销类型  site(场地订单)/ mall(商城订单)/ dypoi(抖音团购)
-
-        }
-    },
-    computed: {
-        ...mapState([ 'brandInfo' ]),
-    },
-    onLoad(options){
-        this.writeOffType = options.type || '';
-        util.$_once(WRITE_OFF_STORE_NAME, data => { // 定位门店
-            if(!data)return this.initStore();
-            this.curStadium = data.curStadium;
-            this.stadiumList = data.stadiumList;
-        })
-
-    },
-    methods: {
-        async initStore(){
-            let { brandInfo } = this;
-            try{
-                util.showLoad();
-                let _storeList = await this.getStoreList({ brand_id: brandInfo.brand.id || '' });
-                if(!_storeList || !_storeList.length)return util.showNone('没有店铺信息');
-                this.stadiumList = _storeList || [];
-                if(_storeList.length) this.curStadium = _storeList[0];
-                util.hideLoad();
-            }catch(err){
-                util.hideLoad();
-                util.showNone('初始化店铺数据失败！');
-            }
-        },
-        // 获取店铺列表
-        getStoreList({
-            page=1,
-            page_size=99999,
-            brand_id='',
-        }){
-            return servers.get({
-                url: API.stadiumList,
-                data: {
-                    page,
-                    page_size,
-                    brand_id,
-                },
-                failMsg: '获取列表失败！'
-            })
-            .then(res=>{
-                let _list = res.list || [];
-                return _list
-            })
-        },
-        
-        scanCodeBtn: util.debounce(function(){
-            uni.scanCode({
-                onlyFromCamera: true,
-                scanType: 'qrCode',
-                success: res=> {
-                    if(util.changeLowerCase(res.scanType) !== 'qr_code')return util.showNone('不支持此类型！');
-
-                    this.analysisOrder({ decrypt_text: res.result });
-                },
-                fail: function(err) {
-                    util.showNone('扫码失败！');
-                    console.warn('扫码失败--->', err);
-                }
-            })
-        }, 300, true),
-        stadiumChange(e){
-            let { stadiumList } = this;
-            this.curStadium = stadiumList[e.detail.value];
-        },
-        confirmBtn: util.debounce(function(){
-            let { iptCode } = this;
-            if(!iptCode)return util.showNone('请输入核销码！');
-            this.analysisOrder({ verify_code: this.iptCode });
-        }, 300, true),
-
-
-        // 核销请求
-        analysisOrder({ verify_code = '', decrypt_text = '' }){
-            let { curStadium, writeOffType } = this;
-            if(!verify_code&&!decrypt_text)return;
-            let _query = {
-                brand_id: curStadium.brand_id,
-                stadium_id: curStadium.id,
-            }
-            let _vType = '';
-            if(!!verify_code){
-                _vType = 'verify_code';
-                writeOffType == 'site'&&(_query['verify_code'] = verify_code);
-                writeOffType == 'mall'&&(_query['vcode'] = verify_code);
-            }
-            if(!!decrypt_text){
-                _vType = 'decrypt_text';
-                writeOffType == 'site'&&(_query['decrypt_text'] = decrypt_text);
-                writeOffType == 'mall'&&(_query['vcode'] = decrypt_text);
-            }
-            if(writeOffType == 'site')return this.siteGet({ query: _query, vType: _vType, });
-            if(writeOffType == 'mall')return this.mallGet({ query: _query, vType: _vType, });
-            if(writeOffType == 'dypoi'){
-                let _code = verify_code;
-                if(decrypt_text){
-                    try{
-                        _code = JSON.parse(decrypt_text)?.code;
-                    }catch(err){console.warn(err)}
-                }
-                return this.dypoiGet({
-                    ..._query,
-                    code: _code,
-                });
-            }
-        },
-        // 抖音团购
-        dypoiGet(query){
-            util.showLoad();
-            servers.get({
-                url: API.writeOff.dyPoiEnterVerifyOrder,
-                data: query,
-                isDefaultGet: false
-            })
-            .then(res=>{
-                util.hideLoad();
-                let { code, data, message } = res?.data || {};
-                if(code!==0)return util.showModal({
-                    title: '提示',
-                    content: message || '查询失败！',
-                    confirmText: '好的'
-                })
-                if(data?.order?.order_no)return util.showModal({
-                    title: data?.order?.product_cache?.name || '提示',
-                    content: '核销数量：1',
-                    showCancel: true,
-                    confirmText: '确认核销',
-                    cancelText: '取消',
-                    success: res=>{
-                        if(res.confirm){
-                            this.dypoiConfirm({ ...query });
-                        }
-                    }
-                })
-                console.log('订单查询---->', res);
-            })
-            .catch(util.hideLoad)
-        },
-        dypoiConfirm({
-            stadium_id = '',
-            brand_id = '',
-            code = '',
-        }){
-            util.showLoad();
-            servers.post({
-                url: API.writeOff.dyPoiAssistantVerify,
-                data: {
-                    stadium_id,
-                    brand_id,
-                    code,
-                },
-                isDefaultGet: false
-            })
-            .then(res=>{
-                util.hideLoad();
-                let { code, data, message } = res?.data || {};
-                if(code!==0)return util.showModal({
-                    title: '提示',
-                    content: message || '核销失败！',
-                    confirmText: '好的'
-                })
-
-                util.showModal({
-                    title: '提示',
-                    content: message || '核销成功！',
-                    confirmText: '关闭'
-                })
-            })
-            .catch(util.hideLoad)
-        },
-        // 商城订单
-        mallGet({ query = {}, vType = '', }){
-            util.showLoad();
-            servers.get({
-                url: API.writeOff.shop2WriteoffGet,
-                data: query,
-                isDefaultGet: false
-            })
-            .then(res=>{
-                util.hideLoad();
-                if(res.data.code == 0){
-                    let _data = res.data.data || {};
-                    if(_data.has_order){
-                        util.$_emit(WRITE_OFF_MALL_ORDER_INFO, {..._data.order || {}});
-                        util.routeTo(`/pages/write_off/mall/confirm/confirm?type=${vType}`, 'nT');
-                    }else{
-                        util.routeTo(`/pages/write_off/null/null?type=${vType}`, 'nT');
-                    }
-                }else{
-                    util.showNone(res.data.message || '操作失败！')
-                }
-                
-            })
-            .catch(util.hideLoad)
-        },
-
-        // 场地/ 年月卡 / 赛事
-        // @vType  verify_code(扫码)/ decrypt_text(输入)
-
-        siteGet({ query = {}, vType = '', }){
-            util.showLoad();
-            servers.get({
-                url: API.writeOff.enterVerifyOrder,
-                data: query,
-                isDefaultGet: false
-            })
-            .then(res=>{
-                util.hideLoad();
-                if(res.data.code == 0){
-                    let _data = res.data.data || {}
-                    
-                    // 年月卡
-                    if(_data.extension&&_data.extension.verify_order_type === 'monthly_card'){
-                        util.$_emit(WRITE_OFF_ORDER_INFO, { data: _data, query });
-                        util.routeTo(`/pages/write_off/ym_confirm/ym_confirm?type=${vType}`, 'nT');
-                        return
-                    }
-
-                    // 赛事
-                    if(_data.extension&&_data.extension.verify_order_type === 'match_order'){
-                        util.$_emit(WRITE_OFF_ORDER_INFO, {..._data});
-                        util.routeTo(`/pages/write_off/events_order/events_order?type=${vType}`, 'nT');
-                        return
-                    }
-                    
-                    util.$_emit(WRITE_OFF_ORDER_INFO, {..._data});
-                    util.routeTo(`/pages/write_off/confirm_order/confirm_order?type=${vType}`, 'nT');
-                }else{
-                    util.routeTo(`/pages/write_off/null/null?type=${vType}`, 'nT');
-                }
-                console.log('订单查询---->', res);
-            })
-            .catch(util.hideLoad)
-        }
-
-    }
-}
-</script>
-
-<style lang="scss">
-    @import '~style/public.scss';
-    page{
-        background-color: #f2f2f7;
-    }
-    .operate-container{
-        .store-bar{
-            margin-bottom: 24upx;
-            padding: 0 24upx;
-            height: 144upx;
-            background-color: #fff;
-            @include centerFlex(space-between);
-            >text{
-                margin-right: 20upx;
-                flex-shrink: 0;
-                font-size: 28upx;
-                color: #9C9C9F;
-            }
-            >picker{
-                flex-grow: 1;
-            }
-            view{
-                padding: 0 20upx;
-                height: 92upx;
-                border-radius: 10upx;
-                background: #f2f2f2;
-                @include centerFlex(space-between);
-                >input{
-                    flex-grow: 1;
-                    height: 100%;
-                    font-size: 28upx;
-                    color: #1A1A1A;
-                }
-                >image{
-                    flex-shrink: 0;
-                    flex-grow: 0;
-                    width: 28upx;
-                    height: 28upx;
-                }
-            }
-        }
-        .c-scan-btn{
-            margin: 0 auto 24upx;
-            width: 702upx;
-            height: 360upx;
-            border-radius: 10upx;
-            background-color: #fff;
-            @include centerFlex(center);
-            >image{
-                width: 172upx;
-                height: 172upx;
-            }
-        }
-        .c-verification-code{
-            padding: 40upx;
-            border-radius: 10upx;
-            background-color: #fff;
-            >view{
-                &:first-child{
-                    margin-bottom: 30upx;
-                    padding: 0 20upx;
-                    height: 112upx;
-                    border-radius: 10upx;
-                    background-color: #f2f2f7;
-                    >input{
-                        height: 100%;
-                        width: 100%;
-                        font-size: 32upx;
-                        color: #1a1a1a;
-                    }
-                }
-                &+view{
-                    height: 112upx;
-                    text-align: center;
-                    line-height: 112upx;
-                    border-radius: 10upx;
-                    font-size: 32upx;
-                    color: #fff;
-                    background-color: $themeColor;
-                }
-            }
-        }
-    }
-</style>
\ No newline at end of file
diff --git a/src/pages/write_off/search_result/search_result.vue b/src/pages/write_off/search_result/search_result.vue
deleted file mode 100644
index 993764c..0000000
--- a/src/pages/write_off/search_result/search_result.vue
+++ /dev/null
@@ -1,339 +0,0 @@
-<template>
-    <view class="search-result">
-        <view class="store-bar">
-            <text>当前门店</text>
-            <picker mode="selector" :range="stadiumList" range-key="name" @change="stadiumChange">
-                <view>
-                    <input disabled v-model="curStadium.name" />
-                    <image mode="aspectFit" src="/static/images/icon/arrow_c33.png"></image>
-                </view>
-            </picker>
-        </view>
-        <view class="r-timer-select">
-            <picker mode="date" @change="dateChange">
-                <view>
-                    <text>核销日期：{{curDate || '-'}}</text>
-                    <image mode="aspectFit" src="/static/images/icon/arrow_c33.png"></image>
-                </view>
-            </picker>
-            <view>核销数量：{{writeOffList.length || 0}}</view>
-        </view>
-        <view class="r-order-list">
-            <view class="l-item" v-for="(e, i) in writeOffList" :key="i">
-                <view class="i-name">{{ e.extension.stadium_name || '-' }}</view>
-                <view class="i-lines">
-                    <view>
-                        <view>订单编号：{{ e.order_no || '-' }}</view>
-                        <view>（{{ e.type || '-' }}）</view>
-                    </view>
-                    <view>
-                        <view>用户信息：{{ e.extension.user_phone || '-' }}（{{ e.extension.nickname || '-' }}）</view>
-                    </view>
-                    <view>
-                        <view>核销码：&#12288;{{e.verify_code || '-' }}</view>
-                    </view>
-                    <view>
-                        <view>验证方式：{{ e.desc || '-' }}</view>
-                    </view>
-                    <view>
-                        <view>核销时间：{{ e.verify_time || '-'}}</view>
-                    </view>
-                    <view>
-                        <view>离场时间：{{ e.verify_leave_time || ''}}</view>
-                    </view>
-                </view>
-				<view class="i-btn" v-if="e.verify_leave_time==''" @click="leaveBtn(e)">手动离场</view>
-            </view>
-        </view>
-        <view class="r-bottom-btn"><view @click="toOperate">核销订单</view></view>
-    </view>
-</template>
-
-<script>
-import util from '../../../utils/util';
-import { API } from '../../../js/api';
-import { servers } from '../../../js/server';
-import { mapState } from 'vuex';
-import { WRITE_OFF_STORE_NAME } from '../../../js/once_name';
-export default {
-    computed: {
-        ...mapState([ 'brandInfo' ]),
-    },
-    data(){
-        return {
-            stadiumList: [],    // 店铺列表
-            curStadium: {},     // 当前店铺
-            writeOffList: [],    // 核销列表,
-            curDate: util.formatDate({}),
-            page: 1,
-            totalNum: 0, 
-        }
-    },
-    // 20210716测试：取消分页，返回当天
-    // onReachBottom(){
-    //     let { page, curDate, curStadium } = this;
-    //     this.getList({
-    //         brand_id: curStadium.brand_id || '',
-    //         stadium_id: curStadium.id || '',
-    //         date: curDate || '',
-    //         page: ++page,
-    //     });
-    // },
-    onLoad(){
-        this.initPage();
-    },
-    onShow(){
-        let { curStadium } = this;
-        if(curStadium&&curStadium.id)this.refreshList();
-    },
-    methods: {
-        refreshList(){
-            let { curDate, curStadium } = this;
-            this.page = 1;
-            this.writeOffList = [];
-            this.getList({
-                brand_id: curStadium.brand_id || '',
-                stadium_id: curStadium.id || '',
-                date: curDate || '',
-            });
-        },
-
-        dateChange(e){
-            this.curDate = e.detail.value;
-            this.$nextTick(this.refreshList);
-        },
-        stadiumChange(e){
-            let { stadiumList } = this;
-            this.curStadium = stadiumList[e.detail.value];
-            this.$nextTick(this.refreshList);
-        },
-
-        async initPage(){
-            let { brandInfo } = this;
-            try{
-                let _storeList = await this.getStoreList({ brand_id: brandInfo.brand.id || '' });
-                this.stadiumList = _storeList || [];
-                if(_storeList.length) this.curStadium = _storeList[0];
-                this.$nextTick(this.refreshList);
-            }catch(err){
-                console.warn('加载数据失败！', err);
-            }
-        },
-        toOperate(){
-            let { stadiumList, curStadium } = this;
-            util.$_emit(WRITE_OFF_STORE_NAME, {
-                stadiumList,
-                curStadium,
-            })
-            util.routeTo(`/pages/write_off/operate/operate?type=site`, 'nT');
-        },
-        getList({ brand_id, stadium_id = '', date = '', page = 1, page_size = '' }){
-            util.showLoad();
-            servers.get({
-                url: API.writeOff.listVerifyRecord,
-                data: { brand_id, stadium_id, date, page, page_size },
-                failMsg: '加载失败！',
-            })
-            .then(res=>{
-                util.hideLoad();
-                this.totalNum = res.total || 0;
-                let _list = res.list || [];
-                if(page == 1)return this.writeOffList = _list;
-                if(!_list.length)return util.showNone('没有更多！');
-                this.page = page;
-                this.writeOffList = [...this.writeOffList, ..._list];
-                
-            })
-        },
-        getStoreList({
-            page=1,
-            page_size=9999,
-            brand_id='',
-        }){
-            return servers.get({
-                url: API.stadiumList,
-                data: {
-                    page,
-                    page_size,
-                    brand_id,
-                },
-                failMsg: '获取列表失败！'
-            })
-            .then(res=>{
-                let _list = res.list || [];
-                return _list
-            })
-        },
-		
-		leaveBtn(item){
-			let { curStadium } = this;
-			util.showModal({
-			    title: '提示',
-			    content: '是否确认手动离场？',
-			    showCancel: true,
-			    success: modalRes=>{
-			        if(modalRes.confirm){
-						util.showLoad();
-						servers.get({
-						    url: API.writeOff.leaveVerifyOrder,
-						    data: {
-						        brand_id: curStadium.brand_id,
-						        id: item.id,
-						    },
-						    failMsg: '请求失败！'
-						})
-						.then(res=>{
-						    util.hideLoad();
-							util.showNone('操作成功！');
-							this.refreshList()
-						})
-					}
-			    }
-			})
-		},
-    }
-}
-</script>
-
-<style lang="scss">
-    @import "~style/public.scss";
-    page{
-        background-color: #f2f2f7;
-    }
-    .search-result{
-        padding-bottom: 132upx;
-        padding-bottom: calc( 132upx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
-        padding-bottom: calc( 132upx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
-        .store-bar{
-            padding: 0 24upx;
-            height: 144upx;
-            background-color: #fff;
-            @include centerFlex(space-between);
-            >text{
-                margin-right: 20upx;
-                flex-shrink: 0;
-                font-size: 28upx;
-                color: #9C9C9F;
-            }
-            >picker{
-                flex-grow: 1;
-            }
-            view{
-                padding: 0 20upx;
-                height: 92upx;
-                border-radius: 10upx;
-                background: #f2f2f2;
-                @include centerFlex(space-between);
-                >input{
-                    flex-grow: 1;
-                    height: 100%;
-                    font-size: 28upx;
-                    color: #1A1A1A;
-                }
-                >image{
-                    flex-shrink: 0;
-                    flex-grow: 0;
-                    width: 28upx;
-                    height: 28upx;
-                }
-            }
-        }
-        .r-timer-select{
-            padding: 0 24upx;
-            margin-bottom: 10upx;
-            @include centerFlex(space-between);
-            picker{
-                flex-shrink: 0;
-                view{
-                    padding: 24upx 0;
-                    >text{
-                        font-weight: 500;
-                        font-size: 32upx;
-                    }   
-                    >image{
-                        margin-left: 16upx;
-                        vertical-align: middle;
-                        width: 22upx;
-                        height: 22upx;
-                    }
-                }
-            }
-            >view{
-                max-width: 40%;
-                text-align: right;
-                font-weight: 500;
-                font-size: 32upx;
-                @include textHide(1);
-            }
-        }
-        .r-order-list{
-            padding: 0 24upx;
-            .l-item{
-				position: relative;
-                margin-bottom: 24upx;
-                padding: 0 20upx;
-                border-radius: 10upx;
-                background-color: #fff;
-                .i-name{
-                    height: 100upx;
-                    line-height: 98upx;
-                    border-bottom: 2upx solid #D8D8D8;
-                    font-weight: 500;
-                    font-size: 28upx;
-                    color: #1a1a1a;
-                }
-                .i-lines{
-                    padding-top: 8upx;
-                    padding-bottom: 32upx;
-                    >view{
-                        display: flex;
-                        >view{
-                            min-width: 0;
-                            line-height: 52upx;
-                            font-size: 28upx;
-                            color: #9c9c9f;
-                            @include textHide(1);
-                            &+view{
-                                flex-shrink: 0;
-                                color: $themeColor;
-                            }
-                        }
-						
-                    }
-                }
-				.i-btn{
-					position: absolute;
-					right: 20rpx;
-					bottom: 32rpx;
-					background-color: #009874;
-					border-radius: 10rpx;
-					width: 156rpx;
-					height: 68rpx;
-					color: #FFFFFF;
-					font-size: 28rpx;
-					text-align: center;
-					line-height: 68rpx;
-				}
-            }
-        }
-        .r-bottom-btn{
-            position: fixed;
-            left: 0;
-            bottom: 0;
-            width: 100%;
-            padding: 10upx 24upx;
-            padding-bottom: calc( 10upx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
-            padding-bottom: calc( 10upx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
-            background-color: #f2f2f7;
-            >view{
-                height: 112upx;
-                line-height: 112upx;
-                text-align: center;
-                font-size: 32upx;
-                border-radius: 10upx;
-                color: #fff;
-                background-color: $themeColor;
-            }
-        }
-    }
-</style>
\ No newline at end of file
diff --git a/src/static/images/code_null.png b/src/static/images/code_null.png
deleted file mode 100644
index 8b413753ea0151f2dfb0ecf6e772e8cf3af630d5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7565
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
CboHwM

diff --git a/src/static/images/countdown_bg.png b/src/static/images/countdown_bg.png
deleted file mode 100644
index 5df695146a75cbe2643ecf54b6ca9aab53b62a56..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 34246
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
zyZ`_I000000000000000000000000000000000000001dwFd_R00000g8Z#l7@z_G
ZfFU#Ko1)rDDYXCq002ovPDHLkV1nx1o^AjD

diff --git a/src/static/images/order_null.png b/src/static/images/order_null.png
deleted file mode 100644
index 51835332f4c5b64fc75fe8816190f4e4e2203988..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8736
zcmYjWc{tSH_a}SEo+8FliAX}yV9J`ZtE}-s2r=2oEKy2?BxD_H$Xbluj3wFEv1A=1
z8vBfWX3X-__pjf5o_n76z0W=8zRv61*ZJrD-ong?_q5n)CMG6c<9qs6Oiav>f0L8t
zWan6uNIF@3vM_mQaI$1D7%Th46PuNhelnJqmveG*GBYzbHa7MsWMoqli9}jmUESH)
zsi~<+&dU6hmA<*TiQC;mAP}RA^CNT9U2E9MC2W6xKfS-Wva+(ZwRLW8Zt?HR^y*4U
zNl7{)yR^IvcXaqAJ-xKF6p2LE*3}0MA+vH3Sw)2_L+B_>%je%+rPz@P!fM=PJ7anD
z1jfsehU{EKK~Yg*NpX5cI-|cZdZcAyV&cc23C7;~*V0nxKz&YWF#}VZTTsCG-ExSj
zum9QJIXak|mzQ5y_$51w@^_Nao1Zz?cVa7=>htFZ8QqB7nO^#0fANp1;>z+9n=<i}
zwlPodEyQ7(=-s)D?!2_jOmcT2qbHxySGZ2zKXHkwDZ<ugw$<c;`@Z}2e-G^WKDWC$
zNnATQ?BDmpqrdWmI>ux(W1y6QN=!{nWz7Cu+9xn@{fyBcjE*l619kDKpJPT*n@9Ua
z^Mh$qznWI2D;CE-j(5~7O?0g<w&CacH<xl|diN>h$kFEPBR1ocs(1!jnOQTvdKb=R
zReebR_~vq4N$Sll5+Y$ewKo52`Sw^#MpDN7w0@MkM2|A@kD$;(Ut{X{HxM56G16In
zEwA!Z0BL$6tEc;WVehx1siAfds(!V*?x9=XWHyX8^R3pp*|qk|KJ~cbJ&I}MuObr@
zVA5Fs?!&N|&GB|FJ!yV}Q9Ijcr9x((kIZQuuRd+<WAEJI0;%}$LbmOO0>T`bPeA_v
z@xo1-wH;9C*ZA{Og<QMkOg_5nYn0n3vW6S2_}R`Q7pi9vz<y%?o_!|YlWN4!)JE_Z
zg6HvZ(P)+eV*Lu=Ja#)=-9tW!>u{{`_|YXTjxWug<cTlzIBivLuM3=~h}))>&F{VX
z52C(Yj#S7hnv%O4caQBLPg|c~M3|r;4BhpmGca2o=JoGA_oX!DKAKA#ySN<nZ*E>M
z70lcbt=f#Ce^GzfqsxKnq<45(`#m1Kk-W2K2k#YASoTxj_%M9db7(!M!HriWz&kF3
z=I(5Bq~VsiZ=QK3FlA1m>v)=dxFURkaFsmx-a+CqN<M<8{*NIHxxB(KL1NRL^kmTi
z<&cV*d!ebf35nw56t|Vxm+*2oMtKqg@ZtkRZmUpfVqzJ=7AQu3<R**lnL0<ly}RMy
zecQ*U)3fR6=&oqzHqr2Cbh0THm`$Bfj@#R#dxbu;J$@WFl`BW41rVk@_&MVWV|6?a
zHYLXo=y4C{%9=TXMaozU<^jpqWD{%D`S?c%bohT7uUxev>n8V!iq)_R>02p#shz(u
z<~Vq<PwI@24X#oAMA_okp43u()JM64waLp03FGr!Ha0ab9)z{y*VhGOTy>s46|%4?
z<y(65IuGNA1YWqsPvfXuF=v)a;S*DWbMVX&N<~Qj5o_V!kFrOXEplVDnfz9f_7Y~9
z4|VYH<-q8qVFc0UEc2qDte>As)UCkxNj~^_%-v2eHyMTq`E3GnnE4aainMHZ*jt&m
zFB{>Bkm^H`MT0AHAI=S3W9KSoH_5~l+oF(!*U%4ajlU6Yi<JW-HvYqF)>7D0(|4ly
zS40Ya<_L4Wc+fl{jR;&w1zSH$bdWN<yEfkXS?0~$^Nl-sR2w(0I)D9Q{7p$0p1Gwd
z864VKXIWIO&CM`c`@++DFYQle->KBt1~x(I(u+ARuQ-rAR8KN6ktRb9F}}I8c|*+P
zdXzmoJsC1oj42)FUdB(dR(@7%$};n1!S-<+*jxlSz0pZ3hrhpDr+67V*4wWk+&jgV
zi0Gx<qWt1~@j>Nju`#-ec#Rw_E%NbJK(<|x9mlPsTX)zB;#SbmWvgd9LD4UylO-Z7
za$YK5;FQm2DfutxJ5_6|oXYRH`Dgmmv<%wXwSvX()s-Usxx+pQ8eunLx{%N(5SeI?
za2C#hg>SR5=WR58Z!4J_eM}FIq(<fL7D^E<eWGR?_fpdg-z0IY8Sz9)e+JHcyA~$F
z2DG;**>@HO7G>9e%zc5A?>f^5;FbGY@n5=*!q>ybMMd$R2Zy+UK+6dQbJ%l@6ww~m
zK1p8S{a|=Tgt!q^o!kgD$SnhPR_EUrlHqAz0Nj}_aG4o?qvHrtxHhmii@Y4kXP^1y
z>B^Bp63BwmCs{F@KBMz)pSkk*rQGVvyvxxj)lYtAFyFBu@a|BRobMH$KT4i|KkHu5
z70n-EP35w@F(8<o$Jv)ZATFfwRRhLSHI(wiHcJ$?b5N`334NgZb@Hf|@FyDXsyxJp
z8N<^K&N=;eiC}KT%<u^xvJ_o>1m4eFYHJ%3?^gJQ6@I81*dA}DB~4FGCUOT0+C$Td
z?jq~@m4Hb53TgY0D{0}ogRWvm{nqiP|3jamH%4Yxc3E$z*^P36ljqKeN~8{rmP7JK
zz@>pheNGt6e>uAg_rF_sbfxnD0Pqj)CwNRb*X3IeYgm7Go>p#nEDnv;i9?u8_a}VU
z)lLCQq!op!xvgwS8CBCvIuiM6h~l)QXG|pJ*}pZM=6y!0=_2S;xWMA4i|mhq<r&$Q
zeGInBfe>PU_UoS)u5#xrTA!-)sAI1wfB(CX8MN~_Kbntmp=0<%6VZfJE<MS!Jja>H
z4hbimSp<mPv-}g7#!1aZj+NVOY}xu5#+S;qO_keS)oi)PuA>-=5^Gq~^}i_VLAO4I
zD@X%^mActG>mUnmmv9mJzEZ5Vz=w<7tvrA8Gl4$&BJdYCR9}(;ahV4Fci+M}Kg;V9
zcaWt?tNc*_uvtU2qfdvEl3oCP{USHCRnfo1<k8+tnUbBu11X@-ap7XsYi8{qH`PTX
z;|;_8wK1i0T%YCB6d@l1I25cc_=kNjLb7X1HLTKQPJvn?ri?RZ{%V~8p^LtH>5_69
zR4npeswba@uyaFgOe~M130CR(mUttKaCR0l{h37+K+#Or_w-|6cuvtptrZ#k6BgNT
zGt%6EdAm&h^@)K1CTBU{`wG_Q=lz$-**AP}-qsq0IN1|i9kQwhA9$e99QG}wQrcT7
zdT6kix=)cr**!6xsGDpl@+pp;d_Jbo+ER=3d@H=%C4WAzPT7MiGA^Xb=%sRb=lFCr
zR{!&y0GmvEA>R8$mvC2y3j%bLpnIKo$n2ed&(Wt(#a1r$>-kPzF1$a;kJ6cWxLPI<
zuI8$8al*5#%8LmRn~i=|HT>AwxBn6wAV#J9{Ze_U5~_!DiJLT|_3@m7b?ssra@zM>
zccZa5DzVr!ScwUpv2pjY?kmrnL@S?fPVpxZcu*UEysTA6^VtArDP8e5Gj6I2^6JL#
z-XNu%j=EV?N6MFpVIf&=X7iQ@7*V_n7i%s;0H&E4F{W0;ygcv^Hy%=-O@S-EzxopK
zd#!w_Nm3M|WMG<)@j6ndu}ieb?ta4^PC%L623xCGkzJo4NtFJx&A1o$bFuThI`AMV
z3t4yrnG;G{xd>78z27ms&R~J2>teO`PJ*5IYm&axf5PzfNdpomq2D>*je=jnB@6sa
zs~D;DB{j3(H_X?&0L!!3@%J7qu_<uF8xg1e5Ct;Si%gO-ie8mvyn%1ZdRZR}>iklS
zPTxd)srqt>m{eO@N_3jFJYzQ-ao~c6pD)A$&TOayDdChzI5{Nm)uZhmC6v`$zV_LO
z&i=A?()P{NoyBj?Rq1Pc?~aHe?I@yutvs^JhC;kF-3n`iwjcW?Igr1Hv0d9hj+4`*
zsn!64Oe>T<CH}`n(8tf02%Pn?6c~h!j6VzOUHa?O=2<=o_;4xA*a=1_Z}{t=;b9Gk
zVE_Q$?G)GE-IOi{Yxt?#uA}#2^7D<9sBFGbhV-_heGYs6^$+KtoU<HXbeFpl6{}&v
zFTi%!fM36*oXX5w!QGobSyh3opo3M@*9+vn&!`rs?@Sh6TVC7APSyaMIfw5uQ=i^O
zRP?pyQjqMg?>0J?%ej#d{YUT6Y@npZ&KTuIVBmhepVrJrfVrr1KNEF$BFld8%w;qY
z#KeH%B0QDa-R$(g9&%zu2ra*kot@8Knggc7!Hqf84zRLLSYO-lP}c2qsT#wl-e6fH
zM_8csK{DC9vz0<6@1^qPI-0@X^EnW57V(mF<44c?7G_l55{BmaR?&*y<-8;?fEoo8
zWmIj%Q?Xa(=s3~$1KHgX(S+U5yDv}!>>v5c#GZGdZ*y+pQv&Pu{ViT0F2$M(q@O~C
zPn)0Rec5A8nI(dM;#0`KBJA6Sg}S~j5Jty?;%E4}Ig0L>uYkMJS*$DQl|v2?H_;lR
zw}flf|2nWJtBKk~Lk{en?`C%}<ml~p^%#9Dcd@@FS?RN^b(dvPn-cCebKr4$uHkQ2
z#+GU@T7t2A-17(RWq^S4l1j6XZY1xz^X{Q#E+8lNJ_M+mi2>U0&!sBQ!4~n%uus2*
zWl^ud^%G~%VMq?0<<NEzpLVg!@oW_1Vy~*d{?}LF4%D>w)a!M*yKFBDyE_5%e*xaf
zBOI_pHDeE6XI^aQ2U`29gK6&8D9G9xTq02m%Dp|N+nbT{%dWYn{-o_W5yTJo?$=&x
zwo-;ml%paj8YV#i{8^HhtM&2(u_>OCWuW0ZZ)9PnMH3yG85w4wE@4VpiSJFO+xa%}
zkFLxA8NuvB0HgjHox^6(`-}3bOa0ff8I_~Q3bnTovZHCBV7U6>e*A}=KZ5iLb1?_Z
zf(=k&LtYJP_8%YAed0BmGUK>$c8F8w6Cex8T7Zf%Iq&{?UK1>D!V#2a*r8hDp=U4Y
zKze_}XLxh5X8MeryU6bi9A-0DivxyfT`SjeUzCeAb=hJ9IT6#U85X4@p>S5`k5Fz0
zq26J^FTf8ZK`y7Q06v&s9d>{70W59T8QfF=Y~+F*0jXN;EbsNdei$P+ie@W^Y2F@<
z)J$=fIaba#)dfr#3uQJ9#3*x<wo^ihHkMI*{s~F6gP4SFetMCPn>ES1&4^d_d9>8+
zmxr#IEBv^2j~JwS5|!$8$|2cEz;wH)#piama}>kWAjb-Su?XZj9FI;(u_kjFLR-nt
zSP^I8hBzBa2mTz@#dLiP?PozQF?%sd0UR9gJ1gl(Z9{P8YeD-GI!G*CDpl|G7`PJ@
z{O!ndsi$n`8AKoV?kpp)d@&6^l{>PT=m$*xc#9a9tepW|o)|DO4RynKc<Xa4T?iqd
zCI-srN}f!hVOy>nJ|9T2ZwawR>QuX@IF^h@u~R}~Ik(Ku?;D@+%Zo$rR+tT5uEgM~
zw+L@UC-UC{W;eJ=|8u($rY3_1Tam8g%g6Hx>NJiW;vN=vbbCFn=d<Z;Z1!wJI`#@g
z0%k{QdEIPW@5P3OJM0DY+W?s%(d*?`E8_T`U38XA137EdKZ;%bcxzSY);}=ZF$K5x
z(<x0H>Q$tmhLM+Ria6(Wm7CGXWTW9Bqu^ialBPHo`*BeBg_H%ik&QE=yKMx`n+8u6
zBz3;ME_y6K(ho)Y`UvKWC9H<lzJ*;|JknU_b{<@f<6aG34k??0-FyNw3LP@&7^d5{
zCQ@W>6or0n3<mBS(ks8QU;`r7tjSKHUuAuxVr5t$83Qxgsw8|AvO05}$*xZuanDoq
zp;B#rVvFP;-4U8d>9D~7``!e<^)aooK3%c4z(bVKU90jQ1)Q}cDsz&w6HZRlaK)hY
zc0<>L3n!n~Cu<%-)pYj{h{^x5y%9yY#PCsH6mZ~$dtJ2H82eAs#D~P^sBcEz3~!K&
zF-@|G<BP$=z8N%@Er)`CDDf_-G33w4ggSD8+DnuTAzkgE^;8UPv;KZ>8iEac47dOe
znVbEZf<^pm!Qv#mca1wmh_2y&r*P|Hj4TD=eSUgd_!JDmck#y3)sQiP!J)_{!3{#a
znFU1<hX=p&anvKFQ4&m_$X0zd!@FG@2z?&%N?zjWL+ASf#lOz++)Tj&Acm0XcIQn_
zK#8JlO$imzhmHjJ%W72NL_ZSLYu;8(COj-5WDkd|s&xfl1%=B}`KKDxw6O(?o?YY`
zbSD8iE_%|%N}?Hlo}}tINvXVDvK#;61_l_OYD}^N|4;HA&ZnIHgC`Ep-+HTcS`8;S
z#RQA8bhZU1siNk#7}0!IT=o~}rXM<D-yn=hCjxTWidn7Yg~U_t^~7kw^=)8hs6l^+
z+}NmLgK07>-U+W1-Jb=XD<YpKT6cYoG5KCg1XCBhA2Z@m^P_=g_k=$Iuv^Q_I&~hO
zeve0#OKd{i5uknI>(**L1=IY$1$Vbr43wcT+;}wN2|w{z{GcmFS&y`*FmSdsq@i{z
zLHW*;-`p+s{?XzrAcN<zEg2^Ym@mgwU5(FVcS_azl!D#~*%rP%!9`5g^wIyCk0Cc?
zIFH-i@u!>n6TVS@WK0YW1^ePcI|&=&g6DVKACe7t8O<F(6}yy|4b?RBiDivr!=63d
zM4_jX=XOL^t^~^Y*!p$Tt8#^l_<U}<j7C-($*yFVo3xqpXUg0V@$wGf3nd|~o(5fn
zbL!<xX^9uMzRLthVvB1+-Uv94u2Dntrap-INt@Gf;iu~Z%Ujz9S*fhw<#)YD*B~?5
zUPx;#)5U8BYuwbV!wsK7*q5u^pz<0|T+V<0is!nB**2k@?>B?f0>AZxg^HX9p*01M
zAdCG2_Mp1UsDJ5;F!*WP1Fb|K)-{Xu3%i~xZb0R16cGdTNmN?=<8!7JS@)-4<qF@D
z%!BM$qg`YqvYh*0jrG6E;M}g8)VmsWtek)B;Cg!o2DmVq&fWM5asB2&Ikyf+a~!>a
zI$X!jyyPpb((=sMVtRR^(uW&Bl6SMV1)kk=+74CEWTHD<w~#s8hiT<XT-$vVt*o`;
zWCRsRUw;FhdEUYI@>DYqfyoKgsM&g9?bMPTH!POpAMs093V>JdI;X0SHyd!a5!2}A
ztHFLo!a6wtjC6HF2okqvUjz(fM(cT8+_qXMVuQ?1@O9sx=&fu2SGk>uGt+HGp{O)Q
z>_TV+P%+$~U-PZ$=tjwDfVrK=<o036`{S8oZ<&G%*5odc?<*mO%50u?B%FKNbepsI
z#s$;sp_#yNL;-4nKmA5}Ho++@&Sln`mcL)`CG;J#gU%~II~cODzZr>;Iq8UQrx}y7
z{wdsM(tArSY8wX6-W2TO|JZ7L&aaW6_v#ozRa)o&I-O<~ybnlUkmRS@tn{ybR))kQ
zKhnfud0+nc;mcg`S06Aq!1&#DHQ_h@L5^&qx^1s=rJ7dry;%I+4Ir=hV)LbB8eZT!
z)Hn>>c#D*ea~bvNX8Wp`*T0uv=m561T7z~rLgg^MQ^pBzyLF7~R{q-&o#Y5U$bCpH
z%-mtdGM@4#$%hhMXg9732OOK&rODo7V-W{AY?>BHBi;Gt7vI3FCEctEN(B;a;CbRX
z5ou;8hwXC*9Pn}fJQb(eFOMsR<RdQbYkN*sFZCPTaXg}s>zD$b4CL`Bzf(F_R)LVt
zn&SqFN|;PSswlco`$Qlm%AU2tX8oCp+OCtoY$nrYUELMpn?xmmR8h%a8MZqsf;yMA
zJo3uH@zS1R=%{#LSZak=FohqY4q+s#FHg*|{yZ=iX&Gj-I)|migrJ5vJ<hE!UrVS9
zAvw8P$Cxxm@v+e^cm@WykMgxI$xYTzP@~K8Sx5^uP+URG{cDSuYB`ph6M8q--<?t(
zYdG++97u=GwPM=uVBsFT;pzdQxKlBPj)$Igm`5M!<Hff-)_)0seKBpk5d)uT|4V{q
zkSp&&@tIiM=)8JvqX`Th?rMBGNsDn5KFLCS;f7B=v$Ol>W`%oS=pAFv>;WUvFCc6L
z&#s%EhwfaIC%=72u&R$SjTsRn;r(>_!a9^De^tV~hL08(UyT^NgNBZ_PYYiHKiCJ{
zjyBgPMRh!kK;wcA%<HvgNRELCn|vGRS3{qI5#`}ArY>D+HQb^+f7*@v-6qp>a@<ch
zUsBA6v3J`C{#Ks!837MFbsnMDHxeF@T+B1>7$E9n9gKKG@D66Eo<k=W5LWrDXE^8<
z3ko|hGguXxU9>0fdi%A<ii!v=z`?eiMf+R<!!o=y+NHuK&;YF-(RP$$*ZD}Gnf+&;
z)C4~5%BCs}a^^2@M;)Ym&KHLMeSyaZ?Z^dvD0#X>BI3<Y8eB@?Dk`hJ_zK=m`Pa1%
zmsPAtTaoP9z4cf|Z6B`>>IvOZo{$*PYmk3-^W;6&$(NJXn*vz#1!V8*b?Av?XRW1y
zKq5?FV?(<NWr@FjzP2mF^C9y4INI-Xd+S@X5&C$^=PGkM2)oYMsv&0om|sSe`1^M(
z6CWg|`<@mK%I+OE035|VzgFi=_%Ud>+IieEG6l&psniaGrq5J!K;Sm_emV|vL9V!%
z(Js?0?wg~Gwgi69kQ&;(D&4(o$*X#)TOpZWj}kZgeS{{}7deh^4jl<)cEl=Y4~3dA
zI;22L%6L1=Hhk*1b`!+V8Dc*)V7c~j^)oD7E5rGC*S&+{zonGjDM^G@QBJ(N^#*ej
zoA{`mZ+0^KXyU)XtupUIU`aGBPRhcf?m-Y7gHVOKFt#6D$^(U)dY&M}rmL5e0(cM|
z<A#X*aZY;IC#8zC?j?}CMpyAX^*{aZT4^Ij^Ppw*h)I1SC_nJ`EC)qHtNfqbc5Z<-
z#e=fi04<wbFzfAlI}C#tqe>q1_V7L^0A-sL><+Z$;9k?uZ>mi0pU>=gBru=2_x@_4
zJL7CLO9&&0;qrav;m5cobF}g*Ir4cUUbghg`-Y`zVOj?5;m8yTejU1hq_h~}cyKVl
zj%`=dR4LzKbBCQaEF}+ultuRtv%G2N&RS!AQ?D{B_a(b*y)=b4S5BL!qjvw@X?=L^
zACd2f(y?82(%CK7Ea!yi>R7#r%BmG@Oyq1x35YY&Y1H#jvxZ@XL2yEMbbi-IF@E)b
zt9oFLatb}q|8BLYR(@2zH5NW5L`*TUhC3w(X|*uz$HMA*uBH%l%%{n63vkE=59v!e
z+5RB9<wSI0&OQpC-1_I@u6$spVdok-d{I1JT4L<F3-=iq@F5~y=Rr7N-=Xb@Kl6k_
zuiI$Nk*5?d{X=V~yJ|7XwP_6B<66WABWd_C_87Ql^?PbxX@S7RNPYLn`J{c_kUC>|
z-GlNBgN!-<uCrw9nc9;0Ve^vTXxYq>%tOh2tz7IWRMmjkuD2KpGlmh*J$yFGCbNpp
zc?e;|_X3G@-nJu=f2<r4rJK(6tEfqoR@OK$WlwWc<y+t$^Y8Ym-qLNLC%Vrm)BJ2A
z!ituC^Z@E1avXcYX>Ih;i542yxx>}*YY^>6J#6sJ&GT63@et94ZnnSyDW~kdh}MUk
z8P|rybl4I(?i~gRYBT7q9*l~Jc@D^G>`4+|%It<@Zg(Sgvv*#J_ihtiph>pynS4Am
zWH=dF{Hkh<>}R0%Avte=vbXOp9718sokHWLh7fi8I*Soc4x)QLi;~7LfoZny$qZKl
z6`sM~aUE8fT~S|xNl-LY$u~QE#BQRJuX6E9?|AyX{HToU1(&b3$KR=eV<RHcS~qwV
zw|*UXhZ(*FNloi$g}*%7_nm?`7DD3B<3n3-ostO1J8C4$h6A{v2X5Bj%Mt2tK!IHN
zII|i@u$IT{H(PnuM%C6M0ho-NwZ+!Y(!D?LKvhA8PZAtFqIFdipl;-69moEY$F{3i
zTPH*lOyr{y#qB*?8&8j_3TF9#@T2h)UXL6L;4r3agJKIy55)LE$}YvzigEkQN(Oaw
zxij$F1h>2@hzBpOAK>_c9`z;Ew$!ew<}t?irvq_7=HzD5zziHm-C^So&T>^*uy@{t
zQ4=u6J!FyN!rRVyOW^QQb3lEQK#RGmTH%PzjbiHGpU16*ckY;vByQ9GdK<mtqV<~p
zeZU5BnG0JezTQ8Z$9RLVu~5EK1Q`oLO^S7%y?W#&G$bZU3(LEeSB0_~5-EI=>Te1r
z36FLkqTp;s5_BZJt_KI)<=R)uzvB>4JaFF>iVNJmB7d~<DKP(!@N?j?R@m>O-8rto
z3~NhOwcvS=jqIQ{qg|JUcN~yjhj|#V^O0w}b;ym6Ah3Lg(Vwf0#fr9!5V6Gv%bhKW
zy{{LJC^XnHGrM{B>UC1tDkO{FCRk$IRk~rOrPu7~+U56<lB2u3inD+!zNJQUah(uG
zK#@!e4s8`Gw~<zNFvoc&X5*ql65oMNC!bufJK>1ph>+ymXx?tJ#5Z;V-Lpg<lH^y#
zS$q~o1W~Ly<Htrap=VZJU;9BIyy$q<io=^d5vH6YDS)bf&57B5(XvsGgtHR`CXd^k
zo}Di@2Wo{nUhXD*_6L{!oq-pE9YU|2za^DZUBappbu>!p4jVT(d`7#}lU-yo9X$eQ
zFAl7F_}z$NzS-Uy-g!@w?)AIiFG_6~1DKlUc_yNZMc+p085EnSW|Cd#vX&KzDUr|!
zN$<mc<F;aHkHmFo*nhiH$KTn^SrU-!S{k<?>(3v*?R=b2Vzc&My?T4Tsbd|o8YTi|
zYcP*yF#ko>PKaz;ZdtBs@X~n(XEu&_XdQLNf}=}@F4wEM>j_#2w4izDaCzh2$4zL`
zaod9UJ2VRjB3eCFMH&vwOx#|1$3w#?80%lIeLkzyFIkO#<(qA)u|FoNd88R(2U_&3
zsN86Ja@c~#N<{67Pb(Ndp4fU^hP05^w{#MRrVr5Ewj;n7V3Nz7p4g`O=;*47isQ@1
zP7}`)#_u-<dHdTP(syEjOW2BQe*=)d?2OQOTCr8Hn$6>wGkx0Qe}aFG2UO!V4R=eP
zpipi^xZpL_%&=unlIADZ^gj#uP3`I9h@ZklxIi8^N%e>xiD!N>O(DcoIj<ll1gJ=E
zQq4XcC*a1nG}+y`&5`^fe#a@igpHc=?$W0KE(%AC&LUMCibY;lcDqfGjj(u8LB^${
z2=>WoD##<gm$HXWi?5oCcbX@c-Ay*2*rR)ZG%cWdJT`cpuOW*bS~aCdU4`;wOHtz{
zhIk(NbY>;+O9r-rFG>yGv@1eBB)mw%`z8MA-gH61L+y({P2|l;|Fuu00w@;-Bo3c}
zfP?-`K?)hq59xJo9P->OD(BulF?k#qpFY^oe_6Y8nD1Jg%mU+Foq^?D{XE^vs9~-f
zJA1N0Y@HYAnY3Q`RMYvVY@MV~JI3~lxe)#av9F<LXBn7VlJCZQle@YHo8Q)k$5F^N
zp>zYr9wJv$Q%%&>B_HcREMCn_EIVpk9iDjBwRd00yd8m8vDwp#&8hVUSs&XwrVJ_0
zf}euC{Dao!e4Se_xk62~wqf2mUX_az$v=dPxqR$n*_{|IFT3aMi`Vo6eU-Y#><1OP
z#@$vNi@tdjebKMc>N{AkI<|Rl6sQrM5jFk)f5rd5Z{icrkHUfK4Nf9%|8|WH%=9aD
H|BL!Rgr_n;

diff --git a/src/static/images/scan_null.png b/src/static/images/scan_null.png
deleted file mode 100644
index d9ffc21da4bdd129dfc79b6687d78eabc4def3ab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11489
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
F{{Ym8?z#W~

diff --git a/src/static/images/write_off/mall.png b/src/static/images/write_off/mall.png
deleted file mode 100644
index 12e4248a29009ee577baa57b1b180ea4c2bfc112..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1400
zcmV-;1&8{HP)<h;3K|Lk000e1NJLTq004jh004jp0{{R3^x%>C0000;P)t-s00000
zm~;S{bpV)k0GW0GoOb}2bO4!k0GV_En|J`3bpV-k0GV|FnRNh~bpV-k0GV|FnRWn~
zbO4!k0Gf6Hm~{Y{bpV)jvU7}O0000NbW%=J0HoI?UJdh4>Kd$)e!euzJZiLdMuwY8
zV$J{n00hWML_t(|+U=W%5~CmxhE;k8OML$~J&Xx<<#GqP;y0O0M2Wv33oLB$M}ipG
zgT>}Q$d01&YT~4LlzRwCA~Z14h~4ZDAsx}|JagMA+#f^5r2-~te+*V#d-4}hVceg?
z(M9b&F8%>y1rPGtvg*&l{sYei5bCeGpepU2bfU&vTu_433J@3B$6F|ZHur~>KNW$}
zX97Uo_c0PGh}QR~eH_M~3DByKgRT^is*j{TFM+a;q#}#=ua3=!8+6(TAntMGlgx{<
z>|-(D!VIWBmU7AktLXc;#RWE6K?M(0V_NNDxU|J3y5VLwJ6+d}dfUX7uIz+#a1WwU
zR9B`6+{4M0rK7LnWZmM$QKU!)QFCj6JGQMg+<_t?pu=0EMi%t~ill(W`!*J~TbhS-
zY)zhfCdozHOvu*e$RPoVDFMqOITH5)fqVjc%xb_D$#Jtfc(Bla1ml#Dt=TQXE#MY#
z3%CW`0&W4ffLp-dEdUWn2x-~31b}j!19Fl@0JCI?6=BK@TS%5@6e(ckS2E<VxTVh*
zk8y_zh?y=EY&9|AI$Zau4{4hD9$@)uVp5Q4ax4$)`w`*7Tg-eVJDizJ7m=554_|t~
zK&Yo*_a#~LzDB%6GLA3(FF#uam4B9tw*YfC)o^KyYQR~WZwwv5<2R-g+f)V7Sp#lV
zW%&FO1hm!c%JK4~wZu6Gt!>GSR=3b6xAt`i(8Z#Fwf>UN&`wI(kd<5j8=nk8k(kNF
zq3oX9ffq?Zs6fGx34j8jZ7YpDMG_b+>zdaUew!Lqzu{(<$m_av3914$RUZwNzrPfS
z>G8@M;_z7|rWjZtL4V2+3iP`Ll(_#H`0p1mJ>3&Ju=$xoK*hzt<GB<$5`OY3g8*)k
z2S6!0!V2WE{-@K(qj_2Z(=duW*96AyTl3*(4cRbk$Wa2iU~iiM2jfWSYgrc*pv)lv
zye&U2!F;ut%7XDc0>=J;cI<V|Rj;<sc%~|FLNxQP7m&uM<f;Na9D>$b0wMAEZ##}J
zG74a>UYKU89Lp)da=fwr+-4IH4whYEiLy1ry`_HKS1^|V#6#5^r3?*c@-)Mmp)kE{
z5M!tbGt&G5T;Xw<1#pJyaLcY~IuoR!T&8%lRVefYnVKO}+sQf}R^xS^z97tR7Z@1Q
zKM=rx1}I)Y(Q-p64$w+Hd@>R^P5|<^WAo#-<NN_xya1o25i>f%5Mr*18<a9wDlQ0G
zj`=ZGI$nTJnL&i7G&pWpZpSTa^ugBq-)bE(FDSPcSw7T9+`M4g>=gV+goci#ITjF9
z3br~k4a6o5^kin#gief-kT4bRm1_yZ-O`EQ?lU#j;ejI^m6L}PH|*5+IBf%nbX3Os
zijj4LYX<F|Y8yGnS(e>hk7oQo>jk%fTfi;g7H|u=1>6E|0so4CuWxGo`nKM$Z*2bl
z*6y!wZr9)5-p@i}rT~ZOVOa?A!1+Twa8KJLK`vIt2f3sO^Jz_dm`{p8Ct&(m$|Rv)
z4eleUceY^sdbppi<AdFjg!@_ZVYuJ8Hw4EB(4WK`ZdX@OnvhRW#)o{y2fa?<%b-_?
zqk>)&hW+yXI_x)X;IoJbeEvN28^nZu%hS;BKRx(8J3jz`q@J)YgS<xo0000<MNUMn
GLSTZTO^TiX

diff --git a/src/static/images/write_off/order.png b/src/static/images/write_off/order.png
deleted file mode 100644
index 2ef7ab0c35191ed6567b1f1c6be9ea44258d35fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1025
zcmV+c1pfPpP)<h;3K|Lk000e1NJLTq004jh004jp0{{R3^x%>C0000;P)t-s00000
zns)%1bpW4!0Gn|Dm~{Y|bO4!k0GW0GnREb|bpV-l0Gf3GnRNh}bO4!k0GW0Gn0Nq~
zbpV@r0GM?Ensor0bpV)j&Ctr=0000NbW%=J07JY87U=V_SIX9<EN<X}Og5M!k#}P4
zb>H9s00U7;L_t(|+U%I?uG=6CfDNYR5_0R!@BgN&cBWaViO#^J)24it@+WHi$#IMU
zz6TMSDF3N@hRds|WX-OV1Lp9!dRvXZK0-!N<ANt{gnV$IWVOT!$gZFPL*y44hZqpr
z2~iiGei|t9A6W}A#}%4DaF)AZ9bj7l5O;wBHYFf?E}@D`fzN;q0t;~`XaTHl;0Pmk
zWBet6Skd}}XMvKfBoPZf{Q2VG*6_Fw-r9I6pHN5Xe~H%m;r<A#`*!7-Bk>z4Ks6!p
z8x-e^`@sQj^Tb<N1JxMITcr60fZOqL@fY3|K&SwB1^D6@+%Z@zzo3IMAlL=Bzx%|(
zkpi4H`-1WODFOBy&vOHRPJjpZR)C|_|3O745Km)ShzKt7Co{m&0T#wjV&SkxB+#==
zKpu+kk5d0uoT#jV3<x4%E=9)Y(0?%svn~3ODFmKH{Cvc6jF1b1Cm@Ky%tACr4J0PA
zFe3=JD+_l3L>b9+GntHJhyZsMt~U_!AUCEF0FM|-5n!B(D%@_vF&sCRhq%*@jooZI
zYvc~ZbwAGj4KXHd`~d9&_&aCRbRpTC)(G_8o~s1(2NYTXz`T6T={0;!;Y&u)3CK>x
zR3rNkm4N=3P9vb_6gUM=fm7fVI0gC$U^D+u23!+;GJxPlpDqm~KRQ5t2Fx&VBhz4%
z8IZ#(YWTev6jQMrUJ<t<hf(bUo>h3QfJ>|*xqn^YufKvH?VC{xgD?z)J0o?Yh(j3u
z|9`rH4|xdgWad_^`4Hcfqqb?VclrmFH3{)DJg^Fv(x1N&)i1@rZ$>R`$5(Gistb@k
zR38DU+Y^EjpckS?xeFKrUMbcyX^w!t?DPwb3<25`<}VkTynkv)@(U~ldP_F9DWLi%
zz&)Wp$6AK#OoxoA(Lz+e6z|%Mn%|Dk(2#_H5D)@FKnMr{As_@C5Ma%01b~^%+WDLT
zc0OxpO#VnRhQ@76CkJck+%~l`Fs4>u>-7cLdUY16jo6oMW3yVjDPU{2n%l`(b33y4
zXWyGW%mM)iB6%r2h<K10ZXo1BMnf((=93pb-4g_zXk-mKfv6V=je3Ew8wDG7v&b6v
vo8~ff?hIv~*0`VeWZhY5c=?dr!0&zog5@PLq&_>D00000NkvXXu0mjfMIpb!

diff --git a/src/static/images/write_off/people.png b/src/static/images/write_off/people.png
deleted file mode 100644
index 2f24e54f4e0427b0cebece7752271383db11678a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1833
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
Xa>8oON`X3y00000NkvXXu0mjfn8;RA

diff --git a/src/static/images/write_off/site.png b/src/static/images/write_off/site.png
deleted file mode 100644
index 9aa15773b64bfe111cd9135bef9b91cbfca331db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1438
zcmV;P1!4M$P)<h;3K|Lk000e1NJLTq004LZ004Lh0{{R34!XwR0000{P)t-s00000
zm~;S{bpV-m0GW0GnREc0c>tMp0Gf6HnREb|bpV-l0GoCInRNh}bpV-m0GV_EnRWo2
zcmSDo0GV|FnRNh}bpV-l0GM_FnRNh|bers$F#rGn8gx=lQvmnaUop!KQzgK#m>lPL
zO`|*&k3?^{hi88Z`}BAK00iPmL_t(&-tC)-a-<*-h8yHmz;ir!{|DVDsN=>#t&+`F
z%D<9|V<<ivkd_`AW+l`fsjVO=mLhu~n!r{hqv#Nfc^KSadn80N0;?F8_JmL&LR?iN
zi|nB!XA3vM7NHYlNkU+f9@jB)aKdJ;b}c;=ErVcrsupCmCv$Ai3AI6sMd7>p<YXzO
zJyjlA^kN|}OU{5Nm@EMx8?R1@3J6Ncvt4I1fJAQZ1-K0ys0@&|70U!D+Wr&aUD0$X
z;ZVe+6z>Xc*@(inS-3ELvL{X$oDd^C*;8+diM<LoT*)DtxJ3J4WKky|qD1$F*tJ*+
zh$<oXyP9%{DF(pl4j9=2qN}iIXN(7ku3>MCaSy;Cu6n!&P9VCH2mFA&9`FNxzz_HV
zKj4#KMhN=>urjTbX}_XHp7Z>hc;2X6!EDe|p=FDlXOiwp*3C6=_<g=X7JbQT0+R@~
z==wgI(;aY1LLKe)Jxf%8z0f{*DwBMU&%A^E)^#|D==e%&wKQbW`H;o1;9!mDoC9aV
zby~>c&x2Od#bSx4!Ze3V;3`EQEyjUeXHKUEV+j>cDV0XRH851XtDU+6ZMfR7&|cL@
zN>g3|FhNRE!BsFYrIb*Nl{H<!qw&~;E2~IZinVFy!D>6*^BQl0D5Ej=X>0K+)@-7A
z2+5woom#`YsA$%z^Hihv+1%c1Ez1kJ4x^@Rr~GZYnN{*d?lrfRe?O<=^r?C}_AOel
zhQQ4-BWx4?!woQ_H+Qums=9f6yBWN)^KVW9A&pz3ZY96IyB`9(PC`o~Zhe&W)?V6!
z%C_KnxOH~tNUI^03meNUVa_}4#)jMS)}UP3&I?H4OlrP?QNXW<b;Tb8dr6JHq(^N%
zRL0^indKCRevKNhOp0f(*vDS0nPT%*#ef;)$y7xJlMZWaCKsDwJ<s&1Odb;~Cikxm
z^Ghm9fY0Ds#RIcJPmeBE(76|YLJ_};B1z(bE9$J%O0@H1G=nW};(?X+;Hsn^EEX`z
z<AI3>Q^vIe`>vkEV}aL|tA*afYWOE$?!g5Z>tv#X-}g?agWC1E?SY`^;Ke&>1BIt0
z{{$?&KgJ33V8mmC)%<xB%|+{IxQPs|9hkb0vMi;e(J~6Sk=Bc*nGw)n2W~}9-I|e-
z%iu~7#exO6DK;CV3>x17X_a6<1cYR#z)TRL#=m7(q#3UQ+`(74?g-0r`99KU2OeIo
zQ;xtYDcZDd7!-8$GNF?ee5S7A+=FZAkOL>#T1+>AZ3&v3S^>x|WAs7BS&0@oFdBah
zWDcyGZ1xZ#w@BK#-{9-lRcr#_tx%y7zX|6f*!g8ML4EM$$cXoFQ}L;pxt?f?bRqmb
zn<?nApKm!nK7K{gy#QPOahsZAD$^qCOrPW>QOvE??j4)e<5jJemp$Dn_#{rRg%n9s
z5+c<5c97-9aJOu8^Ww@qb;DqiM*W(w@n2%UKT!UFAMgWyzz_HVzv%)0HgFHo)nohr
z9FP2=1EKMc!20+3kB5F4L=poK@_#$#{7(;d|JYIXdk^oI!|B8OSJD;oBW^>_rz_l<
zpdsk_1dVGcDW(dJ@9RQJ%AH9#q&?epnBSUqR8o67?dW2n6%AV~?b$@DdsE9qajM@W
sXLl#l@hi!6SJDS%6$V$WJ)b`K2Ms)w<~`b3-T(jq07*qoM6N<$f@3SF?EnA(

diff --git a/src/subpackage/verification/pages/index.vue b/src/subpackage/verification/pages/index.vue
index 3a8f01e..a064ed0 100644
--- a/src/subpackage/verification/pages/index.vue
+++ b/src/subpackage/verification/pages/index.vue
@@ -155,7 +155,7 @@ export default {
                     // 商城订单
                     if(_orderData?.extension?.verify_order_type === 'product_order'){
                         $_emit(WRITE_OFF_MALL_ORDER_INFO, { data: _orderData });
-                        routeTo(`/pages/write_off/ym_confirm/ym_confirm?type=${_vType}`, 'nT');
+                        routeTo(`/pages/write_off/mall/confirm/confirm?type=${_vType}`, 'nT');
                         return
                     }
                      // 年月卡
@@ -172,8 +172,12 @@ export default {
                         return
                     }
                     // 场次、次卡
-                    $_emit(WRITE_OFF_ORDER_INFO, { ..._orderData });
-                    routeTo(`/pages/write_off/confirm_order/confirm_order?type=${_vType}`, 'nT');
+                    if(['person_number', 'venue_number'].includes(_orderData?.extension?.verify_order_type)){
+                        $_emit(WRITE_OFF_ORDER_INFO, { ..._orderData });
+                        routeTo(`/pages/write_off/confirm_order/confirm_order?type=${_vType}`, 'nT');
+                        return 
+                    }
+                    showModal({ content: '暂不支持该类型核销！' })
                 }else if(_data.code === 805){
                     routeTo(`/subpackage/verification/pages/null?tip=${jsonStr(_data?.message ?? '')}`, 'nT');
                 }else{
diff --git a/src/subpackage/verification/pages/site_people/modules/not_leave_modal.vue b/src/subpackage/verification/pages/site_people/modules/not_leave_modal.vue
index 3bc401d..38fbae4 100644
--- a/src/subpackage/verification/pages/site_people/modules/not_leave_modal.vue
+++ b/src/subpackage/verification/pages/site_people/modules/not_leave_modal.vue
@@ -27,7 +27,8 @@ export default {
     data(){
         return {
             visible: false,
-            notLeaveInfo: {}
+            notLeaveInfo: {},
+            brand_id: '',
         }
     },
     methods: {
@@ -39,6 +40,7 @@ export default {
         },
         initData(e){
             let { igsType, key, stadium_id, brand_id } = e;
+            this.brand_id = brand_id ?? '';
             this.show();
             let _keyName = igsType === 1 ? 'gate_id' : igsType === 2 ? 'venue_type_key' : '';
             let _query = { brand_id, stadium_id };
@@ -69,7 +71,8 @@ export default {
             })
         },
         checkBtn(type){
-			if(type == 0)return routeTo(`/pages/write_off/search_result/search_result`, 'nT');
+            let { brand_id } = this;
+			if(type == 0)return routeTo(`/subpackage/verification/pages/record?brand_id=${brand_id?? ''}`, 'nT');
 			if(type == 1)return routeTo(`/pages/order_list/order_list?order_type=1`, 'nT');
 		},
     }

From 04d90301921c4d7580e3d738e530353d26395de0 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Wed, 15 Jan 2025 11:57:15 +0800
Subject: [PATCH 11/30] fix tid1803

---
 .../pages/abnormal_list/abnormal_list.vue          |  4 +--
 src/subpackage/verification/pages/index.vue        | 34 +++++++++++++++-------
 src/subpackage/verification/pages/record.vue       | 15 ++++++++--
 .../verification/pages/site_people/index.vue       |  5 +++-
 .../pages/site_people/modules/not_leave_modal.vue  |  6 ++--
 .../pages/site_people/modules/stadium_select.vue   | 15 ++++++++--
 6 files changed, 58 insertions(+), 21 deletions(-)

diff --git a/src/subpackage/blacklist/pages/abnormal_list/abnormal_list.vue b/src/subpackage/blacklist/pages/abnormal_list/abnormal_list.vue
index 9e30f69..e73ea36 100644
--- a/src/subpackage/blacklist/pages/abnormal_list/abnormal_list.vue
+++ b/src/subpackage/blacklist/pages/abnormal_list/abnormal_list.vue
@@ -102,10 +102,10 @@ export default {
     async onLoad(options){
         try{
             let _date = this.curDate = util.formatDate({}); 
-            let _stadiumLs = await this.getStoreList({});
+            let _stadiumLs = await this.getStoreList({ brand_id: options?.brand_id ?? '' });
             let { curTimeTab } = this;
             this.getRecords({
-                brand_id: options.brand_id,
+                brand_id: options?.brand_id ?? '',
                 [ curTimeTab?.label || '-' ]: _date
             });
         }catch(err){
diff --git a/src/subpackage/verification/pages/index.vue b/src/subpackage/verification/pages/index.vue
index a064ed0..3878e1a 100644
--- a/src/subpackage/verification/pages/index.vue
+++ b/src/subpackage/verification/pages/index.vue
@@ -48,25 +48,40 @@ export default {
 
         }
     },
-    onLoad(options){
+    /**
+     * @param {String} options.brand_id  品牌id
+     * @param {String} options.stadium_id  场馆id
+     */
+    async onLoad(options){
         let _brand_id = options?.brand_id || '';
         this.brand_id = _brand_id;
-        this.getStadiumLs({ brand_id: _brand_id });
+        let _stadiumLs = await this.getStadiumLs({ brand_id: _brand_id });
+        if(options?.stadium_id&&_stadiumLs?.length){
+            // 设置选中场馆
+            let _selected = _stadiumLs.find(ele => +ele.id === +(options?.stadium_id ?? ''));
+            if(_selected?.id)this.curStadium = _selected;
+        }
     },
     methods: {
         // 现场人数
         toSitePeople(){
-            let { brand_id } = this;
-            routeTo(`/subpackage/verification/pages/site_people/index?brand_id=${brand_id}`, 'nT');
+            let { brand_id, curStadium } = this;
+            let _qryStr = `brand_id=${brand_id}`
+            if(curStadium?.id) _qryStr += `&stadium_id=${curStadium.id}`;
+            routeTo(`/subpackage/verification/pages/site_people/index?${_qryStr}`, 'nT');
         },
         // 人数异常
         toAbnormal(){
-            let { brand_id } = this;
-            routeTo(`/subpackage/blacklist/pages/abnormal_list/abnormal_list?brand_id=${brand_id}`, 'nT');
+            let { brand_id, curStadium } = this;
+            let _qryStr = `brand_id=${brand_id}`
+            if(curStadium?.id) _qryStr += `&stadium_id=${curStadium.id}`;
+            routeTo(`/subpackage/blacklist/pages/abnormal_list/abnormal_list?${_qryStr}`, 'nT');
         },
         toRecord(){
-            let { brand_id } = this;
-            routeTo(`/subpackage/verification/pages/record?brand_id=${brand_id}`, 'nT');
+            let { brand_id, curStadium } = this;
+            let _qryStr = `brand_id=${brand_id}`
+            if(curStadium?.id) _qryStr += `&stadium_id=${curStadium.id}`;
+            routeTo(`/subpackage/verification/pages/record?${_qryStr}`, 'nT');
         },
         confirmBtn: debounce(function(){
             let { iptCode } = this;
@@ -116,8 +131,7 @@ export default {
                 let _data = res?.data || {};
                 if(_data.code === 0){
                     let _ls = _data?.data?.list || [];
-                    this.stadiumList = _ls;
-					return _ls;
+                    return this.stadiumList = _ls;
                 }else{
                     return Promise.reject(_data);
                 }
diff --git a/src/subpackage/verification/pages/record.vue b/src/subpackage/verification/pages/record.vue
index a0ad1f7..52cb385 100644
--- a/src/subpackage/verification/pages/record.vue
+++ b/src/subpackage/verification/pages/record.vue
@@ -109,9 +109,19 @@ export default {
             page: 1,
         }
     },
+    /**
+     * @param {Object} options
+     * @param {String} options.brand_id // 品牌id
+     * @param {String} options.stadium_id // 场馆id
+     */
     async onLoad(options){
         this.brand_id = options?.brand_id ?? '';
-        this.getStadiumLs({ brand_id: options?.brand_id ?? '' });
+        let _stadiumLs = await this.getStadiumLs({ brand_id: options?.brand_id ?? '' });
+        if(options?.stadium_id&&_stadiumLs?.length){
+            // 设置选中场馆
+            let _selected = _stadiumLs.find(ele => +ele.id === +(options?.stadium_id ?? ''));
+            if(_selected?.id)this.curStadium = _selected;
+        }
         this.reloadRecordLs();
     },
     onReachBottom(){
@@ -203,8 +213,7 @@ export default {
                 let _data = res?.data || {};
                 if(_data.code === 0){
                     let _ls = _data?.data?.list || [];
-                    this.stadiumList = _ls;
-					return _ls;
+                    return this.stadiumList = _ls;
                 }else{
                     return Promise.reject(_data);
                 }
diff --git a/src/subpackage/verification/pages/site_people/index.vue b/src/subpackage/verification/pages/site_people/index.vue
index 324395a..60d0974 100644
--- a/src/subpackage/verification/pages/site_people/index.vue
+++ b/src/subpackage/verification/pages/site_people/index.vue
@@ -77,7 +77,10 @@ export default {
         }
     },
     async onLoad(options){
-        this.$refs.stadiumSelect.initStadium(options?.brand_id || '')
+        this.$refs.stadiumSelect.initStadium({
+            brand_id: options?.brand_id ?? '',
+            stadium_id: options?.stadium_id ?? '',
+        })
         .then(stadiumInfo=>{
             if(!stadiumInfo?.id) return;
             this.stadiumInfo = stadiumInfo;
diff --git a/src/subpackage/verification/pages/site_people/modules/not_leave_modal.vue b/src/subpackage/verification/pages/site_people/modules/not_leave_modal.vue
index 38fbae4..8d263f1 100644
--- a/src/subpackage/verification/pages/site_people/modules/not_leave_modal.vue
+++ b/src/subpackage/verification/pages/site_people/modules/not_leave_modal.vue
@@ -29,6 +29,7 @@ export default {
             visible: false,
             notLeaveInfo: {},
             brand_id: '',
+            stadium_id: '',
         }
     },
     methods: {
@@ -41,6 +42,7 @@ export default {
         initData(e){
             let { igsType, key, stadium_id, brand_id } = e;
             this.brand_id = brand_id ?? '';
+            this.stadium_id = stadium_id ?? '';
             this.show();
             let _keyName = igsType === 1 ? 'gate_id' : igsType === 2 ? 'venue_type_key' : '';
             let _query = { brand_id, stadium_id };
@@ -71,8 +73,8 @@ export default {
             })
         },
         checkBtn(type){
-            let { brand_id } = this;
-			if(type == 0)return routeTo(`/subpackage/verification/pages/record?brand_id=${brand_id?? ''}`, 'nT');
+            let { brand_id, stadium_id } = this;
+			if(type == 0)return routeTo(`/subpackage/verification/pages/record?brand_id=${brand_id?? ''}&stadium_id=${stadium_id??''}`, 'nT');
 			if(type == 1)return routeTo(`/pages/order_list/order_list?order_type=1`, 'nT');
 		},
     }
diff --git a/src/subpackage/verification/pages/site_people/modules/stadium_select.vue b/src/subpackage/verification/pages/site_people/modules/stadium_select.vue
index e7714e8..66441f3 100644
--- a/src/subpackage/verification/pages/site_people/modules/stadium_select.vue
+++ b/src/subpackage/verification/pages/site_people/modules/stadium_select.vue
@@ -27,7 +27,7 @@ export default {
             this.curStadium = stadiumLs?.[value] || {};
             this.$emit('change:stadium', this.curStadium);
         },
-        async initStadium(brand_id){
+        async initStadium({ brand_id, stadium_id }){
             try{
                 showLoad();
                 let _ls = await this.getStadiumLs({ brand_id });
@@ -36,10 +36,19 @@ export default {
                 // })
                 this.stadiumLs = _ls || [];
                 hideLoad();
-                if(_ls.length){
+                if(stadium_id&&_ls?.length){
+                    let _cur = _ls.find(e=>Number(e.id) === Number(stadium_id));
+                    if(_cur){
+                        this.curStadium = _cur;
+                        return _cur;
+                    } else {
+                        this.curStadium = _ls[0];
+                        return _ls[0];
+                    }
+                } else if (_ls.length){
                     this.curStadium = _ls[0];
                     return _ls[0];
-                }else{
+                } else {
                     showNone('暂无店铺信息！');
                 }
             }catch(err){

From eca5172b028340b8d644205cad19d434c4dec037 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Wed, 15 Jan 2025 18:14:39 +0800
Subject: [PATCH 12/30] finish tid1819

---
 src/pages.json                                     |   6 +
 src/subpackage/wallet/js/api.js                    |   3 +
 .../wallet/pages/douyin_withdraw/index.vue         |  15 ++-
 src/subpackage/wallet/pages/index/index.vue        |  72 ++++++++++-
 .../wallet/pages/index/modules/recharge_modal.vue  |  82 ++++++++++++
 .../wallet/pages/index/modules/wallet_info.vue     |   6 +-
 .../wallet/pages/index/recharge_record.vue         | 141 +++++++++++++++++++++
 7 files changed, 313 insertions(+), 12 deletions(-)
 create mode 100644 src/subpackage/wallet/pages/index/modules/recharge_modal.vue
 create mode 100644 src/subpackage/wallet/pages/index/recharge_record.vue

diff --git a/src/pages.json b/src/pages.json
index 807b35a..267b780 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -759,6 +759,12 @@
 					}
 				},
 				{
+					"path": "pages/index/recharge_record",
+					"style" : {
+						"navigationBarTitleText": "充值记录"
+					}
+				},
+				{
 					"path": "pages/douyin_withdraw/index",
 					"style" : {
 						"navigationBarTitleText": "平台提现"
diff --git a/src/subpackage/wallet/js/api.js b/src/subpackage/wallet/js/api.js
index 4ff0fc2..654bb3a 100644
--- a/src/subpackage/wallet/js/api.js
+++ b/src/subpackage/wallet/js/api.js
@@ -8,6 +8,9 @@ export const WALLET_API = {
 	// 宝付
 	getPayAssureConfigs:`${ORIGIN}/admin/pay/assure/getPayAssureConfigs`,  //  查看可选择的支付账户列表
 	baofuV2Gateway:`${ORIGIN}/admin/pay/assure/baofuV2/gateway`,  //  宝付v2获取金额信息
+	// tid1819
+	wxpayinfo:`${ORIGIN}/admin/assistant/merchantwallet/wxpayinfo`,  //  这个是充值
+	rechargeList:`${ORIGIN}/admin/merchantwallet/recharge/list`,  //  这是充值记录
 }
 
 export default WALLET_API;
\ No newline at end of file
diff --git a/src/subpackage/wallet/pages/douyin_withdraw/index.vue b/src/subpackage/wallet/pages/douyin_withdraw/index.vue
index 9c3665a..2264b47 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/index.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/index.vue
@@ -5,14 +5,14 @@
             title="微信平台可提现资金"
             :balance="formatMoney(balanceInfo.total_amount_of_wechat)"
             type="wx"
-            @click:extract="applyBtn(1)"
+            @click:extract="applyBtn(1, balanceInfo.total_amount_of_wechat)"
         ></platform-item>
         <view class="dw-space"></view>
         <platform-item
             title="抖音平台可提现资金"
             :balance="formatMoney(balanceInfo.total_amount_of_douyin)"
             type="dy"
-            @click:extract="applyBtn(0)"
+            @click:extract="applyBtn(0, balanceInfo.total_amount_of_douyin)"
         ></platform-item>
 
         <view class="dw-space"></view>
@@ -26,7 +26,7 @@
 <script>
 import { WALLET_API } from '../../js/api';
 import servers from '../../js/server';
-import { routeTo, showLoad, hideLoad } from '@/utils/util';
+import { routeTo, showLoad, hideLoad, showModal } from '@/utils/util';
 
 import platformItem from "./modules/platform_item.vue";
 export default {
@@ -58,7 +58,14 @@ export default {
         },
         // 申请提现
         // md【241024】 241113新增 0抖音；1微信
-        applyBtn(source){
+        applyBtn(source, balance){
+            if(!isNaN(balance) && balance < 0)return showModal({
+                content: '系统检测到您在欧轩有未支付的账单，请先完成支付后再提现。点击“前往”跳转钱包页面',
+                confirmText: '前往',
+                success: res=>{
+                    if(res.confirm)routeTo();
+                }
+            })
             routeTo(`/subpackage/wallet/pages/douyin_withdraw/apply?brand_id=${this.brand_id}&source=${source}`, 'nT');
         },
         /**
diff --git a/src/subpackage/wallet/pages/index/index.vue b/src/subpackage/wallet/pages/index/index.vue
index 55d9589..04beb4d 100644
--- a/src/subpackage/wallet/pages/index/index.vue
+++ b/src/subpackage/wallet/pages/index/index.vue
@@ -5,6 +5,8 @@
             @click:douyin="dyBtnClick"
             @click:baofu="bfBtnClick"
             @click:admin="toWebView"
+            @click:recharge="rechargeBtn"
+            @click:record="toRechargeRecord"
         ></wallet-info>
         <view class="wi-tips">
             <view class="wt-tit">温馨提示：</view>
@@ -17,20 +19,28 @@
                 </text>
             </view>
         </view>
-        <wallet-modal v-if="false"></wallet-modal>
+
+        <wallet-modal-success ref="walletModalSuccess" :title="'充值成功'">
+            <template v-slot:tip>充值成功！</template>
+            <template v-slot:btn>充值记录</template>
+        </wallet-modal-success>
+
+        <recharge-modal :balance="balance" ref="rechargeModal"></recharge-modal>
     </view>
 </template>
 
 <script>
 import walletInfo from './modules/wallet_info.vue'
-import walletModalSuccess from '../../components/wallet_modal_success.vue'
+import walletModalSuccess from '../../components/wallet_modal_success.vue';
+import rechargeModal from "./modules/recharge_modal.vue";
 import { WALLET_API } from '../../js/api';
 import servers from '../../js/server';
-import { routeTo, showLoad, hideLoad } from '@/utils/util';
+import { routeTo, showLoad, hideLoad, debounce, showModal } from '@/utils/util';
 export default {
     components: {
         'wallet-info': walletInfo,
-        'wallet-modal': walletModalSuccess,
+        walletModalSuccess,
+        rechargeModal
     },
     data(){
         return {
@@ -44,7 +54,32 @@ export default {
         this.getWalletBalance(options.brand_id);
         console.log(uni.getAccountInfoSync().miniProgram)
     },
+    onReady(){
+        // this.$refs?.walletModalSuccess?.alert();
+    },
     methods: {
+        toRechargeRecord(){
+            let { brand_id } = this;
+            routeTo(`/subpackage/wallet/pages/index/recharge_record?brand_id=${brand_id ?? ''}`, 'nT');
+        },
+        rechargeBtn: debounce(function(){
+            let { brand_id } = this;
+            this.$refs?.rechargeModal?.show?.({
+                success: async num =>{
+                    let { wxpay_info } = await this.getPayInfo({ brand_id, pay_amount: num });
+                    uni.requestPayment({
+                        ...wxpay_info,
+                        success: res => {
+                            this.$refs?.walletModalSuccess?.alert?.();
+                        },
+                        fail: err => {
+                            console.log('wallet index rechargeBtn fail --->', err);
+                            if(err?.errMsg?.indexOf?.('cancel') === -1)showModal({ content: err?.errMsg ?? '支付失败！' })
+                        }
+                    })
+                }
+            })
+        }, 300, true),
         toWebView(){
             routeTo(`/pages/web_view/web_view?src=${encodeURIComponent(this.getAdminAddress())}`,'nT');
         },
@@ -82,7 +117,34 @@ export default {
         bfBtnClick(){
             routeTo(`/subpackage/wallet/pages/baofu_withdraw/index?brand_id=${this.brand_id ?? ''}`, 'nT');
         
-        }
+        },
+        // 获取支付信息
+        getPayInfo({ brand_id, pay_amount }){
+			showLoad();
+            return servers.post({
+                url: WALLET_API.wxpayinfo,
+                data: { brand_id, pay_amount },
+                isDefaultGet: false,
+            })
+            .then(res => {
+				hideLoad();
+                let _data = res?.data || {};
+                if(_data.code === 0){
+                    return _data?.data ?? {};
+                }else{
+                    return Promise.reject(_data);
+                }
+            })
+            .catch(err => {
+                hideLoad();
+                showModal({
+                    title: '提示',
+                    content: err.message || '加载支付信息失败！'
+                })
+                console.warn('wallet index getPayInfo err --->', err);
+				// return Promise.reject(err);
+            })
+		},
     }
 }
 </script>
diff --git a/src/subpackage/wallet/pages/index/modules/recharge_modal.vue b/src/subpackage/wallet/pages/index/modules/recharge_modal.vue
new file mode 100644
index 0000000..784cc5b
--- /dev/null
+++ b/src/subpackage/wallet/pages/index/modules/recharge_modal.vue
@@ -0,0 +1,82 @@
+<template>
+    <wallet-modal title="充值" :show="isShow"  @click:close="hide">
+        <view class="recharge-container">
+            <view class="rc-balance">
+                <text class="rb-txt">钱包余额：</text>
+                {{ balance || 0 }}元
+            </view>
+            <input type="digit" class="rc-ipt" v-model="iptNum" placeholder="请输入金额">
+            <view class="rc-btns">
+                <wm-button @click="hide">取消</wm-button>
+                <wm-button green @click="confirmBtn">确认</wm-button>
+            </view>
+        </view>
+    </wallet-modal>
+</template>
+
+<script>
+import walletModal from '../../../components/wallet_modal.vue';
+import wmButton from '../../../components/wm_button.vue';
+import { showNone } from '@/utils/util';
+export default {
+    props: {
+        balance: {
+            type: Number,
+            default: 0
+        }
+    },
+    components: {
+        walletModal,
+        wmButton,
+    },
+    data() {
+        return {
+            isShow: false,
+            iptNum: '',
+            initData: {},
+        }
+    },
+    methods: {
+        show(data){
+            this.isShow = true;
+            this.initData = data ?? {};
+        },
+        hide(){
+            this.isShow = false;
+        },
+        confirmBtn(){
+            let { initData, iptNum, hide } = this;
+            if(!iptNum || isNaN(iptNum) || Number(iptNum) <= 0)return showNone('请输入正确金额！');
+            initData?.success?.(iptNum);
+            hide();
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+    .recharge-container{
+        padding: 0 50upx;
+        .rc-balance{
+            margin-top: 60upx;
+            @include flcw(28upx, 40upx, $mColor);
+            @include tHide;
+            .rb-txt{
+                color: #1A1A1A;
+            }
+        }
+        .rc-ipt{
+            margin-top: 20upx;
+            padding: 0 20upx;
+            display: block;
+            height: 108upx;
+            border-radius: 10upx;
+            background: #F2F2F7;
+            @include flcw(32upx, 44upx, #1A1A1A);
+        }
+        .rc-btns{
+            margin-top: 80upx;
+            @include ctf(space-between);
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/wallet/pages/index/modules/wallet_info.vue b/src/subpackage/wallet/pages/index/modules/wallet_info.vue
index f450eb1..7826478 100644
--- a/src/subpackage/wallet/pages/index/modules/wallet_info.vue
+++ b/src/subpackage/wallet/pages/index/modules/wallet_info.vue
@@ -7,10 +7,10 @@
         <view class="wi-account">
             <veiw class="wa-top">
                 <view class="wt-name">欧轩内部钱包账户余额</view>
-                <!-- <view class="wt-record">
+                <view class="wt-record" @click="$emit('click:record')">
                     <text>充值记录</text>
                     <image class="wr-icon" mode="aspect" src="/subpackage/wallet/static/images/arrow_b2.png"></image>
-                </view> -->
+                </view>
             </veiw>
             <view class="wa-tip">(用于购买服务使用)</view>
             <view class="wa-balance">
@@ -18,7 +18,7 @@
                     <text class="wm-unit">¥</text>
                     {{ balance }}
                 </view>
-                <!-- <view class="wb-btn">充值</view> -->
+                <view class="wb-btn" @click="$emit('click:recharge')">充值</view>
             </view>
         </view>
         <view class="wi-btns">
diff --git a/src/subpackage/wallet/pages/index/recharge_record.vue b/src/subpackage/wallet/pages/index/recharge_record.vue
new file mode 100644
index 0000000..6d5cbb9
--- /dev/null
+++ b/src/subpackage/wallet/pages/index/recharge_record.vue
@@ -0,0 +1,141 @@
+<template>
+    <view class="recharge-record">
+        <filtrate-bar
+            :filter-list="['全部', '已完成', '已退款']"
+            ref="filtrateBar"
+            @change:times="timesChange"
+            @change:filter="filterBtn"
+        ></filtrate-bar>
+        <view class="rr-ls">
+            <view class="rl-item" v-for="(e, i) in rechargeList" :key="i">
+                <record-line  name="充值金额" :tag="getTagTxt(e.pay_status)" >{{ e.amount || 0 }}</record-line>
+                <record-line  name="充值单号">{{ e.order_no || '-' }}</record-line>
+                <record-line  name="充值时间">{{ e.pay_time || '-' }}</record-line>
+                <record-line  name="支付方式">{{ e.pay_type || '-' }}</record-line>
+                <record-line  name="交易流水号">{{ e.trans_no || '-' }}</record-line>
+                <record-line  name="充值途径">{{ e.optsourse || '-' }}</record-line>
+            </view>
+        </view>
+    </view>
+    <!-- 充值金额：12.00
+充值单号：TX20191017898999
+充值时间：2024-10-17  12:12:12
+支付方式：微信支付
+交易流水号：4002676665666
+充值途径：商家助手（刘晓） -->
+</template>
+
+<script>
+import filtrateBar from '../../components/filtrate_bar.vue';
+import recordLine from '../../components/record_line.vue';
+import { WALLET_API } from '../../js/api';
+import servers from '../../js/server';
+import { routeTo, showLoad, hideLoad, debounce, showModal, showNone } from '@/utils/util';
+export default {
+    components: {
+        filtrateBar,
+        recordLine,
+    },
+    data(){
+        return {
+            rechargeList: [],
+            page: 1,
+            brand_id: '',
+
+            stime: '',
+            etime: '',
+            status: '' // 0:未支付, 1:已支付, 2:已退款
+        }
+    },
+    onLoad(opts){
+        let _bid = opts?.brand_id ?? '';
+        this.brand_id = _bid;
+        let { startDate, endDate } = this.$refs.filtrateBar.getTimes();
+        this.stime = startDate;
+        this.etime = endDate;
+        this.getRechargeList({ brand_id: _bid, stime: startDate, etime: endDate });
+    },
+    onReachBottom(){
+        let { brand_id, page, stime, etime } = this;
+        this.getRechargeList({ brand_id, page: ++page, stime, etime });
+    },
+    methods: {
+        getTagTxt(status = ''){
+            return  status === 0 ? '未支付' : 
+                    status === 1 ? '已完成' : 
+                    status === 2 ? '已退款' : '';
+        },
+        timesChange(e){
+            let { startDate, endDate } = e;
+            this.stime = startDate ?? '';
+            this.etime = endDate ?? '';
+            this.refreshLs();
+        },
+        filterBtn(idx) {
+            let _status = idx === 0 ? '' : idx;
+            this.status = _status;
+            this.refreshLs();
+        },
+        refreshLs(){
+            let { brand_id, stime, etime, status } = this;
+            this.page = 1;
+            this.rechargeList = [];
+            this.getRechargeList({ 
+                brand_id: brand_id, 
+                pay_status: status,
+                stime,
+                etime,
+            });
+        },
+        // 获取充值记录
+        getRechargeList({ brand_id, pay_status = '', stime = '', etime = '', page_size = 20, page = 1 }){
+			showLoad();
+            return servers.post({
+                url: WALLET_API.rechargeList,
+                data: { brand_id, pay_status, stime, etime, page_size, page },
+                isDefaultGet: false,
+            })
+            .then(res => {
+				hideLoad();
+                let _data = res?.data || {};
+                if(_data.code === 0){
+                    let _ls = _data?.data?.list || [];
+                    if(page === 1)return this.rechargeList = _ls;
+                    if(_ls?.length <= 0)return showNone('没有更多！');
+                    this.rechargeList = [ ...this.rechargeList, ..._ls ];
+                    this.page = page;
+                }else{
+                    return Promise.reject(_data);
+                }
+            })
+            .catch(err => {
+                hideLoad();
+                showModal({
+                    title: '提示',
+                    content: err.message || '加载失败！'
+                })
+                console.warn('wallet index getPayInfo err --->', err);
+				// return Promise.reject(err);
+            })
+		},
+
+    }
+}
+</script>
+
+<style lang="scss">
+    .recharge-record{
+
+    }
+    .rr-ls{
+        padding: 24upx;
+        .rl-item{
+            padding: 26upx 20upx;
+            border-radius: 10upx;
+            background: #fff;
+            &+ .rl-item{
+                margin-top: 24upx;
+            }
+        }
+    }
+</style>
\ No newline at end of file

From 63d3bb74112ab8d43a4f51a0702387b1be973705 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Thu, 16 Jan 2025 18:23:40 +0800
Subject: [PATCH 13/30] add tid1807 style

---
 src/pages.json                                     |  23 +++++
 src/static/images/icon/index/green_bg_circle.png   | Bin 52000 -> 7925 bytes
 src/static/images/icon/index/tab_12.png            | Bin 2483 -> 901 bytes
 src/static/images/icon/index/tab_8.png             | Bin 2497 -> 775 bytes
 .../message/components/detail/answer_item.vue      |  39 +++++++++
 .../message/components/detail/image_flow.vue       |  30 +++++++
 src/subpackage/message/components/detail/info.vue  |  46 ++++++++++
 .../message/components/edit/fixed_button.vue       |  36 ++++++++
 .../message/components/edit/upload_img.vue         |  95 +++++++++++++++++++++
 src/subpackage/message/components/fixed_button.vue |  32 +++++++
 src/subpackage/message/components/message_item.vue |  74 ++++++++++++++++
 src/subpackage/message/pages/complaint/detail.vue  |  47 ++++++++++
 src/subpackage/message/pages/complaint/edit.vue    |  24 ++++++
 src/subpackage/message/pages/complaint/list.vue    |  29 +++++++
 src/uni.scss                                       |  12 +++
 15 files changed, 487 insertions(+)
 create mode 100644 src/subpackage/message/components/detail/answer_item.vue
 create mode 100644 src/subpackage/message/components/detail/image_flow.vue
 create mode 100644 src/subpackage/message/components/detail/info.vue
 create mode 100644 src/subpackage/message/components/edit/fixed_button.vue
 create mode 100644 src/subpackage/message/components/edit/upload_img.vue
 create mode 100644 src/subpackage/message/components/fixed_button.vue
 create mode 100644 src/subpackage/message/components/message_item.vue
 create mode 100644 src/subpackage/message/pages/complaint/detail.vue
 create mode 100644 src/subpackage/message/pages/complaint/edit.vue
 create mode 100644 src/subpackage/message/pages/complaint/list.vue

diff --git a/src/pages.json b/src/pages.json
index 807b35a..8ed4b41 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -901,6 +901,29 @@
 					}
 				}
 			]
+		},
+		{
+			"root": "subpackage/message",
+			"pages": [
+				{
+					"path": "pages/complaint/edit",
+					"style" : {
+						"navigationBarTitleText": "投诉建议" 
+					}
+				},
+				{
+					"path": "pages/complaint/list",
+					"style" : {
+						"navigationBarTitleText": "投诉建议" 
+					}
+				},
+				{
+					"path": "pages/complaint/detail",
+					"style" : {
+						"navigationBarTitleText": "投诉详情" 
+					}
+				}
+			]
 		}
 	],
 	"globalStyle": {
diff --git a/src/static/images/icon/index/green_bg_circle.png b/src/static/images/icon/index/green_bg_circle.png
index 0117de2831e5fbdbca102077eeefd51fdbba6851..3f1a34e8c0e7931007cd2de5ad2ae3863406b544 100644
GIT binary patch
literal 7925
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
JQLAPh{y**G03rYY

literal 52000
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%0AKlvFYQhrdEUFdI;bH~K8(#97GIYxj*KVnVTYRK
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
Z_yBiEVpta?kDCAh002ovPDHLkV1g4RbVmRH

diff --git a/src/static/images/icon/index/tab_12.png b/src/static/images/icon/index/tab_12.png
index 1860a6787a001746aa54568b06c024acfafcdc38..8e0eec82feda1651614651f236a13755851c4705 100644
GIT binary patch
literal 901
zcmeAS@N?(olHy`uVBq!ia0vp^CLqkg3?x4-dwml~wFLNtxB_X086_YzuL?xYEM=Ho
z#xT1aDhOl%ML>cT3^T#95H3^@C=1kE3e^Y_gsUk7OMzv9g0qm-fY}hcz~av5tCj$r
zp<NQ>7tHYf8|%+~-2C@n3QtMoh|AI_3H6s)I{##q&D!oJ`OAklwVQ6Aknj5R#tiTB
z7i)hrFfg@xx;Tb-9Dh6Y=A^|2Jg&TD4IBJ!lzS+6xBvgYf8rYzGw)rOLO+{a{od)Z
z%WhLE^UtgMC%(P%Q7i08>a?%Nz5g70@}esLyz}xz`@+oF7r8|SmEBV&ynHb^Bt56F
z;?=9m)0ZbnBu+aT`8>C;FLIjQ?e&r^yDpe$e`#6r;;gB=y_j{(=1)iJOe*ZmT0*Rz
zo4gfSW67wxrRmgP)?_!PD-$P(FQ2>Y+xaf%jaOPHwKOldo^z~GD&A05F;VnUWrK>{
zqT8w_$J?0CJv{As)Rv{}(G4fwA~pd95n-uEoXgZ7&b)PVS>BFJyAHL(dn=Z-toxx9
z?y>Oltwfj59qr5yWTh>|p2jJ8v2fc?+-xE!AMAXELHGKBudGW>ig8E1uoP6d`%G=t
zhmGm&>fFmq1Xp^n^BF1xP1^Y=aL;V^gHCVf<vU!N`@_;`y3Uik)qKp;W)_^!p0cHJ
z=iLR?9cxN7S+y^S^lcE`vGMaaTOY{{LB0<q_I#JJo#|<o`lO<3(&L?Hq)vrRf19^U
zW|`QIM<pp4(doWVZDgySNxiq7xb5J^IU5w;i{=!4xb>&wuuh?4{ehEPZuxxdy7nd6
z?@|j}XYj#a6E=4reXS5F|K_<?+-LUFOXts#UR`K5Y3k+o7W-!Sx5-TvtvmeD@>${b
zkZGYS=Kbyp?(4a~)-pT9rgiI+o^9oE8+f<_x>m*&`V@r!nltslI+0-Z$moX_f7oqb
zYjvj?G`F4%u=uvvXTucxopl%QT{vTLNYvw+V>7GL%ZKqCW)e+{>&jmWMq1kZsMr^;
z7Fcrd)wU^fELRs>v7J^cF^nnkounLVx}#;%44snwNplp_AAYJ#yR=Wmy=+ECRhhxb
jsG}Jh{|d}}vj1BAng0Cr6I;Y;K>5kj)z4*}Q$iB}e7>7Y

literal 2483
zcmV;k2~75hP)<h;3K|Lk000e1NJLTq001-q001-y1^@s6#dsU*0000IbVXQnWq4_3
zIz@PCW>02jb7gb@GB#5iqGbR800d`2O+f$vv5yP<VFdsH07PY2NoGw=04e|g00;m9
zhiL!=000010000Q0000000W=_00RI300962005u@00aO40096108XF-00aO400961
z08Rh^006i}1V;b>00v@9M??Vs0RI60puMM)000Q;Nkl<Zc-rlmdvH|M9mhYvySpI-
zEch6d0ZX-xkE&CdT05268EdUogfTu4MP7LewLoD5;ZYXb@YqmB9))ZYV20^K(h)(x
zwo`_e$h4!S7Oe6pg9uctlmJ5#$nM@>Pj~KQ56cF26Zof-&&-+0W^S_Qdq3y*yXWlE
zNhh6j@_&txDUpgBAQ}Q15N8P`;m_#^wNtJm9={j(F2dJQ`hfZn`3(37*ov@+lB$1Q
z`9Ssc!pZj*gN_CS;ZOK-3Mra>f^4Y|2@Q?kLNx^R2YQj7)4+!~vIM_>9R+imI~K?`
zqp=X^SZqW-2Bva*w{<)mQZk{sya(d`9HkKGN@ggqgFufTQaGcD%iwS+G$dY_(WIh!
zml;dh-#Cnw!NBFiOu7cqX((lB!o+~X2nW-e5@!v)dz{0pl=cT&UVc51#>JkQJV?+C
z90C*)^hR|#Em}vU{6^YhOGprzjOsYR4++j8>;UIk=+X<3`#|30LQWx0F*o;J#F3)|
z%(8#W)LxIw1KDO`IxEFYGr~edMj>n=Ne;?z&>(fwx{!_oP4}Vt3Xo$h*@ZaH3zUW5
zpscb1F!r?U!Z0$+gjvIpWBovvfeyrVU(BwCRv0r;6Gn|0JB-650#eK9swk_f0yKX<
z2W1p+JtX)yA|oiR`Xe?qQ}WPQEs8f0S`b-kuA2ZrB-qmnGYLD4BgOQ+c@0O8JczOk
z)q5bp2RJgsbiV_c8EVlGn#PP527nR4C?Yd~a+34{9Yrb{yBp;}T9I8Kui=r_jAP80
zFdRG5&kJ)mN$x~>AoC?BdM4%fpMh*lgt0JpsFAYyD-e=Kl%b}R4FDVG9-yD?jMDI7
zQ=@)kXS!#mJ9r3FO_)UqGjV;(Gb1F)1${j8K#p%Q$R?890?Z^5@{<;04o=aE`!aRq
z-L2PO!=8}O{|9UG2Y@IxD)$>R_v7j^;BL~Pa$n|wisv0C;1mFRA%UR!eK=c5Z7`2i
zM0NrHB+0YH+)8RHa+5d2YQe>GjB%ha95a?zC+ZH4(TWxjXD48rISjJRx~5NdU9NE6
z7l=#)j)R9%fa-Hxg#Pc^H%QV2C`04pSy9mym2;L6msHF%21h0U=V?WKBsq-8c+lM>
zakAejL?VJ59D(cB0s)e|4b&m>H#1I95<cs7s|r-hfu4{c3bGQk7w{B#I61v2nf(Q+
z)C8Zw)dj$pN%AQo&zO$*KGnfZppQU;{ic5J$nL>fTB>vj{1%aVKuPihupHHTTz#2V
zWC<c+k_12tfbU_W(e&$IeCrWs9B|GGGd>Y!d7>u2L6U#a20kvu+IQj%8n6?@58P($
z7`g&|fJb?9Kof($vzt<5YQxSQ=K2=kejpccyd?+_2ey&pU%<K@=SgM#jyN0M-OJzs
zdr)phq`-vP%!(;~V(tXcfvx667Ml0km4zYORMm0(z6ylVAnUjYoeGvI@%<8!4P4B2
z9A^v#b5C<A)cHNgiwQFTQP-GZG)WGk`e)ie$d*X(F;q)|!PtgH%E4ca#zun90<N>n
zY&T}|y)c;(nH+%l11PJ2TdnsQ54SDCltjk@+0>L@i|Q}T7!LTYz1MnF2U=kOwqVSd
z=CPM_)Ky%=m-?S&$Pl%*OE=-h$AS(^Y5VUZ&Ld`dpXs=vRO+U5BNm?sIvogDjYBdr
zQya|1)uAZWz;Td|K+hrEhMIBl5o0rsjHRS%FPFffy%f!DM4b5uwFu|a+@S4<v|TeU
zCJb}ErqR#a&g7%qn-WG5*#uHXpxZt!gP)FYd)H?6H||5V8M~W_yhFg3-b~HpT+}sT
zwC*xpwh8zUp%$OKPLcP#yJ~^9gv5jyjOt9FC$<?F+m;zG%-pua$RS`O!ZzSN)9ntE
z1^)JjIXedBRp2^oGw`&T#Hse1(VGy?;^eHOcy^R5aoQE;z}dkmVerC?!Gy`uObp==
zNxGtp!;KcPDik0~eC;&zT8f$NK)wlcG_9E@AAHF(a}6YL5&n{R?MRred83HNdINU?
zejormOf1@kK|k2ehOKV<4PAXRE+X}aGt`VC9N&CKym|(|e+tO!B*{Z{0yGtPXR(Zs
zEE<3@qv>iUKg*igj5xz64Id|!w-@>N^hh1(P$0Lp+lkD_*X?H%g<>5rWSeOmgzA;4
z8R1UgF4FPDkK=8anuyypl3!2pXKSeAW~zg^2(}rU7)T{TmHFF7JTf%Zh)5WmN=oO&
zGd0w4GwAb{nH1!&sbR7()eY4kxX)ec6I8jPW-wu3Id%hpI1spSS1!vawVwRhnL2{V
zOJ)w+GdFagX<)m|z&tCABJ!pg%dkH$(3JC2W~S;%(ibH^b3--3Z{zB3fUjVi@%i#8
znwzN^MPxBTh=8w&7T4Hz=Kx*WWolI@kLJcbsNPBf`Gm5nTQW1G3<UbwX3Q94!enD+
zE$W0QscK;K-1GPXOF@<Z=h|gzM5qa6r={U0fD8laLzcNS;D3ga@W*M*R8Jb|nYl3;
zh9x*!MA^Is@F=Q0PfpHML?&CIdZHR85}ag4cP>R_Y7Xcf)*Kr$4}{o1x&)kP=4Mz2
z#!T`2lcZ8m*@7e0h%8DmH4P|hJ50!d*z-VtyIW=)$lJEN04P0aX<1G6<gZ@dj4U&w
z(A309+M+nzf?sAJ1c7GDR8?A2^$Q$m{0ZtVwoV2Oh}32gNHzkWSSB6?^AA@ByR~Ts
z*?=QIH8pdR%TZ`TkyC@P&<kao`Vn}ns0eWC_zS2`2YS$otj5u;**%A9COwABuYen@
zD|Z9?P@Ya{0M&>ygOYjwAscF^1`<aE)%if4^*-+ce@CT1=r=7h=MmO&ZTH~}2}Lsv
zWVi1UT&=W1rJ@O&$|%!9tuR@Knu+QJD^z-f)%cu=6orqqdoO29J&sEa&^OJYEP^8;
zimOi09_*zRi$0Ib9H38{Ii13UF=k%z%yjf?{qjdp9R)fN$OYMr@H>>{#>^=?hP~B#
x2qhoUr-0r-1MmSV5qxYhH|{i@bkfOH=f6eq_ZfeA9drNy002ovPDHLkV1iTbW(fcQ

diff --git a/src/static/images/icon/index/tab_8.png b/src/static/images/icon/index/tab_8.png
index 4b19fe3d3927094bc048984e8f9c798a8521bcbc..d126d718fa08e27e6d85965883783c4b3302d295 100644
GIT binary patch
literal 775
zcmeAS@N?(olHy`uVBq!ia0vp^CLqkg3?x4-dwml~bp`l@xB_X0nWa!PuaaRw9mA|r
zh8aMSGLYchGKOjO46{lY=G1`1Au4AB6_kL~07Yh(fDxDt<(7lR!BVrpY^cUEkT?W^
zbd@s9DFN96WPpv0-6FdY=osCSAirRS-#@-`u|Kmr`$~%E5dS^>+tGd!v%A_&-)>kf
z@}aq2U2#RI+m3y6=VT>anO62;QrQ*;2FCxME{-7{$KOu5S+>}K$D#G0&ScKC_7>AA
zZ@&Kje~*L5^swO;%i0&-?}ZcMqdhh~oPOS*C%pHVeag*)`TO$T+@5@r{Y>!g|6LQ=
zCpKU1Jhs#A!@<s`n%fKVCmvUK&FB!{d-1CMcA@G0!lu@Kmv3A<#=2v6#Hu|@I(_Yy
z9ZBj+JSu-$z}oY_`HkIYpC4So{Op_cWM+RO&2y?8iH;I6b3BzVZb|55d*8cwf4pW>
zy-WU#X+4}9ev7}|a3^`^eaF|j(JCq5XPK}~{$lEQX6*+by+^;TRh1@n?l|@9wA{`v
z7mk-lrwE5X-m5b4Yq+?0^^$GN=Bl_woqZ*5EOx$XiC3XyD@!8t%iyaU&Wp?vSmCv6
z;+ky3CEjNCQa4$hb9eXL39-JYxY93@IrsOkZn;d&D^EY9NpWQ^@6J<tzMFBU#XC!h
z@5X|E7r(z6<Zr)pN0dQAZ1=~@ZA)fees3dmY|`;B$<MC&xxOg>WmH}Dy!~j~5^07t
zpPt?Pti_h_;<k_zb7d>5NP?Q+R+WqoS1jENBfUBkr`+A8vOZPwEyJoeiMd`vnvRnX
zzZUvb+i7JXuxhD{s{77_`il1sjt6Dia{?wNh~AMBxuVCX>ecx&qTqYj|Hy#*F)|l|
z1A_YgZgcpO$f-T&!i67`9zNy_)8t;aL_>4U;Z>W{^*)>vZ9cz%`@!`2&*gRU5?`3?
R{ZIu;(Vnh;F6*2UngEn1T5kXV

literal 2497
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
LNkvXXu0mjf9-6z_

diff --git a/src/subpackage/message/components/detail/answer_item.vue b/src/subpackage/message/components/detail/answer_item.vue
new file mode 100644
index 0000000..7142425
--- /dev/null
+++ b/src/subpackage/message/components/detail/answer_item.vue
@@ -0,0 +1,39 @@
+<template>
+    <view class="answer-item">
+        <view class="ai-user">
+            <view class="au-name">李小小</view>
+            <view class="au-time">[回复] 20241220 10:12:31</view>
+        </view>
+        <view class="ai-content">情况已核实，目前正在解决中</view>
+    </view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+    .answer-item{
+        padding: 30upx 22upx;
+        background: #fff;
+        border-radius: 10upx;
+    }
+    .ai-user{
+        @include ctf;
+        @include flcw(32upx, 44upx, #1A1A1A);
+        .au-name{
+            @include tHide;
+        }
+        .au-time{
+            flex-shrink: 0;
+            color: #9C9C9F;
+        }
+    }
+    .ai-content{
+        padding-left: 26upx;
+        margin-top: 24upx;
+        @include flcw(28upx, 40upx, #9C9C9F);
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/message/components/detail/image_flow.vue b/src/subpackage/message/components/detail/image_flow.vue
new file mode 100644
index 0000000..c32dadb
--- /dev/null
+++ b/src/subpackage/message/components/detail/image_flow.vue
@@ -0,0 +1,30 @@
+<template>
+    <view class="image-flow">
+        <image class="if-img" v-for="i in 5" :key="i"></image>
+    </view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+    .image-flow{
+        padding: 30upx 14upx;
+        background: #fff;
+        border-radius: 20upx;
+        font-size: 0;
+        .if-img{
+            margin: 0 14upx;
+            width: 200upx;
+            height: 200upx;
+            border-radius: 10upx;
+            background: skyblue;
+            &:nth-of-type(n+4){
+                margin-top: 28upx;
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/message/components/detail/info.vue b/src/subpackage/message/components/detail/info.vue
new file mode 100644
index 0000000..396849a
--- /dev/null
+++ b/src/subpackage/message/components/detail/info.vue
@@ -0,0 +1,46 @@
+<template>
+    <view class="detail-info">
+        <view class="di-line">
+            <view class="dl-name">标题：</view>
+            <view class="dl-value">门禁开门异常</view>
+        </view>
+        <view class="di-line">
+            <view class="dl-name">类型：</view>
+            <view class="dl-value">硬件</view>
+        </view>
+        <view class="di-line">
+            <view class="dl-name">反馈内容：</view>
+            <view class="dl-value">开不了门</view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+    .detail-info{
+        padding: 30upx 24upx;
+        border-radius: 10upx;
+        background: #fff;
+        .di-line{
+            @include ctf(space-between);
+            &+.di-line{
+                margin-top: 10upx;
+            }
+            .dl-name{
+                flex-shrink: 0;
+                @include flcw(28upx, 40upx, #1a1a1a);
+            }
+            .dl-value{
+                flex-grow: 1;
+                text-align: right;
+                @include flcw(28upx, 40upx, #1a1a1a);
+                @include tHide;
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/message/components/edit/fixed_button.vue b/src/subpackage/message/components/edit/fixed_button.vue
new file mode 100644
index 0000000..612981c
--- /dev/null
+++ b/src/subpackage/message/components/edit/fixed_button.vue
@@ -0,0 +1,36 @@
+<template>
+    <view class="fixed-button">
+        <button class="fb-btn">取消</button>
+        <button class="fb-btn">提交</button>
+    </view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+    .fixed-button{
+        position: fixed;
+        left: 0;
+        bottom: 0;
+        padding: 10upx 20upx;
+        width: 100%;
+        @include ctf(center);
+        .fb-btn{
+            margin: 0 20upx;
+            width: 240upx;
+            text-align: center;
+            border: 2upx solid $mColor;
+            border-radius: 44upx;
+            background: #fff;
+            @include flcw(32upx, 88upx, $mColor);
+            &+.fb-btn{
+                background: $mColor;
+                color: #fff;
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/message/components/edit/upload_img.vue b/src/subpackage/message/components/edit/upload_img.vue
new file mode 100644
index 0000000..ebdfd04
--- /dev/null
+++ b/src/subpackage/message/components/edit/upload_img.vue
@@ -0,0 +1,95 @@
+<template>
+    <view class="upload-img">
+        <view class="ui-title">上传照片<text class="ut-txt">(最多上传3张，只支持.jpg、png 格式)</text></view>
+        <view class="ui-ls">
+            <view class="ul-item" v-for="i in 4" :key="i">
+                <image class="ui-pic"></image>
+                <image class="ui-close"></image>
+            </view>
+            <view class="ul-item ul-add">
+                <view class="ua-icon"></view>
+                <view class="ua-txt">上传照片</view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+    .upload-img{
+        padding: 30upx 18upx;
+        border-radius: 20upx;
+        background: #fff;
+        .ui-title{
+            padding: 0 10upx;
+            @include flcw(32upx, 44upx, #333333);
+            .ut-txt{
+                font-size: 24upx;
+                color: #9A9A9D;
+            }
+        }
+        .ui-ls{
+            margin-top: 24upx;
+            font-size: 0;
+            .ul-item{
+                position: relative;
+                margin: 0 12upx;
+                vertical-align: top;
+                display: inline-block;
+                width: 200upx;
+                height: 200upx;
+                &:nth-of-type(n+4){
+                    margin-top: 24upx;
+                }
+                .ui-pic{
+                    width: 100%;
+                    height: 100%;
+                    border-radius: 10upx;
+                    background: skyblue;
+                }
+                .ui-close{
+                    position: absolute;
+                    top: 6upx;
+                    right: 6upx;
+                    width: 40upx;
+                    height: 40upx;
+                    background: darkblue;
+                }
+            }
+            .ul-add{
+                padding-top: 36upx;
+                border: 2upx solid #D8D8D8;
+                .ua-icon{
+                    position: relative;
+                    margin: 0 auto;
+                    width: 60upx;
+                    height: 60upx;
+                    &::before, &::after{
+                        content: '';
+                        position: absolute;
+                        left: 50%;
+                        top: 50%;
+                        transform: translate(-50%, -50%);
+                        display: block;
+                        width: 100%;
+                        height: 4upx;
+                        background: #D8D8D8;
+                    }
+                    &::after{
+                        transform: translate(-50%, -50%) rotate(90deg);
+                    }
+                }
+                .ua-txt{
+                    text-align: center;
+                    margin-top: 28upx;
+                    @include flcw(28upx, 40upx, #9A9A9D);
+                }
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/message/components/fixed_button.vue b/src/subpackage/message/components/fixed_button.vue
new file mode 100644
index 0000000..513eff5
--- /dev/null
+++ b/src/subpackage/message/components/fixed_button.vue
@@ -0,0 +1,32 @@
+<template>
+    <view class="fixed-button">
+        <button class="fb-btn" hover-class="hover-active">新建投诉</button>
+    </view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+    .fixed-button{
+        position: fixed;
+        left: 0;
+        bottom: 0;
+        width: 100%;
+        padding: 10upx 24upx;
+        .fb-btn{
+            @include clearBtn;
+            text-align: center;
+            height: 112upx;
+            background: $mColor;
+            border-radius: 10upx;
+            @include flcw(32upx, 112upx, #fff, 500);
+        }
+        .hover-active{
+            opacity: .9;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/message/components/message_item.vue b/src/subpackage/message/components/message_item.vue
new file mode 100644
index 0000000..24abe22
--- /dev/null
+++ b/src/subpackage/message/components/message_item.vue
@@ -0,0 +1,74 @@
+<template>
+    <view class="message-item">
+        <image class="mi-icon"></image>
+        <view class="mi-content">
+            <view class="mc-info">
+                <view class="mi-top">
+                    <view class="mt-title">标题</view>
+                    <view class="mt-tag">返回的状态</view>
+                </view>
+                <view class="mi-content">巴拉巴拉巴拉....</view>
+            </view>
+            <image class="mc-arrow"></image>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+    .message-item{
+        padding: 30upx 24upx;
+        border-radius: 10upx;
+        background: #fff;
+        @include ctf;
+        .mi-icon{
+            flex-shrink: 0;
+            margin-right: 24upx;
+            width: 108upx;
+            height: 108upx;
+            background: skyblue;
+        }
+        .mi-content{
+            flex-grow: 1;
+            @include ctf;
+            .mc-info{
+                flex-grow: 1;
+                .mi-top{
+                    @include ctf;
+                    .mt-title{
+                        @include flcw(32upx, 44upx, #1A1A1A);
+                        @include tHide;
+                    }
+                    .mt-tag{
+                        flex-shrink: 0;
+                        margin-left: 20upx;
+                        padding: 4upx 12upx;
+                        border: 2upx solid $mColor;
+                        border-radius: 6upx;
+                        text-align: center;
+                        @include flcw(24upx, 34upx, $mColor);
+                    }
+                }
+                .mi-content{
+                    margin-top: 18upx;
+                    @include flcw(28upx, 40upx, #9C9C9F);
+                    @include tHide(2);
+                }
+            }
+            .mc-arrow{
+                align-self: flex-start;
+                flex-shrink: 0;
+                margin-left: 20upx;
+                margin-top: 8upx;
+                width: 28upx;
+                height: 28upx;
+                background: skyblue;
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/message/pages/complaint/detail.vue b/src/subpackage/message/pages/complaint/detail.vue
new file mode 100644
index 0000000..0097f5c
--- /dev/null
+++ b/src/subpackage/message/pages/complaint/detail.vue
@@ -0,0 +1,47 @@
+<template>
+    <view class="complaint-detail">
+        <view class="top-status">当前状态：xxx处理中</view>
+        <view class="heigh-space" style="height: 24upx;"></view>
+        <detail-info></detail-info>
+        <view class="heigh-space" style="height: 24upx;"></view>
+        <image-flow></image-flow>
+        <view class="heigh-space" style="height: 24upx;"></view>
+        <button class="right-btn">回复</button>
+        <view class="heigh-space" style="height: 24upx;"></view>
+        <answer-item></answer-item>
+    </view>
+</template>
+
+<script>
+import detailInfo from "../../components/detail/info.vue";
+import imageFlow from "../../components/detail/image_flow.vue";
+import answerItem from "../../components/detail/answer_item.vue";
+export default {
+    components: {
+        detailInfo, imageFlow, answerItem
+    },
+}
+</script>
+
+<style lang="scss">
+    .complaint-detail{
+        padding: 24upx;
+    }
+    .top-status{
+        padding: 0 24upx;
+        text-align: center;
+        border-radius: 10upx;
+        background: #fff;
+        @include tHide;
+        @include flcw(28upx, 84upx, #1A1A1A);
+    }
+    .right-btn{
+        margin-left: auto;
+        margin-right: 0upx;
+        width: 192upx;
+        text-align: center;
+        border-radius: 10upx;
+        background: $mColor;
+        @include flcw(32upx, 88upx, #FFFFFF);
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/message/pages/complaint/edit.vue b/src/subpackage/message/pages/complaint/edit.vue
new file mode 100644
index 0000000..e840ec0
--- /dev/null
+++ b/src/subpackage/message/pages/complaint/edit.vue
@@ -0,0 +1,24 @@
+<template>
+    <view class="complaint-edit">
+        <upload-img></upload-img>
+        <fixed-button></fixed-button>
+    </view>
+</template>
+
+<script>
+import uploadImg from "../../components/edit/upload_img.vue";
+import fixedButton from "../../components/edit/fixed_button.vue";
+export default {
+    components: {
+        uploadImg,
+        fixedButton,
+    },
+}
+</script>
+
+<style lang="scss">
+    .complaint-edit{
+        padding: 24upx;
+        @include isPd(110upx);
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/message/pages/complaint/list.vue b/src/subpackage/message/pages/complaint/list.vue
new file mode 100644
index 0000000..69249c9
--- /dev/null
+++ b/src/subpackage/message/pages/complaint/list.vue
@@ -0,0 +1,29 @@
+<template>
+    <view class="complaint-list">
+        <view class="cl-ls">
+            <message-item></message-item>
+        </view>
+        <fixed-button></fixed-button>
+    </view>
+</template>
+
+<script>
+import fixedButton from "../../components/fixed_button.vue";
+import messageItem from "../../components/message_item.vue";
+export default {
+    components: {
+        fixedButton,
+        messageItem,
+    },
+}
+</script>
+
+<style lang="scss">
+    .complaint-list{
+        @include isPd(132upx);
+        .cl-ls{
+            padding: 28upx 24upx 0;
+
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/uni.scss b/src/uni.scss
index 7745bde..082358c 100644
--- a/src/uni.scss
+++ b/src/uni.scss
@@ -105,4 +105,16 @@ $mColor: #009874;
     padding-bottom: $height;
     padding-bottom: calc( $height + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
     padding-bottom: calc( $height + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
+}
+
+@mixin clearBtn{
+    margin: 0;
+    padding: 0;
+    line-height: 0;
+    background-color: transparent;
+    border-radius: 0;
+    &::after{
+        position: unset !important;
+        border: unset;
+    }
 }
\ No newline at end of file

From 865c0f07cac86dc3a6897558bb96f957bdfd3641 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Thu, 16 Jan 2025 18:28:58 +0800
Subject: [PATCH 14/30] fix tid1803 time

---
 src/subpackage/verification/pages/record.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/subpackage/verification/pages/record.vue b/src/subpackage/verification/pages/record.vue
index 52cb385..24d26c9 100644
--- a/src/subpackage/verification/pages/record.vue
+++ b/src/subpackage/verification/pages/record.vue
@@ -78,11 +78,13 @@ export default {
             let { periodStr } = this;
             return periodStr ? periodStr.replace(/\_/, ' 至 ').replace(/\-/g, '.') : ''
         },
-        // 时间段对象
+        // 时间段对象 用于请求
         periodObj(){
             let { periodStr } = this;
             if(!periodStr)return {};
             let [start, end] = periodStr.split('_');
+            if(start)start += ' 00:00:00';
+            if(end)end += ' 23:59:59';
             return {
                 start: start ?? '',
                 end: end ?? '',

From 34c2521596fd46e13d3cc504314e4e3df80c1486 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Fri, 17 Jan 2025 18:23:50 +0800
Subject: [PATCH 15/30] add style for tid1807

---
 src/pages.json                                     |  23 +++-
 src/pages/menu/forth.vue                           |  66 ++++++++++
 src/static/images/icon/arrow_b2.png                | Bin 251 -> 226 bytes
 src/subpackage/menu/components/bottom_logo.vue     |  28 +++++
 src/subpackage/menu/components/mine/header.vue     |  65 ++++++++++
 src/subpackage/menu/components/mine/line_tab.vue   |  65 ++++++++++
 src/subpackage/menu/pages/index.vue                |  16 +++
 src/subpackage/menu/static/images/arrow_b2.png     | Bin 0 -> 226 bytes
 src/subpackage/menu/static/images/bot_logo.png     | Bin 0 -> 3501 bytes
 src/subpackage/menu/static/images/mine_tab/0.png   | Bin 0 -> 1356 bytes
 src/subpackage/menu/static/images/mine_tab/1.png   | Bin 0 -> 1575 bytes
 src/subpackage/menu/static/images/mine_tab/2.png   | Bin 0 -> 1060 bytes
 src/subpackage/menu/static/images/mine_tab/3.png   | Bin 0 -> 1451 bytes
 src/subpackage/menu/static/images/mine_tab/4.png   | Bin 0 -> 1035 bytes
 src/subpackage/menu/static/images/mine_tab/5.png   | Bin 0 -> 942 bytes
 src/subpackage/menu/static/images/mine_tab/6.png   | Bin 0 -> 640 bytes
 .../message/components/edit/fixed_button.vue       |   1 +
 .../message/components/edit/info_edit.vue          | 135 +++++++++++++++++++++
 .../message/components/edit/upload_img.vue         |   5 +-
 src/subpackage/message/pages/complaint/edit.vue    |   6 +-
 src/subpackage/message/static/images/close.png     | Bin 0 -> 401 bytes
 src/subpackage/message/static/images/unfold.png    | Bin 0 -> 288 bytes
 22 files changed, 405 insertions(+), 5 deletions(-)
 create mode 100644 src/pages/menu/forth.vue
 create mode 100644 src/subpackage/menu/components/bottom_logo.vue
 create mode 100644 src/subpackage/menu/components/mine/header.vue
 create mode 100644 src/subpackage/menu/components/mine/line_tab.vue
 create mode 100644 src/subpackage/menu/pages/index.vue
 create mode 100644 src/subpackage/menu/static/images/arrow_b2.png
 create mode 100644 src/subpackage/menu/static/images/bot_logo.png
 create mode 100644 src/subpackage/menu/static/images/mine_tab/0.png
 create mode 100644 src/subpackage/menu/static/images/mine_tab/1.png
 create mode 100644 src/subpackage/menu/static/images/mine_tab/2.png
 create mode 100644 src/subpackage/menu/static/images/mine_tab/3.png
 create mode 100644 src/subpackage/menu/static/images/mine_tab/4.png
 create mode 100644 src/subpackage/menu/static/images/mine_tab/5.png
 create mode 100644 src/subpackage/menu/static/images/mine_tab/6.png
 create mode 100644 src/subpackage/message/components/edit/info_edit.vue
 create mode 100644 src/subpackage/message/static/images/close.png
 create mode 100644 src/subpackage/message/static/images/unfold.png

diff --git a/src/pages.json b/src/pages.json
index 8ed4b41..a118cdf 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1,6 +1,16 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		
+		{
+			"path": "pages/menu/forth",
+			"style": {
+				"navigationBarTitleText": "个人中心",
+				"componentPlaceholder": {
+					"mine-header": "view",
+					"bottom-logo": "view",
+					"line-tab": "view"
+				}
+			}
+		},	
 		{
 			"path": "pages/index/index",
 			"style": {
@@ -924,6 +934,17 @@
 					}
 				}
 			]
+		},
+		{
+			"root": "subpackage/menu",
+			"pages": [
+				{
+					"path": "pages/index",
+					"style" : {
+						"navigationBarTitleText": "" 
+					}
+				}
+			]
 		}
 	],
 	"globalStyle": {
diff --git a/src/pages/menu/forth.vue b/src/pages/menu/forth.vue
new file mode 100644
index 0000000..aefd4df
--- /dev/null
+++ b/src/pages/menu/forth.vue
@@ -0,0 +1,66 @@
+<template>
+    <view class="forth-menu">
+        <mine-header @on:munted="menuPackageLoaded = true"></mine-header>
+        <block v-if="menuPackageLoaded">
+            <line-tab :icon-num='0'>
+                <template slot="default">账号管理</template>
+                <template slot="right">
+                    <view class="ft-account">
+                        <view class="fc-name">账号名</view>
+                        <image class="fc-icon" mode="aspectFit" src="/static/images/icon/arrow_b2.png"></image>
+                    </view>
+                </template>
+            </line-tab>
+            <line-tab :icon-num='1'>帮助中心</line-tab>
+            <line-tab :icon-num='2'>教练助手</line-tab>
+            <line-tab :icon-num='3'>收银系统</line-tab>
+            <line-tab :icon-num='4'>总后台(<text class="fm-txt">admin.ouxuanzhineng.cn <text class="ft-copy">复制</text></text>)</line-tab>
+            <line-tab :icon-num='5'>投诉建议</line-tab>
+            <line-tab :icon-num='6'>解绑退出</line-tab>
+        </block>
+        <bottom-logo></bottom-logo>
+    </view>
+</template>
+
+<script>
+import mineHeader from "@/subpackage/menu/components/mine/header.vue";
+import lineTab from "@/subpackage/menu/components/mine/line_tab.vue";
+import bottomLogo from "@/subpackage/menu/components/bottom_logo.vue";
+export default {
+    components:{
+        mineHeader,
+        lineTab,
+        bottomLogo,
+    },
+    data(){
+        return {
+            menuPackageLoaded: false
+        }
+    },
+}
+</script>
+
+<style lang="scss">
+    .forth-menu{
+
+    }
+    .fm-txt{
+        font-size: 28upx;
+        .ft-copy{
+            color: $mColor;
+        }
+    }
+    .ft-account{
+        @include ctf(flex-end);
+        .fc-name{
+            @include flcw(32upx, 48upx, #9A9A9D);
+            @include tHide;
+        }
+        .fc-icon{
+            flex-shrink: 0;
+            margin-left: 22upx;
+            width: 30upx;
+            height: 30upx;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/static/images/icon/arrow_b2.png b/src/static/images/icon/arrow_b2.png
index 54df2b3b9b66beeb07c3830279efe65fe73e4f58..e4e1580592509f3a3c7ee7a3babe6a48283aabb8 100644
GIT binary patch
literal 226
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K13?z9tQY(OzWq?nJE0CTwYwqmX^JdSUJ7>;(
zARCD0%$Wxk1hRqRAOsYdHf`z5nLw35L69<g!&h5?nuSV&{DK+2E55N3ysrIZM`u!~
z8^^hWS%wBqXMwVAo-U3d9M?;GJ^2_Ec@Ap?l%>7=FMnFpdqQ;V(Zcp8-yY2Srg>n(
z^aQU@42DyD(m4eWbidJ#TKo3CimcTZ>*sBut-s2z>umL4%n<p)e+g(JgQu&X%Q~lo
FCIB{ITIB!$

literal 251
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU3?z3ec*FxK%K)DcS0KG($BwI4ubw(}YVY2?
zyLRn5di3b^>(_7GxN-dW@oU$v0i_NfK78WDiHjF6o<D#7%$YM+u3Xu)X;Z=-mmNUO
zLM1_d!3_WW&j0xHRD<V^vHhECJqz|F%{Nc&0m{aEx;TbdoPK-8o3BBE$2G8v;~Ia)
z_x%ycDOtZvn1tW`crr`h)o+5eONv8+Pyn0L(zlyV$3N}!VtP;}EBoR^Qr;C=@xty`
yHPYsH^N!6~{r+0Go`mj|qi;%P%$1v5U#2dj!n1u{y8tK9Dh5wiKbLh*2~7Zry>apY

diff --git a/src/subpackage/menu/components/bottom_logo.vue b/src/subpackage/menu/components/bottom_logo.vue
new file mode 100644
index 0000000..9806574
--- /dev/null
+++ b/src/subpackage/menu/components/bottom_logo.vue
@@ -0,0 +1,28 @@
+<template>
+    <view class="bottom-logo">
+        <view class="bl-space"></view>
+        <image class="bl-img" mode="aspectFit" src="/subpackage/menu/static/images/bot_logo.png"></image>
+    </view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+    .bl-space{
+        height: 152upx;
+    }
+    .bl-img{
+        position: fixed;
+        left: 50%;
+        bottom: 52upx;
+        z-index: -1;
+        transform: translateX(-50%);
+        display: block;
+        width: 312upx;
+        height: 100upx;
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/menu/components/mine/header.vue b/src/subpackage/menu/components/mine/header.vue
new file mode 100644
index 0000000..3ee60ac
--- /dev/null
+++ b/src/subpackage/menu/components/mine/header.vue
@@ -0,0 +1,65 @@
+<template>
+    <view class="mine-header">
+        <view class="mh-user">
+            <image class="mu-photo"></image>
+            <view class="mu-info" v-if="false">
+                <view class="mi-line">昵称：猫星人</view>
+                <view class="mi-line">姓名：小雪</view>
+                <view class="mi-line">账号：18316553872</view>
+            </view>
+            <button v-else class="mu-login">点击登录</button>
+        </view>
+        <view class="mh-update">更新头像昵称</view>
+    </view>
+</template>
+
+<script>
+export default {
+    mounted(){
+        console.log('mounted');
+        this.$emit('on:munted');
+    },
+}
+</script>
+
+<style lang="scss">
+    .mine-header{
+        padding-top: 70upx;
+        height: 270upx;
+        background: $mColor;
+        .mh-user{
+            padding-left: 68upx;
+            padding-right: 30upx;
+            @include ctf;
+            .mu-photo{
+                flex-shrink: 0;
+                margin-right: 28upx;
+                width: 120upx;
+                height: 120upx;
+                border-radius: 50%;
+                border: 4upx solid #FFFFFF;
+            }
+            .mu-info{
+                .mi-line{
+                    @include flcw(32upx, 44upx, #FFFFFF);
+                    @include tHide;
+                }
+            }
+            .mu-login{
+                @include clearBtn;
+                width: 180upx;
+                height: 72upx;
+                text-align: center;
+                border-radius: 6upx;
+                background: #fff;
+                @include flcw(32upx, 72upx, $mColor, 500);
+            }
+        }
+        .mh-update{
+            padding-left: 68upx;
+            margin-top: 8upx;
+            text-decoration: underline;
+            @include flcw(20upx, 28upx, #FFFFFF);
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/menu/components/mine/line_tab.vue b/src/subpackage/menu/components/mine/line_tab.vue
new file mode 100644
index 0000000..4a0d219
--- /dev/null
+++ b/src/subpackage/menu/components/mine/line_tab.vue
@@ -0,0 +1,65 @@
+<template>
+    <view class="line-tab">
+        <image class="lt-icon"  mode="aspectFit" :src="'/subpackage/menu/static/images/mine_tab/' + iconNum + '.png'"></image>
+        <view class="lt-right">
+            <view class="lr-left">
+                <view class="lr-name">
+                    <slot name="default">账号管理</slot>
+                </view>
+            </view>
+            <view class="lr-right">
+                <slot name="right">
+                    <image class="lr-arrow" mode="aspectFit" src="/subpackage/menu/static/images/arrow_b2.png"></image>
+                </slot>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+    props: {
+        iconNum: {
+            type: Number,
+            default: 0
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+    .line-tab{
+        padding-left: 22upx;
+        padding-right: 44upx;
+        height: 108upx;
+        background: #fff;
+        @include ctf;
+        .lt-icon{
+            flex-shrink: 0;
+            margin-right: 22upx;
+            width: 48upx;
+            height: 48upx;
+        }
+        .lt-right{
+            flex-grow: 1;
+            @include ctf(space-between);
+            flex-grow: 1;
+            .lr-left{
+                .lr-name{
+                    @include flcw(32upx, 48upx, #9A9A9D);
+                    @include tHide;
+                }
+            }
+            
+            .lr-right{
+                flex-shrink: 0;
+                max-width: 40%;
+                font-size: 0;
+                .lr-arrow{
+                    width: 30upx;
+                    height: 30upx;
+                }
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/menu/pages/index.vue b/src/subpackage/menu/pages/index.vue
new file mode 100644
index 0000000..914b254
--- /dev/null
+++ b/src/subpackage/menu/pages/index.vue
@@ -0,0 +1,16 @@
+<template>
+    <!-- 需要定义一个页面以及在pagesjson里声明才能生成static文件夹 -->
+    <view class="menu-index">&nbsp;</view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+    page{
+        background: #fff;
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/menu/static/images/arrow_b2.png b/src/subpackage/menu/static/images/arrow_b2.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4e1580592509f3a3c7ee7a3babe6a48283aabb8
GIT binary patch
literal 226
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K13?z9tQY(OzWq?nJE0CTwYwqmX^JdSUJ7>;(
zARCD0%$Wxk1hRqRAOsYdHf`z5nLw35L69<g!&h5?nuSV&{DK+2E55N3ysrIZM`u!~
z8^^hWS%wBqXMwVAo-U3d9M?;GJ^2_Ec@Ap?l%>7=FMnFpdqQ;V(Zcp8-yY2Srg>n(
z^aQU@42DyD(m4eWbidJ#TKo3CimcTZ>*sBut-s2z>umL4%n<p)e+g(JgQu&X%Q~lo
FCIB{ITIB!$

literal 0
HcmV?d00001

diff --git a/src/subpackage/menu/static/images/bot_logo.png b/src/subpackage/menu/static/images/bot_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ef008a7827eb2c600849e24530b4e56f4c5b001
GIT binary patch
literal 3501
zcmYM1cQhMp*v1npMnVxg)!6g3M}jIrRf`r?dv8^ez6m9~h*6uWEwuLDqtR9+t)N!b
zE@|IbHHr>Y(dwt)`<?S$=RVhc-M{-e=lSdT<4L|@X$oN%W(NQO5VI@B)&KwyahAPV
z8P8m*h~|FQa5v0vnw<5PmX?l=j@H)J|NLw`Q(IdbAph?(KjUWt6ynYxpaA=)3hx1k
zp=aUGnZmIDCAj}v{n_IFzy6H>5iFqSjEDYN6<|Gc<ay36md09J+5mh(hCH@T=5h@J
zsuyk|wn+StACls)2=ilQZpNX3U+KD;8j1ys{|qt%0APxlvEj{o3){u-#~0z?#N>1!
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
TFF?+|KL9fmOXFsgJK=u-2H$}u

literal 0
HcmV?d00001

diff --git a/src/subpackage/menu/static/images/mine_tab/0.png b/src/subpackage/menu/static/images/mine_tab/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a80539fcd35a642fd09eafd6a1994b3f9234b37
GIT binary patch
literal 1356
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy!U1^9%x0%>C~u(q}~H8r)gv@|m_
zgNQ&#pdd0A$Tl%Cfrw0>J{?U8A`29UNX?lu2gsN)V+N3%IddkE1nLEHfh3R%WXzg1
z3nB|7A&iuil-aXq1K9-y1whk)TJFhT+yiu_NlB1jFvFXv!dV=W7ax9Ep?0LV$m*6;
z^M)TL&ti55>UsJ;naB5L?IMj`l~a<P;zVzpYREQHSBx;3-EZQ?z`&yF>EalYaqn$p
zX7OSJo?gXcciK6_IiA?fzW3(;|7`D-uEJ7GWmcPaZ?2rLAYrR>(*IIQ!ExF0J0JBO
zJ+D{!g!l$~u2~=aG<|Kq@~hb{t{&Q4yoyt2*!3Q>PnFf?{Cam0<Mrj8P4&ktJ6DT}
zFW7m~-@<Fzk_^^`pU%EJ*?G-x!Nfmi<|i9_yH-1tDcqlA8=`Hs;G*=VlOO!wv@d(w
zE7~)4WBSa8oXz<h><Z=C+FHF{pN;hDr+RmFtTNp`JNe+3FHQ!Fj*0D%YDzw;HKBc8
z#4f8U#tW0*_fMXDyf1*^+SYoZr=J+t?A;>9dDx6iK6-kwthU$@jeA@!4oP-=rOWSj
zDt1piBF}n0CH}el+is=#x<<BnO)_Q^9%y&YIUrV)$8^ZViEG_jE|p~xE#G@iE^u5~
zwD(-2+Q}LIPv<l}{M8-NR?0X3nWVE=<BsgqGm8vNesE~aX<Rq8Kukma;Eg2J)9<1(
zH#en!Tv;~3xM@Xp>Jg4l4gN1?_|3??e(Fj}*24}#l~`?Iw+F>SKhC)N99?#P^2v9V
zze<fGH_bjFQWUsgKKsu~<Jq$2>o1@BSM<@~^t@^2td%~FYO8PmeHGr?el=-h)sH>*
z-mG#L@(#W&V3l!VO`iG9<rgpNoZfWt`PWw~t5S@7J9*Ak@kj-W&UVe*(%F98`0S%K
zrz139iAQsuGx0vCRK&|#Yo8y{F5!^e@Q6`=LDH(jMcnIuS0?i>KKdk}s%V9i_!(b;
znWd+jwA+%yihDLa{&U!_?Ha3}4S!07_|vJE<nM_|3Y>Z7zy7L}X3Khk7Y)kt5=k0X
z?N8smeVMzx#mC@cc=9p+!+ebgi&Au^2gJqQyMI4EZptUA$A+xG9|r7PTN<+VZP|?j
zW{X_*l(y`;Bdp}CJLNE+L!{^(M(!l`2`^7L-7QsFxJY~gi`Q}HJ!-D`6HK4U#dB&|
zG;qwnk?5a)<9YydRI}sv3JDqR+L>XVZ(i@b;;`<wVW75@MX!wXhAWeGuH-r&n|>?k
z@HPKW5nF%dJBIJCsg7H@?DW$wdp-$<7{93fY`>!1Z^;*vipzh~w%&TPeEG=<UQ52E
zDirrkZ<*)sHo0=;jhi(^cG-c4EOVB9IJ7<N$>D$O&cS7``Co;W*{obqy@<_i@v3>f
zw@zg%ex1phD{N$)VV7k3S=y0d`LQk4OIC<%(`%b_^H<=)D|1(Ig?MSd@E3?M2q_P5
zQ{>(_o3BcMA!z%%W4js7u95p7z*6=8(c|{FcR#%`?oOL-#UjSCfARsBw`boJhLyS=
z|CS~>b1sX5@UhmK8*AO3vW4yD-kIJIQzEoLTlin%ryUVCeth9-byqwC3{2iM&p1?Y
zjiv2-l`xOR$M1qC<~&f7C~9hU;Q24uST?(MZGQ;I!tEh9o`^9eeU~^}BhGo~YwqIf
o^NS`aWSGd^DLgJ)&#<5IR?Y-jm&A1ofdvkOr>mdKI;Vst07ndGYybcN

literal 0
HcmV?d00001

diff --git a/src/subpackage/menu/static/images/mine_tab/1.png b/src/subpackage/menu/static/images/mine_tab/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..3efd2201e11549a22d836be2d120b509aadfbc9a
GIT binary patch
literal 1575
zcmZ9Mdo<I37{`}UZXuVS)8?|03SlmjC|g+hMi^t{GLncy@uQ^7!kQu!h8afgBPy5C
zaap8rh;qw8v2vSMF2^PF`*!x<?>Xo5Jn!fAJkRIy&xh)0e}2CtOcDZt><4VDoxtex
zcZowm|M?u{Z(-8W4vz(+k&)4<Q>PdV1}KC^qtQTNVq%h&l_ex76bjUahK67&tO_~k
z!IBVyTv!5qPEL-ou`xK3ot-W01R+R-8sv039ZdfR!Blu6=s^=UfG{^VH#0L66rka7
zxP*j+*w|Q5gV)Alu@nl0N~MB3gCptb>E7Pn7z`#fG!y`UvWBfS@P$?pPWH}_b#ck>
z6U%(!fjPFR@&--4HyKk4Xmy^3H5EAN=`oKER#D@w5o{IuKHrIOY!CfXN=r)!BqF9+
zxBmzPRy%KBGM*jF4}d^KUjx=>@qv>(w~=TjMo~spR7zEAeG&!ps{<mHhbDIuhN}Wz
zv?Gs>J=(F@wY_S}MJrY7HBOVI1R4Y15uu|hwz$(h?>7ah0{gGg&Xr>>DO@dWX{)5m
zO%-SI9+~av4oY3n34Qt1pe$LP>9oNnSDA7-qI~bgN_)i|{6lD`i4?KUVru`d0yg9L
zz095KLp~h*i^Ss}^IuLqo&ySj&1bSnk%;^Z6t1?;*z5Q_^XSSxZDVfCW;8=eBkUXp
ze?g2|a<Uf~OHT3SjH3H>0#;g|I{bpqux8-H6ga;4thtel`#t?HAv&3UK<%cg?T^m0
z@|$ygE!i>stC0p~Iv&^umcO^7|M?N9!47;l`&;)(GBfz28^IPO(=?qnvRaTdSCiqC
zTz*KMeQ{7aow+pUF+XCPTs9rpvG>^FO*P<MR)p-ez_hetJDecby)Kh{dR_5wVk)%7
z4rYXxZLv{U6X&}f)r-X@5`LSt^GZ})&^Nt;R7Q`;BjfeptZ+$%$2kga&d@0M@WBj;
z@(UM-9t_kKA}NFbA93IMp{WHz+#zn&{GPbVb>|x9DWra0Q9*Ix`=`+^i5AB!UD93A
za=G5-6H|tFqjz}~3TL}lCl+%_F&LcZf=gu4w1CU|YN8>&=xN_=hi_QcAG%c&5A&`N
z5zMa%c<)xC)f>3AoZ{;*%Gyh{3%rT<s~l1fDmfb$q~ugg3-(l@T@9*ZDC89A5*<-G
ztka01oY?y~{EdCQ+0}F<w=3@WrXEe5ZvXTdgjOJ>!yMVOw8Yw0O4QmLwY)sm4d@y}
zE8En$ZKIQGetchj4xWy^qddnQxrE&`k(^_&u(9#<<J($BEVDMlBP3`?+H>B4ipJ<c
znfI2>CI-JB319<yYT*>OThOI8iQvXKg-`AG*N%83Ng;qY?J0Jy9D~_Lk3&y`Ck{r=
zeHrD|?srWYzbPhiXSU1Gy1u?Zu8Kz6*oPs?HsAJb?a79x;!?~{FoOht7DnAkWcR8q
z6us*cNm=A=N2?>|e2-~{SR!AMMaZLZB)jw9#+0VrCvAvmm&_hk{4{hi1Xl7|0&`cS
z^OcQWNAJQX=&R&#2Kh&~yXKFrBKDcZ&kp8m2y1?Xgn39;aNEpH{iMBli%X&Mmu>qk
zE6+h$!}vNXPG-O~R~75){<9E9m2V5`ORm<1?-bss!xzW#K2U9sIlm_*GWt~%$K0^{
zqTrls<&I9h7BL7y={Q6Y!Uo#)>RtADHdZ3H`^9E2HSG{uOrPvJC#e4EF<dpX?uyj(
zA0G)?<-faU6F=(7hQj1-xJ03HGYCaglG>TpmTzKyQ5v-7eRA=vu+&}55%g?Ott2Tx
zTCH20IlIv`p}_x^KQ-xa<=2VWKgHuVTRYA_eLK;uEojvbmqTh$itt-mehnWQt4HK6
z>Xdt#8vUy;Nr~a!_)J7M^TX-m0+o}mN&q6@8jkFD2tKD<gW9r^8qp@#>R8LmDvA5I
zB2{L&+V6^{wpmas%|RkL&tEf)PV&`0S<PlGKK7un1u{tKq4@}l$ie3;qwC6#;H^B-
o&dS&XSubVJuy!$JPd;&4me@D>V7%Y)BlsUe0Ia=rwWSaFKPL_54FCWD

literal 0
HcmV?d00001

diff --git a/src/subpackage/menu/static/images/mine_tab/2.png b/src/subpackage/menu/static/images/mine_tab/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c1b55cd21cd14749882960dad8184c3b5227e13
GIT binary patch
literal 1060
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy#f1^9%x0%>DoV-ph-Q&UqTBO@Ri
z!Ud8LZbn81SPVp1SXjW>$cz~?W&pWBLo6*Vf#&4p<pJ4n1wdJd0w6gZ3}()pIU5Y-
z%$Wn01QDH`ol#Ly_V)JC(a}y$PCzwfWo1A^fI3=RTPIAI02DMgH%~}NsHv$bDJfB%
zpkoJgy=h61UogV~2czAxE6YMPf3RI#T*tMs<Jk@GPgB0+Cs_zwj5(cg??8W#?SmD5
zGWw#Ii!&}>yf~-5F<(#d^&<ubrYD{*jv*QM-p+Vkw#Y!Bf!R}_L&L@8K<J*U(YN24
zuDx~ld;QwGSC4!Nc;m@Zr+fdrrIq|imNW(vlPl*1X5D9KU&?A=v`?{VDeJO>`wkjN
zJ1YNJ&r;WRKBZ2!De(K56?~1Urx)a!Ho0BkkUH3!K9T2CdSFx(!^9J!rxSG6a7+_R
zDBQT$fvveSLX2(c#+2fpw_0?9;sm}_7-c<tx8FfLI%M4{n@)`;@5dJoO0*T;7ghCe
zs65lb86$GTv*E_f6D*<vem7Xv6jv}UFZR4ps8!|s;%g-1-+49G8ub&nUYvDIO<}z(
ze#)UV;r8jJ<+jqzTD%MGml@g0{#InW+LV07e!BQki7O18lfw-1RTUXc8#gj9Y&Oi8
zz_U<xyPj}*S?BJZ-IEVEJuaO6`NxOm&mT0Bl9?kvr&NSq-8l27@N~~_^6%&L+fLpg
zJY{D1mAN<M&g-$}%jiwuJALiG{QONa?Ry2@@awRD-R-iOJ>YxygAKQ3KfmXTXVJU*
zn%5$8Gt<5Prn}bK33FatIk+uCaKC?3{2GqARtfRz?shbt>wLc4{M=<@e%6T(jh5NB
zY(2vEb<af3xxyd5E*JPy<Li1srgG8Ut<k5{MFQv9bM1E6FoU-x!65p?V==co4!nzI
z>_2V6_(x>!-92-6&a6Gf%Di!Im%C_tQkH_lrdYlu2^(UVIR%5;lf+A-T$|N*&i6X_
zrBB3HcH`n7ij(~>EB-k1Of{U@^F%w}(f&D_^A!T#RfTPTF0`g7+wD)7$5fVOKPvV1
z#c~|Xiv7cvIKwJGb=`FP*xN53>~P%v`cLM^J4Q?=@4kK6!xS(%q1I;AW#3$;4N?Ej
z*7Ls-Uh_VmO@Fo&Yr@7k>pbQ*y?vC&tR-YH#mP13$p6HwyC<(WbV-D~4t!X0V`_=a
z)#G2M_H0Nxys);6^)F{&?#z!fUM{#hxzRX3d;P)O^NIm%Wh=h1ZIxNTD5=(%uJQQ1
r`z~dhg9fHkJr&g!ECd0&e+<VSrw9C*ee@+T!!UTd`njxgN@xNA4*t$Y

literal 0
HcmV?d00001

diff --git a/src/subpackage/menu/static/images/mine_tab/3.png b/src/subpackage/menu/static/images/mine_tab/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..b203514e3d59bc3dd3a219374d5278f3b696a020
GIT binary patch
literal 1451
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy#<2Ka=y0%;Qy6Js!lkB^72jf{+d
z3{z86h`71AIfMZu;fmoRXoAzHPlrgEnVA9Evu4eLC;+l&&z=n=;a~<B%$zwBs0Ijt
z;t&xa1856`4b%(ddbu&g0v&2v666=mpz=MJMZaZhxagZFJlD=ydmr1dDz$7;d{6Cx
zk9TIsuMyZi>4^00%X8266{MSKJZlcw<?LLy;q7h#1_qV}PZ!6KjC*fqye!*fAkgN^
zA@QwNP*n7F*jBx@cm6M}otePe|E)%KTKyh-Es=9JC-)dP-*|mxW$<#pxl-JgUiVE)
z*YxV>FMN^TEbMYzu6tc#&B2JvzT4-s8~xn<!S6-(k0SNG>n&z}H2>H+<<aTIA3D<N
z1@9N!dEc?lKFmqAU*~PmDc*ShV6ktN7I%XmZPq>QG3{-!jGImBtl2BpD|Q^b+-$17
za8ux0F3ZOu$8CIHs5Uj8ntJXL`xfECWVb67s&=N8t5*Jcv&e?2Wu-tNLu+W(w8;~f
zzg#T0nf>rPmZi_ExIYxHlxS=}Sm#{AzsKS0ksp<;8~L7gyW|=y^lQrgSAP8Mcc<mY
z-@fzOa8UWYnD>NUNrg?GlJ%zX`QM*TJ)CJ<uY8C7YO2|bMlB`>#hm}uGBVFy3$6ST
z|NefuLF3yS0h0zR@0M)|)fW=)v*lfP4a`w6{{6ivvz%4o!%bmL6(_^&#ed4GB1DcB
zn7-ZX_^1Es+kK5ki>7d=b}-(_%G}M%z2~3OZDD3#yVY?YZ@Seo3cs17x?TVNx#bTI
z75ugQsnPZG_m*AyiQmtrG^%wZq;3_fvKHIWuK4@&*7c&ZSq>k`<m;Gu{MHV!`tO`q
znXUG|zn2wf*dS`c&Z1dTDEhx(*5@AyAAgyw+{Sh^q3tZ=Lhi|%nAS||KKf{Jg58Gm
zPxmlcNZt8i)F89pZ1&YTjAFCTKHIQ%=F-j5!i^$dU&|G+J+w7YWSOQvZ&6jP`}Tm#
zZ?lYMt~to~ZRf2!dJ-Ss`?{5~%AN82$`+y9cKA~2x1WKP6I%bw{I1;)68`Sq)$d;n
z;`O{IPe1*%M(Ik%boE)RD|S76b@1=1pm|=24QW4_Q~vNM?Bu(u#>J4B?U4Fay&<MI
z+mYeKskhmhh7P7HXWJE6I3#Jh*Oo0XxF3?<^M20_`Dg9ttC~W1{CStFb11BmaS>a$
zXU04G@0X)$EE~H!bvPJSo;x7@aF_VhkVvD4r)DTQ3osaM+SsYBpEXJJ`>(xq4K9oe
z-1Qk=tAwq+R4}KLS#EEDU~f?H?$u8N#Mo@A6nSl8<g%yDUS=h;JW-9S;tSKF;>?v#
zZlwD^XJb9f`1DErGuD7FjkUU3uRh*2VYBFzS50)tT{2B!#>4QLbuViEN6YmyB$%<e
zC~x!0ex}~sV3mHm?9d4v<K$(h-ab9!z|8IZr!cu8>~#CfZ@;$}uePfRXs|SK>Sf&b
z@5^87Ro`_v(^Bg#+&&v^U3#bezWu9*wyn3=R!X^en*KZ7w06=nhNc`X&B`nOvDr&r
z|LXWDc-rl+?(|QmWPg72Uffi8=*0KEg$ehcD^9KuD%AU7^J9KSSEap!^%jN`E4W`?
z-xHy#%fQi9yCeSlL*5On4T6WZ=-qdUW{_Ahr#kF}Ulc>imE#7oe;BqhIW+P=+~~hK
zPMhK6p&FZw6E89~+z7P%z_z9;ieW|Jk=@t1Q<PW&&T-5QE;A^*V0={W$n_YH{Q?KV
zRXhz7|EXOPZng5S_o`Of^(V;c$wpfSv*eU5><51NG(Nm0<?uQA608V$A-}7Ry-nS0
SMl-N5WAJqKb6Mw<&;$Tb7??2t

literal 0
HcmV?d00001

diff --git a/src/subpackage/menu/static/images/mine_tab/4.png b/src/subpackage/menu/static/images/mine_tab/4.png
new file mode 100644
index 0000000000000000000000000000000000000000..9722c80fff92e30891133635a7544805520e17d2
GIT binary patch
literal 1035
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy$41^9%x0%>DoV-ph-AZcV|G=2K?
z>gsAB8wh}cbLY+lGJt|$0pl4nW<c08XU;S;GXo0Fnl%e32;l;yfNY>3kP9>lNY0rv
z2PgtD9Bv3u0Yng}7pM%#1xf({L@z`!ub0YEpvw$Pg8YIR><@em`o|$RF;dLr%l4nI
z4$QKbc;=(6Ab54^y2AK4{`nmx85x(4H)tB&S^Dto);ib9-y7dBFfe`gba4#Hxc7GY
z%f3|xA`LgATAEJvz2VTvTfFc8>APH$8!xilHkv%!^Vi==%WUKM+vS2A4?irh*w4lj
z+Ty|`5ajHkoDr;TrkZr-hF5eFV@vAhJ;9rEygZ(896cI%jC+Obr$WUxmfzyu-_LbK
zcYUa366-skv*F(I1ljgEoj;?Bw%psR@chQvX|uD}Y97h>y7lFC*|{&LKk4{;uRK-S
zX;$&&X}j(CFV38EGjDg~+0X^gZk2d%fBQtI<W>60FHBqS-{$l^Cv^7RnI#kA7%uxI
zbX{gzsokh#u%N^}_?K(r8P=E&`&p_4YU~4c%|HAvUEqbi!iLRnc0br)|K#s^oz2g=
zzezKEDSYms_u$Rfl?)qho)>v>@0h{4$3Gl5GKud#|1?KJ+JC<Cg}qGgjik=6&|`3E
z|5x6!S$jicY=S$(8m?NK<h@J>uC?blq-^HiW7;>r_wj2vxt|hp+Bp%`YnVF9vqS#v
zU@B{5=8G5oBFwzz+5}&QVrGWJ=Z|xyr2jeP_FT!{=Gl{ieF-a0?h=~EqR?KP6~JrS
zAXxYG@aH#D9FAWZdrF&>`3~_*^L?Cr+(C3h{W3edZN~zxJmPUMTjj9L?11XW=X0JY
z98A4YV|PHbPGWm6ubzX@9}oSix3-_FFJ6!CQu-lT82{#PVSMkRBk5v1Y`<5l%kOD6
zIJWKY{tx}fSYr;b@-R)Zo^`Cq{qi)HaubpJ@>lrw9(b8Q({Pqp#9cEl7k!6ry~^yW
zm8-s*|DAEG;nBZk>wVPuLw`;@bjfu4Enk&q%W{3UM{BJ9;JZ@g`#r^@*P0}>r~L|D
z_vPDXkMi%5Z-O4`t~@DsU!|k}bxl%l{iTpa{85I|)9rTMp279<W9IfrKGN~iw&`9y
z=x**>ow)IEY0REJZF85qF;2$=<5wi#;eK_!@Hi)HmD3WNU^^p?__ja|1BQuDPx<TY
zF8gfrDvD#%mhZwxzppgl$m)zyxXROXWr@|nFCAh#4+yccUAZ--!yr2}fpL|RqLzq-
f3}5@_)qj`^Co{}TiO}r?<{bu4S3j3^P6<r_zYW%S

literal 0
HcmV?d00001

diff --git a/src/subpackage/menu/static/images/mine_tab/5.png b/src/subpackage/menu/static/images/mine_tab/5.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ada9fe8c385a544dd0e8076de9dc67ffe7d83c4
GIT binary patch
literal 942
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy#j1AIbUf%Nq0)91~bXKZY2Vq!7_
z41gjK#;jShAZ(y45C8=s44_J&I1m82rlzJ4#XvzLBO{>5%$YMGf)F(jSs)3N1sdq$
z;*yq@22=)=O-M*+Zf*vO^!D~vR#yJ6{k{<BAdQkBzhH)!9FHUxI-l8Dsr|6v%iAM|
zX2fj{-Qc*wbNQl-<S4b6R?Dl?0wsUGIreIqI|BpL3Qrfukc@k8XTHu`Y#`9Oac4Xi
zi^l?9)$M85mt@}m|4}S;<J^v2$9h(OYW^&|@Uvn12M*q2i(I?K&IVsgn>x$?iL~v^
zms!caThCklp7E=jqp<yin&O(bw^SCVtlNHVN=1@U)W#~GYi4R(T~o79Tyyb!?X$6A
z>Pj|)@GRAwphYW67PBO<?%5M{KkV19LtX()OA6orPxIVV^P00TOTt29PMS=^y!d~A
z9!b5JX*Me<ex6dgNW;AQf^#>&n0YMl(l*^sA0!xFE-lLMyES_f*MF7=RWJWWhrHWR
z=J5Rgy=^@KFWK+>kyJdmi*dgEl{sG>)gM$n{I`ey7Q^?S+`kxD?tCx5&~Di9=4Oq=
zob&vPB|ra}*uFUB0=uR{ba1`b4*7qL=l?k0Hk@T8`Nfg#!TIyq5B^O&&GUBA?h7u8
z`wJvkAN-qh;M2#M^{>AsuS;q9z`~kfRWH{Tb0nC_P2|T5yZ?!y92cG>{tM}oy|h~I
zfvM~h|5n?uYlZw48BKq9k0*y*KQ7Gp=uht<w=?!!42zv+)p!44Fz9~rb8*cT9j0gc
z><yo%Ge7uwn(@P*rwkSUiWqF_Eg9zRmti;^&$l8r;9t=J%_-0MnN&Px+4D3k`Pt0y
z!)I;FPi98;Ta1DK91c{v+jF!2bY^Vyk5_d37jQsvc_PoJ`v2Kd1rDW4=5K9loUNrL
z_<8@I%1aCyRnFVXx^8V3e)hj`rw|kSgIW7ro_>6G_K!X1MMjQqZ<{OZT=*AkV*MBH
z+YtM2s{N}!ri_c8X#bxh5X*31_E)v37{dWUMf2_7w_cX`#n4{+<Gz)RT3qF)*IEaf
zs}mP5+B3K5$hXyO-0xX+m&{VI=oSn5!j!SJ&AKxz%YL88oa<4=r;^IzRzKxD{c-2o
w?^Ejo&b$}zzU9BD^53(lEg2UV#b2<WDVsg5IPpm}Fr71ay85}Sb4q9e0Pg6(U;qFB

literal 0
HcmV?d00001

diff --git a/src/subpackage/menu/static/images/mine_tab/6.png b/src/subpackage/menu/static/images/mine_tab/6.png
new file mode 100644
index 0000000000000000000000000000000000000000..496eed091a780f186d4748f3be9a7c5ebc7c20b8
GIT binary patch
literal 640
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy$41^9%x0%@#ZIvC8HIdjgOIY1^v
z&5Ri{kl8>knn-GDs<E*#L@!Wk)~s2J7A->70yGCG4kUqsZEbB3V~dN6ot>TI;^MNi
zvmsLDGwW6XSq3FRe!&dEt3K>VHea$TREzJ&&r_9G%2e(qxjnl$)8gO1`BOR-**-kH
zd3gUePw|7@+z$?QS8Y?-eV&1VG1Jq<F(l*O+ZnfunhXTmR)=tVK2dO7`ZUFLmF=YO
z^*i~z^ICaco(o9dZ_U=Gzni=9r#wfK0!Pyf<J%|7&E7Id|NndT(ZBA)a_{ULilf{v
zU$3voJzn_d?Qs{!E&06>x$0as$9+ERn5WV3&-&jdv-B4aGhfX~-1qzNBeRQ=%Qno=
zc=0-(H)dm<5+kRF1C!97tqq^Kf)C7`;@PQ@&?>a`i13ouR~!=46izw{u<@*AVr;WY
zuwZ(3)a!b~SCOe31FHC@HJN-gv5(i6y<eaZo6GU}h}(h4i92V#eqMb1Dyx)0gW^_!
z4Gz7Vigj5$*Ya!-Skf!y$}w9^)ZOsbqGMSn9v1psSfX*eRN&Ru)7;0p%Rc@(b;NHI
zm*WB9?ep_z#A@}dZDQSJAKAHCymIEN4qLu-11*cPzu&!H@So#(wBuZ5>-UTLn`1ux
z{~PbZBy?x-0h@C(vlUY1R-QE#G3hsbE_G&>+i4a@0hYv5`r(O}(>|^0)dNMQr>mdK
II;Vst07lFUJ^%m!

literal 0
HcmV?d00001

diff --git a/src/subpackage/message/components/edit/fixed_button.vue b/src/subpackage/message/components/edit/fixed_button.vue
index 612981c..5ddd100 100644
--- a/src/subpackage/message/components/edit/fixed_button.vue
+++ b/src/subpackage/message/components/edit/fixed_button.vue
@@ -18,6 +18,7 @@ export default {
         bottom: 0;
         padding: 10upx 20upx;
         width: 100%;
+        @include isPd(10upx);
         @include ctf(center);
         .fb-btn{
             margin: 0 20upx;
diff --git a/src/subpackage/message/components/edit/info_edit.vue b/src/subpackage/message/components/edit/info_edit.vue
new file mode 100644
index 0000000..80e49ee
--- /dev/null
+++ b/src/subpackage/message/components/edit/info_edit.vue
@@ -0,0 +1,135 @@
+<template>
+    <view class="info-edit">
+        <!-- 门店picker -->
+        <view class="ie-stadium">
+            <view class="ie-title"><text class="it-star">*</text>门店</view>
+            <picker mode="selector">
+                <view class="is-box">
+                    <input type="text" class="ib-ipt" disabled/>
+                    <image class="ib-icon" mode="aspectFit" src="/subpackage/message/static/images/unfold.png"></image>
+                </view>
+            </picker>
+        </view>
+        <!-- 标题 -->
+        <view class="ie-section">
+            <view class="ie-title"><text class="it-star">*</text>标题</view>
+            <input type="text" class="ie-ipt" placeholder="请输入" />
+        </view>
+        <!-- 类型 -->
+        <view class="ie-types">
+            <view class="ie-title"><text class="it-star">*</text>类型</view>
+            <view class="it-ls">
+                <view class="il-item" v-for="(e, i) in ['硬件', '软件']" :key="i">
+                    <view class="ii-icon" :class="{ active: i === 0 }"></view>
+                    <view class="ii-txt">{{ e || '' }}</view>
+                </view>
+            </view>
+        </view>
+        <!-- 反馈内容 -->
+        <view class="ie-section">
+            <view class="ie-title"><text class="it-star">*</text>反馈内容</view>
+            <textarea class="ie-tarea" placeholder="请输入"></textarea>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+    .info-edit{
+        padding: 30upx;
+        border-radius: 20upx;
+        background: #fff;
+        .ie-title{
+            flex-shrink: 0;
+            @include flcw(32upx, 44upx, #1A1A1A, 500);
+            .it-star{
+                color: #EA5061;
+            }
+        }
+        .ie-section{
+            margin-top: 24upx;
+        
+        }
+        .ie-ipt, .ie-tarea{
+            display: block;
+            margin-top: 24upx;
+            padding: 26upx 20upx;
+            border-radius: 16upx;
+            background: #F6F8F9;
+            @include flcw(28upx, 40upx, #1A1A1A);
+        }
+        .ie-tarea{
+            height: 306upx;
+        }
+        .ie-stadium{
+            @include ctf;
+            .ie-title{
+                margin-right: 30upx;
+            }
+            .is-box{
+                padding: 0 22upx;
+                width: 478upx;
+                height: 92upx;
+                border: 2upx solid #979797;
+                border-radius: 16upx;
+                @include ctf;
+                .ib-ipt{
+                    height: 100%;
+                    flex-grow: 1;
+                    @include flcw(28upx, 40upx, #1A1A1A);
+                }
+                .ib-icon{
+                    margin-left: 20upx;
+                    flex-shrink: 0;
+                    width: 28upx;
+                    height: 28upx;
+                }
+            }
+        }
+        .ie-types{
+            margin-top: 24upx;
+            @include ctf;
+            .ie-title{
+                margin-right: 76upx;
+            }
+            .it-ls{
+                @include ctf;
+                .il-item{
+                    width: 200upx;
+                    @include ctf;
+                    .ii-icon{
+                        position: relative;
+                        width: 40upx;
+                        height: 40upx;
+                        border-radius: 50%;
+                        border: 2upx solid #D8D8D8;
+                        &.active{
+                            border-color: $mColor;
+                            &::before{
+                                content: '';
+                                position: absolute;
+                                top: 50%;
+                                left: 50%;
+                                transform: translate(-50%, -50%);
+                                width: 28upx;
+                                height: 28upx;
+                                border-radius: 50%;
+                                background: $mColor;
+                            }
+                        }
+                    }
+                    .ii-txt{
+                        margin-left: 12upx;
+                        @include flcw(28upx, 40upx, #1A1A1A);
+
+                    }
+                }
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/message/components/edit/upload_img.vue b/src/subpackage/message/components/edit/upload_img.vue
index ebdfd04..162457c 100644
--- a/src/subpackage/message/components/edit/upload_img.vue
+++ b/src/subpackage/message/components/edit/upload_img.vue
@@ -4,7 +4,7 @@
         <view class="ui-ls">
             <view class="ul-item" v-for="i in 4" :key="i">
                 <image class="ui-pic"></image>
-                <image class="ui-close"></image>
+                <image class="ui-close" mode="aspectFit" src="/subpackage/message/static/images/close.png"></image>
             </view>
             <view class="ul-item ul-add">
                 <view class="ua-icon"></view>
@@ -38,7 +38,7 @@ export default {
             font-size: 0;
             .ul-item{
                 position: relative;
-                margin: 0 12upx;
+                margin: 0 10upx;
                 vertical-align: top;
                 display: inline-block;
                 width: 200upx;
@@ -58,7 +58,6 @@ export default {
                     right: 6upx;
                     width: 40upx;
                     height: 40upx;
-                    background: darkblue;
                 }
             }
             .ul-add{
diff --git a/src/subpackage/message/pages/complaint/edit.vue b/src/subpackage/message/pages/complaint/edit.vue
index e840ec0..cfce4fe 100644
--- a/src/subpackage/message/pages/complaint/edit.vue
+++ b/src/subpackage/message/pages/complaint/edit.vue
@@ -1,15 +1,19 @@
 <template>
     <view class="complaint-edit">
+        <info-edit></info-edit>
+        <view style="height: 24rpx;"></view>
         <upload-img></upload-img>
         <fixed-button></fixed-button>
     </view>
 </template>
 
 <script>
+import infoEdit from "../../components/edit/info_edit.vue";
 import uploadImg from "../../components/edit/upload_img.vue";
 import fixedButton from "../../components/edit/fixed_button.vue";
 export default {
     components: {
+        infoEdit,
         uploadImg,
         fixedButton,
     },
@@ -19,6 +23,6 @@ export default {
 <style lang="scss">
     .complaint-edit{
         padding: 24upx;
-        @include isPd(110upx);
+        @include isPd(120upx);
     }
 </style>
\ No newline at end of file
diff --git a/src/subpackage/message/static/images/close.png b/src/subpackage/message/static/images/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..38445233e69e8adf669d4c5af865429d10e1203f
GIT binary patch
literal 401
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU3?z3ec*FxKn*g5>S0GI`xS+3Q0Msm8666=m
zAh4$Ir_`rOT<<QNKeBahNvx;FmxqQofYKj5T^vI!PPa^m7Hd}EaY=S?aTU1vKW_Dn
za~Z3@{(Gvjv+_iznYwIM_HW1Fyr+HFSi&2)pY1B?T;Y@(^Q65}N4)3r_bcn}T$uZ;
zdh1iR)&Cw`{=~j?bMyO4Hy`$WI`Df@st$k8@99e4=k>kp6hBtgd021XMW!tuZ`{rO
zE|Idwqxpo%?dt+-4>bg4d)fJ|Wenq7`=r)r@-nF#A%&4bOiOM$P1?}y_p9O50S3Px
zClqX%EgmZGeXz3RlKY$08?AOQGB7wQZ2NyLc457+@}Y~(dw2C`Rz`iOOPrmQd+pd=
tjglQ^>$n@-yqsTc{H{=IV*h5h9Yc1AkLUVpulPU#>*?y}vd$@?2>>_tn)m<!

literal 0
HcmV?d00001

diff --git a/src/subpackage/message/static/images/unfold.png b/src/subpackage/message/static/images/unfold.png
new file mode 100644
index 0000000000000000000000000000000000000000..54561422190022d22b626625feb1347ecd695ca3
GIT binary patch
literal 288
zcmeAS@N?(olHy`uVBq!ia0vp^G9b*s3?yAI>n{UR9sxcfu0VPd7;N6WdCQh9KoZD<
zkUMwogh)X|Ac7k=ZiJ{r76h{As<fU5nk8Nm<QL5Feojb%{<mWfMZ40c2CB;N?pZm%
zsUh~6#i=tuB?X=?jv*T7ub%egYfunyxp<6GRHk6f@B1MaU4^ye8uqVR@@dJ2wC8CL
zmtAD%w7#(Q%T=~(r!O(S_`Kba!A+2TMJW4>myuIzbKm*MJ`bohEB2j}b#tPx%*`Vc
xQ<r}WIWG3<#;WAieYY8^Px_zUSf#m5`pW~(O=8vawgK&C@O1TaS?83{1OQIFhbRC5

literal 0
HcmV?d00001


From 7923fea0db3be2c020de47731519caeaeecd85a9 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Mon, 20 Jan 2025 18:27:08 +0800
Subject: [PATCH 16/30] add tid1807 logic

---
 src/pages.json                                     |  16 +++-
 src/pages/menu/forth.vue                           |  10 +-
 src/store/actions.js                               |  33 ++++++-
 .../message/components/edit/fixed_button.vue       |   4 +-
 .../message/components/edit/info_edit.vue          |  78 ++++++++++++++--
 .../message/components/edit/upload_img.vue         | 104 +++++++++++++++++++--
 src/subpackage/message/components/fixed_button.vue |   2 +-
 src/subpackage/message/components/message_item.vue |  21 ++++-
 src/subpackage/message/js/api.js                   |  11 +++
 src/subpackage/message/js/server.js                |   9 ++
 src/subpackage/message/pages/complaint/edit.vue    |  73 +++++++++++++--
 src/subpackage/message/pages/complaint/list.vue    |  62 +++++++++++-
 src/subpackage/message/pages/work_order/edit.vue   |  99 ++++++++++++++++++++
 13 files changed, 484 insertions(+), 38 deletions(-)
 create mode 100644 src/subpackage/message/js/api.js
 create mode 100644 src/subpackage/message/js/server.js
 create mode 100644 src/subpackage/message/pages/work_order/edit.vue

diff --git a/src/pages.json b/src/pages.json
index a118cdf..678e51a 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1,6 +1,10 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
+			"path": "pages/index/index",
+			"style": { }
+		},
+		{
 			"path": "pages/menu/forth",
 			"style": {
 				"navigationBarTitleText": "个人中心",
@@ -11,11 +15,7 @@
 				}
 			}
 		},	
-		{
-			"path": "pages/index/index",
-			"style": {
-			}
-		},
+		
 		{
 			"path": "pages/login/login",
 			"style": {
@@ -932,6 +932,12 @@
 					"style" : {
 						"navigationBarTitleText": "投诉详情" 
 					}
+				},
+				{
+					"path": "pages/work_order/edit",
+					"style" : {
+						"navigationBarTitleText": "提交工单" 
+					}
 				}
 			]
 		},
diff --git a/src/pages/menu/forth.vue b/src/pages/menu/forth.vue
index aefd4df..637ab5c 100644
--- a/src/pages/menu/forth.vue
+++ b/src/pages/menu/forth.vue
@@ -13,7 +13,12 @@
             </line-tab>
             <line-tab :icon-num='1'>帮助中心</line-tab>
             <line-tab :icon-num='2'>教练助手</line-tab>
-            <line-tab :icon-num='3'>收银系统</line-tab>
+            <line-tab :icon-num='3'>
+                <template slot="default">收银系统</template>
+                <template slot="right">
+                    <view class="fm-copy">(复制网址)</view>
+                </template>
+            </line-tab>
             <line-tab :icon-num='4'>总后台(<text class="fm-txt">admin.ouxuanzhineng.cn <text class="ft-copy">复制</text></text>)</line-tab>
             <line-tab :icon-num='5'>投诉建议</line-tab>
             <line-tab :icon-num='6'>解绑退出</line-tab>
@@ -63,4 +68,7 @@ export default {
             height: 30upx;
         }
     }
+    .fm-copy{
+        @include flcw(32upx, 44upx, $mColor);
+    }
 </style>
\ No newline at end of file
diff --git a/src/store/actions.js b/src/store/actions.js
index d0cf110..2babf68 100644
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -1,6 +1,8 @@
 // 异步方法
 import { servers } from '../js/server';
 import { API } from '../js/api';
+import { showLoad, hideLoad, showModal } from '../utils/util';
+
 export default {
     getBrandInfo({commit, state}){
         if(state?.brandInfo?.brand?.id)return Promise.resolve(state.brandInfo);
@@ -24,5 +26,34 @@ export default {
         .catch(err=>{
             console.warn('actions getOrderRefundList err -->', err);
         })
-    }
+    },
+
+    // 获取门店列表
+    getStadiumLs({ commit, state }, brand_id){
+        showLoad();
+        return servers.post({
+            url: API.stadiumList,
+            data: { page_size: 9999, page: 1, brand_id },
+            isDefaultGet: false,
+        })
+        .then(res => {
+            hideLoad();
+            let _data = res?.data || {};
+            if(_data.code === 0){
+                let _ls = _data?.data?.list || [];
+                return _ls;
+            }else{
+                return Promise.reject(_data);
+            }
+        })
+        .catch(err => {
+            hideLoad();
+            showModal({
+                title: '提示',
+                content: err.message || '加载店铺失败！'
+            })
+            console.warn('store actions getStadiumLs err --->', err);
+            // return Promise.reject(err);
+        })
+    },
 }
\ No newline at end of file
diff --git a/src/subpackage/message/components/edit/fixed_button.vue b/src/subpackage/message/components/edit/fixed_button.vue
index 5ddd100..fa8b4e1 100644
--- a/src/subpackage/message/components/edit/fixed_button.vue
+++ b/src/subpackage/message/components/edit/fixed_button.vue
@@ -1,7 +1,7 @@
 <template>
     <view class="fixed-button">
-        <button class="fb-btn">取消</button>
-        <button class="fb-btn">提交</button>
+        <button class="fb-btn" @click="$emit('click:cancel')">取消</button>
+        <button class="fb-btn" @click="$emit('click:submit')">提交</button>
     </view>
 </template>
 
diff --git a/src/subpackage/message/components/edit/info_edit.vue b/src/subpackage/message/components/edit/info_edit.vue
index 80e49ee..63f54eb 100644
--- a/src/subpackage/message/components/edit/info_edit.vue
+++ b/src/subpackage/message/components/edit/info_edit.vue
@@ -1,11 +1,11 @@
 <template>
     <view class="info-edit">
         <!-- 门店picker -->
-        <view class="ie-stadium">
+        <view class="ie-stadium" v-if="isStadium">
             <view class="ie-title"><text class="it-star">*</text>门店</view>
-            <picker mode="selector">
+            <picker mode="selector" :range="stadiumList" range-key="name" @change="stadiumChange">
                 <view class="is-box">
-                    <input type="text" class="ib-ipt" disabled/>
+                    <input type="text" class="ib-ipt" placeholder="请选择门店" :value="fromData.curStadium.name || ''" disabled/>
                     <image class="ib-icon" mode="aspectFit" src="/subpackage/message/static/images/unfold.png"></image>
                 </view>
             </picker>
@@ -13,14 +13,14 @@
         <!-- 标题 -->
         <view class="ie-section">
             <view class="ie-title"><text class="it-star">*</text>标题</view>
-            <input type="text" class="ie-ipt" placeholder="请输入" />
+            <input type="text" class="ie-ipt" placeholder="请输入"  v-model="fromData.titleStr" />
         </view>
         <!-- 类型 -->
-        <view class="ie-types">
+        <view class="ie-types" v-if="isStadium">
             <view class="ie-title"><text class="it-star">*</text>类型</view>
             <view class="it-ls">
-                <view class="il-item" v-for="(e, i) in ['硬件', '软件']" :key="i">
-                    <view class="ii-icon" :class="{ active: i === 0 }"></view>
+                <view class="il-item" v-for="(e, i) in ['硬件', '软件']" :key="i" @click="fromData.typeStr = e">
+                    <view class="ii-icon" :class="{ 'active': e === fromData.typeStr }"></view>
                     <view class="ii-txt">{{ e || '' }}</view>
                 </view>
             </view>
@@ -28,14 +28,73 @@
         <!-- 反馈内容 -->
         <view class="ie-section">
             <view class="ie-title"><text class="it-star">*</text>反馈内容</view>
-            <textarea class="ie-tarea" placeholder="请输入"></textarea>
+            <textarea class="ie-tarea" placeholder="请输入" v-model="fromData.feedbackStr"></textarea>
         </view>
     </view>
 </template>
 
 <script>
+import { showNone } from "@/utils/util"
 export default {
-
+    props: {
+        isStadium: {
+            type: Boolean,
+            default: false
+        },
+        isType: {
+            type: Boolean,
+            default: false
+        }
+    },
+    data(){
+        return {
+            stadiumList: [],
+            fromData: {
+                curStadium: {},
+                titleStr: '',
+                typeStr: '硬件',
+                feedbackStr: '',
+            },
+        }
+    },
+    methods: {
+        async initStadiumLs({ brand_id, stadium_id }){
+            let _stadiums = await this.$store?.dispatch?.('getStadiumLs', brand_id);
+            if(_stadiums.length > 0)this.stadiumList = _stadiums ?? [];
+            if(stadium_id){
+                let _curStadium = _stadiums.find(item => item.id === stadium_id);
+                if(_curStadium?.id)this.fromData.curStadium = _curStadium;
+            }
+        },
+        stadiumChange(e){
+            let { value } = e.detail;
+            if(value === -1)return;
+            this.fromData.curStadium = this.stadiumList[value];
+        },
+        async getData(){
+            let { fromData, isStadium, isType } = this;
+            let { curStadium, titleStr, typeStr, feedbackStr } = fromData;
+            if(titleStr === ''){
+                showNone('请输入标题');
+                return Promise.reject('请输入标题');
+            }
+            if(feedbackStr === ''){
+                showNone('请输入反馈内容');
+                return Promise.reject('请输入反馈内容');
+            }
+            if(isStadium&&!curStadium?.id){
+                showNone('请选择门店');
+                return Promise.reject('请选择门店');
+            }
+            let _data = {
+                title: titleStr,
+                content: feedbackStr,
+            }
+            if(isType)_data['type'] = typeStr;
+            if(isStadium)_data['stadium_id'] = curStadium.id;
+            return _data;
+        }
+    }
 }
 </script>
 
@@ -65,6 +124,7 @@ export default {
         }
         .ie-tarea{
             height: 306upx;
+            width: auto;
         }
         .ie-stadium{
             @include ctf;
diff --git a/src/subpackage/message/components/edit/upload_img.vue b/src/subpackage/message/components/edit/upload_img.vue
index 162457c..c410911 100644
--- a/src/subpackage/message/components/edit/upload_img.vue
+++ b/src/subpackage/message/components/edit/upload_img.vue
@@ -1,12 +1,12 @@
 <template>
     <view class="upload-img">
-        <view class="ui-title">上传照片<text class="ut-txt">(最多上传3张，只支持.jpg、png 格式)</text></view>
+        <view class="ui-title">上传照片<text class="ut-txt">(最多上传{{ max }}张，只支持.jpg、png 格式)</text></view>
         <view class="ui-ls">
-            <view class="ul-item" v-for="i in 4" :key="i">
-                <image class="ui-pic"></image>
-                <image class="ui-close" mode="aspectFit" src="/subpackage/message/static/images/close.png"></image>
+            <view class="ul-item" v-for="(e, i) in imgTemLs" :key="i">
+                <image class="ui-pic" @click="previewImg(e)" mode="aspectFit" :src="e"></image>
+                <image class="ui-close" @click="delImg(i)" mode="aspectFit" src="/subpackage/message/static/images/close.png"></image>
             </view>
-            <view class="ul-item ul-add">
+            <view class="ul-item ul-add" @click="chooseImg" v-if="max > imgTemLs.length">
                 <view class="ua-icon"></view>
                 <view class="ua-txt">上传照片</view>
             </view>
@@ -15,8 +15,101 @@
 </template>
 
 <script>
+import { showModal, jsonPar, showLoad, hideLoad, promisify } from "@/utils/util";
+import server from "../../js/server";
+import { MESSAGE_API } from "../../js/api";
 export default {
+    props: {
+        max: {
+            type: Number,
+            default: 3
+        }
+    },
+    data(){
+        return {
+            imgTemLs: [],
+        }
+    },
+    methods: {
+        chooseImg(){
+            uni.chooseImage({
+                count: 3,
+                sourceType: ['album', 'camera'],
+                success: (res) => {
+                    let { imgTemLs } = this;
+                    if(imgTemLs.length >= 3)return showModal({ content: '最多上传3张图片！' });
+                    this.imgTemLs = imgTemLs.concat(res.tempFilePaths);
+                }
+            });
+        },
+        delImg(idx){
+            this.imgTemLs.splice(idx, 1);
+        },
+        previewImg(url){
+            uni.previewImage({ urls: this.imgTemLs, current: url });
+        },
+        async getUrls(){
+            try{
+                let _urls = [];
+                let { imgTemLs } = this;
+                showLoad('图片上传中...');
+                for(let i = 0; i < imgTemLs?.length; i++){
+                    let _url = await this.uploadImg(imgTemLs[i]);
+                    if(_url !== '')_urls.push(_url);
+                }
+
+                if(_urls?.length < imgTemLs?.length){
+                    let _showModal = promisify(showModal);
+                    hideLoad();
+                    if(_urls?.length === 0){
+                        return _showModal({ content: '图片上传失败，请稍后重试' })
+                        .then(_=>Promise.reject('全部图片上传失败'));
+                    }
 
+                    let _diffVal = imgTemLs?.length - _urls?.length;
+                    return _showModal({
+                        content: `${_diffVal}张图片上传失败`,
+                        showCancel: true,
+                        cancelText: '重试',
+                        confirmText: '继续提交',
+                    })
+                    .then(res=>{
+                        if(res.confirm)return { temps: imgTemLs, urls: _urls };
+                        return Promise.reject(res);
+                    })
+                }
+                hideLoad();
+                return {
+                    temps: imgTemLs,
+                    urls: _urls,
+                };
+            }catch(err){
+                hideLoad();
+                console.warn('message components edit upload_img getUrls err --->', err)
+            }
+        },
+        async uploadImg(url){
+            try{
+                let _imgInfo = await server.uploadFile({
+                    url: MESSAGE_API.zs_message_imgs,
+                    filePath: url,
+                });
+                if(_imgInfo.statusCode != 200)throw(_imgInfo);
+                let _imgRes = jsonPar(_imgInfo.data);
+                if(_imgRes.code != 0)throw(_imgRes);
+                return _imgRes?.data?.url ?? '';
+            }catch(err){
+                // showModal({
+                //     titile: '提示',
+                //     content: err?.errMsg ?? err?.message ?? '上传图片失败！'
+                // });
+                console.warn('message components edit upload_img uploadImg err --->', err)
+                // return Promise.reject(err);
+                return '';
+            }
+        },
+
+    }
 }
 </script>
 
@@ -50,7 +143,6 @@ export default {
                     width: 100%;
                     height: 100%;
                     border-radius: 10upx;
-                    background: skyblue;
                 }
                 .ui-close{
                     position: absolute;
diff --git a/src/subpackage/message/components/fixed_button.vue b/src/subpackage/message/components/fixed_button.vue
index 513eff5..5a301eb 100644
--- a/src/subpackage/message/components/fixed_button.vue
+++ b/src/subpackage/message/components/fixed_button.vue
@@ -1,6 +1,6 @@
 <template>
     <view class="fixed-button">
-        <button class="fb-btn" hover-class="hover-active">新建投诉</button>
+        <button class="fb-btn" hover-class="hover-active" @click="$emit('click')">新建投诉</button>
     </view>
 </template>
 
diff --git a/src/subpackage/message/components/message_item.vue b/src/subpackage/message/components/message_item.vue
index 24abe22..40bdf5b 100644
--- a/src/subpackage/message/components/message_item.vue
+++ b/src/subpackage/message/components/message_item.vue
@@ -4,10 +4,10 @@
         <view class="mi-content">
             <view class="mc-info">
                 <view class="mi-top">
-                    <view class="mt-title">标题</view>
-                    <view class="mt-tag">返回的状态</view>
+                    <view class="mt-title">{{ title || '-' }}</view>
+                    <view class="mt-tag" v-if="status">{{ status || '-' }}</view>
                 </view>
-                <view class="mi-content">巴拉巴拉巴拉....</view>
+                <view class="mi-content">{{ content || '-' }}</view>
             </view>
             <image class="mc-arrow"></image>
         </view>
@@ -16,7 +16,20 @@
 
 <script>
 export default {
-
+    props: {
+        title: {
+            type: String,
+            default: ''
+        },
+        status: {
+            type: String,
+            default: ''
+        },
+        content: {
+            type: String,
+            default: ''
+        }
+    },
 }
 </script>
 
diff --git a/src/subpackage/message/js/api.js b/src/subpackage/message/js/api.js
new file mode 100644
index 0000000..a8137d6
--- /dev/null
+++ b/src/subpackage/message/js/api.js
@@ -0,0 +1,11 @@
+import { ORIGIN } from '@/js/api';
+
+export const MESSAGE_API = {
+    zs_message_imgs:`${ORIGIN}/upload/file/zs_message_imgs`,  // 投诉/工单图片
+    complaintSubmit:`${ORIGIN}/admin/assistant/complaint/submit`,  // 投诉提交
+    complaintList:`${ORIGIN}/admin/assistant/complaint/list`,  // 投诉列表
+    workorderSubmit:`${ORIGIN}/admin/assistant/workorder/submit`,  // 工单提交
+}
+
+
+export default { ORIGIN, MESSAGE_API };
\ No newline at end of file
diff --git a/src/subpackage/message/js/server.js b/src/subpackage/message/js/server.js
new file mode 100644
index 0000000..c06aecb
--- /dev/null
+++ b/src/subpackage/message/js/server.js
@@ -0,0 +1,9 @@
+import { Server } from '@/js/server';
+
+class _server extends Server {
+    constructor(props){
+        super(props)
+    }
+}
+
+export default new _server();
\ No newline at end of file
diff --git a/src/subpackage/message/pages/complaint/edit.vue b/src/subpackage/message/pages/complaint/edit.vue
index cfce4fe..b0a409e 100644
--- a/src/subpackage/message/pages/complaint/edit.vue
+++ b/src/subpackage/message/pages/complaint/edit.vue
@@ -1,9 +1,12 @@
 <template>
     <view class="complaint-edit">
-        <info-edit></info-edit>
+        <info-edit ref="infoEdit"></info-edit>
         <view style="height: 24rpx;"></view>
-        <upload-img></upload-img>
-        <fixed-button></fixed-button>
+        <upload-img ref="uploadImg"></upload-img>
+        <fixed-button
+            @click:cancel="cancelBtn"
+            @click:submit="submitBtn"
+        ></fixed-button>
     </view>
 </template>
 
@@ -11,12 +14,68 @@
 import infoEdit from "../../components/edit/info_edit.vue";
 import uploadImg from "../../components/edit/upload_img.vue";
 import fixedButton from "../../components/edit/fixed_button.vue";
+import { routeTo, debounce, showLoad, hideLoad, showModal, showNone } from "@/utils/util.js";
+import { MESSAGE_API } from "../../js/api.js";
+import server from "../../js/server.js";
 export default {
-    components: {
-        infoEdit,
-        uploadImg,
-        fixedButton,
+    components: { infoEdit, uploadImg, fixedButton },
+    data() {
+        return {
+            brand_id: '',   
+        }
     },
+    onLoad(options) {
+        let _bid = options?.brand_id ?? '';
+        this.brand_id = _bid;
+    },
+    methods: {
+        cancelBtn: routeTo,
+        submitBtn: debounce(async function(){
+            try{
+                let { brand_id } = this;
+                let _infoData = await this.$refs?.infoEdit?.getData?.();
+                let { urls, temps } = await this.$refs?.uploadImg?.getUrls?.();
+                this.complaintSubmit({
+                    brand_id,
+                    title: _infoData?.title ?? '',
+                    content: _infoData?.content ?? '',
+                    showimgs: urls ?? [],
+                })
+            }catch(err){
+                hideLoad();
+                console.warn('subpackage message pages complaint edit submitBtn err --->', err);
+            }
+        }, 300, true),
+
+        // 投诉提交
+        complaintSubmit({ brand_id, title = '', content = '', showimgs = [] }){
+			showLoad();
+            return server.post({
+                url: MESSAGE_API.complaintSubmit,
+                data: { brand_id: +brand_id, title, content, showimgs },
+                isDefaultGet: false,
+            })
+            .then(res => {
+				hideLoad();
+                let _data = res?.data || {};
+                if(_data.code === 0){
+                    showNone(_data?.message ?? '操作成功！');
+                    setTimeout(routeTo, 1000);
+                }else{
+                    return Promise.reject(_data);
+                }
+            })
+            .catch(err => {
+                hideLoad();
+                showModal({
+                    title: '提示',
+                    content: err.message || '操作失败！'
+                })
+                console.warn('subpackage message pages complaint edit complaintSubmit err --->', err);
+				// return Promise.reject(err);
+            })
+		},
+    }
 }
 </script>
 
diff --git a/src/subpackage/message/pages/complaint/list.vue b/src/subpackage/message/pages/complaint/list.vue
index 69249c9..d491087 100644
--- a/src/subpackage/message/pages/complaint/list.vue
+++ b/src/subpackage/message/pages/complaint/list.vue
@@ -1,20 +1,78 @@
 <template>
     <view class="complaint-list">
         <view class="cl-ls">
-            <message-item></message-item>
+            <block v-for="(e, i) in listData" :key="i">
+                <message-item
+                    :title="e.title"
+                    :status="e.status"
+                    :content="e.content"
+                ></message-item>
+                <view style="height: 24rpx;"></view>
+            </block>
         </view>
-        <fixed-button></fixed-button>
+        <fixed-button @click="clickBtn"></fixed-button>
     </view>
 </template>
 
 <script>
 import fixedButton from "../../components/fixed_button.vue";
 import messageItem from "../../components/message_item.vue";
+import { routeTo, debounce, showLoad, hideLoad, showModal, showNone } from "@/utils/util.js";
+import { MESSAGE_API } from "../../js/api.js";
+import server from "../../js/server.js";
 export default {
     components: {
         fixedButton,
         messageItem,
     },
+    data(){
+        return {
+            brand_id: '',
+            listData: [],
+        }
+    },
+    onLoad(options){
+        let _bid = options?.brand_id ?? '';
+        this.brand_id = _bid;
+        this.complaintList({ brand_id: _bid });
+    },
+    methods: {
+        clickBtn(){
+            let { brand_id } = this;
+            routeTo(`/subpackage/message/pages/complaint/edit?brand_id=${brand_id ?? ''}`, 'nT');
+        },
+        complaintList({ brand_id, page = 1, page_size = 20}){
+			showLoad();
+            return server.post({
+                url: MESSAGE_API.complaintList,
+                data: { brand_id: +brand_id, page, page_size },
+                isDefaultGet: false,
+            })
+            .then(res => {
+				hideLoad();
+                let _data = res?.data || {};
+                if(_data.code === 0){
+                    let _ls = _data?.data ?? [];
+                    if(page === 1)return this.listData = _ls;
+                    if(!_ls.length)return showNone('没有更多！');
+                    this.page = page;
+                    this.listData = [ ...this.listData, ..._ls ];
+					return _ls;
+                }else{
+                    return Promise.reject(_data);
+                }
+            })
+            .catch(err => {
+                hideLoad();
+                showModal({
+                    title: '提示',
+                    content: err.message || '加载失败！'
+                })
+                console.warn('subpackage message pages complaint list complaintList err --->', err);
+				// return Promise.reject(err);
+            })
+		},
+    }
 }
 </script>
 
diff --git a/src/subpackage/message/pages/work_order/edit.vue b/src/subpackage/message/pages/work_order/edit.vue
new file mode 100644
index 0000000..7863694
--- /dev/null
+++ b/src/subpackage/message/pages/work_order/edit.vue
@@ -0,0 +1,99 @@
+<template>
+    <view class="work-order-edit">
+        <info-edit 
+            ref="infoEdit"
+            is-stadium
+            is-type
+        ></info-edit>
+        <view style="height: 24rpx;"></view>
+        <upload-img ref="uploadImg"></upload-img>
+        <fixed-button
+            @click:cancel="cancelBtn"
+            @click:submit="submitBtn"
+        ></fixed-button>
+    </view>
+</template>
+
+<script>
+import infoEdit from "../../components/edit/info_edit.vue";
+import uploadImg from "../../components/edit/upload_img.vue";
+import fixedButton from "../../components/edit/fixed_button.vue";
+import { routeTo, debounce, showLoad, hideLoad, showModal, showNone } from "@/utils/util.js";
+import { MESSAGE_API } from "../../js/api.js";
+import server from "../../js/server.js";
+export default {
+    components: { infoEdit, uploadImg, fixedButton },
+    data() {
+        return {
+            brand_id: '',   
+        }
+    },
+    onLoad(options) {
+        let _bid = options?.brand_id ?? '';
+        this.brand_id = _bid;
+        this.$nextTick(_=>{
+            this.$refs?.infoEdit?.initStadiumLs?.({ 
+                brand_id: _bid,
+                stadium_id: +(options?.stadium_id ?? '')
+            });
+        })
+    },
+    methods: {
+        cancelBtn: routeTo,
+        submitBtn: debounce(async function(){
+            try{
+                let { brand_id } = this;
+                let _infoData = await this.$refs?.infoEdit?.getData?.();
+                let { urls, temps } = await this.$refs?.uploadImg?.getUrls?.();
+                this.workorderSubmit({
+                    brand_id,
+                    stadium_id: _infoData?.stadium_id ?? '',
+                    type: _infoData?.type ?? '',
+                    title: _infoData?.title ?? '',
+                    content: _infoData?.content ?? '',
+                    showimgs: urls ?? [],
+                })
+            }catch(err){
+                hideLoad();
+                console.warn('subpackage message pages work order edit submitBtn err --->', err);
+            }
+        }, 300, true),
+
+        // 投诉提交
+        workorderSubmit({ brand_id, stadium_id, type,  title = '', content = '', showimgs = [] }){
+			showLoad();
+            return server.post({
+                url: MESSAGE_API.workorderSubmit,
+                data: { brand_id: +brand_id, stadium_id, type, title, content, showimgs },
+                isDefaultGet: false,
+            })
+            .then(res => {
+				hideLoad();
+                let _data = res?.data || {};
+                if(_data.code === 0){
+                    showNone(_data?.message ?? '操作成功！');
+                    setTimeout(routeTo, 1000);
+                }else{
+                    return Promise.reject(_data);
+                }
+            })
+            .catch(err => {
+                hideLoad();
+                showModal({
+                    title: '提示',
+                    content: err.message || '操作失败！'
+                })
+                console.warn('subpackage message pages work order edit workorderSubmit err --->', err);
+				// return Promise.reject(err);
+            })
+		},
+    }
+}
+</script>
+
+<style lang="scss">
+    .work-order-edit{
+        padding: 24upx;
+        @include isPd(120upx);
+    }
+</style>
\ No newline at end of file

From 47407c13b22e8dcfcb84a0eb6bb8831f300624ef Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Tue, 21 Jan 2025 18:27:11 +0800
Subject: [PATCH 17/30] add tid1807 logic

---
 src/manifest.json                                  |   4 +-
 src/pages.json                                     |  39 ++++-
 src/pages/index/index.vue                          |   5 +
 src/pages/menu/forth.vue                           |  13 +-
 src/static/images/tab/ta_1.png                     | Bin 0 -> 558 bytes
 src/static/images/tab/ta_2.png                     | Bin 0 -> 795 bytes
 src/static/images/tab/ta_3.png                     | Bin 0 -> 726 bytes
 src/static/images/tab/ta_4.png                     | Bin 0 -> 553 bytes
 src/static/images/tab/tab_1.png                    | Bin 0 -> 653 bytes
 src/static/images/tab/tab_2.png                    | Bin 0 -> 986 bytes
 src/static/images/tab/tab_3.png                    | Bin 0 -> 939 bytes
 src/static/images/tab/tab_4.png                    | Bin 0 -> 668 bytes
 src/subpackage/menu/components/mine/line_tab.vue   |   2 +-
 .../message/components/detail/answer_item.vue      |  30 +++-
 .../message/components/detail/image_flow.vue       |  27 +++-
 src/subpackage/message/components/detail/info.vue  |  26 +++-
 .../message/components/edit/upload_img.vue         |   2 +-
 src/subpackage/message/components/fixed_button.vue |   1 +
 src/subpackage/message/components/message_item.vue |  12 +-
 src/subpackage/message/js/api.js                   |   5 +
 src/subpackage/message/pages/complaint/detail.vue  | 138 ++++++++++++++++-
 src/subpackage/message/pages/complaint/list.vue    |  18 +++
 src/subpackage/message/pages/work_order/detail.vue | 171 +++++++++++++++++++++
 src/subpackage/message/pages/work_order/list.vue   | 105 +++++++++++++
 src/subpackage/message/static/images/arrow_b2.png  | Bin 0 -> 226 bytes
 src/subpackage/message/static/images/message.png   | Bin 0 -> 959 bytes
 src/utils/util.js                                  |   8 +-
 27 files changed, 571 insertions(+), 35 deletions(-)
 create mode 100644 src/static/images/tab/ta_1.png
 create mode 100644 src/static/images/tab/ta_2.png
 create mode 100644 src/static/images/tab/ta_3.png
 create mode 100644 src/static/images/tab/ta_4.png
 create mode 100644 src/static/images/tab/tab_1.png
 create mode 100644 src/static/images/tab/tab_2.png
 create mode 100644 src/static/images/tab/tab_3.png
 create mode 100644 src/static/images/tab/tab_4.png
 create mode 100644 src/subpackage/message/pages/work_order/detail.vue
 create mode 100644 src/subpackage/message/pages/work_order/list.vue
 create mode 100644 src/subpackage/message/static/images/arrow_b2.png
 create mode 100644 src/subpackage/message/static/images/message.png

diff --git a/src/manifest.json b/src/manifest.json
index d409cc9..7ac6737 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -76,7 +76,9 @@
         "appid" : "wx7106e84614cf0060",
         "setting" : {
             "urlCheck" : false,
-            "minified" : true
+            "minified" : true,
+            "ignoreDevUnusedFiles": false,
+            "ignoreUploadUnusedFiles": false
         },
         "usingComponents" : true,
         "optimization": {
diff --git a/src/pages.json b/src/pages.json
index 678e51a..5e5e3a7 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -2,7 +2,11 @@
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
 			"path": "pages/index/index",
-			"style": { }
+			"style": {
+				"componentPlaceholder": {
+					"bottom-logo": "view"
+				}
+			}
 		},
 		{
 			"path": "pages/menu/forth",
@@ -924,6 +928,7 @@
 				{
 					"path": "pages/complaint/list",
 					"style" : {
+						"enablePullDownRefresh" : true,
 						"navigationBarTitleText": "投诉建议" 
 					}
 				},
@@ -934,6 +939,19 @@
 					}
 				},
 				{
+					"path": "pages/work_order/list",
+					"style" : {
+						"enablePullDownRefresh" : true,
+						"navigationBarTitleText": "工单列表" 
+					}
+				},
+				{
+					"path": "pages/work_order/detail",
+					"style" : {
+						"navigationBarTitleText": "工单详情" 
+					}
+				},
+				{
 					"path": "pages/work_order/edit",
 					"style" : {
 						"navigationBarTitleText": "提交工单" 
@@ -958,5 +976,24 @@
 		"navigationBarTitleText": "欧轩智能商家助手",
 		"navigationBarBackgroundColor": "#009874",
 		"backgroundColor": "#f2f2f7"
+	},
+	"tabBar": {
+		"color": "#B2B2B2",
+		"selectedColor": "#009874",
+		"backgroundColor": "#FFFFFF",
+		"list": [
+			{
+				"pagePath": "pages/index/index",
+				"text": "工作台",
+				"iconPath": "static/images/tab/tab_1.png",
+				"selectedIconPath": "static/images/tab/ta_1.png"
+			},
+			{
+				"pagePath": "pages/menu/forth",
+				"text": "我的",
+				"iconPath": "static/images/tab/tab_4.png",
+				"selectedIconPath": "static/images/tab/ta_4.png"
+			}
+		]
 	}
 }
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index bca99c3..848b883 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -49,6 +49,9 @@
 				<navigator url="/subpackage/party/pages/login/login">party/pages/login/login</navigator>
 			</view> -->
 		</view>
+		
+		<bottom-logo></bottom-logo>
+
 		<view class="ox-dark-mask" v-if="isShowAuthorModal">
 			<view class="ic-author-modal">
 				<view class="iam-title">微信授权</view>
@@ -88,6 +91,7 @@
 	import util from '../../utils/util';
 	import { servers } from '../../js/server';
 	import { API } from '../../js/api';
+	import bottomLogo from "@/subpackage/menu/components/bottom_logo.vue";
 	const tabList = [
 		{
 			id: 0,
@@ -187,6 +191,7 @@
 	// #endif
 	
 	export default {
+		components: { bottomLogo },
 		computed: {
 			isProfile: _=>util.isProfile(),
 			// loginStatus(){
diff --git a/src/pages/menu/forth.vue b/src/pages/menu/forth.vue
index 637ab5c..a34ac52 100644
--- a/src/pages/menu/forth.vue
+++ b/src/pages/menu/forth.vue
@@ -20,7 +20,7 @@
                 </template>
             </line-tab>
             <line-tab :icon-num='4'>总后台(<text class="fm-txt">admin.ouxuanzhineng.cn <text class="ft-copy">复制</text></text>)</line-tab>
-            <line-tab :icon-num='5'>投诉建议</line-tab>
+            <line-tab :icon-num='5' @click="toComplaint">投诉建议</line-tab>
             <line-tab :icon-num='6'>解绑退出</line-tab>
         </block>
         <bottom-logo></bottom-logo>
@@ -31,6 +31,7 @@
 import mineHeader from "@/subpackage/menu/components/mine/header.vue";
 import lineTab from "@/subpackage/menu/components/mine/line_tab.vue";
 import bottomLogo from "@/subpackage/menu/components/bottom_logo.vue";
+import { routeTo, debounce, showLoad, hideLoad, showModal, showNone } from "@/utils/util.js";
 export default {
     components:{
         mineHeader,
@@ -39,9 +40,19 @@ export default {
     },
     data(){
         return {
+            brand_id: '',
             menuPackageLoaded: false
         }
     },
+    onLoad(options){
+        this.brand_id = options?.brand_id ?? '';
+    },
+    methods: {
+        toComplaint(){
+            let { brand_id } = this;
+            routeTo(`/subpackage/message/pages/complaint/list?brand_id=${brand_id}`, 'nT');
+        },
+    }
 }
 </script>
 
diff --git a/src/static/images/tab/ta_1.png b/src/static/images/tab/ta_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..21bd06c5a8401df6c2f79879b6d9ea4193103bad
GIT binary patch
literal 558
zcmeAS@N?(olHy`uVBq!ia0vp^79h;Q3?%1AoYnzSr2#%6u0Wb$W+}sr5{B6&AQFgx
z+?nMJGfNm2R)R%<+){?wWiU2a!E~TV6<9Gu3y>^jm{rEG1gH_H9xON=CN;B+0jPdf
z3B#;%hUpbRT{iE}ya(E=RubeF%wTj!@${!2K^4wdv%^KNonJ9kSNzwmw_7S~_#QvH
zcVO?LmO>Y8g+Mp9b_NDUCr=m05Rc<;r`*gttRUdpE|Hw`A?khRx0e6^k8quwvgw9X
ztxt{IddpqPCTwMPtur6*kSUH(?-e<wd5K#w>f6>d-yNd+6V`od(Fxq1w8-g?s`D!S
zu!~;L6?}HNe9tXQn-*bHdOvOX1`CC&=_PHQ+i&<q$|>2kI9s=M`0SX%m}FIP#A3<D
zZygpcOZGngYU9$fyLfd9pHSoMG@k=cGvei^zRZ}RQfT{JErM%-b?JQPV5vAY?$YJ&
zialR(hs`<3En>6ncg)rQOn0g^@0G+GY>~Uc{LgjQ->FKj#?^<OpW3kH5W8#OLe-R|
zeAZ7sFPr@Hv7+QYBjqy|J7QWrRhO%VbvVndW>c`|?zVYzwsXT=x7|P1J=(rERzzWc
zMB?mSNvZEw*#xt{$x7}kU1a3rRa~$BVdm6%X1o2oBjigh7KoJH>ye+VIpf<py@(`G
O#Cy8>xvX<aXaWEipXQGM

literal 0
HcmV?d00001

diff --git a/src/static/images/tab/ta_2.png b/src/static/images/tab/ta_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6d39424a312406847db30f5e6add6c7b860df42
GIT binary patch
literal 795
zcmeAS@N?(olHy`uVBq!ia0vp^79h;Q3?%1AoYnzSlLLH0T!A#hj1nlC31%#A0C8uQ
zfl(>LOdu*_m|F@{1LT%4%qnG=QwCNB=FR|<K$Rc{P-7{>EU+xZWS|I8{lapvQ9zS{
zs2r@f7^EIz6i6>v<BSsjirKb6R~eK9`2{ol{`ySz4f`d<rm{Rw!H*}F&bJl4wsX~t
z&YDy`P09Ob567r+tq*iDy1hTn*Q`G>C`#rw69WSiyQhm|h{y4_Q*V|v83;JEE9~al
zbV6$Z#}4!V|4VZ<daw9gc|Px+`1!&eDl^aUd^mqU^;!CLjgU^KQ&u}gf6cyiY+Y!T
zyJ6VT=(yz<-B0{lv_I~>halfM@51zeDN}!j7$=55TqI;#l)KTY`DGC2@0lT6PO!7M
z&s?!4<=(VQ!VT_Aa|+k5(Adftv@_yuK;c)>F2-Ml$+KQtn%ke(Pgl2Fb*en;qE+-J
zmKO{7Q#bqU^3-Fx&pFeJ$;Ic!=VN>af-+uq_@Bvk%IwmKFb;gpP-FV(qf}VNUcvYi
zWmYml?^_aX^OZi{eR`+B=9dj!*WBIiB!2#RP%NqXS8s2p_%yxOpHjQpP3GO5Y8ewS
zlTBfo)%!!HVMmhJ%;~Q6tnkcxsuXJM^2G6?N#%ru=%;D_CEir}9G;{cUwqEFO<~>3
zD`)D|5AH1AyoTY&f)~qI9cSLQ=7~l7>t}IGO=TUu^3=}EdipC_=8>KJg?BvJ+KfqS
zF3YsJNqcT^Q+v^3#b{FF*u=L>Lb#vTp?dzQ8SQ>oPRu!1wwPhc><6uHPPWYdz#^3N
zG?8hu@>ctLA@6@nKP{V=rhDV>v_1EkCM36>+7TtO`RS}_AM#U}{Vx<B=QiE?X;Vyk
zt;FYL8<{GOK6<|0-+SJ9;XTK;&w2Z2j_Sq6`@6#rSnIs;SS<4>&bMN^>-5U0ULv}8
hmOq#L^SS&d%fbCqclzI&v<j5UJzf1=);T3K0RZh0Vxj;5

literal 0
HcmV?d00001

diff --git a/src/static/images/tab/ta_3.png b/src/static/images/tab/ta_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b7764d4f42899851d138440b36b8ba7775f9d77
GIT binary patch
literal 726
zcmeAS@N?(olHy`uVBq!ia0vp^79h;Q3?%1AoYnzST>(BJu0Wb$ZWRd4EM=Hc0!6bS
zY$Oq&?DSHGIpqv<i$Q9D+*zdzGr{VCBnSZ&14V%1WgrAnQvy{3Q3jNqRSs4Olr00P
z1R)?BYKy4mzGk3fbW4K#f*H724Ss!or1|c}jYGTqC4~9EFAq0=b$8zME-zR43vKas
zPfu-A+h19pwyv+KAmz3GGzJF7bDl1aAs)xyUb$J+WWdn+a577ZAPeJ7^MkRK|F3JC
z9Lr4ZzVLGCf7Qe8LQV&Em;aYLD->-0Z9Bu~sHwBxZQgJu-C+5vnI67I?3ZtC&HBEz
zw=`8`|C4oXCk*a{zMp5jDEPr6&8nQ~we#3A=3V-GXHn{eQ@Z<RNtrxd{k!#=kj_tq
zYK7<$o6kjCulZk^yx^ez{KiT4H@P(!#7+fFPdI*CC}ZNSmxT^LN~^WKCA(%mVK}Mj
z5c%r*UOV5G*J`RS*2>RZm2^Z~;I*pAO7GPI`bU*6%<>F)$9AK>sf}0Vl#GTJ$ET+{
z8eOp&v-dmPW#@Y>9-uqz+2%V3dyg*+%+#LtV$+wHC$|lETsN2^DHP&$K<u=M>WXjE
ztERKFtVmgDJmJZ|3C%TYu7&NNl5tnps4ME<rrEMDCjGCC;j~(QFV^n)B*uSEvvPP?
zF8-AH&0=3Nzjsy;i&Ixnk4he2?ty73F762*Euzh)p5OPh@4%~#&D`=H`#t-UmMjQ7
za{Gg(#C_3^-=%%KkIaphx6tbEwRsdeRrA_PN9}iqxALq{e)M7PgNT}gQ=2s>O8?i%
zwfNmAE8}xkZrKWpguh$%N*OB^O2{>IUs^UpJh4Y1yH9&h_4oa?40k+dEnr>nKoXQd
NJzf1=);T3K0RV>qKXCv6

literal 0
HcmV?d00001

diff --git a/src/static/images/tab/ta_4.png b/src/static/images/tab/ta_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..360d429e316f7d0ad2a1edfd8433d5bfd9be2079
GIT binary patch
literal 553
zcmeAS@N?(olHy`uVBq!ia0vp^79h;Q3?%1AoYnzSlLLH0T!A#h<Zgx;B_K4jlwnpG
z!|XDKx#dt1kYEYJv@(WS#UKU{O)mv005YIj${1#pLb*VxSrrU3D}hpC3mbUnRsaA0
zpJi70osVzMzj>;>to`fnpT}N2*z)k&#LI^pPVWrbxxjesgePA<?0s^(<oM>41FP&d
zOx0P{Q*`3vZJ?`UN`m}?8Q6ax-sNZ@`SJCwi+-M`PPFp1e0_3m^U@+~Qw=?@n?OG?
zYI?djhIkx*JN0DVAp?Q7$GYd-%*tlGao~=<|Nmu`LT_}(+noxbS^K*Auc`N@)%DN)
z-z{RvZ=?TU=L9}EAw&798Zp5&&yR`JIS7kCKkKwZan3>;uJVAEmu&`48EdDh7<eVU
z4sbc{Di!(cxC68C`QRT`7scHSS#?(iKB<~0ebhmp&F$jl?t9EG-Ya)JyHZ*|ZI$JW
z!YSwdj~2w83}n>s3oYIkbME-78!H(Sl)m2#YhPv=qA$O-OGfL-)88v|<L`5&oRAed
zY@T{u^hA1V{fQq}KTb$(jqm@_+T-5!<rnLcYx)dT)81u#^?q@&Yf9?(xMM5gWFp??
zzyGGq(Bkp<?)%lTKD~>Q_T5W!o_hPM%mF1Wu^MF+#h{!YOb2wbW*+hU6RqU<$mhmS
Yrb9L@hjRaQo&?3Yr>mdKI;Vst0EHp>sQ>@~

literal 0
HcmV?d00001

diff --git a/src/static/images/tab/tab_1.png b/src/static/images/tab/tab_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a2de1db92ac13b89a9c9b5c90c0e242ec5f57b4
GIT binary patch
literal 653
zcmeAS@N?(olHy`uVBq!ia0vp^79h;Q3?%1AoYnzS6#+gWu0VRrmMxn%Zw8W^zyQbw
z(r^(V0}g=V5XEo>5UGtDHv+}CZQHhW>(=APkHgi&Wg!}YYJdPJ2;?qZG#%t9^^zdJ
zU<ReT#%Es(zV8wL?7er2?oZx_*JfL9TV9!_#>sLbdU0{+>eiMj7l+WQRWBGA80UJr
zIEHu}e>?SNUbBISOK&)n#OCdhv-4*D|9^Oz$#jXUo@;GFbI&nPVs|_4@$AsMKjN$Q
zntbxze0q&g(!=8`86QO1e~v7dZtpxhuV}7QZmC{iOhy-*q<vs|KvT`kDw%xkn1XK}
zUnBEl*Pom&uUvR?<%8o*=1ZR^htFx)@1-KXFTd!RX#C0YvR5-6S@Zln@$z0$mu}pR
zIWk6zcDync5|UComXUaKPVSV6x}tJg_O&5t^1&(o$83J&ub2=P=(^2xaq*{A&EI~#
zDP=`ZcBrWTELo5d_@v1~BqKc8%kLAbhANM`$dw|Vlb-t&Zi!9Oxb)cVWaeja=Y0&>
zvhx`Hxg<YW{d^R8YhP`;`Nmy#XN4T6Tn+i?B>PVF{3PMC3VyqD_HGbg7<W8Yx0CJN
zkAOu7mQS$W$}dtbv8zSHKKyZBut*YD>(OV&6GP1&Z-^3k^`P}NPoQ!8y3L<!q9@+(
z-oGy*`Q`jORWf0_X8g4&dB$}Adc)nFJ0<QEe>FWgsdxt4`K+Cd{Ptp7TKq4!s`*)7
pQMmH%i$~_(4ezhLIVb;^SvFbo6qkp+Auw(kJYD@<);T3K0RUQDKve($

literal 0
HcmV?d00001

diff --git a/src/static/images/tab/tab_2.png b/src/static/images/tab/tab_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5dd78de7bb648c26dcf2c6056f8439d516cacb2
GIT binary patch
literal 986
zcmeAS@N?(olHy`uVBq!ia0vp^79h;Q3?%1AoYnzSy#YQUu0VSC?%kU<ZQ8tfGmwNZ
z;Owniw{F?81;_;gAY<FMZ4fqu3lu@t0+HIjeLGwYG6Sd>q8=^?G!1SYP!Py=Twd+~
zbdX+2kY6wZ``2IZUq4$eb4f{ezlb{b{e_jW#y3yQ4fJ*tKQg^O)plEPj>p-xZDs-=
zCv-<1Ol?SDU|>4u>EamTar|xQ%UO#I1b93>cIZD9aC{PA^ZKuRKJU4A7L(7M`*Sb<
zb^FgZ%O)*beQCn~ALS3<?9P7Abt>c1op%$zI^QbGV7Yhjj>#{<{7r?HOKv`C-zZvr
z*;HV`@yTCnXEHYRei!0+t?g=5=iPJX&VQNDa#t?>mOlN-qvXW(sv40s{rjJ_K5eUT
zEizhSBkum(`%zz*3eTHcQ*J-s@~3M%Q&@|~nrW}*?8;7ku*>y+-{f?`_!TXj7a1kw
zjz9YK<MH&~Ui%#~Pek~?B#3Qk>76#gbW(w^!3|fdd*AofuWB<A;7Pi!V9Hf-@JyfB
zMwY6+(=pcX7q$OZWPiFKnz_)e%Il8D)vlBa^ENDNW3oQncy?)#)YXf7Uwl6{iLJ|R
zddj1-(_*fAN9~dceX2W2WP0y3X_4nFi6zDE-G(81&l&5MANl)HTESS*pW#PMmBH8P
zB^$%!46>g#vh#R~3Eh2V7NVQZnW^!O$FD|nLe3YJ!$Q%)+l+)gW5fmKPFw7+^m4~q
zW7{WLo$LX{E43`0GsKH}A6fP#%$~h@!IDRxXA1w?&Kt8?hI^aln|H~=Zc|QI9S>Aa
z%Q%^T$Kv&M{Sfa>>A_LWXQWeinjg{bd-5&s^x97wqL`bX&S~1uvUt+tqBZy0Ds;Kt
z@2p%n`_8V1rOS?76<o0HOpR&x1U>5|J7(tbrpl*wlrhFHo1j_{rN_P^Sx(mI&y%+@
zjy@i&*Q;(Bs;X76{=Q*+-}S-Dn|`~OzQ5AjAy|H6{n0RX9shd~3$)hk)Vkd>O>MRL
z&o#SPyyaO|C*28u=J{fcah#2^yZxPY?wSY6(^VZ0<(*atm;E7hP4Bp{PX1h1(NoW6
z%rW-s{}^u{{!gPgS|;VWes50hv|}myn$L89vR(W6{cUVI=bMAKmo%*Y?yCN-{BiB7
zT|3V+MsH(epZe<0d%?85z4i-^URAbtjVS-5pz%0wey+?X`Tu%#jK+(dH@)(YP6g%(
N22WQ%mvv4FO#sy}@__&V

literal 0
HcmV?d00001

diff --git a/src/static/images/tab/tab_3.png b/src/static/images/tab/tab_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc1f30df47ac200234d31d44a18d38f7500fe507
GIT binary patch
literal 939
zcmeAS@N?(olHy`uVBq!ia0vp^79h;Q3?%1AoYnzS69RlfT!HkaO`EoD+qQZ0W*`I3
z-U0>?5g-%D04e|~gD@b9w{G1EVE{=811<{@fg1~vg$P1Oi1|Pg$c2y)HS#jC&w*~z
zFA4GsX86JW`{g5U4+G8XhveUO3w-uB+aY=HWCicD3sXbd97XpnnLjHoVnu_MYU-wf
zwf!?HI%YF4FwORKaSZV|{&q@u(JKc5*J=|-%f&h_6HYwX{r~RXi^i$R8xDs2ocvky
z>q@_@i{0Y&eTi&+`p=F(@ys_8{o!x+b>4-vYQ~?_S|(R03bLmC@XjyqFt{(ZB=9zK
zvxoUKNBaOjw<|O99v3hF%d=(n9LB3f^J}K>u-Gwc>)OZHWcDsSbGF2yJpIirH>L?I
zOV?HwZ#d<?<?3OP6Sq^87d$-p#Q1&TLxY>Koxx%Jx0#9;`6<PkO12B<1Rc93zE<)Y
zQ@3{D0i~`&g;`D94(qlr*=S_)s_4dt^)3lIY*UqX_doc4($Z$#pKogKzBP7lbx)}{
z7BTH+*{yrdZ{)g{rR-ekk-d7UaN$Lt6CN8m<h!Qq;F&o48qbMKlbd(y**?E~T&eQ-
zEanG!6I<FsA6oRC@t5nKb#t5dsm~cL9i2?m-oNYGzQX*9YNg(L`Hr|twSQ%LWokXQ
z9VqbE`My)+=EKwXd|s~a;CdEe-#xE;MVV|u)y$Ife`TlI-ua|{(R!iOn@-UmfzI-C
zzQ6F4@l38!zBc3b`>UKL#=joa_E+so=GL8~ZOA0^w(_x3Ti4ewo;>%JL=R-%_C3};
zd$U)$h@RxJ=GR&}_U}IIaX;Lu#&u}+{K?<$9gwk5yXdv){BG&*Hw1F0FAv@v^o4iV
zEIl59nQW>;ue)!5PrM}i<j1a<4?1dHPoKVJkGLnC%`(qy`JAK2Dt@c?pPLaVbx)9e
zey?<(w_ddDoQ?e^(l5T0-?$bdqPmhdU3>24L$CI_-Ys`8-&nojp7PZXUe>JkEsxJH
zcvk1wFCi1M(TM9<&ZgHofoXjjTVEJX;}(=~>#}Vvu8-h4k?6L6p$*rQW!*E<iWxS|
zxR~FW?QtwU#qz+S#p(gR(?nhJZA@QUPD#}?`kdsXANNQ1Kf|&pm$nCc<LiJaoWax8
K&t;ucLK6T%(Av!a

literal 0
HcmV?d00001

diff --git a/src/static/images/tab/tab_4.png b/src/static/images/tab/tab_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5e98905a88dd19f09b0cc0e7cbb2632a99a492a
GIT binary patch
literal 668
zcmeAS@N?(olHy`uVBq!ia0vp^79h;Q3?%1AoYnzS6#+gWu0VPdHn45mHi+;RFxb3#
zGmyJ;=T0CGE(H|Xx^*jDH&6<wY|oxOKoY_RN&y)_5+bs3<3<PrDDqdY?H15(^^zdJ
zV1}#OdTJMM{N_LX-B0q)Ob$hlPfs01ULWaC-_5dhZgp!&OS0LNiB=Q7)_O89Fs|`*
zaSZV|{&wp1yu$`Ou8%7M4u86*y;}GGfBx=ig^atK&MrFPJn^1*<Ssh~&A>+wD@Dbo
zpG%qfQqT1Vv(B~B*7DG;eLLr9JDzl_cB<Glk!#86$3gO+&1R;1&R#r!lSP9@%oAxw
z1CQ(N9y-%qSpMa0+350Un#!rYvX>^bPrH25@%^0mwNbaLR=;}tSx0N;jcdY@qO%`x
zO7Fh-AXE5Fz-`{%yJ{I1HcQLR@-=WyG-pZUXDD}in(HU8@7^o>+TzGl(?2rmQvAGe
z5v&1x5_9s`t=stR8PkKQcP=`n`m|MEJg<6Or>IbN$(v=LR-gEJ-Ag6z<c_d8-G6>B
zZ~h-)`=C;%zg%_WTgSf1H}%6~p4?Gge}%~pjMf!>TdZ1HGDXq(;LiB=%kv#4W=|=O
zX><$LP@Yl3yNu1PXzNe5bKHv<uTJYWiDK=Y@qcrZOP`kXy<h7M?zj2$9?5N(GLiX#
z&#z~@%x!CHg0J0HIJ=B1@Tubj?IT%A>HI23kDgYjjpx&64K){Ea{8g_6lwOD*Ybao
z7kJvX1%2iXX*?gWAS}U>&8PS2s>~fet?kb*TG#AUcHSJT#0rdR22WQ%mvv4FO#plF
BM>+ri

literal 0
HcmV?d00001

diff --git a/src/subpackage/menu/components/mine/line_tab.vue b/src/subpackage/menu/components/mine/line_tab.vue
index 4a0d219..191ae01 100644
--- a/src/subpackage/menu/components/mine/line_tab.vue
+++ b/src/subpackage/menu/components/mine/line_tab.vue
@@ -1,5 +1,5 @@
 <template>
-    <view class="line-tab">
+    <view class="line-tab" @click="$emit('click')">
         <image class="lt-icon"  mode="aspectFit" :src="'/subpackage/menu/static/images/mine_tab/' + iconNum + '.png'"></image>
         <view class="lt-right">
             <view class="lr-left">
diff --git a/src/subpackage/message/components/detail/answer_item.vue b/src/subpackage/message/components/detail/answer_item.vue
index 7142425..ccfbe25 100644
--- a/src/subpackage/message/components/detail/answer_item.vue
+++ b/src/subpackage/message/components/detail/answer_item.vue
@@ -1,16 +1,33 @@
 <template>
-    <view class="answer-item">
+    <view class="answer-item" :class="{ 'active-bg': activeBg }">
         <view class="ai-user">
-            <view class="au-name">李小小</view>
-            <view class="au-time">[回复] 20241220 10:12:31</view>
+            <view class="au-name">{{ name || '-' }}</view>
+            <view class="au-time">[回复] {{ time || '-' }}</view>
         </view>
-        <view class="ai-content">情况已核实，目前正在解决中</view>
+        <view class="ai-content">{{ content || '-' }}</view>
     </view>
 </template>
 
 <script>
 export default {
-
+    props: {
+        name: {
+            type: String,
+            default: ''
+        },
+        time: {
+            type: String,
+            default: ''
+        },
+        content: {
+            type: String,
+            default: ''
+        },
+        activeBg: {
+            type: Boolean,
+            default: false
+        }
+    }
 }
 </script>
 
@@ -19,6 +36,9 @@ export default {
         padding: 30upx 22upx;
         background: #fff;
         border-radius: 10upx;
+        &.active-bg{
+            background: #faeada;
+        }
     }
     .ai-user{
         @include ctf;
diff --git a/src/subpackage/message/components/detail/image_flow.vue b/src/subpackage/message/components/detail/image_flow.vue
index c32dadb..748a691 100644
--- a/src/subpackage/message/components/detail/image_flow.vue
+++ b/src/subpackage/message/components/detail/image_flow.vue
@@ -1,12 +1,34 @@
 <template>
     <view class="image-flow">
-        <image class="if-img" v-for="i in 5" :key="i"></image>
+        <image 
+            class="if-img" 
+            v-for="(e, i) in imgs" 
+            :key="i"
+            :src="e"
+            mode="aspectFill"
+            @click="previewImg(e)"
+        ></image>
     </view>
 </template>
 
 <script>
 export default {
+    props: {
+        imgs: {
+            type: Array,
+            default: ()=>[]
+        }
+    },
+    methods: {
+        previewImg(url) {
+            let { imgs } = this;
+            uni.previewImage({
+                urls: imgs,
+                current: url
+            })
+        }
 
+    }
 }
 </script>
 
@@ -17,11 +39,10 @@ export default {
         border-radius: 20upx;
         font-size: 0;
         .if-img{
-            margin: 0 14upx;
+            margin: 0 12upx;
             width: 200upx;
             height: 200upx;
             border-radius: 10upx;
-            background: skyblue;
             &:nth-of-type(n+4){
                 margin-top: 28upx;
             }
diff --git a/src/subpackage/message/components/detail/info.vue b/src/subpackage/message/components/detail/info.vue
index 396849a..ccadc39 100644
--- a/src/subpackage/message/components/detail/info.vue
+++ b/src/subpackage/message/components/detail/info.vue
@@ -2,22 +2,35 @@
     <view class="detail-info">
         <view class="di-line">
             <view class="dl-name">标题：</view>
-            <view class="dl-value">门禁开门异常</view>
+            <view class="dl-value">{{ title || '-' }}</view>
         </view>
         <view class="di-line">
             <view class="dl-name">类型：</view>
-            <view class="dl-value">硬件</view>
+            <view class="dl-value">{{ type || '-' }}</view>
         </view>
         <view class="di-line">
             <view class="dl-name">反馈内容：</view>
-            <view class="dl-value">开不了门</view>
+            <view class="dl-value">{{ content || '-' }}</view>
         </view>
     </view>
 </template>
 
 <script>
 export default {
-
+    props: {
+        title: {
+            type: String,
+            default: ''
+        },
+        type: {
+            type: String,
+            default: ''
+        },
+        content: {
+            type: String,
+            default: ''
+        }
+    },
 }
 </script>
 
@@ -27,7 +40,9 @@ export default {
         border-radius: 10upx;
         background: #fff;
         .di-line{
-            @include ctf(space-between);
+            display: flex;
+            align-items: flex-start;
+            justify-content: space-between;
             &+.di-line{
                 margin-top: 10upx;
             }
@@ -39,7 +54,6 @@ export default {
                 flex-grow: 1;
                 text-align: right;
                 @include flcw(28upx, 40upx, #1a1a1a);
-                @include tHide;
             }
         }
     }
diff --git a/src/subpackage/message/components/edit/upload_img.vue b/src/subpackage/message/components/edit/upload_img.vue
index c410911..e7737b5 100644
--- a/src/subpackage/message/components/edit/upload_img.vue
+++ b/src/subpackage/message/components/edit/upload_img.vue
@@ -3,7 +3,7 @@
         <view class="ui-title">上传照片<text class="ut-txt">(最多上传{{ max }}张，只支持.jpg、png 格式)</text></view>
         <view class="ui-ls">
             <view class="ul-item" v-for="(e, i) in imgTemLs" :key="i">
-                <image class="ui-pic" @click="previewImg(e)" mode="aspectFit" :src="e"></image>
+                <image class="ui-pic" @click="previewImg(e)" mode="aspectFill" :src="e"></image>
                 <image class="ui-close" @click="delImg(i)" mode="aspectFit" src="/subpackage/message/static/images/close.png"></image>
             </view>
             <view class="ul-item ul-add" @click="chooseImg" v-if="max > imgTemLs.length">
diff --git a/src/subpackage/message/components/fixed_button.vue b/src/subpackage/message/components/fixed_button.vue
index 5a301eb..bf33472 100644
--- a/src/subpackage/message/components/fixed_button.vue
+++ b/src/subpackage/message/components/fixed_button.vue
@@ -17,6 +17,7 @@ export default {
         bottom: 0;
         width: 100%;
         padding: 10upx 24upx;
+        @include isPd(10upx);
         .fb-btn{
             @include clearBtn;
             text-align: center;
diff --git a/src/subpackage/message/components/message_item.vue b/src/subpackage/message/components/message_item.vue
index 40bdf5b..b25b83a 100644
--- a/src/subpackage/message/components/message_item.vue
+++ b/src/subpackage/message/components/message_item.vue
@@ -1,15 +1,15 @@
 <template>
-    <view class="message-item">
-        <image class="mi-icon"></image>
+    <view class="message-item" @click="$emit('click:item')">
+        <image class="mi-icon" mode="aspectFit" src="/subpackage/message/static/images/message.png"></image>
         <view class="mi-content">
             <view class="mc-info">
                 <view class="mi-top">
                     <view class="mt-title">{{ title || '-' }}</view>
                     <view class="mt-tag" v-if="status">{{ status || '-' }}</view>
                 </view>
-                <view class="mi-content">{{ content || '-' }}</view>
+                <view class="mi-text">{{ content || '-' }}</view>
             </view>
-            <image class="mc-arrow"></image>
+            <image class="mc-arrow" mode="aspectFit" src="/subpackage/message/static/images/arrow_b2.png"></image>
         </view>
     </view>
 </template>
@@ -44,7 +44,6 @@ export default {
             margin-right: 24upx;
             width: 108upx;
             height: 108upx;
-            background: skyblue;
         }
         .mi-content{
             flex-grow: 1;
@@ -67,7 +66,7 @@ export default {
                         @include flcw(24upx, 34upx, $mColor);
                     }
                 }
-                .mi-content{
+                .mi-text{
                     margin-top: 18upx;
                     @include flcw(28upx, 40upx, #9C9C9F);
                     @include tHide(2);
@@ -80,7 +79,6 @@ export default {
                 margin-top: 8upx;
                 width: 28upx;
                 height: 28upx;
-                background: skyblue;
             }
         }
     }
diff --git a/src/subpackage/message/js/api.js b/src/subpackage/message/js/api.js
index a8137d6..2385d0b 100644
--- a/src/subpackage/message/js/api.js
+++ b/src/subpackage/message/js/api.js
@@ -4,7 +4,12 @@ export const MESSAGE_API = {
     zs_message_imgs:`${ORIGIN}/upload/file/zs_message_imgs`,  // 投诉/工单图片
     complaintSubmit:`${ORIGIN}/admin/assistant/complaint/submit`,  // 投诉提交
     complaintList:`${ORIGIN}/admin/assistant/complaint/list`,  // 投诉列表
+    complaintInfo:`${ORIGIN}/admin/assistant/complaint/info`,  // 投诉详情
+    complaintReply:`${ORIGIN}/admin/assistant/complaint/reply`,  // 投诉回复
     workorderSubmit:`${ORIGIN}/admin/assistant/workorder/submit`,  // 工单提交
+    workorderList:`${ORIGIN}/admin/assistant/workorder/list`,  // 工单列表
+    workorderInfo:`${ORIGIN}/admin/assistant/workorder/info`,  // 工单详情
+    workorderReply:`${ORIGIN}/admin/assistant/workorder/reply`,  // 工单回复
 }
 
 
diff --git a/src/subpackage/message/pages/complaint/detail.vue b/src/subpackage/message/pages/complaint/detail.vue
index 0097f5c..fe5ded5 100644
--- a/src/subpackage/message/pages/complaint/detail.vue
+++ b/src/subpackage/message/pages/complaint/detail.vue
@@ -1,14 +1,28 @@
 <template>
     <view class="complaint-detail">
-        <view class="top-status">当前状态：xxx处理中</view>
+        <view class="top-status">当前状态：{{ orderInfo.status || '-' }}</view>
         <view class="heigh-space" style="height: 24upx;"></view>
-        <detail-info></detail-info>
+        <detail-info
+            :title="orderInfo.title || '-'"
+            :type="orderInfo.type || '-'"
+            :content="orderInfo.content || '-'"
+        ></detail-info>
+        <block v-if="imgArr.length">
+            <view class="heigh-space" style="height: 24upx;"></view>
+            <image-flow :imgs="imgArr"></image-flow>
+        </block>
         <view class="heigh-space" style="height: 24upx;"></view>
-        <image-flow></image-flow>
-        <view class="heigh-space" style="height: 24upx;"></view>
-        <button class="right-btn">回复</button>
-        <view class="heigh-space" style="height: 24upx;"></view>
-        <answer-item></answer-item>
+        <button class="right-btn" @click="replyBtn">回复</button>
+        <block v-for="(e, i) in commentArr" :key="i">
+            <view class="heigh-space" style="height: 24upx;"></view>
+            <answer-item
+                :name="e.user_name || ''"
+                :time="e.reply_time || ''"
+                :content="e.content || ''"
+                :active-bg="e.is_creator"
+            ></answer-item>
+        </block>
+        
     </view>
 </template>
 
@@ -16,16 +30,126 @@
 import detailInfo from "../../components/detail/info.vue";
 import imageFlow from "../../components/detail/image_flow.vue";
 import answerItem from "../../components/detail/answer_item.vue";
+import { routeTo, debounce, showLoad, hideLoad, showModal, showNone } from "@/utils/util.js";
+import { MESSAGE_API } from "../../js/api.js";
+import server from "../../js/server.js";
 export default {
     components: {
         detailInfo, imageFlow, answerItem
     },
+    computed: {
+        imgArr(){
+            let { orderInfo } = this;
+            let _showimgs = orderInfo?.showimgs ?? [];
+            return _showimgs;
+        },
+        commentArr(){
+            let { orderInfo } = this;
+            let _comment = orderInfo?.comment ?? [];
+            return _comment;
+        }
+    },
+    data(){
+        return {
+            orderInfo: {}
+        }
+    },
+    onLoad(options){
+        this.complaintInfo({
+            brand_id: options?.brand_id ?? '',
+            id: options?.id ?? ''
+        })
+    },
+    methods: {
+        replyBtn(){
+            let { orderInfo } = this;
+            showModal({
+                title: '回复',
+                showCancel: true,
+                editable: true,
+                placeholderText: '请输入回复内容',
+                success: mRes=>{
+                    console.log('replyBtn mRes --->', mRes);
+                    if(mRes?.confirm && mRes?.content)this.complaintReply({
+                        brand_id: orderInfo?.brand_id ?? '',
+                        id: orderInfo?.id ?? '',
+                        reply_text: mRes?.content ?? ''
+                    })
+                    .then(res =>{
+                        if(res === 'success'){
+                            setTimeout(_=>{
+                                this.complaintInfo({
+                                    brand_id: orderInfo?.brand_id ?? '',
+                                    id: orderInfo?.id ?? ''
+                                })
+                            }, 1000);
+                        }
+                    })
+                }
+            })
+        },
+        complaintInfo({ brand_id, id }){
+			showLoad();
+            return server.post({
+                url: MESSAGE_API.complaintInfo,
+                data: { brand_id: +brand_id, id: +id },
+                isDefaultGet: false,
+            })
+            .then(res => {
+				hideLoad();
+                let _data = res?.data || {};
+                if(_data.code === 0){
+                    let _info = _data?.data ?? {};
+					return this.orderInfo = _info;
+                }else{
+                    return Promise.reject(_data);
+                }
+            })
+            .catch(err => {
+                hideLoad();
+                showModal({
+                    title: '提示',
+                    content: err.message || '加载失败！'
+                })
+                console.warn('subpackage message pages complaint detail complaintInfo err --->', err);
+				// return Promise.reject(err);
+            })
+		},
+        complaintReply({ brand_id, id, reply_text }){
+			showLoad();
+            return server.post({
+                url: MESSAGE_API.complaintReply,
+                data: { brand_id: +brand_id, id: +id, reply_text },
+                isDefaultGet: false,
+            })
+            .then(res => {
+				hideLoad();
+                let _data = res?.data || {};
+                if(_data.code === 0){
+                    showNone(_data?.message ?? '回复成功！');
+                    return 'success'
+                }else{
+                    return Promise.reject(_data);
+                }
+            })
+            .catch(err => {
+                hideLoad();
+                showModal({
+                    title: '提示',
+                    content: err.message || '操作失败！'
+                })
+                console.warn('subpackage message pages complaint detail complaintReply err --->', err);
+				// return Promise.reject(err);
+            })
+		},
+    },
 }
 </script>
 
 <style lang="scss">
     .complaint-detail{
         padding: 24upx;
+        @include isPd(24upx);
     }
     .top-status{
         padding: 0 24upx;
diff --git a/src/subpackage/message/pages/complaint/list.vue b/src/subpackage/message/pages/complaint/list.vue
index d491087..a436899 100644
--- a/src/subpackage/message/pages/complaint/list.vue
+++ b/src/subpackage/message/pages/complaint/list.vue
@@ -6,6 +6,7 @@
                     :title="e.title"
                     :status="e.status"
                     :content="e.content"
+                    @click:item="itemClick(e)"
                 ></message-item>
                 <view style="height: 24rpx;"></view>
             </block>
@@ -29,6 +30,7 @@ export default {
         return {
             brand_id: '',
             listData: [],
+            page: 1
         }
     },
     onLoad(options){
@@ -36,7 +38,23 @@ export default {
         this.brand_id = _bid;
         this.complaintList({ brand_id: _bid });
     },
+    async  onPullDownRefresh(){
+        let { brand_id } = this;
+        this.listData = [];
+        this.page = 1;
+        await this.complaintList({ brand_id });
+        uni.stopPullDownRefresh();
+    },
+    onReachBottom(){
+        let { page, brand_id } = this;
+        this.complaintList({ page: page + 1, brand_id });
+    },
     methods: {
+        itemClick(e){
+            let { brand_id } = this;
+            let _qryStr = `brand_id=${brand_id ?? ''}&id=${e?.id ?? ''}`;
+            routeTo(`/subpackage/message/pages/complaint/detail?${_qryStr}`, 'nT');
+        },
         clickBtn(){
             let { brand_id } = this;
             routeTo(`/subpackage/message/pages/complaint/edit?brand_id=${brand_id ?? ''}`, 'nT');
diff --git a/src/subpackage/message/pages/work_order/detail.vue b/src/subpackage/message/pages/work_order/detail.vue
new file mode 100644
index 0000000..3c74259
--- /dev/null
+++ b/src/subpackage/message/pages/work_order/detail.vue
@@ -0,0 +1,171 @@
+<template>
+    <view class="complaint-detail">
+        <view class="top-status">当前状态：{{ orderInfo.status || '-' }}</view>
+        <view class="heigh-space" style="height: 24upx;"></view>
+        <detail-info
+            :title="orderInfo.title || '-'"
+            :type="orderInfo.type || '-'"
+            :content="orderInfo.content || '-'"
+        ></detail-info>
+        <block v-if="imgArr.length">
+            <view class="heigh-space" style="height: 24upx;"></view>
+            <image-flow :imgs="imgArr"></image-flow>
+        </block>
+        <view class="heigh-space" style="height: 24upx;"></view>
+        <button class="right-btn" @click="replyBtn">回复</button>
+        <block v-for="(e, i) in commentArr" :key="i">
+            <view class="heigh-space" style="height: 24upx;"></view>
+            <answer-item
+                :name="e.user_name || ''"
+                :time="e.reply_time || ''"
+                :content="e.content || ''"
+                :active-bg="e.is_creator"
+            ></answer-item>
+        </block>
+        
+    </view>
+</template>
+
+<script>
+import detailInfo from "../../components/detail/info.vue";
+import imageFlow from "../../components/detail/image_flow.vue";
+import answerItem from "../../components/detail/answer_item.vue";
+import { routeTo, debounce, showLoad, hideLoad, showModal, showNone } from "@/utils/util.js";
+import { MESSAGE_API } from "../../js/api.js";
+import server from "../../js/server.js";
+export default {
+    components: {
+        detailInfo, imageFlow, answerItem
+    },
+    computed: {
+        imgArr(){
+            let { orderInfo } = this;
+            let _showimgs = orderInfo?.showimgs ?? [];
+            return _showimgs;
+        },
+        commentArr(){
+            let { orderInfo } = this;
+            let _comment = orderInfo?.comment ?? [];
+            return _comment;
+        }
+    },
+    data(){
+        return {
+            orderInfo: {}
+        }
+    },
+    onLoad(options){
+        this.workorderInfo({
+            brand_id: options?.brand_id ?? '',
+            id: options?.id ?? ''
+        })
+    },
+    methods: {
+        replyBtn(){
+            let { orderInfo } = this;
+            showModal({
+                title: '回复',
+                showCancel: true,
+                editable: true,
+                placeholderText: '请输入回复内容',
+                success: mRes=>{
+                    console.log('replyBtn mRes --->', mRes);
+                    if(mRes?.confirm && mRes?.content)this.workorderReply({
+                        brand_id: orderInfo?.brand_id ?? '',
+                        id: orderInfo?.id ?? '',
+                        reply_text: mRes?.content ?? ''
+                    })
+                    .then(res =>{
+                        if(res === 'success'){
+                            setTimeout(_=>{
+                                this.workorderInfo({
+                                    brand_id: orderInfo?.brand_id ?? '',
+                                    id: orderInfo?.id ?? ''
+                                })
+                            }, 1000);
+                        }
+                    })
+                }
+            })
+        },
+        workorderInfo({ brand_id, id }){
+			showLoad();
+            return server.post({
+                url: MESSAGE_API.workorderInfo,
+                data: { brand_id: +brand_id, id: +id },
+                isDefaultGet: false,
+            })
+            .then(res => {
+				hideLoad();
+                let _data = res?.data || {};
+                if(_data.code === 0){
+                    let _info = _data?.data ?? {};
+					return this.orderInfo = _info;
+                }else{
+                    return Promise.reject(_data);
+                }
+            })
+            .catch(err => {
+                hideLoad();
+                showModal({
+                    title: '提示',
+                    content: err.message || '加载失败！'
+                })
+                console.warn('subpackage message pages work_order detail workorderInfo err --->', err);
+				// return Promise.reject(err);
+            })
+		},
+        workorderReply({ brand_id, id, reply_text }){
+			showLoad();
+            return server.post({
+                url: MESSAGE_API.workorderReply,
+                data: { brand_id: +brand_id, id: +id, reply_text },
+                isDefaultGet: false,
+            })
+            .then(res => {
+				hideLoad();
+                let _data = res?.data || {};
+                if(_data.code === 0){
+                    showNone(_data?.message ?? '回复成功！');
+                    return 'success'
+                }else{
+                    return Promise.reject(_data);
+                }
+            })
+            .catch(err => {
+                hideLoad();
+                showModal({
+                    title: '提示',
+                    content: err.message || '操作失败！'
+                })
+                console.warn('subpackage message pages work_order detail workorderReply err --->', err);
+				// return Promise.reject(err);
+            })
+		},
+    },
+}
+</script>
+
+<style lang="scss">
+    .complaint-detail{
+        padding: 24upx;
+        @include isPd(24upx);
+    }
+    .top-status{
+        padding: 0 24upx;
+        text-align: center;
+        border-radius: 10upx;
+        background: #fff;
+        @include tHide;
+        @include flcw(28upx, 84upx, #1A1A1A);
+    }
+    .right-btn{
+        margin-left: auto;
+        margin-right: 0upx;
+        width: 192upx;
+        text-align: center;
+        border-radius: 10upx;
+        background: $mColor;
+        @include flcw(32upx, 88upx, #FFFFFF);
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/message/pages/work_order/list.vue b/src/subpackage/message/pages/work_order/list.vue
new file mode 100644
index 0000000..fdc725c
--- /dev/null
+++ b/src/subpackage/message/pages/work_order/list.vue
@@ -0,0 +1,105 @@
+<template>
+    <view class="complaint-list">
+        <view class="cl-ls">
+            <block v-for="(e, i) in listData" :key="i">
+                <message-item
+                    :title="e.title"
+                    :status="e.status"
+                    :content="e.content"
+                    @click:item="itemClick(e)"
+                ></message-item>
+                <view style="height: 24rpx;"></view>
+            </block>
+        </view>
+        <fixed-button @click="clickBtn"></fixed-button>
+    </view>
+</template>
+
+<script>
+import fixedButton from "../../components/fixed_button.vue";
+import messageItem from "../../components/message_item.vue";
+import { routeTo, debounce, showLoad, hideLoad, showModal, showNone } from "@/utils/util.js";
+import { MESSAGE_API } from "../../js/api.js";
+import server from "../../js/server.js";
+export default {
+    components: {
+        fixedButton,
+        messageItem,
+    },
+    data(){
+        return {
+            brand_id: '',
+            listData: [],
+            page: 1
+        }
+    },
+    onLoad(options){
+        let _bid = options?.brand_id ?? '';
+        this.brand_id = _bid;
+        this.workorderList({ brand_id: _bid });
+    },
+    async  onPullDownRefresh(){
+        let { brand_id } = this;
+        this.listData = [];
+        this.page = 1;
+        await this.workorderList({ brand_id });
+        uni.stopPullDownRefresh();
+    },
+    onReachBottom(){
+        let { page, brand_id } = this;
+        this.workorderList({ page: page + 1, brand_id });
+    },
+    methods: {
+        itemClick(e){
+            let { brand_id } = this;
+            let _qryStr = `brand_id=${brand_id ?? ''}&id=${e?.id ?? ''}`;
+            routeTo(`/subpackage/message/pages/work_order/detail?${_qryStr}`, 'nT');
+        },
+        clickBtn(){
+            let { brand_id } = this;
+            routeTo(`/subpackage/message/pages/work_order/edit?brand_id=${brand_id ?? ''}`, 'nT');
+        },
+        workorderList({ brand_id, page = 1, page_size = 20}){
+			showLoad();
+            return server.post({
+                url: MESSAGE_API.workorderList,
+                data: { brand_id: +brand_id, page, page_size },
+                isDefaultGet: false,
+            })
+            .then(res => {
+				hideLoad();
+                let _data = res?.data || {};
+                if(_data.code === 0){
+                    let _ls = _data?.data ?? [];
+                    if(page === 1)return this.listData = _ls;
+                    if(!_ls.length)return showNone('没有更多！');
+                    this.page = page;
+                    this.listData = [ ...this.listData, ..._ls ];
+					return _ls;
+                }else{
+                    return Promise.reject(_data);
+                }
+            })
+            .catch(err => {
+                hideLoad();
+                showModal({
+                    title: '提示',
+                    content: err.message || '加载失败！'
+                })
+                console.warn('subpackage message pages work_order list workorderList err --->', err);
+				// return Promise.reject(err);
+            })
+		},
+    }
+}
+</script>
+
+<style lang="scss">
+    .complaint-list{
+        @include isPd(132upx);
+        .cl-ls{
+            padding: 28upx 24upx 0;
+
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/message/static/images/arrow_b2.png b/src/subpackage/message/static/images/arrow_b2.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4e1580592509f3a3c7ee7a3babe6a48283aabb8
GIT binary patch
literal 226
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K13?z9tQY(OzWq?nJE0CTwYwqmX^JdSUJ7>;(
zARCD0%$Wxk1hRqRAOsYdHf`z5nLw35L69<g!&h5?nuSV&{DK+2E55N3ysrIZM`u!~
z8^^hWS%wBqXMwVAo-U3d9M?;GJ^2_Ec@Ap?l%>7=FMnFpdqQ;V(Zcp8-yY2Srg>n(
z^aQU@42DyD(m4eWbidJ#TKo3CimcTZ>*sBut-s2z>umL4%n<p)e+g(JgQu&X%Q~lo
FCIB{ITIB!$

literal 0
HcmV?d00001

diff --git a/src/subpackage/message/static/images/message.png b/src/subpackage/message/static/images/message.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e182f854f38f90a00e7438e8d3f9f2013817b9e
GIT binary patch
literal 959
zcmV;w13>(VP)<h;3K|Lk000e1NJLTq001@s001@!1^@s6j74hQ00001b5ch_0Itp)
z=>Px&c}YY;RA@u(m``jJbri=xZ>MdbHIi5(O-R(J$i;*M7sLb-Od6UHqtWO|iBY!O
z_5{15Aso7dkU)1AE-mb~2lQ^DO*B^GpLnn}CLT<@v{i#1fHZ&tLZ$7_gDIQc7MIR%
zmg!C@Gsphk@B7~8ec$~0n-x~+Bde5)2<$;~HgYU-Y=v|n8pRc2gmD>>W5%soA%T%&
z^G2LbuVLojJt*xcZOAg;TogsPfN+MUM?U7=^na!UVeVMo-U#|R@Vu#bz;P2GyGdjw
zO?1t`j_+Gbv-JzG(L{6^V<x##+|2$H(_T5uzy_1uI5Mz6Y!=}+l%iLH`&t()l;?oP
zvQA8Ui04jv>6(G%?N32pEs4!x=~njUe)bX%WPK>Pg`)fjG~CgX&q!om^U^j0JC*w3
z_6xkNB>V@7%(Gs?fv)H6-$9?5*HlL7%D&{KZw8i6jRG&0#3o5(>wAFYQxgl`?=ceD
zQj_nE7lBoEtPpQR*1bLdKP|Y&!I5w2>ielIS$D_ssr^7MIHt1FG)}_?x{v-n|ChRh
z73}v>9a;vkOEmKo?_{rs1LkHOO6{bm>w|-fIY?}b&SQUtH;Td0EUi@cQFP1cKhR3k
z&DOveV@(dl%YV{2I2)d0gUJpY8D4bd35M`j9&6dcn}=q?dB;wr(g?l5uq;w>KUmu6
z%1(s?=8mB?dl(_W!vlwyd_g?(QFx=c3|3W@4CU~s2V4YJ>GDH=3H}n;RqDqyqEFJ9
zyI7AYq>y|Z755ghwv=y#M7F~#x0z#wR4+=pBBp0Sz5%KHG$1;IFibrAb>%d(-$Hc<
zB9>Pn)z{SmeHrBG^16_wGkeHO&kSt9Zo|@X;8733IT~Xx@Lu0I1-l2;ey;+2u3x1n
zo9M}0@Y-hv=BniFU7();ElZ2a9)#CXeZ?!e&-LpdZ;;50nCvqLbJb3MunEgKh)O%?
z6Yei7Rgzo*)|n(Xh*6L!M9)x+9ih9=of@OZAJ{@k)ym$2eeSlWcYj4+L*zrww-o5@
zRikRE1&P$Ow|20FMdVZG?*jV@vEqxqscI&xZDUYi-vir$e~3wvy?v*tvD39-{C`(4
zVD4qOVXmDb-<h0PK^4E0PB38gsMKeU2+U{0LJyA|3*7>r1w@YdY*^^wkz=7-;In|p
hF`o?!J$%(Vb_?SVL`Fv$^*#Uq002ovPDHLkV1lW6&`|&Y

literal 0
HcmV?d00001

diff --git a/src/utils/util.js b/src/utils/util.js
index cb9c6d4..40ac2c6 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -80,7 +80,9 @@ export function showModal({
   confirmColor='#009874',
   success,
   fail,
-  complete
+  complete,
+  editable = false,
+  placeholderText = ''
 }){
   uni.showModal({
     title,
@@ -91,7 +93,9 @@ export function showModal({
     confirmText,
     success,
     fail,
-    complete
+    complete,
+    editable,
+    placeholderText,
   })
 }
 

From 95de40fc33f656b0a278e7db38caf23cc24ce6f5 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Tue, 21 Jan 2025 18:29:23 +0800
Subject: [PATCH 18/30] fixed tid1819

---
 src/subpackage/wallet/pages/douyin_withdraw/index.vue | 16 ++++++++++------
 src/subpackage/wallet/pages/index/index.vue           |  6 ++++--
 src/subpackage/wallet/pages/index/recharge_record.vue | 10 +++-------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/subpackage/wallet/pages/douyin_withdraw/index.vue b/src/subpackage/wallet/pages/douyin_withdraw/index.vue
index 2264b47..f11b299 100644
--- a/src/subpackage/wallet/pages/douyin_withdraw/index.vue
+++ b/src/subpackage/wallet/pages/douyin_withdraw/index.vue
@@ -5,14 +5,14 @@
             title="微信平台可提现资金"
             :balance="formatMoney(balanceInfo.total_amount_of_wechat)"
             type="wx"
-            @click:extract="applyBtn(1, balanceInfo.total_amount_of_wechat)"
+            @click:extract="applyBtn(1)"
         ></platform-item>
         <view class="dw-space"></view>
         <platform-item
             title="抖音平台可提现资金"
             :balance="formatMoney(balanceInfo.total_amount_of_douyin)"
             type="dy"
-            @click:extract="applyBtn(0, balanceInfo.total_amount_of_douyin)"
+            @click:extract="applyBtn(0)"
         ></platform-item>
 
         <view class="dw-space"></view>
@@ -35,6 +35,7 @@ export default {
     },
     data(){
         return {
+            balance: '',
             brand_id: '',
             balanceInfo: {
                 /**
@@ -46,7 +47,9 @@ export default {
         }
     },
     onLoad(options){
-        this.brand_id = options.brand_id || '';
+        this.brand_id = options?.brand_id || '';
+        this.balance = options?.balance ?? '';
+
     },
     onShow(){
         this.getDouyinWalletBalance(this.brand_id);
@@ -58,9 +61,10 @@ export default {
         },
         // 申请提现
         // md【241024】 241113新增 0抖音；1微信
-        applyBtn(source, balance){
-            if(!isNaN(balance) && balance < 0)return showModal({
-                content: '系统检测到您在欧轩有未支付的账单，请先完成支付后再提现。点击“前往”跳转钱包页面',
+        applyBtn(source){
+            let { balance } = this;
+            if(!isNaN(balance) && Number(balance) < 0)return showModal({
+                content: '系统检测到您在欧轩有未支付的账单，请先完成支付后再提现。',
                 confirmText: '前往',
                 success: res=>{
                     if(res.confirm)routeTo();
diff --git a/src/subpackage/wallet/pages/index/index.vue b/src/subpackage/wallet/pages/index/index.vue
index 04beb4d..0cc02a3 100644
--- a/src/subpackage/wallet/pages/index/index.vue
+++ b/src/subpackage/wallet/pages/index/index.vue
@@ -20,7 +20,7 @@
             </view>
         </view>
 
-        <wallet-modal-success ref="walletModalSuccess" :title="'充值成功'">
+        <wallet-modal-success ref="walletModalSuccess" :title="'充值成功'" @click:button="toRechargeRecord">
             <template v-slot:tip>充值成功！</template>
             <template v-slot:btn>充值记录</template>
         </wallet-modal-success>
@@ -112,7 +112,9 @@ export default {
             })
         },
         dyBtnClick(){
-            routeTo(`/subpackage/wallet/pages/douyin_withdraw/index?brand_id=${this.brand_id ?? ''}`, 'nT');
+            let { brand_id, balance } = this;
+            let _qryStr = `brand_id=${brand_id ?? ''}&balance=${balance ?? 0}`;
+            routeTo(`/subpackage/wallet/pages/douyin_withdraw/index?${_qryStr}`, 'nT');
         },
         bfBtnClick(){
             routeTo(`/subpackage/wallet/pages/baofu_withdraw/index?brand_id=${this.brand_id ?? ''}`, 'nT');
diff --git a/src/subpackage/wallet/pages/index/recharge_record.vue b/src/subpackage/wallet/pages/index/recharge_record.vue
index 6d5cbb9..d557240 100644
--- a/src/subpackage/wallet/pages/index/recharge_record.vue
+++ b/src/subpackage/wallet/pages/index/recharge_record.vue
@@ -13,16 +13,12 @@
                 <record-line  name="充值时间">{{ e.pay_time || '-' }}</record-line>
                 <record-line  name="支付方式">{{ e.pay_type || '-' }}</record-line>
                 <record-line  name="交易流水号">{{ e.trans_no || '-' }}</record-line>
-                <record-line  name="充值途径">{{ e.optsourse || '-' }}</record-line>
+                <record-line  name="充值途径">
+                    {{ e.optsourse || '-' }} <block v-if="e.optname"> （{{ e.optname }}） </block>
+                </record-line>
             </view>
         </view>
     </view>
-    <!-- 充值金额：12.00
-充值单号：TX20191017898999
-充值时间：2024-10-17  12:12:12
-支付方式：微信支付
-交易流水号：4002676665666
-充值途径：商家助手（刘晓） -->
 </template>
 
 <script>

From 262fd65704968211e606a06fc2784dcaa267ae20 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Wed, 22 Jan 2025 10:03:09 +0800
Subject: [PATCH 19/30] vtest 1.1.63 for tid1803&1819

---
 src/subpackage/wallet/pages/index/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/subpackage/wallet/pages/index/index.vue b/src/subpackage/wallet/pages/index/index.vue
index 0cc02a3..fc10103 100644
--- a/src/subpackage/wallet/pages/index/index.vue
+++ b/src/subpackage/wallet/pages/index/index.vue
@@ -28,7 +28,6 @@
         <recharge-modal :balance="balance" ref="rechargeModal"></recharge-modal>
     </view>
 </template>
-
 <script>
 import walletInfo from './modules/wallet_info.vue'
 import walletModalSuccess from '../../components/wallet_modal_success.vue';

From 0ee0294ed6f92af2113b6016db01978f7148fe71 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Wed, 22 Jan 2025 15:02:22 +0800
Subject: [PATCH 20/30] reconstruction index authorization for tid1807

---
 src/App.vue                                        |   3 +-
 src/js/server.js                                   |  12 +
 src/main.js                                        |   3 +-
 src/pages.json                                     |  14 +-
 src/pages/index/index.vue                          | 275 +++------------------
 src/store/actions.js                               |  43 +++-
 src/store/index.js                                 |   9 +-
 src/store/mutations.js                             |  13 +
 src/subpackage/authorization/components/login.vue  | 190 ++++++++++++++
 src/subpackage/authorization/js/api.js             |   7 +
 src/subpackage/authorization/js/server.js          |  10 +
 src/subpackage/authorization/pages/index.vue       |  16 ++
 .../authorization/static/images/author_modal.png   | Bin 0 -> 14649 bytes
 13 files changed, 342 insertions(+), 253 deletions(-)
 create mode 100644 src/subpackage/authorization/components/login.vue
 create mode 100644 src/subpackage/authorization/js/api.js
 create mode 100644 src/subpackage/authorization/js/server.js
 create mode 100644 src/subpackage/authorization/pages/index.vue
 create mode 100644 src/subpackage/authorization/static/images/author_modal.png

diff --git a/src/App.vue b/src/App.vue
index 5335f6f..65974ff 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,9 +3,8 @@
 	import util from './utils/util';
 	export default {
 		onLaunch: function() {
-			// #ifndef H5
+			this.$store.commit('setLoginState', { loginState: false });
 			this.updateManager();
-			// #endif
 		},
 		methods: {	
 			isLogin(){
diff --git a/src/js/server.js b/src/js/server.js
index c671b75..dc191c7 100644
--- a/src/js/server.js
+++ b/src/js/server.js
@@ -1,5 +1,6 @@
 import util from '../utils/util';
 // import { app as vm } from '../main';
+import { app as vm } from '../main';
 const islog = true;
 
 
@@ -27,6 +28,9 @@ export class Server {
                     method: method,
                     data: res,
                 })
+
+                handleUserExceptions({ res });
+
                 if(isDefaultGet){
                     if(failMsg == '')throw Error('默认回调，失败提示不能为空 key -> failMsg');
                     defaultGet({
@@ -70,6 +74,14 @@ export class Server {
             reject({url,res,data});
           }
       }
+      // 用户信息异常
+      function handleUserExceptions({ res }){
+        if(res?.data?.code === 401&&res?.data?.message?.indexOf('用户') !== -1){
+          console.log('用户信息异常，请重新登录');
+          const _store = vm.$store;
+          _store.commit('setLoginState', { loginState: false });
+        }
+      }
   }
   get({url,data={},header={},isDefaultGet=true,failMsg=''}){
     return this.request(url,data,'GET',header,isDefaultGet,failMsg);
diff --git a/src/main.js b/src/main.js
index 38f2407..049f478 100644
--- a/src/main.js
+++ b/src/main.js
@@ -6,8 +6,9 @@ Vue.config.productionTip = false
 
 App.mpType = 'app'
 
-const app = new Vue({
+export const app = new Vue({
   ...App,
   store
 })
 app.$mount()
+
diff --git a/src/pages.json b/src/pages.json
index 5e5e3a7..e1bf9d5 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -4,7 +4,8 @@
 			"path": "pages/index/index",
 			"style": {
 				"componentPlaceholder": {
-					"bottom-logo": "view"
+					"bottom-logo": "view",
+					"authorization-login": "view"
 				}
 			}
 		},
@@ -969,6 +970,17 @@
 					}
 				}
 			]
+		},
+		{
+			"root": "subpackage/authorization",
+			"pages": [
+				{
+					"path": "pages/index",
+					"style" : {
+						"navigationBarTitleText": "" 
+					}
+				}
+			]
 		}
 	],
 	"globalStyle": {
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 848b883..6751c16 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -2,22 +2,22 @@
 	<view class="index-container">
 		<view class="ic-content">
 			<view class="ic-header">
-				<view class="ih-address" v-if="loginStatus" @click="toStoreList">
+				<view class="ih-address" v-if="loginState" @click="toStoreList">
 					<view>{{indexData.brand_name || '-'}}(共{{indexData.stadium_num || '0'}}家)</view>
 					<image src="/static/images/icon/arrow_ff.png" mode="aspectFit"></image>
 				</view>
 				<view v-else class="ih-btn" hover-class="hover-active" @click="showAuthor">点击登陆</view>
 				<block v-if="isPermissionShowTab({ serverKey: 1001 })">
 					<view class="ih-tip">今日总收入</view>
-					<view class="ih-price"><text>{{loginStatus?'¥':''}}</text>{{loginStatus?(indexData.amount || '0'):'***'}}</view>
+					<view class="ih-price"><text>{{loginState?'¥':''}}</text>{{loginState?(indexData.amount || '0'):'***'}}</view>
 					<view class="ih-amount">
 						<view>
 							<view>收款笔数</view>
-							<view>{{loginStatus?(indexData.in_count || '0'):'**'}}</view>
+							<view>{{loginState?(indexData.in_count || '0'):'**'}}</view>
 						</view>
 						<view>
 							<view>退款笔数</view>
-							<view>{{loginStatus?(indexData.out_count || '0'):'**'}}</view>
+							<view>{{loginState?(indexData.out_count || '0'):'**'}}</view>
 						</view>
 					</view>
 				</block>
@@ -52,33 +52,9 @@
 		
 		<bottom-logo></bottom-logo>
 
-		<view class="ox-dark-mask" v-if="isShowAuthorModal">
-			<view class="ic-author-modal">
-				<view class="iam-title">微信授权</view>
-				<view class="iam-tip">您的信息和数据将受到保护</view>
-				<image class="iam-pic" mode="aspectFit" src="/static/images/icon/author_modal.png"></image>
-				<view class="iam-btns">
-					<button plain hover-class="hover-active" @click="cancelAuthor">取消</button>
+		<authorization-login ref="authorizationLogin"></authorization-login>
 
-					<button 
-						v-if="isProfile"
-						plain 
-						hover-class="hover-active" 
-						@click="profileConfirm"
-					>授权并登录</button>
-					<button 
-						v-else
-						plain 
-						hover-class="hover-active" 
-						open-type="getUserInfo"
-						lang="zh_CN"
-						@getuserinfo="confirmAuthor"
-					>授权并登录</button>
-				</view>
-			</view>
-		</view>
-
-		<view class="fly_btn"  @click="toPageInfo(tabList[4])" v-if="loginStatus">
+		<view class="fly_btn"  @click="toPageInfo(tabList[4])" v-if="loginState">
 			<image class="f_bg" src="/static/images/icon/index/green_bg_circle.png" mode="scaleToFill"/>
 			<image class="f_icon" src="/static/images/icon/index/scan_icon_white.png" mode="scaleToFill"/>
 			<text>核销</text>
@@ -91,7 +67,9 @@
 	import util from '../../utils/util';
 	import { servers } from '../../js/server';
 	import { API } from '../../js/api';
+	import { mapGetters } from 'vuex';
 	import bottomLogo from "@/subpackage/menu/components/bottom_logo.vue";
+	import authorizationLogin from "@/subpackage/authorization/components/login.vue";
 	const tabList = [
 		{
 			id: 0,
@@ -176,57 +154,34 @@
 	];
 	
 	const app = getApp();
-	
-	// #ifndef H5
-	
-	const uniGetSetting = util.promisify(uni.getSetting);
-	const uniLogin = util.promisify(uni.login);
-	const uniGetUserInfo= util.promisify(uni.getUserInfo);
 	const APPID = uni.getAccountInfoSync().miniProgram.appId;
-
-	// #endif
-	
-	// #ifdef H5
-	const APPID = "wx7106e84614cf0060" //TODO
-	// #endif
 	
 	export default {
-		components: { bottomLogo },
+		components: { bottomLogo, authorizationLogin },
 		computed: {
-			isProfile: _=>util.isProfile(),
-			// loginStatus(){
-			// 	return app.isLogin();
-			// }
+			...mapGetters([ 'loginState' ]),
 		},
 		data() {
 			return {
 				tabList,
-				isShowAuthorModal: false,
 				indexData: {},
-				loginStatus: false,
 			}
 		},
 		async onLoad(options) {	
-			
 			try{
-				util.showLoad();
+				let _loginRes = {};
 				// 20230829 新增平台账户不绑定，不检验，每次进来走重新登陆绑定流程
-				if(options.role !== 'ADMIN-PLATFORM')await this.checkUserAuthor();
-	
-				util.hideLoad();
-				this.loginStatus = app.isLogin();
-				if(!!app.isLogin())this.getIndexInfo();
+				if(options.role !== 'ADMIN-PLATFORM')_loginRes = await this.$store.dispatch('checkUserAuthor');
+				// 20240325 新增openid绑定账号检测
+				if(_loginRes?.data === '')this.webBrandUserCheck();
+				if(_loginRes?.data)this.getIndexInfo();
 			}catch(err){
-				util.hideLoad();
-				uni.removeStorageSync('token');
-				// util.showNone(err.message || '身份校验失败！');
-				console.log('onLoad err',err);
-				this.loginStatus = app.isLogin();
+				console.warn('pages index onLoad err--->', err);
 			}
 		},
 		onShow(){
-			let { indexData } = this; 
-			if(JSON.stringify(indexData)!='{}'&&!!app.isLogin())this.getIndexInfo();
+			let { indexData, loginState, getIndexInfo } = this; 
+			if(JSON.stringify(indexData)!='{}'&&loginState)getIndexInfo();
 		},
 		methods: {
 			// 账号有开启了权限的才显示菜单，否则不显示【ID1000840】
@@ -238,13 +193,13 @@
 				return false;
 			},
 			toNoticeList(){
-				if(!app.isLogin())return this.showAuthor();
+				if(!this.loginState)return this.showAuthor();
 				util.routeTo(`/pages/message/list/list`,'nT');
 			},
 			toPageInfo(tabInfo){
-				let { indexData } = this;
+				let { indexData, loginState } = this;
 				let _permission = indexData.permission || {};
-				if(!app.isLogin())return this.showAuthor();
+				if(!loginState)return this.showAuthor();
 				if(!tabInfo.path)return util.showNone('暂未开放！');
 				//if(tabInfo.id == 2)return util.routeTo(tabInfo.path,'nT'); //测试
 				if(!_permission[tabInfo.serverKey])return util.showNone('暂无权限，请联系管理员开启！')
@@ -259,7 +214,6 @@
 				if([ 10, 11, 4 ].includes(tabInfo.id))return util.routeTo(tabInfo.path + `?brand_id=${indexData.brand.id}`,'nT');
 
 				if(tabInfo.id === 12){
-					// if(!indexData.brand.mini_wechat_appid)return util.showNone('暂无appid！')
 					let url = tabInfo.path + `?appid=${indexData.brand.mini_wechat_appid}`
 					console.log(222,url)
 					return util.routeTo(url,'nT');
@@ -280,137 +234,15 @@
 					this.$store.commit('setBrandInfo',res);
 				})
 			},	
-			// 看是否授权，清除token
-			async checkUserAuthor(){
-				try{
-					let loginRes =""
-					// #ifndef H5
-					loginRes = await uniLogin();
-					// #endif
-					// #ifdef H5
-					loginRes = {errMsg: "login:ok", code: "0c3xEi0w3kr1t23zcU3w3ZQR3w3xEi0h"} //TODO 设置H5测试数据
-					// #endif
-					console.log(loginRes)
-					return servers.get({
-						url: API.wechatMiniAppLoginAndSync,
-						data: {
-							code: loginRes.code,
-							appid: APPID,
-							// #ifdef H5
-							token:"3d2b0092-e761-11ee-8a66-5254005df464", //TODO
-							// #endif
-						},
-						isDefaultGet: false,
-					})
-					.then(res=>{
-						util.hideLoad();
-						let _data = res.data;
-						if(_data.code == 0){
-							// let _data = res.data.data;
-
-							if(_data.data == ''){
-								uni.removeStorageSync('token');
-								this.loginStatus = app.isLogin();
-								// 20240325 新增openid绑定账号检测
-								this.webBrandUserCheck();
-
-								// return util.routeTo(`/pages/login/login`,'rL');
-							}
-							uni.setStorageSync('token',_data.data);
-							return _data;
-						}else{
-							util.showNone(_data.message || '校验身份失败！');
-							throw res.data || {};
-						}
-						
-					})
-					.catch(err=>{
-						throw err;
-					})
-				}catch(err){
-					throw err;
-				}
-			},
 			showAuthor(){
-				this.isShowAuthorModal = true
-			},
-			closeAuthor(){
-				this.isShowAuthorModal = false
-			},
-			cancelAuthor(){
-				this.closeAuthor();
-			},
-			getLoginQuery({
-				userInfo,
-				loginRes
-			}){
-				return {
-					appid: APPID,
-					code: loginRes.code,
-					encryptedData: userInfo.encryptedData,
-					// is_details: 1,
-					// 后端解密错误，直接传用户信息
-					user_info: userInfo.userInfo,
-					user_raw_data: userInfo.rawData,
-					...userInfo.userInfo,
-				}
-			},
-			// 新获取用户信息
-			profileConfirm(){
-				uni.getUserProfile({
-					lang: 'zh_CN', desc: '授权登陆',
-					success: res => {
-						this.confirmAuthor({detail: {...res}});
+				this.$refs?.authorizationLogin?.alert?.({
+					success: ()=>{
+						setTimeout(this.getIndexInfo, 1000);
 					},
-					fail: function(err) {
-						util.showNone('获取用户信息失败！请重试');
-						console.warn('getUserProfile Err', err)
+					fail: err =>{
+						// console.warn('pages index showAuthor authorizationLogin Err ->', err)
 					}
 				})
-			},	
-
-			async confirmAuthor(userRes){
-				if(!userRes.detail.userInfo){
-					this.closeAuthor();
-					return util.showNone('获取用户信息失败！请稍后重试');
-				}
-				let loginRes = await uniLogin();
-
-				if(!loginRes.code){
-					this.closeAuthor();
-					return util.showNone('获取登陆凭证失败！稍后重试');
-				}
-
-				servers.post({
-					url: API.wechatMiniAppLoginAndSync,
-					data: this.getLoginQuery({
-						userInfo: userRes.detail,
-						loginRes
-					}),
-					isDefaultGet: false,
-				})
-				.then(res=>{
-					util.hideLoad();
-					let _data = res.data || {};
-					if(_data.code == 0){
-						if(_data.data == '')return util.routeTo(`/pages/login/login`,'rL');
-						util.showNone(_data.message || '登陆成功！');
-						// let _data = res.data.data;
-						// if(_data.user.role == '')return util.routeTo(`/pages/merchant_login/merchant_login`,'rL');
-						
-						uni.setStorageSync('token',_data.data);
-						setTimeout(_=>{
-							this.getIndexInfo();
-							this.closeAuthor();
-							this.loginStatus = app.isLogin();
-						}, 1200);
-					}else{
-						util.showNone(_data.message || '后台登陆失败！');
-						setTimeout(_=>this.closeAuthor(), 1200);
-					}
-					
-				}).catch(util.hideLoad)
-
 			},
 			webBrandUserCheck(){
 
@@ -456,8 +288,8 @@
 				})
 			},
 			toStoreList(){
-				if(!app.isLogin())return this.showAuthor();
-				let { indexData } = this;
+				let { indexData, loginState } = this;
+				if(!loginState)return this.showAuthor();
 				util.routeTo(`/pages/store_list/store_list?brand_id=${indexData.brand.id}`,'nT');
 			},
 			bindUserOpenid(){
@@ -687,57 +519,6 @@
 			
 		}
 	}
-	.ic-author-modal{
-		position: absolute;
-		left: 50%;
-		top: 50%;
-		transform: translate(-50%, -50%);
-		padding-top: 60upx;
-		width: 662upx;
-		height: 884upx;
-		border-radius: 10upx;
-		background-color: #fff;
-		.iam-title{
-			margin-bottom: 22upx;
-			text-align: center;
-			line-height: 60upx;
-			font-size: 44upx;
-			font-weight: 500;
-			color: #1a1a1a;
-		}
-		.iam-tip{
-			margin-bottom: 52upx;
-			line-height: 40upx;
-			text-align: center;
-			font-size: 28upx;
-			color: #9c9c9f;
-		}
-		.iam-pic{
-			margin: 0 auto 62upx;
-			display: block;
-			width: 488upx;
-			height: 416upx;
-		}
-		.iam-btns{
-			@include centerFlex(center);
-			>button{
-				margin: 0 20upx;
-				width: 240upx;
-				height: 92upx;
-				line-height: 88upx;
-				text-align: center;
-				border-radius: 46upx;
-				border: 2upx solid $themeColor;
-				font-size: 32upx;
-				color: $themeColor;
-				&+button{
-					background-color: $themeColor;
-					color: #fff;
-				}
-			}
-		}
-
-	}
 
 	// fly_btn
 	.fly_btn{
diff --git a/src/store/actions.js b/src/store/actions.js
index 2babf68..c5ebddc 100644
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -1,7 +1,7 @@
 // 异步方法
 import { servers } from '../js/server';
 import { API } from '../js/api';
-import { showLoad, hideLoad, showModal } from '../utils/util';
+import { showLoad, hideLoad, showModal, promisify } from '../utils/util';
 
 export default {
     getBrandInfo({commit, state}){
@@ -56,4 +56,45 @@ export default {
             // return Promise.reject(err);
         })
     },
+    // 看是否授权，清除token 也可以理解自动登陆
+    async checkUserAuthor({ commit, state }){
+        let loginRes = {};
+        try{
+            const uniLogin = promisify(uni.login);
+            loginRes = await uniLogin();
+        }catch(err){
+            console.warn('store actions checkUserAuthor login err', err);
+            showModal({ content: '获取登陆凭证失败！请稍后重新登录！' });
+            return Promise.reject(err);
+        }
+        showLoad();
+        return servers.post({
+            url: API.wechatMiniAppLoginAndSync,
+            data: {
+                code: loginRes.code,
+                appid: state.APPID,
+            },
+            isDefaultGet: false,
+        })
+        .then(res => {
+            hideLoad();
+            let _data = res?.data || {};
+            if(_data.code === 0){
+                if(_data.data === ''){
+                    commit('setLoginState', { loginState: false, token: '' });
+                    return _data;
+                }
+                commit('setLoginState', { loginState: true, token: _data.data });
+                return _data;
+            }else{
+                return Promise.reject(_data);
+            }
+        })
+        .catch(err=>{
+            console.warn('store actions checkUserAuthor wechatMiniAppLoginAndSync err --->', err);
+            hideLoad();
+            showModal({ content: err?.message || '静默登录失败！请稍后重试！' });
+            return Promise.reject(err);
+        })
+    },
 }
\ No newline at end of file
diff --git a/src/store/index.js b/src/store/index.js
index 38ef2f5..6c1f777 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -54,7 +54,8 @@ export default new Vuex.Store({
             typeInfo: {},   // 球场类型
             venueList: [],  // 选择场地列表
             orderInfo: {},  // 订单信息 // 20230620 新增挂账需求，用于回显确认订单
-        }
+        },
+        isLogin: false,  // 登陆状态
     },
     mutations,
     actions,
@@ -69,6 +70,12 @@ export default new Vuex.Store({
             }
             console.warn(_arr.length)
             return _arr;
+        },
+        loginState: state =>{
+            let _isLogin = state.isLogin;
+            let _token = uni.getStorageSync('token');
+            // 只是想获得一个响应的token状态
+            if(_isLogin || !_isLogin)return !!_token;
         }
     }
 });
diff --git a/src/store/mutations.js b/src/store/mutations.js
index 0918706..4d9a91d 100644
--- a/src/store/mutations.js
+++ b/src/store/mutations.js
@@ -10,5 +10,18 @@ export default {
     // 场地占用信息
     setOccupyInfo(state, _occupyInfo){
         state.occupyInfo = _occupyInfo;
+    },
+
+    //
+    setLoginState(state, { loginState = false, token = '' }){
+        console.log(loginState, token);
+        if(loginState&&token){
+            uni.setStorageSync('token', token);
+            state.isLogin = loginState;
+        }else{
+            uni.removeStorageSync('token', token);
+            state.isLogin = false;
+        }
+        
     }
 }
\ No newline at end of file
diff --git a/src/subpackage/authorization/components/login.vue b/src/subpackage/authorization/components/login.vue
new file mode 100644
index 0000000..635810e
--- /dev/null
+++ b/src/subpackage/authorization/components/login.vue
@@ -0,0 +1,190 @@
+<template>
+    <view class="authorization-login" v-show="isShow">
+        <view class="ic-author-modal">
+				<view class="iam-title">微信授权</view>
+				<view class="iam-tip">您的信息和数据将受到保护</view>
+				<image class="iam-pic" mode="aspectFit" src="../static/images/author_modal.png"></image>
+				<view class="iam-btns">
+					<button plain hover-class="hover-active" @click="hide">取消</button>
+
+					<button 
+						v-if="isProfile"
+						plain 
+						hover-class="hover-active" 
+						@click="profileConfirm"
+					>授权并登录</button>
+					<button 
+						v-else
+						plain 
+						hover-class="hover-active" 
+						open-type="getUserInfo"
+						lang="zh_CN"
+						@getuserinfo="confirmAuthor"
+					>授权并登录</button>
+				</view>
+			</view>
+    </view>
+</template>
+
+<script>
+import { promisify, showModal, showNone, showLoad, hideLoad } from "@/utils/util";
+import { AUTHOR_API } from "../js/api";
+import server from "../js/server";
+export default {
+    data(){
+        return {
+            isShow: false,
+            initData: {
+                /**
+                 * @param {Object} data
+                 * @param {Function} data.success
+                 * @param {Function} data.fail
+                 * */ 
+            },
+        }
+    },
+    methods: {
+        alert(data){
+            this.isShow = true;
+            this.initData = data ?? {};
+        },
+        hide(){
+            this.isShow = false;
+        },
+        isProfile(){
+            return !!uni.getUserProfile
+        },
+        // 新获取用户信息
+        profileConfirm(){
+            uni.getUserProfile({
+                lang: 'zh_CN', desc: '授权登陆',
+                success: res => { this.confirmAuthor({detail: {...res}}) },
+                fail: err => {
+                    showModal({ content: '获取用户信息失败！请重试' });
+                    console.warn('subpackage authorization components login getUserProfile Err ->', err)
+                }
+            })
+        },
+        async confirmAuthor(userRes){
+            if(!userRes.detail.userInfo){
+                this.hide();
+                return showModal({ content: '获取用户信息失败！请稍后重试' });
+            }
+
+            let loginRes = await promisify(uni.login)();
+            if(!loginRes.code){
+                this.hide();
+                return showModal({ content: '获取登陆凭证失败！请稍后重试' });
+            }
+            this.serverLogin({ userRes, loginRes })
+        },
+        getLoginQuery({
+            userInfo,
+            loginRes
+        }){
+            return {
+                appid: uni.getAccountInfoSync?.()?.miniProgram?.appId ?? '',
+                code: loginRes?.code ?? '',
+                encryptedData: userInfo?.encryptedData ?? '',
+                // is_details: 1,
+                // 后端解密错误，直接传用户信息
+                user_info: userInfo?.userInfo ?? {},
+                user_raw_data: userInfo?.rawData ?? {},
+                ...(userInfo?.userInfo ?? {}),
+            }
+        },
+        serverLogin({ userRes, loginRes }){
+            showLoad();
+            return server.post({
+                url: AUTHOR_API.wechatMiniAppLoginAndSync,
+                data: this.getLoginQuery({
+                    userInfo: userRes.detail,
+                    loginRes
+                }),
+                isDefaultGet: false,
+            })
+            .then(res=>{
+                hideLoad();
+                let _data = res.data || {};
+                if(_data.code == 0){
+                    if(_data.data == '')return util.routeTo(`/pages/login/login`,'rL');
+                    showNone(_data?.message || '登陆成功！');
+                    this.$store.commit('setLoginState', { loginState: true, token: _data.data });
+                    this.initData?.success?.(_data);
+                    this.hide();
+                    return _data;
+                }else{
+                    // util.showNone(_data.message || '后台登陆失败！');
+                    // setTimeout(_=>this.closeAuthor(), 1200);
+                    return Promise.reject(_data);
+                }
+            })
+            .catch(err=>{
+                hideLoad();
+                showModal({ content: err?.message || '后台登陆失败！' });
+                console.warn('subpackage authorization components login serverLogin Err ->', err);
+                if(this.initData?.fail)return this.initData?.fail?.(err);
+                return Promise.reject(err);
+            })
+        },
+        cancelAuthor(){
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+    .authorization-login{
+        position: fixed;
+		left: 0;
+		top: var(--window-top);
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, .5);
+    }
+
+    .ic-author-modal{
+		position: absolute;
+		left: 50%;
+		top: 50%;
+		transform: translate(-50%, -50%);
+		padding-top: 60upx;
+		width: 662upx;
+		height: 884upx;
+		border-radius: 10upx;
+		background-color: #fff;
+		.iam-title{
+			margin-bottom: 22upx;
+			text-align: center;
+            @include flcw(44upx, 60upx, #1a1a1a, 500);
+		}
+		.iam-tip{
+			margin-bottom: 52upx;
+			text-align: center;
+            @include flcw(28upx, 40upx, #9c9c9f);
+		}
+		.iam-pic{
+			margin: 0 auto 62upx;
+			display: block;
+			width: 488upx;
+			height: 416upx;
+		}
+		.iam-btns{
+			@include ctf(center);
+			>button{
+				margin: 0 20upx;
+				width: 240upx;
+				height: 92upx;
+				text-align: center;
+				border-radius: 46upx;
+				border: 2upx solid $mColor;
+                @include flcw(32upx, 88upx, $mColor);
+				&+button{
+					background-color: $mColor;
+					color: #fff;
+				}
+			}
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/src/subpackage/authorization/js/api.js b/src/subpackage/authorization/js/api.js
new file mode 100644
index 0000000..5b8b559
--- /dev/null
+++ b/src/subpackage/authorization/js/api.js
@@ -0,0 +1,7 @@
+import { ORIGIN } from '@/js/api';
+
+export const AUTHOR_API = { 
+    wechatMiniAppLoginAndSync: `${ORIGIN}/assistant/WechatMiniAppGetToken`,  //  小程序授权获取token，为空就登录
+}
+
+export default AUTHOR_API;
\ No newline at end of file
diff --git a/src/subpackage/authorization/js/server.js b/src/subpackage/authorization/js/server.js
new file mode 100644
index 0000000..ac1b071
--- /dev/null
+++ b/src/subpackage/authorization/js/server.js
@@ -0,0 +1,10 @@
+import { Server } from '@/js/server';
+
+class _Server extends Server {
+    constructor(props){
+        super(props)
+    }
+}
+
+
+export default new _Server();
\ No newline at end of file
diff --git a/src/subpackage/authorization/pages/index.vue b/src/subpackage/authorization/pages/index.vue
new file mode 100644
index 0000000..b3f8694
--- /dev/null
+++ b/src/subpackage/authorization/pages/index.vue
@@ -0,0 +1,16 @@
+<template>
+    <!-- 需要定义一个页面以及在pagesjson里声明才能生成static文件夹 -->
+    <view>&nbsp;</view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+    page{
+        background: #fff;
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/authorization/static/images/author_modal.png b/src/subpackage/authorization/static/images/author_modal.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e3612314f6f3e6f628de1ea7b9493c670bec96e
GIT binary patch
literal 14649
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
ZF=3YyEyDvK{{39TP*>Ig)GFFU{U5=)GzI_w

literal 0
HcmV?d00001


From 012285f53969993107efe12cbe410195fca3666f Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Wed, 22 Jan 2025 16:11:18 +0800
Subject: [PATCH 21/30] add tid1807 logic for mine

---
 src/App.vue                                      |   2 +-
 src/js/api.js                                    |   4 +
 src/pages.json                                   |   3 +-
 src/pages/menu/forth.vue                         | 110 ++++++++++++++++++++---
 src/pages/web_view/web_view.vue                  |   3 +-
 src/subpackage/menu/components/mine/header.vue   |  36 ++++++--
 src/subpackage/menu/components/mine/line_tab.vue |   4 +-
 7 files changed, 135 insertions(+), 27 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 65974ff..541ee89 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,7 +3,7 @@
 	import util from './utils/util';
 	export default {
 		onLaunch: function() {
-			this.$store.commit('setLoginState', { loginState: false });
+			// this.$store.commit('setLoginState', { loginState: false });
 			this.updateManager();
 		},
 		methods: {	
diff --git a/src/js/api.js b/src/js/api.js
index 550179d..a20f901 100644
--- a/src/js/api.js
+++ b/src/js/api.js
@@ -167,5 +167,9 @@ API['party'] = {
   bindingOpenId: `${ORIGIN}/assistant/bindingOpenId`, //改为小程序端绑定openid
 }
 
+API['mine'] = {
+  userCurrent:`${ORIGIN}/user/current`, //获取账户信息, （不要传品牌id）
+}
+
 export default { ORIGIN, API };
 
diff --git a/src/pages.json b/src/pages.json
index e1bf9d5..a0aded5 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -16,7 +16,8 @@
 				"componentPlaceholder": {
 					"mine-header": "view",
 					"bottom-logo": "view",
-					"line-tab": "view"
+					"line-tab": "view",
+					"authorization-login": "view"
 				}
 			}
 		},	
diff --git a/src/pages/menu/forth.vue b/src/pages/menu/forth.vue
index a34ac52..470db83 100644
--- a/src/pages/menu/forth.vue
+++ b/src/pages/menu/forth.vue
@@ -1,29 +1,49 @@
 <template>
     <view class="forth-menu">
-        <mine-header @on:munted="menuPackageLoaded = true"></mine-header>
+        <mine-header
+            @on:munted="menuPackageLoaded = true"
+            :is-login="loginState"
+            @click:login="loginBtn"
+            :nickname="userInfo.nickname"
+            :name="userInfo.actual_name"
+            :account="userInfo.mobile"
+            :photo="userInfo.avatar_url"
+            
+        ></mine-header>
         <block v-if="menuPackageLoaded">
             <line-tab :icon-num='0'>
                 <template slot="default">账号管理</template>
                 <template slot="right">
                     <view class="ft-account">
-                        <view class="fc-name">账号名</view>
+                        <view class="fc-name"  v-if="loginState">{{ extension.brand_name || '-' }}</view>
                         <image class="fc-icon" mode="aspectFit" src="/static/images/icon/arrow_b2.png"></image>
                     </view>
                 </template>
             </line-tab>
-            <line-tab :icon-num='1'>帮助中心</line-tab>
-            <line-tab :icon-num='2'>教练助手</line-tab>
-            <line-tab :icon-num='3'>
-                <template slot="default">收银系统</template>
-                <template slot="right">
-                    <view class="fm-copy">(复制网址)</view>
-                </template>
-            </line-tab>
-            <line-tab :icon-num='4'>总后台(<text class="fm-txt">admin.ouxuanzhineng.cn <text class="ft-copy">复制</text></text>)</line-tab>
+            <line-tab :icon-num='1' @click="toWebView(deadData.helpCenterLink)">帮助中心</line-tab>
+            <block v-if="loginState">
+                <line-tab :icon-num='2' @click="toMiniProgram(deadData.assistantCoachAppid)">教练助手</line-tab>
+                <line-tab :icon-num='3'>
+                    <template slot="default">收银系统</template>
+                    <template slot="right">
+                        <view class="fm-copy" @click="copyLink(deadData.cashierSystemLink)">(复制网址)</view>
+                    </template>
+                </line-tab>
+                <line-tab :icon-num='4'>
+                    <template slot="default">总后台</template>
+                    <template slot="right">
+                        <view class="fm-copy" @click="copyLink(deadData.backstageLink)">(复制网址)</view>
+                    </template>
+                </line-tab>
+            </block>
+            
+            <!-- <line-tab :icon-num='4'>总后台(<text class="fm-txt">{{ deadData.backstageLink }}<text class="ft-copy" @click="copyLink(deadData.backstageLink)">复制</text></text>)</line-tab> -->
             <line-tab :icon-num='5' @click="toComplaint">投诉建议</line-tab>
-            <line-tab :icon-num='6'>解绑退出</line-tab>
+            <line-tab :icon-num='6' v-if="loginState">解绑退出</line-tab>
         </block>
         <bottom-logo></bottom-logo>
+
+        <authorization-login ref="authorizationLogin"></authorization-login>
     </view>
 </template>
 
@@ -31,27 +51,89 @@
 import mineHeader from "@/subpackage/menu/components/mine/header.vue";
 import lineTab from "@/subpackage/menu/components/mine/line_tab.vue";
 import bottomLogo from "@/subpackage/menu/components/bottom_logo.vue";
-import { routeTo, debounce, showLoad, hideLoad, showModal, showNone } from "@/utils/util.js";
+import authorizationLogin from "@/subpackage/authorization/components/login.vue";
+import { routeTo, debounce, showLoad, hideLoad, showModal, showNone, jsonStr } from "@/utils/util.js";
+import { mapGetters } from 'vuex';
+import { servers } from '../../js/server';
+import { API } from '../../js/api';
 export default {
     components:{
         mineHeader,
         lineTab,
         bottomLogo,
+        authorizationLogin,
     },
     data(){
         return {
             brand_id: '',
-            menuPackageLoaded: false
+            menuPackageLoaded: false,
+            userInfo: {},
+            deadData: {
+                helpCenterLink: 'https://help.ouxuanzhineng.cn/', // 帮助中心
+                cashierSystemLink: 'https://kb.ouxuanzhineng.cn/', // 收银系统
+                backstageLink: 'https://admin.ouxuanzhineng.cn/', // 总后台
+                assistantCoachAppid: 'wxd71043ec955dfecf', // 教练助手：AppID
+            },
         }
     },
+    computed: {
+        ...mapGetters([ 'loginState' ]),
+        extension(){
+            return this.userInfo?.extension || {}
+        },
+    },
     onLoad(options){
         this.brand_id = options?.brand_id ?? '';
+        if(this.loginState)this.getUserInfo();
     },
     methods: {
+        toMiniProgram(appid){
+            uni.navigateToMiniProgram({ appId: appid });
+        },
+        toWebView(url){
+            routeTo(`/pages/web_view/web_view?src=${jsonStr(url)}`, 'nT');
+        },
+        copyLink(url){
+            uni.setClipboardData({ data: url });
+        },
         toComplaint(){
             let { brand_id } = this;
             routeTo(`/subpackage/message/pages/complaint/list?brand_id=${brand_id}`, 'nT');
         },
+        loginBtn(){
+            this.$refs?.authorizationLogin?.alert?.({
+                success: ()=>{
+                    this.getUserInfo();
+                },
+                fail: err =>{
+                    // console.warn('pages index showAuthor authorizationLogin Err ->', err)
+                }
+            })
+        },
+        getUserInfo(){
+            showLoad();
+            return servers.post({
+                url: API.mine.userCurrent,
+                data: {},
+                isDefaultGet: false,
+            })
+            .then(res => {
+                hideLoad();
+                let _data = res?.data || {};
+                if(_data.code === 0){
+                    this.userInfo = _data?.data || {};
+                    console.log('pages menu getUserInfo res --->', _data);
+                }else{
+                    return Promise.reject(_data);
+                }
+            })
+            .catch(err => {
+                hideLoad();
+                showModal({ content: err?.message || '加载用户失败！' });
+                console.warn('pages menu getUserInfo err --->', err);
+                // return Promise.reject(err);
+            })
+        },
     }
 }
 </script>
diff --git a/src/pages/web_view/web_view.vue b/src/pages/web_view/web_view.vue
index 5b8a040..0437b78 100644
--- a/src/pages/web_view/web_view.vue
+++ b/src/pages/web_view/web_view.vue
@@ -2,6 +2,7 @@
     <web-view :src="address"></web-view>
 </template>
 <script>
+import { jsonPar } from "@/utils/util.js";
 export default {
     data(){
         return {
@@ -10,7 +11,7 @@ export default {
     },
     onLoad(options){
         console.log('web_view options', options);
-        this.address = decodeURIComponent(options?.src || 'https://www.ouxuanzhineng.cn');
+        this.address = jsonPar(decodeURIComponent(options?.src ?? ''));
     }
 }
 </script>
\ No newline at end of file
diff --git a/src/subpackage/menu/components/mine/header.vue b/src/subpackage/menu/components/mine/header.vue
index 3ee60ac..712f6af 100644
--- a/src/subpackage/menu/components/mine/header.vue
+++ b/src/subpackage/menu/components/mine/header.vue
@@ -1,20 +1,42 @@
 <template>
     <view class="mine-header">
         <view class="mh-user">
-            <image class="mu-photo"></image>
-            <view class="mu-info" v-if="false">
-                <view class="mi-line">昵称：猫星人</view>
-                <view class="mi-line">姓名：小雪</view>
-                <view class="mi-line">账号：18316553872</view>
+            <image class="mu-photo" mode="aspectFill" :src="photo"></image>
+            <view class="mu-info" v-if="isLogin">
+                <view class="mi-line">昵称：{{ nickname || '-' }}</view>
+                <view class="mi-line">姓名：{{ name || '-' }}</view>
+                <view class="mi-line">账号：{{ account || '-' }}</view>
             </view>
-            <button v-else class="mu-login">点击登录</button>
+            <button v-else class="mu-login" @click="$emit('click:login')">点击登录</button>
         </view>
-        <view class="mh-update">更新头像昵称</view>
+        <view class="mh-update"  v-if="isLogin" @click="$emit('click:update')">更新头像昵称</view>
     </view>
 </template>
 
 <script>
 export default {
+    props: {
+        isLogin: {
+            type: Boolean,
+            default: false
+        },
+        nickname: {
+            type: String,
+            default: ''
+        },
+        name: {
+            type: String,
+            default: ''
+        },
+        account: {
+            type: String,
+            default: ''
+        },
+        photo: {
+            type: String,
+            default: ''
+        }
+    },
     mounted(){
         console.log('mounted');
         this.$emit('on:munted');
diff --git a/src/subpackage/menu/components/mine/line_tab.vue b/src/subpackage/menu/components/mine/line_tab.vue
index 191ae01..1fdd4fe 100644
--- a/src/subpackage/menu/components/mine/line_tab.vue
+++ b/src/subpackage/menu/components/mine/line_tab.vue
@@ -43,17 +43,15 @@ export default {
         .lt-right{
             flex-grow: 1;
             @include ctf(space-between);
-            flex-grow: 1;
             .lr-left{
                 .lr-name{
                     @include flcw(32upx, 48upx, #9A9A9D);
                     @include tHide;
                 }
             }
-            
             .lr-right{
                 flex-shrink: 0;
-                max-width: 40%;
+                max-width: 60%;
                 font-size: 0;
                 .lr-arrow{
                     width: 30upx;

From 4725a19a27fc681b19c6d859753fb265ae5bd6e3 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Wed, 22 Jan 2025 16:45:36 +0800
Subject: [PATCH 22/30] finish logic for mine

---
 src/js/api.js                                      |   1 +
 src/pages.json                                     |   3 +-
 src/pages/menu/forth.vue                           |  58 +++-
 .../components/user_info/iconfont.css              |  25 ++
 .../authorization/components/user_info/impower.vue | 132 ++++++++
 .../components/user_info/tuniaoui-wx-user-info.vue | 357 +++++++++++++++++++++
 src/subpackage/authorization/js/api.js             |   2 +
 7 files changed, 575 insertions(+), 3 deletions(-)
 create mode 100644 src/subpackage/authorization/components/user_info/iconfont.css
 create mode 100644 src/subpackage/authorization/components/user_info/impower.vue
 create mode 100644 src/subpackage/authorization/components/user_info/tuniaoui-wx-user-info.vue

diff --git a/src/js/api.js b/src/js/api.js
index a20f901..7ab38f9 100644
--- a/src/js/api.js
+++ b/src/js/api.js
@@ -169,6 +169,7 @@ API['party'] = {
 
 API['mine'] = {
   userCurrent:`${ORIGIN}/user/current`, //获取账户信息, （不要传品牌id）
+  unbindAssistant:`${ORIGIN}/admin/user/unbindAssistant"`, // 解绑退出
 }
 
 export default { ORIGIN, API };
diff --git a/src/pages.json b/src/pages.json
index a0aded5..d007de2 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -17,7 +17,8 @@
 					"mine-header": "view",
 					"bottom-logo": "view",
 					"line-tab": "view",
-					"authorization-login": "view"
+					"authorization-login": "view",
+					"authorization-user": "view"
 				}
 			}
 		},	
diff --git a/src/pages/menu/forth.vue b/src/pages/menu/forth.vue
index 470db83..9af5aa4 100644
--- a/src/pages/menu/forth.vue
+++ b/src/pages/menu/forth.vue
@@ -8,7 +8,7 @@
             :name="userInfo.actual_name"
             :account="userInfo.mobile"
             :photo="userInfo.avatar_url"
-            
+            @click:update="updateUser"
         ></mine-header>
         <block v-if="menuPackageLoaded">
             <line-tab :icon-num='0'>
@@ -39,11 +39,12 @@
             
             <!-- <line-tab :icon-num='4'>总后台(<text class="fm-txt">{{ deadData.backstageLink }}<text class="ft-copy" @click="copyLink(deadData.backstageLink)">复制</text></text>)</line-tab> -->
             <line-tab :icon-num='5' @click="toComplaint">投诉建议</line-tab>
-            <line-tab :icon-num='6' v-if="loginState">解绑退出</line-tab>
+            <line-tab :icon-num='6' v-if="loginState" @click="unBindBtn">解绑退出</line-tab>
         </block>
         <bottom-logo></bottom-logo>
 
         <authorization-login ref="authorizationLogin"></authorization-login>
+        <authorization-user ref="authorizationUser"></authorization-user>
     </view>
 </template>
 
@@ -52,6 +53,7 @@ import mineHeader from "@/subpackage/menu/components/mine/header.vue";
 import lineTab from "@/subpackage/menu/components/mine/line_tab.vue";
 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 { servers } from '../../js/server';
@@ -62,6 +64,7 @@ export default {
         lineTab,
         bottomLogo,
         authorizationLogin,
+        authorizationUser,
     },
     data(){
         return {
@@ -87,19 +90,70 @@ export default {
         if(this.loginState)this.getUserInfo();
     },
     methods: {
+        // 解绑
+        unBindBtn: debounce(function(){
+            let { userInfo } = this;
+            if(!userInfo?.id)return showModal({ content: '用户信息有误' })
+            showModal({
+                content: '您确定要解绑退出吗？',
+                showCancel: true,
+                success: mRes=>{
+                    if(mRes.confirm)this.unBindReq(userInfo.id);
+                }
+            })
+            
+        }, 300, true),
+        // 解绑请求
+        unBindReq(user_id){
+            showLoad();
+            return servers.post({
+                url: API.mine.unbindAssistant,
+                data: { user_id },
+                isDefaultGet: false,
+            })
+            .then(res => {
+                hideLoad();
+                let _data = res?.data || {};
+                if(_data.code === 0){
+                    showNone('操作成功！');
+                    setTimeout(() => {
+                        this.$store.commit('setLoginState', { loginState: false });
+                        routeTo(`/pages/login/login`,'rL');
+                    }, 1000);
+                    console.log('pages menu unBindReq res --->', _data);
+                }else{
+                    return Promise.reject(_data);
+                }
+            })
+            .catch(err => {
+                hideLoad();
+                showModal({ content: err?.message || '操作失败！' });
+                console.warn('pages menu unBindReq err --->', err);
+                // return Promise.reject(err);
+            })
+        },
+        // 更新用户信息
+        updateUser(){
+            this.$refs?.authorizationUser?.show?.({ success: this.getUserInfo });
+        },
+        // 跳转小程序
         toMiniProgram(appid){
             uni.navigateToMiniProgram({ appId: appid });
         },
+        // 跳转网页
         toWebView(url){
             routeTo(`/pages/web_view/web_view?src=${jsonStr(url)}`, 'nT');
         },
+        // 复制链接
         copyLink(url){
             uni.setClipboardData({ data: url });
         },
+        // 投诉建议
         toComplaint(){
             let { brand_id } = this;
             routeTo(`/subpackage/message/pages/complaint/list?brand_id=${brand_id}`, 'nT');
         },
+        // 登录
         loginBtn(){
             this.$refs?.authorizationLogin?.alert?.({
                 success: ()=>{
diff --git a/src/subpackage/authorization/components/user_info/iconfont.css b/src/subpackage/authorization/components/user_info/iconfont.css
new file mode 100644
index 0000000..217a692
--- /dev/null
+++ b/src/subpackage/authorization/components/user_info/iconfont.css
@@ -0,0 +1,25 @@
+@charset "UTF-8";
+
+@font-face {
+  font-family: "tuniaoFont"; /* Project id 3784643 */
+  src: 
+       url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAN8AAsAAAAAB4gAAAMvAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACDBgqCQIIdATYCJAMMCwgABCAFhH8HPRuYBiMRpmvPIfurAzsYPj7DCVbrRAmElfXCs4V6xacO8aHO69VXu54tTy8h0hcJ7ufgieY+3+xscrn9B8wKQQFBywplLZCw9SwcOyZ5pKsoAQAbcICJTr7AjPPqr06NRkeIAemFpXv8cje1+/LkuLvD789WJZUANjOe9F76qptDOSMUui/Ua0WQKpZGXaqf5hHZdAD6x8tRJtRKtQd7j5UKkk6lWywYkGADCZBnGLugJd6CAI4GOjH956Ep4k7imdNkYTGFAkm2nJyPrBNwA7YhWwgQ/K4bLXITD8wl8xxuBN+XwyYJwOAp5jFjOwNbPNwd3l3WiyFAv3sCBLjcAB6gQM3GjLLSbJpDo1ANiqsiFiX7WAQzqTcMA06j/pb/eAbEx8yMAaAChg3sDjs6COwub8IAoAD4PEZkA7iAZClPKdicmJLc2OiZcQC3cV613sc3Ab9W7YItQtio9YgdKGjgr+ANlbg5gPvXFacv8IyvKTH4pcjV7VIcfnuIAUd3VCbxcCIKj++rvr/hpx/iwxd4/5mxDXeILbBp2+ByMIlGMuQEU3gjiVaMcXk8Dn2gWo5wuRwuIldLRqRwWogvmCRXE9/kSvrVQP4iFDVWRSbRakMk/AtcBYVpO6rpah1V9J/m/Wt+q8WfsOV+S5KFTGD5dwW9KFstZUs5smuYK3V495zwUG+r/Izf0PWtbWj/HUQsAL9u+cGK8NCiAgRnaRJ49fqljrxWc4PaKs4pQwBlMLUeAzgcEGLakvg5nCZ3zgTBkZzAEEUuFEeJyMrq4BGhGT6OPjiqGd4eIZkLKGKjgTKuAAgpPIAhjmdQUngnsrJdeKTxBz4pkgjHjJQeFqFMXv8PQqg0QP+F2cbAdoHqFmaM52jYlcbNoeTq4CtPkjzHAE1Zl0QvFEjGmp9fY6vKwBI9kOvIuQhJ4kJWy0k1dVXFVXcpbfTmIIRKA/RfmG0M7G1T3cKM8VwMXGlEnR1KY0uU+CTJnM1ODk1ZdxJdSOjYdGOp+TW2k6szsNg8qIvIuQipetFCVstpQCB1lcXHXUl5ZOpfdBvgMI9QMaJi8TZdzLS36K8/ueDZOWMAAA==') format('woff2'),
+       url('//at.alicdn.com/t/c/font_3784643_5jru9pe5fad.woff?t=1669045092678') format('woff'),
+       url('//at.alicdn.com/t/c/font_3784643_5jru9pe5fad.ttf?t=1669045092678') format('truetype');
+}
+
+[class*='tn-icon-'] {
+  font-family: 'tuniaoFont' !important;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  text-align: center;
+  text-decoration: none;
+}
+
+.tn-icon-close:before {
+  content: "\e74d";
+}
+
+.tn-icon-camera-fill:before {
+  content: "\e75d";
+}
diff --git a/src/subpackage/authorization/components/user_info/impower.vue b/src/subpackage/authorization/components/user_info/impower.vue
new file mode 100644
index 0000000..5fb815a
--- /dev/null
+++ b/src/subpackage/authorization/components/user_info/impower.vue
@@ -0,0 +1,132 @@
+<template>
+    <wx-user-info-modal
+        v-model="showAuthorizationModal"
+        @updated="updatedUserInfoEvent"
+        :isModal="isModal"
+        :alway="alway"
+    ></wx-user-info-modal>
+</template>
+
+<script>
+import WxUserInfoModal from './tuniaoui-wx-user-info.vue';
+import { AUTHOR_API } from '../../js/api';
+import servers from '../../js/server';
+import { showModal, jsonPar, showLoad, hideLoad } from '@/utils/util';
+export default {
+    components: { WxUserInfoModal },
+    props: {
+        isModal: {
+            type: Boolean,
+            default: true
+        },
+        alway: {
+            type: Boolean,
+            default: false
+        }
+    },
+    watch: {
+        showAuthorizationModal(nVal, oVal){
+            let { initData } = this;
+            if(!nVal&&oVal)initData?.close();
+        }
+    },
+    data() {
+        return {
+            showAuthorizationModal: false,
+            initData: {},
+        }
+    },
+    methods: {
+        show(data){
+            this.showAuthorizationModal = true;
+            this.initData = data;
+        },
+        hide(){
+            this.showAuthorizationModal = false;
+        },
+        // 获取到的用户信息
+        async updatedUserInfoEvent(info) {
+            let { initData, userEdit } = this;
+            try{
+                let _imgUrl = await this.uploadImg(info.avatar);
+                let _editObj = { nickname: info.nickname, avatar_url: _imgUrl };
+                await userEdit(_editObj);
+                initData?.success?.(_editObj);
+            }catch(err){
+                console.warn('authorize components user info impower updatedUserInfoEvent err --->', err)
+                initData?.fail?.(err);
+            }
+        },
+        // 上传头像
+        async uploadImg(url){
+            try{
+                showLoad();
+                let _imgInfo = await servers.uploadFile({
+                    url: AUTHOR_API.zs_user_avatar,
+                    filePath: url,
+                });
+                if(_imgInfo.statusCode != 200)throw(_imgInfo);
+                let _imgRes = jsonPar(_imgInfo.data);
+                if(_imgRes.code != 0)throw(_imgRes);
+                hideLoad();
+                return _imgRes.data.url || '';
+            }catch(err){
+                hideLoad();
+                showModal({ content: err?.errMsg ?? err?.message ?? '上传图片失败！' });
+                console.warn('authorize components user info impower uploadImg err --->', err)
+                return Promise.reject(err);
+            }
+        },
+        // 用户信息上传
+        userEdit({ nickname, avatar_url }){
+			showLoad();
+            return servers.post({
+                url: AUTHOR_API.changeAvatar,
+                data: { nickname, avatar_url },
+                isDefaultGet: false,
+            })
+            .then(res => {
+				hideLoad();
+                let _data = res?.data || {};
+                if(_data.code === 0){
+                    console.log('userEdit res--->', _data);
+					return _data?.data;
+                }else{
+                    return Promise.reject(_data);
+                }
+            })
+            .catch(err => {
+                hideLoad();
+                showModal({ content: err.message || '操作失败！' });
+                console.warn('authorize components user info impower userEdit err --->', err);
+				return Promise.reject(err);
+            })
+		},
+        // 刷新用户信息
+        refreshUserInfo(){
+            return servers.post({
+                url: ATR_API.userCurrent,
+                data: {},
+                isDefaultGet: false,
+            })
+            .then(res => {
+                let _data = res?.data || {};
+                if(_data.code === 0){
+                    uni.setStorageSync('userInfo', _data?.data);
+                    this.$store.commit('refreshUserInfo', _data?.data);
+					return _data?.data;
+                }else{
+                    return Promise.reject(_data);
+                }
+            })
+            .catch(err => {
+                console.warn('authorize components user info impower refreshUserInfo err --->', err);
+				// return Promise.reject(err);
+            })
+		}
+    }
+}
+</script>
+
+<style lang="scss"> 
+</style>
\ No newline at end of file
diff --git a/src/subpackage/authorization/components/user_info/tuniaoui-wx-user-info.vue b/src/subpackage/authorization/components/user_info/tuniaoui-wx-user-info.vue
new file mode 100644
index 0000000..0d9d7bc
--- /dev/null
+++ b/src/subpackage/authorization/components/user_info/tuniaoui-wx-user-info.vue
@@ -0,0 +1,357 @@
+<template>
+  <view
+    v-if="openModal || alway"
+    class="wx-authorization-modal"
+    :class="{ 'modal-class': isModal }"
+  >
+    <view
+      class="wam__mask"
+      @touchmove.prevent=""
+      @tap.stop="closeModal"
+    ></view>
+    
+    <!-- 内容区域 -->
+    <view class="wam__wrapper">
+      <!-- 关闭按钮 -->
+      <view class="wam__close-btn" @tap.stop="closeModal">
+        <text class="tn-icon-close"></text>
+      </view>
+      <!-- 标题 -->
+      <view class="wam__title">获取您的昵称、头像</view>
+      <!-- tips -->
+      <view class="wam__sub-title">
+        获取用户头像、昵称，主要用于向用户提供具有辨识度的用户中心界面
+      </view>
+      
+      <!-- 头像选择 -->
+      <view class="wam__avatar">
+        <view class="button-shadow">
+          <button
+            class="button"
+            open-type="chooseAvatar"
+            @chooseavatar="chooseAvatarEvent"
+          >
+            <view v-if="userInfo.avatar" class="avatar__image">
+              <image class="image" :src="userInfo.avatar" mode="aspectFill"></image>
+            </view>
+            <view v-else class="avatar__empty">
+              <!-- <image class="image" src="https://cdn.nlark.com/yuque/0/2022/jpeg/280373/1668928062708-assets/web-upload/764843cf-055a-4cb6-b5d3-dca528b33fd4.jpeg" mode="aspectFill"></image> -->
+            </view>
+            <view class="avatar--icon">
+              <view class="tn-icon-camera-fill"></view>
+            </view>
+          </button>
+        </view>
+      </view>
+      
+      <!-- 昵称输入 -->
+      <view class="wam__nickname">
+        <view class="nickname__data">
+          <input class="input" type="nickname" v-model="userInfo.nickname" placeholder="请输入昵称" placeholder-style="color: #AAAAAA;">
+        </view>
+      </view>
+      
+      
+      <!-- 保存按钮 -->
+      <view
+        class="wam__submit-btn"
+        :class="[{
+          'disabled': !userInfo.avatar || !userInfo.nickname
+        }]"
+        hover-class="tn-btn-hover-class"
+        :hover-stay-time="150"
+        @tap.stop="submitUserInfo"
+      >
+        保 存
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  
+  export default {
+    options: {
+      // 在微信小程序中将组件节点渲染为虚拟节点，更加接近Vue组件的表现(不会出现shadow节点下再去创建元素)
+      virtualHost: true
+    },
+    props: {
+      value: {
+        type: Boolean,
+        default: false
+      },
+      isModal: {
+        type: Boolean,
+        default: true
+      },
+      alway: {
+        type: Boolean,
+        default: false
+      }
+    },
+    data() {
+      return {
+        openModal: false,
+        userInfo: {
+          avatar: '',
+          nickname: ''
+        }
+      }
+    },
+    watch: {
+      value: {
+        handler(val) {
+          this.openModal = val
+        },
+        immediate: true
+      }
+    },
+    methods: {
+      
+      
+      // 头像选择
+      chooseAvatarEvent(e) {
+        this.userInfo.avatar = e.detail.avatarUrl
+      },
+      
+      // 更新用户信息
+      submitUserInfo() {
+        // 判断是否已经选择了用户头像和输入了用户昵称
+        if (!this.userInfo.avatar || !this.userInfo.nickname) {
+          return uni.showToast({
+            icon: 'none',
+            title: '请选择头像和输入用户信息'
+          })
+        }
+        
+        // 更新完成事件
+        this.$emit('updated', this.userInfo)
+        
+      },
+      
+      // 关闭弹框
+      closeModal() {
+        this.$emit('input', false)
+      },
+      
+      
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  @import './iconfont.css';
+
+  .modal-class{
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100vw;
+    height: 100vh;
+    z-index: 99998;
+    .wam {
+      &__mask {
+        display: block !important;
+        position: absolute;
+        left: 0;
+        top: 0;
+        width: 100%;
+        height: 100%;
+        background-color: rgba(0, 0, 0, 0.5);
+        opacity: 0;
+        animation: showMask 0.25s ease 0.1s forwards;
+      }
+      &__close-btn {
+        display: block !important;
+        display: none;
+        position: absolute;
+        top: 30rpx;
+        right: 30rpx;
+        z-index: 99999;
+      }
+      &__wrapper{
+        position: absolute;
+        left: 0;
+        bottom: 0;
+        width: 100%;
+        transform-origin: center bottom;
+        transform: scaleY(0);
+        animation: showWrapper 0.25s ease 0.1s forwards;
+        z-index: 99999;
+      }
+    }
+      
+  }
+  
+  .wx-authorization-modal {
+    // view {
+    //   box-sizing: border-box;
+    // }
+    
+    .image {
+      width: 100%;
+      height: 100%;
+      border-radius: inherit;
+    }
+
+    
+    
+    .wam {
+      /* mask */
+      &__mask {
+        display: none;
+      }
+      
+      /* close-btn */
+      &__close-btn {
+        display: none;
+      }
+      
+      /* wrapper */
+      &__wrapper {
+        background-color: #FFFFFF;
+        border-radius: 20rpx 20rpx 0rpx 0rpx;
+        padding: 40rpx;
+        padding-top: 60rpx;
+        padding-bottom: 40rpx;
+        padding-bottom: calc(constant(safe-area-inset-bottom) + 40rpx);
+        padding-bottom: calc(env(safe-area-inset-bottom) + 40rpx);
+        
+      }
+      
+      /* title */
+      &__title {
+        font-size: 34rpx;
+      }
+      /* sub-title */
+      &__sub-title {
+        font-size: 26rpx;
+        color: #AAAAAA;
+        margin-top: 16rpx;
+        padding-bottom: 30rpx;
+      }
+      
+      /* 头像选择 */
+      &__avatar {
+        width: 100%;
+        margin-top: 30rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        
+        .button-shadow {
+          border: 8rpx solid rgba(255,255,255,0.05);
+          box-shadow: 0rpx 0rpx 80rpx 0rpx rgba(0, 0, 0, 0.15);
+          border-radius: 50%;
+        }
+        
+        .button {
+          position: relative;
+          width: 160rpx;
+          height: 160rpx;
+          border-radius: 50%;
+          overflow: visible;
+          background-image: repeating-linear-gradient(45deg, #E4E9EC, #F8F7F8);
+          color: #FFFFFF;
+          background-color: transparent;
+          padding: 0;
+          margin: 0;
+          font-size: inherit;
+          line-height: inherit;
+          border: none;
+          &::after {
+            border: none;
+          }
+        }
+        
+        .avatar {
+          &__empty, &__image {
+            width: 100%;
+            height: 100%;
+            border-radius: inherit;
+          }
+          
+          &--icon {
+            position: absolute;
+            right: -10rpx;
+            bottom: -6rpx;
+            width: 60rpx;
+            height: 60rpx;
+            // transform: translate(50%, 50%);
+            background-color: #1D2541;
+            color: #FFFFFF;
+            border-radius: 50%;
+            border: 6rpx solid #FFFFFF;
+            line-height: 1;
+            font-size: 36rpx;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+          }
+        }
+      }
+      
+      /* 昵称 */
+      &__nickname {
+        margin-top: 40rpx;
+        
+        .nickname {
+          
+          &__data {
+            margin-top: 16rpx;
+            width: 100%;
+            padding: 26rpx 20rpx;
+            border-radius: 10rpx;
+            background-color: #F8F7F8;
+            
+            .input {
+              color: #080808;
+            }
+          }
+        }
+      }
+      
+      /* 保存按钮 */
+      &__submit-btn {
+        width: 100%;
+        background-color: $mColor;
+        color: #FFFFFF;
+        margin-top: 60rpx;
+        border-radius: 10rpx;
+        padding: 25rpx;
+        font-size: 32rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        
+        &.disabled {
+          background-color: #E6E6E6;
+        }
+      }
+      
+      
+    }
+  }
+  
+  .tn-btn-hover-class {
+    box-shadow: inset 10rpx 2rpx 40rpx 0rpx rgba(0, 0, 0, 0.05);
+  }
+  
+  @keyframes showMask {
+    0% {
+      opacity: 0;
+    }
+    100% {
+      opacity: 1;
+    }
+  }
+  @keyframes showWrapper {
+    0% {
+      transform: scaleY(0);
+    }
+    100% {
+      transform: scaleY(1);
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/authorization/js/api.js b/src/subpackage/authorization/js/api.js
index 5b8b559..19ed53b 100644
--- a/src/subpackage/authorization/js/api.js
+++ b/src/subpackage/authorization/js/api.js
@@ -2,6 +2,8 @@ import { ORIGIN } from '@/js/api';
 
 export const AUTHOR_API = { 
     wechatMiniAppLoginAndSync: `${ORIGIN}/assistant/WechatMiniAppGetToken`,  //  小程序授权获取token，为空就登录
+    zs_user_avatar:`${ORIGIN}/upload/file/zs_user_avatar`,  // 头像图片上传
+    changeAvatar: `${ORIGIN}/admin/assistant/changeAvatar`,  //  修改用户头像、昵称
 }
 
 export default AUTHOR_API;
\ No newline at end of file

From 7336471323fafedbfb1f8b596cef6227cd30f3ac Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Wed, 22 Jan 2025 17:22:49 +0800
Subject: [PATCH 23/30] finish tid1807 logic for index

---
 src/pages/index/index.vue               |  51 +++++++++++++++++++++-----------
 src/static/images/icon/index/tab_13.png | Bin 0 -> 1246 bytes
 src/store/index.js                      |  13 ++++----
 3 files changed, 41 insertions(+), 23 deletions(-)
 create mode 100644 src/static/images/icon/index/tab_13.png

diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 6751c16..21e9c93 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -37,7 +37,8 @@
 		</view>
 		<view class="ic-tabs" v-if="indexData&&indexData.permission">
 			<block v-for="(e, i) in tabList" :key="i">
-				<view class="it-item" @click="toPageInfo(e)" v-if="isPermissionShowTab(e)">
+				<!-- tid1807 去掉"核销查询“菜单(已有悬浮按钮) -->
+				<view class="it-item" @click="toPageInfo(e)" v-if="isPermissionShowTab(e)&&e.id!=4">
 					<view>
 						<image mode="aspectFit" :src="'/static/images/icon/index/tab_'+ e.id + '.png'"></image>
 						<view>{{e.name}}</view>
@@ -54,7 +55,7 @@
 
 		<authorization-login ref="authorizationLogin"></authorization-login>
 
-		<view class="fly_btn"  @click="toPageInfo(tabList[4])" v-if="loginState">
+		<view class="fly_btn"  @click="toPageInfo(tabList[4])" v-if="loginState&&isPermissionShowTab(tabList[4])">
 			<image class="f_bg" src="/static/images/icon/index/green_bg_circle.png" mode="scaleToFill"/>
 			<image class="f_icon" src="/static/images/icon/index/scan_icon_white.png" mode="scaleToFill"/>
 			<text>核销</text>
@@ -70,6 +71,16 @@
 	import { mapGetters } from 'vuex';
 	import bottomLogo from "@/subpackage/menu/components/bottom_logo.vue";
 	import authorizationLogin from "@/subpackage/authorization/components/login.vue";
+	/**
+	 * tid1807
+	 * 1、去掉"核销查询“菜单(已有悬浮按钮) *
+	 * 2、去掉“收款记录”(在收入统计页面已有入口进入收款记录) *
+	 * 3、去掉“进场人数异常”(该入口计划放入新改版的“核销查询”页面) *
+	 * 4、原“系统工具”文案改为“小程序管理”;原“钱包提现”文案改为“钱包&提现”: 原“设备管理”文案改为“智能设备”; *
+	 * 5、增加底部 (工作台、推广营销、商家服务、我的) *
+	 * 6、增加“工单”功能
+	 * 
+	 * */ 
 	const tabList = [
 		{
 			id: 0,
@@ -77,12 +88,12 @@
 			path: '/pages/turnover/turnover',
 			serverKey: 1001  // 后端对应权限编号
 		},
-		{
-			id: 1,
-			name: '收款记录',
-			path: '/subpackage/income/pages/details_record/details_record',
-			serverKey: 1002  // 后端对应权限编号
-		},
+		// {
+		// 	id: 1,
+		// 	name: '收款记录',
+		// 	path: '/subpackage/income/pages/details_record/details_record',
+		// 	serverKey: 1002  // 后端对应权限编号
+		// },
 		{
 			id: 2,
 			name: '订单管理',
@@ -132,25 +143,31 @@
 			path: '/pages/order_list/order_list?order_type=18',
 			serverKey: 1014  // 后端对应权限编号 1014
 		},
-		{
-			id: 10,
-			name: '进场人数异常',
-			path: '/subpackage/blacklist/pages/abnormal_list/abnormal_list',
-			serverKey: 1015  // 后端对应权限编号 1015
-		},
+		// {
+		// 	id: 10,
+		// 	name: '进场人数异常',
+		// 	path: '/subpackage/blacklist/pages/abnormal_list/abnormal_list',
+		// 	serverKey: 1015  // 后端对应权限编号 1015
+		// },
 		{
 			id: 11,
-			name: '钱包提现',
+			name: '钱包&提现',
 			path: '/subpackage/wallet/pages/index/index',
 			serverKey: 1017  // 后端对应权限编号 1017
 		},
 		
 		{//需求要求更改ICON位置
 			id: 12,
-			name: '系统工具',
+			name: '小程序管理',
 			path: '/subpackage/party/pages/index/index',
 			serverKey: 1016  // 后端对应权限编号 1016
 		},
+		{
+			id: 13,
+			name: '工单',
+			path: '/subpackage/message/pages/work_order/list',
+			serverKey: 1022  // 后端对应权限编号 1022
+		},
 	];
 	
 	const app = getApp();
@@ -211,7 +228,7 @@
 					});
 				}
 
-				if([ 10, 11, 4 ].includes(tabInfo.id))return util.routeTo(tabInfo.path + `?brand_id=${indexData.brand.id}`,'nT');
+				if([ 10, 11, 4, 13 ].includes(tabInfo.id))return util.routeTo(tabInfo.path + `?brand_id=${indexData.brand.id}`,'nT');
 
 				if(tabInfo.id === 12){
 					let url = tabInfo.path + `?appid=${indexData.brand.mini_wechat_appid}`
diff --git a/src/static/images/icon/index/tab_13.png b/src/static/images/icon/index/tab_13.png
new file mode 100644
index 0000000000000000000000000000000000000000..f499c7c45189451686f46793106f7be32da32d87
GIT binary patch
literal 1246
zcmV<41R?v0P)<h;3K|Lk000e1NJLTq001-q001-y1^@s6#dsU*00001b5ch_0Itp)
z=>Px(m`OxIRA@u(nO$sCWf;eQ&pF4fj0VW27-EnZZ;Zrnp+;1K(SRXhqA{VUL3H9)
z7Q<u=w#*ngn#dUIG=O9jf<!J<x?nWH7y~yN)Ljr0C88G!@gpD@KHae0+Vkj{tXsPc
z+U=ZflJ>4|pReEhf4?hSV;{N3cqjr*bVZ8_{l68mZG#&x%s{UTVu>}bFiA}!y<MD|
zdJ@}qMyh4xA-A((E{-n8(K#3dQN|ZYNaE0iA>U%i9;!BV4hJ<9=-s9Y;;A~+c^M|`
zDyWFDfq?lI&o-YK3^o*~y}lWdTA*xPhuGDVUqWOH;nt>+fufD`(9{<bSea~0Ma=nx
zTMqUAFrZLuiOJbn?LbwAmv9E;OVA5f?=(LxWGd+WC>2>*c2fRJ4WW*d+dcraZOu$f
zGX^?0?I4^7xr=b?&wiGgbL{B4TR{(_OdIf#PEsWyUVP)XOrU7}ZK&Y_-H|p{IY>?G
z!kiNp!mxea0Yn!J0y=^?A;N7xW&-VKoQ;!;0k@}(4L+ti@^~TY%sI!7wIAW|*dY6(
z7-op-mhX!|IrpNUhMp><D(q~S4_xnO&6i^*Fy$LoY&wyV%QK)@-6YOgZK&210H#01
zMJ(%1UfB3kI;Uqq(Z-w6zD47n0s<+>bF6IL<2}%pRiy;VUcpJdRG?!~65$w_iwL*;
z>OGJfG1@p4N#2LUB>z>C6k;AD+;YU9IpjY<ZW%nAL%F5%-^x><_PU!8YcWDOBL2Qd
zI8Fle2;s;<MAZ8^v~7J5t2=^HU9jtg@+TGxsET~&1JE$1asLOHA}k{udCz;G*!mLA
zcGm&T1ye})0i*Xpsy3hU9;iQJ``YOkT8?4*JBLgoL9q09La+4{m+ihDDBg$sUlE4Q
z;ORazP7I@)L)+`!t9J}!b~=FY3E{}26M-XLLv-zal*I!zseAPfv9j%`+cvOLy|ZQ}
zJz1|l?#5PX&84#Wc*br$9)#}Ya(B}$B$Ay7Hw=^@os^_PJpX3atIuvbK)iboqD!*s
z{Tes~axtS_RWUh@X?(znO@F0-`|nme=U<-%I0U?7*D1g};NHwSq=UfZ<y6}7OoiNU
z+Zz^w^C@8FT!`=$2Fs|59LI&((XblT*MVTpF-C8g!e9~Ak%RpqGB-!twwTei7v+gO
za>Oxt5+`^7x}HJV0F>w9KYCN)Lrw;lV%y2#f!tR2Bp~uC=nBYb$Xr6$h{_|Ncju+<
z=uzSzyZS~#P2}|8FvA~Twyc^$pmZrJPoeq%U|b=00+DW13!#dG$mfW@Pdu@g+O3)M
zI;TTs)Got`Psi*j>4QpH(-7U9@diF<4W;iroc*ZThSB@?=tao#OqKLt1WpsSFI_2S
z{s+vrn<}t+-PfOovI4tD{SzQ{Bqo1Gtv#goJcGMJp!|V$ubxJa<t`i#4~lypkzJG!
zp|bUlLKHqyj{Je#|B=qkYDTHQ9MpaFZ>A^FLG9MWc)|?bhjOhZ7Be}2_-Py!%5)#g
zBi*^W`fZoLLVi~?#`r~`F?OKu?nQ-s@8U5gC@M6@4)opqA5LyAQ$~8Km;e9(07*qo
IM6N<$g7o=S4gdfE

literal 0
HcmV?d00001

diff --git a/src/store/index.js b/src/store/index.js
index 6c1f777..ebb04ce 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -33,19 +33,20 @@ export default new Vuex.Store({
         // },
         permissionObj: { // 权限代号对应
             '1001': '营业额',
-            '1002': '收款记录',
+            // '1002': '收款记录',
 			'1012': '订单管理',
             '1007': '员工管理',
             '1008': '核销查询',
-            '1009': '场地管理',
+            '1009': '场地看板',
             '1010': '设备管理',
             '1011': '商品零售',
 			// '1013': '课程管理',
 			'1014': '储值卡管理',
-			'1015': '进场人数异常',
-			'1016': '系统工具',
-            '1017': '钱包提现',
-            '1018': '退款权限'
+			// '1015': '进场人数异常',
+			'1016': '小程序管理',
+            '1017': '钱包&提现',
+            '1018': '退款权限',
+            '1022': '工单'
         },
         // 场地占用提交页面信息
         occupyInfo: {

From 82b50d7c2049cc7a3db2e3c86d9da126ea858869 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Thu, 23 Jan 2025 14:35:54 +0800
Subject: [PATCH 24/30] finish tid1807

---
 src/pages.json                                     |  30 ++++++
 src/pages/index/index.vue                          |   2 +-
 src/pages/menu/forth.vue                           |  29 +++--
 src/pages/menu/second.vue                          |  32 ++++++
 src/pages/menu/third.vue                           | 117 +++++++++++++++++++++
 src/static/images/third_pages/banner.png           | Bin 0 -> 23995 bytes
 src/static/images/third_pages/bg.png               | Bin 0 -> 2519 bytes
 src/static/images/third_pages/tab_a.png            | Bin 0 -> 2399 bytes
 src/static/images/third_pages/tab_b.png            | Bin 0 -> 1962 bytes
 src/store/index.js                                 |   2 +-
 .../authorization/components/user_info/impower.vue |   3 +-
 src/subpackage/menu/components/bottom_logo.vue     |  37 ++++---
 .../message/components/edit/upload_img.vue         |   6 +-
 src/subpackage/message/components/fixed_button.vue |   2 +-
 src/subpackage/message/pages/complaint/list.vue    |   2 +-
 src/subpackage/message/pages/work_order/list.vue   |   2 +-
 16 files changed, 237 insertions(+), 27 deletions(-)
 create mode 100644 src/pages/menu/second.vue
 create mode 100644 src/pages/menu/third.vue
 create mode 100644 src/static/images/third_pages/banner.png
 create mode 100644 src/static/images/third_pages/bg.png
 create mode 100644 src/static/images/third_pages/tab_a.png
 create mode 100644 src/static/images/third_pages/tab_b.png

diff --git a/src/pages.json b/src/pages.json
index d007de2..73c4bde 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -10,6 +10,24 @@
 			}
 		},
 		{
+			"path": "pages/menu/second",
+			"style": {
+				"navigationBarTitleText": "推广营销",
+				"componentPlaceholder": {
+					"bottom-logo": "view"
+				}
+			}
+		},
+		{
+			"path": "pages/menu/third",
+			"style": {
+				"navigationBarTitleText": "商家服务",
+				"componentPlaceholder": {
+					"bottom-logo": "view"
+				}
+			}
+		},
+		{
 			"path": "pages/menu/forth",
 			"style": {
 				"navigationBarTitleText": "个人中心",
@@ -1003,6 +1021,18 @@
 				"selectedIconPath": "static/images/tab/ta_1.png"
 			},
 			{
+				"pagePath": "pages/menu/second",
+				"text": "推广营销",
+				"iconPath": "static/images/tab/tab_2.png",
+				"selectedIconPath": "static/images/tab/ta_2.png"
+			},
+			{
+				"pagePath": "pages/menu/third",
+				"text": "商家服务",
+				"iconPath": "static/images/tab/tab_3.png",
+				"selectedIconPath": "static/images/tab/ta_3.png"
+			},
+			{
 				"pagePath": "pages/menu/forth",
 				"text": "我的",
 				"iconPath": "static/images/tab/tab_4.png",
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 21e9c93..38e7e21 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -121,7 +121,7 @@
 		},
 		{
 			id: 6,
-			name: '设备管理',
+			name: '智能设备',
 			path: '/subpackage/device/pages/index/index',
 			serverKey: 1010  // 后端对应权限编号
 		},
diff --git a/src/pages/menu/forth.vue b/src/pages/menu/forth.vue
index 9af5aa4..2fcc2b9 100644
--- a/src/pages/menu/forth.vue
+++ b/src/pages/menu/forth.vue
@@ -6,10 +6,11 @@
             @click:login="loginBtn"
             :nickname="userInfo.nickname"
             :name="userInfo.actual_name"
-            :account="userInfo.mobile"
+            :account="userInfo.mobile || userInfo.username || ''"
             :photo="userInfo.avatar_url"
             @click:update="updateUser"
         ></mine-header>
+        <!-- 后端： account-> 如果有手机号就显示手机号  没有的话显示username, 都没有的话就空好了 -->
         <block v-if="menuPackageLoaded">
             <line-tab :icon-num='0'>
                 <template slot="default">账号管理</template>
@@ -29,15 +30,14 @@
                         <view class="fm-copy" @click="copyLink(deadData.cashierSystemLink)">(复制网址)</view>
                     </template>
                 </line-tab>
-                <line-tab :icon-num='4'>
-                    <template slot="default">总后台</template>
-                    <template slot="right">
-                        <view class="fm-copy" @click="copyLink(deadData.backstageLink)">(复制网址)</view>
-                    </template>
+                <line-tab :icon-num='4' @click="toWebView(deadData.backstageLink)">
+                    <view class="fm-admin">
+                        <view class="fa-txt">总后台<text class="ft-txt">({{ deadData.backstageLink }})</text></view><view class="fa-copy" @click.stop="copyLink(deadData.backstageLink)">复制</view>
+                    </view>
                 </line-tab>
             </block>
             
-            <!-- <line-tab :icon-num='4'>总后台(<text class="fm-txt">{{ deadData.backstageLink }}<text class="ft-copy" @click="copyLink(deadData.backstageLink)">复制</text></text>)</line-tab> -->
+            
             <line-tab :icon-num='5' @click="toComplaint">投诉建议</line-tab>
             <line-tab :icon-num='6' v-if="loginState" @click="unBindBtn">解绑退出</line-tab>
         </block>
@@ -218,4 +218,19 @@ export default {
     .fm-copy{
         @include flcw(32upx, 44upx, $mColor);
     }
+    .fm-admin{
+        @include ctf;
+        .fa-txt{
+            @include flcw(32upx, 44upx, #9A9A9D);
+            @include tHide;
+            .ft-txt{
+                font-size: 28upx;
+            }
+        }
+        .fa-copy{
+            padding: 0upx 10upx;
+            flex-shrink: 0;
+            @include flcw(28upx, 44upx, $mColor);
+        }
+    }
 </style>
\ No newline at end of file
diff --git a/src/pages/menu/second.vue b/src/pages/menu/second.vue
new file mode 100644
index 0000000..0e40ef5
--- /dev/null
+++ b/src/pages/menu/second.vue
@@ -0,0 +1,32 @@
+<template>
+    <view class="second-pages">
+        <view class="sp-post">
+            <view class="sp-box">
+                <view class="tl-tit">板块更新中</view>
+            </view>
+        </view>
+        <bottom-logo is-fixed></bottom-logo>
+    </view>
+</template>
+
+<script>
+import bottomLogo from "@/subpackage/menu/components/bottom_logo.vue";
+export default {
+    components:{ bottomLogo },
+}
+</script>
+
+<style lang="scss">
+    .sp-post{
+        padding: 24upx;
+        .sp-box{
+            padding: 22upx 28upx;
+            height: 400upx;
+            background-image: linear-gradient(270deg, #d7d7da 0%, $mColor 100%);
+            .tl-tit{
+                @include flcw(43upx, 60upx, #fff, 500);
+                @include tHide;
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/pages/menu/third.vue b/src/pages/menu/third.vue
new file mode 100644
index 0000000..92636e0
--- /dev/null
+++ b/src/pages/menu/third.vue
@@ -0,0 +1,117 @@
+<template>
+    <view class="third-page">
+        <view class="tp-container">
+            <image class="tc-post" mode="aspectFit" src="/static/images/third_pages/banner.png"></image>
+            <view class="tc-bot">
+                <view class="tb-left" @click="clickTap">
+                    <image class="tl-bg" mode="aspectFill" src="/static/images/third_pages/bg.png"></image>
+                    <view class="tl-tit">采购商城</view>
+                    <view class="tl-txt">采购专业装备</view>
+                </view>
+                <view class="tb-right">
+                    <view class="tr-item active" @click="clickTap">
+                        <view class="ti-title">客服外包</view>
+                        <view class="ti-text">客服外包</view>
+                        <image class="tr-icon" src="/static/images/third_pages/tab_a.png"></image>
+                    </view>
+                    <view class="tr-item" @click="clickTap">
+                        <view class="ti-title">敬请期待</view>
+                        <view class="ti-text">敬请期待</view>
+                        <image class="tr-icon" src="/static/images/third_pages/tab_b.png"></image>
+                    </view>
+                    <view class="tr-item" @click="clickTap">
+                        <view class="ti-title">敬请期待</view>
+                        <view class="ti-text">敬请期待</view>
+                        <image class="tr-icon" src="/static/images/third_pages/tab_b.png"></image>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <bottom-logo is-fixed></bottom-logo>
+    </view>
+</template>
+
+<script>
+import bottomLogo from "@/subpackage/menu/components/bottom_logo.vue";
+import { showNone } from "@/utils/util";
+export default {
+    components:{ bottomLogo },
+    methods: {
+        clickTap(){
+            showNone('板块更新中');
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+    .third-page{
+        .tp-container{
+            padding: 28upx 24upx 0upx;
+            .tc-post{
+                display: block;
+                height: 400upx;
+                width: 100%;
+            }
+            .tc-bot{
+                margin-top: 24upx;
+                display: flex;
+                align-items: stretch;
+                .tb-left{
+                    position: relative;
+                    flex-shrink: 0;
+                    margin-right: 22upx;
+                    padding: 22upx 28upx;
+                    width: 340upx;
+                    height: 420upx;
+                    .tl-bg{
+                        position: absolute;
+                        left: 0;
+                        top: 0;
+                        width: 100%;
+                        height: 100%;
+                        z-index: -1;
+                    }
+                    .tl-tit{
+                        @include flcw(43upx, 60upx, #fff, 500);
+                        @include tHide;
+                    }
+                    .tl-txt{
+                        @include flcw(30upx, 42upx, #fff, 500);
+                        @include tHide;
+                    }
+                }
+                .tb-right{
+                    flex-grow: 1;
+                    display: flex;
+                    flex-direction: column;
+                    justify-content: space-between;
+                    .tr-item{
+                        position: relative;
+                        height: 124upx;
+                        background-image: linear-gradient(270deg, #FFFFFF 0%, #C8C8CA 100%);
+                        padding: 16upx;
+                        &.active{
+                            background-image: linear-gradient(270deg, #F2D286 0%, #E0A46F 100%);
+                        }
+                        .ti-title{
+                            @include flcw(32upx, 44upx, #fff, 500);
+                            @include tHide;
+                        }
+                        .ti-text{
+                            @include flcw(22upx, 32upx, #fff, 500);
+                            @include tHide;
+                        }
+                        .tr-icon{
+                            position: absolute;
+                            right: 6upx;
+                            bottom: 0upx;
+                            width: 136upx;
+                            height: 104upx;
+                        }
+                    }
+                }
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/static/images/third_pages/banner.png b/src/static/images/third_pages/banner.png
new file mode 100644
index 0000000000000000000000000000000000000000..17323159ac94b1713aef580684980aa28b87751c
GIT binary patch
literal 23995
zcmV)4K+3;~P)<h;3K|Lk000e1NJLTq00CbB0077c0{{R3cz+W700090P)t-s@bmMr
zzr06LN&o-<f`Wqe`1kDa@bvce?(*^P^z-xe^z!uc`TF_P-`nc$?fd)t_xbtK-PzCD
z*Vf_PmZO}v#>3_7>CM>HyUNGN)X~b;)3wCFKukjC?d!3@zQ)qe#L&&N!oaY<yuQrI
zLr+CLNIyD8JU2o)!OqOl+}D_=qn4zgEH*Esv#+7Btu#M2lAxS0Ix>}^nYF{c@%8no
zwz2~R1o!y&th=}0=j5!pv@$$49V8>DxV0oLC+_m|ASomS1_!OZyP>bCr?sx?@b8+b
zr3MHKlcJ!Rrk^M?EG9522@MUaxU!O;nB3*!t-QH~kct8V0^{iBu)VmRtf&nT5O92T
zk)D;?<llOTg@}`lcY=GRwX)&r=zxrej+>Z>mXjJF9%OK6o2#ggo|}r6j%adh!q3Q_
zuB(rmlXZlHdWL`!6%@Y8#f_PegOQKB$HLg+-h7LS?(pw}kcNJWf>2vmrLw7tnU_;v
zTxxc2VQgefR7|S5xCIRdoT;FIkBx12a*Uajae;qvdT{3M?R0>5SYuxH{QFc}QeA0g
zU1wiUSx}&@q_e-fg_M$ljDwx2q!bw&ue`HGQAkTxQqJ1bbbfjQ2?It^P&GY0SYB5n
zC@E-dWqpW!xy8OhOiM~nNPUBM1r-Q+g?ny&d!?_U1|$izz_%G16|T3eSY>24K|n-E
zLdez3^7{BaLOo+>U|?=-ZgpxdF)UtVS_&KvWpr~pMMTxs)YahGcztsQFbRc=e`$Dk
zK1oL|Ha421m?0t@!p6ML&&{H#o=I0%2{{RgkcK^CGFN0+DK9a%y|Bf{#>vsduC%5)
zQ8kR0isR(ryuH0lVM9Y#Ka`n`J8dT`O(z{h8$@I}5h)Z+Yd+lE+Oe{;sjI3OHW|Fa
zwi8qgo}ix%MGG`qDvp$fJ3KR)pOb)tflYQWJ$oHtf>Ks^Mki+wmY0|;DIt=dkaLz`
zn60;skB@4NS!9kwd!A{jq>Y8Ed6l|`kA!M}aaL<tImdERNB{r;1$0tQQ;?952M2;1
zdyxPDT4+f`K~#9!yxLt%TV)sra5RSKg(gm&f;dpeV2(MValtK4kov*rrXtSx5d|}=
z5tc5ZB!VR-Y{qO5C%Dv`q3N=sF~r2A7YoK<qNH3HFp##Ci)PZqu$BZ8Ab8{ddCvRt
zw0%njMgON9JI2)f`0qLIc@J4PT-Ug3mn|WENMre-`iJ*FSoQq*^AA*4@7s4f@=#(L
z8q^#5oqhZERd;uv@2#rZZ$H%7XB%|3-CtZ#ke{EElbf4+Cuhfc_9C|?<>s`x?dFWR
zm9yhQZtn1~W2kp@ak2aI<+bH_;Of=6v5~Rh{K`r^8upHaLStTc<x`a$x7+P<c|2b4
zSSU0%f`826Ye(jA9=m$&+QJw<9gGIz%S%hkvDq2Fe;%J)SO~-^vpQ4A^mJZfVPW2S
zcBjig*Y!7KU3cGo<a@6=`T(qa?UwHY@MYjKu;Ng_S~}79!Tk>_Ux$Nva}=-OQW9zD
z5YoisHae$21bFX-+??Uz;kN#c(LY9izWm2(EU-YnBO(9F%8EbY4TnMzugmlW`?~KK
zc*hp5T?^qYeCNTt6pMp5aE*QE#g};T`ebT)H-MGx2EGHx^;wO~D-DJ)d>hGke^u3a
z0Bc_hwG4-)+kkh#RlF&_#RcGnZ|3q6Qu@Y%H+`$+3zaW;3AlH0a&mE!eHl0yUs;(C
zdA$+xed;L!cDb}KS{(wf7qrTEZUOc6lCM9uw7Rq$pIP?}%rooE^z`(UP8S#0;@!Y^
zfYO!4_0_qTf!X&E`|1Ki7YFI`nRHX?+l}$?pgqA?>bpatc?DSHk_)_1PRX}{e0Ssy
z7dQ%X^KBiA7tdV$VJRM1Pz9caZ&3NV>eyESv+tbO<AdiI`Ks|i;GyX3GJJVD1T5dE
zADNz@6i!U!f%z-=LN#N52drd)cNgjlS%l}ruKVt5qyb^)0W1Y(R~F{(Hk6g!ZlxMg
z<ClEzR^wNuujnTCmy85hOy!s9a&w|E`#SRT@9!@=bM|a3HXFT485@cCQQ+u^cVsRS
z_PEer1<bw?s;|f6Q@&i^YggeL3Hf8I%sa!p@Qp_Okevo+;T}%m9vZ!pAK5q+R}p6s
zZ*s`@SUO)NY#}$K^{p>&?4!$@L;IS%qRYNAdJWOP2Uh*XurIi~`_ef6;!cFd=HNSL
zUEu;_n6dD6voB~V>>B|u3JhNDyD;bTc_YF2((3AR9KHee4Md|+i#Jd4lCA&~ZJPcj
z`|e8d1+ezz6@&(6VVuf%42v&#*L^V_v~RBEYwEHsP7;7^iC26t3_IG|0NiGuY{6gM
zU?e;;M!;jC01aT}tFCU9#OwBiBayHV&KMBN_bQEF4}5ifE#LWT0e^I2dYzX)Bzc0I
zDlEPh?%h_{w-3H*fmS8H8W{gTgjak!_CKtBi#PDqx|9Unf7)LRVD<&@{X^Xs$ET+!
z!afg{1q2*Lffq0!$oF97K?Ka)-*AXN=Z0r^gtP7&!t@2NU;73EXfM8Ps=a)&Xc<?0
z&7}8bVDc?LWcWfCVP^13eZ`kAZ+E~KyoRqa8@8dpG=K}*oK8o9W3c1+nep+dS|8R2
z+~B!|`T4-y$VeELz<u`Fg9j~NAI5{v#e+B;_IlYDSH%&JFC2|Aub;>7JpMfD3*Ozt
zD}k;OE;RaU_}avmlIW}MFck390OtNOv*MNUo9rv&*H}6jv*BO#7X^mzpv~!Uv>oc6
z>}lzo4twCnGx#c9v_`z-`z*r1tV-j7W(5|)@bxNRFMeYtw!AVQ4MxQmyyTmJi!krz
z`U_6tmEaS*QhdQH4JOizzE0EET=+`N{+_b3nf~H+0lq^3F0fUVwfFRNmip>ko{>2!
zFyE8G*SGF_5bFmTzaV$jq3DSAor7;MzPu6-1cOm5&e)ghi&-l5-Q4^YU(q#uUm@Q&
zo`mlM;C&he-UnSH#B2H56Ma*7Z{2I$v;C9)TC_5LafQpde{iUOu+4Et{q2*Vp6Qw5
z(F$NLFb0Iz=c{~{#{>EcUthSQ!e=ccd<a#TzIx2-iTH6-JriVK>hJ7~RbTKH6%~o^
zCK@dL-PqTzd=aa^>NcZH9b5I?WPdY9$_rlW4#P3n-#_GZ+|}59^3$I0r;d0)$JaPD
zAbgm=+V>#r!)P>aIqH-zc;QRi5y4sbMuWkLXq0_%m7Au3caOyAZw6qazozeb4Gdm%
zIBk8CeQ`Pe&-$C#UhP}p?6=q3+S+gr_i0bdCnfN8djJe!EMP-e=~jZ*0){WCdR%o)
zO&Aawcy129VSfzUI^dl^gQI+ro3VIPBmK<`ykURk215!ATd6M{th?@81z)*+%is3?
z%6CKavha=_cjjYzr=#E5=BzJk|9*VB)aQ0V5okOhf+HRme3@4bV0;5A;mZX^)IJ1F
z-{rU;zCi@O5T>272@D6rmtz2%*`UAoY2T^@UpkBdypeCtcJ~)wU<?P;7yt4c_+GXT
zIh{k@?caA5)%e^Rm<B|2%<FP1UyNY_#_v|vA&~ZQ08Dq(G3@J11d9%o&^D#TJ4G80
zdt^R{@8*Ef-weL{lYD7B82v>u`)+@Kb$faFi~m5bqyKVuZ~dUt)^YNMftrd|)U&dZ
zN5ldT2>ep@mric_?WZWNI`PE~HTHdDGr^jY+DL?bXV`a|PBJ3oCPPMqWDCCK^$#cc
za)DF&D|Z+FXMd%>+PAS|bhHBnt}naPbtK$MyttBiu<i=LcSK#^_=L|_x`>xP>YA9>
zL%yLIs&6n-TM;H-@Um|_9*f1N@{-Fd4c>(B-6?^ux<SSQ_^s!k*S?7Eujt}s_+oof
zb|=&AK1hrb8`0{iUt~?+y?Zf#?;N&ulr4_h2M33G-y5&>)T!+TS_UuR4i~=YF9*n+
zN(y}Inmiu5;RA3qw!9RNMzFSE-za=%<FV!C82L`HY!RY>3w8dbZxwu{zfb>e^mpsN
zP?f_dv3Z!0#hK-s<Ft=XE?yoQv~`>~TjSyS@*u#CGJGTGuhJ!7j`pqdAiN_ygT=#4
zD2zIX!;v8Qk}iC)nKmI|X<`O#THrimK5W*PM=;lSoBNwNrnCAcF)w^`F@Q(g+eg2#
z4fdCPaKMN9s{I_?C<g=45bobpNLGlIZyo#2#$r>!un*Y2a0tFL*r~*GIC@aT*E-aB
zb_P!|D9o%2Y$T1ZZBxEHfVaQDlFjv(|0Hx3FMJEIa=19z+fM^xpxF&PCI&DbNJK+k
z-CyqQK^>mJY8~MX&BWsq5g+@~c)&EqP9=0<JFlXjZX&#+M!M;U4PRRZUt|7mXMYKJ
z^O5ojFV#0Uf3Rcn(#5y!wxNy_AJ@3ZP8T?GHHZa7vM;@1UkKwy4j=IK&rHyCsB_i%
zB9Y+C^6DCRXQ3MqUWy2>uOZR_<D`5!o0`8kwq^cGeYdPEe};5beRJ~L>K8BdT&(UN
z`lh<4u+`1Dyw=5ppl20oKqy}M1@aUEUvxGU(Z0dirM0!SC4Ppic`+T3DXb}Gaj>t%
z1g10l?n?2!H;u1sp>5~-L8Q0RTdA-3=3oF{YWZNYqp`p0z0aG0sPEQXbn9UHa_Bt+
z^H$|Z1lwv@+rhVHYW2@Q|6Gk>@X{_jZL|CRcuu5(B{BQ%F$yfvzVv+PUKQD2$NE?M
zRwd3~N*SM|y{W!7@^zSx-vA=Wo9eH)8h-?~D$JWx;H+wIIeTWbzu$hMvxde2&tHIg
zXn#`q%KA*d1urj^=}s<uq_*NG_<AC<OW<9LVILU0*2CjHi0q+pL6xsWbS3O7z$p*l
z#FunUUja_`y<hnn4K`XVWTvy>Dj{FpUiNLXpZwr#OZ(;iZyG*0+(f?Wc7pd9c!4Iq
zNz}|tPc<q^N^5><a=XL+r8VO9(_OOl^q6Qla+4u<ak|9PWZ4vEUjdfqZ;8GDmi`*P
zoJ8L{GWZ(624Q-9b2bPs#&3b6t#K4jht8CJ(_j5^UMu^uBPOs1YXbNR@Uy0`8@@*l
z>?v(_xqZPH^G<*ldp(#62M(~U2n%tcgn^BSFGuQ|;#<9W-@(+Mf5;4Mg36KJmUvTr
z9fQ3W$GbW|?e3_4=ksQa11J(C|J4^?#PHSI?zKgQC7-!HkvQ`PBN6zbyG6;o_z+*5
z4B^7f`aZ0E0i51ffc5@wJ^88)U;vXZ3rjR`W@uAXBDe_iQhx_K-Wx9*XlZXa`NEgY
zl?=#`Zr(}91<wG6>pC*|9w{xYXhMCL*KlbI;wG;208xsq2y0^#SO#&S@-=|d`aY2A
zE6<OUeES>87X?<n0xZI2HqQ%OgSVi#&DLmdc%iGNWOwHaAANkdwNlCPk^#O?v9BgK
z`pXZNTbqwmd{*ZQN0--D<HTEn%NS#t!YnH_P9kPx#VfwT+ovvXiN5L?r{QZ6i?1EN
zeeCP7d=c#{*}89L-us>94_2SNG=8|*S5Y)D@NGp?r7RPO&PDwdQ^S{m>sr5Vt#i4;
z!8o2_V3VgbZ@hE7%K|<?N$qfwaY~K(#lFA<umrl`J*J)yVf~xp%eoQ;EDH$v`9App
zRYTaIHe-?sEl17Xocv;E--EBc^X9q3&2(@3S@UO2*x&&eAgv`Z;<k1uaZXJo<GS7a
zJQ-KHFmB|qWca1!;$nC2$&YqxUV}I_y2e(2H8p$zEV%gLN${rl%6w3~rmsAJ8&bYp
zVA%u~;;lMo;ALNjv+?}vFSnd4s%;MYKKuG>EXSBsMf*aUBcH|Kz*C~u*4D3^n=5Kd
z4)4j^{l)t&J?)dP?R%@-=@`B+JalrLc<DfJO1;d9tyyDcW?vD;Tju543;0%P-|9@h
z08aMB{6&FNCon$#Wdv7v^Na7Y)%TX2c<+TbJ3k(O|NV1a0~ni!OG|2zBS((lOm8YG
z=zUF1O-V^<>0w;C3iEakoICga_}R{ukIr0r@0qu6ud?%V=;7fDx88R2=+Q?WIW^qd
z0!WrMM}*N|97eJpXHrRDqpGj?%KFUUrAUE!09(E&um%<q2yX|i;371C+nj^8p?<r)
zqocRCx4ZlHhT|tsoOtG$_QZUOk7r&war}5g8UBB%3>|jz<iBlXy7$V>r(Q(h`pBz0
zckVoW&(23~wZm8IrZF~S`Xb4~%qz=>H&X8}3||F||7X6y*=)|_0)rR_1MAm6a=jq9
zd}Y(V_yOx-1UKafzcceIoeIE+@D=q6<rD(cM<~y|`s&VmkXugQ^28JGzWZ)=_UTt|
zuKG9`m#xhqA-t*3S;ycj!i{tsqxy=k?4N1hhV%tSCwKvoQecj5aLTdS!b)!?WQ)Kw
ze>nF7!{G*-*!J#az1yywdhrTX5`>(iM;Y?D=g`l@+;ht<fIa;LB|AI&Mg+W1oPK0)
z_c`TyScLIP5~kx@0mjQ3$IAEEF$?%{9IC#0JnXO1zSY8O`i>HCif>ARsd4Fqx5{fB
z9MxTfewGEe(7la*Z0(dq$(p~Bre%tL3M=(AG1>2CKau?ybZ>m@vB$EXxbeoDZhANS
z^wFH-yV<mqUm{#2!g>;aOUB<B>xr!Lau(M8C0)9@!B^Fne}cWbTH~^>L<$UFy+Fej
zr7kcjFtN;u%_c3ebXT`m_ZPlb2v}7WQLf;mlXgv^6=KPa+~9k5zUXK#RP{wt289H^
zc(E~F$$@V<iOTFn8V`vtFMioqc<HcSi1_L|WNZPe0&8Cg3vUiyrlpzW-qK4Vyq0gy
z#=g)6?ACp=@7Z~(?d2lYRoQ3^%Zh?ue26bX4dzgH5#qJ;(|Pu-wtS_$$8i}xj(5kE
zuo@6mNdv;+C|15wVDO4=#)zz(B&^H6#rQTBY~ahhtgDq-_nyqU;N||_^6G6vAE@@~
zY&0Zr$S=NQUgi7YhYW0`T;<XFhk14OmbH3NyrQeZ?-*DLT+erKQefR+p}7->?r=_K
zTm2?E(p~TtIEstecSo|X)EBZT1vYil`(CN<RJ^67r6#cwPGSBw>2q0+GO*+jrM^C4
zb(UCPSPCv36l+AR4`8e*c|fR}I6Z>3G4bkyc!^rBTuGs?$f0vC2XA%6xA-s4?ysq;
zGK>N^H}Ov^OKAv`KU!H3r5Ph?G)*Z(G8GIlW{5xv9UBJ4IaH`HO-#}>S?bj2MULHY
z(M97;(?xy)#ydVy>sjynoVE9R4kv2u)7e|GntraH{qB7><-T_+`kwXv#v-e~X?+zt
zyEW9;K5^vXyI15}E-d8o$d|y<W%^j(Fn%?C$xG7Dv1Q@~#w`f0fW5#4^Chqwvweik
zY+_9leh>6#ro0#qSk{_vOJ!e}R_`y%Tdd6myzs^H;m&(Y$HZ%?Jcz6NLOAv9*~}M7
zc@ePh@&f04UrK-xdL_V{>LS!_u^KDXWrA;^vM<L&+F$u932*d$;&jW$&tq98-o#hJ
zm5clbeHAp>W&?8kcy>Jag&TMg(?t?t4v4SgfWQi^$tN&@MJ!?d!S~ID@s&i@&uiY^
zeLRs?^HqF2h_&MEZLnbf#OcDV7hgMe(0QwLm|I2Wnx3Al@X<cw?SrrGo!O;@c-h|!
za5#tsF5Lr;z6MNT0q1nH|Ni^tFS3^PR=VUh-?_w>ycK;_Uw6ejlHrwa?VihXYx`q)
zU*YC);3QI3;EOn~>Gp6qr1jNw0I3p=&DRU;1DL?_m2eVb>IZ^N)2779VD*Ks&G`rN
zO-^r0vOFWNJBydToDa`j{_Pv+lGjqD!YQ-1nsHB0$T)f3*QRf_y^ed)!lSTr;L-|h
z_irk&gkfAY{1t6wKgmtH7U&k(-b%i@(@@T<{wig<^c~sx^EL676IVl4e~ps93~VhK
z-p;`5vw@^(yutAOk(bB-=7eYlun9Y{LP)ohsD4tUdDx&!Tq`f`O=3Xc#+ZD?oA^fE
zobQR^iDGs%D77OGzq%sbGGPqnErh-zj<`8rwO70|GYRnL9Km0g3LGW`d<87x@;Gj_
zNEb0)mY2STYQB4X^Hi*_bYp*?7<u}=CFv^3Al`zngiE@7^32D>foy%LTfx_WH6TKP
zn+04=*gLz4YuGIE-G`vO;N`ufHu*+g`KrCw+1`KmeS^M7?qGR#upBqnVQkfXUq!mp
z;OD?Qdb^*zi7t6Xj6H?ri|?Wjz)ej61_p&iOwrt{sw`<`OWl~}=J|P>LxnhhAMPY?
zrTe_9Z`3W8joxh`jg5_Ujoa$4fB0bGh2VRV$uTQwi$#x(zNs*}i;UW>N&1%YD(W(Q
zIe<~%;0s_DSimopdRPrqTduX#WlFm6#c!hddVl4cj$hVS(}Ak_Gh5zw&*{Sb{bosD
z0-sceC0sr9%^TY>dCv#l*R|>uZW02&9t!MdxDEk(+Q`goVbEqzXxOMr-j~E%?wj)N
zsdQ^Hs!A8Ui7%FCr;a&q(%`KF*IYmVs!;dBsIPsU7rNpdvuuoQY;1%h0IR?n5cE}p
zv1NQKY>He1ZZ;|}>x;ijbD=%;1+V+&&Tctgg|j#EdVeqfe(s=jQ(_`-(Kj(hd5zak
zZtSjjDY`y3ys>Vw*zo|u0FJ&a@ZQ!ifdw3teXAb1rnJ&UbHQsT(tYjEM&HvFd_#j(
z-V-Nm`X;#GZDizo{1FJLI%tvce@G1|p(|tCo3GdRKrHXdig<^S^@XwZ;q~FMh2e$a
zjfIUd^ZoesU49Ru*MXZOux*TwQs4Ygo9|Ly{#C-lfxG~2;<x6^7ozV@`tlQYKfA$|
z4Hj>DDa@4nKJ)PQjgtpmw~Fw=DjR)+urliP?FznZFL*CH?-*e5TG)W>`oaRVV}Zkf
zc(=O;OEmWta1eID@QT{{p$_u4fj2J8oR_|bO1?H8+*gZViyd7zTrC}(SH5*2!MAw!
z<=1~1JUAG5-;!|5R{MLN$s(IBc{^=7z&Fo3Y*|PG;TcX~-lXhCfsghAxI+bID7@te
zS7~PGi;cVho-4%u()Wmb%L{x$^|e%}FNo>eGW^2eD?!&o;;jO6cGvXxJ1|0Awimw6
ztLY%#H0#4EFn!;5Uk8@(mW|^$$n!>F)wi`3zE}Wr{>oQpH}5ZfwIWM_-*}@=X{;|E
zX`9_YXuQ(J%i_ScZ5DnNfiHz+jDyHaUrb-}a`sC1)~#E%;{gu=?7sHjNyG%kXVT_N
zVAqv!6;^FZ(%mNKg)ipNeCm4^zU1}rNWRflzTnOK)*dOGIyQKcu*w$4guYH+5-ZfD
zFL);>lkyTZjZX+H(d=Vn6_~yuf`XyHxRa^xc&O?USD~&?Up!SnUp%y<`9R(XtR&N+
zA?Mqe`p#c_#eMN`pc09d3a;|)WN56AcVNJ#!z9|v^5%8Fu#h(HlL7;nzM;S_3}Yc{
zr<8ZrHbuPD1@BLLKQiC87A_y+*-ek?1lJO;d?_p5vi=r7{OJn3sOu52gsTO=sHUrn
zz#`_l*V=o4ypt<=-e8K{C$S&Em%u#3jiSJq5JLc_uYj@1kzEz44iesccRlfYA@R5z
z9+{tO$9!OYsq4J%8i2tIU-2U1mG5In-L~4xJxeDCg_{5?sVQCxd<o3BE_}f|;J&`>
z6>nfgxaZCbY}at~<r-K87BJqn82<Vg&0UqZqa*kZeRRkc5Ko(Lw!NgqEBaoiuXsfp
zd<o0Y_o*MB8ytK)_`dn3fXjphEn4{w3_zI13Lo~3YX_UX8od+1HPTtn{g4tcuaQUJ
z#mx+xz<XN>?7||hYOG(l87_f45Ihn7&QR}AN7KGGJHf>Q+wj%Za8R{3d+0RE>ShC1
zyl8Dc4SQZ5I|fGTTAcWvMa+^e3%>|o2+LRBDj$Zg`wm+sCMH;2<6T=@i@s|FMy<{F
z;{))$4Pg0_Hvz^LUPyARp^#tf5;r>@0xx}A=^G}5o_ip$6UTE~k-%lXjj3<_Gi_%u
ze5EU5B&+Mhat#|oUjlmqZd{ph?cnXjc`fkXr*1w5%mQDudl2u@cRc!X31KkuC7%S7
zV@0}dD_!!MuRYWS-*$Y2{4}pHaEg;K2SW&@OY?V|2e^346}axPy84m1bKs@wr;LQ}
z$+%*~3tvoG5xcJQ;^gM1Hs^KSGZy0V9l#tAVF2HTuMOaL_PVcl^U8v)EbOx7xNI-#
z+uOTLUtPiZ{heSOopr8blZzl0vinN7cI3D3(B4lCS4nzY8Tnp#NAMc~-zcm=7YV!<
z<Lt$Wjl8q)1*x*Sx@yi2yz==6y8z4q(Fb225Xq1bWVN`gbcrinPKV{b<-NQ2*#hF_
z$O~UYz)I;JPmzhljT*p*4<FvKgTB9Cfv=TUx&oH4r2XigIu76I>FK;M!O>n{nvs_$
zHbmWBMZ%6p1jYmocPTsL0LCR8d?T=FfsAa`Rm;w22`_cU+t)XAsJXqxd4sKV{SHsQ
zzbvqqH|p-NY~Q{e!1YItFLCuiU<o_1kgMfQ^Chq{Al{NMW<%tiHC(wmFMwI#v6&V6
zo;Tkf_Z6^orI~$kb7LGQ-E9iE;*Gw&t?;$!z{|I@W-Hk+dc%>fk2M)ADDDo|h3^jd
ze*FRlDTo;93V18f^ko3+xYMQ!UIe_<ouIDsu9gR_=75-4;RNo-61bZK*bA&gOUA+V
zE>791xiKYO@Gkd^kN54JZ*O_}Db`mP$Lwp8(v3;TB1X$Z*}#heH=Lf?&jqcPX#XoU
zlhcafVh7*pz&mBU!+v5z)ZJ4dJYa<lm}fXEaDN=Y^vwdRqD{h8Pqhf+<W+CQ3tc3Z
z*V@~IXA63Fzx3>#mmkOK%r7rA4o)y(@4A(FC0tkBIkTT19)lRhF`JY$mbkJn;=Jzc
z?Va-Bpz;zo_$uF?BCrNT7kzOHVu&k<q`?BzF*mhWtyP5Uvv-KR<9J%*=%KkbTmD*q
zN8qa~x7u8ahU>m{;tjq5`APGweSGGH*Y@+-)a;!bT{<Xo7BPlMSbEefE=FNx5;5H=
zE*)IgPiv{I<x~X5fWS2}d^`I`u|lJ788B6oty1Kg32l8g^!9?cryIT;5WIln{AGJX
zb<<}^h>I6^E#hV9i|w)E<744}C}Q6pOJ;`F(oVTu*+XAsGRaEhy%c7zc<&mnT$yiN
zcx@Id2rKXb`0^gla`Y9jh^r@So0|)We;>{=+dFO#6!d&FU%&;1U%-`JzOlPS5v#xQ
z74VbWcQib8>lgl4%%}`z<~3SZ*3LL*#)kP)IMmp6$?LOs)<WI8cOx!TJy)+@{RYJF
zJrjLV;CO;twgN+iz&1s<>MGv+P!KLg0|MP{`$)FCw}~GS;T9!)_2?M`XF=0A&fjGE
z$`}3pd+o-JrKP1`5IR#Dfpx+yYAUnUCFYvNDGA$#Bj@$m8+lj3D_zol3*B$8A_j~B
z;VXz;ogBdO4Z!hCRgKrTR2R77?PYg4dab+{&i7w9y1T&ohW=7G`|X;ZI58ry^OpP8
z75`rS{`(ss#*56s*{Kt0)tbs+cI28VWHFPKMe2eV(;*IrHS4bHs<xIt`37K2h%+eg
z1TNtwrw?@b0wR2CC<~lR#m4fkSW^eyV&qC%W@vdiR@cf4UGR2}jvp#$ftFla@MNdY
zhl+d@O1N^3fp0_o+|@^qe*NBZg8{RrGIh!fX9T_mY#S4G{nQ5EPtaY>291T7&lm!)
z2H&ZbNetlg^zDnjY_MRxp|(?FVatsXuXH&YplgvXc)R+$TlYP<!}WtTm$F<$q~UbX
z4F~e3zBt^r=lyd(JhJ@yE0o2I$XTt9(6P^C4pXD%=FOYnREw!QW98-20lc%OD_*%~
z6Mbic@AN=eK=fIGO$WXV40qcO2XeL_BK)$;`pA_mU_~1TgLSvR6Bk8Y7l!5^U_Nm9
z;Kik<rI@TBG<&n7LG3-fz47#}bJu=A3|Y=!eo5$Popa6=T6KnR6jp9>HpJn8RMkCa
ziNJT`fLMVqPjKVr8-QJyy453E+2(OyCGMzI7rIzcPWK;eYHx|aBk8B{$&*m{AgB_r
za`<rL<%{^ox^@l5mcK|WXfUhJHxgtgCUVWCOP2sFWE?=3yxv~Z6|Z2ku?Z1<H6Y--
zTmnX<YwzNWbyajOLn5t;>$a$_eTp@`h~d`Rv)ewS$1Mm0=J@3TnC+FY9&{itlJe5`
zv4))&KfC%_AU0*sci)LQ8P1L@VhemJtc=}+E_tEL;o!WR>axM~U7MYl2)-z=`R0Ks
z$+u`LS+cf*R9VinmSJrX_SQZkWOo;*(2araLxl(U9%Oq&Dz4AiVNYp57%;Dk%XyW5
zNV~V+sH!Lo;C&fu0hJ=g3&y)fF)GoL0gN%Rme>bu8*9*tA^`=hX<9&pdI`N)si>_J
ztprVk2b&OUY|@t+A27c3-}3vuz1FOAb27$n+L^H;hM&uI_St8jJ@oyY10(;Vx-+HK
zG%i5egSLUMkHEYX$m|sE8^(A+@v3^=SG?|9#{EQ50Ut~SJpRTJHemVgmM?%A1Ga~G
zN4y<GLx{4qWy!MD+AZ1w7rN)*JAPyreD6%-U-}9-W+8%ECCu&%UZ#?FOYO$)cXcK;
zjS;Ar{ZGq3Z^WBpdUX)hJNPGI-Z3>bUd)j5MstYXkd=+7fW1M;_woJ5-eUoC2%(5q
zDbm6<;<EW>D_dVylqRX|Odh`IYBRf@ya&GBas914K=bhfe53gaHy`|UXV;0LUw*Nf
zfX|WqQHKM5olxP7^^C2p(Hira8Lo9w?3yKfk(}=Mlz2znSG?|9lGXn-0EY1N!7nb+
zcl^i<N5JxBhsbX6BTl{In-6!5x{ZcF)~MRBjd>C`etTE%0{X+B82^SYT?^@>Z%-><
z0e9X!eE8>|A?yM2!Oy3GYBMco&V2Y`nkv-g^0Xd-YZ{e>6uyOTL3nBkxbzKP;fgnK
zBNq_@TLF(89$G{LW`lSS^-Eu`;Pk+kxU;Gr(Z*rSWSw>wLS0Rv<}VC9-aCvLwC?8g
z4l<Y8E=Uo30WZf7t$pkD+AF=hU_)Y`*20s@^+Qf!*)k<<@O6#bWsTuxQoGMAzfpzx
zMh=Tty1|=p$tzGi_@aE3B4G1H0iQzw@3aO%Hzy{o=QDf_#?UKdb5*OAT8Pm$FS7Ur
zSzA-Evv<z~E@AwchG#Z;rmH|Uc7QCS@k33#|6afK&b{Zk4lJ{b=386Ah^ZCs65u<h
zY0oe2%Ce1{XvSy!G(RD*;}il^kLik6zB%2aWDQqk<*N($Ch&0_;gav-Iq$%4s)898
zj!{=ZR;|{nR<sOgnWU<i>3+qQF2DNf6WY;G!!rTPm#D?1W<Bm3V~1kuoAx$*4Q_sE
zsJ36w?hCvpSGy{uo9+gfy_UBSdkf#gry}~R5vDmZn|59C5;k(dlM47_bYKEcSpn~V
z?@0kGiBqm(4cItih?=#sjWlc3Ona5g-A}_;PH>9d$G=speZ`9eZ?*51&3hYuU)1}M
z{k#8sFJ-TBZ&=-}k9zG!t<p7(R$|E;pCTR3>W{<VJ!9R$%J+Ei!j~1h0#UKz5y0Mo
z<%<rC0)7%5g2HZ$N5s2<B3W+;MjJ~rQoY(Td)-R*VkZ2{-SFii%9sF-6Xer+qHs&!
z$mW4Yx*^qW*s)z7*$ix%&`DosY_Pg|s-|z9A1_SD2yjRE<Qa+Pkji&GQ@r3^0d6jn
zlLqX*Bd1irJj4OR?`@7^m8*udE*r3t1*^M8$?E<a{cg6OLS#2HxMS>hoWF@Tdv8l&
z@SvHU*44XpzGvInom|7g?Z(&+xScVI7B!oS)>p6C;IBnGph;4z;Ssc6j?27yRld?)
zOT5yR>7?f;J^}b*7I@JPagLIU!zvsfRJMauvXWH;(C-4;!j4RzWqnimR*%nA%;6in
zCE)oR@7lL}&z={sx>ld%f#Vlxqh{^5FaG9ze71-Co&v9gBOfr%i{=Yk(n?pn?yAQ}
z$WH-$aQV_9`05ac0w!=NiPd32S!%QU5mjuiWX*N385hQ`AO{AY!6IPmzkwTD!9@Mm
zs(mB1zPp+=yA6F-hcAcKdJ2V{ia^r<uw1`PC9fUaI4DcFh;WsUB41Kiz-vcUz@rKH
z9RWj_c@hsKXl0v~WvtDLHY)Zr1gtU0i^+CfMBc+)g9h)%CAh3_<<3Rz`ObCUYlkpf
zQEas8vVDkk^-}su^*cH`Ix^a{9Uc8(6rpbLu8G$ggWG=X4+ekD3ch$Tb%<F4FQyi}
z^H?Dc8*y0C3KkJ8X{}%lwj3a9+pEEQI6&)e`l7u0a<<fM%Xdp>-$3_GCr_egi>oPQ
z+bRwlzNH+Rot>4gc-bAIF+|-iEq#qgGa#P4uwuZ=1lBR`9q8@!yyUGQQtGna3s|uT
zSo5y;6vH2CzvAHs(g5vbseXf)zMU<7b@`%p!&`(k*1{dj<y2L0mG1|5%#I!!g)ZU~
zW~|<53})-823~Fgzl{=(@VrZLTH?mYfVQewHUrgcu(k+Fcz960WA}wG_eoaIjl|qe
zYhUzV{03^Xec(Ec(?Gjym*1hsQ*0583wJ;?GRudmcbUB2d_&i9FI&Fnm$I}3V6}*&
z$FE;cz*CD9_T?*j&fuo=gcx*zHntkAaJ|1G2F#l<bQ{r~+vMxj%Vns6fM?C^NVjGE
z-UwN%*!*($u3{?6SoQ0|9RNl6tQ>;w>@woKYvPq{=!({I_3BkTU;b3UEaA1I>+1v_
zJ*6hBz&I%jmvyU-V6^!@8#P;|trmta^1#AGnnJVsr7wjdn%imZtJGk{F9x#ZwD#@u
z`ju~lw1{-CUnlR{T8?*P!*Q<`@(_g`_~P2y@sBCYGi6?OGGP?2<Hoqy%C=m%W!N3%
z*xy-rfYEJQkHri`3An30-z~Mx7$|$yw(T2Zid_9#B&&#bdU}05!&}1rE9GuH^m;di
zFNg5@^g#zs!r+yzD%W+rE$C=gRlEh;+lnz{e5eod%$2bddEesJaqaqU0&RZBg0_4E
zIO^9#XEV>&ud{mPt3%tQ<H|O0|A;*NFodsq7hXXHuV)H)W(L*!@~-WVKi)6ir0c!_
z_H!}_lelag$S{qE3By;PtCkwD`8scoxJ}<qi1zg8I$hho681#>E=NSGtRvEOUg3&1
zV1N7V5j-r9K=>+v<%{|~j`}?$Ug#1x>F#XU5H}+XVrCzKWvoK3>cf@2B0ly@_i<v5
z-F$t1GSa>;WZ~OszL5&wYT!PvUxx*)<0@+ic+ndQx}s%%{Ov~%_F{eb;lJR!#Qt#c
zleOkl`y0k9UGO$IWFW8$r>QU?A2_h@xu|1TE;B2IW88v{aoF^S1$@)%=Boi&KJEG<
zJqUhn*hUJz)xhQ}(xR<!O&7d|8@7;r3armQ`{T3PkQL>N2K?!gMrfLa_#$*QD2rJI
z#%69qn8b*f0nOy<d6)rmbry!1@AhHp8#_U4yY+RP9I*eM&fXr6pc-Y?+LyPtKsc8?
zZ!<}l&w(3}uT=RZS>cv=X=^Qkw3J2gjCZLun6A(99OOzV^0Ib0<aOT0G4WRVz8S(I
z4r7;&IJ&+04%v4AH`H9af*~3@1b|t=r(M`@2yow)<qKd%$a!k>#dpMg%fM*C9j02w
z)wn^$3th+tt=r-!f1qw3!q5y;5I+IeFLL5KAatGACL5U|ulv4f1sud-oS`1}$Qv*F
zn%l)A+}ZBh7&`=kHG+s1Y#88e(^r9S6)?YD*Q&S*nDra5ZcE&(E_q=ab^8=#LHh?9
zE@;!4@ddwrL0w#==aK;M^0>BLyrHWk-T+nw=ZSY8;8D*Xl{w)16-&35*Bw#7w|AQ_
zcs(w>sV!dz_EdF>V*M%=^}AN2HC&ynK^M5tjY#${9n6fDwy0dw{e{KLYl2v4{WgaU
zNWM2nx7U25f|>A*Mo}&6fvs@KiwnEIszdzwx_ot;rt`M%E8wkp<W|7)wUp}DWLGGw
zfEE$1HD2)o*<rtjtj;9-y5><W0Os<NLn>bKYDYiv_V?Q~j_V4T#zcwg4c-8@7-%K1
z7q32>3~LeqJVsznLf`=Rd~AOBUwkd~dOH;?Ur(`q$r>?RA2j%w!7Dakc_g!{wfir$
zUP!t_zFXJJ=nbJ8yk{Bdo&^mamAq&Wo`C)?gbVfC3*P?i=X-zst_e)v=ercs-PDe+
z;>xvb9N3L>zGhsg-+)zgB3ztg;PlwW23&D!wjx&^$OP+m8ESQlIs<S`_i6Dqq#JEl
zuF)4zypia=N>MkCbfIj-tlvgIKKx|+H)nB>!&>W;0|eIe8GUVhCg1wj&@CsYTd!&p
z=DXQ_75Iub<{?zSlbM=@Y%v>lX#)KNrw!H#ob}QrxFXnU<7e8ca@Ba#wQb-w8kNJ{
z5G^Jo^Q`_F?IQYvf&xDO^!r?5a~{GICw}Or@Ek9?6>iAdTHn%!uK~+9(xz|J@8kwt
zEi77^5>?fjT&3!)xC0JtmVH(^gHV=rt3Bp4)xh&Lv<282Y`6yGb4qELt7{RSg_LI$
zoD5&tVXrCr@xsEjVU2%ZJloj*+WTB|cmA6fhk2a4i8YL2Fofft3)5}s8^Hh9*J<t5
zyMVi{o9iV;t|lu~x&oF}D_i{GG$PYHj+TNXR(bLSxawrVD0wCfN*C4s;uHLI0DbOb
ze44UipE=8yAMnAE%w7Co$gv5jU%4`If_qY8vK`|HO|;9`7M->2E8YL+dzk^R(^8gw
zz?-XFB`eqwtdB6-A%mr@a9Oy-)g&ZK7rJ(pGF9lm&)eY3rfE=`fE6oL@8rt4ZY@QM
zt<9AD*57>QkGOB&US?pgel>n%i+<I4-PUz0nT^(X|G%%>vS>N6xQ^3hz&fjBMT;CZ
zS;k~-Vet%cp{u?C-R8B4%(eB3NyqH8E?g!1C>I{EM!DJvrwT~&)E-+(Y5&t3(|4@q
zL-_1lOA0q&^^8X@;hVGl-~C}ywxpFUX44?+u##1rHf)b@YB#Og)+~-D&^27(0WEWJ
zqB(IMvY|>?+s5_;X=70bX)|j&`e2&B{avZSE*-f12l|PnW{Z8zFQchPwQuN#tMcD{
zVQXcpx+N|z!{K75WSur}r-sH27rIKixaMcVjYeEqV{2$$mnamjU}O7F$f9bE7PeZ3
z9t%y==~s`E469Q|w(3a-f5rJ+w_ewK&Xm!TZ#;g2T*p6Jr>fibC^dWCr1XeZp)H=`
zI+21=S_f<m7tu8gB&*A2t4x8G>)geAgb7{t2A@H1kT>TWouOF1!hKY>v0x@>5!%K*
zfv~N$jFARx0k^qCJ${-v<ChXvL*IHGu!*#@N638etE(7mMRA$Pfjh!BaG5CFY|kZb
z@aBBQ+pih)EU&E*p{^3PkOgft1TC16tiy^{LCJX4;;A0xno{%)-H2Ce9T6|z*E)e%
zL&3{6#opBXU3vatvjy)wfW<d*x{0ez13QdYxJ=ld%Id0krMrknL05CUX_`#Fz4`8-
z`ZZhXnk{I#GEuZxKc{1uCcW&+j=_3Q2tgRuTlkh?y>O!e;G4ft@6;wT|3&ngW*<V=
zgzcobi(h(pNGo1NFW`l56mLNnvAzJ_ltS?eSH)}7kgVR|-R;d`(0I*uLbhlK+dxZO
zr=8>Yz*jOcCTnp(JtB_ay47Q_`FWA)SKKm>FUEeG)m6M-U0to^vWkCWozR6toI0;!
zvf-=dkaTs4h`z*Cyfc_CGG&c{rE8smwF}>w6kj#symrdgYrORJ=8%qPY__6}s@*GD
z#P+^G(zS+gjj(cK=u}G3MoibU`urU3jkuLl#Q2Xo2Z86i<je2GJn!NECLZ(>2pe;0
zdMA8ugs;`EUw@0v5WL|##NObIcQM;}&pGcd#Fy$FEBpE;l&}q2jlMMY!pKXqn(9(~
zrXU~H7h$E_KCi=e%?;eO<GKBdv+HXs8-HD1(LjG0tBkNh;~W-x9>abLdlq)w@!;*e
z{xLA{)?C;8Ew{|0((yv<gsag*xf@H@Xp!)Z!&=}bUC;PGq@7D_5<wWpy^ytPg%&M^
zT3hYGwzkzo2x8Hy4XF_f8Y@lfquTh4LM+t~*TiSDy1@h^N)3py9y~$Ba4Gg691IuY
z$-ADtd-p%z&UB%zjgPO7UD}kTKmPpZo0)Hh`&CPnYn_)W$^>4X`idn13@_*cZVTy_
zJAz(POR^=e6&sT2c0iWLL+F*hX=C3|l5^oV5<mN$dQG@jPs4Ec)Lf*9A?(BZCnkJ%
zgNIXvY$1hV*K$%$70SuES-F^u6eC%=EI%%z(<Nu-#%}HG?z^+4*=j>CNAW=DJb;{;
ziyeWak-0G+XQsEWhlm$ygjX$#cU;gVv;yx*(50x-E|&Rm@#?jZRM$Z33b$?+Y;D+G
zge-xx)hqD$*tf7X-B-ntX9IL&jl@w>3gFa$OHl3#VX#X%6!dm(*?qe2{Gmfr@ABpJ
z{z|Eo!bho8DR}{XHY=Bk*<!L#E+tFZf;Zp`#3$kiY}c1gS1PH(Y(kFaKaGt)-Ff14
zEYxYM_cy^>?2I-Z54}R{_5mi`)j;b}ME^qIov!Aq(-nAYx8WeTLcIF)rC#_1XE?|<
zw{PxjxAGjp&kcdlE^PHiWF_5h^;T;UU#H|`Gv_L_YFs0kB#H55K^edbK}mv&{~gy<
z6nh=6+&&VG%Cm1j6cDK5=+6RlHVx!-@K#dpK)~k<28M=)d^j5d?IA6EzCbV#0QUXf
zQYssfqqkp<-QWJK_b4`St%s$PpA&V`?+xe|aF@8lGI%*$3Y{)D1_Z+kz8c)4TNzs}
zTbM0Fi-6bCK6+xx#$LyrR-XnJL>akSzD}b-lZ!!RgD;FOt+mAYO7f*-%gE#f2X=*7
z#-e<QCNTf?il$=l6~PUe<`mduSPIBXsZ^<wjt2o0a6$KgkAcQF9KalBckd1j9ng?7
z=yA8Z(!*39dHvw!_`{vCT+Yr+W0j!06t7^*g0roqi>O{Vah`RG9mKY|18z&IHHZ0z
zI90oA@;ZI$$m@x%0BRDkNWWOMnp1O1*w*Os*y;6XQcVcs%KF6<L)W2fZ$R-kv=8?l
z>j?&-LH^qB@5jvIY%!56M-t^^BoRSGA#lv!6jG@&YD4m6t-c2EOFb2@n_=Z>#pwYa
zIHe~gb0^03)V8du%^ZmCRITyqbcHie2)cYY5^ULalP#JhfUWMegqE>o?oYz4@`FF+
zi<;azyHda9+}M?lHj4szc+lWb7PT^91ZxD*&QlWQIb*hk&W+?Vk=bmjvd=vc50C(Z
zpzTh3z3^qwra3V=8hxDUQwBUrxWR0$Z?st3LX*3O9p_T%wA&4P4hDnxV@_EQKz2`K
zMz{zyFX1cnTPt4hUB-A31Q)L0fZuYv6{#&bLaWGYDg7EidrQhSER6-C;<$+Kde@mz
zOXu$M2hA=&mQJ_rz0loatyk3AQANZOxF+pMSjY2Ob#>0u<O+A$+C!Tieccbor!Qq7
z*8ZOT6LI1Ng9W)b<DE{A*cy>6W15Mw+Z<dbr~Kgc`y}WRoCLflz+1!3^c#$@`$Fh^
ztIa{6)#>s8U0uC`EjBS?meARz<+fr0r6`~gRp3Ike>z0tq%etFt$u&^>E7K9epk~O
zrK4l>xns{~8XMdFmd=BH8*OHfDgqrZ)u5`#;@B7&<rzljIslgFC>g<9Wfvh+MuXRS
zd^G%V=JS`BV{rS~@oOWOp2*2f+j_jjyOf`k%bB?m)Fd4{cJbN0K}YQJsY(SZ7qjYO
zDwxb0v@2<B%ACLO^y;U)T;_afk=E2=zSkG=y>JV7@yQ2zk&$DAsI66O!(ovm==HZ?
zOHsx4U-%lD=7%#+r(5Q`=DW<#TMk~Cygb_4<f-4a_5AexEzRwdmO8Vwt;5ph$~h$!
z`GRT!TnUWV7$szKD#I-SugPQwTKuv`?aZ8V2&5V4;Q2>k2iA_3;nRc99KE-&{PNMr
zrKp^Ek-!_$Z<BWfd=$_pe4Kox(gPv$nlZ?_e~f{^3vCtXa{VsPSK!rKHYQvqTSAN6
zmdlpVYP|+gnlDBcDLC7|<ExvobM@%$=%=Z!F7SPGbNAGRt{I@7eBQoi@Qzh+dHk_&
zj_%vn9kI@@E<<bUzyJu+J+Y$^#Njm1FY;*C8^dD(R6^_&7bU(bW6b*yIjt4N5706)
z?%@W@<xp(UvEkiZG?FZ44}0Ac@C1a$oANjChFxS(H`?uJZe;ph)_isA6=-h(E!Z;I
zI<T6r1#DT8(5Rs$whCX}sMjsxq3N>yAHD|Fn!KI~ndiGc&pbGF^4*)6_cPYe#UpP<
zVhwm_r_nF5(4AgK!>IMl*YDrH{rvH4@?)#XD4~00P@z@0FH<ng!oY|!yQV>36A$um
ztqaTtbEs!%mrQHdu-o`YfZK!*cn^Tr0XKNtpmE19*3K)`X(){2zPRe%d*Hx<C@$O!
z1#zKL_Z~P9t5j4(txC1HS{H8Xs%U8=RZA-xMbRdOB1wx4^eqV?p!P|HzWYBX=a@S1
zLH$U3W98oJ@BZ)qeBXDz<l3KW)vH@hUj}jN#Z$3NKJ3!97j9|7`BK8a$4d!Q-7?t%
zt-mwSLbk}ixFygl^a)!&>%}z7;Qkw5#HhzdgU1iNxB>wSsg(z}0q>(no7dh6F2%mF
zEDAOM_!Wz~wi~z0D;tJgwMAJ|by3p{qj%eKvoXL$Xd=mL4w$XMjP`%w$92J4804*4
z;SJ8jIY<K@r(~=hZr8AJ)27a*lVkYwGYN6;{1%<M^j7`a+3|g`&bI>?SHE?5>-kdO
z-Na<;m@Rh%=Wg5xr;pH*uCb&^!|C$u>woZl+;QXdOWSrNF8Z(B3aky^d4#z5Zp4U)
z1-y@>+ZXO^+>T$<E6Iwj8F@i2m&>|l+jjNySxuI`yG2=5^|E(2)hQlhoL+nVpc(aw
zF+5oALckK#K!}Hjw|U4DTU0zOo5$!Yu@|~>K1R?6=6C(p<-Ts->s){d*^=CLWCuT6
z$Jj#V$QE!N)$%P}-eBTg(|_UXB0kyk^t#!57alnipD}#n^;jh?S?a35jCc316pO`2
zdk*f{9!(Sx(kt7pNjQ;<hNc>}DeJmd7wykxwWevJsy8mnvMiPx0dsS%J{GhnB#bFo
zo;2cr;CAltb3l|$#p7%rc|e)|nK#=<HJU=v64M^lz`^^g`$D+%KC`%m&ZGr>x&bX5
zftO@1+8-}-<T+TwzYH!`qMU{tFtgwF4-N$0h9d{h-yU{!j_=E<%&k|cbalXc#ge4N
zrQ3;11wvP>WXzW}RVu2*d`&iOO$BLPHB6X>rt3XK+4!v4S4~Y8y{%eJ@wOb*`Xp=v
zj*K^lcTj^SAhGt5S4iH$G)q4KDBG%bPMxRv&O0j=o8myq-@uhG@9aRj{O%(|;Rvit
z1GH?9jIU%|x6Bks5W4>bFMYySa^T`<KI*}_{r9iLZ-?K_o*cY6`LHjS%YKPQvzeFo
zUVS<+WW=hNAdv`c`TW$BfmeE2QGz2>NwOrhVrZtM65Z;mX=tBqQPiPpjhw1t*#onH
zE7N5V=`rcy(F_jn4D3X~t;iDB6sN8`aIm8YSVoud#R0TD8Zf*7OzHAl6D=OPdOWHI
z414^z+u(I{3%C6~e9wCLb>+i9^2IU&u2_JGA7cNO{Kd&NuLnmqUnxG?I%7b;yKheA
zXr+|%E&2E)6^qUuP#B)76h7sxo!Py?j3jN9iaR6b!staPSt{C5<8xIbq(N8Bs}QeP
z)<r1UsG6cI$}OR50frrU;+Ti-^|VHpj*v#?;i2E<=APEg8jfj(e*;pw#$=$9b)UI_
zIbP1Uo-XxYo}EFsU`reMtZHx?38=l7yX7uTz*zImt;^~<<A{Ici=R?BAveCqh$bC7
zc0IN@yv<S)e*dLC8#gZ6x9nc%$%Z$+4LM&Dd46uVFMH}~I#dV@uMSUF-U{)3Pa|eD
zBq<jB<LNCUy$y5~sT4BbRvk^lRt)2FUe>V?mNi4Rt0ok#k7-$+4|^`RY|OUlA>rn1
zEb#jt)z9NRc>IYkg-h5{*)AezdD%cLfjR=$Z6g+Z-X7szECwR~g|D0M)28B}E?ajj
zdNwOukSy!syvyyk1b1MJ&z}h|ynD6q@>b-D?`CpZa!GD#w*S=0fn+N4>UKIZHFfLb
z%eQf%q<k7~FN_LOBB5CKqIS9f=$0hBGG$Yvs3l2M4P7dU%ga~`RSl+LXrf$h?AhIt
z%(m@r=)p38BCuI=d~h;0?hZ^?F592^vKuwfm2C7Oo_{$zIqjSgCFZv79owcLn!0#N
zaK8VpUp{z)j1m=7+b#ol+`$NHhw=N@p2&c2;^K++$AgJ^7llM<<IX^PzhzmUZd4;v
zZ=Fh|hE1LZ-^kv3TX?$RTGF>9J3JOhzl`0i1;R4~MX}<sTh&-zL0FZiar4$&Nx*r$
zpc*wr!WSw^2J$#v)1Y7+qKaAt=W;Xnax)JZl>l2hqFv{{b$EHy@jZt-l{pER(_5q^
znX{4suB%&@t+Q{=@gnN@BL0hho3-@noqBEccRTCM0FUf2^2EDv_fkm^W(3x*Ix#+R
zQBdxMwnet>+ZPv>-MtV#g;xagYBKueW~`9UhkVoK&YbH@CX>0`5??ks<kZv5y;q^^
z{ZnatrXUFEXkux^R1}=Q44T0pKqFp-6tk*nmRb}cU{w_jJVZnE>Zn!Ja(OpW3@2A>
zTyMY#k}%X0p2GN|Zdg6G&)E*0DO-0WfsZUQ*;2TC?;M9qwm$xb=@^z+q9Ub5f1{4`
z+n{wg5@atrSG)l);`s0bli$bl`FtdD{CRr;r0*Tv7ATbBrTEuq`*3<+J{}he*;*`(
zSK@`q6X6;;Xn2WlE_wt6G{QGwVk-0ULnU8%a<B9x1Gpun68lEn`Gz)5#&LXa)YH@R
zFBA0+4{R-BrDV#++0nJ24DD3(j!xN7sA5HohvIFb4L2rnGbSf>PCYM6UBVcbYBV7U
zI79K8tx)FX=mvc^hYZ^8)pg*D0~Nnd+F237|L6CbEG@TP_v!b3&+qr-_avE&P+h@i
zw~`l1TL!!48T|at;`wbvY2+LWo15UA+1^-O+B|SY-=&zm>O9bg5ziyM&&$&Gx5hay
ze;{2ENPdw4ci<k5Ufr-al(lRNdDo-cOA_GQ_8O5k-ha-wmAezN_w0M~k?Rh>bT^RR
z+thpS;rQ%3XK|6zvvtZ2aJgb}o{gC21`G9i!I4k+$BTfuD?V><^Tk4;nD?KT&9$|)
z`?_>F6B_?MqZr!EzziL00;UsF@HFi<C`%P3OTkZDo9DGI(U=F`+&pKz%K8iVeo!CX
z`959B<uE`lu5GL%Aa5-$Y{J2>Y%Xnl|ID|Cmlh7-jqgL_cIPYi5Wf3?dfz>L`}TW)
z_xSFOWbJ+rsIxUw1G-Qj1iSwie7%Gcl_W;7t8RMn?qm1vEp9=lJMelsOYq*ED{vNP
zDV0jS5*KB;UZ~XbL0;D?h228s;IO2>T7=3>*Jx@UunGb<9LVHeo!{D$^c{`j^co1q
z;N+wmbzOBJrmD#87>PA4&8aE##kJxZ8$R9@kaA$2D{|ZzXB2aUb<rqoWV#Ta7Z;b7
zR*!BjEo^_gia7nmf%T=;jc>P5c^}2E0-P8$`aJ*cyR-$kqn#xX+wPSP?TFig3$^I}
z>wGUibmYe8?tTbo^|4k3c<*bk^7i;1BksMgUddCsRbv&UN<cf6YPBK<xQJQKmhu5D
z9W7Pr^?F&~5l4wDi)nk#m#vrUg|SKPyk_UtiWLlc+Kg*~F0Cf;NWjT8D;iUis?I3&
zilS?EK3JHC*4WxmMlY>-GKG3ZE_nfZZ7082a8|y1abfd`&GiFI-y(_L+FUrcdi3bR
zjjQk6_{fny*q0DS1STU@2k~tSZhJ6;_M$@js;(`(|8{)9)Y$!pUViS_v0KP!=9%}d
zyI^9EvBwt|*Sv2?aTHlqX_<8#$I>akQq7j6h)DSXy2?lSs9efJl*k7FwOB}tC7)R+
z)OQPM=6PK#)(eGsHoU_a-{<p+#HbOAa8+Gm>H!pkqGQ$)6f>jmD5Ywp>X++`SoBbr
z{cMr3=V9fQ90K&b&F5AYVdagk&BgPuF=ma{Up{gb<~Fvs-g##U*!!9Z1TkiZH<q<a
z-d49#J6CAyzu?=04f(?7M{j!Z=11Oq^T|hUBm)~_L({`pPS}hOr$*A8FQlSobFF}E
z(Mcq^u(D2RQK<@GmaIpVd{)W&EiNLRC{@dbpVhfarLtRRnP&wYm8%sgl+mQ^La|uL
zQ>j#v;pAGQ0UP6?T2{^NPtvg{4g_0MWyz8%2=awO`u5`!R26uUNz3NEDOXljkjt&?
z@WmbW?BX}5x>r{gmbMm-tgbGtE-gIK33e#HyhiMfy~c#5Z<{B~`hXT{)BUgFL#u}w
z^Vn}bdFX!p8}}c%`L-7iUw8d=Hy^(H-e!P!hyZ?QtgNJXCKO51L<5Of!nG(ZtWs`N
zQk1M1m0ekZ$0e1cv}{JnOL0-FDR6X^)pt0pUV&I`PLN9Qd)cWCOOfyE2s*5LW|p>U
zRs->PKuz?+(`utZ4_FOaXOPr6CMECGm_iX|E*kzq=^(q3Bl$&{$tYYMK^Y~A;(S+R
z&!W<XzI^#eb8YTr<m6LF=U)3_I}PjG)4t#G{UZxs@^=95%>$C41;E$eaTVHNp1cla
z#mBdj9Qf|{h)(UE$V~8@ATzS2hvR4=8|aP=pqz-gRKO=hBN5j|=rAL}GZ8~!^G;3Y
zTw5V8S)v`ummssI2zIH2h@vo#L6r~)D*32kSWZS^CC;7EY1&nZVl*Z=5U5?N2F`FZ
z>*T8yCur0ercP3gm3fXY3JQ!2ymh<2E$u9R1AX>^rv*fbYe;u&2jCL5bKHx{_qW2?
zuFLKrY4)W@aIWj{^-p#_`6U*$VL{t_V~>{yO^0O(F+-d^6AoIzuV<2pL=2qi#A*6u
z)Ca#Yz2QjMkR(Hoa#39&s#!)7?3KJ3H#nx0hk>(<X;Rs8DPL0JsmahzsamQ!x|p&U
z$q*Sm(yyvW<UG*>E*&GFHJPFryP*-%g`%nNIC9}T;^ds|<XGuF&}|7*{|jFpBI{=^
z>j2wd-8P);+PcVmd%QBkJA004SF~_l3O{#Vd+SYyZ+-d6M?QNswLFo>|9I9^9M()p
zlEhDnOn@Rcfu^U>CUQD<@+2KiOhpkq4au0XYBVEBCMzUutL8YYW5y{aZYn^{`Z+er
zmf>loW*QoPYF07*Mk;8Q@|9{yv<z9*WLd7E`b(ey^gz=wG)r}>V6ADg>v9dQLadx)
zwc?0SXw&ufOE@WoNzRT|BV`LL_WuvxwonIQMiQh6ZJf$QZhX~qAD_MNSXUsJspB4>
zj-Qg#tjU7Ya0+%KHvvM>I2TdT-r=b`LF{I!x*Gv!+fIJ1yEbc@j@HY$f?~3!q+14#
z97SO%+X%CHh}G;=z$CBbIZ9!|JJl+}v*?DkM5BfP-Ed=`t5FOh!;5tzGU>8yN|L2J
znwZOdM`Fb<gcsKLlQVrCEwrt`fTRD9FVK3YE09rO4jA(&S6+<*>FBkqXHRt<f8)+~
z$KwHheE8|X(a0=2VVb5f&Do+!lp2?8f${4BgytZ|z>~4lr%w)?1aFH>51&b#>7{IV
znn~&r$^>bXNs2)WoIxibMnyu^3=2<(BqfV1L=4Ow{1h(%wPf*p6agKd6Q$~nM1z2K
z-2n`-*npbGfveVR6Mwl{FK(gYTO^z}4_$fXWp5F_gzTmG1GSd(|6l&?X`QmT67D5z
zJ6~Sf$ZbClJ$wVM<DUw}!=J{#82#$2(KI{w^y|K`PX-~=<PDRTq%;WfHpl2zB-)F?
ziE!@jPpHwa`_a1;mSu*E_gYED;0;MkYMN@8P{?JXejt~Ou+Bv|kj^S%ctV&RR><hc
zhYc>sX7l+{R)$X-qQP;DTtkhWP(9MBhnh~fZlghhv@MY{Dr<`ihe%rs;oCAUO6fii
z>P6(+L-gxst&@p(XRkc*!N=cjjdgWBkBdoQ-8k8XULT#EeQj{~>DhB%eDu}m=tq;h
zDZyEOOAg7lErAk?!B6z=oaxiTaWpu2>hJF!P}QW>o0y?pS>QxF?rL<vFbqkiHOrES
zmGv1ps!IkwFgarQC{}?S$)DzKX8~GqWM<fpP)#H@MA>BwPS&&<IPalGj8<XkhNT(R
zZ(ixS?3Dw1@u5`-dr_ht9{x1nzm549xXlYQz`mrdX5Z0;)ni-lKJdT;H*|FYEadHP
z=z9EFa@(IrC;0ademXn(_9vrXO;2(H7ZQB_WkKM$fF>}u0nk8Aetkc#&Q`OmD4jTY
z`mxh!AWg(#YBV0!&e7IP(uZ$hlF@LIAz0<4W<@0lhd9!DMSwQpUtSED9%`9mbpfCu
z#xi9}sg_VP+O90SH4KG7P1GQ&{q)1)`YQ(xt%I)z*xTS@JT59<BDAKHzJC&b$-O5!
zHxF-Yy}P|lmLvi1!%!C}WACZZ1=h!(J&~Ol9(iGK@(a@UHGNQA7TI)K;N@rtw&FOO
z<0PBoB{7}0VP}6h-b?Zf(v8~x7!o>II*}Z3DTL?v)C?Ub!DBWVw`c+5p(I9wAE_FS
zmJKeVF>#S)S%sAu)+ah1YM*~x*Ry%3H2I*z*Dyf-@WT&3HuV$q<AtSla?h?d-&PpD
z$o}=34VtI6$cgfO>kAvX;x^3Mg^THcZcC42Yd;}?%a7v16DLOI2Gj5Re8Tc1!%QD!
zG#-OFZ;L#L#%p1p%`Hn%%CI?6KxqOyKbS<w0A6s8J$4$a0Fs!pq*1}ae=}1vi6|p8
z0vDb7LZwLbFht9e)sSt&-~N!K%Pbl69EKazxO_HCtQ>Y^J&)?}0@2#qg$vampbHCF
zOSHe|*L=NE?xOQ;_7<SuvG3^8$KQ@U?A<tp2z!_p&+vd+a3A*Q0&fNy8NoJ;i<q<Q
z)63I=U`S&aO$#%Fk|0wd(J%x7ur#pcK?t;r(P<yjj6f(HjL)dF*LO~K-Cl?FR6i>3
z2vrODgNa^Ds)4k?1(TW^wTS|%Oa(>!7=#io#Ta?0n&;jh)?{)>>K4pcTxjaM^`0x=
zLVf%zzMgq6F5jM((ABt(ro54-hK_qyg@KzSz1Zu)-3t>Q-l0-vgqSBgl0`{}yWPzJ
z^~hi<HTV1=6O4qZ2M;nK&R|#vaUy7mx@mJZQf2Z*<V0Q+m}x&1pXqJ(p`&bgth>8A
zh6h52iVnyGi5|gFK-aBAyqES12sxS>4o78Cv~5w>IgKGv-f=j4SV))4m0e6BLB}f<
z!ui6|W#}lp@_+Sjn=d+`_n();`mDgGKEyqKpC#9n09;(T1A8#`gjaSS-z6`Whf1YP
zR+)pc3X57}VlI;z!e@inQ5YKJfpGkUr0WsJ@Nuj!nKD?L2N(@wmID{3d0yg~X&J-6
z=GVhyDGOo-Gyp3<2Gsb9DWs%3W1TxUHPt)NONByufKFO8MUoE@C5~U`>}640_A&f4
zKatH>cQGw`YW`JB13@dB$TNTAUoyb`PyXG1^|}Zjp;>w6>oZ@y|5|z+m=R#1_C-?4
zO_fmAlDo5IvU5Ze@Gpz8E^`9r*)0@sv#YVO!UM%qHw?ZXrXq2j8|QRMX3yK=^FmaV
zSP@o~%zTMW*$gLgsQvu7?&G<5JTe0_(}>Fu2opD-L_04%Fg1|Cv}G`y97xh?P1iMF
zIHI2kGN8+ei2gnSo|aHi<}t~Svs7!CAYS*@KBIp7MFi~c<_|b%^KI)NO;aLUX!dV3
zJDvAmzQFgAl_uT_GqfmweeTnbgvoSjoHXWVh(Ht@_9NsuHteA69B$qS|7Ho_-Q79>
zj}^&e;;B=p`i3S3=Z?Sn07E4snlA3VAK@HH*^v-AG>36)S+tkUtb@RT`~hwztFlOv
z(OkOHkD&2b3<7cTuJ8u&GDzdoAZ@;uruk%~*}^opY(rj%Czwm<K0MIlwE?yH!n)q$
zcliEQz<+K?16r?z7G>Jc)ty;r6Hyd~1)+%+11>0v0dc_<)M^!X#jWB_>V|QlE>Y`N
z8>vw%S{0?OwQeOgN!vtJToRnrh?QcEOQeuiv4U?+kbv5!KA3m^bM8#XIIU~kPEwPQ
z8j`Pn{(J77d(L!w);P!FcDT4gM6D?!G1qvU#TAy5b~CI%gmMRn8TVD0Z@t2o@ghnN
zP~W**w+>u9dZ_HtsOjF*=7OPR`B$Q~`Ss2xcMEHs{Revr@2-x<9@kemA?sqNN0LTQ
z89fxEA1aG@ZX#S`!e!Vq2Eqxm=EI(62Es0QbXH(24Ep_){^ZVnT2_1akS5xgB|mLW
z)$nEe1>TPN>XXJ7fjKbMt{V6Ctx7)-oxQ>Ba8oZvhYO!elspMBLpOmblBe*r-vS#j
zgYy;q!+iJGBSmArnAGAC_@=e#7fy&D1da=X@qq<f_ngn1ToAmF<p@ak@?8}%zvWe}
z$LVqT-uo*282BDGyp4w5)E2`r1`n2kC}IgrcOj<2G$3Up8o1KUqFwN7)X!pZ!<S!p
zMjApX-M!j(eB}B1%Z9fvnsq3q`O+T%7mWXmetCPi&eUgj=Irx`73pK1&%7`->~NQr
z*Eqtc7{Qm3rK}c6P7g|+GtR@@dYlD(4sAri*R1$MJ^VK<jrm?z0*8_T7?5#}ym45m
zKfAohDb4gcTbDcR7GJDhYFVD;alX%&kc>HNW1-N?$M-yiwXxVad&L=i|9#TXU>IJ&
zrU602G$>%s^yj~jH61gQDenB@`Zx8ozJoOQL+E7#$(QW6J^kwch<+y$V&k*O`B+*S
zP8pikYsJRu@Jhhs@(@?>k^7M-Q6*27D^Z#9!l2h(1})z`X|7~{s66#K-_>b6z=cXe
zB{Y_^j1Szp2*wCL!(&y|jm3*`TDP5EZ`OsWH5CVa<*kuWJnnoy_U72YF3%aC=Wg^t
zlWAXL%v?}#?;ci++!6*rs@&uO5R_rVKrOOoEbX|$K6~i((}wFGI0X(hylB$N%@IE1
z%WVIc|MG5o!<q-YgP;VM;{|Tl1-xf|(<?z4b?j7<8gxNBY|A2qF$bp9lsk*y7^i?2
zd;$BM$`^o<Dk0b*fSDA05gVw)(Y&fE91z)dz`W{ESzdAMwY|J3Z+YzWs@5rzCFrB1
z&6BqwCnxfHTh7JEji=azcD%)poG;&ldRa#>5Do_dJP_jTl7(Rsh|I0<VW<JlfWXc*
z>qIK=K#Hc(Z_1z1FIP2C5l^bsXkyB-mST)>qFfbvoduAjR)=>Aet2LPPaza7yGA*D
zycp)+bn;ZC!j~KvQGy`840sL%%*PsdzX~G;;oaELk~3gfrrn$6ni?*;{m7ovVqaV4
z2#3A5b0fQ-^~<@@&tx(hCw1>z_4?wiXsorhHHLrUak`1OSn?!Eas(i2N}sU?{4n$s
zTU&8#v#XBq;v+I&b@73IG|{EKJUD5qm9#!dJ3*VU#W~vAQjsr(i6je|IRYg0UqH2W
zkPA`OC&`x~bQDw8T*@o9th#!RrWlMjr0``8zvN+#19)*A$2}@>;W&HTyy~DkZ&fUP
z3!0kLxS!XR9y^hlqBkyGBcJ=NH?AgA6M8hF|Kid$`<BuJY?O*bqOtgf7Q4UDM+^BC
z4<9!?Xfo=%w)Ft$q>7g>@(lsk@cqrJ!8%ax-P9~7pOFHfoFLXPHN)_FWi1nB<ynz2
zBgx3~AF@~O-?}3Wh)ZC>3S+`MXAa|41Ps2g39zOfqB&=)GH0i!k2q28Eq`8}Yx_7Y
zBRdoI<oKLc^zt>xVN{~G9Mny0QuCUnJ+YIO_6l<9&}5)aqKE{(K+9KgtN#mpMS<Bw
zls#Ed@Y9Gb{RK`RX_+Tf%u#T5Q0*@$(_kaCOq3O0mXI)8PMur3V>KBu6IOhf0jq?G
zFS?0uLnqNe=^Kw_SEDsdb++x}$B&zB+1ZVT6xz2W8)U*6-Vg>QQ2$G3_hjfM6or`#
zR^V-`o>KLz(*5)LRlP#qXg`rK&*;r!wilH<Tud3EsF^CPWn0b?T2_;cUC5e-cnbZN
zQ<ZD!<j@S6_|Bme0>N|%Fs?Z``oC<2?LJz_-mW{A0k|1^v+L?|=dBs9A20LO_CQpD
zi#inA#4B1kT7iZNwgg`0%aPy@e?`CCT}PBo>TpjKdZDb$&?GFQP*}z+Or(HQ6#4>l
zFbK-P3@sC8wq_-jgO>e=R#oobvjmidO)O3jFm?v5*mCUtLBPFM3bsV|MBTOAkyUF_
zbOcxJ#i|C2Pc#9C#8Z?VyaY`to#>h>5NPzP-24^39AFEqbVId6+|(0~W*C~tGL{!O
zJr2r>Ig4Y;!kLjbv6h+gBB6EhH&{4Ux<rmqS-&GKR6>LW;>^s&w+<{=d!pz$!zJa~
zY@0u3l$K_sH$E^Werm-czHkb%2fcE-A->1^BGI!+!?%s?U(|2ne^T$0Y48J-4Zt#D
zal0Q`hVTrUuc}%OlafWgEaoLb%QvSkBwwyLd3FER)im}Yj;3whSx}Vs{2<%Hv}qZ+
z)z!K4)*V?kX!s<fKGjMMXA}792}%NB8Lbt5Ot2X*L!PVGCGu5*=f|2P?av*}(3TFg
zm8bIld+xg1#ej?%S$~|8Iad}_=0j>1#N;oGpj889R?=qMS+1Z&eYVh@+p_79*<Mgx
zU5D{Zge|*nZ~7qg-7@O=3*O#|HWT%$2p2pJ#Frn?U2<WW$QOK-CA1mI<*U<Nemry>
zZS^BifoY$dGUqu0Q+F*AmVh;6?xce&7|VvCN*T}7v*A&0bF^{LKw-J1wv5d<XM5&=
zeJ0~vz4&nL^Zi;FIEXiej7F<pyh^h9YUAf=%ddHdTG5TCj)Y_xPa{Ox2g>sJ1}P&z
zl1U@Okf((R@mFx&j+n;Jm^5tKN87RNT-)}6!+PvnkNs}S2~EfU1YgP`1Y;Wb7)@#-
zU$MNCZ2h)(`PE?1smL<q_PbUi=6{h`94T`UT2>~13T2x2!IpV3m#rdfA22>;QqLo{
z+}zTUk==dvnGC3+ri4t#cz=ZN3<@#_gvu9y@j_aENcp$*+Xk2FR1sW$2Hk-`s?KTx
zWg7qPd3YUJ$<;(RC<vKB6Z2qEv`^1I%Q8yGL{Q+}JB2E$xaeI+Im?gv1DJ8ZdR4#z
zkw(9y-hb17+e3`tF6n$7-xZ9y()5pVxy)!>NtqWZlW5HEf({WiWd-r`(P$(GaIJbS
z>Qg?|kMmWBI)$)kqSu~&_5X!_(brq40_GMMx;E&LvXy9AnKBK37N^e<aABY$#B^W}
z9kudKSD0I)uOF;2roa*SW8hU1&N=qOd{w&4mw9!dU&QzDRYS{Hi#e$wS_BYKai2N!
z54{TlB~EE&pcSJ=ta4EcB0qL6U}@govYaZopEdV3D9yt<It6bBr}A%?HPcn~D|l)B
zmo7ic_v<p&b$Izrp(AF<G4O$D?WOsF9L>$mv<{<J-gc@s(5;^EcFgyy`bAjV<*Tgm
z@Flr?zfR&?mtSycLC~5Ia9pC=F<<EShxuw9La*2A_p^C&GWjN(-q&A?#hdWm5do{k
zuLz=e{`cuu{1*5cztFED-+x!X{P-I$#(dRx^7$KMob)Vy?KkNccM$~4(5aKwe+A)R
z*KgvZuR%<{er3tFS%gk@3R%0~)^C@e)h}_Dd&;A{yHn=`1tWLh)iZIE9KL_ke;KXv
mW;Ac|cj=c`gh4l@Q|C`-)b&w1Sem;40000<MNUMnLSTYdK_sgH

literal 0
HcmV?d00001

diff --git a/src/static/images/third_pages/bg.png b/src/static/images/third_pages/bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..e52e90515835e41fb6b44bbfbd65f33f4a927976
GIT binary patch
literal 2519
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

literal 0
HcmV?d00001

diff --git a/src/static/images/third_pages/tab_a.png b/src/static/images/third_pages/tab_a.png
new file mode 100644
index 0000000000000000000000000000000000000000..afc8d31dc3baae55c6875e6de4a5d615f37c8ebb
GIT binary patch
literal 2399
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
RiQfPK002ovPDHLkV1j}*j5q)Q

literal 0
HcmV?d00001

diff --git a/src/static/images/third_pages/tab_b.png b/src/static/images/third_pages/tab_b.png
new file mode 100644
index 0000000000000000000000000000000000000000..545b00be3776f3292d4bfdb91ef89fed87145792
GIT binary patch
literal 1962
zcmX|B2UJtp77c_dMWm@rhCzf6!^kKI3Q`25gpV*%q$@3`hy|2Eq$q-bFpgprlo~{8
zAe2yoAd>*0BoLB70x7hB!q6lTdKv!JS?k}m-hJnuch1@S>~q&kz2sykb3o+)1Okz<
zhg-XVw>5Z-C7@t$3XelUAi@@xF1p!(<M8k>gTWXW7zAr*XqZZ+Q>iopp3v3VH8eCt
zr_;ZD`NHLLX*60_S66RuAFvq==E%s%^71l=!(p*l1t`?`_&CVzXzyrlZXO*S<#4zZ
z3YFAD>h0|%_4KgW942#!N~MA<=Jz!<IRyeh<jTqlr~v!`2n4g)Y(S>2t_~Cj$L{WK
zB9X{qeRBfb_V)JH*48E*4p61j2S7T7(qE9D57Gf5r~^D8cyN#b{NF3HSu74PK)~Q2
zlSUf=9ZgM5k;!C01|atL(+36yN{Wly2yHc0RWma)z?qw!O`%XeefreV(Sfb4U0Pbg
zH8v9P_<y^YoSX!yfc(P30;mjl0y3cH+}s?H2-v`rpOXVVk;#3tv$NCF)2N)BzCKD{
z9~EGMEL3hTkH-V?Z1zZAUS58FJ`m^sBLL!qiS+kVK?{HkNCbV+X!P3Z>eAxk#)bw!
zgUcPs%g(Muqg$GrLF0u51!H4lB+@sv!GQ31JkX)DvlH|SfWChH3g}g!(S<00oC_#{
zHvgSzPY=1Rtqn*DSOKY<KYpB_p9ew_2!x4=2~ZCx@Uf{0=)>ppaX4IgIU3vnpbQ3s
zsl(PaHa2EWcpHE_ln~+K<O=!cz`7#h%I4atV1>_LTwKVCk5d0hY;SX8eSK|BAXr&s
zF^HIV=?}x~Y)o}j_I7u-w>CD`mzNd+{Pbt`&=9q|t)adg^)e;$rl-5p1#?q_6B@F6
z+uK`P-vR|IEA!LSys^=d;bBTo7p}gp4qH|E>g68~A4J~t^>DUT_fbO8AP|wa_STke
z@b1OT4WB`aBi*iYLY5*UF-xr*W8XKQ)7eFi^{Hphypi?kbgwB^)1KTMj$OKUJ7K$i
zd3NgVqx`GL>DisxjbBMu%3y9Xo@1}cum2P>G}redy^BZx+Uubo9*?dnT?sBehg0+G
zHu~FX!}P~iWpOu5Xz8xT=rOo&1-X}g9|AYHO(x>e-e)Us9uC%*H&G19xE%Y?ex~w;
zy1ldQ0~oWZL|Y!;X=-dGH)?{lx3x!N+x5`}1ldPM8Sjs1czt+2r5VC{+E*qo4u{z&
z1`Mh>!wgc%T_wyq&ETz|4+5yAC2ZB+)J-(#H<P5(p^dJ_o|=|#la<yIoJB<=jbO6b
z<t1fKOeL(V+*cQ4FRH-b*(qZDnM{bdt5HD2dxyw#qTxPwNFw4d4MbGKXa;bj%-@p`
zVTy-YP4t}v(I=vEP!kuT5c1F)8F!j2gn1mA`UGZsooLc{$6Nb;yo6MZdhodkRrW1A
zY*xSxg=C|GleTg=j9s%rw<piS5+;1_#QR%%usIiB9nnKILW&b=dEwQyT1Pvvu-*XA
zi?%|tkFUod`zw_Wr}6rXc1;%TBa;i#HD#nVl6hrCx3F;8B;RAwXVQ=K@bCd1SQRqj
zslxH1AjnVMoQ&s6xkp6`)n2^hF8sGqO4-^~NOnK2<rl9~B=S*laiYWZHLfdn;`VJp
z?Bn%CpH+udDLLbvo)?APn|h?`21i}pHAjDoguey9RY&6u`K=W#^@gEq$qmC)$Nk-p
zwM_0MF2jw>H)O9@Sf>)ln4=5JGjkO)@3#e^7mrgMvQ_v=9hAQ;e0d?sGR8KzeY1ki
z_E(;_#xZ`X9e>#QDVWR6Ju5m2LuY1go>!N|Y{kBUYq*=2bV!(pWuASsNqbgy`k9`r
zeQIK7iUu;#sTOOYaRT$iOgcCEMh1VEa8En#?J;G^9bx$?M&jD3`tux9RqDZm&s|*|
z+7|;gbRp41EJj(9)?k{P>fcTg%9zQGjxqC{L|`!uy6m~VG>yVOz6;Dn%#BD+4Uzma
zi>oF7AA_A(v=}nmx<>WN@sl(f#KY`eSTBt73o`jq{Lh!W0^thVk&95~k*FZI8&1kM
zSJ(X=%!CwERh+NUKa+yOyxz_UpQybN))(dbIx72qTQGCYIwnRAa=~hNG+`m|Xwk9z
zT7dztes1Hi(`pkwpq|)-wS=xp8{Uc1zXHj^$YFimolV={obntL4Mb`lRF;&0szMJD
zsJI1U9kC!SG2^t3cw(HsAuNy=fjD294kbYL)zt_WAW|IZ@?5=$Yq)^|$xo`fh;yfY
zm#rK@c#A?M3ora2+>kPp!T3ikdcMr|asMg4-kGG}PWANi;S}jS!)nB%eZ)Y{s{BOH
zQ>%+Ah8gn~0iB2+^_qO}Qz^<Y!RL5=R(R4p+zYq0cNq5Y+Cd#krWCBwn<la6Cto;i
zu9Acae`B8bVCZt_q0j)1V0>$pWLlp)>gc82<k8ihho}#!zS?SuI(wI<sv;DpHRBA8
yKDihCLbY|=hP9)vC7yY;Wp9GyI(L3Q4HclnF1EUBxCMTg5PKUZ>nbb%g#Q64W@CB)

literal 0
HcmV?d00001

diff --git a/src/store/index.js b/src/store/index.js
index ebb04ce..f4a60d0 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -38,7 +38,7 @@ export default new Vuex.Store({
             '1007': '员工管理',
             '1008': '核销查询',
             '1009': '场地看板',
-            '1010': '设备管理',
+            '1010': '智能设备',
             '1011': '商品零售',
 			// '1013': '课程管理',
 			'1014': '储值卡管理',
diff --git a/src/subpackage/authorization/components/user_info/impower.vue b/src/subpackage/authorization/components/user_info/impower.vue
index 5fb815a..e3f4571 100644
--- a/src/subpackage/authorization/components/user_info/impower.vue
+++ b/src/subpackage/authorization/components/user_info/impower.vue
@@ -27,7 +27,7 @@ export default {
     watch: {
         showAuthorizationModal(nVal, oVal){
             let { initData } = this;
-            if(!nVal&&oVal)initData?.close();
+            if(!nVal&&oVal)initData?.close?.();
         }
     },
     data() {
@@ -51,6 +51,7 @@ export default {
                 let _imgUrl = await this.uploadImg(info.avatar);
                 let _editObj = { nickname: info.nickname, avatar_url: _imgUrl };
                 await userEdit(_editObj);
+                this.hide();
                 initData?.success?.(_editObj);
             }catch(err){
                 console.warn('authorize components user info impower updatedUserInfoEvent err --->', err)
diff --git a/src/subpackage/menu/components/bottom_logo.vue b/src/subpackage/menu/components/bottom_logo.vue
index 9806574..56a1a45 100644
--- a/src/subpackage/menu/components/bottom_logo.vue
+++ b/src/subpackage/menu/components/bottom_logo.vue
@@ -1,27 +1,40 @@
 <template>
-    <view class="bottom-logo">
-        <view class="bl-space"></view>
-        <image class="bl-img" mode="aspectFit" src="/subpackage/menu/static/images/bot_logo.png"></image>
+    <view class="bottom-logo" :class="{ 'fixed-active': isFixed }" @click="toWebView">
+        <image @click="toWebView" class="bl-img" mode="aspectFit" src="/subpackage/menu/static/images/bot_logo.png"></image>
     </view>
 </template>
 
 <script>
+import { routeTo, jsonStr } from '@/utils/util.js'
 export default {
-
+    props: {
+        isFixed: {
+            type: Boolean,
+            default: false
+        }
+    },
+    methods: {
+        toWebView(){
+            routeTo(`/pages/web_view/web_view?src=${jsonStr('https://www.ouxuanzhineng.cn/')}`, 'nT');
+        }
+    }
 }
 </script>
 
 <style lang="scss">
-    .bl-space{
-        height: 152upx;
+    .bottom-logo{
+        height: 200upx;
+        width: 100%;
+        @include ctf(center);
+        &.fixed-active{
+            position: fixed;
+            left: 50%;
+            bottom: 0;
+            transform: translateX(-50%);
+            z-index: -1;
+        }
     }
     .bl-img{
-        position: fixed;
-        left: 50%;
-        bottom: 52upx;
-        z-index: -1;
-        transform: translateX(-50%);
-        display: block;
         width: 312upx;
         height: 100upx;
     }
diff --git a/src/subpackage/message/components/edit/upload_img.vue b/src/subpackage/message/components/edit/upload_img.vue
index e7737b5..ddd367e 100644
--- a/src/subpackage/message/components/edit/upload_img.vue
+++ b/src/subpackage/message/components/edit/upload_img.vue
@@ -36,8 +36,10 @@ export default {
                 count: 3,
                 sourceType: ['album', 'camera'],
                 success: (res) => {
-                    let { imgTemLs } = this;
-                    if(imgTemLs.length >= 3)return showModal({ content: '最多上传3张图片！' });
+                    let { imgTemLs, max } = this;
+                    let _curImgNum = imgTemLs?.length ?? 0;
+                    let _temImgNum = res?.tempFilePaths?.length ?? 0;
+                    if((_curImgNum + _temImgNum) > max)return showModal({ content: '最多上传3张图片！' });
                     this.imgTemLs = imgTemLs.concat(res.tempFilePaths);
                 }
             });
diff --git a/src/subpackage/message/components/fixed_button.vue b/src/subpackage/message/components/fixed_button.vue
index bf33472..45203d5 100644
--- a/src/subpackage/message/components/fixed_button.vue
+++ b/src/subpackage/message/components/fixed_button.vue
@@ -1,6 +1,6 @@
 <template>
     <view class="fixed-button">
-        <button class="fb-btn" hover-class="hover-active" @click="$emit('click')">新建投诉</button>
+        <button class="fb-btn" hover-class="hover-active" @click="$emit('click')">新建</button>
     </view>
 </template>
 
diff --git a/src/subpackage/message/pages/complaint/list.vue b/src/subpackage/message/pages/complaint/list.vue
index a436899..a6188e2 100644
--- a/src/subpackage/message/pages/complaint/list.vue
+++ b/src/subpackage/message/pages/complaint/list.vue
@@ -11,7 +11,7 @@
                 <view style="height: 24rpx;"></view>
             </block>
         </view>
-        <fixed-button @click="clickBtn"></fixed-button>
+        <fixed-button @click="clickBtn">新建投诉</fixed-button>
     </view>
 </template>
 
diff --git a/src/subpackage/message/pages/work_order/list.vue b/src/subpackage/message/pages/work_order/list.vue
index fdc725c..014eeb5 100644
--- a/src/subpackage/message/pages/work_order/list.vue
+++ b/src/subpackage/message/pages/work_order/list.vue
@@ -11,7 +11,7 @@
                 <view style="height: 24rpx;"></view>
             </block>
         </view>
-        <fixed-button @click="clickBtn"></fixed-button>
+        <fixed-button @click="clickBtn">新建工单</fixed-button>
     </view>
 </template>
 

From 6bc7b865a0dfd624dd1cfc265d2c0b2cd49e2d9b Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Thu, 23 Jan 2025 15:11:44 +0800
Subject: [PATCH 25/30] fix tid1807

---
 src/pages/menu/forth.vue                  |  17 ++++++++---------
 src/static/images/icon/author_modal.png   | Bin 14649 -> 0 bytes
 src/static/images/icon/scan_code_btn.png  | Bin 932 -> 0 bytes
 src/static/images/icon/selected_ring.png  | Bin 419 -> 0 bytes
 src/static/images/icon/write_off_fail.png | Bin 9879 -> 0 bytes
 5 files changed, 8 insertions(+), 9 deletions(-)
 delete mode 100644 src/static/images/icon/author_modal.png
 delete mode 100644 src/static/images/icon/scan_code_btn.png
 delete mode 100644 src/static/images/icon/selected_ring.png
 delete mode 100644 src/static/images/icon/write_off_fail.png

diff --git a/src/pages/menu/forth.vue b/src/pages/menu/forth.vue
index 2fcc2b9..89b5f8d 100644
--- a/src/pages/menu/forth.vue
+++ b/src/pages/menu/forth.vue
@@ -150,19 +150,18 @@ export default {
         },
         // 投诉建议
         toComplaint(){
-            let { brand_id } = this;
+            let { brand_id, loginState, showAuthor } = this;
+            if(!loginState)return showAuthor();
             routeTo(`/subpackage/message/pages/complaint/list?brand_id=${brand_id}`, 'nT');
         },
         // 登录
         loginBtn(){
-            this.$refs?.authorizationLogin?.alert?.({
-                success: ()=>{
-                    this.getUserInfo();
-                },
-                fail: err =>{
-                    // console.warn('pages index showAuthor authorizationLogin Err ->', err)
-                }
-            })
+            this.showAuthor();
+        },
+        showAuthor(){
+            this.$refs?.authorizationLogin?.alert?.({ 
+                success: this.getUserInfo
+            });
         },
         getUserInfo(){
             showLoad();
diff --git a/src/static/images/icon/author_modal.png b/src/static/images/icon/author_modal.png
deleted file mode 100644
index 8e3612314f6f3e6f628de1ea7b9493c670bec96e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14649
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
ZF=3YyEyDvK{{39TP*>Ig)GFFU{U5=)GzI_w

diff --git a/src/static/images/icon/scan_code_btn.png b/src/static/images/icon/scan_code_btn.png
deleted file mode 100644
index 5dfbb52a4c8a5d68d9a56fae77ee58694ebe8ee5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 932
zcmV;V16%xwP)<h;3K|Lk000e1NJLTq00682006860{{R36dzja0000mP)t-s00000
zm~;S`bO4!j0GD(Cm~jA@bO4%l0GM?Em~;S`bpV)j0G)UMm~;S{bO4xirDtYA0000F
zbW%=J0L=7kH5$Gnkl#tI5usR*18&R!00R_BL_t(&-tC*gYLh__$2T--YAq7PQ$a#X
z@5#Y~w?w^o%p-^=1tEC@3yN1gc@o+_fxbaK2_Ag{A3>6UHWr-{cG7>+WVU5@2EMQC
z|B_|D<;P}sX20EUXWWJA4`1%lvRWM{>dtdo*51cA!_{U_4{24SzC_&_(5j|yFE=};
zwQ5M%+q71@%dH;KdQBwkXIig&i;cEO&`84mBtZvgQ*V->v4m}k9l^XkCOs_eJJxoa
z^ag>(M?z;)rVQP!qq7MH295pbRtSo42dOXb2}*EY=ydkHO03@x`Yu7WCj(;j7RKOg
z=n_>wnU4bIblP*ts`7I67l!@HDd^jUwO4syor(rLxbs!!lMeR#e7(6f=cfy1^})UN
zX5f_Mjp2{$@~@7#mlO7}XIj`z?`J%B9WCqz+tndvOmEJn&aaAnEo{xNjf{0_Vk}u;
zDPuD>V>32mqp=%zTOECDt%+T<4i<a%hB~&36N(ZR2eFYlwvE%D78cD5jfJhE9qMDT
zuvK7DAB}~r0*m@+ENm56)JJ1stH7c@8Vg$m7WF~w)lKBG+!g#G9W3)O{5n|X!B~{A
z%&X5#d#HwG9vo2zEAUdVP{!UctoLuR93%L*SdJ0=TP(*2{w<bcgjb<hju8A?EN5k1
z+m1+0t<Hkg>j{2RAyqZ7qG)P@^-ohHtk#+u8)1zG!Dz~i49v(KESxvLHnOs^im?$5
zZ<~v@$qye%igtiXIqp^8z36EkPPc#DKk^YW{}i!1Cq!poeI&~lJ?y5xJO4HN`LBm%
z-T<)_8d&BTeGEhs1uULr?9IZ4KVlc{lY97rplH__;menzT@{t=zHG&Y%W}o(ZM7`d
z$KF=Uay4JF_=Jqj*aBf~!Xu4>IgLV3jRIwj!g`H@kc~p7jRL%l!qJU_=WRm$jS>@#
z(kRT5KEf#~QFm;oS0>a91A8Y?jrjDRN+|s&K3S<tqV^L~tD1q-s)R(aw%pn1v^8ME
zv%IA@2nR_if!$C_Aatx_V7o%PWs*A}-7+FM6wWIrhn@qIVF3`ADHwGC0000<MNUMn
GLSTX+iKu=6

diff --git a/src/static/images/icon/selected_ring.png b/src/static/images/icon/selected_ring.png
deleted file mode 100644
index 0f0161612eba7f5b6f1094ecb466c7bdbfccbfd9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 419
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy-T^)#t_<_a8D>>5%q&5m86^y}
zN<rLN#SF768D<qR07ak*fZ}CfaUcmq<sk7H#UPOxC6!Eq`aokPN`m}?8O1NYzOjGN
zq%eIszVG!PPH*k>cDJv+Z+a<U^H-pn_nt0}Ar_}wgKrA8DDX@!>g0Y^_3Z!t5?!mf
zH$I;q9ANPEnf<Css%AOk-Jg!3s#5zCoO}Mn)_k`5cSd)SZ*qWE&q=o}pPzrc!=xAU
z`vJr4JKxw$Y`y(hgwK6vt5x*=YH;>o{>As*w<cbD@@nqB_PgSoYWvr7vadL2$`hoP
zG4bdA9S>)hE=U#PFP|fBE>okorKon#0Uhnh{2SKve_-0^(4Cm<k>0q-<(7q2&&;(9
z+R_(8rE(+|GHg70K~!n>f<TAOqJocDCpw8}{#%wYCFAS=w4<9NlXfp{6m<8KipqSm
p^ud&iv%kMMyZyz<hoX=FGp|3d-Du&G7z^||gQu&X%Q~loCID>|uV(-N

diff --git a/src/static/images/icon/write_off_fail.png b/src/static/images/icon/write_off_fail.png
deleted file mode 100644
index 47ee4faedde4075ca64055428342198903cb6e93..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9879
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


From b57bc976f3797494d48306e7a1a9d5dab0eb52b2 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Thu, 23 Jan 2025 15:38:58 +0800
Subject: [PATCH 26/30] fixed webview query

---
 src/pages/index/index.vue                   | 5 ++++-
 src/pages/login/login.vue                   | 4 ++--
 src/pages/merchant_login/merchant_login.vue | 4 ++--
 src/subpackage/wallet/pages/index/index.vue | 4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 33a6169..5a35f8e 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -55,7 +55,7 @@
 
 		<authorization-login ref="authorizationLogin"></authorization-login>
 
-		<view class="fly_btn"  @click="toPageInfo(tabList[4])" v-if="loginState&&isPermissionShowTab(tabList[4])">
+		<view class="fly_btn"  @click="toPageInfo(getTabForID(4))" v-if="loginState&&isPermissionShowTab(getTabForID(4))">
 			<image class="f_bg" src="/static/images/icon/index/green_bg_circle.png" mode="scaleToFill"/>
 			<image class="f_icon" src="/static/images/icon/index/scan_icon_white.png" mode="scaleToFill"/>
 			<text>核销</text>
@@ -201,6 +201,9 @@
 			if(JSON.stringify(indexData)!='{}'&&loginState)getIndexInfo();
 		},
 		methods: {
+			getTabForID(id){
+				return tabList.find(e=>e.id === id) || {}
+			},
 			// 账号有开启了权限的才显示菜单，否则不显示【ID1000840】
 			isPermissionShowTab(e){
 				let { indexData } = this;
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index c7b5177..63cbafc 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -43,7 +43,7 @@
 <script>
 import { API } from '../../js/api';
 import { servers } from '../../js/server';
-import util from '../../utils/util';
+import util, { jsonStr } from '../../utils/util';
 // import wxplugin from '../../utils/wx_plugin';
 const uniGetSetting = util.promisify(uni.getSetting);
 const uniLogin = util.promisify(uni.login);
@@ -189,7 +189,7 @@ export default {
             }
         },
         toWebView(){
-            util.routeTo(`/pages/web_view/web_view?src=${encodeURIComponent("https://www.ouxuanzhineng.cn")}`,'rL');
+            util.routeTo(`/pages/web_view/web_view?src=${jsonStr("https://www.ouxuanzhineng.cn")}`,'rL');
         }
     },
 }
diff --git a/src/pages/merchant_login/merchant_login.vue b/src/pages/merchant_login/merchant_login.vue
index c8f7a1c..8327f6b 100644
--- a/src/pages/merchant_login/merchant_login.vue
+++ b/src/pages/merchant_login/merchant_login.vue
@@ -8,11 +8,11 @@
     </view>
 </template>
 <script>
-import util from '../../utils/util'
+import util, { jsonStr } from '../../utils/util'
 export default {
     methods: {
         toWebView(){
-            util.routeTo(`/pages/web_view/web_view?src=${encodeURIComponent("https://www.ouxuanzhineng.cn")}`,'rL');
+            util.routeTo(`/pages/web_view/web_view?src=${jsonStr("https://www.ouxuanzhineng.cn/")}`,'rL');
         }
     }
 }
diff --git a/src/subpackage/wallet/pages/index/index.vue b/src/subpackage/wallet/pages/index/index.vue
index fc10103..34175d7 100644
--- a/src/subpackage/wallet/pages/index/index.vue
+++ b/src/subpackage/wallet/pages/index/index.vue
@@ -34,7 +34,7 @@ import walletModalSuccess from '../../components/wallet_modal_success.vue';
 import rechargeModal from "./modules/recharge_modal.vue";
 import { WALLET_API } from '../../js/api';
 import servers from '../../js/server';
-import { routeTo, showLoad, hideLoad, debounce, showModal } from '@/utils/util';
+import { routeTo, showLoad, hideLoad, debounce, showModal, jsonStr } from '@/utils/util';
 export default {
     components: {
         'wallet-info': walletInfo,
@@ -80,7 +80,7 @@ export default {
             })
         }, 300, true),
         toWebView(){
-            routeTo(`/pages/web_view/web_view?src=${encodeURIComponent(this.getAdminAddress())}`,'nT');
+            routeTo(`/pages/web_view/web_view?src=${jsonStr(this.getAdminAddress())}`,'nT');
         },
         getAdminAddress(){
             let _appid = uni.getAccountInfoSync()?.miniProgram?.appId || '';

From ed0777f2fdc27ec746e2d60820e512f71fbb0baa Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Thu, 23 Jan 2025 18:04:19 +0800
Subject: [PATCH 27/30] fix bug for tid1807

---
 src/js/api.js                                     |  2 +-
 src/pages/login/login.vue                         |  2 +-
 src/pages/menu/forth.vue                          | 13 +++++--------
 src/subpackage/authorization/components/login.vue |  6 ++----
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/js/api.js b/src/js/api.js
index 7ab38f9..7762a45 100644
--- a/src/js/api.js
+++ b/src/js/api.js
@@ -169,7 +169,7 @@ API['party'] = {
 
 API['mine'] = {
   userCurrent:`${ORIGIN}/user/current`, //获取账户信息, （不要传品牌id）
-  unbindAssistant:`${ORIGIN}/admin/user/unbindAssistant"`, // 解绑退出
+  unbindAssistant:`${ORIGIN}/admin/user/unbindAssistant`, // 解绑退出
 }
 
 export default { ORIGIN, API };
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 63cbafc..df342e7 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -67,7 +67,7 @@ export default {
 		
 		
 		// 初始化
-		MiniprogramThirdpartyPlugin.init(wx)
+		// MiniprogramThirdpartyPlugin.init(wx)
 		
 
 	},
diff --git a/src/pages/menu/forth.vue b/src/pages/menu/forth.vue
index 89b5f8d..9f6015d 100644
--- a/src/pages/menu/forth.vue
+++ b/src/pages/menu/forth.vue
@@ -1,16 +1,16 @@
 <template>
     <view class="forth-menu">
+        <!-- 后端： account-> 如果有手机号就显示手机号  没有的话显示username, 都没有的话就空好了 -->
         <mine-header
-            @on:munted="menuPackageLoaded = true"
             :is-login="loginState"
-            @click:login="loginBtn"
             :nickname="userInfo.nickname"
             :name="userInfo.actual_name"
             :account="userInfo.mobile || userInfo.username || ''"
             :photo="userInfo.avatar_url"
+            @on:munted="menuPackageLoaded = true"
+            @click:login="loginBtn"
             @click:update="updateUser"
         ></mine-header>
-        <!-- 后端： account-> 如果有手机号就显示手机号  没有的话显示username, 都没有的话就空好了 -->
         <block v-if="menuPackageLoaded">
             <line-tab :icon-num='0'>
                 <template slot="default">账号管理</template>
@@ -36,8 +36,6 @@
                     </view>
                 </line-tab>
             </block>
-            
-            
             <line-tab :icon-num='5' @click="toComplaint">投诉建议</line-tab>
             <line-tab :icon-num='6' v-if="loginState" @click="unBindBtn">解绑退出</line-tab>
         </block>
@@ -69,6 +67,7 @@ export default {
     data(){
         return {
             brand_id: '',
+            // 异步组件加载完成状态
             menuPackageLoaded: false,
             userInfo: {},
             deadData: {
@@ -159,9 +158,7 @@ export default {
             this.showAuthor();
         },
         showAuthor(){
-            this.$refs?.authorizationLogin?.alert?.({ 
-                success: this.getUserInfo
-            });
+            this.$refs?.authorizationLogin?.alert?.({ success: this.getUserInfo });
         },
         getUserInfo(){
             showLoad();
diff --git a/src/subpackage/authorization/components/login.vue b/src/subpackage/authorization/components/login.vue
index 635810e..4ec018b 100644
--- a/src/subpackage/authorization/components/login.vue
+++ b/src/subpackage/authorization/components/login.vue
@@ -27,7 +27,7 @@
 </template>
 
 <script>
-import { promisify, showModal, showNone, showLoad, hideLoad } from "@/utils/util";
+import { promisify, showModal, showNone, showLoad, hideLoad, routeTo } from "@/utils/util";
 import { AUTHOR_API } from "../js/api";
 import server from "../js/server";
 export default {
@@ -107,15 +107,13 @@ export default {
                 hideLoad();
                 let _data = res.data || {};
                 if(_data.code == 0){
-                    if(_data.data == '')return util.routeTo(`/pages/login/login`,'rL');
+                    if(_data.data == '')return routeTo(`/pages/login/login`,'rL');
                     showNone(_data?.message || '登陆成功！');
                     this.$store.commit('setLoginState', { loginState: true, token: _data.data });
                     this.initData?.success?.(_data);
                     this.hide();
                     return _data;
                 }else{
-                    // util.showNone(_data.message || '后台登陆失败！');
-                    // setTimeout(_=>this.closeAuthor(), 1200);
                     return Promise.reject(_data);
                 }
             })

From c47d9d8ddf31743c17019e8bf1fd5416e2bfead3 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Thu, 6 Feb 2025 14:28:26 +0800
Subject: [PATCH 28/30] vtest 1.1.64 & fix for tid1807

---
 src/pages/menu/forth.vue                     | 23 +++++++++++++++++------
 src/subpackage/verification/pages/record.vue | 14 ++++++++++----
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/pages/menu/forth.vue b/src/pages/menu/forth.vue
index 9f6015d..86415b9 100644
--- a/src/pages/menu/forth.vue
+++ b/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(){
diff --git a/src/subpackage/verification/pages/record.vue b/src/subpackage/verification/pages/record.vue
index 24d26c9..d2eea85 100644
--- a/src/subpackage/verification/pages/record.vue
+++ b/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;

From 415bc015111caee0352b7567c4f951b3c68981b2 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Thu, 6 Feb 2025 18:27:15 +0800
Subject: [PATCH 29/30] change for tid107

---
 src/subpackage/message/components/edit/upload_img.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/subpackage/message/components/edit/upload_img.vue b/src/subpackage/message/components/edit/upload_img.vue
index ddd367e..bbaa0d5 100644
--- a/src/subpackage/message/components/edit/upload_img.vue
+++ b/src/subpackage/message/components/edit/upload_img.vue
@@ -22,7 +22,7 @@ export default {
     props: {
         max: {
             type: Number,
-            default: 3
+            default: 6
         }
     },
     data(){
@@ -32,14 +32,15 @@ export default {
     },
     methods: {
         chooseImg(){
+            let { max } = this;
             uni.chooseImage({
-                count: 3,
+                count: max,
                 sourceType: ['album', 'camera'],
                 success: (res) => {
                     let { imgTemLs, max } = this;
                     let _curImgNum = imgTemLs?.length ?? 0;
                     let _temImgNum = res?.tempFilePaths?.length ?? 0;
-                    if((_curImgNum + _temImgNum) > max)return showModal({ content: '最多上传3张图片！' });
+                    if((_curImgNum + _temImgNum) > max)return showModal({ content: `最多上传${max}张图片！` });
                     this.imgTemLs = imgTemLs.concat(res.tempFilePaths);
                 }
             });

From a11433987556ad3155df0dc3fc6b0c128bd1153b Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Fri, 7 Feb 2025 11:02:57 +0800
Subject: [PATCH 30/30] vtest 1.1.65&fix for tid1807

---
 src/pages/index/index.vue                    | 75 ++++++++++++++--------------
 src/subpackage/verification/pages/record.vue |  2 +-
 2 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 5a35f8e..5cb8a2f 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -88,17 +88,11 @@
 			path: '/pages/turnover/turnover',
 			serverKey: 1001  // 后端对应权限编号
 		},
-		// {
-		// 	id: 1,
-		// 	name: '收款记录',
-		// 	path: '/subpackage/income/pages/details_record/details_record',
-		// 	serverKey: 1002  // 后端对应权限编号
-		// },
 		{
-			id: 2,
-			name: '订单管理',
-			path: '/subpackage/order/pages/order_manage/order_manage',
-			serverKey: 1012  // 后端对应权限编号
+			id: 11,
+			name: '钱包&提现',
+			path: '/subpackage/wallet/pages/index/index',
+			serverKey: 1017  // 后端对应权限编号 1017
 		},
 		{
 			id: 3,
@@ -107,10 +101,10 @@
 			serverKey: 1007  // 后端对应权限编号
 		},
 		{
-			id: 4,
-			name: '核销查询',
-			path: '/subpackage/verification/pages/index',
-			serverKey: 1008  // 后端对应权限编号
+			id: 2,
+			name: '订单管理',
+			path: '/subpackage/order/pages/order_manage/order_manage',
+			serverKey: 1012  // 后端对应权限编号
 		},
 		{
 			id: 5,
@@ -120,42 +114,23 @@
 			serverKey: 1009  // 后端对应权限编号
 		},
 		{
-			id: 6,
-			name: '智能设备',
-			path: '/subpackage/device/pages/index/index',
-			serverKey: 1010  // 后端对应权限编号
-		},
-		{
 			id: 7,
 			name: '商品零售',
 			path: '/subpackage/retail/pages/index/index',
 			serverKey: 1011  // 后端对应权限编号
 		},
-		// {
-		// 	id: 8,
-		// 	name: '课程管理',
-		// 	path: '/subpackage/course/pages/index/index',
-		// 	serverKey: 1013  // 后端对应权限编号 1013
-		// },
 		{
 			id: 9,
 			name: '储值卡管理',
 			path: '/pages/order_list/order_list?order_type=18',
 			serverKey: 1014  // 后端对应权限编号 1014
 		},
-		// {
-		// 	id: 10,
-		// 	name: '进场人数异常',
-		// 	path: '/subpackage/blacklist/pages/abnormal_list/abnormal_list',
-		// 	serverKey: 1015  // 后端对应权限编号 1015
-		// },
 		{
-			id: 11,
-			name: '钱包&提现',
-			path: '/subpackage/wallet/pages/index/index',
-			serverKey: 1017  // 后端对应权限编号 1017
+			id: 6,
+			name: '智能设备',
+			path: '/subpackage/device/pages/index/index',
+			serverKey: 1010  // 后端对应权限编号
 		},
-		
 		{//需求要求更改ICON位置
 			id: 12,
 			name: '小程序管理',
@@ -168,6 +143,32 @@
 			path: '/subpackage/message/pages/work_order/list',
 			serverKey: 1022  // 后端对应权限编号 1022
 		},
+		// {
+		// 	id: 1,
+		// 	name: '收款记录',
+		// 	path: '/subpackage/income/pages/details_record/details_record',
+		// 	serverKey: 1002  // 后端对应权限编号
+		// },
+		{
+			id: 4,
+			name: '核销查询',
+			path: '/subpackage/verification/pages/index',
+			serverKey: 1008  // 后端对应权限编号
+		},
+		// {
+		// 	id: 8,
+		// 	name: '课程管理',
+		// 	path: '/subpackage/course/pages/index/index',
+		// 	serverKey: 1013  // 后端对应权限编号 1013
+		// },
+		
+		// {
+		// 	id: 10,
+		// 	name: '进场人数异常',
+		// 	path: '/subpackage/blacklist/pages/abnormal_list/abnormal_list',
+		// 	serverKey: 1015  // 后端对应权限编号 1015
+		// },
+		
 	];
 	
 	const app = getApp();
diff --git a/src/subpackage/verification/pages/record.vue b/src/subpackage/verification/pages/record.vue
index d2eea85..f7b0359 100644
--- a/src/subpackage/verification/pages/record.vue
+++ b/src/subpackage/verification/pages/record.vue
@@ -162,7 +162,7 @@ export default {
             })
         }, 300, true),
         // 初始化时间段
-        initPeriodStr(dayNum = 1){
+        initPeriodStr(dayNum = 0){
             let _today = new Date();
             let _todayTimestamp = _today.getTime();
             let _eStr = formatDate({ date: _today });