Merge branch 'release'

pages/discussion/components/projectItem/projectItem.wxml

@@ -7,8 +7,11 @@
       <view class="name">{{projectObj.nickname}}</view>
       <image class="dang" wx:if="{{projectObj.partyFlag == '1'}}" src="../../../../images/mine/ic_dangbiaoqian.png" />
     </view>
+    <view class="state">
+      <image  wx:if="{{projectObj.topFlag == '1' ? true : false}}" src="../../../../images/discussion/top-flag.png" />
       <view class="issue-state" style="background: {{projectObj.stateName == '已结案' ? '#4E9BF2' : '#FFC438'}}">{{projectObj.stateName}}</view>    
     </view>
+  </view>
 
   <view class="content">{{projectObj.itemContent}}</view>
 

pages/discussion/components/projectItem/projectItem.wxss

@@ -46,7 +46,16 @@
   text-align: center;
   padding: 0 8rpx;
 }
-
+.project-item .header .state {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.project-item .header .state image{
+  width: 65rpx;
+  height: 30rpx;
+  margin-right: 20rpx;
+}
 .project-item .content {
   color: #333;
   font-size: 36rpx;

pages/toRegister/toRegister.js

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

project.config.json

@@ -24,8 +24,12 @@
       "outputPath": ""
     },
     "useIsolateContext": true,
-		"useCompilerModule": false,
-		"userConfirmedUseCompilerModuleSwitch": false
+    "useCompilerModule": true,
+    "userConfirmedUseCompilerModuleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "useMultiFrameRuntime": false,
+    "useApiHook": true
   },
   "compileType": "miniprogram",
   "libVersion": "2.8.2",

subpages/oneKeyService/pages/index/index.js

@@ -71,6 +71,10 @@ Page({
       wx.navigateTo({
         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}`
+      })
     }
   }
 })

subpages/oneKeyService/pages/noticeDetail/noticeDetail.js

@@ -41,6 +41,11 @@ Page({
         title: '城管聚焦' 
       })
       this.noticeDetail(options.id)
+    } else if(options.modulecode == 'notice_jwgk'){
+      wx.setNavigationBarTitle({
+        title: '居务公开' 
+      })
+      this.noticeDetail(options.id)
     }
   },
 

subpages/oneKeyService/pages/warning/warning.js

@@ -49,6 +49,11 @@ Page({
       wx.setNavigationBarTitle({
         title: '城管聚焦'
       })
+    }else if(options.modulecode == 'notice_jwgk'){
+      // this.getBannerList('6')
+      wx.setNavigationBarTitle({
+        title: '居务公开'
+      })
     }else{
       this.getBannerList('2')
       wx.setNavigationBarTitle({

subpages/understandJs/pages/delicious/delicious.js

@@ -22,6 +22,15 @@ Page({
     this.setData({
       noticeCategory:options.modulecode
     })
+    if(options.modulecode == 'notice_taste'){
+      wx.setNavigationBarTitle({
+        title: '锦水味道' 
+      })
+    }else if(options.modulecode == 'notice_jssq'){
+      wx.setNavigationBarTitle({
+        title: '锦水社区' 
+      })
+    }
     this.noticelist();
   },
   noticelist () {

subpages/understandJs/pages/delicious/delicious.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "锦水味道",
+  "navigationBarTitleText": "",
   "usingComponents": {
     "load-more": "../../../../components/loadMore/loadMore",
     "no-data":"../../../../components/nodata/nodata"

subpages/understandJs/pages/index/index.js

@@ -89,6 +89,10 @@ Page({
       wx.navigateTo({
         url: `../noticeDetail/noticeDetail?modulecode=${e.currentTarget.dataset.modulecode}`
       })
+    } else if (e.currentTarget.dataset.modulecode == 'notice_jssq') {
+      wx.navigateTo({
+        url: `../delicious/delicious?modulecode=${e.currentTarget.dataset.modulecode}`
+      })
     }
   }
 })

subpages/understandJs/pages/noticeDetail/noticeDetail.js

@@ -35,6 +35,11 @@ Page({
         title: "锦水味道" 
       })
       this.noticeDetail(options.id)
+    } else if(options.modulecode == 'notice_jssq'){
+      wx.setNavigationBarTitle({
+        title: "锦水社区" 
+      })
+      this.noticeDetail(options.id)
     } else if(options.modulecode == "notice_impression"){
       wx.setNavigationBarTitle({
         title: "锦水印象"