From d1229bd4fe82c5303a07cd96476c27f61b1c48b2 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 08 十月 2024 16:23:54 +0800
Subject: [PATCH] updatge 扣款详情
---
pages/order/order-detail.vue | 166 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 140 insertions(+), 26 deletions(-)
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 8feb5ab..3b6c0b3 100644
--- a/pages/order/order-detail.vue
+++ b/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)
},
@@ -111,6 +124,56 @@
},
methods: {
+ // 商品评论
+ commentButtonClick(){
+ // 跳转的到评论列表
+ uni.navigateTo({
+ url: '/pages/order/comment/order-comment?orderId='+this.id
+ })
+ },
+
+ openbrand(item) {
+ //也要判断一下是否重复进入
+ //判断堆栈，如果是店铺，就直接返回
+ //或者是：从商铺到列表再到详情，再到商铺，这种也不行
+ const pages = getCurrentPages();
+ console.log('toShopping', pages)
+ if (pages && pages.length >= 2) {
+ if (pages[pages.length - 2].route === "sub_pages/customer/shop/shop") {
+ uni.navigateBack()
+ return
+ }
+ }
+ if (pages && pages.length >= 3) {
+ if (pages[pages.length - 3].route === "sub_pages/customer/shop/shop" &&
+ pages[pages.length - 2].route === "sub_pages/customer/trade/list"
+ ) {
+ uni.navigateBack({
+ delta: 2
+ })
+ return
+ }
+ }
+
+ if (pages.length >= 10) {
+ //直接强制购物车
+ uni.reLaunch({
+ url: '/sub_pages/customer/shop/shop?id=' + (item.supplierId || '')
+ })
+ } else {
+ uni.navigateTo({
+ url: '/sub_pages/customer/shop/shop?id=' + (item.supplierId || '')
+ })
+ }
+
+ },
+
+ toFlowerDetail(item) {
+ console.log(item)
+ uni.navigateTo({
+ url: `/sub_pages/customer/trade/detail?id=${item.flowerId}`
+ })
+ },
salesTypeChange(e) {
this.submitForm.salesType = e.value
},
@@ -210,25 +273,37 @@
extraData: {
// merchant_id: '',
// merchant_trade_no: '',
+ // merchant_id: '1661512517',
+ // merchant_trade_no: tmp.id || '',
transaction_id: tmp.dto && tmp.dto.paymentTrId || ''
},
- async success() {
+ async success(info) {
+ console.log('info', info)
//dosomething
// 发送请求
- tmp.$message.showLoading()
- const {
- code
- } = await tmp.$http.request('get',
- '/api/customer/order/receive/confirm', {
- params: {
- id: tmp.id,
- }
- })
- tmp.$message.hideLoading()
- if (code === 0) {
- tmp.getDetail()
- tmp.$store.dispatch('getCurrentInfo')
+ if (info.extraData && info.extraData.status === 'fail') {
+ tmp.$message.showToast('支付和确认收货需要是同一微信号，请联系实际支付人登录确认')
+
+ } else if (info.extraData && info.extraData.status === 'cancel') {
+
+ } else {
+ tmp.$message.showLoading()
+ const {
+ code
+ } = await tmp.$http.request('get',
+ '/api/customer/order/receive/confirm', {
+ params: {
+ id: tmp.id,
+ }
+ })
+ tmp.$message.hideLoading()
+ if (code === 0) {
+ tmp.getDetail()
+ tmp.$store.dispatch('getCurrentInfo')
+ }
+
}
+
},
fail(e) {
//dosomething
@@ -291,6 +366,41 @@
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",
+ ...data
+ }
+ if (compareVersion(version, '2.26.2') >= 0) {
+
+ wx.openEmbeddedMiniProgram({
+ appId: 'wxef277996acc166c3',
+ extraData: param
+ })
+
+ } else {
+ wx.navigateToMiniProgram({
+ appId: 'wxef277996acc166c3',
+ extraData: param
+ })
+
+ }
+ // #endif
+
}
@@ -421,10 +531,13 @@
// this.$message.showToast('未选择需要售后的商品')
// return
// }
- if (isNaN(parseFloat(this.submitForm.num)) || this.submitForm.num <= 0) {
+ if (isNaN(parseInt(this.submitForm.num)) || this.submitForm.num <= 0 || parseInt(this.submitForm
+ .num) <= 0) {
this.$message.showToast('售后数量需要大于0')
return
}
+ this.submitForm.num = parseInt(this.submitForm.num) || 1
+
if (!this.submitForm.salesType) {
this.$message.showToast('未填写售后类型')
return
@@ -493,9 +606,11 @@
<view v-for="(item,index) of list" :key="index">
<view class="flower-info m-b-20 m-t-12 br-4"
v-if="!showSales||showSales&&(submitForm.orderItemId == item.id)">
- <view class="supplier-name ">
- <image class="icon-dp" src="/static/common/icon-dp.png"></image>
- {{ item.supplierName || ''}}
+ <view class="supplier-name " >
+ <view @click.stop="openbrand(item)" style="display: inline-block;">
+ <image class="icon-dp br-4" src="/static/common/icon-dp.png"></image>
+ {{ item.supplierName|| '' }} >
+ </view>
</view>
<!-- submitForm.orderItemId:{{submitForm.orderItemId}} -->
<!-- itemId:{{item.id}} -->
@@ -504,10 +619,9 @@
<!-- @click="changeSalesOrderItem(item)" -->
<!-- :checked="submitForm.orderItems.indexOf(item.id)>=0" -->
- <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover"
- @click="previewImg(item.flowerCover)">
- </image>
- <view class="flex1">
+ <!-- <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover" @click="previewImg(item.flowerCover)"></image> -->
+ <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover" @click="toFlowerDetail(item)"></image>
+ <view class="flex1" @click.stop="toFlowerDetail(item)">
<view class=" flex">
<view class="title"><span class="level">{{ item.flowerCategory || ''}}</span><span
class="level">{{ item.flowerLevelStr || ''}}</span>{{ item.flowerName || ''}}
@@ -613,8 +727,8 @@
</view>
<view class="info-container bg-white br-4 m-t-12" v-if="!showSales">
<view class="form-item flex">
- <view class="label">订单金额:</view>
- <view class="value m-l-a m-r-0 text-right">+{{ dto.totalAmount || '0' }}</view>
+ <view class="label">商品金额:</view>
+ <view class="value m-l-a m-r-0 text-right">+{{ dto.flowerAmount || '0' }}</view>
</view>
<view class="form-item flex">
<view class="label">运费:</view>
@@ -791,8 +905,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="buttonClick('evaluate')" v-if=" dto.status === 'EVALUATE'"> 评价
- </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> -->
<!-- ||dto.status=='COMPLETED' -->
<!-- 在外面申请了，里面不允许了 -->
<!-- <view class="button button-1" @click="buttonClick('sales')" v-if=" dto.status === 'RECEIVE'"> 申请售后
--
Gitblit v1.9.3