修改商品商品列表组件 首页界面优化

This commit is contained in:
jia 2023-09-12 18:45:03 +08:00
parent 866cb45819
commit cfce9a063e
10 changed files with 335 additions and 268 deletions

View File

@ -7,7 +7,7 @@
<view id="left" v-if="leftList.length"> <view id="left" v-if="leftList.length">
<view v-for="(item,index) in leftList" :key="index" <view v-for="(item,index) in leftList" :key="index"
class="wf-itema" @tap="itemTap(item)"> class="wf-itema" @tap="itemTap(item)">
<WaterfallsFlowItem :item="item" :isStore="isStore" :type="type" @goShop="goShop"/> <WaterfallsFlowItem :item="item" :isStore="isStore" :heightx="251" :type="type" @goShop="goShop"/>
</view> </view>
</view> </view>
</view> </view>
@ -16,7 +16,7 @@
<view id="right" v-if="rightList.length"> <view id="right" v-if="rightList.length">
<view v-for="(item,index) in rightList" :key="index" <view v-for="(item,index) in rightList" :key="index"
class="wf-itemb" @tap="itemTap(item)"> class="wf-itemb" @tap="itemTap(item)">
<WaterfallsFlowItem :item="item" :isStore="isStore" :type="type" @goShop="goShop"/> <WaterfallsFlowItem :item="item" :isStore="isStore" :heightx="336" :type="type" @goShop="goShop"/>
</view> </view>
</view> </view>
</view> </view>

View File

@ -27,7 +27,7 @@
type: Object, type: Object,
require: true require: true
}, },
index: { heightx: {
type: string, type: string,
require: true require: true
} }

View File

@ -658,6 +658,11 @@
that.getConfig(); that.getConfig();
uni.hideLoading(); uni.hideLoading();
}, },
onHide(){
this.CartCount=0
},
/** /**
* 用户点击右上角分享 * 用户点击右上角分享
*/ */

View File

