diff --git a/sourcecode/alipay/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.axml b/sourcecode/alipay/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.axml
index 2d6132f1f..75430074f 100644
--- a/sourcecode/alipay/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.axml
+++ b/sourcecode/alipay/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.axml
@@ -116,8 +116,8 @@
- 退款说明必填
-
+ 退款说明选填
+
diff --git a/sourcecode/alipay/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.js b/sourcecode/alipay/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
index bba5acc56..51660015e 100644
--- a/sourcecode/alipay/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
+++ b/sourcecode/alipay/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
@@ -353,8 +353,7 @@ Page({
// 数据校验
var validation = [
{ fields: "type", msg: "请选择操作类型", is_can_zero: 1 },
- { fields: "reason", msg: "请选择原因" },
- { fields: "msg", msg: "请填写退款说明" }
+ { fields: "reason", msg: "请选择原因" }
];
if (form_data['type'] == 1)
{
diff --git a/sourcecode/baidu/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.js b/sourcecode/baidu/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
index a2d0ce065..565e2e948 100644
--- a/sourcecode/baidu/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
+++ b/sourcecode/baidu/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
@@ -328,7 +328,10 @@ Page({
}
// 数据校验
- var validation = [{ fields: "type", msg: "请选择操作类型", is_can_zero: 1 }, { fields: "reason", msg: "请选择原因" }, { fields: "msg", msg: "请填写退款说明" }];
+ var validation = [
+ { fields: "type", msg: "请选择操作类型", is_can_zero: 1 },
+ { fields: "reason", msg: "请选择原因" }
+ ];
if (form_data['type'] == 1) {
validation.push({ fields: "number", msg: "请选择退货数量" });
}
diff --git a/sourcecode/baidu/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.swan b/sourcecode/baidu/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.swan
index 08f44aeac..efb4c709a 100644
--- a/sourcecode/baidu/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.swan
+++ b/sourcecode/baidu/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.swan
@@ -116,8 +116,8 @@
- 退款说明必填
-
+ 退款说明选填
+
diff --git a/sourcecode/qq/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.js b/sourcecode/qq/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
index d5bdf2863..5ca50e09d 100644
--- a/sourcecode/qq/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
+++ b/sourcecode/qq/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
@@ -350,8 +350,7 @@ Page({
// 数据校验
var validation = [
{ fields: "type", msg: "请选择操作类型", is_can_zero: 1 },
- { fields: "reason", msg: "请选择原因" },
- { fields: "msg", msg: "请填写退款说明" }
+ { fields: "reason", msg: "请选择原因" }
];
if (form_data['type'] == 1)
{
diff --git a/sourcecode/qq/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.qml b/sourcecode/qq/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.qml
index 8d6c7b493..24ecacdb6 100644
--- a/sourcecode/qq/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.qml
+++ b/sourcecode/qq/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.qml
@@ -116,8 +116,8 @@
- 退款说明必填
-
+ 退款说明选填
+
diff --git a/sourcecode/toutiao/default/pages/plugins/membershiplevelvip/order/order.js b/sourcecode/toutiao/default/pages/plugins/membershiplevelvip/order/order.js
index 96210c59e..2efde73f3 100644
--- a/sourcecode/toutiao/default/pages/plugins/membershiplevelvip/order/order.js
+++ b/sourcecode/toutiao/default/pages/plugins/membershiplevelvip/order/order.js
@@ -227,13 +227,12 @@ Page({
// 支付方法
pay_handle(order_id, index) {
- var self = this; // 加载loding
-
+ var self = this;
tt.showLoading({
title: "请求中..."
});
tt.request({
- url: app.get_request_url("pay", "toutiao", "membershiplevelvip"),
+ url: app.get_request_url("pay", "buy", "membershiplevelvip"),
method: "POST",
data: {
id: order_id,
@@ -242,33 +241,26 @@ Page({
dataType: "json",
success: res => {
tt.hideLoading();
-
if (res.data.code == 0) {
var data = res.data.data;
tt.pay({
- orderInfo: data.order_info,
- service: data.service,
+ orderInfo: data.data,
+ service: 5,
success(res) {
- // if (res.code == 0) {
- // // 数据设置
- // self.order_item_pay_success_handle(index); // 跳转支付页面
+ if (res.code == 0) {
+ // 数据设置
+ self.order_item_pay_success_handle(index);
- // tt.navigateTo({
- // url: "/pages/paytips/paytips?code=9000&total_price=" + self.data.data_list[index]['price']
- // });
- // } else {
- // app.showToast('支付失败');
- // }
-
- // 由于头条支付无法监听支付状态，这里就不做接口轮询了，直接刷新页面
- self.setData({
- data_page: 1
- });
- self.get_data_list(1);
+ // 跳转支付页面
+ tt.navigateTo({
+ url: "/pages/paytips/paytips?code=9000"
+ });
+ } else {
+ app.showToast('支付失败');
+ }
},
fail(res) {
- console.log(res, 'pay-fail')
- app.showToast('调起收银台失败-'+res.data.code);
+ app.showToast('调起收银台失败-'+res.errMsg);
}
});
} else {
diff --git a/sourcecode/toutiao/default/pages/plugins/wallet/user-recharge/user-recharge.js b/sourcecode/toutiao/default/pages/plugins/wallet/user-recharge/user-recharge.js
index d5eca8873..a8f60fac6 100644
--- a/sourcecode/toutiao/default/pages/plugins/wallet/user-recharge/user-recharge.js
+++ b/sourcecode/toutiao/default/pages/plugins/wallet/user-recharge/user-recharge.js
@@ -227,7 +227,7 @@ Page({
title: "请求中..."
});
tt.request({
- url: app.get_request_url("pay", "toutiao", "wallet"),
+ url: app.get_request_url("pay", "recharge", "wallet"),
method: "POST",
data: {
recharge_id: recharge_id,
@@ -236,33 +236,26 @@ Page({
dataType: "json",
success: res => {
tt.hideLoading();
-
if (res.data.code == 0) {
var data = res.data.data;
tt.pay({
- orderInfo: data.order_info,
- service: data.service,
+ orderInfo: data.data,
+ service: 5,
success(res) {
- // if (res.code == 0) {
- // // 数据设置
- // self.order_item_pay_success_handle(index); // 跳转支付页面
+ if (res.code == 0) {
+ // 数据设置
+ self.order_item_pay_success_handle(index);
- // tt.navigateTo({
- // url: "/pages/paytips/paytips?code=9000&total_price=" + self.data.data_list[index]['money']
- // });
- // } else {
- // app.showToast('支付失败');
- // }
-
- // 由于头条支付无法监听支付状态，这里就不做接口轮询了，直接刷新页面
- self.setData({
- data_page: 1
- });
- self.get_data_list(1);
+ // 跳转支付页面
+ tt.navigateTo({
+ url: "/pages/paytips/paytips?code=9000"
+ });
+ } else {
+ app.showToast('支付失败');
+ }
},
- fail: function (res) {
- console.log(res, 'pay-fail')
- app.showToast('调起收银台失败-'+res.data.code);
+ fail(res) {
+ app.showToast('调起收银台失败-'+res.errMsg);
}
});
} else {
diff --git a/sourcecode/toutiao/default/pages/user-order/user-order.js b/sourcecode/toutiao/default/pages/user-order/user-order.js
index aecaf80ca..f8389ff3f 100755
--- a/sourcecode/toutiao/default/pages/user-order/user-order.js
+++ b/sourcecode/toutiao/default/pages/user-order/user-order.js
@@ -246,7 +246,7 @@ Page({
title: "请求中..."
});
tt.request({
- url: app.get_request_url("pay", "toutiao"),
+ url: app.get_request_url("pay", "order"),
method: "POST",
data: {
ids: order_ids,
@@ -268,31 +268,23 @@ Page({
case 0:
var data = res.data.data;
tt.pay({
- orderInfo: data.order_info,
- service: data.service,
+ orderInfo: data.data,
+ service: 5,
success(res) {
- // if (res.code == 0) {
- // // 数据设置
- // self.order_item_pay_success_handle(index);
+ if (res.code == 0) {
+ // 数据设置
+ self.order_item_pay_success_handle(order_ids);
- // // 跳转支付页面
- // tt.navigateTo({
- // url: "/pages/paytips/paytips?code=9000&total_price=" +
- // self.data.data_list[index]['total_price']
- // });
- // } else {
- // app.showToast('支付失败');
- // }
-
- // 由于头条支付无法监听支付状态，这里就不做接口轮询了，直接刷新页面
- self.setData({
- data_page: 1
- });
- self.get_data_list(1);
+ // 跳转支付页面
+ tt.navigateTo({
+ url: "/pages/paytips/paytips?code=9000"
+ });
+ } else {
+ app.showToast('支付失败');
+ }
},
fail(res) {
- console.log(res, 'pay-fail');
- app.showToast('调起收银台失败-'+res.data.code);
+ app.showToast('调起收银台失败-'+res.errMsg);
}
});
break;
@@ -342,8 +334,9 @@ Page({
// 支付成功数据设置
order_item_pay_success_handle(order_ids) {
var order_ids_arr = order_ids.split(',');
- var temp_data_list = this.data.data_list; // 数据设置
+ var temp_data_list = this.data.data_list;
+ // 数据设置
for (var i in temp_data_list) {
if (order_ids_arr.indexOf(temp_data_list[i]['id']) != -1) {
switch (parseInt(temp_data_list[i]['order_model'])) {
diff --git a/sourcecode/toutiao/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.js b/sourcecode/toutiao/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
index 3df92651b..6e244f717 100644
--- a/sourcecode/toutiao/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
+++ b/sourcecode/toutiao/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
@@ -356,8 +356,7 @@ Page({
// 数据校验
var validation = [
{ fields: "type", msg: "请选择操作类型", is_can_zero: 1 },
- { fields: "reason", msg: "请选择原因" },
- { fields: "msg", msg: "请填写退款说明" }
+ { fields: "reason", msg: "请选择原因" }
];
if (form_data['type'] == 1)
{
diff --git a/sourcecode/toutiao/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.ttml b/sourcecode/toutiao/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.ttml
index 3cd0ca7f2..35f778d32 100644
--- a/sourcecode/toutiao/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.ttml
+++ b/sourcecode/toutiao/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.ttml
@@ -116,8 +116,8 @@
- 退款说明必填
-
+ 退款说明选填
+
diff --git a/sourcecode/weixin/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.js b/sourcecode/weixin/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
index c6097b35f..d4aff8cde 100644
--- a/sourcecode/weixin/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
+++ b/sourcecode/weixin/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
@@ -352,8 +352,7 @@ Page({
// 数据校验
var validation = [
{ fields: "type", msg: "请选择操作类型", is_can_zero: 1 },
- { fields: "reason", msg: "请选择原因" },
- { fields: "msg", msg: "请填写退款说明" }
+ { fields: "reason", msg: "请选择原因" }
];
if (form_data['type'] == 1)
{
diff --git a/sourcecode/weixin/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.wxml b/sourcecode/weixin/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.wxml
index acddab27a..a17d61832 100644
--- a/sourcecode/weixin/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.wxml
+++ b/sourcecode/weixin/default/pages/user-orderaftersale-detail/user-orderaftersale-detail.wxml
@@ -116,8 +116,8 @@
- 退款说明必填
-
+ 退款说明选填
+