commit -m 供应商商品

common/config/config.js

@@ -2,9 +2,9 @@ let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
 	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
-	URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
+	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-	// URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+	URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境

pages.json

@@ -162,7 +162,7 @@
 				"navigationBarTitleText": "隐私权政策"
 			}
 		},{
-			"path": "pages/service/sellconten",
+			"path": "pages/service/sellConten",
 			"style": {
 				"navigationBarTitleText": "条款内容"
 			}

pages/login/register-select.vue

@@ -15,7 +15,7 @@
 					<view class="icon">
 						<image src="http://static-b.caimei365.com/app/img/icon/icon-supplier.png" mode=""></image>
 					</view>
-					<view class="text my">供应商(买家)</view>
+					<view class="text my">供应商(卖家)</view>
 					<view class="text-small">仪器/产品/服务供应商</view>
 				</view>
 			</view>

pages/login/register-supplier.vue

@@ -106,23 +106,23 @@
 			<view class="register-row clearfix">
 				<view class="register-from"  @click="showMulLinkageThreePicker">
 					<view class="label">联系地址:</view>
-					<text class="row-input" :class="addressData.address === '请选择公司所在地区' ? 'none' : ''">
-						{{addressData.address }}
+					<text class="row-input" :class="addressText === '请选择公司所在地区' ? 'none' : ''">
+						{{ addressText }}
 					</text>		
 					<text class="iconfont icon-xiayibu"></text>
 				</view>
 			</view>
 			<view class="register-row text-textarea clearfix">
-				<view class="textarea show" v-if="isShowInput" @click="showTextareaFocus">{{addressData.addressDetail ? addressData.addressDetail :'详细地址：如道路、门牌号、小区等'}}</view>
+				<view class="textarea show" v-if="isShowInput" @click="showTextareaFocus">{{threeParmas.address ? threeParmas.address :'详细地址：如道路、门牌号、小区等'}}</view>
 				<textarea 	v-else
 							class="textarea" 
 							type="text" 
-							v-model="addressData.addressDetail" 
+							v-model="threeParmas.address" 
 							placeholder="详细地址：如道路、门牌号、小区等" 
 							placeholder-class="placeholder"
 							maxlength="25"
 							@input="onTextareaInput"
-							@focus="textareaFocus"
+							:focus="textareaFocus"
 							@blur="hideTextareaFocus"
 							:class="isShowInput ? '':''"
 				/>
@@ -130,7 +130,7 @@
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">营业执照编号:</view>
-					<input class="row-input" type="text" v-model="socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="20"/>
+					<input class="row-input" type="text" v-model="threeParmas.socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="20"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
@@ -261,7 +261,7 @@
 				isCheck:false,			//是否勾选协议
 				userID:'',		//机构userID
 				clubID:'',		//机构ID
-				stepIndex:2,
+				stepIndex:0,
 				firstParmas:{
 					bindMobile:'',
 					mobileCode:'',
@@ -276,6 +276,10 @@
 					whichStep:2
 				},
 				threeParmas:{
+				    provinceID :'',
+					cityID : '',
+					townID : '',
+					address:'',
 					sname:'',	 	//机构简称
 					socialCreditCode:'',	//统一社会信用代码
 					businessLicenseImage:'',	//营业执照图片
@@ -283,16 +287,17 @@
 					cityID : '',
 					townID : '',
 					address:'',
-					firstShopType:'',
+					firstShopType:0,
 					secondShopType: '',
 					mainpro:'',
 					isAgreed:0,
+					whichStep:3
 				},
+				addressText:'请选择公司所在地区',
 				isDisabled:true,
 				isShowInput:true,
 				textareaFocus:false,
-				isOrganizationType:0,
-				organizationTypeText:'请选择机构类型',
+				organizationTypeText:'请选择公司类型',
 				supplierList:supplierList,//医疗类型
 				supplierMedicaCampList:supplierMedicaCampNullList,//主营内容
 				mentuzCampList:[],		//医美主营
@@ -302,13 +307,6 @@
 				isShowAustomItem:false, //是否显示其他添加
 				customItemValue:'', 	//自定义项目
 				isMainproCheck:false,
-				addressData:{
-					address:'请选择机构所在地区',
-					townID:'',			//区ID
-					cityID:'',			//市ID
-					provinceID:'',		//省ID
-					addressDetail: '',	//地址详情
-				},
 				isSupplierAlert:true
 			}
 		},
