代码更新

App.vue

@@ -10,13 +10,10 @@
 			console.log('App Hide')
 		},
 		created(){
-		
+			
 		},
 		methods:{
-			//获取token 接口
-			getToken(){
-				
-			}
+		
 		}
 	}
 </script>

components/lb-picker/README.md

@@ -18,7 +18,19 @@ H5 + 各平台小程序（百度除外）
 4、自定义选择器头部确定取消按钮颜色及插槽支持  
 5、选择器可视区自定义滚动个数  
 6、自定义数据字段，满足不同人的需求  
-7、自定义选择器样式
+7、自定义选择器样式  
+8、单选及非联动选择支持扁平化的简单数据，如下形式：
+
+```javascript
+// 单选列表
+list1: ['选项1', '选项2', '选项2'],
+// 非联动选择列表
+list2: [
+  ['选项1', '选项2', '选项3'],
+  ['选项11', '选项22', '选项33'],
+  ['选项111', '选项222', '选项333']
+]
+```
 
 ## 引入插件
 
@@ -58,6 +70,88 @@ npm install uni-lb-picker
 import LbPicker from 'uni-lb-picker'
 ```
 
+## 选择器数据格式
+
+### 单选
+
+常规数据
+
+```javascript
+list: [
+  {
+    label: '选项1',
+    value: '1'
+  },
+  {
+    label: '选项2',
+    value: '2'
+  }
+]
+```
+
+扁平化简单数据
+
+```javascript
+list: ['选项1', '选项2']
+```
+
+### 多级联动
+
+```javascript
+list: [
+  {
+    label: '选项1',
+    value: '1',
+    children: [
+      {
+        label: '选项1-1',
+        value: '1-1',
+        children: [
+          {
+            label: '选项1-1-1',
+            value: '1-1-1'
+          }
+        ]
+      }
+    ]
+  }
+]
+```
+
+### 非联动选择
+
+常规数据
+
+```javascript
+list: [
+  [
+    { label: '选项1', value: '1' },
+    { label: '选项2', value: '2' },
+    { label: '选项3', value: '3' }
+  ],
+  [
+    { label: '选项11', value: '11' },
+    { label: '选项22', value: '22' },
+    { label: '选项33', value: '33' }
+  ],
+  [
+    { label: '选项111', value: '111' },
+    { label: '选项222', value: '222' },
+    { label: '选项333', value: '333' }
+  ]
+]
+```
+
+扁平化简单数据
+
+```javascript
+list: [
+  ['选项1', '选项2', '选项3'],
+  ['选项11', '选项22', '选项33'],
+  ['选项111', '选项222', '选项333']
+]
+```
+
 ## 调用显示选择器
 
 通过`ref`形式手动调用`show`方法显示，隐藏同理调用`hide`
@@ -108,7 +202,7 @@ this.$refs.picker2.show() // picker2显示
 为了满足不同人的需求，插件支持自定义数据字段名称， 插件默认的数据字段如下形式：
 
 ```javascript
