From bef3a652349b7b79c914afcc013d7229706a2b3b Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期五, 09 六月 2023 09:10:32 +0800
Subject: [PATCH] Merge branch 'hotfix/修复苹果问题'

---
 uniapp/App.vue |   54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/uniapp/App.vue b/uniapp/App.vue
index a2558af..28c9a50 100644
--- a/uniapp/App.vue
+++ b/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>

--
Gitblit v1.9.3