revert: 所有代码与custom/common分支同

This commit is contained in:
2026-01-05 15:56:49 +08:00
parent 8ef6975ee1
commit 60a0e5133e
219 changed files with 14860 additions and 15585 deletions

View File

@@ -7,17 +7,15 @@
<text class="unit price-font"></text>
<text class="money price-font">{{ payInfo.pay_money | moneyFormat }}</text>
</view>
<block v-if="payTypeList.length > 0">
<view class="pay-type">
<view class="payment-item" v-for="(item, index) in payTypeList" :key="index"
@click="payIndex = index">
<view class="payment-item" v-for="(item, index) in payTypeList" :key="index" @click="payIndex = index">
<view>
<text class="iconfont" :class="item.icon"></text>
<text class="name">{{ item.name }}</text>
</view>
<text class="iconfont"
:class="payIndex == index ? 'icon-yuan_checked color-base-text' : 'icon-checkboxblank'"></text>
<text class="iconfont" :class="payIndex == index ? 'icon-yuan_checked color-base-text' : 'icon-checkboxblank'"></text>
</view>
</view>
<button type="primary" @click="confirm">确认支付</button>
@@ -33,13 +31,11 @@
<script>
import { Weixin } from 'common/js/wx-jssdk.js';
import nsLogin from '@/components/ns-login/ns-login.vue';
import nsEmpty from '@/components/ns-empty/ns-empty.vue';
export default {
components: {
nsLogin: () => import('@/components/ns-login/ns-login.vue'),
nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
},
components: { nsLogin, nsEmpty },
data() {
return {
payIndex: 0,
@@ -90,7 +86,7 @@ export default {
this.autoPay();
}, 500)
}
}
}
}
});
},
@@ -110,10 +106,10 @@ export default {
}
});
},
autoPay() {
autoPay(){
if (!this.payTypeList.length) return;
if (this.$util.isWeiXin()) {
this.payTypeList.forEach((item, index) => {
this.payTypeList.forEach((item, index) => {
if (item.type == 'wechatpay') {
this.payIndex = index;
this.confirm();
@@ -290,7 +286,7 @@ export default {
// #endif
},
watch: {
storeToken: function (nVal, oVal) {
storeToken: function(nVal, oVal) {
if (nVal) {
this.getPayInfo();
}
@@ -314,7 +310,6 @@ export default {
align-items: center;
flex-direction: column;
padding: 80rpx 26rpx;
.content {
white-space: nowrap;
overflow: hidden;
@@ -323,16 +318,13 @@ export default {
padding: 0 60rpx;
text-align: center;
}
.money-wrap {
font-weight: bold;
margin: 40rpx 0;
.unit {
font-size: 40rpx;
margin-right: 6rpx;
}
.money {
font-size: 70rpx;
}
@@ -342,7 +334,6 @@ export default {
width: 100%;
background: #fff;
border-radius: 20rpx;
.payment-item {
display: flex;
align-items: center;
@@ -350,43 +341,34 @@ export default {
height: 90rpx;
border-bottom: 2rpx solid $color-line;
padding: 20rpx 30rpx;
&:last-of-type {
border-bottom: none;
}
>view {
> view {
display: flex;
align-items: center;
.name {
margin-left: 20rpx;
}
}
.iconfont {
font-size: 64rpx;
}
.icon-weixin1 {
color: #24af41;
}
.icon-zhifubaozhifu- {
color: #00a0e9;
}
.icon-yuan_checked {
font-size: 40rpx;
color: $base-color;
}
.icon-checkboxblank {
font-size: 40rpx;
}
}
}
button {
width: 100%;
margin-top: 80rpx !important;

View File

@@ -18,9 +18,7 @@
<script>
export default {
components: {
loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
},
components: {},
data() {
return {
isIphoneX: false,

View File

@@ -3,19 +3,16 @@
<template v-if="payInfo.pay_status != undefined">
<view class="result-box">
<template v-if="payInfo.pay_status">
<image :src="$util.img('public/uniapp/pay/pay_success.png')" mode="widthFix" lazy-load="true"
class="result-image" />
<image :src="$util.img('public/uniapp/pay/pay_success.png')" mode="widthFix" lazy-load="true" class="result-image"/>
<view class="msg success">{{ $lang('paymentSuccess') }}</view>
<view class="pay-amount">
<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
<text class="price-style large">{{ parseFloat(payInfo.pay_money).toFixed(2).split(".")[0]
}}</text>
<text class="price-style small">.{{ parseFloat(payInfo.pay_money).toFixed(2).split(".")[1]
}}</text>
<text class="price-style large">{{ parseFloat(payInfo.pay_money).toFixed(2).split(".")[0] }}</text>
<text class="price-style small">.{{ parseFloat(payInfo.pay_money).toFixed(2).split(".")[1] }}</text>
</view>
</template>
<template v-else>
<image :src="$util.img('public/uniapp/pay/pay_fail.png')" mode="widthFix" class="result-image" />
<image :src="$util.img('public/uniapp/pay/pay_fail.png')" mode="widthFix" class="result-image"/>
<view class="msg fail">{{ $lang('paymentFail') }}</view>
</template>
@@ -63,288 +60,284 @@
</template>
<script>
export default {
components: {
nsGoodsRecommend: () => import('@/components/ns-goods-recommend/ns-goods-recommend.vue'),
loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
},
data() {
return {
payInfo: {},
outTradeNo: '',
paySource: '',
consumeInfo: {},
consumeStatus: 0,
};
},
onLoad(option) {
if (option.code) this.outTradeNo = option.code;
this.paySource = uni.getStorageSync('paySource');
},
onShow() {
this.getPayInfo();
this.getConsume();
},
methods: {
consume(type) {
switch (type) {
case 'point':
this.$util.redirectTo('/pages_tool/member/point_detail', {});
break;
case 'growth':
this.$util.redirectTo('/pages_tool/member/level', {});
break;
case 'coupon':
this.$util.redirectTo('/pages_tool/member/coupon', {});
break;
default:
this.$util.redirectTo('/pages/member/index', {}, 'reLaunch');
break;
}
export default {
data() {
return {
payInfo: {},
outTradeNo: '',
paySource: '',
consumeInfo: {},
consumeStatus: 0,
};
},
getConsume() {
this.$api.sendRequest({
url: '/memberconsume/api/config/info',
data: {
out_trade_no: this.outTradeNo
},
success: res => {
if (res.code >= 0 && res.data) {
let reward = res.data.value;
if (res.data.is_use && (reward.point_num > 0 || reward.growth_num > 0 || reward.coupon_list.length)) {
this.consumeStatus = res.data.is_use;
this.consumeInfo = res.data.value;
onLoad(option) {
if (option.code) this.outTradeNo = option.code;
this.paySource = uni.getStorageSync('paySource');
},
onShow() {
this.getPayInfo();
this.getConsume();
},
methods: {
consume(type) {
switch (type) {
case 'point':
this.$util.redirectTo('/pages_tool/member/point_detail', {});
break;
case 'growth':
this.$util.redirectTo('/pages_tool/member/level', {});
break;
case 'coupon':
this.$util.redirectTo('/pages_tool/member/coupon', {});
break;
default:
this.$util.redirectTo('/pages/member/index', {}, 'reLaunch');
break;
}
},
getConsume() {
this.$api.sendRequest({
url: '/memberconsume/api/config/info',
data: {
out_trade_no: this.outTradeNo
},
success: res => {
if (res.code >= 0 && res.data) {
let reward = res.data.value;
if (res.data.is_use && (reward.point_num > 0 || reward.growth_num > 0 || reward.coupon_list.length)) {
this.consumeStatus = res.data.is_use;
this.consumeInfo = res.data.value;
}
}
}
},
fail: res => {
if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
}
});
},
getPayInfo() {
this.$api.sendRequest({
url: '/api/pay/info',
data: {
out_trade_no: this.outTradeNo
},
success: res => {
if (res.code >= 0 && res.data) {
this.payInfo = res.data;
this.payInfo.pay_money = parseFloat(res.data.pay_money);
this.payInfo.pay_money += parseFloat(res.data.balance);
this.payInfo.pay_money += parseFloat(res.data.balance_money);
},
fail: res => {
if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
} else {
this.$util.showToast({
title: '未获取到支付信息!'
});
setTimeout(() => {
this.$util.redirectTo('/pages/index/index', {}, 'reLaunch');
}, 1500);
}
},
fail: res => {
if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
});
},
getPayInfo() {
this.$api.sendRequest({
url: '/api/pay/info',
data: {
out_trade_no: this.outTradeNo
},
success: res => {
if (res.code >= 0 && res.data) {
this.payInfo = res.data;
this.payInfo.pay_money = parseFloat(res.data.pay_money);
this.payInfo.pay_money += parseFloat(res.data.balance);
this.payInfo.pay_money += parseFloat(res.data.balance_money);
if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
} else {
this.$util.showToast({
title: '未获取到支付信息!'
});
setTimeout(() => {
this.$util.redirectTo('/pages/index/index', {}, 'reLaunch');
}, 1500);
}
},
fail: res => {
if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
}
});
},
goHome() {
this.$util.redirectTo('/pages/index/index', {}, 'reLaunch');
},
toOrderDetail(id) {
if (this.payInfo.order_type == 2) {
this.$util.redirectTo('/pages_order/detail_pickup', {
order_id: id
}, 'redirectTo');
} else if (this.payInfo.order_type == 3) {
this.$util.redirectTo('/pages_order/detail_local_delivery', {
order_id: id
}, 'redirectTo');
} else if (this.payInfo.order_type == 4) {
this.$util.redirectTo('/pages_tool/order/detail_virtual', {
order_id: id
}, 'redirectTo');
} else {
this.$util.redirectTo('/pages_order/detail', {
order_id: id
}, 'redirectTo');
}
});
},
goHome() {
this.$util.redirectTo('/pages/index/index', {}, 'reLaunch');
},
toOrderDetail(id) {
if (this.payInfo.order_type == 2) {
this.$util.redirectTo('/pages_order/detail/detail_pickup', {
order_id: id
}, 'redirectTo');
} else if (this.payInfo.order_type == 3) {
this.$util.redirectTo('/pages_order/detail/detail_local_delivery', {
order_id: id
}, 'redirectTo');
} else if (this.payInfo.order_type == 4) {
this.$util.redirectTo('/pages_tool/order/detail_virtual', {
order_id: id
}, 'redirectTo');
} else {
this.$util.redirectTo('/pages_order/detail/detail', {
order_id: id
}, 'redirectTo');
},
toOrder(id) {
this.$util.redirectTo('/pages_promotion/giftcard/order_list', {}, 'redirectTo');
uni.setStorageSync('paySource', '');
},
toRecharge() {
this.$util.redirectTo('/pages_tool/recharge/order_list', {}, 'redirectTo');
uni.setStorageSync('paySource', '');
},
toCard() {
this.$util.redirectTo('/pages_tool/member/card', {}, 'redirectTo');
uni.setStorageSync('paySource', '');
},
toPresaleOrder() {
this.$util.redirectTo('/pages_promotion/presale/order_list', {}, 'redirectTo');
uni.setStorageSync('paySource', '');
},
toExchangeOrder() {
this.$util.redirectTo('/pages_promotion/point/order_list', {}, 'redirectTo');
uni.setStorageSync('paySource', '');
}
},
toOrder(id) {
this.$util.redirectTo('/pages_promotion/giftcard/order_list', {}, 'redirectTo');
uni.setStorageSync('paySource', '');
},
toRecharge() {
this.$util.redirectTo('/pages_tool/recharge/order_list', {}, 'redirectTo');
uni.setStorageSync('paySource', '');
},
toCard() {
this.$util.redirectTo('/pages_tool/member/card', {}, 'redirectTo');
uni.setStorageSync('paySource', '');
},
toPresaleOrder() {
this.$util.redirectTo('/pages_promotion/presale/order_list', {}, 'redirectTo');
uni.setStorageSync('paySource', '');
},
toExchangeOrder() {
this.$util.redirectTo('/pages_promotion/point/order_list', {}, 'redirectTo');
uni.setStorageSync('paySource', '');
}
}
};
};
</script>
<style lang="scss">
.consume-box {
padding: $padding;
background: #F8F8F8;
width: calc(100% - 48rpx);
margin: 0 24rpx 0 24rpx;
box-sizing: border-box;
border-radius: 20rpx;
.consume-head {
display: flex;
justify-content: center;
font-weight: 500;
font-size: 26rpx;
.consume-head-text {
line-height: 1;
}
}
.consume-list {
display: flex;
}
.consume-item {
flex: 1;
display: flex;
align-items: center;
justify-content: center;
color: $color-title;
font-size: $font-size-base;
margin-top: 10rpx;
image {
width: 24rpx;
margin-right: 4rpx;
}
.consume-value {
font-size: 26rpx;
}
}
.consume-remark {
color: $color-tip;
font-size: $font-size-tag;
padding: 10rpx 20rpx;
}
}
.clear {
clear: both;
}
.container {
display: flex;
flex-direction: column;
align-items: center;
.result-box {
padding-top: 94rpx;
display: flex;
flex-direction: column;
align-items: center;
background-color: #FFFFFF;
width: 100%;
padding-bottom: 40rpx;
}
.result-image {
width: 80rpx;
height: auto;
will-change: transform;
}
.msg {
font-size: 32rpx;
margin-top: 25rpx;
&.success {
color: #09BB07;
}
&.fail {
color: #FF4646;
}
}
.pay-amount {
font-size: 30rpx;
margin: 40rpx 0 24rpx 0;
font-weight: 600;
line-height: 50rpx;
text {
color: #333333 !important;
font-weight: bold !important;
}
.unit {
margin-right: 4rpx;
}
.large {
font-size: 60rpx !important;
}
.small {
font-size: 36rpx !important;
}
}
.action {
width: 100%;
height: 80rpx;
display: flex;
justify-content: center;
.consume-box {
padding: $padding;
background: #F8F8F8;
width: calc(100% - 48rpx);
margin: 0 24rpx 0 24rpx;
box-sizing: border-box;
margin-top: 24rpx;
border-radius: 20rpx;
.btn {
font-size: 30rpx;
width: 200rpx;
height: 66rpx;
line-height: 66rpx;
text-align: center;
border-radius: 66rpx;
border: 1px solid $color-tip;
box-sizing: border-box;
.consume-head {
display: flex;
justify-content: center;
font-weight: 500;
font-size: 26rpx;
&:last-child {
margin-left: 40rpx;
.consume-head-text {
line-height: 1;
}
}
.go-home {
background-color: $base-color;
color: #fff;
border-color: $base-color;
.consume-list {
display: flex;
}
.consume-item {
flex: 1;
display: flex;
align-items: center;
justify-content: center;
color: $color-title;
font-size: $font-size-base;
margin-top: 10rpx;
image {
width: 24rpx;
margin-right: 4rpx;
}
.consume-value {
font-size: 26rpx;
}
}
.consume-remark {
color: $color-tip;
font-size: $font-size-tag;
padding: 10rpx 20rpx;
}
}
}
/deep/ .goods-recommend {
margin-top: 30rpx;
}
.clear {
clear: both;
}
.container {
display: flex;
flex-direction: column;
align-items: center;
.result-box {
padding-top: 94rpx;
display: flex;
flex-direction: column;
align-items: center;
background-color: #FFFFFF;
width: 100%;
padding-bottom: 40rpx;
}
.result-image {
width: 80rpx;
height: auto;
will-change: transform;
}
.msg {
font-size: 32rpx;
margin-top: 25rpx;
&.success {
color: #09BB07;
}
&.fail {
color: #FF4646;
}
}
.pay-amount {
font-size: 30rpx;
margin: 40rpx 0 24rpx 0;
font-weight: 600;
line-height: 50rpx;
text {
color: #333333 !important;
font-weight: bold !important;
}
.unit {
margin-right: 4rpx;
}
.large {
font-size: 60rpx !important;
}
.small {
font-size: 36rpx !important;
}
}
.action {
width: 100%;
height: 80rpx;
display: flex;
justify-content: center;
box-sizing: border-box;
margin-top: 24rpx;
.btn {
font-size: 30rpx;
width: 200rpx;
height: 66rpx;
line-height: 66rpx;
text-align: center;
border-radius: 66rpx;
border: 1px solid $color-tip;
box-sizing: border-box;
&:last-child {
margin-left: 40rpx;
}
}
.go-home {
background-color: $base-color;
color: #fff;
border-color: $base-color;
}
}
}
/deep/ .goods-recommend {
margin-top: 30rpx;
}
</style>
<style lang="scss" scoped>
/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
max-height: unset !important;
}
<style scoped>
/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
max-height: unset !important;
}
</style>

View File

@@ -12,15 +12,15 @@ export default {
name: 'wx_pay',
data() {
return {
show: true,
wx_alipay: "",
out_trade_no: ""
show : true,
wx_alipay : "",
out_trade_no : ""
};
},
onLoad(options) {
this.wx_alipay = options.wx_alipay || '';
this.out_trade_no = options.out_trade_no || '';
if (!this.$util.isWeiXin() && this.wx_alipay) {
if(!this.$util.isWeiXin() && this.wx_alipay){
this.show = false;
location.href = this.wx_alipay;
}
@@ -36,7 +36,7 @@ export default {
success: res => {
if (res.code >= 0 && res.data) {
this.checkPayStatus();
}
}
}
});
},
@@ -64,33 +64,29 @@ export default {
</script>
<style lang="scss">
.launch-mask {
position: fixed;
top: 0px;
.launch-mask{
position:fixed;
top:0px;
left: 0px;
width: 100%;
width:100%;
height: 100%;
background: rgba(0, 0, 0, 0.8);
.mask-img {
background:rgba(0,0,0,0.8);
.mask-img{
text-align: right;
margin: 10% 10px 10px 30px;
image {
margin:10% 10px 10px 30px;
image{
width: 50px;
height: 117px;
margin-right: 9%
height:117px;
margin-right:9%
}
}
.mask-word {
.mask-word{
color: #fff;
text-align: center;
font-weight: bold;
font-size: 18px;
text {
color: #FF0036 !important
text{
color:#FF0036 !important
}
}
}