From 3bdf7cff7115fdb3e2444a928697f796c3aa7c3f Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Wed, 15 Mar 2023 18:24:43 +0800
Subject: [PATCH] 2023-3-15

---
 .../community/components/CommunityDetail.vue  | 152 +++--
 .../src/views/build/community/index.vue       |   2 +-
 .../components/ProductCateDetail.vue          | 520 +++++++++---------
 .../src/views/pms/productCate/index.vue       |  18 +-
 4 files changed, 378 insertions(+), 314 deletions(-)

diff --git a/mallplusui-web-admin/src/views/build/community/components/CommunityDetail.vue b/mallplusui-web-admin/src/views/build/community/components/CommunityDetail.vue
index 1aa819f..bf1096c 100644
--- a/mallplusui-web-admin/src/views/build/community/components/CommunityDetail.vue
+++ b/mallplusui-web-admin/src/views/build/community/components/CommunityDetail.vue
@@ -2,15 +2,15 @@
 	<el-card class="form-container" shadow="never">
 		<el-form :model="community" :rules="rules" ref="communityFrom" label-width="130px">
 
-			<el-form-item label="社区名称：" >
+			<el-form-item label="社区名称：">
 
 				<span>{{name}}</span>
 			</el-form-item>
 			<el-form-item label="取货点名称：" prop="name">
 				<el-input v-model="community.name"></el-input>
 			</el-form-item>
-			<el-form-item label="取货点电话：" prop="counts">
-				<el-input v-model="community.counts"></el-input>
+			<el-form-item label="取货点电话：" prop="phone">
+				<el-input v-model="community.phone" maxlength="11"></el-input>
 			</el-form-item>
 			<el-form-item label="取货点地址：" prop="details">
 				<el-input v-model="community.details"></el-input>
@@ -61,12 +61,12 @@
 	</el-card>
 </template>
 <script>
-	import BaiduMap from 'vue-baidu-map/components/map/Map.vue'
-	import BmLocalSearch from 'vue-baidu-map/components/search/LocalSearch';
-	import BmCityList from 'vue-baidu-map/components/controls/CityList';
-	import BmCopyright from 'vue-baidu-map/components/controls/Copyright';
-	import BmView from 'vue-baidu-map/components/map/MapView';
-	import BmMarker from 'vue-baidu-map/components/overlays/Marker'
+	// import BaiduMap from 'vue-baidu-map/components/map/Map.vue'
+	// import BmLocalSearch from 'vue-baidu-map/components/search/LocalSearch';
+	// import BmCityList from 'vue-baidu-map/components/controls/CityList';
+	// import BmCopyright from 'vue-baidu-map/components/controls/Copyright';
+	// import BmView from 'vue-baidu-map/components/map/MapView';
+	// import BmMarker from 'vue-baidu-map/components/overlays/Marker'
 	import {
 		createCommunity,
 		getCommunity,
@@ -81,15 +81,15 @@
 	};
 	export default {
 		name: 'CommunityDetail',
-		components: {
-			SingleUpload,
-			BaiduMap,
-			BmLocalSearch,
-			BmCityList,
-			BmView,
-			BmCopyright,
-			BmMarker
-		},
+		// components: {
+		// 	SingleUpload,
+		// 	BaiduMap,
+		// 	BmLocalSearch,
+		// 	BmCityList,
+		// 	BmView,
+		// 	BmCopyright,
+		// 	BmMarker
+		// },
 		props: {
 			isEdit: {
 				type: Boolean,
@@ -97,6 +97,21 @@
 			}
 		},
 		data() {
+			var checkSubmit = (rule, value, callback) => {
+			  const Submit =
+			    /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
+			  if (value) {
+			    if (!Submit.test(value)) {
+			      callback(new Error('手机号格式不正确'))
+			    }
+			    callback()
+			  }
+			  callback()
+			  // if (Submit.test(value)) {
+			  //   return callback()
+			  // }
+			  // callback(new Error('请输入手机号'))
+			}
 			return {
 				name: "",
 				community: Object.assign({}, defaultCommunity),
@@ -112,15 +127,20 @@
 							message: '长度在 2 到 140 个字符',
 							trigger: 'blur'
 						}
-					]
+					],
+					phone: [{
+						required: true,
+						validator: checkSubmit,
+						trigger: 'blur'
+					}]
 				},
