维沙bug修复

components/cm-module/listTemplate/productList.vue

@@ -42,7 +42,6 @@
 					<text class="list-details-title">{{ item.productName }}</text>
 					
 					<!-- <text class="list-details-specs">商品编码：{{ item.productCode != null ? item.productCode : '' }}</text> -->
-					<!-- <text class="list-details-miniQuantity">起订量：{{ item.ladderPriceFlag == '1' ? item.maxBuyNumber : item.minBuyNumber}}</text> -->
 					<!-- 价格 -->
 					<view class="price-box">
 						<view class="list-details-price prom">
@@ -57,6 +56,7 @@
 								<view class="floor-tags">阶梯价格</view>
 							</view>
 						</view>
+						<text class="list-details-miniQuantity">起订量：{{ item.ladderPriceFlag == '1' ? item.maxBuyNumber : item.minBuyNumber}}</text>
 						<text class="list-details-specs">规格：{{ item.unit != null ? item.unit : '' }}</text>
 						<view class="list-details-price">
 							<view class="list-shop">
@@ -65,8 +65,8 @@
 									<text class="iconfont icon-wenhao" @click.stop="repurchModel"></text>
 								</view>
 								<view class="list-price" v-else>
-									<text class="price-larger" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
-										￥{{(PromotionsFormat(item.promotions) ? item.price1 : item.retailPrice) | NumFormat }}
+									<text class="price-larger" :class="PromotionsFormat(item.promotion) ? 'none' : ''">
+										￥{{(PromotionsFormat(item.promotion) ? item.price : item.retailPrice) | NumFormat }}
 									</text>
 								</view>
 							</view>
@@ -79,7 +79,7 @@
 			</view>
 			<!--加载loadding-->
 			<tui-loadmore :visible="loadingNow" :index="3" text="加载中..."></tui-loadmore>
-			<tui-nomore :visible="!loadingNow" text="没有更多了"></tui-nomore>
+			<tui-nomore :visible="!loadingNow" :text="hasNextPage?'上拉加载更多':'没有更多了'"></tui-nomore>
 			<!--加载loadding END-->
 		</scroll-view>
 		<!-- 商品列表为空时 -->
@@ -346,13 +346,13 @@ export default {
 		width: 100%;
 		font-size: 20rpx;
 		display: inline-block;
-		margin-top: 14rpx;
 		color: #999999;
 	}
 	.list-details-miniQuantity {
 		width: 100%;
 		display: inline-block;
-		margin-top: 7rpx;
+		font-size: 20rpx;
+		color: #999999;
 	}
 }
 .price-box{
@@ -365,19 +365,13 @@ export default {
 	// line-height: 54rpx;
 	// margin-top: 10rpx;
 	// height: 54rpx;
-	
 	float: left;
-	&.prom{
-		min-height: 40rpx;
-		margin-top: 20rpx;
-	}
 	.floor-item-act{
 		width: 100%;
 		// height: 56rpx;
 		text-align: center;
 		box-sizing: border-box;
 		float: left;
-		padding:0 0 10rpx 0;
 		.floor-tags{
 			height: 28rpx;
 			border-radius: 6rpx;

components/cm-module/scrollTop/scrollTop.vue

@@ -2,7 +2,7 @@
 	<!-- 商品详情价格判断 -->
 	<view>
 		<view class="scrollTop" :style="{bottom:bottom+'rpx'}">
-			<view class="icon msg">
+			<view class="icon msg" v-if="!hideContact">
 				<!-- #ifdef MP-WEIXIN -->
 				<button class="contact-btn" open-type="contact" @bindcontact="handleContact">
 					<text class="iconfont icon-zaixiankefu"></text>
@@ -27,6 +27,10 @@
 			isScrollTop:{
 				type:Boolean,
 				default:false
+			},
+			hideContact:{
+				type:Boolean,
+				default:false
 			}
 		},
 		data() {
@@ -60,6 +64,7 @@
 		height: 200rpx;
 		position: fixed;
 		right: 20rpx;
+		z-index: 999;
 		.icon{
 			width: 80rpx;
 			height: 80rpx;

pages/goods/product.vue

@@ -166,9 +166,9 @@
 					</view>
 					<view class="product-details ">
 						<view class="product-item-none" v-if="goodsData.isNoneDisabled">
-							<image class="none-image" :src="productNoneImage" mode=""></image>
+							<image class="none-image" src="/static/ws/product_off.png" mode=""></image>
 							<view class="none-text"
-								>此商品已{{ goodsData.disabledText }}，请浏览以下推荐商品~</view
+								>此商品已{{ goodsData.disabledText }}</view
 							>
 						</view>
 						<!-- 选择商品参数按钮 -->
@@ -412,6 +412,8 @@ export default {
 				})
 		}
 		this.getWinHeight()
+		// this.goodsData.isNoneDisabled = true
+		// console.log(this.goodsData);
 	},
 	computed: {
 		...mapState(['hasLogin', 'isWxAuthorize', 'identity'])
@@ -468,7 +470,8 @@ export default {
 					if (
 						this.product.validFlag == '3' ||
 						this.product.validFlag == '10' ||
-						this.stock == 0
+						this.stock == 0||
+						this.product.status == 0
 					) {
 						this.disabled = true
 						this.isNoneDisabled = true
@@ -489,7 +492,7 @@ export default {
 					}
 					this.goodsData.disabled = this.disabled
 					this.goodsData.isNoneDisabled = this.isNoneDisabled
-					if (this.product.validFlag == '3') {
+					if(this.product.status == 0){
 						this.goodsData.disabledText = '下架'
 					}
 					if (this.product.validFlag == '10') {
@@ -1159,7 +1162,7 @@ page {
 	.none-text {
 		text-align: center;
 		font-size: $font-size-28;
-		color: #fea785;
+		color: rgb(254,194,117);
 		line-height: 40rpx;
 	}
 }