mirror of
http://git.coreshop.cn/jianweie/coreshoppro.git
synced 2026-06-10 06:07:51 +08:00
【修复】修复安卓app下单界面调用类型失效的问题。
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<view>
|
<view>
|
||||||
<u-toast ref="uToast" />
|
<u-toast ref="uToast" />
|
||||||
<view v-for="item in payments" :key="item.code" @click="toPayHandler(item.code)" v-if="!(type == 2 && item.code == 'balancepay')">
|
<view v-for="item in payments" :key="item.code" @click="toPayHandler(item.code)" v-if="!(type == $globalConstVars.paymentType.recharge && item.code == 'balancepay')">
|
||||||
<view class="u-reset-button coreshop-list menu-avatar padding-xl radius shadow shadow-lg bg-blue margin-top">
|
<view class="u-reset-button coreshop-list menu-avatar padding-xl radius shadow shadow-lg bg-blue margin-top">
|
||||||
<view class="coreshop-list-item">
|
<view class="coreshop-list-item">
|
||||||
<view class="coreshop-avatar radius">
|
<view class="coreshop-avatar radius">
|
||||||
@@ -10,8 +10,11 @@
|
|||||||
<view class="content">
|
<view class="content">
|
||||||
<view class="coreshop-text-grey">{{ item.name }}</view>
|
<view class="coreshop-text-grey">{{ item.name }}</view>
|
||||||
<view class="coreshop-text-gray coreshop-font-sm flex coreshop-text-left">
|
<view class="coreshop-text-gray coreshop-font-sm flex coreshop-text-left">
|
||||||
<view class="u-line-1">
|
<view class="u-line-1 coreshop-text-red" v-if="item.code == 'balancepay'">
|
||||||
{{ item.memo }}
|
当前余额:{{userInfo.balance}}元
|
||||||
|
</view>
|
||||||
|
<view class="u-line-1" v-else>
|
||||||
|
{{item.memo}}
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@@ -36,6 +39,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
import { mapMutations, mapActions, mapState } from 'vuex';
|
||||||
export default {
|
export default {
|
||||||
props: {
|
props: {
|
||||||
// 如果是商品订单此参数必须
|
// 如果是商品订单此参数必须
|
||||||
@@ -77,6 +81,19 @@
|
|||||||
|
|
||||||
this.getPayments()
|
this.getPayments()
|
||||||
},
|
},
|
||||||
|
computed: {
|
||||||
|
...mapState({
|
||||||
|
userInfo: state => state.userInfo,
|
||||||
|
}),
|
||||||
|
userInfo: {
|
||||||
|
get() {
|
||||||
|
return this.$store.state.userInfo;
|
||||||
|
},
|
||||||
|
set(val) {
|
||||||
|
this.$store.commit('userInfo', val);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
methods: {
|
methods: {
|
||||||
// 获取可用支付方式列表
|
// 获取可用支付方式列表
|
||||||
getPayments() {
|
getPayments() {
|
||||||
|
|||||||
@@ -348,6 +348,10 @@
|
|||||||
console.log(options);
|
console.log(options);
|
||||||
var _this = this;
|
var _this = this;
|
||||||
//下单前置检查,自定义交易组件检测场景是否需要推送订单到微信服务。
|
//下单前置检查,自定义交易组件检测场景是否需要推送订单到微信服务。
|
||||||
|
// #ifdef H5|APP-PLUS|APP-PLUS-NVUE
|
||||||
|
_this.getOrderDistributionModel()
|
||||||
|
// #endif
|
||||||
|
// #ifdef MP
|
||||||
wx.checkBeforeAddOrder({
|
wx.checkBeforeAddOrder({
|
||||||
success(res) {
|
success(res) {
|
||||||
console.log('下单前置检查', res);
|
console.log('下单前置检查', res);
|
||||||
@@ -358,7 +362,6 @@
|
|||||||
|
|
||||||
// 获取不同类型营销下单支持的配送方式
|
// 获取不同类型营销下单支持的配送方式
|
||||||
_this.getOrderDistributionModel()
|
_this.getOrderDistributionModel()
|
||||||
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
fail(res) {
|
fail(res) {
|
||||||
@@ -368,6 +371,7 @@
|
|||||||
_this.getOrderDistributionModel()
|
_this.getOrderDistributionModel()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
// #endif
|
||||||
|
|
||||||
let cartIds = options.cartIds;
|
let cartIds = options.cartIds;
|
||||||
if (options.orderType) {
|
if (options.orderType) {
|
||||||
|
|||||||
Reference in New Issue
Block a user