From 83e49ed8b1ab05dd332def0fba6c3703d1e91373 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期五, 11 八月 2023 16:32:28 +0800
Subject: [PATCH] Merge branch 'feature/v1.1.5开发' into develop
---
uniapp/App.vue | 177 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 108 insertions(+), 69 deletions(-)
diff --git a/uniapp/App.vue b/uniapp/App.vue
index adf7563..ac5afb2 100644
--- a/uniapp/App.vue
+++ b/uniapp/App.vue
@@ -11,7 +11,7 @@
// #endif
export default {
onLaunch: function() {
-
+
// #ifdef APP-PLUS
//鎺ㄩ�佸紑濮�
/* var info = plus.push.getClientInfo()
@@ -33,6 +33,7 @@
} else { //APP鍦ㄧ嚎锛屾敹鍒版秷鎭笉浼氬寘鍚玹ype灞炴��,杩欐椂鐨刾ayload鏄疛SON瀛楃涓诧紝闇�瑕佽浆涓篔SON瀵硅薄
payload = JSON.parse(msg.payload);
}
+ console.log(payload);
if (payload != null || payload != undefined) {
// var messageType = payload.messageType;
// onLaunch 鐢熷懡鍛ㄦ湡閲岋紝椤甸潰璺宠浆鏈夐棶棰�,璺充笉杩囧幓
@@ -129,10 +130,12 @@
this.globalData.systemLevel = e.system;
this.globalData.equipmentNumber = idfa.value()
};
+ this.getArgument(true);
// #endif
}
})
-
+
+
},
globalData: {
platform: '',
@@ -142,27 +145,31 @@
canlisten: true,
appinfo: {},
ifwt: 0,
- hasinit:false,
- hasbcinit:false,
- isLaunch:false
-
+ hasinit: false,
+ hasbcinit: false,
+ isLaunch: false,
+ argumentStr: ''
+
+ },
+ data(){
+ return {
+
+ }
},
onShow: function() {
var that = this;
uni.getNetworkType({
- success:function(res){
+ success: function(res) {
if (res.networkType == 'none') {
uni.showModal({
title: '缃戠粶閾炬帴澶辫触',
content: '妫�娴嬪埌缃戠粶鏉冮檺鍙兘璁剧疆涓哄叧闂紝鎮ㄥ彲浠ュ湪鈥滆缃�濅腑妫�鏌ユ棤绾挎暟鎹強铚傜獫绉诲姩缃戠粶'
})
- }else{
- if(!that.globalData.hasinit)
- {
+ } else {
+ if (!that.globalData.hasinit) {
that.getAppInfo();
}
- if(!that.globalData.hasbcinit)
- {
+ if (!that.globalData.hasbcinit) {
console.log("鍒濆鍖栫櫨宸濇彃浠�")
that.bcInit();
}
@@ -179,44 +186,77 @@
var route = routes[routes.length - 1].route
}
// #ifdef APP-PLUS
- if (this.globalData.canlisten && route != 'pages/mine/tools/turnChain'&&route!='pages/rankinglist/compareprice') {
+ if (this.globalData.canlisten && route != 'pages/mine/tools/turnChain' && route !=
+ 'pages/rankinglist/compareprice') {
getClipboard()
}
-
+ that.getArgument();
// #endif
},
onHide: function() {},
methods: {
...mapMutations(['login']),
- bcInit:function()
- {
+ bcInit: function() {
var that = this;
- if (uni.getSystemInfoSync().platform == 'ios')
- {
+ if (uni.getSystemInfoSync().platform == 'ios') {
const plug = uni.requireNativePlugin('xiguazhu-baichuan');
plug.init({}, result => {
//console.log('1111111111111111111');
- console.log(result); // code绛変簬0灏辨槸鍒濆鍖栨垚鍔�
- if(result.code==0)
- {
- that.globalData.hasbcinit=true;
+ console.log(result); // code绛変簬0灏辨槸鍒濆鍖栨垚鍔�
+ if (result.code == 0) {
+ that.globalData.hasbcinit = true;
}
});
- }
- else{
- that.globalData.hasbcinit=true;
+ } else {
+ that.globalData.hasbcinit = true;
}
},
- getPushCid:function()
- {
+ targetArgument(args){
+ var toarg = args.replace('dafanguan://', '');
+ var argObj = JSON.parse(decodeURIComponent(toarg));
+ switch (argObj.totype) {
+ case "0": //鍐呴摼
+ if(argObj.url)
+ {
+ uni.navigateTo({
+ url: argObj.url
+ });
+ }
+ break;
+ default:
+ break;
+ }
+ },
+ getArgument(isload=false) {
+ if(this.globalData.argumentStr&&this.globalData.argumentStr.length>0)
+ {
+ return;
+ }
+ try {
+ var args = plus.runtime.arguments;
+ console.log(args);
+ if (args) {
+ if(isload)
+ {
+ this.globalData.argumentStr = args;
+ return;
+ }
+ plus.runtime.arguments = "";
+ plus.runtime.arguments = null;
+ this.targetArgument(args);
+ }
+ } catch (es) {
+ console.log(es)
+ }
+
+ },
+ getPushCid: function() {
// #ifdef APP-PLUS
var info = plus.push.getClientInfo()
- if(info&&info.clientid!='null')
- {// 鑾峰彇褰撳墠璁惧鐨勫鎴风id,浼犵粰鍚庡彴,瀹炵幇鎸囧畾鐢ㄦ埛
+ if (info && info.clientid != 'null') { // 鑾峰彇褰撳墠璁惧鐨勫鎴风id,浼犵粰鍚庡彴,瀹炵幇鎸囧畾鐢ㄦ埛
uni.setStorageSync('clientInfo', info);
this.updatePushCid();
- }
- else{
+ } else {
console.log('娌℃湁鑾峰彇鍒�');
setTimeout(() => {
this.getPushCid();
@@ -224,38 +264,33 @@
}
// #endif
},
- updatePushCid:function()
- {
+ updatePushCid: function() {
let clientInfo = uni.getStorageSync('clientInfo');
- if(clientInfo&&clientInfo!='null'&&clientInfo.clientid)
- {
- console.log('寮�濮嬫洿鏂�');
+ if (clientInfo && clientInfo != 'null' && clientInfo.clientid) {
+ console.log('寮�濮嬫洿鏂�:'+clientInfo.clientid);
this.$u.api.updateCid({
- pushcid:clientInfo.clientid
- }).then(e => {
- }).catch(function (err) {
- })
- }
- else{
+ pushcid: clientInfo.clientid
+ }).then(e => {}).catch(function(err) {})
+ } else {
this.getPushCid();
}
-
+
},
getAppInfo: function() {
var that = this;
- that.globalData.hasinit=true;
+ that.globalData.hasinit = true;
this.$u.api.comminInt({}).then(e => {
- if (e.code != 0)
- {
- that.globalData.hasinit=false;
+ 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)
// #ifdef APP-PLUS
- if (plus.os.name == 'iOS') {
- if (that.globalData.appinfo.iosExamine && plus.runtime.version == e.data.basic.IosExamineV) {
+ if (plus.os.name == 'iOS') {
+ if (that.globalData.appinfo.iosExamine && plus.runtime.version == e.data.basic
+ .IosExamineV) {
that.globalData.ifwt = 0
} else {
if (plus.runtime.isApplicationExist({
@@ -269,7 +304,8 @@
}
}
} else {
- if (plus.runtime.isApplicationExist({pname:'com.tencent.mm',
+ if (plus.runtime.isApplicationExist({
+ pname: 'com.tencent.mm',
action: 'weixin://'
})) {
that.globalData.ifwt = 1 //鏄惁瀹夎寰俊 1浠ｈ〃瀹夎
@@ -278,26 +314,29 @@
that.globalData.ifwt = 0
}
}
+
// #endif
- }).catch(function(err) {that.globalData.hasinit=false;})
-
+ }).catch(function(err) {
+ that.globalData.hasinit = false;
+ })
+
},
-
- 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
- }
- })
- },
+
+ 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>
@@ -319,4 +358,4 @@
}
/* #endif */
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.3