bug

src/project/tianfuxing/AppHome/AddMerchants.vue

@@ -118,7 +118,6 @@
               },
               success: (res) => {
                 const data = JSON.parse(res.data)
-                console.log(data)
 
                 if (data.code === 0) {
                   this.photoUrl = data.data[0].split(';')[0]

src/project/tianfuxing/AppMy/UserInfo.vue

@@ -6,36 +6,36 @@
           <h2>头像</h2>
           <div class="form-item__right">
             <button class="avatar-wrapper" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
-              <image class="avatar" :src="user.avatarUrl || 'https://cdn.cunwuyun.cn/wxmp/tianfuxing/avatar.png'"></image>
+              <image class="avatar" :src="userInfo.avatarUrl || 'https://cdn.cunwuyun.cn/wxmp/tianfuxing/avatar.png'"></image>
             </button>
           </div>
         </div>
         <div class="form-item">
           <h2>昵称</h2>
           <div class="form-item__right">
-            <input placeholder="请输入昵称" type="nickname" v-model="user.nickName" />
+            <input placeholder="请输入昵称" type="nickname" v-model="userInfo.nickName" />
           </div>
         </div>
         <div class="form-item">
           <h2>手机号</h2>
           <div class="form-item__right">
-            <input placeholder="请输入手机号" type="number" maxlength="11" v-model="user.phone" />
+            <input placeholder="请输入手机号" type="number" maxlength="11" v-model="userInfo.phone" />
           </div>
         </div>
         <div class="form-item">
           <h2>所在社区</h2>
-          <picker :range="sqList" range-key="dictName" @change="e => (user.sssq = sqList[e.detail.value].dictName)">
+          <picker :range="sqList" range-key="dictName" @change="e => (userInfo.sssq = sqList[e.detail.value].dictName)">
             <div class="form-item__right">
-              <span :style="{color: user.sssq ? '#333' : '#999'}">{{ user.sssq ? user.sssq : '请输入所在社区' }}</span>
+              <span :style="{color: userInfo.sssq ? '#333' : '#999'}">{{ userInfo.sssq ? userInfo.sssq : '请输入所在社区' }}</span>
               <image class="right" src="https://cdn.cunwuyun.cn/wxmp/tianfuxing/ContentRightArrow@2x.png" />
             </div>
           </picker>
         </div>
         <div class="form-item">
           <h2>所在小区</h2>
-          <picker :range="xqList" range-key="dictName" @change="e => (user.szxq = xqList[e.detail.value].dictName)">
+          <picker :range="xqList" range-key="dictName" @change="e => (userInfo.szxq = xqList[e.detail.value].dictName)">
             <div class="form-item__right">
-              <span :style="{color: user.szxq ? '#333' : '#999'}">{{ user.szxq ? user.szxq : '请输入所在小区' }}</span>
+              <span :style="{color: userInfo.szxq ? '#333' : '#999'}">{{ userInfo.szxq ? userInfo.szxq : '请输入所在小区' }}</span>
               <image class="right" src="https://cdn.cunwuyun.cn/wxmp/tianfuxing/ContentRightArrow@2x.png" />
             </div>
           </picker>
@@ -77,29 +77,29 @@
 
     methods: {
       save () {
-        if (!this.user.avatarUrl) {
+        if (!this.userInfo.avatarUrl) {
           return this.$toast('请上传头像')
         }
 
-        if (!this.user.nickName) {
+        if (!this.userInfo.nickName) {
           return this.$toast('请输入昵称')
         }
 
-        if (!this.user.phone) {
+        if (!this.userInfo.phone) {
           return this.$toast('请输入手机号')
         }
 
-        if (!this.user.sssq) {
+        if (!this.userInfo.sssq) {
           return this.$toast('请选择所在社区')
         }
 
-        if (!this.user.szxq) {
+        if (!this.userInfo.szxq) {
           return this.$toast('请选择所在小区')
         }
         this.$loading()
         this.$instance.post('/api/appwechatuser/update-nickName', null, {
           params: {
-            ...this.user
+            ...this.userInfo
           }
         }).then(res => {
           if (res.code === 0) {

src/project/tianfuxing/AppSquare/AppSquare.vue

@@ -20,6 +20,7 @@
   export default {
     appName: '文明广场',
     name: 'AppSquare',
+    enablePullDownRefresh: true,
 
     data () {
       return {
@@ -58,7 +59,10 @@
       },
 
       getList () {
-        if (this.isMore) return
+        if (this.isMore) {
+          uni.stopPullDownRefresh()
+          return
+        }
 
         this.$loading()
         this.$instance.post(`/api/appwechatescalation/list`, null, {
@@ -72,6 +76,7 @@
         }).then(res => {
           if (res.code === 0) {
             this.$hideLoading()
+            uni.stopPullDownRefresh()
             if (this.current > 1) {
               this.list = [...this.list, ...res.data.records]
             } else {
@@ -89,6 +94,7 @@
             this.isMore = true
           }
         }).catch(() => {
+          uni.stopPullDownRefresh()
           this.$hideLoading()
         })
       }
@@ -96,7 +102,13 @@
 
     onReachBottom () {
       this.getList()
-    }
+    },
+
+    onPullDownRefresh() {
+      this.isMore = false
+      this.current = 1
+      this.getList()
+    },
   }
 </script>