From 47171769ba8a7e953c870ac6b5bf24efb6a5e440 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期三, 14 六月 2023 14:41:40 +0800
Subject: [PATCH] no message
---
uniapp/manifest.json | 11 +++--
uniapp/pages/rankinglist/fengqiang.vue | 2
uniapp/pages/rankinglist/xianbao.vue | 2
uniapp/App.vue | 2 +
uniapp/pages/mine/mine.vue | 3 +
uniapp/components/sh_page/indexCont.vue | 4 --
uniapp/pages/login/wxlogin.vue | 34 ++++++++++++++---
uniapp/pages/index/index.vue | 38 +++++++++++-------
uniapp/components/sh_page/indexNewPage.vue | 1
9 files changed, 64 insertions(+), 33 deletions(-)
diff --git a/uniapp/App.vue b/uniapp/App.vue
index fb50101..a85e536 100644
--- a/uniapp/App.vue
+++ b/uniapp/App.vue
@@ -220,6 +220,7 @@
that.globalData.ifwt = 0
}
}
+ console.log(that.globalData.ifwt);
} else {
if (plus.runtime.isApplicationExist({pname:'com.tencent.mm',
action: 'weixin://'
@@ -232,6 +233,7 @@
}
}
// #endif
+
}).catch(function(err) {})
},
diff --git a/uniapp/components/sh_page/indexCont.vue b/uniapp/components/sh_page/indexCont.vue
index a1422aa..d20685a 100644
--- a/uniapp/components/sh_page/indexCont.vue
+++ b/uniapp/components/sh_page/indexCont.vue
@@ -594,7 +594,6 @@
},
onRestore() {
this.swpidx = 0
- console.log('涓嬫媺琚粓姝�');
},
pagescroll(e) {
this.$emit('scrollNum', e.detail.scrollTop)
@@ -625,7 +624,6 @@
this.$u.api.getBanner({
type: '1,3,4,5,11,12,13,14'
}).then(e => {
- console.log(e)
if (e.code == 1) return that.$alert(e.msg);
var res = e.data.info;
if(res.topBannerList&&res.topBannerList.length>0)
@@ -637,7 +635,6 @@
that.doubleLineList = res.doubleLineList;
that.bottomBannerList = res.bottomBannerList;
that.fastenter=res.indexbanner;
- console.log(that.fastenter);
that.popBannerSList=res.popBannerSList;
that.enterTop=res.enterTop;
that.enterDown=res.enterDown;
@@ -699,7 +696,6 @@
pageSize: 10,
type: type
}).then(e => {
- console.log(e)
if (e.code != 0) return that.$alert(e.msg)
var res = e.data.list;
if (res.length < 10) {
diff --git a/uniapp/components/sh_page/indexNewPage.vue b/uniapp/components/sh_page/indexNewPage.vue
index 1e6b000..266b390 100644
--- a/uniapp/components/sh_page/indexNewPage.vue
+++ b/uniapp/components/sh_page/indexNewPage.vue
@@ -178,7 +178,6 @@
}).then(e => {
if (e.code == 1) return that.$alert(e.msg);
var res = e.data.info;
- console.log(res)
if(res.length > 0){
this.showBulletFrame = true;
this.BulletFrameData = res[0]
diff --git a/uniapp/manifest.json b/uniapp/manifest.json
index bfea3e9..14acebf 100644
--- a/uniapp/manifest.json
+++ b/uniapp/manifest.json
@@ -128,11 +128,14 @@
"splashscreen" : {
"androidStyle" : "default",
"android" : {
- "hdpi" : "E:/OPProject/鍙戠増鐢╛鍕垮垹/寮�灞�/寮�灞忓皬.png",
- "xhdpi" : "E:/OPProject/鍥剧墖/寮�灞�/寮�灞忎腑.png",
- "xxhdpi" : "E:/OPProject/鍥剧墖/寮�灞�/寮�灞忓ぇ.png"
+ "hdpi" : "E:/OPProject/鍙戠増鐢╛鍕垮垹/android/480X762.9.png",
+ "xhdpi" : "E:/OPProject/鍙戠増鐢╛鍕垮垹/android/720X1242.9.png",
+ "xxhdpi" : "E:/OPProject/鍙戠増鐢╛鍕垮垹/android/1080x1882.9.png"
},
- "iosStyle" : "common"
+ "iosStyle" : "storyboard",
+ "ios" : {
+ "storyboard" : "E:/OPProject/鍙戠増鐢╛鍕垮垹/ios/CustomStoryboard.zip"
+ }
},
"icons" : {
"android" : {
diff --git a/uniapp/pages/index/index.vue b/uniapp/pages/index/index.vue
index 2d77b3a..50e40da 100644
--- a/uniapp/pages/index/index.vue
+++ b/uniapp/pages/index/index.vue
@@ -1,7 +1,8 @@
<template>
- <view v-if="!isshowtype">
+ <view v-if="isshowtype">
<indexnewPage></indexnewPage>
- </view>
+
+ </view>
<view v-else class="index-wrapper wrapperLayer borderBox">
<view class="fixed-container colCen borderBox" :style="'background:'+ (categoryCurrent>0?'#EE1B14':(scrollTop>30?'#EE1B14;':bannerColor) +';')">
<view class="topbarbox"></view>
@@ -131,6 +132,7 @@
}
},
onLoad() {
+ this.shShow();
this.getCategoryList();
this.getPopBannerInfo();
},
@@ -144,19 +146,6 @@
},1000);
return;
}
- // #ifdef APP-PLUS
-
- var showtar = getApp().globalData.ifwt == 1 ? false : true;
- var platform = plus.os.name;
- console.log(showtar);
- console.log(platform);
- if(showtar&&platform=='iOS')
- {//璺宠浆new
- this.isshowtype=true;
-
- return;
- }
- // #endif
var user= uni.getStorageSync('userInfo');
console.log(user);
if(!user.invitation_code)
@@ -182,6 +171,25 @@
},
watch: {},
methods: {
+ shShow()
+ {
+ var that=this;
+ console.log('寮�濮嬭姹偮仿仿仿仿仿�');
+ this.$u.api.comminInt({}).then(e => {
+ // #ifdef APP-PLUS
+ if (plus.os.name == 'iOS') {
+ if (e.data.basic.iosExamine && plus.runtime.version == e.data.basic.IosExamineV) {
+ that.isshowtype=true;
+ } else {
+ that.isshowtype=false;
+ }
+ console.log(that.isshowtype);
+ }
+ // #endif
+ }).catch(function(err) {
+ console.log(err);
+ })
+ },
goToShowBulletFrame(info){
this.showBulletFrame = false
utils.goUrl(info, this)
diff --git a/uniapp/pages/login/wxlogin.vue b/uniapp/pages/login/wxlogin.vue
index 912d100..a4bd08a 100644
--- a/uniapp/pages/login/wxlogin.vue
+++ b/uniapp/pages/login/wxlogin.vue
@@ -4,7 +4,7 @@
<view class="pageContent borderBox colCen">
<image class="applogo" :src="appInfo.logo" mode="aspectFill"></image>
- <view class="wxlogoBtn rowCenCen" @tap="wxlogin()" v-if="haswxlogin">
+ <view class="wxlogoBtn rowCenCen" @tap="wxlogin()" v-if="supportWx">
<image class="logoIcon" src="../../static/images/mine/wxwhite.png" mode=""></image>
<view>寰俊涓�閿櫥褰�</view>
</view>
@@ -47,19 +47,41 @@
isread: false,
haswxlogin: false,
isSupportMob:false,
- isother:false
+ isother:false,
+ supportWx:true
}
},
onLoad() {
this.appInfo = uni.getStorageSync('appInfo')
- console.log(this.appInfo.iosExamine)
- console.log(getApp().globalData.ifwt)
- //this.haswxlogin = this.appInfo.iosExamine ? false : (getApp().globalData.ifwt == 1 ? true : false)
- this.haswxlogin = getApp().globalData.ifwt == 1 ? true :false;
+ this.checkSupportWx();
this.isSupportMoblie();
},
methods: {
...mapMutations(['login']),
+ checkSupportWx()
+ {
+ // #ifdef APP-PLUS
+ if (plus.os.name == 'iOS') {
+ if (plus.runtime.isApplicationExist({
+ action: 'weixin://'
+ }) && plus.runtime.isApplicationExist({
+ action: 'taobao://'
+ })) {
+ this.supportWx = true //鏄惁瀹夎寰俊鍜屾窐瀹� 1浠ｈ〃瀹夎
+ } else {
+ this.supportWx = false
+ }
+ } else {
+ if (plus.runtime.isApplicationExist({pname:'com.tencent.mm',
+ action: 'weixin://'
+ })) {
+ this.supportWx = true //鏄惁瀹夎寰俊 1浠ｈ〃瀹夎
+ } else {
+ this.supportWx = false
+ }
+ }
+ // #endif
+ },
backHome() {
var pages = getCurrentPages();
console.log(pages.length);
diff --git a/uniapp/pages/mine/mine.vue b/uniapp/pages/mine/mine.vue
index 47f7d73..caf3789 100644
--- a/uniapp/pages/mine/mine.vue
+++ b/uniapp/pages/mine/mine.vue
@@ -341,8 +341,10 @@
methods: {
getInit()
{
+ console.log(getApp().globalData)
if(!getApp().globalData.hasinit)
{
+ console.log('鍒濆鍖�1111')
getApp().getAppInfo();
setTimeout(()=>{
this.getInit();
@@ -383,7 +385,6 @@
var that = this;
this.$u.api.getBanner({type:'2'}).then(e => {
if(e.code == 1)return that.$alert(e.msg);
- console.log(e.data.info)
that.bannerList = e.data.info;
}).catch(function (err) {
})
diff --git a/uniapp/pages/rankinglist/fengqiang.vue b/uniapp/pages/rankinglist/fengqiang.vue
index 6f9697f..bfff77a 100644
--- a/uniapp/pages/rankinglist/fengqiang.vue
+++ b/uniapp/pages/rankinglist/fengqiang.vue
@@ -1,5 +1,5 @@
<template>
- <view v-if="!isshowtype">
+ <view v-if="isshowtype">
<matherPage></matherPage>
</view>
<view v-else>
diff --git a/uniapp/pages/rankinglist/xianbao.vue b/uniapp/pages/rankinglist/xianbao.vue
index e0d4a4b..6dbb8a5 100644
--- a/uniapp/pages/rankinglist/xianbao.vue
+++ b/uniapp/pages/rankinglist/xianbao.vue
@@ -1,5 +1,5 @@
<template>
- <view v-if="!isshowtype">
+ <view v-if="isshowtype">
<findPage></findPage>
</view>
<view v-else>
--
Gitblit v1.9.3