From c36a34bc484d9c2b86a5d2396e8b767bc8b5e0f3 Mon Sep 17 00:00:00 2001
From: liushaowen <565850092@qq.com>
Date: Wed, 17 Jun 2020 09:50:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=83=E7=90=86=E5=92=A8=E8=AF=A2=E3=80=81?=
 =?UTF-8?q?=E7=BB=BC=E6=B2=BB=E7=9F=9B=E8=B0=83=20-=E5=88=98=E7=BB=8D?=
 =?UTF-8?q?=E6=96=87=202020.6.17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/conflict.js                               |  16 +
 api/consult.js                                |  18 ++
 app.json                                      |  15 +
 pages/index/index.js                          |  14 +-
 pages/index/index.wxml                        |   2 +-
 .../components/loadMore/loadMore.js           |  14 +
 .../components/loadMore/loadMore.json         |   3 +
 .../components/loadMore/loadMore.wxml         |   7 +
 .../components/loadMore/loadMore.wxss         |  18 ++
 .../pullDownRefresh/pullDownRefresh.js        |  70 +++++
 .../pullDownRefresh/pullDownRefresh.json      |   3 +
 .../pullDownRefresh/pullDownRefresh.wxml      |   9 +
 .../pullDownRefresh/pullDownRefresh.wxss      |  27 ++
 subpages/conflictMediation/images/input.png   | Bin 0 -> 896 bytes
 subpages/conflictMediation/images/loading.gif | Bin 0 -> 3897 bytes
 .../pages/historyDetail/historyDetail.js      |  28 ++
 .../pages/historyDetail/historyDetail.json    |   5 +
 .../pages/historyDetail/historyDetail.wxml    |  42 +++
 .../pages/historyDetail/historyDetail.wxss    |  55 ++++
 .../conflictMediation/pages/index/index.js    | 278 ++++++++++++++++++
 .../conflictMediation/pages/index/index.json  |  11 +
 .../conflictMediation/pages/index/index.wxml  |  80 +++++
 .../conflictMediation/pages/index/index.wxss  |  93 ++++++
 .../consult/components/loadMore/loadMore.js   |  14 +
 .../consult/components/loadMore/loadMore.json |   3 +
 .../consult/components/loadMore/loadMore.wxml |   7 +
 .../consult/components/loadMore/loadMore.wxss |  18 ++
 .../pullDownRefresh/pullDownRefresh.js        |  70 +++++
 .../pullDownRefresh/pullDownRefresh.json      |   3 +
 .../pullDownRefresh/pullDownRefresh.wxml      |   9 +
 .../pullDownRefresh/pullDownRefresh.wxss      |  27 ++
 .../components/questionList/questionList.js   |  59 ++++
 .../components/questionList/questionList.json |   4 +
 .../components/questionList/questionList.wxml |  49 +++
 .../components/questionList/questionList.wxss | 117 ++++++++
 subpages/consult/images/input.png             | Bin 0 -> 896 bytes
 subpages/consult/images/loading.gif           | Bin 0 -> 3897 bytes
 .../pages/consultIndex/consultIndex.js        | 234 +++++++++++++++
 .../pages/consultIndex/consultIndex.json      |  10 +
 .../pages/consultIndex/consultIndex.wxml      |  25 ++
 .../pages/consultIndex/consultIndex.wxss      | 128 ++++++++
 41 files changed, 1583 insertions(+), 2 deletions(-)
 create mode 100644 api/conflict.js
 create mode 100644 api/consult.js
 create mode 100644 subpages/conflictMediation/components/loadMore/loadMore.js
 create mode 100644 subpages/conflictMediation/components/loadMore/loadMore.json
 create mode 100644 subpages/conflictMediation/components/loadMore/loadMore.wxml
 create mode 100644 subpages/conflictMediation/components/loadMore/loadMore.wxss
 create mode 100644 subpages/conflictMediation/components/pullDownRefresh/pullDownRefresh.js
 create mode 100644 subpages/conflictMediation/components/pullDownRefresh/pullDownRefresh.json
 create mode 100644 subpages/conflictMediation/components/pullDownRefresh/pullDownRefresh.wxml
 create mode 100644 subpages/conflictMediation/components/pullDownRefresh/pullDownRefresh.wxss
 create mode 100644 subpages/conflictMediation/images/input.png
 create mode 100644 subpages/conflictMediation/images/loading.gif
 create mode 100644 subpages/conflictMediation/pages/historyDetail/historyDetail.js
 create mode 100644 subpages/conflictMediation/pages/historyDetail/historyDetail.json
 create mode 100644 subpages/conflictMediation/pages/historyDetail/historyDetail.wxml
 create mode 100644 subpages/conflictMediation/pages/historyDetail/historyDetail.wxss
 create mode 100644 subpages/conflictMediation/pages/index/index.js
 create mode 100644 subpages/conflictMediation/pages/index/index.json
 create mode 100644 subpages/conflictMediation/pages/index/index.wxml
 create mode 100644 subpages/conflictMediation/pages/index/index.wxss
 create mode 100644 subpages/consult/components/loadMore/loadMore.js
 create mode 100644 subpages/consult/components/loadMore/loadMore.json
 create mode 100644 subpages/consult/components/loadMore/loadMore.wxml
 create mode 100644 subpages/consult/components/loadMore/loadMore.wxss
 create mode 100644 subpages/consult/components/pullDownRefresh/pullDownRefresh.js
 create mode 100644 subpages/consult/components/pullDownRefresh/pullDownRefresh.json
 create mode 100644 subpages/consult/components/pullDownRefresh/pullDownRefresh.wxml
 create mode 100644 subpages/consult/components/pullDownRefresh/pullDownRefresh.wxss
 create mode 100644 subpages/consult/components/questionList/questionList.js
 create mode 100644 subpages/consult/components/questionList/questionList.json
 create mode 100644 subpages/consult/components/questionList/questionList.wxml
 create mode 100644 subpages/consult/components/questionList/questionList.wxss
 create mode 100644 subpages/consult/images/input.png
 create mode 100644 subpages/consult/images/loading.gif
 create mode 100644 subpages/consult/pages/consultIndex/consultIndex.js
 create mode 100644 subpages/consult/pages/consultIndex/consultIndex.json
 create mode 100644 subpages/consult/pages/consultIndex/consultIndex.wxml
 create mode 100644 subpages/consult/pages/consultIndex/consultIndex.wxss

diff --git a/api/conflict.js b/api/conflict.js
new file mode 100644
index 0000000..0f6e4e4
--- /dev/null
+++ b/api/conflict.js
@@ -0,0 +1,16 @@
+var fly = require('../utils/request.js')
+module.exports = {
+  submitConflict: submitConflict,
+  getHistory:getHistory,
+  getHistoryById:getHistoryById
+}
+
+function submitConflict(param) {
+  return fly.post('work/property/conflict/submit', param)
+}
+function getHistory(param) {
+  return fly.get('work/property/conflict/listHistory', param)
+}
+function getHistoryById(id) {
+  return fly.get('work/property/conflict/getById/'+id)
+}
diff --git a/api/consult.js b/api/consult.js
new file mode 100644
index 0000000..3045c57
--- /dev/null
+++ b/api/consult.js
@@ -0,0 +1,18 @@
+var fly = require('../utils/request.js')
+module.exports = {
+  getQuestionList: getQuestionList,
+  getMyQuestionList:getMyQuestionList,
+  submitAnswer:submitAnswer
+}
+// 工作端--待解答的心理咨询问题列表
+function getQuestionList(param) {
+  return fly.get('work/property/psychology/listQuestion', param)
+}
+// 工作端--我解答的心理咨询问题列表
+function getMyQuestionList(param) {
+  return fly.get('work/property/psychology/listMyQuestion', param)
+}
+// 工作端--心理咨询-提交问题的回答
+function submitAnswer(param) {
+  return fly.post('work/property/psychology/submitAnswer', param)
+}
\ No newline at end of file
diff --git a/app.json b/app.json
index f0edc9f..f1bff44 100644
--- a/app.json
+++ b/app.json
@@ -64,6 +64,21 @@
         "pages/monthlyIndex/monthlyIndex",
         "pages/monthlyDetail/monthlyDetail"
       ]
