增加资讯发布人字段

package.json

@@ -53,6 +53,7 @@
     "xlsx": "0.14.1"
   },
   "devDependencies": {
+    "@types/minimatch": "^6.0.0",
     "@vue/cli-plugin-babel": "4.4.4",
     "@vue/cli-plugin-eslint": "4.4.4",
     "@vue/cli-plugin-unit-jest": "4.4.4",

src/views/componentGallery/module.vue

@@ -27,9 +27,9 @@
                         </div>
                     </div>
                 </el-col>
-                 <el-col :span="6" class="right">
+                <el-col :span="6" class="right">
                     <div class="btnList">
-                        <button class="search" @click="getData">搜索</button>
+                        <button class="search" @click="goSearch('search')">搜索</button>
                         <button class="reset" @click="goReset">重置</button>
                     </div>
                 </el-col>
@@ -501,7 +501,10 @@ export default {
             this.getData();
         },
         // 1.6 搜索按钮
-        goSearch() {
+        goSearch(type) {
+            if (type == 'search') {
+                this.page = 1
+            }
             const data = {
                 page: this.page,
                 page_size: this.pageSize,
@@ -512,14 +515,11 @@ export default {
             }
             this.$store.dispatch('module/getComponentList',data).then(res => {
                 if (res.code == 200) {
-                    // this.moduleLoading = false
                     this.tableData = res.data.data
                     this.total = res.data.total
                     for (let i = 0; i < res.data.data.length; i++) {
                         const item = res.data.data[i];
                         this.tableData[i].component_size = item.component_width + ' * ' + item.component_height;
-                        // console.log("456",item.pagetype);
-
                     }
                 }
             }).catch(err => {

src/views/news/NewList.vue

@@ -94,7 +94,7 @@
               </template>
             </el-table-column>
             <!-- 发布人 -->
-            <el-table-column label="发布人(用户昵称)" width="160">
+            <el-table-column label="发布人(用户昵称)" width="160" v-if="creatNews_user_type == 10000">
               <template slot-scope="scope">
                 <span v-if="(scope.row.is_collector == 0 || scope.row.is_collector == null) && scope.row.user">
                   {{ scope.row.user.nickname || '' }}

src/views/news/examine.vue

@@ -105,6 +105,14 @@
                 <span v-if="scope.row.status == 2">已拒绝</span>
               </template>
             </el-table-column>
+            <!-- 发布人 -->
+            <el-table-column label="发布人" width="" v-if="creatNews_user_type == 10000">
+              <template slot-scope="scope">
+                <span v-if="(scope.row.is_collector == 0 || scope.row.is_collector == null) && scope.row.user">
+                  {{ scope.row.user.nickname || '' }}
+                </span>
+              </template>
+            </el-table-column>
             <el-table-column fixed="right" label="操作" width="300" header-align="center"
               v-if="creatNews_user_type == 10000">
               <template slot-scope="scope">