对接楼栋之前

App.vue

@@ -8,6 +8,36 @@
 			};
 		},
 		onLaunch: function(e) {
+			// uni.setEnableDebug({
+			//     enableDebug: true
+			// })
+			
+			//更新版本
+			const updateManager = uni.getUpdateManager();
+			
+			updateManager.onCheckForUpdate(function (res) {
+			  // 请求完新版本信息的回调
+			  console.log("是否有新版本：",res.hasUpdate);
+			});
+			
+			updateManager.onUpdateReady(function (res) {
+			  uni.showModal({
+			    title: '更新提示',
+			    content: '新版本已经准备好，是否重启应用？',
+			    success(res) {
+			      if (res.confirm) {
+			        // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+			        updateManager.applyUpdate();
+			      }
+			    }
+			  });
+			
+			});
+			
+			updateManager.onUpdateFailed(function (res) {
+			  // 新的版本下载失败
+			});
+			
 			this.param = e;
 			this.execParam();
 			this.globalData.checkIsIPhoneX();
@@ -49,9 +79,9 @@
 			token: "j2qctr89u1xfmbjkp69hegfmqhwquycw",
 			//对接后台的api地址
 			//远程的
-			apiurl: "http://139.9.103.171:9082/app/",
-			//德系本地的
-			// apiurl: "http://192.168.2.57:9082/app/",
+			// apiurl: "http://192.168.2.200:9082/app/",
+			apiurl: "https://community.58fo.com/api/app/",
+			
 			member: null,
 			//用户信息--后台
 			userInfo: null,

comps/dt_login.vue

@@ -5,7 +5,7 @@
 		  <view class="dt-login-wrap">
 		    <view class="title">您还没登录</view>
 		    <view class="subtitle">请先登录再进行操作</view>
-		    <image class="login-icon" src="/static/login1.png" ></image>
+		    <image class="login-icon" src="/static/common/login.png" ></image>
 			
 		    <view class="btn-wrap">
 		      <button class="btn-base" 
@@ -141,7 +141,6 @@ export default {
         let userType = this.$global.userType.member
         this.$auth.login(userType, resp.sessionId, resp.userId, resp)
         this.hide()
-        this.$util.refreshPage(['/pagesM/pages/category','/pagesM/pages/shop_car'])
 		// this.$auth.setInviteCode(null);
 		this.$auth.removeInviteCode();
 		let a = this.$auth.getInviteCode();
@@ -190,7 +189,6 @@ export default {
 			resp.sessionKey = this.respLogin.sessionKey
 			this.$auth.login(userType, resp.sessionId, resp.userId, resp)
 			this.hide()
-			this.$util.refreshPage(['pages/index','pages/category','pages/shop_car'])
 			this.$auth.removeInviteCode();
 			let a = this.$auth.getInviteCode();
 			if(this.inviteCode){

comps/dt_service.vue

@@ -26,8 +26,7 @@ export default {
     width:80upx;
     height:80upx;
     border-radius:50%;
-	background-color: #2f7ff5;
-    // background-color:$dt-color-primary;
+    background-color:$base;
   }
 }
 </style>

comps/grid/grid.vue

@@ -57,6 +57,23 @@ export default {
 				this.$emit('tapGrid', obj)
 				return
 			}else if(item.type === 'switchTab'){
+				if (url=='/pages/community/community?current=1') {
+					//跳转到老人关爱页面
+					//因为switchTab无法附带参数，只能用globalData附带参数
+					getApp().globalData.subsectionCurrent=1
+				}
+				if (url=='/pages/community/community?current=2') {
+					//跳转到车辆关爱页面
+					//因为switchTab无法附带参数，只能用globalData附带参数
+					getApp().globalData.subsectionCurrent=2
+				}
+				if (url='/pages/index/index?openDoor') {
+					//一键开门，跳转到首页并打开开门设备列表
+					getApp().globalData.openDoor=true
+				}
+				
+				
+				
 				uni.switchTab({
 					url
 				})

comps/mescroll-uni/mescroll-uni-option.js

@@ -21,7 +21,7 @@ const GlobalOption = {
 		},
 		empty: {
 			use: true, // 是否显示空布局
-			icon: "/static/empty1.png", // 图标路径 (建议放入static目录, 如 /static/img/mescroll-empty.png )
+			icon: "/static/common/empty1.png", // 图标路径 (建议放入static目录, 如 /static/img/mescroll-empty.png )
 			tip: '数据为空' // 提示
 		}
 	}

pages.json

@@ -172,7 +172,7 @@
 		{
 			"path": "pages/choosePlot/householdCert/householdCert",
 			"style": {
-				"navigationBarTitleText": "用户认证"
+				"navigationBarTitleText": ""
 			}
 		},
 		{
@@ -199,7 +199,7 @@
 		{
 			"path": "pages/uploadFace/uploadFace",
 			"style": {
-				"navigationBarTitleText": "人脸录入"
+				"navigationBarTitleText": ""
 			}
 		}
         ,{
@@ -288,7 +288,7 @@
             "path" : "pages/myFamily/add/add",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                "navigationBarTitleText": "添加家人",
                 "enablePullDownRefresh": false
             }
             
@@ -428,16 +428,6 @@
                 "enablePullDownRefresh": false
             }
             
-        }
-        ,{
-            "path" : "pages/wode/wode2",
-            "style" :                                                                                    
-            {
-				"navigationStyle":"custom",
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
         }
         ,{
             "path" : "pages/services/property/detail",
@@ -529,6 +519,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/develop/develop",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "即将开放",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	 "subPackages": [{
 	 	"root": "pagesM/",
@@ -907,32 +906,32 @@
 			{
 			  "pagePath": "pages/index/index",
 			  "text": "小区",
-			  "selectedIconPath":"static/tarbar/blue/home.png",
-			  "iconPath":"static/tarbar/blue/home0.png"
+			  "selectedIconPath":"static/tarbar/home.png",
+			  "iconPath":"static/tarbar/home0.png"
 			},
 			{
 			  "pagePath": "pages/community/community",
 			  "text": "社区",
-			  "selectedIconPath":"static/tarbar/blue/shequ.png",
-			  "iconPath":"static/tarbar/blue/shequ0.png"
+			  "selectedIconPath":"static/tarbar/shequ.png",
+			  "iconPath":"static/tarbar/shequ0.png"
 			},
 			{
 			  "pagePath": "pages/device/device",
 			  "text": "我家",
-			  "selectedIconPath":"static/tarbar/blue/zhijia.png",
-			  "iconPath":"static/tarbar/blue/zhijia0.png"
+			  "selectedIconPath":"static/tarbar/zhijia.png",
+			  "iconPath":"static/tarbar/zhijia0.png"
 			},
 			{
 			  "pagePath": "pages/life/life",
 			  "text": "周边",
-			  "selectedIconPath":"static/tarbar/blue/shop.png",
-			  "iconPath":"static/tarbar/blue/shop0.png"  
+			  "selectedIconPath":"static/tarbar/shop.png",
+			  "iconPath":"static/tarbar/shop0.png"  
 			},
 			{
 			  "pagePath": "pages/wode/wode",
 			  "text": "我的",
-			  "selectedIconPath":"static/tarbar/blue/my.png",
-			  "iconPath":"static/tarbar/blue/my0.png"
+			  "selectedIconPath":"static/tarbar/my.png",
+			  "iconPath":"static/tarbar/my0.png"
 			}
 		  ]
 	  },

pages/auth/auth.vue

@@ -14,7 +14,7 @@
 			<view @click="jump(0)" class="cu-item arrow" >
 				<view class="content">
 					<image style="width: 50rpx; height: 50rpx;margin: 0 20rpx 4rpx 0;" 
-					src="/static/icon/city2.png" class="png" mode="aspectFit"></image>
+					src="/static/common/city2.png" class="png" mode="aspectFit"></image>
 					<text class="text-black text-bold">城市</text>
 				</view>
 				<view class="action">
@@ -26,7 +26,7 @@
 			<view @click="jump(1)" class="cu-item arrow" >
 				<view class="content">
 					<image style="width: 50rpx; height: 50rpx;margin: 0 20rpx 0rpx 0;" 
-					src="/static/icon/xiaoqu.png" class="png" mode="aspectFit"></image>
+					src="/static/common/xiaoqu.png" class="png" mode="aspectFit"></image>
 					<text class="text-black text-bold">小区</text>
 				</view>
 				<view class="action">
@@ -38,7 +38,7 @@
 			<view @click="jump(2)" class="cu-item arrow" >
 				<view class="content">
 					<image style="width: 50rpx; height: 50rpx;margin: 0 20rpx 10rpx 0;" 
-					src="/static/icon/loudong.png" class="png" mode="aspectFit"></image>
+					src="/static/common/loudong.png" class="png" mode="aspectFit"></image>
 					<text class="text-black text-bold">楼栋</text>
 				</view>
 				<view class="action">
@@ -50,7 +50,7 @@
 			<view @click="jump(3)" class="cu-item arrow" >
 				<view class="content">
 					<image style="width: 50rpx; height: 50rpx;margin: 0 20rpx 10rpx 0;" 
-					src="/static/icon/fangjian.png" class="png" mode="aspectFit"></image>
+					src="/static/common/fangjian.png" class="png" mode="aspectFit"></image>
 					<text class="text-black text-bold">门牌号</text>
 				</view>
 				<view class="action">
@@ -126,6 +126,7 @@
 					uni.navigateTo({
 						url:"../choosePlot/choosePlot?city="+app.globalData.city+"&county="+app.globalData.county+"&currentCityCode="+app.globalData.currentCityCode
 					})
+					return
 				}
 				//未选择城市
 				if(this.$isEmpty(this.city_county_name)){

pages/authorize_record/authorize_record.vue

@@ -62,7 +62,7 @@
 </view>
 
 <view class="default"  v-if="$isEmpty(list)">
-  <image src="/static/empty.png" mode="heightFix"></image>
+  <image src="/static/common/empty.png" mode="heightFix"></image>
   <view>
     <text>没有获取到相关记录</text>
   </view>

pages/bluetooth/bluetooth.vue

@@ -15,7 +15,7 @@
   </scroll-view>
 </view>
 <view class="default" v-if="scanList==null || scanList.length==0">
-  <image src="/static/empty.png" mode="heightFix"></image>
+  <image src="/static/common/empty.png" mode="heightFix"></image>
   <view>
     <text>没有扫描到设备</text>
   </view>

pages/choosePlot/choosePlot.vue

@@ -148,26 +148,26 @@ export default {
         success: function (res) {
           let latitude = res.latitude;
           let longitude = res.longitude;
-          uni.request({
-            url: `https://apis.map.qq.com/ws/geocoder/v1/?location=${latitude},${longitude}&key=${config.key}`,
-            success: res => {
-              uni.hideLoading(); // console.log(res)
-
-              console.log(res.data.result.ad_info.city + res.data.result.ad_info.adcode);
-              that.setData({
-                city: res.data.result.ad_info.city,
-                currentCityCode: res.data.result.ad_info.adcode,
-                //区code  如，越秀区--440104
-                county: res.data.result.ad_info.district
-              }); //兼容地图插件
-
-              app.globalData.city = res.data.result.ad_info.city;
-              app.globalData.currentCityCode = res.data.result.ad_info.adcode;
-              app.globalData.county = res.data.result.ad_info.district; //拉取小区信息
-
-              that.getCommunity();
-            }
-          });
+		  
+		  let params={
+			  location:latitude+","+longitude,
+			  key:config.key,
+		  }
+		  let operation = 'miniprogram/ws/geocoder/v1/location';
+		  getApp().globalData.postRequest(params, operation, function (res) {
+			    uni.hideLoading(); // console.log(res)
+				let info=res.data.result.result.ad_info
+				that.setData({
+				  city: info.city,
+				  currentCityCode: info.adcode,
+				  //区code  如，越秀区--440104
+				  county: info.district
+				}); //兼容地图插件
+				app.globalData.city = info.city;
+				app.globalData.currentCityCode = info.adcode;
+				app.globalData.county = info.district; //拉取小区信息
+				that.getCommunity();
+		  });
         }
       });
     },

pages/choosePlot/chooseRoom/chooseRoom.vue

