修改BUG

src/server/api.js

@@ -145,7 +145,16 @@ export default {
       method: "post",
       data
     });
-  },  // 公告编辑
+  },
+  // 公告编辑
+  notice_detail(data) {
+    return request({
+      url: "/smgw/getNotice",
+      method: "post",
+      data
+    });
+  },
+  // 公告编辑
   notice_edit(data) {
     return request({
       url: "/smgw/updateNotice",

src/views/merchant/new.vue

@@ -73,7 +73,7 @@
       <el-form-item
         class="form-item"
         prop="loanLicenseUrl"
-        label="小贷拍照"
+        label="小贷牌照"
       >
         <el-upload
           class="avatar-uploader"
@@ -173,9 +173,9 @@ export default {
       rules: {
         tenantFullName: [{ required: true, message: "请输入机构名称", trigger: "blur" }],
         tenantName: [{ required: true, message: "请输入机构简称", trigger: "blur" }],
-        businessLicenseUrl: [{ required: true, message: "请上传营业执照", trigger: "blur" }],
-        loanLicenseUrl: [{ required: true, message: "请上传小贷拍照", trigger: "blur" }],
-        officeApprovalUrl: [{ required: true, message: "请上传金融办批文", trigger: "blur" }]
+        businessLicenseUrl: [{ required: false, message: "请上传营业执照", trigger: "blur" }],
+        loanLicenseUrl: [{ required: false, message: "请上传小贷牌照", trigger: "blur" }],
+        officeApprovalUrl: [{ required: false, message: "请上传金融办批文", trigger: "blur" }]
       }
     };
   },

src/views/notice/new.vue

@@ -98,10 +98,10 @@ export default {
     return {
       uploadUrl: `${$API}/sysUser/upload`,
       form: {
-        znxTitle: "mc公告标题",
+        znxTitle: "",
         znxTitleUrl: "",
-        znxContent: "名称公告内容",
-        znxHref: "www.baidu.com"
+        znxContent: "",
+        znxHref: ""
       },
       rules: {
         znxTitle: [{ required: true, message: "请输入公告标题", trigger: "blur" }],
@@ -120,9 +120,9 @@ export default {
     }
   },
   methods: {
-   async init() {
+    async init() {
       const id = this.id;
-      const { result, success } = await API.notice_edit({ id });
+      const { result, success } = await API.notice_detail({ id });
       if (success) {
         this.form = result;
       }
@@ -148,7 +148,13 @@ export default {
       this.$refs[formName].validate(async (valid) => {
         if (valid) {
           const form = Object.assign({}, this.form);
-          let result = await API.notice_add({ ...form });
+          let result;
+          if (this.id) {
+            result = await API.notice_edit({ ...form });
+          } else {
+            result = await API.notice_add({ ...form });
+          }
+
           if (result.success) {
             this.$baseMessage("保存成功", "success");
             setTimeout(() => {

src/views/prod/list.vue

@@ -17,27 +17,27 @@
         </el-form-item>
         <el-form-item label="产品名称">
           <el-input
-            v-model="queryForm.tenantNo"
+            v-model="queryForm.appName"
             clearable
             placeholder="请输入机构名称"
           />
         </el-form-item>
-        <el-form-item label="产品状态">
-          <el-select
-            v-model="queryForm.status"
-            clearable
-            placeholder="请选择"
-          >
-            <el-option
-              label="启用"
-              value="1"
-            />
-            <el-option
-              label="禁用"
-              value="0"
-            />
-          </el-select>
-        </el-form-item>
+        <!--<el-form-item label="产品状态">-->
+        <!--  <el-select-->
+        <!--    v-model="queryForm.status"-->
+        <!--    clearable-->
+        <!--    placeholder="请选择"-->
+        <!--  >-->
+        <!--    <el-option-->
+        <!--      label="启用"-->
+        <!--      value="1"-->
+        <!--    />-->
+        <!--    <el-option-->
+        <!--      label="禁用"-->
+        <!--      value="0"-->
+        <!--    />-->
+        <!--  </el-select>-->
+        <!--</el-form-item>-->
         <el-form-item>
           <el-button
             type="primary"
@@ -196,7 +196,7 @@ export default {
         current: 1,
         size: 10,
         status: "",
-        tenantName: "",
+        appName: "",
         tenantNo: ""
       }
     };

vue.config.js

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