chore: 添加@dcloudio/uni-quickapp-webview依赖及更新支付组件

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,44 @@
         balanceUsable: {
             type: Boolean,
             default: true
-            }
+        },
     },
     data() {
         return {
             payIndex: 0,
-                // #ifdef H5
+            payTypeList: [
-                payTypeList: [{
+                // #ifdef H5 || MP-ALIPAY
+                {
                     name: '支付宝支付',
                     icon: 'icon-zhifubaozhifu-',
                     type: 'alipay'
                 },
+                // #endif
+                // #ifdef H5 || MP-WEIXIN
                 {
                     name: '微信支付',
                     icon: 'icon-weixin1',
                     type: 'wechatpay'
-                    }
+                },
+                // #endif
+                {
+                    name: '线下支付',
+                    icon: 'icondiy icon-yuezhifu',
+                    type: 'offlinepay'
+                },
             ],
+            // #ifdef H5 
             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'
-                }],
-                // #endif
             payInfo: null,
             balanceConfig: 0,
             // 预售页面判断
             sale: true,
             isBalance: 0,
-                balance: 0
+            balance: 0,
+            //重置是否已完成，没有完成不能调用api/pay/pay
+            resetPayComplete: true,
+            repeatFlag: false,
         };
     },
     created(e) {
@@ -127,9 +128,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 +170,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 +197,7 @@
                         if (this.balanceConfig && this.balanceUsable) this.getMemberBalance();
                         setTimeout(() => {
                             this.$refs.choosePaymentPopup.open();
+                            if (typeof callback == 'function') callback();
                         })
                     } else {
                         this.$util.showToast({
@@ -178,7 +211,6 @@
          * 获取余额配置
          */
         getBalanceConfig() {
-			
             this.$api.sendRequest({
                 url: '/api/pay/getBalanceConfig',
                 data: {},
@@ -196,10 +228,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 +243,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);
-                                    }
                             });
                         }
                     }
@@ -239,8 +265,7 @@
                 data: {
                     out_trade_no: this.payInfo.out_trade_no,
                     pay_type: payType ? 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 => {
@@ -258,7 +283,9 @@
                                         wx_alipay: wx_alipay,
                                         out_trade_no: this.payInfo.out_trade_no
                                     }, '', 'redirectTo');
+                                    this.repeatFlag = false;
                                 } else {
+                                    this.repeatFlag = false;
                                     location.href = res.data.data;
                                     this.checkPayStatus();
                                 }
@@ -290,12 +317,14 @@
                                                 res => {
                                                     if (res.errMsg == 'chooseWXPay:ok') {
                                                         this.paySuccess();
+                                                        this.repeatFlag = false;
                                                     } else {
                                                         this.$util.showToast({
                                                             title: res.errMsg
                                                         });
                                                         setTimeout(() => {
                                                             this.close();
+                                                            this.repeatFlag = false;
                                                         }, 1500)
                                                     }
                                                 },
@@ -304,20 +333,30 @@
                                                         title: '您已取消支付'
                                                     });
                                                     this.resetpay();
+                                                    this.repeatFlag = false;
                                                 }
                                             );
                                         }
                                     });
                                 } else {
+                                    this.repeatFlag = false;
                                     location.href = res.data.url;
                                     this.checkPayStatus();
                                 }
                                 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 => {
@@ -325,6 +364,7 @@
                     this.$util.showToast({
                         title: 'request:fail'
                     });
+                    this.repeatFlag = false;
                 }
             });
         },
@@ -365,8 +405,15 @@
                     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 {
                             var payData = res.data.data;
 
                             // #ifdef MP-WEIXIN
@@ -380,6 +427,7 @@
                                     paySign: payData.paySign,
                                     success: res => {
                                         this.paySuccess();
+                                        this.repeatFlag = false;
                                     },
                                     fail: res => {
                                         this.flag = false;
@@ -388,6 +436,7 @@
                                                 title: '您已取消支付'
                                             });
                                             this.resetpay();
+                                            this.repeatFlag = false;
                                         } else {
                                             uni.showModal({
                                                 content: '支付失败,失败原因: ' + res.errMsg,
@@ -395,6 +444,7 @@
                                             });
                                             setTimeout(() => {
                                                 this.close();
+                                                this.repeatFlag = false;
                                             }, 1500)
                                         }
                                     }
@@ -408,6 +458,7 @@
                                 ...payData,
                                 success: res => {
                                     this.paySuccess();
+                                    this.repeatFlag = false;
                                 },
                                 fail: res => {
                                     this.flag = false;
@@ -416,6 +467,7 @@
                                             title: '您已取消支付'
                                         });
                                         this.resetpay();
+                                        this.repeatFlag = false;
                                     } else {
                                         uni.showModal({
                                             content: '支付失败,失败原因: ' + res.errMsg,
@@ -423,14 +475,17 @@
                                         });
                                         setTimeout(() => {
                                             this.close();
+                                            this.repeatFlag = false;
                                         }, 1500)
                                     }
                                 }
                             });
+                        }
                     } else {
                         this.$util.showToast({
                             title: res.message
                         });
+                        this.repeatFlag = false;
                     }
                 },
                 fail: res => {
@@ -438,6 +493,7 @@
                     this.$util.showToast({
                         title: 'request:fail'
                     });
+                    this.repeatFlag = false;
                 }
             });
         },
@@ -463,13 +519,23 @@
          * 重置支付单据
          */
         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 +545,11 @@
         clearInterval(this.timer);
     },
     // #endif
-    };
+};
 </script>
 
 <style lang="scss" scoped>
-    .popup {
+.popup {
     width: 75vw;
     background: #fff;
     border-top-left-radius: $border-radius;
@@ -538,9 +604,9 @@
             padding-bottom: env(safe-area-inset-bottom);
         }
     }
-    }
+}
 
-    .choose-payment-popup {
+.choose-payment-popup {
     .payment-item {
         display: flex;
         align-items: center;
@@ -570,6 +636,10 @@
             color: #24af41;
         }
 
+        .icon-yuezhifu {
+            color: #f9a647;
+        }
+
         .icon-zhifubaozhifu- {
             color: #00a0e9;
         }
@@ -642,13 +712,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>

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"
   }
 }