Merge branch 'master' of http://139.186.142.91:10010/r/productDev/jinkuai

MrShi

7 天以前 2d02eb82474e43faedfe06910381ede0eda67f3c

 small-program/pages/mine/mine.vue

@@ -153,7 +153,8 @@
            changing1:false,
            autoReceiveStatus: false,
            isLogin:false,
            useIdentity:0
            useIdentity:0,
            qrcode:''
         }
      },
      onShow(options){ 
@@ -279,6 +280,20 @@
               that.changing1 = false
            })
         } ,
         saoyisao(){
            var that =this
            // 允许从相机和相册扫码
            wx.scanCode({
              // scanType:['barCode'],
              success (res) {
               that.qrcode =res.result
                console.log(res)
              },
              fail(e){
                 console.error(e)
              }
            })
         },
         updateMemberInfo(e) {
            if(this.changing){
               return