修改一些问题

src/views/login/index.vue

@@ -290,6 +290,8 @@ export default {
         const result = await this.send_msg_code(this.form);
         if(result.success){
           this.countDown();
+        }else{
+          this.$baseMessage(result.message,'error');
         }
       } else {
         this.$baseMessage('请输入用户名和密码','error');

src/views/merchant/list.vue

@@ -15,11 +15,11 @@
             placeholder="请输入机构编号"
           />
         </el-form-item>
-        <el-form-item label="机构名称">
+        <el-form-item label="机构简称">
           <el-input
             v-model="queryForm.tenantName"
             clearable
-            placeholder="请输入机构名称"
+            placeholder="请输入机构简称"
           />
         </el-form-item>
         <el-form-item label="机构状态">
@@ -119,9 +119,9 @@
     </el-table>
 
     <el-pagination
-      :current-page="queryForm.pageNo"
+      :current-page="queryForm.current"
       :layout="layout"
-      :page-size="queryForm.pageSize"
+      :page-size="queryForm.size"
       :total="total"
       background
       @current-change="handleCurrentChange"
@@ -187,10 +187,10 @@ export default {
       list: [],
       listLoading: true,
       layout: "total, sizes, prev, pager, next, jumper",
-      total: 0,
+      total: 1,
       queryForm: {
         current: 1,
-        size: 8,
+        size: 9,
         status: "",
         tenantName: "",
         tenantNo: ""

src/views/notice/list.vue

@@ -53,6 +53,20 @@
               fit="fit"
             />
           </div>
+          <div v-else-if="item.label==='公告状态'">
+            <el-tag
+              v-if="row[item.prop]===0"
+              type="success"
+            >
+              已上架
+            </el-tag>
+            <el-tag
+              v-else
+              type="info"
+            >
+              已下架
+            </el-tag>
+          </div>
           <span v-else>{{ row[item.prop] }}</span>
         </template>
       </el-table-column>
@@ -65,18 +79,19 @@
         <template #default="{ row }">
           <el-button
             type="text"
-            @click="handleView(row)"
+            @click="handleChangeStatus(row)"
           >
-            上架
+            <span v-if="row.prop===0">下架</span>
+            <span v-else>下架</span>
           </el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <el-pagination
-      :current-page="queryForm.pageNo"
+      :current-page="queryForm.current"
       :layout="layout"
-      :page-size="queryForm.pageSize"
+      :page-size="queryForm.size"
       :total="total"
       background
       @current-change="handleCurrentChange"
@@ -120,12 +135,12 @@ export default {
         {
           order: 5,
           label: "公告状态",
-          prop: "status"
+          prop: "isDelete"
         },
         {
           order: 6,
           label: "创建时间",
-          prop: "appLogo"
+          prop: "gmtCreate"
         }
       ],
       list: [],
@@ -161,12 +176,9 @@ export default {
     onSubmit() {
       this.fetchData();
     },
-    handleView(row) {
-      const {appNo} = row;
-      this.$router.push({
-        path: '/prod/edit',
-        query: { appNo }
-      })
+    handleChangeStatus(row) {
+      //const {appNo} = row;
+
     },
     handleSizeChange(val) {
       this.queryForm.size = val;

src/views/prod/edit.vue

@@ -31,6 +31,7 @@
       >
         <el-select
           v-model="form.abutmentWay"
+          :disabled="!!appNo"
           placeholder="请选择"
         >
           <el-option

src/views/prod/list.vue

@@ -118,9 +118,9 @@
     </el-table>
 
     <el-pagination
-      :current-page="queryForm.pageNo"
+      :current-page="queryForm.current"
       :layout="layout"
-      :page-size="queryForm.pageSize"
+      :page-size="queryForm.size"
       :total="total"
       background
       @current-change="handleCurrentChange"

src/views/prod/new.vue

@@ -324,20 +324,20 @@ export default {
       form: {
         tenantNo: "",
         abutmentWay: "",
-        gradeSort: "3",
+        gradeSort: "",
         appLogo: "",
-        appName: "MC产品",
-        appInfo: "产品介绍",
-        abstratInfo: "产品摘要",
-        applyAmtMin: "300",
-        applyAmtMax: "500",
-        withdrawSpan: "1000",
-        incomeCount: "1000",
-        approvalTime: "1000",
-        raiseTimeMax: "7",
-        raiseTimeMin: "5",
-        memo: "1000",
-        customerNumbers: "400", // 客服电话
+        appName: "",
+        appInfo: "",
+        abstratInfo: "",
+        applyAmtMin: "",
+        applyAmtMax: "",
+        withdrawSpan: "",
+        incomeCount: "",
+        approvalTime: "",
+        raiseTimeMax: "",
+        raiseTimeMin: "",
+        memo: "",
+        customerNumbers: "", // 客服电话
         creditWay: 1 // 授信方式
       },
       rules: {

vue.config.js

@@ -69,7 +69,8 @@ module.exports = {
       //  }
       //},
       "/api": {
-        target: `http://192.168.0.199:8221`,
+        //target: `http://192.168.0.199:8221`,
+        target: `http://192.168.0.75:8080`,
         ws: true,
         changeOrigin: true,
         pathRewrite: {