Merge branch 'hotfix/修复苹果问题'

zhaojs

2023-06-09 bef3a652349b7b79c914afcc013d7229706a2b3b

Merge branch 'hotfix/修复苹果问题'

 uniapp/App.vue

@@ -135,7 +135,10 @@
            userInfo: {},
            canlisten: true,
            appinfo: {},
            ifwt: 0
            ifwt: 0,
            hasinit:false,
            hasbcinit:false,
			
        },
        onShow: function() {
            var that = this;
@@ -147,10 +150,20 @@
                            content: '检测到网络权限可能设置为关闭，您可以在“设置”中检查无线数据及蜂窝移动网络'
                        })
                    }else{
                        let appInfo = utils.getCacheSync('appInfo')
                        if(appInfo == "" || appInfo == undefined){
                        console.log("是否请求过："+that.globalData.hasinit)
                        if(!that.globalData.hasinit)
                        {
                            that.getAppInfo();
                        }
                        if(!that.globalData.hasbcinit)
                        {
                            that.bcInit();
                        }
                        /* let appInfo = utils.getCacheSync('appInfo')
                        if(appInfo == "" || appInfo == undefined){
                            console.log("获取方法")
                            that.getAppInfo();
                        } */
                    }
                }
            })
@@ -169,10 +182,29 @@
        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(result);    // code等于0就是初始化成功
                        if(result.code==0)
                        {
                            that.globalData.hasbcinit=true;
                        }
                    });
                }
            },
            getAppInfo: function() {
                var that = this;
                this.$u.api.comminInt({}).then(e => {
                    console.log(e)
                    if (e.code != 0) return that.$alert(e.msg)
                    that.globalData.hasinit=true;
                    that.globalData.appinfo = e.data.basic
                    utils.setCache('appInfo', e.data.basic)
                    utils.setCache('baseUrl', this.$u.http.config.baseUrl)
@@ -206,6 +238,22 @@
                }).catch(function(err) {})
                
            },
			
             watch:function(method,istr){
                            var obj=this.globalData
                            console.log(obj)
                            Object.defineProperty(obj,istr,{
                            configurable:true,
                            enumerable:true,
                            set:function(value){
                                this._consumerGoodsStatus=value
                                method(value)
                            },
                            get:function(value){
                                        return this._consumerGoodsStatus
                                    }
                                })
                            },
        },
    }
</script>

 uniapp/components/empowerModel.vue

@@ -34,6 +34,10 @@
        },
        created() {
            this.applogo = getApp().globalData.appinfo.logo
            if(!getApp().globalData.hasbcinit)
            {
                getApp().bcInit();
            }
            /* console.log(uni.getSystemInfoSync().platform);
            if (uni.getSystemInfoSync().platform == 'ios') {
                                    plug.init({}, result => {
@@ -47,7 +51,7 @@
                console.log(getApp().globalData.appinfo);
                console.log(plug);
                plug.login({}, result => {
                    console.log(plug);
                    console.log(result);
                    var nick = result.userinfo.nick
                    if (result.code == 0) {
                        plug.taobaoOauth({

 uniapp/components/pddremind.vue

@@ -22,7 +22,7 @@

<script>
    import util from '../utils/utils.js'
    const plug = uni.requireNativePlugin('Html5app-Baichuan')
    const plug = uni.requireNativePlugin('xiguazhu-baichuan')
    export default {
        data() {
            return {

 uniapp/nativeplugins/xiguazhu-baichuan/ios/UTDID.framework/Headers

ÎļþÒÑɾ³ý

 uniapp/nativeplugins/xiguazhu-baichuan/ios/UTDID.framework/Resources

ÎļþÒÑɾ³ý

 uniapp/nativeplugins/xiguazhu-baichuan/ios/UTDID.framework/UTDID

Binary files differ

 uniapp/nativeplugins/xiguazhu-baichuan/ios/UTDID.framework/Versions/A/Headers/AidProtocol.h

ÎļþÒÑɾ³ý

 uniapp/nativeplugins/xiguazhu-baichuan/ios/UTDID.framework/Versions/A/Headers/UTDevice.h

ÎļþÒÑɾ³ý

 uniapp/nativeplugins/xiguazhu-baichuan/ios/UTDID.framework/Versions/A/Resources/Info.plist

Binary files differ

 uniapp/nativeplugins/xiguazhu-baichuan/ios/UTDID.framework/Versions/A/UTDID

Binary files differ

 uniapp/nativeplugins/xiguazhu-baichuan/ios/UTDID.framework/Versions/Current

ÎļþÒÑɾ³ý

 uniapp/pages/goods/goodsDetail.vue

@@ -263,6 +263,7 @@
  import pddEmpower from '../../components/pddempower.vue'
  import inviteCodeModel from '../../components/inviteCode.vue'
  import inviterModel from '../../components/inviterModel.vue'
   
  export default {
    components: {
      empowerModel,
@@ -305,6 +306,16 @@
      if (this.memberId) {
        this.updataUser()
      }
	  
      if(!getApp().globalData.hasinit)
      {
          console.log("初始化")
          getApp().getAppInfo();
      }
      if(!getApp().globalData.hasbcinit)
      {
          getApp().bcInit();
      }
    },
    onLoad(options) {
      this.appinfo = utils.getCacheSync('appInfo')
@@ -553,10 +564,12 @@
          goodsId: this.optionsInfo.goodsId,
          type: 0
        }).then(e => {
            console.log(e)
          if (e.code != 0) return that.$alert(e.msg)
          var res = e.data.info;
          var tburl = res.shortUrl
          // #ifdef APP-PLUS
		 
          if (plus.runtime.isApplicationExist({
              pname: 'com.taobao.taobao',
              action: 'taobao://'

 uniapp/pages/mine/mine.vue

@@ -262,7 +262,6 @@
                platform: '',
                showtar: false,
                bbcList:'',

                sct: 0,
                inviteCodeShow:false,
                inviterShow:false
@@ -278,6 +277,7 @@
            this.getuserInfo();
            this.centerInfo();
            this.getmoneyInfo();
            this.getInit();
            uni.stopPullDownRefresh();
        },        
        onLoad() {
@@ -286,24 +286,36 @@
                    url:"/pages/login/wxlogin"
                })
            }else{
                // #ifdef APP-PLUS
                this.appInfo = uni.getStorageSync('appInfo');
                console.log(this.appInfo.iosExamine);
                this.showtar = getApp().globalData.ifwt == 1 ? false : true;
                this.platform = plus.os.name
                // #endif
                //getApp().watch(this.ifwtChange,'ifwt')
                this.centerInfo()
                this.getbanner()
            }

        },
        onShow() {
            if(this.hasLogin){
                this.getInit();
                this.getmoneyInfo()
                this.getuserInfo()
            }
        },
        methods: {
            getInit()
            {
                if(!getApp().globalData.hasinit)
                {
                    getApp().getAppInfo();
                    setTimeout(()=>{
                        this.getInit();
                    },2000)
                }
				
                // #ifdef APP-PLUS
                console.log(getApp().globalData.ifwt)
                this.appInfo = uni.getStorageSync('appInfo');
                this.showtar = getApp().globalData.ifwt == 1 ? false : true;
                this.platform = plus.os.name
                // #endif
            },
            getmoneyInfo() {
                var that = this;
                this.$u.api.getEstimateAmount({}).then(e => {
@@ -416,8 +428,6 @@
                }
                
            },

			
            cpr_version(a, b) {
                console.log(a);
                var _a = this.toNum(a),