From 2a93afc95dda6afd1479af042e178b3e84a0c8c4 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期四, 13 六月 2024 14:03:36 +0800
Subject: [PATCH] feat(支付): 修改接口统一前缀
---
pages/pay/discountpay.vue | 41 ++++++++++++++++-------------------------
1 files changed, 16 insertions(+), 25 deletions(-)
diff --git a/pages/pay/discountpay.vue b/pages/pay/discountpay.vue
index df0683a..59773f7 100644
--- a/pages/pay/discountpay.vue
+++ b/pages/pay/discountpay.vue
@@ -10,15 +10,15 @@
</view>
</view>
- <view v-if="discountInfo.shopDiscount!=1&&money*(1-discountInfo.shopDiscount)>=0.01"
+ <!-- <view v-if="discountInfo.shopDiscount!=1&&money*(1-discountInfo.shopDiscount)>=0.01"
class="bg-fff u-m-h-32 u-m-t-20 u-p-h-32 u-br-10">
<view class="u-p-v-32 u-flex u-row-between u-border-bottom u-font-30 color-333">
<view>{{discountInfo.memberGradeName}}涓撳睘鎶樻墸</view>
<view>-{{ money*(1-discountInfo.shopDiscount).toFixed(2) }}</view>
</view>
- </view>
+ </view>-->
<view v-if="canUseIntegral||canUseCoupon" class="u-p-h-32 bg-fff u-m-h-32 u-br-10">
- <view class="u-font-28 u-m-t-32">閫夋嫨浼樻儬鏂瑰紡</view>
+<!-- <view class="u-font-28 u-m-t-32">閫夋嫨浼樻儬鏂瑰紡</view>
<view v-if="canUseIntegral" class="u-p-v-24 u-border-bottom u-flex u-m-t-10">
<image class="item-icon" style="align-self: flex-start;position: relative;top: -3rpx;"
src="/static/integral.png" mode=""></image>
@@ -29,7 +29,7 @@
</view>
<input-number @handleCount="changeInt" :value="canUseInt" :min="0" :max="maxIntegral">
</input-number>
- </view>
+ </view>-->
<view v-if="canUseCoupon" class="u-flex u-p-v-32">
<image class="item-icon" src="/static/coupon-icon.png" mode=""></image>
<view class="u-font-30 u-flex-1 u-m-h-16">浼樻儬鍒�</view>
@@ -94,7 +94,7 @@
<key-bord @changeMoney="changeMoney" :num.sync="money" @close="bordShow = false" @pay="pay"></key-bord>
</u-popup>
<!-- 鏀粯楠岃瘉鐮� -->
- <u-popup :show="codeShow" closeable mode="center" @close="codeShow = false">
+<!-- <u-popup :show="codeShow" closeable mode="center" @close="codeShow = false">
<view class="u-p-h-40 u-p-b-40">
<view class="u-text-center u-p-t-20 u-m-b-30 u-font-34">璇疯緭鍏ユ墜鏈洪獙璇佺爜</view>
<view class="u-text-center u-m-b-20 color-666">{{ shopInfo.shop_name }}</view>
@@ -104,7 +104,7 @@
<u-code-input @finish="bankPay" v-model="smscode" mode="box" :focus="true"></u-code-input>
</view>
- </u-popup>
+ </u-popup>-->
</view>
</template>
@@ -120,6 +120,7 @@
queryUseSweepPayCoupon,
getWechatConfigInfo,
saveWxOrder,
+ saveOrder,
tlPay
} from '@/common/api/index'
import wx from 'weixin-js-sdk'; // 浣跨敤js-sdk
@@ -244,7 +245,10 @@
onLoad(opt) {
this.isNew = uni.getStorageSync('IS_NEW')
this.cid = uni.getStorageSync('CID')
- this.discountInfo = uni.getStorageSync('DISCOUNT_INFO')
+ if(uni.getStorageSync('DISCOUNT_INFO')){
+ this.discountInfo = uni.getStorageSync('DISCOUNT_INFO')
+ }
+
const token = uni.getStorageSync(ACCESSTOKEN) || null
if (opt.shopInfo) {
this.shopInfo = JSON.parse(decodeURIComponent(opt.shopInfo))
@@ -258,6 +262,7 @@
if (opt.money) {
this.money = parseFloat(opt.money).toFixed(2)
let dis = this.money * 100 * (1 - this.discountInfo.shopDiscount)
+ console.log('dis',dis)
let money = parseInt((this.money * 100 * this.discountInfo.shopDiscount))
if (dis < 1) {
money = parseInt((this.money * 100))
@@ -332,7 +337,7 @@
if (this.payWay == 3) {
params.bankCardId = this.bankCardId
}
- saveWxOrder(params).then(res => {
+ saveOrder(params).then(res => {
uni.hideLoading()
try {
this.orderId = res.orderId
@@ -357,7 +362,9 @@
this.aliPay(res.paymentData)
}
} else if (res.toPayMethod == 3) {
- window.location.href = res.paymentUrl
+ // window.location.href = res.paymentUrl
+ this.smscode = ''
+ this.codeShow = true
}
}
} catch (e) {
@@ -372,22 +379,6 @@
},
// 寰俊鏀粯
wxPay(res) {
- /*setTimeout(() => {
- wx.chooseWXPay({
- timestamp: res.timeStamp, // 鏀粯绛惧悕鏃堕棿鎴�
- nonceStr: res.nonceStr, // 鏀粯绛惧悕闅忔満涓诧紝涓嶉暱浜� 32 浣�
- package: res.package, // 缁熶竴鏀粯鎺ュ彛杩斿洖鐨刾repay_id鍙傛暟鍊硷紝鎻愪氦鏍煎紡濡傦細prepay_id=\*\*\*锛�
- signType: res.signType, // 寰俊鏀粯V3鐨勪紶鍏� RSA ,寰俊鏀粯V2鐨勪紶鍏ユ牸寮忎笌V2缁熶竴涓嬪崟鐨勭鍚嶆牸寮忎繚鎸佷竴鑷�
- paySign: res.paySign, // 鏀粯绛惧悕
- success: function(res) {
- // 鏀粯鎴愬姛鍚庣殑鍥炶皟鍑芥暟
- uni.navigateTo({
- url: `/pages/pay/paySuccess?orderId=${this.orderId}&youHuiInfo=${JSON
- .stringify(this.youHuiInfo)}`
- })
- }
- });
- }, 200)*/
setTimeout(() => {
WeixinJSBridge.invoke(
'getBrandWCPayRequest', {
--
Gitblit v1.9.1