From 6d2ed02113ca14df030522264d68ac4fec369b3f Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 04 十一月 2024 09:52:15 +0800
Subject: [PATCH] 1.微信支付
---
sub_pages/customer/shopping/confirm.vue | 70 -----------------
pages/order/order.vue | 78 +-----------------
pages/order/order-detail.vue | 56 -------------
3 files changed, 10 insertions(+), 194 deletions(-)
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 43f9a37..3da6543 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -18,19 +18,6 @@
salesTypeList: [],
};
},
-
- async onShow() {
- // 支付回调
- // #ifdef PUB_CUSTOMER
- 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)
},
@@ -124,13 +111,6 @@
},
methods: {
- // 商品评论
- commentButtonClick(){
- // 跳转的到评论列表
- uni.navigateTo({
- url: '/pages/order/comment/order-comment?orderId='+this.id
- })
- },
openbrand(item) {
//也要判断一下是否重复进入
@@ -264,7 +244,7 @@
await this.$message.confirm('是否确定收货')
var tryCallWx = false
- // #ifdef MPOLD
+ // #ifdef MP
let tmp = this
if (wx.openBusinessView && tmp.dto && tmp.dto.paymentTrId) {
tryCallWx = true
@@ -332,8 +312,6 @@
this.$message.hideLoading()
if (code === 0) {
this.getDetail()
- this.$store.dispatch('getCurrentInfo')
- this.$message.showToast('收货成功')
}
}
@@ -356,8 +334,6 @@
if (code === 0) {
//微信接口
let that = this
- // #ifndef PUB_CUSTOMER
-
wx.requestPayment({
...data,
async success(res) {
@@ -370,32 +346,6 @@
that.$message.showToast('支付失败')
}
})
- // #endif
- // #ifdef PUB_CUSTOMER
- 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",
- ...data
- }
- wx.openEmbeddedMiniProgram({
- appId: 'wxef277996acc166c3',
- extraData: param
- })
- // #endif
-
}
@@ -900,8 +850,8 @@
<view class="button button-1" @click="buttonClick('payAgain')" v-if=" dto.status === 'PENDING'"> 重新支付<span
v-if="dto.bctime">({{dto.bctime}})</span>
</view>
- <!-- <view class="button button-1" @click="commentButtonClick('evaluate')" v-if=" dto.status === 'EVALUATE'"> 评价 </view> -->
- <!-- <view class="button button-1" @click="buttonClick('evaluate')" v-if=" dto.status === 'EVALUATE'"> 评价 </view> -->
+ <view class="button button-1" @click="buttonClick('evaluate')" v-if=" dto.status === 'EVALUATE'"> 评价
+ </view>
<!-- ||dto.status=='COMPLETED' -->
<!-- 在外面申请了，里面不允许了 -->
<!-- <view class="button button-1" @click="buttonClick('sales')" v-if=" dto.status === 'RECEIVE'"> 申请售后
diff --git a/pages/order/order.vue b/pages/order/order.vue
index 4847452..2781cb6 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -92,19 +92,6 @@
await this.getList()
uni.stopPullDownRefresh()
},
- async onShow() {
- // 支付回调
- // #ifdef PUB_CUSTOMER
- 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: {
@@ -179,15 +166,9 @@
url: '/pages/order/order-detail?id=' + item.id
})
},
-
- commentButtonClick(item){
- uni.navigateTo({
- url: '/pages/order/comment/order-comment?id='+item.id
- })
- },
-
async copyOrder(item) {
+ console.log(item)
await this.$message.confirm('是否确定再来一单')
// 发送请求
this.$message.showLoading()
@@ -244,7 +225,7 @@
case 'confirm': {
await this.$message.confirm('是否确定收货')
var tryCallWx = false
- // #ifdef MPOLD
+ // #ifdef MP
let tmp = this
if (wx.openBusinessView && item.paymentTrId) {
tryCallWx = true
@@ -313,9 +294,6 @@
this.$message.hideLoading()
if (code === 0) {
this.refreshList()
- //刷新积分
- this.$store.dispatch('getCurrentInfo')
- this.$message.showToast('收货成功')
}
}
@@ -337,7 +315,6 @@
if (code === 0) {
//微信接口
let that = this
- // #ifndef PUB_CUSTOMER
wx.requestPayment({
...data,
async success(res) {
@@ -353,45 +330,6 @@
that.$message.showToast('支付失败')
}
})
- // #endif
- // #ifdef PUB_CUSTOMER
- 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",
- ...data
- }
- wx.openEmbeddedMiniProgram({
- appId: 'wxef277996acc166c3',
- extraData: param
- })
- // if (compareVersion(version, '2.26.2') >= 0) {
-
- // wx.openEmbeddedMiniProgram({
- // appId: 'wxef277996acc166c3',
- // extraData: param
- // })
-
- // } else {
- // wx.navigateToMiniProgram({
- // appId: 'wxef277996acc166c3',
- // extraData: param
- // })
-
- // }
- // #endif
}
@@ -550,14 +488,15 @@
<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">
@@ -640,10 +579,7 @@
<!-- <view class="button button-1 m-l-a m-r-15" @click="toDetailSale(dto)"
v-if="dto.statusBackend === 'RECEIVE'"> 申请售后
</view> -->
- <!-- <view class="button button-0 m-l-a m-r-15" @click="buttonClick(dto,'evaluate')"
- v-if="dto.statusBackend === 'EVALUATE'"> 评价
- </view> -->
- <view class="button button-0 m-l-a m-r-15" @click="commentButtonClick(dto)"
+ <view class="button button-0 m-l-a m-r-15" @click="buttonClick(dto,'evaluate')"
v-if="dto.statusBackend === 'EVALUATE'"> 评价
</view>
diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index 8553dc6..a86ff82 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -67,46 +67,6 @@
},
async onShow() {
- // 支付回调
- // #ifdef PUB_CUSTOMER
- if (this.sign['cache_topay']) {
- 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()
- await tmp.$store.dispatch('sign_clear', 'cache_topay')
- return
- }
- }
-
- // #endif
//优惠券
if (this.cache_coupon && this.cache_coupon.id) {
this.dto.couponRecordId = this.cache_coupon.id
@@ -337,7 +297,6 @@
await tmp.$store.dispatch('sign_add', 'shopping')
uni.navigateBack()
} else if (data) {
- // #ifndef PUB_CUSTOMER
wx.requestPayment({
...data,
async success(res) {
@@ -365,35 +324,6 @@
// uni.navigateBack()
}
})
- // #endif
- // openEmbeddedMiniProgram，需要小程序基础库版本不低于 2.26.2
-
- // #ifdef PUB_CUSTOMER
- 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",
- ...data,
- }
- await tmp.$store.dispatch('sign_add', 'cache_topay')
-
- wx.openEmbeddedMiniProgram({
- appId: 'wxef277996acc166c3',
- extraData: param
- })
- // #endif
}
}
--
Gitblit v1.9.3