Merge branch 'master' of http://121.42.41.42:7070/r/shibeirencai_wechat

app.json

@@ -19,7 +19,8 @@
     "pages/user/myInfo/index",
     "pages/topics/interactive/submitTopic/index",
     "pages/topics/interactive/topicArticle/index",
-    "pages/billboards/park/park-category/index"
+    "pages/billboards/park/park-category/index",
+    "pages/billboards/park/park-detail/index"
   ],
   "window": {
     "backgroundTextStyle": "light",

models/billboard.js

@@ -3,7 +3,8 @@ import {HTTP, Method} from '../utils/http.js'
 const BaillConst = {
   bail_list_url:'/api/content/getListByCode',
   bail_tag_url: '/api/apicategory/childList', // 获取子分类和标题
-  category_artice_url: '/api/content/getOneListByCode'
+
+  category_artice_url: '/api/apicategory/getByCode'
 }
 class BillboardModel extends HTTP {
   constructor () {
@@ -38,7 +39,7 @@ class BillboardModel extends HTTP {
       success: success,
       method: Method.POST,
       data: {
-        typeCode: code
+        code: code
       }
     }
     this.request(params)

pages/billboards/park/park-category/index.js

@@ -29,8 +29,10 @@ Page({
     this.fetchTags()
   },
   onTapMoreItem (e) {
-    const {code} = e.currentTarget.dataset
+    const {code, name} = e.currentTarget.dataset
-    console.log(code)
+    wx.navigateTo({
+      url: `/pages/billboards/park/park-detail/index?code=${code}&name=${name}`,
+    })
   },
   clickCardItem(e) {
     console.log(e.detail)

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

@@ -3,13 +3,14 @@
   <block wx:for="{{list}}" wx:key="category-list-{{index}}">
     <view class="categroy_card_wrapper">
       <mp-cell bindtap="onTapMoreItem" icon="/images/common/line.png" data-code="{{item.code}}"  
+      data-name="{{item.name}}"
       link="true" 
       ext-class="cell-item">
         <text slot="title" data-code="{{item.code}}">{{item.name}}</text>
       </mp-cell>
       <view class="card_list">
         <block wx:for="{{item.datas}}" wx:key="park-list-{{index}}">
-          <e-card cId="{{item.id}}" title="{{item.title}}" image="{{item.titlePic}}" tag-class="e_card" bind:clickCardItem="clickCardItem" />
+          <e-card cId="{{item.id}}" title="{{item.title}}" image="{{item.image}}" tag-class="e_card" bind:clickCardItem="clickCardItem" />
         </block>
       </view>
     </view>

pages/billboards/park/park-detail/index.js

@@ -0,0 +1,34 @@
+// pages/billboards/park/park-detail/index.js
+import { BillboardModel } from '../../../../models/billboard.js'
+
+let billboard = new BillboardModel()
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    content: '',
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    const {code, name} = options
+    console.log(code)
+    wx.setNavigationBarTitle({
+      title: name,
+    })
+    this.fetchCategoryIntro(code)
+  },
+  fetchCategoryIntro (code) {
+    billboard.fetchCategoryArtice(code, res => {
+      console.log(res)
+      this.setData({
+        content: res.result.brief
+      })
+    })
+  }
+})

pages/billboards/park/park-detail/index.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

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

@@ -0,0 +1,4 @@
+<!--pages/billboards/park/park-detail/index.wxml-->
+<view class="container">
+  <rich-text nodes="{{content}}"></rich-text>
+</view>

pages/billboards/park/park-detail/index.wxss

@@ -0,0 +1,4 @@
+/* pages/billboards/park/park-detail/index.wxss */
+.container {
+  padding: 0 10px;
+}