Merge branch 'master' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong_vue_store

src/views/goods/Index.vue

@@ -54,6 +54,32 @@
 							</a-select-option>
 						</a-select>
 					</a-form-item>
+					<a-form-item label="是否大牌">
+						<a-select @change="getGoodsDapai" style="width: 120px" placeholder="请选择">
+							<a-select-option :value="item.val" v-for="item in isYesNo" :key="item.val">
+								{{ item.name }}
+							</a-select-option>
+						</a-select>
+					</a-form-item>
+					<a-form-item label="是否新品">
+						<a-select @change="getGoodsXinpin" style="width: 120px" placeholder="请选择">
+							<a-select-option :value="item.val" v-for="item in isYesNo" :key="item.val">
+								{{ item.name }}
+							</a-select-option>
+						</a-select>
+					</a-form-item><a-form-item label="是否店内">
+						<a-select @change="getGoodsStore" style="width: 120px" placeholder="请选择">
+							<a-select-option :value="item.val" v-for="item in isYesNo" :key="item.val">
+								{{ item.name }}
+							</a-select-option>
+						</a-select>
+					</a-form-item><a-form-item label="是否排行榜">
+						<a-select @change="getGoodsRank" style="width: 120px" placeholder="请选择">
+							<a-select-option :value="item.val" v-for="item in isYesNo" :key="item.val">
+								{{ item.name }}
+							</a-select-option>
+						</a-select>
+					</a-form-item>
 					<a-form-item class="search-btn">
 						<a-button type="primary" icon="search" html-type="submit">搜索</a-button>
 					</a-form-item>
@@ -289,7 +315,11 @@ export default {
 				spec_type: '',
 				channel: '',
 				merchant_id: '',
-				is_jd_remove: ''
+				is_jd_remove: '',
+				is_brand:'',
+				is_new:'',
+				is_in_store:'',
+				is_paihang:''
 			},
 			setupIndex: 0,
 			setupValue: 1,
@@ -365,6 +395,18 @@ export default {
 		getGoodsJingDong(val) {
 			this.queryParam.is_jd_remove = val
 		},
+		getGoodsDapai(val) {
+			this.queryParam.is_brand = val
+		},
+		getGoodsXinpin(val) {
+			this.queryParam.is_new = val
+		},
+		getGoodsStore(val) {
+			this.queryParam.is_in_store = val
+		},
+		getGoodsRank(val) {
+			this.queryParam.is_paihang = val
+		},
 		// 批量修改
 		handleModify() {
 			this.$router.push('/goods/modify')
@@ -447,6 +489,14 @@ export default {
 				(this.queryParam.categoryId || '') +
 				'&is_jd_remove=' +
 				(this.queryParam.is_jd_remove || '') +
+				'&is_brand=' +
+				(this.queryParam.is_brand || '') +
+				'&is_new=' +
+				(this.queryParam.is_new || '') +
+				'&is_in_store=' +
+				(this.queryParam.is_in_store || '') +
+				'&is_paihang=' +
+				(this.queryParam.is_paihang || '') +
 				'&channel=' +
 				this.queryParam.channel +
 				'&merchant_id=' +