diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 8dc9183..dd7ee12 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -5,7 +5,7 @@ "configurations" : [ { "app-plus" : { - "launchtype" : "remote" + "launchtype" : "local" }, "default" : { "launchtype" : "local" diff --git a/App.vue b/App.vue index 8e1ba4d..738ab2c 100644 --- a/App.vue +++ b/App.vue @@ -37,90 +37,6 @@ } }) - // 取出初始播放信息 - uni.getStorage({ - key: 'playingInfo', - success: function(res) { - console.log(res, 'playingInfo本地初始化') - store.commit('setUserInfo', { - 'playingInfo': res.data - }) - store.commit('setUserInfo', { - 'playTitle': res.data.chapter, - 'fengImg': res.data.bookImage - }) - console.log(store.state.userInfo, '初始化') - }, - fail: function(e) { - console.log(e, 'playingInfo本地初始化失败') - store.commit('setUserInfo', { - 'playingInfo': { - 'images': '../../static/icon/fengziIcon.jpg', - 'chapterName': '暂无播放信息', - } - }) - store.commit('setUserInfo', { - 'playTitle': '暂无播放信息', - 'fengImg': '../../static/icon/fengziIcon.jpg' - }) - }, - }) - // 取出播放列表 - uni.getStorage({ - key: 'playData', - success: function(res) { // 本地有播放数据就用本地的 - console.log(res.data, '取出的本地数据'); - if (res.data.myList.length <= 0) { - store.commit('setUserInfo', { - 'playVisible': false - }) - } else { - music.setList(res.data.myList, '', store.state.userInfo.playIndex) - // music.setCoverImg(res.data.fengImg) - store.commit('setUserInfo', res.data) - } - store.commit('setUserInfo', { - 'playFlag': false - }); // 设置播放按钮状态为暂停 - store.commit('setUserInfo', { - 'currentTime': 0 - }); - - }, - fail: function(e) { // 如果没有,就查询一下线上的播放记录 - console.log('本地无数据'); - music.setList([]) - //store.commit('setUserInfo',{'playingInfo': {'bookid':0,'chapterId':0}}); - store.commit('setUserInfo', { - 'playVisible': false - }) - store.commit('setUserInfo', { - 'myList': [], - 'fengImg': '../../static/icon/fengziIcon.jpg' - }) - store.commit('setUserInfo', { - 'playFlag': false - }); - store.commit('setUserInfo', { - 'currentTime': 0 - }); - } - }); - // end - // 取出播放弹窗显示或者隐藏 - uni.getStorage({ - key: 'playVisible', - success: function(res) { - store.commit('setUserInfo', { - 'playVisible': res.data - }); // 设置是否显示按钮 - }, - fail: function(e) { // 如果本地没有playVisible数据,默认为false - store.commit('setUserInfo', { - 'playVisible': false - }); - } - }); //取出缓存数据 store.commit('setCacheData'); // #ifdef MP-WEIXIN diff --git a/components/cx-audio-play/cx-audio-play - 副本.vue b/components/cx-audio-play/cx-audio-play - 副本.vue deleted file mode 100644 index 129322f..0000000 --- a/components/cx-audio-play/cx-audio-play - 副本.vue +++ /dev/null @@ -1,682 +0,0 @@ - - - - diff --git a/components/cx-audio-play/cx-audio-play.vue b/components/cx-audio-play/cx-audio-play.vue deleted file mode 100644 index 8dc96ab..0000000 --- a/components/cx-audio-play/cx-audio-play.vue +++ /dev/null @@ -1,360 +0,0 @@ - - - - diff --git a/components/cx-audio-play/miniplay.vue b/components/cx-audio-play/miniplay.vue deleted file mode 100644 index 5677d24..0000000 --- a/components/cx-audio-play/miniplay.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - - - diff --git a/components/cx-audio-play/statics/bofang2.png b/components/cx-audio-play/statics/bofang2.png deleted file mode 100644 index e529031..0000000 Binary files a/components/cx-audio-play/statics/bofang2.png and /dev/null differ diff --git a/components/cx-audio-play/statics/bofangxiao.png b/components/cx-audio-play/statics/bofangxiao.png deleted file mode 100644 index af4c319..0000000 Binary files a/components/cx-audio-play/statics/bofangxiao.png and /dev/null differ diff --git a/components/cx-audio-play/statics/kj.png b/components/cx-audio-play/statics/kj.png deleted file mode 100644 index 038acd5..0000000 Binary files a/components/cx-audio-play/statics/kj.png and /dev/null differ diff --git a/components/cx-audio-play/statics/kt.png b/components/cx-audio-play/statics/kt.png deleted file mode 100644 index 8f3f108..0000000 Binary files a/components/cx-audio-play/statics/kt.png and /dev/null differ diff --git a/components/cx-audio-play/statics/play-icon-audio.png b/components/cx-audio-play/statics/play-icon-audio.png deleted file mode 100644 index 1c10ad7..0000000 Binary files a/components/cx-audio-play/statics/play-icon-audio.png and /dev/null differ diff --git a/components/cx-audio-play/statics/stop-play-btn.png b/components/cx-audio-play/statics/stop-play-btn.png deleted file mode 100644 index fce7727..0000000 Binary files a/components/cx-audio-play/statics/stop-play-btn.png and /dev/null differ diff --git a/components/cx-audio-play/statics/sys.png b/components/cx-audio-play/statics/sys.png deleted file mode 100644 index 3150e1d..0000000 Binary files a/components/cx-audio-play/statics/sys.png and /dev/null differ diff --git a/components/cx-audio-play/statics/tabbar/tabbarimg.jpg b/components/cx-audio-play/statics/tabbar/tabbarimg.jpg deleted file mode 100644 index 66e20ff..0000000 Binary files a/components/cx-audio-play/statics/tabbar/tabbarimg.jpg and /dev/null differ diff --git a/components/cx-audio-play/statics/zanting.png b/components/cx-audio-play/statics/zanting.png deleted file mode 100644 index 06cf073..0000000 Binary files a/components/cx-audio-play/statics/zanting.png and /dev/null differ diff --git a/components/cx-audio-play/statics/zt.png b/components/cx-audio-play/statics/zt.png deleted file mode 100644 index d466632..0000000 Binary files a/components/cx-audio-play/statics/zt.png and /dev/null differ diff --git a/components/guide-pages/guide-pages.vue b/components/guide-pages/guide-pages.vue index d7ac27c..d75f570 100644 --- a/components/guide-pages/guide-pages.vue +++ b/components/guide-pages/guide-pages.vue @@ -3,21 +3,21 @@ - 疯子读书, + 吴门医述,
让阅读无处不在
- 疯子读书, + 吴门医述,
古今一统,中西互参
- 疯子读书, + 吴门医述,
和光同尘,普惠人间
diff --git a/components/z-navigation/z-navigation.vue b/components/z-navigation/z-navigation.vue index 8de1bdc..d57cc2e 100644 --- a/components/z-navigation/z-navigation.vue +++ b/components/z-navigation/z-navigation.vue @@ -21,7 +21,7 @@ :src="'/' + item.selectedIconPath" mode="aspectFit"> {{ item.text }} + :class="[item.pagePath == path ? 'footer_item_text_active' : 'normal_text']">{{ item.text }} @@ -39,68 +39,57 @@ data() { return { path: '', - navigationList: [{ - pagePath: 'pages/peanut/home', - iconPath: 'static/tab/icon1_n.png', - selectedIconPath: 'static/tab/icon1_y.png', - text: '首页' - },{ - "pagePath": "pages/medicaldes/medicaldes", - "iconPath": "static/icon/five5_n.png", - "selectedIconPath": "static/icon/five5.png", - "text": "吴门医述" + navigationList: [ + + { + "pagePath": "pages/peanut/home", + "iconPath": "static/tab/icon1_n.png", + "selectedIconPath": "static/tab/icon1_y.png", + "text": "首页" + }, + { + "pagePath": "pages/peanut/shopping", + "iconPath": "static/tab/tab_nor_02.png", + "selectedIconPath": "static/tab/tab_cur_02.png", + "text": "购物车" }, { "pagePath": "pages/library/library", - "iconPath": "static/tab/icon3_n.png", - "selectedIconPath": "static/tab/icon3_y.png", - "text": "我的图书" - }, - // { - // pagePath: 'pages/peanut/bookshelf', - // iconPath: 'static/tab/icon3_n.png', - // selectedIconPath: 'static/tab/icon3_y.png', - // text: '我的书架' - // }, - // { - // pagePath: 'pages/bookShop/orderList', - // iconPath: 'static/tab/icon2_n.png', - // selectedIconPath: 'static/tab/icon2_y.png', - // text: '我的订单' - - // }, - + "iconPath": "static/tab/tab_nor_03.png", + "selectedIconPath": "static/tab/tab_cur_03.png", + "text": "太湖公益" + }, { - pagePath: 'pages/peanut/mine', - iconPath: 'static/tab/icon4_n.png', - selectedIconPath: 'static/tab/icon4_y.png', - text: '我的' - } + "pagePath": "pages/peanut/mine", + "iconPath": "static/tab/tab_nor_04.png", + "selectedIconPath": "static/tab/tab_cur_04.png", + "text": "我的" + } ], - navigationIos: [{ - pagePath: 'pages/peanut/home', - iconPath: 'static/tab/icon1_n.png', - selectedIconPath: 'static/tab/icon1_y.png', - text: '首页' - }, - // { - // pagePath: 'pages/bookShop/orderList', - // iconPath: 'static/tab/icon2_n.png', - // selectedIconPath: 'static/tab/icon2_y.png', - // text: '我的订单' - - // }, + navigationIos: [ { - "pagePath": "pages/medicaldes/medicaldes", - "iconPath": "static/icon/five5.png", - "selectedIconPath": "static/icon/five5.png", - "text": "吴门医述" + "pagePath": "pages/peanut/home", + "iconPath": "static/tab/icon1_n.png", + "selectedIconPath": "static/tab/icon1_y.png", + "text": "首页" + }, + { + "pagePath": "pages/peanut/shopping", + "iconPath": "static/tab/tab_nor_02.png", + "selectedIconPath": "static/tab/tab_cur_02.png", + "text": "购物车" }, { - pagePath: 'pages/peanut/mine', - iconPath: 'static/tab/icon4_n.png', - selectedIconPath: 'static/tab/icon4_y.png', - text: '我的' + "pagePath": "pages/library/library", + "iconPath": "static/tab/tab_nor_03.png", + "selectedIconPath": "static/tab/tab_cur_03.png", + "text": "太湖公益" + }, + { + "pagePath": "pages/peanut/mine", + "iconPath": "static/tab/tab_nor_04.png", + "selectedIconPath": "static/tab/tab_cur_04.png", + "text": "我的" } ], }; @@ -126,7 +115,9 @@ \ No newline at end of file diff --git a/components/zsy-calendar/dateBox.vue b/components/zsy-calendar/dateBox.vue deleted file mode 100644 index 7bda82e..0000000 --- a/components/zsy-calendar/dateBox.vue +++ /dev/null @@ -1,113 +0,0 @@ - - - - - diff --git a/components/zsy-calendar/js/utils.js b/components/zsy-calendar/js/utils.js deleted file mode 100644 index 2c2ae4d..0000000 --- a/components/zsy-calendar/js/utils.js +++ /dev/null @@ -1,68 +0,0 @@ -/** - * 时间格式化 - * @param {String} time - * @param {String} cFormat - */ -export function parseTime(time, cFormat) { - if (arguments.length === 0) { - return null - } - if (!time) return '' - /* 修复IOS系统上面的时间不兼容*/ - if (time.toString().indexOf('-') > 0) { - time = time.replace(/-/g, '/') - } - const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}' - let date - if (typeof time === 'object') { - date = time - } else { - if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { - time = parseInt(time) - } - if ((typeof time === 'number') && (time.toString().length === 10)) { - time = time * 1000 - } - date = new Date(time) - } - const formatObj = { - y: date.getFullYear(), - m: date.getMonth() + 1, - d: date.getDate(), - h: date.getHours(), - i: date.getMinutes(), - s: date.getSeconds(), - a: date.getDay() - } - const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => { - const value = formatObj[key] - // Note: getDay() returns 0 on Sunday - if (key === 'a') { - return ['日', '一', '二', '三', '四', '五', '六'][value] - } - return value.toString().padStart(2, '0') - }) - return time_str -} - -/** - * This is just a simple version of deep copy - * Has a lot of edge cases bug - * If you want to use a perfect deep copy, use lodash's _.cloneDeep - * @param {Object} source - * @returns {Object} - */ -export function deepClone(source) { - if (!source && typeof source !== 'object') { - throw new Error('error arguments', 'deepClone') - } - const targetObj = Object.prototype.toString.call(source) === "[object Array]" ? [] : {} - Object.keys(source).forEach(keys => { - if (source[keys] && typeof source[keys] === 'object') { - targetObj[keys] = deepClone(source[keys]) - } else { - targetObj[keys] = source[keys] - } - }) - return targetObj -} \ No newline at end of file diff --git a/components/zsy-calendar/zsy-calendar v1.0.vue b/components/zsy-calendar/zsy-calendar v1.0.vue deleted file mode 100644 index 54d8878..0000000 --- a/components/zsy-calendar/zsy-calendar v1.0.vue +++ /dev/null @@ -1,641 +0,0 @@ - - - - - diff --git a/components/zsy-calendar/zsy-calendar.vue b/components/zsy-calendar/zsy-calendar.vue deleted file mode 100644 index 07183d3..0000000 --- a/components/zsy-calendar/zsy-calendar.vue +++ /dev/null @@ -1,536 +0,0 @@ - - - - - diff --git a/manifest.json b/manifest.json index 042cda5..71c59c0 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { - "name" : "疯子读书", - "appid" : "__UNI__9788EB5", - "description" : "疯子读书", + "name" : "吴门医述", + "appid" : "__UNI__C7475A8", + "description" : "吴门医述", "networkTimeout" : { "request" : 3000 }, @@ -12,8 +12,8 @@ "src" : "图片路径" } ], - "versionName" : "1.2.44", - "versionCode" : 1244, + "versionName" : "1.0.0", + "versionCode" : 100, "app-plus" : { "compatible" : { "ignoreVersion" : true @@ -134,15 +134,15 @@ "ios" : { "appstore" : "unpackage/res/icons/1024x1024.png", "ipad" : { - "app" : "unpackage/res/icons/76x76.png", - "app@2x" : "unpackage/res/icons/152x152.png", - "notification" : "unpackage/res/icons/20x20.png", - "notification@2x" : "unpackage/res/icons/40x40.png", - "proapp@2x" : "unpackage/res/icons/167x167.png", - "settings" : "unpackage/res/icons/29x29.png", - "settings@2x" : "unpackage/res/icons/58x58.png", - "spotlight" : "unpackage/res/icons/40x40.png", - "spotlight@2x" : "unpackage/res/icons/80x80.png" + "app" : "", + "app@2x" : "", + "notification" : "", + "notification@2x" : "", + "proapp@2x" : "", + "settings" : "", + "settings@2x" : "", + "spotlight" : "", + "spotlight@2x" : "" }, "iphone" : { "app@2x" : "unpackage/res/icons/120x120.png", diff --git a/pages.json b/pages.json index 2eaaa08..8a0a00a 100644 --- a/pages.json +++ b/pages.json @@ -37,82 +37,6 @@ "enablePullDownRefresh": false } }, - { - "path": "pages/eBook/1/bookComent", - "style": { - "navigationBarTitleText": "小说1" - } - }, - { - "path": "pages/eBook/1/battery", - "style": { - "navigationBarTitleText": "小说1-1" - } - }, - // { - // "path": "pages/eBook/1/bookComent", - // "style": { - // "navigationBarTitleText": "小说1-2" - // } - // }, - { - "path": "pages/eBook/2/book", - "style": { - "navigationBarTitleText": "小说2" - } - }, - { - "path": "pages/yRead/angbook", - "style": { - "navigationBarTitleText": "小说3", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/yRead/cus-audio-play", - "style": { - "navigationBarTitleText": "小说3-1", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/eBook/bookType", - "style": { - "navigationBarTitleText": "小说列表" - } - }, - { - "path": "pages/eBook/bookList", - "style": { - "navigationBarTitleText": "小说列表" - } - }, - { - "path": "pages/eBook/bookContent", - "style": { - "navigationBarTitleText": "小说详情", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/eBook/bookMessage", - "style": { - "navigationBarTitleText": "小说简介", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/eBook/bookRecord", - "style": { - "navigationBarTitleText": "阅读记录" - } - }, - { - "path": "pages/eBook/bookBuy", - "style": { - "navigationBarTitleText": "购买记录" - } - }, { "path": "pages/peanut/opeVip", "style": { @@ -266,181 +190,13 @@ "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", - "style": { - "navigationBarTitleText": "医案", - "enablePullDownRefresh": true - } - }, - { - "path": "pages/yian/yianList", - "style": { - "navigationBarTitleText": "医案列表", - "enablePullDownRefresh": true - } - }, - { - "path": "pages/yian/yianDetail", - "style": { - "navigationBarTitleText": "医案详情", - "enablePullDownRefresh": false - } - }, + }, { // 更新版本 "path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup", "style": { @@ -471,201 +227,52 @@ } }, { - "path": "pages/acupoint/acupoint", - "style": { - "navigationBarTitleText": "穴位检索", + "path" : "pages/news/news", + "style" : + { + "navigationBarTitleText" : "news", "enablePullDownRefresh": false } - }, - { - "path": "pages/acupoint/acupointDetail", - "style": { - "navigationBarTitleText": "脉穴详情", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/acupoint/givenDegree", - "style": { - "navigationBarTitleText": "特定穴位", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/timeAcupoint/timeAcupoint", - "style": { - "navigationBarTitleText": "时辰取穴", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/timeAcupoint/totalTable", - "style": { - "navigationBarTitleText": "全部穴位一览表", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/prescript/prescript", - "style": { - "navigationBarTitleText": "方药检索", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/prescript/prescriptDetail", - "style": { - "navigationBarTitleText": "方剂详情", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/prescript/medicineSearchDetail", - "style": { - "navigationBarTitleText": "药物详情", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/prescript/CNMedicineSearch", - "style": { - "navigationBarTitleText": "中药检索", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/prescript/CNMedicineSearchDetail", - "style": { - "navigationBarTitleText": "中药详情", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/prescript/CNMedicineText", - "style": { - "navigationBarTitleText": "中药搜索", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/medicaldes/medicaldes", - "style": { - "navigationBarTitleText": "吴门医述", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/medicaldes/zhuanzhuchuban", - "style": { - "navigationBarTitleText": "专著出版", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/medicaldes/xueshugongxianDetail", - "style": { - "navigationBarTitleText": "学术贡献详情", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/medicaldes/medicaldesDetail", - "style": { - "navigationBarTitleText": "医述详情", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/medicaldes/recordDetail", - "style": { - "navigationBarTitleText": "纪实详情", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/medicaldes/video", - "style": { - "navigationBarTitleText": "医述详情", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/luck/luck", - "style": { - "navigationBarTitleText": "五运六气", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/classic/classic", - "style": { - "navigationBarTitleText": "国学经典", - "enablePullDownRefresh": false - } - } - // { - // "path": "pages/agreement/yszcPage", - // "style": { - // "navigationBarTitleText": "隐私政策" - // } - // } + } ], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "uni-app", // "navigationBarTitleText": "启动页", - "navigationBarBackgroundColor": "#FFFFFF", + "navigationBarBackgroundColor": "#343434", "backgroundColor": "#FFFFFF", "navigationStyle": "custom", "enablePullDownRefresh": true }, "tabBar": { - "color": "#444444", + "color": "#fff", "selectedColor": "#079307", "borderStyle": "black", - "backgroundColor": "#ffffff", + "backgroundColor": "#343434", "list": [ { "pagePath": "pages/peanut/home", "iconPath": "static/tab/icon1_n.png", "selectedIconPath": "static/tab/icon1_y.png", "text": "首页" - }, - // { - // "pagePath": "pages/peanut/shopping", - // "iconPath": "static/tab/icon2_n.png", - // "selectedIconPath": "static/tab/icon2_y.png", - // "text": "购物车" - // }, + }, { - "pagePath": "pages/medicaldes/medicaldes", - "iconPath": "static/icon/five5_n.png", - "selectedIconPath": "static/icon/five5.png", - "text": "吴门医述" + "pagePath": "pages/peanut/shopping", + "iconPath": "static/tab/tab_nor_02.png", + "selectedIconPath": "static/tab/tab_cur_02.png", + "text": "购物车" }, { "pagePath": "pages/library/library", - "iconPath": "static/tab/icon3_n.png", - "selectedIconPath": "static/tab/icon3_y.png", - "text": "我的图书" - }, - // { - // "pagePath": "pages/peanut/bookshelf", - // "iconPath": "static/tab/icon3_n.png", - // "selectedIconPath": "static/tab/icon3_y.png", - // "text": "我的书架" - // }, - // { - // "pagePath": "pages/bookShop/orderList", - // "iconPath": "static/tab/icon2_n.png", - // "selectedIconPath": "static/tab/icon2_y.png", - // "text": "我的订单" - // }, + "iconPath": "static/tab/tab_nor_03.png", + "selectedIconPath": "static/tab/tab_cur_03.png", + "text": "太湖公益" + }, { "pagePath": "pages/peanut/mine", - "iconPath": "static/tab/icon4_n.png", - "selectedIconPath": "static/tab/icon4_y.png", - "text": "我" + "iconPath": "static/tab/tab_nor_04.png", + "selectedIconPath": "static/tab/tab_cur_04.png", + "text": "我的" } ] }, diff --git a/pages/agreement/yhxyPage.vue b/pages/agreement/yhxyPage.vue index e582a57..90e1080 100644 --- a/pages/agreement/yhxyPage.vue +++ b/pages/agreement/yhxyPage.vue @@ -1,65 +1,65 @@