lilei 10 months ago
parent
commit
b6918e1240

+ 13 - 15
pages/index/index.vue

@@ -1,5 +1,5 @@
 <template>
 <template>
-	<view class="content" :class="hasShopiing?'bg-0':'bg-0'">
+	<view class="content" :class="hasShopiing?'bg-0':'bg-1'">
 		<view class="content-body">
 		<view class="content-body">
 			<!-- 头部栏 -->
 			<!-- 头部栏 -->
 			<view class="header-box">
 			<view class="header-box">
@@ -20,7 +20,7 @@
 				</view>
 				</view>
 			</view>
 			</view>
 			<view class="cbody">
 			<view class="cbody">
-				<view :class="hasShopiing?'shopping bg-blue':'body-box bg-blue'">
+				<view :class="hasShopiing?'shopping':'body-box bg-blue'">
 					<!-- 滚动区域 -->
 					<!-- 滚动区域 -->
 					<view class="scroll-list" v-if="!hasShopiing">
 					<view class="scroll-list" v-if="!hasShopiing">
 						<scrollBox v-if="list.length&&!hasRedPacket" :list="list"></scrollBox>
 						<scrollBox v-if="list.length&&!hasRedPacket" :list="list"></scrollBox>
@@ -465,9 +465,9 @@
 					this.hasShopiing = res.data && res.data.paramValue == 1
 					this.hasShopiing = res.data && res.data.paramValue == 1
 					// 有商城
 					// 有商城
 					if(this.hasShopiing){
 					if(this.hasShopiing){
-						if(!flag){
-							// 隐藏tab 视频,显示tab购物车
-							this.showCatTab()
+						// 隐藏tab 视频,显示tab购物车
+						this.showCatTab()
+						if(this.productTypeList.length == 0){
 							// 商品分类
 							// 商品分类
 							this.getGoodType()
 							this.getGoodType()
 						}
 						}
@@ -957,7 +957,7 @@
 		background-image: linear-gradient(#86defa 0%, #ffffff 15%);
 		background-image: linear-gradient(#86defa 0%, #ffffff 15%);
 	}
 	}
 	.bg-1{
 	.bg-1{
-		background-image: linear-gradient(#066cff 10%, #80b1fd 30%, #f8f8f8 50%);
+		background-image: linear-gradient(#86defa 0%,#cdeff9 20%,#f8f8f8 30%);
 	}
 	}
 	.content {
 	.content {
 		margin: 0;
 		margin: 0;
@@ -1090,6 +1090,7 @@
 		}
 		}
 		.bg-blue{
 		.bg-blue{
 			position: relative;
 			position: relative;
+			z-index: 1;
 			> view{
 			> view{
 				z-index: 100;
 				z-index: 100;
 				position: relative;
 				position: relative;
@@ -1107,10 +1108,7 @@
 				content: '';
 				content: '';
 				border-radius: 0 0 50% 50%;
 				border-radius: 0 0 50% 50%;
 				/*分别对应 左上 右上 右下 左下 可以修改成其它颜色*/
 				/*分别对应 左上 右上 右下 左下 可以修改成其它颜色*/
-			    background: linear-gradient(to bottom, #066cff, #1d77ff);  
-			}
-			.search-head{
-				 
+			    background: linear-gradient(to bottom, #066cff, #056bf9);  
 			}
 			}
 			.userCard{
 			.userCard{
 				position:relative;
 				position:relative;
@@ -1147,11 +1145,11 @@
 		.shopping{
 		.shopping{
 			padding: 0;
 			padding: 0;
 			.notices{
 			.notices{
-				padding: 0.5em 10px 0
-			}
-			&::after{
-				top: -25px;
-				border-radius: 0 0 150px 150px;
+				padding: 0.5em 10px 0;
+				margin-top: 0.2rem;
+				.text{
+					color: #066cff;
+				}
 			}
 			}
 		}
 		}
 		.list-box{
 		.list-box{

+ 3 - 3
pagesB/cart/productitem.vue

@@ -5,13 +5,13 @@
 		:key="item.cartSn" 
 		:key="item.cartSn" 
 		>
 		>
 			<view class="choose-product-item-check" @click="checkItem(item)">
 			<view class="choose-product-item-check" @click="checkItem(item)">
-				<uni-icons v-if="!item.edit && (item.status==0||item.dealerScopeFlag==0)" type="circle-filled" size="24" color="#ccc"></uni-icons>
+				<uni-icons v-if="!item.edit && (!item.status||item.dealerScopeFlag==0)" type="circle-filled" size="24" color="#ccc"></uni-icons>
 				<uni-icons v-else :type="item.checked?'checkbox-filled':'circle'" size="24" :color="item.checked?'#dd0000':'#666'"></uni-icons>
 				<uni-icons v-else :type="item.checked?'checkbox-filled':'circle'" size="24" :color="item.checked?'#dd0000':'#666'"></uni-icons>
 			</view>
 			</view>
 			 <view>
 			 <view>
 				 <view class="choose-product-item-img">
 				 <view class="choose-product-item-img">
 					<image mode="aspectFit" :src="item.productImage?item.productImage+'?x-oss-process=image/resize,p_30':'/static/def_imgs.png'" style="width: 100%;height: 180rpx;"></image>
 					<image mode="aspectFit" :src="item.productImage?item.productImage+'?x-oss-process=image/resize,p_30':'/static/def_imgs.png'" style="width: 100%;height: 180rpx;"></image>
-					<view class="back-price xiajia" v-if="item.status==0">下架</view>
+					<view class="back-price xiajia" v-if="!item.status">下架</view>
 					<view class="back-price xiajia" v-else-if="item.dealerScopeFlag==0">售罄</view>
 					<view class="back-price xiajia" v-else-if="item.dealerScopeFlag==0">售罄</view>
 					<view class="choose-product-item-left-info-code">
 					<view class="choose-product-item-left-info-code">
 						<text max-lines="1" overflow="ellipsis">{{item.productCode}}</text>
 						<text max-lines="1" overflow="ellipsis">{{item.productCode}}</text>
@@ -32,7 +32,7 @@
 									<view class="qty-btn" @click="changeQty(item.qty+1,item,1)" :class="(item.qty >= 999)?'qty-disabled':''">+</view>
 									<view class="qty-btn" @click="changeQty(item.qty+1,item,1)" :class="(item.qty >= 999)?'qty-disabled':''">+</view>
 								</view>
 								</view>
 							</view>
 							</view>
-							<view v-if="!item.edit && (item.status==0||item.dealerScopeFlag==0)" class="edit-qty">
+							<view v-if="!item.edit && (!item.status||item.dealerScopeFlag==0)" class="edit-qty">
 								X <text>{{item.qty}}</text>
 								X <text>{{item.qty}}</text>
 							</view>
 							</view>
 							<view v-if="item.edit" class="edit-qty">
 							<view v-if="item.edit" class="edit-qty">

+ 0 - 1
pagesB/shopiing/searchProduct.vue

@@ -213,7 +213,6 @@
 					productCode: this.queryWord,
 					productCode: this.queryWord,
 					categorySn: this.categorySn,
 					categorySn: this.categorySn,
 					dealerSn: dealerSn,
 					dealerSn: dealerSn,
-					categoryStatus : 1,
 					status: 1
 					status: 1
 				}).then(res => {
 				}).then(res => {
 					this.loading = false
 					this.loading = false

+ 0 - 1
pagesB/shopiing/shopProduct.vue

@@ -270,7 +270,6 @@
 					queryWord: this.queryWord,
 					queryWord: this.queryWord,
 					categorySn: this.categorySn,
 					categorySn: this.categorySn,
 					dealerSn: dealerSn,
 					dealerSn: dealerSn,
-					categoryStatus : 1,
 					status: 1
 					status: 1
 				}).then(res => {
 				}).then(res => {
 					this.loading = false
 					this.loading = false