File tree Expand file tree Collapse file tree 4 files changed +34
-5
lines changed Expand file tree Collapse file tree 4 files changed +34
-5
lines changed Original file line number Diff line number Diff line change @@ -148,6 +148,10 @@ export const PayChannelEnum = {
148
148
"code" : "alipay_qr" ,
149
149
"name" : "支付宝扫码支付"
150
150
} ,
151
+ ALIPAY_BAR : {
152
+ "code" : "alipay_bar" ,
153
+ "name" : "支付宝条码支付"
154
+ } ,
151
155
}
152
156
153
157
/**
Original file line number Diff line number Diff line change 53
53
</template >
54
54
</el-table-column >
55
55
<el-table-column label =" 商户名称" align =" center" prop =" payMerchant.name" />
56
- <el-table-column label =" 创建时间" align =" center" prop =" createTime" width =" 180" >
57
- <template v-slot =" scope " >
58
- <span >{{ parseTime(scope.row.createTime) }}</span >
59
- </template >
60
- </el-table-column >
61
56
<el-table-column label =" 支付宝配置" align =" center" >
62
57
<el-table-column :label =" payChannelEnum.ALIPAY_APP.name" align =" center" >
63
58
<template v-slot =" scope " >
107
102
</el-button >
108
103
</template >
109
104
</el-table-column >
105
+ <el-table-column :label =" payChannelEnum.ALIPAY_BAR.name" align =" center" >
106
+ <template v-slot =" scope " >
107
+ <el-button type =" success" icon =" el-icon-check" circle
108
+ v-if =" judgeChannelExist(scope.row.channelCodes,payChannelEnum.ALIPAY_BAR.code)"
109
+ @click =" handleUpdateChannel(scope.row,payChannelEnum.ALIPAY_BAR.code,payType.ALIPAY)" >
110
+ </el-button >
111
+ <el-button v-else
112
+ type =" danger" icon =" el-icon-close" circle
113
+ @click =" handleCreateChannel(scope.row,payChannelEnum.ALIPAY_BAR.code,payType.ALIPAY)" >
114
+ </el-button >
115
+ </template >
116
+ </el-table-column >
110
117
</el-table-column >
111
118
<el-table-column label =" 微信配置" align =" center" >
112
119
<el-table-column :label =" payChannelEnum.WX_LITE.name" align =" center" >
Original file line number Diff line number Diff line change @@ -82,6 +82,7 @@ export default {
82
82
alipay_app: require (" @/assets/images/pay/icon/alipay_app.svg" ),
83
83
alipay_wap: require (" @/assets/images/pay/icon/alipay_wap.svg" ),
84
84
alipay_pc: require (" @/assets/images/pay/icon/alipay_pc.svg" ),
85
+ alipay_bar: require (" @/assets/images/pay/icon/alipay_bar.svg" ),
85
86
wx_app: require (" @/assets/images/pay/icon/wx_app.svg" ),
86
87
wx_lite: require (" @/assets/images/pay/icon/wx_lite.svg" ),
87
88
wx_pub: require (" @/assets/images/pay/icon/wx_pub.svg" ),
@@ -102,6 +103,11 @@ export default {
102
103
form: { // 展示形式:form
103
104
html: ' ' ,
104
105
},
106
+ barCode: { // 展示形式:条形码
107
+ value: ' ' ,
108
+ title: ' ' ,
109
+ visible: false ,
110
+ },
105
111
};
106
112
},
107
113
created () {
@@ -155,6 +161,16 @@ export default {
155
161
},
156
162
/** 提交支付 */
157
163
submit (channelCode ) {
164
+ // 条形码支付,需要特殊处理
165
+ if (channelCode === PayChannelEnum .ALIPAY_BAR .code ) {
166
+
167
+ return ;
168
+ }
169
+
170
+ // 默认的提交处理
171
+ this .submit0 (channelCode)
172
+ },
173
+ submit0 (channelCode ) {
158
174
this .submitLoading = true
159
175
submitOrder ({
160
176
id: this .id ,
You can’t perform that action at this time.
0 commit comments