【首页布局修改】 -刘绍文 -2020/05/07

epdc-resident-mp-yushan/app.json

@@ -125,21 +125,21 @@
       },
       {
         "pagePath": "pages/discussion/discussion",
-        "text": "党群议事",
+        "text": "有么说么",
         "iconPath": "images/discuss.png",
         "selectedIconPath": "images/discussSelected.png"
       },
       {
         "pagePath": "pages/association/association",
-        "text": "邻里党群",
+        "text": "左邻右舍",
         "iconPath": "images/association.png",
         "selectedIconPath": "images/association-select.png"
       },
       {
-        "pagePath": "pages/heart/heart",
-        "text": "初心互助",
-        "iconPath": "images/mutual.png",
-        "selectedIconPath": "images/mutualSelected.png"
+        "pagePath": "pages/accept/accept",
+        "text": "物业服务",
+        "iconPath": "images/property.png",
+        "selectedIconPath": "images/propertySelected.png"
       },
       {
         "pagePath": "pages/mine/mine",

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

@@ -1,6 +1,7 @@
 Component({
   data: {
-    currentIndex: 0
+    currentIndex: 0,
+    autoplay:true
   },
   properties: {
     bannerList: {
@@ -12,15 +13,22 @@ Component({
 
   },
   pageLifetimes: {
-
+    show:function(){
+      this.setData({
+        autoPlay:true
+      })
+    },
+    hide:function(){
+      this.setData({
+        autoPlay:false
+      })
+    }
   },
   methods: {
     swiperChange (e) {
-      if (e.detail.source === 'touch') {
          this.setData({
           currentIndex: e.detail.current
         })
-      }
     },
     navigatetoBannerDetail (e) {
       const { id, url, newsflag } = e.currentTarget.dataset

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

@@ -1,5 +1,5 @@
 <view class="banner">
-  <swiper circular="{{true}}" autoplay="{{true}}" interval="{{3000}}" current="{{currentIndex}}" bindchange="swiperChange">
+  <swiper circular="{{true}}" autoplay="{{autoplay}}" interval="{{3000}}" current="{{currentIndex}}" bindchange="swiperChange">
     <swiper-item
       wx:for="{{bannerList}}"
       wx:key="index"

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

@@ -1,6 +1,7 @@
 .banner {
-  width: 100%;
+  width: 94%;
   height: 320rpx;
+  margin:0 auto;
 }
 .banner swiper {
   width: 100%;

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

@@ -11,14 +11,14 @@
     wx:for-index="index"
     wx:key="index">
     <view class="left">
+     <image src="{{item.newsImageUrl}}" />
+    </view>
+    <view class="right">
       <view class="title">{{item.newsTitle}}</view>
       <view class="bottom">
         <view class="category">{{item.deptName}}-{{item.newsCategoryName}}</view>
         <view class="time">{{filters.formatTimestamp(item.newsStartTime)}}</view>
       </view>
     </view>
-    <view class="right">
-      <image src="{{item.newsImageUrl}}" />
-    </view>
   </view>
 </view>

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

@@ -3,7 +3,7 @@
   background: #fff;
   box-sizing: border-box;
   padding: 0 35rpx;
-  margin-top: 10rpx;
+  margin-top: 20rpx;
 } 
 .news-list .list-item {
   width: 100%;
@@ -14,11 +14,11 @@
   align-items: center;
   justify-content: space-between;
 }
-.news-list .list-item .left {
+.news-list .list-item .right {
   width: calc(100% - 50rpx - 220rpx);
   height: 146rpx;
 }
-.news-list .list-item .left .title {
+.news-list .list-item .right .title {
   color: #3f3f3f;
   font-size: 30rpx;
   line-height: 45rpx;
@@ -30,12 +30,13 @@
   -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
 }
-.news-list .list-item .left .bottom {
+.news-list .list-item .right .bottom {
   display: flex;
   align-items: center;
   justify-content: space-between;
+  padding-top: 20rpx;
 }
-.news-list .list-item .left .bottom .category {
+.news-list .list-item .right .bottom .category {
   color: #aaa;
   font-size: 22rpx;
   line-height: 48rpx;
@@ -44,20 +45,20 @@
   overflow: hidden;
   text-overflow: ellipsis;
 }
-.news-list .list-item .left .bottom .time {
+.news-list .list-item .right .bottom .time {
   color: #aaa;
   font-size: 22rpx;
   line-height: 48rpx;
   width: 150rpx;
   text-align: right;
 }
-.news-list .list-item .right {
-   width: 220rpx;
+.news-list .list-item .left {
+   width: 250rpx;
    height: 146rpx;
    border-radius: 12rpx;
    overflow: hidden;
 }
-.news-list .list-item .right image {
+.news-list .list-item .left image {
   width: 100%;
   height:100%;
 }

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

@@ -11,6 +11,6 @@
         <view class="content">{{item.title}}</view>
       </swiper-item>
     </swiper>
-    <view class="num">{{unreadnum}}</view>
+    <!-- <view class="num">{{unreadnum}}</view> -->
   </view>
 </view>

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

@@ -17,11 +17,12 @@
 .notice .notice-logo {
   width: 32rpx;
   height: 32rpx;
+  margin-left: -80rpx;
 }
 .notice .info-note {
-  width: 94rpx;
-  height: 24rpx;
-  margin: 0 20rpx 0 10rpx;
+  width: 58rpx;
+  height: 30rpx;
+  margin: 5rpx 20rpx 0 10rpx;
 }
 .notice swiper {
   height: 76rpx;

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

@@ -1,6 +1,38 @@
 <wxs src="../../../../utils/filter.wxs" module="filters"></wxs>
 <view class="project" wx:if="{{projectList.length > 0}}">
-  <swiper circular="{{true}}" autoplay="{{false}}" current="{{currentIndex}}" bindchange="swiperChange">
+  <view class="text">项目进度</view>
+  <!-- <scroll-view class="swiper" scroll-x>
+    <view class="swiper-item"  wx:for="{{projectList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
+       <view class="content"  data-id="{{item.id}}" bindtap="navigatetoItemDetail">
+        <view class="top">
+          <image mode="aspectFill" wx:if="{{item.images.length > 0}}" class="top-bg" src="{{item.images[0]}}" />
+          <image wx:else class="top-bg" src="https://epdc-shibei.elinkservice.cn/epdcFile/M00/02/89/rBAAM16O4_OAB6d6AALSjaFpI9M647.png" />
+          <view class="top-content">
+            <view>
+              <image class="project-status" src="{{filters.formatState(item.stateName)}}" />
+            </view>
+            <view class="progress">
+              <view class="image-logo">
+                <image class="progress-logo" src="../../../../images/home/new-progress.png"/>
+              </view>
+              <view class="progress-content">最新进展：{{item.latestProgress.progressName}}</view>
+            </view>
+          </view>
+        </view>
+        <view class="bottom">
+          <view class="title">{{item.itemContent}}</view>
+          <view class="info">
+            <view class="left">
+              <image class="avatar" src="{{item.avatar}}" />
+              <view class="name">{{item.nickname}}</view>
+            </view>
+            <view class="right">表达态度 {{item.statementNum}}次</view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </scroll-view> -->
+  <swiper circular="{{true}}" current="{{currentIndex}}" bindchange="swiperChange" class="swiper" next-margin="{{'200rpx'}}">
     <swiper-item wx:for="{{projectList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
       <view class="content"  data-id="{{item.id}}" bindtap="navigatetoItemDetail">
         <view class="top">
@@ -32,10 +64,10 @@
     </swiper-item>
   </swiper>
 
-  <view class="indication">
+  <!-- <view class="indication">
     <block wx:for="{{projectList}}" wx:key="index">
       <view class="spot{{index == currentIndex? ' active' : ''}}"></view>
     </block>
-  </view>
+  </view> -->
 
 </view>

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

@@ -1,25 +1,34 @@
 .project {
   width: 100%;
-  height: 450rpx;
   box-sizing: border-box;
   padding-top: 20rpx;
+  background: #FFF;
+  margin-top: 20rpx;
 }
-.project swiper {
+.project .text{
+  font-weight: bold;
+  padding: 30rpx;
+}
+.project .swiper {
   width: 100%;
   height: 380rpx;
+  display: inline-block;
+  white-space: nowrap;
+  overflow-x: scroll;
 }
-.project swiper swiper-item {
+.project .swiper .swiper-item {
+  display: inline-block;
   box-sizing: border-box;
-  padding: 0 40rpx;
-  width:100%;
+  padding: 0 30rpx;
+  width:60%;
   height: 380rpx;
 }
 .project .content { 
   width: 100%;
   height: 380rpx;
   background: #fff;
-  border-radius: 0 16rpx 16rpx 16rpx;
   overflow: hidden;
+  padding: 0 30rpx;
 }
 .project .content .top {
   width:100%;
@@ -49,7 +58,7 @@
 }
 .project .content .top .top-content  .progress {
   height: 36rpx;
-  width: 36%;
+  width: 60%;
   margin-left: 20rpx;
   background: rgba(0,0,0, 0.4);
   border-radius: 17rpx;
@@ -114,6 +123,7 @@
 .project .content .bottom .info .right {
   color: #aaa;
   font-size: 20rpx;
+  padding-right: 15rpx;
 }
 
 /* 自定义轮播指示点样式 */

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

@@ -9,21 +9,48 @@ Component({
     }
   },
   methods: {
-    // 跳转到我要报事
-    navigateToAddIssue () {
-      this.triggerEvent('navigateToAddIssue')
+    // 跳转到左邻右舍
+    navigateToAssociation () {
+      this.triggerEvent('navigateToAssociation')
     },
-    // 跳转到网格专员
-    navigatetoConsultion() {
-      this.triggerEvent('navigatetoConsultion')
+    // 跳转到有么说么
+    navigateToDiscussion() {
+      this.triggerEvent('navigateToDiscussion')
     },
-    // 跳转到通知公告
-    navigateToNotice () {
-      this.triggerEvent('navigateToNotice')
+    // 跳转到物业服务
+    navigateToProperty () {
+      this.triggerEvent('navigateToProperty')
     },
-    // 跳转到请您监督
-    navigatetoAppraise () {
-      this.triggerEvent('navigatetoAppraise')
+    // 跳转到互帮互助
+    navigateToHeart () {
+      this.triggerEvent('navigateToHeart')
+    },
+    // 跳转到社区教育
+    navigateToEducation () {
+      this.showNotAvailable();
+      // this.triggerEvent('navigateToEducation')
+    },
+    // 跳转到平安榆山
+    navigateToSafe () {
+      this.showNotAvailable();
+      // this.triggerEvent('navigateToSafe')
+    },
+    // 跳转到政策法规
+    navigateToPolicy () {
+      this.showNotAvailable();
+      // this.triggerEvent('navigateToPolicy')
+    },
+    // 跳转到综合服务
+    navigateToSyntheticalService () {
+      this.showNotAvailable();
+      // this.triggerEvent('navigateToSynthetical')
+    },
+    // 暂未开放
+    showNotAvailable () {
+      wx.showToast({
+        icon:'none',
+        title: '暂未开放',
+      })
     },
   }
 })

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

@@ -1,20 +1,36 @@
 <view class="sudoku">
   <view class="content">
-    <view class="item" hover-stay-time="150" hover-class="hover-sudoku" bindtap="navigateToAddIssue">
-      <image src="../../../../images/home/add-issue.png" />
-      <view class="name">我要报事</view>
+    <view class="item" hover-stay-time="150" hover-class="hover-sudoku" bindtap="navigateToAssociation">
+      <image src="../../../../images/home/association.png" />
+      <view class="name">左邻右舍</view>
     </view>
-    <view wx:if="{{sudokuState.consultAvailable == '1'}}" class="item" hover-stay-time="150" hover-class="hover-sudoku" bindtap="navigatetoConsultion">
-      <image src="../../../../images/home/consult.png" />
-      <view class="name">网格专员</view>
+    <view class="item" hover-stay-time="150" hover-class="hover-sudoku" bindtap="navigateToDiscussion">
+      <image src="../../../../images/home/discussion.png" />
+      <view class="name">有么说么</view>
     </view>
-    <view class="item" hover-stay-time="150" hover-class="hover-sudoku" bindtap="navigateToNotice">
-      <image src="../../../../images/home/notice.png" />
-      <view class="name">通知公告</view>
+    <view class="item" hover-stay-time="150" hover-class="hover-sudoku" bindtap="navigateToProperty">
+      <image src="../../../../images/home/property.png" />
+      <view class="name">物业服务</view>
     </view>
-    <view wx:if="{{sudokuState.appraiseAvailable == '1'}}" class="item" hover-stay-time="150" hover-class="hover-sudoku" bindtap="navigatetoAppraise">
-      <image src="../../../../images/home/appramise.png" />
-      <view class="name">请您监督</view>
+    <view class="item" hover-stay-time="150" hover-class="hover-sudoku" bindtap="navigateToHeart">
+      <image src="../../../../images/home/heart.png" />
+      <view class="name">互帮互助</view>
+    </view>
+     <view class="item" hover-stay-time="150" hover-class="hover-sudoku" bindtap="navigateToEducation">
+      <image src="../../../../images/home/edu-grey.png" />
+      <view class="name">社区教育</view>
+    </view>
+     <view class="item" hover-stay-time="150" hover-class="hover-sudoku" bindtap="navigateToSafe">
+      <image src="../../../../images/home/safe-grey.png" />
+      <view class="name">平安榆山</view>
+    </view>
+     <view class="item" hover-stay-time="150" hover-class="hover-sudoku" bindtap="navigateToPolicy">
+      <image src="../../../../images/home/policy-grey.png" />
+      <view class="name">政策法规</view>
+    </view>
+     <view class="item" hover-stay-time="150" hover-class="hover-sudoku" bindtap="navigateToSyntheticalService">
+      <image src="../../../../images/home/synthetical-service-grey.png" />
+      <view class="name">综合服务</view>
     </view>
   </view>
 </view>

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

@@ -1,14 +1,15 @@
 .sudoku {
   background:#fff;
   padding: 0 20rpx;
+  margin-top: 20rpx;
 }
 .content {
   width: 100%;
-  height: 215rpx;
   display: grid;
   grid-template-columns: 1fr 1fr 1fr 1fr;
   grid-template-rows: 215rpx;
   box-sizing: border-box;
+  padding-bottom: 20rpx;
 }
 .item {
   display: flex;
@@ -23,7 +24,6 @@
 .item .name {
   font-size: 28rpx;
   color: #3f3f3f;
-  font-weight: bold;
 }
 .sudoku .hover-sudoku {
   background: rgba(0,0,0,0.1);

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

@@ -218,8 +218,8 @@ Page({
       })
     })
   },
-   // 跳转到我要报事
-   navigateToAddIssue () {
+   // 跳转到互帮互助
+   navigateToHeart () {
     if (app.globalData.infoCompleted == 0) {
       this.setData({
         completeInfoDialogVisible: !this.data.completeInfoDialogVisible
@@ -227,38 +227,37 @@ Page({
       return false
     }
     wx.navigateTo({
-      url: '/subpages/discussion/pages/addIssue/addIssue'
+      url: '/pages/heart/heart'
     })
   },
-  // 跳转到网格专员
-  navigatetoConsultion() {
+  // 跳转到左邻右舍
+  navigateToAssociation() {
     if (app.globalData.infoCompleted == 0) {
       this.setData({
         completeInfoDialogVisible: !this.data.completeInfoDialogVisible
       })
       return false
     }
-    wx.navigateTo({
-      url: '/subpages/home/pages/consultation/consultation'
+    wx.switchTab({
+      url: '/pages/association/association',
     })
   },
-  // 跳转到通知公告
-  navigateToNotice () {
-    wx.navigateTo({
-      url: '/subpages/home/pages/notice/notice'
+  // 跳转到有么说么
+  navigateToDiscussion () {
+    wx.switchTab({
+      url: '/pages/discussion/discussion'
     })
   },
-  // 跳转到请您监督
-  navigatetoAppraise () {
+  // 跳转到物业服务
+  navigateToProperty () {
     if (app.globalData.infoCompleted == 0) {
       this.setData({
         completeInfoDialogVisible: !this.data.completeInfoDialogVisible
       })
       return false
     }
-    const token = wx.getStorageSync('token')
-    wx.navigateTo({
-      url: `/subpages/home/pages/webview/webview?url=${global.WEBROOT()}&token=${token}`
+    wx.switchTab({
+      url: '/pages/association/association'
     })
   },
   // 初始化加载

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

@@ -1,13 +1,13 @@
 <view class="header" style="height: {{statusHeight + navigationHeight}}px;">
   <image class="header-bg" src="../../images/home/home-status.png" />
-  <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">党群e家</view>
+  <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">微笑榆山</view>
 </view>
 
 <view class="home" style="margin-top: {{statusHeight + navigationHeight}}px">
 
   <!--所属网格-->
   <view class="belong-grid">
-    <image class="belong-grid-bg" src="../../images/home/home-grid-bg.png" />
+    <!-- <image class="belong-grid-bg" src="../../images/home/home-grid-bg.png" /> -->
     <view class="grid" bindtap="changeGrid">
       <image class="party-logo" src="../../images/home/dang_logo.png" />
       <view class="grid-name">{{departmentName}}</view>
@@ -21,15 +21,6 @@
     bannerList="{{bannerList}}">
   </banner>
 
-  <!--sudoku九宫格-->
-  <sudoku
-    sudokuState="{{sudokuState}}"
-    bind:navigateToAddIssue="navigateToAddIssue"
-    bind:navigatetoConsultion="navigatetoConsultion"
-    bind:navigateToNotice="navigateToNotice"
-    bind:navigatetoAppraise="navigatetoAppraise">
-  </sudoku>
-  
   <!--消息列表-->
   <notice
     bind:navigateToInfoList="navigateToInfoList" 
@@ -37,6 +28,19 @@
     unreadnum="{{unReadNum}}">
   </notice>
 
+  <!--sudoku九宫格-->
+  <sudoku
+    sudokuState="{{sudokuState}}"
+    bind:navigateToAssociation="navigateToAssociation"
+    bind:navigateToDiscussion="navigateToDiscussion"
+    bind:navigateToProperty="navigateToProperty"
+    bind:navigateToHeart="navigateToHeart"
+    bind:navigateToEducation="navigateToEducation"
+    bind:navigateToSafe="navigateToSafe"
+    bind:navigateToPolicy="navigateToPolicy"
+    bind:navigateToSynthetical="navigateToSyntheticalService">
+  </sudoku>
+
   <!--项目列表-->
   <project
     bind:navigatetoItemDetail="navigatetoItemDetail"

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

@@ -58,14 +58,15 @@ page {
 .belong-grid .grid .party-logo {
   width: 32rpx;
   height: 32rpx;
-  margin: 0 10rpx 0 23rpx;
+  margin-left: 20rpx;
 }
 .belong-grid .grid .grid-name {
+  margin-left: 10rpx;
   font-size: 32rpx;
-  color: #fff;
 }
 .belong-grid .grid .more-grid {
   width: 18rpx;
   height: 26rpx;
   margin-left: 10rpx;
+  margin-top: 6rpx;
 }

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

@@ -21,7 +21,7 @@ Page({
       }
     })
     let that = this
-    const versionNum = '1.2.11'
+    const versionNum = '0.9.7.23'
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data.scanFlag
@@ -42,9 +42,9 @@ Page({
     // })
   },
   experience() {
-    app.globalData.tempGridId = '1192004624745586689'
+    app.globalData.tempGridId = '1232925355908550657'
     wx.reLaunch({
-      url: '/pages/index/index?scene=1192004624745586689'
+      url: '/pages/index/index?scene=1232925355908550657'
     })
   },
   scan() {