From 8f09fcb6707915dd961e653dd2322a7cc673fe80 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 03 九月 2024 17:42:27 +0800
Subject: [PATCH] feat(支付): 1、改为history路由
---
pay/scanpay.vue | 538 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 356 insertions(+), 182 deletions(-)
diff --git a/pay/scanpay.vue b/pay/scanpay.vue
index 89935e8..c90f8f0 100644
--- a/pay/scanpay.vue
+++ b/pay/scanpay.vue
@@ -1,87 +1,135 @@
<!-- 鎵爜鏀粯 -->
<template>
<view class="page">
- <view class="shop u-flex u-row-between">
- <view class="u-m-r-30">
- <view class="u-font-28 color-666 u-m-b-10">浠樻缁�</view>
- <view class="u-font-34 font-bold color-333">{{ shopInfo.shopName }}</view>
- </view>
- <u-image width="94rpx" height="94rpx" radius="10rpx" :src="shopInfo.logoImage||'/static/imgs/store-logo.png'"></u-image>
- </view>
- <view class="u-p-48 bg-fff u-flex-1 content">
- <view class="u-font-28 color-666">閲戦</view>
- <view class="u-p-v-20 u-flex u-border-bottom u-relative money-box">
- <view class="money-icon color-333">楼</view>
- <view class="u-flex-1 u-flex u-m-l-10" style="height: 80rpx;">
- <view v-if="money" class="money-num">{{ money }}</view>
- <view :class="['cursor',{'cursor-act':!money&&bordShow}]"></view>
- <view v-if="!money" class="u-font-50 color-999">璇疯緭鍏ラ噾棰�</view>
- <view :class="['cursor',{'cursor-act':money&&bordShow}]"></view>
+ <u-loading-page :loading="loading"></u-loading-page>
+ <block v-if="shopInfo.scanFlag==1">
+ <view class="shop u-flex u-row-between">
+ <view class="u-m-r-30">
+ <view class="u-font-26 color-666 u-m-b-10">浠樻缁�</view>
+ <view class="u-font-34 color-333">{{ shopInfo.shopName }}</view>
</view>
- <view class="mask" @click="showBord"></view>
+ <u-image width="88rpx" height="88rpx" shape="circle" errorIcon="/static/store-logo.png" loadingIcon="/static/store-logo.png" :src="shopInfo.logoImage||'/static/store-logo.png'" bgColor="#fff"></u-image>
</view>
- <image v-if="isNew&&(this.payWay == 2&&!UNIONID)" @click="toRegister" class="reg-btn" src="/static/register-btn.png" mode=""></image>
- <block v-if="shopInfo.userCouponFlag==1">
- <view class="u-flex u-p-v-24 u-border-bottom">
- <u-icon name="coupon-fill" size="60rpx" color="#D31F28"></u-icon>
- <view class="u-font-32 u-flex-1 u-m-h-16">浼樻儬鍒�</view>
- <view @click="showCoupon" class="u-flex">
- <view v-if="couponInfo.id" class="tag-pain">
- 婊{ parseFloat((couponInfo.thresholdValue / 100).toFixed(2)) }}鍏冨噺{{ parseFloat((couponInfo.discount / 100).toFixed(2)) }}鍏�
- </view>
- <view v-else class="u-font-28 lh-1">璇烽�夋嫨</view>
- <u-icon class="u-m-l-10" name="arrow-right" color="#999" size="16"></u-icon>
+ <view class="u-p-24 bg-fff u-m-32 u-br-10">
+ <view class="u-flex u-row-between">
+ <view class="u-font-28 color-666">閲戦</view>
+ <view @click="buyerNote='';showRemark=true;" class="remark">娣诲姞澶囨敞</view>
+ </view>
+ <view v-if="smoney" class="u-p-v-20 u-flex u-col-bottom u-border-bottom u-relative money-box">
+ <view class="money-icon color-333 lh-1">楼</view>
+ <view class="u-flex-1 u-flex u-col-bottom u-m-l-10" style="height: 80rpx;">
+ <view class="money-num lh-1">{{ smoney }}</view>
</view>
</view>
- <view v-if="discount" class="u-p-v-30 u-flex u-row-between u-border-bottom">
- <view class="u-font-32 color-333">瀹為檯鎶垫墸</view>
- <view class="color-green">- {{ discount }}</view>
+ <view v-else class="u-p-v-20 u-flex u-col-bottom u-border-bottom u-relative money-box">
+ <view class="money-icon color-333 lh-1">楼</view>
+ <view class="u-flex-1 u-flex u-col-bottom u-m-l-10" style="height: 80rpx;">
+ <view v-if="money" class="money-num lh-1">{{ money }}</view>
+ <view :class="['cursor',{'cursor-act':!money&&bordShow}]"></view>
+ <view v-if="!money" class="u-font-50 color-999 lh-1">璇疯緭鍏ラ噾棰�</view>
+ <view :class="['cursor',{'cursor-act':money&&bordShow}]"></view>
+ </view>
+ <view class="mask" @click="showBord"></view>
</view>
- <view v-if="discount" class="u-p-v-30 u-flex u-row-between u-border-bottom">
- <view class="u-font-32 color-333">瀹炰粯閲戦</view>
- <view class="color-red">
- <text class="u-font-26 u-m-r-6">楼</text>
- <text class="u-font-34">{{ payMoney }}</text>
+ <view v-if="payWay==2" class="u-tips-color u-p-t-24">
+ <wx-open-launch-weapp id="launch-btn" appid="wx47b3b5ca64bc7d5d" path="pages/index/index">
+ <script type="text/wxtag-template">
+ <style>
+ .txt {
+ font-size: 13px;
+ color: #999
+ }
+ .btn {
+ font-size: 13px;
+ color: #1E8BE0
+ }
+ </style>
+ <div>
+ <span class="txt">寰俊鎼滅储鎴栫洿鎺ョ偣鍑绘墦寮�</span>
+ <span class="btn">銆愬唨浼橀偖銆�</span>
+ <span class="txt">灏忕▼搴忥紝浜彈鏇村浼樻儬</span>
+ </div>
+ </script>
+ </wx-open-launch-weapp>
+ </view>
+ </view>
+ <block v-if="payWay==2&&shopInfo.userCouponFlag==1">
+ <view class="bg-fff u-m-32 u-br-10">
+ <view class="u-flex u-p-24 u-border-bottom">
+ <!-- <u-icon name="coupon-fill" size="60rpx" color="#D31F28"></u-icon> -->
+ <view class="u-font-32 u-flex-1 u-m-h-16">浼樻儬鍒�</view>
+ <view @click="showCoupon" class="u-flex">
+ <view v-if="couponInfo.id" class="tag-pain">
+ 婊{ parseFloat((couponInfo.thresholdValue / 100).toFixed(2)) }}鍏冨噺{{ parseFloat((couponInfo.discount / 100).toFixed(2)) }}鍏�
+ </view>
+ <view v-else class="u-font-28 lh-1 u-tips-color">璇烽�夋嫨</view>
+ <u-icon class="u-m-l-10" name="arrow-right" color="#999" size="16"></u-icon>
+ </view>
</view>
</view>
</block>
- </view>
- <button class="pay-it" @click="pay">浠樻</button>
- <!-- 鏁板瓧閿洏 -->
- <u-popup :show="bordShow" :overlay="false" @close="bordShow = false">
- <key-bord @changeMoney="changeMoney" :num.sync="money" @close="bordShow = false" @pay="pay"></key-bord>
- </u-popup>
- <!-- 浼樻儬鍒稿脊绐� -->
- <u-popup mode="bottom" :closeable="true" :show="couponShow" @close="couponShow = false" :round="10">
- <view class="u-font-32 color-333 u-text-center u-p-t-30">浼樻儬鍒�</view>
- <view v-if="checkCoupon.id" class="choose-coupon">
- 宸查�夋嫨浼樻儬鍒�1寮狅紝鍏辨姷鎵ｏ骏{{ parseFloat((checkCoupon.discount / 100).toFixed(2)) }}
- </view>
- <!-- <view class="choose-coupon">閫夋嫨浼樻儬鍒�</view> -->
- <scroll-view scroll-y class="u-p-30 coupon-list">
- <view @click="clickCoupon(item)" class="u-m-b-24 u-flex coupon" v-for="(item, index) in couponList" :key="index">
- <view style="color: #D31F28;" class="u-p-h-28">
- <view class="font-bold">
- <text class="u-font-36">锟�</text>
- <text class="money">{{ parseFloat(item.discount / 100) }}</text>
- </view>
- <view class="u-font-24 u-m-t-20">婊{ parseFloat(item.thresholdValue / 100) }}鍏冧娇鐢�</view>
+ <block v-if="payWay==2&&shopInfo.userCouponFlag==1&&discount">
+ <view class="u-m-32 u-br-10 bg-fff">
+ <view class="u-p-24 u-flex u-row-between u-border-bottom">
+ <view class="u-font-32 color-333">鎶垫墸閲戦</view>
+ <view class="color-green">- {{ discount }}</view>
</view>
- <view class="butt"></view>
- <view class="u-p-30 u-flex-1 u-flex">
- <view class="u-flex-1">
- <view class="u-font-28 color-333 u-line-2">{{ item.name }}</view>
- <view class="u-font-22 color-999 u-m-t-20">
- 鏈夋晥鏈熻嚦锛歿{ $u.timeFormat(item.outTime, 'yyyy-mm-dd hh:MM') }}
- </view>
+ <view class="u-p-24 u-flex u-row-between u-br-10 bg-fff">
+ <view class="u-font-32 color-333">瀹炰粯閲戦</view>
+ <view class="color-red">
+ <text class="u-font-26 u-m-r-6">楼</text>
+ <text class="u-font-34">{{ payMoney }}</text>
</view>
- <u-icon v-if="item.id==checkCoupon.id" name="checkmark-circle-fill" color="#D31F28" size="20">
- </u-icon>
</view>
</view>
- </scroll-view>
- <view @click="getCoupon" class="coupon-btn">纭畾</view>
- </u-popup>
+ </block>
+ <button class="pay-it" @click="pay">浠樻</button>
+ <!-- 鏁板瓧閿洏 -->
+ <u-popup zIndex="500" :show="bordShow" :overlay="false" @close="bordShow = false">
+ <key-bord @changeMoney="changeMoney" :num.sync="money" @close="bordShow = false" @pay="pay"></key-bord>
+ </u-popup>
+ <!-- 浼樻儬鍒稿脊绐� -->
+ <u-popup v-if="payWay==2" mode="bottom" :closeable="true" :show="couponShow" @close="couponShow = false" :round="10">
+ <view class="u-font-32 color-333 u-text-center u-p-t-30">浼樻儬鍒�</view>
+ <view v-if="checkCoupon.id" class="choose-coupon">
+ 宸查�夋嫨浼樻儬鍒�1寮狅紝鍏辨姷鎵ｏ骏{{ parseFloat((checkCoupon.discount / 100).toFixed(2)) }}
+ </view>
+ <scroll-view scroll-y class="u-p-30 coupon-list">
+ <view @click="clickCoupon(item)" class="u-m-b-24 u-flex coupon" v-for="(item, index) in couponList" :key="index">
+ <view style="color: #D31F28;" class="u-p-h-28">
+ <view class="font-bold">
+ <text class="u-font-36">锟�</text>
+ <text class="money">{{ parseFloat(item.discount / 100) }}</text>
+ </view>
+ <view class="u-font-24 u-m-t-20">婊{ parseFloat(item.thresholdValue / 100) }}鍏冧娇鐢�</view>
+ </view>
+ <view class="butt"></view>
+ <view class="u-p-30 u-flex-1 u-flex">
+ <view class="u-flex-1">
+ <view class="u-font-28 color-333 u-line-2">{{ item.name }}</view>
+ <view class="u-font-22 color-999 u-m-t-20">
+ 鏈夋晥鏈熻嚦锛歿{ $u.timeFormat(item.outTime, 'yyyy-mm-dd hh:MM') }}
+ </view>
+ </view>
+ <u-icon v-if="item.id==checkCoupon.id" name="checkmark-circle-fill" color="#D31F28" size="20">
+ </u-icon>
+ </view>
+ </view>
+ </scroll-view>
+ <view @click="getCoupon" class="coupon-btn">纭畾</view>
+ </u-popup>
+ <u-modal showCancelButton :show="showRemark" title="澶囨敞" confirmColor="#D31F28" @close="showRemark = false" @cancel="showRemark = false" @confirm="showRemark = false">
+ <view style="border: 1rpx solid #eee;width: 100%">
+ <u--textarea v-model="buyerNote" placeholder="璇疯緭鍏ュ娉ㄥ唴瀹�" maxlength="100" none count></u--textarea>
+ </view>
+
+ </u-modal>
+ </block>
+ <view v-if="shopInfo.scanFlag==0" class="empty-box">
+ <image src="/static/empty.png" class="empty"></image>
+ <view class="tips">{{ tips }}</view>
+ <view @click="clickDone" class="clickDone">鍏抽棴</view>
+ </view>
</view>
</template>
@@ -91,34 +139,45 @@
ACCESSTOKEN
} from 'common/config.js';
import {
- queryShop,
+ queryShopByCid,
+ queryShopByShopId,
userLogin,
queryUseSweepPayCoupon,
+ getWechatConfigInfo,
closeOrder,
saveOrder,
} from 'common/api/index'
+import wx from 'weixin-js-sdk'; // 浣跨敤js-sdk
+
export default {
data() {
return {
+ smoney: '',
+ tips: '璇ュ晢鎴锋殏鏈紑閫氭敮浠樺姛鑳�',
+ loading: false,
+ remark: '',
+ buyerNote: '',
+ showRemark: false,
UNIONID: null,
- payWay: this.$utils.getPlat(),
- cid: '',
- bordShow: true, // 鏄剧ず閿洏
+ payWay: this.$utils.getPlat(), //2 缁翠俊 5鏀粯瀹�
+ cid: '', //鐮佺墝id C鎵獴闈欐�佺爜鏃舵湁
+ activityQrcodeId: '', //鍔ㄦ�佹敹娆剧爜 C鎵獴鍔ㄦ�佺爜鏃舵湁
+ shopId: '', //鍟嗘埛id C鎵獴鍔ㄦ�佺爜鏃舵湁
+ bordShow: false, // 鏄剧ず閿洏
+ orderId: '',
shopInfo: {
cusid: '',
shopName: '',
logoImage: '',
- scanFlag: '',
- useScoreFlag: 0, //鍟嗛摵鏄惁鍙敤绉垎 0鍚� 1鏄�
- userCouponFlag: 0, //鍟嗛摵鏄惁鍙敤浼樻儬鍒� 0鍚� 1鏄�
+ scanFlag: -1,
+ useScoreFlag: -1, //鍟嗛摵鏄惁鍙敤绉垎 0鍚� 1鏄�
+ userCouponFlag: -1, //鍟嗛摵鏄惁鍙敤浼樻儬鍒� 0鍚� 1鏄�
},
money: '', // 閲戦
token: null,
isNew: false, // 鏄惁鏂扮敤鎴凤紝鏂扮敤鎴锋煡璇笉鍒扮Н鍒嗗拰閾惰鍗�
canReset: false,
- end: 0,
- count: 0,
couponShow: false, // 浼樻儬鍒稿脊绐�
couponList: [], // 浼樻儬鍒�
couponInfo: {
@@ -147,58 +206,102 @@
}
},
onLoad(opt) {
+ uni.setStorageSync('CID', opt.cid)
+ uni.setStorageSync('SHOPID', opt.shopId)
+ uni.setStorageSync('SMONEY', opt.smoney)
+ uni.setStorageSync('AQCI', opt.activityQrcodeId)
+ this.UNIONID = uni.getStorageSync('UNIONID') || null
this.isNew = uni.getStorageSync('IS_NEW')
- uni.showLoading()
+ if (opt.smoney) {
+ this.smoney = opt.smoney
+ this.money = opt.smoney
+ } else {
+ this.bordShow = true
+ }
+ if (opt.activityQrcodeId) {
+ this.activityQrcodeId = opt.activityQrcodeId
+ // this.getOrderInfo()
+ }
+ if (opt.shopId) {
+ this.shopId = opt.shopId
+ this.init()
+ }
if (opt.cid) {
this.cid = opt.cid
this.init()
}
- if (opt.code || opt.auth_code) {
- let code = opt.code
- if (this.payWay == 5) {
- code = opt.auth_code
+ if (opt.code || opt.auth_code || opt.userAuthCode) {
+ let params = {
+ code: opt.code
}
- this.end++
+ let code = opt.code
+ if (this.payWay == 2&&opt.state == 1 ) { //寰俊
+ params.getUserInfo = 1
+ }
+ if (this.payWay == 5) { //鏀粯瀹�
+ params.code = opt.auth_code
+ }
+ if (this.payWay == 15) { //浜戦棯浠�
+ code = opt.userAuthCode
+ }
+ const cd = uni.getStorageSync('cd')
+ if (code === cd) {
+ return
+ }
+ uni.setStorageSync('cd', code)
userLogin({
platform: this.payWay,
- params: {
- code
- }
+ params
}).then(res => {
this.getToken(res)
- }).catch(() => {
- this.count++
- if (this.count >= this.end) {
- uni.hideLoading()
- }
})
}
},
- onShow() {
- this.UNIONID = uni.getStorageSync('UNIONID' + this.payWay) || null
- this.token = uni.getStorageSync(ACCESSTOKEN) || null
- if (this.canReset && this.token && !this.isNew) {
- this.end = 0
- this.count = 0
- uni.showLoading()
- this.showCoupon()
- }
- this.canReset = true
- },
methods: {
- getToken(res) {
- this.count++
- if (this.count >= this.end) {
- uni.hideLoading()
+ /*鍏抽棴椤甸潰*/
+ clickDone() {
+ let browser = navigator.userAgent.toLowerCase();
+ if (browser.match(/Alipay/i) == "alipay") {
+ //杩欎釜鍙互鍏抽棴瀹夊崜绯荤粺鐨勬墜鏈�
+ document.addEventListener("AlipayJSBridgeReady", function () {
+ AlipayJSBridge.call("closeWindow");
+ },
+ false
+ );
+ //杩欎釜鍙互鍏抽棴ios绯荤粺鐨勬墜鏈�
+ AlipayJSBridge.call('closeWebview'); //鏀粯瀹�
+ } else if (browser.match(/MicroMessenger/i) == "micromessenger") {
+ //杩欎釜鍙互鍏抽棴瀹夊崜绯荤粺鐨勬墜鏈�
+ document.addEventListener("WeixinJSBridgeReady", function () {
+ WeixinJSBridge.call("closeWindow");
+ },
+ false
+ );
+ //杩欎釜鍙互鍏抽棴ios绯荤粺鐨勬墜鏈�
+ WeixinJSBridge.call("closeWindow");
+ } else {
+ window.opener = null; //濡傛灉娌℃湁杩欒鍜屼笅闈㈢殑涓�琛屽垯浼氬嚭鐜颁笂闈㈢殑绗簩涓闂銆�
+ window.open(' ', '_self', ' ');
+ window.close()
}
+ },
+ /*鐧诲綍*/
+ getToken(res) {
this.token = res.token
if (res.openid) {
- uni.setStorageSync('OPENID' + this.payWay, res.token)
+ uni.setStorageSync('OPENID', res.openid)
}
if (res.unionid) {
- uni.setStorageSync('UNIONID' + this.payWay, res.token)
+ uni.setStorageSync('UNIONID', res.unionid)
}
+ if (res.aLiUserId) {
+ uni.setStorageSync('ALIUSERID', res.aLiUserId)
+ }
+ if (res.cloudPayUserId) {
+ uni.setStorageSync('UNIONPAYID', res.cloudPayUserId)
+ }
+ this.UNIONID = res.unionid
uni.setStorageSync(ACCESSTOKEN, res.token)
uni.setStorageSync('IS_NEW', res.isNew)
this.isNew = res.isNew
@@ -206,18 +309,14 @@
this.showCoupon()
}
},
+ /*鎺堟潈unionid*/
toRegister() {
- if (this.UNIONID) {
- uni.navigateTo({
- url: '/pay/register?cid=' + this.cid
- })
- }
if (this.payWay == 2) {
- const redirect_uri = encodeURIComponent(`${config.webURL}/pay/scanpay?cid=${opt.query.cid}`)
+ const redirect_uri = encodeURIComponent(`${config.webURL}/pay/scanpay?cid=${this.cid || ''}&shopId=${this.shopId || ''}&activityQrcodeId=${this.activityQrcodeId || ''}&smoney=${this.smoney || ''}`)
+ uni.clearStorageSync()
window.location.href =
- `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${config.wx_appid}&redirect_uri=${redirect_uri}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
+ `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${config.wx_appid}&redirect_uri=${redirect_uri}&response_type=code&scope=snsapi_userinfo&state=1#wechat_redirect`
}
-
},
// 鏇存柊閲戦
changeMoney(str) {
@@ -228,51 +327,83 @@
this.bordShow = true;
},
init() {
- this.end += 1
- //鑾峰彇鍟嗛摵淇℃伅
- queryShop({
- params: {
+ this.loading = true
+ let timer = setTimeout(() => {
+ this.shopInfo.scanFlag = 0
+ this.tips = '褰撳墠鐢ㄦ埛杩囧锛岃绋嶅悗閲嶈瘯锝瀇锝�'
+ this.loading = false
+ }, 2000)
+ let api = queryShopByCid
+ let params = {
+ cid: this.cid
+ }
+ if (this.cid) {
+ api = queryShopByCid
+ params = {
cid: this.cid
}
- }).then(res => {
- this.count++
- if (this.count >= this.end) {
- uni.hideLoading()
+ }
+ if (this.shopId) {
+ api = queryShopByShopId
+ params = {
+ shopId: this.shopId
}
+ }
+ //鑾峰彇鍟嗛摵淇℃伅
+ api({
+ params
+ }).then(res => {
+ clearTimeout(timer)
+ this.loading = false
if (!uni.$u.test.isEmpty(res.logoImage)) {
res.logoImage = config.baseURL + res.logoImage
}
this.shopInfo = res
- }).catch(() => {
- this.count++
- if (this.count >= this.end) {
- uni.hideLoading()
- }
+ }).catch((err) => {
+ clearTimeout(timer)
+ this.shopInfo.scanFlag = 0
+ this.tips = err.description||'褰撳墠鐢ㄦ埛杩囧锛岃绋嶅悗閲嶈瘯锝瀇锝�'
+ this.loading = false
})
+
+ if (this.payWay == 2) {
+ const uri = encodeURIComponent(window.location)
+ getWechatConfigInfo({
+ url: uri
+ }).then(res => {
+ wx.config({
+ debug: false, // 寮�鍚皟璇曟ā寮�
+ appId: res.appId, // 蹇呭～锛屽叕浼楀彿鐨勫敮涓�鏍囪瘑
+ timestamp: res.timestamp, // 蹇呭～锛岀敓鎴愮鍚嶇殑鏃堕棿鎴�
+ nonceStr: res.noncestr, // 蹇呭～锛岀敓鎴愮鍚嶇殑闅忔満涓�
+ signature: res.signature, // 蹇呭～锛岀鍚�
+ jsApiList: ['hideAllNonBaseMenuItem'], // 蹇呭～锛岄渶瑕佷娇鐢ㄧ殑JS鎺ュ彛鍒楄〃
+ openTagList: ['wx-open-launch-weapp'] //鍙�夛紝闇�瑕佷娇鐢ㄧ殑寮�鏀炬爣绛惧垪琛�
+ });
+ wx.ready(function () {
+ wx.hideAllNonBaseMenuItem();
+ })
+ })
+ }
},
// 鑾峰彇浼氬憳鐩稿叧淇℃伅
showCoupon() {
- this.end += 1
- //鑾峰彇鐢ㄦ埛浼樻儬鍒�
- queryUseSweepPayCoupon({
- params: {
- cusid: this.shopInfo.cusid,
- cid: this.cid,
- money: Number(this.money * 100),
- }
- }).then(res => {
- this.count++
- if (this.count >= this.end) {
- uni.hideLoading()
- }
- this.couponList = res
- this.couponShow = true
- }).catch(() => {
- this.count++
- if (this.count >= this.end) {
- uni.hideLoading()
- }
- })
+ if(this.UNIONID){
+ //鑾峰彇鐢ㄦ埛浼樻儬鍒�
+ queryUseSweepPayCoupon({
+ params: {
+ applyPayWayStr: this.payWay,
+ cusid: this.shopInfo.id,
+ money: Number(this.money * 100),
+ }
+ }).then(res => {
+ this.couponList = res
+ this.couponShow = true
+ })
+ }else{
+ this.toRegister()
+ }
+
},
//閫夋嫨浼樻儬鍒�
clickCoupon(item) {
@@ -302,12 +433,18 @@
// 閲戦 this.money
uni.showLoading()
const params = {
- money: Number(this.payMoney * 100),
- shopId: this.shopInfo.id,
- cid: this.cid,
payWay: this.payWay,
+ buyerNote: this.buyerNote,
score: 0,
couponDetailId: this.couponInfo.id
+ }
+ if (this.activityQrcodeId) {
+ params.activityQrcodeId = this.activityQrcodeId
+ }
+ if (this.cid) {
+ params.money = Number(this.money * 100)
+ params.shopId = this.shopInfo.id
+ params.cid = this.cid
}
//鐢熸垚璁㈠崟
saveOrder(params).then(res => {
@@ -346,9 +483,9 @@
if (res.err_msg == "get_brand_wcpay_request:ok") {
// 浣跨敤浠ヤ笂鏂瑰紡鍒ゆ柇鍓嶇杩斿洖,寰俊鍥㈤槦閮戦噸鎻愮ず锛�
//res.err_msg灏嗗湪鐢ㄦ埛鏀粯鎴愬姛鍚庤繑鍥瀘k锛屼絾骞朵笉淇濊瘉瀹冪粷瀵瑰彲闈犮��
- uni.navigateTo({
+ /*uni.navigateTo({
url: `/pay/paySuccess?orderId=${this.orderId}&youHuiInfo=${JSON.stringify(this.youHuiInfo)}`
- })
+ })*/
} else {
this.closeOrder()
}
@@ -366,18 +503,21 @@
.stringify(this.youHuiInfo)}`
})
// 鏀粯鎴愬姛
- } else if (res.resultCode == 8000 || res.resultCode == 6001) {
+ } else if (res.resultCode == 8000) {
// 姝ｅ湪澶勭悊涓� || 鍙栨秷
- } else {
+ } else if (res.resultCode == 6001) {
+ // 鍙栨秷
this.closeOrder()
+ } else {
// 鏀粯澶辫触
+ this.closeOrder()
}
});
},
closeOrder() {
- closeOrder({
+ closeOrder({params:{
id: this.orderId,
- }).then(res => {
+ }}).then(res => {
})
}
}
@@ -387,45 +527,39 @@
<style scoped lang="scss">
.page {
height: calc(100vh - 0px);
- display: flex;
- flex-direction: column;
+ background-color: #EDEDED;
+ border-top: 1px solid #EDEDED;
+ box-sizing: border-box;
}
.shop {
- padding: 50rpx 64rpx;
+ padding: 50rpx 32rpx 10px;
}
.avg-img {
- width: 94rpx;
- height: 94rpx;
- border-radius: 10rpx;
+ width: 88rpx;
+ height: 88rpx;
+ border-radius: 44rpx;
background-color: #ffffff;
}
-.content {
- border-radius: 40rpx 40rpx 0 0;
-}
.money {
font-size: 40rpx;
color: #333;
}
-.money-box{
- padding-left: 50rpx;
-}
+
+
.money-icon {
- position: absolute;
- font-size: 50rpx;
- // font-weight: bold;
+ position: relative;
+ bottom: 6rpx;
+ font-size: 42rpx;
color: #666;
- margin-right: 20rpx;
- bottom: 10rpx;
- left: 0;
+ margin-right: 10rpx;
}
.money-num {
- font-size: 96rpx;
- // font-weight: bold;
+ font-size: 72rpx;
}
.pay-it {
@@ -499,12 +633,12 @@
.cursor {
width: 1px;
- height: 80rpx;
+ height: 70rpx;
}
.cursor-act {
width: 1px;
- background-color: #333;
+ background-color: #999;
animation: cursor-blinks 1s infinite steps(1, start);
}
@@ -632,6 +766,13 @@
background-color: #ffffff;
}
+.remark {
+ color: #1E8BE0
+}
+
+.lh-1 {
+ line-height: 1;
+}
.coupon-btn {
margin: 0 30rpx 30rpx;
@@ -644,4 +785,37 @@
text-align: center;
}
+.empty-box {
+ height: calc(80vh - 64rpx);
+ margin: 32rpx;
+ background-color: #fff;
+ border-radius: 10rpx;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+
+ .tips {
+ font-size: 28rpx;
+ color: #999;
+ margin: 60rpx 0;
+ }
+
+ .empty {
+ width: 291rpx;
+ height: 302rpx;
+ }
+
+ .clickDone {
+ font-size: 34rpx;
+ color: #fff;
+ width: 331rpx;
+ height: 88rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border-radius: 61rpx;
+ background: linear-gradient(0deg, #D31F28 0%, #D31F28 100%), linear-gradient(270deg, #F62B20 13.24%, #FC4E0B 111.68%), #D9D9D9;
+ }
+}
</style>
--
Gitblit v1.9.1