@@ -1,51 +1,51 @@
-<template>
-<view :class="$isEmpty(room_list)?'empty-wrap':''">
-<view class="bg-gray" style="padding: 16rpx 30rpx;">
-	<text >当前选择楼栋：</text>
-</view>
-<view class="bg-white" style="padding:30rpx 30rpx 20rpx 30rpx;border-bottom: 1rpx solid #efefef;display: flex;justify-content: space-between;">
-	<view class="text-blue">
-		<text class="">{{unit_name}}</text>
-	</view>
-	<view class="cu-btn line-blue sm round" @tap="change">
-		<text class="cuIcon-refresh padding-right-10"></text>
-		<text>切换楼栋</text>
-	</view>
-</view>
-	<view class="bg-gray" style="padding: 12rpx 30rpx;">
-		<text >选择房间：</text>
-	</view>
-<view class="nav_section" v-if="room_list.length>0">
-  <navigator open-type="redirect" v-for="(item, index) in room_list" :key="index" :url="'../../auth/auth?room_id=' + item.id + '&room_name=' + item.name + '&residential_name=' + residential_name + '&unit_name=' + unit_name">
-    <view class="nav_section_items">
-      <view class="section_cont">
-        <view class="section_cont_tel">
-          <text class="info">{{item.name}}</text>
-        </view>
-      </view>
-    </view>
-  </navigator>
-</view>
-<view class="default" v-if="$isEmpty(room_list)">
-  <image src="/static/empty.png" mode="heightFix"></image>
-  <view>
-    <text>没有获取到房间信息</text>
-  </view>
-</view>
-</view>
-</template>
-
-<script>
-var app = getApp();
-
+<template>
+<view :class="$isEmpty(room_list)?'empty-wrap':''">
+<view class="bg-gray" style="padding: 16rpx 30rpx;">
+	<text >当前选择楼栋：</text>
+</view>
+<view class="bg-white" style="padding:30rpx 30rpx 20rpx 30rpx;border-bottom: 1rpx solid #efefef;display: flex;justify-content: space-between;">
+	<view class="text-blue">
+		<text class="">{{unit_name}}</text>
+	</view>
+	<view class="cu-btn line-blue sm round" @tap="change">
+		<text class="cuIcon-refresh padding-right-10"></text>
+		<text>切换楼栋</text>
+	</view>
+</view>
+	<view class="bg-gray" style="padding: 12rpx 30rpx;">
+		<text >选择房间：</text>
+	</view>
+<view class="nav_section" v-if="room_list.length>0">
+  <navigator open-type="redirect" v-for="(item, index) in room_list" :key="index" :url="'../../auth/auth?room_id=' + item.id + '&room_name=' + item.name + '&residential_name=' + residential_name + '&unit_name=' + unit_name">
+    <view class="nav_section_items">
+      <view class="section_cont">
+        <view class="section_cont_tel">
+          <text class="info">{{item.name}}</text>
+        </view>
+      </view>
+    </view>
+  </navigator>
+</view>
+<view class="default" v-if="$isEmpty(room_list)">
+  <image src="/static/common/empty.png" mode="heightFix"></image>
+  <view>
+    <text>没有获取到房间信息</text>
+  </view>
+</view>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
 export default {
   data() {
-    return {
-	  city_county_name:"",
+    return {
+	  city_county_name:"",
 	  //房间号
-      room_list: null,
+      room_list: null,
 	  //小区名字
-      residential_name: null,
+      residential_name: null,
 	  //楼栋名字
       unit_name: null 
 
@@ -53,10 +53,10 @@ export default {
   },
   components: {},
   props: {},
-  /**
-   * 生命周期函数--监听页面加载
+  /**
+   * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {
+  onLoad: function (options) {
 	  this.city_county_name=uni.getStorageSync("cityCountyName")
     //小区名字
     var residential_name = options.residential_name; //楼栋名字
@@ -68,11 +68,11 @@ export default {
     var unit_id = options.unit_id;
     this.getRoom(unit_id);
   },
-  methods: {
-	  change(){
-		uni.navigateBack({
-			delta:1
-		})  
+  methods: {
+	  change(){
+		uni.navigateBack({
+			delta:1
+		})  
 	  },
     //根据楼栋信息查询房间
     getRoom: function (unit_id) {
@@ -92,54 +92,54 @@ export default {
       });
     }
   }
-};
-</script>
-<style>
-/* pages/choosePlot/chooseUnit/chooseUnit.wxss */
-page{
-  overflow-y: scroll
-}
-.nav_section {
-  width: 100%;
-  background:#fff;
-}
-
-.nav_section_items {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  padding: 30rpx;
-  border-bottom: 2rpx solid #ddd;
-  position: relative;
-}
-
-.nav_section_items:active {
-  background: #ddd;
-}
-
-
-
-.nav_section_items .section_cont view {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  display: block;
-}
-.nav_section_items .section_cont .section_cont_sub {
-  font-size: 30rpx;
-  line-height: 50rpx;
-  color: #000;
-  margin-bottom: 10rpx;
-}
-.section_cont_tel .info{
-  width: 500rpx;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  display: inline-block;
-}
-.default {
  text-align: center;
  position: fixed;
  left: 50%;
  top: 40%;
  transform: translate(-50%, -50%);
}
-.default text{
-	color: #AAAAAA;
-}
.default image {
  height: 250rpx;
  display: inline-block;
}
.empty-wrap{
	background-color: #FFFFFF;
	min-height: 100vh;
}
+};
+</script>
+<style>
+/* pages/choosePlot/chooseUnit/chooseUnit.wxss */
+page{
+  overflow-y: scroll
+}
+.nav_section {
+  width: 100%;
+  background:#fff;
+}
+
+.nav_section_items {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  padding: 30rpx;
+  border-bottom: 2rpx solid #ddd;
+  position: relative;
+}
+
+.nav_section_items:active {
+  background: #ddd;
+}
+
+
+
+.nav_section_items .section_cont view {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  display: block;
+}
+.nav_section_items .section_cont .section_cont_sub {
+  font-size: 30rpx;
+  line-height: 50rpx;
+  color: #000;
+  margin-bottom: 10rpx;
+}
+.section_cont_tel .info{
+  width: 500rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  display: inline-block;
+}
+.default {  text-align: center;  position: fixed;  left: 50%;  top: 40%;  transform: translate(-50%, -50%);}
+.default text{
+	color: #AAAAAA;
+}.default image {  height: 250rpx;  display: inline-block;}.empty-wrap{	background-color: #FFFFFF;	min-height: 100vh;}
 </style>

pages/choosePlot/chooseUnit/chooseUnit.vue

@@ -1,46 +1,46 @@
-<template>
-<view :class="$isEmpty(unit_list)?'empty-wrap':''">
-	<view class="bg-gray" style="padding: 16rpx 30rpx;">
-		<text >当前选择小区：</text>
-	</view>
-	<view class="bg-white" style="padding:30rpx 30rpx 20rpx 30rpx;border-bottom: 1rpx solid #efefef;display: flex;justify-content: space-between;">
-		<view class="text-blue">
-			<text class="">{{residential_name}}</text>
-		</view>
-		<view class="cu-btn line-blue sm round" @tap="change">
-			<text class="cuIcon-refresh padding-right-10"></text>
-			<text>切换小区</text>
-		</view>
-	</view>
-	<view class="bg-gray" style="padding: 12rpx 30rpx;">
-		<text >选择楼栋：</text>
-	</view>
-<view class="nav_section" v-if="unit_list.length>0">
-  <view @click="jump(item)" v-for="(item, index) in unit_list" :key="index" >
-    <view class="nav_section_items">
-      <view class="section_cont">
-        <view class="section_cont_tel">
-          <text class="info">{{item.name}}</text>
-        </view>
-      </view>
-    </view>
-  </view>
-</view>
-<view class="default" v-if="$isEmpty(unit_list)">
-  <image src="/static/empty.png" mode="heightFix"></image>
-  <view>
-    <text >没有获取到楼栋信息</text>
-  </view>
-</view>
-</view>
-</template>
-
-<script>
-var app = getApp();
-
+<template>
+<view :class="$isEmpty(unit_list)?'empty-wrap':''">
+	<view class="bg-gray" style="padding: 16rpx 30rpx;">
+		<text >当前选择小区：</text>
+	</view>
+	<view class="bg-white" style="padding:30rpx 30rpx 20rpx 30rpx;border-bottom: 1rpx solid #efefef;display: flex;justify-content: space-between;">
+		<view class="text-blue">
+			<text class="">{{residential_name}}</text>
+		</view>
+		<view class="cu-btn line-blue sm round" @tap="change">
+			<text class="cuIcon-refresh padding-right-10"></text>
+			<text>切换小区</text>
+		</view>
+	</view>
+	<view class="bg-gray" style="padding: 12rpx 30rpx;">
+		<text >选择楼栋：</text>
+	</view>
+<view class="nav_section" v-if="unit_list.length>0">
+  <view @click="jump(item)" v-for="(item, index) in unit_list" :key="index" >
+    <view class="nav_section_items">
+      <view class="section_cont">
+        <view class="section_cont_tel">
+          <text class="info">{{item.name}}</text>
+        </view>
+      </view>
+    </view>
+  </view>
+</view>
+<view class="default" v-if="$isEmpty(unit_list)">
+  <image src="/static/common/empty.png" mode="heightFix"></image>
+  <view>
+    <text >没有获取到楼栋信息</text>
+  </view>
+</view>
+</view>
+</template>
+
+<script>
+var app = getApp();
+
 export default {
   data() {
-    return {
+    return {
       unit_list: null,
       //小区集合
       residential_name: null //小区名字
@@ -51,10 +51,10 @@ export default {
   components: {},
   props: {},
 
-  /**
-   * 生命周期函数--监听页面加载
+  /**
+   * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {
+  onLoad: function (options) {
 	  console.log(app.defaultCity,)
     //小区名字
     var residential_name = options.residential_name;
@@ -65,17 +65,17 @@ export default {
     var residential_id = options.residential_id;
     this.getUnit(residential_id);
   },
-  methods: {
-	  change(){
-		uni.navigateBack({
-			delta:1
-		})  
-	  },
-	  jump(item){
-		  app.globalData.unitId=item.id
-		  uni.navigateTo({
-		  	 url:"/pages/choosePlot/chooseRoom/chooseRoom?unit_id=" + item.id + "&unit_name=" + item.name + "&residential_name=" + this.residential_name
-		  })
+  methods: {
+	  change(){
+		uni.navigateBack({
+			delta:1
+		})  
+	  },
+	  jump(item){
+		  app.globalData.unitId=item.id
+		  uni.navigateTo({
+		  	 url:"/pages/choosePlot/chooseRoom/chooseRoom?unit_id=" + item.id + "&unit_name=" + item.name + "&residential_name=" + this.residential_name
+		  })
 	  },
     //根据小区id获取楼栋信息
     getUnit: function (residential_id) {
@@ -95,56 +95,56 @@ export default {
       });
     }
   }
-};
-</script>
-<style>
-/* pages/choosePlot/chooseUnit/chooseUnit.wxss */
-page{
-  overflow-y: scroll
-}
-.nav_section {
-  width: 100%;
-  background:#fff;
-
-}
-
-.nav_section_items {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  padding: 30rpx;
-  border-bottom: 2rpx solid #ddd;
-  position: relative;
-}
-
-.nav_section_items:active {
-  background: #ddd;
-}
-
-
-
-.nav_section_items .section_cont view {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  display: block;
-}
-.nav_section_items .section_cont .section_cont_sub {
-  font-size: 30rpx;
-  line-height: 50rpx;
-  color: #000;
-  margin-bottom: 10rpx;
-}
-.section_cont_tel .info{
-  width: 500rpx;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  display: inline-block;
-}
-.default {
  text-align: center;
  position: fixed;
  left: 50%;
  top: 40%;
  transform: translate(-50%, -50%);
}
-.default text{
-	color: #AAAAAA;
-}
-
.default image {
  height: 250rpx;
  display: inline-block;
}
.empty-wrap{
	background-color: #FFFFFF;
	min-height: 100vh;
}
+};
+</script>
+<style>
+/* pages/choosePlot/chooseUnit/chooseUnit.wxss */
+page{
+  overflow-y: scroll
+}
+.nav_section {
+  width: 100%;
+  background:#fff;
+
+}
+
+.nav_section_items {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  padding: 30rpx;
+  border-bottom: 2rpx solid #ddd;
+  position: relative;
+}
+
+.nav_section_items:active {
+  background: #ddd;
+}
+
+
+
+.nav_section_items .section_cont view {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  display: block;
+}
+.nav_section_items .section_cont .section_cont_sub {
+  font-size: 30rpx;
+  line-height: 50rpx;
+  color: #000;
+  margin-bottom: 10rpx;
+}
+.section_cont_tel .info{
+  width: 500rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  display: inline-block;
+}
+.default {  text-align: center;  position: fixed;  left: 50%;  top: 40%;  transform: translate(-50%, -50%);}
+.default text{
+	color: #AAAAAA;
+}
+.default image {  height: 250rpx;  display: inline-block;}.empty-wrap{	background-color: #FFFFFF;	min-height: 100vh;}
 </style>

pages/choosePlot/householdCert/householdCert.vue

@@ -1,134 +1,138 @@
 <template>
 	<view class="bg-white">
-		<view class="flex justify-between " style="padding: 30rpx;box-sizing: border-box;">
-			<view class="" style="font-size: 38rpx;">
-				<text class="text-bold text-black">您的申请信息</text>
-			</view>
-			<view class="text-red"  style="padding-top: 12rpx;">
-				<text style="font-size: 38rpx;">{{totalStep}}</text>
-				<text class="text-df">/{{totalStep}}</text>
-			</view>
-		</view>
-		<view class="">
-			<view style="padding: 50rpx 0 20rpx 48rpx;">
-				<text class="cuIcon-location padding-right-sm"></text>
-				<text class="local_city_info">{{residential_name}} {{unit_name}} {{room_name}}</text>
-			</view>
-		</view>
-		<view class="form">
-				<u-form :border="true" ref="uForm" >
-					<u-form-item :required="true"  label="住户姓名:" prop="name" label-width="150">
-						<u-input :border="true"  placeholder="住户姓名,必填" v-model="name" type="text"></u-input>
-					</u-form-item>
-					<u-form-item :required="true"  label="住户类型:" prop="type" label-width="150">
-						<u-input :border="true"  type="select" :select-open="typeShow" v-model="typeLabel" placeholder="请选择住户类型" @click="typeShow = true"></u-input>
-					</u-form-item>
-					<u-form-item :required="true"  label="国籍:" prop="nationality" label-width="150">
-						<u-input :border="true" type="select" :select-open="nationalityShow" v-model="nationalityLabel"  @click="nationalityShow = true"></u-input>
-					</u-form-item>
-					<u-form-item   label="证件类型:" prop="nationalityName" label-width="150">
-						<u-input :disabled="true" :border="true" type="text" v-model="nationalityName"></u-input>
-					</u-form-item>
-					<u-form-item :required="type==0?true:false"  label="证件号码" prop="id_card" label-width="150">
-						<u-input :border="true" placeholder="住户类型是业主时,必填" :trim="true"  maxlength="18" v-model="id_card" type="number"></u-input>
-					</u-form-item>
-					<u-form-item :required="true" label="性别" prop="sex" label-width="150">
-						<u-radio-group v-model="sex" >
-							<u-radio shape="circle"  name="1">男</u-radio>
-							<u-radio shape="circle"  name="2">女</u-radio>
-						</u-radio-group>
-					</u-form-item>
-				</u-form>
-		</view>
-		<view v-if="nationality==3" style="background-color: #FFFFFF;">
-		  <view class="form_group mb0" style="padding-left: 60rpx;">
-		    <view>
-		      <text class="sex">护照图片：</text>
-		      <text class="tips">（基本身份信息页）</text>
-		    </view>
-		  </view>
-		  <view @click="show=true;operaType=1" style="margin: 30rpx 0 10rpx 0;display: flex;align-items: center;flex-direction: column;">
-		    <upload-img
-		  	  :width="$isEmpty(show_passport_img_uri)?bgWidth:imgWidth"
-		  	  :height="$isEmpty(show_passport_img_uri)?bgHeight:imgHeight"
-		  	  :currentImage="show_passport_img_uri"
-		  	  :bgsrc="bgsrc"
-		  	  >
-		    </upload-img>
-		    <view class="" style="color: #59a5f0;">
-		  	 <text class="cuIcon-camera padding-right-sm" style="font-size: 30rpx;"></text>
-		  	 <text v-if="$isEmpty(show_passport_img_uri)">点击上传护照</text>
-		  	 <text style="margin-top: 40rpx;display: inline-block;" v-else>点击重新上传</text>
-		    </view>
-		  </view>
-		</view>
-		
-		<view v-if="nationality==3" style="background-color: #FFFFFF;">
-		  <view class="form_group mb0" style="padding-left: 60rpx;">
-		    <view>
-		      <text class="sex">入境证明：</text>
-		      <text class="tips">（入镜盖章页）</text>
-		    </view>
-		  </view>
-		  <view  @click="show=true;operaType=2" style="margin: 30rpx 0 10rpx 0;display: flex;align-items: center;flex-direction: column;">
-		    <upload-img
-		  	  :width="$isEmpty(show_entry_img_uri)?bgWidth:imgWidth"
-		  	  :height="$isEmpty(show_entry_img_uri)?bgHeight:imgHeight"
-		  	  :currentImage="show_entry_img_uri"
-		  	  :bgsrc="bgsrc"
-		  	  >
-		    </upload-img>
-		    <view class="" style="color: #59a5f0;">
-		  	 <text class="cuIcon-camera padding-right-sm" style="font-size: 30rpx;"></text>
-		  	 <text v-if="$isEmpty(show_entry_img_uri)">点击上传入境证明</text>
-		  	 <text style="margin-top: 40rpx;display: inline-block;" v-else>点击重新上传</text>
-		    </view>
-		  </view>
-		</view>
-		
-		<view style="background-color: #FFFFFF;">
-					<view class="form_group mb0" style="padding-left: 60rpx;">
-						 <view>
-							<text class="sex">人脸：</text>
-							<text class="tips">（人脸用于开门，请上传正脸图片）</text>
-						  </view>
+		<view class="" v-if="appletType==1">
+			<view class="flex justify-between " style="padding: 30rpx;box-sizing: border-box;">
+					<view class="" style="font-size: 38rpx;">
+						<text class="text-bold text-black">您的申请信息</text>
+					</view>
+					<view class="text-red"  style="padding-top: 12rpx;">
+						<text style="font-size: 38rpx;">{{totalStep}}</text>
+						<text class="text-df">/{{totalStep}}</text>
 					</view>
-					<view @click="show=true;operaType=3" style="margin: 30rpx 0 10rpx 0;display: flex;align-items: center;flex-direction: column;">
-					  <upload-img
-						  :width="$isEmpty(show_image_uri)?bgWidth:imgWidth"
-						  :height="$isEmpty(show_image_uri)?bgHeight:imgHeight"
-						  :currentImage="show_image_uri"
-						  :bgsrc="bgsrc"
-						  >
-					  </upload-img>
-					  <view class="" style="color: #59a5f0;">
-						 <text class="cuIcon-camera padding-right-sm" style="font-size: 30rpx;"></text>
-						 <text v-if="$isEmpty(show_image_uri)">点击上传人面</text>
-						 <text style="margin-top: 40rpx;display: inline-block;" v-else>点击重新上传</text>
-					  </view>
+				</view>
+				<view class="">
+					<view style="padding: 50rpx 0 20rpx 48rpx;">
+						<text class="cuIcon-location padding-right-sm"></text>
+						<text class="local_city_info">{{residential_name}} {{unit_name}} {{room_name}}</text>
 					</view>
-					<view class="category" style="padding-bottom: 140rpx;">
-						<view v-for="(item, index) in iconArray" :key="index" class="category_item">
-						  <view class="category_item_wrap" @tap="top" :data-index="item.index">
-							<view class="icon_wrap">
-							  <image :src="item.iconUrl" class="index_icon"></image>
+				</view>
+				<view class="form">
+						<u-form :border="true" ref="uForm" >
+							<u-form-item :required="true"  label="住户姓名:" prop="name" label-width="150">
+								<u-input :border="true"  placeholder="住户姓名,必填" v-model="name" type="text"></u-input>
+							</u-form-item>
+							<u-form-item :required="true"  label="住户类型:" prop="type" label-width="150">
+								<u-input :border="true"  type="select" :select-open="typeShow" v-model="typeLabel" placeholder="请选择住户类型" @click="typeShow = true"></u-input>
+							</u-form-item>
+							<u-form-item :required="true"  label="国籍:" prop="nationality" label-width="150">
+								<u-input :border="true" type="select" :select-open="nationalityShow" v-model="nationalityLabel"  @click="nationalityShow = true"></u-input>
+							</u-form-item>
+							<u-form-item   label="证件类型:" prop="nationalityName" label-width="150">
+								<u-input :disabled="true" :border="true" type="text" v-model="nationalityName"></u-input>
+							</u-form-item>
+							<u-form-item :required="type==0?true:false"  label="证件号码" prop="id_card" label-width="150">
+								<u-input :border="true" placeholder="住户类型是业主时,必填" :trim="true"  maxlength="18" v-model="id_card" type="number"></u-input>
+							</u-form-item>
+							<u-form-item :required="true" label="性别" prop="sex" label-width="150">
+								<u-radio-group v-model="sex" >
+									<u-radio shape="circle"  name="1">男</u-radio>
+									<u-radio shape="circle"  name="2">女</u-radio>
+								</u-radio-group>
+							</u-form-item>
+						</u-form>
+				</view>
+				<view v-if="nationality==3" style="background-color: #FFFFFF;">
+				  <view class="form_group mb0" style="padding-left: 60rpx;">
+				    <view>
+				      <text class="sex">护照图片：</text>
+				      <text class="tips">（基本身份信息页）</text>
+				    </view>
+				  </view>
+				  <view @click="show=true;operaType=1" style="margin: 30rpx 0 10rpx 0;display: flex;align-items: center;flex-direction: column;">
+				    <upload-img
+				  	  :width="$isEmpty(show_passport_img_uri)?bgWidth:imgWidth"
+				  	  :height="$isEmpty(show_passport_img_uri)?bgHeight:imgHeight"
+				  	  :currentImage="show_passport_img_uri"
+				  	  :bgsrc="bgsrc"
+				  	  >
+				    </upload-img>
+				    <view class="" style="color: #59a5f0;">
+				  	 <text class="cuIcon-camera padding-right-sm" style="font-size: 30rpx;"></text>
+				  	 <text v-if="$isEmpty(show_passport_img_uri)">点击上传护照</text>
+				  	 <text style="margin-top: 40rpx;display: inline-block;" v-else>点击重新上传</text>
+				    </view>
+				  </view>
+				</view>
+				
+				<view v-if="nationality==3" style="background-color: #FFFFFF;">
+				  <view class="form_group mb0" style="padding-left: 60rpx;">
+				    <view>
+				      <text class="sex">入境证明：</text>
+				      <text class="tips">（入镜盖章页）</text>
+				    </view>
+				  </view>
+				  <view  @click="show=true;operaType=2" style="margin: 30rpx 0 10rpx 0;display: flex;align-items: center;flex-direction: column;">
+				    <upload-img
+				  	  :width="$isEmpty(show_entry_img_uri)?bgWidth:imgWidth"
+				  	  :height="$isEmpty(show_entry_img_uri)?bgHeight:imgHeight"
+				  	  :currentImage="show_entry_img_uri"
+				  	  :bgsrc="bgsrc"
+				  	  >
+				    </upload-img>
+				    <view class="" style="color: #59a5f0;">
+				  	 <text class="cuIcon-camera padding-right-sm" style="font-size: 30rpx;"></text>
+				  	 <text v-if="$isEmpty(show_entry_img_uri)">点击上传入境证明</text>
+				  	 <text style="margin-top: 40rpx;display: inline-block;" v-else>点击重新上传</text>
+				    </view>
+				  </view>
+				</view>
+				
+				<view style="background-color: #FFFFFF;">
+							<view class="form_group mb0" style="padding-left: 60rpx;">
+								 <view>
+									<text class="sex">人脸：</text>
+									<text class="tips">（人脸用于开门，请上传正脸图片）</text>
+								  </view>
 							</view>
-							<view class="category_item_text">
-							  <text>{{item.iconText}}</text>
+							<view @click="show=true;operaType=3" style="margin: 30rpx 0 10rpx 0;display: flex;align-items: center;flex-direction: column;">
+							  <upload-img
+								  :width="$isEmpty(show_image_uri)?bgWidth:imgWidth"
+								  :height="$isEmpty(show_image_uri)?bgHeight:imgHeight"
+								  :currentImage="show_image_uri"
+								  :bgsrc="bgsrc"
+								  >
+							  </upload-img>
+							  <view class="" style="color: #59a5f0;">
+								 <text class="cuIcon-camera padding-right-sm" style="font-size: 30rpx;"></text>
+								 <text v-if="$isEmpty(show_image_uri)">点击上传人面</text>
+								 <text style="margin-top: 40rpx;display: inline-block;" v-else>点击重新上传</text>
+							  </view>
+							</view>
+							<view class="category" style="padding-bottom: 140rpx;">
+								<view v-for="(item, index) in iconArray" :key="index" class="category_item">
+								  <view class="category_item_wrap" @tap="top" :data-index="item.index">
+									<view class="icon_wrap">
+									  <image :src="item.iconUrl" class="index_icon"></image>
+									</view>
+									<view class="category_item_text">
+									  <text>{{item.iconText}}</text>
+									</view>
+								  </view>
 							</view>
-						  </view>
 					</view>
-			</view>
+				</view>
+			  <u-action-sheet @click="photoChecked"  z-index="999999" :list="list" v-model="show"></u-action-sheet>
+			  <u-select z-index="999999" mode="single-column" :list="typeArry" v-model="typeShow" @confirm="typeConfirm"></u-select>
+			  <u-select z-index="999999" mode="single-column" :list="nationalityArry" v-model="nationalityShow" @confirm="nationalityConfirm"></u-select>
+			  <view  @click="showDialogBtn"  class=" footer-fixed" >
+			  	<view class="cu-btn  flex  text-lg bg-red-btn" style="padding: 46rpx 0;">
+			  		提交认证
+			  	</view>
+			  </view>
+		</view>
+		<view v-else >
+			
 		</view>
-	  <u-action-sheet @click="photoChecked"  z-index="999999" :list="list" v-model="show"></u-action-sheet>
-	  <u-select z-index="999999" mode="single-column" :list="typeArry" v-model="typeShow" @confirm="typeConfirm"></u-select>
-	  <u-select z-index="999999" mode="single-column" :list="nationalityArry" v-model="nationalityShow" @confirm="nationalityConfirm"></u-select>
-	  <view  @click="showDialogBtn"  class=" footer-fixed" >
-	  	<view class="cu-btn  flex  text-lg bg-red-btn" style="padding: 46rpx 0;">
-	  		提交认证
-	  	</view>
-	  </view>
-	</view>
  </view>
 </template>
 
@@ -142,6 +146,9 @@ export default {
 	},
 	data() {
 		return {
+			//小程序审核状态
+			appletType:0,
+			
 			//默认点击弹出拍照模态框的是人面上传操作，1：护照，2：入境，3：人面
 			operaType:3,
 			//人面上传模态框，上传照片或拍照
@@ -264,6 +271,7 @@ export default {
 		};
 	},
 	onLoad: function (options) {
+		  this.appletType=uni.getStorageSync('appletType')
 		  //显示用户选择的小区+楼栋+房间名字
 		  this.residential_name = options.residential_name;
 		  this.unit_name = options.unit_name;
@@ -272,6 +280,16 @@ export default {
 		  this.name=app.globalData.member.name
 	},
 	onShow() {
+		if (this.appletType==0) {
+			uni.setNavigationBarTitle({
+				title:"功能待开发"
+			})
+		}else{
+			uni.setNavigationBarTitle({
+				title:"用户认证"
+			})
+		}
+		
 		//总步骤数
 		//注册的流程总步骤数是3，其他流程总步骤数是2
 		if(this.$isEmpty(app.globalData.totalStep)){

pages/community/community.vue

@@ -12,7 +12,7 @@
 		<view style="height: 100%;">
 			<swiper style="height: 100%;" :current="subsectionCurrent"  @change="swiperChange"
 				@animationfinish="animationfinish">
-				<swiper-item >
+				<!-- <swiper-item >
 					<scroll-view scroll-y style="height: 100%;">
 						<view class="bg-white " >
 							<view style="margin: 0 0rpx 40rpx;">
@@ -67,7 +67,7 @@
 							<u-divider bgColor="#f1f1f1;"  height="80">到底了</u-divider>
 						</view>
 					</scroll-view>
-				</swiper-item>
+				</swiper-item> -->
 				<swiper-item >
 					<scroll-view scroll-y style="height: 100%;background-color: #F1F1F1;">
 						<view style="margin: 0 20rpx;">
@@ -158,9 +158,9 @@
 				tabCurrent:0,
 				subsectionCurrent: 0,
 				subsectionList: [
-					{
-						name: '通讯服务'
-					}, 
+					// {
+					// 	name: '通讯服务'
+					// }, 
 					{
 						name: '老人关爱'
 					},
@@ -207,40 +207,31 @@
 						target:'https://yx.nx.189.cn/t/public/index.php/flowcs/index'
 					},
 					
-					
-					
 				],
 				commonList:[
-					// {
-					// 	icon:'../../static/test/icon3.png',
-					// 	title:"话费账单",
-					// 	badge:0,
-					// 	type:'url',
-					// 	target:'https://yx.nx.189.cn/u/public/index.php/index/index/historyold'
-					// },
-					{
-						icon:'../../static/test/paihao.png',
+					{
+						icon:'../../static/telecom/paihao.png',
 						title:"营业厅排号",
 						badge:0,
 						type:'url',
 						target:'https://pdweb.360sides.com/?qudao=ningxia'
 					},
 					{
-						icon:'../../static/test/xiaohu.png',
+						icon:'../../static/telecom/xiaohu.png',
 						title:"销户服务",
 						badge:0,
 						type:'url',
 						target:'https://yx.nx.189.cn/t/public/index.php/hd2020zzyw/kuandai'
 					},
 					{
-						icon:'../../static/test/tuiding-zengzhi.png',
+						icon:'../../static/telecom/tuiding-zengzhi.png',
 						title:"增值服务退订",
 						badge:0,
 						type:'url',
 						target:'http://im.189.cn/cw/index.html?cf=1&cid=6400'
 					},
 					{
-						icon:'../../static/test/tuiding1.png',
+						icon:'../../static/telecom/tuiding1.png',
 						title:"应用功能退订",
 						badge:0,
 						type:'url',
@@ -249,49 +240,49 @@
 				],
 				mobileList:[
 					{
-						icon:'../../static/test/chongzhi.png',
+						icon:'../../static/telecom/chongzhi.png',
 						title:"话费充值",
 						badge:0,
 						type:'applet',
 						target:'wxd4daf5a66b681275'
 					},
 					{
-						icon:'../../static/test/liuliang.png',
+						icon:'../../static/telecom/liuliang.png',
 						title:"流量充值",
 						badge:0,
 						type:'url',
 						target:'https://yx.nx.189.cn/t/public/index.php/flowcs/index'
 					},
 					{
-						icon:'../../static/test/icon21.png',
+						icon:'../../static/telecom/icon21.png',
 						title:"号卡精选",
 						badge:0,
 						type:'url',
 						target:'https://yx.nx.189.cn/t/public/index.php/hkcs/index'
 					},
 					{
-						icon:'../../static/test/xiehao.png',
+						icon:'../../static/telecom/xiehao.png',
 						title:"携号转网",
 						badge:0,
 						type:'url',
 						target:'https://yx.nx.189.cn/m_lx2020xhzw/login_xhzw.do'
 					},
 					{
-						icon:'../../static/test/icon25.png',
+						icon:'../../static/telecom/icon25.png',
 						title:"手机挂失",
 						badge:0,
 						type:'url',
 						target:'https://yx.nx.189.cn/t/public/index.php/hd2020zzyw/guashi.html'
 					},
 					{
-						icon:'../../static/test/icon26.png',
+						icon:'../../static/telecom/icon26.png',
 						title:"手机补换卡",
 						badge:0,
 						type:'url',
 						target:'https://yx.nx.189.cn/t/public/index.php/hd2020zzyw/buhuanka'
 					},
 					{
-						icon:'../../static/test/icon24.png',
+						icon:'../../static/telecom/icon24.png',
 						title:"彩铃功能",
 						badge:0,
 						type:'url',
@@ -301,35 +292,35 @@
 				
 				broadbandList:[
 					{
-						icon:'../../static/test/icon31.png',
+						icon:'../../static/telecom/icon31.png',
 						title:"宽带订单查询",
 						badge:0,
 						type:'url',
 						target:'https://yx.nx.189.cn/x/kd_yj/order.php'
 					},
 					{
-						icon:'../../static/test/icon32.png',
+						icon:'../../static/telecom/icon32.png',
 						title:"宽带自助排障",
 						badge:0,
 						type:'url',
 						target:'https://x.189.cn/tykf-services/sso?channel=NX_WEIXIN_Soo&reqMode=5&reqParam=hK8dQ%2F1J63ieVlPpE55UzGkn6hYdnMN25CW93bWD%2FTnwiQ2lOVtZ3E3higHv+%2BXd4tUIpuOnSY%2BVYTLziitWtYd2sArB68J422bltp46KFKLbr%2Fpx6l2JOKRI+a6OaIxCk'
 					},
 					{
-						icon:'../../static/test/icon33.png',
+						icon:'../../static/telecom/icon33.png',
 						title:"宽带升级",
 						badge:0,
 						type:'url',
 						target:'http://hd.nxeb.cc/pages/market/html/modify.html?client=0'
 					},
 					{
-						icon:'../../static/test/icon34.png',
+						icon:'../../static/telecom/icon34.png',
 						title:"宽带移机",
 						badge:0,
 						type:'url',
 						target:'https://yx.nx.189.cn/x/kd_yj/'
 					},
 					{
-						icon:'../../static/test/icon35.png',
+						icon:'../../static/telecom/icon35.png',
 						title:"宽带超市",
 						badge:0,
 						type:'url',
@@ -338,9 +329,14 @@
 				]
 			}
 		},
-		onLoad() {
+		onLoad(options) {
 			this.fetchStaticData()
 		},
+		onShow() {
+			if (!this.$isEmpty(getApp().globalData.subsectionCurrent)) {
+				this.subsectionCurrent=getApp().globalData.subsectionCurrent
+			}
+		},
 		methods: {
 			subsectionChange(index) {
 				this.subsectionCurrent = index
@@ -391,52 +387,7 @@
 			fetchStaticData(){
 				this.oldManList=[
 					
-					{
-						name:'李爱琴',
-						sex:'女',
-						age:'64',
-						temperature:'36.5',
-						idCard:'640302195608152578',
-						device:'阅海万家D区西北门',
-						plotName:'阅海万家D区',
-						image:'http://139.9.103.171:1888/miniofile/app/del/old01.jpg',
-						time:'2020-12-06 09:52:28'
-					},
 					
-					{
-						name:'李爱琴',
-						sex:'女',
-						age:'64',
-						temperature:'36.2',
-						idCard:'640302195608152578',
-						device:'阅海万家D区北门',
-						plotName:'阅海万家D区',
-						image:'http://139.9.103.171:1888/miniofile/app/del/1607607799(1).jpg',
-						time:'2020-12-02 14:23:34'
-					},
-					{
-						name:'李爱琴',
-						sex:'女',
-						age:'64',
-						temperature:'36.2',
-						idCard:'640302195608152578',
-						device:'阅海万家D区西北门',
-						plotName:'阅海万家D区',
-						image:'http://139.9.103.171:1888/miniofile/app/del/1607607892(1).jpg',
-						time:'2020-12-01 08:31:22'
-					},
-					
-					{
-						name:'李爱琴',
-						sex:'女',
-						age:'64',
-						temperature:'36.6',
-						idCard:'640302195608152578',
-						device:'阅海万家D区北门',
-						plotName:'阅海万家D区',
-						image:'http://139.9.103.171:1888/miniofile/app/del/1607607824(1).jpg',
-						time:'2020-12-02 16:31:22'
-					},
 					{
 						name:'李爱琴',
 						sex:'女',
@@ -447,19 +398,20 @@
 						plotName:'阅海万家D区',
 						image:'http://139.9.103.171:1888/miniofile/app/del/1607607748(1).jpg',
 						time:'2020-12-05 09:31:22'
-					},
-					
+					}
+					,
 					{
 						name:'阮启方',
 						sex:'男',
 						age:'66',
-						temperature:'36.1',
+						temperature:'36.3',
 						idCard:'640302195804232481',
-						device:'阅海万家D区北门',
+						device:'阅海万家D区西北门',
 						plotName:'阅海万家D区',
-						image:'http://139.9.103.171:1888/miniofile/app/del/1607607925(1).jpg',
-						time:'2020-12-01 15:36:24'
-					},
+						image:'http://139.9.103.171:1888/miniofile/app/del/1607608168(1).jpg',
+						time:'2020-11-20 15:31:22'
+					}
+					,
 					{
 						name:'李爱琴',
 						sex:'女',
@@ -470,17 +422,6 @@
 						plotName:'阅海万家D区',
 						image:'http://139.9.103.171:1888/miniofile/app/del/1607607676(1).jpg',
 						time:'2020-12-10 15:31:22'
-					},
-					{
-						name:'阮启方',
-						sex:'男',
-						age:'66',
-						temperature:'36.3',
-						idCard:'640302195804232481',
-						device:'阅海万家D区西北门',
-						plotName:'阅海万家D区',
-						image:'http://139.9.103.171:1888/miniofile/app/del/1607608168(1).jpg',
-						time:'2020-11-20 15:31:22'
 					}
 					,
 					{

pages/community/detail/elderlyDetail.vue

@@ -25,7 +25,7 @@
 							<text>{{dataDetail.temperature}} ℃</text>
 						</view>
 					</view>
-					<view class="padding-top-20">
+					<view class="padding-top-20" v-if="appletType==1">
 						<image @click="previewImg(dataDetail.image)"  style="width: 250rpx;height: 280rpx;border-radius: 12rpx;" mode="scaleToFill" :src="dataDetail.image"></image>
 					</view>
 				</view>
@@ -59,10 +59,13 @@
 	export default {
 		data() {
 			return {
+				//小程序审核状态
+				appletType:0,
 				dataDetail:{}
 			}
 		},
 		onShow() {
+			this.appletType= uni.getStorageSync('appletType')
 			this.dataDetail=app.globalData.elderlyDetail
 		},
 		methods: {

pages/demo/demo2.vue

@@ -1,28 +1,51 @@
 <template>
-	<view style="min-height: 100vh;">
-		<view class="" >
-			<view class="flex  justify-center" style="position: relative;bottom: -80rpx;">
-				<view  class="cu-btn cuIcon  bg-gradual-blue" style="width: 160rpx;height: 160rpx;">
-					<view class="flex " style="flex-direction: column;">
-						<view class="cuIcon-unlock text-white" style="font-size: 60rpx;"></view>
-						<view class="text-sm margin-top-20">
-							点我开门
+	<view class="">
+		<view class="bg-white " >
+				<view style="margin: 0 0rpx 40rpx;">
+					<image style="width: 100%;" mode="widthFix" src="http://139.9.103.171:8888/group1/M00/00/01/iwlnq1-_4mqAf_t4AAKPnq9axkQ981.png" ></image>
+				</view>
+				<view class="bg-white" style="padding-top: 20rpx;position: relative;top:-20rpx;">
+					<view class="common-service" >
+						<text>通用服务</text>
+					</view>
+					<view class="cu-list grid col-4 no-border " style="border-radius: 50rpx;">
+						<view class="cu-item" @click="goDetail(item)" v-for="(item,index) in commonList" :key="index">
+							<view class="grid-icon ">
+								<image  :src="item.icon" mode="widthFix"/>
+							</view>
+							<text class="text-sm ">{{item.title}}</text>
 						</view>
 					</view>
 				</view>
+				
+				<view class="common-service">
+					<text>手机服务</text>
+				</view>
+				<view class="cu-list grid col-4 no-border " style="border-radius: 50rpx;">
+					<view class="cu-item" @click="goDetail(item)" v-for="(item,index) in mobileList" :key="index">
+						<view class="grid-icon ">
+							<image  :src="item.icon" mode="widthFix"/>
+						</view>
+						<text class="text-sm ">{{item.title}}</text>
+					</view>
+				</view>
 			</view>
-			<view style="padding: 40rpx 10rpx 0rpx;" class="cu-list grid col-5 no-border" >
-				<view  class="cu-item"  v-for="(item,index) in gridList" :key="index">
-					<block >
-						<view class="grid-icon" >
-							<image style="width: 45rpx;height: 45rpx;"  :src="item.icon"/>
+			<view class="bg-white" style="padding-top: 20rpx;position: relative;top:-10rpx;">
+				<view class="common-service">
+					<text>宽带服务</text>
+				</view>
+				<view class="cu-list grid col-4 no-border " style="border-radius: 50rpx;">
+					<view class="cu-item" @click="goDetail(item)" v-for="(item,index) in broadbandList" :key="index">
+						<view class="grid-icon ">
+							<image   :src="item.icon" mode="widthFix"/>
 						</view>
-						<view class="cu-tag bg-orange badge" v-if="item.badge>0">{{item.badge}}</view>
-						<text  style="color: #333333;font-size: 26rpx;">{{item.title}}</text>
-					</block>
+						<text class="text-sm ">{{item.title}}</text>
+					</view>
 				</view>
 			</view>
-		</view>
+			<view style="height: 80rpx;">
+				<u-divider bgColor="#f1f1f1;"  height="80">到底了</u-divider>
+			</view>
 		
 	</view>
 </template>
@@ -32,20 +55,165 @@ export default {
 	name: '',
 	data() {
 		return {
-			gridList:[
+			// 卡片列表
+			cardList:[
+				{
+					title:'热门活动',
+					subTiltle:'优惠多多',
+					type:'url',
+					target:'https://yx.nx.189.cn/u/public/index.php/index/index/rmhd.html'
+				},
+				{
+					title:'充值交费',
+					subTiltle:'用于充值交费',
+					type:'url',
+					target:'https://mp.weixin.qq.com/s/oGB5l9lZCQHHJJuXT0umRw'
+				},
+				{
+					title:'宽带预约',
+					subTiltle:'用于宽带预约',
+					type:'url',
+					target:'https://wap.nx.189.cn/pages/market/html/market.html'
+				},
+				{
+					title:'充30减2',
+					subTiltle:'手机充值满减活动',
+					type:'url',
+					target:'https://yx.nx.189.cn/t/public/index.php/dyq/index'
+				},
+				{
+					title:'抽话费',
+					subTiltle:'用于抽话费',
+					type:'url',
+					target:'https://pms.189.cn/cljy-web/static/chfchf/chfchf_zc_index.html?shopid=2000118600000002&cmpid=dp-002&number=undefined'
+				},
 				{
-					icon:'../../static/grid1/kaisuo.png',
-					title:"A区",
+					title:'流量超市',
+					subTiltle:'用于充值流量',
+					type:'url',
+					target:'https://yx.nx.189.cn/t/public/index.php/flowcs/index'
+				},
+				
+			],
+			commonList:[
+				{
+					icon:'../../static/telecom/paihao.png',
+					title:"营业厅排号",
 					badge:0,
-					index:1
+					type:'url',
+					target:'https://pdweb.360sides.com/?qudao=ningxia'
 				},
 				{
-					icon:'../../static/grid1/kaisuo.png',
-					title:"D区",
+					icon:'../../static/telecom/xiaohu.png',
+					title:"销户服务",
 					badge:0,
-					index:1
+					type:'url',
+					target:'https://yx.nx.189.cn/t/public/index.php/hd2020zzyw/kuandai'
 				},
+				{
+					icon:'../../static/telecom/tuiding-zengzhi.png',
+					title:"增值服务退订",
+					badge:0,
+					type:'url',
+					target:'http://im.189.cn/cw/index.html?cf=1&cid=6400'
+				},
+				{
+					icon:'../../static/telecom/tuiding1.png',
+					title:"应用功能退订",
+					badge:0,
+					type:'url',
+					target:'https://yx.nx.189.cn/t/public/index.php/hd2020zzyw/yy'
+				}
 			],
+			mobileList:[
+				{
+					icon:'../../static/telecom/chongzhi.png',
+					title:"话费充值",
+					badge:0,
+					type:'applet',
+					target:'wxd4daf5a66b681275'
+				},
+				{
+					icon:'../../static/telecom/liuliang.png',
+					title:"流量充值",
+					badge:0,
+					type:'url',
+					target:'https://yx.nx.189.cn/t/public/index.php/flowcs/index'
+				},
+				{
+					icon:'../../static/telecom/icon21.png',
+					title:"号卡精选",
+					badge:0,
+					type:'url',
+					target:'https://yx.nx.189.cn/t/public/index.php/hkcs/index'
+				},
+				{
+					icon:'../../static/telecom/xiehao.png',
+					title:"携号转网",
+					badge:0,
+					type:'url',
+					target:'https://yx.nx.189.cn/m_lx2020xhzw/login_xhzw.do'
+				},
+				{
+					icon:'../../static/telecom/icon25.png',
+					title:"手机挂失",
+					badge:0,
+					type:'url',
+					target:'https://yx.nx.189.cn/t/public/index.php/hd2020zzyw/guashi.html'
+				},
+				{
+					icon:'../../static/telecom/icon26.png',
+					title:"手机补换卡",
+					badge:0,
+					type:'url',
+					target:'https://yx.nx.189.cn/t/public/index.php/hd2020zzyw/buhuanka'
+				},
+				{
+					icon:'../../static/telecom/icon24.png',
+					title:"彩铃功能",
+					badge:0,
+					type:'url',
+					target:'https://yx.nx.189.cn/t/public/index.php/hd2020zzyw/cailing'
+				},
+			],
+			
+			broadbandList:[
+				{
+					icon:'../../static/telecom/icon31.png',
+					title:"宽带订单查询",
+					badge:0,
+					type:'url',
+					target:'https://yx.nx.189.cn/x/kd_yj/order.php'
+				},
+				{
+					icon:'../../static/telecom/icon32.png',
+					title:"宽带自助排障",
+					badge:0,
+					type:'url',
+					target:'https://x.189.cn/tykf-services/sso?channel=NX_WEIXIN_Soo&reqMode=5&reqParam=hK8dQ%2F1J63ieVlPpE55UzGkn6hYdnMN25CW93bWD%2FTnwiQ2lOVtZ3E3higHv+%2BXd4tUIpuOnSY%2BVYTLziitWtYd2sArB68J422bltp46KFKLbr%2Fpx6l2JOKRI+a6OaIxCk'
+				},
+				{
+					icon:'../../static/telecom/icon33.png',
+					title:"宽带升级",
+					badge:0,
+					type:'url',
+					target:'http://hd.nxeb.cc/pages/market/html/modify.html?client=0'
+				},
+				{
+					icon:'../../static/telecom/icon34.png',
+					title:"宽带移机",
+					badge:0,
+					type:'url',
+					target:'https://yx.nx.189.cn/x/kd_yj/'
+				},
+				{
+					icon:'../../static/telecom/icon35.png',
+					title:"宽带超市",
+					badge:0,
+					type:'url',
+					target:'http://hd.nxeb.cc/pages/market/html/market.html?rand=1535419737668&client=0'
+				}
+			]
 		};
 	},
 	onLoad() {
@@ -58,8 +226,42 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-	.bg-gradual-blue {
-		background-image: linear-gradient(45deg, rgba(31, 117, 203, 0.8), rgba(34, 126, 217, 0.5));
-		color: #ffffff;
+	.bg-white {
+	  background-color: #FFFFFF;
 	}
+	.grid-icon image {
+	  width: 56rpx;
+	  height: 56rpx;
+	}
+	.text-sm {
+	  font-size: 24rpx;
+	}
+	.common-service {
+	  font-weight: 800;
+	  font-size: 32rpx;
+	  margin-left: 40rpx;
+	  margin-bottom: 10rpx;
+	}
+	.cu-list.grid.no-border {
+	  padding: 10px 5px;
+	}
+	.cu-list.grid {
+	  background-color: #ffffff;
+	  text-align: center;
+	}
+	.cu-list.grid.no-border {
+	  padding: 10px 5px;
+	}
+	.grid {
+	  /* display: -webkit-box; */
+	  /* display: -webkit-flex; */
+	  display: -webkit-box;
+	  display: -webkit-flex;
+	  display: flex;
+	  /* -webkit-flex-wrap: wrap; */
+	  -webkit-flex-wrap: wrap;
+	          flex-wrap: wrap;
+	}
+
+	
 </style>

pages/develop/develop.vue

@@ -0,0 +1,24 @@
+<template>
+	<view>
+		<u-empty icon-size="300"  marginTop="300"   text="暂未开发" src="http://139.9.103.171:1888/miniofile/xlyq/empty/empty.png"></u-empty>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+page{
+	background-color: #FFFFFF;
+}
+</style>

pages/device/device.vue

@@ -25,7 +25,7 @@
 							</view>
 							<view class="text-left flex justify-around content">
 								<view class="" @click="add">
-									<image src="/static/yangan.jpg"  ></image>
+									<image src="/static/myhome/del/yangan.jpg"  ></image>
 									<text>智能烟感</text>
 								</view>
 								<view class="" @click="add">
@@ -114,7 +114,7 @@
 						price:'289.9'
 					},
 					{
-						image:'/static/yangan.jpg',
+						image:'/static/myhome/del/yangan.jpg',
 						name:'烟雾报警器家用',
 						price:'254'
 					},
@@ -146,9 +146,8 @@
 		},
 		methods: {
 			add(){
-				uni.showToast({
-					title:"待开发",
-					icon:"none"
+				uni.navigateTo({
+					url:"../develop/develop"
 				})
 			},
 			addDevice(){

pages/empty/empty.vue

@@ -1,13 +1,13 @@
 <template>
 	<view style="background-color: #fff;min-height: 100vh;">
-		<view class="default" >
-		  <image src="/static/empty.png" mode="heightFix"></image>
-		  <view style="font-size: 26rpx;">
-		    <text style="color: #909090;">{{msg}}</text>
-		  </view>
-		  <navigator :url="url" class="cu-btn round bg-btn margin-top-50" style="padding: 35rpx 65rpx;margin-left: 8rpx;">
-				{{btnName}}
-		  </navigator>
+		<view class="default" >
+		  <image src="/static/common/empty.png" mode="heightFix"></image>
+		  <view style="font-size: 26rpx;">
+		    <text style="color: #909090;">{{msg}}</text>
+		  </view>
+		  <navigator :url="url" class="cu-btn round bg-btn margin-top-50" style="padding: 35rpx 65rpx;margin-left: 8rpx;">
+				{{btnName}}
+		  </navigator>
 		</view>
 	</view>
 </template>
@@ -16,22 +16,22 @@
 	export default {
 		data() {
 			return {
-				msg:"您还未完成注册认证",
-				btnName:"去注册认证",
+				msg:"您还未完成注册认证",
+				btnName:"去注册认证",
 				url:"../register/register"
 			}
-		},
-		onLoad(options) {
-			if(options.type=='2'){
-				//导航栏标题
-				uni.setNavigationBarTitle({
-					title:"房屋认证"
-				})
-				//去认证
-				this.msg="您还未完成房屋认证"
-				this.btnName="去认证"
-				this.url="../auth/auth"
-			}
+		},
+		onLoad(options) {
+			if(options.type=='2'){
+				//导航栏标题
+				uni.setNavigationBarTitle({
+					title:"房屋认证"
+				})
+				//去认证
+				this.msg="您还未完成房屋认证"
+				this.btnName="去认证"
+				this.url="../auth/auth"
+			}
 		},
 		methods: {
 			
@@ -40,5 +40,18 @@
 </script>
 
 <style lang="scss">
-.default {
  text-align: center;
  position: fixed;
  left: 50%;
  top: 40%;
  transform: translate(-50%, -50%);
}
.default text{
	color: #AAAAAA;
}
.default image {
  height: 280rpx;
  display: inline-block;
}
+.default {
+  text-align: center;
+  position: fixed;
+  left: 50%;
+  top: 40%;
+  transform: translate(-50%, -50%);
+}
+.default text{
+	color: #AAAAAA;
+}
+.default image {
+  height: 280rpx;
+  display: inline-block;
+}
 </style>

pages/empty/goauth.vue

@@ -1,10 +1,10 @@
 <template>
 	<view style="background-color: #fff;min-height: 100vh;">
-		<view class="default" >
-		   <image src="/static/empty.png" mode="heightFix"></image>
-		  <view style="margin-top: 20rpx;">
-		    <text>您的信息正在审核中...</text>
-		  </view>
+		<view class="default" >
+		   <image src="/static/common/empty.png" mode="heightFix"></image>
+		  <view style="margin-top: 20rpx;">
+		    <text>您的信息正在审核中...</text>
+		  </view>
 		</view>
 	</view>
 </template>
@@ -15,9 +15,9 @@
 			return {
 				
 			}
-		},
-		onLoad() {
-			
+		},
+		onLoad() {
+			
 		},
 		methods: {
 			
@@ -26,5 +26,23 @@
 </script>
 
 <style lang="scss">
-.default {
  text-align: center;
  position: fixed;
  left: 50%;
  top: 40%;
  transform: translate(-50%, -50%);
}
.default text{
	color: #AAAAAA;
}

.default image {
  height: 280rpx;
  display: inline-block;
}
.empty-wrap{
	background-color: #FFFFFF;
	min-height: 100vh;
}
+.default {
+  text-align: center;
+  position: fixed;
+  left: 50%;
+  top: 40%;
+  transform: translate(-50%, -50%);
+}
+.default text{
+	color: #AAAAAA;
+}
+
+.default image {
+  height: 280rpx;
+  display: inline-block;
+}
+.empty-wrap{
+	background-color: #FFFFFF;
+	min-height: 100vh;
+}
 </style>

pages/index/index.vue

@@ -4,10 +4,14 @@
 			<loading  isFullScreen color="#2f7ff5" :active="isloading" text="开门中..."></loading>
 			<u-navbar :is-back="false" title=" ">
 				<view class="slot-wrap">
-					<picker @change="typeChange" :value="plotIndex" :range="plotArray">
+					<view v-if="$isEmpty(plot)" class="padding-left-20" @click="$u.toast('暂无小区信息')">
+						<u-icon name="map" size="34"></u-icon>
+						<text class="padding-left-sm " style="font-size: 34rpx;">暂无小区信息</text>
+					</view>
+					<picker v-else @change="typeChange" :value="plotIndex" :range="plotArray">
 					  <view class="padding-left-20 ">
 					  	<u-icon name="map" size="34"></u-icon>
-					  	<text class="padding-left-sm " style="font-size: 34rpx;">{{plot?plot:'暂无小区信息'}}</text>
+					  	<text class="padding-left-sm " style="font-size: 34rpx;">plot</text>
 					  </view>
 					</picker>
 				</view>
@@ -33,7 +37,7 @@
 					<view class="cu-item" :class="item.index==5?'img1-lg':''" @click="top(item.index)" v-for="(item,index) in gridList" :key="index">
 						<block v-if="item.index==5">
 							<view class="grid-icon" >
-								<image  style="width: 100rpx;height: 100rpx;" :src="modalShow?'../../static/grid1/kaisuo1.png':'../../static/grid1/kaisuo0.png'"/>
+								<image  style="width: 100rpx;height: 100rpx;" :src="modalShow?'../../static/home/open1.png':'../../static/home/open4.png'"/>
 							</view>
 							<text  style="color: #333333;font-size: 30rpx;font-weight: 800;" >{{item.title}}</text>
 						</block>
@@ -49,7 +53,7 @@
 				<!-- 设备列表 -->
 				<view v-if="modalShow==true" class="flex justify-around margin-top-30" >
 					<view @click="open(item.id)" v-for="(item,index) in device_list" :key="index" style="flex-direction: column;" class="flex justify-center align-center">
-						<image style="width: 60rpx;height: 60rpx;" src="../../static/grid1/kaimen.png"/>
+						<image style="width: 60rpx;height: 60rpx;" src="../../static/home/kaimen.png"/>
 						<view class="text-center padding-top-20" style="font-size: 24rpx;">
 							{{item.name}}
 						</view>
@@ -68,9 +72,9 @@
 			</view>
 		</view>
 		<view class="bg-white">
-			<image src="/static/banner.png" style="width: 100%;" mode="widthFix"></image>
+			<image src="/static/common/banner.png" style="width: 100%;" mode="widthFix"></image>
 		</view>
-		<view >
+		<view v-if="!this.$isEmpty(goodsList)">
 			<view class="tj-title">
 				<view class="">
 					<text class="text-lg text-bold">为您推荐</text>
@@ -133,7 +137,7 @@
 				adList: [
 					{
 					  'videoType': 0,
-					  'videoUri': "http://139.9.103.171:1888/miniofile/app/abcd.png"
+					  'videoUri': "http://139.9.103.171:1888/miniofile/app/banner2.jpeg"
 					},
 				],
 				elements: [{
@@ -164,31 +168,31 @@
 				}],
 				gridList:[
 					{
-						icon:'../../static/grid1/fangwu.png',
+						icon:'../../static/home/fangwu.png',
 						title:"我的房屋",
 						badge:0,
 						index:1
 					},
 					{
-						icon:'../../static/grid1/renyuan.png',
+						icon:'../../static/home/renyuan.png',
 						title:"家庭成员",
 						badge:0,
 						index:2
 					},
 					{
-						icon:'../../static/grid1/kaisuo1.png',
+						icon:'../../static/home/open4.png',
 						title:"开门",
 						badge:0,
 						index:5
 					},
 					{
-						icon:'../../static/grid1/cheliang.png',
+						icon:'../../static/home/cheliang.png',
 						title:"我的车辆",
 						badge:0,
 						index:3
 					},
 					{
-						icon:'../../static/grid1/fangke1.png',
+						icon:'../../static/home/fangke1.png',
 						title:"访客授权",
 						badge:0,
 						index:4
@@ -198,6 +202,9 @@
 			}
 		},
 		onShow() {
+			//从功能列表一键开门跳转过来的，打开开门设备列表
+			this.modalShow=getApp().globalData.openDoor
+			
 			//处理进入小程序的不同场景
 			this.execParam();
 			this.loadData()
@@ -452,10 +459,7 @@
 			},
 			//获取openid
 			getOpenId: function () {
-			  var openid = uni.getStorageSync("openid");
-			  console.info("缓存中获取的openid=" + openid);
 			  var that = this;
-			  if (openid == null || openid == '') {
 			    uni.login({
 			      success: res => {
 			        let params = {};
@@ -469,6 +473,7 @@
 						  console.log("获取openid成功")
 			            //openid存入缓存
 			            uni.setStorageSync("openid", res.data.openid);
+						uni.setStorageSync("appletType", res.data.appletType);
 						that.openid=res.data.openid
 						that.sessionKey=res.data.sessionKey
 			            that.getMemberByOpenid(res.data.openid);
@@ -478,9 +483,6 @@
 			        });
 			      }
 			    });
-			  } else {
-			    that.getMemberByOpenid(openid);
-			  }
 			},
 			//根据openid获取用户信息
 			getMemberByOpenid: function (openid) {

pages/my-camera/my-camera.vue

@@ -3,7 +3,7 @@
 		<view class="center">
 			<image class="content" v-if="src!=null" :src="src" ></image>
 			<camera class="content" v-else :device-position="position" flash="auto" @error="error" >
-				<cover-image :class="type==1?'coverImg-type1':'coverImg-type0'"  :src="type==1?'../../static/camera/card.png':'../../static/camera/face1.jpg'"></cover-image>
+				<cover-image :class="type==1?'coverImg-type1':'coverImg-type0'"  :src="type==1?'../../static/camera/card.png':'http://139.9.103.171:1888/miniofile/xlyq/face2.png'"></cover-image>
 			</camera>
 		</view>
 		<view class="bottom">
@@ -29,7 +29,7 @@
 				type:0,
 				
 				flash:'off',
-				position:'back',
+				position:'front',
 				src: null
 			}
 		},
@@ -137,7 +137,7 @@
 			width: 100vw;
 			.coverImg-type0{
 				height: 75vh;
-				margin-top: 20rpx;
+				margin-top: -20rpx;
 				margin-bottom: 20rpx;
 				opacity: 0.3;
 			}

pages/myFamily/activateFace/activateFace.vue

@@ -1,41 +1,41 @@
-<template>
-<view style="background-color: #FFFFFF;height: 100vh;">
-<view v-if="faceList!=null && faceList.length!=0">
-	<view class="head">请选择人脸套餐：</view>
-	<view class="content">
-	  <view class="faceList">
-	    <view v-for="(item, index) in faceList" :key="index" class="item" @tap="selectFace" :data-item="item" :data-index="index" :style="'border-color:' + (selectIndex==index?'#1296db':'gray')">
-	      <view class="day">{{item.days}}天</view>
-	      <view class="amount">售价{{item.amount}}元</view>
-	    </view>
-	  </view>
-	</view>
-	<view class="faceDate">
-	  人脸有效期：<text>{{faceEndDate}}</text>
-	</view>
-	<view @click="goPay"  class=" footer-fixed" >
-		<view class="cu-btn  flex  text-lg bg-red-btn" style="padding: 46rpx 0;">
-			支付
-		</view>
-	</view>
-</view>
-<view v-else>
-	<view class="default" >
-	   <image src="/static/empty.png" mode="heightFix"></image>
-	  <view>
-	    <text>没有相关信息</text>
-	  </view>
-	</view>
-</view>	
-
-</view>	
-
-</template>
-
-<script>
+<template>
+<view style="background-color: #FFFFFF;height: 100vh;">
+<view v-if="faceList!=null && faceList.length!=0">
+	<view class="head">请选择人脸套餐：</view>
+	<view class="content">
+	  <view class="faceList">
+	    <view v-for="(item, index) in faceList" :key="index" class="item" @tap="selectFace" :data-item="item" :data-index="index" :style="'border-color:' + (selectIndex==index?'#1296db':'gray')">
+	      <view class="day">{{item.days}}天</view>
+	      <view class="amount">售价{{item.amount}}元</view>
+	    </view>
+	  </view>
+	</view>
+	<view class="faceDate">
+	  人脸有效期：<text>{{faceEndDate}}</text>
+	</view>
+	<view @click="goPay"  class=" footer-fixed" >
+		<view class="cu-btn  flex  text-lg bg-red-btn" style="padding: 46rpx 0;">
+			支付
+		</view>
+	</view>
+</view>
+<view v-else>
+	<view class="default" >
+	   <image src="/static/empty.png" mode="heightFix"></image>
+	  <view>
+	    <text>没有相关信息</text>
+	  </view>
+	</view>
+</view>	
+
+</view>	
+
+</template>
+
+<script>
 // pages/myFamily/activateFace/activateFace.js
-let app = getApp();
-
+let app = getApp();
+
 export default {
   data() {
     return {
@@ -52,8 +52,8 @@ export default {
   components: {},
   props: {},
 
-  /**
-   * 生命周期函数--监听页面加载
+  /**
+   * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
     this.user_id = options.user_id;
@@ -72,38 +72,38 @@ export default {
     this.getFaceList();
   },
 
-  /**
-   * 生命周期函数--监听页面初次渲染完成
+  /**
+   * 生命周期函数--监听页面初次渲染完成
    */
   onReady: function () {},
 
-  /**
-   * 生命周期函数--监听页面显示
+  /**
+   * 生命周期函数--监听页面显示
    */
   onShow: function () {},
 
-  /**
-   * 生命周期函数--监听页面隐藏
+  /**
+   * 生命周期函数--监听页面隐藏
    */
   onHide: function () {},
 
-  /**
-   * 生命周期函数--监听页面卸载
+  /**
+   * 生命周期函数--监听页面卸载
    */
   onUnload: function () {},
 
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh: function () {},
 
-  /**
-   * 页面上拉触底事件的处理函数
+  /**
+   * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {},
 
-  /**
-   * 用户点击右上角分享
+  /**
+   * 用户点击右上角分享
    */
   onShareAppMessage: function () {},
   methods: {
@@ -160,55 +160,69 @@ export default {
       });
     }
   }
-};
-</script>
-<style lang="scss">
-.head{
-  line-height: 100rpx;
-  margin-left: 20rpx
-}
-.content{
-  width: 100%;
-}
-.faceList{
-  margin: 0 10rpx;
-  display: flex;
-  justify-content: space-between;
-  flex-wrap: wrap;
-}
-.item{
-  width:30%;
-  display: flex;
-  flex-direction: column;
-  align-content: center;
-  justify-content: center;
-  text-align: center;
-  border-radius: 10rpx;
-  border-style: solid;
-  border-width: 2rpx;
-  margin: 10rpx
-}
-.day{
-  height:80rpx;
-  line-height: 80rpx;
-  font-size: 35rpx;
-}
-.amount{
-  color:#1296db;
-  height:90rpx;
-}
-.faceDate{
-  position: fixed;
-  bottom: 150rpx;
-  width: 100%;
-  height: 100rpx;
-  line-height: 100rpx;
-  text-align: center;
-}
-.faceDate text{
-  color:#1296db;
-}
-
-
-.default {
  text-align: center;
  position: fixed;
  left: 50%;
  top: 40%;
  transform: translate(-50%, -50%);
}
.default text{
	color: #AAAAAA;
}
.default image {
  height: 280rpx;
  display: inline-block;
}
+};
+</script>
+<style lang="scss">
+.head{
+  line-height: 100rpx;
+  margin-left: 20rpx
+}
+.content{
+  width: 100%;
+}
+.faceList{
+  margin: 0 10rpx;
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
+}
+.item{
+  width:30%;
+  display: flex;
+  flex-direction: column;
+  align-content: center;
+  justify-content: center;
+  text-align: center;
+  border-radius: 10rpx;
+  border-style: solid;
+  border-width: 2rpx;
+  margin: 10rpx
+}
+.day{
+  height:80rpx;
+  line-height: 80rpx;
+  font-size: 35rpx;
+}
+.amount{
+  color:#1296db;
+  height:90rpx;
+}
+.faceDate{
+  position: fixed;
+  bottom: 150rpx;
+  width: 100%;
+  height: 100rpx;
+  line-height: 100rpx;
+  text-align: center;
+}
+.faceDate text{
+  color:#1296db;
+}
+
+
+.default {
+  text-align: center;
+  position: fixed;
+  left: 50%;
+  top: 40%;
+  transform: translate(-50%, -50%);
+}
+.default text{
+	color: #AAAAAA;
+}
+.default image {
+  height: 280rpx;
+  display: inline-block;
+}
+
 </style>

pages/myhome/familyList.vue

@@ -1,5 +1,5 @@
 <template>
-<view :class="$isEmpty(user_list)?'empty-wrap':''">
+<view :class="$isEmpty(user_list)?'empty-wrap':''">
 <view class="nav_section" v-if="user_list!=null && user_list.length!=0">
   <view v-for="(item, index) in user_list" :key="index" class="nav_list">
     <view class="nav_section_items">
@@ -32,8 +32,8 @@
     <button class="ar_btn">添加成员</button>
   </navigator>
 </view> -->
-<view class="default" v-else>
-  <image src="/static/empty.png" mode="heightFix"></image>
+<view class="default" v-else>
+  <image src="/static/common/empty.png" mode="heightFix"></image>
   <view>
     <text>没有获取到房屋成员信息</text>
   </view>
@@ -200,5 +200,23 @@ page {
   border:1px solid $base-btn-color;
 
 }
-.default {
  text-align: center;
  position: fixed;
  left: 50%;
  top: 40%;
  transform: translate(-50%, -50%);
}
.default text{
	color: #AAAAAA;
}

.default image {
  height: 250rpx;
  display: inline-block;
}
.empty-wrap{
	background-color: #FFFFFF;
	min-height: 100vh;
}
+.default {
+  text-align: center;
+  position: fixed;
+  left: 50%;
+  top: 40%;
+  transform: translate(-50%, -50%);
+}
+.default text{
+	color: #AAAAAA;
+}
+
+.default image {
+  height: 250rpx;
+  display: inline-block;
+}
+.empty-wrap{
+	background-color: #FFFFFF;
+	min-height: 100vh;
+}
 </style>

pages/myhome/myhome.vue

@@ -34,16 +34,16 @@
 				房屋成员
 			</view>
 		</view>
-	</view>
-	<view @tap="choosePlot" class="footer-fixed" >
-		<view class="cu-btn  flex  text-lg bg-red-btn" style="padding: 46rpx 0;">
-			添加房屋认证
-		</view>
+	</view>
+	<view @tap="choosePlot" class="footer-fixed" >
+		<view class="cu-btn  flex  text-lg bg-red-btn" style="padding: 46rpx 0;">
+			添加房屋认证
+		</view>
 	</view>
 </view>
 
-<view class="default" v-else>
-	  <image src="/static/empty.png" mode="heightFix"></image>
+<view class="default" v-else>
+	  <image src="/static/common/empty.png" mode="heightFix"></image>
 	<view>
     <text>没有获取到我的房屋信息</text>
   </view>
@@ -72,12 +72,12 @@ export default {
     //获取房屋信息
     this.geRoomByMemberId();
   },
-  methods: {
+  methods: {
 	  
-	 jump(id){
-		 uni.navigateTo({
-			 url:"./familyList?room_id="+id
-		 })
+	 jump(id){
+		 uni.navigateTo({
+			 url:"./familyList?room_id="+id
+		 })
 	 },
     //根据会员id获取我的房屋列表
     geRoomByMemberId: function () {
@@ -110,12 +110,12 @@ export default {
       });
     },
 
-    choosePlot() {
-		if(!this.$isEmpty(app.globalData.totalStep)){
-			app.globalData.totalStep=2
+    choosePlot() {
+		if(!this.$isEmpty(app.globalData.totalStep)){
+			app.globalData.totalStep=2
 		}
-		  uni.navigateTo({
-			url:"../auth/auth"
+		  uni.navigateTo({
+			url:"../auth/auth"
 		  })
     }
 
@@ -173,5 +173,23 @@ button
 		align-items: center;
 	}
 }
-.default {
  text-align: center;
  position: fixed;
  left: 50%;
  top: 40%;
  transform: translate(-50%, -50%);
}
.default text{
	color: #AAAAAA;
}

.default image {
  height: 250rpx;
  display: inline-block;
}
.empty-wrap{
	background-color: #FFFFFF;
	min-height: 100vh;
}
+.default {
+  text-align: center;
+  position: fixed;
+  left: 50%;
+  top: 40%;
+  transform: translate(-50%, -50%);
+}
+.default text{
+	color: #AAAAAA;
+}
+
+.default image {
+  height: 250rpx;
+  display: inline-block;
+}
+.empty-wrap{
+	background-color: #FFFFFF;
+	min-height: 100vh;
+}
 </style>

pages/oneButton/oneButton.vue

@@ -1,36 +1,36 @@
-<template>
-<view :class="$isEmpty(device_list)?'empty-wrap':''">
-<view class="openButton_contain" v-if="device_list.length>0">
-	<view class="padding-30" v-for="(item, index) in device_list" :key="index"  style="border-bottom: 1rpx solid #EEEEEE;display: flex;justify-content: space-between;">
-		<text style="margin: 8rpx 0 0 6rpx;">{{item.name}}</text>
-		<view :data-device_id="item.id" @tap="openDoor" class="cu-btn bg-red sm round " >
-			立即开门
-		</view>
-	</view>
-  <!-- <view v-for="(item, index) in device_list" :key="index" class="openButton_list">
-      <view class="info">{{item.name}}</view>
-	  <view class="cu-btn round sm bg-red">
-		立即开门
-	  </view>
-      <view class="button" :data-device_id="item.id" @tap="openDoor">立即开门</view>
-  </view> -->
-</view>
-<view class="default" v-if="$isEmpty(device_list)">
-  <image src="/static/empty.png" mode="heightFix"></image>
-  <view>
-    <text>没有获取到设备信息</text>
-  </view>
-</view>
-</view>
-</template>
-
-<script>
+<template>
+<view :class="$isEmpty(device_list)?'empty-wrap':''">
+<view class="openButton_contain" v-if="device_list.length>0">
+	<view class="padding-30" v-for="(item, index) in device_list" :key="index"  style="border-bottom: 1rpx solid #EEEEEE;display: flex;justify-content: space-between;">
+		<text style="margin: 8rpx 0 0 6rpx;">{{item.name}}</text>
+		<view :data-device_id="item.id" @tap="openDoor" class="cu-btn bg-red sm round " >
+			立即开门
+		</view>
+	</view>
+  <!-- <view v-for="(item, index) in device_list" :key="index" class="openButton_list">
+      <view class="info">{{item.name}}</view>
+	  <view class="cu-btn round sm bg-red">
+		立即开门
+	  </view>
+      <view class="button" :data-device_id="item.id" @tap="openDoor">立即开门</view>
+  </view> -->
+</view>
+<view class="default" v-if="$isEmpty(device_list)">
+  <image src="/static/common/empty.png" mode="heightFix"></image>
+  <view>
+    <text>没有获取到设备信息</text>
+  </view>
+</view>
+</view>
+</template>
+
+<script>
 //获取app实例
-var app = getApp();
-
+var app = getApp();
+
 export default {
   data() {
-    return {
+    return {
 		isFirst:true,
       device_list: null
     };
@@ -39,8 +39,8 @@ export default {
   components: {},
   props: {},
 
-  /**
-   * 生命周期函数--监听页面加载
+  /**
+   * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
     // let device_list = app.device_list;
@@ -50,14 +50,14 @@ export default {
     //   })
     // }else{
     // 如果设备列表为空--则去拉取一次
-    // }
+    // }
 	this.isFirst=false
     this.getAuthDevice();
-  },
-  onShow() {
-  	if(!this.isFirst){
-  		this.getAuthDevice();
-  	}
+  },
+  onShow() {
+  	if(!this.isFirst){
+  		this.getAuthDevice();
+  	}
   },
   methods: {
     //立即开门
@@ -108,57 +108,57 @@ export default {
       });
     }
   }
-};
-</script>
-<style lang="scss">
+};
+</script>
+<style lang="scss">
 view,
 button
 {
     box-sizing: border-box;
-}
-
+}
+
 .cu-btn.sm {
     padding: 0 26rpx;
     font-size: 24rpx;
     height: 54rpx;
-}
-	
-	
-page {
-  overflow-y: scroll;
-  background-color: #FFFFFF;
-  height: 100vh;
-}
-
-.openButton_contain {
-  padding-top: 30rpx;
-}
-
-.openButton_list {
-  width: 100%;
-  padding: 0 20rpx;
-  border-bottom: 1px solid #eee;
-  height: 120rpx;
-  line-height: 120rpx;
-  background: #fff;
-  position: relative;
-  box-sizing: border-box;
-}
-
-.openButton_list .button {
-  position: absolute;
-  right: 20rpx;
-  top: 50%;
-  transform: translate(0, -50%);
-  border: 1px solid $base;
-  height: 60rpx;
-  line-height: 60rpx;
-  padding: 0 20rpx;
-  border-radius: 6rpx;
-  color: #fff;
-  background: $base;
-}
-
-.default {
  text-align: center;
  position: fixed;
  left: 50%;
  top: 40%;
  transform: translate(-50%, -50%);
}
.default text{
	color: #AAAAAA;
}

.default image {
  height: 250rpx;
  display: inline-block;
}
.empty-wrap{
	background-color: #FFFFFF;
	min-height: 100vh;
}
-
+}
+	
+	
+page {
+  overflow-y: scroll;
+  background-color: #FFFFFF;
+  height: 100vh;
+}
+
+.openButton_contain {
+  padding-top: 30rpx;
+}
+
+.openButton_list {
+  width: 100%;
+  padding: 0 20rpx;
+  border-bottom: 1px solid #eee;
+  height: 120rpx;
+  line-height: 120rpx;
+  background: #fff;
+  position: relative;
+  box-sizing: border-box;
+}
+
+.openButton_list .button {
+  position: absolute;
+  right: 20rpx;
+  top: 50%;
+  transform: translate(0, -50%);
+  border: 1px solid $base;
+  height: 60rpx;
+  line-height: 60rpx;
+  padding: 0 20rpx;
+  border-radius: 6rpx;
+  color: #fff;
+  background: $base;
+}
+
+.default {  text-align: center;  position: fixed;  left: 50%;  top: 40%;  transform: translate(-50%, -50%);}.default text{	color: #AAAAAA;}.default image {  height: 250rpx;  display: inline-block;}.empty-wrap{	background-color: #FFFFFF;	min-height: 100vh;}
+
 </style>

pages/record/record.vue

@@ -1,41 +1,41 @@
-<template>
-<view style="background-color: #FFFFFF;height: 100vh;">
-<view class="nav_section" v-if="list.length>0">
-  <view>
-    <view v-for="(item, index) in list" :key="index" class="nav_section_items">
-      <view class="section_cont" data-aid="undefined">
-        <view class="section_cont_tel">
-          <text>访客类型：</text>
-          <text class="fr classify" v-if="item.accessUserType==0">朋友</text>
-          <text class="fr classify" v-else-if="item.accessUserType==1">外卖</text>
-          <text class="fr classify" v-else-if="item.accessUserType==2">快递</text>
-          <text class="fr classify" v-else-if="item.accessUserType==3">其他</text>
-          <text class="fr classify" v-else>其他</text>
-        </view>
-       <view class="section_cont_tel">
-          <text>开门密码：</text>
-           <text class="fr">{{item.accessCardNo}}</text>
-        </view>
-        <view class="section_cont_tel"> <text>开门时间：</text> <text class="fr">{{item.accessDate}}</text></view>
-        
-      </view>
-    </view>
-  </view>
-</view>
-<view class="default" v-if="list==null || list.length==0">
-    <image src="/static/empty.png" mode="heightFix"></image>
-  <view>
-    <text>没有获取到访客记录</text>
-  </view>
-</view>
-</view>
-</template>
-
-<script>
+<template>
+<view style="background-color: #FFFFFF;height: 100vh;">
+<view class="nav_section" v-if="list.length>0">
+  <view>
+    <view v-for="(item, index) in list" :key="index" class="nav_section_items">
+      <view class="section_cont" data-aid="undefined">
+        <view class="section_cont_tel">
+          <text>访客类型：</text>
+          <text class="fr classify" v-if="item.accessUserType==0">朋友</text>
+          <text class="fr classify" v-else-if="item.accessUserType==1">外卖</text>
+          <text class="fr classify" v-else-if="item.accessUserType==2">快递</text>
+          <text class="fr classify" v-else-if="item.accessUserType==3">其他</text>
+          <text class="fr classify" v-else>其他</text>
+        </view>
+       <view class="section_cont_tel">
+          <text>开门密码：</text>
+           <text class="fr">{{item.accessCardNo}}</text>
+        </view>
+        <view class="section_cont_tel"> <text>开门时间：</text> <text class="fr">{{item.accessDate}}</text></view>
+        
+      </view>
+    </view>
+  </view>
+</view>
+<view class="default" v-if="list==null || list.length==0">
+    <image src="/static/common/empty.png" mode="heightFix"></image>
+  <view>
+    <text>没有获取到访客记录</text>
+  </view>
+</view>
+</view>
+</template>
+
+<script>
 //获取app实例
-var app = getApp();
-var util = require("../../utils/util.js");
-
+var app = getApp();
+var util = require("../../utils/util.js");
+
 export default {
   data() {
     return {
@@ -46,8 +46,8 @@ export default {
   components: {},
   props: {},
 
-  /**
-   * 生命周期函数--监听页面加载
+  /**
+   * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
     this.getPwdOpenRecord();
@@ -76,85 +76,85 @@ export default {
       });
     }
   }
-};
-</script>
-<style>
-/* pages/myHome/myHome.wxss */
-page{
-  overflow-y: scroll;
-}
-.nav_section {
-  width: 100%;
-  overflow-y: scroll;
-}
-
-.nav_section_items {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  padding: 30rpx;
-  border-bottom: 2rpx solid #ddd;
-  position: relative;
-  background: #fff;
-  margin: 30rpx;
-  border-radius: 10rpx;
-}
-
-
-.nav_section_items .section_image {
-  width: 170rpx;
-  height: 158rpx;
-  position: relative;
-}
-
-.nav_section_items .identity {
-  padding: 4rpx;
-  top: 0;
-  right: 0;
-  background: #29afec;
-  color: #fff;
-  font-size: 24rpx;
-  position: absolute;
-}
-
-.nav_section_items .section_image image {
-  width: 100%;
-  height: 100%;
-}
-
-.nav_section_items .section_cont {
-  width: 100%;
-  font-size: 26rpx;
-  color: #a9a9a9;
-}
-
-.nav_section_items .section_cont view {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  display: block;
-}
-
-.nav_section_items .section_cont .section_cont_intro {
-  white-space: normal;
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
-}
-
-.nav_section_items .section_cont .section_cont_tel {
-  font-size: 28rpx;
-  color: #666;
-  line-height: 80rpx;
-  margin-bottom: 10rpx;
-  width: 100%;
-  border-bottom: 1px dashed #a9a9a9;
-}
-.nav_section_items .section_cont .section_cont_tel .classify{
-  color: #d24a58;
-}
-
-.section_cont_tel .fr {
-  float: right;
-}
-.default {
  text-align: center;
  position: fixed;
  left: 50%;
  top: 40%;
  transform: translate(-50%, -50%);
}
.default text{
	color: #AAAAAA;
}

.default image {
  height: 250rpx;
  display: inline-block;
}
</style>
+};
+</script>
+<style>
+/* pages/myHome/myHome.wxss */
+page{
+  overflow-y: scroll;
+}
+.nav_section {
+  width: 100%;
+  overflow-y: scroll;
+}
+
+.nav_section_items {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  padding: 30rpx;
+  border-bottom: 2rpx solid #ddd;
+  position: relative;
+  background: #fff;
+  margin: 30rpx;
+  border-radius: 10rpx;
+}
+
+
+.nav_section_items .section_image {
+  width: 170rpx;
+  height: 158rpx;
+  position: relative;
+}
+
+.nav_section_items .identity {
+  padding: 4rpx;
+  top: 0;
+  right: 0;
+  background: #29afec;
+  color: #fff;
+  font-size: 24rpx;
+  position: absolute;
+}
+
+.nav_section_items .section_image image {
+  width: 100%;
+  height: 100%;
+}
+
+.nav_section_items .section_cont {
+  width: 100%;
+  font-size: 26rpx;
+  color: #a9a9a9;
+}
+
+.nav_section_items .section_cont view {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  display: block;
+}
+
+.nav_section_items .section_cont .section_cont_intro {
+  white-space: normal;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+}
+
+.nav_section_items .section_cont .section_cont_tel {
+  font-size: 28rpx;
+  color: #666;
+  line-height: 80rpx;
+  margin-bottom: 10rpx;
+  width: 100%;
+  border-bottom: 1px dashed #a9a9a9;
+}
+.nav_section_items .section_cont .section_cont_tel .classify{
+  color: #d24a58;
+}
+
+.section_cont_tel .fr {
+  float: right;
+}
+.default {  text-align: center;  position: fixed;  left: 50%;  top: 40%;  transform: translate(-50%, -50%);}.default text{	color: #AAAAAA;}.default image {  height: 250rpx;  display: inline-block;}</style>

pages/register/register.vue

@@ -30,18 +30,18 @@
     </view>
     <view style="display:flex;margin:20rpx 20rpx">
 	  <u-checkbox v-model="isCheck" active-color="blue">
-		  <navigator url="/pages/webview/webview?url=https://openapi.lezhuapp.com/help/app.html"><text style="color:#5db5fe">请阅读并同意用户协议</text></navigator>
+		  <navigator url="/pages/webview/webview"><text style="color:#5db5fe">请阅读并同意用户协议</text></navigator>
 	  </u-checkbox>
     </view>
 	<view class="tips">
 	  <text style="padding-left: 40rpx;">认证后用户可享受更多权益，随时获取到您所在小区的动态</text>
 	</view>
 	
-	<view @click="showDialogBtn" class=" footer-fixed" >
+	<button open-type="getUserInfo" @getuserinfo="showDialogBtn"  class=" footer-fixed" >
 		<view class="cu-btn  flex  text-lg bg-red-btn" style="padding: 46rpx 0;">
 			确认
 		</view>
-	</view>
+	</button>
   </form>
 </view>
 </template>
@@ -143,7 +143,8 @@ export default {
       ;
     },
     //确认
-    showDialogBtn: function () {
+    showDialogBtn: function (e) {
+		console.log(e);
 	  app.globalData.totalStep=3
       let that = this;
       let name = that.name;
@@ -222,7 +223,7 @@ export default {
       //构建参数
       let params = {};
       params['tel'] = this.tel;
-	  params['play_type'] = 2;
+	  params['play_type'] = '2';
       let operation = 'member/getSmsCode';
       app.globalData.postRequest(params, operation, function (res) {
         //短信发送成功

pages/services/delivery/delivery.vue

@@ -4,7 +4,7 @@
 		<view class="cu-list menu card ">
 			<view class="cu-item arrow" >
 				<view class="content " style="padding: 36rpx 0;">
-					<image style="width: 60rpx;" src="/static/publish.png" class="png" mode="widthFix"></image>
+					<image style="width: 60rpx;" src="/static/common/publish.png" class="png" mode="widthFix"></image>
 					<text class="text-black text-bold margin-left-10 text-lg" >新增收货地址</text>
 				</view>
 			</view>

pages/services/property/list/card.vue

@@ -34,11 +34,7 @@
 				</view>
 			</view>
 			<view class="bottom" >
-				<button @click.stop="" class="cu-btn  sm round line-black margin-right-20"
-					open-type="contact"
-					session-from="weapp"
-					:send-message-title="'订单编号为：'+item.repairNo"
-				>
+				<button @click.stop="" open-type="contact" class="cu-btn  sm round line-black margin-right-20" >
 					联系客服
 				</button>
 				<!-- 待处理，显示取消工单 -->
@@ -46,11 +42,11 @@
 					取消工单
 				</view>
 				<!-- 已取消，显示删除订单 -->
-				<view  v-if="item.handleStatus==-1||item.handleStatus==1" class="cu-btn  sm round bg-red" @click.stop="deleteItem(item)">
+				<view v-if="item.handleStatus==-1" class="cu-btn  sm round bg-red" @click.stop="deleteItem(item)">
 					删除工单
 				</view>
 				<!-- 已完成，显示写评价 -->
-				<view v-if="dataDetail.handleStatus==1&&dataDetail.estimateStatus==0" class="cu-btn  sm round bg-red" @click.stop="comment(item)">
+				<view v-if="item.handleStatus==1" class="cu-btn  sm round bg-red" @click.stop="comment(item)">
 					写评价
 				</view>
 			</view>
@@ -84,6 +80,7 @@ export default {
 			})
 		},
 		goDetail(item){
+			getApp().globalData.dataDetail=item
 			uni.navigateTo({
 				url:"../detail?id="+item.id
 			})

pages/switchcity/switchcity.vue

@@ -40,7 +40,7 @@
 
       <view class="selectCity">
         <view class="hotcity-common" @tap="reGetLocation">重新定位城区</view>
-        <view class="thisCityName" :data-city="city" :data-code="currentCityCode">{{city}}{{county}}</view>
+        <view @click="back" class="thisCityName" :data-city="city" :data-code="currentCityCode">{{city}}{{county}}</view>
 
         <view class="hotcity-common">热门城市</view>
         <view class="weui-grids">
@@ -156,6 +156,13 @@ export default {
     }); //this.getLocation();
   },
   methods: {
+	  back(){
+		  if (!this.$isEmpty(this.county)) {
+		  	uni.navigateBack({
+		  		delta:1
+		  	})
+		  }
+	  },
 	  goTop (e) {
 		  //视图会发生重新渲染
 		  this.scrollTop = this.oldScrollTop
@@ -267,23 +274,18 @@ export default {
     selectCounty: function () {
       console.log("正在定位区县");
       let code = this.currentCityCode; // console.log(code);
-
       const that = this;
-      uni.request({
-        url: `https://apis.map.qq.com/ws/district/v1/getchildren?&id=${code}&key=${config.key}`,
-        success: function (res) {
-          // console.log(res.data)
-          // console.log(res.data.result[0]);
-          that.setData({
-            countyList: res.data.result[0]
-          }); // console.log(that.data.countyList);
-
-          console.log("请求区县成功" + `https://apis.map.qq.com/ws/district/v1/getchildren?&id=${code}&key=${config.key}`); // console.log(res)
-        },
-        fail: function () {
-          console.log("请求区县失败，请重试");
-        }
-      });
+	  let params={
+		  id:code,
+		  key:config.key
+	  }
+	  let operation = 'miniprogram/ws/district/v1/getchildren';
+	  getApp().globalData.postRequest(params, operation, function (res) {
+		  let countyList=res.data.result.result[0]
+		  that.setData({
+		    countyList: countyList
+		  });
+	  });
     },
     getLocation: function () {
       console.log("正在定位城市");
@@ -296,19 +298,20 @@ export default {
         success: function (res) {
           let latitude = res.latitude;
           let longitude = res.longitude;
-          uni.request({
-            url: `https://apis.map.qq.com/ws/geocoder/v1/?location=${latitude},${longitude}&key=${config.key}`,
-            success: res => {
-              // console.log(res)
-              console.log(res.data.result.ad_info.city + res.data.result.ad_info.adcode);
-              that.setData({
-                city: res.data.result.ad_info.city,
-                currentCityCode: res.data.result.ad_info.adcode,
-                county: res.data.result.ad_info.district
-              });
-              that.selectCounty();
-            }
-          });
+		  let params={
+			  location:latitude+","+longitude,
+			  key:config.key,
+		 }
+		  let operation = 'miniprogram/ws/geocoder/v1/location';
+		  getApp().globalData.postRequest(params, operation, function (res) {
+			  let info=res.data.result.result.ad_info
+			  console.log(info.city + info.adcode);
+			  that.setData({
+			    city: info.city,
+			    currentCityCode: info.adcode,
+			    county: info.district
+			  });
+		  });
         }
       });
     },

pages/tool-list/epidemic-pass/epidemic-pass.vue

@@ -66,6 +66,8 @@
 				this.switch2Check=e.target.value
 			},
 			submit(){
+				this.$u.toast('待开发')
+				return
 				uni.navigateTo({
 					url:"./detail"
 				})

pages/tool-list/tool-list.vue

@@ -19,77 +19,69 @@
 				       title:'业主认证',
 				       subList:[
 				           {
-				               src:'/static/grid1/fangwu.png',  name:'我的房屋', url:"/pages/myhome/myhome"
+				               src:'/static/home/fangwu.png',  name:'我的房屋', url:"/pages/myhome/myhome"
 				           },
 				           {
-				               src:'/static/grid1/luru.png',  name:'人脸录入', url:"/pages/uploadFace/uploadFace"
+				               src:'/static/home/luru.png',  name:'人脸录入', url:"/pages/uploadFace/uploadFace"
 				           },
 				           {
-				               src:'/static/grid1/renyuan.png',  name:'家人管理', url:"/pages/myFamily/myFamily"
+				               src:'/static/home/renyuan.png',  name:'家人管理', url:"/pages/myFamily/myFamily"
 				           },
 						   {
-				               src:'/static/grid1/fangwu.png',  name:'家人关爱', url:"/pages/index/index",type:'click'
+				               src:'/static/home/fangwu.png',  name:'老人关爱', url:"/pages/community/community?current=1",type:'switchTab'
 				           },
-				           {
-				               src:'/static/grid1/baoxiu.png',  name:'增值订购', url:"/pages/index/index",type:'click'
-				           },
-						   {
-				               src:'/static/grid1/luru.png',  name:'业主投票', url:"/pages/index/index",type:'click'
-				           }
 				       ]
 				   },
 				   {
 				       title:'小区出入',
 				       subList:[
 				           {
-				               src:'/static/grid1/kaimen.png',  name:'一键开门', url:"/pages/device/device",type:'switchTab'
+				               src:'/static/home/kaimen.png',  name:'一键开门', url:"/pages/index/index?openDoor",type:'switchTab'
 				           },
-				           {
-				               src:'/static/grid1/fangke1.png',  name:'远程开门', url:"/pages/index/index",type:'click'
+						   {
+				               src:'/static/home/fangke1.png',  name:'访客授权', url:"/pages/authorize_record/authorize_record"
 				           },
 				           {
-				               src:'/static/grid1/luru.png',  name:'刷卡开门', url:"/pages/index/index",type:'click'
-				           },{
-				               src:'/static/grid1/fangke1.png',  name:'访客授权', url:"/pages/authorize_record/authorize_record"
+				               src:'/static/home/jilu.png',  name:'访客记录', url:"/pages/record/record"
 				           },
-				           {
-				               src:'/static/grid1/baoxiu.png',  name:'访客记录', url:"/pages/record/record"
-				           }
+						   {
+						       src:'/static/home/cheliang.png',  name:'车辆关爱', url:"/pages/community/community?current=2",type:'switchTab'
+						   },
+						   {
+						       src:'/static/home/fanyi1.png',  name:'防疫登记', url:"/pages/tool-list/epidemic-pass/epidemic-pass"
+						   }
 				       ]
 				   },
 				   {
 				       title:'小区应用',
 				       subList:[
+						   {
+						       src:'/static/home/baoxiu.png',  name:'物业报修', url:"/pages/services/property/property"
+						   },
 				           {
-				               src:'/static/grid1/luru.png',  name:'物业缴费', url:"/pages/index/index", type:'click'
-				           },
-				           {
-				               src:'/static/grid1/fangke1.png',  name:'扫码充电', url:"/pages/index/index", type:'click'
-				           },
-				           {
-				               src:'/static/grid1/baoxiu.png',  name:'物管报修', url:"/pages/index/index", type:'click'
-				           },{
-				               src:'/static/grid1/gonggao.png',  name:'公告查看', url:"/pages/index/index", type:'click'
+				               src:'/static/home/jiaofei.png',  name:'物业缴费', url:"/pages/index/index", type:'click'
 				           }
-				       ]
-				   },
-				   {
-				       title:'社区周边',
-				       subList:[
-				           {
-				               src:'/static/grid1/fangke1.png',  name:'周边商户', url:"/pages/index/index", type:'click'
-				           },
-				           {
-				               src:'/static/grid1/kaimen.png',  name:'送水服务', url:"/pages/index/index", type:'click'
-				           },
+						   ,
 						   {
-				               src:'/static/grid1/renyuan.png',  name:'代收快递', url:"/pages/index/index", type:'click'
+				               src:'/static/home/gonggao.png',  name:'公告查看', url:"/pages/notice/notice"
 				           }
+						   ,
+						   {
+						       src:'/static/home/shanghu.png',  name:'周边商户', url:"/pages/life/life", type:'switchTab'
+						   }
 				       ]
 				   }
 				]
 			}
 		},
+		onLoad() {
+			//小程序audit期间隐藏掉人脸录入功能
+			let appletType= uni.getStorageSync('appletType')
+			if (appletType=='0') {
+				this.gridList[0].subList.splice(1,1)
+				console.log(this.gridList);
+			}
+		},
 		methods: {
 			tapGrid ( data ) {
 				uni.showToast({

pages/uploadFace/uploadFace.vue

@@ -1,67 +1,72 @@
 <template>
 <view>
-<!--pages/ uploadFace/uploadFace.wxml-->
-<view>
-<!--  <picker class="cybm_pic_1" :value="index" :range="list" :range-key="'roomName'" @change="roomChange">
-    <view class="picker form_group">
-      <view class="my-item">
-        <text class="info">我的房屋</text>
-        <text class="status">{{list[index].roomName}}</text>
-        <text class="iconfont icon-arrow-left arrow"></text>
-      </view>
-    </view>
-  </picker> -->
-  <view class="cu-list menu" @click="locationShow=true">
-  	<view class="cu-item" >
-  		<view class="content">
-  			<text >我的房屋</text>
-  		</view>
-  		<view class="action">
-  			<text >{{selectLabel?selectLabel:list[0].roomName}}</text>
-  			<text class="cuIcon-right padding-left-10"></text>
-  		</view>
-  	</view>
-  </view>
-</view>
-
-<view class="upload_container">
-  <view>
-	  <view @click="show=true"  style="margin: 30rpx 0 10rpx 0;display: flex;align-items: center;flex-direction: column;">
-	    <upload-img
-	  	  :width="$isEmpty(face_url)?300:560"
-	  	  :height="$isEmpty(face_url)?300:420"
-	  	  :currentImage="face_url"
-		  bgsrc="http://139.9.103.171:1888/img/image/camera1.png"
-	  	  >
-	    </upload-img>
-	    <view class="" style="color: #59a5f0;">
-	  	 <text class="cuIcon-camera padding-right-sm" style="font-size: 30rpx;"></text>
-	  	 <text v-if="$isEmpty(face_url)">点击上传人脸</text>
-	  	 <text style="margin-top: 40rpx;display: inline-block;" v-else>点击重新上传</text>
-	    </view>
-	  </view>
-  </view>
-</view>
-<view class="category">
-  <view v-for="(item, index) in iconArray" :key="index" class="category_item">
-    <view class="category_item_wrap" @tap="top" :data-index="item.index">
-      <view class="icon_wrap">
-        <image :src="item.iconUrl" class="index_icon"></image>
-      </view>
-      <view class="category_item_text">
-        <text>{{item.iconText}}</text>
-      </view>
-    </view>
-  </view>
-</view>
-<canvas canvas-id="photo_canvas" :style="'width:' + canvasWidth + 'px;height:' + canvasHeight + 'px;position: absolute;left:-300px;top:-300px;'"></canvas>
-<view @tap="uploadFace" class=" footer-fixed" >
-	<view class="cu-btn  flex  text-lg bg-red-btn" style="padding: 46rpx 0;">
-		提交人脸信息
+	<view class="" v-if="appletType==1">
+		<view>
+		<!--  <picker class="cybm_pic_1" :value="index" :range="list" :range-key="'roomName'" @change="roomChange">
+		    <view class="picker form_group">
+		      <view class="my-item">
+		        <text class="info">我的房屋</text>
+		        <text class="status">{{list[index].roomName}}</text>
+		        <text class="iconfont icon-arrow-left arrow"></text>
+		      </view>
+		    </view>
+		  </picker> -->
+		  <view class="cu-list menu" @click="locationShow=true">
+		  	<view class="cu-item" >
+		  		<view class="content">
+		  			<text >我的房屋</text>
+		  		</view>
+		  		<view class="action">
+		  			<text >{{selectLabel?selectLabel:list[0].roomName}}</text>
+		  			<text class="cuIcon-right padding-left-10"></text>
+		  		</view>
+		  	</view>
+		  </view>
+		</view>
+		
+		<view class="upload_container">
+		  <view>
+			  <view @click="show=true"  style="margin: 30rpx 0 10rpx 0;display: flex;align-items: center;flex-direction: column;">
+			    <upload-img
+			  	  :width="$isEmpty(face_url)?300:560"
+			  	  :height="$isEmpty(face_url)?300:420"
+			  	  :currentImage="face_url"
+				  bgsrc="http://139.9.103.171:1888/img/image/camera1.png"
+			  	  >
+			    </upload-img>
+			    <view class="" style="color: #59a5f0;">
+			  	 <text class="cuIcon-camera padding-right-sm" style="font-size: 30rpx;"></text>
+			  	 <text v-if="$isEmpty(face_url)">点击上传人脸</text>
+			  	 <text style="margin-top: 40rpx;display: inline-block;" v-else>点击重新上传</text>
+			    </view>
+			  </view>
+		  </view>
+		</view>
+		<view class="category">
+		  <view v-for="(item, index) in iconArray" :key="index" class="category_item">
+		    <view class="category_item_wrap" @tap="top" :data-index="item.index">
+		      <view class="icon_wrap">
+		        <image :src="item.iconUrl" class="index_icon"></image>
+		      </view>
+		      <view class="category_item_text">
+		        <text>{{item.iconText}}</text>
+		      </view>
+		    </view>
+		  </view>
+		</view>
+		<canvas canvas-id="photo_canvas" :style="'width:' + canvasWidth + 'px;height:' + canvasHeight + 'px;position: absolute;left:-300px;top:-300px;'"></canvas>
+		<view @tap="uploadFace" class=" footer-fixed" >
+			<view class="cu-btn  flex  text-lg bg-red-btn" style="padding: 46rpx 0;">
+				提交人脸信息
+			</view>
+		</view>
+		<u-select z-index="9999999"  mode="single-column" value-name="id"  label-name="roomName" v-model="locationShow" :list="list" @confirm="roomChange"></u-select>
+		<u-action-sheet @click="photoChecked"  z-index="999999" :list="actionList" v-model="show"></u-action-sheet>
+	</view>
+	
+	<view v-else >
+		
 	</view>
-</view>
-<u-select z-index="9999999"  mode="single-column" value-name="id"  label-name="roomName" v-model="locationShow" :list="list" @confirm="roomChange"></u-select>
-<u-action-sheet @click="photoChecked"  z-index="999999" :list="actionList" v-model="show"></u-action-sheet>
 </view>
 </template>
 
@@ -76,6 +81,8 @@ export default {
   },
   data() {
     return {
+	  appletType:0,
+		
 	  //显示模态框
 	  locationShow:false,
 	  selectLabel:'',
@@ -125,13 +132,21 @@ export default {
     };
   },
   onShow() {
+	 if (this.appletType==0) {
+	 	uni.setNavigationBarTitle({
+	 		title:"功能待开发"
+	 	})
+	 }else{
+	 	uni.setNavigationBarTitle({
+	 		title:"人脸录入"
+	 	})
+	 }
   	//获取当前页面的对象
   	let currPage=this.$util.getPageCtx()
   	if(!this.$isEmpty(currPage.data.image)){
   		this.handelImg(currPage.data.image)
   	} 
   },
-
   components: {},
   props: {},
 
@@ -139,8 +154,11 @@ export default {
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+	this.appletType=uni.getStorageSync('appletType')
+	
     this.getFaceImg();
   },
+
   methods: {
 	  //点击模态框选项触发
 	  photoChecked(index){

pages/wode/news/news.vue

@@ -1,36 +1,36 @@
-<template>
-<view style="background-color: #FFFFFF;min-height: 100vh;">
-<view class="nav_section" v-if="list.length>0">
-  <view v-for="(item, index) in list" :key="index" class="nav_section_items">
-    <view class="section_cont">
-      <view class="section_cont_tel">
-        <text class="title">{{item.noticeTitle}}</text>
-      </view>
-      <view class="section_cont_tel">
-        <text class="content">{{item.noticeContent}}</text>
-      </view>
-      <view class="section_cont_tel">
-        <text class="date">{{item.createDate}}</text>
-      </view>
-  
-      
-    </view>
-  </view>
-</view>
-<view class="default" v-if="list==null || list.length==0">
-  <image src="/static/empty.png" mode="heightFix"></image>
-  <view>
-    <text>没有消息</text>
-  </view>
-</view>
-</view>
-</template>
-
-<script>
-var util = require("../../../utils/util.js"); //获取app实例
+<template>
+<view style="background-color: #FFFFFF;min-height: 100vh;">
+<view class="nav_section" v-if="list.length>0">
+  <view v-for="(item, index) in list" :key="index" class="nav_section_items">
+    <view class="section_cont">
+      <view class="section_cont_tel">
+        <text class="title">{{item.noticeTitle}}</text>
+      </view>
+      <view class="section_cont_tel">
+        <text class="content">{{item.noticeContent}}</text>
+      </view>
+      <view class="section_cont_tel">
+        <text class="date">{{item.createDate}}</text>
+      </view>
+  
+      
+    </view>
+  </view>
+</view>
+<view class="default" v-if="list==null || list.length==0">
+  <image src="/static/common/empty.png" mode="heightFix"></image>
+  <view>
+    <text>没有消息</text>
+  </view>
+</view>
+</view>
+</template>
+
+<script>
+var util = require("../../../utils/util.js"); //获取app实例
 //获取app实例
-var app = getApp();
-
+var app = getApp();
+
 export default {
   data() {
     return {
@@ -41,8 +41,8 @@ export default {
   components: {},
   props: {},
 
-  /**
-   * 生命周期函数--监听页面加载
+  /**
+   * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
     this.getNotice();
@@ -73,53 +73,53 @@ export default {
       });
     }
   }
-};
-</script>
-<style>
-/* pages/myHome/myHome.wxss */
-page{
-  overflow-y: scroll;
-}
-.nav_section {
-  width: 100%;
-}
-
-.nav_section_items {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  padding: 30rpx;
-  border-bottom: 2rpx solid #ddd;
-  position: relative;
-  background: #fff;
-}
-
-.nav_section_items:active {
-  background: #ddd;
-}
-
-.nav_section_items .section_cont .section_cont_sub {
-  font-size: 30rpx;
-  line-height: 50rpx;
-  margin-bottom: 10rpx;
-}
-.section_cont_tel .title{
-  font-size: 28rpx;
-  color: #1f1f1f;
-}
-.section_cont_tel{
-  line-height: 60rpx;
-
-}
-.section_cont_tel .content{
-
-  font-size: 32rpx;
-  color: #080808;
-}
-.section_cont_tel .date{
-
-  font-size: 24rpx;
-  color: #868686;
-}
-
-.default {
  text-align: center;
  position: fixed;
  left: 50%;
  top: 40%;
  transform: translate(-50%, -50%);
}
.default text{
	color: #AAAAAA;
}

.default image {
  height: 250rpx;
  display: inline-block;
}
</style>
+};
+</script>
+<style>
+/* pages/myHome/myHome.wxss */
+page{
+  overflow-y: scroll;
+}
+.nav_section {
+  width: 100%;
+}
+
+.nav_section_items {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  padding: 30rpx;
+  border-bottom: 2rpx solid #ddd;
+  position: relative;
+  background: #fff;
+}
+
+.nav_section_items:active {
+  background: #ddd;
+}
+
+.nav_section_items .section_cont .section_cont_sub {
+  font-size: 30rpx;
+  line-height: 50rpx;
+  margin-bottom: 10rpx;
+}
+.section_cont_tel .title{
+  font-size: 28rpx;
+  color: #1f1f1f;
+}
+.section_cont_tel{
+  line-height: 60rpx;
+
+}
+.section_cont_tel .content{
+
+  font-size: 32rpx;
+  color: #080808;
+}
+.section_cont_tel .date{
+
+  font-size: 24rpx;
+  color: #868686;
+}
+
+.default {  text-align: center;  position: fixed;  left: 50%;  top: 40%;  transform: translate(-50%, -50%);}.default text{	color: #AAAAAA;}.default image {  height: 250rpx;  display: inline-block;}</style>

pages/wode/wode.vue

@@ -6,21 +6,19 @@
 			<view @tap="tapToWhich('/pagesM/pages/mine_info')" style="display: flex;align-items: center;margin: 0 30upx;">
 				<view class="member_head_img">
 					<block v-if="isLogin">
-						<image v-if="userInfo.avatarUrl" :src="userInfo.avatarUrl" mode="scaleToFill"></image>
+						<image v-if="userDetail.avatar" :src="userDetail.avatar"></image>
 						<button v-else class="avatar-wrap" open-type="getUserInfo" @getuserinfo="tapGetUserInfo" @tap.stop="() => false">
-							<!-- todo -->
-							<image style="background-color: #FFFFFF;" src="http://139.9.103.171:8888/group1/M00/00/01/iwlnq1_AYZqAb30pAAAQNvkj3Wk302.png"></image>
+							<image src="http://139.9.103.171:8888/group1/M00/00/01/iwlnq1_AYZqAb30pAAAQNvkj3Wk302.png"></image>
 						</button>
 					</block>
-					<!-- todo -->
-					<image v-else style="background-color: #FFFFFF;" src="http://139.9.103.171:8888/group1/M00/00/01/iwlnq1_AYZqAb30pAAAQNvkj3Wk302.png"></image>
+					<image v-else src="http://139.9.103.171:8888/group1/M00/00/01/iwlnq1_AYZqAb30pAAAQNvkj3Wk302.png"></image>
 				</view>
 				<view v-if="isLogin" class="member_info">
 					<view class="member_name_box" style="margin-bottom: 20rpx;">
-						<view class="member_name">{{ userInfo.nickName }}</view>
+						<view class="member_name">{{ userDetail.username }}</view>
 					</view>
-					<view class="member_phone_box" >
-						<view class="member_phone">19124812874</view>
+					<view class="member_phone_box">
+						<!-- <view class="member_phone">{{shopPhone}}</view> -->
 					</view>
 				</view>
 				<view v-else class="no_login"><button class="no_login_btn">游客(未登录)</button></view>
@@ -109,31 +107,31 @@ export default {
 			//todo
 			gridList:[
 				{
-					icon:'../../static/index/blue/order.png',
+					icon:'../../static/wode/order.png',
 					title:"商城订单",
 					badge:0,
 					index:1
 				},
 				{
-					icon:'../../static/index/blue/cart.png',
+					icon:'../../static/wode/cart.png',
 					title:"购物车",
 					badge:0,
 					index:2
 				},
 				{
-					icon:'../../static/index/blue/wuye.png',
+					icon:'../../static/wode/wuye.png',
 					title:"报修业务",
 					badge:0,
 					index:3
 				},
 				{
-					icon:'../../static/index/blue/contact.png',
+					icon:'../../static/wode/contact.png',
 					title:"联系物业",
 					badge:0,
 					index:4
 				},
 				{
-					icon:'../../static/index/blue/msg.png',
+					icon:'../../static/wode/msg.png',
 					title:"消息通知",
 					badge:0,
 					index:5
@@ -150,42 +148,44 @@ export default {
 			mineItemList: [
 				{
 					itemName: '住户认证',
-					itemIcon: '/static/index/blue/renzheng.png',
+					itemIcon: '/static/wode/renzheng.png',
 					index:6
 				},
 				{
 					itemName: '通行人脸',
-					itemIcon: '/static/index/blue/face.png',
+					itemIcon: '/static/wode/face.png',
 					index:7
 				},
 				{
 					itemName: '身份信息',
-					itemIcon: '/static/index/blue/shenfen.png',
+					itemIcon: '/static/wode/shenfen.png',
 					index:8
 				},
 				{
 					itemName: '收货地址',
-					itemIcon: '/static/index/blue/address.png',
+					itemIcon: '/static/wode/address.png',
 					index:9
 				},
 			],
 			systemItemList:[
 				{
 					itemName: '问题反馈',
-					itemIcon: '/static/index/blue/fankui.png',
+					itemIcon: '/static/wode/fankui.png',
 					index:10
 				},
 				{
 					itemName: '帮助中心',
-					itemIcon: '/static/index/blue/shuoming.png',
+					itemIcon: '/static/wode/shuoming.png',
 					index:11
 				},
 				{
 					itemName: '设置',
-					itemIcon: '/static/index/blue/setting.png',
+					itemIcon: '/static/wode/setting.png',
 					index:12
 				}
 			],
+			//商城绑定的手机号
+			shopPhone:'',
 			memberId: '',
 			dataDetail: {},
 			orderStatusNum: {},
@@ -193,17 +193,7 @@ export default {
 			isLogin: false,
 		};
 	},
-	onShow() {
-		if(this.isFirst){
-			this.isFirst=false
-		}else{
-			this.login()
-		}
-	},
 	computed: {
-		orderState() {
-			return this.$global.orderState;
-		},
 		//社区begin
 		authStatus:{
 			  get(){
@@ -222,7 +212,6 @@ export default {
 	},
 	methods: {
 		async tapGetUserInfo(e) {
-			return
 			console.log(158, e);
 			if (e.detail.errMsg == 'getUserInfo:ok') {
 				let userInfo = e.detail.userInfo;
@@ -237,14 +226,12 @@ export default {
 		showLogin() {
 			this.$refs.dialogLogin.show();
 		},
-		// 登录成功响应事件
 		onSignIn(resp) {
+			this.shopPhone=this.$auth.getMineBase().user.mobile || ''
 			console.log(143, resp);
-			this.$util.refreshPage(['pages/home', 'pages/shop_car']);
 			this.onPullDownRefreshPage();
 		},
 		tapToWhich(aimUrl) {
-			return
 			if (!this.$auth.isAuth) {
 				this.showLogin();
 				return;
@@ -253,23 +240,30 @@ export default {
 				url: aimUrl
 			});
 		},
-		tapToOrder(state) {
-			return
+		tapToOrder() {
 			if (!this.$auth.isAuth) {
 				this.showLogin();
 				return;
 			}
 			uni.navigateTo({
-				url: '/pagesM/pages/mine_order_list?state=' + state
+				url: '/pagesM/pages/mine_order_list'
 			});
 		},
+		tapToCar(){
+			if (!this.$auth.isAuth) {
+				this.showLogin();
+				return;
+			}
+			uni.navigateTo({
+				url:'/pagesM/pages/shop_car'
+			})
+		},
 		onShareAppMessage: function(e) {
 			return {
 				path: '/pagesM/pages/home'
 			}
 		},
 		tapHeadMenu(index){
-			return
 			let url;
 			if(index==0){
 				url = '/pagesM/pages/coupon_list'
@@ -284,22 +278,18 @@ export default {
 		},
 		tapToMenu(index) {
 			let url=''
-			let flag=this.buttonMethod()
 			switch (index) { 
 				case 1: 
 					//商城订单
-					url="/pagesM/pages/mine_order_list"
+					this.tapToOrder()
 					break; 
 				case 2:
 					//购物车
-					uni.showToast({
-						title:"暂未开发",
-						icon:"none"
-					})
+					this.tapToCar()
 					break;
 				case 3: 
 					// 报修业务
-					if (flag) {
+					if (this.buttonMethod()) {
 						uni.navigateTo({
 						  url: '../services/property/list/list'
 						})
@@ -311,7 +301,7 @@ export default {
 					break;
 				case 5:
 					//消息通知
-					if (flag) {
+					if (this.buttonMethod()) {
 						uni.navigateTo({
 							url: '/pages/wode/news/news'
 						})
@@ -319,7 +309,7 @@ export default {
 					break;
 				case 6: 
 					//住户认证
-					if (flag) {
+					if (this.buttonMethod()) {
 						uni.navigateTo({
 							url:"myInfo/myInfo"
 						})
@@ -327,7 +317,11 @@ export default {
 					break;
 				case 7:
 					// 通行人脸
-					url="/pages/uploadFace/uploadFace"
+					if (this.buttonMethod()) {
+						uni.navigateTo({
+							url:"/pages/uploadFace/uploadFace"
+						})
+					}
 					break;
 				case 8:
 					// 身份信息
@@ -374,12 +368,24 @@ export default {
 			this.userDetail = resp.user || {};
 		},
 		onLoadPage() {
-			this.isFirst=true
+			wx.hideShareMenu();
+			this.communityInitData()
+			this.isLogin = this.$auth.isAuth;
+			this.memberId = this.$auth.getMemberId();
+			this.getMyBaseDatas();
 			// this.memberId = this.$auth.getMemberId();
 			// this.getMyBaseDatas();
 		},
-		
 		// 社区 begin
+		communityInitData(){
+			var that = this; //从全局变量中获取用户信息
+			if (app.globalData.member) {
+			  that.setData({
+			    state: app.globalData.member.state,
+			    anyHousePass: app.globalData.anyHousePass
+			  });
+			}
+		},
 		login(){
 			var that = this; //从全局变量中获取用户信息
 			if (app.globalData.userInfo == null) {
@@ -492,22 +498,37 @@ export default {
 		},
 		// 社区 end
 	},
-	onLoad() {
-		wx.showShareMenu({
-		  withShareTicket: true
-		})
-	},
 	onReady() {
-		// if (!this.$auth.isAuth) {
-		// 	this.showLogin();
-		// 	return;
-		// } else {
-		// 	this.$refs.dialogLogin.hide();
-		// }
+		if (!this.$auth.isAuth) {
+			this.showLogin();
+			return;
+		} else {
+			this.$refs.dialogLogin.hide();
+		}
 	},
 	onShow() {
+		//小程序audit期间隐藏掉
+		let appletType= uni.getStorageSync('appletType')
+		let tmp=this.mineItemList
+		if (appletType=='0') {
+			this.mineItemList.splice(1,1)
+			this.mineItemList.splice(1,1)
+		}else{
+			this.mineItemList=tmp
+		}
+		
+		
+		if (this.isFirst) {
+			this.isFirst=false
+		}else{
+			
+		}
 		this.onShowPage();
-		this.login()
+		wx.hideShareMenu();
+		this.communityInitData()
+		this.isLogin = this.$auth.isAuth;
+		this.memberId = this.$auth.getMemberId();
+		this.getMyBaseDatas();
 	},
 	onPullDownRefresh() {
 		this.onPullDownRefreshPage();

pages/wode/wode2.vue

@@ -23,7 +23,7 @@
 				</view>
 				<view v-else class="no_login"><button class="no_login_btn">游客(未登录)</button></view>
 				<view style="flex:1"></view>
-				<image src="/static/test/item_setting_icon.png" mode="aspectFit" @tap.stop="tapOther(1)" style="width: 56upx;height: 56upx;"></image>
+				<image src="/static/wode/item_setting_icon.png" mode="aspectFit" @tap.stop="tapOther(1)" style="width: 56upx;height: 56upx;"></image>
 			</view>
 			<view style="display: flex;margin: 22upx 64upx 0;justify-content: space-between;">
 				<view  @tap="tapHeadMenu(0)" style="text-align: center;">

pagesM/comps/dt_login.vue

@@ -5,7 +5,7 @@
 		  <view class="dt-login-wrap">
 		    <view class="title">您还没登录</view>
 		    <view class="subtitle">请先登录再进行操作</view>
-		    <image class="login-icon" src="/static/login1.png" ></image>
+		    <image class="login-icon" src="/static/common/login.png" ></image>
 			
 		    <view class="btn-wrap">
 		      <button class="btn-base" 

pagesM/comps/dt_scroll_tab.vue

@@ -102,7 +102,7 @@ export default {
       // padding:0 44upx;
     }
     .tab-item.active{
-      color:$dt-color-primary;
+      color:$base;
     }
     .tab-item.active-line:before{
       position:absolute;
@@ -112,7 +112,7 @@ export default {
       width:80upx;
       height:4upx;
       border-radius:2upx;
-      background-color:$dt-color-primary;
+      background-color:$base;
       content:'';
     }
     // .tab-item.active:before{

pagesM/comps/dt_service.vue

@@ -26,7 +26,7 @@ export default {
     width:80upx;
     height:80upx;
     border-radius:50%;
-    background-color:$dt-color-primary;
+    background-color:$base;
   }
 }
 </style>

pagesM/comps/foot_goods_book.vue

@@ -180,7 +180,7 @@ export default {
 					padding-left: 10upx;
 					padding-top: 7upx;
 					font-size: 48upx;
-					color: #d32222;
+					color: #2f7ff5;;
 				}
 			}
 			.sku-params {
@@ -219,8 +219,8 @@ export default {
 					margin-bottom: 10upx;
 				}
 				.active {
-					background-color:$dt-color-primary;
-					border: 2upx solid $dt-color-primary;
+					background-color:$base;
+					border: 2upx solid $base;
 					color: #fff;
 					opacity: 1;
 				}
@@ -287,7 +287,7 @@ export default {
 			color: #fff;
 			border-radius: 6upx;
 			text-align: center;
-			background: $dt-color-primary;
+			background: $base;
 		}
 	}
 	.book-close {

pagesM/pages/ad_apply_organ.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<image src="https://wap.lezhuapp.com/visit/upload/image/202008/d1c278aa-c586-4832-ad3a-e252d9b6a317.jpg" mode="widthFix" style="width: 100%;" @tap="click"></image>
+		<image src="" mode="widthFix" style="width: 100%;" @tap="click"></image>
 	</view>
 </template>
 

pagesM/pages/browse_records.vue

@@ -1,15 +1,19 @@
 <template>
   <view class="dt-page">
-    <block v-if="emptyType == 0">
-		<view style="height: 20upx;"></view>
-      <view class="data_wrap" v-for="(item,index) in dataList" :key="index">
-		 <view style="background-color: #f2f2f2;height: 70upx;line-height: 70upx;padding-left: 20upx;margin-bottom: 20upx;color: #999;">{{item.time}}</view>
-        <!-- <DtGoodsList :dataList="item.datas" /> -->
-		<DtRecommendGoodsList :dataList="item.datas"></DtRecommendGoodsList>
-      </view>
-      <DtNoMore v-if="isNoMore" />
-    </block>
-    <DtEmpty :type="emptyType" />
+    <view class="" v-if="appletType==1">
+    	<block v-if="emptyType == 0">
+    		<view style="height: 20upx;"></view>
+    	  <view class="data_wrap" v-for="(item,index) in dataList" :key="index">
+    		 <view style="background-color: #f2f2f2;height: 70upx;line-height: 70upx;padding-left: 20upx;margin-bottom: 20upx;color: #999;">{{item.time}}</view>
+    	    <!-- <DtGoodsList :dataList="item.datas" /> -->
+    		<DtRecommendGoodsList :dataList="item.datas"></DtRecommendGoodsList>
+    	  </view>
+    	  <DtNoMore v-if="isNoMore" />
+    	</block>
+    	<DtEmpty :type="emptyType" />
+    </view>
+	
+	<u-empty v-else margin-top="300" text="内容为空" mode="list"></u-empty>
   </view>
 </template>
 <script>
@@ -27,6 +31,9 @@ export default {
   },
   data() {
     return {
+		//小程序审核状态
+	  appletType:0,
+		
       dataList: [],
       memberId: 0
     }
@@ -54,6 +61,7 @@ export default {
     },
   },
   onShow() {
+	this.appletType= uni.getStorageSync('appletType')
     this.onShowPage()
   },
   onReachBottom() {

pagesM/pages/coupon_list.vue

@@ -32,7 +32,7 @@
 	bottom: 0;
 	left: 0;
 	right: 0;
-	background-color: #DB4444;
+	background-color: #2f7ff5;
 	height: 90upx;
 	line-height: 90upx;
 	text-align: center;
@@ -214,7 +214,7 @@ export default {
       width: 30%;
     }
     .tab-item.active {
-      color: $dt-color-primary; 
+      color: $base; 
       position: relative;
       width: 30%;
       font-weight: 600;
@@ -224,7 +224,7 @@ export default {
       display: block;
       height: 4upx;
       width: 30%;
-      background: $dt-color-primary;
+      background: $base;
       position: absolute;
       bottom: 0;
       left: 34%;

pagesM/pages/goods_des.vue

@@ -769,6 +769,9 @@ export default {
 			}
 		},
 		showPoster() {
+			this.$u.toast('未开放')
+			return
+			
 			if (this.isclick) {
 				return;
 			}
@@ -782,7 +785,6 @@ export default {
 			if(this.$auth.isPromoter(true)){
 				inviteCode = this.$auth.getMemberId();
 			}
-			// let path = `https://wap.lezhuapp.com/wapp/qrcode/pages/home?type=share&id=${this.base.id}&storeId=${this.base.store.id}&path=${currentPage.route}&inviteCode=${inviteCode}`;
 			let path = `https://wap.lezhuapp.com/wapp/qrcode/`;
 			let param = encodeURI(`type=share&id=${this.base.id}&storeId=${this.base.store.id}&path=${currentPage.route}&inviteCode=${inviteCode}`)
 			this.qrval = path + param;

pagesM/pages/goods_des_old.vue

@@ -770,11 +770,13 @@ export default {
 			}
 		},
 		showPoster() {
+			this.$u.toast('未开放')
+			return
+			
 			if (this.isclick) {
 				return;
 			}
 			this.isclick = true;
-			
 			// 获取页面path
 			let pages = getCurrentPages(); //获取加载的页面
 			let currentPage = pages[pages.length - 1]; //获取当前页面的对象
@@ -783,7 +785,6 @@ export default {
 			if(this.$auth.isPromoter(true)){
 				inviteCode = this.$auth.getMemberId();
 			}
-			// let path = `https://wap.lezhuapp.com/wapp/qrcode/pages/home?type=share&id=${this.base.id}&storeId=${this.base.store.id}&path=${currentPage.route}&inviteCode=${inviteCode}`;
 			let path = `https://wap.lezhuapp.com/wapp/qrcode/`;
 			let param = encodeURI(`type=share&id=${this.base.id}&storeId=${this.base.store.id}&path=${currentPage.route}&inviteCode=${inviteCode}`)
 			this.qrval = path + param;

pagesM/pages/mine_info.vue

@@ -241,7 +241,7 @@ export default {
     height: 90upx;
     line-height: 90upx;
     border-radius:10upx;
-    background-color:$dt-color-primary;
+    background-color:$base;
   }
   .hidden{
     opacity:0;

pagesM/pages/mine_setting.vue

@@ -42,6 +42,7 @@ export default {
     //退出登录
     logout() {
       this.$auth.logout()
+	  this.touristLogin()
 	  uni.switchTab({
 	  	url:"/pages/wode/wode"
 	  })
@@ -57,6 +58,19 @@ export default {
         }
       })
     },
+	/**
+	 * 游客登陆
+	 */
+	async touristLogin() {
+	  // 检查是否登录
+	  if (!this.$auth.isAuth) { // 就算是游客，也重新登录
+	    let resp = await this.$api.touristLogin()
+		console.log("Resp",resp);
+	    let userType = this.$global.userType.tourist
+	    this.$auth.login(userType, resp.sessionId, resp.userId, resp)
+	    console.log('游客登录成功!', resp)
+	  } 
+	},
     onLoadPage() {
 	  wx.hideShareMenu();
       // this.memberInfo = this.$auth.getMemberInfo()

server.prod.json

@@ -1,6 +1,6 @@
 {
     "version": "1.0.0",
-    "apiUrl": "https://ycapp.58fo.com/online",
+	"apiUrl": "https://community.58fo.com/etrade",
     "miniappCode":"30010103",
     "storeId": "10001",
     "account": "13800000000",