diff --git a/App.vue b/App.vue
index 11994f9..b122197 100644
--- a/App.vue
+++ b/App.vue
@@ -12,12 +12,14 @@
// 数据接口请求地址
// request_url: 'http://192.168.1.43:7777/',
// request_url: env == 'development' ? '/api/' : 'https://store.sxczgkj.com/',
- request_url: 'https://store.sxczgkj.com/',
+ // request_url: 'https://store.sxczgkj.com/',
+ request_url: 'http://www.fulaijiajiazheng.cn/',
// 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/）
// static_url: 'http://192.168.1.43:7777/',
// static_url: env == 'development' ? '/api/' : 'https://store.sxczgkj.com/',
- static_url: 'https://store.sxczgkj.com/',
+ // static_url: 'https://store.sxczgkj.com/',
+ static_url: 'http://www.fulaijiajiazheng.cn/',
// 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
system_type: 'default',
diff --git a/components/payment/payment.vue b/components/payment/payment.vue
index 7ba30ec..9004826 100644
--- a/components/payment/payment.vue
+++ b/components/payment/payment.vue
@@ -338,7 +338,7 @@
// 从一开始就判断支付方式，如果是无忧支付直接进入支付状态判断页面
console.log('payment===', payment);
- if (payment.payment == 'IEPayPoli') {
+ if (payment.payment == 'IEPayPoli' || payment == 'Alipay') {
console.log('直接进入无忧支付，开始跳转');
uni.setStorageSync('wuyouPay', '');
uni.redirectTo({
@@ -354,7 +354,7 @@
payment_id: payment_id || this.payment_id,
};
// h5自定义重定向地址
- // #ifdef H5
+ // #ifdef H5 || APP
var redirect_url = app.globalData.page_url_protocol(this.propToAppointPage || app.globalData.get_page_url(false));
post_data['redirect_url'] = encodeURIComponent(base64.encode(redirect_url));
// 存在支付标识、指定支付方式使用respond_url返回地址、移除重定向地址
@@ -403,8 +403,10 @@
switch (payment_type) {
// 正常线上支付
case 0:
+ console.log('111');
// #ifdef APP
- this.app_pay_handle(this, data, order_id);
+ // this.app_pay_handle(this, data, order_id);
+ this.h5_pay_handle(this, data, order_id);
// #endif
// #ifdef MP-TOUTIAO
// 头条是否非普通版本支持
@@ -429,27 +431,32 @@
break;
// 线下支付
case 1:
+ console.log('222');
+ this.h5_pay_handle(this, data, order_id);
+
// 现金支付
- let self = this;
- uni.showModal({
- content: res.data.msg,
- showCancel: false,
- confirmText: self.$t('common.confirm'),
- success(res) {
- if (res.confirm) {
- self.to_other(order_id);
- } else {
- self.order_item_pay_fail_handle(data, order_id, self.$t('paytips.paytips.6mpsl7'));
- }
- },
- });
+ // let self = this;
+ // uni.showModal({
+ // content: res.data.msg,
+ // showCancel: false,
+ // confirmText: self.$t('common.confirm'),
+ // success(res) {
+ // if (res.confirm) {
+ // self.to_other(order_id);
+ // } else {
+ // self.order_item_pay_fail_handle(data, order_id, self.$t('paytips.paytips.6mpsl7'));
+ // }
+ // },
+ // });
break;
// 钱包支付
case 2:
+ console.log('333');
this.order_item_pay_success_handle(data, order_id);
break;
// 默认
default:
+ console.log('444');
app.globalData.showToast(this.$t('payment.payment.vhx5dv'));
}
}
@@ -686,6 +693,7 @@
},
// h5支付处理
h5_pay_handle(self, data, order_id) {
+ console.log('111111111111111111111111');
console.log('h5_pay_handle===', order_id);
// 字符串则为跳转地址直接进入
if (typeof data.data == 'string') {
@@ -750,7 +758,7 @@
}
// 无忧支付
- if (data.payment.payment == 'IEPayPoli') {
+ if (data.payment.payment == 'IEPayPoli' || data.payment.payment == 'Alipay') {
console.log('无忧支付order_id===', order_id);
console.log('无忧支付===', data);
uni.setStorageSync('wuyouPay', '');
diff --git a/manifest.json b/manifest.json
index 3486cd4..99da408 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
{
- "name" : "ShopXO",
+ "name" : "商城",
"appid" : "__UNI__F095115",
- "description" : "ShopXO开源商城、MIT协议、可商用、可二次开发、满足99%电商运营需求",
+ "description" : "商城",
"versionName" : "1.0.0",
"versionCode" : 100,
"transformPx" : false,
diff --git a/pages.json b/pages.json
index 86d2773..9584914 100644
--- a/pages.json
+++ b/pages.json
@@ -10,7 +10,8 @@
"titlePenetrate": "YES",
// #endif
"enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "navigationBarTitleText": "",
+ "navigationBarTextStyle": "black"
}
}, {
"path": "pages/contact/contact",
diff --git a/pages/buy/buy.vue b/pages/buy/buy.vue
index 4fe1425..4adcc36 100644
--- a/pages/buy/buy.vue
+++ b/pages/buy/buy.vue
@@ -347,7 +347,7 @@
明细：共{{ total_count }}件
- {{ $t('buy.buy.4884hk') }}
+ {{ $t('buy.buy.4884hk') }}
@@ -540,6 +540,7 @@
},
onLoad(params) {
+ console.log('进入页面了');
// 调用公共事件方法
app.globalData.page_event_onload_handle(params);
@@ -730,9 +731,12 @@
} else if (payment == 'WalletPay') {
// 支付宝支付 改装钱包余额支付
console.log('支付宝支付===', order_id);
- } else if (payment == 'IEPayPoli') {
+ } else if (payment == 'IEPayPoli' || payment == 'Alipay') {
console.log('开始无忧支付===', order_id);
this.pay_url = app.globalData.get_request_url('wuYouPay', 'xo');
+
+ console.log('this.pay_url===123455667', this.pay_url);
+
this.$nextTick(() => {
this.$refs.payment.pay_handle(order_id, payment_id, payment_list);
});
@@ -817,6 +821,7 @@
data: this.request_data_ext_params_merge(data),
dataType: 'json',
success: (res) => {
+ console.log(res);
uni.stopPullDownRefresh();
if (this.is_first == 0) {
uni.hideLoading();
diff --git a/pages/buy/wu_you_status.vue b/pages/buy/wu_you_status.vue
index 410441f..9f1852c 100644
--- a/pages/buy/wu_you_status.vue
+++ b/pages/buy/wu_you_status.vue
@@ -10,7 +10,7 @@