Browse Source

优化:1.商品列表隐藏售卖时间2.创建展示商品分组3.替换售价和划线价字段

lishanshan 8 tháng trước cách đây
mục cha
commit
4638640864

+ 3 - 3
pages/coupon/activity.vue

@@ -76,10 +76,10 @@
                     <image class="product-image" :src="item.productImage" mode="aspectFill"></image>
                     <view class="product-details">
                         <view class="product-name">{{ item.productName }}</view>
-                        <view class="product-date">{{ item.saleStartDate + '-' + item.saleEndDate }}</view>
+                        <!-- <view class="product-date">{{ item.saleStartDate + '-' + item.saleEndDate }}</view> -->
                         <view class="product-price">
-                            <text class="actual-price">¥{{ item.price }}</text>
-                            <text class="original-price">¥{{ item.soldPrice }}</text>
+                            <text class="actual-price">¥{{ item.soldPrice }}</text>
+                            <text class="original-price">¥{{ item.price }}</text>
                         </view>
                     </view>
                 </view>

+ 2 - 2
pages/order/details.vue

@@ -74,8 +74,8 @@
 								</view>
 							</view>
 							<view class="right">
-								<span style="font-size: 22rpx;color: #FD4912;">¥{{specitem.price}}</span>
-								<span style="text-decoration: line-through;font-size: 18rpx;color: #999999;">¥{{specitem.soldPrice}}</span>
+								<span style="font-size: 22rpx;color: #FD4912;">¥{{specitem.soldPrice}}</span>
+								<span style="text-decoration: line-through;font-size: 18rpx;color: #999999;">¥{{specitem.price}}</span>
 							</view>
 						</view>
 					</view>

+ 2 - 2
pages/order/index.vue

@@ -146,9 +146,9 @@
 										</view>
 									</view>
 									<view class="right">
-										<span style="font-size: 22rpx;color: #333333;">¥{{specitem.price}}</span>
+										<span style="font-size: 22rpx;color: #333333;">¥{{specitem.soldPrice}}</span>
 										<span
-											style="text-decoration: line-through;font-size: 18rpx;color: #999999;">¥{{specitem.soldPrice}}</span>
+											style="text-decoration: line-through;font-size: 18rpx;color: #999999;">¥{{specitem.price}}</span>
 									</view>
 								</view>
 							</view>

+ 9 - 9
pages/product/creatProduct.vue

@@ -42,7 +42,7 @@
 							border="none"></u--input>
 						<u-icon slot="right" name="arrow-right"></u-icon>
 					</u-form-item> -->
-				<view v-if="form.categoryId === '1889837829066899458'" class="item">
+				<view class="item">
 					<view class="label">
 						商品分组<span v-if="tabIndex == '0'">*</span>
 					</view>
@@ -193,8 +193,8 @@
 						商品售价<span>*</span>
 					</view>
 					<view class="picker">
-						<u-input type="number" v-model.number="form.price" placeholder="请输入"
-							@blur="checkPriceAndSoldPrice('price')" />
+						<u-input type="number" v-model.number="form.soldPrice" placeholder="请输入"
+							@blur="checkPriceAndSoldPrice('soldPrice')" />
 					</view>
 					<view class="unit">
 						元
@@ -205,8 +205,8 @@
 						商品市场价<span>*</span>
 					</view>
 					<view class="picker">
-						<u-input type="number" v-model.number="form.soldPrice" placeholder="请输入"
-							@blur="checkPriceAndSoldPrice('soldPrice')" />
+						<u-input type="number" v-model.number="form.price" placeholder="请输入"
+							@blur="checkPriceAndSoldPrice('price')" />
 					</view>
 					<view class="unit">
 						元
@@ -760,7 +760,7 @@ export default {
 				});
 				return
 			}
