feat：华为支付完成

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "codingcopilot.enableCompletionLanguage": {}
+}

common/js/config.js

@@ -14,18 +14,18 @@ try {
 // 调试版本，配置说明
 const devCfg = {
     // 商户ID
-    uniacid: 926, //825
+    uniacid: 1, //825
 
     //api请求地址
-    baseUrl: 'https://xcx21.5g-quickapp.com/',
+    baseUrl: 'https://dev.aigc-quickapp.com/',
     // baseUrl: 'http://localhost:8010/',
 
     // 图片域名
-    imgDomain: 'https://xcx21.5g-quickapp.com/',
+    imgDomain: 'https://dev.aigc-quickapp.com/',
     //imgDomain: 'http://localhost:8010/',
 
     // H5端域名
-    h5Domain: 'https://xcx21.5g-quickapp.com/',
+    h5Domain: 'https://dev.aigc-quickapp.com/',
     // h5Domain: 'http://localhost:8010/',
 
     // // api请求地址

components/common-payment/payment.js

@@ -462,7 +462,11 @@ export default {
 		openChoosePayment() {
 			// #ifdef MP
 			if (this.paymentData.is_virtual) {
+				if(this.paymentData?.is_virtual_delivery == 1){
+					this.$util.subscribeMessage('ORDER_URGE_PAYMENT,ORDER_PAY,ORDER_DELIVERY');
+				}else{
 					this.$util.subscribeMessage('ORDER_URGE_PAYMENT,ORDER_PAY');
+				}
 			} else {
 				switch (this.orderCreateData.delivery.delivery_type) {
 					case 'express': //物流配送
@@ -605,8 +609,9 @@ export default {
 			let delivery = {
 				delivery_type: data.name,
 				delivery_type_name: data.title
-			}
+			};
-			// 如果是门店配送
+
+			// 如果是门店配送或者门店自提
 			if (data.name == 'store' || data.name == 'local') {
 				if (data.store_list[0]) {
 					delivery.store_id = data.store_list[0].store_id;
@@ -692,7 +697,7 @@ export default {
 				let obj = {
 					delivery: this.orderCreateData.delivery,
 					dataTime: data
-				}
+				};
 				this.$refs.timePopup.open(obj, type);
 				this.$forceUpdate();
 			}

components/payment/payment.vue

@@ -9,25 +9,29 @@
                 </view>
                 <scroll-view scroll-y="true" class="popup-body">
                     <view class="pay-money">
-                        <text class="money">支付金额{{ payMoney|moneyFormat }}元</text>
+                        <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>
+                            <text class="name">余额抵扣</text>
-                            <view class="money">可用¥{{ balanceDeduct|moneyFormat }}</view>
+                            <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">
-                            <view class="payment-item" v-for="(item, index) in payTypeList" :key="index" @click="payIndex = index">
+                            <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>
+                                    <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>
@@ -43,16 +47,16 @@
 
 <!-- 新版支付组件 订单表为order表 的订单支付时使用该组件 -->
 <script>
-    import uniPopup from '@/components/uni-popup/uni-popup.vue';
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
-    import nsSwitch from '@/components/ns-switch/ns-switch.vue';
+import nsSwitch from '@/components/ns-switch/ns-switch.vue';
 
-    // #ifdef H5
+// #ifdef H5
-    import {
+import {
     Weixin
-    } from 'common/js/wx-jssdk.js';
+} from 'common/js/wx-jssdk.js';
-    // #endif
+// #endif
 
-    export default {
+export default {
     name: 'payment',
     components: {
         uniPopup,
@@ -63,47 +67,56 @@
         balanceUsable: {
             type: Boolean,
             default: true
-            }
+        },
     },
     data() {
         return {
             payIndex: 0,
-                // #ifdef H5
+            payTypeList: [
-                payTypeList: [{
-                        name: '支付宝支付',
-                        icon: 'icon-zhifubaozhifu-',
-                        type: 'alipay'
-                    },
                 {
                     name: '微信支付',
                     icon: 'icon-weixin1',
-                        type: 'wechatpay'
+                    type: 'wechatpay',
-                    }
+                    description: '推荐微信用户使用'
-                ],
+                },
-                timer: null,
+                {
-                // #endif
-                // #ifdef MP-WEIXIN
-                payTypeList: [{
-                    name: '微信支付',
-                    provider: 'wxpay',
-                    icon: 'icon-weixin1',
-                    type: 'wechatpay'
-                }],
-                // #endif
-                // #ifdef MP-ALIPAY
-                payTypeList: [{
                     name: '支付宝支付',
                     icon: 'icon-zhifubaozhifu-',
                     type: 'alipay',
-                    provider: 'alipay'
+                    description: '推荐支付宝用户使用'
-                }],
+                },
+                {
+                    name: '华为支付',
+                    icon: 'icon-huawei-pay',
+                    type: 'huaweipay',
+                    description: '华为用户专属支付'
+                },
+                {
+                    name: '线下支付',
+                    icon: 'icondiy icon-yuezhifu',
+                    type: 'offlinepay',
+                    description: '到店支付或银行转账'
+                },
+                {
+                    name: '余额支付',
+                    icon: 'icon-balance',
+                    type: 'balancepay',
+                    description: '使用账户余额支付'
+                }
+            ],
+            // #ifdef H5 
+            timer: null,
             // #endif
             payInfo: null,
             balanceConfig: 0,
             // 预售页面判断
             sale: true,
             isBalance: 0,
-                balance: 0
+            balance: 0,
+            //重置是否已完成，没有完成不能调用api/pay/pay
+            resetPayComplete: true,
+            repeatFlag: false,
+            flag: false // 保留文件1的flag变量，用于支付失败处理
         };
     },
     created(e) {
@@ -127,9 +140,32 @@
                 }
             }
             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();
@@ -146,14 +182,22 @@
                 });
                 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) {
+        getPayInfo(out_trade_no, callback) {
             this.$api.sendRequest({
                 url: '/api/pay/info',
                 data: {
@@ -165,6 +209,7 @@
                         if (this.balanceConfig && this.balanceUsable) this.getMemberBalance();
                         setTimeout(() => {
                             this.$refs.choosePaymentPopup.open();
+                            if (typeof callback == 'function') callback();
                         })
                     } else {
                         this.$util.showToast({
@@ -178,7 +223,6 @@
          * 获取余额配置
          */
         getBalanceConfig() {
-			
             this.$api.sendRequest({
                 url: '/api/pay/getBalanceConfig',
                 data: {},
@@ -196,10 +240,6 @@
                 success: res => {
                     if (res.code == 0 && res.data) {
                         this.balance = parseFloat(res.data.usable_balance);
-							//余额不足以抵扣整个订单时不显示
-							if(parseFloat(this.payMoney) > this.balance){
-								this.balanceConfig = 0
-							}
                     }
                 }
             })
@@ -215,10 +255,8 @@
                         if (res.data.pay_type == '') {
                             this.payTypeList = [];
                         } else {
-                                this.payTypeList.forEach((val, key) => {
+                            this.payTypeList = this.payTypeList.filter((val, key) => {
-                                    if (res.data.pay_type.indexOf(val.type) == -1) {
+                                return res.data.pay_type.indexOf(val.type) != -1
-                                        this.payTypeList.splice(key, 1);
-                                    }
                             });
                         }
                     }
@@ -228,41 +266,48 @@
         // #ifdef H5
         pay() {
             var payType = this.payTypeList[this.payIndex];
+            // 保留文件2的线下支付逻辑
+            if (!payType || payType.type === 'offlinepay') {
+                this.payOffline();
+                return;
+            }
+
+            // 保留文件2的流程控制
+            if (!this.resetPayComplete) {
+                uni.hideLoading();
+                this.$util.showToast({
+                    title: '支付取消中，请稍后再试！'
+                });
+                this.repeatFlag = false;
+                return;
+            }
+
+            // 复用文件1的核心逻辑：调用后端/api/pay/pay接口
             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 : '',
+                    pay_type: payType.type,
-                        return_url: encodeURIComponent(this.$config.h5Domain + return_url + this.payInfo
+                    return_url: encodeURIComponent(this.$config.h5Domain + return_url + this.payInfo.out_trade_no),
-                            .out_trade_no),
                     is_balance: this.isBalance
                 },
                 success: res => {
                     uni.hideLoading();
+                    this.repeatFlag = false; // 重置文件2的防重复标记
                     if (res.code >= 0) {
                         if (res.data.pay_success) {
                             this.paySuccess();
                             return;
                         }
                         switch (payType.type) {
-                                case 'alipay':
+                            // 保留文件1的微信支付逻辑（新增空值判断）
-                                    if (this.$util.isWeiXin()) {
-                                        var wx_alipay = encodeURIComponent(res.data.data);
-                                        this.$util.redirectTo('/pages_tool/pay/wx_pay', {
-                                            wx_alipay: wx_alipay,
-                                            out_trade_no: this.payInfo.out_trade_no
-                                        }, '', 'redirectTo');
-                                    } else {
-                                        location.href = res.data.data;
-                                        this.checkPayStatus();
-                                    }
-                                    break;
                             case 'wechatpay':
                                 if (this.$util.isWeiXin()) {
                                     if (uni.getSystemInfoSync().platform == 'ios') {
@@ -279,6 +324,12 @@
                                         success: jssdkRes => {
                                             var wxJS = new Weixin(),
                                                 payData = res.data.data;
+                                            // 新增：空值判断，避免读取undefined属性
+                                            if (!payData) {
+                                                this.$util.showToast({ title: '微信支付参数获取失败' });
+                                                this.close();
+                                                return;
+                                            }
                                             wxJS.init(jssdkRes.data);
                                             wxJS.pay({
                                                     timestamp: payData.timestamp ? payData.timestamp : payData.timeStamp,
@@ -309,10 +360,96 @@
                                         }
                                     });
                                 } else {
+                                    // 新增：判断res.data.url是否存在
+                                    if (!res.data.url) {
+                                        this.$util.showToast({ title: '微信支付链接获取失败' });
+                                        this.close();
+                                        return;
+                                    }
                                     location.href = res.data.url;
                                     this.checkPayStatus();
                                 }
                                 break;
+                            // 保留文件1的支付宝支付逻辑
+                            case 'alipay':
+                                if (this.$util.isWeiXin()) {
+                                    // 新增：判断res.data.data是否存在
+                                    if (!res.data.data) {
+                                        this.$util.showToast({ title: '支付宝支付参数获取失败' });
+                                        this.close();
+                                        return;
+                                    }
+                                    var wx_alipay = encodeURIComponent(res.data.data);
+                                    this.$util.redirectTo('/pages_tool/pay/wx_pay', {
+                                        wx_alipay: wx_alipay,
+                                        out_trade_no: this.payInfo.out_trade_no
+                                    }, '', 'redirectTo');
+                                } else {
+                                    // 新增：判断res.data.data是否存在
+                                    if (!res.data.data) {
+                                        this.$util.showToast({ title: '支付宝支付链接获取失败' });
+                                        this.close();
+                                        return;
+                                    }
+                                    location.href = res.data.data;
+                                    this.checkPayStatus();
+                                }
+                                break;
+                            // 新增华为支付分支处理（沿用文件1范式，补充空值判断）
+                            case 'huaweipay':
+                                // 新增：先判断res.data.data是否存在
+                                if (!res.data.data) {
+                                    this.$util.showToast({ title: '华为支付参数获取失败' });
+                                    this.close();
+                                    return;
+                                }
+                                const systemInfo = uni.getSystemInfoSync();
+                                const isHuaweiQuickApp = systemInfo.platform === 'quickapp-huawei';
+                                // 华为快应用：尝试原生SDK唤起
+                                if (isHuaweiQuickApp && res.data.data.orderInfo) {
+                                    try {
+                                        const huaweiPay = require('@service.pay.huawei');
+                                        huaweiPay.pay({
+                                            orderInfo: res.data.data.orderInfo,
+                                            success: () => {
+                                                this.paySuccess();
+                                            },
+                                            fail: (err) => {
+                                                // 原生失败跳H5链接
+                                                if (res.data.data.payUrl) {
+                                                    location.href = res.data.data.payUrl;
+                                                    this.checkPayStatus();
+                                                } else {
+                                                    this.$util.showToast({
+                                                        title: `华为支付失败：${err.message}`
+                                                    });
+                                                    this.close();
+                                                }
+                                            }
+                                        });
+                                    } catch (sdkErr) {
+                                        // SDK加载失败跳H5
+                                        if (res.data.data.payUrl) {
+                                            location.href = res.data.data.payUrl;
+                                            this.checkPayStatus();
+                                        } else {
+                                            this.$util.showToast({
+                                                title: '华为支付SDK加载失败'
+                                            });
+                                            this.close();
+                                        }
+                                    }
+                                } else if (res.data.data.payUrl) {
+                                    // 非华为快应用：直接跳H5链接
+                                    location.href = res.data.data.payUrl;
+                                    this.checkPayStatus();
+                                } else {
+                                    this.$util.showToast({
+                                        title: '未获取到华为支付链接'
+                                    });
+                                    this.close();
+                                }
+                                break;
                         }
                     } else {
                         this.$util.showToast({
@@ -322,12 +459,22 @@
                 },
                 fail: res => {
                     uni.hideLoading();
+                    this.repeatFlag = false; // 重置文件2的防重复标记
                     this.$util.showToast({
                         title: 'request:fail'
                     });
                 }
             });
         },
+        /**
+         * 线下支付处理（保留文件2原有逻辑）
+         */
+        payOffline() {
+            this.$util.redirectTo('/pages_tool/pay/offlinepay', {
+                outTradeNo: this.payInfo.out_trade_no
+            });
+            this.repeatFlag = false;
+        },
         checkPayStatus() {
             this.timer = setInterval(() => {
                 this.$api.sendRequest({
@@ -352,16 +499,37 @@
         // #ifdef MP
         pay() {
             var payType = this.payTypeList[this.payIndex];
+            // 保留文件2的线下支付逻辑
+            if (!payType || payType.type === 'offlinepay') {
+                this.$util.redirectTo('/pages_tool/pay/offlinepay', {
+                    outTradeNo: this.payInfo.out_trade_no
+                });
+                this.repeatFlag = false;
+                return;
+            }
+
+            // 保留文件2的流程控制
+            if (!this.resetPayComplete) {
+                uni.hideLoading();
+                this.$util.showToast({
+                    title: '支付取消中，请稍后再试！'
+                });
+                this.repeatFlag = false;
+                return;
+            }
+
+            // 复用文件1的小程序端核心逻辑：调用/api/pay/pay
             this.$api.sendRequest({
                 url: '/api/pay/pay',
                 data: {
                     out_trade_no: this.payInfo.out_trade_no,
-                        pay_type: payType ? payType.type : '',
+                    pay_type: payType.type,
                     scene: uni.getStorageSync('is_test') ? 1175 : wx.getLaunchOptionsSync().scene,
                     is_balance: this.isBalance
                 },
                 success: res => {
                     uni.hideLoading();
+                    this.repeatFlag = false; // 重置文件2的防重复标记
                     if (res.code >= 0) {
                         if (res.data.pay_success) {
                             this.paySuccess();
@@ -369,7 +537,15 @@
                         }
                         var payData = res.data.data;
 
-                            // #ifdef MP-WEIXIN
+                        switch (payType.type) {
+                            // 保留文件1的微信支付逻辑（新增空值判断）
+                            case 'wechatpay':
+                                // 新增：空值判断
+                                if (!payData) {
+                                    this.$util.showToast({ title: '微信支付参数获取失败' });
+                                    this.close();
+                                    return;
+                                }
                                 var scene = uni.getStorageSync('is_test') ? 1175 : wx.getLaunchOptionsSync().scene;
                                 if ([1175, 1176, 1177, 1191, 1195].indexOf(scene) != -1) {
                                     uni.requestOrderPayment({
@@ -382,51 +558,63 @@
                                             this.paySuccess();
                                         },
                                         fail: res => {
-                                        this.flag = false;
+                                            this.handlePayFail(res);
-                                        if (res.errMsg == 'requestOrderPayment:fail cancel') {
-                                            this.$util.showToast({
-                                                title: '您已取消支付'
-                                            });
-                                            this.resetpay();
-                                        } else {
-                                            uni.showModal({
-                                                content: '支付失败,失败原因: ' + res.errMsg,
-                                                showCancel: false
-                                            });
-                                            setTimeout(() => {
-                                                this.close();
-                                            }, 1500)
-                                        }
                                         }
                                     });
-                                return
+                                    return;
                                 }
-                            // #endif
-
                                 uni.requestPayment({
-                                provider: payType.provider,
+                                    provider: 'wxpay',
                                     ...payData,
                                     success: res => {
                                         this.paySuccess();
                                     },
                                     fail: res => {
-                                    this.flag = false;
+                                        this.handlePayFail(res);
-                                    if (res.errMsg == 'requestPayment:fail cancel') {
+                                    }
-                                        this.$util.showToast({
-                                            title: '您已取消支付'
                                 });
-                                        this.resetpay();
+                                break;
-                                    } else {
+                            // 保留文件1的支付宝支付逻辑（新增空值判断）
-                                        uni.showModal({
+                            case 'alipay':
-                                            content: '支付失败,失败原因: ' + res.errMsg,
+                                // 新增：空值判断
-                                            showCancel: false
+                                if (!payData) {
-                                        });
+                                    this.$util.showToast({ title: '支付宝支付参数获取失败' });
-                                        setTimeout(() => {
                                     this.close();
-                                        }, 1500)
+                                    return;
                                 }
+                                uni.requestPayment({
+                                    provider: 'alipay',
+                                    ...payData,
+                                    success: res => {
+                                        this.paySuccess();
+                                    },
+                                    fail: res => {
+                                        this.handlePayFail(res);
                                     }
                                 });
+                                break;
+                            // 新增华为支付小程序端逻辑（补充空值判断）
+                            case 'huaweipay':
+                                // 新增：空值判断
+                                if (!payData) {
+                                    this.$util.showToast({ title: '华为支付参数获取失败' });
+                                    this.close();
+                                    return;
+                                }
+                                if (payData.payUrl) {
+                                    // 小程序端跳WebView页面
+                                    this.$util.redirectTo('/pages/Pay/Pay', {
+                                        payUrl: payData.payUrl,
+                                        outTradeNo: this.payInfo.out_trade_no
+                                    });
+                                } else {
+                                    this.$util.showToast({
+                                        title: '未获取到华为支付链接'
+                                    });
+                                    this.close();
+                                }
+                                break;
+                        }
                     } else {
                         this.$util.showToast({
                             title: res.message
@@ -435,15 +623,36 @@
                 },
                 fail: res => {
                     uni.hideLoading();
+                    this.repeatFlag = false; // 重置文件2的防重复标记
                     this.$util.showToast({
                         title: 'request:fail'
                     });
                 }
             });
         },
+        /**
+         * 统一处理支付失败（复用文件1逻辑）
+         */
+        handlePayFail(res) {
+            this.flag = false;
+            if (res.errMsg.includes('cancel')) {
+                this.$util.showToast({
+                    title: '您已取消支付'
+                });
+                this.resetpay();
+            } else {
+                uni.showModal({
+                    content: '支付失败,失败原因: ' + res.errMsg,
+                    showCancel: false
+                });
+                setTimeout(() => {
+                    this.close();
+                }, 1500)
+            }
+        },
         // #endif
         /**
-             * 支付成功之后跳转
+         * 支付成功之后跳转（真实业务逻辑）
          */
         paySuccess() {
             if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
@@ -460,16 +669,26 @@
             }
         },
         /**
-             * 重置支付单据
+         * 重置支付单据（真实业务逻辑）
          */
         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);
+                    if (res.code == 0) {
+                        this.getPayInfo(res.data, () => {
+                            this.resetPayComplete = true;
+                        });
+                    } else {
+                        this.resetPayComplete = true;
+                    }
+                },
+                fail: res => {
+                    this.resetPayComplete = true;
                 }
             })
         }
@@ -479,11 +698,11 @@
         clearInterval(this.timer);
     },
     // #endif
-    };
+};
 </script>
 
 <style lang="scss" scoped>
-    .popup {
+.popup {
     width: 75vw;
     background: #fff;
     border-top-left-radius: $border-radius;
@@ -538,9 +757,9 @@
             padding-bottom: env(safe-area-inset-bottom);
         }
     }
-    }
+}
 
-    .choose-payment-popup {
+.choose-payment-popup {
     .payment-item {
         display: flex;
         align-items: center;
@@ -570,9 +789,16 @@
             color: #24af41;
         }
 
+        .icon-yuezhifu {
+            color: #f9a647;
+        }
+
         .icon-zhifubaozhifu- {
             color: #00a0e9;
         }
+        .icon-huawei-pay {
+            color: #c7000b; // 华为支付品牌色
+        }
 
         .icon-checkboxblank {
             font-size: 40rpx;
@@ -642,13 +868,13 @@
             font-size: $font-size-toolbar;
         }
     }
-    }
+}
 
-    .empty {
+.empty {
     width: 100%;
     text-align: center;
     padding: 40rpx 0;
     color: $color-sub;
     font-size: $font-size-tag;
-    }
+}
 </style>

lang/zh-cn/goods/detail.js

@@ -11,7 +11,7 @@ export const lang = {
 	home:'首页',
 	cart:'购物车',
 	leave:'立即留言',
-	make:'立即咨询',
+	make:'立即支付',
 	
 	send:'配送',
 	express:'快递发货',

main.js

@@ -27,7 +27,6 @@ Vue.prototype.$lang = Lang.lang; //解析语言包
 
 Vue.prototype.$config = Config;
 
-
 // #ifdef H5
 EventBus.setDomBridge(DomEventBridge)
 // #endif
@@ -59,6 +58,17 @@ Vue.component('ns-login', NsLogin);
 import PrivacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 Vue.component('privacy-popup', PrivacyPopup)
 
+// ========== 新增：注册diy系列组件 ==========
+import DiyBottomNav from '@/components/diy-components/diy-bottom-nav.vue'
+import DiyGroup from '@/components/diy-components/diy-group.vue'
+import DiyCategory from '@/components/diy-components/diy-category.vue'
+import DiyIcon from '@/components/diy-components/diy-icon.vue' // 补充diy-icon
+
+Vue.component('diy-bottom-nav', DiyBottomNav) // 修正拼写错误
+Vue.component('diy-group', DiyGroup)
+Vue.component('diy-category', DiyCategory)
+Vue.component('diy-icon', DiyIcon) // 注册diy-icon
+// ========== 新增结束 ==========
 const app = new Vue({
 	...App,
 	store

manifest.json

@@ -54,8 +54,6 @@
             }
         }
     },
-    /* 快应用特有相关 */
-    "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
         "appid" : "wxa8f94045d9c2fc10",
@@ -126,5 +124,12 @@
     "uniStatistics" : {
         "version" : "2"
     },
-    "sassImplementationName" : "node-sass"
+    "sassImplementationName" : "node-sass",
+    /** 快应用配置 **/
+    "quickapp-webview" : {
+        "package" : "com.jieganfsj.fivegshop",
+        "minPlatformVersion" : 1070,
+        "versionName" : "1.0.0",
+        "versionCode" : 0
+    }
 }

node_modules/jweixin-module/README.md

@@ -19,8 +19,8 @@ https://unpkg.com/jweixin-module/out/index.js
 ## 使用
 
 ```js
-var wx = require('jweixin-module')
+var jweixin = require('jweixin-module')
-wx.ready(function(){
+jweixin.ready(function(){
     // TODO
 });
 ```

node_modules/jweixin-module/package.json

@@ -1,42 +1,13 @@
 {
-  "_from": "jweixin-module",
-  "_id": "jweixin-module@1.4.1",
-  "_inBundle": false,
-  "_integrity": "sha512-2R2oa1lYhAsclfjKSf3DP4ZiP1dcrQUbM7aklbeJA+UAg/LS7MqoA6UbTy1cs4sbB34z62K4bKW0Z9iazD8ejg==",
-  "_location": "/jweixin-module",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "tag",
-    "registry": true,
-    "raw": "jweixin-module",
     "name": "jweixin-module",
-    "escapedName": "jweixin-module",
+    "version": "1.6.0",
-    "rawSpec": "",
-    "saveSpec": null,
-    "fetchSpec": "latest"
-  },
-  "_requiredBy": [
-    "#USER",
-    "/"
-  ],
-  "_resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.4.1.tgz",
-  "_shasum": "1fc8fa42622243f6c35651d272cd587debf56cd1",
-  "_spec": "jweixin-module",
-  "_where": "E:\\demo\\niushop_uniapp",
-  "author": {
-    "name": "Shengqiang Guo"
-  },
-  "bugs": {
-    "url": "https://github.com/zhetengbiji/jweixin-module/issues"
-  },
-  "bundleDependencies": false,
-  "deprecated": false,
     "description": "微信JS-SDK",
-  "devDependencies": {
+    "main": "lib/index.js",
-    "textfile": "^1.2.0",
+    "scripts": {},
-    "uglify-js": "^3.4.9"
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/zhetengbiji/jweixin-module.git"
     },
-  "homepage": "https://github.com/zhetengbiji/jweixin-module#readme",
     "keywords": [
         "wxjssdk",
         "weixin",
@@ -45,16 +16,11 @@
         "jssdk",
         "wx"
     ],
+    "author": "Shengqiang Guo",
     "license": "ISC",
-  "main": "out/index.js",
+    "bugs": {
-  "name": "jweixin-module",
+        "url": "https://github.com/zhetengbiji/jweixin-module/issues"
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/zhetengbiji/jweixin-module.git"
     },
-  "scripts": {
+    "homepage": "https://github.com/zhetengbiji/jweixin-module#readme",
-    "build": "node build",
+    "devDependencies": {}
-    "prepublish": "npm run build"
-  },
-  "version": "1.4.1"
 }

package-lock.json

@@ -1,13 +1,23 @@
 {
-  "name": "uniappsaas",
+  "name": "frontend",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
+      "dependencies": {
+        "@dcloudio/uni-quickapp-webview": "^2.0.2-4080420251103001",
+        "jweixin-module": "^1.6.0"
+      },
       "devDependencies": {
         "terser-webpack-plugin": "^5.3.10"
       }
     },
+    "node_modules/@dcloudio/uni-quickapp-webview": {
+      "version": "2.0.2-4080420251103001",
+      "resolved": "https://registry.npmmirror.com/@dcloudio/uni-quickapp-webview/-/uni-quickapp-webview-2.0.2-4080420251103001.tgz",
+      "integrity": "sha512-dxDDk/37OoUZ6PmXhXS/9C8Y5tYRalU6FIXT5OlPf1co2VuLF0OrdqAmINJDWs1dBQgN7e6Hw+bkeK9+4SzLxQ==",
+      "license": "Apache-2.0"
+    },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.5",
       "resolved": "https://repo.huaweicloud.com/repository/npm/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
@@ -619,6 +629,12 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/jweixin-module": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmmirror.com/jweixin-module/-/jweixin-module-1.6.0.tgz",
+      "integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w==",
+      "license": "ISC"
+    },
     "node_modules/loader-runner": {
       "version": "4.3.0",
       "resolved": "https://repo.huaweicloud.com/repository/npm/loader-runner/-/loader-runner-4.3.0.tgz",
@@ -984,6 +1000,11 @@
     }
   },
   "dependencies": {
+    "@dcloudio/uni-quickapp-webview": {
+      "version": "2.0.2-4080420251103001",
+      "resolved": "https://registry.npmmirror.com/@dcloudio/uni-quickapp-webview/-/uni-quickapp-webview-2.0.2-4080420251103001.tgz",
+      "integrity": "sha512-dxDDk/37OoUZ6PmXhXS/9C8Y5tYRalU6FIXT5OlPf1co2VuLF0OrdqAmINJDWs1dBQgN7e6Hw+bkeK9+4SzLxQ=="
+    },
     "@jridgewell/gen-mapping": {
       "version": "0.3.5",
       "resolved": "https://repo.huaweicloud.com/repository/npm/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
@@ -1456,6 +1477,11 @@
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
+    "jweixin-module": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmmirror.com/jweixin-module/-/jweixin-module-1.6.0.tgz",
+      "integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
+    },
     "loader-runner": {
       "version": "4.3.0",
       "resolved": "https://repo.huaweicloud.com/repository/npm/loader-runner/-/loader-runner-4.3.0.tgz",

package.json

@@ -6,6 +6,7 @@
     "terser-webpack-plugin": "^5.3.10"
   },
   "dependencies": {
+    "@dcloudio/uni-quickapp-webview": "^2.0.2-4080420251103001",
     "jweixin-module": "^1.6.0"
   }
 }

project.config.json

@@ -1,7 +1,8 @@
 {
   "description": "项目配置文件",
   "packOptions": {
-    "ignore": []
+    "ignore": [],
+    "include": []
   },
   "setting": {
     "urlCheck": true,
@@ -37,20 +38,20 @@
     "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
     "packNpmRelationList": [],
-    "minifyWXSS": true
+    "minifyWXSS": true,
+    "compileWorklet": false,
+    "minifyWXML": true,
+    "localPlugins": false,
+    "disableUseStrict": false,
+    "useCompilerPlugins": false,
+    "condition": false,
+    "swc": false,
+    "disableSWC": true
   },
   "compileType": "miniprogram",
-  "libVersion": "2.16.1",
+  "libVersion": "3.12.0",
   "appid": "wx29215aa1bd97bbd6",
   "projectname": "niushop_b2c_v4_uniapp",
-  "debugOptions": {
-    "hidedInDevtools": []
-  },
-  "scripts": {},
-  "staticServerOptions": {
-    "baseURL": "",
-    "servePath": ""
-  },
   "isGameTourist": false,
   "condition": {
     "search": {
@@ -71,5 +72,7 @@
     "miniprogram": {
       "list": []
     }
-  }
+  },
+  "simulatorPluginLibVersion": {},
+  "editorSetting": {}
 }

store/index.js

@@ -58,6 +58,7 @@ const store = new Vuex.Store({
 		cartNumber: 0,
 		cartMoney: 0,
 		cartChange: 0,
+		wechatConfigStatus:0,
 		bottomNavHidden: false, // 底部导航是否隐藏，true：隐藏，false：显示
 		aiUnreadCount: 10, // AI未读消息数量
 		globalAIAgentConfig: null, // AI客服配置
@@ -74,11 +75,21 @@ const store = new Vuex.Store({
 		mapConfig: {
 			tencent_map_key: '',
 			wap_is_open: 1,
-			wap_valid_time: 0
+			wap_valid_time: 0,
+		},
+		copyright: null,
+		initStatus:false,
+		offlineWhiteList:['pages/order/payment','pages/order/list','pages/order/detail'],//线下支付白名单
+		canReceiveRegistergiftInfo: {
+			status: false,
+			path: ''
 		},
-		copyright: null
 	},
 	mutations: {
+		// 设置是否可以领取新人礼
+		setCanReceiveRegistergiftInfo(state, data) {
+			state.canReceiveRegistergiftInfo = data;
+		},
 		// 设置那些组件展示
 		setDiyGroupShowModule(state, data) {
 			state.diyGroupShowModule = data;
@@ -182,11 +193,19 @@ const store = new Vuex.Store({
 			uni.setStorageSync('copyright', value);
 		},
 		setMemberInfo(state, value) {
+			// 会员被锁定后，清除会员登录信息
+			if (value && value.status == 0) {
+				value = null;
+			}
 			state.memberInfo = value;
 			if (value) {
 				uni.setStorageSync('memberInfo', value);
 			} else {
+				// 会员为空时，清除会员登录信息
 				uni.removeStorageSync('memberInfo');
+				this.commit('setToken', '');
+				this.dispatch('emptyCart');
+				//uni.removeStorageSync('authInfo');
 			}
 		},
 		setCartNumber(state, cartNumber) {
@@ -201,6 +220,12 @@ const store = new Vuex.Store({
 		setCartMoney(state, value) {
 			state.cartMoney = value;
 		},
+		setInitStatus(state,value){
+			state.initStatus = value
+		},
+		setWechatConfigStatus(state,value){
+			state.wechatConfigStatus = value
+		},    
 		// 设置AI未读消息数量
 		setAiUnreadCount(state, value) {
 			state.aiUnreadCount = value;
@@ -220,6 +245,7 @@ const store = new Vuex.Store({
 					success: res => {
 						var data = res.data;
 						if (data) {
+
 							this.commit('setThemeStyle', colorList[data.style_theme.name]);
 
 							// 底部导航
@@ -240,6 +266,7 @@ const store = new Vuex.Store({
 							this.commit('setGlobalAIAgentConfig', data.ai_agent_config);
 
 							this.commit('setGlobalStoreConfig', data.store_config);
+              this.commit('setWechatConfigStatus',data.wechat_config_status)
 							
 							//联系我们
 							
@@ -252,7 +279,7 @@ const store = new Vuex.Store({
 								this.commit('setDefaultStoreInfo', null);
 								this.commit('setGlobalStoreInfo', null);
 							}
-
+							this.commit('setInitStatus',true)
 							resolve(data);
 						}
 					}
@@ -266,7 +293,7 @@ const store = new Vuex.Store({
 				data: {},
 				success: res => {
 					if (res.code == 0) {
-						let list = [];
+						let list = {};
 						let ids = [];
 						let totalMoney = 0;
 						let totalNum = 0;
@@ -279,16 +306,17 @@ const store = new Vuex.Store({
 									goods_id: item.goods_id,
 									sku_id: item.sku_id,
 									num: item.num,
-									discount_price: item.discount_price
+									discount_price: item.discount_price,
+									min_buy: item.min_buy,
+									stock: item.stock,
 								};
 
 								if (!list['goods_' + cart.goods_id]) {
 									list['goods_' + cart.goods_id] = {};
 								}
-								list['goods_' + cart.goods_id]['sku_' + cart
+								list['goods_' + cart.goods_id]['max_buy'] = item.max_buy;
-										.sku_id
+								list['goods_' + cart.goods_id]['goods_name'] = item.goods_name;
-									] =
+								list['goods_' + cart.goods_id]['sku_' + cart.sku_id] = cart;
-									cart;
 								ids.push(cart.cart_id);
 							});
 
@@ -299,8 +327,7 @@ const store = new Vuex.Store({
 									let item = list[goods][sku];
 									if (typeof item == 'object') {
 										num += item.num;
-										money += parseFloat(item.discount_price) * parseInt(item
+										money += parseFloat(item.discount_price) * parseInt(item.num);
-											.num);
 									}
 								}
 								list[goods].num = num;
@@ -311,7 +338,6 @@ const store = new Vuex.Store({
 
 							}
 						}
-
 						this.commit('setCartList', list);
 
 						this.commit('setCartIds', ids);