Merge branch 'feature/1.1.4开发' into develop

zhaojs

2023-07-20 fc9bd6378d3bfbde6d5c71535757a3d44de8d8ff

 uniapp/pages/login/wxlogin.vue

@@ -113,12 +113,20 @@
         },
         doMobileLogin(mobRes)
         {
            //从缓存获取cid
            let clientInfo = uni.getStorageSync('clientInfo');
            let pushCid='';
            if(clientInfo&&clientInfo.clientid)
            {
               pushCid=clientInfo.clientid
            }
            var that=this;
            uniCloud.callFunction({
              name: 'getPhoneNumber', // 你的云函数名称
              data: {
                'access_token': mobRes.access_token, // 客户端一键登录接口返回的access_token
                'openid': mobRes.openid // 客户端一键登录接口返回的openid
                'openid': mobRes.openid, // 客户端一键登录接口返回的openid
               'pushCid':pushCid//app推送cid
              }
            }).then(res => {
               console.log(res)
@@ -207,6 +215,8 @@
                     url: './setPass'
                  })
               } */ else {
                  //更新pushcid
                  getApp().updatePushCid();
                  uni.switchTab({
                     url: '../index/index'
                  })