Merge branch 'feature/Feature_loginPage' into develop

src/views/issue/index.vue

@@ -23,7 +23,7 @@
       <div class="btn-group clearfix">
         <div class="fl">
           <el-button class="fl" size="small" type="primary" icon="el-icon-plus" @click="clickImport()">新增</el-button>
-          <div class="tips fl">导入模板第一行必须为空白行、第一列必须为公司编号（S9219801）</div>
+          <div class="tips fl">导入模板第一行必须为空白行、第一列必须为经销商编号（S9219801）</div>
         </div>
       </div>
       <div class="table">
@@ -45,10 +45,10 @@
           </el-table-column>
           <el-table-column align="center" prop="remark" label="备注" min-width="140" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="创建时间" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
-          
+
         </el-table>
       </div>
-      
+
       <div class="pagination clearfix">
         <div class="fr">
           <el-pagination
@@ -87,12 +87,12 @@
     <!-- 详情 -->
     <el-dialog title="详情" :visible.sync="detailDialog" :show-close="false" width="70%" :close-on-click-modal="false">
       <div class="table" style="margin: 10px 0 20px;">
-        <el-table 
-          v-loading="detailTable_listLoading" 
-          :data="detailTable_dataList" 
-          element-loading-text="Loading" 
-          tooltip-effect="dark" 
-          style="width: 100%" 
+        <el-table
+          v-loading="detailTable_listLoading"
+          :data="detailTable_dataList"
+          element-loading-text="Loading"
+          tooltip-effect="dark"
+          style="width: 100%"
           max-height="270">
           <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
           <el-table-column align="center" prop="title" label="标题" min-width="140" show-overflow-tooltip></el-table-column>
@@ -162,7 +162,7 @@ export default {
     }
   },
   computed: {
-    
+
   },
   created() {
     this.getList();
@@ -316,4 +316,4 @@ export default {
   line-height: 32px;
   margin-left: 10px;
 }
-</style>
+</style>

src/views/pset/login_setting.vue

@@ -315,12 +315,7 @@
                     this.dataList = res.data;
                     this.listLoading = false;
                 });
-                getProductList({
-                    productCategoryName: "",
-                    productCategoryNumber: "",
-                }).then((res) => {
-                    this.productList = res.data;
-                });
+
             },
             handleChange(e) {
                 this.productList.find((k) => {