@@ -386,7 +384,7 @@
 					itemList: ['医疗', '非医疗'],
 					success: (e) => {
 						self.threeParmas.firstShopType = e.tapIndex+1
-						console.log(self.isOrganizationType)
+						console.log(self.threeParmas.firstShopType)
 						switch(e.tapIndex){
 							case 0:
 								this.organizationTypeText = '医疗'
@@ -460,7 +458,44 @@
 				})	
 			},
 			SupplierRegisteredThree(){
-				
+				if( this.threeParmas.townID == ''){
+					this.$util.msg('请选择公司地址',2000);
+					return
+				}
+				if( this.threeParmas.address == ''){
+					this.$util.msg('请填写公司详细地址',2000);
+					return
+				}
+				if( this.threeParmas.socialCreditCode == ''){
+					this.$util.msg('请填写统一社会信用代码',2000);
+					return
+				}
+				if( !this.threeParmas.businessLicenseImage){
+					this.$util.msg('请上传您的营业执照',2000);
+					return
+				}
+				if(this.threeParmas.firstShopType == 0){
+					this.$util.msg('请选择公司类型',2000);
+					return
+				}
+				if(this.threeParmas.mainpro == ''){
+					this.$util.msg('请选择主营内容',2000);
+					return
+				}
+				if(this.threeParmas.isAgreed == 0){
+					this.$util.msg('请勾选同意协议',2000);
+					return
+				}
+				let postParmas =  Object.assign(this.firstParmas,this.twoParmas,this.threeParmas);
+				this.UserService.appSupplierRegister(postParmas).then(response =>{
+					this.$util.modal('','您的资料已提交成功，系统将在1-2个工作日内进行审核~','知道了','',false,() =>{
+						uni.navigateBack({
+							delta: 1
+						});
+					})
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000);
+				})
 			},
 			chooseBusinessImage() {//营业执照图片上传
 				uploadFileImage().then(res =>{
@@ -518,6 +553,20 @@
 				this.isShowInput = false
 				this.textareaFocus = true
 			},
+			hideTextareaFocus(){//文本框失去焦点
+				this.isShowInput = true
+				this.textareaFocus = false
+			},
+			onConfirm(e) {
+				this.addressText = e.name;
+				this.threeParmas.townID = e.townCode;
+				this.threeParmas.cityID = e.cityCode;
+				this.threeParmas.provinceID = e.provinceCode;
+				console.log(this.threeParmas)
+			},	
+			onTextareaInput(e){
+			   this.threeParmas.address = e.detail.value;
+			},
 			onBlurInput(e){//
 				if(e.detail.value ===''){
 					this.isDisabled = true

pages/service/supplieragree.vue

@@ -23,7 +23,7 @@
 		methods:{
 			initData(){
 				let self = this;
-				this.OtherService.QueryClubProtocol({helpPageID:1036}).then(response =>{
+				this.OtherService.QueryClubProtocol({helpPageID:1035}).then(response =>{
 					let data =response.data.content
 					self.$refs.childTemplate.html = self.$api.adaptRichTextImg(data);
 				}).catch(error =>{

services/ajax.env.js

@@ -2,9 +2,9 @@ let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
 	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
-	URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
+	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境

services/shop.service.js

@@ -98,5 +98,16 @@ export default class ShopService {
 	modifiedData (data = {}) {
 		return this.AjaxService.post({ url:'/supplier/modifiedData', data, isLoading: true })
 	}
-	
+	/* 一级分类 */
+	GetPrimaryClassification (data = {}) {
+		return this.AjaxService.get({ url:'/supplier/primaryClassification', data, isLoading: false })
+	}
+	/* 二级级分类 */
+	GetPrimarySecondaryClassification (data = {}) {
+		return this.AjaxService.get({ url:'/supplier/secondaryClassification', data, isLoading: false })
+	}
+	/* 三级分类 */
+	GetPrimaryThreeLevelClassification (data = {}) {
+		return this.AjaxService.get({ url:'/supplier/threeLevelClassification', data, isLoading: false })
+	}
 }

services/user.service.js

@@ -6,6 +6,10 @@ export default class UserService {
 		Object.assign(this, { AjaxService })
 		this.name = 'UserService'
 	}
+	/* 供应商注册 */ 
+	appSupplierRegister (data = {}) {
+		return this.AjaxService.post({ url:'/supplier/register', data, isLoading: true })
+	}
 	/* 初始化查询用户是否为正常用户 */ 
 	appSelectLoginUser (data = {}) {
 		return this.AjaxService.post({ url:'', data, isLoading: true })

supplier/pages/deliver/deliver-goods.vue

@@ -139,7 +139,7 @@
 				})
 				this.isCheckAll = goodsCheckedLength === productsList.length;
 			},
-			updateBothCheckBtn() {
+			updateBothCheckBtn() {//
 				this.productsList.forEach((item)=>{
 					item.checked = this.isCheckAll ;
 				})

supplier/pages/user/my-product.vue

@@ -7,7 +7,7 @@
 			</view>
 			<view class="superv-header-checked" v-else>
 				<view class="oltext">
-					<view class="checkbox iconfont" :class="[isChecked ?'icon-yixuanze':'icon-weixuanze']" @click="isCheckedAll"></view>
+					<view class="checkbox iconfont" :class="[isAllChecked ?'icon-yixuanze':'icon-weixuanze']" @click="isCheckedAll"></view>
 					<view class="text">全选</view>
 				</view>
 				<view class="ortext" @click="closeSupervFn">完成</view>
@@ -23,11 +23,11 @@
 				<!-- 列表 -->
 				<checkbox-group @change="buyChange" class="tui-group">
 					<view class="tui-cart-cell  tui-mtop" v-for="(item,index) in dataList" :key="index">
-						<tui-swipe-actions :actions="actions" @click="handlerButton($event,item)" :params="item">
+						<tui-swipe-actions :actions="item.actions" @click="handlerButton($event,item)" :params="item">
 							<template v-slot:content>
 								<view class="tui-goods-item">
-									<view class="tui-goods-checkBox" v-if="isSuperv">
-										<view class="checkbox iconfont" :class="[isChecked ?'icon-yixuanze':'icon-weixuanze']" @click="isCheckedAll"></view>
+									<view class="tui-goods-checkBox" v-if="isSuperv" @click="">
+										<view class="checkbox iconfont" :class="[item.isChecked ?'icon-yixuanze':'icon-weixuanze']" @click="checkedSoperv(item)"></view>
 									</view>
 									<view class="tui-goods-image">
 										<image :src="item.mainImage" class="tui-goods-img"/>
@@ -60,44 +60,44 @@
 		<!--右抽屉-->
 		<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-label">商品名称:</view>
 				<view class="d-input">
-					<input class="input" type="text" value="" v-model="listQuery.keyword" placeholder="输入商品名称"/>
+					<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.productSn" placeholder="输入商品货号"/>
+					<input class="input" type="text" value="" v-model="listQuery.productCode" placeholder="输入商品货号"/>
 				</view>
 				<view class="d-label">状态:</view>
 				<view class="d-input">
-					<picker @change="bindPickerChange(3,$event)" :value="index" :range="Array2" range-key="name">
-						<input class="input" type="text" disabled="false" v-model="listQuery.publishStatus" value="" placeholder="请选择审核状态"/>
+					<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="brandOptions" range-key="name">
-						<input class="input" type="text" disabled="false" v-model="listQuery.brandId" value="" placeholder="请选择商品品牌"/>
+					<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(1,$event)" :value="index" :range="Array" range-key="name">
-						<input class="input" type="text" disabled="false" v-model="listQuery.productCategoryId" value="" placeholder="请选择分类"/>
+					<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(1,$event)" :value="index" :range="Array" range-key="name">
-						<input class="input" type="text" disabled="false" v-model="listQuery.productCategoryId" value="" placeholder="请选择二级分类"/>
+					<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(1,$event)" :value="index" :range="Array" range-key="name">
-						<input class="input" type="text" disabled="false" v-model="listQuery.productCategoryId" value="" placeholder="请选择三级分类"/>
+					<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>
@@ -112,7 +112,7 @@
 			<view class="tui-popup-box clearfix">
 				<view class="tui-right-flex tui-popup-btn" :style="{ paddingBottom :isIphoneX ? '68rpx' : '0rpx' }">
 					<view class="tui-flex-1">
-						<view class="tui-button" :class="isChecked ? 'active' : ''" @click="closeSupervFn()">批量下架</view>
+						<view class="tui-button" :class="isProductChecked ? 'active' : ''" @click="closeSupervFn()">批量下架</view>
 					</view>
 				</view>
 			</view>	
@@ -144,24 +144,26 @@
 		data() {
 			return{	
 				isSuperv:false,
-				isChecked:false,
-				mapStateArr:[
-					{label:'isQuery',val:[4,5,12,13,33,22,23,32,77],status: true},
-					{label:'isDelete',val:[6],status: true},
-					{label:'isCancel',val:[0,111],status: true},
-					{label:'isConfirm',val:[33],status: true},
-					{label:'isConfirmation',val:[0],status: true},
-					{label:'isPay',val:[11,12,13,21,22,23,111],status: true},
-				],
-				actions: [
-					{name: '查看详情',color: '#fff',fontsize: 26,width: 50,background: '#f9a94b'},
-					{name: '添加主页推荐',color: '#fff',fontsize: 26,width: 50,background: '#ff7a51'},
-					{name: '下架',color: '#fff',fontsize: 26,width: 50,background: '#fea785'},
-					{name: '无操作',color: '#fff',fontsize: 26,width: 50,background: '#e1e1e1'},
+				isProductChecked:false,
+				validFlagText:'',
+				featuredFlagText:'',
+				firstClassificationText:'',
+				twoClassificationText:'',
+				threeClassificationText:'',
+				recommendActions: [{name:'是',value:1},{name: '否',value:0}],
+				statusActions: [
+					{name:'全部',value:''},
+					{name: '未审核',value:1},
+					{name: '审核未通过',value:8},
+					{name: '已上架',value:2},
+					{name: '已下架',value:3},
+					{name: '已冻结',value:9},
+					{name: '已隐身',value:10},
+					{name: '已删除',value:0},
 				],
-				Array: [{name:'男装'},{name: '女装'},{name: '男鞋'},{name: '女鞋'},{name: '童鞋'}],
-				brandOptions: [],
-				Array2: [{name:'审核通过'},{name: '未审核'}],
+				classificationFirstList:[],
+				classificationTwoList:[],
+				classificationThreeList:[],
 				currents:0,
 				userID:0,
 				listQuery:Object.assign({}, defaultListQuery),
@@ -172,6 +174,7 @@
 				skeletonShow: true,
 				isEmpty: false,
 				isDelete:false,
+				isAllChecked:false,
 				isModalLayer: false,
 				loadding: false,
 				pullUpOn: true,
@@ -228,12 +231,13 @@
 					console.log(data.results)
 					if(data.results && data.results.length > 0){
 						this.isEmpty = false;
-						this.dataList = [...data.results];
+						this.dataList = data.results;
+						this.handleDataList()
 						if(this.hasNextPage){
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
 						}else{
-							if(this.dataList.length < 2){
+							if(this.dataList.length < 5){
 								this.pullUpOn = true
 							}else{
 								this.pullUpOn = false
@@ -249,10 +253,11 @@
 			}, 
 			GetOnReachBottomData(index){//上拉加载
 				this.listQuery.pageNum += 1
-				this.ProductService.GetSupplierPyProduct(this.listQuery).then(response =>{
+				this.ShopService.GetSupplierPyProduct(this.listQuery).then(response =>{
 					let data = response.data.productPage
 					this.hasNextPage = data.hasNextPage;
 					this.dataList = this.dataList.concat(data.results)
+					this.handleDataList()
 					this.pullFlag = false;// 防上拉暴滑
 					setTimeout(()=>{this.pullFlag = true;},500)
 					if(this.hasNextPage){
@@ -265,13 +270,95 @@
 					}
 				})	
 			},	
+			handleDataList(){//根据商品状态set不同的tabAction返回新的数据
+				const mapStateArr = [
+						{
+							val:['0','3','8','10'],
+							actions:[
+								{name: '无操作',color: '#fff',fontsize: 26,width: 50,background: '#e1e1e1'}
+							]
+						},
+						{
+							val:['1','9'],
+							actions:[
+								{name: '查看详情',color: '#fff',fontsize: 26,width: 50,background: '#f9a94b'}
+							]
+						},
+						{
+							val:['2'],
+							actions:[
+								{name: '查看详情',color: '#fff',fontsize: 26,width: 50,background: '#f9a94b'},
+								{name: '删除主页推荐',color: '#fff',fontsize: 26,width: 50,background: '#ff7a51'},
+								{name: '下架',color: '#fff',fontsize: 26,width: 50,background: '#fea785'}
+							]	
+						}
+					]
+				this.dataList.forEach(item =>{
+					switch(item.validFlag){
+						case '0':
+							item.actions = [
+								{name: '无操作',color: '#fff',fontsize: 26,width: 50,background: '#e1e1e1'},
+							]
+							break;
+						case '1':
+							item.actions = [
+								{name: '查看详情',color: '#fff',fontsize: 26,width: 50,background: '#f9a94b'},
+							]
+							break;
+						case '2':
+							if(item.featuredFlag == 1){
+								item.actions = [
+									{name: '查看详情',color: '#fff',fontsize: 26,width: 50,background: '#f9a94b'},
+									{name: '删除主页推荐',color: '#fff',fontsize: 26,width: 50,background: '#ff7a51'},
+									{name: '下架',color: '#fff',fontsize: 26,width: 50,background: '#fea785'},
+								]
+							}else{
+								item.actions = [
+									{name: '查看详情',color: '#fff',fontsize: 26,width: 50,background: '#f9a94b'},
+									{name: '添加主页推荐',color: '#fff',fontsize: 26,width: 50,background: '#ff7a51'},
+									{name: '下架',color: '#fff',fontsize: 26,width: 50,background: '#fea785'},
+								]
+							}
+							break;
+						case '3':
+							item.actions = [
+								{name: '无操作',color: '#fff',fontsize: 26,width: 50,background: '#e1e1e1'},
+							]
+							break;
+						case '8':
+							item.actions = [
+								{name: '无操作',color: '#fff',fontsize: 26,width: 50,background: '#e1e1e1'},
+							]
+							break;
+						case '9':
+							item.actions = [
+								{name: '查看详情',color: '#fff',fontsize: 26,width: 50,background: '#f9a94b'},
+							]
+							break;
+						case '10':
+							item.actions = [
+								{name: '无操作',color: '#fff',fontsize: 26,width: 50,background: '#e1e1e1'},
+							]
+							break;
+					}
+				})
+				console.log(this.dataList)
+			},
 			handSearchList(){//搜索
 				this.GetProductListInfo()
 				this.leftDrawer = false;
 				this.rightDrawer = false;
 			},	
 			handSearchClear(){//重置搜索条件
-					
+				this.listQuery = Object.assign({}, defaultListQuery)
+				this.validFlagText='';
+				this.featuredFlagText='';
+				this.firstClassificationText='';
+				this.twoClassificationText='';
+				this.threeClassificationText='';
+				this.classificationTwoList = [];
+				this.classificationThreeList = [];
+				console.log(this.listQuery)
 			},
 			handlerButton(e,item){//监听侧滑按钮点击事件
 				switch(this.currents){
@@ -355,7 +442,7 @@
 						this.getOrderListCount()
 					},2000)
 				}).catch(error =>{
-					this.$util.msg(error.message,2000)
+					this.$util.msg(error.msg,2000)
 				})
 			},
 			UpdateDeleteStatus(){//商品删除处理接口
@@ -366,36 +453,9 @@
 						this.getOrderListCount()
 					},2000)
 				}).catch(error =>{
-					this.$util.msg(error.message,2000)
+					this.$util.msg(error.msg,2000)
 				})
 			},
-			hideMobel(){
-				this.modal = false;
-			},
-			isCheckedAll(){
-				this.isCheckedAll = true
-			},
-			addProductFn(){
-				this.$util.msg('功能开发中,敬请期待^_^',2000);
-			},
-			supervClickFn(){//管理全选
-				this.isSuperv = true
-			},
-			closeSupervFn(){
-				this.isSuperv = false
-			},
-			searchClickFn() {//弹出抽屉
-				this.rightDrawer = true;
-			},
-			closeDrawer(e) {//关闭抽屉
-				this.leftDrawer = false;
-				this.rightDrawer = false;
-			},
-			orderPriceToFixed (n){
-				let price ='';
-				price = Number(n).toFixed(2);
-				return price
-			},
 			tabClick(index){
 				this.currents = index
 				switch(index){
@@ -432,23 +492,127 @@
 				this.listQuery.date = e.detail.value
 			},
 			bindPickerChange: function(type,e) {//选择筛选条件
-				console.log(type)
-				console.log(e)
 				switch(type){
 					case 1:
-						this.listQuery.classification = this.Array[e.target.value].name
-						console.log(this.listQuery.classification)
+						this.validFlagText = this.statusActions[e.target.value].name
+						this.listQuery.validFlag = this.statusActions[e.target.value].value
 						break;
 					case 2:
-						this.listQuery.source = this.brandOptions[e.target.value].name
-						console.log(this.listQuery.source)
+						this.featuredFlagText = this.recommendActions[e.target.value].name
+						this.listQuery.featuredFlag = this.recommendActions[e.target.value].value
+						break;
+					case 3:					
+						this.firstClassificationText = this.classificationFirstList[e.target.value].name
+						this.listQuery.bigTypeID = this.classificationFirstList[e.target.value].value
+						this.GetPrimarySecondaryClassification(this.listQuery.bigTypeID)
+						this.twoClassificationText = ''
+						this.threeClassificationText=''
+						break;
+					case 4:
+						if(this.listQuery.bigTypeID == 0){
+							this.$util.msg('请先选择一级分类',2000)
+							return
+						}
+						this.twoClassificationText = this.classificationTwoList[e.target.value].name
+						this.listQuery.smallTypeID = this.classificationTwoList[e.target.value].value
+						this.GetPrimaryThreeLevelClassification(this.listQuery.smallTypeID)
 						break;
-					case 3:
-						this.listQuery.classification = this.Array2[e.target.value].name
-						console.log(this.listQuery.classification)
+					case 5:
+						if(this.listQuery.smallTypeID == 0){
+							this.$util.msg('请先选择二级分类',2000)
+							return
+						}
+						this.threeClassificationText = this.classificationThreeList[e.target.value].name
+						this.listQuery.tinyTypeID = this.classificationThreeList[e.target.value].value
 						break;
 				}
 			},
+			GetPrimaryClassification(){//获取筛选条件一级分类
+				this.ShopService.GetPrimaryClassification().then(response =>{
+					const data = response.data
+					data.forEach(item =>{
+						let _obj = {name:item.name,value:item.bigTypeID} 
+						this.classificationFirstList.push(_obj)
+					})
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
+			},
+			GetPrimarySecondaryClassification(value){//获取筛选条件二级分类
+				this.classificationTwoList = []
+				this.ShopService.GetPrimarySecondaryClassification({bigTypeId:value}).then(response =>{
+					const data = response.data
+					data.forEach(item =>{
+						let _obj = {name:item.name,value:item.smallTypeID} 
+						this.classificationTwoList.push(_obj)
+					})
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
+			},
+			GetPrimaryThreeLevelClassification(value){//获取筛选条件三级分类
+				this.classificationThreeList = []
+				this.ShopService.GetPrimaryThreeLevelClassification({smallTypeId:value}).then(response =>{
+					const data = response.data
+					data.forEach(item =>{
+						let _obj = {name:item.name,value:item.tinyTypeID} 
+						this.classificationThreeList.push(_obj)
+					})
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
+			},
+			hideMobel(){
+				this.modal = false;
+			},
+			updateCheckAllBtn() {//勾选单个判断全选
+				let goodsCheckedLength = 0
+				this.dataList.forEach(item => {
+					if(item.isChecked) { goodsCheckedLength++; }
+				})
+				this.isAllChecked = goodsCheckedLength === this.dataList.length;
+				if(goodsCheckedLength>0){
+					this.isProductChecked = true
+				}else{
+					this.isProductChecked = false
+				}
+			},
+			updateBothCheckBtn() {//全选勾选判断
+				this.dataList.forEach((item)=>{
+					item.isChecked = this.isAllChecked				
+				})
+			},
+			isCheckedAll(){//全选
+				this.isAllChecked = !this.isAllChecked
+				if(this.isAllChecked){
+					this.isProductChecked = true
+				}else{
+					this.isProductChecked = false
+				}
+				this.updateBothCheckBtn()
+			},
+			checkedSoperv(item){//选择
+				item.isChecked = !item.isChecked
+				this.updateCheckAllBtn()
+			},
+			supervClickFn(){//管理全选
+				this.isSuperv = true
+			},
+			closeSupervFn(){
+				this.isSuperv = false
+			},
+			searchClickFn() {//弹出抽屉
+				this.rightDrawer = true;
+			},
+			closeDrawer(e) {//关闭抽屉
+				this.leftDrawer = false;
+				this.rightDrawer = false;
+			},
+			orderPriceToFixed (n){
+				let price ='';
+				price = Number(n).toFixed(2);
+				return price
+			},
 			verifyColorFilter: function(state){
 				let stateColor = '',
 					stateColorObject={
@@ -491,6 +655,7 @@
 			this.$api.getComStorage('userInfo').then((resolve) =>{
 				this.listQuery.shopID = resolve.shopID
 				this.GetProductListInfo()
+				this.GetPrimaryClassification()
 			})
 		}	
 	}
@@ -533,6 +698,7 @@
 				float: left;
 				color: #666666;
 				display: flex;
+				margin-left: 10rpx;
 				.checkbox{
 					display: flex;
 					margin: 0;
@@ -822,6 +988,7 @@
 		padding: 30rpx 20rpx;
 		box-sizing: border-box;
 		border-bottom: 1px solid #EBEBEB;
+		position: relative;
 	}
 	.tui-goods-checkBox{
 		display: flex;
@@ -862,7 +1029,7 @@
 		}
 	}
 	.tui-goods-info {
-		width: 420rpx;
+		width: 360rpx;
 		padding-left: 20rpx;
 		display: flex;
 		flex-direction: column;
@@ -874,7 +1041,8 @@
 	}
 	.tui-goods-status{
 		width: 160rpx;
-		float: right;
+		position: absolute;
+		right: 0;
 		.status-text{
 			font-size: $font-size-24;
 			line-height: 44rpx;