@ -2,15 +2,15 @@
<view class="Circle_friends"> <view class="Circle_friends">
<view class="circle_friends_wrapper"> <view class="circle_friends_wrapper">
<view v-if="isFshow"> <view v-if="isFshow">
<view class="site-box flex_a_c_j_sb" :style="{ 'background-color': backColor }"> <view class="site-box flex_a_c_j_sb" :style="{ 'opacity': backColor,}">
<view :class="['place_wrapper', 'flex_a_c', isFshow ? 'sitebox' : '']" @click="selectLocation"> <view :class="['place_wrapper', 'flex_a_c', isFshow ? 'sitebox' : '']" @click="selectLocation">
<view :class="['iconfont', 'icon-weizhi', isFshow ? 'sitebox' : '']" <view :class="['iconfont', 'icon-weizhi', isFshow ? 'sitebox' : '']"
style="color: #000; margin-left: 20rpx"> style=" margin-left: 20rpx">
</view> </view>
<view class="town_name" style="color: #000">{{ street }}</view> <view class="town_name">{{ street }}</view>
</view> </view>
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none"> <navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
<view :class="['iconfont', 'icon-xiaoxi', isFshow ? 'sitebox' : '']" style="color: #000"></view> <view :class="['iconfont', 'icon-xiaoxi', isFshow ? 'sitebox' : '']"></view>
</navigator> </navigator>
</view> </view>
<!--<view class="site-box ','flex_a_c_j_sb'" v-if="ishshow"> <!--<view class="site-box ','flex_a_c_j_sb'" v-if="ishshow">
@ -20,13 +20,27 @@
</view> --> </view> -->
</view> </view>
<zbpSwiper ref="list" :isSelectPlace="true" :town="street" :show="show" :location_Arr="locationArr" <zbpSwiper ref="list" :isSelectPlace="true" :town="street" :show="show" :location_Arr="locationArr"
@change="dchange"> @change="dchange">
</zbpSwiper> </zbpSwiper>
<view class="tabs_wrapper"> <view class="tabs_wrapper">
<u-tabs :list="tabsData.list" @click="tabsChange" lineColor="#F84221" keyName="cate_name" <!-- <u-tabs :list="tabsData.list" @click="tabsChange" lineColor="#F84221" keyName="cate_name"
:activeStyle="activeStyle" itemStyle="padding-left: 0px; height: 33px;"></u-tabs> :activeStyle="activeStyle" itemStyle="padding-left: 0px; height: 33px;"></u-tabs>
<view class="tabs_wrapper-img">
<image src="@/static/images/zk.png" mode=""></image>
</view> -->
<view class="" style="width: 650rpx;">
<u-tabs :list="tabsData.list" @click="tabsChange" itemStyle=" height: 33px;" lineColor="#F84221"
:current="current" keyName="cate_name" :activeStyle="activeStyle"></u-tabs>
</view>
<view class="tabs_wrapper-img" @click="open">
<image src="@/static/images/zk.png" mode=""></image>
</view>
</view> </view>
<view class=""> </view> <view class=""> </view>
<view class="goodslist"> <view class="goodslist">
@ -55,6 +69,24 @@
</view> </view>
</template> </template>
</m-tabbar> --> </m-tabbar> -->
<uni-popup ref="popup" type="bottom">
<view class="classpage">
<view class="classpage-one">
全部分类
<image src="@/static/images/cuo.png" mode="" @click="cuo"></image>
</view>
<view class="classpage-two">
点击进入分类
</view>
<view class="classpage-three">
<view class="" v-for="(item,i) in tabsData.list" :key='i' @click="tabsChange2(item,i)">
{{item.cate_name}}
</view>
</view>
</view>
</uni-popup>
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"
:isGoIndex="false"></authorize> :isGoIndex="false"></authorize>
<view class="location" v-if="isshow"> <view class="location" v-if="isshow">
@ -108,7 +140,7 @@
}, },
data() { data() {
return { return {
isNewRenderDone: false, //
isAuto: false, // isAuto: false, //
isShowAuth: false, // isShowAuth: false, //
activeStyle: { activeStyle: {
@ -149,11 +181,12 @@
streeta_id: '', streeta_id: '',
street: '', street: '',
bgColor: '', bgColor: '',
backColor: 'rgba(252, 252, 252, 0)', backColor: 0,
isFshow: false, isFshow: false,
scrollTop: 0, scrollTop: 0,
show: true, show: true,
userid: '' userid: '',
current:0
} }
}, },
onShow() { onShow() {
@ -211,6 +244,22 @@
}) })
},
onHide() {
this.getGoods(true)
uni.pageScrollTo({
selector: ".Circle_friends",
scrollTop: 0
})
uni.setTabBarItem({
index: 0,
text: "泸州",
iconPath: '/static/tabbar_icon/a.png',
selectedIconPath: '/static/tabbar_icon/a-a.png'
});
this.isFshow = false
}, },
onReachBottom() { onReachBottom() {
@ -218,8 +267,7 @@
if (this.productList.length > 0) { if (this.productList.length > 0) {
setTimeout(() => { setTimeout(() => {
this.getGoods(false); this.getGoods(false);
}, 500) }, 1000)
} else { } else {
this.get_host_product(); this.get_host_product();
} }
@ -240,6 +288,7 @@
}); });
}, },
// #ifdef APP-PLUS // #ifdef APP-PLUS
onPageScroll(e) { onPageScroll(e) {
@ -248,7 +297,7 @@
// //
if (scrollTop <= 20) { if (scrollTop <= 20) {
this.backColor = 'rgba(252, 252, 252, 0.0)' this.backColor = 0
this.isFshow = false this.isFshow = false
this.show = true this.show = true
uni.setTabBarItem({ uni.setTabBarItem({
@ -258,11 +307,11 @@
selectedIconPath: '/static/tabbar_icon/a-a.png' selectedIconPath: '/static/tabbar_icon/a-a.png'
}); });
} else if (20 < scrollTop && scrollTop <= 100) { } else if (20 < scrollTop && scrollTop <= 100) {
this.backColor = 'rgba(255, 255, 255, 0.5)' this.backColor = 0.5
this.isFshow = true this.isFshow = true
this.show = false this.show = false
} else if (scrollTop > 100) { } else if (scrollTop > 100) {
this.backColor = 'rgba(252, 252, 252, 1.0)' this.backColor = 1
this.isFshow = true this.isFshow = true
this.show = false this.show = false
this.$nextTick(() => { this.$nextTick(() => {
@ -283,12 +332,18 @@
this.$bus.$off('value-updated') this.$bus.$off('value-updated')
}, },
methods: { methods: {
//
open() {
this.$refs.popup.open()
},
//
cuo() {
this.$refs.popup.close()
},
// //
onLoadFun(data) { onLoadFun(data) {
this.getUserInfo(); this.getUserInfo();
this.isShowAuth = false; this.isShowAuth = false;
}, },
/** /**
* 获取个人用户信息 * 获取个人用户信息
@ -350,7 +405,7 @@
// console.log("header "); // console.log("header ");
} }
if (scrollTop <= 20) { if (scrollTop <= 20) {
this.backColor = 'rgba(252, 252, 252, 0.0)' this.backColor = 0
this.isFshow = false this.isFshow = false
uni.setTabBarItem({ uni.setTabBarItem({
index: 0, index: 0,
@ -359,10 +414,10 @@
selectedIconPath: '/static/tabbar_icon/a-a.png' selectedIconPath: '/static/tabbar_icon/a-a.png'
}); });
} else if (20 < scrollTop && scrollTop <= 100) { } else if (20 < scrollTop && scrollTop <= 100) {
this.backColor = 'rgba(255, 255, 255, 0.5)' this.backColor = 0.5
this.isFshow = true this.isFshow = true
} else if (scrollTop > 100) { } else if (scrollTop > 100) {
this.backColor = 'rgba(252, 252, 252, 1.0)' this.backColor = 1
this.isFshow = true this.isFshow = true
uni.setTabBarItem({ uni.setTabBarItem({
@ -379,6 +434,7 @@
tabsChange1(item) { tabsChange1(item) {
this.getArticleList(item.article_category_id) this.getArticleList(item.article_category_id)
this.streeta_id = item.id this.streeta_id = item.id
this.tabsData1.tabsActive = item.index this.tabsData1.tabsActive = item.index
@ -542,11 +598,12 @@
data data
} = await getTopicList() } = await getTopicList()
this.tabsData.list = [{ this.tabsData.list = [{
cate_name: "推荐", cate_name: "热门推荐",
category_id: 0 category_id: 0
}, ...data] }, ...data]
}, },
tabsChange(item) { tabsChange(item) {
console.log(item)
this.productList = [] this.productList = []
this.where.category_id = item.category_id this.where.category_id = item.category_id
this.emptyShow = false this.emptyShow = false
@ -555,7 +612,22 @@
this.getGoods(true) this.getGoods(true)
this.street_id = item.id this.street_id = item.id
this.tabsData.tabsActive = item.index this.tabsData.tabsActive = item.index
this.current = item.index
},
tabsChange2(item,index) {
// console.log(item,index)
this.productList = []
this.where.category_id = item.category_id
this.$refs.popup.close()
this.emptyShow = false
this.loadend = false;
this.$set(this.where, 'page', 1)
this.getGoods(true)
this.tabsData.tabsActive = index
this.current = index
}, },
selfLocation() { selfLocation() {
@ -732,6 +804,57 @@
background: linear-gradient(180deg, #ffffff 0%, #f6f6f6 100%); background: linear-gradient(180deg, #ffffff 0%, #f6f6f6 100%);
} }
.classpage {
width: 100%;
height: calc(100vh - 50px);
background-color: #fff;
position: relative;
padding-top: 40rpx;
padding-left: 40rpx;
padding-right: 10rpx;
.classpage-one {
text-align: center;
image {
position: absolute;
right: 25rpx;
width: 42rpx;
height: 42rpx;
}
}
.classpage-two {
font-size: 26rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400;
color: #333333;
margin-top: 77rpx;
}
.classpage-three {
display: flex;
flex-direction: row;
flex-wrap: wrap;
margin-top: 35rpx;
view {
margin-right: 20rpx;
margin-bottom: 14rpx;
width: 210rpx;
height: 81rpx;
line-height: 81rpx;
text-align: center;
background: #FFFFFF;
border-radius: 11rpx 11rpx 11rpx 11rpx;
opacity: 1;
border: 2rpx solid #707070;
}
}
}
// .bg-img { // .bg-img {
// position: absolute; // position: absolute;
// width: 100%; // width: 100%;
@ -792,6 +915,8 @@
padding-top: 25rpx; padding-top: 25rpx;
/* #endif */ /* #endif */
// background-color: #e5e5e5; // background-color: #e5e5e5;
background: url('@/static/images/bg2.png') no-repeat;
background-size: 100% 100%;
padding-right: 20rpx; padding-right: 20rpx;
@ -810,6 +935,7 @@
.iconfont { .iconfont {
opacity: 0; opacity: 0;
color: #fff;
font-size: 30rpx; font-size: 30rpx;
font-size: 35.09rpx; font-size: 35.09rpx;
} }
@ -827,8 +953,9 @@
} }
/deep/.u-tabs__wrapper__nav__item { /deep/.u-tabs__wrapper__nav__item {
padding: 0 0px; // padding: 0 0px;
padding-right: 10rpx; padding-left: 0rpx;
padding-right: 20rpx;
} }
.search_wrapper { .search_wrapper {
@ -841,6 +968,23 @@
margin: 0 auto; margin: 0 auto;
margin-bottom: 21.05rpx; margin-bottom: 21.05rpx;
// margin-left: -20rpx; // margin-left: -20rpx;
position: relative;
}
.tabs_wrapper-img {
width: 70rpx;
height: 70rpx;
position: absolute;
z-index: 888;
background-color: #fff;
right: 0;
top: 0;
image {
width: 40rpx;
height: 40rpx;
margin-top: 10rpx;
}
} }
.empty_wrapper { .empty_wrapper {

View File

@ -75,7 +75,7 @@
<productConSwiper :imgUrls="followDetail.image"></productConSwiper> <productConSwiper :imgUrls="followDetail.image"></productConSwiper>
</view> </view>
<view class="pro_describle"> <view class="pro_describle">
<view class="mentioned" v-if="followDetail.relevance.length" <view class="mentioned" v-if="followDetail.relevance.length"
@click="openMore(followDetail)"> @click="openMore(followDetail)">
<text class="title">查看TA提到的宝贝({{followDetail.relevance.length}})</text> <text class="title">查看TA提到的宝贝({{followDetail.relevance.length}})</text>
<view class="product_more"> <view class="product_more">
@ -86,7 +86,36 @@
</view> </view>
<text class="iconfont icon-gengduo3"></text> <text class="iconfont icon-gengduo3"></text>
</view> </view>
</view> </view>
<!-- <view class="product">
<scroll-view class="scroll-view" scroll-x="true"
style="white-space: nowrap; display: flex;" scroll-with-animation
show-scrollbar="true">
<view class="product-item" v-for="(goods,idx) in in followDetail.relevance" :key="idx">
<view v-if="goods.spu" class="item-count acea-row"
@click="goDetail(goods.spu)">
<view class="picture">
<image class="image" :src="goods.spu.image"></image>
</view>
<view class="product-text" >
<text class="name line1"
v-if="goods.spu && goods.spu.store_name.length>=12">{{goods.spu.store_name.slice(0,12)}}...</text>
<text class="name line1"
v-else>{{goods.spu && goods.spu.store_name}}</text>
<view class="product-price">
<view class="price"><text class="sm">¥</text><text
class="money">{{goods.spu.price}}</text>
</view>
<text class="buy-btn">购买</text>
</view>
</view>
</view>
</view>
</scroll-view>
</view> -->
<view class="product_info"> <view class="product_info">
<text class="text"> <text class="text">
{{followDetail.content}} {{followDetail.content}}

View File

@ -103,12 +103,12 @@
@change="menuAction($event, item.attrValue,item)"> @change="menuAction($event, item.attrValue,item)">
. . . . . .
</rudon-rowMenuDotDotDot> --> </rudon-rowMenuDotDotDot> -->
<view class="" style='font-size: 30rpx;text-align: right;' <view class="" style='font-size: 30rpx;text-align: right;position: absolute; top: 0px; right: 10px;'
@click="menuActiona(item,index)"> @click="menuActiona(item,index)">
... ...
</view> </view>
<view class="muau-header" v-if='index==num'> <view class="muau-header" v-if='index==num' style="position: absolute; top: 40rpx; right: 0px;">
<view class="muau" v-for='(kk,i) in options' <view class="muau" v-for='(kk,i) in options'
@click='menuAction(kk, item.attrValue,item,index)'> @click='menuAction(kk, item.attrValue,item,index)'>
<view class=""> <view class="">

View File

@ -149,7 +149,7 @@
<view class="picture"> <view class="picture">
<image class="image" :src="goods.spu.image"></image> <image class="image" :src="goods.spu.image"></image>
</view> </view>
<view class="product-text"> <view class="product-text" >
<text class="name line1" <text class="name line1"
v-if="goods.spu && goods.spu.store_name.length>=12">{{goods.spu.store_name.slice(0,12)}}...</text> v-if="goods.spu && goods.spu.store_name.length>=12">{{goods.spu.store_name.slice(0,12)}}...</text>
<text class="name line1" <text class="name line1"
@ -226,19 +226,19 @@
<text class="count">{{item.relevance.length}}</text> <text class="count">{{item.relevance.length}}</text>
</view> </view>
</view> </view>
<view v-if="showManage" class="manage"> <view v-if="showManage == item.author.uid" class="manage">
<view class="manage-gou"></view> <view class="manage-gou"></view>
<navigator hover-class="none" <navigator hover-class="none"
:url="'/pages/plantGrass/plant_release/index?id='+item.community_id+'&type=2'" :url="'/pages/plantGrass/plant_release/index?id='+item.community_id+'&type=2'"
class="items"> class="items">
<image src="../static/img/index/video-edit.png" style="width: 16px; height: 16px;"> <image src="../static/img/index/video-edit.png" style="width: 16px; height: 16px;">
</image> </image>
<text class="text">编辑</text> <text class="text" style="margin-left: 20rpx;">编辑</text>
</navigator> </navigator>
<view class="items" @click.stop="deleteTopic(item)"> <view class="items" @click.stop="deleteTopic(item)">
<image src="../static/img/index/video-delete.png" <image src="../static/img/index/video-delete.png"
style="width: 16px; height: 16px;"></image> style="width: 16px; height: 16px;"></image>
<text class="text">删除</text> <text class="text" style="margin-left: 20rpx;">删除</text>
</view> </view>
</view> </view>
<!-- 1.视频预览时的图片currenttimes就是获取当前滑块的时间点如果不需要可以注释掉 --> <!-- 1.视频预览时的图片currenttimes就是获取当前滑块的时间点如果不需要可以注释掉 -->
@ -358,6 +358,7 @@
import { import {
getUserInfo getUserInfo
} from '@/api/user.js'; } from '@/api/user.js';
import { navigateBack } from '../../../libs/uniApi';
export default { export default {
computed: configMap({ computed: configMap({
statusBarHeight: 0, statusBarHeight: 0,
@ -501,7 +502,7 @@
this.wHeight = uni.getSystemInfoSync().screenHeight; //获取屏幕高度 this.wHeight = uni.getSystemInfoSync().screenHeight; //获取屏幕高度
this.boxStyle.height = this.wHeight; //改变视频高度 this.boxStyle.height = this.wHeight; //改变视频高度
this.get() //这一步,加载视频数据 this.get() //这一步,加载视频数据
// if (this.isLogin) this.getUserInfo() if (this.isLogin) this.getUserInfo()
}, },
onReady() {}, onReady() {},
methods: { methods: {
@ -637,17 +638,23 @@
content: '确定要删除该话题么?', content: '确定要删除该话题么?',
success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
console.log(item.community_id)
deletePlantApi(item.community_id).then(res => { deletePlantApi(item.community_id).then(res => {
if (res.status === 200) { console.log(res)
if (res.status == 200) {
that.$util.Tips({ that.$util.Tips({
title: res.message title: res.message
}); });
setTimeout(function() { // setTimeout(function() {
uni.redirectTo({ // uni.redirectTo({
url: '/pages/plantGrass/plant_user/index?id=' + // url: '/pages/plantGrass/plant_user/index?id=' +
item.uid // item.uid
// })
// }, 1000);
uni.navigateBack({
delta:1,
}) })
}, 1000);
} }
}) })
} else if (res.cancel) { } else if (res.cancel) {
@ -855,6 +862,7 @@
}, },
scrolls(event) { scrolls(event) {
this.showManage = false; this.showManage = false;
this.isDragging = event.isDragging; this.isDragging = event.isDragging;
if (!event.isDragging) { //isDragging判断用户是不是在滑动滑动true停止滑动false。我们要用户停止滑动时才给 k 赋值,这样就可以避免很多麻烦 if (!event.isDragging) { //isDragging判断用户是不是在滑动滑动true停止滑动false。我们要用户停止滑动时才给 k 赋值,这样就可以避免很多麻烦
@ -1116,7 +1124,7 @@
/* #ifdef MP */ /* #ifdef MP */
padding-top: 200rpx; padding-top: 200rpx;
/* #endif */ /* #endif */
background-color: #000000; // background-color: #000000;
background-color: #F5F5F5; background-color: #F5F5F5;
.goods_item { .goods_item {
@ -1240,6 +1248,7 @@
height: 86rpx; height: 86rpx;
.icon-xiangzuo { .icon-xiangzuo {
margin-left: 10px; margin-left: 10px;
width: 20px; width: 20px;
@ -1405,7 +1414,7 @@
box-shadow: 0 1px 8px rgba(0, 0, 0, 0.1); box-shadow: 0 1px 8px rgba(0, 0, 0, 0.1);
padding: 0 8px; padding: 0 8px;
position: absolute; position: absolute;
bottom: 10px; bottom: 185px;
right: 60px; right: 60px;
border-radius: 8px; border-radius: 8px;
@ -1541,7 +1550,8 @@
.product-item { .product-item {
width: 444rpx; width: 444rpx;
height: 136rpx; height: 136rpx;
background: rgba(0, 0, 0, .55); // background: rgba(0, 0, 0, .55);
background-color: #F4F4F4;
border-radius: 12rpx; border-radius: 12rpx;
padding: 16rpx 15rpx; padding: 16rpx 15rpx;
margin-right: 30rpx; margin-right: 30rpx;
@ -1587,7 +1597,8 @@
.name { .name {
font-size: 24rpx; font-size: 24rpx;
width: 286rpx; width: 286rpx;
color: #fff; // color: #fff;
color: #000;
} }
.product-price { .product-price {
@ -1602,7 +1613,8 @@
.sm, .sm,
.money { .money {
color: #ffffff; // color: #ffffff;
color: #000;
font-size: 24rpx; font-size: 24rpx;
} }
} }

View File

@ -1,65 +1,6 @@
<template> <template>
<view class="merchant-details"> <view class="merchant-details">
<view style="height: var(--status-bar-height);"></view> <view class="top">
<view class="tit">
<u--image style="margin: 0 auto;" :showLoading="true" src="../../../static/images/SJRZ/succes.png"
width="348.83rpx" height="271.77rpx" @click="goBack"></u--image>
恭喜您的申请已通过
</view>
<view class="content">
<view class="steps">
<u-steps current="3" direction="column" mode="number">
<u-steps-item title="运输中" desc="11:40">
<!-- <u--image style="margin: 0 auto;" :showLoading="true" src="../../../static/images/SJRZ/CGBZ.png"
width="31.54rpx" height="31.54rpx"></u--image> -->
<!-- <u--image style="margin: 0 auto;" :showLoading="true"
src="../../../static/images/SJRZ/succes.png" width="348.83rpx" height="271.77rpx"
@click="goBack"></u--image> -->
<text class="slot-icon" slot="icon"><u--image style="margin: 0 auto;" :showLoading="true"
src="../../../static/images/SJRZ/CGBZ.png" width="31.54rpx"
height="31.54rpx"></u--image></text>
</u-steps-item>
<u-steps-item title="待审核" desc="10:35">
<text class="slot-icon" slot="icon"><u--image style="margin: 0 auto;" :showLoading="true"
src="../../../static/images/SJRZ/CGBZ.png" width="31.54rpx"
height="31.54rpx"></u--image></text>
</u-steps-item>
<u-steps-item title="审核通过" desc="11:40">
<text class="slot-icon" slot="icon"><u--image style="margin: 0 auto;" :showLoading="true"
src="../../../static/images/SJRZ/CGBZ.png" width="31.54rpx"
height="31.54rpx"></u--image></text>
</u-steps-item>
</u-steps>
</view>
<view class="msg" v-if="mer_id > 0 && resData.login_url" @click="copyTBL()">
<view style="margin-bottom: 20rpx;">
<text style="font-weight: bold;">登录地址</text>
<text class="">{{resData.login_url}}</text>
</view>
<view>
<text style="font-weight: bold;">商户账号</text>
<text class="">{{resData.phone}}</text>
</view>
<!-- <view class=" phone">
<view class="">
<text class="head">商户账号</text>
<text class="content">{{resData.phone}}</text>
</view>
<text class="cope" @click="copyTBL()">复制</text>
</view> -->
</view>
</view>
<view class="btn" v-if="mer_id > 0">
<view class="">
温馨提示初始密码默认为手机号后六位请初次登录后及时修改
</view>
</view>
<view class="btn_bottom" @click="navgo(`/pages/product/basicSet?mer_id=${mer_id}`)">
<u-button type="primary" style="background-color: #3274F9;border-radius: 30rpx;border: none;"
text="完善商户信息"></u-button>
</view>
<!-- <view class="top">
<image class="img" src="../static/images/successTop.png" mode=""></image> <image class="img" src="../static/images/successTop.png" mode=""></image>
<view class="title"> <view class="title">
恭喜您的申请已通过 恭喜您的申请已通过
@ -77,8 +18,12 @@
</view> </view>
<text class="cope" @click="copyTBL()">复制</text> <text class="cope" @click="copyTBL()">复制</text>
</view> </view>
</view> --> </view>
<view class="btn" v-if="mer_id > 0">
<view class="">
温馨提示初始密码默认为手机号后六位请初次登录后及时修改
</view>
</view>
</view> </view>
</template> </template>
@ -109,11 +54,6 @@
} }
}, },
methods: { methods: {
navgo(url) {
uni.navigateTo({
url
})
},
getGoodsDetails(id) { getGoodsDetails(id) {
getGoodsDetails(id).then(res => { getGoodsDetails(id).then(res => {
this.resData = res.data this.resData = res.data
@ -198,100 +138,69 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.merchant-details { .merchant-details {
padding: 0 4vw; display: flex;
// padding: ; flex-direction: column;
align-items: center;
background-color: #fff;
height: 100vh; height: 100vh;
position: relative; position: relative;
// background-color: #C5D9FD;
background-image: url("../../../static/images/SJRZ/bg.png");
background-repeat: no-repeat;
position: relative;
.tit {
color: white;
font-size: 33.29rpx;
text-align: center;
// padding: 50vh 0;
transform: translateY(5vh);
display: flex;
// justify-content: space-around;
flex-direction: column;
align-items: center;
}
.content {
background-color: white;
border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
// transform: translateY(20vh);
margin-top: 100rpx;
box-sizing: border-box;
padding: 2vw;
// .steps {}
.msg {
width: 85%;
padding: 30rpx;
// height: 150rpx;
margin: 30rpx auto;
background-color: #F4F7FE;
border-radius: 8rpx;
.li {
// margin-: ;
// display: flex;
// justify-content: left;
// display: flex;
// flex-shrink: 1;
}
}
}
.top { .top {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
.img { .img {
width: 340rpx; width: 340rpx;
height: 280rpx; height: 280rpx;
margin: 140rpx 0 30rpx 0; margin: 140rpx 0 30rpx 0;
} }
.title { .title {
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
color: #333; color: #333;
} }
} }
.msg {
width: 85%;
.btn { padding: 30rpx;
// width: 70%; height: 150rpx;
// position: absolute; margin: 70rpx 70rpx;
// text-align: center; background-color: #F6F6F6;
// color: #999999; border-radius: 8rpx;
// font-size: 24rpx; .url {
// bottom: 80rpx display: flex;
// background-color: red; flex-wrap: nowrap;
// height: 100vw; margin-bottom: 20rpx;
margin-top: 5vw; }
.phone {
display: flex;
justify-content: space-between;
}
.head {
color: #333333;
font-size: 28rpx;
font-weight: 500;
white-space: nowrap;
}
.content {
color: #999999;
font-size: 26rpx;
}
.cope {
padding: 5rpx 16rpx;
color: #FFFFFF;
border-radius: 30rpx;
background-color: #999999;
margin-left: 40rpx;
font-size: 20rpx;
}
} }
.btn {
.btn_bottom { width: 70%;
position: fixed; position: absolute;
width: 92vw; text-align: center;
bottom: 20rpx; color: #999999;
font-size: 24rpx;
bottom: 80rpx
} }
} }
</style> </style>

View File

@ -2,16 +2,15 @@
<view class="Circle_friends"> <view class="Circle_friends">
<view class="circle_friends_wrapper"> <view class="circle_friends_wrapper">
<view v-if="isFshow"> <view v-if="isFshow">
<view class="site-box flex_a_c_j_sb" :style="{'background-color':backColor}"> <view class="site-box flex_a_c_j_sb" :style="{'opacity':backColor}">
<view :class="['place_wrapper','flex_a_c',isFshow?'sitebox':'']" @click="selectLocation"> <view :class="['place_wrapper','flex_a_c',isFshow?'sitebox':'']" @click="selectLocation">
<view :class="['iconfont','icon-weizhi',isFshow?'sitebox':'']" <view :class="['iconfont','icon-weizhi',isFshow?'sitebox':'']" style="margin-left: 20rpx;">
style="color:#000;margin-left: 20rpx;">
</view> </view>
<view class="town_name" style="color:#000;">{{street}}</view> <view class="town_name">{{street}}</view>
</view> </view>
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none"> <navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
<view :class="['iconfont','icon-xiaoxi',isFshow?'sitebox':'']" style="color:#000;"></view> <view :class="['iconfont','icon-xiaoxi',isFshow?'sitebox':'']" style="color:#fff;"></view>
</navigator> </navigator>
</view> </view>
@ -117,7 +116,7 @@
<image src="@/static/images/f4.png" mode="aspectFit"></image> <image src="@/static/images/f4.png" mode="aspectFit"></image>
</view> </view>
<view class="goodslist"> <view class="goodslist">
<WaterfallsFlow :wfList="productList" :type="1" /> <WaterfallsFlow :wfList="productList" :type="1" />
</view> </view>
<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'> <view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}} <text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
@ -199,7 +198,7 @@
}, },
isshow: false, isshow: false,
locationArr: ({}), locationArr: ({}),
bgColor: '', bgColor: '',
showPicker: false, showPicker: false,
columnData: [], columnData: [],
@ -230,7 +229,7 @@
street: '', street: '',
bgColor: '', bgColor: '',
isFshow: false, isFshow: false,
backColor: 'rgba(252, 252, 252, 0)', backColor: 0,
loadend: false, loadend: false,
loading: false, loading: false,
loadTitle: '加载更多', loadTitle: '加载更多',
@ -238,14 +237,12 @@
}, },
onPullDownRefresh() { onPullDownRefresh() {
this.list(true); this.list(true);
this.Area() this.Area()
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
}, },
onLoad() { onLoad() {
this.list() this.list()
this.Area() this.Area()
@ -264,7 +261,6 @@
}) })
}, },
onReachBottom() { onReachBottom() {
if (this.productList.length > 0) { if (this.productList.length > 0) {
setTimeout(() => { setTimeout(() => {
@ -274,7 +270,7 @@
this.list() this.list()
} }
}, },
beforeDestroy() { beforeDestroy() {
// //
@ -301,26 +297,24 @@
} }
}, },
// #ifdef APP-PLUS // #ifdef APP-PLUS
onPageScroll(e) { onPageScroll(e) {
const scrollTop = e.scrollTop; const scrollTop = e.scrollTop;
if (scrollTop <= 20) { if (scrollTop <= 20) {
this.backColor = 'rgba(252, 252, 252, 0)' this.backColor = 0
this.isFshow = false this.isFshow = false
} else if (20 < scrollTop && scrollTop <= 100) { } else if (20 < scrollTop && scrollTop <= 100) {
this.backColor = 'rgba(252, 252, 252, .5)' this.backColor = 0.5
this.isFshow = true this.isFshow = true
} else if (scrollTop > 100) { } else if (scrollTop > 100) {
this.backColor = 'rgba(252, 252, 252, 1)' this.backColor = 0.5
this.isFshow = true this.isFshow = true
} }
}, },
// #endif // #endif
methods: { methods: {
navaction(val) { navaction(val) {
uni.navigateTo({ uni.navigateTo({
@ -329,60 +323,33 @@
}, },
// //
list(isPage,id) { list(isPage, id) {
if (id) {
let that = this;
let that = this; if (that.loadend) return;
if (that.loadend) return; if (that.loading) return;
if (that.loading) return;
if (isPage === true) that.$set(that, 'productList', []);
if (isPage === true) that.$set(that, 'productList', []);
that.loading = true;
that.loading = true; that.loadTitle = '';
that.loadTitle = ''; getProductHot(that.where.page, that.where.limit).then(res => {
spuInfo(id,that.where).then(res => { let list = res.data.list;
let list = res.data.list; let productList = that.$util.SplitArray(list, that.productList);
let productList = that.$util.SplitArray(list, that.productList); let loadend = list.length < that.where.limit;
let loadend = list.length < that.where.limit; that.loadend = loadend;
that.loadend = loadend; that.loading = false;
that.loading = false; that.loadTitle = loadend ? '已全部加载' : '加载更多';
that.loadTitle = loadend ? '已全部加载' : '加载更多'; that.$set(that, 'productList', productList);
that.$set(that, 'productList', productList); // console.log(that.productList)
// console.log(that.productList) that.$set(that.where, 'page', that.where.page + 1);
that.$set(that.where, 'page', that.where.page + 1); if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true
if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true }).catch(err => {
}).catch(err => { that.loading = false;
that.loading = false; that.loadTitle = '加载更多';
that.loadTitle = '加载更多'; });
});
} else {
let that = this;
if (that.loadend) return;
if (that.loading) return;
if (isPage === true) that.$set(that, 'productList', []);
that.loading = true;
that.loadTitle = '';
getProductHot(that.where.page,that.where.limit).then(res => {
let list = res.data.list;
let productList = that.$util.SplitArray(list, that.productList);
let loadend = list.length < that.where.limit;
that.loadend = loadend;
that.loading = false;
that.loadTitle = loadend ? '已全部加载' : '加载更多';
that.$set(that, 'productList', productList);
// console.log(that.productList)
that.$set(that.where, 'page', that.where.page + 1);
if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true
}).catch(err => {
that.loading = false;
that.loadTitle = '加载更多';
});
}
}, },
@ -413,13 +380,13 @@
if (scrollTop <= 20) { if (scrollTop <= 20) {
this.backColor = 'rgba(252, 252, 252, 0)' this.backColor = 0
this.isFshow = false this.isFshow = false
} else if (20 < scrollTop && scrollTop <= 100) { } else if (20 < scrollTop && scrollTop <= 100) {
this.backColor = 'rgba(252, 252, 252, .5)' this.backColor = 0.5
this.isFshow = true this.isFshow = true
} else if (scrollTop > 100) { } else if (scrollTop > 100) {
this.backColor = 'rgba(252, 252, 252, 1)' this.backColor = 1
this.isFshow = true this.isFshow = true
@ -447,8 +414,8 @@
this.street = e.value[1].name this.street = e.value[1].name
this.street_id = e.value[1].code this.street_id = e.value[1].code
this.town = e.value[1].name this.town = e.value[1].name
this.productList=[] this.productList = []
this.list(true,this.street_id) this.list(true, this.street_id)
this.$nextTick(() => { this.$nextTick(() => {
this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code); this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
@ -538,8 +505,8 @@
this.street = e.value[1].name this.street = e.value[1].name
this.street_id = e.value[1].code this.street_id = e.value[1].code
this.town = e.value[1].name this.town = e.value[1].name
this.productList=[] this.productList = []
this.list(true,this.street_id) this.list(true, this.street_id)
}, },
selfLocation() { selfLocation() {
if (uni.getStorageSync('loction') == true) { if (uni.getStorageSync('loction') == true) {
@ -674,7 +641,8 @@
/* #ifdef H5 */ /* #ifdef H5 */
padding-top: 25rpx; padding-top: 25rpx;
/* #endif */ /* #endif */
// background-color: #e5e5e5; background: url('@/static/images/bg2.png') no-repeat;
background-size: 100% 100%;
padding-right: 20rpx; padding-right: 20rpx;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 43 KiB