diff --git a/components/payment/index.vue b/components/payment/index.vue
index 7dd92d9..60eef8b 100644
--- a/components/payment/index.vue
+++ b/components/payment/index.vue
@@ -4,13 +4,13 @@
选择付款方式
-
+
{{item.name}}
-
- {{item.title}} ¥{{ item.number }}
+
+ {{item.title}} ¥{{ item.number || '0.00' }}
{{item.title}}
@@ -24,343 +24,419 @@
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index 4708651..89ce0d8 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -286,7 +286,7 @@
-
+
@@ -353,29 +353,6 @@
isGoodsReturn: false, //是否为退款订单
status: {}, //订单底部按钮状态
isClose: false,
- payMode: [{
- name: "微信支付",
- icon: "icon-weixinzhifu",
- value: 'wechat',
- title: '微信快捷支付',
- payStatus: 1
- },
- {
- name: "支付宝支付",
- icon: "icon-zhifubao",
- value: 'alipay',
- title: '支付宝支付',
- payStatus: this.$store.getters.globalData.alipay_open
- },
- {
- name: "余额支付",
- icon: "icon-yuezhifu",
- value: 'balance',
- title: '可用余额:',
- number: 0,
- payStatus: this.$store.getters.globalData.yue_pay_status
- }
- ],
pay_close: false,
pay_order_id: '',
totalPrice: '0',
@@ -712,9 +689,6 @@
*/
getUserInfo: function() {
let that = this;
- getUserInfo().then(res => {
- that.payMode[2].number = res.data.now_money;
- })
},
getOrderCode(){
verifyCode(this.order_id).then(res=>{
diff --git a/pages/order_details/stay.vue b/pages/order_details/stay.vue
index 31d582a..5855dfa 100644
--- a/pages/order_details/stay.vue
+++ b/pages/order_details/stay.vue
@@ -169,7 +169,7 @@
-
+
@@ -671,29 +671,6 @@
isGoodsReturn: false, //是否为退款订单
status: {}, //订单底部按钮状态
isClose: false,
- payMode: [{
- name: "微信支付",
- icon: "icon-weixinzhifu",
- value: 'wechat',
- title: '微信快捷支付',
- payStatus: 1
- },
- {
- name: "支付宝支付",
- icon: "icon-zhifubao",
- value: 'alipay',
- title: '支付宝支付',
- payStatus: this.$store.getters.globalData.alipay_open
- },
- {
- name: "余额支付",
- icon: "icon-yuezhifu",
- value: 'balance',
- title: '可用余额:',
- number: 0,
- payStatus: this.$store.getters.globalData.yue_pay_status
- },
- ],
pay_close: false,
pay_order_id: '',
totalPrice: '0',
@@ -706,14 +683,7 @@
}
};
},
- watch: {
- alipay_open(n){
- this.payMode[1].payStatus = n
- },
- yue_pay_status(n){
- this.payMode[2].payStatus = n
- }
- },
+ watch: {},
computed: configMap({hide_mer_status:0,alipay_open:0,yue_pay_status:0},
mapGetters(['isLogin','uid','viewColor','keyColor'])),
onLoad: function(options) {
@@ -872,10 +842,6 @@
*/
getUserInfo: function() {
let that = this;
- getUserInfo().then(res => {
- that.payMode[2].number = res.data.now_money;
- that.$set(that, 'payMode', that.payMode);
- })
},
/**
* 获取订单详细信息
diff --git a/pages/points_mall/exchange_record.vue b/pages/points_mall/exchange_record.vue
index eaeea96..b8adc1a 100644
--- a/pages/points_mall/exchange_record.vue
+++ b/pages/points_mall/exchange_record.vue
@@ -50,16 +50,16 @@
-
+
@@ -604,7 +571,7 @@
}
.order-details .wrapper .actualPay .money {
font-weight: bold;
- font-size: 30rpx;
+ font-size: 30rpx;
}
.order-details .footer {
width: 100%;
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index 61573cf..b13922d 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -245,7 +245,7 @@
-
+
@@ -300,29 +300,6 @@
page: 1,
limit: 20,
domain: HTTP_REQUEST_URL,
- payMode: [{
- name: "微信支付",
- icon: "icon-weixinzhifu",
- value: 'wechat',
- title: '微信快捷支付',
- payStatus: 1
- },
- {
- name: "支付宝支付",
- icon: "icon-zhifubao",
- value: 'alipay',
- title: '支付宝支付',
- payStatus: this.$store.getters.globalData.alipay_open
- },
- {
- name: "余额支付",
- icon: "icon-yuezhifu",
- value: 'balance',
- title: '可用余额:',
- number: 0,
- payStatus: this.$store.getters.globalData.yue_pay_status
- }
- ],
pay_close: false,
pay_order_id: '',
invoice_order_id: '',
@@ -337,6 +314,7 @@
// 余额切换相关
user_balance: 0.00,
mer_balance: 0.00,
+ use_balance: 0.00,
is_with_goods: 0,
};
},
@@ -349,14 +327,7 @@
...mapGetters(['isLogin','uid','viewColor', 'shopIsLogin', 'shopMerId']),
...configMap(['hide_mer_status', 'community_status', 'alipay_open', 'yue_pay_status']),
},
- watch: {
- alipay_open(n){
- this.payMode[1].payStatus = n
- },
- yue_pay_status(n){
- this.payMode[2].payStatus = n
- }
- },
+ watch: {},
onShow() {
if (this.isLogin) {
this.page = 1;
@@ -412,7 +383,6 @@
let that = this;
getUserInfo().then(res => {
that.user_balance = res.data.now_money || 0.00;
- that.payMode[2].number = res.data.now_money;
});
if(that.shopIsLogin){
getStoreDetail(that.shopMerId).then(res => {
@@ -475,8 +445,8 @@
// 打开支付组件
goPay: function(item) {
// 根据订单类型 判断显示用户余额还是商户余额
- if(item.activity_type == 35) this.payMode[2].number = this.mer_balance || 0.00;
- else this.payMode[2].number = this.user_balance || 0.00;
+ if(item.activity_type == 35) this.use_balance = this.mer_balance || 0.00;
+ else this.use_balance = this.user_balance || 0.00;
// 显示支付弹框
this.$set(this, 'pay_close', true);
this.order_id = item.group_order_id;
diff --git a/pages/users/order_list/search.vue b/pages/users/order_list/search.vue
index fd51d10..ca8fcdd 100644
--- a/pages/users/order_list/search.vue
+++ b/pages/users/order_list/search.vue
@@ -53,15 +53,15 @@
-
+
-
+
{{goods.cart_info.product.store_name}}
-
+
¥{{goods.cart_info.activeSku.active_price}}
x{{goods.product_num}}
@@ -71,7 +71,7 @@
x{{goods.product_num}}
-
+
@@ -198,7 +198,7 @@
-
+
@@ -247,29 +247,6 @@
page: 1,
limit: 20,
focus: true,
- payMode: [{
- name: "微信支付",
- icon: "icon-weixinzhifu",
- value: 'wechat',
- title: '微信快捷支付',
- payStatus: 1
- },
- {
- name: "支付宝支付",
- icon: "icon-zhifubao",
- value: 'alipay',
- title: '支付宝支付',
- payStatus: this.$store.getters.globalData.alipay_open
- },
- {
- name: "余额支付",
- icon: "icon-yuezhifu",
- value: 'balance',
- title: '可用余额:',
- number: 0,
- payStatus: this.$store.getters.globalData.yue_pay_status
- }
- ],
pay_close: false,
pay_order_id: '',
totalPrice: '0',
@@ -283,14 +260,7 @@
...mapGetters(['isLogin','viewColor']),
...configMap(['hide_mer_status', 'community_status', 'alipay_open', 'yue_pay_status']),
},
- watch: {
- alipay_open(n){
- this.payMode[1].payStatus = n
- },
- yue_pay_status(n){
- this.payMode[2].payStatus = n
- }
- },
+ watch: {},
onShow() {
if (this.isLogin) {
this.page = 1;
@@ -340,10 +310,6 @@
*/
getUserInfo: function() {
let that = this;
- getUserInfo().then(res => {
- that.payMode[2].number = res.data.now_money;
- // that.$set(that, 'payMode', that.payMode);
- });
},
/**
* 关闭支付组件
@@ -632,7 +598,7 @@
onReachBottom: function() {
this.getOrderList();
},
-
+
}
@@ -897,25 +863,25 @@
}
}
}
-
+
.search {
height: 60rpx;
padding: 0 30rpx;
border-radius: 30rpx;
background-color: #FFFFFF;
font-size: 26rpx;
-
+
.iconfont {
margin-right: 10rpx;
font-size: 26rpx;
color: #999999;
}
-
+
.input-placeholder {
font-size: 26rpx;
color: #999999;
}
-
+
.input {
flex: 1;
}
diff --git a/pages/users/presell_order_list/index.vue b/pages/users/presell_order_list/index.vue
index 7b75278..ac5e2c4 100644
--- a/pages/users/presell_order_list/index.vue
+++ b/pages/users/presell_order_list/index.vue
@@ -15,7 +15,7 @@
等待买家付尾款
未开始
交易已关闭
-
+
@@ -63,7 +63,7 @@
-
+
@@ -110,29 +110,6 @@
orderStatus: 0, //订单状态
page: 1,
limit: 20,
- payMode: [{
- name: "微信支付",
- icon: "icon-weixinzhifu",
- value: 'wechat',
- title: '微信快捷支付',
- payStatus: 1
- },
- {
- name: "支付宝支付",
- icon: "icon-zhifubao",
- value: 'alipay',
- title: '支付宝支付',
- payStatus: this.$store.getters.globalData.alipay_open
- },
- {
- name: "余额支付",
- icon: "icon-yuezhifu",
- value: 'balance',
- title: '可用余额:',
- number: 0,
- payStatus: this.$store.getters.globalData.yue_pay_status
- }
- ],
pay_close: false,
pay_order_id: '',
totalPrice: '0',
@@ -191,10 +168,6 @@
*/
getUserInfo: function() {
let that = this;
- getUserInfo().then(res => {
- that.payMode[2].number = res.data.now_money;
- // that.$set(that, 'payMode', that.payMode);
- });
},
/**
* 关闭支付组件
diff --git a/pages/users/user_payment/index.vue b/pages/users/user_payment/index.vue
index 7d2efc3..57d193e 100644
--- a/pages/users/user_payment/index.vue
+++ b/pages/users/user_payment/index.vue
@@ -47,8 +47,7 @@
-
+
@@ -99,37 +98,6 @@
statusBarHeight: statusBarHeight,
pay_close: false,
totalPrice: '0',
- payMode: [{
- name: '微信支付',
- icon: 'icon-weixinzhifu',
- // #ifdef H5
- value: this.$wechat.isWeixin() ? 'weixin' : 'h5',
- // #endif
- // #ifdef MP
- value: 'routine',
- // #endif
- // #ifdef APP-PLUS
- value: 'weixin',
- // #endif
- title: '微信快捷支付',
- payStatus: true
- }
- // #ifdef H5 ||APP-PLUS
- ,
- {
- name: '支付宝支付',
- icon: 'icon-zhifubao',
- // #ifdef H5 || APP-PLUS
- value: 'alipay',
- // #endif
- // #ifdef MP
- value: 'alipayQr',
- // #endif
- title: '支付宝支付',
- payStatus: true
- }
- // #endif
- ],
};
},
computed: mapGetters(['viewColor','isLogin','uid']),