From cc1447640e50234095ba89de65de8abec685aca0 Mon Sep 17 00:00:00 2001 From: zy <752204717@qq.com> Date: Tue, 26 Mar 2024 15:38:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E6=B7=BB=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/cx-audio-play/cx-audio-play.vue | 1 + components/music.vue | 9 +- components/z-navigation/z-navigation.vue | 12 +- manifest.json | 4 +- pages.json | 138 ++-- pages/peanut/mine.vue | 798 +++++++++++---------- static/icon/five5_n.png | Bin 0 -> 3733 bytes 7 files changed, 493 insertions(+), 469 deletions(-) create mode 100644 static/icon/five5_n.png diff --git a/components/cx-audio-play/cx-audio-play.vue b/components/cx-audio-play/cx-audio-play.vue index 25a432b..6e654b8 100644 --- a/components/cx-audio-play/cx-audio-play.vue +++ b/components/cx-audio-play/cx-audio-play.vue @@ -11,6 +11,7 @@ + + @@ -35,7 +36,13 @@ mode="aspectFill"> --> - + + + + + + + diff --git a/components/z-navigation/z-navigation.vue b/components/z-navigation/z-navigation.vue index 885b40d..30b7ca6 100644 --- a/components/z-navigation/z-navigation.vue +++ b/components/z-navigation/z-navigation.vue @@ -44,6 +44,11 @@ iconPath: 'static/tab/icon1_n.png', selectedIconPath: 'static/tab/icon1_y.png', text: '首页' + },{ + "pagePath": "pages/medicaldes/medicaldes", + "iconPath": "static/icon/five5.png", + "selectedIconPath": "static/icon/five5.png", + "text": "吴门医述" }, { "pagePath": "pages/library/library", @@ -64,12 +69,7 @@ // text: '我的订单' // }, - { - "pagePath": "pages/medicaldes/medicaldes", - "iconPath": "static/icon/five5.png", - "selectedIconPath": "static/icon/five5.png", - "text": "吴门医述" - }, + { pagePath: 'pages/peanut/mine', iconPath: 'static/tab/icon4_n.png', diff --git a/manifest.json b/manifest.json index 0e0fb8f..d66fb5b 100644 --- a/manifest.json +++ b/manifest.json @@ -12,8 +12,8 @@ "src" : "图片路径" } ], - "versionName" : "1.2.41", - "versionCode" : 1241, + "versionName" : "1.2.42", + "versionCode" : 1242, "app-plus" : { "compatible" : { "ignoreVersion" : true diff --git a/pages.json b/pages.json index fb84de3..187164d 100644 --- a/pages.json +++ b/pages.json @@ -2,7 +2,8 @@ "easycom": { "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" }, - "pages": [{ + "pages": [ + { "path": "pages/peanut/home", "style": { "navigationBarTitleText": "首页" @@ -257,169 +258,167 @@ "style": { "navigationBarTitleText": "物流详情" } - } - - , { + }, + { "path": "pages/peanut/aboutUs", "style": { "navigationBarTitleText": "关于我们", "enablePullDownRefresh": false } - - }, { + }, + { "path": "pages/listen/listen", "style": { "navigationBarTitleText": "悦耳列表", "enablePullDownRefresh": false } - - }, { + }, + { "path": "pages/listen/home", "style": { "navigationBarTitleText": "悦耳听书", "enablePullDownRefresh": true } - - }, { + }, + { "path": "pages/listen/search", "style": { "navigationBarTitleText": "搜索听书", "enablePullDownRefresh": false } - - }, { + }, + { "path": "pages/listen/bgMusix", "style": { "navigationBarTitleText": "背景音乐模式", "enablePullDownRefresh": false } - - }, { + }, + { "path": "pages/listen/bgMusic", "style": { "navigationBarTitleText": "背景音乐启用", "enablePullDownRefresh": false } - - }, { + }, + { "path": "pages/listen/bgMusic", "style": { "navigationBarTitleText": "背景音乐启用", "enablePullDownRefresh": false } - - }, { + }, + { "path": "pages/listen/musicbg", "style": { "navigationBarTitleText": "音乐1", "enablePullDownRefresh": false } - - }, { + }, + { "path": "pages/peanut/myComments", "style": { "navigationBarTitleText": "我的评价", "enablePullDownRefresh": false } - - }, { + }, + { "path": "pages/listen/setListen", "style": { "navigationBarTitleText": "听书设置11", "enablePullDownRefresh": false } - - }, { + }, + { "path": "pages/listen/bigListen", "style": { "navigationBarTitleText": "听书页面", "enablePullDownRefresh": false } - - }, { + }, + { "path": "pages/listen/listenNotBuy", "style": { "navigationBarTitleText": "未购买的详情", "enablePullDownRefresh": false } - - }, { + }, + { "path": "pages/comments/comments", "style": { "navigationBarTitleText": "书评1", "enablePullDownRefresh": true } - - }, { + }, + { "path": "pages/comments/commentsDetail", "style": { "navigationBarTitleText": "书评详情1", "enablePullDownRefresh": false } - - }, { + }, + { "path": "pages/comments/commentsList", "style": { "navigationBarTitleText": "书评", "enablePullDownRefresh": true } - - }, { + }, + { "path": "pages/bookShop/settlementBook", "style": { "navigationBarTitleText": "book购买1", "enablePullDownRefresh": false } - - }, { + }, + { "path": "pages/library/library", "style": { "navigationBarTitleText": "我的图书", "enablePullDownRefresh": true } - - }, { + }, + { "path": "pages/clock/clock", "style": { "navigationBarTitleText": "读书打卡", "enablePullDownRefresh": false } - - }, { + }, + { "path": "pages/clock/index", "style": { "navigationBarTitleText": "读书打卡列表", "enablePullDownRefresh": false } - - }, { + }, + { "path": "pages/clock/clockList", "style": { "navigationBarTitleText": "打卡记录1", "enablePullDownRefresh": false } - - }, { + }, + { "path": "pages/talkBook/talkBook", "style": { "navigationBarTitleText": "讲书", "enablePullDownRefresh": true } - - }, { + }, + { "path": "pages/talkBook/talkBookML", "style": { "navigationBarTitleText": "讲书书籍页面", "enablePullDownRefresh": true } - - }, { + }, + { "path": "pages/talkBook/talkBookDetail", "style": { "navigationBarTitleText": "讲书详情", "enablePullDownRefresh": false } - }, { "path": "pages/yian/yian", @@ -427,7 +426,6 @@ "navigationBarTitleText": "医案", "enablePullDownRefresh": true } - }, { "path": "pages/yian/yianList", @@ -435,14 +433,13 @@ "navigationBarTitleText": "医案列表", "enablePullDownRefresh": true } - - }, { + }, + { "path": "pages/yian/yianDetail", "style": { "navigationBarTitleText": "医案详情", "enablePullDownRefresh": false } - }, { // 更新版本 "path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup", @@ -456,7 +453,6 @@ "popGesture": "none", "animationType": "fade-in", "animationDuration": 200 - } } }, @@ -466,7 +462,6 @@ "navigationBarTitleText": "快递列表", "enablePullDownRefresh": false } - }, { "path": "pages/peanut/chargeDetaill", @@ -488,13 +483,15 @@ "navigationBarTitleText": "脉穴详情", "enablePullDownRefresh": false } -},{ + }, + { "path": "pages/acupoint/givenDegree", "style": { "navigationBarTitleText": "特定穴位", "enablePullDownRefresh": false } - },{ + }, + { "path": "pages/timeAcupoint/timeAcupoint", "style": { "navigationBarTitleText": "时辰取穴", @@ -627,7 +624,8 @@ "selectedColor": "#079307", "borderStyle": "black", "backgroundColor": "#ffffff", - "list": [{ + "list": [ + { "pagePath": "pages/peanut/home", "iconPath": "static/tab/icon1_n.png", "selectedIconPath": "static/tab/icon1_y.png", @@ -639,6 +637,12 @@ // "selectedIconPath": "static/tab/icon2_y.png", // "text": "购物车" // }, + { + "pagePath": "pages/medicaldes/medicaldes", + "iconPath": "static/icon/five5.png", + "selectedIconPath": "static/icon/five5.png", + "text": "吴门医述" + }, { "pagePath": "pages/library/library", "iconPath": "static/tab/icon3_n.png", @@ -657,12 +661,6 @@ // "selectedIconPath": "static/tab/icon2_y.png", // "text": "我的订单" // }, - { - "pagePath": "pages/medicaldes/medicaldes", - "iconPath": "static/icon/five5.png", - "selectedIconPath": "static/icon/five5.png", - "text": "吴门医述" - }, { "pagePath": "pages/peanut/mine", "iconPath": "static/tab/icon4_n.png", @@ -673,10 +671,12 @@ }, "condition": { //模式配置，仅开发期间生效 "current": 0, //当前激活的模式(list 的索引项) - "list": [{ - "name": "", //模式名称 - "path": "", //启动页面，必选 - "query": "" //启动参数，在页面的onLoad函数里面得到 - }] + "list": [ + { + "name": "", //模式名称 + "path": "", //启动页面，必选 + "query": "" //启动参数，在页面的onLoad函数里面得到 + } + ] } } \ No newline at end of file diff --git a/pages/peanut/mine.vue b/pages/peanut/mine.vue index f2ba3b2..cb36377 100644 --- a/pages/peanut/mine.vue +++ b/pages/peanut/mine.vue @@ -1,25 +1,41 @@ diff --git a/static/icon/five5_n.png b/static/icon/five5_n.png new file mode 100644 index 0000000000000000000000000000000000000000..9b8f521a9c65b1476ca216a1cd0d0661db163c60 GIT binary patch literal 3733 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 B{E`3w literal 0 HcmV?d00001