Merge branch 'master' of http://159.75.201.17:3000/zwq/tuanfeng-pc-admin

src/views/platformProduct/commodityManagement/addCommodity.vue

@@ -127,7 +127,7 @@
 <script>
 import Tinymce from '@/components/Tinymce'
 import {
-  getGroupSelect,
+  // getGroupSelect,
   getClassify,
   getClassifyAdd,
   getClassifyGetById,
@@ -316,7 +316,7 @@ export default {
   mounted() {
 
 
-    
+
     // console.log(this.voucherList)
     this.groups()
     this.selectList()
@@ -555,9 +555,9 @@ export default {
     },
     // 获取商品分组
     async groups() {
-      const res = await getGroupSelect({
-      })
-      this.groupList = res.data
+      // const res = await getGroupSelect({
+      // })
+      // this.groupList = res.data
     },
     // 获取详情
     async details() {

src/views/platformProduct/commodityManagement/index.vue

@@ -167,7 +167,7 @@
 
 <script>
 import CommAdd from './addCommodity.vue'
-import { getBtnList, getToken } from '@/utils/auth'
+import { getToken } from '@/utils/auth'
 import { uploadUrl } from '@/utils/request'
 import {
   getClassifyGetAll,
@@ -252,7 +252,7 @@ export default {
     this.getBrandList()
     this.getAll(this.formInline)
     this.queryAllCategory()
-    this.btnList = getBtnList()
+    // this.btnList = getBtnList()
   },
   // 方法集合
   methods: {