宣传栏,调整Card组件

components/card/index.wxml

@@ -1,5 +1,5 @@
 <!--components/card/index.wxml-->
 <view class="card tag-class" bindtap="onTap">
-  <image class="card_logo" src="/images/temp_1.png"/>
+  <image class="card_logo" src="{{image.length > 0 ? 'image' : '/images/temp_1.png'}}"/>
-  <view class="card_title">橡胶谷园区</view>
+  <view class="card_title">{{title}}</view>
 </view>

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;
 }

components/image-button/index.js

@@ -5,6 +5,10 @@ Component({
    */
   properties: {
     title: String,
+    disable: {
+      type: Boolean,
+      value: false,
+    }
   },
 
   /**

components/image-button/index.wxml

@@ -1,5 +1,5 @@
 <!--components/image-botton/index.wxml-->
 <view class="image-button" bindtap="onTap">
-  <image class="image-btn-bg" src="images/btn_bg.png"></image>
+  <image class="image-btn-bg" src="{{disable ? 'images/btn_bg_disable.png':'images/btn_bg.png'}}"></image>
   {{title}}
 </view>

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,

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() {

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()
     })
   },
   

pages/article/index.wxml

@@ -12,6 +12,6 @@
     <rich-text nodes="{{nodes}}"></rich-text>
   </view>
   <view class="page_footer" wx:if="{{showBtn}}">
-    <e-ibutton title="在线报名" bind:onTap="onlineSubmit"/>
+    <e-ibutton title="在线报名" bind:onTap="onlineSubmit" disable="{{disable}}"/>
   </view>
 </view>

pages/billboards/index.js

@@ -1,6 +1,6 @@
 // pages/billboards/index.js
-import {AuthModel} from '../../models/auth.js'
+// import {AuthModel} from '../../models/auth.js'
-let auth = new AuthModel()
+// 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

pages/billboards/park/index.wxml

@@ -1,7 +1,7 @@
 <!--pages/billboards/park/index.wxml-->
 <view class="container">
-  <image bindtap="onClickItem" data-code="park-cbd" class="billboard_item" src="/images/billboard/1.png"></image>
+  <image bindtap="onClickItem" data-code="park-cbd" class="billboard_item" src="images/1.png"></image>
-  <image bindtap="onClickItem" data-code="park-bhxq" class="billboard_item" src="/images/billboard/2.png"></image>
+  <image bindtap="onClickItem" data-code="park-bhxq" class="billboard_item" src="images/2.png"></image>
-  <image bindtap="onClickItem" data-code="park-cxzy" class="billboard_item" src="/images/billboard/3.png"></image>
+  <image bindtap="onClickItem" data-code="park-cxzy" class="billboard_item" src="images/3.png"></image>
-  <image bindtap="onClickItem" data-code="park-lswh" class="billboard_item" src="/images/billboard/3.png"></image>
+  <image bindtap="onClickItem" data-code="park-lswh" class="billboard_item" src="images/4.png"></image>
 </view>

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()
   },
   /**
    * 页面相关事件处理函数--监听用户下拉动作

pages/billboards/park/park-list/index.wxml

@@ -1,7 +1,8 @@
 <!--pages/billboards/park/index.wxml-->
 <view class="container">
   <block wx:for="{{list}}" wx:key="park-list-{{index}}">
-    <e-card cId="{{index}}" 
+    <e-card cId="{{item.id}}" 
+      title="{{item.title}}"
       tag-class="e_card" 
       bind:clickCardItem="clickCardItem"/>
   </block>

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
       })
     })
   }

pages/home/index.js

@@ -26,6 +26,11 @@ Page({
       currPage: 1,
     })
     this.fetchHomeList()
+    wx.vibrateShort({
+      success () {
+        console.log('震动')
+      }
+    })
   },
 
   /**

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",