-			if (this.tabIndex == '0' && this.form.categoryId === '1889837829066899458' && !this.form.groupingId) {
+			if (this.tabIndex == '0' && !this.form.groupingId) {
 				uni.showToast({
 					title: '请选择商品分组',
 					icon: 'none'
@@ -871,7 +871,7 @@ export default {
 		// 校验商品市场价必须大于商品售价
 		checkPriceAndSoldPrice(field) {
 			if ((field == 'price' && this.form.soldPrice) || (field == 'soldPrice' && this.form.price)) {
-				if (this.form.soldPrice <= this.form.price) {
+				if (this.form.price <= this.form.soldPrice) {
 					uni.showToast({
 						title: '商品市场价必须大于商品售价',
 						icon: 'none',
@@ -1171,14 +1171,14 @@ export default {
 				});
 				return
 			}
-			if (!this.form.soldPrice) {
+			if (!this.form.price) {
 				uni.showToast({
 					title: '请输入商品市场价',
 					icon: 'none'
 				});
 				return
 			}
-			if (this.form.soldPrice <= this.form.price) {
+			if (this.form.price <= this.form.soldPrice) {
 				uni.showToast({
 					title: '商品市场价必须大于商品售价',
 					icon: 'none'

+ 7 - 7
pages/product/creatStandard.vue

@@ -29,10 +29,10 @@
 					<view class="data">
 						<span>{{ item.productName }}</span>
 						<!-- <span>售卖时间:{{item.time}}</span> -->
-						<view class="repertory">售卖时间:{{ item.saleStartDate }} - {{ item.saleEndDate }}</view>
+						<!-- <view class="repertory">售卖时间:{{ item.saleStartDate }} - {{ item.saleEndDate }}</view> -->
 						<view class="price">
-							<span style="font-size: 22rpx;margin: 0px;">¥</span>{{ item.price }}
-							<span style="color:#999 ;font-size: 22rpx; text-decoration: line-through;">¥{{ item.soldPrice }}</span>
+							<span style="font-size: 22rpx;margin: 0px;">¥</span>{{ item.soldPrice }}
+							<span style="color:#999 ;font-size: 22rpx; text-decoration: line-through;">¥{{ item.price }}</span>
 						</view>
 					</view>
 					<view class="ticket" v-if="item.isRights == 1">
@@ -145,10 +145,10 @@
 						if (res.data.code == 200) {
 							res.data.result.records.forEach((item) => {
 								item.select = false;
-								item.saleEndDate = item.saleEndDate.includes('00:00:00') ? item.saleEndDate.slice(0, 10) : item
-									.saleEndDate
-								item.saleStartDate = item.saleStartDate.includes('00:00:00') ? item.saleStartDate.slice(0, 10) :
-									item.saleStartDate
+								// item.saleEndDate = item.saleEndDate.includes('00:00:00') ? item.saleEndDate.slice(0, 10) : item
+								// 	.saleEndDate
+								// item.saleStartDate = item.saleStartDate.includes('00:00:00') ? item.saleStartDate.slice(0, 10) :
+								// 	item.saleStartDate
 								// item.productImage = configService.apiUrl + '/' + item.productImage
 							})
 							this.productList = res.data.result.records

+ 3 - 3
pages/product/details.vue

@@ -20,7 +20,7 @@
 				<view class="data">
 					<span class="span">商品分类</span>{{ form.productCategory }}
 				</view>
-				<view v-if="form.categoryId === '1889837829066899458'" class="data">
+				<view class="data">
 					<span class="span">商品分组</span>{{ form.groupingName }}
 				</view>
 				<view class="img_box">
@@ -115,10 +115,10 @@
 					销售信息
 				</view>
 				<view class="data">
-					<span class="span">商品售价</span>{{ form.price }}元
+					<span class="span">商品售价</span>{{ form.soldPrice }}元
 				</view>
 				<view class="data">
-					<span class="span">商品市场价</span>{{ form.soldPrice }}元
+					<span class="span">商品市场价</span>{{ form.price }}元
 				</view>
 				<view class="data">
 					<span class="span">虚拟销量</span>{{ form.virtualSales }}

+ 7 - 7
pages/product/index.vue

@@ -47,13 +47,13 @@
 					<span class="audit " v-if="item.productStatus == '2'" style="color:#596ABB ;">审核中</span>
 					<span class="reject " v-if="item.productStatus == '3'" style="color:#F55D65 ;">未通过</span>
 					<span class="line"></span>
-					<span v-if="item.saleStartDate">{{ item.saleStartDate.slice(0, 10) }}-{{ item.saleEndDate.slice(0, 10) }}</span>
+					<!-- <span v-if="item.saleStartDate">{{ item.saleStartDate.slice(0, 10) }}-{{ item.saleEndDate.slice(0, 10) }}</span> -->
 					<!-- <view class="error insufficient" v-if="item.stockQuantity ==0">
 						库存不足
 					</view> -->
-					<view class="error overtime" v-if="item.sellingOvertime && item.stockQuantity > 0">
+					<!-- <view class="error overtime" v-if="item.sellingOvertime && item.stockQuantity > 0">
 						售卖超时
-					</view>
+					</view> -->
 
 
 					<!-- <span>已售:{{item.num}}</span>
@@ -70,11 +70,11 @@
 						<!-- <view class="repertory">库存:{{ item.stockQuantity }} <span
 								@click.stop="goUser(item)">销量:{{ item.soldQuantity }}</span> </view> -->
 						<view class="price">
-							<span style="font-size: 22rpx;margin: 0px;">¥</span>{{ item.categoryId == 1945013773786701826 ? item.soldPrice : item.price }}
-							<span v-if="item.categoryId == 1945013773786701826">~</span>
+							<span style="font-size: 22rpx;margin: 0px;">¥</span>{{item.soldPrice}}
+							<span v-if="item.categoryId == 1945013773786701826 ">~</span>
 							<span style="font-size: 22rpx;font-size: 30rpx;font-weight: 600;"
-								v-if="item.categoryId == 1945013773786701826">¥{{ item.price }}</span>
-							<span style="color:#999 ;font-size: 22rpx; text-decoration: line-through;" v-else>¥{{ item.soldPrice }}</span>
+								v-if="item.categoryId == 1945013773786701826 ">¥{{item.price}}</span>
+							<span style="color:#999 ;font-size: 22rpx; text-decoration: line-through;" v-else>¥{{item.price}}</span>
 						</view>
 						<image src="/static/product/ticket.png" mode="" class="ticket" v-if="item.isRights == 1"></image>
 					</view>