-;[
+list: [
   {
     label: '选择1',
     value: 1,
@@ -125,7 +219,7 @@ this.$refs.picker2.show() // picker2显示
 如果你的数据字段和上面不一样，如下形式：
 
 ```javascript
-;[
+list: [
   {
     text: '选择1',
     id: 1,
@@ -161,7 +255,7 @@ data () {
 
 ```html
 <lb-picker>
-  <view slot="cancle-text">我是自定义取消</view>
+  <view slot="cancel-text">我是自定义取消</view>
   <view slot="confirm-text">我是自定义确定</view>
 </lb-picker>
 ```
@@ -172,24 +266,30 @@ data () {
 
 ### Props
 
-| 参数                    | 说明                                                    | 类型                | 可选值                                                           | 默认值                                            |
-| :---------------------- | :------------------------------------------------------ | :------------------ | :--------------------------------------------------------------- | :------------------------------------------------ |
-| value/v-model           | 绑定值，联动选择为 Array 类型                           | String/Number/Array | -                                                                | -                                                 |
-| mode                    | 选择器类型，支持单列，多列联动                          | String              | selector 单选/multiSelector 多级联动/unlinkedSelector 多级非联动 | selector                                          |
-| list                    | 选择器数据                                              | Array               | -                                                                | -                                                 |
-| level                   | 多列联动层级，仅 mode 为 multiSelector 有效             | Number              | -                                                                | 2                                                 |
-| props                   | 自定义数据字段                                          | Object              | -                                                                | {label:'label',value:'value',children:'children'} |
-| cancle-text             | 取消文字                                                | String              | -                                                                | 取消                                              |
-| cancle-color            | 取消文字颜色                                            | String              | -                                                                | #999999                                           |
-| confirm-text            | 确定文字                                                | String              | -                                                                | 确定                                              |
-| confirm-color           | 确定文字颜色                                            | String              | -                                                                | #007aff                                           |
-| column-num              | 可视滚动区域内滚动个数，最好设置奇数值                  | Number              | -                                                                | 5                                                 |
-| radius                  | 选择器顶部圆角，支持 rpx，如 radius="10rpx"             | String              | -                                                                | -                                                 |
-| ~~column-style~~        | 选择器默认样式(已弃用，见下方自定义样式说明)            | Object              | -                                                                | -                                                 |
-| ~~active-column-style~~ | 选择器选中样式(已弃用，见下方自定义样式说明)            | Object              | -                                                                | -                                                 |
-| loading                 | 选择器是否显示加载中，可使用 loading 插槽自定义加载效果 | Boolean             | -                                                                | -                                                 |
-| mask-color              | 遮罩层颜色                                              | String              | -                                                                | rgba(0, 0, 0, 0.4)                                |
-| close-on-click-mask     | 点击遮罩层是否关闭选择器                                | Boolean             | true/false                                                       | true                                              |
+| 参数                    | 说明                                                                                        | 类型                | 可选值                                                           | 默认值                                            |
+| :---------------------- | :------------------------------------------------------------------------------------------ | :------------------ | :--------------------------------------------------------------- | :------------------------------------------------ |
+| value/v-model           | 绑定值，联动选择为 Array 类型                                                               | String/Number/Array | -                                                                | -                                                 |
+| mode                    | 选择器类型，支持单列，多列联动                                                              | String              | selector 单选/multiSelector 多级联动/unlinkedSelector 多级非联动 | selector                                          |
+| list                    | 选择器数据(v1.0.7 单选及非联动多选支持扁平数据：['选项 1', '选项 2'])                       | Array               | -                                                                | -                                                 |
+| level                   | 多列联动层级，仅 mode 为 multiSelector 有效                                                 | Number              | -                                                                | 2                                                 |
+| props                   | 自定义数据字段                                                                              | Object              | -                                                                | {label:'label',value:'value',children:'children'} |
+| cancel-text             | 取消文字                                                                                    | String              | -                                                                | 取消                                              |
+| cancel-color            | 取消文字颜色                                                                                | String              | -                                                                | #999                                              |
+| confirm-text            | 确定文字                                                                                    | String              | -                                                                | 确定                                              |
+| confirm-color           | 确定文字颜色                                                                                | String              | -                                                                | #007aff                                           |
+| empty-text              | (v1.0.7 新增)选择器列表为空的时候显示的文字                                                 | String              | -                                                                | 暂无数据                                          |
+| empty-color             | (v1.0.7 新增)暂无数据文字颜色                                                               | String              | -                                                                | #999                                              |
+| column-num              | 可视滚动区域内滚动个数，最好设置奇数值                                                      | Number              | -                                                                | 5                                                 |
+| radius                  | 选择器顶部圆角，支持 rpx，如 radius="10rpx"                                                 | String              | -                                                                | -                                                 |
+| ~~column-style~~        | ~~选择器默认样式(已弃用，见下方自定义样式说明)~~                                            | Object              | -                                                                | -                                                 |
+| ~~active-column-style~~ | ~~选择器选中样式(已弃用，见下方自定义样式说明)~~                                            | Object              | -                                                                | -                                                 |
+| loading                 | 选择器是否显示加载中，可使用 loading 插槽自定义加载效果                                     | Boolean             | -                                                                | -                                                 |
+| mask-color              | 遮罩层颜色                                                                                  | String              | -                                                                | rgba(0, 0, 0, 0.4)                                |
+| close-on-click-mask     | 点击遮罩层是否关闭选择器                                                                    | Boolean             | true/false                                                       | true                                              |
+| ~~change-on-init~~      | ~~(v1.0.7 已弃用)初始化时是否触发 change 事件~~                                             | Boolean             | true/false                                                       | -                                                 |
+| dataset                 | (v1.0.7 新增)可以向组件中传递任意的自定义的数据，在`confirm`或`change`事件中可以取到        | Object              | -                                                                | -                                                 |
+| show-header             | (v1.0.8 新增)是否显示选择器头部                                                             | Boolean             | -                                                                | - true                                            |
+| inline                  | (v1.0.8 新增)inline 模式，开启后默认显示选择器，无需点击弹出，可以配合`show-header`一起使用 | Boolean             | -                                                                | -                                                 |
 
 ### 方法
 
@@ -200,26 +300,51 @@ data () {
 
 ### Events
 
-| 事件名称 | 说明                                     | 回调参数                                                                                                                                                                                                                                                             |
-| :------- | :--------------------------------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| show     | 选择器打开时触发                         | -                                                                                                                                                                                                                                                                    |
-| hide     | 选择器隐藏时触发                         | -                                                                                                                                                                                                                                                                    |
-| change   | 选择器滚动时触发，此时不会改变绑定的值   | `{ index, item, value }` `index`触发滚动后新的索引，单选时是具体的索引值，多列联动选择时为数组。`item`触发滚动后新的的完整内容，包裹`label`、`value`等，单选时为对象，多列选择时为数组对象。`value`触发滚动后新的 value 值，单列选择时为具体值，多列联动选择时为数组 |
-| confirm  | 点击选择器确定时触发，此时会改变绑定的值 | 同上`change`事件说明                                                                                                                                                                                                                                                 |
-| cancle   | 点击选择器取消时触发                     | 同上`change`事件说明                                                                                                                                                                                                                                                 |
+| 事件名称 | 说明                                     | 回调参数                                                                                                                                                                                                                                                                                                                             |
+| :------- | :--------------------------------------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| show     | 选择器打开时触发                         | -                                                                                                                                                                                                                                                                                                                                    |
+| hide     | 选择器隐藏时触发                         | -                                                                                                                                                                                                                                                                                                                                    |
+| change   | 选择器滚动时触发，此时不会改变绑定的值   | `{ index, item, value, change }` `index`触发滚动后新的索引，单选时是具体的索引值，多列联动选择时为数组。`item`触发滚动后新的的完整内容，包括`label`、`value`等，单选时为对象，多列选择时为数组对象。`value`触发滚动后新的 value 值，单列选择时为具体值，多列联动选择时为数组。`change`触发事件的类型，详情参考下面的 change 事件备注 |
+| confirm  | 点击选择器确定时触发，此时会改变绑定的值 | 同上`change`事件说明                                                                                                                                                                                                                                                                                                                 |
+| cancel   | 点击选择器取消时触发                     | 同上`change`事件说明                                                                                                                                                                                                                                                                                                                 |
+
+### `change` 事件备注
+
+如果绑定的值是空的，`change`触发后里面的内容都是列表的第一项。  
+`change`事件会在以下情况触发：
+
+- 初始化
+- 绑定值 value 变化
+- 选择器 list 列表变化
+- 滚动选择器
+
+以上情况会在回调函数中都可以取到`change`变化的类型，对应上面的情况包括以下：
+
+- `init`
+- `value`
+- `list`
+- `scroll`
+
+根据这些类型大家可以在`change`的时候按需处理自己的业务逻辑，比如一种常见的情况，有默认值的时候需要显示默认值的文字，此时可以`change`事件中判断`change`的类型是否是`init`，如果是的话可以取事件回调中的`item`进行显示绑定值对应的文字信息。
+
+```javascript
+handleChange (e) {
+  if (e.change === 'init') {
+    console.log(e.item.label) // 单选 选项1
+    console.log(e.item.map(item => item.label).join('-')) // 多选 选项1-选项11
+  }
+}
+```
 
 ### 插槽
 
 | 插槽名        | 说明                |
 | :------------ | :------------------ |
-| cancle-text   | 选择器取消文字插槽  |
+| cancel-text   | 选择器取消文字插槽  |
 | action-center | 选择器顶部中间插槽  |
 | confirm-text  | 选择器确定文字插槽  |
 | loading       | 选择器 loading 插槽 |
-
-## 其他
-
-其他功能参考示例 Demo 代码。
+| empty         | 选择器 空数据 插槽  |
 
 ### 选择器自定义样式
 
@@ -264,3 +389,7 @@ handleConfirm (e) {
 ## Tips
 
 微信小程序端，滚动时在 iOS 自带振动反馈，可在系统设置 -> 声音与触感 -> 系统触感反馈中关闭
+
+## 其他
+
+其他功能参考示例 Demo 代码。

components/lb-picker/index.vue

@@ -1,24 +1,28 @@
 <template>
-  <view class="lb-picker">
+  <view :class="['lb-picker', inline ? 'lb-picker-inline' : '']">
     <view class="lb-picker-mask"
-      v-show="visible"
+      v-show="visible && !inline"
       :style="{ 'background-color': maskColor }"
-      @tap="handleMaskTap">
+      @tap.stop="handleMaskTap"
+      @touchmove.stop.prevent="moveHandle">
     </view>
     <view :class="['lb-picker-container', visible ? 'lb-picker-toggle' : '']"
-      :style="{borderRadius: `${radius} ${radius} 0 0`}">
-      <view class="lb-picker-header"
-        :style="{height: pickerHeaderHeight, 'line-height': pickerHeaderHeight}">
+      :style="{ borderRadius: `${radius} ${radius} 0 0` }">
+      <view v-if="showHeader"
+        class="lb-picker-header"
+        :style="{
+          height: pickerHeaderHeight,
+          'line-height': pickerHeaderHeight
+        }">
         <view class="lb-picker-action lb-picker-left">
-          <view class="lb-picker-action-cancle"
-            @tap="handleCancle">
-            <slot v-if="$slots['cancle-text']"
-              name="cancle-text">
-            </slot>
+          <view class="lb-picker-action-cancel"
+            @tap.stop="handleCancel">
+            <slot v-if="$slots['cancel-text']"
+              name="cancel-text"> </slot>
             <view v-else
-              class="action-cancle-text"
-              :style="{color: cancleColor}">
-              {{ cancleText }}
+              class="action-cancel-text"
+              :style="{ color: cancelColor }">
+              {{ cancelText }}
             </view>
           </view>
         </view>
@@ -30,21 +34,19 @@
 
         <view class="lb-picker-action lb-picker-right">
           <view class="lb-picker-action-confirm"
-            @tap="handleConfirm">
+            @tap.stop="handleConfirm">
             <slot v-if="$slots['confirm-text']"
-              name="confirm-text">
-            </slot>
+              name="confirm-text"> </slot>
             <view v-else
               class="action-confirm-text"
-              :style="{color: confirmColor}">
+              :style="{ color: confirmColor }">
               {{ confirmText }}
             </view>
           </view>
         </view>
       </view>
       <view class="lb-picker-content"
-        :style="{height: pickerContentHeight}">
-
+        :style="{ height: pickerContentHeight }">
         <!-- loading -->
         <view v-if="loading"
           class="lb-picker-loading">
@@ -53,33 +55,47 @@
           </slot>
         </view>
 
+        <!-- 暂无数据 -->
+        <view v-if="isEmpty && !loading"
+          class="lb-picker-empty">
+          <slot name="empty">
+            <text class="lb-picker-empty-text"
+              :style="{ color: emptyColor }">
+              {{ emptyText }}
+            </text>
+          </slot>
+        </view>
+
         <!-- 单选 -->
-        <selector-picker v-if="mode === 'selector' && !loading"
+        <selector-picker v-if="mode === 'selector' && !loading && !isEmpty"
           :value="value"
           :list="list"
           :props="pickerProps"
           :height="pickerContentHeight"
+          :inline="inline"
           @change="handleChange">
         </selector-picker>
 
         <!-- 多列联动 -->
-        <multi-selector-picker v-if="mode === 'multiSelector' && !loading"
+        <multi-selector-picker v-if="mode === 'multiSelector' && !loading && !isEmpty"
           :value="value"
           :list="list"
           :level="level"
           :visible="visible"
           :props="pickerProps"
           :height="pickerContentHeight"
+          :inline="inline"
           @change="handleChange">
         </multi-selector-picker>
 
         <!-- 非联动选择 -->
-        <unlinked-selector-picker v-if="mode === 'unlinkedSelector' && !loading"
+        <unlinked-selector-picker v-if="mode === 'unlinkedSelector' && !loading && !isEmpty"
           :value="value"
           :list="list"
           :visible="visible"
           :props="pickerProps"
           :height="pickerContentHeight"
+          :inline="inline"
           @change="handleChange">
         </unlinked-selector-picker>
       </view>
@@ -89,9 +105,9 @@
 
 <script>
 const defaultProps = {
-	label: 'label',
-	value: 'value',
-	children: 'children'
+  label: 'label',
+  value: 'value',
+  children: 'children'
 }
 import { getIndicatorHeight } from './utils'
 import SelectorPicker from './pickers/selector-picker'
@@ -99,117 +115,141 @@ import MultiSelectorPicker from './pickers/multi-selector-picker'
 import UnlinkedSelectorPicker from './pickers/unlinked-selector-picker'
 const indicatorHeight = getIndicatorHeight()
 export default {
-	components: {
-		SelectorPicker,
-		MultiSelectorPicker,
-		UnlinkedSelectorPicker
-	},
-	props: {
-		value: [String, Number, Array],
-		list: Array,
-		mode: {
-			type: String,
-			default: 'selector'
-		},
-		level: {
-			type: Number,
-			default: 2
-		},
-		props: {
-			type: Object
-		},
-		cancleText: {
-			type: String,
-			default: '取消'
-		},
-		cancleColor: String,
-		confirmText: {
-			type: String,
-			default: '确定'
-		},
-		confirmColor: String,
-		canHide: {
-			type: Boolean,
-			default: true
-		},
-		radius: String,
-		columnNum: {
-			type: Number,
-			default: 5
-		},
-		loading: Boolean,
-		closeOnClickMask: {
-			type: Boolean,
-			default: true
-		},
-		maskColor: {
-			type: String,
-			default: 'rgba(0, 0, 0, 0.4)'
-		}
-	},
-	data(){
-		return {
-			visible: false,
-			myValue: this.value,
-			picker: {},
-			pickerProps: Object.assign({}, defaultProps, this.props),
-			pickerHeaderHeight: indicatorHeight + 'px',
-			pickerContentHeight: indicatorHeight * (this.columnNum) + 'px'
-		}
-	},
-	methods: {
-		show () {
-			this.visible = true
-		},
-		hide () {
-			this.visible = false
-		},
-		handleCancle () {
-			this.$emit('cancle', this.picker)
-			if (this.canHide) {
-				this.hide()
-			}
-		},
-		handleConfirm () {
-			const picker = JSON.parse(JSON.stringify(this.picker))
-			this.myValue = picker.value
-			this.$emit('confirm', this.picker)
-			if (this.canHide) {
-				this.hide()
-			}
-		},
-		handleChange ({ value, item, index, init }) {
-			this.picker.value = value
-			this.picker.item = item
-			this.picker.index = index
-			if (!init) {
-				this.$emit('change', this.picker)
-			}
-		},
-		handleMaskTap () {
-			if (this.closeOnClickMask) {
-				this.visible = false
-			}
-		}
-	},
-	watch: {
-		value (newVal) {
-			this.myValue = newVal
-		},
-		myValue (newVal) {
-			this.$emit('input', newVal)
-		},
-		visible (newVisible) {
-			if (newVisible) {
-				this.$emit('show')
-			} else {
-				this.$emit('hide')
-			}
-		}
-	}
+  components: {
+    SelectorPicker,
+    MultiSelectorPicker,
+    UnlinkedSelectorPicker
+  },
+  props: {
+    value: [String, Number, Array],
+    list: Array,
+    mode: {
+      type: String,
+      default: 'selector'
+    },
+    level: {
+      type: Number,
+      default: 1
+    },
+    props: {
+      type: Object
+    },
+    cancelText: {
+      type: String,
+      default: '取消'
+    },
+    cancelColor: String,
+    confirmText: {
+      type: String,
+      default: '确定'
+    },
+    confirmColor: String,
+    canHide: {
+      type: Boolean,
+      default: true
+    },
+    emptyColor: String,
+    emptyText: {
+      type: String,
+      default: '暂无数据'
+    },
+    radius: String,
+    columnNum: {
+      type: Number,
+      default: 5
+    },
+    loading: Boolean,
+    closeOnClickMask: {
+      type: Boolean,
+      default: true
+    },
+    maskColor: {
+      type: String,
+      default: 'rgba(0, 0, 0, 0.4)'
+    },
+    dataset: Object,
+    inline: Boolean,
+    showHeader: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data () {
+    return {
+      visible: false,
+      myValue: this.value,
+      picker: {},
+      pickerProps: Object.assign({}, defaultProps, this.props),
+      pickerHeaderHeight: indicatorHeight + 'px',
+      pickerContentHeight: indicatorHeight * this.columnNum + 'px'
+    }
+  },
+  computed: {
+    isEmpty () {
+      if (!this.list) return true
+      if (this.list && !this.list.length) return true
+      return false
+    }
+  },
+  methods: {
+    show () {
+      if (this.inline) return
+      this.visible = true
+    },
+    hide () {
+      if (this.inline) return
+      this.visible = false
+    },
+    handleCancel () {
+      this.$emit('cancel', this.picker)
+      if (this.canHide && !this.inline) {
+        this.hide()
+      }
+    },
+    handleConfirm () {
+      if (this.isEmpty) {
+        this.$emit('confirm', null)
+        this.hide()
+      } else {
+        const picker = JSON.parse(JSON.stringify(this.picker))
+        this.myValue = picker.value
+        this.$emit('confirm', this.picker)
+        if (this.canHide) this.hide()
+      }
+    },
+    handleChange ({ value, item, index, change }) {
+      this.picker.value = value
+      this.picker.item = item
+      this.picker.index = index
+      this.picker.change = change
+      this.picker.dataset = this.dataset || {}
+      this.$emit('change', this.picker)
+    },
+    handleMaskTap () {
+      if (this.closeOnClickMask) {
+        this.visible = false
+      }
+    },
+    moveHandle () {}
+  },
+  watch: {
+    value (newVal) {
+      this.myValue = newVal
+    },
+    myValue (newVal) {
+      this.$emit('input', newVal)
+    },
+    visible (newVisible) {
+      if (newVisible) {
+        this.$emit('show')
+      } else {
+        this.$emit('hide')
+      }
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import "./style/picker.scss";
-</style>
+</style>

components/linzq-citySelect/linzq-citySelect.vue

@@ -149,11 +149,16 @@
 		methods: {
 			// 获取城市接口
 			getCityData() {
+				uni.showLoading({
+					mask:true,
+					title:'加载中'
+				})
 				this.http.httpRequest('/wxapplet/ownersid/BaseArea/list', 'get', {
 					layer: 2
 				}, true).then((res) => {
 					console.log(res)
 					if (res.code == 0) {
+						uni.hideLoading()
 						this.citys = res.data.rows
 						//获取city.js 的程序字母
 						var mu = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'j', 'k', 'l', 'm', 'n', 'p', 'q', 'r', 's', 't', 'w', 'x',
@@ -177,11 +182,14 @@
 							}
 						}
 					} else {
+						uni.hideLoading()
 						uni.showToast({
 							title: res.msg,
 							'icon': 'none'
 						})
 					}
+				}).catch(()=>{
+					uni.hideLoading()
 				})
 			},
 			// 选择当前定位的

pages.json

@@ -302,7 +302,7 @@
 			"style": {
 				"navigationBarTitleText": "我的家人",
 				"navigationBarTextStyle": "black",
-				 "disableScroll":true,
+				 // "disableScroll":true,
 				  "app-plus":{
 				             "bounce":"none"
 				         }

pages/authentication/checkIng.vue

@@ -16,7 +16,12 @@
 			return{
 				
 			}
-		}
+		},
+		onUnload() {
+			uni.switchTab({
+				url: '../mine/mine',
+			})
+		},
 	}
 </script>
 

pages/authentication/selectHouse.vue

@@ -64,7 +64,7 @@
 			<view class="bottom"></view>
 		</view>
 		<!-- 发表按钮 -->
-		<button class="btn" @tap="submit" :class="{active:form.houseName&&form.lou&&form.hoodNum&&form.home}" :loading="isLoading">发表</button>
+		<button class="btn" @tap="submit" :class="{active:form.houseName&&form.lou&&form.hoodNum&&form.home}" >发表</button>
 		<!-- 选择小区名称组件 -->
 		<lb-picker ref="houseName" :props="typeProps" :list="houseData" @confirm="confirm"></lb-picker>
 		<!-- 选择楼层组件 -->
@@ -198,6 +198,7 @@
 				this.form.hoodNum = ''
 				this.form.home = ''
 				this.lou = ''
+				this.form.ceng=''
 				this.ceng=''
 				this.hoodNum = '',
 					this.home = ''
@@ -211,7 +212,9 @@
 				this.form.hoodNum = '' //单元号
 				this.form.home = ''
 				this.hoodNum = '',
-					this.home = ''
+				this.home = ''
+				this.form.ceng=''
+				this.ceng=''
 				this.form.lou = data.item.name
 				this.lou = data.item.id
 				this.getLouData(this.name, 2, this.lou, '单元')
@@ -220,8 +223,11 @@
 			confirmHoodNum(data) {
 				this.form.home = ''
 				this.home = ''
+				this.form.ceng=''
 				this.ceng=''
+				
 				this.form.hoodNum = data.item.name
+				console.log(data)
 				this.hoodNum = data.item.id
 				this.getLouData(this.name, 3,this.hoodNum , '层')
 				
@@ -230,7 +236,10 @@
 			submit() {
 				// 判断信息是否选择完整
 				if (this.form.houseName && this.form.lou && this.form.hoodNum && this.form.home && this.form.ceng) {
-					this.isLoading = true
+					uni.showLoading({
+						mask:true,
+						title:'加载中'
+					})
 					 this.http.httpRequest('/wxapplet/ownersidpeoinfor/add','post',{
 						 phoneNum:uni.getStorageSync('phoneNumber'),
 						 cardNo:uni.getStorageSync('idNumber'),
@@ -239,27 +248,30 @@
 					 }).then((res)=>{
 						 if(res.code==0){
 							 uni.setStorageSync('homeId',this.home)
-							 let str=this.form.houseName+this.form.lou+this.form.hoodNum+this.form.ceng+this.form.home
+							 let str=this.form.houseName+this.form.lou+this.form.hoodNum+this.form.home
 							 uni.setStorageSync('homeAdress',str)
 							 // 判断认证房屋时  是否已经微信授权登录过了
 							 if (!uni.getStorageSync('createBy')) {
 							 	uni.navigateTo({
 							 		url: '../login/authorization'
 							 	})
-							 } else {
-							 	uni.navigateTo({
-							 		url: '../mine/myHouse'
+							 } else { 
+							 	uni.switchTab({
+							 	url: '../mine/mine'	
 							 	})
 							 }
+							 uni.hideLoading()
 						 }else{
+							  uni.hideLoading()
 							 uni.showToast({
 							 	title:res.msg,
 								'icon':'none'
 							 })
 						 }
+					 }).catch(()=>{
+						  uni.hideLoading()
 					 })
 					
-
 				} else {
 					return
 				}

pages/circle/circles.vue

@@ -3,9 +3,9 @@
 	<view>
 		<view style="width: 100%;height: 600rpx;position: relative;">
 			<image src="../../static/care_family.png" style="width: 100%;height:100%;" @longpress="changeBgImg"></image>
-			<view style="height:44rpx;font-size:32rpx;font-family:PingFang SC;font-weight:bold;color:rgba(255,255,255,1);position: absolute;bottom: 20rpx;right: 194rpx;">星河</view>
-			<view style="width: 132rpx;height: 132rpx;position: absolute;right: 34rpx;bottom: -30rpx;border-radius:14rpx;">
-				<image src="../../static/complain_icon_complain@2x.png" style="width: 100%;height: 100%;"></image>
+			<view style="height:44rpx;font-size:32rpx;font-family:PingFang SC;font-weight:bold;color:rgba(255,255,255,1);position: absolute;bottom: 20rpx;right: 194rpx;">{{userName}}</view>
+			<view style="width: 132rpx;height: 132rpx;position: absolute;right: 34rpx;bottom: -30rpx;" @tap="seeMyInfo">
+				<image :src="headImg" style="width: 100%;height: 100%;border-radius:14rpx;"></image>
 			</view>
 		</view>
 		<view class="content">
@@ -27,13 +27,13 @@
 							{{item.content}}
 						</view>
 						<!-- 图片内容 -->
-						<view class="img" v-if="item.photosUrlList.length==1" v-show="item.photosUrlList.length>0">
+						<view class="img" v-if="item.photosUrlList.length==1" v-show="item.photosUrlList.length>0"  @tap="prewImg(item)">
 							<image :src="img" style="width: 246rpx;height: 420rpx;" v-for="(img,index) in item.photosUrlList" :key="index"
-							 @tap="prewImg(item)"></image>
+							></image>
 						</view>
-						<view class="img" v-else style="display: flex;flex-wrap: wrap;" v-show="item.photosUrlList.length>0">
+						<view class="img"  v-else style="display: flex;flex-wrap: wrap;" v-show="item.photosUrlList.length>0" @tap="prewImg(item)">
 							<image :src="img" style="width:180rpx;height:180rpx;margin-right: 10rpx;margin-bottom: 10rpx;" v-for="(img,index) in item.photosUrlList"
-							 :key="index" @tap="prewImg(item,index)"></image>
+							 :key="index" ></image>
 						</view>
 						<!-- 点赞 -->
 						<view style="width: 100%;height: 42rpx;display:flex;position: relative; margin-bottom: 20rpx;">
@@ -76,7 +76,7 @@
 		<view class="talkAbout" v-show="isTalk">
 			<!-- 评论弹出框-->
 			<view class="leftContent">
-				<input type="text" style="width: 100%;height: 100%;padding-left: 16rpx;" placeholder="评论" :focus="isFouce" @blur="bindBlur"
+				<input type="text" style="width: 100%;height: 100%;padding-left: 16rpx;" placeholder="评论"  @confirm="send" :focus="isFouce" @blur="bindBlur"
 				 v-model="talkInfo">
 			</view>
 			<view @tap="send" class="sendBtn">发送</view>
@@ -89,6 +89,9 @@
 	export default {
 		data() {
 			return {
+				userName:uni.getStorageSync('userName'),
+				headImg:uni.getStorageSync('headImg'),
+				userPhone:uni.getStorageSync('userPhone'),
 				circleId: '', //朋友圈Id
 				isUpFinish: false,
 				// 上拉加载时文案
@@ -131,6 +134,12 @@
 		},
 
 		methods: {
+			//查看我的信息
+			seeMyInfo(){
+				uni.navigateTo({
+					url:'../mine/myInfo'
+				})
+			},
 			//获取列表数据
 			getData() {
 				uni.showLoading({
@@ -156,7 +165,6 @@
 				}).catch(() => {
 
 				})
-
 			},
 			//加载更多数据获取
 			getmorelist() {
@@ -196,23 +204,23 @@
 			// 预览图片
 			prewImg(item, index) {
 				console.log(item)
-				//  uni.previewImage({
-				//   current:item.imgArr[index],
-				//  	urls:item.imgArr,
-				// success:(res)=>{
+				 uni.previewImage({
+				  // current:item.imgArr[index],
+				 	urls:item.photosUrlList,
+				success:(res)=>{
 
-				// }
-				//  })
+				}
+				 })
 			},
 			// 切换背景图片
 			changeBgImg() {
-				uni.chooseImage({
-					count: 1, //默认9
-					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-					success: (res) => {
-						console.log(res.tempFiles[0].path)
-					}
-				});
+				// uni.chooseImage({
+				// 	count: 1, //默认9
+				// 	sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+				// 	success: (res) => {
+				// 		console.log(res.tempFiles[0].path)
+				// 	}
+				// });
 			},
 			// 发送评论失去焦点
 			bindBlur() {
@@ -227,15 +235,24 @@
 			},
 			// 发送评论
 			send() {
+				//判断评论是否为空
+				if(!this.talkInfo){
+					return
+				}
 				this.http.httpRequest('/wxapplet/prop/comment/add', 'post', {
 					circleId: this.circleId,
 					commentConten: this.talkInfo,
 					createBy: uni.getStorageSync('createBy')
 				}, true).then((res) => {
 					if (res.code == 0) {
-						setTimeout(() => {
-							this.getData()
-						}, 500)
+						// setTimeout(() => {
+						// 	this.getData()
+						// }, 1500)
+						
+						if (getCurrentPages().length != 0) {
+						            //刷新当前页面的数据
+						            getCurrentPages()[getCurrentPages().length - 1].onLoad()
+						          }
 					} else {
 						uni.showToast({
 							title: res.msg,

pages/circle/publish.vue

@@ -6,9 +6,9 @@
 				<textarea style="width: 100%;" :auto-height="true" placeholder="这一刻的想法" v-model="textarea"></textarea>
 			</view>
 			<view class="imgBox">
-				<view class="upImg">
-					<image :src="item" v-for="(item,index) in imgData" :key="index" style="width:208rpx;height: 208rpx;margin-right: 10rpx;margin-bottom: 10rpx;"
-					 v-show="imgData.length>0"></image>
+				<view class="upImg" >
+					<image :src="item" v-for="(item,index) in imgData" :key="index" @longtap="deleteImg(index)" style="width:208rpx;height: 208rpx;margin-right: 10rpx;margin-bottom: 10rpx;"
+					 v-show="imgData.length>0" ></image>
 					<image src="../../static/circle_image@2x.png" style="width:208rpx;height: 208rpx;margin-bottom: 10rpx;" @tap="chooseImg"></image>
 				</view>
 				<!-- <view style="width: 208rpx;height: 208rpx;" @tap="chooseImg">
@@ -29,6 +29,20 @@
 			}
 		},
 		methods: {
+			// 长按图片删除
+			deleteImg(index){
+				 wx.showModal({
+				   title: '提示',
+				   content: '确定要删除此图片吗？',
+				   success:  (res) =>{
+				    if (res.confirm) {
+				     this.imgData.splice(index, 1);
+				    } else if (res.cancel) {
+				      return false;    
+				     }
+				   }
+				  })
+			},
 			// 发表
 			push() {
 				if (this.textarea) {
@@ -39,6 +53,10 @@
 					} else {
 						img = ''
 					}
+					uni.showLoading({
+						mask:true,
+						title:'加载中'
+					})
 					this.http.httpRequest('/wxapplet/prop/comtycircle/add', 'post', {
 						userId: uni.getStorageSync('userId'),
 						content: this.textarea,
@@ -48,6 +66,7 @@
 					}, true).then((res) => {
 						console.log(res)
 						if (res.code == 0) {
+							uni.hideLoading()
 							uni.showToast({
 								'icon':'success',
 								title:'发表成功'
@@ -59,11 +78,14 @@
 							},800)
 								
 						} else {
+							uni.hideLoading()
 							uni.showToast({
 								title: res.msg,
 								'icon': 'none'
 							})
 						}
+					}).catch(()=>{
+						uni.hideLoading()
 					})
 				} else {
 					return

pages/complain/compalinSuccess.vue

@@ -18,8 +18,7 @@
 			}
 		},
 		onUnload() {
-			console.log('走这里')
-			wx.reLaunch({
+			uni.reLaunch({
 			      url: '/pages/complain/index',
 			 })
 		}

pages/complain/evaluateCompalin.vue

@@ -36,7 +36,7 @@
 				</view> -->
 			</view>
 		</view>
-		<button class="submit" :class="{active:starNum && textRea}" @tap="submit" :loading="isLoading">提交</button>
+		<button class="submit" :class="{active:starNum && textRea}" @tap="submit" >提交</button>
 	</view>
 </template>
 
@@ -72,7 +72,10 @@
 			   if(!this.textRea || !this.starNum){
 				   return
 			   }else{
-				   this.isLoading = true
+				   uni.showLoading({
+				   	mask:true,
+					title:'加载中'
+				   })
 				   this.http.httpRequest('/wxapplet/owneradvice/edit', 'post', {
 				   	adviceId: Number(this.id),
 				   	score: this.starNum,
@@ -80,18 +83,20 @@
 				   }).then((res) => {
 				   	// 判断请求是否成功 0 成功 
 				   	if (res.code == 0) {
-				   		this.isLoading = false
 				   		uni.setStorageSync('rateType',0)
 				   		uni.navigateTo({
 				   			url:"../onlineRpair/evalueSuccess"
 				   		})
+						uni.hideLoading()
 				   	} else {
-						this.isLoading=false
+					uni.hideLoading()
 				   		uni.showToast({
 				   			title: res.msg,
 				   			"icon": 'none'
 				   		})
 				   	}
+				   }).catch(()=>{
+					   uni.hideLoading()
 				   })
 			   }
 			},

pages/complain/index.vue

@@ -14,25 +14,10 @@
 					<view class="text">
 						{{item.content}}
 					</view>
-					<view class="img" v-show="item.photosUrlList">
+					<view class="img" v-show="item.photosUrlList.length>0" @tap="prew(item)">
 						<image :src="img" style="width: 180rpx;height: 180rpx;padding-right: 10rpx;margin-bottom: 10rpx;" v-for="(img,index) in item.photosUrlList"
 						 :key="index"></image>
 					</view>
-					<!-- 回复信息 -->
-					<!-- 		<view class="replay">
-					<view style="width: 100%;margin: 20rpx 0rpx 20rpx 20rpx;">
-						<view class="replayItem">
-							<view class="replayName"><text style="font-size: 28rpx;color: #333333;font-family:PingFang SC;font-weight:bold;">物业
-								</text><text style="color:rgba(51,51,51,1);">回复</text><text style="font-size: 28rpx;color: #333333;font-family:PingFang SC;font-weight:bold;margin-left: 5rpx;">肖战:</text></view>
-							<view class="replayContent">换了一个新的，已经修好啦~</view>
-						</view>
-						<view class="replayItem">
-							<view class="replayName"><text style="font-size: 28rpx;color: #333333;font-family:PingFang SC;font-weight:bold;">小赞
-								</text><text style="color:rgba(51,51,51,1);">回复</text><text style="font-size: 28rpx;color: #333333;font-family:PingFang SC;font-weight:bold;margin-left: 5rpx;">肖战:</text></view>
-							<view class="replayContent">换了一个新的，已经修好啦~</view>
-						</view>
-					</view>
-				</view> -->
 					<!-- 我要评论 -->
 					<view class="bottomBtn" @tap="myTalk(item.adviceId)">我的评价</view>
 					<view class="date">{{(item.createTime).substr(0,16)}}</view>
@@ -60,6 +45,16 @@
 			this.refresh();
 		},
 		methods: {
+			// 预览图片
+			prew(item){
+				uni.previewImage({
+				  // current:item.imgArr[index],
+				 	urls:item.photosUrlList,
+				success:(res)=>{
+				
+				},
+				})
+			},
 			// 刷新页面
 			refresh() {
 				this.$nextTick(() => {
@@ -78,7 +73,6 @@
 				this.pageNum = pullScroll.page
 				setTimeout(() => {
 					this.http.httpRequest('/wxapplet/owneradvice/list', 'get', {
-						// cardNo: uni.getStorageSync('idNumber'),
 						pageNum: pullScroll.page,
 						pageSize: this.pageSize,
 						userId: uni.getStorageSync("userId")

pages/complain/wantCompalin.vue

@@ -29,18 +29,16 @@
 				<!-- 图片盒字 -->
 				<view style="width:646rpx;height: 114rpx;position: absolute;left: 24rpx;bottom: 40rpx;display: flex;">
 					<view style="height: 114rpx;margin-right: 10rpx;display: flex;justify-content: space-between;" v-show="imgData" >
-						<image style="width: 114rpx;height: 114rpx;margin-right: 10rpx;" :src="item.path" v-for="(item,index) in imgData" :key="index"></image>
+						<image style="width: 114rpx;height: 114rpx;margin-right: 10rpx;" :src="item" v-for="(item,index) in imgData" :key="index" @longtap="deleteImg(index)" @tap="prew(imgData)"></image>
 					</view>
 					<image src="../../static/circle_image@2x.png" style="width: 114rpx;height: 114rpx;" @tap="uploadImg(item)"></image>
 				</view>
 			</view>
 		</view>
-		<button class="submit" :class="{active:digest && textRea}" @tap="submit" :loading="isloading">提交</button>
+		<button class="submit" :class="{active:digest && textRea}" @tap="submit" >提交</button>
 	</view>
 </template>
-
 <script>
-	
 	export default {
 		data() {
 			return {
@@ -59,6 +57,30 @@
 			this.phoneHeight = uni.getSystemInfoSync().statusBarHeight
 		},
 		methods: {
+			// 预览图片
+			prew(item){
+				uni.previewImage({
+				  // current:item.imgArr[index],
+				 	urls:item,
+				success:(res)=>{
+				
+				},
+				})
+			},
+			// 长按图片删除
+			deleteImg(index){
+				 wx.showModal({
+				   title: '提示',
+				   content: '确定要删除此图片吗？',
+				   success:  (res) =>{
+				    if (res.confirm) {
+				     this.imgData.splice(index, 1);
+				    } else if (res.cancel) {
+				      return false;    
+				     }
+				   }
+				  })
+			},
 			// 选择评分
 		changeRate(e){
 			this.starNum=e.value
@@ -122,28 +144,34 @@
 				if(!this.digest || !this.textRea){
 					return
 				}else{
-					this.isloading=true
+					uni.showLoading({
+						mask:true,
+						title:'加载中'
+					})
 					this.http.httpRequest('/wxapplet/owneradvice/add', 'post', {
 						userId: uni.getStorageSync('userId'),
 						createBy: uni.getStorageSync('createBy'),
 						content:this.textRea,
 						PhotosUrlList:this.imgData,
+						comtyId:uni.getStorageSync('comtyId'),
 						complType:this.digest,
 						ownerPhone:uni.getStorageSync('phoneNumber')
 					}, true).then((res)=>{
 						console.log(res)
 						if(res.code==0){
-							this.isloading=false
 							uni.navigateTo({
 								url:'./compalinSuccess'
 							})
+							uni.hideLoading()
 						}else{
-							this.isLoading=false
+							uni.hideLoading()
 							uni.showToast({
 								title:res.msg,
 								'icon':'none'
 							})
 						}
+					}).catch(()=>{
+						uni.hideLoading()
 					})
 				}
 			},

pages/family/family.vue

@@ -1,12 +1,22 @@
 <template>
 	<view>
+		
 		<view class="topImg">
 			<image src="../../static/care_family.png" style="width: 100%;height: 100%;"></image>
 			<view class="topTile">家人关怀</view>
 			<view class="topNum">今天有<text style="font-weight:400;">0</text>条出行异常</view>
 		</view>
 		<!-- <view style="margin-top: 30rpx;"> -->
-		<view class="content" v-for="(item,index) in data" :key="index">
+		<view v-show="visible">
+			<!-- <view class="img">
+				<image src="../../static/null_image_checking@2x.png" style="width: 100%;height: 100%;"></image>
+			</view> -->
+			<view>
+			<view class="title">
+				暂无数据
+			</view>
+			</view>
+		<view class="content" v-for="(item,index) in data" :key="index" v-show="!visible">
 			<view class="item">
 				<view class="left" style="width: 60rpx;">姓名</view><view  style="height:42rpx;margin-left: 138rpx;">{{item.personName}}</view>
 				<view class="status" v-show="false">出行异常</view>
@@ -29,12 +39,14 @@
 				<view class="right" v-else>其他</view>
 			</view>
 		</view>
+		</view>
 	</view>
 </template>
 <script>
 	export default {
 		data() {
 			return {
+				visible:true,
 				moreIndex: '',
 				IsFirst: true, //判断是否显示更多数据
 				data: []
@@ -61,10 +73,20 @@
 				}, true).then((res) => {
 					console.log(res)
 					if (res.code == 0) {
+						// 判断返回数据是否为空
+						if(res.data.rows.length==0){
+							// uni.showToast({
+							// 	title:'暂无数据',
+							// 	'icon':'none'
+							// })
+							this.visible=true
+						}else{
+							this.visible=false
+							this.data = res.data.rows
+						}
 						uni.hideLoading()
-						this.data = res.data.rows
 					} else {
-						uni.hideLoading()
+						uni.hideLoading()  
 						uni.showToast({
 							title: res.msg,
 							"icon": 'none'
@@ -80,6 +102,18 @@
 	}
 </script>
 <style>
+	.title{
+			width: 510rpx;
+			height: 50rpx;
+			font-size:36rpx;
+			font-family:PingFang SC;
+			font-weight:400;
+			line-height:50rpx;
+			color:rgba(36,36,36,1);
+			margin:0 auto;
+			margin-top: 30rpx;
+			text-align: center;
+			}
 	.status{
 		width:100rpx;
 		height:26rpx;

pages/home/home.vue

@@ -1,188 +0,0 @@
-<template>
-	<view class="uni-flex uni-column">
-		<view class="uni-flex uni-flex-item articles uni-list">
-			<view class="uni-list-cell" hover-class="uni-list-cell-hover" v-for="(n,key) in news" :key="key" @click="goNew(n)">
-				<view class="uni-media-list">
-					<image class="uni-media-list-logo" lazy-load  mode="widthFix" :src="n.pic"></image>
-					<view class="uni-media-list-body">
-						<view class="uni-media-list-text-top uni-ellipsis">{{n.title}}</view>
-						<view class="uni-media-list-text-bottom">
-							<text>[{{n.class}}] </text>
-							<text>{{n.createDate}}</text>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<!-- 1 -->
-		<load-more :loadingType="loadingType" :contentText="contentText"></load-more> 
-	</view>
-</template>
-
-<script>
-	// 2
-	import loadMore from '@/components/uni-load-more.vue';
-	// 3
-	var index;
-	export default {
-		data() {
-			return {
-				// --4
-				type: 0,
-				news: [],
-				loadingType: 0,
-				contentText: {
-					contentdown: "上拉显示更多",
-					contentrefresh: "正在加载...",
-					contentnomore: "没有更多数据了"
-				},
-				// --4
-			};
-		},
-		onPullDownRefresh() {
-			this.getData();
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		onLoad() {
-			// 5
-			index = 1;
-			this.getData();
-		},
-		methods: {
-			// 6
-			getData() {
-				if (this.loadingType !== 0) {
-					return;
-				}
-				this.loadingType = 1;
-				uni.request({
-					url: this.webUrl + 'News',
-					method: 'POST',
-					data: {
-						pageIndex: index,
-						type: this.type
-					},
-					header: {
-						'content-type': 'application/x-www-form-urlencoded'
-					},
-					success: res => {
-						if (res.data.result.uniArticles.length > 0) {
-							this.news = this.news.concat(res.data.result.uniArticles);
-						} else {
-							this.loadingType = 2;
-							return;
-						}
-						if (index == parseInt(res.data.result.pages)) {
-							this.loadingType = 2;
-							return;
-						} else {
-							this.loadingType = 0;
-						}
-						index++;
-					},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-		},
-		onReachBottom() {
-			// 7
-			this.getData();
-		},
-		components: {
-			// 8
-			loadMore
-		}
-	}
-</script>
-
-<style>
-	.home .news-center .contentsItem {
-		width: 100%;
-		border-top: 1px solid #e2e2e2;
-	}
-
-	.home .news-center .item-contents {
-		padding: 50upx 45upx;
-	}
-
-	.home .news-center .item-contents .item-contents-wrap {
-		position: relative;
-		margin: 0 auto;
-		width: 660upx;
-		height: 380upx;
-		display: block;
-	}
-
-	.home .news-center .item-contents image {
-		margin: 0 auto;
-		width: 660upx;
-		height: 380upx;
-		display: block;
-	}
-
-	.home .news-center .item-contents .contentsMessage {
-		margin: 0 auto;
-		width: 660upx;
-		box-sizing: border-box;
-		padding: 25upx 20upx;
-		background: #e9e9e9;
-	}
-
-	.home .news-center .contentsMessage .Msgs {
-		width: 620upx;
-	}
-
-	.home .news-center .contentsMessage .Msgs .lfMsg {
-		font-size: 26upx;
-		/* #ifdef H5 */
-		font-size: 26upx;
-		/* #endif */
-		color: #505050;
-		width: 490upx;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-	}
-	.home .news-center .contentsMessage  .lfMsgs-wrap{
-		margin-top: 10upx;
-	}
-	.home .news-center .contentsMessage  .lfMsgs {
-		font-size: 24upx;
-		/* #ifdef H5 */
-		font-size: 24upx;
-		/* #endif */
-		color: #909090;
-		text-spacing: 5upx;
-	}
-
-	.home .news-center .contentsMessage .Msgs .rtMsg {
-		font-size: 26upx;
-		/* #ifdef H5 */
-		font-size: 26upx;
-		/* #endif */
-		color: #909090;
-		justify-content: flex-end;
-
-	}
-
-	.home .news-center .contentsMessage .Msgs .Msgs-artitle {
-		width: 100%;
-		margin-top: 10upx;
-		margin-bottom: 30upx;
-		font-size: 26upx;
-		/* #ifdef H5 */
-		font-size: 26upx;
-		/* #endif */
-		color: #909090;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-	}
-
-	.image {
-		position: absolute;
-	}
-</style>

pages/index/changeHouse.vue

@@ -6,16 +6,16 @@
 				<view class="city">
 					<view style="height: 100%;display: flex;">
 						<image src="../../static/house_icon_location@2x.png" style="width: 40rpx;height:40rpx;margin-right: 18rpx;"></image>
-						<view class="text">{{item.address}}</view>
+						<view class="text">{{item.comtyName}}</view>
 					</view>
 
 				</view>
-				<view class="address" v-for="(list,index) in item.ownerHouse" :key="index">
+				<view class="address">
 					<image src="../../static/house_icon_house@2x.png" style="width: 40rpx;height:40rpx;margin-right: 18rpx;"></image>
-					<view class="text">{{list.houseName}}</view>
+					<view class="text">{{item.houseName}}</view>
 					<view class="delete">
-						<radio-group @change="changeHouse(list)">
-							<radio style="transform:scale(0.8)" :value="list.houseName" :checked="address==list.houseName" />
+						<radio-group @change="changeHouse(item)">
+							<radio style="transform:scale(0.8)" :value="item.houseName" :checked="address==item.houseName" />
 						</radio-group>
 
 					</view>
@@ -30,11 +30,11 @@
 		data() {
 			return {
 				data: [],
-				  address:""
+				  address:uni.getStorageSync('homeAdress')
 			}
 		},
 		onShow() {
-			this.address=uni.getStorageSync('homeAdress')
+			
 		},
 		mounted() {
 			this.getHouseData()
@@ -44,6 +44,8 @@
 			changeHouse(item) {
 				console.log(item)
 				uni.setStorageSync('homeAdress',item.houseName)
+				uni.setStorageSync('comtyId',item.comtyId)
+				uni.setStorageSync('homeId',item.houseId)
 				uni.switchTab({
 					url: "./index"
 				})

pages/index/index.vue

@@ -21,7 +21,7 @@
 					 :duration="1000" style="width: 100%;height: 100%;" indicator-active-color="#298AFD" indicator-color="#fff">
 						<swiper-item v-for="(item,index) in photoData" :key="index">
 							<view class="swiper-item">
-								<view style="border-radius: 15rpx;">
+								<view style="">
 									<image :src="item.photo" style="width: 100%;height:342px;"></image>
 								</view>
 							</view>
@@ -77,7 +77,8 @@
 						</view>
 						<view class="leftInfo">{{item.content}}</view>
 						<view class="leftDate">
-							<view class="leftTag" v-if="item.status==1">最新</view>
+							<!-- v-if="item.status==1" -->
+							<view class="leftTag" >最新</view>
 							<view style="width:230rpx;height:34rpx;font-size:24rpx;font-family:PingFang SC;font-weight:400;line-height:34rpx;color:rgba(204,204,204,1);position: absolute;right: 0;">{{(item.createDate).substr(0,16)}}</view>
 						</view>
 					</view>
@@ -106,6 +107,7 @@
 			// 获取状态栏的高度
 			this.phoneHeight = uni.getSystemInfoSync().statusBarHeight
 			this.getBannerData()
+			this.getUserInfo()
 		},
 		onShow() {
 			this.adress = uni.getStorageSync('homeAdress')
@@ -115,6 +117,41 @@
 			
 		},
 		methods: {
+			//把base64转换成图片
+			 getBase64ImageUrl(data) {
+			     /// 获取到base64Data
+			     var base64Data = data;
+			     /// 通过微信小程序自带方法将base64转为二进制去除特殊符号，再转回base64
+			     base64Data = uni.arrayBufferToBase64(uni.base64ToArrayBuffer(base64Data))  
+			     /// 拼接请求头，data格式可以为image/png或者image/jpeg等，看需求
+			     const base64ImgUrl = "data:image/png;base64," + base64Data;
+			     // 刷新数据
+			 return base64ImgUrl
+			 },
+			// 获取用户信息
+			getUserInfo(){
+				this.http.httpRequest('/wxapplet/ownersid/getUser', 'get', {
+					userId: uni.getStorageSync('userId')
+				}, true).then((res) => {
+					if (res.code == 0) {
+						uni.setStorageSync('userName',res.data.loginName)
+						uni.setStorageSync('userPhone',res.data.phoneNum)
+						// 判断当前返回值是否是网络路径图片
+						if(res.data.avatar.indexOf('https://')==-1){
+							uni.setStorageSync('headImg',this.getBase64ImageUrl(res.data.avatar))  
+						}else{
+							uni.setStorageSync('headImg',res.data.avatar)
+						}
+					} else {
+						// uni.showToast({
+						// 	title: res.msg,
+						// 	'icon': 'none'
+						// })
+					}
+				
+				}).catch(() => {
+				})
+			},
 			// 获取轮播图数据
 			getBannerData() {
 				this.http.httpRequest('/wxapplet/owner/AdvertPhoto/list', 'get', {}, true).then((res) => {
@@ -143,7 +180,7 @@
 						uni.hideLoading()
 						// 判断当前数据是否大于三条数据
 						if (res.data.rows.length > 3) {
-							this.list = res.data.rows.splice(0, 2)
+							this.list = res.data.rows.splice(0, 3)
 						} else {
 							this.list = res.data.rows
 						}
@@ -367,6 +404,7 @@
 		margin: 0 auto;
 		/* border: 1rpx solid #333333; */
 		margin-top: 48rpx;
+		overflow:hidden; 
 	}
 
 	.topBox {

pages/index/visitorPass.vue

@@ -51,7 +51,7 @@
 				</view>
 			</view>
 			<!-- 获取临时开门码 -->
-			<button class="loginNow" @tap="loginNow()" :class="{active:form.name && form.idNumber && form.phone && form.date &&form.dec}" :loading="isLoading">
+			<button class="loginNow" @tap="loginNow()" :class="{active:form.name && form.idNumber && form.phone && form.date &&form.dec}" >
 				获取临时开门码
 			</button>
 
@@ -159,7 +159,10 @@
 							duration: 2000
 						});
 					} else {
-						this.isLoading=true
+						uni.showLoading({
+							mask:true,
+							title:"加载中"
+						})
 						this.http.httpRequest('/wxapplet/owner/peopleInfor/add', 'post',{
 							cardId: uni.getStorageSync('idNumber'),
 							comtyId: uni.getStorageSync('comtyId'),
@@ -173,18 +176,20 @@
 							personName: this.form.name
 
 						},true).then((res) => {
-							this.isLoading=false
 							if (res.code == 0) {
 								uni.navigateTo({
-									url: "../visitor/doorCode?code="+res.data
+									url: "../visitor/doorCode?code="+res.data.Qrcode+'&img='+res.data.codePhotoUrl
 								})
+								uni.hideLoading()
 							} else {
-								this.isLoading=false
+								uni.hideLoading()
 								uni.showToast({
 									title: res.msg,
 									'icon': 'none'
 								})
 							}
+						}).catch(()=>{
+							uni.hideLoading()
 						})
 					
 					}

pages/login/authorization.vue

@@ -16,13 +16,13 @@
 			}
 		},
 		methods: {
-			getPhoneNumber(e){
-				console.log(e) 
-			},
 			// 授权登录
 			login(e) {
 				console.log(e)
-				this.isLoading=true
+				uni.showLoading({
+					mask:true,
+					title:'加载中'
+				})
 				// 调起微信授权
 				uni.login({
 					provider: 'weixin',
@@ -33,21 +33,21 @@
 							avatar: e.detail.userInfo.avatarUrl,
 							cardNo:uni.getStorageSync('idNumber')
 						},true).then((res)=>{
-							this.isLoading=false
 							if(res.code==0){
 								uni.setStorageSync('createBy',res.data[0].createBy)
 								uni.switchTab({
 									url:"../index/index"
 								})
+								uni.hideLoading()
 							}else{
-								this.isLoading=false
+							uni.hideLoading()
 								uni.showToast({
 									title:res.msg,
 									"icon":'none'
 								})
 							}
 						}).catch(()=>{
-							this.isLoading=false
+							uni.hideLoading()
 						})
 					}
 				});

pages/login/login.vue

@@ -139,7 +139,10 @@
 				if (!this.form.code || !this.form.phone) {
 					return
 				} else {
-					this.isLoading=true
+					uni.showLoading({
+						mask:true,
+						title:'登录中'
+					})
 					this.http.httpRequest('/wxapplet/ownersid/login', 'post', {
 						phoneNumBer: this.form.phone,
 						loginType: '2',
@@ -147,7 +150,7 @@
 					}, true).then((res) => {
 						// 判断是否登陆成功
 						if (res.code == 0) {
-							 this.isLoading=false
+							
 							console.log(res)
 							uni.setStorageSync('userId',res.data[0].userId)
 							uni.setStorageSync('idNumber',res.data[0].idcardNum)
@@ -155,15 +158,16 @@
 							uni.navigateTo({
 								url: '../authentication/city'
 							})
+							uni.hideLoading()
 						} else {
-							this.isLoading=false
+							uni.hideLoading()
 							uni.showToast({
 								title: res.msg,
 								'icon': 'none'
 							})
 						}
 					}).catch(()=>{
-						this.isLoading=false
+						uni.hideLoading()
 					})
 
 				}
@@ -176,19 +180,15 @@
 	.getCode {
 		color: rgba(163, 197, 237, 1);
 	}
-
 	.codeActive {
 		color: rgba(41, 138, 253, 1);
 	}
-
 	.cx {
 		color: rgba(163, 197, 237, 1);
 	}
-
 	.cxActive {
 		color: rgba(41, 138, 253, 1);
 	}
-
 	.regiter {
 		width: 56rpx;
 		height: 40rpx;

pages/mine/addCar.vue

@@ -24,7 +24,7 @@
 		<lb-picker ref="type" :list="typeData" @confirm="confirm">
 		</lb-picker>
 		<!-- 保存 -->
-		<button class="btn" :class="{active:type && carNum}" :loading="isLoading" @tap="saveInfo">保存</button>
+		<button class="btn" :class="{active:type && carNum}"  @tap="saveInfo">保存</button>
 	</view>
 </template>
 
@@ -64,7 +64,10 @@
 				if (!this.typeNum || !this.carNum) {
 					return
 				} else {
-					this.isLoading=true
+					  uni.showLoading({
+					  	mask:true,
+						title:'加载中'
+					  })
 					this.http.httpRequest('/wxapplet/ownercar/add', 'post', {
 						cardId: uni.getStorageSync('idNumber'),
 						carNo: this.carNum,
@@ -75,16 +78,16 @@
 						uni.navigateTo({
 							url:'./myCar'
 						})
-						this.isLoading=false
+						  uni.hideLoading()
 						} else {
-							this.isLoading=false
+							uni.hideLoading()
 							uni.showToast({
 								title: res.msg,
 								'icon': 'none'
 							})
 						}
 					}).catch(()=>{
-						this.isLoading=false
+						uni.hideLoading()
 					})
 				}
 			}

pages/mine/addFamily.vue

@@ -23,7 +23,7 @@
 			<view class="title">人脸照片 </view>
 			<view class="content" style="height: 300rpx;">
 				<image src="../../static/circle_image@2x.png" style="width: 330rpx;height: 300rpx;" @tap="chooseImg" v-show="isShow"></image>
-				<image :src="photo" style="width: 330rpx;height: 300rpx;" v-show="isImg" @tap="chooseImg"></image>
+				<image :src="img" style="width: 330rpx;height: 300rpx;" v-show="isImg" @tap="chooseImg"></image>
 			</view>
 		</view>
 		<!-- <view class="tip">注：带*为必填项</view> -->
@@ -39,6 +39,7 @@
 				phone: '', //手机号
 				idNumber: '', //身份证号
 				photo: '', //人脸照片
+				img:'',
 				isShow: true, //判断添加照片是否显示
 				isImg: false
 			}
@@ -51,9 +52,21 @@
 					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
 					// sourceType: ['album'], //从相册选择
 					success: (res) => {
-						this.photo = res.tempFiles[0].path
-						this.isShow = false
-						this.isImg = true
+						this.img=res.tempFiles[0].path
+						wx.getFileSystemManager().readFile({
+						  filePath:res.tempFiles[0].path,//微信小程序图片默认路径
+						  encoding: 'base64', //编码格式
+						  success:(res)=>{
+							  this.isShow = false
+							  this.isImg = true
+						   this.photo=res.data
+						  },fail(){
+						   
+						  }
+						})
+						
+						
+					
 					}
 				})
 			},
@@ -76,6 +89,10 @@
 							title: "身份证号码格式不正确"
 						})
 					} else {
+						uni.showLoading({
+							mask:true,
+							title:'加载中'
+						})
 						this.http.httpRequest('/wxapplet/owner/peopleInfor/faceadd', 'post', {
 							comtyId: uni.getStorageSync('comtyId'),
 							cardNo: this.idNumber,
@@ -85,19 +102,25 @@
 							doorNum:uni.getStorageSync('homeId')
 						}, true).then((res) => {
 							if (res.code == 0) {
+								uni.hideLoading()
 								uni.showToast({
 									'icon': 'success',
 									title: "保存成功"
 								})
-								uni.navigateTo({
-									url: './family'
-								})
+								setTimeout(()=>{
+									uni.navigateTo({
+										url: './family'
+									})
+								},500)
 							} else {
+								uni.hideLoading()
 								uni.showToast({
 									title: res.msg,
 									'icon': 'none'
 								})
 							}
+						}).catch(()=>{
+							uni.hideLoading()
 						})
 						
 					}

pages/mine/carList.vue

@@ -1,7 +1,15 @@
 <!-- 汽车通行记录 -->
 <template>
 	<view>
-		<view style="margin-top: 34rpx;">
+		<view v-show="visible">
+			<!-- <view class="img">
+				<image src="../../static/null_image_checking@2x.png" style="width: 100%;height: 100%;"></image>
+			</view> -->
+			<view class="title">
+				暂无通行记录
+			</view>
+			</view>
+		<view style="margin-top: 34rpx;" v-show="!visible">
 			<view class="item" v-for="(item,index) in data" :key="index" :class="{active:isPrimeNum(index)}">
 				<view class="content">
 					<view class="left">{{item.deviceName}}</view>
@@ -11,7 +19,6 @@
 				</view>
 			</view>
 		</view>
-
 	</view>
 </template>
 
@@ -19,6 +26,7 @@
 	export default {
 		data() {
 			return {
+				visible:true,
 				id: "", //汽车ID
 				data: []
 			}
@@ -40,7 +48,18 @@
 				}, true).then((res) => {
 					console.log(res)
 					if (res.code == 0) {
-						this.data=res.data.rows
+						// 判断当前是否返回数据
+						if(res.data.length==0){
+							// uni.showToast({
+							// 	title:'暂无通行记录',
+							// 	'icon':'none'
+							// })
+							this.visible=true
+						}else{
+							this.visible=false
+							this.data=res.data
+						}
+						
 						uni.hideLoading()
 					} else {
 						uni.hideLoading()
@@ -66,13 +85,24 @@
 </script>
 
 <style>
+	.title{
+			width: 510rpx;
+			height: 50rpx;
+			font-size:36rpx;
+			font-family:PingFang SC;
+			font-weight:400;
+			line-height:50rpx;
+			color:rgba(36,36,36,1);
+			margin:0 auto;
+			margin-top: 30rpx;
+			text-align: center;
+			}
 	.item {
 		width: 100%;
 		height: 80rpx;
 		background: rgba(249, 249, 249, 1);
 		opacity: 1;
 	}
-
 	.active {
 		background: rgba(255, 255, 255, 1);
 	}
@@ -87,7 +117,7 @@
 	}
 
 	.date {
-		width: 240rpx;
+		width: 260rpx;
 		height: 34rpx;
 		font-size: 24rpx;
 		font-family: PingFang SC;

pages/mine/face.vue

@@ -8,7 +8,7 @@
 			</view>
 			<!-- 人脸照片 -->
 			<view class="imgBox">
-				<image :src="photo" style="width: 100%;height: 100%;"></image>
+				<image :src="facePhoto" style="width: 100%;height: 100%;"></image>
 			</view>
 			<!-- 更换模板 -->
 			<view class="btn" @tap="changePhoto">更换模板</view>
@@ -21,14 +21,56 @@
 		data() {
 			return {
 				phoneHeight: 0, //手机状态栏的高度
-				photo: '' //人脸照片
+				photo: '' ,//人脸照片
+				facePhoto:'',
+				
 			}
 		},
 		created() {
 			// 获取状态栏的高度
 			this.phoneHeight = uni.getSystemInfoSync().statusBarHeight
+			this.getUserData()
 		},
 		methods: {
+			// 获取用户数据
+			getUserData() {
+				uni.showLoading({
+					title: '加载中',
+					'icon': 'none'
+				})
+				this.http.httpRequest('/wxapplet/ownersid/getUser', 'get', {
+					userId: uni.getStorageSync('userId')
+				}, true).then((res) => {
+					console.log(res)
+					if (res.code == 0) {
+						uni.hideLoading()
+						this.data = res.data
+						this.photo=res.data.facePhoto
+						this.facePhoto=this.getBase64ImageUrl(res.data.facePhoto)
+					} else {
+						uni.hideLoading()
+						uni.showToast({
+							title: res.msg,
+							'icon': 'none'
+						})
+					}
+			
+				}).catch(() => {
+					uni.hideLoading()
+				})
+			},
+			//把base64转换成图片
+			 getBase64ImageUrl(data) {
+			     /// 获取到base64Data
+			     var base64Data = data;
+			     /// 通过微信小程序自带方法将base64转为二进制去除特殊符号，再转回base64
+			     base64Data = uni.arrayBufferToBase64(uni.base64ToArrayBuffer(base64Data))  
+			     /// 拼接请求头，data格式可以为image/png或者image/jpeg等，看需求
+			     const base64ImgUrl = "data:image/png;base64," + base64Data;
+			     // 刷新数据
+				return base64ImgUrl
+			 },
+			// 更换模板
 			updateInfo() {
 				this.http.httpRequest('/wxapplet/owner/peopleInfor/faceadd', 'post', {
 					comtyId: uni.getStorageSync('comtyId'),
@@ -60,13 +102,13 @@
 					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
 					// sourceType: ['album'], //从相册选择
 					success: (res) => {
+						this.facePhoto=res.tempFiles[0].path
 						wx.getFileSystemManager().readFile({
 						  filePath:res.tempFiles[0].path,//微信小程序图片默认路径
 						  encoding: 'base64', //编码格式
 						  success:(res)=>{
 						   this.photo=res.data
 						   this.updateInfo()
-						   console.log('111')
 						  },fail(){
 						   
 						  }

pages/mine/family.vue

@@ -1,16 +1,24 @@
 <template>
 	<view class="">
-		<view style="width: 100%;text-align: center;margin-top: 20rpx;" v-show="length==0">暂无数据</view>
-		<uni-swipe-action>
+		<view v-show="visible">
+			<!-- <view class="img">
+				<image src="../../static/null_image_checking@2x.png" style="width: 100%;height: 100%;"></image>
+			</view> -->
+			<view class="title">
+				暂无数据
+			</view>
+		</view>
+		<!-- <view style="width: 100%;text-align: center;margin-top: 20rpx;" v-if="data.length==0">暂无数据</view> -->
+		<uni-swipe-action v-show="!visible">
 			<uni-swipe-action-item :options="options" @click="onClick(item)" @change="change" v-for="(item,index) in data" :key="index">
 				<view class="item">
-					<view class="left" >
-						<image src="../../static/youer.png" style="width:140rpx;height:140rpx;border-radius: 20rpx;"  v-if="IdCard(item.cardNo)<=6"></image>
-							<image src="../../static/shaonian.png" style="width:140rpx;height:140rpx;border-radius: 20rpx;"  v-else-if="IdCard(item.cardNo)>=7 && IdCard(item.cardNo)<=12"></image>
-							<image src="../../static/qingShao.png" style="width:140rpx;height:140rpx;border-radius: 20rpx;"  v-else-if="IdCard(item.cardNo)>=13 && IdCard(item.cardNo)<=17"></image>
-							<image src="../../static/young.png" style="width:140rpx;height:140rpx;border-radius: 20rpx;"  v-else-if="IdCard(item.cardNo)>=18 && IdCard(item.cardNo)<=45"></image>
-							<image src="../../static/zhongnian.png" style="width:140rpx;height:140rpx;border-radius: 20rpx;"  v-else-if="IdCard(item.cardNo)>=46 && IdCard(item.cardNo)<=69"></image>
-							<image src="../../static/old.png" style="width:140rpx;height:140rpx;border-radius: 20rpx;"  v-else-if="IdCard(item.cardNo)>69"></image>
+					<view class="left">
+						<image src="../../static/youer.png" style="width:140rpx;height:140rpx;border-radius: 20rpx;" v-if="IdCard(item.cardNo)<=6"></image>
+						<image src="../../static/shaonian.png" style="width:140rpx;height:140rpx;border-radius: 20rpx;" v-else-if="IdCard(item.cardNo)>=7 && IdCard(item.cardNo)<=12"></image>
+						<image src="../../static/qingShao.png" style="width:140rpx;height:140rpx;border-radius: 20rpx;" v-else-if="IdCard(item.cardNo)>=13 && IdCard(item.cardNo)<=17"></image>
+						<image src="../../static/young.png" style="width:140rpx;height:140rpx;border-radius: 20rpx;" v-else-if="IdCard(item.cardNo)>=18 && IdCard(item.cardNo)<=45"></image>
+						<image src="../../static/zhongnian.png" style="width:140rpx;height:140rpx;border-radius: 20rpx;" v-else-if="IdCard(item.cardNo)>=46 && IdCard(item.cardNo)<=69"></image>
+						<image src="../../static/old.png" style="width:140rpx;height:140rpx;border-radius: 20rpx;" v-else-if="IdCard(item.cardNo)>69"></image>
 					</view>
 					<view class="right">
 						<view class="name">{{item.personName}}</view>
@@ -35,9 +43,10 @@
 	export default {
 		data() {
 			return {
-				length:0,//数据判断值
-				data: [],//列表数据
-				options: [{//左滑动数据
+				visible:true,
+				length: false, //数据判断值
+				data: [], //列表数据
+				options: [{ //左滑动数据
 					text: '删除',
 					style: {
 						backgroundColor: '#dd524d'
@@ -45,27 +54,31 @@
 				}]
 			}
 		},
-		mounted() {
+		created() {
 			this.getListData()
-		
+		},
+		mounted() {
+
+
 		},
 		components: {
 			uniSwipeAction,
 			uniSwipeActionItem
 		},
-		computed:{
-			
+		computed: {
+
 		},
 		methods: {
-			  //根据身份证号获取年龄
+			//根据身份证号获取年龄
 			IdCard(UUserCard) {
-			    var myDate = new Date();
-			    var month = myDate.getMonth() + 1;
-			    var day = myDate.getDate();
-			    var age = myDate.getFullYear() - UUserCard.substring(6, 10) - 1;
-			    if (UUserCard.substring(10, 12) < month || UUserCard.substring(10, 12) == month && UUserCard.substring(12, 14) <= day) {
-			        age++;
-			    }
+				var myDate = new Date();
+				var month = myDate.getMonth() + 1;
+				var day = myDate.getDate();
+				var age = myDate.getFullYear() - UUserCard.substring(6, 10) - 1;
+				if (UUserCard.substring(10, 12) < month || UUserCard.substring(10, 12) == month && UUserCard.substring(12, 14) <=
+					day) {
+					age++;
+				}
 				return age
 			},
 			// 点击删除
@@ -85,10 +98,12 @@
 								// 判断接口是否请求成功
 								if (res.code == 0) {
 									uni.showToast({
-										title:'删除成功',
-										'icon':'success'
+										title: '删除成功',
+										'icon': 'success'
 									})
-									this.getListData()
+									setTimeout(() => {
+										this.getListData()
+									}, 500)
 								} else {
 									uni.showToast({
 										title: res.msg,
@@ -105,8 +120,8 @@
 			// 获取列表数据
 			getListData() {
 				uni.showLoading({
-					mask:true,
-					title:'加载中'
+					mask: true,
+					title: '加载中'
 				})
 				this.http.httpRequest('/wxapplet/owner/peopleInfor/getfamily', 'get', {
 					cardNo: uni.getStorageSync('idNumber'),
@@ -114,9 +129,14 @@
 				}, true).then((res) => {
 					console.log(res)
 					if (res.code == 0) {
+						// 判断当前是否返回数据
+						if (res.data.rows.length == 0) {
+							this.visible=true
+						}else{
+							this.data = res.data.rows
+							this.visible=false
+						}
 						uni.hideLoading()
-						this.data = res.data.rows
-						 this.length=this.data.length	
 					} else {
 						uni.hideLoading()
 						uni.showToast({
@@ -124,7 +144,7 @@
 							'icon': 'none'
 						})
 					}
-				}).catch(()=>{
+				}).catch(() => {
 					uni.hideLoading()
 				})
 			},
@@ -155,7 +175,18 @@
 		left: 26rpx;
 		bottom: 56rpx;
 	}
-
+.title{
+		width: 510rpx;
+		height: 50rpx;
+		font-size:36rpx;
+		font-family:PingFang SC;
+		font-weight:400;
+		line-height:50rpx;
+		color:rgba(36,36,36,1);
+		margin:0 auto;
+		margin-top: 30rpx;
+		text-align: center;
+		}
 	.idNumber {
 		width: 100%;
 		height: 34rpx;

pages/mine/mine.vue

@@ -3,14 +3,15 @@
 		<view class="topBox">
 			<image src="../../static/login_bgground@2x.png" style="width: 100%;height: 100%;"></image>
 			<view class="headPhoto" @tap="seeMyInfo">
-				<image src="../../static/login_bgground@2x.png" style="width: 122rpx;height: 122rpx;border-radius: 50%;margin:18rpx;"></image>
+				
+				<image :src="headImg?headImg:'../../static/qingShao.png'" style="width: 122rpx;height: 122rpx;border-radius: 50%;margin:18rpx;" ></image>
 			</view>
 			<view class="name" @tap="seeMyInfo">
-				星河
+				{{userName}}
 			</view>
-			<view class="phone" @tap="seeMyInfo">15825252525</view>
+			<view class="phone" @tap="seeMyInfo">{{userPhone}}</view>
 			<!-- 车辆数 -->
-			<view class="carBox" >
+			<view class="carBox">
 				<view class="leftCar" @tap="seeMyCar">
 					<view class="num">{{carNum?carNum:0}}</view>
 					<view class="text">汽车辆数</view>
@@ -29,7 +30,7 @@
 				</view>
 				<view style="display: flex;justify-content: space-between;margin-left: 32rpx;width: 100%;margin-top: 48rpx;">
 					<view class="title">我的房屋</view>
-						<image src="../../static/icon_more@2x.png" style="width:15rpx ;height: 28rpx;margin-top: 8rpx;"></image>
+					<image src="../../static/icon_more@2x.png" style="width:15rpx ;height: 28rpx;margin-top: 8rpx;"></image>
 				</view>
 			</view>
 			<view class="item" @tap="visitorInfo">
@@ -38,7 +39,7 @@
 				</view>
 				<view style="display: flex;justify-content: space-between;margin-left: 32rpx;width: 100%;margin-top: 48rpx;">
 					<view class="title">访客信息</view>
-						<image src="../../static/icon_more@2x.png" style="width:15rpx ;height: 28rpx;margin-top: 8rpx;"></image>
+					<image src="../../static/icon_more@2x.png" style="width:15rpx ;height: 28rpx;margin-top: 8rpx;"></image>
 				</view>
 			</view>
 			<view class="item" @tap="changeFace">
@@ -47,7 +48,7 @@
 				</view>
 				<view style="display: flex;justify-content: space-between;margin-left: 32rpx;width: 100%;margin-top: 48rpx;">
 					<view class="title">人脸模板</view>
-						<image src="../../static/icon_more@2x.png" style="width:15rpx ;height: 28rpx;margin-top: 8rpx;"></image>
+					<image src="../../static/icon_more@2x.png" style="width:15rpx ;height: 28rpx;margin-top: 8rpx;"></image>
 				</view>
 			</view>
 			<view class="item" @tap="seeMyFamily">
@@ -56,7 +57,7 @@
 				</view>
 				<view style="display: flex;justify-content: space-between;margin-left: 32rpx;width: 100%;margin-top: 48rpx;">
 					<view class="title">我的家人</view>
-						<image src="../../static/icon_more@2x.png" style="width:15rpx ;height: 28rpx;margin-top: 8rpx;"></image>
+					<image src="../../static/icon_more@2x.png" style="width:15rpx ;height: 28rpx;margin-top: 8rpx;"></image>
 				</view>
 			</view>
 			<view class="item" @tap="seeMyMessage">
@@ -65,7 +66,7 @@
 				</view>
 				<view style="display: flex;justify-content: space-between;margin-left: 32rpx;width: 100%;margin-top: 48rpx;">
 					<view class="title">我的消息</view>
-						<image src="../../static/icon_more@2x.png" style="width:15rpx ;height: 28rpx;margin-top: 8rpx;"></image>
+					<image src="../../static/icon_more@2x.png" style="width:15rpx ;height: 28rpx;margin-top: 8rpx;"></image>
 				</view>
 			</view>
 		</view>
@@ -73,193 +74,209 @@
 </template>
 
 <script>
-	export default{
-		data(){
-			return{
-				carNum:0,//汽车数量
-				bikeNum:0,//自行车数量
+	export default {
+		data() {
+			return {
+				userName:uni.getStorageSync('userName'),
+				headImg:uni.getStorageSync('headImg'),
+				userPhone:uni.getStorageSync('userPhone'),
+				carNum: 0, //汽车数量
+				bikeNum: 0, //自行车数量
+				headPhoto:'',
 			}
 		},
 		onShow() {
 			this.getCarData()
+			// this.getUserData()
 		},
 		onLoad() {
-			
+
 		},
-		methods:{
+		methods: {
+			
 			// 获取汽车车辆数
-			 getCarData(){
-				 uni.showLoading({
-				 	mask:true,
-					title:'加载中'
-				 })
-				this.http.httpRequest('/wxapplet/ownercar/list','get',{
-					cardId:uni.getStorageSync('idNumber'),
-					pageNum:1,
-					pageSize:10
-				},true).then((res)=>{
+			getCarData() {
+				uni.showLoading({
+						title: '加载中',
+						'icon': 'none'
+					})
+				this.http.httpRequest('/wxapplet/ownercar/list', 'get', {
+					cardId: uni.getStorageSync('idNumber'),
+					pageNum: 1,
+					pageSize: 10
+				}, true).then((res) => {
 					uni.hideLoading()
 					console.log(res)
-					if(res.code==0){
+					if (res.code == 0) {
 						this.carNum = res.data.rows.length
-					}else{
+					} else {
 						uni.hideLoading()
 					}
-				}).catch(()=>{
+				}).catch(() => {
 					uni.hideLoading()
 				})
-			 },
+			},
 			// 查看电动车
-			seeMyBike(){
+			seeMyBike() {
 				uni.navigateTo({
-					url:'./myBike'
+					url: './myBike'
 				})
 			},
 			// 访客信息
-			visitorInfo(){
+			visitorInfo() {
 				uni.navigateTo({
-					url:"../visitor/historyList"
+					url: "../visitor/historyList"
 				})
 			},
 			// 查看个人资料
-			seeMyInfo(){
+			seeMyInfo() {
 				uni.navigateTo({
-					url:"myInfo"
+					url: "myInfo"
 				})
 			},
 			// 查看我的汽车
-			seeMyCar(){
+			seeMyCar() {
 				uni.navigateTo({
-					url:"myCar"
+					url: "myCar"
 				})
 			},
 			// 查看我的房屋
-			seeMyhouse(){
+			seeMyhouse() {
 				uni.navigateTo({
-					url:"myHouse"
+					url: "myHouse"
 				})
 			},
 			//更换人脸模板
-			changeFace(){
+			changeFace() {
 				uni.navigateTo({
-					url:"./face"
+					url: "./face"
 				})
 			},
 			// 查看我的家人
-			seeMyFamily(){
+			seeMyFamily() {
 				uni.navigateTo({
-					url:"./family"
+					url: "./family"
 				})
 			},
 			// 查看我的消息
-			seeMyMessage(){
+			seeMyMessage() {
 				uni.navigateTo({
-					url:"./message"
+					url: "./message"
 				})
 			}
-				
+
 		}
 	}
 </script>
 
 <style>
-	.leftIcon{
-		width:38rpx;
-		height:40rpx;
+	.leftIcon {
+		width: 38rpx;
+		height: 40rpx;
 		margin-top: 48rpx;
 	}
-		
-	.item{
+
+	.item {
 		width: 650rpx;
 		height: 140rpx;
 		margin: 0 auto;
-		border-bottom:2rpx solid rgba(245,245,245,1);
+		border-bottom: 2rpx solid rgba(245, 245, 245, 1);
 		display: flex;
-		
+
 	}
-	.main{
+
+	.main {
 		width: 100%;
 		margin-top: 50rpx;
 		overflow: hidden;
 	}
-	.carBox{
-		width:650rpx;
-		height:170rpx;
-		background:rgba(255,255,255,1);
-		box-shadow:0rpx 6rpx 20rpx rgba(0,0,0,0.12);
-		opacity:1;
-		border-radius:86rpx;
+
+	.carBox {
+		width: 650rpx;
+		height: 170rpx;
+		background: rgba(255, 255, 255, 1);
+		box-shadow: 0rpx 6rpx 20rpx rgba(0, 0, 0, 0.12);
+		opacity: 1;
+		border-radius: 86rpx;
 		position: absolute;
 		left: 50rpx;
 		bottom: -54rpx;
 		display: flex;
 	}
-	.leftCar{
+
+	.leftCar {
 		width: 218rpx;
 		height: 90rpx;
 		margin-left: 108rpx;
-		border-right:2px solid rgba(247,247,247,1); ;
+		border-right: 2px solid rgba(247, 247, 247, 1);
+		;
 		margin-top: 40rpx;
 	}
-	.rightCar{
+
+	.rightCar {
 		height: 90rpx;
-			margin-top: 40rpx;
-			margin-left: 96rpx;
+		margin-top: 40rpx;
+		margin-left: 96rpx;
 	}
-	.num{
+
+	.num {
 		width: 108rpx;
-		height:44rpx;
-		font-size:32rpx;
-		font-family:PingFang SC;
-		font-weight:bold;
-		color:rgba(51,51,51,1);
+		height: 44rpx;
+		font-size: 32rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
 		text-align: center;
-	line-height: 44rpx;
+		line-height: 44rpx;
 	}
-	.text{
-		height:36rpx;
-		font-size:26rpx;
-		font-family:PingFang SC;
-		font-weight:400;
-		color:rgba(51,51,51,1);
+
+	.text {
+		height: 36rpx;
+		font-size: 26rpx;
+		font-family: PingFang SC;
+		font-weight: 400;
+		color: rgba(51, 51, 51, 1);
 	}
-	.name{
+
+	.name {
 		height: 50rpx;
-		font-size:36rpx;
-		font-family:PingFang SC;
-		font-weight:400;
-		color:rgba(255,255,255,1);
+		font-size: 36rpx;
+		font-family: PingFang SC;
+		font-weight: 400;
+		color: rgba(255, 255, 255, 1);
 		position: absolute;
 		bottom: 216rpx;
 		left: 220rpx;
-		
+
 	}
-	.phone{
-		width:168rpx;
-		height:34rpx;
-		font-size:24rpx;
-		font-family:PingFang SC;
-		font-weight:400;
-		color:rgba(255,255,255,1);
+
+	.phone {
+		width: 168rpx;
+		height: 34rpx;
+		font-size: 24rpx;
+		font-family: PingFang SC;
+		font-weight: 400;
+		color: rgba(255, 255, 255, 1);
 		position: absolute;
 		bottom: 176rpx;
 		left: 220rpx;
 	}
-		
-	.topBox{
+
+	.topBox {
 		width: 100%;
 		height: 430rpx;
 		position: relative;
 	}
-	.headPhoto{
-		width:160rpx;
-		height:160rpx;
-		border:2rpx solid rgba(255,255,255,1);
-		border-radius:50%;
-		opacity:1;
+
+	.headPhoto {
+		width: 160rpx;
+		height: 160rpx;
+		border: 2rpx solid rgba(255, 255, 255, 1);
+		border-radius: 50%;
+		opacity: 1;
 		position: absolute;
 		left: 50rpx;
 		bottom: 142rpx;
-		background:#000000;
+		background: #000000;
 	}
-</style>
+</style>

pages/mine/myHouse.vue

@@ -1,21 +1,29 @@
 <!-- 我的房屋 -->
 <template>
 	<view class="">
-		<view class="item" v-for="(item,index) in data" :key="index">
+		 <view v-show="visible">
+			 <view class="img">
+			 		<image src="../../static/null_image_checking@2x.png" style="width: 100%;height: 100%;"></image>
+			 </view>
+			 <view class="title">
+			 	房屋正在审核中，暂无数据~
+			 </view>
+		 </view>
+		<view class="item" v-for="(item,index) in data" :key="index" v-show="!visible">
 			<view class="content">
 				<view class="city">
 					<view style="height: 100%;display: flex;">
 						<image src="../../static/house_icon_location@2x.png" style="width: 40rpx;height:40rpx;margin-right: 18rpx;"></image>
-						<view class="text">{{item.address}}</view>
+						<view class="text">{{item.comtyName}}</view>
+						<view class="delete" @tap="deleteHouse(item.houseId,item.comtyId)">
+							删除
+						</view>
 					</view>
-
 				</view>
-				<view class="address" v-for="(list,index1) in item.ownerHouse" :key="index1">
+				<view class="address">
 					<image src="../../static/house_icon_house@2x.png" style="width: 40rpx;height:40rpx;margin-right: 18rpx;"></image>
-					<view class="text">{{list.houseName}}</view>
-					<view class="delete" @tap="deleteHouse(list.houseId,item.id)">
-						删除
-					</view>
+					<view class="text">{{item.houseName}}</view>
+					
 				</view>
 			</view>
 		</view>
@@ -28,12 +36,20 @@
 	export default {
 		data() {
 			return {
-				data: []
+				data: [],
+				visible:true
 			}
 		},
 		mounted() {
 			this.getHouseData()
 		},
+		onUnload() {
+			uni.navigateTo({
+				url: './mine',
+			})
+			      
+			 
+		},
 		methods: {
 			// 删除房屋
 			deleteHouse(item, id) {
@@ -53,7 +69,9 @@
 										title: '删除成功',
 										'icon': 'success'
 									})
-									this.getHouseData()
+									setTimeout(()=>{
+										this.getHouseData()
+									},500)
 								} else {
 									uni.showToast({
 										title: res.msg,
@@ -85,8 +103,13 @@
 				}, true).then((res) => {
 					console.log(res)
 					if (res.code == 0) {
+						if(res.data.length==0){
+							 this.visible=true
+						}else{
+							this.visible=false
+							this.data = res.data
+						}
 						uni.hideLoading()
-						this.data = res.data
 					} else {
 						uni.hideLoading()
 						uni.showToast({
@@ -104,6 +127,25 @@
 </script>
 
 <style>
+	.img{
+		width: 520rpx;
+		height: 520rpx;
+		margin: 0  auto;
+		margin-top: 262rpx;
+	}
+	.title{
+		width: 510rpx;
+		height: 50rpx;
+		font-size:36rpx;
+		font-family:PingFang SC;
+		font-weight:400;
+		line-height:50rpx;
+		color:rgba(36,36,36,1);
+		margin:0 auto;
+		margin-top: 46rpx;
+		text-align: center;
+		}
+		
 	.btn {
 		width: 702rpx;
 		height: 90rpx;
@@ -136,6 +178,7 @@
 		font-family: PingFang SC;
 		font-weight: 400;
 		color: rgba(41, 138, 253, 1);
+		margin-left: 100rpx;
 	}
 
 	.item {

pages/mine/myInfo.vue

@@ -5,7 +5,7 @@
 			<view class="item" @tap="changeHeadPhoto">
 				<view class="left">头像</view>
 				<view class="right">
-					<image :src="headImg" style="width: 72rpx;height: 72rpx;border-radius: 50%;margin-right: 20rpx;"></image>
+					<image :src="headPhoto" style="width: 72rpx;height: 72rpx;border-radius: 50%;margin-right: 20rpx;"></image>
 					<image src="../../static/icon_more@2x.png" style="width: 15rpx;height: 23rpx;margin-bottom:30rpx ;"></image>
 				</view>
 			</view>
@@ -31,21 +31,21 @@
 			</view>
 		</view>
 		<!-- 微信 -->
-		<view style="width: 100%;border-bottom:2rpx solid rgba(247,247,247,1);height:88rpx;margin-top: 30rpx;overflow: hidden;">
+		<!-- <view style="width: 100%;border-bottom:2rpx solid rgba(247,247,247,1);height:88rpx;margin-top: 30rpx;overflow: hidden;">
 			<view class="item" @tap="wxLogin">
 				<view class="left" style="width: 98rpx;">微信</view>
 				<view class="right" style="width:500rpx;position: relative;">
-					<text style="max-width: 400rpx;height: 40rpx;text-align: right;position: absolute;right: 37rpx;top: 10rpx;color:rgba(153,153,153,1);">已绑定</text>
+					<text style="max-width: 400rpx;height: 40rpx;text-align: right;position: absolute;right: 37rpx;top: 10rpx;color:rgba(153,153,153,1);">{{data.status==1?'绑定':'未绑定'}}</text>
 					<image src="../../static/icon_more@2x.png" style="width: 15rpx;height: 23rpx;position: absolute;right: 0;bottom:35rpx ;"></image>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<!-- 人脸模板 -->
 		<view style="width: 100%;border-bottom:2rpx solid rgba(247,247,247,1);height:300rpx;margin-top: 30rpx;overflow: hidden;">
 			<view class="item" style="height: 100%;">
 				<view class="left" style="width: 132rpx;margin-top: 128rpx;">人脸模板</view>
 				<view class="right" style="width:500rpx;position: relative;" @tap="changeFacePhoto">
-					<image src="../../static/care_family.png" style="width: 256rpx;height:256rpx;position: absolute;right: 37rpx;color:rgba(153,153,153,1);"></image>
+					<image :src="facePhoto" style="width: 256rpx;height:256rpx;position: absolute;right: 37rpx;color:rgba(153,153,153,1);"></image>
 					<image src="../../static/icon_more@2x.png" style="width: 15rpx;height: 23rpx;position: absolute;right: 0;bottom:142rpx ;"></image>
 				</view>
 			</view>
@@ -61,34 +61,113 @@
 				phone: 15855391987, //手机号
 				headImg: '', //头像
 				photo: '', //人脸
+				status:0,
+				facePhoto:'',
+				headPhoto:''
 			}
 		},
+		onLoad() {
+			this.getUserData()
+		},
 		methods: {
+			// 获取用户数据
+			  getUserData(){
+				  uni.showLoading({
+				  	title:'加载中',
+					'icon':'none'
+				  })
+				this.http.httpRequest('/wxapplet/ownersid/getUser','get',{
+					userId:uni.getStorageSync('userId')
+				},true).then((res)=>{
+					console.log(res)
+					if(res.code==0){
+						uni.hideLoading()
+						// 判断当前返回值是否是网络路径图片
+						if(res.data.avatar.indexOf('https://')==-1){
+							this.headPhoto=this.getBase64ImageUrl(res.data.avatar)
+							uni.setStorageSync("headImg",this.headPhoto)
+							this.headImg=res.data.avatar
+						}else{
+							 this.getImageToBase64(res.data.avatar)
+							 this.headPhoto=res.data.avatar
+							 uni.setStorageSync("headImg",res.data.avatar)
+						}
+						this.phone=res.data.phoneNum
+						this.userName=res.data.loginName
+						uni.setStorageSync('userName',res.data.loginName)
+						uni.setStorageSync('userPhoen',res.data.phoneNum)
+						this.status=res.data.status
+						this.photo=res.data.facePhoto
+						this.facePhoto=this.getBase64ImageUrl(res.data.facePhoto)
+					}else{
+						uni.hideLoading()
+						uni.showToast({
+							title:res.msg,
+							'icon':'none'
+						})
+					}
+					
+				}).catch(()=>{
+					uni.hideLoading()
+				})
+			  },
+			  // 网络图片转base64
+			  getImageToBase64(img){
+				   uni.downloadFile({
+					    url: img,
+						success:(res)=>{
+							console.log(res)
+							wx.getFileSystemManager().readFile({
+								filePath:res.tempFilePath, //微信小程序图片默认路径
+								encoding: 'base64', //编码格式
+								success: (res) => {
+									this.headImg=res.data
+								},
+								fail() {
+							
+								}
+							})
+						}
+				   })
+			  },
+			  //把base64转换成图片
+			   getBase64ImageUrl(data) {
+			       /// 获取到base64Data
+			       var base64Data = data;
+			       /// 通过微信小程序自带方法将base64转为二进制去除特殊符号，再转回base64
+			       base64Data = uni.arrayBufferToBase64(uni.base64ToArrayBuffer(base64Data))  
+			       /// 拼接请求头，data格式可以为image/png或者image/jpeg等，看需求
+			       const base64ImgUrl = "data:image/png;base64," + base64Data;
+			       // 刷新数据
+				  return base64ImgUrl
+			   },
 			// 修改信息方法
 			updateInfo() {
-				uni.showLoading({
-					mask: true,
-					title: '加载中'
-				})
 				this.http.httpRequest('/wxapplet/ownersid/update/user', 'post', {
 					CardNo: uni.getStorageSync('idNumber'),
-					userId: uni.getStorageSync('userId'),
+					userId: String(uni.getStorageSync('userId')),
 					loginName: this.userName,
 					avatar: this.headImg,
 					facePic: this.photo,
 					ComtyId: uni.getStorageSync('comtyId'),
 				}, true).then((res) => {
 					if (res.code == 0) {
-						uni.hideLoading()
+						uni.showToast({
+							title:'修改成功',
+							'icon':'success'
+						})
+						setTimeout(()=>{
+							this.getUserData()
+						},500)
+						
 					} else {
-						uni.hideLoading()
 						uni.showToast({
 							title: res.msg,
 							'icon': 'none'
 						})
 					}
 				}).catch((res) => {
-					uni.hideLoading()
+					
 				})
 			},
 			// 修改头像
@@ -98,19 +177,19 @@
 					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
 					// sourceType: ['album'], //从相册选择
 					success: (res) => {
-						wx.uploadFile({
-							filePath: res.tempFiles[0].path,
-							url: 'https://www.szdeao.com/wxapplet/upload/imgPhoto ', //仅为示例，非真实的接口地址
-							name: 'photo',
-							method: 'post',
+						this.headPhoto=res.tempFiles[0].path
+						wx.getFileSystemManager().readFile({
+							filePath: res.tempFiles[0].path, //微信小程序图片默认路径
+							encoding: 'base64', //编码格式
 							success: (res) => {
-								let data = JSON.parse(res.data)
-								let reg = /,$/gi;
-								this.headImg = data.data.imagesPath.replace(reg, "");
-								console.log(this.headImg)
+								this.headImg = res.data
 								this.updateInfo()
+							},
+							fail() {
+						
 							}
 						})
+					
 					}
 				})
 			},
@@ -121,6 +200,7 @@
 					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
 					// sourceType: ['album'], //从相册选择
 					success: (res) => {
+						this.facePhoto=res.tempFiles[0].path
 						wx.getFileSystemManager().readFile({
 							filePath: res.tempFiles[0].path, //微信小程序图片默认路径
 							encoding: 'base64', //编码格式

pages/onlineRpair/evalueSuccess.vue

@@ -18,11 +18,11 @@
 		},
 		onUnload() {
 			if(uni.getStorageSync('rateType')==1){
-				wx.reLaunch({
+				uni.reLaunch({
 				      url: '/pages/onlineRpair/index',
 				    })
 			}else{
-				wx.reLaunch({
+				uni.reLaunch({
 				      url: '/pages/complain/index',
 				    })
 			}

pages/onlineRpair/index.vue

@@ -14,7 +14,7 @@
 					<view class="text">
 						{{item.content}}
 					</view>
-					<view class="img">
+					<view class="img" v-show="item.photosUrlList.length>0" @tap="prew(item)">
 						<image :src="img" style="width: 180rpx;height: 180rpx;padding-right: 10rpx;margin-bottom: 10rpx;" v-for="(img,index) in item.photosUrlList"
 						 :key="index"></image>
 					</view>
@@ -61,6 +61,16 @@
 			this.refresh();
 		},
 		methods: {
+			// 预览图片
+			prew(item){
+				uni.previewImage({
+				  // current:item.imgArr[index],
+				 	urls:item.photosUrlList,
+				success:(res)=>{
+				
+				},
+				})
+			},
 			// 刷新页面
 			refresh() {
 				this.$nextTick(() => {
@@ -82,7 +92,7 @@
 					this.http.httpRequest('/wxapplet/ownerreprair/list', 'post', {
 						cardNo: uni.getStorageSync('idNumber'),
 						pageNum: pullScroll.page,
-						pageSize: 3,
+						pageSize: 10,
 						comtyId: uni.getStorageSync("comtyId")
 					}).then((res) => {
 						console.log(res)

pages/onlineRpair/repairsEvaluate.vue

@@ -36,7 +36,7 @@
 				</view> -->
 			</view>
 		</view>
-		<button class="submit" :class="{active:starNum && textRea}" @tap="submit" :loading="isLoading">提交</button>
+		<button class="submit" :class="{active:starNum && textRea}" @tap="submit" >提交</button>
 	</view>
 </template>
 
@@ -75,7 +75,10 @@
 				if (!this.starNum || !this.textRea) {
 					return
 				} else {
-					this.isLoading = true
+					uni.showLoading({
+						mask:true,
+						title:'加载中'
+					})
 					this.http.httpRequest('/wxapplet/ownerreprair/edit', 'post', {
 						id: Number(this.id),
 						score: this.starNum,
@@ -83,18 +86,20 @@
 					}).then((res) => {
 						// 判断请求是否成功 0 成功 
 						if (res.code == 0) {
-							this.isLoading = false
 							uni.setStorageSync('rateType',1)
 							uni.navigateTo({
 								url: './evalueSuccess'
 							})
+							uni.hideLoading()
 						} else {
-							this.isLoading=false
+							uni.hideLoading()
 							uni.showToast({
 								title: res.msg,
 								"icon": 'none'
 							})
 						}
+					}).catch(()=>{
+						uni.hideLoading()
 					})
 				}
 			},

pages/onlineRpair/wantRepair.vue

@@ -29,13 +29,13 @@
 				<!-- 图片盒字 -->
 				<view style="width:646rpx;height: 114rpx;position: absolute;left: 24rpx;bottom: 40rpx;display: flex;">
 					<view style="height: 114rpx;margin-right: 10rpx;display: flex;justify-content: space-between;" v-show="imgData">
-						<image style="width: 114rpx;height: 114rpx;margin-right: 10rpx;" :src="item" v-for="(item,index) in imgData" :key="index"></image>
+						<image style="width: 114rpx;height: 114rpx;margin-right: 10rpx;" :src="item" v-for="(item,index) in imgData" :key="index" @longtap="deleteImg(index)" @tap="prew(imgData)"></image>
 					</view>
 					<image src="../../static/circle_image@2x.png" style="width: 114rpx;height: 114rpx;" @tap="uploadImg(item)"></image>
 				</view>
 			</view>
 		</view>
-		<button class="submit" :class="{active:digest && textRea}" @tap="submit" :loading="isloading">提交</button>
+		<button class="submit" :class="{active:digest && textRea}" @tap="submit" >提交</button>
 	</view>
 </template>
 
@@ -58,6 +58,30 @@
 			this.phoneHeight = uni.getSystemInfoSync().statusBarHeight
 		},
 		methods: {
+			// 预览图片
+			prew(item){
+				uni.previewImage({
+				  // current:item.imgArr[index],
+				 	urls:item,
+				success:(res)=>{
+				
+				},
+				})
+			},
+			// 长按图片删除
+			deleteImg(index){
+				 wx.showModal({
+				   title: '提示',
+				   content: '确定要删除此图片吗？',
+				   success:  (res) =>{
+				    if (res.confirm) {
+				     this.imgData.splice(index, 1);
+				    } else if (res.cancel) {
+				      return false;    
+				     }
+				   }
+				  })
+			},
 			// 选择评分
 			changeRate(e) {
 				this.starNum = e.value
@@ -104,6 +128,10 @@
 					},
 					fail: (res) => {
 						failUp++;
+						uni.showToast({
+							title: res.msg,
+							'icon': 'none'
+						})
 					},
 					complete: () => {
 						i++;
@@ -121,28 +149,33 @@
 				if (!this.digest || !this.textRea || !this.imgData) {
 					return
 				} else {
-					this.isloading = true
+					uni.showLoading({
+						mask:true,
+						title:'加载中'
+					})
 					this.http.httpRequest('/wxapplet/ownerreprair/add', 'post', {
 						userId: uni.getStorageSync('userId'),
 						createBy: uni.getStorageSync('createBy'),
 						content: this.textRea,
 						PhotosUrlList: this.imgData,
 						reprairType: this.digest,
+						comtyId:uni.getStorageSync('comtyId'),
 						ownerPhone: uni.getStorageSync('phoneNumber')
 					}, true).then((res) => {
-						console.log(res)
 						if (res.code == 0) {
-							this.isloading = false
 							uni.navigateTo({
 								url: './repairSuccess'
 							})
+							uni.hideLoading()
 						} else {
-							this.isLoading = false
+							uni.hideLoading()
 							uni.showToast({
 								title: res.msg,
 								'icon': 'none'
 							})
 						}
+					}).catch(()=>{
+						uni.hideLoading()
 					})
 				}
 			},

pages/openDoor/openDoor.vue

@@ -45,19 +45,33 @@
 		methods: {
 			// 获取列表数据
 			getList() {
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				})
 				this.http.httpRequest('/wxapplet/owneradvice/comtydevice/list', 'get', {
 					userId: String(uni.getStorageSync('userId')),
 					comtyId: uni.getStorageSync('comtyId')
 				}, true).then((res) => {
 					console.log(res)
 					if (res.code == 0) {
+						if (res.data.length == 0) {
+							uni.showToast({
+								title: '暂无数据',
+								'icon': 'none'
+							})
+						}
 						this.doorData = res.data
+						uni.hideLoading()
 					} else {
+						uni.hideLoading()
 						uni.showToast({
 							title: res.msg,
 							'icon': 'none'
 						})
 					}
+				}).catch(() => {
+					uni.hideLoading()
 				})
 			},
 			// 开门
@@ -70,7 +84,7 @@
 				}, true).then((res) => {
 					console.log(res)
 					if (res.code == 0) {
-						
+
 					} else {
 						uni.showToast({
 							title: res.msg,

pages/openDoor/openDoorList.vue

@@ -50,8 +50,15 @@
 				}, true).then((res) => {
 					console.log(res)
 					if (res.code == 0) {
-						uni.hideLoading()
+						// 判断返回数据是否为空
+						if(res.data.rows.length==0){
+							uni.showToast({
+								title:'暂无数据',
+								'icon':'none'
+							})
+						}
 						this.data=res.data.rows
+						uni.hideLoading()
 					} else {
 						uni.hideLoading()
 						uni.showToast({

pages/register/register.vue

@@ -144,7 +144,7 @@
 							}, 1000)
 						}
 						this.http.httpRequest('/wxapplet/ownersid/shortmessaging','get',{phoneNumBer:this.form.phone},true).then((res)=>{
-							console.log(res)
+							
 						})
 					}
 
@@ -170,27 +170,35 @@
 							duration: 2000
 						});
 					} else {
+						uni.showLoading({
+							mask:true,
+							title:'加载中'
+						})
 						this.http.httpRequest('/wxapplet/ownersid/add', 'post', {
 							loginName: this.form.name,
 							idcardNum: this.form.idNumber,
 							phoneNumBer: this.form.phone,
 							authcode:this.form.code
 						}, true).then((res) => {
-							console.log(res)
+							// 判断接口是否请求成功 0 成功 1 步成功
 							if(res.code==0){
+								uni.hideLoading()
 								this.$refs.popup.open()
 							}else{
+								uni.hideLoading()
 								uni.showToast({
 										title:res.msg,
 										icon:'none'
 									})
-								this.form.phone=''
-								this.form.code=''
+								// this.form.phone=''
+								// this.form.code=''
 								this.isShow = false
 								this.isGet = true
 								this.num=0
 							}
 							
+						}).catch(()=>{
+							uni.hideLoading()
 						})
 
 					}

pages/visitor/doorCode.vue

@@ -14,8 +14,8 @@
 			<image src="../../static/opening_bgimage@2x.png" style="width: 100%;height: 100%;"></image>
 			<view class="mainTitle">您的开门码</view>
 			<view class="mainCode">{{code}}</view>
-			<!-- <image :src="url" style="width:346rpx;height: 346rpx;position: absolute;bottom: 214rpx;left: 144rpx;" @longtap="saveImg"></image> -->
-			<canvas style="width:346rpx;height: 346rpx;position: absolute;bottom: 214rpx;left: 144rpx;" @longtap="saveImg" canvas-id="myQrcode" ></canvas>
+			<image :src="url" style="width:346rpx;height: 346rpx;position: absolute;bottom: 214rpx;left: 144rpx;" @longtap="saveImg"></image>
+			<!-- <canvas style="width:346rpx;height: 346rpx;position: absolute;bottom: 214rpx;left: 144rpx;" @longtap="saveImg" canvas-id="myQrcode" ></canvas> -->
 			<view class="mainTip">长按图片即可保存二维码</view>
 		</view>
 	</view>
@@ -27,14 +27,15 @@
 		data() {
 			return {
 				phoneHeight: 0, //手机状态栏的高度,
-				url: 'https://wechat.weixinzjit.com/costa/public/uploads/images/20190109/67b16149693920598435315fd0d5ab3e.jpg',
+				url: '',
 				// url:'../../static/complain_icon_complain@2x.png'
 				code:''
 			}
 		},
 		onLoad(option){
 			this.code=option.code
-			this.draw(this.code)
+			this.url=option.img
+			// this.draw(this.code)
 		},
 		created() {
 			// 获取状态栏的高度
@@ -53,7 +54,7 @@
 			saveImg(e) {
 				//用户需要授权
 				let that = this
-				wx.getSetting({
+				uni.getSetting({
 					success(res) {
 						//未授权 先授权 然后保存
 						if (!res.authSetting['scope.writePhotosAlbum']) {

pages/visitor/historyList.vue

@@ -6,7 +6,7 @@
 					<view class="itemTitle">
 						<view class="leftDate">{{(item.createDate).substr(5,5)}}</view>
 						<view class="name">
-							肖战
+							{{item.personName}}
 						</view>
 						<view style="width:196rpx ;height: 40rpx;ont-size:28px;font-family:PingFang SC;font-weight:bold;line-height:40rpx;color:rgba(41,138,253,1);">
 							{{item.visitorPhone}}
@@ -19,12 +19,7 @@
 							</view>
 							<view class="right">{{item.cardNo}}</view>
 						</view>
-						<view style="width: 100%;display: flex;justify-content: space-between;margin-top: 24rpx;">
-							<view class="left">
-								业主姓名:
-							</view>
-							<view class="right">{{item.personName}}</view>
-						</view>
+						
 						<view style="width: 100%;display: flex;justify-content: space-between;margin-top: 24rpx;">
 							<view class="left">
 								访问事由:
@@ -195,7 +190,7 @@
 
 	.item {
 		width: 702rpx;
-		height: 730rpx;
+		height: 530rpx;
 		margin: 0 auto;
 		background: rgba(255, 255, 255, 1);
 		border: 2rpx solid rgba(247, 247, 247, 1);
@@ -228,7 +223,7 @@
 	}
 
 	.name {
-		width: 80rpx;
+		width: 280rpx;
 		height: 40rpx;
 		font-size: 28rpx;
 		font-family: PingFang SC;