+    },
+    {
+      "root": "subpages/consult",
+      "name": "consult",
+      "pages": [
+        "pages/consultIndex/consultIndex"
+      ]
+    },
+    {
+      "root": "subpages/conflictMediation",
+      "name": "conflictMediation",
+      "pages": [
+        "pages/index/index",
+        "pages/historyDetail/historyDetail"
+      ]
     }
   ],
   "preloadRule": {
diff --git a/pages/index/index.js b/pages/index/index.js
index 74ba87d..7323bed 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -123,6 +123,7 @@ Page({
     console.log('e', JSON.stringify(e))
     let tmp = e.currentTarget.dataset.tmp
     let state = e.currentTarget.dataset.state
+    let navCode= e.currentTarget.dataset.navcode
     switch (tmp) {
       case 'tmp-1':
         let childNav = [];
@@ -201,7 +202,18 @@ Page({
         //   })
         // }
         break
-
+        case 'tmp-6':
+          if(navCode==10031){
+            wx.navigateTo({
+              url: '/subpages/consult/pages/consultIndex/consultIndex',
+            })
+          }
+          if(navCode==10032){
+            wx.navigateTo({
+              url: '/subpages/conflictMediation/pages/index/index',
+            })
+          }
+          break
       default:
         let c_childNav = [];
         for (let i = 0; i < this.data.panel.length; i++) {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 99c04aa..99a25aa 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -40,7 +40,7 @@
       <view class="detailed-name">{{itemPanel.mainLabel}}</view>
       <view class="sudoku">
         <view class="content">
-          <view wx:for="{{itemPanel.childNav}}" wx:for-index="index" wx:for-item="itemChild" data-state="{{index}}" data-tmp="{{itemPanel.templateInfo.templateCode}}" bindtap="toTabs" hover-stay-time="150" hover-class="grid-hover" class="item">
+          <view wx:for="{{itemPanel.childNav}}" wx:for-index="index" wx:for-item="itemChild" data-state="{{index}}" data-tmp="{{itemPanel.templateInfo.templateCode}}" data-navcode="{{itemChild.navCode}}" bindtap="toTabs" hover-stay-time="150" hover-class="grid-hover" class="item">
             <image src="{{itemChild.icon}}" />
             <view class="name">{{itemChild.label}}</view>
             <!-- 书记在线特殊处理 -->
diff --git a/subpages/conflictMediation/components/loadMore/loadMore.js b/subpages/conflictMediation/components/loadMore/loadMore.js
new file mode 100644
index 0000000..bde42e0
--- /dev/null
+++ b/subpages/conflictMediation/components/loadMore/loadMore.js
@@ -0,0 +1,14 @@
+Component({
+  data: {
+  },
+  properties: {
+    loadMoreVisible: {
+      type: Boolean,
+      value: false
+    },
+    loadMoreType: {
+      type: String,
+      value: 'loading'
+    }
+  }
+})
\ No newline at end of file
diff --git a/subpages/conflictMediation/components/loadMore/loadMore.json b/subpages/conflictMediation/components/loadMore/loadMore.json
new file mode 100644
index 0000000..32640e0
--- /dev/null
+++ b/subpages/conflictMediation/components/loadMore/loadMore.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
\ No newline at end of file
diff --git a/subpages/conflictMediation/components/loadMore/loadMore.wxml b/subpages/conflictMediation/components/loadMore/loadMore.wxml
new file mode 100644
index 0000000..573e607
--- /dev/null
+++ b/subpages/conflictMediation/components/loadMore/loadMore.wxml
@@ -0,0 +1,7 @@
+<view class="load-more" style="visibility: {{loadMoreVisible ? 'visible' : 'hidden'}}">
+  <block wx:if="{{loadMoreType == 'loading'}}">
+    <image class="load-image" src="../../images/loading.gif" />
+    <view class="load-text">正在加载中...</view>
+  </block>
+  <view wx:else class="load-text">没有更多了~</view>
+</view>
\ No newline at end of file
diff --git a/subpages/conflictMediation/components/loadMore/loadMore.wxss b/subpages/conflictMediation/components/loadMore/loadMore.wxss
new file mode 100644
index 0000000..dbb07cd
--- /dev/null
+++ b/subpages/conflictMediation/components/loadMore/loadMore.wxss
@@ -0,0 +1,18 @@
+.load-more {
+  width: 100%;
+  height: 100rpx;
+  background: #f7f7f7;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.load-more .load-text {
+  color: #999;
+  font-size: 26rpx;
+}
+.load-more .load-image {
+  width: 30rpx;
+  height: 30rpx;
+  object-fit: cover;
+  margin-right: 10rpx;
+}
\ No newline at end of file
diff --git a/subpages/conflictMediation/components/pullDownRefresh/pullDownRefresh.js b/subpages/conflictMediation/components/pullDownRefresh/pullDownRefresh.js
new file mode 100644
index 0000000..b76e2ec
--- /dev/null
+++ b/subpages/conflictMediation/components/pullDownRefresh/pullDownRefresh.js
@@ -0,0 +1,70 @@
+Component({
+  data: {
+    lastY: '',
+    translateHeight: 0,
+    state: -1,
+    scrollTop: 0,
+    enablePulldownFresh: false
+  },
+  options: {
+    multipleSlots: true
+  },
+  properties: {
+    upperDistance: {
+      type: Number,
+      value: 80
+    }
+  },
+  methods: {
+    onPageScroll (e) {
+      this.data.scrollTop = e.scrollTop
+      this.data.enablePulldownFresh = false
+    },
+    touchstart (e) {
+      this.data.lastY = e.touches[0].clientY
+      if (this.data.scrollTop === 0) {
+        this.data.enablePulldownFresh = true
+      } else {
+        this.data.enablePulldownFresh = false
+      }
+    },
+    touchmove (e) {
+      let clientY = e.touches[0].clientY
+      let offset = clientY - this.data.lastY
+      if (this.data.scrollTop > 0 || offset < 0) {
+        return false
+      }
+      this.data.translateHeight = offset
+      this.data.state = 1
+
+      if (this.data.enablePulldownFresh) {
+        if (this.data.translateHeight > this.data.upperDistance) {
+          this.data.state = 2
+        }
+        this.setData({
+          translateHeight: this.data.translateHeight > 100 ? 100 : this.data.translateHeight,
+          state: this.data.state
+        })
+      }
+    },
+    touchend (e) {
+      if (this.data.translateHeight > this.data.upperDistance) {
+        if (this.data.enablePulldownFresh) {
+          this.setData({
+            translateHeight: 100,
+            state: 3
+          })
+          this.triggerEvent('pullDownRefresh')
+        }
+      } else if (this.data.scrollTop <= 0) {
+        this.stopRefresh()
+      }
+    },
+    stopRefresh () {
+      this.setData({
+        translateHeight: 0,
+        state: -1
+      })
+    }
+  }
+})
\ No newline at end of file
diff --git a/subpages/conflictMediation/components/pullDownRefresh/pullDownRefresh.json b/subpages/conflictMediation/components/pullDownRefresh/pullDownRefresh.json
new file mode 100644
index 0000000..32640e0
--- /dev/null
+++ b/subpages/conflictMediation/components/pullDownRefresh/pullDownRefresh.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
\ No newline at end of file
diff --git a/subpages/conflictMediation/components/pullDownRefresh/pullDownRefresh.wxml b/subpages/conflictMediation/components/pullDownRefresh/pullDownRefresh.wxml
new file mode 100644
index 0000000..cf6780f
--- /dev/null
+++ b/subpages/conflictMediation/components/pullDownRefresh/pullDownRefresh.wxml
@@ -0,0 +1,9 @@
+<view class="pulldown-refresh" bindtouchstart="touchstart" bindtouchmove="touchmove" bindtouchend="touchend">
+  <view class="pulldown-state">
+    <image class="loading" src="../../images/loading.gif" />
+    <view class="loading-state">{{state == 1 ? '下拉刷新' : state == 2 ? '松开刷新' : '刷新中...'}}</view>
+  </view>
+  <view class="pulldown-content" style="transform: translateY({{translateHeight}}rpx)">
+    <slot name="content"></slot>
+  </view>
+</view>
\ No newline at end of file
diff --git a/subpages/conflictMediation/components/pullDownRefresh/pullDownRefresh.wxss b/subpages/conflictMediation/components/pullDownRefresh/pullDownRefresh.wxss
new file mode 100644
index 0000000..7ee6289
--- /dev/null
+++ b/subpages/conflictMediation/components/pullDownRefresh/pullDownRefresh.wxss
@@ -0,0 +1,27 @@
+.pulldown-refresh {
+  width:100%;
+  background: #f7f7f7;
+}
+.pulldown-refresh .pulldown-state {
+  width:100%;
+  height: 100rpx;
+  display:flex;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: -100rpx;
+}
+.pulldown-refresh .pulldown-state .loading {
+  width: 30rpx;
+  height: 30rpx;
+  margin-right: 10rpx;
+}
+.pulldown-refresh .pulldown-state .loading-state {
+  font-size: 25rpx;
+  color:#666;
+}
+
+.pulldown-refresh .pulldown-content {
+  width:100%;
+  height:auto;
+  transition: transform 0.05s linear;
+}
\ No newline at end of file
diff --git a/subpages/conflictMediation/images/input.png b/subpages/conflictMediation/images/input.png
new file mode 100644
index 0000000000000000000000000000000000000000..eda2e427e8364bdaf3881d2ef38ef6933f697368
GIT binary patch
literal 896
zcmV-`1AqL9P)<h;3K|Lk000e1NJLTq000^Q000^Y1^@s6sY*=F0009=Nkl<ZNK38O
zT}V@57zgm@|GeAIaczWlQ4JK_0!0K9kqJepP!Qfk7e(Dh7hOd+T|@=xT|^gMT69x4
zeLw^T27&ek<;SLITWWd{J0r6TDP2kDoHyR%JZy8DAGw>2vF-Oh&+|Xe8E6L|vY{bh
zYT6ay@f-s49NG3Q3=e-&1a`_<YG~N!*R*~KG!Zj_nFz>0%99uxdbwke)zox}m~Rt6
zIgkQ>l4Tv-F-UdBYHq$k!1Y|nc?~@MFX+#K0}*(=6<RVmxi$i;rKOvIYuVPVRtKcF
z4arEP`mfhJ2xh-Whz?9le0H(c)*b*?-8KSmwgowe5CdS2s1vgg^K4n2NF)+27LE3R
z=qi{Evh9v7Lz!^6MldTR?6gO<MhNx1Aeh?`kGq&`YrDK+n$Pu-k*O^~nNX-kXxab?
z;UEPNG4nhWHahCIajn8lLk{BgI>=h83ZZNOzA<nNqoWhK*XX7o846Xe2r)>iU8`+!
zswn{(Omq~nSaM5HCKRe>V1TlN-vBZgXh$serEuevtteAfRSjJqARtog^abywg+j*0
zW{Rz~l2E3yvIah%s>Gd1PQnUXXPC^L`uO;Csohx=QV4lG4&t6VKguoyAyTGock0Px
z(Mn3DPPL1e2MNfpq&Q@FRGbrubu%eDBL|Vv9lX07izJMg4WDJTV|I2!B=3H-?Dy}7
z&-Yd`N043hWgtV^c85MUSGHa2;{BLNbnV{#k${%$wso$RVh}N>2~bGM!Iw;3CJ;C!
zg?N;+ZHq!+PD#t^)KjTVSCSWorC_iR%w6RmH4{kLuBTF)n#sB_ED!}Ng2C@#*2_Q!
zfNdjA7?y*<6O!mz!5z_UovMU|=-5uX^1|>d5a<PPz6A7vggEU_r@yX!$&5sfTfhYt
zf^5^gqRq}u%KG{}magAtK;5=qAQtOYpO?|-O#<o&_<^NBV1j_g94G^z-)6qMYhgkC
zO_I4M`(0amj)l1AY;WMOcWUbWa$Q|W({;o74Wc_D9>1tw*wN@~Vm<<3MnMk=XeMA-
z0(~a%s&a90vDD6535U-Tb2qU%Kb`SSPY=n)#=Vxu^Uk^ch#rV|ygLg$0do@p-~Is-
WI{R~{P*4#70000<MNUMnLSTZ8Jd)J_

literal 0
HcmV?d00001

diff --git a/subpages/conflictMediation/images/loading.gif b/subpages/conflictMediation/images/loading.gif
new file mode 100644
index 0000000000000000000000000000000000000000..915c1984cb8541c40f28762a09970b6578632aa3
GIT binary patch
literal 3897
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

literal 0
HcmV?d00001

diff --git a/subpages/conflictMediation/pages/historyDetail/historyDetail.js b/subpages/conflictMediation/pages/historyDetail/historyDetail.js
new file mode 100644
index 0000000..017e189
--- /dev/null
+++ b/subpages/conflictMediation/pages/historyDetail/historyDetail.js
@@ -0,0 +1,28 @@
+const app = getApp()
+const api = require('../../../../api/conflict')
+Page({
+  data: {
+    detail:{}
+  },
+  onHide:function(){
+
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+   onLoad: function (options) {
+     let id = options.id;
+    api.getHistoryById(id).then(res=>{
+      this.setData({
+        detail:res.data
+      })
+    })
+  },
+    // this.getRecommend();
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    
+  },
+})
\ No newline at end of file
diff --git a/subpages/conflictMediation/pages/historyDetail/historyDetail.json b/subpages/conflictMediation/pages/historyDetail/historyDetail.json
new file mode 100644
index 0000000..caf3a8a
--- /dev/null
+++ b/subpages/conflictMediation/pages/historyDetail/historyDetail.json
@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "详情",
+  "usingComponents": {
+  }
+}
\ No newline at end of file
diff --git a/subpages/conflictMediation/pages/historyDetail/historyDetail.wxml b/subpages/conflictMediation/pages/historyDetail/historyDetail.wxml
new file mode 100644
index 0000000..c0cb123
--- /dev/null
+++ b/subpages/conflictMediation/pages/historyDetail/historyDetail.wxml
@@ -0,0 +1,42 @@
+<view class="edit">
+    <view class="edit-item">
+      <view class="title" style="{{'color:#c1c1c1'}}">矛盾纠纷类型</view>
+      <textarea class="textarea" disabled="{{true}}" value="{{detail.conflictType}}" auto-height="{{true}}" placeholder-style="color:#c1c1c1;font-size:28rpx"></textarea>
+    </view>
+    <view class="edit-item">
+      <view class="title" style="{{'color:#c1c1c1'}}">形成原因</view>
+      <textarea class="textarea" disabled="{{true}}" value="{{detail.conflictReason}}" auto-height="{{true}}" placeholder-style="color:#c1c1c1;font-size:28rpx"></textarea>
+    </view>
+    <view class="edit-item">
+      <view class="title" style="{{'color:#c1c1c1'}}">涉及人数</view>
+      <textarea class="textarea" disabled="{{true}}" value="{{detail.involvedNum}}" auto-height="{{true}}" placeholder-style="color:#c1c1c1;font-size:28rpx"></textarea>
+    </view>
+    <view class="edit-item">
+      <view class="title" style="{{'color:#c1c1c1'}}">挑头骨干人员</view>
+      <textarea class="textarea"disabled="{{true}}" value="{{detail.mainstayLeader}}" auto-height="{{true}}" placeholder-style="color:#c1c1c1;font-size:28rpx"></textarea>
+    </view>
+    <view class="edit-item">
+      <view class="title" style="{{'color:#c1c1c1'}}">责任单位</view>
+      <textarea class="textarea" disabled="{{true}}" value="{{detail.responsibleDept}}" auto-height="{{true}}" placeholder-style="color:#c1c1c1;font-size:28rpx"></textarea>
+    </view>
+    <view class="edit-item">
+      <view class="title" style="{{'color:#c1c1c1'}}">责任人</view>
+      <textarea class="textarea" disabled="{{true}}" value="{{detail.responsiblePeople}}" auto-height="{{true}}" placeholder-style="color:#c1c1c1;font-size:28rpx"></textarea>
+    </view>
+    <view class="edit-item">
+      <view class="title" style="{{'color:#c1c1c1'}}">主要采取措施</view>
+      <textarea class="textarea" disabled="{{true}}" value="{{detail.majorMeasures}}" auto-height="{{true}}" placeholder-style="color:#c1c1c1;font-size:28rpx"></textarea>
+    </view>
+    <view class="edit-item">
+      <view class="title" style="{{'color:#c1c1c1'}}">目前稳控情况</view>
+      <textarea class="textarea" disabled="{{true}}" value="{{detail.currentSituation}}" auto-height="{{true}}" placeholder-style="color:#c1c1c1;font-size:28rpx"></textarea>
+    </view>
+    <view class="edit-item">
+      <view class="title" style="{{'color:#c1c1c1'}}">备注</view>
+      <textarea class="textarea" disabled="{{true}}" value="{{detail.remark}}" auto-height="{{true}}" placeholder-style="color:#c1c1c1;font-size:28rpx"></textarea>
+    </view>
+    <view class="edit-item" style="margin-bottom:15rpx">
+      <view class="title" style="{{'color:#c1c1c1'}}">提报时间</view>
+      <textarea class="textarea" disabled="{{true}}" value="{{detail.submitTime}}" auto-height="{{true}}" ></textarea>
+    </view>
+  </view>
\ No newline at end of file
diff --git a/subpages/conflictMediation/pages/historyDetail/historyDetail.wxss b/subpages/conflictMediation/pages/historyDetail/historyDetail.wxss
new file mode 100644
index 0000000..b6a3520
--- /dev/null
+++ b/subpages/conflictMediation/pages/historyDetail/historyDetail.wxss
@@ -0,0 +1,55 @@
+page {
+  width: 100%;
+  height: auto;
+  overflow-y: scroll;
+  background: #f7f7f7;
+}
+.toptabs{
+  border-bottom: 1px solid #EDEFF0;
+  position: fixed;
+  top: 0;
+  z-index: 999999;
+  width: 100%;
+  background: #ffffff;
+}
+.wux-tabs__tab {
+  font-size:32rpx!important;
+  color: #8393A0!important;
+}
+.wux-tabs__tab--current {
+  color:#333333!important;
+  font-weight: bold;
+  font-size: 40rpx!important;
+}
+.wux-tabs__tab-bar{
+  background: #ffffff!important;
+}
+.newhot-tabs{
+  display: flex;
+  width: 100%;
+  margin: 10px;
+  height: 50rpx;
+}
+.edit{
+  width: 100%;
+}
+.edit .edit-item{
+  width: 100%;
+  background-color: #fff;
+  margin-top: 15rpx;
+}
+.edit .edit-item .title{
+  color: #333333;
+  font-size: 32rpx;
+  margin:0 20rpx;
+  padding: 20rpx 0;
+  border-bottom: 0.5px solid #E7EEEE;
+}
+.edit .edit-item .textarea{
+  color: #333333;
+  font-size: 32rpx;
+  margin:0 20rpx;
+  padding: 20rpx 0;
+  border-bottom: 0.5px solid #E7EEEE;
+  width: 96%;
+}
\ No newline at end of file
diff --git a/subpages/conflictMediation/pages/index/index.js b/subpages/conflictMediation/pages/index/index.js
new file mode 100644
index 0000000..8c10cba
--- /dev/null
+++ b/subpages/conflictMediation/pages/index/index.js
@@ -0,0 +1,278 @@
+const api = require('../../../../api/conflict')
+import { formatTimestamp } from '../../../../utils/util'
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    loadMoreType: 'loading',
+    loadMoreVisible: true,
+    tabList:['编辑上报','历史上报'],//tab列表
+    currentTabIndex:0,
+    pageNo: 1, // 分页页码
+    pageSize: 20, // 分页页长
+    isLoading: true,
+    timestamp:'',
+    conflictType:'',
+    reason:'',
+    peopleNumber:'',
+    peopleLeader:'',
+    dutyUnit:'',
+    dutyPerson:'',
+    mainMeasure:'',
+    statusNow:'',
+    remark:'',
+    temp_datetime:[],
+    datetime:'',
+    historyList:[],
+    pickerVisible:false
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    let date=new Date();
+    this.setData({
+      temp_datetime:[date.getFullYear().toString(),date.getMonth().toString(),date.getDate().toString()]
+    })
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    if(this.data.currentTabIndex ==='1' && !this.data.isLoading && this.data.loadMoreType!='none'){
+      this.setData({
+        loadMoreType:'loading',
+        loadMoreVisible:true,
+        pageNo:this.data.pageNo+1,
+        isLoading:true
+      })
+      let param = {
+        pageIndex:this.data.pageNo,
+        pageSize:this.data.pageSize,
+        timestamp:this.data.timestamp
+      }
+      this.getHistory(param)
+    }
+  },
+  onConfirmDatetime(e){
+    console.log(e.detail)
+    this.setData({
+      datetime:e.detail.label,
+      pickerVisible:false
+    })
+  },
+  changeTab(e){
+    this.setData({
+      currentTabIndex:e.detail.key
+    })
+    if(e.detail.key==="1"){
+      this.setData({
+        loadMoreType:'loading',
+        loadMoreVisible:true,
+        pageNo:1,
+        historyList:[],
+        isLoading:true,
+        timestamp:formatTimestamp(new Date())
+      })
+      let param = {
+        pageIndex:this.data.pageNo,
+        pageSize:this.data.pageSize,
+        timestamp:this.data.timestamp
+      }
+      this.getHistory(param)
+    }
+  },
+  getHistory(param){
+    api.getHistory(param).then((res)=>{
+      this.setData({
+        historyList:this.data.historyList.concat(res.data),
+        isLoading:false
+      })
+      if(res.data.length<20){
+        this.setData({
+          loadMoreType:'none',
+          loadMoreVisible:true,
+        })
+      }else{
+        this.setData({
+          loadMoreType:"more",
+          loadMoreVisible:false
+        })
+      }
+    })
+  },
+  handleConflictType(e){
+    this.setData({
+      conflictType:e.detail.value
+    })
+  },
+  handleReason(e){
+    this.setData({
+      reason:e.detail.value
+    })
+  },
+  handlePeopleNumber(e){
+    this.setData({
+      peopleNumber:e.detail.value
+    })
+  },
+  handlePeopleLeader(e){
+    this.setData({
+      peopleLeader:e.detail.value
+    })
+  }
+  ,
+  handleDutyUnit(e){
+    this.setData({
+      dutyUnit:e.detail.value
+    })
+  },
+  handleDutyPerson(e){
+    this.setData({
+      dutyPerson:e.detail.value
+    })
+  },
+  handleMainMeasure(e){
+    this.setData({
+      mainMeasure:e.detail.value
+    })
+  },
+  handleStatusNow(e){
+    this.setData({
+      statusNow:e.detail.value
+    })
+  },
+  handleRemark(e){
+    this.setData({
+      remark:e.detail.value
+    })
+  },
+  showPicker(){
+    this.setData({
+      pickerVisible:!this.data.pickerVisible
+    })
+  },
+  navigateToDetail(e){
+    wx.navigateTo({
+      url: '../historyDetail/historyDetail?id='+e.currentTarget.dataset.id,
+    })
+  },
+  submit(){
+    if(this.data.conflictType===''){
+      wx.showToast({
+        title: '请输入矛盾纠纷类型',
+        icon:"none"
+      })
+      return false
+    }
+    if(this.data.reason===''){
+      wx.showToast({
+        title: '请输入形成原因',
+        icon:"none"
+      })
+      return false
+    }
+    if(this.data.peopleNumber===''){
+      wx.showToast({
+        title: '请输入涉及人数',
+        icon:"none"
+      })
+      return false
+    }
+    if(this.data.peopleLeader===''){
+      wx.showToast({
+        title: '请输入挑头骨干人员',
+        icon:"none"
+      })
+      return false
+    }
+    if(this.data.dutyUnit===''){
+      wx.showToast({
+        title: '请输入责任单位',
+        icon:"none"
+      })
+      return false
+    }
+    if(this.data.dutyPerson===''){
+      wx.showToast({
+        title: '请输入责任人',
+        icon:"none"
+      })
+      return false
+    }
+    if(this.data.mainMeasure===''){
+      wx.showToast({
+        title: '请输入主要采取措施',
+        icon:"none"
+      })
+      return false
+    }
+    if(this.data.statusNow===''){
+      wx.showToast({
+        title: '请输入目前稳控状况',
+        icon:"none"
+      })
+      return false
+    }
+    if(this.data.datetime===''){
+      wx.showToast({
+        title: '请选择提报时间',
+        icon:"none"
+      })
+      return false
+    }
+    let num = new Number(this.data.peopleNumber)
+    if(isNaN(num)||num<0 || this.data.peopleNumber.indexOf('.')!=-1){
+      wx.showToast({
+        title: '请输入正确的人数',
+        icon:"none"
+      })
+      return false
+    }
+    let param = {
+      conflictType:this.data.conflictType,
+      conflictReason:this.data.reason,
+      involvedNum:parseInt(this.data.peopleNumber),
+      mainstayLeader:this.data.peopleLeader,
+      responsibleDept:this.data.dutyUnit,
+      responsiblePeople:this.data.dutyPerson,
+      majorMeasures:this.data.mainMeasure,
+      currentSituation:this.data.statusNow,
+      remark:this.data.remark,
+      submitTime:this.data.datetime
+    }
+    wx.showLoading({
+      title:'提交中'
+    })
+    api.submitConflict(param).then(()=>{
+      this.setData({
+        conflictType:'',
+        reason:'',
+        peopleNumber:'',
+        peopleLeader:'',
+        dutyUnit:'',
+        dutyPerson:'',
+        mainMeasure:'',
+        statusNow:'',
+        remark:'',
+        datetime:''
+      })
+      wx.hideLoading({
+        complete: (res) => {
+          wx.showToast({
+          title: '上报成功',
+          icon:'none'
+        })},
+      })
+      
+    }).catch(err=>{
+      wx.hideLoading({
+        
+      })
+    })
+  }
+})
\ No newline at end of file
diff --git a/subpages/conflictMediation/pages/index/index.json b/subpages/conflictMediation/pages/index/index.json
new file mode 100644
index 0000000..2a78e22
--- /dev/null
+++ b/subpages/conflictMediation/pages/index/index.json
@@ -0,0 +1,11 @@
+{
+  "navigationBarTitleText": "综治矛调",
+  "usingComponents": {
+    "load-more": "../../components/loadMore/loadMore",
+    "pulldown-refresh": "../../components/pullDownRefresh/pullDownRefresh",
+    "wux-tabs": "../../../../dist/tabs/index",
+    "wux-tab": "../../dist/tab/index",
+    "wux-date-picker":"../../../../dist/date-picker/index",
+    "wux-cell":"../../../../dist/cell/index"
+  }
+}
\ No newline at end of file
diff --git a/subpages/conflictMediation/pages/index/index.wxml b/subpages/conflictMediation/pages/index/index.wxml
new file mode 100644
index 0000000..8416523
--- /dev/null
+++ b/subpages/conflictMediation/pages/index/index.wxml
@@ -0,0 +1,80 @@
+<view class="home">
+  <view class="toptabs">
+    <wux-tabs controlled scroll current="{{ currentTabIndex }}" bindchange="changeTab">
+    <wux-tab  wx:for="{{tabList}}" wx:key="index" key="{{index}}" title="{{item}}"></wux-tab>
+        <!-- <wux-tab key="tab1" title="待处理"></wux-tab>
+        <wux-tab key="tab2" title="已结案"></wux-tab>
+        <wux-tab key="tab3" title="已关闭"></wux-tab> -->
+    </wux-tabs>
+  </view>
+  <scroll-view scroll-y class="edit" wx:if="{{currentTabIndex==0}}">
+    <view class="edit-item">
+      <view class="title" style="{{conflictType===''?'color:#333':'color:#c1c1c1'}}">矛盾纠纷类型</view>
+      <textarea disabled="{{pickerVisible}}" maxlength="50" class="textarea" value="{{conflictType}}"  placeholder="{{pickerVisible?'':'请输入内容'}}" bindinput="handleConflictType" auto-height="{{true}}" placeholder-style="color:#c1c1c1;font-size:28rpx"></textarea>
+      <text class="text-limit">{{util.length(conflictType)}}/50</text>
+    </view>
+    <view class="edit-item">
+      <view class="title" style="{{reason===''?'color:#333':'color:#c1c1c1'}}">形成原因</view>
+      <textarea disabled="{{pickerVisible}}" maxlength="200" class="textarea" value="{{reason}}"   placeholder="{{pickerVisible?'':'请输入内容'}}" bindinput="handleReason" auto-height="{{true}}" placeholder-style="color:#c1c1c1;font-size:28rpx"></textarea>
+      <text class="text-limit">{{util.length(reason)}}/200</text>
+    </view>
+    <view class="edit-item">
+      <view class="title" style="{{peopleNumber===''?'color:#333':'color:#c1c1c1'}}">涉及人数</view>
+      <input class="textarea" style="padding-bottom:20rpx" type="number" value="{{peopleNumber}}" placeholder="{{pickerVisible?'':'请输入内容'}}" bindinput="handlePeopleNumber" auto-height="{{true}}" placeholder-style="color:#c1c1c1;font-size:28rpx"></input>
+    </view>
+    <view class="edit-item">
+      <view class="title" style="{{peopleLeader===''?'color:#333':'color:#c1c1c1'}}">挑头骨干人员</view>
+      <textarea disabled="{{pickerVisible}}"  maxlength="100" class="textarea" value="{{peopleLeader}}" placeholder="{{pickerVisible?'':'请输入内容'}}" bindinput="handlePeopleLeader" auto-height="{{true}}" placeholder-style="color:#c1c1c1;font-size:28rpx"></textarea>
+      <text class="text-limit">{{util.length(peopleLeader)}}/100</text>
+    </view>
+    <view class="edit-item">
+      <view class="title" style="{{dutyUnit===''?'color:#333':'color:#c1c1c1'}}">责任单位</view>
+      <textarea disabled="{{pickerVisible}}"  maxlength="150" class="textarea" value="{{dutyUnit}}" placeholder="{{pickerVisible?'':'请输入内容'}}" bindinput="handleDutyUnit" auto-height="{{true}}" placeholder-style="color:#c1c1c1;font-size:28rpx"></textarea>
+      <text class="text-limit">{{util.length(dutyUnit)}}/150</text>
+    </view>
+    <view class="edit-item">
+      <view class="title" style="{{dutyPerson===''?'color:#333':'color:#c1c1c1'}}">责任人</view>
+      <textarea disabled="{{pickerVisible}}" maxlength="50" class="textarea" value="{{dutyPerson}}" placeholder="{{pickerVisible?'':'请输入内容'}}" bindinput="handleDutyPerson" auto-height="{{true}}" placeholder-style="color:#c1c1c1;font-size:28rpx"></textarea>
+      <text class="text-limit">{{util.length(dutyPerson)}}/150</text>
+    </view>
+    <view class="edit-item">
+      <view class="title" style="{{mainMeasure===''?'color:#333':'color:#c1c1c1'}}">主要采取措施</view>
+      <textarea disabled="{{pickerVisible}}" maxlength="500" class="textarea" value="{{mainMeasure}}" placeholder="{{pickerVisible?'':'请输入内容'}}" bindinput="handleMainMeasure" auto-height="{{true}}" placeholder-style="color:#c1c1c1;font-size:28rpx"></textarea>
+      <text class="text-limit">{{util.length(mainMeasure)}}/500</text>
+    </view>
+    <view class="edit-item">
+      <view class="title" style="{{statusNow===''?'color:#333':'color:#c1c1c1'}}">目前稳控情况</view>
+      <textarea disabled="{{pickerVisible}}" class="textarea" maxlength="500" value="{{statusNow}}"   placeholder="{{pickerVisible?'':'请输入内容'}}" bindinput="handleStatusNow" auto-height="{{true}}" placeholder-style="color:#c1c1c1;font-size:28rpx"></textarea>
+      <text class="text-limit">{{util.length(statusNow)}}/500</text>
+    </view>
+    <view class="edit-item">
+      <view class="title" style="{{remark===''?'color:#333':'color:#c1c1c1'}}">备注</view>
+      <textarea disabled="{{pickerVisible}}" maxlength="500" class="textarea" value="{{pickerVisible?'':remark}}"  placeholder="{{pickerVisible?'':'请输入内容'}}" bindinput="handleRemark" auto-height="{{true}}" placeholder-style="color:#c1c1c1;font-size:28rpx"></textarea>
+      <text class="text-limit">{{util.length(remark)}}/500</text>
+    </view>
+    <view class="edit-item" style="z-index:777">
+     <wux-date-picker  controlled mode="date" visible="{{pickerVisible}}" value="{{ temp_datetime }}" data-index="1" data-mode="datetime" bind:confirm="onConfirmDatetime" bind:cancel='showPicker'>
+      </wux-date-picker>
+      <view style="z-index:888" class="title" style="{{datetime===''?'color:#333':'color:#c1c1c1'}}">提报时间</view>
+      <view style="z-index:888" bindtap="showPicker"><input placeholder-style="color:#c1c1c1;font-size:28rpx" style="padding-bottom:20rpx" class="textarea" placeholder="请选择时间"  disabled="{{true}}" value="{{datetime}}" auto-height="{{true}}" ></input>
+      </view>
+    </view>
+    <view class="submit" bindtap="submit">提交</view>
+  </scroll-view>
+  <view class="history" wx:else> 
+    <view class="history-item" wx:for="{{historyList}}" wx:key="index" wx:for-item="item">
+      <view class="title" data-id="{{item.id}}" bindtap="navigateToDetail">上报时间:{{item.submitTime}}</view>
+    </view>
+  </view>
+</view>
+
+<load-more wx:if="{{currentTabIndex==1}}" loadMoreVisible="{{loadMoreVisible}}" loadMoreType="{{loadMoreType}}"></load-more>
+<wxs module="util">
+function length(str){
+  return str.length
+}
+module.exports = {
+  length: length
+}
+</wxs>
+
diff --git a/subpages/conflictMediation/pages/index/index.wxss b/subpages/conflictMediation/pages/index/index.wxss
new file mode 100644
index 0000000..96f0b68
--- /dev/null
+++ b/subpages/conflictMediation/pages/index/index.wxss
@@ -0,0 +1,93 @@
+page {
+  width: 100%;
+  height: auto;
+  overflow-y: scroll;
+  background: #f7f7f7;
+}
+.toptabs{
+  border-bottom: 1px solid #EDEFF0;
+  position: fixed;
+  top: 0;
+  z-index: 999999;
+  width: 100%;
+  background: #ffffff;
+}
+.wux-tabs__tab {
+  font-size:32rpx!important;
+  color: #8393A0!important;
+}
+.wux-tabs__tab--current {
+  color:#333333!important;
+  font-weight: bold;
+  font-size: 40rpx!important;
+}
+.wux-tabs__tab-bar{
+  background: #ffffff!important;
+}
+.newhot-tabs{
+  display: flex;
+  width: 100%;
+  margin: 10px;
+  height: 50rpx;
+}
+.edit{
+  margin-top: 100rpx;
+  width: 100%;
+  height: calc(100vh - 100rpx);
+}
+.edit .edit-item{
+  width: 100%;
+  background-color: #fff;
+  margin-bottom: 15rpx;
+}
+.edit .edit-item .title{
+  color: #333333;
+  font-size: 32rpx;
+  margin:0 20rpx;
+  padding: 20rpx 0;
+  border-bottom: 0.5px solid #E7EEEE;
+}
+.edit .edit-item .textarea{
+  color: #333333;
+  font-size: 32rpx;
+  margin:0 20rpx;
+  padding: 20rpx 0;
+  border-bottom: 0.5px solid #E7EEEE;
+  padding-bottom: 45rpx;
+  width: 96%;
+}
+.history{
+  margin-top: 100rpx;
+  width: 100%;
+}
+.history .history-item{
+  width: 100%;
+  background-color: #fff;
+  margin-top: 15rpx;
+  height: 80rpx;
+  line-height: 80rpx;
+}
+.history .history-item .title{
+  color: #333333;
+  font-size: 32rpx;
+  margin:0 20rpx;
+}
+
+.submit{
+  width: 70%;
+  height: 100rpx;
+  margin: 30rpx auto;
+  background-color: #fa2626;
+  border-radius: 36rpx;
+  line-height: 100rpx;
+  text-align: center;
+  font-size: 34rpx;
+  color: #FFF;
+}
+.text-limit{
+  float:right;
+  margin-top:-48rpx;
+  margin-right:20rpx;
+  font-size:30rpx;
+  color:#999;
+}
\ No newline at end of file
diff --git a/subpages/consult/components/loadMore/loadMore.js b/subpages/consult/components/loadMore/loadMore.js
new file mode 100644
index 0000000..bde42e0
--- /dev/null
+++ b/subpages/consult/components/loadMore/loadMore.js
@@ -0,0 +1,14 @@
+Component({
+  data: {
+  },
+  properties: {
+    loadMoreVisible: {
+      type: Boolean,
+      value: false
+    },
+    loadMoreType: {
+      type: String,
+      value: 'loading'
+    }
+  }
+})
\ No newline at end of file
diff --git a/subpages/consult/components/loadMore/loadMore.json b/subpages/consult/components/loadMore/loadMore.json
new file mode 100644
index 0000000..32640e0
--- /dev/null
+++ b/subpages/consult/components/loadMore/loadMore.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
\ No newline at end of file
diff --git a/subpages/consult/components/loadMore/loadMore.wxml b/subpages/consult/components/loadMore/loadMore.wxml
new file mode 100644
index 0000000..573e607
--- /dev/null
+++ b/subpages/consult/components/loadMore/loadMore.wxml
@@ -0,0 +1,7 @@
+<view class="load-more" style="visibility: {{loadMoreVisible ? 'visible' : 'hidden'}}">
+  <block wx:if="{{loadMoreType == 'loading'}}">
+    <image class="load-image" src="../../images/loading.gif" />
+    <view class="load-text">正在加载中...</view>
+  </block>
+  <view wx:else class="load-text">没有更多了~</view>
+</view>
\ No newline at end of file
diff --git a/subpages/consult/components/loadMore/loadMore.wxss b/subpages/consult/components/loadMore/loadMore.wxss
new file mode 100644
index 0000000..dbb07cd
--- /dev/null
+++ b/subpages/consult/components/loadMore/loadMore.wxss
@@ -0,0 +1,18 @@
+.load-more {
+  width: 100%;
+  height: 100rpx;
+  background: #f7f7f7;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.load-more .load-text {
+  color: #999;
+  font-size: 26rpx;
+}
+.load-more .load-image {
+  width: 30rpx;
+  height: 30rpx;
+  object-fit: cover;
+  margin-right: 10rpx;
+}
\ No newline at end of file
diff --git a/subpages/consult/components/pullDownRefresh/pullDownRefresh.js b/subpages/consult/components/pullDownRefresh/pullDownRefresh.js
new file mode 100644
index 0000000..b76e2ec
--- /dev/null
+++ b/subpages/consult/components/pullDownRefresh/pullDownRefresh.js
@@ -0,0 +1,70 @@
+Component({
+  data: {
+    lastY: '',
+    translateHeight: 0,
+    state: -1,
+    scrollTop: 0,
+    enablePulldownFresh: false
+  },
+  options: {
+    multipleSlots: true
+  },
+  properties: {
+    upperDistance: {
+      type: Number,
+      value: 80
+    }
+  },
+  methods: {
+    onPageScroll (e) {
+      this.data.scrollTop = e.scrollTop
+      this.data.enablePulldownFresh = false
+    },
+    touchstart (e) {
+      this.data.lastY = e.touches[0].clientY
+      if (this.data.scrollTop === 0) {
+        this.data.enablePulldownFresh = true
+      } else {
+        this.data.enablePulldownFresh = false
+      }
+    },
+    touchmove (e) {
+      let clientY = e.touches[0].clientY
+      let offset = clientY - this.data.lastY
+      if (this.data.scrollTop > 0 || offset < 0) {
+        return false
+      }
+      this.data.translateHeight = offset
+      this.data.state = 1
+
+      if (this.data.enablePulldownFresh) {
+        if (this.data.translateHeight > this.data.upperDistance) {
+          this.data.state = 2
+        }
+        this.setData({
+          translateHeight: this.data.translateHeight > 100 ? 100 : this.data.translateHeight,
+          state: this.data.state
+        })
+      }
+    },
+    touchend (e) {
+      if (this.data.translateHeight > this.data.upperDistance) {
+        if (this.data.enablePulldownFresh) {
+          this.setData({
+            translateHeight: 100,
+            state: 3
+          })
+          this.triggerEvent('pullDownRefresh')
+        }
+      } else if (this.data.scrollTop <= 0) {
+        this.stopRefresh()
+      }
+    },
+    stopRefresh () {
+      this.setData({
+        translateHeight: 0,
+        state: -1
+      })
+    }
+  }
+})
\ No newline at end of file
diff --git a/subpages/consult/components/pullDownRefresh/pullDownRefresh.json b/subpages/consult/components/pullDownRefresh/pullDownRefresh.json
new file mode 100644
index 0000000..32640e0
--- /dev/null
+++ b/subpages/consult/components/pullDownRefresh/pullDownRefresh.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
\ No newline at end of file
diff --git a/subpages/consult/components/pullDownRefresh/pullDownRefresh.wxml b/subpages/consult/components/pullDownRefresh/pullDownRefresh.wxml
new file mode 100644
index 0000000..cf6780f
--- /dev/null
+++ b/subpages/consult/components/pullDownRefresh/pullDownRefresh.wxml
@@ -0,0 +1,9 @@
+<view class="pulldown-refresh" bindtouchstart="touchstart" bindtouchmove="touchmove" bindtouchend="touchend">
+  <view class="pulldown-state">
+    <image class="loading" src="../../images/loading.gif" />
+    <view class="loading-state">{{state == 1 ? '下拉刷新' : state == 2 ? '松开刷新' : '刷新中...'}}</view>
+  </view>
+  <view class="pulldown-content" style="transform: translateY({{translateHeight}}rpx)">
+    <slot name="content"></slot>
+  </view>
+</view>
\ No newline at end of file
diff --git a/subpages/consult/components/pullDownRefresh/pullDownRefresh.wxss b/subpages/consult/components/pullDownRefresh/pullDownRefresh.wxss
new file mode 100644
index 0000000..7ee6289
--- /dev/null
+++ b/subpages/consult/components/pullDownRefresh/pullDownRefresh.wxss
@@ -0,0 +1,27 @@
+.pulldown-refresh {
+  width:100%;
+  background: #f7f7f7;
+}
+.pulldown-refresh .pulldown-state {
+  width:100%;
+  height: 100rpx;
+  display:flex;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: -100rpx;
+}
+.pulldown-refresh .pulldown-state .loading {
+  width: 30rpx;
+  height: 30rpx;
+  margin-right: 10rpx;
+}
+.pulldown-refresh .pulldown-state .loading-state {
+  font-size: 25rpx;
+  color:#666;
+}
+
+.pulldown-refresh .pulldown-content {
+  width:100%;
+  height:auto;
+  transition: transform 0.05s linear;
+}
\ No newline at end of file
diff --git a/subpages/consult/components/questionList/questionList.js b/subpages/consult/components/questionList/questionList.js
new file mode 100644
index 0000000..5b73271
--- /dev/null
+++ b/subpages/consult/components/questionList/questionList.js
@@ -0,0 +1,59 @@
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    questionList:{
+      type:Array
+    },
+    currentTab:{
+      type:Number
+    },
+    currentQuestion:{
+      type:String
+    }
+  },
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    answerInput:''
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    clearInput(){
+      this.setData({
+        answerInput:''
+      })
+    },
+    handleInput(e){
+      this.setData({
+        answerInput:e.detail.value
+      })
+    },
+    openInput(e){
+      if(this.data.currentQuestion != e.currentTarget.dataset.index){
+        this.setData({
+          answerInput:''
+        })
+      }
+      this.triggerEvent("changeCurrentQuestion",e.currentTarget.dataset.index);
+    },
+    submitAnswer(e){
+      if(this.data.answerInput===''){
+        wx.showToast({
+          title: '请输入回答',
+          icon:"none"
+        })
+        return false
+      }
+      this.triggerEvent("submitAnswer",{id:e.currentTarget.dataset.questionid,answer:this.data.answerInput});
+    },
+    changeCollapse(e){
+      this.triggerEvent("changeCollapse",e);
+    },
+  }
+})
diff --git a/subpages/consult/components/questionList/questionList.json b/subpages/consult/components/questionList/questionList.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/subpages/consult/components/questionList/questionList.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/subpages/consult/components/questionList/questionList.wxml b/subpages/consult/components/questionList/questionList.wxml
new file mode 100644
index 0000000..f873f59
--- /dev/null
+++ b/subpages/consult/components/questionList/questionList.wxml
@@ -0,0 +1,49 @@
+<view class="home">
+  <view wx:for="{{questionList}}"
+    wx:for-item="item"
+    wx:for-index="index"
+    wx:key="index"
+    class="list-item">
+    <view class="item-header">
+      <view class="question">
+         <text id="questionContent" style="font-weight: bold;" class="text {{item.collapse?'text-collapse':''}}">{{item.questionContent}}</text>
+          <text style="float:right" bindtap="changeCollapse" data-index="{{index}}" wx:if="{{item.showCollapse}}" class='coll-p'>{{item.collapse?'全文':'收起'}}</text>
+      </view>
+    </view>
+    <view class="item-button">
+      <view class="time">{{item.questionTime}}</view>
+      <view class="reply" bindtap="openInput" data-index="{{index}}" wx:if="{{currentTab===1 || currentTab===0}}">
+        <image src="../../images/input.png" class="button-img"></image>
+        <view class="button-text">回复</view>
+      </view>
+    </view>
+    <view class="item-reply" wx:if="{{currentQuestion===tools.toString(index) && (currentTab===1 || currentTab===0)}}">
+    <textarea auto-height="{{true}}" class="textarea" maxlength="500" bindinput="handleInput"></textarea>
+    </view>
+    <view class="item-button" wx:if="{{currentQuestion===tools.toString(index)}}" style="margin-top:20rpx">
+      <text style="font-size:30rpx;color:#999;line-height:60rpx">{{tools.length(answerInput)|0}}/500</text>
+      <view class="reply-button" data-questionid="{{item.id}}" bindtap="submitAnswer">确定</view>
+    </view>
+    <view class="item-answer" style="" wx:for="{{item.answerList}}" wx:for-item="answer" wx:if="{{currentTab===2}}" wx:for-index="answerIndex">
+      <view class="answer-content">
+        <text id="answerContent" data-question="{{index}}" class="text {{answer.collapse?'text-collapse':''}}">{{answer.answerContent}}</text>
+        <text style="float:right" bindtap="changeCollapse" data-questionIndex="{{index}}" data-index="{{answerIndex}}" wx:if="{{answer.showCollapse}}" class='coll-p'>{{answer.collapse?'全文':'收起'}}</text>
+      </view>
+      <view class="item-header">
+        <view class="answer-footer">{{answer.psychologistName + ' | 心理咨询师 ' +answer.answerTime}}</view>
+      </view>
+    </view>
+  </view>
+</view>
+<wxs module='tools'>
+function toString(a){
+  return a.toString();
+}
+function length(str){
+  return str.length;
+}
+module.exports = {
+  toString: toString,
+  length:length
+}
+</wxs>
\ No newline at end of file
diff --git a/subpages/consult/components/questionList/questionList.wxss b/subpages/consult/components/questionList/questionList.wxss
new file mode 100644
index 0000000..82cdacf
--- /dev/null
+++ b/subpages/consult/components/questionList/questionList.wxss
@@ -0,0 +1,117 @@
+/* subpages/consult/components/questionList.wxss */
+.home{
+  width: 100%;
+}
+.list-item{
+  background-color: #fff;
+  margin-top: 20rpx;
+  padding: 0 20rpx;
+}
+.list-item .item-header{
+  display: inline-block;
+  width: 100%;
+}
+.list-item .item-header .index{
+  display: inline-block;
+  width: 4%;
+  height: 100rpx;
+  line-height: 100rpx;
+  font-size: 30rpx;
+}
+.list-item .item-header .question{
+  display: inline-block;
+  line-height: 50rpx;
+  font-size: 35rpx;
+  letter-spacing: 2rpx;
+}
+.list-item .item-button .time{
+  display: inline-block;
+  width: 40%;
+  font-size: 25rpx;
+  color: #AAA;
+}
+.list-item .item-button{
+  height: 60rpx;
+  width: 100%;
+  padding-top: 20rpx;
+}
+
+.list-item .item-button .reply{
+  height: 50rpx;
+  width: 20%;
+  font-size: 30rpx;
+  line-height: 50rpx;
+  text-align: center;
+  float: right;
+}
+.list-item .item-button .reply .button-img{
+  height: 25rpx;
+  width: 25rpx;
+  margin-left: -5rpx;
+}
+.list-item .item-button .reply .button-text{
+  color: #F71A1A;
+  font-size: 30rpx;
+  display: inline-block;
+  margin-left: 10rpx;
+}
+.item-reply{
+  width: 100%;
+  min-height: 300rpx;
+}
+.item-reply .textarea{
+  width: 100%;
+  min-height: 300rpx;
+  background-color: #f2f2f2;
+}
+.answer-content{
+  width: 100%;
+  font-size: 30rpx;
+  color: #777;
+}
+.reply-button{
+  border-radius: 35rpx;
+  background-color: #e02d22;
+  height: 55rpx;
+  width: 120rpx;
+  color: #fff;
+  line-height: 50rpx;
+  text-align: center;
+  margin-right: 20rpx;
+  float: right;
+  font-size: 30rpx;
+}
+.answer-footer{
+  padding: 20rpx 0;
+  font-size: 30rpx;
+  color: #c3c3c3;
+}
+.answer-content text{
+  line-height: 50rpx;
+  display: block;
+}
+.question text{
+  line-height: 50rpx;
+}
+
+.answer-content text.text-collapse{
+  display:-webkit-box;
+  -webkit-box-orient:vertical; 
+  -webkit-line-clamp:3;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.text-collapse{
+  display:-webkit-box;
+  -webkit-box-orient:vertical; 
+  -webkit-line-clamp:2;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.coll-p{
+  font-size: 30rpx;
+  color: #5064A3;
+  margin-top: 10rpx;
+  margin-right: 20rpx;
+}
\ No newline at end of file
diff --git a/subpages/consult/images/input.png b/subpages/consult/images/input.png
new file mode 100644
index 0000000000000000000000000000000000000000..eda2e427e8364bdaf3881d2ef38ef6933f697368
GIT binary patch
literal 896
zcmV-`1AqL9P)<h;3K|Lk000e1NJLTq000^Q000^Y1^@s6sY*=F0009=Nkl<ZNK38O
zT}V@57zgm@|GeAIaczWlQ4JK_0!0K9kqJepP!Qfk7e(Dh7hOd+T|@=xT|^gMT69x4
zeLw^T27&ek<;SLITWWd{J0r6TDP2kDoHyR%JZy8DAGw>2vF-Oh&+|Xe8E6L|vY{bh
zYT6ay@f-s49NG3Q3=e-&1a`_<YG~N!*R*~KG!Zj_nFz>0%99uxdbwke)zox}m~Rt6
zIgkQ>l4Tv-F-UdBYHq$k!1Y|nc?~@MFX+#K0}*(=6<RVmxi$i;rKOvIYuVPVRtKcF
z4arEP`mfhJ2xh-Whz?9le0H(c)*b*?-8KSmwgowe5CdS2s1vgg^K4n2NF)+27LE3R
z=qi{Evh9v7Lz!^6MldTR?6gO<MhNx1Aeh?`kGq&`YrDK+n$Pu-k*O^~nNX-kXxab?
z;UEPNG4nhWHahCIajn8lLk{BgI>=h83ZZNOzA<nNqoWhK*XX7o846Xe2r)>iU8`+!
zswn{(Omq~nSaM5HCKRe>V1TlN-vBZgXh$serEuevtteAfRSjJqARtog^abywg+j*0
zW{Rz~l2E3yvIah%s>Gd1PQnUXXPC^L`uO;Csohx=QV4lG4&t6VKguoyAyTGock0Px
z(Mn3DPPL1e2MNfpq&Q@FRGbrubu%eDBL|Vv9lX07izJMg4WDJTV|I2!B=3H-?Dy}7
z&-Yd`N043hWgtV^c85MUSGHa2;{BLNbnV{#k${%$wso$RVh}N>2~bGM!Iw;3CJ;C!
zg?N;+ZHq!+PD#t^)KjTVSCSWorC_iR%w6RmH4{kLuBTF)n#sB_ED!}Ng2C@#*2_Q!
zfNdjA7?y*<6O!mz!5z_UovMU|=-5uX^1|>d5a<PPz6A7vggEU_r@yX!$&5sfTfhYt
zf^5^gqRq}u%KG{}magAtK;5=qAQtOYpO?|-O#<o&_<^NBV1j_g94G^z-)6qMYhgkC
zO_I4M`(0amj)l1AY;WMOcWUbWa$Q|W({;o74Wc_D9>1tw*wN@~Vm<<3MnMk=XeMA-
z0(~a%s&a90vDD6535U-Tb2qU%Kb`SSPY=n)#=Vxu^Uk^ch#rV|ygLg$0do@p-~Is-
WI{R~{P*4#70000<MNUMnLSTZ8Jd)J_

literal 0
HcmV?d00001

diff --git a/subpages/consult/images/loading.gif b/subpages/consult/images/loading.gif
new file mode 100644
index 0000000000000000000000000000000000000000..915c1984cb8541c40f28762a09970b6578632aa3
GIT binary patch
literal 3897
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

literal 0
HcmV?d00001

diff --git a/subpages/consult/pages/consultIndex/consultIndex.js b/subpages/consult/pages/consultIndex/consultIndex.js
new file mode 100644
index 0000000..3804fe9
--- /dev/null
+++ b/subpages/consult/pages/consultIndex/consultIndex.js
@@ -0,0 +1,234 @@
+const app = getApp()
+const api = require('../../../../api/consult')
+import { formatTimestamp } from '../../../../utils/util'
+Page({
+  data: {
+    loadMoreType: 'loading',
+    loadMoreVisible: true,
+    tabList:['我的待回答','公共待回答','已经回答'],//tab列表
+    currentTabIndex:0,
+    currentQuestion:'',
+    pageNo: 1, // 分页页码
+    pageSize: 10, // 分页页长
+    isLoading: true,
+    timestamp:'',
+    answerInput:'',
+    questionList:[],
+  },
+  onHide:function(){
+
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+   onLoad: function (options) {
+     this.setData({
+       timestamp:formatTimestamp(new Date())
+     })
+     let param = {
+       pageIndex:this.data.pageNo,
+       pageSize:this.data.pageSize,
+       timestamp:this.data.timestamp,
+       designatedFlag:this.data.currentTabIndex==0?'1':'0'
+     }  
+     this.getQuestionList(param)
+  },
+  getQuestionList(param){
+    api.getQuestionList(param).then((res)=>{
+      this.setData({
+        questionList:this.data.questionList.concat(res.data),
+        isLoading:false
+      })
+      this.setCollapse();
+      if(res.data.length<10){
+        this.setData({
+          loadMoreType:'none',
+          loadMoreVisible:true,
+        })
+      }else{
+        this.setData({
+          loadMoreType:"more",
+          loadMoreVisible:false
+        })
+      }
+     }).catch(err=>{
+       this.setData({
+        questionList:[],
+        isLoading:false,
+        loadMoreType:'none',
+        loadMoreVisible:true
+       })
+     })
+  },
+  getMyQuestionList(param){
+    api.getMyQuestionList(param).then((res)=>{
+      this.setData({
+        questionList:this.data.questionList.concat(res.data),
+        isLoading:false
+      })
+      this.setCollapse();
+      if(res.data.length<10){
+        this.setData({
+          loadMoreType:'none',
+          loadMoreVisible:true,
+        })
+      }else{
+        this.setData({
+          loadMoreType:"more",
+          loadMoreVisible:false
+        })
+      }
+     }).catch(err=>{
+       this.setData({
+        questionList:[],
+        isLoading:false,
+        loadMoreType:'none',
+        loadMoreVisible:true
+       })
+     })
+  },
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    
+  },
+  onReachBottom(){
+    if(!this.data.isLoading && this.data.loadMoreType!='none'){
+      this.setData({
+        isLoading:true,
+        loadMoreVisible:true,
+        loadMoreType:'loading',
+        pageNo:this.data.pageNo+1
+      })
+      if(this.data.currentTabIndex!=2){
+        let param = {
+          pageIndex:this.data.pageNo,
+          pageSize:this.data.pageSize,
+          timestamp:this.data.timestamp,
+          designatedFlag:this.data.currentTabIndex==0?'1':'0'
+        }
+        this.getQuestionList(param)
+      }else{
+        let param = {
+          pageIndex:this.data.pageNo,
+          pageSize:this.data.pageSize,
+          timestamp:this.data.timestamp,
+        }
+        this.getMyQuestionList(param)
+      }
+    }
+  },
+  handleInput(e){
+    this.setData({
+      answerInput:e.detail.value
+    })
+  },
+  changeTab(e){
+    if(this.data.isLoading){
+      return false;
+    }
+    this.setData({
+        questionList:[],
+        currentQuestion:'',
+        answerInput:'',
+        currentTabIndex:e.detail.key,
+        loadMoreType:'loading',
+        loadMoreVisible:true,
+        isLoading:true,
+        pageSize:10,
+        pageNo:1,
+        timestamp:formatTimestamp(new Date())
+      })
+      this.selectComponent("#question-list").clearInput();
+      if(e.detail.key!=2){
+        let param = {
+          pageIndex:this.data.pageNo,
+          pageSize:this.data.pageSize,
+          timestamp:this.data.timestamp,
+          designatedFlag:this.data.currentTabIndex==0?'1':'0'
+        }  
+        this.getQuestionList(param)
+      }else{
+        let param = {
+          pageIndex:this.data.pageNo,
+          pageSize:this.data.pageSize,
+          timestamp:this.data.timestamp,
+        }  
+        this.getMyQuestionList(param)
+      }
+  },
+  openInput(e){
+    this.setData({
+      currentQuestion:e.detail,
+      answerInput:''
+    })
+  },
+  submitAnswer(e){
+    let param = {
+      questionId:e.detail.id,
+      answerContent:e.detail.answer
+    }
+    api.submitAnswer(param).then(()=>{
+      this.data.questionList.splice(this.data.currentQuestion,1);
+      this.selectComponent("#question-list").clearInput();
+      wx.showToast({
+        title: '回复成功',
+        icon:"none"
+      })
+      this.setData({
+        questionList:this.data.questionList,
+        currentQuestion:''
+      })
+    }).catch(err=>{
+      
+    })
+  },
+  setCollapse: function() {
+    var query = wx.createSelectorQuery();
+    var that = this;
+    query.in(this.selectComponent('#question-list')).selectAll('#questionContent').boundingClientRect(function (rect) {
+        rect.forEach((v, i) => {
+            if (v.height > 60) {  //判断高度,根据各种高度取折中
+                var set = "questionList[" + i + "].collapse";
+                var set1 = "questionList[" + i + "].showCollapse";
+                that.setData({
+                    [set]: true,
+                    [set1]: true,
+                })
+            }
+        })
+    }).exec();
+    query.in(this.selectComponent('#question-list')).selectAll('#answerContent').boundingClientRect(function (rect) {
+      rect.forEach((v, i) => {
+        console.log(v)
+        console.log(v.dataset.question)
+          if (v.height > 70) {
+            var set = "questionList[" + v.dataset.question + "].answerList[0].collapse";
+            var set1 = "questionList[" + v.dataset.question + "].answerList[0].showCollapse";
+            that.setData({
+              [set]: true,
+              [set1]: true,
+          })
+          }
+      })
+  }).exec();
+ },   
+    //点击全文收起
+    changeCollapse: function(e){
+        var index = e.detail.currentTarget.dataset.index;
+        var questionIndex=e.detail.currentTarget.dataset.questionindex;
+        if(questionIndex===undefined){
+          var set = "questionList[" + index + "].collapse";
+          this.setData({
+              [set]: !this.data.questionList[index].collapse
+          })
+        }else{
+          var set = "questionList[" + questionIndex + "].answerList[0].collapse";
+          console.log(set)
+          this.setData({
+              [set]: !this.data.questionList[questionIndex].answerList[0].collapse
+          })
+        }
+    }
+})
\ No newline at end of file
diff --git a/subpages/consult/pages/consultIndex/consultIndex.json b/subpages/consult/pages/consultIndex/consultIndex.json
new file mode 100644
index 0000000..159baf3
--- /dev/null
+++ b/subpages/consult/pages/consultIndex/consultIndex.json
@@ -0,0 +1,10 @@
+{
+  "navigationBarTitleText": "心理咨询",
+  "usingComponents": {
+    "load-more": "../../components/loadMore/loadMore",
+    "pulldown-refresh": "../../components/pullDownRefresh/pullDownRefresh",
+    "wux-tabs": "../../../../dist/tabs/index",
+    "wux-tab": "../../dist/tab/index",
+    "question-list":"../../components/questionList/questionList"
+  }
+}
\ No newline at end of file
diff --git a/subpages/consult/pages/consultIndex/consultIndex.wxml b/subpages/consult/pages/consultIndex/consultIndex.wxml
new file mode 100644
index 0000000..d683eb1
--- /dev/null
+++ b/subpages/consult/pages/consultIndex/consultIndex.wxml
@@ -0,0 +1,25 @@
+<view class="home">
+  <!-- <scroll-view class="tab">
+    <view wx:for="{{tabList}}"wx:for-item="item" wx:for-index="index" wx:key="index" data-index="{{index}}" bindtap="changeTab" class="tab-item">
+      <view class="tab-name{{index == currentTabIndex? ' active' : ''}}">{{item}}</view>
+      <view class="tab-line{{index == currentTabIndex? ' active' : ''}}"></view>
+    </view>
+  </scroll-view> -->
+    <view class="toptabs">
+      <wux-tabs controlled scroll current="{{ currentTabIndex }}" bindchange="changeTab">
+      <wux-tab  wx:for="{{tabList}}" key="{{index}}" title="{{item}}"></wux-tab>
+          <!-- <wux-tab key="tab1" title="待处理"></wux-tab>
+          <wux-tab key="tab2" title="已结案"></wux-tab>
+          <wux-tab key="tab3" title="已关闭"></wux-tab> -->
+      </wux-tabs>
+  </view>
+  <view class="list">
+    <question-list id="question-list" class="questionList" questionList="{{questionList}}" currentTab="{{currentTabIndex}}" bind:submitAnswer="submitAnswer" bind:changeCurrentQuestion="openInput" currentQuestion="{{currentQuestion}}" bind:changeCollapse="changeCollapse"></question-list>
+  </view>
+</view>
+<!-- <view wx:if="{{tabList.length == 0 && isLoading == false}}" class="nothing-to-show">
+  <image src="../../images/property/nothing.png" class="nothing-img"></image>
+  <view style="color: #BCBCBC;">管理员暂未添加物业项目信息~</view>
+</view> -->
+<load-more loadMoreVisible="{{loadMoreVisible}}" loadMoreType="{{loadMoreType}}"></load-more>
+
diff --git a/subpages/consult/pages/consultIndex/consultIndex.wxss b/subpages/consult/pages/consultIndex/consultIndex.wxss
new file mode 100644
index 0000000..37c0f2b
--- /dev/null
+++ b/subpages/consult/pages/consultIndex/consultIndex.wxss
@@ -0,0 +1,128 @@
+page {
+  width: 100%;
+  height: auto;
+  overflow-y: scroll;
+  background: #f7f7f7;
+}
+.toptabs{
+  border-bottom: 1px solid #EDEFF0;
+  position: fixed;
+  top: 0;
+  z-index: 999999;
+  width: 100%;
+  background: #ffffff;
+}
+.wux-tabs__tab {
+  font-size:32rpx!important;
+  color: #8393A0!important;
+}
+.wux-tabs__tab--current {
+  color:#333333!important;
+  font-weight: bold;
+  font-size: 40rpx!important;
+}
+.wux-tabs__tab-bar{
+  background: #ffffff!important;
+}
+.newhot-tabs{
+  display: flex;
+  width: 100%;
+  margin: 10px;
+  height: 50rpx;
+}
+.header {
+  position: fixed;
+  width: 100%;
+  top: 0;
+  left: 0;
+  z-index: 1000;
+}
+.header .header-bg {
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  z-index: 10;
+  left: 0;
+  top: 0;
+}
+.header .navigation {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: rgba(255,255,255, 0.9);
+  font-size: 32rpx;
+  position: relative;
+  z-index: 100;
+}
+.home {
+  width: 100%;
+  overflow-y: scroll;
+}
+.nothing-to-show{
+  width: 100%;
+  height: 100vh;
+  background: #f7f7f7;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+.nothing-img{
+  width: 500rpx;
+  height:245rpx;
+  object-fit: cover;
+
+}
+.tab{
+  width: 100%;
+  height: 100rpx;
+  background: #fff;
+  overflow-x: scroll;
+  display: inline-block;
+  white-space: nowrap;
+  margin:0 auto;
+  -webkit-overflow-scrolling: touch;
+  position: fixed;
+  top: 0;
+}
+.tab-item{
+  height: 100%;
+  min-width: 33%;
+  margin:0 auto;
+  display: inline-block;
+  box-sizing: border-box;
+}
+.tab-name{
+  text-align: center;
+  margin:0 auto;
+  height: 80%;
+  font-size: 25rpx;
+  line-height: 100rpx;
+  padding: 0 20rpx;
+  color: #999;
+}
+.tab-name.active{
+  text-align: center;
+  margin:0 auto;
+  height: 80%;
+  font-size: 30rpx;
+  line-height: 100rpx;
+  padding: 0 20rpx;
+  color: #BB0300;
+}
+.tab-line.active{
+  border-top: 4rpx solid #BB0300;
+  width: 30%;
+  margin: 0 auto;
+  margin-top: 10rpx;
+}
+.list{
+  margin: 0 auto;
+  margin-top: 120rpx;
+}
+.questionList{
+  width: 100%;
+}
+
+