Merge branch 'znz_dev' into 'master'

Znz dev

See merge request !6

src/wx/pages/faq/faq.wxml

 <!--pages/myNews/myNews.wxml-->
-<view class="topBg">
-	<image class='background-image' src='/img/faqTop.png' mode="widthFix"></image>
-</view>
+<image class='background-image' src='/img/faqTop.png' mode="widthFix"></image>
 <view class="title" bindtap='back'>
 	<image src="/img/left1.png" style="width:40px;height:40px;margin-right:5px"></image>在线答疑
 </view>
@@ -28,7 +26,7 @@
 		<view bindtap='faqDetail' wx:for="{{faqList}}" class="faqItem" data-index="{{item.id}}" wx:key="{{index}}">
 			<view class="faqContent">
 				<view class="faqRow1">
-					<text>{{item.content}}</text>
+					<text class="faqCotent">{{item.content}}</text>
 					<view class="faqReplycount">回复:{{item.reply_count}}</view>
 				</view>
 				<view class="faqRow2">最佳答案：{{item.best_detail_content}}</view>

src/wx/pages/faq/faq.wxss

@@ -57,7 +57,7 @@
 
 .searchArea>input {
   flex: 1;
-  margin-right:10px;
+  margin-right: 10px;
   height: 40px;
   line-height: 40px;
   font-size: 14px;
@@ -80,7 +80,7 @@
 
 .topTitle {
   position: fixed;
-  top: 40%;
+  top: 38%;
   width: 100%;
   height: 35px;
   display: flex;
@@ -160,7 +160,7 @@
   display: flex;
   flex-direction: column;
   border-radius: 10px;
-  box-shadow: 0 0 15px -3px rgb(0, 0, 0, 0.3);
+  box-shadow: 0 0 8px -3px rgb(0, 0, 0, 0.3);
 }
 
 .faqRow1 {
@@ -170,7 +170,12 @@
   margin-bottom: 10px;
 }
 
-.faqRow1 text{
+.faqRow1 .faqCotent {
+  width: 80%;
+  word-break: break-all;
+}
+
+.faqRow1 text {
   font-size: 16px;
 }
 

src/wx/pages/faqSearch/faqSearch.js

@@ -6,8 +6,8 @@ Page({
    * 页面的初始数据
    */
   data: {
-    page:0,
-    pageCount:0,
+    page: 0,
+    pageCount: 0,
     keyword: '',
     faqList: []
   },
@@ -78,8 +78,8 @@ Page({
   },
 
   /**
- * 页面上拉触底事件的处理函数
- */
+   * 页面上拉触底事件的处理函数
+   */
   onReachBottom: function () {
     //触底以后加载更多
     if ((this.data.page + 1) < this.data.pageCount) {
@@ -107,7 +107,10 @@ Page({
       });
       return;
     }
-
+    this.setData({
+      page: 0,
+      faqList: []
+    })
     this.searchFaqList();
   },
 

src/wx/pages/faqSearch/faqSearch.wxml

 <!--pages/myNews/myNews.wxml-->
-<view class="topBg">
-	<image class='background-image' src='/img/faqTop.png' mode="widthFix"></image>
-</view>
-<view class="title" bindtap='back'>
-	<image src="/img/left1.png" style="width:40px;height:40px;margin-right:5px"></image>在线答疑检索
-</view>
+<custom-navi text="返回" back="{{true}}" home="{{true}}" bg1="#fff" bg2="#fff" bg3="#fff"></custom-navi>
 
 <view class="searchArea">
 	<text>关键词索引</text>

src/wx/pages/faqSearch/faqSearch.wxss

 /* pages/myNews/faq.wxss */
-.background-image {
-  position: fixed;
-  width: 100%;
-  left: 0;
-  top: 0;
-  background: #fff;
-  z-index: 200;
-}
-
-.title {
-  position: fixed;
-  top: 4%;
-  left: 2%;
-  display: flex;
-  align-items: center;
-  font-size: 18px;
-  color: #fff;
-  z-index: 201;
-}
-
-.titleArea {
-  position: fixed;
-  top: 12%;
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  z-index: 200;
-}
-
-.titleArea text {
-  text-align: center;
-  font-size: 20px;
-  font-weight: 500;
-  color: #fff;
-}
-
 .searchArea {
   position: fixed;
-  top: 30%;
+  top: 8%;
   width: 100%;
   height: 60px;
   background-color: #fff;
@@ -78,68 +41,12 @@
   color: #bcbcbc;
 }
 
-.topTitle {
-  position: fixed;
-  top: 38%;
-  width: 100%;
-  height: 35px;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-  background-color: #fff;
-  z-index: 200;
-}
-
-.topTitle .leftTitle {
-  width: 100%;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-}
-
-.topTitle .leftTitle .leftLine {
-  height: 20px;
-  width: 6px;
-  border-radius: 3px;
-  background-color: #ed5f77;
-  margin-left: 5%;
-}
-
-.topTitle .leftTitle .hot_title {
-  margin-left: 10px;
-  font-size: 20px;
-  font-weight: bolder;
-  color: #000;
-}
-
-.topTitle .rightTitle {
-  width: 100%;
-  display: flex;
-  flex-direction: row-reverse;
-  align-items: center;
-  margin-right: 5%;
-}
-
-.topTitle .rightTitle view {
-  background-color: #e70012;
-  width: 10px;
-  height: 10px;
-  border-radius: 50%;
-}
-
-.topTitle .rightTitle text {
-  margin-left: 10px;
-  font-size: 16px;
-  font-weight: 400;
-  border-bottom: 1px solid #333333;
-}
-
 .content {
   width: 100%;
   height: 100%;
   position: absolute;
-  top: 45%;
+  top: 15%;
+  margin-bottom: 60px;
 }
 
 .hotFaqs {
@@ -160,7 +67,7 @@
   display: flex;
   flex-direction: column;
   border-radius: 10px;
-  box-shadow: 0 0 15px -3px rgb(0, 0, 0, 0.3);
+  box-shadow: 0 0 8px -3px rgb(0, 0, 0, 0.3);
 }
 
 .faqRow1 {
@@ -170,6 +77,11 @@
   margin-bottom: 10px;
 }
 
+.faqRow1 .faqCotent {
+  width: 80%;
+  word-break: break-all;
+}
+
 .newFaqButton {
   position: fixed;
   bottom: 0;

src/wx/pages/myFaq/myFaq.wxml

@@ -5,7 +5,7 @@
   <view bindtap='faqDetail' wx:for="{{faqList}}" class="faqItem" data-index="{{item.id}}" wx:key="{{index}}">
     <view class="faqCol1">
       <view class="faqContent">
-        <image src="/img/rpoint.png"></image>
+        <view></view>
         <text>{{item.content}}</text>
       </view>
       <view class="faqReplycount">回复:{{item.reply_count}}</view>
@@ -15,6 +15,8 @@
 
 </view>
 
-<view bindtap='newFaq' class="newFaqButton">立即咨询</view>
+<view bindtap='newFaq' class="newFaqButton">
+		<view>立即咨询</view>
+	</view>
 <van-dialog id="van-dialog" />
 <van-notify id="van-notify" />
\ No newline at end of file

src/wx/pages/myFaq/myFaq.wxss

 /* pages/myNews/myFaq.wxss */
-
-.hotFaqs{
-  width:100%;
+.hotFaqs {
+  width: 100%;
+  margin-top: 20px;
 }
 
-.faqItem{
-  width:90%;
-  margin-top: 10px;
-  margin-left: 0;
-  margin-right: 0;
-  padding:10px;
+.faqItem {
+  width: 90%;
+  margin: 10px auto;
+  padding: 10px;
   display: flex;
   flex-direction: row;
   justify-content: space-between;
   align-items: center;
-  border-radius: 5px;
-  border: 1rpx solid gray;
+  border-radius: 10px;
+  box-shadow: 0 0 8px -3px rgb(0, 0, 0, 0.3);
 }
 
-.faqCol1{
-  width:82%;
+.faqCol1 {
+  width: 82%;
   display: flex;
   flex-direction: column;
   justify-content: space-around;
   align-items: left;
 }
 
-.faqCotent{
+.faqContent {
+  width: 100%;
   display: flex;
   flex-direction: row;
-  justify-content: flex-start;
   align-items: center;
   font-size: 17px;
 }
 
-.faqContent image {
+.faqContent view {
+  background-color: #e70012;
   width: 10px;
   height: 10px;
+  border-radius: 50%;
 }
 
 .faqContent text {
   margin-left: 5px;
   width: 90%;
-  word-break:break-all;
+  word-break: break-all;
 }
 
-.faqReplycount{
+.faqReplycount {
   font-size: 14px;
   margin-left: 15px;
+  margin-top: 10px;
 }
 
-.faqCol2{
-  width:17%;
+.newFaqButton {
+  position: fixed;
+  bottom: 0;
+  width: 100%;
   display: flex;
-  flex-direction: row;
-  justify-content: space-between;
   align-items: center;
-  font-size: 16px;
+  /* background: #fff; */
 }
 
-.newFaqButton{
-  position: fixed;
-  bottom: 10px;
-  height: 30px;
-  line-height: 30px;
-  border-radius: 15px;
-  background: linear-gradient(to right, #e85c6d, #fb689b);
-  color: #fff;
-  font-size: 14px;
+.delFaqButton {
+  width: 20%;
+  height: 30px;
+  line-height: 30px;
+  text-align: center;
+  border-radius: 15px;
+  background: #ed5f77;
+  color: #fff;
 }
+
+.newFaqButton view {
+  text-align: center;
+  margin: 0 auto;
+  width: 80%;
+  height: 50px;
+  line-height: 50px;
+  border-radius: 25px;
+  margin-bottom: 10px;
+  background: linear-gradient(to right, #e85c6d, #fb689b);
+  color: #fff;
+  font-size: 18px;
+}
\ No newline at end of file

src/wx/project.config.json

@@ -101,6 +101,19 @@
 					"pathName": "pages/faq/faq",
 					"query": "",
 					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "pages/myFaq/myFaq",
+					"pathName": "pages/myFaq/myFaq",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "pages/faqSearch/faqSearch",
+					"pathName": "pages/faqSearch/faqSearch",
+					"scene": null
 				}
 			]
 		}