Merge branch 'release/v1.1.3发布'

zhaojs

2023-06-30 ba3d748f9eb65a66fca9bd74fc7796b90a0a70ae

 uniapp/App.vue

@@ -82,7 +82,8 @@
         }); */
         APPUpdate();
         // #endif
         this.getAppInfo()
         this.getAppInfo();
         //this.that.bcInit();
         let userInfo = uni.getStorageSync('userInfo')
         if (userInfo.id) {
            this.login(userInfo)
@@ -136,6 +137,9 @@
         canlisten: true,
         appinfo: {},
         ifwt: 0,
         hasinit:false,
         hasbcinit:false,
         isLaunch:false
         
      },
      onShow: function() {
@@ -148,7 +152,16 @@
                     content: '检测到网络权限可能设置为关闭，您可以在“设置”中检查无线数据及蜂窝移动网络'
                  })
               }else{
                  that.getAppInfo();
                  console.log("是否请求过："+that.globalData.hasinit)
                  if(!that.globalData.hasinit)
                  {
                     that.getAppInfo();
                  }
                  if(!that.globalData.hasbcinit)
                  {
                     console.log("初始化百川插件")
                     that.bcInit();
                  }
                  /* let appInfo = utils.getCacheSync('appInfo')
                  if(appInfo == "" || appInfo == undefined){
                     console.log("获取方法")
@@ -162,7 +175,6 @@
            var route = routes[routes.length - 1].route
         }
         // #ifdef APP-PLUS
         console.log(this.globalData.canlisten)
         if (this.globalData.canlisten && route != 'pages/mine/tools/turnChain') {
            getClipboard()
         }
@@ -172,11 +184,36 @@
      onHide: function() {},
      methods: {
         ...mapMutations(['login']),
          bcInit:function()
         {
            var that = this;
            console.log(uni.getSystemInfoSync().platform);
            if (uni.getSystemInfoSync().platform == 'ios')
            {
               const plug = uni.requireNativePlugin('xiguazhu-baichuan');
               console.log(plug)
               plug.init({}, result => {
                  //console.log('1111111111111111111');
                  console.log(result);   // code等于0就是初始化成功
                  if(result.code==0)
                  {
                     that.globalData.hasbcinit=true;
                  }
               });
            }
            else{
               that.globalData.hasbcinit=true;
            }
         },
         getAppInfo: function() {
            var that = this;
            that.globalData.hasinit=true;
            this.$u.api.comminInt({}).then(e => {
               console.log(e)
               if (e.code != 0) return that.$alert(e.msg)
               if (e.code != 0) 
               {
                  that.globalData.hasinit=false;
                  return that.$alert(e.msg)
               }
               that.globalData.appinfo = e.data.basic
               utils.setCache('appInfo', e.data.basic)
               utils.setCache('baseUrl', this.$u.http.config.baseUrl)
@@ -207,9 +244,10 @@
                  }
               }
               // #endif
            }).catch(function(err) {})
            }).catch(function(err) {that.globalData.hasinit=false;})
            
         },
			
          watch:function(method,istr){
                         var obj=this.globalData
                         console.log(obj)