首页改版

epdc-resident-mp-yushan/app.json

@@ -251,37 +251,6 @@
     }
 
   },
-  "tabBar": {
-    "color": "#666666",
-    "selectedColor": "#27be99",
-    "backgroundColor": "#FFFFFF",
-    "borderStyle": "white",
-    "list": [{
-        "pagePath": "pages/index/index",
-        "text": "首页",
-        "iconPath": "images/home.png",
-        "selectedIconPath": "images/home-active.png"
-      },
-      {
-        "pagePath": "pages/association/association",
-        "text": "左邻右舍",
-        "iconPath": "images/association.png",
-        "selectedIconPath": "images/group-active.png"
-      },
-      {
-        "pagePath": "pages/property/property",
-        "text": "我的物业",
-        "iconPath": "images/property.png",
-        "selectedIconPath": "images/property-active.png"
-      },
-      {
-        "pagePath": "pages/mine/mine",
-        "text": "我的",
-        "iconPath": "images/mine.png",
-        "selectedIconPath": "images/mine-active.png"
-      }
-    ]
-  },
   "window": {
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#fff",

epdc-resident-mp-yushan/pages/index/index.js

@@ -37,16 +37,11 @@ Page({
       },
       {
         icon:
-          'https://epdc-yushan.elinkservice.cn/files-pro/20211009/59b127e9fc8042969334c31fe0272c3f.png',
+          'https://epdc-yushan.elinkservice.cn/files-pro/20220324/118ea106d9ed40978f3e23cc51b43119.png',
+          // 'https://epdc-yushan.elinkservice.cn/files-pro/20211009/59b127e9fc8042969334c31fe0272c3f.png', // 蓝色
         tip: '指尖榆山',
         module: 'fingerYushan',
       },
-      {
-        icon:
-          'https://epdc-yushan.elinkservice.cn/files-pro/20211009/ccbab2a8a4a847548a72972770009576.png',
-        tip: '网格队伍',
-        module: 'gridArmy',
-      },
       {
         icon:
           'https://epdc-yushan.elinkservice.cn/files-pro/20211009/db945b5cc30147df80923f6c5928074f.png',
@@ -55,10 +50,22 @@ Page({
       },
       {
         icon:
-          'https://epdc-yushan.elinkservice.cn/files-pro/20211009/47c5baebb4d54987b4faebfeadd92a25.png',
+          'https://epdc-yushan.elinkservice.cn/files-pro/20220324/1083316800d948b4a8a4206dcb857722.png',
-        tip: '社会组织',
+        tip: '个人中心',
-        module: 'societyOrg',
+        module: 'personalCenter',
       },
+      // {
+      //   icon:
+      //     'https://epdc-yushan.elinkservice.cn/files-pro/20211009/ccbab2a8a4a847548a72972770009576.png',
+      //   tip: '网格队伍',
+      //   module: 'gridArmy',
+      // },
+      // {
+      //   icon:
+      //     'https://epdc-yushan.elinkservice.cn/files-pro/20211009/47c5baebb4d54987b4faebfeadd92a25.png',
+      //   tip: '社会组织',
+      //   module: 'societyOrg',
+      // },
     ],
     serviceImgUrl: '',
     servicePhone: '',
@@ -444,6 +451,10 @@ Page({
       wx.navigateTo({
         url: '/subpages/fingertipYushan/pages/index/index',
       })
+    } else if (module === 'personalCenter') {
+      wx.navigateTo({
+        url: '/pages/mine/mine'
+      })
     }
   },
   // 我有事要说跳转

epdc-resident-mp-yushan/pages/index/index.wxml

@@ -2,7 +2,7 @@
   <view class="header" style="height: {{statusHeight + navigationHeight}}px;">
     <!-- <image class="header-bg" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7160-w6AJBH6AAAk6D4lsPc207.png" /> -->
     <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
-      现代榆山
+      <image src="https://epdc-yushan.elinkservice.cn/files-pro/20220324/9be8371ee12d40f79be7974cdc6d79f5.png" />
     </view>
   </view>
   <view class="home" style="margin-top: {{statusHeight + navigationHeight}}px">
@@ -25,9 +25,9 @@
           <image wx:elif="{{infoList.length > 0 && unReadNum > 0}}" bindtap="navigateToNotice" src="../../images/home/yes-notice.png"></image>
         </view>
       </view>
-      <view class="newImage">
+      <!-- <view class="newImage">
         <image src="https://epdc-yushan.elinkservice.cn/files-pro/20210913/32b8ebf77da5499d9e98c605efa4fe64.png"></image>
-      </view>
+      </view> -->
     </view>
     <!-- banner列表 -->
     <view class="banner">
@@ -62,7 +62,7 @@
     </view>
   </view> -->
     <!-- 我有事要说、要办、要提 -->
-    <view class="grid-list">
+    <!-- <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" />
@@ -87,7 +87,7 @@
         </view>
         <view class="tip">我建议点事</view>
       </view>
-    </view>
+    </view> -->
     <!-- <view class="grid-list">
     <view class="grid-item-left" bindtap="navigateToDiscussion">
       <image src="https://epdc-yushan.elinkservice.cn/files-pro/20210914/3e2b3a7d912448c8bc0178aa7fdffb60.png" />
@@ -101,6 +101,15 @@
       </view>
     </view>
   </view> -->
+    <view class="grid-list">
+      <view class="grid-item-left">
+        <image class="grid-item-left-1" src="https://epdc-yushan.elinkservice.cn/files-pro/20220323/4b9bb24aa8e3477fb946225b86bf251b.png" bindtap="callPhone" data-phone="{{servicePhone}}"/>
+      </view>
+      <view class="grid-item-right">
+        <image class="grid-item-right-1" src="https://epdc-yushan.elinkservice.cn/files-pro/20220323/cb34833d541a4255abf84a7c82a0ff96.png" bindtap="navigateToDiscussion"/>
+        <image class="grid-item-right-2" src="https://epdc-yushan.elinkservice.cn/files-pro/20220323/6889b62a3b8c4cdc92d14751990ce8f3.png" data-module="gridArmy" bindtap="navigateToModule" style="margin-top: 2rpx;"/>
+      </view>
+    </view>
     <!-- 积分排名、指尖榆山、网格队伍、志愿服务、社会组织模块 -->
     <view class="module-list">
       <view hover-class="hover-module-item" hover-stay-time="150" class="module-item" wx:for="{{moduleList}}" wx:key="index" wx:for-item="item" data-module="{{item.module}}" bindtap="navigateToModule">

epdc-resident-mp-yushan/pages/index/index.wxss

@@ -11,7 +11,8 @@ page {
   top: 0;
   left: 0;
   z-index: 1000;
-  background: #349c83;
+  background: #bb0300;
+  /* background: #349c83; */
 }
 
 .header .header-bg {
@@ -34,12 +35,19 @@ page {
   z-index: 100;
   letter-spacing: 2rpx;
 }
+.header .navigation image {
+  width: 150rpx;
+  height: 50rpx;
+}
 
 .belong-grid {
   width: 100%;
-  height: 160rpx;
+  height: 70rpx;
   position: relative;
-  background: linear-gradient(to bottom, #349c83, #39b092);
+  background: #bb0300;
+  padding-top: 14rpx;
+  box-sizing: border-box;
+  /* background: linear-gradient(to bottom, #349c83, #39b092); */
 }
 
 .belong-grid .newbelong-grid {
@@ -262,6 +270,36 @@ page {
   margin-right: 20rpx;
 }
 .grid-list {
+  width: 100%;
+  height: 300rpx;
+  margin: -30rpx auto 0;
+  position: relative;
+  background: #ffffff;
+  padding: 28rpx 24rpx;
+  box-sizing: border-box;
+  border-radius: 20rpx 20rpx 0 0;
+  display: flex;
+}
+.grid-list .grid-item-left {
+  
+}
+.grid-list .grid-item-left image {
+  width: 336rpx;
+  height: 272rpx;
+  float: none;
+}
+.grid-list .grid-item-right {
+  display: flex;
+  flex-direction: column;
+  height: 272rpx;
+}
+.grid-list .grid-item-right image {
+  width: 360rpx;
+  height: 136rpx;
+  float: none;
+  margin-top: 4rpx;
+}
+/* .grid-list {
   width: 100%;
   display: flex;
   align-items: center;
@@ -296,7 +334,7 @@ page {
   color: #333;
   font-size: 30rpx;
   line-height: 50rpx;
-}
+} */
 /* .grid-list {
   width: 100%;
   box-sizing: border-box;

epdc-resident-mp-yushan/pages/toRegister/toRegister.js

@@ -21,7 +21,7 @@ Page({
       }
     })
     let that = this
-    const versionNum = '1.2.29'
+    const versionNum = '1.2.31'
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data ? res.data.scanFlag : '1'

epdc-resident-mp-yushan/subpages/association/pages/associationDetail/associationDetail.js

@@ -255,7 +255,7 @@ Page({
         icon: 'none',
         duration: 2000
       })
-      wx.switchTab({
+      wx.navigateTo({
         url: '/pages/association/association'
       })
     }).catch(err => {

epdc-resident-mp-yushan/subpages/association/pages/createassociation/createassociation.js

@@ -182,14 +182,16 @@ Page({
   },
   // 关闭弹框
   closeDialog () {
-    wx.switchTab({
+    wx.navigateBack()
-      url: '/pages/association/association'
+    // wx.switchTab({
-    })
+    //   url: '/pages/association/association'
+    // })
   },
   // 弹框确定按钮
   confirmDialog () {
-    wx.switchTab({
+    wx.navigateBack()
-      url: '/pages/association/association'
+    // wx.switchTab({
-    })
+    //   url: '/pages/association/association'
+    // })
   }
 })

epdc-resident-mp-yushan/subpages/discussion/pages/addIssue/addIssue.js

@@ -336,8 +336,9 @@ Page({
   },
   // 知道了 确认按钮 
   confirmDialog () {
-   wx.switchTab({
+    wx.navigateBack()
-     url: '/pages/discussion/discussion'
+  //  wx.switchTab({
-   })
+  //    url: '/pages/discussion/discussion'
+  //  })
   }
 })

epdc-resident-mp-yushan/subpages/discussion/pages/publishEvaluation/components/evaluationCallback/evaluationCallback.js

@@ -30,7 +30,7 @@ Component({
   },
   methods: {
     backDiscussion () {
-      wx.switchTab({
+      wx.navigateTo({
         url: '/pages/discussion/discussion'
       })
     },

epdc-resident-mp-yushan/subpages/extend/pages/tripReport/tripReport.js

@@ -284,7 +284,7 @@ Page({
                 _this.showToast('提交成功')
                 setTimeout(() => {
                   _this.data.lock = false
-                  wx.switchTab({
+                  wx.reLaunch({
                     url: '/pages/index/index',
                   })
                 }, 1000)

epdc-resident-mp-yushan/subpages/home/pages/info/info.js

@@ -54,7 +54,7 @@ Page({
     })
     if (type === '0') {
       if (businessType === 'groupUserReviewPassed' || businessType === 'groupPassed' || businessType === 'groupUserReviewNotPass') {
-        wx.switchTab({
+        wx.navigateTo({
           url: '/pages/association/association'
         })
       } else if (businessType === 'groupNotPassedOrDisband') {
@@ -132,7 +132,7 @@ Page({
         })
       }
     } else if (type === '3') {
-      wx.switchTab({
+      wx.navigateTo({
         url: '/pages/association/association'
       })
     }

epdc-resident-mp-yushan/subpages/integralCentre/pages/index/index.wxss

@@ -14,17 +14,21 @@ page {
   display: flex;
   flex-direction: column;
   align-items: center;
+  position: relative;
 }
 
 .title .exchange-enter {
-  width: 100%;
+  width: 150rpx;
-  height: 50rpx;
+  height: 80rpx;
-  line-height: 50rpx;
+  line-height: 80rpx;
   padding: 0 30rpx;
   box-sizing: border-box;
-  font-size: 28rpx;
+  font-size: 32rpx;
-  text-align: right;
+  text-align: center;
   color: rgba(255, 255, 255, 1);
+  position: absolute;
+  top: 20px;
+  right: 20px;
 }
 
 .title .number {
@@ -33,7 +37,7 @@ page {
   line-height: 86rpx;
   font-weight: bold;
   color: rgba(255, 255, 255, 1);
-  margin-top: 10rpx;
+  margin-top: 60rpx;
 }
 
 .title .name {

epdc-resident-mp-yushan/subpages/property/pages/associationDetail/associationDetail.js

@@ -257,9 +257,10 @@ Page({
         icon: 'none',
         duration: 2000
       })
-      wx.switchTab({
+      wx.navigateBack()
-        url: '/pages/association/association'
+      // wx.switchTab({
-      })
+      //   url: '/pages/association/association'
+      // })
     }).catch(err => {
       console.log(err)
     })

epdc-resident-mp-yushan/subpages/property/pages/createassociation/createassociation.js

@@ -182,14 +182,16 @@ Page({
   },
   // 关闭弹框
   closeDialog () {
-    wx.switchTab({
+    wx.navigateBack()
-      url: '/pages/association/association'
+    // wx.switchTab({
-    })
+    //   url: '/pages/association/association'
+    // })
   },
   // 弹框确定按钮
   confirmDialog () {
-    wx.switchTab({
+    wx.navigateBack()
-      url: '/pages/association/association'
+    // wx.switchTab({
-    })
+    //   url: '/pages/association/association'
+    // })
   }
 })