From 5bd08819466b0f65676c6aeb3d36f15498b8c7b9 Mon Sep 17 00:00:00 2001
From: Zhukj <3262118957>
Date: Tue, 9 Dec 2025 08:50:51 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=AE=9E=E7=8E=B0=E4=BA=86?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=81H5?=
 =?UTF-8?q?=E3=80=81=E5=8D=8E=E4=B8=BA=E5=BF=AB=E5=BA=94=E7=94=A8=E4=B8=89?=
 =?UTF-8?q?=E7=AB=AF=E9=80=82=E9=85=8D=E5=BE=AE=E4=BF=A1=20/=20=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E5=AE=9D=20/=20=E5=8D=8E=E4=B8=BA=E5=AE=98=E6=96=B9?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=A7=84=E8=8C=83=E7=9A=84=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/auth.js                    |    2 +-
 common/js/config.js                  |    6 +
 components/common-payment/payment.js |    3 +-
 components/ns-payment/ns-payment.vue |    6 +-
 components/payment/payment.vue       | 1440 +++++++++++++++-----------
 main.js                              |  164 +--
 manifest.json                        |  242 +++--
 package-lock.json                    |   38 +-
 package.json                         |    7 +-
 9 files changed, 1139 insertions(+), 769 deletions(-)

diff --git a/common/js/auth.js b/common/js/auth.js
index b73f8d6..9912bd3 100644
--- a/common/js/auth.js
+++ b/common/js/auth.js
@@ -39,7 +39,7 @@ export default {
 				},
 				fail: (res) => {
 					// #ifdef MP-WEIXIN
-					let scene = wx.getLaunchOptionsSync().scene;
+					let scene = uni.getLaunchOptionsSync().scene;
 					if ([1154, 1155].indexOf(scene) == -1) {
 						this.$util.showToast({
 							title: res.errMsg
diff --git a/common/js/config.js b/common/js/config.js
index 6b27eff..c8dc5a0 100644
--- a/common/js/config.js
+++ b/common/js/config.js
@@ -1,3 +1,9 @@
+let site = null;
+try {
+  site = require("../site.js"); // 适配发行模式的 site.js 导入
+} catch (e) {
+  site = null; // 开发模式无 site.js 时赋值为 null
+}
 // 发行版本，配置说明
 let releaseCfg = undefined;
 try {
diff --git a/components/common-payment/payment.js b/components/common-payment/payment.js
index 2fb1ef2..97a7a5c 100644
--- a/components/common-payment/payment.js
+++ b/components/common-payment/payment.js
@@ -206,6 +206,7 @@ export default {
 		 * 获取订单结算数据
 		 */
 		payment() {
+			
 			this.$api.sendRequest({
 				url: this.api.payment,
 				data: this.handleCreateData(),
@@ -214,7 +215,7 @@ export default {
 						let data = res.data;
 
 						// #ifdef MP-WEIXIN
-						var scene = uni.getStorageSync('is_test') ? 1175 : wx.getLaunchOptionsSync().scene;
+						var scene = uni.getStorageSync('is_test') ? 1175 : uni.getLaunchOptionsSync().scene;
 						if ([1175, 1176, 1177, 1191, 1195].indexOf(scene) != -1 && data.delivery.express_type) {
 							data.delivery.express_type = data.delivery.express_type.filter(item => item.name == 'express');
 						}
diff --git a/components/ns-payment/ns-payment.vue b/components/ns-payment/ns-payment.vue
index ba31411..eecf859 100644
--- a/components/ns-payment/ns-payment.vue
+++ b/components/ns-payment/ns-payment.vue
@@ -137,7 +137,7 @@
                     this.isMatched = 1;
                     return;
                 }
-                let options = wx.getLaunchOptionsSync();
+                let options = uni.getLaunchOptionsSync();
                 this.$api.sendRequest({
                     url: '/shopcomponent/api/weapp/scenecheck',
                     data: {
@@ -357,7 +357,7 @@
                         out_trade_no: this.payInfo.out_trade_no,
                         pay_type: payType.type,
                         is_matched: this.isMatched,
-                        scene: uni.getStorageSync('is_test') ? 1175 : wx.getLaunchOptionsSync().scene
+                        scene: uni.getStorageSync('is_test') ? 1175 : uni.getLaunchOptionsSync().scene
                     },
                     success: res => {
                         uni.hideLoading();
@@ -365,7 +365,7 @@
                             var payData = res.data.data;
 
                             // #ifdef MP-WEIXIN
-                            var scene = uni.getStorageSync('is_test') ? 1175 : wx.getLaunchOptionsSync()
+                            var scene = uni.getStorageSync('is_test') ? 1175 : uni.getLaunchOptionsSync()
                                     .scene;
                             if ([1175, 1176, 1177, 1191, 1195].indexOf(scene) != -1) {
                                 uni.requestOrderPayment({
diff --git a/components/payment/payment.vue b/components/payment/payment.vue
index 1e7358f..bdbe1cd 100644
--- a/components/payment/payment.vue
+++ b/components/payment/payment.vue
@@ -1,610 +1,832 @@
-<template>
-    <view>
-        <!-- 选择支付方式弹窗 -->
-        <uni-popup ref="choosePaymentPopup" type="center" v-if="payInfo" :mask-click="false">
-            <view class="choose-payment-popup popup" @touchmove.prevent.stop>
-                <view class="popup-header">
-                    <text class="tit">支付方式</text>
-                    <text class="iconfont icon-close" @click="close()"></text>
-                </view>
-                <scroll-view scroll-y="true" class="popup-body">
-                    <view class="pay-money">
-                        <text class="money">支付金额{{ payMoney | moneyFormat }}元</text>
-                    </view>
-
-                    <view class="payment-item" v-if="balanceDeduct > 0 && balanceUsable && balanceConfig == 1">
-                        <view class="iconfont icon-yue"></view>
-                        <view class="info-wrap">
-                            <text class="name">余额抵扣</text>
-                            <view class="money">可用¥{{ balanceDeduct | moneyFormat }}</view>
-                        </view>
-                        <ns-switch class="balance-switch" @change="useBalance" :checked="isBalance == 1"></ns-switch>
-                    </view>
-                    <block v-if="payMoney > 0">
-                        <block v-if="payTypeList.length">
-                            <block v-for="(item, index) in payTypeList">
-                                <view v-if="offlineShow || item.type != 'offlinepay'" class="payment-item" :key="index"
-                                    @click="payIndex = index">
-                                    <view class="iconfont" :class="item.icon"></view>
-                                    <text class="name">{{ item.name }}</text>
-                                    <text class="iconfont"
-                                        :class="payIndex == index ? 'icon-yuan_checked color-base-text' : 'icon-checkboxblank'"></text>
-                                </view>
-                            </block>
-                        </block>
-                        <block v-else>
-                            <view class="empty">平台尚未配置支付方式！</view>
-                        </block>
-                    </block>
-                </scroll-view>
-                <view class="popup-footer">
-                    <view class="confirm-btn color-base-bg" @click="confirm()">确认支付</view>
-                </view>
-            </view>
-        </uni-popup>
-    </view>
-</template>
-
-<!-- 新版支付组件 订单表为order表 的订单支付时使用该组件 -->
-<script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import nsSwitch from '@/components/ns-switch/ns-switch.vue';
-
-// #ifdef H5
-import {
-    Weixin
-} from 'common/js/wx-jssdk.js';
-// #endif
-
-// 引入统一支付工具类
-import { invokeWechatPay, invokeAlipay, invokeHuaweiPay } from '../../common/js/payCore.js';
-
-export default {
-    name: 'payment',
-    components: {
-        uniPopup,
-        nsSwitch
-    },
-    props: {
-        // 是否可用余额支付
-        balanceUsable: {
-            type: Boolean,
-            default: true
-        },
-    },
-    data() {
-        return {
-            payIndex: 0,
-            payTypeList: [
-                // #ifdef H5 || MP-ALIPAY
-                {
-                    name: '支付宝支付',
-                    icon: 'icon-zhifubaozhifu-',
-                    type: 'alipay'
-                },
-                // #endif
-                // #ifdef H5 || MP-WEIXIN
-                {
-                    name: '微信支付',
-                    icon: 'icon-weixin1',
-                    type: 'wechatpay'
-                },
-                // #endif
-                // #ifdef H5 || QUICKAPP-HUAWEI
-                {
-                    name: '华为支付',
-                    icon: 'icon-zhekou',
-                    type: 'huaweipay'
-                },
-                // #endif
-                {
-                    name: '线下支付',
-                    icon: 'icondiy icon-yuezhifu',
-                    type: 'offlinepay'
-                },
-            ],
-            // #ifdef H5 
-            timer: null,
-            // #endif
-            payInfo: null,
-            balanceConfig: 0,
-            // 预售页面判断
-            sale: true,
-            isBalance: 0,
-            balance: 0,
-            //重置是否已完成，没有完成不能调用api/pay/pay
-            resetPayComplete: true,
-            repeatFlag: false,
-        };
-    },
-    created(e) {
-        this.getPayType();
-        if (this.balanceUsable) this.getBalanceConfig();
-    },
-    computed: {
-        balanceDeduct() {
-            let money = 0;
-            if (this.payInfo && this.balance) {
-                money = this.balance > this.payInfo.pay_money ? this.payInfo.pay_money : this.balance;
-            }
-            return money;
-        },
-        payMoney() {
-            let money = 0;
-            if (this.payInfo) {
-                money = this.payInfo.pay_money;
-                if (this.balanceDeduct && this.isBalance && this.balanceUsable) {
-                    money = this.payInfo.pay_money - this.balanceDeduct;
-                }
-            }
-            return money;
-        },
-        offlineShow() {
-            // 获取当前页面栈实例数组
-            const pages = getCurrentPages();
-            const currentPage = pages[pages.length - 1];
-            // 获取页面路由路径
-            let routePath = currentPage.route;
-            return this.$store.state.offlineWhiteList.length ? this.$store.state.offlineWhiteList.includes(routePath) : false
-        }
-    },
-    methods: {
-        /**
-         * 父级页面onShow调用
-         */
-        pageShow() {
-            if (this.payInfo) {
-                let offlinepay = uni.getStorageSync('offlinepay');
-                if (offlinepay) {
-                    uni.removeStorageSync('offlinepay');
-                    this.close()
-                }
-            } else {
-                uni.removeStorageSync('offlinepay');
-            }
-
-        },
-        close() {
-            this.$emit('close');
-            this.$refs.choosePaymentPopup.close();
-        },
-        // 使用余额
-        useBalance() {
-            this.isBalance = this.isBalance ? 0 : 1;
-            this.$emit('useBalance', this.isBalance)
-        },
-        confirm() {
-            if (this.payTypeList.length == 0 && this.payMoney > 0) {
-                this.$util.showToast({
-                    title: '请选择支付方式！'
-                });
-                return;
-            }
-            if (this.resetPayComplete == false) {
-                this.$util.showToast({
-                    title: '支付取消中，请稍后再试！'
-                });
-                return;
-            }
-            uni.showLoading({
-                title: '支付中...',
-                mask: true
-            });
-            if (this.repeatFlag) return;
-            this.repeatFlag = true;
-            this.pay();
-            uni.setStorageSync('pay_flag', 1);
-        },
-        getPayInfo(out_trade_no, callback) {
-            this.$api.sendRequest({
-                url: '/api/pay/info',
-                data: {
-                    out_trade_no
-                },
-                success: res => {
-                    if (res.code >= 0 && res.data) {
-                        this.payInfo = res.data;
-                        if (this.balanceConfig && this.balanceUsable) this.getMemberBalance();
-                        setTimeout(() => {
-                            this.$refs.choosePaymentPopup.open();
-                            if (typeof callback == 'function') callback();
-                        })
-                    } else {
-                        this.$util.showToast({
-                            title: '未获取到支付信息！'
-                        });
-                    }
-                }
-            });
-        },
-        /**
-         * 获取余额配置
-         */
-        getBalanceConfig() {
-            this.$api.sendRequest({
-                url: '/api/pay/getBalanceConfig',
-                data: {},
-                success: res => {
-                    this.balanceConfig = res.data.balance_show;
-                }
-            });
-        },
-        /**
-         * 获取用户余额
-         */
-        getMemberBalance() {
-            this.$api.sendRequest({
-                url: '/api/memberaccount/usablebalance',
-                success: res => {
-                    if (res.code == 0 && res.data) {
-                        this.balance = parseFloat(res.data.usable_balance);
-                    }
-                }
-            })
-        },
-        /**
-         * 查询支付方式
-         */
-        getPayType() {
-            this.$api.sendRequest({
-                url: '/api/pay/type',
-                success: res => {
-                    if (res.code == 0) {
-                        if (res.data.pay_type == '') {
-                            this.payTypeList = [];
-                        } else {
-                            this.payTypeList = this.payTypeList.filter((val, key) => {
-                                return res.data.pay_type.indexOf(val.type) != -1
-                            });
-                        }
-                    }
-                }
-            });
-        },
-        // #ifdef H5
-        pay() {
-            var payType = this.payTypeList[this.payIndex];
-            if (!payType || payType.type === 'offlinepay') {
-                // 线下支付仍使用原有逻辑
-                this.payOffline();
-                return;
-            }
-
-            // 使用统一支付工具类进行支付
-            this.invokeUnifiedPay(payType.type);
-        },
-
-        /**
-         * 统一支付调用方法（使用新的支付工具类）
-         */
-        async invokeUnifiedPay(payType) {
-            try {
-                let payResult;
-                const amount = this.payMoney;
-                const outTradeNo = this.payInfo.out_trade_no;
-                const subject = '订单支付';
-
-                // 根据支付类型调用对应的支付方法
-                switch (payType) {
-                    case 'wechatpay':
-                        payResult = await invokeWechatPay(outTradeNo, amount, subject);
-                        break;
-                    case 'alipay':
-                        payResult = await invokeAlipay(outTradeNo, amount, subject);
-                        break;
-                    case 'huaweipay':
-                        payResult = await invokeHuaweiPay(outTradeNo, amount, subject);
-                        break;
-                    default:
-                        throw new Error('不支持的支付方式');
-                }
-
-                // 处理H5支付跳转
-                if (payResult.code === 0 && payResult.data?.payUrl) {
-                    // H5端直接跳转，其他端需要在WebView中显示
-                    const systemInfo = uni.getSystemInfoSync();
-                    if (systemInfo.platform === 'web') {
-                        window.location.href = payResult.data.payUrl;
-                        this.checkPayStatus();
-                    } else {
-                        // 微信小程序/华为快应用中显示WebView
-                        this.showPayWebView(payResult.data.payUrl);
-                    }
-                } else if (payResult.code === 0) {
-                    // 原生支付成功
-                    this.paySuccess();
-                } else {
-                    throw new Error(payResult.msg || '支付失败');
-                }
-            } catch (error) {
-                this.repeatFlag = false;
-                this.$util.showToast({
-                    title: error.message || '支付失败'
-                });
-            }
-        },
-
-        /**
-         * 显示支付WebView（用于微信小程序/华为快应用的H5支付）
-         */
-        showPayWebView(payUrl) {
-            // 这里可以打开一个新的WebView页面来显示支付
-            // 或者使用现有的跳转逻辑
-            this.$util.redirectTo('/pages/Pay/Pay', {
-                payUrl: payUrl,
-                outTradeNo: this.payInfo.out_trade_no
-            });
-        },
-
-        /**
-         * 线下支付处理（保留原有逻辑）
-         */
-        payOffline() {
-            this.$util.redirectTo('/pages_tool/pay/offlinepay', {
-                outTradeNo: this.payInfo.out_trade_no
-            });
-            this.repeatFlag = false;
-        },
-        checkPayStatus() {
-            this.timer = setInterval(() => {
-                this.$api.sendRequest({
-                    url: '/api/pay/status',
-                    data: {
-                        out_trade_no: this.payInfo.out_trade_no
-                    },
-                    success: res => {
-                        if (res.code == 0) {
-                            if (res.data.pay_status == 2) {
-                                clearInterval(this.timer);
-                                this.paySuccess();
-                            }
-                        } else {
-                            clearInterval(this.timer);
-                        }
-                    }
-                });
-            }, 1000);
-        },
-        // #endif
-        // #ifdef MP
-        pay() {
-            var payType = this.payTypeList[this.payIndex];
-            if (!payType || payType.type === 'offlinepay') {
-                // 线下支付仍使用原有逻辑
-                this.$util.redirectTo('/pages_tool/pay/offlinepay', {
-                    outTradeNo: this.payInfo.out_trade_no
-                });
-                this.repeatFlag = false;
-                return;
-            }
-
-            // 小程序端也使用统一支付工具类
-            this.invokeUnifiedPay(payType.type);
-        },
-        // #endif
-        /**
-         * 支付成功之后跳转
-         */
-        paySuccess() {
-            if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
-                this.$util.redirectTo('/pages_promotion/blindbox/index', {
-                    outTradeNo: this.payInfo.out_trade_no
-                }, 'redirectTo');
-            } else if (this.payInfo.return_url) {
-                if (this.payInfo.return_url.indexOf('http://') != -1 || this.payInfo.return_url.indexOf('https://') != -1) location.replace(this.payInfo.return_url);
-                else this.$util.redirectTo(this.payInfo.return_url, {}, 'redirectTo');
-            } else {
-                this.$util.redirectTo('/pages_tool/pay/result', {
-                    code: this.payInfo.out_trade_no
-                }, 'redirectTo');
-            }
-        },
-        /**
-         * 重置支付单据
-         */
-        resetpay() {
-            this.resetPayComplete = false;
-            this.$api.sendRequest({
-                url: '/api/pay/resetpay',
-                data: {
-                    out_trade_no: this.payInfo.out_trade_no,
-                },
-                success: res => {
-                    if (res.code == 0) {
-                        this.getPayInfo(res.data, () => {
-                            this.resetPayComplete = true;
-                        });
-                    } else {
-                        this.resetPayComplete = true;
-                    }
-                },
-                fail: res => {
-                    this.resetPayComplete = true;
-                }
-            })
-        }
-    },
-    // #ifdef H5
-    deactivated() {
-        clearInterval(this.timer);
-    },
-    // #endif
-};
-</script>
-
-<style lang="scss" scoped>
-.popup {
-    width: 75vw;
-    background: #fff;
-    border-top-left-radius: $border-radius;
-    border-top-right-radius: $border-radius;
-
-    .popup-header {
-        display: flex;
-        border-bottom: 2rpx solid $color-line;
-        position: relative;
-        padding: 40rpx;
-
-        .tit {
-            flex: 1;
-            font-size: $font-size-toolbar;
-            line-height: 1;
-            text-align: center;
-        }
-
-        .iconfont {
-            line-height: 1;
-            position: absolute;
-            right: 30rpx;
-            top: 50%;
-            transform: translate(0, -50%);
-            color: $color-tip;
-            font-size: $font-size-toolbar;
-        }
-    }
-
-    .popup-body {
-        height: calc(100% - 250rpx);
-
-        &.safe-area {
-            height: calc(100% - 270rpx);
-        }
-    }
-
-    .popup-footer {
-        height: 100rpx;
-
-        .confirm-btn {
-            height: 72rpx;
-            line-height: 72rpx;
-            color: #fff;
-            text-align: center;
-            margin: 20rpx 30rpx 0;
-            border-radius: $border-radius;
-        }
-
-        &.bottom-safe-area {
-            padding-bottom: constant(safe-area-inset-bottom);
-            padding-bottom: env(safe-area-inset-bottom);
-        }
-    }
-}
-
-.choose-payment-popup {
-    .payment-item {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        height: 90rpx;
-        margin: 0 30rpx;
-        border-bottom: 2rpx solid $color-line;
-        padding: 20rpx 0;
-
-        &:nth-child(2) {
-            padding-top: 0;
-        }
-
-        &:last-child {
-            border-bottom: none;
-        }
-
-        .iconfont {
-            font-size: 64rpx;
-        }
-
-        .icon-yue {
-            color: #faa218;
-        }
-
-        .icon-weixin1 {
-            color: #24af41;
-        }
-
-        .icon-yuezhifu {
-            color: #f9a647;
-        }
-
-        .icon-zhifubaozhifu- {
-            color: #00a0e9;
-        }
-
-
-
-        .icon-checkboxblank {
-            font-size: 40rpx;
-            color: $color-line;
-        }
-
-        .icon-yuan_checked {
-            font-size: 40rpx;
-        }
-
-        .name {
-            margin-left: 20rpx;
-            font-size: $font-size-base;
-            flex: 1;
-        }
-
-        .info-wrap {
-            flex: 1;
-            margin-left: 20rpx;
-
-            .name {
-                margin-left: 0;
-                font-size: $font-size-base;
-                flex: 1;
-            }
-
-            .money {
-                color: $color-tip;
-                font-size: $font-size-tag;
-            }
-        }
-
-        .box {
-            flex: 1;
-            padding: 0 10rpx;
-            line-height: inherit;
-            text-align: right;
-
-            input {
-                font-size: $font-size-tag !important;
-            }
-        }
-
-        &.set-pay-password {
-            height: initial;
-
-            .box {
-                font-size: $font-size-tag !important;
-            }
-        }
-    }
-
-    .pay-money {
-        text-align: center;
-        padding: 20rpx 0 40rpx 0;
-        background-color: #fff;
-        font-weight: bold;
-        margin-top: 30rpx;
-        line-height: 1;
-
-        .unit {
-            margin-right: 4rpx;
-            font-size: $font-size-tag;
-        }
-
-        .money {
-            font-size: $font-size-toolbar;
-        }
-    }
-}
-
-.empty {
-    width: 100%;
-    text-align: center;
-    padding: 40rpx 0;
-    color: $color-sub;
-    font-size: $font-size-tag;
-}
+<template>
+    <view>
+        <!-- 选择支付方式弹窗 -->
+        <uni-popup ref="choosePaymentPopup" type="center" v-if="payInfo" :mask-click="false">
+            <view class="choose-payment-popup popup" @touchmove.prevent.stop>
+                <view class="popup-header">
+                    <text class="tit">支付方式-测试</text>
+                    <text class="iconfont icon-close" @click="close()"></text>
+                </view>
+                <scroll-view scroll-y="true" class="popup-body">
+                    <view class="pay-money">
+                        <text class="money">支付金额{{ payMoney | moneyFormat }}元</text>
+                    </view>
+
+                    <view class="payment-item" v-if="balanceDeduct > 0 && balanceUsable && balanceConfig == 1">
+                        <view class="iconfont icon-yue"></view>
+                        <view class="info-wrap">
+                            <text class="name">余额抵扣</text>
+                            <view class="money">可用¥{{ balanceDeduct | moneyFormat }}</view>
+                        </view>
+                        <ns-switch class="balance-switch" @change="useBalance" :checked="isBalance == 1"></ns-switch>
+                    </view>
+                    <block v-if="payMoney > 0">
+                        <block v-if="payTypeList.length">
+                            <block v-for="(item, index) in payTypeList">
+                                <view v-if="offlineShow || item.type != 'offlinepay'" class="payment-item" :key="index"
+                                    @click="payIndex = index">
+                                    <view class="iconfont" :class="item.icon"></view>
+                                    <text class="name">{{ item.name }}</text>
+                                    <text class="iconfont"
+                                        :class="payIndex == index ? 'icon-yuan_checked color-base-text' : 'icon-checkboxblank'"></text>
+                                </view>
+                            </block>
+                        </block>
+                        <block v-else>
+                            <view class="empty">平台尚未配置支付方式！</view>
+                        </block>
+                    </block>
+                </scroll-view>
+                <view class="popup-footer">
+                    <view class="confirm-btn color-base-bg" @click="confirm()">确认支付</view>
+                </view>
+            </view>
+        </uni-popup>
+    </view>
+</template>
+
+<!-- 新版支付组件 订单表为order表 的订单支付时使用该组件 -->
+<script>
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
+import nsSwitch from '@/components/ns-switch/ns-switch.vue';
+
+// #ifdef H5
+import { Weixin } from 'common/js/wx-jssdk.js';
+// #endif
+
+// ========== 引入三端支付工具类（核心：适配官方规范） ==========
+import { getWechatPay } from '@/utils/wechat-pay.js';
+import { getAlipayPay } from '@/utils/alipay-pay.js';
+import { getHuaweiPay } from '@/utils/huawei-pay.js';
+
+export default {
+    name: 'payment',
+    components: {
+        uniPopup,
+        nsSwitch
+    },
+    props: {
+        // 是否可用余额支付
+        balanceUsable: {
+            type: Boolean,
+            default: true
+        },
+    },
+    data() {
+        return {
+            payIndex: 0,
+            payTypeList: [
+                // 所有端都显示微信支付
+                {
+                    name: '微信支付',
+                    icon: 'icon-weixin1',
+                    type: 'wechatpay'
+                },
+                // 所有端都显示支付宝支付
+                {
+                    name: '支付宝支付',
+                    icon: 'icon-zhifubaozhifu-',
+                    type: 'alipay'
+                },
+                // 所有端都显示华为支付
+                {
+                    name: '华为支付',
+                    icon: 'icon-zhekou',
+                    type: 'huaweipay'
+                },
+                {
+                    name: '线下支付',
+                    icon: 'icondiy icon-yuezhifu',
+                    type: 'offlinepay'
+                },
+            ],
+            // #ifdef H5 
+            timer: null,
+            // #endif
+            payInfo: null,
+            balanceConfig: 0,
+            // 预售页面判断
+            sale: true,
+            isBalance: 0,
+            balance: 0,
+            //重置是否已完成，没有完成不能调用api/pay/pay
+            resetPayComplete: true,
+            repeatFlag: false,
+            // ========== 支付工具类实例 ==========
+            wechatPay: null,
+            alipayPay: null,
+            huaweiPay: null
+        };
+    },
+    created(e) {
+        this.getPayType();
+        if (this.balanceUsable) this.getBalanceConfig();
+        // ========== 初始化三端支付工具类（填写官方申请的参数） ==========
+        this.initPayUtils();
+    },
+    computed: {
+        balanceDeduct() {
+            let money = 0;
+            if (this.payInfo && this.balance) {
+                money = this.balance > this.payInfo.pay_money ? this.payInfo.pay_money : this.balance;
+            }
+            return money;
+        },
+        payMoney() {
+            let money = 0;
+            if (this.payInfo) {
+                money = this.payInfo.pay_money;
+                if (this.balanceDeduct && this.isBalance && this.balanceUsable) {
+                    money = this.payInfo.pay_money - this.balanceDeduct;
+                }
+            }
+            return money;
+        },
+        offlineShow() {
+            // 获取当前页面栈实例数组
+            const pages = getCurrentPages();
+            const currentPage = pages[pages.length - 1];
+            // 获取页面路由路径
+            let routePath = currentPage.route;
+            return this.$store.state.offlineWhiteList.length ? this.$store.state.offlineWhiteList.includes(routePath) : false
+        }
+    },
+    methods: {
+        // ========== 初始化支付工具类（核心：配置官方参数） ==========
+        initPayUtils() {
+            // 微信支付初始化（替换为你的微信官方参数）
+            this.wechatPay = getWechatPay({
+                appId: '你的微信小程序/AppID', // 微信开放平台/AppID
+                merchantId: '你的微信商户号', // 微信支付商户号
+                apiKey: '你的微信API密钥', // 微信支付API密钥（商户平台获取）
+                privateKey: '你的微信RSA私钥', // 商户私钥
+                publicKey: '微信支付公钥' // 微信支付公钥
+            });
+
+            // 支付宝支付初始化（替换为你的支付宝官方参数）
+            this.alipayPay = getAlipayPay({
+                appId: '你的支付宝AppID', // 支付宝开放平台/AppID
+                merchantId: '你的支付宝商户号', // 支付宝支付商户号
+                privateKey: '你的支付宝RSA2私钥', // RSA2私钥
+                alipayPublicKey: '支付宝公钥' // 支付宝公钥
+            });
+
+            // 华为支付初始化（替换为你的华为官方参数）
+            this.huaweiPay = getHuaweiPay({
+                appId: '你的华为AppID', // 华为开发者联盟AppID
+                merchantId: '你的华为商户号', // 华为支付商户号
+                publicKey: '华为支付公钥', // 华为支付公钥
+                privateKey: '你的华为商户私钥', // 华为商户私钥
+                env: 'sandbox' // 测试环境：sandbox，生产环境：production
+            });
+        },
+        /**
+         * 父级页面onShow调用
+         */
+        pageShow() {
+            if (this.payInfo) {
+                let offlinepay = uni.getStorageSync('offlinepay');
+                if (offlinepay) {
+                    uni.removeStorageSync('offlinepay');
+                    this.close()
+                }
+            } else {
+                uni.removeStorageSync('offlinepay');
+            }
+        },
+        close() {
+            this.$emit('close');
+            this.$refs.choosePaymentPopup.close();
+        },
+        // 使用余额
+        useBalance() {
+            this.isBalance = this.isBalance ? 0 : 1;
+            this.$emit('useBalance', this.isBalance)
+        },
+        confirm() {
+            if (this.payTypeList.length == 0 && this.payMoney > 0) {
+                this.$util.showToast({
+                    title: '请选择支付方式！'
+                });
+                return;
+            }
+            if (this.resetPayComplete == false) {
+                this.$util.showToast({
+                    title: '支付取消中，请稍后再试！'
+                });
+                return;
+            }
+            uni.showLoading({
+                title: '支付中...',
+                mask: true
+            });
+            if (this.repeatFlag) return;
+            this.repeatFlag = true;
+            this.pay();
+            uni.setStorageSync('pay_flag', 1);
+        },
+        getPayInfo(out_trade_no, callback) {
+            this.$api.sendRequest({
+                url: '/api/pay/info',
+                data: {
+                    out_trade_no
+                },
+                success: res => {
+                    if (res.code >= 0 && res.data) {
+                        this.payInfo = res.data;
+                        if (this.balanceConfig && this.balanceUsable) this.getMemberBalance();
+                        setTimeout(() => {
+                            this.$refs.choosePaymentPopup.open();
+                            if (typeof callback == 'function') callback();
+                        })
+                    } else {
+                        this.$util.showToast({
+                            title: '未获取到支付信息！'
+                        });
+                    }
+                }
+            });
+        },
+        /**
+         * 获取余额配置
+         */
+        getBalanceConfig() {
+            this.$api.sendRequest({
+                url: '/api/pay/getBalanceConfig',
+                data: {},
+                success: res => {
+                    this.balanceConfig = res.data.balance_show;
+                }
+            });
+        },
+        /**
+         * 获取用户余额
+         */
+        getMemberBalance() {
+            this.$api.sendRequest({
+                url: '/api/memberaccount/usablebalance',
+                success: res => {
+                    if (res.code == 0 && res.data) {
+                        this.balance = parseFloat(res.data.usable_balance);
+                    }
+                }
+            })
+        },
+        /**
+         * 查询支付方式
+         */
+        getPayType() {
+            this.$api.sendRequest({
+                url: '/api/pay/type',
+                success: res => {
+                    if (res.code == 0) {
+                        if (res.data.pay_type == '') {
+                            this.payTypeList = [];
+                        } else {
+                            this.payTypeList = this.payTypeList.filter((val, key) => {
+                                return res.data.pay_type.indexOf(val.type) != -1
+                            });
+                        }
+                    }
+                }
+            });
+        },
+        // #ifdef H5
+        pay() {
+            var payType = this.payTypeList[this.payIndex];
+            var return_url = '';
+            if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
+                return_url = '/pages_promotion/blindbox/index?outTradeNo=';
+            } else {
+                return_url = '/pages_tool/pay/result?code=';
+            }
+            this.$api.sendRequest({
+                url: '/api/pay/pay',
+                data: {
+                    out_trade_no: this.payInfo.out_trade_no,
+                    pay_type: payType ? payType.type : '',
+                    return_url: encodeURIComponent(this.$config.h5Domain + return_url + this.payInfo.out_trade_no),
+                    is_balance: this.isBalance
+                },
+                success: async res => { // 新增async支持异步调用
+                    uni.hideLoading();
+                    if (res.code >= 0) {
+                        if (res.data.pay_success) {
+                            this.paySuccess();
+                            return;
+                        }
+                        switch (payType.type) {
+                            // ========== 支付宝支付（H5端，符合官方RSA2规范） ==========
+                            case 'alipay':
+                                try {
+                                    this.repeatFlag = false;
+                                    const orderInfo = {
+                                        outTradeNo: this.payInfo.out_trade_no,
+                                        productName: '订单支付',
+                                        price: this.payMoney,
+                                        returnUrl: this.$config.h5Domain + return_url + this.payInfo.out_trade_no,
+                                        notifyUrl: this.$config.h5Domain + '/api/pay/alipay/notify'
+                                    };
+                                    // 创建支付宝订单（带RSA2签名）
+                                    const alipayRes = await this.alipayPay.h5Pay(orderInfo);
+                                    // 验证支付宝签名（官方规范）
+                                    const isAlipaySignValid = this.alipayPay.verifyResult(alipayRes, alipayRes.sign);
+                                    if (!isAlipaySignValid) {
+                                        this.$util.showToast({ title: '支付宝订单签名验证失败' });
+                                        return;
+                                    }
+                                    // 区分微信浏览器/普通浏览器
+                                    if (this.$util.isWeiXin()) {
+                                        var wx_alipay = encodeURIComponent(alipayRes.payUrl);
+                                        this.$util.redirectTo('/pages_tool/pay/wx_pay', {
+                                            wx_alipay: wx_alipay,
+                                            out_trade_no: this.payInfo.out_trade_no
+                                        }, '', 'redirectTo');
+                                    } else {
+                                        location.href = alipayRes.payUrl;
+                                        this.checkPayStatus();
+                                    }
+                                } catch (error) {
+                                    this.$util.showToast({ title: '支付宝支付失败：' + error.message });
+                                    this.repeatFlag = false;
+                                }
+                                break;
+
+                            // ========== 微信支付（H5端，符合官方JSSDK+签名规范） ==========
+                            case 'wechatpay':
+                                try {
+                                    this.repeatFlag = false;
+                                    const orderInfo = {
+                                        outTradeNo: this.payInfo.out_trade_no,
+                                        productName: '订单支付',
+                                        price: this.payMoney,
+                                        openid: this.$store.state.openid,
+                                        notifyUrl: this.$config.h5Domain + '/api/pay/wechat/notify',
+                                        returnUrl: this.$config.h5Domain + return_url + this.payInfo.out_trade_no,
+                                        url: uni.getSystemInfoSync().platform == 'ios' ? uni.getStorageSync('initUrl') : location.href
+                                    };
+                                    // 微信浏览器内（JSSDK支付）
+                                    if (this.$util.isWeiXin()) {
+                                        // 初始化JSSDK（官方规范）
+                                        await this.wechatPay.initJSSDK(orderInfo.url);
+                                        // 创建微信订单（带HMAC-SHA256签名）
+                                        const wxPayRes = await this.wechatPay.mpPay(orderInfo);
+                                        // 验证签名（官方规范）
+                                        const isWxSignValid = this.wechatPay.verifyResult(wxPayRes, wxPayRes.paySign);
+                                        if (!isWxSignValid) {
+                                            this.$util.showToast({ title: '微信订单签名验证失败' });
+                                            return;
+                                        }
+                                        // 唤起JSSDK支付
+                                        await this.wechatPay.h5Pay(wxPayRes);
+                                        this.paySuccess();
+                                    } else {
+                                        // 普通浏览器（H5支付链接）
+                                        const wxH5Res = await this.wechatPay.h5Pay(orderInfo);
+                                        console.log('普通浏览器微信支付链接：', wxH5Res.mweb_url);
+                                        location.href = wxH5Res.mweb_url;
+                                        this.checkPayStatus();
+                                    }
+                                } catch (error) {
+                                    this.$util.showToast({ title: '微信支付失败：' + error.message });
+                                    this.resetpay();
+                                    this.repeatFlag = false;
+                                }
+                                break;
+
+                            // ========== 华为支付（H5端，符合官方RSA签名规范） ==========
+                            case 'huaweipay':
+                                try {
+                                    this.repeatFlag = false;
+                                    const orderInfo = {
+                                        productId: 'PROD_' + this.payInfo.out_trade_no,
+                                        productName: '订单支付',
+                                        price: this.payMoney
+                                    };
+                                    // 创建华为订单（带RSA签名）
+                                    const huaweiRes = await this.huaweiPay.h5Pay(orderInfo);
+                                    // 验证签名（官方规范）
+                                    const isHuaweiSignValid = this.huaweiPay.verifySignature(JSON.stringify(huaweiRes), huaweiRes.sign);
+                                    if (!isHuaweiSignValid) {
+                                        this.$util.showToast({ title: '华为订单签名验证失败' });
+                                        return;
+                                    }
+                                    console.log('华为支付跳转链接：', huaweiRes.payUrl);
+                                    location.href = huaweiRes.payUrl;
+                                    this.checkPayStatus();
+                                } catch (error) {
+                                    this.$util.showToast({ title: '华为支付失败：' + error.message });
+                                    this.repeatFlag = false;
+                                }
+                                break;
+
+                            // ========== 线下支付（保留原有逻辑） ==========
+                            case 'offlinepay':
+                                this.$util.redirectTo('/pages_tool/pay/offlinepay', {
+                                    outTradeNo: this.payInfo.out_trade_no
+                                });
+                                this.repeatFlag = false;
+                                break;
+                        }
+                    } else {
+                        this.$util.showToast({
+                            title: res.message
+                        });
+                        this.repeatFlag = false;
+                    }
+                },
+                fail: res => {
+                    uni.hideLoading();
+                    this.$util.showToast({
+                        title: 'request:fail'
+                    });
+                    this.repeatFlag = false;
+                }
+            });
+        },
+        checkPayStatus() {
+            this.timer = setInterval(() => {
+                this.$api.sendRequest({
+                    url: '/api/pay/status',
+                    data: {
+                        out_trade_no: this.payInfo.out_trade_no
+                    },
+                    success: res => {
+                        if (res.code == 0) {
+                            if (res.data.pay_status == 2) {
+                                clearInterval(this.timer);
+                                this.paySuccess();
+                            }
+                        } else {
+                            clearInterval(this.timer);
+                        }
+                    }
+                });
+            }, 1000);
+        },
+        // #endif
+        // #ifdef MP
+        pay() {
+            var payType = this.payTypeList[this.payIndex];
+            this.$api.sendRequest({
+                url: '/api/pay/pay',
+                data: {
+                    out_trade_no: this.payInfo.out_trade_no,
+                    pay_type: payType ? payType.type : '',
+                    scene: uni.getStorageSync('is_test') ? 1175 : uni.getLaunchOptionsSync().scene,
+                    is_balance: this.isBalance
+                },
+                success: async res => { // 新增async支持异步调用
+                    uni.hideLoading();
+                    if (res.code >= 0) {
+                        if (res.data.pay_success) {
+                            this.paySuccess();
+                            this.repeatFlag = false;
+                            return;
+                        }
+                        if (payType.type == 'offlinepay') {
+                            this.$util.redirectTo('/pages_tool/pay/offlinepay', {
+                                outTradeNo: this.payInfo.out_trade_no
+                            });
+                            this.repeatFlag = false;
+                        } else {
+                            try {
+                                this.repeatFlag = false;
+                                // ========== 华为支付（小程序端，跳转H5） ==========
+                                if (payType.type == 'huaweipay') {
+                                    const orderInfo = {
+                                        productId: 'PROD_' + this.payInfo.out_trade_no,
+                                        productName: '订单支付',
+                                        price: this.payMoney
+                                    };
+                                    const huaweiRes = await this.huaweiPay.mpWeixinPay(orderInfo);
+                                    this.$util.redirectTo('/pages_tool/pay/wx_pay', {
+                                        wx_alipay: encodeURIComponent(huaweiRes.payUrl),
+                                        out_trade_no: this.payInfo.out_trade_no
+                                    });
+                                } else {
+                                    // ========== 微信/支付宝小程序支付（符合官方验签规范） ==========
+                                    var payData = res.data.data;
+                                    // 验证支付参数签名（官方规范）
+                                    let isSignValid = false;
+                                    if (payType.type == 'wechatpay') {
+                                        isSignValid = this.wechatPay.verifyResult(payData, payData.paySign);
+                                    } else if (payType.type == 'alipay') {
+                                        isSignValid = this.alipayPay.verifyResult(payData, payData.sign);
+                                    }
+                                    if (!isSignValid) {
+                                        this.$util.showToast({ title: '支付参数签名验证失败' });
+                                        return;
+                                    }
+
+                                    // #ifdef MP-WEIXIN
+                                    var scene = uni.getStorageSync('is_test') ? 1175 : uni.getLaunchOptionsSync().scene;
+                                    if ([1175, 1176, 1177, 1191, 1195].indexOf(scene) != -1) {
+                                        uni.requestOrderPayment({
+                                            timeStamp: payData.timeStamp,
+                                            nonceStr: payData.nonceStr,
+                                            package: payData.package,
+                                            signType: payData.signType,
+                                            paySign: payData.paySign,
+                                            success: res => {
+                                                this.paySuccess();
+                                                this.repeatFlag = false;
+                                            },
+                                            fail: res => {
+                                                this.flag = false;
+                                                if (res.errMsg == 'requestOrderPayment:fail cancel') {
+                                                    this.$util.showToast({
+                                                        title: '您已取消支付'
+                                                    });
+                                                    this.resetpay();
+                                                    this.repeatFlag = false;
+                                                } else {
+                                                    uni.showModal({
+                                                        content: '支付失败,失败原因: ' + res.errMsg,
+                                                        showCancel: false
+                                                    });
+                                                    setTimeout(() => {
+                                                        this.close();
+                                                        this.repeatFlag = false;
+                                                    }, 1500)
+                                                }
+                                            }
+                                        });
+                                        return
+                                    }
+                                    // #endif
+
+                                    uni.requestPayment({
+                                        provider: payType.provider,
+                                        ...payData,
+                                        success: res => {
+                                            this.paySuccess();
+                                            this.repeatFlag = false;
+                                        },
+                                        fail: res => {
+                                            this.flag = false;
+                                            if (res.errMsg == 'requestPayment:fail cancel') {
+                                                this.$util.showToast({
+                                                    title: '您已取消支付'
+                                                });
+                                                this.resetpay();
+                                                this.repeatFlag = false;
+                                            } else {
+                                                uni.showModal({
+                                                    content: '支付失败,失败原因: ' + res.errMsg,
+                                                    showCancel: false
+                                                });
+                                                setTimeout(() => {
+                                                    this.close();
+                                                    this.repeatFlag = false;
+                                                }, 1500)
+                                            }
+                                        }
+                                    });
+                                }
+                            } catch (error) {
+                                this.$util.showToast({ title: '支付失败：' + error.message });
+                                this.repeatFlag = false;
+                            }
+                        }
+                    } else {
+                        this.$util.showToast({
+                            title: res.message
+                        });
+                        this.repeatFlag = false;
+                    }
+                },
+                fail: res => {
+                    uni.hideLoading();
+                    this.$util.showToast({
+                        title: 'request:fail'
+                    });
+                    this.repeatFlag = false;
+                }
+            });
+        },
+        // #endif
+        /**
+         * 支付成功之后跳转
+         */
+        paySuccess() {
+            if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
+                this.$util.redirectTo('/pages_promotion/blindbox/index', {
+                    outTradeNo: this.payInfo.out_trade_no
+                }, 'redirectTo');
+            } else if (this.payInfo.return_url) {
+                if (this.payInfo.return_url.indexOf('http://') != -1 || this.payInfo.return_url.indexOf('https://') != -1) location.replace(this.payInfo.return_url);
+                else this.$util.redirectTo(this.payInfo.return_url, {}, 'redirectTo');
+            } else {
+                this.$util.redirectTo('/pages_tool/pay/result', {
+                    code: this.payInfo.out_trade_no
+                }, 'redirectTo');
+            }
+        },
+        /**
+         * 重置支付单据
+         */
+        resetpay() {
+            this.resetPayComplete = false;
+            this.$api.sendRequest({
+                url: '/api/pay/resetpay',
+                data: {
+                    out_trade_no: this.payInfo.out_trade_no,
+                },
+                success: res => {
+                    if (res.code == 0) {
+                        this.getPayInfo(res.data, () => {
+                            this.resetPayComplete = true;
+                        });
+                    } else {
+                        this.resetPayComplete = true;
+                    }
+                },
+                fail: res => {
+                    this.resetPayComplete = true;
+                }
+            })
+        }
+    },
+    // #ifdef H5
+    deactivated() {
+        clearInterval(this.timer);
+    },
+    // #endif
+};
+</script>
+
+<style lang="scss" scoped>
+.popup {
+    width: 75vw;
+    background: #fff;
+    border-top-left-radius: $border-radius;
+    border-top-right-radius: $border-radius;
+
+    .popup-header {
+        display: flex;
+        border-bottom: 2rpx solid $color-line;
+        position: relative;
+        padding: 40rpx;
+
+        .tit {
+            flex: 1;
+            font-size: $font-size-toolbar;
+            line-height: 1;
+            text-align: center;
+        }
+
+        .iconfont {
+            line-height: 1;
+            position: absolute;
+            right: 30rpx;
+            top: 50%;
+            transform: translate(0, -50%);
+            color: $color-tip;
+            font-size: $font-size-toolbar;
+        }
+    }
+
+    .popup-body {
+        height: calc(100% - 250rpx);
+
+        &.safe-area {
+            height: calc(100% - 270rpx);
+        }
+    }
+
+    .popup-footer {
+        height: 100rpx;
+
+        .confirm-btn {
+            height: 72rpx;
+            line-height: 72rpx;
+            color: #fff;
+            text-align: center;
+            margin: 20rpx 30rpx 0;
+            border-radius: $border-radius;
+        }
+
+        &.bottom-safe-area {
+            padding-bottom: constant(safe-area-inset-bottom);
+            padding-bottom: env(safe-area-inset-bottom);
+        }
+    }
+}
+
+.choose-payment-popup {
+    .payment-item {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        height: 90rpx;
+        margin: 0 30rpx;
+        border-bottom: 2rpx solid $color-line;
+        padding: 20rpx 0;
+
+        &:nth-child(2) {
+            padding-top: 0;
+        }
+
+        &:last-child {
+            border-bottom: none;
+        }
+
+        .iconfont {
+            font-size: 64rpx;
+        }
+
+        .icon-yue {
+            color: #faa218;
+        }
+
+        .icon-weixin1 {
+            color: #24af41;
+        }
+
+        .icon-yuezhifu {
+            color: #f9a647;
+        }
+
+        .icon-zhifubaozhifu- {
+            color: #00a0e9;
+        }
+
+        .icon-checkboxblank {
+            font-size: 40rpx;
+            color: $color-line;
+        }
+
+        .icon-yuan_checked {
+            font-size: 40rpx;
+        }
+
+        .name {
+            margin-left: 20rpx;
+            font-size: $font-size-base;
+            flex: 1;
+        }
+
+        .info-wrap {
+            flex: 1;
+            margin-left: 20rpx;
+
+            .name {
+                margin-left: 0;
+                font-size: $font-size-base;
+                flex: 1;
+            }
+
+            .money {
+                color: $color-tip;
+                font-size: $font-size-tag;
+            }
+        }
+
+        .box {
+            flex: 1;
+            padding: 0 10rpx;
+            line-height: inherit;
+            text-align: right;
+
+            input {
+                font-size: $font-size-tag !important;
+            }
+        }
+
+        &.set-pay-password {
+            height: initial;
+
+            .box {
+                font-size: $font-size-tag !important;
+            }
+        }
+    }
+
+    .pay-money {
+        text-align: center;
+        padding: 20rpx 0 40rpx 0;
+        background-color: #fff;
+        font-weight: bold;
+        margin-top: 30rpx;
+        line-height: 1;
+
+        .unit {
+            margin-right: 4rpx;
+            font-size: $font-size-tag;
+        }
+
+        .money {
+            font-size: $font-size-toolbar;
+        }
+    }
+}
+
+.empty {
+    width: 100%;
+    text-align: center;
+    padding: 40rpx 0;
+    color: $color-sub;
+    font-size: $font-size-tag;
+}
 </style>
\ No newline at end of file
diff --git a/main.js b/main.js
index caad937..bdce6de 100644
--- a/main.js
+++ b/main.js
@@ -1,67 +1,99 @@
-// #ifdef H5
-import './common/js/pc'
-// #endif
-import Vue from 'vue'
-import App from './App'
-import store from './store'
-import Util from './common/js/util.js'
-import Http from './common/js/http.js'
-import Lang from './common/js/lang.js'
-import Config from './common/js/config.js'
-import EventBus from './common/js/event-bus.js'
-import DomEventBridge from './common/js/dom-event-bridge.js'
-import globalConfig from './common/js/golbalConfig.js';
-import {
-	uniStorage
-} from './common/js/storage.js'
-
-Vue.prototype.$store = store //挂在vue
-
-Vue.config.productionTip = false
-
-Vue.prototype.$util = Util;
-Vue.prototype.$api = Http;
-
-Vue.prototype.$langConfig = Lang; //语言包对象
-Vue.prototype.$lang = Lang.lang; //解析语言包
-
-Vue.prototype.$config = Config;
-
-
-// #ifdef H5
-EventBus.setDomBridge(DomEventBridge)
-// #endif
-Vue.prototype.$eventBus = EventBus;
-
-Vue.mixin(globalConfig);
-
-App.mpType = 'app';
-
-// 重写存储，增加前缀
-uniStorage();
-
-//常用组件
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
-Vue.component('loading-cover', loadingCover);
-
-import nsEmpty from '@/components/ns-empty/ns-empty.vue';
-Vue.component('ns-empty', nsEmpty);
-
-import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-Vue.component("mescroll-uni", MescrollUni); //上拉加载,下拉刷新组件
-
-import MescrollBody from "@/components/mescroll/mescroll-body.vue"
-Vue.component('mescroll-body', MescrollBody);
-
-import NsLogin from "@/components/ns-login/ns-login.vue"
-Vue.component('ns-login', NsLogin);
-
-import PrivacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-Vue.component('privacy-popup', PrivacyPopup)
-
-const app = new Vue({
-	...App,
-	store
-})
-
+// #ifdef H5
+import './common/js/pc'
+// #endif
+import Vue from 'vue'
+import App from './App'
+import store from './store'
+import Util from './common/js/util.js'
+import Http from './common/js/http.js'
+import Lang from './common/js/lang.js'
+import Config from './common/js/config.js'
+import EventBus from './common/js/event-bus.js'
+import DomEventBridge from './common/js/dom-event-bridge.js'
+import globalConfig from './common/js/golbalConfig.js';
+import {
+	uniStorage
+} from './common/js/storage.js'
+
+Vue.prototype.$store = store //挂在vue
+
+Vue.config.productionTip = false
+
+Vue.prototype.$util = Util;
+Vue.prototype.$api = Http;
+
+Vue.prototype.$langConfig = Lang; //语言包对象
+Vue.prototype.$lang = Lang.lang; //解析语言包
+
+Vue.prototype.$config = Config;
+
+// #ifdef H5
+EventBus.setDomBridge(DomEventBridge)
+// #endif
+Vue.prototype.$eventBus = EventBus;
+
+Vue.mixin(globalConfig);
+
+App.mpType = 'app';
+
+// 重写存储，增加前缀
+uniStorage();
+
+//常用组件
+import loadingCover from '@/components/loading-cover/loading-cover.vue';
+Vue.component('loading-cover', loadingCover);
+
+import nsEmpty from '@/components/ns-empty/ns-empty.vue';
+Vue.component('ns-empty', nsEmpty);
+
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+Vue.component("mescroll-uni", MescrollUni); //上拉加载,下拉刷新组件
+
+import MescrollBody from "@/components/mescroll/mescroll-body.vue"
+Vue.component('mescroll-body', MescrollBody);
+
+import NsLogin from "@/components/ns-login/ns-login.vue"
+Vue.component('ns-login', NsLogin);
+
+import PrivacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// 只保留一次组件注册（删除重复行）
+Vue.component('privacy-popup', PrivacyPopup)
+
+// 全局登录方法（替换成你的真实后端接口地址）
+Vue.prototype.$doGlobalLogin = async function() {
+  return new Promise((resolve, reject) => {
+    uni.login({
+      success: async (loginRes) => {
+        if (!loginRes.code) {
+          reject("获取登录凭证失败，请重试");
+          return;
+        }
+        try {
+          // ！！替换为你的真实后端登录接口地址！！
+          const res = await uni.request({
+            url: "https://dev.aigc-quickapp.com/api/user/login", 
+            method: "POST",
+            data: { code: loginRes.code }
+          });
+          if (res.data?.success) {
+            uni.setStorageSync("token", res.data.token);
+            resolve(true);
+          } else {
+            reject(res.data?.msg || "登录失败");
+          }
+        } catch (err) {
+          reject("网络异常");
+        }
+      },
+      fail: () => reject("登录授权失败")
+    });
+  });
+};
+
+// 只创建一次Vue实例（删除重复声明）
+const app = new Vue({
+	...App,
+	store
+})
+
 app.$mount()
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index bec6eaf..0c00531 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,27 +1,23 @@
 {
-    "name" : "lucky_weapp",
-    "appid" : "__UNI__A3A4830",
-    "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueCompiler" : "uni-app",
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
+    "name":"lucky_weapp",
+    "appid":"__UNI__A3A4830",
+    "description":"",
+    "versionName":"1.0.0",
+    "versionCode":"100",
+    "transformPx":false,
+    "app-plus":{
+        "usingComponents":true,
+        "nvueCompiler":"uni-app",
+        "splashscreen":{
+            "alwaysShowBeforeRender":true,
+            "waiting":true,
+            "autoclose":true,
+            "delay":0
         },
-        /* 模块配置 */
-        "modules" : {},
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
+        "modules":{},
+        "distribute":{
+            "android":{
+                "permissions":[
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
@@ -46,90 +42,164 @@
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ]
             },
-            /* ios打包配置 */
-            "ios" : {},
-            /* SDK配置 */
-            "sdkConfigs" : {
-                "ad" : {}
+            "ios":{},
+            "sdkConfigs":{
+                "ad":{},
+                // App端支付SDK配置（适配原生App支付）
+                "payment":{
+                    "weixin":{
+                        "appid":"wx1234567890abcdef", // 替换：微信开放平台AppID
+                        "universalLink":"https://yourdomain.com/apple-app-site-association" // 替换：iOS微信Universal Link
+                    },
+                    "alipay":{
+                        "appid":"2024000000000000" // 替换：支付宝开放平台AppID
+                    },
+                    "huawei":{
+                        "appid":"12345678" // 替换：华为开发者联盟AppID（应用市场申请）
+                    }
+                }
             }
         }
     },
-    /* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "wxa8f94045d9c2fc10",
-        "setting" : {
-            "urlCheck" : false,
-            "postcss" : false,
-            "es6" : true,
-            "minified" : true
+    "mp-weixin":{
+        "appid":"wxa8f94045d9c2fc10", // 你的微信小程序AppID（已保留）
+        "setting":{
+            "urlCheck":false,
+            "postcss":false,
+            "es6":true,
+            "minified":true
         },
-        "usingComponents" : true,
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : "为了更好地为您提供服务"
+        "usingComponents":true,
+        "permission":{
+            "scope.userLocation":{
+                "desc":"为了更好地为您提供服务"
             },
-            "scope.writePhotosAlbum" : {
-                "desc" : "为了更好地为您提供服务"
+            "scope.writePhotosAlbum":{
+                "desc":"为了更好地为您提供服务"
             }
         },
-        "requiredPrivateInfos" : [ "chooseLocation", "getLocation", "chooseAddress" ],
-        "__usePrivacyCheck__" : true,
-        "optimization" : {
-            "subPackages" : true
+        "useDeprecatedAPI":{
+            "getSystemInfoSync":false
+        },
+        "requiredPrivateInfos":["chooseLocation","getLocation","chooseAddress"],
+        "__usePrivacyCheck__":true,
+        "optimization":{
+            "subPackages":true
+        },
+        // 微信小程序支付核心配置（官方规范）
+        "pay":{
+            "merchantId":"1688888888", // 替换：你的微信支付商户号（商户平台获取）
+            "keyPath":"cert/apiclient_key.p12" // 可选：微信支付证书路径（退款/分账等接口需用）
+        },
+        "sdkConfigs":{
+            "jssdk":{
+                "apis":["chooseWXPay"] // 必须：开启微信JSSDK支付接口（H5/小程序共用）
+            }
         }
     },
-    "mp-alipay" : {
-        "usingComponents" : true,
-        "appid" : ""
+    "mp-alipay":{
+        "usingComponents":true,
+        "appid":"2024000000000000", // 替换：你的支付宝小程序AppID（开放平台获取）
+        // 支付宝小程序支付配置（官方规范）
+        "pay":{
+            "merchantId":"2088888888888888" // 替换：你的支付宝支付商户号
+        }
     },
-    "mp-baidu" : {
-        "usingComponents" : true
+    "mp-baidu":{
+        "usingComponents":true
     },
-    "mp-toutiao" : {
-        "usingComponents" : true
+    "mp-toutiao":{
+        "usingComponents":true
     },
-    "h5" : {
-        "sdkConfigs" : {
-            "maps" : {
-                "qqmap" : {
-                    "key" : "TUHBZ-CNWKU-UHAVP-GZQ26-HNZFO-3YBF4"
+    "h5":{
+        "sdkConfigs":{
+            "maps":{
+                "qqmap":{
+                    "key":"TUHBZ-CNWKU-UHAVP-GZQ26-HNZFO-3YBF4" // 已保留
+                },
+                // H5端微信/华为支付JSSDK配置
+                "weixin":{
+                    "appid":"wxa8f94045d9c2fc10" // 和微信小程序AppID一致（无需修改）
+                },
+                "huawei":{
+                    "appid":"12345678" // 替换：华为开发者联盟AppID
                 }
             }
         },
-        "router" : {
-            "mode" : "history",
-            "base" : "/hwapp/"
+        "router":{
+            "mode":"hash", // 必须：hash模式适配支付回调跳转
+            "base":"/hwapp/"
         },
-        "title" : " ",
-        "devServer" : {
-            "https" : false
-        },
-        "optimization" : {
-            "treeShaking" : {
-                "enable" : false
+        "title":"华为支付演示",
+        "devServer":{
+            "https":false,
+            // H5端支付接口跨域代理（解决浏览器跨域限制）
+            "proxy":{
+                // 华为支付接口代理
+                "/api/huawei":{
+                    "target":"https://iap-api.cloud.huawei.com",
+                    "changeOrigin":true,
+                    "pathRewrite":{
+                        "^/api/huawei":""
+                    }
+                },
+                // 微信支付接口代理
+                "/api/wechat":{
+                    "target":"https://api.mch.weixin.qq.com",
+                    "changeOrigin":true,
+                    "pathRewrite":{
+                        "^/api/wechat":""
+                    }
+                },
+                // 支付宝支付接口代理（沙箱/生产二选一）
+                "/api/alipay":{
+                    "target":"https://openapi.alipaydev.com", // 沙箱环境；生产：https://openapi.alipay.com
+                    "changeOrigin":true,
+                    "pathRewrite":{
+                        "^/api/alipay":""
+                    }
+                }
             }
         },
-        "domain" : " ",
-        "unipush" : {
-            "enable" : false
+        "optimization":{
+            "treeShaking":{
+                "enable":false
+            }
         },
-        "async" : {
-            "loading" : "",
-            "error" : "",
-            "delay" : 0,
-            "timeout" : 3000
+        "domain":" ",
+        "unipush":{
+            "enable":false
         },
-        "template" : ""
+        "async":{
+            "loading":"",
+            "error":"",
+            "delay":0,
+            "timeout":3000
+        },
+        "template":""
     },
-    "uniStatistics" : {
-        "version" : "2"
+    "uniStatistics":{
+        "version":"2"
     },
-    "sassImplementationName" : "node-sass",
-    /** 快应用配置 **/
-    "quickapp-webview" : {
-        "package" : "com.jieganfsj.fivegshop",
-        "minPlatformVersion" : 1070,
-        "versionName" : "1.0.0",
-        "versionCode" : 0
+    "sassImplementationName":"node-sass",
+    "quickapp-webview":{
+        "package":"com.jieganfsj.fivegshop", // 已保留：华为快应用包名
+        "minPlatformVersion":1070,
+        "versionName":"1.0.0",
+        "versionCode":0,
+        // 华为快应用支付核心配置（官方规范）
+        "sdkConfigs":{
+            "huawei":{
+                "appid":"12345678", // 替换：华为开发者联盟AppID
+                "payment":{
+                    "merchantId":"88888888" // 替换：华为支付商户号（商户平台获取）
+                }
+            }
+        },
+        // 华为快应用必须声明的支付权限（官方强制）
+        "features":[
+            {"name":"system.pay"},
+            {"name":"huawei.pay"}
+        ]
     }
-}
+}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index f43ba2b..9762499 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,14 @@
 {
-  "name": "frontend",
+  "name": "lucky_shop",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "dependencies": {
         "@dcloudio/uni-quickapp-webview": "^2.0.2-4080420251103001",
+        "crypto-js": "^4.1.1",
+        "js-base64": "^3.7.2",
+        "jsencrypt": "^3.2.1",
         "jweixin-module": "^1.6.0"
       },
       "devDependencies": {
@@ -455,6 +458,12 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/crypto-js": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz",
+      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==",
+      "license": "MIT"
+    },
     "node_modules/electron-to-chromium": {
       "version": "1.5.4",
       "resolved": "https://repo.huaweicloud.com/repository/npm/electron-to-chromium/-/electron-to-chromium-1.5.4.tgz",
@@ -614,6 +623,18 @@
         "node": ">= 10.13.0"
       }
     },
+    "node_modules/js-base64": {
+      "version": "3.7.8",
+      "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-3.7.8.tgz",
+      "integrity": "sha512-hNngCeKxIUQiEUN3GPJOkz4wF/YvdUdbNL9hsBcMQTkKzboD7T/q3OYOuuPZLUE6dBxSGpwhk5mwuDud7JVAow==",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/jsencrypt": {
+      "version": "3.5.4",
+      "resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.5.4.tgz",
+      "integrity": "sha512-kNjfYEMNASxrDGsmcSQh/rUTmcoRfSUkxnAz+MMywM8jtGu+fFEZ3nJjHM58zscVnwR0fYmG9sGkTDjqUdpiwA==",
+      "license": "MIT"
+    },
     "node_modules/json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://repo.huaweicloud.com/repository/npm/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
@@ -1345,6 +1366,11 @@
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "dev": true
     },
+    "crypto-js": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz",
+      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
+    },
     "electron-to-chromium": {
       "version": "1.5.4",
       "resolved": "https://repo.huaweicloud.com/repository/npm/electron-to-chromium/-/electron-to-chromium-1.5.4.tgz",
@@ -1464,6 +1490,16 @@
         "supports-color": "^8.0.0"
       }
     },
+    "js-base64": {
+      "version": "3.7.8",
+      "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-3.7.8.tgz",
+      "integrity": "sha512-hNngCeKxIUQiEUN3GPJOkz4wF/YvdUdbNL9hsBcMQTkKzboD7T/q3OYOuuPZLUE6dBxSGpwhk5mwuDud7JVAow=="
+    },
+    "jsencrypt": {
+      "version": "3.5.4",
+      "resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.5.4.tgz",
+      "integrity": "sha512-kNjfYEMNASxrDGsmcSQh/rUTmcoRfSUkxnAz+MMywM8jtGu+fFEZ3nJjHM58zscVnwR0fYmG9sGkTDjqUdpiwA=="
+    },
     "json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://repo.huaweicloud.com/repository/npm/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
diff --git a/package.json b/package.json
index dbca309..46c12fb 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,9 @@
   },
   "dependencies": {
     "@dcloudio/uni-quickapp-webview": "^2.0.2-4080420251103001",
-    "jweixin-module": "^1.6.0"
+    "jweixin-module": "^1.6.0",
+    "js-base64": "^3.7.2",
+    "jsencrypt": "^3.2.1",
+    "crypto-js": "^4.1.1"
   }
-}
+}
\ No newline at end of file