From 4a29244fd31cc4e64a53dd67ea0806277a1c09ec Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期日, 18 六月 2023 23:31:42 +0800
Subject: [PATCH] no message
---
uniapp/pages.json | 20 +-
uniapp/static/images/tabBar/ne_xb_act.png | 0
uniapp/components/sh_page/minePage.vue | 9
uniapp/components/colGoods.vue | 4
uniapp/pages/find/findGoods.vue | 4
uniapp/components/sh_page/indexCont.vue | 309 ++-------------------------------
uniapp/components/sh_page/matherPage.vue | 4
uniapp/static/images/tabBar/ne_bend.png | 0
uniapp/static/images/tabBar/ne_index_act.png | 0
uniapp/static/images/tabBar/ne_mine_act.png | 0
uniapp/static/images/tabBar/ne_xb.png | 0
uniapp/manifest.json | 4
uniapp/static/images/tabBar/ne_qiang_act.png | 0
uniapp/pages/goods/goodsDetail.vue | 26 ++
uniapp/static/images/tabBar/ne_bend_act.png | 0
uniapp/static/images/tabBar/ne_index.png | 0
uniapp/.hbuilderx/launch.json | 2
uniapp/pages/mine/mine.vue | 6
uniapp/pages/index/index.vue | 10
uniapp/static/images/tabBar/ne_qiang.png | 0
uniapp/components/sh_page/findPage.vue | 2
uniapp/components/rowGoods.vue | 4
uniapp/components/sh_page/indexNewPage.vue | 90 +++++++--
uniapp/static/images/tabBar/ne_mine.png | 0
24 files changed, 155 insertions(+), 339 deletions(-)
diff --git a/uniapp/.hbuilderx/launch.json b/uniapp/.hbuilderx/launch.json
index 9284d7d..4e0cff3 100644
--- a/uniapp/.hbuilderx/launch.json
+++ b/uniapp/.hbuilderx/launch.json
@@ -14,7 +14,7 @@
},
"h5" :
{
- "launchtype" : "local"
+ "launchtype" : "remote"
},
"mp-weixin" :
{
diff --git a/uniapp/components/colGoods.vue b/uniapp/components/colGoods.vue
index 238232d..cc6d194 100644
--- a/uniapp/components/colGoods.vue
+++ b/uniapp/components/colGoods.vue
@@ -17,12 +17,12 @@
</view>
<view class="goodsPrice-goodSale colCen borderBox">
<view class="couponInfo-bar rowCen">
- <view class="couponbox rowCenCen" v-if="items.couponPrice>0 || items.faction=='w'">
+ <view class="couponbox rowCenCen" style="border: 1px solid #f50d49; color: #f50d49; background: none;" v-if="items.couponPrice>0 || items.faction=='w'">
<view>
{{items.faction=='w' ?(items.discount+'鎶�'):items.couponPrice+'鍏冨埜'}}
</view>
</view>
- <view class="backPrice rowCenCen">
+ <view class="backPrice rowCenCen" style="background: #f50d49;">
<view>杩攞{items.fanli}}鍏�</view>
</view>
</view>
diff --git a/uniapp/components/rowGoods.vue b/uniapp/components/rowGoods.vue
index 0400f4c..2741ca8 100644
--- a/uniapp/components/rowGoods.vue
+++ b/uniapp/components/rowGoods.vue
@@ -17,12 +17,12 @@
<view class="cardbottom-container colCenEnd">
<view class="discounts-container rowCen borderBox">
- <view class="coupon-box rowCenCen" v-if="items.couponPrice>0 || items.sourceType=='wph'">
+ <view class="coupon-box rowCenCen" style="border: 1px solid #f50d49; color: #f50d49; background: none;" v-if="items.couponPrice>0 || items.sourceType=='wph'">
<view>
{{items.sourceType=='wph'?items.discount+'鎶�':items.couponPrice+'鍏冨埜'}}
</view>
</view>
- <view class="back-box rowCenCen" v-if="items.fanli">
+ <view class="back-box rowCenCen" style="background: #f50d49;" v-if="items.fanli">
<view>
杩攞{items.fanli}}鍏�
</view>
diff --git a/uniapp/components/sh_page/findPage.vue b/uniapp/components/sh_page/findPage.vue
index 576bcfc..92ec140 100644
--- a/uniapp/components/sh_page/findPage.vue
+++ b/uniapp/components/sh_page/findPage.vue
@@ -66,7 +66,7 @@
<image class="avator-img" :src="itms.anchor.head_img" mode="aspectFill"></image>
<view class="name-time">
<view class="name">
- {{itms.anchor.nickname}}
+ 灏忓畼绮鹃��
</view>
<view class="time" v-text="getTimer(itms.update_time)">
<!-- {{getTimer(itms.updateTime)}} -->
diff --git a/uniapp/components/sh_page/indexCont.vue b/uniapp/components/sh_page/indexCont.vue
index de56fa5..a57fc73 100644
--- a/uniapp/components/sh_page/indexCont.vue
+++ b/uniapp/components/sh_page/indexCont.vue
@@ -16,19 +16,20 @@
</view>
<view class="pageBody-container colCen borderBox">
<view class="column-container">
- <!-- <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>
- <swiper-item v-for="(items,index) in topBannerList" :key='index'>
- <view class="swiper-item defIcon" @click="goUrl(items)">
- <image :src="items.image" mode="aspectFit"></image>
- </view>
-
-
- </swiper-item>
- </swiper>
- </view> -->
+ <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>
+ <swiper-item v-for="(items,index) in topBannerList" :key='index'>
+ <view class="swiper-item defIcon" @click="goUrl(items)">
+ <image :src="items.image" mode="aspectFit"></image>
+ </view>
+
+
+ </swiper-item>
+ </swiper>
+ </view>
+
<!-- 閲戝垰鍖� -->
<view class="navslider-box" v-if="navbarShowList.length > 0">
@@ -58,11 +59,11 @@
</swiper>
</view> -->
<!--蹇嵎鍏ュ彛鍥炬爣-->
- <!-- <view class="c-loading-img rowCenCen">
+ <view class="c-loading-img rowCenCen">
<view class="imgbox defIcon" v-for="(eitem,index) in fastenter" :key="index" @click="goUrl(eitem)">
<image :src="eitem.image"></image>
</view>
- </view> -->
+ </view>
<!--宸﹁疆鎾紝鍙充袱琛�-->
<view class="centerflex f_contant">
<view class="f_centerSwiper-container swiper-box swiper-item f_left">
@@ -107,266 +108,6 @@
</swiper-item>
</swiper>
</view>
- <!--鍏ㄧ綉鐑攢-->
- <!-- <view class="van-row">
- <view class="van-col van-col--12" style="padding-right: 10rpx;">
- <view class="home-row" @click="gorxb()">
- <view class="title"><text class="name">鍏ㄧ綉鐑攢姒�</text>
- <view class="tag">
- <image
- src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAYAAAAmL5yKAAAAAXNSR0IArs4c6QAAASJJREFUOE+V08suBFEQxvHfGZcFVgQrli6ReBEh8RJsWHgSCzY8hsSLSMRlZ6xIWBkLl2mpntPSaY1MJ93pc6rqX199JydpPAWdRL9gCyc5vJs4q2L1ktQExLpgDBdYyfFrrCfem/mpIKWypvxU3SfwiMlc0MN8olfPj1ipoGA8L97yug0wl3jN8bIuGoeCTRxiBHuJ84IpPCBA8UThbADqPpRqCrpYyIm3WDVQ9NQGaCoOQH8whQ5i1pkMe24AwoOXgg0c4xMHFaDyI6RO/wIIcHh0haWccx+A6B5vGPMXoALHaHE6obz0YFhANVp59MOM0BytFVA3sZIajdr2vwF3WMym3GAt/19i+Z/9boywjSOMYicuTT7rH5eptn+KD+x/Adlpb2CRJ4eqAAAAAElFTkSuQmCC">
- </image>
- <text>瀹炴椂濂借揣</text>
- </view>
- </view>
- <view class="g-row">
- <view v-for="(items,index) in rqList.fqbGoods" :key='index'>
- <view class="pic"><text class="num">{{index+1}}</text>
- <view class="van-image">
- <image class="van-image__img" :src="items.mainPic">
- </image>
- </view>
- </view>
- <view class="time">2灏忔椂鎶{items.twoHoursSales}}</view>
- <view class="my">楼{{items.actualPrice}}</view>
- </view>
- </view>
- </view>
- </view>
- <view class="van-col van-col--12" style="padding-left: 6rpx;">
- <view class="home-row two" @click="goddq()">
- <view class="title"><text class="name">闄愭椂绉掓潃</text>
- <view class="tagg" style="opacity: 1;">
- <text class="ddq" style="white-space: nowrap;">{{rqList.ddqTime}} 鐐瑰満 </text>
- <view class="van-count-down">鐤姠涓�</view>
- </view>
- </view>
- <view class="g-row">
- <view v-for="(items,index) in rqList.ddqGoods" :key='index'>
- <view class="pic">
- <view class="van-image">
- <image :src="items.mainPic" alt="" class="van-image__img"></image>
- </view>
- </view>
- <view class="time" style="opacity: 1;">
- {{items.specialText[0] ? items.specialText[0]:'宸叉姠'+items.monthSales+'浠�' }}
- </view>
- <view class="my">楼{{items.actualPrice}}</view>
- </view>
- </view>
- </view>
- </view>
- </view> -->
- <!-- 澶у閮藉湪涔� -->
- <!-- <view class="everysBuying-container colCen" v-if="zdmList.length>0">
- <view class="box-bar-content rowCen">
- <view class="title-text">
- 姣忔棩蹇呬拱
- </view>
- <view class="tips-txt rowCenCen">
- <view>绮鹃�夌垎娆�</view>
- </view>
- </view>
- <view class="goodsScroll-container rowCen">
- <scroll-view class="scrollgoods-box" scroll-x scroll-with-animation>
- <view class="scrollList-content">
- <view class="goods-items" v-for="(items,index) in zdmList" :key="index"
- @tap="goDetails(items)">
- <view class="items-container colCen">
- <view class="image-content defIcon">
- <image :src="items.mainPic" mode="aspectFill" :lazy-load="true"></image>
- </view>
-
- <view class="goodsinfo-content colCen borderBox">
- <view class="goodsName-box">
- {{items.dtitle}}
- </view>
- <view class="coupons-container rowCen">
- <view class="couponbac-content rowCen">
- <view class="textsTip">
- 鐖嗘
- </view>
- <view class="coupons-value">
- {{items.couponPrice}}鍏冨埜
- </view>
- </view>
- </view>
- <view class="price-info-container rowEnd">
- <view class="nowPrice-content rowEnd">
- <view class="rmbicon">
- 锟�
- </view>
- <view class="nowprice">
- {{items.actualPrice}}
- </view>
- </view>
- <view class="oldPrice-content rowEnd">
- <view class="oldprice">
- 锟{items.originalPrice}}
- </view>
- </view>
- </view>
- </view>
- </view>
- </view>
- </view>
- </scroll-view>
- </view>
-
-
- </view> -->
- <!-- <view class="goodsFalling-container colCen" v-if="fallingList.length>0">
- <view class="box-bar-content rowCen">
- <view class="title-text">
- 濂借揣鐩撮檷
- </view>
- <view class="tips-txt rowCenCen">
- <view>浣庤繃鑱氬垝绠�.鐪佽繃娣樻姠璐�</view>
- </view>
- </view>
- <view class="goodsScroll-container rowCen">
- <scroll-view class="scrollgoods-box" scroll-x scroll-with-animation>
- <view class="scrollList-content">
- <view class="goods-items" v-for="(items,index) in fallingList" :key="index"
- @tap="goDetails(items,true)">
- <view class="items-container colCen">
- <view class="image-content defIcon">
- <image style="border-radius: 8rpx;" :src="items.mainPic"
- mode="aspectFill" :lazy-load="true"></image>
- <view class="spec-box rowCenCen" v-if="items.specialText.length>0">
- <view>{{items.specialText[0]}}</view>
- </view>
- </view>
-
- <view class="goodsinfo-content colCen borderBox">
- <view class="goodsName-box">
- {{items.dtitle}}
- </view>
- <view class="price-info-container rowEnd">
- <view class="nowPrice-content rowEnd">
- <view class="rmbicon">
- 锟�
- </view>
- <view class="nowprice">
- {{items.actualPrice}}
- </view>
- </view>
- <view class="oldPrice-content rowEnd">
- <view class="oldprice">
- 锟{items.originalPrice}}
- </view>
- </view>
- </view>
- <view class="saleNum-container rowCen">
- <view class="content-box rowCen">
- <view class="txt-tips rowCenBet">
- 鐖嗘
- </view>
- <view class="salenum rowCenCen">
- <view>{{items.monthSales}}浠�</view>
- </view>
- </view>
- </view>
- <view class="likeNum-container rowCen">
- <view class="like-num">
- {{items.twoHoursSales}}
- </view>
- <view class="txt">
- 浜烘兂涔�
- </view>
- </view>
- </view>
- </view>
- </view>
- </view>
- </scroll-view>
- </view>
- </view> -->
-
- <!-- 绂忓埄鎶㈣喘 -->
- <!-- <view class="welfare-container colCen">
- <view class="titlebar-container rowCenBet">
- <view class="left-content rowCen">
- <view class="titletext">
- 绂忓埄鎶㈣喘
- </view>
- </view>
- </view>
-
- <view class="goodsList-container colCen">
- <block v-for="(items,index) in phbList.slice(0,4)" :key="index">
- <view class="goods-items-container rowCen borderBox" @click="goDetails(items)">
- <view class="left-imagecontent defIcon">
- <image style="border-radius: 8rpx;" :src="items.mainPic" mode="aspectFill">
- </image>
- </view>
-
- <view class="right-goodsinfo-container colCenBet borderBox">
- <view class="top-content-box colCen">
- <view class="goodsnameinfo-content rowSta">
- <view class="typeIcon-content defIcon">
- <image :src="items.labelImg" mode="heightFix"></image>
- </view>
- <view class="tradename">
- {{items.dtitle}}
- </view>
- </view>
-
- <view class="desc-box">
- {{items.desc}}
- </view>
- </view>
-
- <view class="btm-content-box colCen">
- <view class="discounts-container rowCen borderBox">
- <view class="coupon-box rowCenCen">
- <view>
- {{items.couponPrice}}鍏冨埜
- </view>
- </view>
-
-
- <view class="back-box rowCenCen">
- <view>
- 杩攞{items.fanli}}鍏�
- </view>
- </view>
- </view>
-
- <view class="price-saleNums-container rowEndBet">
- <view class="left-price-box rowEnd">
- <view class="nowpirce rowEnd">
- <view class="rmb">
- 锟�
- </view>
- <view class="num">
- {{items.actualPrice}}
- </view>
- </view>
-
- <s class="original-price">
- 锟{items.originalPrice}}
- </s>
- </view>
-
- <view class="saleNum-content">
- 鐖嗗崠{{items.monthSales}}浠�
- </view>
- </view>
- </view>
- </view>
- </view>
- </block>
- </view>
- </view> -->
-
- <!-- 瀹炴椂鐤姠姒� -->
-
-
-
- <!-- 鎶栧ソ鐗� -->
-
-
</view>
@@ -377,11 +118,11 @@
<view class="type-items-container colCenCen" @click="switchtype(items,index)"
:class="bottomCurrent==index?'type-container-active':''">
<view class="mainTitle">
- 濂界墿鎺ㄨ崘
+ {{items.mainTitle}}
</view>
- <!-- <view class="subtitle rowCenCen">
+ <view class="subtitle rowCenCen">
<view>{{items.subTitle}}</view>
- </view> -->
+ </view>
</view>
</block>
</view>
@@ -404,7 +145,6 @@
<slideTop v-if="scrollTop>1000" @toTop='scrolltoTops'></slideTop>
</view>
</template>
-
<script>
import utils from '@/utils/utils.js'
import slideTop from '@/components/slideTop.vue'
@@ -452,7 +192,7 @@
dyList: [],
rqList: [],
typedataList: [
- /* {
+ {
mainTitle: '浜笢',
subTitle: '瀹樻柟淇濋殰',
type: 2
@@ -471,7 +211,7 @@
mainTitle: '鍞搧浼�',
subTitle: '澶х墝绮鹃��',
type: 4
- } */
+ }
],
bottomType: 1,
bottomCurrent: 0,
@@ -626,10 +366,11 @@
}).then(e => {
if (e.code == 1) return that.$alert(e.msg);
var res = e.data.info;
+ console.log(res);
if(res.topBannerList&&res.topBannerList.length>0)
{
that.topBannerList = res.topBannerList;
- that.headerColor = that.topBannerList[0].colour;
+ //that.headerColor = that.topBannerList[0].colour;
}
that.singleLineList = res.singleLineList;
that.doubleLineList = res.doubleLineList;
@@ -2056,11 +1797,11 @@
.type-container-active {
.mainTitle {
- color: #FE3738;
+ color: #FE6C03;
}
.subtitle {
- background: #FE3738;
+ background: #FE6C03;
color: #FFFFFF;
}
}
diff --git a/uniapp/components/sh_page/indexNewPage.vue b/uniapp/components/sh_page/indexNewPage.vue
index 266b390..3869d45 100644
--- a/uniapp/components/sh_page/indexNewPage.vue
+++ b/uniapp/components/sh_page/indexNewPage.vue
@@ -1,6 +1,6 @@
<template>
<view style="background: #fff;" class="index-wrapper wrapperLayer borderBox">
- <view class="fixed-container colCen borderBox" :style="'background:'+ (categoryCurrent>0?'#EE1B14':(scrollTop>30?'#EE1B14;':bannerColor) +';')">
+ <view class="fixed-container colCen borderBox" style="background-image: url(https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/inde_top_bg.png);background-size: cover;">
<view class="topbarbox"></view>
<view class="headerSearch-container rowCenBet borderBox">
<view class="leftgoSearchbox rowCen borderBox" @click="goPath('search')">
@@ -8,7 +8,7 @@
<view></view>
</view>
<view class="hotSearchbox rowCenCen">
- <view>杈撳叆鍟嗗搧鍚�</view>
+ <view>杈撳叆鍟嗗搧鍚嶆垨绮樿创瀹濊礉鏍囬鎼滅储</view>
</view>
</view>
<view class="rightgoMsg rowCenCen iconfont searchImg" @click="goPath('turnChain')">
@@ -19,8 +19,8 @@
<u-badge v-show="isNewMessage" :is-dot="true" type="success"></u-badge>
</view>
</view>
-
- <!-- <view class="categoryNavbar-container rowCenBet">
+
+ <view class="categoryNavbar-container rowCenBet">
<scroll-view class="categoryScroll" scroll-x scroll-with-animation @scroll="rowscroll" :scroll-into-view="nowcurrentid" :scroll-left="scrollleftnum">
<block v-for="(items,index) in categoryList" :key='index'>
<view class="category-container">
@@ -33,11 +33,11 @@
</view>
</block>
</scroll-view>
-
+
<view class="category-icon-box rowCenCen" @click="showCateModel()">
<view class="iconfont"></view>
</view>
- </view> -->
+ </view>
</view>
<!-- 寮规 -->
<view class="categoryModel-wrapper" @touchmove.prevent>
@@ -79,6 +79,47 @@
</swiper-item>
</swiper>
</view>
+
+ <!-- 寮规 -->
+ <view class="categoryModel-wrapper" @touchmove.prevent>
+ <view class="shadow" :class="cateModel?'showShadow':''" @click="closeModel()"></view>
+ <view class="category-content" :style="'top:'+Topheight+'px'" :class="cateModel?'showcate':''">
+ <view class="catelist-box colCen borderBox" v-if="cateModel">
+ <view class="titlebar rowCen">
+ <view>閫夋嫨鍒嗙被</view>
+ </view>
+
+ <view class="list-container borderBox rowCen">
+ <block v-for="(items,index) in categoryList" :key='index'>
+ <view class="cate-items colCen" v-if="index!=0" @click="changeCurrent(index,items.cid)">
+ <view class="picbox defIcon">
+ <image :src="items.cpic" mode="aspectFill" :lazy-load="true"></image>
+ </view>
+ <view class="catename">
+ {{items.cname}}
+ </view>
+ </view>
+ </block>
+ </view>
+ </view>
+ </view>
+ </view>
+
+ <view class="body-container colCen borderBox">
+ <swiper class="pageSwiper" :disable-touch='canswiper' duration="200" :current='categoryCurrent' @change='changeCatepage' @transition='swipering' @animationfinish='stopswiper'>
+ <swiper-item v-for="(items,index) in categoryList" :key='index' :current-item-id='items.cid'>
+ <view v-if='index==0'>
+ <indexPage ref='indexPage' :recomendType="recomendType" :canrefush='canrefush' :fixedClass='fixedClass' @scrolltoTop='scrolltoTop' @scrolltoview='scrolltoview'
+ @pushfixed='getfixed' @scrollNum='getScroll' :Topheight='Topheight' @passColor='getColor'></indexPage>
+ </view>
+ <view v-else>
+ <categoryPage v-if="index==categoryCurrent+1 || index==categoryCurrent-1 || index==categoryCurrent" :parentId='items.cid'
+ :Topheight='Topheight' :canrefush='canrefush' :canload='index==categoryCurrent'>
+ </categoryPage>
+ </view>
+ </swiper-item>
+ </swiper>
+ </view>
<!-- 寮规骞垮憡 -->
<u-mask :show="showBulletFrame">
<view class="warp">
@@ -99,7 +140,18 @@
import categoryPage from '@/components/categoryPage.vue';
export default {
props: {
-
+ recomendType: {
+ type: Number,
+ default: 1
+ },
+ Topheight: {
+ type: Number,
+ default: 90
+ },
+ fixedClass: {
+ type: Boolean,
+ default: false
+ }
},
components: {
indexPage,
@@ -113,21 +165,20 @@
shareShow: false,
bannerColor: '',
cateModel: false,
- Topheight: 0,
categoryCurrent: 0,
current: 1,
scrollTop: 0,
- fixedClass: false,
- canrefush:true,
categoryList: [],
canswiper:false,
scrollleftnum:0,
rowLeft:0,
+ canrefush:false,
nowcurrentid:'',
- recomendType:1
+
}
},
created() {
+
this.getCategoryList();
this.getPopBannerInfo();
if(this.categoryList){
@@ -160,9 +211,6 @@
return;
}
- },
- onReady() {
- this.getTopheight()
},
watch: {},
methods: {
@@ -301,9 +349,9 @@
},
changeCatepage(e) {
// 婊戝姩鍒囨崲
- /* this.bannerColor = '#EE1B14'
+ this.bannerColor = '#EE1B14'
this.categoryCurrent = e.detail.current
- this.currentscroll() */
+ this.currentscroll()
},
cateChange(idx) {
// 鍒嗙被鐐瑰嚮
@@ -312,6 +360,7 @@
},
getTopheight() {
// 鑾峰彇椤堕儴楂樺害
+ console.log("寮�濮嬭幏鍙栭珮搴�")
uni.createSelectorQuery().in(this).select('.fixed-container').boundingClientRect(data => {
console.log("寰楀埌甯冨眬浣嶇疆淇℃伅" + JSON.stringify(data));
this.Topheight = data.height
@@ -338,14 +387,15 @@
}
</script>
+
<style lang="scss">
.index-wrapper {
height: 100vh;
overflow: hidden;
-margin-top: 160rpx;
+
.body-container {
width: 100%;
-
+
.pageSwiper {
width: 100%;
overflow: hidden;
@@ -366,8 +416,7 @@
left: 0;
padding: 0 32rpx;
z-index: 600;
- background: linear-gradient(to right,#ee1b14,#ee1b144d);
- //background-color: #EE1B14;
+ background-color: #EE1B14;
// transition: all 0.5s;
.headerSearch-container {
@@ -568,3 +617,4 @@
}
}
</style>
+
diff --git a/uniapp/components/sh_page/matherPage.vue b/uniapp/components/sh_page/matherPage.vue
index 22fea69..fb1e28f 100644
--- a/uniapp/components/sh_page/matherPage.vue
+++ b/uniapp/components/sh_page/matherPage.vue
@@ -4,7 +4,7 @@
<view class="topbac-content">
<view class="topbarbox"></view>
<view class="colorContent defIcon">
- <image src="https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/bac.png" mode="aspectFill"></image>
+ <image src="https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/inde_top_bg.png" mode="aspectFill"></image>
</view>
</view>
@@ -197,7 +197,7 @@
.barbac {
width: 100%;
height: 300rpx;
- background: url('https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/bac.png')no-repeat;
+ background: url('https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/inde_top_bg.png')no-repeat;
background-size: 100% 100%;
position: absolute;
pointer-events: none;
diff --git a/uniapp/components/sh_page/minePage.vue b/uniapp/components/sh_page/minePage.vue
index e6e5bb4..937ceda 100644
--- a/uniapp/components/sh_page/minePage.vue
+++ b/uniapp/components/sh_page/minePage.vue
@@ -1,6 +1,6 @@
<template>
<view class="minePage-wrapper">
- <view class="fixed-box colCen" style="background:linear-gradient(263deg, #D20CFC, #8905F6);">
+ <view class="fixed-box colCen" style="background:#ffb030">
<view class="topbarbox"></view>
<view class="navigate-container rowCenBet">
<view class="setting-box" style="opacity: 0;">
@@ -365,7 +365,6 @@
<style lang="scss">
.minePage-wrapper {
width: 100%;
-
.fixed-box {
position: fixed;
width: 100%;
@@ -393,7 +392,7 @@
width: 100%;
height: 426rpx;
position: relative;
- background: linear-gradient(263deg, #D20CFC, #8905F6);
+ background: #ffb030;
.headerbox-container {
width: 100%;
@@ -447,7 +446,7 @@
font-weight: 400;
color: #FFFFFF;
padding: 0 18rpx;
- background: #BE52FA;
+ background: #ffb030;
border-radius: 18rpx;
}
@@ -459,7 +458,7 @@
text-align: center;
font-size: 24rpx;
font-weight: 400;
- color: #ED00F8;
+ color: #ffb030;
margin-left: 20rpx;
}
}
diff --git a/uniapp/manifest.json b/uniapp/manifest.json
index e88fe97..6d9386a 100644
--- a/uniapp/manifest.json
+++ b/uniapp/manifest.json
@@ -2,8 +2,8 @@
"name" : "澶ц繑瀹�",
"appid" : "__UNI__FC8858A",
"description" : "澶ц繑瀹榓pp",
- "versionName" : "1.1.7",
- "versionCode" : 117,
+ "versionName" : "1.1.8",
+ "versionCode" : 118,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/uniapp/pages.json b/uniapp/pages.json
index b96baae..c928bfb 100644
--- a/uniapp/pages.json
+++ b/uniapp/pages.json
@@ -880,33 +880,33 @@
// "height": "60px",
"list": [{
"pagePath": "pages/index/index",
- "iconPath": "static/images/tabBar/home.png",
- "selectedIconPath": "static/images/tabBar/homeActive.png",
+ "iconPath": "static/images/tabBar/ne_index.png",
+ "selectedIconPath": "static/images/tabBar/ne_index_act.png",
"text": " 棣栭〉"
},
{
"pagePath": "pages/rankinglist/fengqiang",
- "iconPath": "static/images/tabBar/fqbico_un.png",
- "selectedIconPath": "static/images/tabBar/fqbico_in.png",
+ "iconPath": "static/images/tabBar/ne_qiang.png",
+ "selectedIconPath": "static/images/tabBar/ne_qiang_act.png",
"text": "鐤姠姒�"
},
{
"pagePath": "pages/rankinglist/xianbao",
- "iconPath": "static/images/tabBar/find.png",
- "selectedIconPath": "static/images/tabBar/findactive.png",
+ "iconPath": "static/images/tabBar/ne_xb.png",
+ "selectedIconPath": "static/images/tabBar/ne_xb_act.png",
"text": "绾挎姤"
},
{
"pagePath": "pages/community/community",
- "iconPath": "static/images/tabBar/talentSay.png",
- "selectedIconPath": "static/images/tabBar/talentSayactive.png",
+ "iconPath": "static/images/tabBar/ne_bend.png",
+ "selectedIconPath": "static/images/tabBar/ne_bend_act.png",
"text": "鏈湴鐢熸椿"
},
{
"pagePath": "pages/mine/mine",
- "iconPath": "static/images/tabBar/mine.png",
- "selectedIconPath": "static/images/tabBar/mineActive.png",
+ "iconPath": "static/images/tabBar/ne_mine.png",
+ "selectedIconPath": "static/images/tabBar/ne_mine_act.png",
"text": "鎴戠殑"
}
]
diff --git a/uniapp/pages/find/findGoods.vue b/uniapp/pages/find/findGoods.vue
index c84b413..70b6372 100644
--- a/uniapp/pages/find/findGoods.vue
+++ b/uniapp/pages/find/findGoods.vue
@@ -11,7 +11,7 @@
<image class="avator-img" :src="anchor.head_img" mode="aspectFill"></image>
<view class="author-name-box">
- {{anchor.nickname}}
+ 灏忓畼绮鹃��
</view>
<view class="follow-btn rowCenCen" @tap='followFnc()'>
@@ -424,7 +424,7 @@
.snapUp-btn{
width: 104rpx;
height: 44rpx;
- background: linear-gradient(0deg, #E00604, #F85C21);
+ background: #f50d49;
border-radius: 8rpx;
font-size: 28rpx;
font-weight: 500;
diff --git a/uniapp/pages/goods/goodsDetail.vue b/uniapp/pages/goods/goodsDetail.vue
index b06bed0..6eeb2cc 100644
--- a/uniapp/pages/goods/goodsDetail.vue
+++ b/uniapp/pages/goods/goodsDetail.vue
@@ -215,7 +215,7 @@
</view>
</view>
- <view class="right-container rowCen borderBox">
+ <view class="right-container rowCen borderBox" v-if="!showtar || platform!='iOS'">
<view class="leftsharebox btnbox colCenCen" @tap="goPath()">
<view class="priceText">
锟{optionsInfo.fanli}}
@@ -236,6 +236,30 @@
</view>
</view>
</view>
+
+ <view v-else class="right-container rowCen borderBox">
+ <view class="leftsharebox btnbox colCenCen" style="background: #ffb030;" @tap="goPath()">
+ <view class="priceText">
+ 锟{optionsInfo.fanli}}
+ </view>
+ <view class="texttips">
+ 鍒嗕韩璧�
+ </view>
+ </view>
+ <view class="rightbackbox btnbox colCenCen" style="background: #fe0350;" @tap="getCouponUrl()">
+ <view v-if="frompage=='freebuy'" class="priceText">
+ 锟{optionsInfo.actualPrice}}
+ </view>
+ <view v-else class="priceText">
+ 锟{optionsInfo.fanli}}
+ </view>
+ <view class="texttips">
+ 璐拱杩�
+ </view>
+ </view>
+ </view>
+
+
</view>
</view>
<!-- taobao -->
diff --git a/uniapp/pages/index/index.vue b/uniapp/pages/index/index.vue
index 9ba098e..1fa19b6 100644
--- a/uniapp/pages/index/index.vue
+++ b/uniapp/pages/index/index.vue
@@ -1,8 +1,8 @@
<template>
- <!-- <view v-if="isshowtype">
- <indexnewPage></indexnewPage>
- </view> -->
- <view class="index-wrapper wrapperLayer borderBox">
+ <view v-if="isshowtype">
+ <indexnewPage :Topheight="Topheight" :recomendType="recomendType" :canrefush='canrefush' :fixedClass='fixedClass'></indexnewPage>
+ </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>
<view class="headerSearch-container rowCenBet borderBox">
@@ -172,6 +172,7 @@
this.recomendType = open_like_recommend == "" ? 1 : open_like_recommend;
},
onReady() {
+ console.log("鑾峰彇楂樹綆")
this.getTopheight()
},
watch: {},
@@ -342,6 +343,7 @@
getTopheight() {
// 鑾峰彇椤堕儴楂樺害
uni.createSelectorQuery().in(this).select('.fixed-container').boundingClientRect(data => {
+ console.log(data.height+":----------------");
this.Topheight = data.height
}).exec();
},
diff --git a/uniapp/pages/mine/mine.vue b/uniapp/pages/mine/mine.vue
index 54c381c..caf3789 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 class="minePage-wrapper">
+ </view>
+ <view v-else 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/static/images/tabBar/ne_bend.png b/uniapp/static/images/tabBar/ne_bend.png
new file mode 100644
index 0000000..e697bdc
--- /dev/null
+++ b/uniapp/static/images/tabBar/ne_bend.png
Binary files differ
diff --git a/uniapp/static/images/tabBar/ne_bend_act.png b/uniapp/static/images/tabBar/ne_bend_act.png
new file mode 100644
index 0000000..1415a14
--- /dev/null
+++ b/uniapp/static/images/tabBar/ne_bend_act.png
Binary files differ
diff --git a/uniapp/static/images/tabBar/ne_index.png b/uniapp/static/images/tabBar/ne_index.png
new file mode 100644
index 0000000..44f709e
--- /dev/null
+++ b/uniapp/static/images/tabBar/ne_index.png
Binary files differ
diff --git a/uniapp/static/images/tabBar/ne_index_act.png b/uniapp/static/images/tabBar/ne_index_act.png
new file mode 100644
index 0000000..b07a956
--- /dev/null
+++ b/uniapp/static/images/tabBar/ne_index_act.png
Binary files differ
diff --git a/uniapp/static/images/tabBar/ne_mine.png b/uniapp/static/images/tabBar/ne_mine.png
new file mode 100644
index 0000000..91b9da0
--- /dev/null
+++ b/uniapp/static/images/tabBar/ne_mine.png
Binary files differ
diff --git a/uniapp/static/images/tabBar/ne_mine_act.png b/uniapp/static/images/tabBar/ne_mine_act.png
new file mode 100644
index 0000000..51f4cfd
--- /dev/null
+++ b/uniapp/static/images/tabBar/ne_mine_act.png
Binary files differ
diff --git a/uniapp/static/images/tabBar/ne_qiang.png b/uniapp/static/images/tabBar/ne_qiang.png
new file mode 100644
index 0000000..589e39f
--- /dev/null
+++ b/uniapp/static/images/tabBar/ne_qiang.png
Binary files differ
diff --git a/uniapp/static/images/tabBar/ne_qiang_act.png b/uniapp/static/images/tabBar/ne_qiang_act.png
new file mode 100644
index 0000000..824ea97
--- /dev/null
+++ b/uniapp/static/images/tabBar/ne_qiang_act.png
Binary files differ
diff --git a/uniapp/static/images/tabBar/ne_xb.png b/uniapp/static/images/tabBar/ne_xb.png
new file mode 100644
index 0000000..8199e00
--- /dev/null
+++ b/uniapp/static/images/tabBar/ne_xb.png
Binary files differ
diff --git a/uniapp/static/images/tabBar/ne_xb_act.png b/uniapp/static/images/tabBar/ne_xb_act.png
new file mode 100644
index 0000000..537de9d
--- /dev/null
+++ b/uniapp/static/images/tabBar/ne_xb_act.png
Binary files differ
--
Gitblit v1.9.3