From e0c979eb8a501eab86a9edd8f74597db7c6571d1 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期六, 17 六月 2023 14:45:15 +0800
Subject: [PATCH] no message
---
uniapp/manifest.json | 4 ++--
uniapp/components/sh_page/minePage.vue | 6 +++---
uniapp/utils/config.js | 4 ++--
uniapp/pages/mine/mine.vue | 6 +++---
uniapp/components/sh_page/indexCont.vue | 4 ++--
uniapp/pages/index/index.vue | 17 +++++++++++------
uniapp/components/sh_page/findPage.vue | 2 +-
7 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/uniapp/components/sh_page/findPage.vue b/uniapp/components/sh_page/findPage.vue
index a12ad2e..576bcfc 100644
--- a/uniapp/components/sh_page/findPage.vue
+++ b/uniapp/components/sh_page/findPage.vue
@@ -282,7 +282,7 @@
gofindDetails(id) {
console.log(id)
uni.navigateTo({
- url: "./findGoods?id=" + id
+ url: "/pages/find/findGoods?id=" + id
})
},
diff --git a/uniapp/components/sh_page/indexCont.vue b/uniapp/components/sh_page/indexCont.vue
index d20685a..de56fa5 100644
--- a/uniapp/components/sh_page/indexCont.vue
+++ b/uniapp/components/sh_page/indexCont.vue
@@ -16,7 +16,7 @@
</view>
<view class="pageBody-container colCen borderBox">
<view class="column-container">
- <view class="bannerSwiper-container colCenCen borderBox" v-if="topBannerList.length>0">
+ <!-- <view class="bannerSwiper-container colCenCen borderBox" v-if="topBannerList.length>0">
<swiper class="swiper-box" :current="swpidx
" @change="changeColor" :autoplay="true" :interval="3000" :duration="500" :indicator-dots="true"
:indicator-active-color="'#fff'" circular>
@@ -28,7 +28,7 @@
</swiper-item>
</swiper>
- </view>
+ </view> -->
<!-- 閲戝垰鍖� -->
<view class="navslider-box" v-if="navbarShowList.length > 0">
diff --git a/uniapp/components/sh_page/minePage.vue b/uniapp/components/sh_page/minePage.vue
index ea94e20..e6e5bb4 100644
--- a/uniapp/components/sh_page/minePage.vue
+++ b/uniapp/components/sh_page/minePage.vue
@@ -44,7 +44,7 @@
</view>
<view class="mine-under-container colCen borderBox">
- <view class="swiper-container borderBox" v-if="bannerList.length>0">
+ <!-- <view class="swiper-container borderBox" v-if="bannerList.length>0">
<swiper class="banerContent" :autoplay="true" :interval="3000" :duration="1000" circular>
<swiper-item v-for="(items,index) in bannerList" :key="index" @tap="goUrl(items)">
<view class="swiper-items defIcon">
@@ -52,7 +52,7 @@
</view>
</swiper-item>
</swiper>
- </view>
+ </view> -->
<view class="setting-wrapper wrapperLayer colCen">
@@ -391,7 +391,7 @@
.headerbox-container {
width: 100%;
- height: 326rpx;
+ height: 426rpx;
position: relative;
background: linear-gradient(263deg, #D20CFC, #8905F6);
diff --git a/uniapp/manifest.json b/uniapp/manifest.json
index 14acebf..e88fe97 100644
--- a/uniapp/manifest.json
+++ b/uniapp/manifest.json
@@ -2,8 +2,8 @@
"name" : "澶ц繑瀹�",
"appid" : "__UNI__FC8858A",
"description" : "澶ц繑瀹榓pp",
- "versionName" : "1.1.4",
- "versionCode" : 114,
+ "versionName" : "1.1.7",
+ "versionCode" : 117,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/uniapp/pages/index/index.vue b/uniapp/pages/index/index.vue
index 50e40da..9ba098e 100644
--- a/uniapp/pages/index/index.vue
+++ b/uniapp/pages/index/index.vue
@@ -1,9 +1,8 @@
<template>
- <view v-if="isshowtype">
+ <!-- <view v-if="isshowtype">
<indexnewPage></indexnewPage>
-
- </view>
- <view v-else class="index-wrapper wrapperLayer borderBox">
+ </view> -->
+ <view class="index-wrapper wrapperLayer borderBox">
<view class="fixed-container colCen borderBox" :style="'background:'+ (categoryCurrent>0?'#EE1B14':(scrollTop>30?'#EE1B14;':bannerColor) +';')">
<view class="topbarbox"></view>
<view class="headerSearch-container rowCenBet borderBox">
@@ -129,10 +128,11 @@
nowcurrentid:'',
recomendType:1,
isshowtype:false,
+ hasshow:false,
}
},
onLoad() {
- this.shShow();
+
this.getCategoryList();
this.getPopBannerInfo();
},
@@ -146,6 +146,11 @@
},1000);
return;
}
+ if(!this.hasshow)
+ {
+ this.shShow();
+ }
+
var user= uni.getStorageSync('userInfo');
console.log(user);
if(!user.invitation_code)
@@ -174,8 +179,8 @@
shShow()
{
var that=this;
- console.log('寮�濮嬭姹偮仿仿仿仿仿�');
this.$u.api.comminInt({}).then(e => {
+ that.hasshow=true;
// #ifdef APP-PLUS
if (plus.os.name == 'iOS') {
if (e.data.basic.iosExamine && plus.runtime.version == e.data.basic.IosExamineV) {
diff --git a/uniapp/pages/mine/mine.vue b/uniapp/pages/mine/mine.vue
index caf3789..54c381c 100644
--- a/uniapp/pages/mine/mine.vue
+++ b/uniapp/pages/mine/mine.vue
@@ -1,8 +1,8 @@
<template>
- <view v-if="isshowtype">
+ <!-- <view v-if="isshowtype">
<minePage></minePage>
- </view>
- <view v-else class="minePage-wrapper">
+ </view> -->
+ <view class="minePage-wrapper">
<view class="fixed-box colCen" style="background:linear-gradient(263deg, #D20CFC, #8905F6);">
<view class="topbarbox"></view>
<view class="navigate-container rowCenBet">
diff --git a/uniapp/utils/config.js b/uniapp/utils/config.js
index 8f94b03..567e57f 100644
--- a/uniapp/utils/config.js
+++ b/uniapp/utils/config.js
@@ -1,6 +1,6 @@
//const httpUrl = ""; // 鎺ュ彛鍩熷悕
-const httpUrl = "http://appapitest.ushopvip.com"; // 娴嬭瘯鐜鎺ュ彛鍩熷悕
-//const httpUrl = "http://dfgapp.ushopvip.com"; // 鐢熶骇鐜鎺ュ彛鍩熷悕
+//const httpUrl = "http://appapitest.ushopvip.com"; // 娴嬭瘯鐜鎺ュ彛鍩熷悕
+const httpUrl = "http://dfgapp.ushopvip.com"; // 鐢熶骇鐜鎺ュ彛鍩熷悕
const salt = "";
export default {
httpUrl:httpUrl,
--
Gitblit v1.9.3