diff --git a/App.vue b/App.vue index d3b18fd..6f70591 100644 --- a/App.vue +++ b/App.vue @@ -22,11 +22,11 @@ export default { // themeColor: "#00B666", // themeBackgroundColor: "#00B66621", - themeColor: "#fea702", - themeBackgroundColor: "#fea70221", + // themeColor: "#fea702", + // themeBackgroundColor: "#fea70221", - // themeColor: "#2FC67D", - // themeBackgroundColor: "#2FC67D21", + themeColor: "#2FC67D", + themeBackgroundColor: "#2FC67D21", logo: "", // #ifdef MP-WEIXIN diff --git a/components/list/job.vue b/components/list/job.vue index 953feb6..3df123b 100644 --- a/components/list/job.vue +++ b/components/list/job.vue @@ -9,7 +9,7 @@ 'padding-top': pt + 'rpx', }" > - + diff --git a/manifest.json b/manifest.json index df30c27..66f1af8 100644 --- a/manifest.json +++ b/manifest.json @@ -137,7 +137,7 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "wx15bc9c758f4eb129", + "appid" : "wxfab5320942daaafa", "setting" : { "urlCheck" : false, "es6" : true, diff --git a/pages.json b/pages.json index 11a55f8..f24115c 100644 --- a/pages.json +++ b/pages.json @@ -854,38 +854,38 @@ "uniIdRouter": {}, "tabBar": { "color": "#606266", - "selectedColor": "#fea702", + "selectedColor": "#2FC67D", "borderStyle": "black", "backgroundColor": "#ffffff", // "custom": true, "list": [ { "iconPath": "static/image/tabbar/home.png", - "selectedIconPath": "static/image/tabbar/home_yellow.png", + "selectedIconPath": "static/image/tabbar/home_green.png", "pagePath": "pages/home/index", "text": "首页" }, { "iconPath": "static/image/tabbar/message.png", - "selectedIconPath": "static/image/tabbar/message_yellow.png", + "selectedIconPath": "static/image/tabbar/message_green.png", "pagePath": "pages/message/index", "text": "消息" }, { "iconPath": "static/image/tabbar/plus-square.png", - "selectedIconPath": "static/image/tabbar/plus-square_yellow.png", + "selectedIconPath": "static/image/tabbar/plus-square_green.png", "pagePath": "pages/apply/index", "text": "报名" }, { "iconPath": "static/image/tabbar/order.png", - "selectedIconPath": "static/image/tabbar/order_yellow.png", + "selectedIconPath": "static/image/tabbar/order_green.png", "pagePath": "pages/order/index", "text": "工单" }, { "iconPath": "static/image/tabbar/user.png", - "selectedIconPath": "static/image/tabbar/user_yellow.png", + "selectedIconPath": "static/image/tabbar/user_green.png", "pagePath": "pages/person/index", "text": "我的" } diff --git a/pages/home/index.vue b/pages/home/index.vue index 0c15c94..644257c 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -402,12 +402,12 @@ export default { setTimeout(() => { - let _notice = uni.getStorageSync("miniApp-info").notice || '愿祖国繁荣富强,山河锦绣如画;盼华夏儿女同心,共筑盛世中华!'; + let _notice = (uni.getStorageSync("miniApp-info") || {}).notice || '愿祖国繁荣富强,山河锦绣如画;盼华夏儿女同心,共筑盛世中华!'; if (_notice) { var reg = /[\r\n]/g; _notice = _notice.replace(reg, ""); that.noticList = [_notice]; - that.noticeColor = uni.getStorageSync("miniApp-info").noticeColor; + that.noticeColor = (uni.getStorageSync("miniApp-info") || {}).noticeColor; that.showNotic = "play"; } }, 100); @@ -590,6 +590,7 @@ export default { }, methods: { themeColorRgba(alpha) { + if (!this.themeColor) return `rgba(0,0,0,${alpha})`; let hex = this.themeColor.replace('#', ''); if (hex.length === 3) hex = hex.split('').map(c => c + c).join(''); let r = parseInt(hex.substring(0, 2), 16); @@ -1036,7 +1037,7 @@ export default { that.query.list = []; uni.setStorageSync("lin-liu", 0); uni.setStorageSync("lin-bao", 0); - that.query.list = resData.recordList.map((item, index) => { + that.query.list = (resData.recordList || []).map((item, index) => { item.liuNum = uni.getStorageSync("lin-liu") ? uni.getStorageSync("lin-liu") : Math.floor(Math.random() * 1000); return { @@ -1131,7 +1132,7 @@ export default { ); } else { that.query.list = that.query.list.concat( - resData.recordList.map((item, index) => { + (resData.recordList || []).map((item, index) => { return { ...item, liuNum: item.liuNum, @@ -1151,8 +1152,8 @@ export default { ); } } - that.speed = resData.recordCount; - that.query.isFinish = resData.recordList.length; + that.speed = resData.recordCount || 0; + that.query.isFinish = (resData.recordList || []).length; resolve(); }); // console.log("resData.recordList", resData.recordList); @@ -1307,11 +1308,10 @@ export default { }); }, getSearch(e) { - // console.log(e); this.speed = -1; + this.isshowskit = false; this.keyword = e || ""; this.query.page = 1; - // console.log(this.whichPage); this.getList(); }, restoreActiveTab() {