Browse Source

commit -m 我的商品、我的店铺

zhengjinyi 4 years ago
parent
commit
daeabfe07a
2 changed files with 220 additions and 113 deletions
  1. 162 109
      supplier/pages/user/my-product.vue
  2. 58 4
      supplier/pages/user/my-shop.vue

File diff suppressed because it is too large
+ 162 - 109
supplier/pages/user/my-product.vue


+ 58 - 4
supplier/pages/user/my-shop.vue

@@ -26,7 +26,7 @@
 			<banner :list="bannerImageList"></banner>
 		</view>	
 		<view class="container-section tui-skeleton">
-			<view class="title">主推商品</view>
+			<view class="tab-title">主推商品</view>
 			<view class="section-product clearfix">
 				<view class="floor-item" v-for="(item, index) in organizeProducts" :key="index" @click.stop="navToDetailPage(item.productID)">
 					<image class="tui-skeleton-fillet" :src="item.mainImage" mode="aspectFill"></image>
@@ -34,7 +34,7 @@
 						<view class="title tui-skeleton-rect">
 							<text class="mclap">{{item.name}}</text>
 						</view>
-						<view class="floor-item-act">
+						<!-- <view class="floor-item-act">
 							<template v-if="item.actStatus==1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
 									{{item.promotions.name}}<text v-if="hasLogin && item.price1TextFlag != '1'">:¥{{item.price | NumFormat}}</text>
@@ -44,7 +44,60 @@
 							<template v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">
 								<view class="floor-tags">阶梯价格</view>	
 							</template>	
+						</view> -->	
+						<view class="" v-if="hasLogin">
+							<view v-if="userIdentity == 4">
+								<view class="title-none" v-show="item.price1TextFlag == '1'">
+									<text class="p big">¥未公开价格</text>
+								</view>
+								<view class="title-none" v-show="item.price1TextFlag == '2'">
+									<text class="p big">¥价格仅会员可见</text>
+								</view>
+								<view class="price tui-skeleton-rect" v-show="item.price1TextFlag == '0'" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
+									<text class="p sm">¥</text>
+									<text class="p big">{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price ) | NumFormat}}</text>
+								</view>
+							</view>
+							<view v-else>
+								<view class="title-none" v-if="item.price1TextFlag == '1'">
+									<text class="p big">未公开价格</text>
+								</view>
+								<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.promotions) ? 'none' : ''">
+									<text class="p sm">¥</text>
+									<text class="p big">{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price ) | NumFormat}}</text>
+								</view>
+							</view>
 						</view>
+						<view v-else class="no-price">
+							<view class="p-stars">
+								<text class="p-no">¥</text>
+								<uni-stars :stars="parseInt(item.price1Grade)" :fontSize="36" :widthInfo="180"></uni-stars>
+							</view>
+						</view>	
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="container-section tui-skeleton">
+			<view class="tab-title">全部商品</view>
+			<view class="section-product clearfix">
+				<view class="floor-item" v-for="(item, index) in organizeProducts" :key="index" @click.stop="navToDetailPage(item.productID)">
+					<image class="tui-skeleton-fillet" :src="item.mainImage" mode="aspectFill"></image>
+					<view class="floor-item-content">
+						<view class="title tui-skeleton-rect">
+							<text class="mclap">{{item.name}}</text>
+						</view>
+						<!-- <view class="floor-item-act">
+							<template v-if="item.actStatus==1">
+								<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
+									{{item.promotions.name}}<text v-if="hasLogin && item.price1TextFlag != '1'">:¥{{item.price | NumFormat}}</text>
+								</view>
+								<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
+							</template>
+							<template v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">
+								<view class="floor-tags">阶梯价格</view>	
+							</template>	
+						</view> -->	
 						<view class="" v-if="hasLogin">
 							<view v-if="userIdentity == 4">
 								<view class="title-none" v-show="item.price1TextFlag == '1'">
@@ -289,7 +342,7 @@
 		background-color: #F7F7F7;
 		box-sizing: border-box;
 		padding: 0 24rpx;
-		.title{
+		.tab-title{
 			width: 100%;
 			height: 88rpx;
 			line-height: 88rpx;
@@ -318,7 +371,7 @@
 				image{
 					width: 341rpx;
 					height: 341rpx;
-					border-radius: 20rpx 20rpx 0 0;
+					border-radius: 2rpx 2rpx 0 0;
 					display: block;
 					margin-bottom: 20rpx;
 				}
@@ -370,6 +423,7 @@
 					height: 72rpx;
 					display: flex;
 					flex-direction: column;
+					margin-bottom: 10rpx;
 					.mclap{
 						width: 100%;
 						line-height: 36rpx;

Some files were not shown because too many files changed in this diff