增加我有事要阅；首页电话从接口获取；首页服务样式修改；志愿者页面咨询热线点击拨打；精彩说说样式调整；新增等级排名页面；增加论坛指南

components/activity/activity.js

@@ -3,7 +3,7 @@ var api = require('../../utils/activity.js')
 const app = getApp()
 Component({
   properties: {
-    state: Number
+    state: Number,
   },
   data: {
     activityList: [],
@@ -33,7 +33,7 @@ Component({
         that.setData({
           activityList: that.data.activityList.concat(res.data)
         })
-        console.log(res.data.length)
+        //console.log(res.data.length)
         //数据访问成功
         var myEventDetail = {
           listLength: res.data.length
@@ -74,5 +74,4 @@ Component({
       })
     }
   }
-
 })

components/activity/activity.wxml

@@ -25,7 +25,7 @@
           <text>活动地点：{{item.actAddress}}</text>
         </view>
       </view>
-      <view class="infos_nums">
+      <view class="infos_nums" wx:if="{{!(state==2&&item.actCurrentState=='4')}}">
     
         <span wx:if="{{item.actQuotaCategory == 0}}" class="total">不限名额</span>
         <span wx:else class="total">活动名额 {{item.actQuota}}人</span>

pages/heartNew/heartNew.js

@@ -277,7 +277,7 @@ Page({
     let that = this
     api.getImgUrl('0').then(function (res) {
       that.setData({
-        getImgUrl: res.data[0].imgUrl
+        getImgUrl: res.data[0]
       })
     })
   },
@@ -344,4 +344,25 @@ Page({
       url: `/subpages/heart/pages/volunteer/volunteer`
     })
   },
+  
+  //拨打电话
+  getPhone(e) {
+    // return false
+    wx.showModal({
+      title: '拨打电话',
+      content: ``,
+      cancelColor: '#29B9A5',
+      confirmColor: '#29B9A5',
+      success: (res) => {
+        if (res.confirm) {
+          console.log('用户点击确定')
+          wx.makePhoneCall({
+            phoneNumber: e.currentTarget.dataset.number
+          })
+        } else if (res.cancel) {
+          console.log('用户点击取消')
+        }
+      }
+    })
+  }
 })

pages/heartNew/heartNew.wxml

@@ -14,8 +14,8 @@
   <view class="belong-grid">
     <image class="belong-grid-bg" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7160-u6ATTx1AAEZrXGthow458.png" />
     <view class="newbelong-grid">
-      <view class="grid">
+      <view class="grid" bindtap="getPhone" data-number="{{getImgUrl.remark}}">
-        <image src="{{getImgUrl}}" />
+        <image src="{{getImgUrl.imgUrl}}" />
       </view>
       <view class="volunteer" bindtap="govolunteer">
         <image src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/09/rBAB717MhrKAB80nAAApr5c7VJQ292.png" />

pages/heartNew/heartNew.wxss

