From d4fdb37a847a1213df4fcaaad15ced7d8e5ce02b Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Mon, 9 Oct 2023 11:12:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=96=AF=E5=B8=81=E6=94=B9=E5=A4=A9=E5=8C=BB?=
=?UTF-8?q?=E7=96=97=E5=B8=81=20=E5=BC=95=E5=AF=BC=E9=A1=B5=E6=96=87?=
=?UTF-8?q?=E5=AD=97=E4=BF=AE=E6=94=B9=20=E9=85=8D=E7=BD=AE=E6=96=87?=
=?UTF-8?q?=E4=BB=B6=E8=AF=B7=E6=B1=82=E5=9C=B0=E5=9D=80=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=20=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/guide-pages/guide-pages.vue | 4 +-
config/baseUrl.js | 9 ++--
config/utils.js | 2 +-
main.js | 3 +-
pages/bookShop/orderList.vue | 70 +++++++++++++++-----------
pages/bookShop/settlement.vue | 23 +++++----
pages/bookShop/settlementBook.vue | 18 +++----
pages/library/library.vue | 2 +-
pages/listen/home.vue | 63 ++++++++++++++++++-----
pages/peanut/home.vue | 6 +--
pages/peanut/mine.vue | 2 +-
pages/peanut/opeVip.vue | 10 ++--
pages/peanut/reCharge.vue | 2 +-
pages/peanut/reCharge1.vue | 2 +-
pages/peanut/shopping.vue | 7 ++-
pages/talkBook/talkBookML.vue | 2 +-
pages/user/persCount.vue | 8 +--
utils/music.js | 6 ++-
18 files changed, 151 insertions(+), 88 deletions(-)
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 {