From 37504b9a14bd3c6afda63e114e1d02e3fd00f641 Mon Sep 17 00:00:00 2001
From: lqq <jesus_lqq@163.com>
Date: Tue, 5 Nov 2019 15:23:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E7=AE=80=E4=BB=8B=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                                      |  3 +-
 models/billboard.js                           |  5 +--
 pages/billboards/park/park-category/index.js  |  6 ++--
 .../billboards/park/park-category/index.wxml  |  1 +
 pages/billboards/park/park-detail/index.js    | 34 +++++++++++++++++++
 pages/billboards/park/park-detail/index.json  |  3 ++
 pages/billboards/park/park-detail/index.wxml  |  4 +++
 pages/billboards/park/park-detail/index.wxss  |  4 +++
 8 files changed, 55 insertions(+), 5 deletions(-)
 create mode 100644 pages/billboards/park/park-detail/index.js
 create mode 100644 pages/billboards/park/park-detail/index.json
 create mode 100644 pages/billboards/park/park-detail/index.wxml
 create mode 100644 pages/billboards/park/park-detail/index.wxss

diff --git a/app.json b/app.json
index 657d38a..08cfe03 100644
--- a/app.json
+++ b/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",
diff --git a/models/billboard.js b/models/billboard.js
index 8e0b9a6..90e3cc1 100644
--- a/models/billboard.js
+++ b/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)
diff --git a/pages/billboards/park/park-category/index.js b/pages/billboards/park/park-category/index.js
index 779311b..f14e996 100644
--- a/pages/billboards/park/park-category/index.js
+++ b/pages/billboards/park/park-category/index.js
@@ -29,8 +29,10 @@ Page({
     this.fetchTags()
   },
   onTapMoreItem (e) {
-    const {code} = e.currentTarget.dataset
-    console.log(code)
+    const {code, name} = e.currentTarget.dataset
+    wx.navigateTo({
+      url: `/pages/billboards/park/park-detail/index?code=${code}&name=${name}`,
+    })
   },
   clickCardItem(e) {
     console.log(e.detail)
diff --git a/pages/billboards/park/park-category/index.wxml b/pages/billboards/park/park-category/index.wxml
index b643f5e..4743e83 100644
--- a/pages/billboards/park/park-category/index.wxml
+++ b/pages/billboards/park/park-category/index.wxml
@@ -3,6 +3,7 @@
   <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>
diff --git a/pages/billboards/park/park-detail/index.js b/pages/billboards/park/park-detail/index.js
new file mode 100644
index 0000000..9fe5530
--- /dev/null
+++ b/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
+      })
+    })
+  }
+})
\ No newline at end of file
diff --git a/pages/billboards/park/park-detail/index.json b/pages/billboards/park/park-detail/index.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/billboards/park/park-detail/index.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/billboards/park/park-detail/index.wxml b/pages/billboards/park/park-detail/index.wxml
new file mode 100644
index 0000000..18ea9cf
--- /dev/null
+++ b/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>
diff --git a/pages/billboards/park/park-detail/index.wxss b/pages/billboards/park/park-detail/index.wxss
new file mode 100644
index 0000000..5501d79
--- /dev/null
+++ b/pages/billboards/park/park-detail/index.wxss
@@ -0,0 +1,4 @@
+/* pages/billboards/park/park-detail/index.wxss */
+.container {
+  padding: 0 10px;
+}
\ No newline at end of file

From 45cc03340eedf0c5c648405eb8cb0a917bd255d3 Mon Sep 17 00:00:00 2001
From: lqq <jesus_lqq@163.com>
Date: Tue, 5 Nov 2019 15:42:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/billboards/park/park-category/index.wxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/billboards/park/park-category/index.wxml b/pages/billboards/park/park-category/index.wxml
index 4743e83..7c19288 100644
--- a/pages/billboards/park/park-category/index.wxml
+++ b/pages/billboards/park/park-category/index.wxml
@@ -10,7 +10,7 @@
       </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>