sileya-ai
/
vr-shopxo-source
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

小程序细节优化

feat/task1-c-wallet
devil_gong 2019-12-02 14:10:45 +08:00
parent 667901a969
commit 0c9ebcf3e8
13 changed files with 160 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
application/service/ToutiaoService.php
View File

@ -33,16 +33,7 @@ class ToutiaoService
* @param [array] $params [输入参数]
*/
public static function Pay($params = [])
{
// 配置信息
$merchant_id = MyC('common_app_mini_toutiao_pay_merchant_id');
$app_id = MyC('common_app_mini_toutiao_pay_appid');
$pay_secret = MyC('common_app_mini_toutiao_pay_secret');
if(empty($merchant_id) || empty($app_id) || empty($pay_secret))
{
return DataReturn('小程序未配置', -1);
}
{
// 获取支付信息
$ret = OrderService::Pay($params);
if($ret['code'] != 0)
@ -50,56 +41,71 @@ class ToutiaoService
return $ret;
}
// 获取订单信息
$where = ['id'=>intval($params['id']), 'user_id' => $params['user']['id']];
$order = Db::name('Order')->where($where)->find();
// 支付方式
$payment_id = empty($params['payment_id']) ? $order['payment_id'] : intval($params['payment_id']);
$payment = PaymentService::PaymentList(['where'=>['id'=>$payment_id]]);
// 头条需要的订单信息
$order_info = [
'merchant_id' => $merchant_id,
'app_id' => $app_id,
'sign_type' => 'MD5',
'timestamp' => time(),
'version' => '2.0',
'trade_type' => 'H5',
'product_code' => 'pay',
'payment_type' => 'direct',
'out_order_no' => $order['order_no'].GetNumberCode(6),
'uid' => md5($params['user']['id']),
'total_amount' => $order['total_price']*100,
'currency' => 'CNY',
'subject' => '订单支付',
'body' => $order['order_no'],
'trade_time' => time(),
'valid_time' => intval(MyC('common_order_close_limit_time', 30, true))*60,
'notify_url' => __MY_URL__,
];
// 支付方式
$service = 1;
switch($payment[0]['payment'])
// 线上支付信息处理
$order_info = [];
$service = 0;
if($ret['data']['is_online_pay'] == 1)
{
// 微信
case 'Weixin' :
$service = 3;
$order_info['wx_url'] = $ret['data']['data'];
$order_info['wx_type'] = 'MWEB';
break;
// 配置信息
$merchant_id = MyC('common_app_mini_toutiao_pay_merchant_id');
$app_id = MyC('common_app_mini_toutiao_pay_appid');
$pay_secret = MyC('common_app_mini_toutiao_pay_secret');
if(empty($merchant_id) || empty($app_id) || empty($pay_secret))
{
return DataReturn('小程序未配置', -1);
}
// 获取订单信息
$where = ['id'=>intval($params['id']), 'user_id' => $params['user']['id']];
$order = Db::name('Order')->where($where)->find();
// 支付宝
case 'Alipay' :
$service = 4;
$order_info['alipay_url'] = $ret['data']['data'];
break;
// 支付方式
$payment_id = empty($params['payment_id']) ? $order['payment_id'] : intval($params['payment_id']);
$payment = PaymentService::PaymentList(['where'=>['id'=>$payment_id]]);
// 头条需要的订单信息
$order_info = [
'merchant_id' => $merchant_id,
'app_id' => $app_id,
'sign_type' => 'MD5',
'timestamp' => time(),
'version' => '2.0',
'trade_type' => 'H5',
'product_code' => 'pay',
'payment_type' => 'direct',
'out_order_no' => $order['order_no'].GetNumberCode(6),
'uid' => md5($params['user']['id']),
'total_amount' => $order['total_price']*100,
'currency' => 'CNY',
'subject' => '订单支付',
'body' => $order['order_no'],
'trade_time' => time(),
'valid_time' => intval(MyC('common_order_close_limit_time', 30, true))*60,
'notify_url' => __MY_URL__,
];
// 支付方式
$service = 1;
switch($payment[0]['payment'])
{
// 微信
case 'Weixin' :
$service = 3;
$order_info['wx_url'] = $ret['data']['data'];
$order_info['wx_type'] = 'MWEB';
break;
// 支付宝
case 'Alipay' :
$service = 4;
$order_info['alipay_url'] = $ret['data']['data'];
break;
}
// 签名
$order_info['sign'] = (new \base\Toutiao())->PaySignCreated($order_info, $pay_secret);
}
// 签名
$order_info['sign'] = (new \base\Toutiao())->PaySignCreated($order_info, $pay_secret);
// 返回数据
$result = [
'order_info' => $order_info,

4
public/appmini/old/alipay/app.js
View File

@ -67,8 +67,8 @@ App({
// 请求地址
request_url: "{{request_url}}",
request_url: 'http://tp5-dev.com/',
request_url: 'http://dev.shopxo.net/',
// request_url: 'http://tp5-dev.com/',
// request_url: 'http://dev.shopxo.net/',
// 基础信息
application_title: "{{application_title}}",

2
public/appmini/old/alipay/app.json
View File

@ -31,7 +31,7 @@
"pages/extraction-address/extraction-address"
],
"window": {
"defaultTitle": "test",
"defaultTitle": "{{application_title}}",
"titleBarColor": "#d2364c"
},
"tabBar": {

18
public/appmini/old/alipay/pages/cart/cart.js
View File

@ -192,7 +192,11 @@ Page({
// 选择处理
this.selected_calculate();
} else {
app.showToast(res.data.msg);
if (app.is_login_check(res.data)) {
app.showToast(res.data.msg);
} else {
app.showToast('提交失败，请重试！');
}
}
},
fail: () => {
@ -245,7 +249,11 @@ Page({
if (res.data.code == 0) {
this.cart_delete(id, type);
} else {
app.showToast(res.data.msg);
if (app.is_login_check(res.data)) {
app.showToast(res.data.msg);
} else {
app.showToast('提交失败，请重试！');
}
}
},
fail: () => {
@ -273,7 +281,11 @@ Page({
});
app.showToast(((type == 'delete') ? '删除成功' : '收藏成功'), 'success');
} else {
app.showToast((type == 'delete') ? '删除失败' : '收藏失败');
if (app.is_login_check(res.data)) {
app.showToast((type == 'delete') ? '删除失败' : '收藏失败');
} else {
app.showToast('提交失败，请重试！');
}
}
},
fail: () => {

4
public/appmini/old/baidu/app.js
View File

@ -62,8 +62,8 @@ App({
// 请求地址
request_url: "{{request_url}}",
request_url: 'http://tp5-dev.com/',
request_url: 'https://dev.shopxo.net/',
// request_url: 'http://tp5-dev.com/',
// request_url: 'https://dev.shopxo.net/',
// 基础信息
application_title: "{{application_title}}",

18
public/appmini/old/baidu/pages/cart/cart.js
View File

@ -182,7 +182,11 @@ Page({
// 选择处理
this.selected_calculate();
} else {
app.showToast(res.data.msg);
if (app.is_login_check(res.data)) {
app.showToast(res.data.msg);
} else {
app.showToast('提交失败，请重试！');
}
}
},
fail: () => {
@ -202,7 +206,11 @@ Page({
if (res.data.code == 0) {
this.cart_delete(id, type);
} else {
app.showToast(res.data.msg);
if (app.is_login_check(res.data)) {
app.showToast(res.data.msg);
} else {
app.showToast('提交失败，请重试！');
}
}
},
fail: () => {
@ -254,7 +262,11 @@ Page({
app.showToast(type == 'delete' ? '删除成功' : '收藏成功', 'success');
} else {
app.showToast(type == 'delete' ? '删除失败' : '收藏失败');
if (app.is_login_check(res.data)) {
app.showToast((type == 'delete') ? '删除失败' : '收藏失败');
} else {
app.showToast('提交失败，请重试！');
}
}
},
fail: () => {

4
public/appmini/old/qq/app.js
View File

@ -67,8 +67,8 @@ App({
// 请求地址
request_url: "{{request_url}}",
request_url: 'http://tp5-dev.com/',
request_url: 'https://dev.shopxo.net/',
// request_url: 'http://tp5-dev.com/',
// request_url: 'https://dev.shopxo.net/',
// 基础信息
application_title: "{{application_title}}",

18
public/appmini/old/qq/pages/cart/cart.js
View File

@ -183,7 +183,11 @@ Page({
// 选择处理
this.selected_calculate();
} else {
app.showToast(res.data.msg);
if (app.is_login_check(res.data)) {
app.showToast(res.data.msg);
} else {
app.showToast('提交失败，请重试！');
}
}
},
fail: () => {
@ -203,7 +207,11 @@ Page({
if (res.data.code == 0) {
this.cart_delete(id, type);
} else {
app.showToast(res.data.msg);
if (app.is_login_check(res.data)) {
app.showToast(res.data.msg);
} else {
app.showToast('提交失败，请重试！');
}
}
},
fail: () => {
@ -255,7 +263,11 @@ Page({
app.showToast(((type == 'delete') ? '删除成功' : '收藏成功'), 'success');
} else {
app.showToast((type == 'delete') ? '删除失败' : '收藏失败');
if (app.is_login_check(res.data)) {
app.showToast((type == 'delete') ? '删除失败' : '收藏失败');
} else {
app.showToast('提交失败，请重试！');
}
}
},
fail: () => {

4
public/appmini/old/toutiao/app.js
View File

@ -67,8 +67,8 @@ App({
// 请求地址
request_url: "{{request_url}}",
request_url: 'http://tp5-dev.com/',
// request_url: 'https://test.shopxo.net/',
// request_url: 'http://tp5-dev.com/',
// request_url: 'https://dev.shopxo.net/',
// 基础信息
application_title: "{{application_title}}",

1
public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttss
View File

@ -179,6 +179,7 @@
}
.goods-base button {
background: #fff;
padding: 0;
}
.goods-base .goods-share {
position: absolute;

45
public/appmini/old/toutiao/pages/user-order/user-order.js
View File

@ -223,7 +223,7 @@ Page({
tt.showLoading({title: "请求中..." });
tt.request({
url: app.get_request_url("pay", "order"),
url: app.get_request_url("pay", "toutiao"),
method: "POST",
data: {
id: order_id,
@ -235,29 +235,36 @@ Page({
if (res.data.code == 0) {
// 是否在线支付,非在线支付则支付成功
if (res.data.data.is_online_pay == 0) {
// 数据设置
self.order_item_pay_success_handle(index);
var temp_data_list = this.data.data_list;
temp_data_list[index]['status'] = 2;
temp_data_list[index]['status_name'] = '待发货';
this.setData({ data_list: temp_data_list });
app.showToast("支付成功", "success");
} else {
tt.requestPayment({
timeStamp: res.data.data.data.timeStamp,
nonceStr: res.data.data.data.nonceStr,
package: res.data.data.data.package,
signType: res.data.data.data.signType,
paySign: res.data.data.data.paySign,
success: function(res) {
// 数据设置
self.order_item_pay_success_handle(index);
tt.pay({
orderInfo: res.data.data.order_info,
service: res.data.data.service,
success(res) {
if (res.code == 0) {
// 数据设置
var temp_data_list = self.data.data_list;
temp_data_list[index]['status'] = 2;
temp_data_list[index]['status_name'] = '待发货';
self.setData({ data_list: temp_data_list });
// 跳转支付页面
tt.navigateTo({
url: "/pages/paytips/paytips?code=9000&total_price=" +
self.data.data_list[index]['total_price']
});
// 跳转支付页面
wx.navigateTo({
url: "/pages/paytips/paytips?code=9000&total_price=" +
self.data.data_list[index]['total_price']
});
} else {
app.showToast('支付失败');
}
},
fail: function (res) {
app.showToast('支付失败');
fail(res) {
console.log(res, 'pay-fail')
app.showToast('调起收银台失败-'+res.data.code);
}
});
}

4
public/appmini/old/weixin/app.js
View File

@ -67,8 +67,8 @@ App({
// 请求地址
request_url: "{{request_url}}",
request_url: 'http://tp5-dev.com/',
request_url: 'https://dev.shopxo.net/',
// request_url: 'http://tp5-dev.com/',
// request_url: 'https://dev.shopxo.net/',
// 基础信息
application_title: "{{application_title}}",

18
public/appmini/old/weixin/pages/cart/cart.js
View File

@ -183,7 +183,11 @@ Page({
// 选择处理
this.selected_calculate();
} else {
app.showToast(res.data.msg);
if (app.is_login_check(res.data)) {
app.showToast(res.data.msg);
} else {
app.showToast('提交失败，请重试！');
}
}
},
fail: () => {
@ -203,7 +207,11 @@ Page({
if (res.data.code == 0) {
this.cart_delete(id, type);
} else {
app.showToast(res.data.msg);
if (app.is_login_check(res.data)) {
app.showToast(res.data.msg);
} else {
app.showToast('提交失败，请重试！');
}
}
},
fail: () => {
@ -255,7 +263,11 @@ Page({
app.showToast(((type == 'delete') ? '删除成功' : '收藏成功'), 'success');
} else {
app.showToast((type == 'delete') ? '删除失败' : '收藏失败');
if (app.is_login_check(res.data)) {
app.showToast((type == 'delete') ? '删除失败' : '收藏失败');
} else {
app.showToast('提交失败，请重试！');
}
}
},
fail: () => {