Merge branch 'release'

pages/toRegister/toRegister.js

@@ -21,7 +21,7 @@ Page({
     //   }
     // })
     let that = this
-    const versionNum = "1.5.1"
+    const versionNum = "1.5.2"
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data.scanFlag

project.config.json

@@ -34,24 +34,37 @@
   "compileType": "miniprogram",
   "libVersion": "2.8.2",
   "appid": "wx6dcf544cdae7d4ec",
-  "projectname": "%E7%B2%BE%E8%87%B4%E9%94%A6%E6%B0%B4-%E5%B1%85%E6%B0%9                                   1%E7%AB%AF",
+  "projectname": "e%E9%94%A6%E6%B0%B4-%E5%B1%85%E6%B0%91%E7%AB%AF",
+  "cloudfunctionTemplateRoot": "",
+  "watchOptions": {
+    "ignore": []
+  },
   "debugOptions": {
     "hidedInDevtools": []
   },
-  "isGameTourist": false,
-  "simulatorType": "wechat",
-  "simulatorPluginLibVersion": {},
+  "scripts": {},
   "condition": {
+    "search": {
+      "current": -1,
+      "list": []
+    },
+    "conversation": {
+      "current": -1,
+      "list": []
+    },
     "plugin": {
+      "current": -1,
       "list": []
     },
     "game": {
       "list": []
     },
     "gamePlugin": {
+      "current": -1,
       "list": []
     },
     "miniprogram": {
+      "current": -1,
       "list": [
         {
           "id": 0,
@@ -60,12 +73,6 @@
           "query": "gid=1233592630168813569",
           "scene": 1011
         },
-        {
-          "name": "pages/indexNew/indexNew",
-          "pathName": "pages/indexNew/indexNew",
-          "query": "scene=module_ma_code_zyzqn",
-          "scene": 1011
-        },
         {
           "id": 2,
           "name": "网格长注册",
@@ -94,12 +101,6 @@
           "query": "scene=1277169327606366209&from=analysis",
           "scene": null
         },
-        {
-          "name": "工作端跳转",
-          "pathName": "pages/indexNew/indexNew",
-          "query": "scene=1280737901335838721&from=work",
-          "scene": null
-        },
         {
           "id": 7,
           "name": "我有事说",

subpages/oneKeyService/pages/index/index.js

@@ -72,8 +72,11 @@ Page({
         url: `../warning/warning?modulecode=${e.currentTarget.dataset.modulecode}`
       })
     } else if (e.currentTarget.dataset.modulecode == 'notice_jwgk') {
+      // wx.navigateTo({
+      //   url: `../warning/warning?modulecode=${e.currentTarget.dataset.modulecode}`
+      // })
       wx.navigateTo({
-        url: `../warning/warning?modulecode=${e.currentTarget.dataset.modulecode}`
+        url: `../laobingzaixian/laobingzaixian?modulecode=${e.currentTarget.dataset.modulecode}`
       })
     } else if (e.currentTarget.dataset.modulecode == 'notice_yjfu_lbzx') {
       wx.navigateTo({

subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.js

@@ -20,13 +20,27 @@ Page({
     duration: 500, //幻灯片切换时长(ms)
     currentSwiper: 0,
     showTitle: true, //视频标题
+    dictType: 'notice_yjfu_lbzx', // 居务公开，老兵在线
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    this.getBannerList('7')
+    this.setData({
+      dictType: options.modulecode
+    })
+    if (options.modulecode == 'notice_jwgk') {
+      wx.setNavigationBarTitle({
+        title: '居务公开' 
+      })
+      this.getBannerList('8')
+    } else if (options.modulecode == 'notice_yjfu_lbzx') {
+      wx.setNavigationBarTitle({
+        title: '老兵在线' 
+      })
+      this.getBannerList('7')
+    }
     this.getFullDictInfo()
   },
 
@@ -56,7 +70,7 @@ Page({
   },
 
   getFullDictInfo () {
-    const dictType = 'notice_yjfu_lbzx'
+    const dictType = this.data.dictType
     api.modulelist(dictType).then(res => {
       this.setData({
         deptList: res.data,
@@ -135,7 +149,7 @@ Page({
   navigateToDict (e) {
     console.log(e.currentTarget.dataset.dict)
     wx.navigateTo({
-      url: `../laobingzaixianDict/laobingzaixianDict?dictName=${e.currentTarget.dataset.dict.name}&dictType=notice_yjfu_lbzx&dictValue=${e.currentTarget.dataset.dict.moduleCode}`
+      url: `../laobingzaixianDict/laobingzaixianDict?dictName=${e.currentTarget.dataset.dict.name}&dictType=${this.data.dictType}&dictValue=${e.currentTarget.dataset.dict.moduleCode}`
     })
   }
 })

subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "老兵在线",
+  "navigationBarTitleText": "",
   "usingComponents": {
     "load-more": "../../../../components/loadMore/loadMore",
     "no-data":"../../../../components/nodata/nodata"

subpages/oneKeyService/pages/laobingzaixian/laobingzaixian.wxss

@@ -89,7 +89,7 @@ button::after {
     display: grid;
     grid-template-columns: 1fr;
     place-items: center;
-    gap: 20rpx 0;
+    gap: 24rpx 0;
     width: 690rpx;
     padding: 20rpx 0;
     margin: 0rpx auto;
@@ -101,7 +101,7 @@ button::after {
 }
 .list-item {
     width: 100%;
-    height: 130rpx;
+    height: 160rpx;
     background: #fff;
     display: flex;
     justify-content: space-between;
@@ -114,7 +114,7 @@ button::after {
     font-family:PingFang SC;
     font-weight:bold;
     color:rgba(51,51,51,1);
-    margin-left: 40rpx;    
+    margin-left: 42rpx;    
     display: flex;
     align-items: center;
 }
@@ -126,7 +126,7 @@ button::after {
 .list-item .list-name .list-icon {
     width: 106rpx;
     height: 106rpx;
-    margin-right: 10rpx;
+    margin-right: 14rpx;
 }
 
 /* 轮播图start */
@@ -156,7 +156,7 @@ button::after {
   .page-body {
     padding-top: 30rpx;
     background: #fff;
-    height: 300rpx;
+    height: 350rpx;
   }
   
   .page-section {
@@ -182,7 +182,7 @@ button::after {
   .page-section-spacing {
     box-sizing: border-box;
     /* padding: 0 20rpx; */
-    height: 300rpx;
+    height: 350rpx;
     background-color: #fff;
   }
   
@@ -201,15 +201,16 @@ button::after {
   
   .swiper-item {
     display: block;
-    height: 300rpx;
+    height: 350rpx;
   }
   
   .banner {
     overflow: hidden;
-    height: 300rpx;
+    height: 350rpx;
     display: flex;
     width: 100%;
     border-radius: 16rpx;
+    margin-bottom: 8rpx;
   }
   
   .dots {
@@ -241,7 +242,7 @@ button::after {
   
   swiper {
     width: 710rpx;
-    height: 300rpx;
+    height: 350rpx;
     box-shadow: 0px 4px 29px 0px rgba(63, 63, 63, 0.1);
     border-radius: 16rpx;
     overflow: hidden;

subpages/oneKeyService/pages/laobingzaixianDict/laobingzaixianDict.js

@@ -29,6 +29,7 @@ Page({
       dictType: options.dictType,
       dictValue: options.dictValue
     })
+    console.log(options)
     this.getSclerotiaList()
   },
   

subpages/oneKeyService/pages/laobingzaixianDict/laobingzaixianDict.wxml

@@ -1,19 +1,32 @@
 <wxs module="filter" src="../../../../utils/filter.wxs"></wxs>
 <!-- 列表 -->
-<view class="list-all">
+<view class="list-all" wx:if="{{dictType == 'notice_yjfu_lbzx'}}">
     <view class="list-item" wx:for-index="index" wx:for-item="item" wx:key="index" wx:for="{{sclerotialist}}" data-id="{{item.id}}" bindtap="toDetail">
         <image src="{{item.imgUrl}}"></image>
         <view class="item-info">
-        <view class="item-info-name">{{item.noticeTitle}}
-        </view>
+        <view class="item-info-name">{{item.noticeTitle}}</view>
         <view class="item-info-time">
             <text>{{item.deptName}}</text>
             <text>{{filter.formatTime(item.noticeTime, 'yyyy-MM-dd')}}</text>
         </view>
         </view>
     </view>
+</view>
+<view class="list-all" wx:else>
+    <view class="list-item-2" wx:for-index="index" wx:for-item="item" wx:key="index" wx:for="{{sclerotialist}}" bindtap="toDetail" data-id="{{item.id}}">
+        <view class="name">{{item.noticeTitle}}</view>
+        <view class="info">
+            <text>{{common.getStr(item.noticeContent)}}</text>
+        </view>
+    </view>
 </view>
  <!--加载更多提示-->
 <load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible}}"></load-more>
 
 <no-data isShow="{{nodata}}"></no-data>
+
+<wxs module="common">
+    module.exports.getStr = function(content) {
+        return content.replace(getRegExp('<\/?.+?\/?>|[&nbsp;]','g'),'')
+    }
+</wxs>

subpages/oneKeyService/pages/laobingzaixianDict/laobingzaixianDict.wxss

@@ -84,3 +84,37 @@ page {
     width: 100%;
     height: 100%;
   }
+
+  .list-all .list-item-2 {
+    width: 100%;
+    padding: 40rpx 28rpx;
+    margin-top: 16rpx;
+    background: #fff;
+    box-sizing: border-box;
+  }
+  
+  .list-all .list-item-2 .name {
+    font-size: 34rpx;
+    font-weight: 500;
+    color: rgba(51, 51, 51, 1);
+    line-height: 50rpx;
+  }
+  
+  .list-all .list-item-2 .info {
+    margin-top: 15rpx;
+    font-size: 28rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: rgba(153, 153, 153, 1);
+  }
+  
+  .list-all .list-item-2 .info text {
+    line-height: 46rpx;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    word-wrap: break-word;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    font-size: 30rpx;
+  }

subpages/oneKeyService/pages/noticeDetail/noticeDetail.js

@@ -43,7 +43,7 @@ Page({
       this.noticeDetail(options.id)
     } else if(options.modulecode == 'notice_jwgk'){
       wx.setNavigationBarTitle({
-        title: '居务公开' 
+        title: options.modulename
       })
       this.noticeDetail(options.id)
     } else if(options.modulecode == 'notice_yjfu_lbzx'){