commit -m 首页新品橱窗

components/cm-module/cm-seller/home.vue

@@ -113,7 +113,7 @@
 				this.CommonService.GetHomeDataInfo({userId:this.userID,soure:2}).then(response =>{
 					let data = response.data
 					this.pageList = data.homePageFloor
-					this.hotListPageFloor =  data.PageFloor
+					this.hotListPageFloor =  data.pageFloorList
 					console.log('hotListPageFloor',this.hotListPageFloor)
 					this.supplierObj = data.supplierImage
 					this.isRequest = true

components/cm-module/pageTemplate/templateL.vue

@@ -15,21 +15,18 @@
 						class="floor-item ad_04 clearfix"
 						v-for="(item, idx) in product"
 						:key="idx"
-						@click.stop="navToDetailPage(item)"
+						@click.stop="navToDetailPage(item.product)"
 					>
-						<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>
+						<image class="item-img tui-skeleton-fillet" :src="item.product.image" mode="aspectFill"></image>
 						<template-Type :product="item.product"></template-Type>
-						<view class="floor-item_tag" v-if="item.listType == 2">
-							<text>{{ item.label }}</text>
-						</view>
 						<view class="floor-item-content">
 							<view class="title tui-skeleton-rect">
 								<text class="mclap-tag" v-if="item.product.beautyActFlag == '1'">美博会</text>
 								<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''"
-									>{{ item.name }}
+									>{{ item.product.name }}
 								</text>
 							</view>
-							<view class="floor-item-price" v-if="item.listType == 1">
+							<view class="floor-item-price">
 								<template>
 									<template-Tags :product="item.product"></template-Tags>
 								</template>
@@ -142,11 +139,11 @@ export default {
 		async initData(data) {
 			const userInfo = await this.$api.getStorage()
 			this.shopId = userInfo.shopId ? userInfo.shopId : 0
-			this.productCount = data.floorImageList.length
+			this.productCount = data.floorImageList4.length
 			if (this.productCount > 0) {
 				this.productList.splice(0, this.productList.length)
-				for (var i = 0, j = data.floorImageList.length; i < j; i += this.pageSize) {
-					this.productList.push(data.floorImageList.slice(i, i + this.pageSize))
+				for (var i = 0, j = data.floorImageList4.length; i < j; i += this.pageSize) {
+					this.productList.push(data.floorImageList4.slice(i, i + this.pageSize))
 				}
 			}
 		},
@@ -172,9 +169,7 @@ export default {
 		},
 		navToDetailPage(pros) {
 			//跳转商品详情页
-			uni.navigateTo({
-			  	url:`/pages/second/product/product-details?id=${pros.productId}`
-			})
+			this.$api.navigateTo(`/pages/goods/product?id=${pros.productId}`)
 		}
 	}
 }

components/cm-module/supplier/home.vue

@@ -113,7 +113,7 @@
 				this.CommonService.GetHomeDataInfo({userId:this.userID,soure:2}).then(response =>{
 					let data = response.data
 					this.pageList = data.homePageFloor
-					this.hotListPageFloor =  data.PageFloor
+					this.hotListPageFloor =  data.pageFloorList
 					console.log('hotListPageFloor',this.hotListPageFloor)
 					this.supplierObj = data.supplierImage
 					this.isRequest = true

pages.json

@@ -858,7 +858,7 @@
                 {
                     "path": "form/form",
                     "style": {
-                        "navigationBarTitleText": "发布二手"
+                        "navigationBarTitleText": "发布二手估价商品"
                     }
                 },
                 {

pages/goods/good-hot.vue

@@ -386,13 +386,14 @@ export default {
 			// 选择品牌
 			brand.isChecked = !brand.isChecked
 			if (brand.isChecked) {
-				this.checkedBrandList.push(brand.id)
+				if(!this.contains(this.checkedBrandList,brand.id)){
+					this.checkedBrandList.push(brand.id)
+				}
 			} else {
-				this.checkedBrandList.splice(index, 1)
+				this.checkedBrandList.splice(this.checkedBrandList.indexOf(brand.id),1)
 			}
 			this.isAllcheckedBrand = false
 			this.checkedBrandLength = this.checkedBrandList.length
-			console.log('checkedBrandList', this.checkedBrandList)
 			this.listQuery.brandID = this.checkedBrandList.join(',')
 			console.log('this.listQuery.brandID', this.listQuery.brandID)
 		},
@@ -404,6 +405,9 @@ export default {
 				el.isChecked = false
 			})
 		},
+		contains(arr, val) {// 校验
+			return arr.some(item => item === val)
+		},
 		showDropShow() {
 			this.dropShow = !this.dropShow
 		},
@@ -454,7 +458,7 @@ page {
 	position: relative;
 	.topcontent-image {
 		width: 100%;
-		height: 430rpx;
+		height: 480rpx;
 		background: url(https://static.caimei365.com/app/img/hot/hot-bg@2x.png);
 		background-size: cover;
 		box-sizing: border-box;

pages/goods/goods-classify.vue

@@ -467,7 +467,6 @@ export default {
 			this.shopId = userInfo.shopId ? userInfo.shopId : 0
 			this.userIdentity = userInfo.userIdentity ? userInfo.userIdentity : 0
 			this.vipFlag = userInfo.vipFlag ? userInfo.vipFlag : 0
-
 			this.isRequest = true
 			this.GetProductListInfo()
 			this.GetProductOneClassly()

pages/supplier/user/my-product.vue

@@ -38,7 +38,7 @@
 											<view class="tui-goods-price">￥{{item.price | NumFormat}}</view>
 										</view>
 										<view class="tui-goods-pip">市场价:￥{{item.normalPrice | NumFormat}}</view>
-										<view class="tui-goods-pip">新品展示: <text class="red">{{ item.newvalidFlag | newvalidFlagFilters }}</text>	</view>
+										<view class="tui-goods-pip">新品展示: <text class="red">{{ item.showFlag | newvalidFlagFilters }}</text>	</view>
 										<view class="tui-goods-pip">分类:{{ item.typeName ? item.typeName : '无' }}</view>
 									</view>
 									<view class="tui-goods-status">
@@ -61,65 +61,67 @@
 		<!--右抽屉-->
 		<tui-drawer mode="right" :visible="rightDrawer" @close="closeDrawer">
 			<view class="d-container clearfix" :style="{paddingTop:CustomBar+10+'px'}">
-				<view class="d-label">商品名称:</view>
-				<view class="d-input">
-					<input class="input" type="text" value="" v-model="listQuery.name" placeholder="输入商品名称"/>
-				</view>
-				<view class="d-label">商品货号:</view>
-				<view class="d-input">
-					<input class="input" type="text" value="" v-model="listQuery.productCode" placeholder="输入商品货号"/>
-				</view>
-				<view class="d-label">状态:</view>
-				<view class="d-input">
-					<picker @change="bindPickerChange(1,$event)" :value="index" :range="statusActions" range-key="name">
-						<input class="input" type="text" disabled="false" v-model="validFlagText" value="" placeholder="请选择审核状态"/>
-						<text class="iconfont icon-xiangyou"></text>
-					</picker>
-				</view>
-				<view class="d-label">主推商品:</view>
-				<view class="d-input">
-					<picker @change="bindPickerChange(2,$event)" :value="index" :range="recommendActions" range-key="name">
-						<input class="input" type="text" disabled="false" v-model="featuredFlagText" value="" placeholder="请选择"/>
-						<text class="iconfont icon-xiangyou"></text>
-					</picker>
-				</view>
-				<view class="d-label">商品属性:</view>
-				<view class="d-input">
-					<picker @change="bindPickerChange(0,$event)" :value="index" :range="commodityTypeActons" range-key="name">
-						<input class="input" type="text" disabled="false" v-model="commodityTypeText" value="" placeholder="请选择"/>
-						<text class="iconfont icon-xiangyou"></text>
-					</picker>
-				</view>
-				<view class="d-label">商品分类:</view>
-				<view class="d-input">
-					<picker @change="bindPickerChange(3,$event)" :value="index" :range="classificationFirstList" range-key="name">
-						<input class="input" type="text" disabled="false" v-model="firstClassificationText" value="" placeholder="请选择一分类"/>
-						<text class="iconfont icon-xiangyou"></text>
-					</picker>
-				</view>
-				<view class="d-input">
-					<picker @change="bindPickerChange(4,$event)" :value="index" :range="classificationTwoList" range-key="name">
-						<input class="input" type="text" disabled="false" v-model="twoClassificationText" value="" placeholder="请选择二级分类"/>
-						<text class="iconfont icon-xiangyou"></text>
-					</picker> 
-				</view>
-				<view class="d-input">
-					<picker @change="bindPickerChange(5,$event)" :value="index" :range="classificationThreeList" range-key="name">
-						<input class="input" type="text" disabled="false" v-model="threeClassificationText" value="" placeholder="请选择三级分类"/>
-						<text class="iconfont icon-xiangyou"></text>
-					</picker>
-				</view>
-				<view class="d-label">新品展示:</view>
-				<view class="d-input">
-					<picker @change="bindPickerChange(6,$event)" :value="index" :range="newFlagActions" range-key="name">
-						<input class="input" type="text" disabled="false" v-model="newvalidFlagText" value="" placeholder="请选择"/>
-						<text class="iconfont icon-xiangyou"></text>
-					</picker>
-				</view>
-				<view class="d-input btn">
-					<view class="d-btn comfrim" @click="handSearchList">确定</view>
-					<view class="d-btn clear" @click="handSearchClear">重置</view>
-				</view>
+				<scroll-view class="tui-popup-scroll" scroll-y="true">
+					<view class="d-label">商品名称:</view>
+					<view class="d-input">
+						<input class="input" type="text" value="" v-model="listQuery.name" placeholder="输入商品名称"/>
+					</view>
+					<view class="d-label">商品货号:</view>
+					<view class="d-input">
+						<input class="input" type="text" value="" v-model="listQuery.productCode" placeholder="输入商品货号"/>
+					</view>
+					<view class="d-label">状态:</view>
+					<view class="d-input">
+						<picker @change="bindPickerChange(1,$event)" :value="index" :range="statusActions" range-key="name">
+							<input class="input" type="text" disabled="false" v-model="validFlagText" value="" placeholder="请选择审核状态"/>
+							<text class="iconfont icon-xiangyou"></text>
+						</picker>
+					</view>
+					<view class="d-label">主推商品:</view>
+					<view class="d-input">
+						<picker @change="bindPickerChange(2,$event)" :value="index" :range="recommendActions" range-key="name">
+							<input class="input" type="text" disabled="false" v-model="featuredFlagText" value="" placeholder="请选择"/>
+							<text class="iconfont icon-xiangyou"></text>
+						</picker>
+					</view>
+					<view class="d-label">商品属性:</view>
+					<view class="d-input">
+						<picker @change="bindPickerChange(0,$event)" :value="index" :range="commodityTypeActons" range-key="name">
+							<input class="input" type="text" disabled="false" v-model="commodityTypeText" value="" placeholder="请选择"/>
+							<text class="iconfont icon-xiangyou"></text>
+						</picker>
+					</view>
+					<view class="d-label">商品分类:</view>
+					<view class="d-input">
+						<picker @change="bindPickerChange(3,$event)" :value="index" :range="classificationFirstList" range-key="name">
+							<input class="input" type="text" disabled="false" v-model="firstClassificationText" value="" placeholder="请选择一分类"/>
+							<text class="iconfont icon-xiangyou"></text>
+						</picker>
+					</view>
+					<view class="d-input">
+						<picker @change="bindPickerChange(4,$event)" :value="index" :range="classificationTwoList" range-key="name">
+							<input class="input" type="text" disabled="false" v-model="twoClassificationText" value="" placeholder="请选择二级分类"/>
+							<text class="iconfont icon-xiangyou"></text>
+						</picker> 
+					</view>
+					<view class="d-input">
+						<picker @change="bindPickerChange(5,$event)" :value="index" :range="classificationThreeList" range-key="name">
+							<input class="input" type="text" disabled="false" v-model="threeClassificationText" value="" placeholder="请选择三级分类"/>
+							<text class="iconfont icon-xiangyou"></text>
+						</picker>
+					</view>
+					<view class="d-label">新品展示:</view>
+					<view class="d-input">
+						<picker @change="bindPickerChange(6,$event)" :value="index" :range="newFlagActions" range-key="name">
+							<input class="input" type="text" disabled="false" v-model="newvalidFlagText" value="" placeholder="请选择"/>
+							<text class="iconfont icon-xiangyou"></text>
+						</picker>
+					</view>
+					<view class="d-input btn">
+						<view class="d-btn comfrim" @click="handSearchList">确定</view>
+						<view class="d-btn clear" @click="handSearchClear">重置</view>
+					</view>
+				</scroll-view>	
 			</view>
 		</tui-drawer>
 		<!-- 批量操作 -->
@@ -174,11 +176,12 @@
 				commodityTypeActons: [{name:'产品',value:1},{name: '仪器',value:2}],
 				newFlagActions: [
 					{name:'全部',value:''},
-					{name:'参与',value:0},
+					{name: '待审核',value:0},
 					{name: '已展示',value:1},
-					{name: '未参与',value:2},
-					{name: '审核未通过',value:3},
-					{name: '已下线',value:4}
+					{name: '展示过期',value:2},
+					{name: '未展示',value:3},
+					{name: '审核未通过',value:4},
+					{name: '已下线',value:5}
 				],
 				statusActions: [
 					{name:'全部',value:''},
@@ -265,11 +268,12 @@
 			newvalidFlagFilters(value) {
 				//新品展示状态
 				const map = {
-					0: '参与',
+					0: '待审核',
 					1: '已展示',
-					2: '未参与',
-					3: '审核未通过',
-					4: '已下线'
+					2: '展示过期',
+					3: '未展示',
+					4: '审核未通过',
+					5: '已下线'
 				}
 				return map[value]
 			}
@@ -763,6 +767,10 @@
 	.d-container {
 		width: 560rpx;
 		padding: 80rpx 30rpx;
+		.tui-popup-scroll{
+			width: 100%;
+			height: auto;
+		}
 		.d-title{
 			width: 100%;
 			height:80rpx;

pages/tabBar/home/index.vue

@@ -152,7 +152,7 @@
 				this.CommonService.GetHomeDataInfo({userId:this.userID,soure:2}).then(response =>{
 					let data = response.data
 					this.pageList = data.homePageFloor
-					this.hotListPageFloor =  data.PageFloor
+					this.hotListPageFloor =  data.pageFloorList
 					this.supplierObj = data.supplierImage
 					setTimeout(()=>{
 						this.isRequest = true

services/config.env.js

@@ -3,8 +3,8 @@ if(process.env.NODE_ENV === 'development'){
     // 开发环境
     // URL_CONFIG = 'http://192.168.2.67:18002'	 //智捷联调地址
     // URL_CONFIG = 'http://192.168.2.68:18002'	 //涛涛联调地址
-    URL_CONFIG = 'http://192.168.2.75:18002'	 //超超联调地址
-    // URL_CONFIG = 'https://core-b.caimei365.com'
+    // URL_CONFIG = 'http://192.168.2.75:18002'	 //超超联调地址
+    URL_CONFIG = 'https://core-b.caimei365.com'
     // URL_CONFIG = 'https://core.caimei365.com'
 }else{
     // 生产环境