From c3319db3d83f2d4fa7fdf06e3792496ce77d90aa Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期一, 09 九月 2024 02:24:16 +0800
Subject: [PATCH] update 提及的修复问题和会员信息相关的

---
 sub_pages/customer/shop/shop.vue |  210 ++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 139 insertions(+), 71 deletions(-)

diff --git a/sub_pages/customer/shop/shop.vue b/sub_pages/customer/shop/shop.vue
index 2e44cdb..407070c 100644
--- a/sub_pages/customer/shop/shop.vue
+++ b/sub_pages/customer/shop/shop.vue
@@ -34,17 +34,17 @@
 					<view class="label">发布</view>
 				</view>
 				<view class="form-item">
-					<view class="value">0</view>
+					<view class="value">*</view>
 					<view class="label">获赞</view>
 				</view>
 				<view class="form-item">
-					<view class="value">0</view>
+					<view class="value">*</view>
 					<view class="label">粉丝</view>
 				</view>
-				<view class="form-item">
+				<!-- <view class="form-item">
 					<view class="value">0</view>
 					<view class="label">关注</view>
-				</view>
+				</view> -->
 			</view>
 			<view class="p10" style="padding-left: 20rpx;padding-right: 20rpx;">
 				<top-tabs :tabs="tabs" :flg="flg" @change="changeTab">
@@ -82,65 +82,87 @@
 				</view>
 				<no-data v-if="(!list||list.length==0)&&true" style="width: 100%;margin-top: 120rpx;"></no-data>
 				<view class="flex m-t-12 flex-wrap-normal">
-				<view class="type-list"  v-if="flg==='1'">
-					<view v-for="(item,index) of catgoryTree" @click="changeType(item)"
-						:class="[query.categoryRoot===item.id?'current':'']" :key="index" class="p10 flex type-item">
-						{{item.name || '-'}}
-					</view>
-				</view>
-				<view class="flex1">
-					
-				
-					<view class="component-shop-item flex" v-for="(item,index) of list" :key="index" :class="flg==='1'?'flg-category':''">
-						<view class="img" @click.stop="toDetail(item)">
-							<image class="img img100" :src="item.cover" lazy-load>
-							</image>
-							<view class="level">
-								{{item.levelStr||''}}
-							</view>
+					<view class="type-list" v-if="flg==='1'">
+						<view v-for="(item,index) of catgoryTree" @click="changeType(item)"
+							:class="[query.categoryRoot===item.id?'current':'']" :key="index"
+							class="p10 flex type-item">
+							{{item.name || '-'}}
 						</view>
+					</view>
+					<view class="flex1">
 
-						<view class="m-l-12 info-container flex1">
-							<view class="title" @click.stop="toDetail(item)">
-								{{item.name}}
-								<view class="price">
-									¥{{item.price}}/扎
+
+						<view class="component-shop-item flex" v-for="(item,index) of list" :key="index"
+							:class="flg==='1'?'flg-category':''">
+							<view class="img" @click.stop="toDetail(item)">
+								<image class="img img100" :src="item.cover" lazy-load>
+								</image>
+								<view class="level">
+									{{item.levelStr||''}}
 								</view>
 							</view>
-							<view class="shop-name" @click.stop="toDetail(item)">
+
+							<view class="m-l-12 info-container flex1">
+								<view class="title" @click.stop="toDetail(item)">
+									{{item.name}}
+									<!-- #ifdef PUB_CUSTOMER_DEV -->
+									<view class="price component-price-new">
+										¥{{item.priceMember||item.price}}/扎<span class="tip">会员价</span>
+										<view class="component-price-old">
+											¥{{item.price}}/扎
+										</view>
+									</view>
+									<!-- #endif -->
+									<!-- #ifndef PUB_CUSTOMER_DEV -->
+									<view class="price">
+										¥{{item.price}}/扎
+									</view>
+									<!-- #endif -->
+
+								</view>
+								<view class="tags" v-if="item.tags||false" @click.stop="toDetail(item)">
+									<!-- 		<view class="tag red">限时抢购</view>
+								<view class="tag green">品质严选</view> -->
+									<view class="tag red" v-for="(tag,k) of item.tagArr" :class="[k===0?'red':'green']"
+										:key="tag">{{
+								  tag
+								}}
+									</view>
+								</view>
+								<!-- 	<view class="shop-name" @click.stop="toDetail(item)">
 								{{item.categoryStr}}
-							</view>
-							<view class="other-info flex" @click.stop="toDetail(item)">
-								<view class="m-r-15">
-									已售:{{item.sales || 0}}
-								</view>
-								<view class="m-r-15">
-									剩余:{{item.stock || 0}}
-								</view>
-								<view class="m-r-15">
-									{{item.unit}}
-								</view>
-							</view>
-							<view class="bottom-buttons  flex">
-								<view class="m-l-0 m-r-a">
-									<view class="m-r-15 desc-gray other-info">
-										颜色:{{item.color||'-'}}
+							</view> -->
+								<view class="other-info flex" @click.stop="toDetail(item)">
+									<view class="m-r-15">
+										已售:{{ ((item.sales||0) +(item.realSales||0)) || 0}}
+									</view>
+									<view class="m-r-15">
+										剩余:{{item.stock || 0}}
+									</view>
+									<view class="m-r-15">
+										{{item.unit}}
 									</view>
 								</view>