-				location: '北京',
-				keyword: '百度',
-				center: {
-					lng: 116.404,
-					lat: 39.915
-				},
-				zoom: 15
+				// location: '北京',
+				// keyword: '百度',
+				// center: {
+				// 	lng: 116.404,
+				// 	lat: 39.915
+				// },
+				// zoom: 15
 			}
 		},
 		mounted() {
@@ -129,21 +149,21 @@
 			// window.addEventListener('mousewheel',this.handleScroll,false)
 		},
 		created() {
-			console.log("query>>>",this.$route.query)
+			console.log("query>>>", this.$route.query)
 			this.name = this.$route.query.cname
 
 			if (this.isEdit) {
 				getCommunity(this.$route.query.id).then(response => {
 					this.community = response.data;
-					if (this.community.latitude) {
-						this.center.lat = this.community.latitude;
-					}
-					if (this.community.longitude) {
-						this.center.lng = this.community.longitude;
-					}
-					if (this.community.city) {
-						this.location = this.community.city;
-					}
+					// if (this.community.latitude) {
+					// 	this.center.lat = this.community.latitude;
+					// }
+					// if (this.community.longitude) {
+					// 	this.center.lng = this.community.longitude;
+					// }
+					// if (this.community.city) {
+					// 	this.location = this.community.city;
+					// }
 				});
 			} else {
 				this.community = Object.assign({}, defaultCommunity);
@@ -151,24 +171,42 @@
 		},
 
 		methods: {
-			changeAfters(e) {
-				console.log('123')
-				console.log(e)
-			},
-			handleScroll(e) {
-				//修复body高度为100%，百度地图鼠标滚轮滚动产生位移问题，以及全景鼠标hover后未显示全景信息问题
-				document.body.scrollTop = 0
-				document.documentElement.scrollTop = 0
-			},
-			syncCenterAndZoom(e) {
+			// changeAfters(e) {
+			// 	console.log('123')
+			// 	console.log(e)
+			// },
+			// handleScroll(e) {
+			// 	//修复body高度为100%，百度地图鼠标滚轮滚动产生位移问题，以及全景鼠标hover后未显示全景信息问题
+			// 	document.body.scrollTop = 0
+			// 	document.documentElement.scrollTop = 0
+			// },
+			// syncCenterAndZoom(e) {
 
-				const {
-					lng,
-					lat
-				} = e.target.getCenter()
-				this.center.lng = lng
-				this.center.lat = lat
-				this.zoom = e.target.getZoom()
+			// 	const {
+			// 		lng,
+			// 		lat
+			// 	} = e.target.getCenter()
+			// 	this.center.lng = lng
+			// 	this.center.lat = lat
+			// 	this.zoom = e.target.getZoom()
+			// },
+			UpNumber(val, limit = 2) {
+				val = val.replace(/[^\d]/g, '') // 保留数字
+				val = val.replace(/^00/, '0.') // 开头不能有两个0
+				val = val.replace(/^\./g, '0.') // 开头为小数点转换为0.
+				val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
+				val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); // 只保留一个小数点
+				/^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0
+				const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
+				const reg = new RegExp(str)
+				if (limit === 0) {
+					// 不需要小数点
+					val = val.replace(reg, '$1')
+				} else {
+					// 通过正则保留小数点后指定的位数
+					val = val.replace(reg, '$1.$2')
+				}
+				return val
 			},
 			onSubmit(formName) {
 				this.$refs[formName].validate((valid) => {
@@ -179,8 +217,8 @@
 							type: 'warning'
 						}).then(() => {
 							this.community.companyId = this.$route.query.cid
-							this.community.latitude = this.center.lat;
-							this.community.longitude = this.center.lng;
+							// this.community.latitude = this.center.lat;
+							// this.community.longitude = this.center.lng;
 							if (this.isEdit) {
 								updateCommunity(this.$route.query.id, this.community).then(response => {
 									if (response.code == 200) {
@@ -190,7 +228,7 @@
 											type: 'success',
 											duration: 1000
 										});
-										this.$router.back();
+										this.$router.go(-1);
 									} else {
 										this.$message({
 											message: response.msg,
@@ -210,7 +248,7 @@
 											type: 'success',
 											duration: 1000
 										});
-										this.$router.back();
+										this.$router.go(-1);
 									} else {
 										this.$message({
 											message: response.msg,
diff --git a/mallplusui-web-admin/src/views/build/community/index.vue b/mallplusui-web-admin/src/views/build/community/index.vue
index 455b980..be23960 100644
--- a/mallplusui-web-admin/src/views/build/community/index.vue
+++ b/mallplusui-web-admin/src/views/build/community/index.vue
@@ -55,7 +55,7 @@
 					<template slot-scope="scope">{{scope.row.phone}}</template>
 				</el-table-column>
 				<el-table-column label="取货点地址" align="center">
-					<template slot-scope="scope">{{scope.row.address}}</template>
+					<template slot-scope="scope">{{scope.row.details}}</template>
 				</el-table-column>
 
 				<el-table-column label="创建时间" width="200" align="center">
diff --git a/mallplusui-web-admin/src/views/pms/productCate/components/ProductCateDetail.vue b/mallplusui-web-admin/src/views/pms/productCate/components/ProductCateDetail.vue
index f322669..b056146 100644
--- a/mallplusui-web-admin/src/views/pms/productCate/components/ProductCateDetail.vue
+++ b/mallplusui-web-admin/src/views/pms/productCate/components/ProductCateDetail.vue
@@ -1,269 +1,287 @@
 <template>
-  <el-card class="form-container" shadow="never">
-    <el-form :model="productCate"
-             :rules="rules"
-             ref="productCateFrom"
-             label-width="150px">
-      <el-form-item label="分类名称：" prop="name">
-        <el-input v-model="productCate.name"></el-input>
-      </el-form-item>
-      <el-form-item label="上级分类：">
-        <el-select v-model="productCate.parentId"
-                   placeholder="请选择分类">
-          <el-option
-            v-for="item in selectProductCateList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="数量单位：">
-        <el-input v-model="productCate.productUnit"></el-input>
-      </el-form-item>
-      <el-form-item label="排序：">
-        <el-input v-model="productCate.sort"></el-input>
-      </el-form-item>
-     <!-- <el-form-item label="是否显示：">
-        <el-radio-group v-model="productCate.showStatus">
-          <el-radio :label="1">是</el-radio>
-          <el-radio :label="0">否</el-radio>
-        </el-radio-group>
-      </el-form-item> -->
-      <el-form-item label="是否显示在导航栏：">
+	<el-card class="form-container" shadow="never">
+		<el-form :model="productCate" :rules="rules" ref="productCateFrom" label-width="150px">
+			<el-form-item label="分类名称：" prop="name">
+				<el-input v-model="productCate.name"></el-input>
+			</el-form-item>
+			<el-form-item label="上级分类：">
+				<el-select v-model="productCate.parentId" placeholder="请选择分类">
+					<el-option v-for="item in selectProductCateList" :key="item.id" :label="item.name" :value="item.id">
+					</el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item label="数量单位：">
+				<el-input v-model="productCate.productUnit"></el-input>
+			</el-form-item>
+			<el-form-item label="排序：">
+				<el-input v-model="productCate.sort"></el-input>
+			</el-form-item>
+			<el-form-item label="是否显示：">
+				<el-radio-group v-model="productCate.showStatus">
+					<el-radio :label="1">是</el-radio>
+					<el-radio :label="0">否</el-radio>
+				</el-radio-group>
+			</el-form-item>
+			<!-- <el-form-item label="是否显示在导航栏：">
         <el-radio-group v-model="productCate.navStatus">
           <el-radio :label="1">是</el-radio>
           <el-radio :label="0">否</el-radio>
         </el-radio-group>
-      </el-form-item>
-     <!-- <el-form-item label="是否显示在首页：">
+      </el-form-item> -->
+			<!-- <el-form-item label="是否显示在首页：">
         <el-radio-group v-model="productCate.indexStatus">
           <el-radio :label="1">是</el-radio>
           <el-radio :label="0">否</el-radio>
         </el-radio-group>
       </el-form-item> -->
-      <el-form-item label="分类图标：">
-        <single-upload v-model="productCate.icon"></single-upload>
-      </el-form-item>
-      <el-form-item v-for="(filterProductAttr, index) in filterProductAttrList"
-                    :label="index | filterLabelFilter"
-                    :key="filterProductAttr.key"
-      >
-        <el-cascader
-          clearable
-          v-model="filterProductAttr.value"
-          :options="filterAttrs">
-        </el-cascader>
-        <el-button style="margin-left: 20px" @click.prevent="removeFilterAttr(filterProductAttr)">删除</el-button>
-      </el-form-item>
-      <el-form-item>
-        <el-button size="small" type="primary" @click="handleAddFilterAttr()">新增</el-button>
-      </el-form-item>
-      <el-form-item label="关键词：">
-        <el-input v-model="productCate.keywords"></el-input>
-      </el-form-item>
-      <el-form-item label="分类描述：">
-        <el-input type="textarea" :autosize="true" v-model="productCate.description"></el-input>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="onSubmit('productCateFrom')">提交</el-button>
-        <el-button v-if="!isEdit" @click="resetForm('productCateFrom')">重置</el-button>
-      </el-form-item>
-    </el-form>
-  </el-card>
+			<el-form-item label="分类图标：">
+				<single-upload v-model="productCate.icon"></single-upload>
+			</el-form-item>
+			<el-form-item v-for="(filterProductAttr, index) in filterProductAttrList" :label="index | filterLabelFilter"
+				:key="filterProductAttr.key">
+				<el-cascader clearable v-model="filterProductAttr.value" :options="filterAttrs">
+				</el-cascader>
+				<el-button style="margin-left: 20px" @click.prevent="removeFilterAttr(filterProductAttr)">删除</el-button>
+			</el-form-item>
+			<el-form-item>
+				<el-button size="small" type="primary" @click="handleAddFilterAttr()">新增</el-button>
+			</el-form-item>
+			<el-form-item label="关键词：">
+				<el-input v-model="productCate.keywords"></el-input>
+			</el-form-item>
+			<el-form-item label="分类描述：">
+				<el-input type="textarea" :autosize="true" v-model="productCate.description"></el-input>
+			</el-form-item>
+			<el-form-item>
+				<el-button type="primary" @click="onSubmit('productCateFrom')">提交</el-button>
+				<el-button v-if="!isEdit" @click="resetForm('productCateFrom')">重置</el-button>
+			</el-form-item>
+		</el-form>
+	</el-card>
 </template>
 
 <script>
-  import {fetchList, createProductCate, updateProductCate, getProductCate} from '@/api/productCate';
-  import {fetchListWithAttr} from '@/api/productAttrCate';
-  import {getProductAttrInfo} from '@/api/productAttr';
-  import SingleUpload from '@/components/Upload/singleUpload';
+	import {
+		fetchList,
+		createProductCate,
+		updateProductCate,
+		getProductCate
+	} from '@/api/productCate';
+	import {
+		fetchListWithAttr
+	} from '@/api/productAttrCate';
+	import {
+		getProductAttrInfo
+	} from '@/api/productAttr';
+	import SingleUpload from '@/components/Upload/singleUpload';
 
-  const defaultProductCate = {
-    description: '',
-    icon: '',
-    keywords: '',
-    name: '',
-    navStatus: 0,
-    parentId: 0,
-    productUnit: '',
-    showStatus: 1,
-    indexStatus:1,
-    sort: 0,
-    productAttributeIdList: []
-  };
-  export default {
-    name: "ProductCateDetail",
-    components: {SingleUpload},
-    props: {
-      isEdit: {
-        type: Boolean,
-        default: false
-      }
-    },
-    data() {
-      return {
-        productCate: Object.assign({}, defaultProductCate),
-        selectProductCateList: [],
-        rules: {
-          name: [
-            {required: true, message: '请输入品牌名称', trigger: 'blur'},
-            {min: 2, max: 140, message: '长度在 2 到 140 个字符', trigger: 'blur'}
-          ]
-        },
-        filterAttrs: [],
-        filterProductAttrList: [{
-          value: []
-        }]
-      }
-    },
-    created() {
-      if (this.isEdit) {
-        getProductCate(this.$route.query.id).then(response => {
-          this.productCate = response.data;
-        });
-        getProductAttrInfo(this.$route.query.id).then(response => {
-          if (response.data != null && response.data.length > 0) {
-            this.filterProductAttrList = [];
-            for (let i = 0; i < response.data.length; i++) {
-              this.filterProductAttrList.push({
-                key: Date.now() + i,
-                value: [response.data[i].attributeCategoryId, response.data[i].attributeId]
-              })
-            }
-          }
-        });
-      } else {
-        this.productCate = Object.assign({}, defaultProductCate);
-      }
-      this.getSelectProductCateList();
-      this.getProductAttrCateList();
-    },
-    methods: {
-      getSelectProductCateList() {
-        fetchList(0, {pageSize: 100, pageNum: 1}).then(response => {
-          this.selectProductCateList = response.data.records;
-          this.selectProductCateList.unshift({id: 0, name: '无上级分类'});
-        });
-      },
-      getProductAttrCateList() {
-        fetchListWithAttr().then(response => {
-          let list = response.data;
-          for (let i = 0; i < list.length; i++) {
-            let productAttrCate = list[i];
-            let children = [];
-            if (productAttrCate.productAttributeList != null && productAttrCate.productAttributeList.length > 0) {
-              for (let j = 0; j < productAttrCate.productAttributeList.length; j++) {
-                children.push({
-                  label: productAttrCate.productAttributeList[j].name,
-                  value: productAttrCate.productAttributeList[j].id
-                })
-              }
-            }
-            this.filterAttrs.push({label: productAttrCate.name, value: productAttrCate.id, children: children});
-          }
-        });
-      },
-      getProductAttributeIdList() {
-        //获取选中的筛选商品属性
-        let productAttributeIdList = [];
-        for (let i = 0; i < this.filterProductAttrList.length; i++) {
-          let item = this.filterProductAttrList[i];
-          if (item.value !== null && item.value.length === 2) {
-            productAttributeIdList.push(item.value[1]);
-          }
-        }
-        return productAttributeIdList;
-      },
-      onSubmit(formName) {
-        this.$refs[formName].validate((valid) => {
-          if (valid) {
-            this.$confirm('是否提交数据', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).then(() => {
-              if (this.isEdit) {
-                this.productCate.productAttributeIdList = this.getProductAttributeIdList();
-                updateProductCate(this.$route.query.id, this.productCate).then(response => {
-                  this.$message({
-                    message: '修改成功',
-                    type: 'success',
-                    duration: 1000
-                  });
-                  this.$router.back();
-                });
-              } else {
-                this.productCate.productAttributeIdList = this.getProductAttributeIdList();
-                createProductCate(this.productCate).then(response => {
-                  this.$refs[formName].resetFields();
-                  this.resetForm(formName);
-                  this.$message({
-                    message: '提交成功',
-                    type: 'success',
-                    duration: 1000
-                  });
-                });
-              }
-            });
+	const defaultProductCate = {
+		description: '',
+		icon: '',
+		keywords: '',
+		name: '',
+		navStatus: 1,
+		parentId: 0,
+		productUnit: '',
+		showStatus: 0,
+		indexStatus: 1,
+		sort: 0,
+		productAttributeIdList: []
+	};
+	export default {
+		name: "ProductCateDetail",
+		components: {
+			SingleUpload
+		},
+		props: {
+			isEdit: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				productCate: Object.assign({}, defaultProductCate),
+				selectProductCateList: [],
+				rules: {
+					name: [{
+							required: true,
+							message: '请输入品牌名称',
+							trigger: 'blur'
+						},
+						{
+							min: 2,
+							max: 140,
+							message: '长度在 2 到 140 个字符',
+							trigger: 'blur'
+						}
+					]
+				},
+				filterAttrs: [],
+				filterProductAttrList: [{
+					value: []
+				}]
+			}
+		},
+		created() {
+			if (this.isEdit) {
+				getProductCate(this.$route.query.id).then(response => {
+					this.productCate = response.data;
+				});
+				getProductAttrInfo(this.$route.query.id).then(response => {
+					if (response.data != null && response.data.length > 0) {
+						this.filterProductAttrList = [];
+						for (let i = 0; i < response.data.length; i++) {
+							this.filterProductAttrList.push({
+								key: Date.now() + i,
+								value: [response.data[i].attributeCategoryId, response.data[i].attributeId]
+							})
+						}
+					}
+				});
+			} else {
+				this.productCate = Object.assign({}, defaultProductCate);
+			}
+			this.getSelectProductCateList();
+			this.getProductAttrCateList();
+		},
+		methods: {
+			getSelectProductCateList() {
+				fetchList(0, {
+					pageSize: 100,
+					pageNum: 1
+				}).then(response => {
+					this.selectProductCateList = response.data.records;
+					this.selectProductCateList.unshift({
+						id: 0,
+						name: '无上级分类'
+					});
+				});
+			},
+			getProductAttrCateList() {
+				fetchListWithAttr().then(response => {
+					let list = response.data;
+					for (let i = 0; i < list.length; i++) {
+						let productAttrCate = list[i];
+						let children = [];
+						if (productAttrCate.productAttributeList != null && productAttrCate.productAttributeList
+							.length > 0) {
+							for (let j = 0; j < productAttrCate.productAttributeList.length; j++) {
+								children.push({
+									label: productAttrCate.productAttributeList[j].name,
+									value: productAttrCate.productAttributeList[j].id
+								})
+							}
+						}
+						this.filterAttrs.push({
+							label: productAttrCate.name,
+							value: productAttrCate.id,
+							children: children
+						});
+					}
+				});
+			},
+			getProductAttributeIdList() {
+				//获取选中的筛选商品属性
+				let productAttributeIdList = [];
+				for (let i = 0; i < this.filterProductAttrList.length; i++) {
+					let item = this.filterProductAttrList[i];
+					if (item.value !== null && item.value.length === 2) {
+						productAttributeIdList.push(item.value[1]);
+					}
+				}
+				return productAttributeIdList;
+			},
+			onSubmit(formName) {
+				this.$refs[formName].validate((valid) => {
+					if (valid) {
+						this.$confirm('是否提交数据', '提示', {
+							confirmButtonText: '确定',
+							cancelButtonText: '取消',
+							type: 'warning'
+						}).then(() => {
+							if (this.isEdit) {
+								this.productCate.productAttributeIdList = this.getProductAttributeIdList();
+								updateProductCate(this.$route.query.id, this.productCate).then(
+								response => {
+									this.$message({
+										message: '修改成功',
+										type: 'success',
+										duration: 1000
+									});
+									this.$router.back();
+								});
+							} else {
+								this.productCate.productAttributeIdList = this.getProductAttributeIdList();
+								createProductCate(this.productCate).then(response => {
+									this.$refs[formName].resetFields();
+									this.resetForm(formName);
+									this.$message({
+										message: '提交成功',
+										type: 'success',
+										duration: 1000
+									});
+								});
+							}
+						});
 
-          } else {
-            this.$message({
-              message: '验证失败',
-              type: 'error',
-              duration: 1000
-            });
-            return false;
-          }
-        });
-      },
-      resetForm(formName) {
-        this.$refs[formName].resetFields();
-        this.productCate = Object.assign({}, defaultProductCate);
-        this.getSelectProductCateList();
-        this.filterProductAttrList = [{
-          value: []
-        }];
-      },
-      removeFilterAttr(productAttributeId) {
-        if (this.filterProductAttrList.length === 1) {
-          this.$message({
-            message: '至少要留一个',
-            type: 'warning',
-            duration: 1000
-          });
-          return;
-        }
-        var index = this.filterProductAttrList.indexOf(productAttributeId);
-        if (index !== -1) {
-          this.filterProductAttrList.splice(index, 1)
-        }
-      },
-      handleAddFilterAttr() {
-        if (this.filterProductAttrList.length === 3) {
-          this.$message({
-            message: '最多添加三个',
-            type: 'warning',
-            duration: 1000
-          });
-          return;
-        }
-        this.filterProductAttrList.push({
-          value: null,
-          key: Date.now()
-        });
-      }
-    },
-    filters: {
-      filterLabelFilter(index) {
-        if (index === 0) {
-          return '筛选属性：';
-        } else {
-          return '';
-        }
-      }
-    }
-  }
+					} else {
+						this.$message({
+							message: '验证失败',
+							type: 'error',
+							duration: 1000
+						});
+						return false;
+					}
+				});
+			},
+			resetForm(formName) {
+				this.$refs[formName].resetFields();
+				this.productCate = Object.assign({}, defaultProductCate);
+				this.getSelectProductCateList();
+				this.filterProductAttrList = [{
+					value: []
+				}];
+			},
+			removeFilterAttr(productAttributeId) {
+				if (this.filterProductAttrList.length === 1) {
+					this.$message({
+						message: '至少要留一个',
+						type: 'warning',
+						duration: 1000
+					});
+					return;
+				}
+				var index = this.filterProductAttrList.indexOf(productAttributeId);
+				if (index !== -1) {
+					this.filterProductAttrList.splice(index, 1)
+				}
+			},
+			handleAddFilterAttr() {
+				if (this.filterProductAttrList.length === 3) {
+					this.$message({
+						message: '最多添加三个',
+						type: 'warning',
+						duration: 1000
+					});
+					return;
+				}
+				this.filterProductAttrList.push({
+					value: null,
+					key: Date.now()
+				});
+			}
+		},
+		filters: {
+			filterLabelFilter(index) {
+				if (index === 0) {
+					return '筛选属性：';
+				} else {
+					return '';
+				}
+			}
+		}
+	}
 </script>
 
 <style scoped>
diff --git a/mallplusui-web-admin/src/views/pms/productCate/index.vue b/mallplusui-web-admin/src/views/pms/productCate/index.vue
index f9b960e..8383dca 100644
--- a/mallplusui-web-admin/src/views/pms/productCate/index.vue
+++ b/mallplusui-web-admin/src/views/pms/productCate/index.vue
@@ -119,6 +119,7 @@
 		},
 		methods: {
 			resetParentId() {
+				console.log('parentId>>>', this.$route.query.parentId);
 				if (this.$route.query.parentId != null) {
 					this.parentId = this.$route.query.parentId;
 				} else {
@@ -130,8 +131,11 @@
 			},
 			getList() {
 				this.listLoading = true;
+				console.log('parentId>>>', this.parentId);
+				console.log('listQuery>>>', this.listQuery);
 				fetchList(this.parentId, this.listQuery).then(response => {
 					this.listLoading = false;
+					console.log('list>>>', response.data.records);
 					this.list = response.data.records;
 					this.total = response.data.total;
 				});
@@ -188,12 +192,16 @@
 				});
 			},
 			handleShowNextLevel(index, row) {
-				this.$router.push({
-					path: '/pms/productCate',
-					query: {
-						parentId: row.id
+				this.listQuery = {
+						pageNum: 1,
+						pageSize: 5
 					}
-				})
+					this.$router.push({
+						path: '/pms/productCate',
+						query: {
+							parentId: row.id
+						}
+					})
 			},
 			handleTransferProduct(index, row) {
 				console.log('handleAddProductCate');