diff --git a/components/card/index.wxml b/components/card/index.wxml index 34d6ecc..8482000 100644 --- a/components/card/index.wxml +++ b/components/card/index.wxml @@ -1,5 +1,5 @@ - - 橡胶谷园区 + + {{title}} diff --git a/components/card/index.wxss b/components/card/index.wxss index 484e504..e32232d 100644 --- a/components/card/index.wxss +++ b/components/card/index.wxss @@ -8,11 +8,12 @@ height: 106px; } .card_title { + padding: 0 10px; display: flex; flex-direction: row; align-items: center; justify-content: center; - height: 41px; + min-height: 41px; color: #373737; font-size: 12px; } \ No newline at end of file diff --git a/images/common/btn_bg_disable.png b/components/image-button/images/btn_bg_disable.png similarity index 100% rename from images/common/btn_bg_disable.png rename to components/image-button/images/btn_bg_disable.png diff --git a/components/image-button/index.js b/components/image-button/index.js index 9300fde..6d918a1 100644 --- a/components/image-button/index.js +++ b/components/image-button/index.js @@ -5,6 +5,10 @@ Component({ */ properties: { title: String, + disable: { + type: Boolean, + value: false, + } }, /** diff --git a/components/image-button/index.wxml b/components/image-button/index.wxml index 58bb6fe..77ad10e 100644 --- a/components/image-button/index.wxml +++ b/components/image-button/index.wxml @@ -1,5 +1,5 @@ - + {{title}} diff --git a/images/billboard/3.png b/images/billboard/3.png index bdb832a..b96a4e0 100644 Binary files a/images/billboard/3.png and b/images/billboard/3.png differ diff --git a/images/common/btn_bg.png b/images/common/btn_bg.png deleted file mode 100644 index ca30feb..0000000 Binary files a/images/common/btn_bg.png and /dev/null differ diff --git a/models/artice.js b/models/artice.js index d649550..4027b54 100644 --- a/models/artice.js +++ b/models/artice.js @@ -37,7 +37,7 @@ class ArticeModel extends HTTP { this.request(params) } // 在线报名 - onlineSign(aId, type, success) { + onlineSign(aId, success) { let params = { url: ArticeConst.artice_online_url, success: success, diff --git a/models/auth.js b/models/auth.js index 0075c2f..a3c18f3 100644 --- a/models/auth.js +++ b/models/auth.js @@ -1,6 +1,6 @@ import { HTTP, Method, HTTPConst } from '../utils/http.js' -const token_url = 'oas-admin/screen/user/ageAndSex' +const token_url = '' class AuthModel extends HTTP { constructor() { diff --git a/pages/article/index.js b/pages/article/index.js index b7b754b..1e449ca 100644 --- a/pages/article/index.js +++ b/pages/article/index.js @@ -18,6 +18,7 @@ Page({ origin: '', unStar: '/images/common/star.png', star: '/images/common/star_light.png', + disable: true, }, onClickCollect () { // 收藏功能 @@ -50,7 +51,8 @@ Page({ date: date, origin: data.source, isStar: data.isCollection ? true : false, - showBtn: data.typeFlag == 0 ? false : true + showBtn: data.typeFlag >= 2 ? true : false, + disable: data.typeFlag == 3 ? true : false, }) }) }, @@ -71,6 +73,14 @@ Page({ onlineSignApi () { artice.onlineSign(this.data.aId, res => { console.log(res) + wx.showToast({ + title: res.message, + icon: 'none' + }) + this.setData({ + disable: true + }) + // this.fetchArticeApi() }) }, diff --git a/pages/article/index.wxml b/pages/article/index.wxml index 969de5b..2b907ed 100644 --- a/pages/article/index.wxml +++ b/pages/article/index.wxml @@ -12,6 +12,6 @@ - + diff --git a/pages/billboards/index.js b/pages/billboards/index.js index 7168720..6cb2289 100644 --- a/pages/billboards/index.js +++ b/pages/billboards/index.js @@ -1,6 +1,6 @@ // pages/billboards/index.js -import {AuthModel} from '../../models/auth.js' -let auth = new AuthModel() +// import {AuthModel} from '../../models/auth.js' +// let auth = new AuthModel() Page({ @@ -15,9 +15,6 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { - auth.fetchAuthToken(res => { - console.log(res) - }) }, onClickItem (e) { const {index} = e.currentTarget.dataset diff --git a/pages/billboards/park/images/1.png b/pages/billboards/park/images/1.png new file mode 100644 index 0000000..de45b9f Binary files /dev/null and b/pages/billboards/park/images/1.png differ diff --git a/pages/billboards/park/images/2.png b/pages/billboards/park/images/2.png new file mode 100644 index 0000000..cd7d0ff Binary files /dev/null and b/pages/billboards/park/images/2.png differ diff --git a/pages/billboards/park/images/3.png b/pages/billboards/park/images/3.png new file mode 100644 index 0000000..ea60709 Binary files /dev/null and b/pages/billboards/park/images/3.png differ diff --git a/pages/billboards/park/images/4.png b/pages/billboards/park/images/4.png new file mode 100644 index 0000000..3d5d8b8 Binary files /dev/null and b/pages/billboards/park/images/4.png differ diff --git a/pages/billboards/park/index.wxml b/pages/billboards/park/index.wxml index 692e750..537b15f 100644 --- a/pages/billboards/park/index.wxml +++ b/pages/billboards/park/index.wxml @@ -1,7 +1,7 @@ - - - - + + + + diff --git a/pages/billboards/park/park-list/index.js b/pages/billboards/park/park-list/index.js index 8095d2e..3ced5b5 100644 --- a/pages/billboards/park/park-list/index.js +++ b/pages/billboards/park/park-list/index.js @@ -35,7 +35,30 @@ Page({ const page = this.data.curPage billboard.fetchBailList(curCode, page, res => { console.log(res) + const list = res.list + if (page == 1) { + this.setData({ + list: list + }) + } else { + if (list.length > 0) { + const list = [...this.data.list, ...list] + this.setData({ + list: list + }) + } else { + const page = this.data.currPage - 1 + this.setData({ + currPage: page + }) + wx.showToast({ + title: '已加载全部', + icon: 'none' + }) + } + } }) + wx.stopPullDownRefresh() }, /** * 页面相关事件处理函数--监听用户下拉动作 diff --git a/pages/billboards/park/park-list/index.wxml b/pages/billboards/park/park-list/index.wxml index 2e95c39..b10ef67 100644 --- a/pages/billboards/park/park-list/index.wxml +++ b/pages/billboards/park/park-list/index.wxml @@ -1,7 +1,8 @@ - diff --git a/pages/billboards/policy/policy-list/index.js b/pages/billboards/policy/policy-list/index.js index 5d9121a..e4a0df0 100644 --- a/pages/billboards/policy/policy-list/index.js +++ b/pages/billboards/policy/policy-list/index.js @@ -42,9 +42,8 @@ Page({ fetchPolicyArtice () { policy.fetchPolicyArtice(this.data.curCode, res => { console.log(res) - const list = res.list this.setData({ - nodes: list[0].content + nodes: res.data.content }) }) } diff --git a/pages/home/index.js b/pages/home/index.js index 3a3846b..24902df 100644 --- a/pages/home/index.js +++ b/pages/home/index.js @@ -26,6 +26,11 @@ Page({ currPage: 1, }) this.fetchHomeList() + wx.vibrateShort({ + success () { + console.log('震动') + } + }) }, /** diff --git a/pages/home/index.json b/pages/home/index.json index 4721f9c..8b85794 100644 --- a/pages/home/index.json +++ b/pages/home/index.json @@ -1,5 +1,7 @@ { "enablePullDownRefresh": true, + "backgroundColor": "#f7f7f7", + "backgroundTextStyle": "dark", "usingComponents": { "e-swiper": "/components/swiper/index", "e-focus": "/components/focus/index",