-								<view class="icons flex">
-									<uni-icons v-if="item.shopnum&&item.shopnum>=1" type="minus" size="32"
-										@click.stop="addnum(item,-1)"></uni-icons>
-									<view class="curnums" @click.stop="updateItemNum(item)"
-										v-if="item.shopnum&&item.shopnum>=1">
-										{{ item.shopnum }}
+								<view class="bottom-buttons  flex">
+									<view class="m-l-0 m-r-a">
+										<view class="m-r-15 desc-gray other-info">
+											颜色:{{item.color||'-'}}
+										</view>
 									</view>
-									<uni-icons v-if="!item.shopnum||item.shopnum<=99" type="plus-filled" size="32"
-										@click.stop="addnum(item,1)"></uni-icons>
+									<view class="icons flex">
+										<uni-icons v-if="item.shopnum&&item.shopnum>=1" type="minus" size="32"
+											@click.stop="addnum(item,-1)"></uni-icons>
+										<view class="curnums" @click.stop="updateItemNum(item)"
+											v-if="item.shopnum&&item.shopnum>=1">
+											{{ item.shopnum }}
+										</view>
+										<uni-icons v-if="!item.shopnum||item.shopnum<=99" type="plus-filled" size="32"
+											@click.stop="addnum(item,1)"></uni-icons>
+									</view>
 								</view>
 							</view>
 						</view>
 					</view>
-				</view>
 				</view>
 			</view>
 
@@ -262,7 +284,7 @@
 					levelStr: '',
 					level: '',
 					name: '',
-					categoryRoot:'',
+					categoryRoot: '',
 				},
 				level_show: false,
 				level_columns: [
@@ -276,8 +298,16 @@
 			}
 		},
 		onShow() {
-			//避免商品数目不一样
+			//避免商品数目不一样			
 			this.refreshList('post')
+		},
+		async onPullDownRefresh() {
+			if (this.id) {
+				await this.getDetail()
+			}
+			await this.refreshList('post')
+			uni.stopPullDownRefresh()
+
 		},
 		onLoad(options) {
 			this.id = options.id || ''
@@ -343,6 +373,16 @@
 			// }
 		},
 		methods: {
+			getList_after() {
+				if (this.list) {
+					for (var item of this.list) {
+						item.tagArr = []
+						if (item.tags) {
+							item.tagArr = item.tags.split(",") || []
+						}
+					}
+				}
+			},
 
 			async getDetail() {
 				{
@@ -441,13 +481,13 @@
 						this.$message.hideLoading()
 					}
 					//如果存在第一个分类,根据一级分类查询
-					if(this.catgoryTree.length>0){
-						this.query.categoryRoot =this.catgoryTree[0].id
+					if (this.catgoryTree.length > 0) {
+						this.query.categoryRoot = this.catgoryTree[0].id
 						//然后刷新
 						this.refreshList('post')
-						
+
 					}
-					
+
 				}
 				this.flg = '' + flg
 				//如果没有加载数据,需要加载一下
@@ -455,12 +495,12 @@
 
 			},
 			changeType(item) {
-				if(item.id!==this.query.categoryRoot){
+				if (item.id !== this.query.categoryRoot) {
 					this.query.categoryRoot = item.id || ''
 					this.refreshList('post')
 					//拼接二级分类,然后查询商品列表
 				}
-				
+
 			},
 			buttonSearchFlow() {
 				// this.query.name = this.search_flow || ''
@@ -539,6 +579,30 @@
 
 <style lang="scss" scoped>
 	.brand-detail {
+		.tags {
+			margin-top: 12rpx;
+			display: flex;
+
+			.tag {
+				// min-width: 60rpx;
+				padding-left: 10rpx;
+				padding-right: 10rpx;
+				line-height: 30rpx;
+				background: #FEE6E6;
+				border-radius: 10rpx;
+				font-size: 18rpx;
+				color: #CD1212;
+				margin-right: 6rpx;
+				text-align: center;
+			}
+
+			.tag.green {
+				color: rgba(110, 159, 102, 1);
+				background: rgba(202, 229, 214, 1);
+				border-radius: 10rpx;
+				// opacity: 0.57;
+			}
+		}
 
 		// min-height: 99vh;
 		.brand-info {
@@ -549,9 +613,10 @@
 			overflow: hidden;
 			overflow-y: scroll;
 			padding: 40rpx 32rpx;
-			height: calc(100vh - 450rpx);
+			min-height: calc(100vh - 470rpx);
+			max-height: calc(100vh - 470rpx);
 			padding-top: 0rpx;
-			
+
 			.type-list {
 				max-width: 140rpx;
 				min-width: 140rpx;
@@ -561,7 +626,7 @@
 				// max-height: calc(100vh - 600rpx);
 				overflow-y: scroll;
 				margin-right: 10rpx;
-			
+
 				.type-item {
 					text-align: center;
 					font-weight: 400;
@@ -572,30 +637,33 @@
 					// padding-left: 30rpx;
 					// padding-right: 30rpx;
 				}
-			
+
 				.type-item.current {
 					font-weight: 600;
 					color: #04BA97;
 				}
 			}
-			.flg-category.component-shop-item{
-				.img{
+
+			.flg-category.component-shop-item {
+				.img {
 					width: 140rpx;
 					height: 140rpx;
 					margin-top: 10rpx;
 				}
-				.info-container{
+
+				.info-container {
 					.title {
 						margin-top: 0rpx;
 					}
-					.shop-name{
-						
-					}
+
+					.shop-name {}
+
 					.other-info {
 						margin-bottom: 60rpx;
 					}
-					.bottom-buttons{
-						    bottom: -50rpx;
+
+					.bottom-buttons {
+						bottom: -50rpx;
 					}
 				}
 

--
Gitblit v1.9.3