diff --git a/components/guide-pages/guide-pages.vue b/components/guide-pages/guide-pages.vue index 1e4442f..c9a2311 100644 --- a/components/guide-pages/guide-pages.vue +++ b/components/guide-pages/guide-pages.vue @@ -12,14 +12,14 @@ 疯子读书,
- 让阅读无处不在 + 古今一统,中西互参
疯子读书,
- 让阅读无处不在 + 和光同尘,普惠人间
diff --git a/config/baseUrl.js b/config/baseUrl.js index 2516a4f..621a115 100644 --- a/config/baseUrl.js +++ b/config/baseUrl.js @@ -5,12 +5,15 @@ if (process.env.NODE_ENV === 'development') { // baseUrl = "http://localhost:7001/"; // socketUrl = "ws://localhost:6001/"; // baseUrl = "https://twin-ui.com/demo/"; - // baseUrl = "http://59.110.212.44:9100/pb/"; - baseUrl = "http://192.168.110.100:9100/pb/"; + // baseUrl = "http://59.110.212.44:9200/pb/"; + // baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境 + // baseUrl = "http://192.168.110.100:9100/pb/"; // 开发用电脑 + baseUrl = "http://192.168.110.38:9200/pb/"; // 吴春磊笔记本 // socketUrl = "ws://8.129.186.35:6001/"; } else if (process.env.NODE_ENV === 'production') { // 生产环境11 - baseUrl = "http://59.110.212.44:9100/pb/"; + // baseUrl = "http://59.110.212.44:9100/pb/"; + baseUrl = "https://api.nuttyreading.com/"; // baseUrl = "ws://twin-ui.com:6001/"; // socketUrl = "ws://twin-ui.com:6001/"; } diff --git a/config/utils.js b/config/utils.js index 982d5a3..fd6cc48 100644 --- a/config/utils.js +++ b/config/utils.js @@ -235,7 +235,7 @@ export const getLatLon = function(tip) { }); } -// 单独重新微信支付 +// 单独微信支付 export const setWXPay = function(payInfo, callback) { $http.request({ url: "/pay/placeAnOrder/shoppingpay", diff --git a/main.js b/main.js index 3bc6a5b..48b3651 100644 --- a/main.js +++ b/main.js @@ -8,7 +8,8 @@ Vue.prototype.$bgm = bgm // 地址 // Vue.prototype.$baseUrl = "http://192.168.110.100:9100/pb/" - Vue.prototype.$baseUrl = "http://59.110.212.44:9100/pb/" + // Vue.prototype.$baseUrl = "http://59.110.212.44:9100/pb/" + Vue.prototype.$baseUrl = "https://api.nuttyreading.com/" diff --git a/pages/bookShop/orderList.vue b/pages/bookShop/orderList.vue index f2989d2..cf1bc03 100644 --- a/pages/bookShop/orderList.vue +++ b/pages/bookShop/orderList.vue @@ -5,17 +5,20 @@ - + {{item.name}} - 待支付 - 待发货 - 待收货 - 已完成 + 待支付 + 待发货 + 待收货 + 已完成 + + 订单编号: {{ifex.orderSn}} + @@ -36,7 +39,7 @@ - 花生币充值 + 天医币充值 {{ifex.realMoney}} @@ -59,8 +62,8 @@
- 下单时间:{{ifex.createTime}} - 实付款 : + 下单时间:{{ifex.createTime}} + 实付款 : {{ifex.realMoney}} @@ -174,7 +177,7 @@ import { }, // 订单详情 - goOrdiCont(e) { + goOrdiCont(e) { uni.navigateTo({ url: './orderLCont?orderId=' + e.orderId + '&orderType=' + e.orderStatus + '&orderSn=' + e.orderSn }); @@ -507,27 +510,34 @@ import {