Merge branch 'master-2.0' of http://47.96.225.205:8888/r/hmy_farmer-main in...

xuxueyang

2024-10-09 aa82f2ce6aabe78b47c927d7ae2d3ff08c59baaf

 mixin/mixin.js

@@ -50,9 +50,20 @@
         // regAvatarUrl: 'https://youzhen123.oss-cn-huhehaote.aliyuncs.com/WechatOwnerProperty/images/mrtx.png',
         regUserName: '',
         regAvatarUrl: '',
         previewImgSign:false,
      }
   },
   methods: {
      copyTxt(txt) {
         uni.setClipboardData({
            data: txt, //要被复制的内容
            success: () => { //复制成功的回调函数
               uni.showToast({ //提示
                  title: '复制成功'
               })
            }
         })
      },
      onChooseavatar(e) {
         let self = this;
         let {
@@ -68,6 +79,10 @@
         this.regUserName = e.detail.value; // 获取微信昵称
      },

      handleContact(e) {
         console.log(e.detail.path)
         console.log(e.detail.query)
      },



@@ -117,14 +132,29 @@
                  } else {
                     //根据id去重正常
                     var ids = []
                     var idsMap = {}
                     for (var item of this.list) {
                        ids.push(item.id)
                        if (item.id) {
                           idsMap[item.id] = item
                        }
                     }
                     var hasnew = false
                     for (var item of data.records) {
                        if (ids.indexOf(item.id) < 0) {
                           this.list.push(item)
                        } else {
                           //最好更新一下
                           idsMap[item.id] = {
                              ...idsMap[item.id],
                              ...item, //覆盖了
                           }
                           hasnew = true
                        }
                     }
                     if (hasnew) {
                        this.$forceUpdate()
                     }

                  }
                  this.page.total = data.total || 0