From 632f805124d116b92dca70f2638ebd5b3f8301c8 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Wed, 8 Jul 2020 16:24:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E6=9C=89=E4=BA=8B=E5=81=9A-=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E7=BD=91=E6=A0=BC-=E8=B7=B3=E8=BD=AC=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E7=AB=AF=E5=B9=B6=E4=B8=B4=E6=97=B6=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/indexNew/indexNew.js   | 46 ++++++++++++++++++++++++++++++++----
 pages/indexNew/indexNew.wxml | 11 +++++----
 project.config.json          |  2 +-
 utils/config.js              |  5 ++--
 4 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/pages/indexNew/indexNew.js b/pages/indexNew/indexNew.js
index 98c23c7..b1765c9 100644
--- a/pages/indexNew/indexNew.js
+++ b/pages/indexNew/indexNew.js
@@ -73,18 +73,19 @@ Page({
     loadMoreVisible: false,
     defaultGridId:'',//默认网格
     leaderGridId:'', //领导网格6.22
+    workGridId:'', //工作网格7.08
     completeInfoDialogVisible: false, //完善信息
     homePagePhone: {}
   },
   onShow: function() {
     if (wx.getStorageSync('token') != '' && wx.getStorageSync('token') != undefined && wx.getStorageSync('token') != null) {
       if (!this.data.first) {
+        this.loadGridList()
         this.getBannerList()
         this.getFirstInfo()
         this.getNoticeList()
         this.getIssueList()
         this.getProjectList()
-        this.loadGridList()
         this.setData({
           pageNo: 1,
           newsList: []
@@ -153,6 +154,10 @@ Page({
             that.setData({
               leaderGridId:item.residentValue
             })            
+          } else if (item.residentType === 'default_grid' && item.residentCode === 'work_grid') {
+            that.setData({
+              workGridId:item.residentValue
+            })            
           }
         })
       }
@@ -345,13 +350,13 @@ Page({
                   }
                   wx.removeStorageSync('shareObj')
                 }
+                  that.loadGridList()
                   that.getBannerList()
                   that.getFirstInfo()
                   that.getNoticeList()
                   that.getNewsList()
                   that.getIssueList()
                   that.getProjectList()
-                  that.loadGridList()
               }
             }
 
@@ -523,7 +528,7 @@ Page({
       })
     }
   },
-  // 我有事阅 6.22
+  // 我有事阅 6.22 ->数据端
   wysy() {
     if(this.data.departmentId != this.data.leaderGridId){//领导网格处理
       wx.showToast({
@@ -544,7 +549,40 @@ Page({
             extraData: {
               scrip: res.data
             },
-            envVersion: 'trial',//trial //develop
+            envVersion: 'release',//trial //develop
+            success(res) {
+              console.log(res)
+            },
+            fail(err) {
+              console.log(err)
+            }
+          })
+        }      
+      })
+    }
+  },
+  // 我有事做 7.08 ->工作端
+  wysz() {
+    if(this.data.departmentId != this.data.workGridId){//工作网格处理
+      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: 'wx826a8435db9e0947',
+            path: 'pages/login/login?scrip='+res.data,
+            extraData: {
+              scrip: res.data
+            },
+            envVersion: 'release',//trial //develop
             success(res) {
               console.log(res)
             },
diff --git a/pages/indexNew/indexNew.wxml b/pages/indexNew/indexNew.wxml
index 10b6e37..0b0b4e5 100644
--- a/pages/indexNew/indexNew.wxml
+++ b/pages/indexNew/indexNew.wxml
@@ -84,12 +84,15 @@
 
   <!-- 我有话说 -->
   <view class="grid-all-new">
-    <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>
+    <button bindtap="wysy" 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/16/rBAB717xXhKATMiMAAAvjvVWdAA612.png'></image>
     </button>
+    <button bindtap="wysz" class="weui-btn-left" form-type='submit' plain='true' hover-class="hover-btn" wx:elif="{{departmentId == workGridId}}">
+      <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/1C/rBAB718FM7iAdYrNAABKu-5Itrc967.png'></image>
+    </button>
+    <button bindtap="wyss" 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/06/rBAB7161BRGARAefAAGNonPzguk041.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>
diff --git a/project.config.json b/project.config.json
index de6daae..4564423 100644
--- a/project.config.json
+++ b/project.config.json
@@ -4,7 +4,7 @@
 		"ignore": []
 	},
 	"setting": {
-		"urlCheck": true,
+		"urlCheck": false,
 		"es6": true,
 		"postcss": true,
 		"preloadBackgroundData": false,
diff --git a/utils/config.js b/utils/config.js
index 9c560a3..8ce72dc 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -6,13 +6,14 @@ 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/' // 锦水正式环境接口地址
+  // return 'http://10.10.10.64:9094/epdc-api/api/'
 }
 
 function WEBROOT() {