From fc9bd6378d3bfbde6d5c71535757a3d44de8d8ff Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 20 七月 2023 15:18:06 +0800
Subject: [PATCH] Merge branch 'feature/1.1.4开发' into develop
---
uniapp/App.vue | 72 +++++++++++++++++++++++++++++-------
1 files changed, 58 insertions(+), 14 deletions(-)
diff --git a/uniapp/App.vue b/uniapp/App.vue
index 28c9a50..adf7563 100644
--- a/uniapp/App.vue
+++ b/uniapp/App.vue
@@ -11,11 +11,14 @@
// #endif
export default {
onLaunch: function() {
+
// #ifdef APP-PLUS
//鎺ㄩ�佸紑濮�
/* var info = plus.push.getClientInfo()
+ console.log(info);
// 鑾峰彇褰撳墠璁惧鐨勫鎴风id,浼犵粰鍚庡彴,瀹炵幇鎸囧畾鐢ㄦ埛
- info && uni.setStorageSync('clientInfo', info)
+ info && uni.setStorageSync('clientInfo', info) */
+ this.getPushCid();
// 浣跨敤5+App鐨勬柟寮忚繘琛岀洃鍚秷鎭帹閫�
//娑堟伅鐐瑰嚮浜嬩欢
//銆怉PP鍦ㄧ嚎銆戯紝鏀跺埌閫忎紶娑堟伅閫氳繃锛屼笉浼氭彁閱掕嚦閫氱煡鏍忕洰锛岄渶瑕佸彂閫佹湰鍦版秷鎭紝鍐嶈繘琛岀偣鍑昏Е鍙戠殑鐐瑰嚮浜嬩欢銆�
@@ -56,6 +59,7 @@
//鏀跺埌閫忎紶娑堟伅
//鍙湁APP鍦ㄧ嚎鏃讹紝鎵嶄細瑙﹀彂receive浜嬩欢锛岄�忎紶娑堟伅涓嶄細瑙﹀彂绯荤粺娑堟伅,闇�瑕佸垱寤烘湰鍦版秷鎭�
plus.push.addEventListener("receive", function(msg) {
+ console.log('receive', JSON.stringify(msg))
//涓氬姟浠ｇ爜
// IOS
if (uni.getSystemInfoSync().platform == 'ios') {
@@ -64,7 +68,8 @@
if (msg.type == "receive") {
//鍒涘缓鏈湴娑堟伅,鍙戦�佺殑鏈湴娑堟伅涔熶細琚玶eceive鏂规硶鎺ユ敹鍒帮紝浣嗘病鏈塼ype灞炴�э紝涓攁ps鏄痭ull
plus.push.createMessage(msg.content, JSON.stringify(msg), {
- title: messageTitle
+ title: messageTitle,
+ //icon:'/static/images/app/pushlogo.png'
});
}
} else { // Android
@@ -79,10 +84,11 @@
//娑堟伅鎺ㄩ�佺粨鏉�
plus.push.addEventListener('click', res => {
console.log(res);
- }); */
+ });
APPUpdate();
// #endif
- this.getAppInfo()
+ this.getAppInfo();
+ //this.that.bcInit();
let userInfo = uni.getStorageSync('userInfo')
if (userInfo.id) {
this.login(userInfo)
@@ -138,6 +144,7 @@
ifwt: 0,
hasinit:false,
hasbcinit:false,
+ isLaunch:false
},
onShow: function() {
@@ -150,13 +157,13 @@
content: '妫�娴嬪埌缃戠粶鏉冮檺鍙兘璁剧疆涓哄叧闂紝鎮ㄥ彲浠ュ湪鈥滆缃�濅腑妫�鏌ユ棤绾挎暟鎹強铚傜獫绉诲姩缃戠粶'
})
}else{
- console.log("鏄惁璇锋眰杩囷細"+that.globalData.hasinit)
if(!that.globalData.hasinit)
{
that.getAppInfo();
}
if(!that.globalData.hasbcinit)
{
+ console.log("鍒濆鍖栫櫨宸濇彃浠�")
that.bcInit();
}
/* let appInfo = utils.getCacheSync('appInfo')
@@ -172,8 +179,7 @@
var route = routes[routes.length - 1].route
}
// #ifdef APP-PLUS
- console.log(this.globalData.canlisten)
- if (this.globalData.canlisten && route != 'pages/mine/tools/turnChain') {
+ if (this.globalData.canlisten && route != 'pages/mine/tools/turnChain'&&route!='pages/rankinglist/compareprice') {
getClipboard()
}
@@ -185,12 +191,11 @@
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)
{
@@ -198,13 +203,53 @@
}
});
}
+ else{
+ that.globalData.hasbcinit=true;
+ }
+ },
+ getPushCid:function()
+ {
+ // #ifdef APP-PLUS
+ var info = plus.push.getClientInfo()
+ if(info&&info.clientid!='null')
+ {// 鑾峰彇褰撳墠璁惧鐨勫鎴风id,浼犵粰鍚庡彴,瀹炵幇鎸囧畾鐢ㄦ埛
+ uni.setStorageSync('clientInfo', info);
+ this.updatePushCid();
+ }
+ else{
+ console.log('娌℃湁鑾峰彇鍒�');
+ setTimeout(() => {
+ this.getPushCid();
+ }, 1000)
+ }
+ // #endif
+ },
+ updatePushCid:function()
+ {
+ let clientInfo = uni.getStorageSync('clientInfo');
+ if(clientInfo&&clientInfo!='null'&&clientInfo.clientid)
+ {
+ console.log('寮�濮嬫洿鏂�');
+ this.$u.api.updateCid({
+ pushcid:clientInfo.clientid
+ }).then(e => {
+ }).catch(function (err) {
+ })
+ }
+ else{
+ this.getPushCid();
+ }
+
},
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)
- that.globalData.hasinit=true;
+ 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)
@@ -227,7 +272,6 @@
if (plus.runtime.isApplicationExist({pname:'com.tencent.mm',
action: 'weixin://'
})) {
- console.log("瀹夊崜绔凡瀹夎寰俊")
that.globalData.ifwt = 1 //鏄惁瀹夎寰俊 1浠ｈ〃瀹夎
} else {
console.log("瀹夊崜绔湭瀹夎寰俊")
@@ -235,7 +279,7 @@
}
}
// #endif
- }).catch(function(err) {})
+ }).catch(function(err) {that.globalData.hasinit=false;})
},
--
Gitblit v1.9.3