bingyi/shopxo
1
0
Fork 0
mirror of https://gitee.com/zongzhige/shopxo.git synced 2026-06-07 10:22:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

线下支付逻辑优化

Browse Source
This commit is contained in:
devil
2020-04-07 17:29:57 +08:00
parent 59070118a2
commit 01dd8a1480
30 changed files with 632 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
sourcecode/qq/app.js
View File

@ -555,6 +555,49 @@ App({
}
},
/**
* alert确认框
* title [string] 标题（默认空）
* msg [string] 提示信息，必传
* is_show_cancel [int] 是否显示取消按钮（默认显示 0否, 1|undefined是）
* cancel_text [string] 取消按钮文字（默认 取消）
* cancel_color [string] 取消按钮的文字颜色，必须是 16 进制格式的颜色字符串（默认 #000000）
* confirm_text [string] 确认按钮文字（默认 确认）
* confirm_color [string] 确认按钮的文字颜色，必须是 16 进制格式的颜色字符串（默认 #000000）
* object [boject] 回调操作对象，点击确认回调参数1，取消回调0
* method [string] 回调操作对象的函数
*/
alert(e)
{
var msg = e.msg || null;
if (msg != null)
{
var title = e.title || '';
var is_show_cancel = (e.is_show_cancel == 0) ? false : true;
var cancel_text = e.cancel_text || '取消';
var confirm_text = e.confirm_text || '确认';
var cancel_color = e.cancel_color || '';
var confirm_color = e.confirm_color || '';
qq.showModal({
title: title,
content: msg,
showCancel: is_show_cancel,
cancelText: cancel_text,
cancelColor: cancel_color,
confirmText: confirm_text,
confirmColor: confirm_color,
success(res) {
if ((e.object || null) != null && typeof e.object === 'object' && (e.method || null) != null) {
e.object[e.method](res.confirm ? 1 : 0);
}
}
});
} else {
self.showToast('提示信息为空 alert');
}
},
/**
* 是否需要登录
* 是否需要绑定手机号码

2
sourcecode/qq/pages/user-order-detail/user-order-detail.js
View File

@ -54,7 +54,7 @@ Page({
{name: "优惠金额", value: data.data.preferential_price || ''},
{name: "增加金额", value: data.data.increase_price || '' },
{name: "支付金额", value: data.data.pay_price || ''},
{name: "支付方式", value: data.data.payment_name || ''},
{name: "支付方式", value: (data.data.payment_name || '') + ((data.data.is_under_line_text || null) == null ? '' : '（' + data.data.is_under_line_text +'）')},
{name: "快递公司", value: data.data.express_name || ''},
{name: "快递单号", value: data.data.express_number || ''},
{name: "用户留言", value: data.data.user_note || ''},

58
sourcecode/qq/pages/user-order/user-order.js
View File

@ -234,29 +234,45 @@ Page({
success: res => {
qq.hideLoading();
if (res.data.code == 0) {
// 是否在线支付,非在线支付则支付成功
if (res.data.data.is_online_pay == 0) {
// 数据设置
self.order_item_pay_success_handle(index);
// 支付方式类型
switch (res.data.data.is_payment_type) {
// 正常线上支付
case 0 :
qq.requestPayment({
package: res.data.data.data,
success: function(res) {
// 数据设置
self.order_item_pay_success_handle(index);
app.showToast("支付成功", "success");
} else {
qq.requestPayment({
package: res.data.data.data,
success: function(res) {
// 数据设置
self.order_item_pay_success_handle(index);
// 跳转支付页面
qq.navigateTo({
url: "/pages/paytips/paytips?code=9000&total_price=" +
self.data.data_list[index]['total_price']
});
},
fail: function (res) {
app.showToast('支付失败');
}
});
break;
// 跳转支付页面
qq.navigateTo({
url: "/pages/paytips/paytips?code=9000&total_price=" +
self.data.data_list[index]['total_price']
});
},
fail: function (res) {
app.showToast('支付失败');
}
});
// 线下支付
case 1 :
var temp_data_list = self.data.data_list;
temp_data_list[index]['is_under_line'] = 1;
self.setData({ data_list: temp_data_list });
app.alert({ msg: res.data.msg, is_show_cancel: 0});
break;
// 钱包支付
case 2 :
self.order_item_pay_success_handle(index);
app.showToast('支付成功', 'success');
break;
// 默认
default :
app.showToast('支付类型有误');
}
} else {
app.showToast(res.data.msg);

6
sourcecode/qq/pages/user-order/user-order.qml
View File

@ -12,7 +12,9 @@
<view class="list-item bg-white spacing-mb" qq:if="{{data_list.length > 0}}" qq:for="{{data_list}}" qq:key="key">
<view class="item-base oh br-b">
<text class="cr-666">{{item.add_time}}</text>
<text class="fr cr-main">{{item.status_name}}</text>
<text class="fr cr-main">
{{item.status_name}}<text qq:if="{{(item.is_under_line_text || null) != null}}">（{{item.is_under_line_text}}）</text>
</text>
</view>
<view qq:for="{{item.items}}" qq:key="key" qq:for-item="detail" class="goods-item br-b-dashed oh">
<navigator url="/pages/user-order-detail/user-order-detail?id={{item.id}}" hover-class="none">
@ -36,7 +38,7 @@
<view class="item-describe tr cr-666">{{item.describe}}</view>
<view qq:if="{{item.status == 1 || item.status == 3 || (item.status == 4 && item.user_is_comments == 0) || (item.status == 2 && item.order_model != 2)}}" class="item-operation tr br-t">
<button qq:if="{{item.status <= 1}}" class="submit-cancel" type="default" size="mini" bindtap="cancel_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">取消</button>
<button qq:if="{{item.status == 1}}" class="submit-pay cr-666 br" type="default" size="mini" bindtap="pay_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">支付</button>
<button qq:if="{{item.status == 1}}" class="submit-pay cr-666 br" type="default" size="mini" bindtap="pay_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">{{item.is_under_line == 1 ? '切换' : ''}}支付</button>
<button qq:if="{{item.status == 2 && item.order_model != 2}}" class="submit-rush cr-666 br" type="default" size="mini" bindtap="rush_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">催催</button>
<button qq:if="{{item.status == 3}}" class="submit-success cr-666 br" type="default" size="mini" bindtap="collect_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">收货</button>
<button qq:if="{{item.status == 4 && item.user_is_comments == 0}}" class="submit-success cr-666 br" type="default" size="mini" bindtap="comments_event" data-value="{{item.id}}" data-index="{{index}}" hover-class="none">评论</button>