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 0000000..9b8f521 Binary files /dev/null and b/static/icon/five5_n.png differ