diff --git a/epdc-resident-mp-yushan/app.json b/epdc-resident-mp-yushan/app.json
index 7636663..4b6db3a 100644
--- a/epdc-resident-mp-yushan/app.json
+++ b/epdc-resident-mp-yushan/app.json
@@ -255,12 +255,6 @@
         "iconPath": "images/home.png",
         "selectedIconPath": "images/home-active.png"
       },
-      {
-        "pagePath": "pages/discussion/discussion",
-        "text": "有么说么",
-        "iconPath": "images/discuss.png",
-        "selectedIconPath": "images/discussion-active.png"
-      },
       {
         "pagePath": "pages/association/association",
         "text": "左邻右舍",
diff --git a/epdc-resident-mp-yushan/pages/discussion/discussion.json b/epdc-resident-mp-yushan/pages/discussion/discussion.json
index 0495b99..c7d31a2 100644
--- a/epdc-resident-mp-yushan/pages/discussion/discussion.json
+++ b/epdc-resident-mp-yushan/pages/discussion/discussion.json
@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "有么说么",
+  "navigationBarTitleText": "我有事要说",
   "usingComponents": {
     "issue-list": "./components/issueList/issueList",
     "project-list": "./components/projectList/projectList",
diff --git a/epdc-resident-mp-yushan/pages/index/index.js b/epdc-resident-mp-yushan/pages/index/index.js
index e43cbe0..d516022 100644
--- a/epdc-resident-mp-yushan/pages/index/index.js
+++ b/epdc-resident-mp-yushan/pages/index/index.js
@@ -389,8 +389,11 @@ Page({
       return false
     }
     wx.navigateTo({
-      url: '/subpages/discussion/pages/addIssue/addIssue'
+      url: '/pages/discussion/discussion'
     })
+    // wx.navigateTo({
+    //   url: '/subpages/discussion/pages/addIssue/addIssue'
+    // })
   },
   navigateToWork() {
     if (app.globalData.infoCompleted == 0) {
@@ -430,8 +433,21 @@ Page({
   // 拨打便民服务电话
   callPhone(e) {
     const { phone } = e.currentTarget.dataset
-    wx.makePhoneCall({
-      phoneNumber: phone
+    wx.showModal({
+      title: `拨打${phone}`,
+      content: '',
+      cancelColor: '#29B9A5',
+      confirmColor: '#29B9A5',
+      success: (res) => {
+        if (res.confirm) {
+          console.log('用户点击确定')
+          wx.makePhoneCall({
+            phoneNumber: phone,
+          })
+        } else if (res.cancel) {
+          console.log('用户点击取消')
+        }
+      },
     })
   },
   changeTab(e) {
diff --git a/epdc-resident-mp-yushan/pages/index/index.wxml b/epdc-resident-mp-yushan/pages/index/index.wxml
index 06bab08..bd5b7ec 100644
--- a/epdc-resident-mp-yushan/pages/index/index.wxml
+++ b/epdc-resident-mp-yushan/pages/index/index.wxml
@@ -59,15 +59,21 @@
   </view> -->
     <!-- 我有事要说、要办、要提 -->
     <view class="grid-list">
+      <view class="grid-item" hover-class="hover-grid-item" hover-stay-time="150" bindtap="callPhone" data-phone="{{servicePhone}}">
+        <view class="icon-container">
+          <image src="https://epdc-yushan.elinkservice.cn/files-pro/20211012/4f7f6ffc15564903806551f93cc422db.png" />
+        </view>
+        <view class="tip">榆山12345</view>
+      </view>
       <view class="grid-item" hover-class="hover-grid-item" hover-stay-time="150" bindtap="navigateToDiscussion">
         <view class="icon-container">
-          <image src="https://epdc-yushan.elinkservice.cn/files-pro/20211009/d06b8f3c799249328cc6191284fb7eb6.png" />
+          <image src="https://epdc-yushan.elinkservice.cn/files-pro/20211012/8326a3e0c3394704800779bf79b91157.png" />
         </view>
         <view class="tip">我有事要说</view>
       </view>
       <view class="grid-item" hover-class="hover-grid-item" hover-stay-time="150" bindtap="navigateToWork">
         <view class="icon-container">
-          <image src="https://epdc-yushan.elinkservice.cn/files-pro/20211009/02047a12ac0944ad8c76b4ab47925c13.png" />
+          <image src="https://epdc-yushan.elinkservice.cn/files-pro/20211012/242af713e37541ec9518c4ff28ac5a2c.png" />
         </view>
         <view class="tip">我有事要办</view>
       </view>
@@ -139,7 +145,7 @@
   <!-- 悬浮按钮 -->
   <move-btn wx:if="{{vaccinationSwitch}}" button-width="142" button-height="164" button-left="620" area-top="120" area-height="80%" img-url="../../images/vaccines.png" bindmovebtnCallBack="toVaccines"></move-btn>
   <!-- 拨打电话 -->
-  <view class="fixed-phone-container {{phoneSlideState === 'open' ? 'open' : ''}}" catch:touchend="openPhonePannel">
+  <!-- <view class="fixed-phone-container {{phoneSlideState === 'open' ? 'open' : ''}}" catch:touchend="openPhonePannel">
     <view class="left">
       <view class="phone-container">
         <image src="https://epdc-yushan.elinkservice.cn/files-pro/20211009/fcdf6f0075e64467984e216f1f80d23a.png" />
@@ -152,5 +158,5 @@
     <view class="call-btn" hover-class="hover-call-btn" hover-stay-time="150" bindtap="callPhone" data-phone="{{servicePhone}}">
       拨打
     </view>
-  </view>
+  </view> -->
 </view>
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/pages/toRegister/toRegister.js b/epdc-resident-mp-yushan/pages/toRegister/toRegister.js
index be3aa5e..a168218 100644
--- a/epdc-resident-mp-yushan/pages/toRegister/toRegister.js
+++ b/epdc-resident-mp-yushan/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
       }
     })
     let that = this
-    const versionNum = '1.2.17'
+    const versionNum = '1.2.18'
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data ? res.data.scanFlag : '1'
diff --git a/epdc-resident-mp-yushan/subpages/fingertipYushan/pages/index/index.js b/epdc-resident-mp-yushan/subpages/fingertipYushan/pages/index/index.js
index d30b4ee..2ef612f 100644
--- a/epdc-resident-mp-yushan/subpages/fingertipYushan/pages/index/index.js
+++ b/epdc-resident-mp-yushan/subpages/fingertipYushan/pages/index/index.js
@@ -12,7 +12,8 @@ Page({
     loadMoreVisible: false,
     isLoadMore: false,
     modulelist: [],
-    pid: '1438320938730868737'
+    pid: '1438320938730868737',
+    typeCode: 'ZJYS'
   },
 
   /**
@@ -38,7 +39,8 @@ Page({
     let params = {
       pageIndex: this.data.pageIndex,
       pageSize: this.data.pageSize,
-      pid: this.data.pid
+      // pid: this.data.pid
+      typeCode: this.data.typeCode
     }
     api.getModuleList(params).then(res => {
       console.log(res.data)
diff --git a/epdc-resident-mp-yushan/subpages/workTodo/pages/index/index.js b/epdc-resident-mp-yushan/subpages/workTodo/pages/index/index.js
index 2d6c23f..2984794 100644
--- a/epdc-resident-mp-yushan/subpages/workTodo/pages/index/index.js
+++ b/epdc-resident-mp-yushan/subpages/workTodo/pages/index/index.js
@@ -9,6 +9,7 @@ Page({
     isLoadMore: false, //是否显示load-more组件
     modulelist: [],
     pid: '1438320849966813186', //主页获取一键服务pid
+    typeCode: 'YSYB'
   },
   onLoad: function (options) {
     if (options.pid) {
@@ -22,7 +23,8 @@ Page({
     let params = {
       pageIndex: this.data.pageIndex,
       pageSize: this.data.pageSize,
-      pid: this.data.pid,
+      // pid: this.data.pid,
+      typeCode: this.data.typeCode
     }
     getModuleList(params)
       .then((res) => {