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

components/segment/index.wxss

@@ -6,7 +6,8 @@
   padding: 5px;
 }
 .title {
-  min-width: 150rpx;
+  min-width: 100rpx;
+  padding: 0 20rpx;
   white-space: nowrap;
   display: flex;
   align-items: center;

pages/article/index.js

@@ -21,6 +21,8 @@ Page({
     unStar: '/images/common/star.png',
     star: '/images/common/star_light.png',
     disable: true,
+    readNum: 0,
+    collectNum: 0,
   },
   onClickCollect () {
     // 收藏功能
@@ -51,7 +53,7 @@ Page({
   fetchArticeApi () {
     artice.getDetail(this.data.aId, (res) => {
       //console.log('artice detail')
-      //console.log(res)
+      console.log(res)
       const data = res.result
       const date = dayjs(data.createTime).format('MM月DD日')
       this.setData({
@@ -63,6 +65,8 @@ Page({
         isStar: data.isCollection ? true : false,
         showBtn: data.typeFlag >= 2 ? true : false,
         disable: data.typeFlag == 3 ? true : false,
+        readNum: data.readNum,
+        collectNum: data.collectNum,
       })
     })
   },

pages/article/index.wxml

@@ -13,6 +13,10 @@
   </view>
   <view class="page_bd {{showBtn ? 'page_bd_short':''}}">
     <rich-text nodes="{{nodes}}"></rich-text>
+    <view class="read_collectNum">
+      <view class="read_num">阅读：{{readNum}}</view>
+      <view class="collect_num">收藏：{{collectNum}}</view>
+    </view>
   </view>
   <view class="page_footer" wx:if="{{showBtn}}">
     <e-ibutton title="{{disable ? '已报名' : '在线报名'}}" bind:onTap="onlineSubmit" disable="{{disable}}"/>

pages/article/index.wxss

@@ -60,5 +60,15 @@
   padding: 0 10px;
 }
 .page_bd_short {
-  margin-bottom: 81px; 
+  padding-bottom: 81px; 
+}
+.read_collectNum {
+  padding: 20rpx 0;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  font-size: 16px;
+}
+.read_num, .collect_num {
+  color: #999;
 }

pages/billboards/policy/index.wxml

@@ -12,5 +12,5 @@
       bind:clickListItem="clickListItem"
     />
   </block>
-  <e-empty empty="{{list.length <= 0}}" message="暂无搜索内容"/>
+  <e-empty empty="{{list.length <= 0}}" message="{{searchKey.length > 0 ? '暂无搜索内容' : '暂无内容'}}"/>
 </view>

pages/register/index.js

@@ -34,9 +34,10 @@ Page({
   onLoad: function (options) {
 
   },
-  onHide () {
+  onUnload () {
     clearInterval(this.data.interval)
   },
+  
   // 重新获取Code
   refetchCodeDownTime () {
     
@@ -48,7 +49,7 @@ Page({
         time: time,
         btnTitle: title
       })
-      if (time == 0) {
+      if (time <= 0) {
         this.setData({
           fetchCode: true,
           time: 60,
@@ -77,6 +78,8 @@ Page({
           // console.log(this.data.formData)
           this.fetchMsgCodeApi()
         }
+      } else {
+        this.fetchMsgCodeApi()
       }
     })
   },

pages/register/index.wxss

@@ -32,4 +32,7 @@
 }
 .register_form .weui-cells::before {
   border-top: 0px solid white;
+}
+.register_form .weui-vcode-btn {
+  width: 100px;
 }