Merge branch 'master' of https://git.dayouqiantu.cn/yshopb2c/yshop-qd

src/mixins/crud.js

@@ -11,6 +11,7 @@ import checkPermission from '@/utils/permission'
 export default {
   data() {
     return {
+      cateList: [],
       // 表格数据
       data: [],
       // 排序规则，默认 id 降序， 支持多字段排序 ['id,desc', 'createTime,asc']
@@ -60,6 +61,7 @@ export default {
         this.loading = true
         // 请求数据
         initData(this.url, this.getQueryParame()).then(data => {
+          this.cateList = data.cateList
           this.total = data.totalElements
           this.data = data.content
           // time 毫秒后显示表格

src/views/activity/extract/index.vue

@@ -25,7 +25,7 @@
       <el-table-column prop="extractPrice" label="提现金额" />
       <el-table-column prop="extractType" label="提现方式">
         <template slot-scope="scope">
-          <div v-if="scope.row.extractType='weixin'">
+          <div v-if="scope.row.extractType=='weixin'">
             姓名:{{ scope.row.realName }}<br>
             微信号:{{ scope.row.wechat }}
           </div>

src/views/shop/goods/index.vue

@@ -4,9 +4,15 @@
     <div class="head-container">
       <!-- 搜索 -->
       <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
-      <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+      <el-select v-model="query.type" clearable placeholder="搜索类型" class="filter-item" style="width: 130px">
         <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
       </el-select>
+      <el-select v-model="cateId"  clearable placeholder="商品分类" class="filter-item" style="width: 130px">
+        <el-option v-for="item in cateList" :disabled="item.disabled === 0"
+                   :value="item.value"
+                   :key="item.id"
+                   :label="item.label"></el-option>
+      </el-select>
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 新增 -->
       <div style="display: inline-block;margin: 0px 2px;">
@@ -123,11 +129,13 @@ import checkPermission from '@/utils/permission'
 import initData from '@/mixins/crud'
 import { del, onsale } from '@/api/yxStoreProduct'
 import eForm from './form'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import comForm from '@/views/activity/combination/form'
 import killForm from '@/views/activity/seckill/form'
 import bargainForm from '@/views/activity/bargain/form'
+import Treeselect from '@riophae/vue-treeselect'
 export default {
-  components: { eForm, comForm, killForm, bargainForm },
+  components: { eForm, comForm, Treeselect,killForm, bargainForm },
   mixins: [initData],
   data() {
     return {
@@ -136,7 +144,8 @@ export default {
       queryTypeOptions: [
         { key: 'storeName', display_name: '商品名称' }
       ],
-      isAttr: false
+      isAttr: false,
+      cateId: null,
     }
   },
   created() {
@@ -149,7 +158,7 @@ export default {
     beforeInit() {
       this.url = 'api/yxStoreProduct'
       const sort = 'id,desc'
-      this.params = { page: this.page, size: this.size, sort: sort, isShow: 1, isDel: 0 }
+      this.params = { page: this.page, size: this.size, sort: sort, isShow: 1, isDel: 0,cateId: this.cateId }
       const query = this.query
       const type = query.type
       const value = query.value

src/views/shop/goods/index2.vue

@@ -7,6 +7,12 @@
       <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
         <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
       </el-select>
+      <el-select v-model="cateId"  clearable placeholder="商品分类" class="filter-item" style="width: 130px">
+        <el-option v-for="item in cateList" :disabled="item.disabled === 0"
+                   :value="item.value"
+                   :key="item.id"
+                   :label="item.label"></el-option>
+      </el-select>
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 新增 -->
       <el-button
@@ -86,6 +92,7 @@ export default {
     return {
       delLoading: false,
       visible: false,
+      cateId: null,
       queryTypeOptions: [
         { key: 'storeName', display_name: '商品名称' }
       ]
@@ -101,7 +108,7 @@ export default {
     beforeInit() {
       this.url = 'api/yxStoreProduct'
       const sort = 'id,desc'
-      this.params = { page: this.page, size: this.size, sort: sort, isShow: 0, isDel: 0 }
+      this.params = { page: this.page, size: this.size, sort: sort, isShow: 0, isDel: 0,cateId: this.cateId  }
       const query = this.query
       const type = query.type
       const value = query.value

src/views/system/role/index.vue

@@ -110,8 +110,6 @@
             :data="menus"
             :default-checked-keys="menuIds"
             :props="defaultProps"
-            check-strictly
-            accordion
             show-checkbox
             node-key="id"
           />
@@ -238,7 +236,9 @@ export default {
         this.menuIds = []
         // 菜单数据需要特殊处理
         val.menus.forEach(function(data, index) {
+           if(data.pid!=0){
             _this.menuIds.push(data.id)
+          }
         })
       }
     },