Revert "no message"

This reverts commit 946e9efdfa.

app.json

@@ -4,8 +4,6 @@
         "pages/logs/logs",
         "pages/login/login",
         "pages/work/work",
-        "pages/work2/work2",
-        "pages/work1/work1",
         "pages/information/information",
         "pages/mine/mine",
         "pages/webView/webView",
@@ -22,8 +20,6 @@
                 "pages/addhouse/addhouse"
             ]
         },
-
-        
         {
             "root": "subpages/searchResult",
             "name": "searchResult",
@@ -137,12 +133,6 @@
                 "iconPath": "images/home/work.png",
                 "selectedIconPath": "images/home/workSelected.png"
             },
-            {
-                "pagePath": "pages/work2/work2",
-                "text": "工作",
-                "iconPath": "images/home/work.png",
-                "selectedIconPath": "images/home/workSelected.png"
-            },
             {
                 "pagePath": "pages/statistics/statistics",
                 "text": "统计",

components/custom-tab-bar/index.js

@@ -24,15 +24,6 @@ Component({
                 show: true
 
             },
-        ,
-        {
-            "pagePath": "/pages/work2/work2",
-            "text": "工作",
-            "iconPath": "/images/home/work.png",
-            "selectedIconPath": "/images/home/workSelected.png",
-            show: true
-
-        },
             {
                 "pagePath": "/pages/statistics/statistics",
                 "text": "数据",

components/custom-tab-bar/index.wxml

@@ -1,7 +1,7 @@
 <view class="tab-bar-block"></view>
 <view class="tab-bar">
 
-<view  wx:for="{{list}}" wx:if="{{item.show}}" wx:key="index" class="tab-bar-item" data-path="{{item.pagePath}}" data-index="{{index}}" bindtap="switchTab">
+<view wx:for="{{list}}" wx:if="{{item.show}}" wx:key="index" class="tab-bar-item" data-path="{{item.pagePath}}" data-index="{{index}}" bindtap="switchTab">
     <!-- <image src="{{selected === index ? item.selectedIconPath : item.iconPath}}"></image> -->
         <!-- <view style="color: {{selected === index ? selectedColor : color}}">{{item.text}}</view> -->
     <!-- <view  >

pages/work2/work2.js

@@ -1,66 +0,0 @@
-// pages/work2/work2.js
-Page({
-
-    /**
-     * 页面的初始数据
-     */
-    data: {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
-    }
-})

pages/work2/work2.json

@@ -1,9 +0,0 @@
-{
-    "navigationStyle": "custom",
-    "usingComponents": {
-        "custom-tab-bar":"../../components/custom-tab-bar"
-    },
-    "navigationBarBackgroundColor": "#1673ee",
-    "navigationBarTitleText": " ",
-    "backgroundTextStyle": "dark"
-}

pages/work2/work2.wxml

@@ -1,83 +0,0 @@
-<!--pages/work2/work2.wxml-->
-<view class="page">
-<!--box_1在这里的作用  -->
-    <view class="block_1">
-      <view class="header">
-        <image src="/images/work2/Header.png "class="label_1"></image>
-        <!--lines指定行数 -->
-        <text lines="1" class="text_1">海伦路街道</text>
-      </view>
-    </view>
-  <view class="box_2">
-    <view class="section_5">
-    
-      <view class="list_1">
-        <view class="section_1-0">
-          <view class="text-wrapper_7-0">
-            <text lines="1" class="text_2-0">居民信息</text>
-          </view>
-          <view class="image-wrapper_9-0">
-            <image src="/images/work2/add_resident.png" class="image_12-0"></image>
-            <image src="/images/work2/add_record.png" class="image_13-0"></image>
-          </view>
-          <view class="text-wrapper_8-0">
-            <text lines="1" class="text_3-0">新增居民信息</text>
-            <text lines="1" class="text_4-0">新增记录</text>
-          </view>
-        </view>
-        <view class="section_1-0">
-          <view class="text-wrapper_7-0">
-            <text lines="1" class="text_2-0">房屋信息</text>
-          </view>
-          <view class="image-wrapper_9-0">
-            <image src="/images/work2/add_houses.png" class="image_12-1"></image>
-            <image src="/images/work2/add_record.png" class="image_13-1"></image>
-          </view>
-          <view class="text-wrapper_8-0">
-            <text lines="1" class="text_3-0">新增房屋信息</text>
-            <text lines="1" class="text_4-0">新增记录</text>
-          </view>
-        </view>
-        <!-- <view class="section_1-0">
-          <view class="text-wrapper_7-0">
-            <text lines="1" class="text_2-0">房屋信息</text>
-          </view>
-          <view class="image-wrapper_9-0">
-            <image src="/images/work2/add_houses.png" class="image_12-1"></image>
-            <image src="/images/work2/add_record.png" class="image_13-1"></image>
-            <image src="/images/work2/add_record.png" class="image_13-1"></image>
-         
-          </view>
-          <view class="text-wrapper_8-0">
-            <text lines="1" class="text_3-0">新增房屋信息</text>
-            <text lines="1" class="text_4-0">新增记录</text>
-          </view>
-        </view> -->
-    
-      <view class="section_1-0">
-        <text lines="1" class="text_8">服务信息</text>
-        <view class="list_2">
-          <view class="list-items_1-0">
-            <image src="/images/work2/reporting.png" class="image_14-0"></image>
-            <text lines="1" class="text_9-0">诉求上报</text>
-          </view>
-          <view class="list-items_1-1">
-            <image src="/images/work2/rep_record.png" class="image_14-1"></image>
-            <text lines="1" class="text_9-1">诉求上报记录</text>
-          </view>
-          <view class="list-items_1-2">
-            <image src="/images/work2/satisfaction.png" class="image_14-2"></image>
-            <text lines="1" class="text_9-2">满意度调查</text>
-          </view>
-        </view>
-      </view>
-      <view class="section_1-0">
-        <text lines="1" class="text_12">数据</text>
-        <image src="/images/work2/data.png" class="image_15"></image>
-        <text lines="1" class="text_13">数据</text>
-      </view>
-    </view>
-  </view>
-</view>
-</view>
-<custom-tab-bar></custom-tab-bar>

pages/work2/work2.wxss

@@ -1,517 +0,0 @@
-/* pages/work2/work2.wxss */
-.page {
-  /*定位方式为相对定位 */
-  position: relative;
-  width: 750rpx;
-  height: 1546rpx;
-  /* 超过页面显示滑轮 */
-  overflow: hidden;
-  display: flex;
-  /* 按照行排序 */
-  flex-direction: column;
-}
-.box_1 {
-  height: 1546rpx;
-  background-size: 100% 100%;
-  display: flex;
-  flex-direction: column;
-  width: 750rpx;
-}
-.block_1 {
-  background: #1673ee;
-  width: 750rpx;
-  height: 298rpx;
-  display: flex;
-  flex-direction: column;
-}
-.box_2 {
-  background-color: rgba(247,247,247,1.000000);
-  border-radius: 20rpx;
-  /* 相对于父级进行定位 */
-  position: absolute;
-  left: 0rpx;
-  top: 181rpx;
-  width: 750rpx;
-  height: 1365rpx;
-  display: flex;
-  flex-direction: column;
-  justify-content: flex-end;
-}
-.section_5 {
-  width: 750rpx;
-  height: 1395rpx;
-  display: flex;
-  flex-direction: column;
-}
-.header {
-  width: 699rpx;
-  height: 56rpx;
-  flex-direction: row;
-  display: flex;
-  margin: 100rpx 0 0 31rpx;
-}
-.label_1 {
-  width: 34rpx;
-  height: 31rpx;
-  margin-top: 11rpx;
-}
-.text_1 {
-  width: 157rpx;
-  height: 30rpx;
-  overflow-wrap: break-word;
-  color: rgba(255,255,255,1);
-  font-size: 32rpx;
-  font-family: PingFang-SC-Medium;
-  font-weight: 500;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 42rpx;
-  margin: 13rpx 0 0 18rpx;
-}
-.image_2 {
-  width: 158rpx;
-  height: 56rpx;
-  margin-left: 332rpx;
-}
-.list_1 {
-  width: 710rpx;
-  height: 603rpx;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  margin: 43rpx 0 0 20rpx;
-}
-.section_1-0 {
-  background-color: rgba(255,255,255,1.000000);
-  border-radius: 20rpx;
-  height: 292rpx;
-  margin-bottom: 19rpx;
-  width: 710rpx;
-  display: flex;
-  flex-direction: column;
-}
-.text-wrapper_7-0 {
-  width: 134rpx;
-  height: 33rpx;
-  display: flex;
-  /* row水平排列 */
-  flex-direction: row;
-  margin: 29rpx 0 0 29rpx;
-}
-.text_2-0 {
-  width: 134rpx;
-  height: 33rpx;
-  /* 文本换行 */
-  overflow-wrap: break-word;
-  color: rgba(51,51,51,1);
-  font-size: 34rpx;
-  font-family: PingFang-SC-Bold;
-  font-weight: 700;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 42rpx;
-}
-.image-wrapper_9-0 {
-  width: 303rpx;
-  height: 100rpx;
-  flex-direction: row;
-  display: flex;
-  justify-content: space-between;
-  margin: 40rpx 0 0 59rpx;
-}
-.image_12-0 {
-  width: 100rpx;
-  height: 100rpx;
-}
-.image_13-0 {
-  width: 100rpx;
-  height: 100rpx;
-}
-.text-wrapper_8-0 {
-  width: 336rpx;
-  height: 27rpx;
-  flex-direction: row;
-  display: flex;
-  justify-content: space-between;
-  margin: 23rpx 0 40rpx 31rpx;
-}
-.text_3-0 {
-  width: 166rpx;
-  height: 27rpx;
-  overflow-wrap: break-word;
-  color: rgba(51,51,51,1);
-  font-size: 28rpx;
-  font-family: PingFang-SC-Medium;
-  font-weight: 500;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 28rpx;
-}
-.text_4-0 {
-  width: 109rpx;
-  height: 27rpx;
-  overflow-wrap: break-word;
-  color: rgba(51,51,51,1);
-  font-size: 28rpx;
-  font-family: PingFang-SC-Medium;
-  font-weight: 500;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 28rpx;
-}
-.section_1-1 {
-  background-color: rgba(255,255,255,1.000000);
-  border-radius: 20rpx;
-  height: 292rpx;
-  margin-bottom: 19rpx;
-  width: 710rpx;
-  display: flex;
-  flex-direction: column;
-}
-.text-wrapper_7-1 {
-  width: 134rpx;
-  height: 33rpx;
-  display: flex;
-  flex-direction: row;
-  margin: 29rpx 0 0 29rpx;
-}
-.text_2-1 {
-  width: 134rpx;
-  height: 33rpx;
-  overflow-wrap: break-word;
-  color: rgba(51,51,51,1);
-  font-size: 34rpx;
-  font-family: PingFang-SC-Bold;
-  font-weight: 700;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 42rpx;
-}
-.image-wrapper_9-1 {
-  width: 303rpx;
-  height: 100rpx;
-  flex-direction: row;
-  display: flex;
-  justify-content: space-between;
-  margin: 40rpx 0 0 59rpx;
-}
-.image_12-1 {
-  width: 100rpx;
-  height: 100rpx;
-}
-.image_13-1 {
-  width: 100rpx;
-  height: 100rpx;
-}
-.text-wrapper_8-1 {
-  width: 336rpx;
-  height: 27rpx;
-  flex-direction: row;
-  display: flex;
-  justify-content: space-between;
-  margin: 23rpx 0 40rpx 31rpx;
-}
-.text_3-1 {
-  width: 166rpx;
-  height: 27rpx;
-  overflow-wrap: break-word;
-  color: rgba(51,51,51,1);
-  font-size: 28rpx;
-  font-family: PingFang-SC-Medium;
-  font-weight: 500;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 28rpx;
-}
-.text_4-1 {
-  width: 109rpx;
-  height: 27rpx;
-  overflow-wrap: break-word;
-  color: rgba(51,51,51,1);
-  font-size: 28rpx;
-  font-family: PingFang-SC-Medium;
-  font-weight: 500;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 28rpx;
-}
-.group_5 {
-  background-color: rgba(255,255,255,1.000000);
-  border-radius: 20rpx;
-  width: 710rpx;
-  height: 292rpx;
-  display: flex;
-  flex-direction: column;
-  margin: 20rpx 0 0 20rpx;
-}
-.text_8 {
-  width: 134rpx;
-  height: 33rpx;
-  overflow-wrap: break-word;
-  color: rgba(51,51,51,1);
-  font-size: 34rpx;
-  font-family: PingFang-SC-Bold;
-  font-weight: 700;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 42rpx;
-  margin: 29rpx 0 0 29rpx;
-}
-.list_2 {
-  width: 524rpx;
-  height: 150rpx;
-  flex-direction: row;
-  display: flex;
-  margin: 40rpx 0 40rpx 58rpx;
-}
-.list-items_1-0 {
-  width: 110rpx;
-  height: 150rpx;
-  margin-right: 66rpx;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-}
-.image_14-0 {
-  width: 100rpx;
-  height: 100rpx;
-  margin-left: 5rpx;
-}
-.text_9-0 {
-  width: 165rpx;
-  height: 26rpx;
-  overflow-wrap: break-word;
-  color: rgba(51,51,51,1);
-  font-size: 28rpx;
-  font-family: PingFang-SC-Medium;
-  font-weight: 500;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 28rpx;
-  margin-top: 24rpx;
-}
-.list-items_1-1 {
-  width: 110rpx;
-  height: 150rpx;
-  margin-right: 66rpx;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-}
-.image_14-1 {
-  width: 100rpx;
-  height: 100rpx;
-  margin-left: 5rpx;
-}
-.text_9-1 {
-  width: 165rpx;
-  height: 26rpx;
-  overflow-wrap: break-word;
-  color: rgba(51,51,51,1);
-  font-size: 28rpx;
-  font-family: PingFang-SC-Medium;
-  font-weight: 500;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 28rpx;
-  margin-top: 24rpx;
-}
-.list-items_1-2 {
-  width: 110rpx;
-  height: 150rpx;
-  margin-right: 66rpx;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-}
-.image_14-2 {
-  width: 100rpx;
-  height: 100rpx;
-  margin-left: 5rpx;
-}
-.text_9-2 {
-  width: 165rpx;
-  height: 26rpx;
-  overflow-wrap: break-word;
-  color: rgba(51,51,51,1);
-  font-size: 28rpx;
-  font-family: PingFang-SC-Medium;
-  font-weight: 500;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 28rpx;
-  margin-top: 24rpx;
-}
-.group_6 {
-  background-color: rgba(255,255,255,1.000000);
-  border-radius: 20rpx;
-  width: 710rpx;
-  height: 292rpx;
-  display: flex;
-  flex-direction: column;
-  margin: 20rpx 0 22rpx 20rpx;
-}
-.text_12 {
-  width: 66rpx;
-  height: 32rpx;
-  overflow-wrap: break-word;
-  color: rgba(51,51,51,1);
-  font-size: 34rpx;
-  font-family: PingFang-SC-Bold;
-  font-weight: 700;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 42rpx;
-  margin: 30rpx 0 0 29rpx;
-}
-.image_15 {
-  width: 100rpx;
-  height: 100rpx;
-  margin: 40rpx 0 0 64rpx;
-}
-.text_13 {
-  width: 54rpx;
-  height: 26rpx;
-  overflow-wrap: break-word;
-  color: rgba(51,51,51,1);
-  font-size: 28rpx;
-  font-family: PingFang-SC-Medium;
-  font-weight: 500;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 28rpx;
-  margin: 24rpx 0 40rpx 87rpx;
-}
-.group_7 {
-  box-shadow: 0px 7px 35px 0px rgba(226,232,234,0.440000);
-  background-color: rgba(255,255,255,1.000000);
-  width: 750rpx;
-  height: 96rpx;
-  margin-top: -1rpx;
-  flex-direction: row;
-  display: flex;
-
-}
-.image-text_5 {
-  width: 45rpx;
-  height: 74rpx;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  margin: 14rpx 0 0 60rpx;
-}
-.label_4 {
-  width: 45rpx;
-  height: 45rpx;
-}
-.text-group_1 {
-  width: 39rpx;
-  height: 19rpx;
-  overflow-wrap: break-word;
-  color: rgba(51,51,51,1);
-  font-size: 20rpx;
-  font-family: PingFang-SC-Medium;
-  font-weight: 500;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 42rpx;
-  margin: 10rpx 0 0 4rpx;
-}
-.image-text_6 {
-  width: 42rpx;
-  height: 71rpx;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  margin: 17rpx 0 0 141rpx;
-}
-.label_5 {
-  width: 42rpx;
-  height: 42rpx;
-}
-.text-group_2 {
-  width: 40rpx;
-  height: 19rpx;
-  overflow-wrap: break-word;
-  color: rgba(51,51,51,1);
-  font-size: 20rpx;
-  font-family: PingFang-SC-Medium;
-  font-weight: 500;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 42rpx;
-  margin: 10rpx 0 0 1rpx;
-}
-.image-text_7 {
-  width: 42rpx;
-  height: 72rpx;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  margin: 16rpx 0 0 144rpx;
-}
-.group_8 {
-  height: 42rpx;
-  background: url(https://lanhu.oss-cn-beijing.aliyuncs.com/psb107itikvx7wanfoldvxanukh8hgavt1d771ff1-de09-48b8-b053-853d6d42d3b4) 100% no-repeat;
-  background-size: 100% 100%;
-  display: flex;
-  flex-direction: column;
-  width: 42rpx;
-}
-.box_4 {
-  background-image: linear-gradient(180deg, rgba(116,170,248,1.000000) 0, rgba(116,170,248,1.000000) 0, rgba(130,181,253,1.000000) 100.000000%, rgba(130,181,253,1.000000) 100.000000%);
-  border-radius: 4rpx;
-  height: 22rpx;
-  display: flex;
-  flex-direction: column;
-  width: 22rpx;
-  margin: -1rpx 0 0 21rpx;
-}
-.section_4 {
-  background-color: rgba(205,225,255,1.000000);
-  border-radius: 4rpx;
-  width: 14rpx;
-  height: 14rpx;
-  border: 2px solid rgba(225,236,253,1);
-  display: flex;
-  flex-direction: column;
-  margin: 4rpx 0 0 4rpx;
-}
-.text-group_3 {
-  width: 39rpx;
-  height: 19rpx;
-  overflow-wrap: break-word;
-  color: rgba(58,128,231,1);
-  font-size: 20rpx;
-  font-family: PingFang-SC-Bold;
-  font-weight: 700;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 42rpx;
-  margin: 11rpx 0 0 2rpx;
-}
-.image-text_8 {
-  width: 54rpx;
-  height: 79rpx;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  margin: 9rpx 54rpx 0 168rpx;
-}
-.image_11 {
-  width: 54rpx;
-  height: 54rpx;
-}
-.text-group_4 {
-  width: 39rpx;
-  height: 19rpx;
-  overflow-wrap: break-word;
-  color: rgba(51,51,51,1);
-  font-size: 20rpx;
-  font-family: PingFang-SC-Medium;
-  font-weight: 500;
-  text-align: left;
-  white-space: nowrap;
-  line-height: 42rpx;
-  margin: 6rpx 0 0 10rpx;
-}

project.config.json

@@ -55,6 +55,5 @@
     "editorSetting": {
         "tabIndent": "insertSpaces",
         "tabSize": 4
-    },
+    }
-    "simulatorPluginLibVersion": {}
 }

project.private.config.json

@@ -8,38 +8,6 @@
     "condition": {
         "miniprogram": {
             "list": [
-                {
-                    "name": "pages/work2",
-                    "pathName": "pages/work2/work2",
-                    "query": "",
-                    "launchMode": "default",
-                    "scene": null,
-                    "partialCompile": {
-                        "enabled": true,
-                        "pages": []
-                    }
-                },
-                {
-                    "name": "工作",
-                    "pathName": "pages/work/work",
-                    "query": "",
-                    "launchMode": "default",
-                    "scene": null
-                },
-                {
-                    "name": "pages/index/index",
-                    "pathName": "pages/index/index",
-                    "query": "",
-                    "launchMode": "default",
-                    "scene": null
-                },
-                {
-                    "name": "pages/test1/test1",
-                    "pathName": "pages/test1/test1",
-                    "query": "",
-                    "launchMode": "default",
-                    "scene": null
-                },
                 {
                     "name": "subpages/statistics/pages/residentPortrait2/residentPortrait",
                     "pathName": "subpages/statistics/pages/residentPortrait2/residentPortrait",
@@ -250,6 +218,13 @@
                     "launchMode": "default",
                     "scene": 1017
                 },
+                {
+                    "name": "工作",
+                    "pathName": "pages/work/work",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
                 {
                     "name": "新增居民",
                     "pathName": "subpages/addResi/pages/addResi/addResi",

utils/config.js

@@ -5,8 +5,8 @@ module.exports = {
   };
   
   function BASEURL() {
-    // return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境
+    return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境
-    return 'http://192.168.1.144/api/' //测试环境
+    // return 'http://192.168.1.144/api/' //测试环境
   }