hmy_farmer-main.git

xuxy

2024-10-05 18fe52ed15f6075d1a0506aab66f990e430383cf

add 前端支持新支付类别

已修改6个文件

	manifest.json	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	package-lock.json	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	package.json	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/order/order-detail.vue	47 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/order/order.vue	53 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	sub_pages/customer/shopping/confirm.vue	74 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 manifest.json

@@ -49,7 +49,7 @@
    "quickapp" : {},
    /* 快应用特有相关 */
    "mp-weixin" : {
        "appid" : "wx1441324401626290",
        "appid" : "wx3203fd935a6ffe09",
        "setting" : {
            "urlCheck" : false,
            "es6" : true,

 package-lock.json

@@ -1,5 +1,5 @@
{
    "name": "hmy_farmer",
    "name": "hmy_farmer-main",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {

 package.json

@@ -42,7 +42,7 @@
                    "PUB_TYPE": "customer"
                },
                "define": {
                    "PUB_CUSTOMER": true
                    "PUB_CUSTOMER_DEV": true
                }
            }


 pages/order/order-detail.vue

@@ -18,6 +18,19 @@
                salesTypeList: [],
            };
        },
		
        async onShow() {
            // 支付回调
            // #ifdef PUB_CUSTOMER_DEV
            let options = wx.getEnterOptionsSync();
            if (options.scene == '1038' && options.referrerInfo.appId == 'wxef277996acc166c3') {
                // 代表从收银台小程序返回
                let extraData = options.referrerInfo.extraData;
                this.getDetail()
                return
            }
            // #endif
        },
        onUnload() {
            this.timer && clearTimeout(this.timer)
        },
@@ -346,6 +359,40 @@
                                    that.$message.showToast('支付失败')
                                }
                            })
                            // #ifdef PUB_CUSTOMER_DEV
                            var param = {
                                cusid: "平台分配的商户号",
                                appid: "平台分配的appid",
                                orgid: "平台分配的机构号",
                                version: "12",
                                trxamt: "1",
                                reqsn: "商户唯一订单号",
                                notify_url: "服务器异步通知页面路径",
                                body: "标题",
                                remark: "备注",
                                validtime: "订单有效时间",
                                limit_pay: "no_credit",
                                randomstr: "随机字符串",
                                paytype: "W06",
                                signtype: "签名方式",
                                sign: "签名，参考2.1"
                            }
                            if (compareVersion(version, '2.26.2') >= 0) {
							
                                wx.openEmbeddedMiniProgram({
                                    appId: 'wxef277996acc166c3',
                                    extraData: param
                                })
							
                            } else {
                                wx.navigateToMiniProgram({
                                    appId: 'wxef277996acc166c3',
                                    extraData: param
                                })
							
                            }
                            // #endif
							

                        }


 pages/order/order.vue

@@ -92,6 +92,19 @@
            await this.getList()
            uni.stopPullDownRefresh()
        },
        async onShow() {
            // 支付回调
            // #ifdef PUB_CUSTOMER_DEV
            let options = wx.getEnterOptionsSync();
            if (options.scene == '1038' && options.referrerInfo.appId == 'wxef277996acc166c3') {
                // 代表从收银台小程序返回
                let extraData = options.referrerInfo.extraData;
                this.$store.dispatch('sign_add', 'order')
                this.refreshList()
                return
            }
            // #endif
        },
        methods: {


@@ -330,6 +343,39 @@
                                    that.$message.showToast('支付失败')
                                }
                            })
                            // #ifdef PUB_CUSTOMER_DEV
                            var param = {
                                cusid: "平台分配的商户号",
                                appid: "平台分配的appid",
                                orgid: "平台分配的机构号",
                                version: "12",
                                trxamt: "1",
                                reqsn: "商户唯一订单号",
                                notify_url: "服务器异步通知页面路径",
                                body: "标题",
                                remark: "备注",
                                validtime: "订单有效时间",
                                limit_pay: "no_credit",
                                randomstr: "随机字符串",
                                paytype: "W06",
                                signtype: "签名方式",
                                sign: "签名，参考2.1"
                            }
                            if (compareVersion(version, '2.26.2') >= 0) {

                                wx.openEmbeddedMiniProgram({
                                    appId: 'wxef277996acc166c3',
                                    extraData: param
                                })

                            } else {
                                wx.navigateToMiniProgram({
                                    appId: 'wxef277996acc166c3',
                                    extraData: param
                                })

                            }
                            // #endif

                        }

