diff --git a/audioBook/components/AudioPlayer.vue b/audioBook/components/AudioPlayer.vue
new file mode 100644
index 0000000..1707d64
--- /dev/null
+++ b/audioBook/components/AudioPlayer.vue
@@ -0,0 +1,107 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/audioBook/pages/index.vue b/audioBook/pages/index.vue
new file mode 100644
index 0000000..b565eb3
--- /dev/null
+++ b/audioBook/pages/index.vue
@@ -0,0 +1,720 @@
+
+
+
+
+
+
+
+
+
+ {{ line.text }}
+
+
+
+
+
+
+
+
+ {{ currentChapter.title }}
+
+ {{ currentChapterIndex + 1 }}/{{ chapters.length }}
+
+
+
+
+
+ {{ formatTime(currentTime) }}
+
+
+
+
+
+
+ {{ formatTime(duration) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/DynamicIsland.vue b/components/DynamicIsland.vue
index 96d07b8..f6d7f87 100644
--- a/components/DynamicIsland.vue
+++ b/components/DynamicIsland.vue
@@ -112,7 +112,7 @@
style="display: flex;align-items: center;font-size: 26rpx;font-weight: bold;display: flex;align-items: center;margin-top: 20rpx;">
时长:{{
- userInfo && userInfo.token ? userInfo.hour+'h' : "-"
+ userInfo && userInfo.token ? userInfo.hour||0+'h' : "-"
}}
diff --git a/pages.json b/pages.json
index d247ec7..eb3961c 100644
--- a/pages.json
+++ b/pages.json
@@ -41,8 +41,7 @@
{
"path": "pages/login/login",
"style": {
- "navigationBarTitleText": "登录",
- "navigationStyle": "custom"
+ "navigationBarTitleText": "登录"
}
},
{
@@ -322,14 +321,13 @@
"navigationBarTitleText": "优惠券"
}
},
- {
- "path": "other/ipPoster",
- "style": {
- "navigationBarTextStyle": "white",
- "navigationStyle": "custom"
- }
- }
-
+ {
+ "path": "other/ipPoster",
+ "style": {
+ "navigationBarTextStyle": "white",
+ "navigationStyle": "custom"
+ }
+ }
]
},
{
@@ -768,6 +766,17 @@
}
}
]
+ },
+ {
+ "root": "audioBook",
+ "pages": [
+ {
+ "path": "pages/index",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ }
+ ]
}
],
"tabBar": {
diff --git a/pages/index/iSoul.vue b/pages/index/iSoul.vue
index e28b9c9..843c03c 100644
--- a/pages/index/iSoul.vue
+++ b/pages/index/iSoul.vue
@@ -1277,6 +1277,9 @@ view {
font-weight: 500;
margin-bottom: 6rpx;
line-height: 1.3;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
}
.asset-desc {
diff --git a/pages/index/readingBody.vue b/pages/index/readingBody.vue
index 36c34bb..6bdc1b5 100644
--- a/pages/index/readingBody.vue
+++ b/pages/index/readingBody.vue
@@ -284,11 +284,12 @@ export default {
{
type_id: this.readingType[this.readingIndex].id,
offset: 0,
- limit: 1,
+ limit: 10,
},
"/api/article/getArticleByType"
).then((res) => {
if (res.data) {
+ console.log('----',res.data)
this.readingList = res.data;
}
});
diff --git a/pages/index/timeShopBank.vue b/pages/index/timeShopBank.vue
index aabc22c..7b74105 100644
--- a/pages/index/timeShopBank.vue
+++ b/pages/index/timeShopBank.vue
@@ -44,7 +44,7 @@
-
-
-
- 笔记功能开发中...
+
-
+
关注功能开发中...
-
+
推荐功能开发中...
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 6c45279..0c18ee4 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -1,12 +1,5 @@
-
-
-
-
diff --git a/static/js/request.js b/static/js/request.js
index 380ec2f..ca80aa9 100644
--- a/static/js/request.js
+++ b/static/js/request.js
@@ -6,11 +6,13 @@ const DEV_API_URL = 'http://1.13.193.49';
// const DEV_API_URL = 'https://epic.js-dyyj.com';
// const PROD_API_URL = 'https://epic.js-dyyj.com';
-const PROD_API_URL = 'https://epic.new.js-dyyj.com';
+const PROD_API_URL = 'http://1.13.193.49';
const NEWAPIURL = process.env.NODE_ENV === 'development' ? DEV_API_URL : PROD_API_URL;
// const DEV_API_URL_DES = 'http://192.168.124.177:8083/xcx';
-const DEV_API_URL_DES = 'https://des.js-dyyj.com/xcx';
-const PROD_API_URL_DES = 'https://des.js-dyyj.com/xcx';
+// const DEV_API_URL_DES = 'https://des.js-dyyj.com/xcx';
+const DEV_API_URL_DES = 'http://1.13.193.49:8083/xcx';
+// const PROD_API_URL_DES = 'https://des.js-dyyj.com/xcx';
+const PROD_API_URL_DES = 'http://1.13.193.49:8083/xcx';
const NEWAPIURL_DES = process.env.NODE_ENV === 'development' ? DEV_API_URL_DES : PROD_API_URL_DES;
const getToken = () => {
const userInfoFromStorage = uni.getStorageSync('userInfo');
diff --git a/subPackages/user/travelerList.vue b/subPackages/user/travelerList.vue
index 4e280b7..9fb40f3 100644
--- a/subPackages/user/travelerList.vue
+++ b/subPackages/user/travelerList.vue
@@ -13,7 +13,19 @@
-
+
+
+ 📋
+ 暂无出行人信息
+ 点击下方按钮添加您的出行人信息
+
+
+
{{ item.name }}
@@ -51,7 +63,15 @@
+
+
+ 📋
+ 暂无收货地址
+ 点击下方按钮添加您的收货地址
+
+