@@ -77,7 +77,7 @@ page {
 .belong-grid .newbelong-grid {
   display: flex;
   flex-direction: row;
-  /* align-items: center; */
+  align-items: flex-end;
   justify-content: space-between;
 }
 
@@ -91,7 +91,7 @@ page {
 }
 
 .belong-grid .newbelong-grid .grid {
-  margin-left: 21rpx;
+  margin-left: 28rpx;
   /* width: 90%; */
   width: calc(100% - 234rpx);
   height: 62rpx;
@@ -102,14 +102,14 @@ page {
 }
 
 .belong-grid .newbelong-grid .grid image {
-  width: 100%;
+  width: 532rpx;
-  height: 46rpx;
+  height: 66rpx;
 }
 
 .belong-grid .newbelong-grid .volunteer {
   margin-right: 15rpx;
-  width: 90rpx;
+  width: 108rpx;
-  height: 62rpx;
+  height: 68rpx;
   position: relative;
   z-index: 100;
   display: flex;

pages/indexNew/indexNew.js

@@ -72,6 +72,9 @@ Page({
     loadMoreType: 'none',
     loadMoreVisible: false,
     defaultGridId:'',//默认网格
+    leaderGridId:'', //领导网格6.22
+    completeInfoDialogVisible: false, //完善信息
+    homePagePhone: {}
   },
   onShow: function() {
     if (wx.getStorageSync('token') != '' && wx.getStorageSync('token') != undefined && wx.getStorageSync('token') != null) {
@@ -127,6 +130,14 @@ Page({
 
     // 获取默认网格
     this.getResidentConfig()
+    api.getHomePhone().then( res => {
+      if (res.code === 0 && res.msg === 'success') {
+        this.data.homePagePhone = res.data[0]
+        this.setData({
+          homePagePhone: this.data.homePagePhone
+        })
+      }
+    })
   },
   // 获取默认网格
   getResidentConfig(){
@@ -138,6 +149,10 @@ Page({
             that.setData({
               defaultGridId:item.residentValue
             })
+          } else if (item.residentType === 'default_grid' && item.residentCode === 'leader_grid') {
+            that.setData({
+              leaderGridId:item.residentValue
+            })            
           }
         })
       }
@@ -508,6 +523,39 @@ Page({
       })
     }
   },
+  // 我有事阅 6.22
+  wysy() {
+    if(this.data.departmentId != this.data.leaderGridId){//领导网格处理
+      wx.showToast({
+        title: '无法使用该板块',
+        icon: 'none',
+        duration: 3000
+      })
+    }else{
+      if (this.verifyCompleteInfo()) {
+        return false
+      }
+      api.getScrip().then(res => {
+        if (res.code === 0 && res.msg === 'success') {
+          console.log('getScrip',res.data)
+          wx.navigateToMiniProgram({
+            appId: 'wx3ea0a6fb71ddf659',
+            path: 'pages/login/login?scrip='+res.data,
+            extraData: {
+              scrip: res.data
+            },
+            envVersion: 'trial',//trial //develop
+            success(res) {
+              console.log(res)
+            },
+            fail(err) {
+              console.log(err)
+            }
+          })
+        }      
+      })
+    }
+  },
   dqhd() {
     wx.navigateTo({
       url: `../../subpages/associationNew/pages/associationlist/associationlist`
@@ -560,7 +608,7 @@ Page({
     // return false
     wx.showModal({
       title: '拨打电话',
-      content: `您确定拨打${e.currentTarget.dataset.number}`,
+      content: ``,
       cancelColor: '#29B9A5',
       confirmColor: '#29B9A5',
       success: (res) => {
@@ -574,5 +622,16 @@ Page({
         }
       }
     })
+  },
+  // 检查 是否完善信息6.22
+  verifyCompleteInfo () {
+    if (app.globalData.infoCompleted == 0) {
+      this.setData({
+        completeInfoDialogVisible: !this.data.completeInfoDialogVisible
+      })
+      return true
+    } else {
+      return false
+    }
   }
 })

pages/indexNew/indexNew.json

@@ -4,6 +4,7 @@
   "navigationBarTextStyle": "white",
   "usingComponents": {
     "nav-bar": "/components/navbar/index",
-    "load-more": "../../components/loadMore/loadMore"
+    "load-more": "../../components/loadMore/loadMore",
+    "complete-info-dialog": "../../components/completeInfoDialog/completeInfoDialog"
   }
 }

pages/indexNew/indexNew.wxml

@@ -75,17 +75,21 @@
       <view class="name" wx:else>0</view>
     </view> -->
   <!-- </view> -->
-  <view class="newnotice" bindtap="getPhone" data-number="87875655">
+  <view class="newnotice" bindtap="getPhone" data-number="{{homePagePhone.remark}}">
-    <image class="image1" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/14/rBAB717t5zeAR7mBAAAe8_LOKr8883.png"></image>
+    <image class="image1" src="{{homePagePhone.imgUrl}}"></image>
+    <image class="image-call" src="../../images/home/call.png"></image>
     <!-- <image class="image2" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7161AbyAfYVeAAAdNklNbvM579.png"></image> -->
     <!-- <text></text> -->
   </view>
 
   <!-- 我有话说 -->
   <view class="grid-all-new">
-    <button bindtap="wyss" class="weui-btn-left" form-type='submit' plain='true' hover-class="hover-btn">
+    <button bindtap="wyss" class="weui-btn-left" form-type='submit' plain='true' hover-class="hover-btn" wx:if="{{departmentId != leaderGridId}}">
       <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7161BRGARAefAAGNonPzguk041.png'></image>
     </button>
+    <button bindtap="wysy" class="weui-btn-left" form-type='submit' plain='true' hover-class="hover-btn" wx:else>
+      <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/16/rBAB717xXhKATMiMAAAvjvVWdAA612.png'></image>
+    </button>
     <view class="weui-btn-right">
       <button bindtap="goheart" class="weui-btn-top" form-type='submit' plain='true' hover-class="hover-btn">
         <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7161BqiAGT25AADji64eXU8518.png'></image>
@@ -161,3 +165,5 @@
   <!--加载更多提示-->
   <load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible}}"></load-more>
 </view>
+
+<complete-info-dialog completeInfoDialogVisible="{{completeInfoDialogVisible}}"></complete-info-dialog>

pages/indexNew/indexNew.wxss

@@ -243,8 +243,13 @@ page {
   align-items: center;
 }
 
+.image-call {
+  width: 126rpx;
+  height: 72rpx;
+  margin-left: 70rpx;
+}
 .newnotice .image1 {
-  width: 599rpx;
+  width: 456rpx;
   height: 50rpx;
 }
 
@@ -419,6 +424,7 @@ page {
   width: calc(100% - 42rpx);
   margin-top: 29rpx;
   margin-left: 21rpx;
+  margin-bottom: 29rpx;
 }
 
 .grid-all-new .weui-btn-left {

project.config.json

@@ -22,9 +22,9 @@
 			"disablePlugins": [],
 			"outputPath": ""
 		},
-		"useIsolateContext": true,
 		"useCompilerModule": false,
-		"userConfirmedUseCompilerModuleSwitch": false
+		"userConfirmedUseCompilerModuleSwitch": false,
+		"useIsolateContext": true
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.8.2",

subpages/integralCentre/pages/index/index.js

@@ -31,6 +31,11 @@ Page({
         type: '1',
         name: '街道排名',
         select: false
+      },
+      {
+        type: '2',
+        name: '等级排名',
+        select: false
       }
     ],
     timestamp: getTimestamp(),

utils/api.js

@@ -52,7 +52,9 @@ module.exports = {
   completePartyInfoV2: completePartyInfoV2,
   userPointsRankinglist:userPointsRankinglist,
   getDefaultGridInfo:getDefaultGridInfo,
-  getResidentConfig:getResidentConfig
+  getResidentConfig:getResidentConfig,
+  getScrip:getScrip,
+  getHomePhone:getHomePhone
 }
 
 function getToken(wxCode) {
@@ -501,3 +503,13 @@ function getDefaultGridInfo() {
 function getResidentConfig() {
   return fly.get('residentConfig/getResidentConfig')
 }
+
+// *****************************获取临时凭证接口****6.22***************end
+// 获取临时凭证用于跳转到数据端
+function getScrip() {
+  return fly.post('admin/getScrip')
+}
+// 获取首页电话
+function getHomePhone() {
+  return fly.get('imgConfig/getImgUrl/3')
+}

utils/config.js

@@ -6,13 +6,13 @@ module.exports = {
 };
 
 function BASEURL() {
-  // return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境
+  return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境
   // return 'https://eug-test.elinkit.com.cn/epdc-api/api/' // 测试环境 接口地址
   // return "http://219.146.91.110:9094/epdc-api/api/"  // 测试环境 ip接口地址
   // return "https://epdc.elinkservice.cn/epdc-api/api/" // 正式环境 接口地址
   // return 'https://epdc-app.qingdaoshibei.cn/epdc-api/api/' // 电政办 正式环境 接口地址
   //  return 'https://epdc-shibei.elinkservice.cn/epdc-api/api/' // 电政办 正式环境 接口地址
-  return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
+  // return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
 }
 
 function WEBROOT() {