@@ -488,15 +534,14 @@

                    <view class="supplier-name w-fit m-l-0 m-r-a" @click.stop="openbrand(item)">
                        <image class="icon-dp br-4" src="/static/common/icon-dp.png"></image>
                        {{ item.supplierName|| '' }} > 
                        {{ item.supplierName|| '' }} >
                    </view>
                    <view class="flex m-t-12 flex-wrap-normal">
                        <!-- @click="previewImg(item.flowerCover)" -->
                        <image class="flower-img img100 m-r-6" :src="item.flowerCover"
                            @click.stop="toDetail(dto)" >
                        <image class="flower-img img100 m-r-6" :src="item.flowerCover" @click.stop="toDetail(dto)">
                        </image>
                        <!-- <view class="flex1" @click.stop="toFlowerDetail(item)"> -->
                        <view class="flex1" >
                        <view class="flex1">

                            <view class=" flex">
                                <view class="title flex flex1">

 sub_pages/customer/shopping/confirm.vue

@@ -67,6 +67,44 @@

        },
        async onShow() {
            // 支付回调
            // #ifdef PUB_CUSTOMER_DEV
            let options = wx.getEnterOptionsSync();
            if (options.scene == '1038' && options.referrerInfo.appId=='wxef277996acc166c3') {
                // 代表从收银台小程序返回
                let extraData = options.referrerInfo.extraData;
                // if (!extraData) {
                //     // "当前通过物理按键返回，未接收到返参，建议自行查询交易结果";
                // } else {
                //     if (extraData.code == 'success') {
                //         // "支付成功";
                //     } else if (extraData.code == 'cancel') {
                //         // "支付已取消";
                //         this.$message.showToast("支付已取消" + extraData.errmsg)
                //     } else {
                //         // "支付失败：" + extraData.errmsg;
                //         this.$message.showToast("支付失败：" + extraData.errmsg)
                //     }
                // }
                //
                //只要是进入了这个支付页面，都算是支付了，不管成功与否都返回
                console.log('pay success options.referrerInfo', options.referrerInfo)
                //返回上一页
                let tmp = this
                await tmp.$store.dispatch('sign_add', 'shopping')
                //清空优惠券
                tmp.$store.dispatch('cache_coupon_select', {})
                tmp.$store.dispatch('cache_goods_select', [])
				
                await tmp.$message.showToast('支付成功',{
                    duration:500
                })
                uni.navigateBack()
                return
            }


            // #endif
            //优惠券
            if (this.cache_coupon && this.cache_coupon.id) {
                this.dto.couponRecordId = this.cache_coupon.id
@@ -324,6 +362,42 @@
                                            // uni.navigateBack()
                                        }
                                    })
									
                                    // openEmbeddedMiniProgram，需要小程序基础库版本不低于 2.26.2
									
                                    // #ifdef PUB_CUSTOMER_DEV
                                    var param = {
                                        cusid: "平台分配的商户号",
                                        appid: "平台分配的appid",
                                        orgid: "平台分配的机构号",										
                                        version: "12",									
                                        trxamt: "1",								
                                        reqsn: "商户唯一订单号",				
                                        notify_url: "服务器异步通知页面路径",	
                                        body: "标题",
                                        remark: "备注",	
                                        validtime: "订单有效时间",	
                                        limit_pay: "no_credit",	
                                        randomstr: "随机字符串",	
                                        paytype: "W06",
                                        signtype: "签名方式",	
                                        sign: "签名，参考2.1"
                                    }
                                    if (compareVersion(version, '2.26.2') >= 0) {
									
                                        wx.openEmbeddedMiniProgram({			
                                            appId: 'wxef277996acc166c3',			
                                            extraData: param
                                        })
										
                                    } else {
                                        wx.navigateToMiniProgram({
                                            appId: 'wxef277996acc166c3',
                                            extraData: param
                                        })
									
                                    }
                                    // #endif

                                }
                            }

			@@ -49,7 +49,7 @@
			"quickapp" : {},
			/* 快应用特有相关 */
			"mp-weixin" : {
			"appid" : "wx1441324401626290",
			"appid" : "wx3203fd935a6ffe09",
			"setting" : {
			"urlCheck" : false,
			"es6" : true,

			@@ -1,5 +1,5 @@
			{
			"name": "hmy_farmer",
			"name": "hmy_farmer-main",
			"lockfileVersion": 2,
			"requires": true,
			"packages": {

			@@ -42,7 +42,7 @@
			"PUB_TYPE": "customer"
			},
			"define": {
			"PUB_CUSTOMER": true
			"PUB_CUSTOMER_DEV": true
			}
			}

			@@ -18,6 +18,19 @@
			salesTypeList: [],
			};
			},

			async onShow() {
			// 支付回调
			// #ifdef PUB_CUSTOMER_DEV
			let options = wx.getEnterOptionsSync();
			if (options.scene == '1038' && options.referrerInfo.appId == 'wxef277996acc166c3') {
			// 代表从收银台小程序返回
			let extraData = options.referrerInfo.extraData;
			this.getDetail()
			return
			}
			// #endif
			},
			onUnload() {
			this.timer && clearTimeout(this.timer)
			},
			@@ -346,6 +359,40 @@
			that.$message.showToast('支付失败')
			}
			})
			// #ifdef PUB_CUSTOMER_DEV
			var param = {
			cusid: "平台分配的商户号",
			appid: "平台分配的appid",
			orgid: "平台分配的机构号",
			version: "12",
			trxamt: "1",
			reqsn: "商户唯一订单号",
			notify_url: "服务器异步通知页面路径",
			body: "标题",
			remark: "备注",
			validtime: "订单有效时间",
			limit_pay: "no_credit",
			randomstr: "随机字符串",
			paytype: "W06",
			signtype: "签名方式",
			sign: "签名，参考2.1"
			}
			if (compareVersion(version, '2.26.2') >= 0) {

			wx.openEmbeddedMiniProgram({
			appId: 'wxef277996acc166c3',
			extraData: param
			})

			} else {
			wx.navigateToMiniProgram({
			appId: 'wxef277996acc166c3',
			extraData: param
			})

			}
			// #endif


			}

			@@ -92,6 +92,19 @@
			await this.getList()
			uni.stopPullDownRefresh()
			},
			async onShow() {
			// 支付回调
			// #ifdef PUB_CUSTOMER_DEV
			let options = wx.getEnterOptionsSync();
			if (options.scene == '1038' && options.referrerInfo.appId == 'wxef277996acc166c3') {
			// 代表从收银台小程序返回
			let extraData = options.referrerInfo.extraData;
			this.$store.dispatch('sign_add', 'order')
			this.refreshList()
			return
			}
			// #endif
			},
			methods: {


			@@ -330,6 +343,39 @@
			that.$message.showToast('支付失败')
			}
			})
			// #ifdef PUB_CUSTOMER_DEV
			var param = {
			cusid: "平台分配的商户号",
			appid: "平台分配的appid",
			orgid: "平台分配的机构号",
			version: "12",
			trxamt: "1",
			reqsn: "商户唯一订单号",
			notify_url: "服务器异步通知页面路径",
			body: "标题",
			remark: "备注",
			validtime: "订单有效时间",
			limit_pay: "no_credit",
			randomstr: "随机字符串",
			paytype: "W06",
			signtype: "签名方式",
			sign: "签名，参考2.1"
			}
			if (compareVersion(version, '2.26.2') >= 0) {

			wx.openEmbeddedMiniProgram({
			appId: 'wxef277996acc166c3',
			extraData: param
			})

			} else {
			wx.navigateToMiniProgram({
			appId: 'wxef277996acc166c3',
			extraData: param
			})

			}
			// #endif

			}

			@@ -488,15 +534,14 @@

			<view class="supplier-name w-fit m-l-0 m-r-a" @click.stop="openbrand(item)">
			<image class="icon-dp br-4" src="/static/common/icon-dp.png"></image>
			{{ item.supplierName\|\| '' }} >
			{{ item.supplierName\|\| '' }} >
			</view>
			<view class="flex m-t-12 flex-wrap-normal">
			<!-- @click="previewImg(item.flowerCover)" -->
			<image class="flower-img img100 m-r-6" :src="item.flowerCover"
			@click.stop="toDetail(dto)" >
			<image class="flower-img img100 m-r-6" :src="item.flowerCover" @click.stop="toDetail(dto)">
			</image>
			<!-- <view class="flex1" @click.stop="toFlowerDetail(item)"> -->
			<view class="flex1" >
			<view class="flex1">

			<view class=" flex">
			<view class="title flex flex1">

			@@ -67,6 +67,44 @@

			},
			async onShow() {
			// 支付回调
			// #ifdef PUB_CUSTOMER_DEV
			let options = wx.getEnterOptionsSync();
			if (options.scene == '1038' && options.referrerInfo.appId=='wxef277996acc166c3') {
			// 代表从收银台小程序返回
			let extraData = options.referrerInfo.extraData;
			// if (!extraData) {
			// // "当前通过物理按键返回，未接收到返参，建议自行查询交易结果";
			// } else {
			// if (extraData.code == 'success') {
			// // "支付成功";
			// } else if (extraData.code == 'cancel') {
			// // "支付已取消";
			// this.$message.showToast("支付已取消" + extraData.errmsg)
			// } else {
			// // "支付失败：" + extraData.errmsg;
			// this.$message.showToast("支付失败：" + extraData.errmsg)
			// }
			// }
			//
			//只要是进入了这个支付页面，都算是支付了，不管成功与否都返回
			console.log('pay success options.referrerInfo', options.referrerInfo)
			//返回上一页
			let tmp = this
			await tmp.$store.dispatch('sign_add', 'shopping')
			//清空优惠券
			tmp.$store.dispatch('cache_coupon_select', {})
			tmp.$store.dispatch('cache_goods_select', [])

			await tmp.$message.showToast('支付成功',{
			duration:500
			})
			uni.navigateBack()
			return
			}


			// #endif
			//优惠券
			if (this.cache_coupon && this.cache_coupon.id) {
			this.dto.couponRecordId = this.cache_coupon.id
			@@ -324,6 +362,42 @@
			// uni.navigateBack()
			}
			})

			// openEmbeddedMiniProgram，需要小程序基础库版本不低于 2.26.2

			// #ifdef PUB_CUSTOMER_DEV
			var param = {
			cusid: "平台分配的商户号",
			appid: "平台分配的appid",
			orgid: "平台分配的机构号",
			version: "12",
			trxamt: "1",
			reqsn: "商户唯一订单号",
			notify_url: "服务器异步通知页面路径",
			body: "标题",
			remark: "备注",
			validtime: "订单有效时间",
			limit_pay: "no_credit",
			randomstr: "随机字符串",
			paytype: "W06",
			signtype: "签名方式",
			sign: "签名，参考2.1"
			}
			if (compareVersion(version, '2.26.2') >= 0) {

			wx.openEmbeddedMiniProgram({
			appId: 'wxef277996acc166c3',
			extraData: param
			})

			} else {
			wx.navigateToMiniProgram({
			appId: 'wxef277996acc166c3',
			extraData: param
			})

			}
			// #endif

			}
			}