修改bug

src/config/default/theme.config.js

@@ -5,7 +5,7 @@ const theme = {
   //布局种类 horizontal vertical gallery comprehensive common
   layout: 'vertical',
   //主题名称 default ocean green glory white
-  themeName: 'glory',
+  themeName: 'white',
   //是否固定头部
   fixedHeader: true,
   //是否显示顶部进度条

src/main.js

@@ -4,6 +4,12 @@ import i18n from './i18n'
 import store from './store'
 import router from './router'
 import '@/vab'
+import Minix from '@/minix/index'
+
+
+
+// 全局混入
+Vue.mixin(Minix);
 
 Vue.config.productionTip = false
 new Vue({

src/minix/index.js

+import BlockHeader from '@/components/blockHeader'
+export default {
+  name: "Login",
+  components:{
+    BlockHeader
+  }
+}

src/server/api.js

@@ -106,6 +106,14 @@ export default {
       data
     });
   },
+  // 产品上下架
+  prod_switch_upDown(params) {
+    return request({
+      url: "/macy/editProductInfoByStatus",
+      method: "get",
+      params
+    });
+  },
   // 产品查看
   prod_view(params) {
     return request({
@@ -177,5 +185,13 @@ export default {
       method: "post",
       data
     });
+  },
+  // 变更状态
+  dict(params) {
+    return request({
+      url: "/dictData/selectBydictType",
+      method: "get",
+      params
+    });
   }
 };

src/views/merchant/list.vue

 <template>
   <div class="page-fence">
     <!--搜索-->
+    <block-header title="搜索" />
     <div class="search">
       <el-form
         label-suffix=":"
@@ -40,16 +41,18 @@
         </el-form-item>
         <el-form-item>
           <el-button
+            icon="el-icon-search"
             type="primary"
             @click="onSubmit"
           >
-            查询
+            搜 索
           </el-button>
           <!--<el-button type="default" @click="onReset">重置</el-button>-->
         </el-form-item>
       </el-form>
     </div>
 
+    <block-header title="机构列表" />
     <!--操作菜单栏-->
     <div
       v-if="true"
@@ -139,7 +142,7 @@ export default {
   name: "Fence",
   data() {
     return {
-      checkList: ["机构编号", "机构名称", "机构简称", "机构状态", "营业执照", "小贷拍照", "金融办批文"],
+      checkList: ["机构编号", "机构名称", "机构简称", "机构状态", "营业执照", "小贷牌照", "金融办批文"],
       columns: [
         {
           order: 1,

src/views/notice/list.vue

 <template>
   <div class="page-fence">
     <!--操作菜单栏-->
+    <block-header title="公告列表" />
     <div
       v-if="true"
       class="action-bar"
     >
-      <div class="action-bar-left" />
-      <div class="action-bar-right">
+      <div class="action-bar-left">
         <router-link to="/notice/new">
           <el-button
+            icon="el-icon-plus"
             type="primary"
             size="mini"
           >
-            发布公告
+            新增公告
           </el-button>
         </router-link>
       </div>
@@ -72,20 +73,31 @@
       </el-table-column>
 
       <el-table-column
+        width="150"
         fixed="right"
         align="center"
         label="操作"
       >
         <template #default="{ row }">
           <el-button
-            type="text"
+            v-if="row.isDelete===0"
+            size="mini"
+            type="danger"
+            @click="handleChangeStatus(row)"
+          >
+            下架
+          </el-button>
+          <el-button
+            v-else
+            size="mini"
+            type="success"
             @click="handleChangeStatus(row)"
           >
-            <span v-if="row.isDelete===0">下架</span>
-            <span v-else>上架</span>
+            上架
           </el-button>
           <el-button
-            type="text"
+            size="mini"
+            type="primary"
             @click="handleView(row)"
           >
             <span>详情</span>
@@ -115,7 +127,7 @@ export default {
   name: "Fence",
   data() {
     return {
-      checkList: ["标题", "标题ICON", "公告内容", "H5链接", "公告状态", "创建时间"],
+      checkList: ["标题", "标题ICON", "公告内容", "公告状态",'发布人', "创建时间"],
       columns: [
         {
           order: 1,
@@ -130,14 +142,9 @@ export default {
         {
           order: 3,
           label: "公告内容",
+          overflow: true,
           prop: "znxContent"
         },
-        {
-          order: 4,
-          label: "H5链接",
-          prop: "znxHref",
-          overflow: true
-        },
         {
           order: 5,
           label: "公告状态",
@@ -145,6 +152,11 @@ export default {
         },
         {
           order: 6,
+          label: "发布人",
+          prop: "znxCreateby"
+        },
+        {
+          order: 7,
           label: "创建时间",
           prop: "gmtCreate"
         }

src/views/notice/new.vue

@@ -7,7 +7,7 @@
       :model="form"
       label-width="120px"
     >
-      <block-header title="公告信息" />
+      <block-header title="创建公告" />
       <el-form-item
         prop="appLogo"
         class="form-item"
@@ -38,7 +38,19 @@
         class="form-item"
         label="公告标题"
       >
-        <el-input v-model="form.znxTitle" />
+        <el-select
+          v-model="form.znxTitle"
+          style="width: 100%"
+          size="mini"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in select"
+            :key="item.code"
+            :label="item.value"
+            :value="item.code"
+          />
+        </el-select>
       </el-form-item>
 
       <el-form-item
@@ -53,6 +65,7 @@
         />
       </el-form-item>
       <el-form-item
+        v-if="false"
         prop="znxHref"
         class="form-item"
         label="公告跳转链接"
@@ -96,6 +109,7 @@ export default {
   },
   data() {
     return {
+      select:{},
       uploadUrl: `${$API}/sysUser/upload`,
       form: {
         znxTitle: "",
@@ -104,15 +118,16 @@ export default {
         znxHref: ""
       },
       rules: {
-        znxTitle: [{ required: true, message: "请输入公告标题", trigger: "blur" }],
+        znxTitle: [{ required: true, message: "请选择公告标题", trigger: "blur" }],
         znxTitleUrl: [{ required: false, message: "请上传公告标题ICON", trigger: "change" }],
         znxContent: [{ required: true, message: "请输入公告内容", trigger: "blur" }],
-        znxHref: [{ required: true, message: "请输入公告跳转链接", trigger: "blur" }]
+        znxHref: [{ required: false, message: "请输入公告跳转链接", trigger: "blur" }]
       }
     };
   },
   async created() {
     // 再请求表单
+    await this.initDict();
     const { query } = this.$route;
     if (query && query.id) {
       this.id = query.id;
@@ -120,6 +135,15 @@ export default {
     }
   },
   methods: {
+    async initDict() {
+      const result = await API.dict({
+        dictType:'ZNXTITLE'
+      });
+      console.log(result,'hah')
+      if(result.success){
+        this.select = result.result;
+      }
+    },
     async init() {
       const id = this.id;
       const { result, success } = await API.notice_detail({ id });

src/views/prod/edit.vue

@@ -256,6 +256,7 @@
             <el-form-item prop="incomeTimeBefore">
               <el-time-picker
                 v-model="form.incomeTimeBefore"
+                value-format="HH:mm:ss"
                 style="width: 120px"
                 placeholder="起始时间"
                 :picker-options="{
@@ -273,6 +274,7 @@
             <el-form-item prop="incomeTimeLate">
               <el-time-picker
                 v-model="form.incomeTimeLate"
+                value-format="HH:mm:ss"
                 style="width: 120px"
                 placeholder="结束时间"
                 :picker-options="{

src/views/prod/list.vue

 <template>
   <div class="page-fence">
     <!--搜索-->
+    <block-header title="搜索" />
     <div class="search">
       <el-form
         label-suffix=":"
@@ -22,34 +23,20 @@
             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>
           <el-button
+            icon="el-icon-search"
             type="primary"
             @click="onSubmit"
           >
-            查询
+            搜 索
           </el-button>
         </el-form-item>
       </el-form>
     </div>
 
     <!--操作菜单栏-->
+    <block-header title="产品列表" />
     <div
       v-if="true"
       class="action-bar"
@@ -57,6 +44,7 @@
       <div class="action-bar-left">
         <router-link to="/prod/new">
           <el-button
+            icon="el-icon-plus"
             type="primary"
             size="mini"
           >
@@ -73,6 +61,7 @@
       ref="tableSort"
       v-loading="listLoading"
       border
+      size="small"
       :data="list"
       style="width: 100%"
     >
@@ -95,20 +84,51 @@
             />
           </div>
           <div v-else-if="item.label==='产品状态'">
-            <span>{{ row[item.prop]==="1"?'启用':'禁用' }}</span>
+            <el-tag
+              v-if="row[item.prop] === '1'"
+              type="success"
+              size="mini"
+            >
+              启用
+            </el-tag>
+            <el-tag
+              v-else
+              type="info"
+              size="mini"
+            >
+              禁用
+            </el-tag>
           </div>
           <span v-else>{{ row[item.prop] }}</span>
         </template>
       </el-table-column>
 
       <el-table-column
+        width="170"
         fixed="right"
         align="center"
         label="操作"
       >
         <template #default="{ row }">
           <el-button
-            type="text"
+            v-if="row.status==='1'"
+            size="mini"
+            type="danger"
+            @click="handleClick(row)"
+          >
+            禁用
+          </el-button>
+          <el-button
+            v-else
+            size="mini"
+            type="success"
+            @click="handleClick(row)"
+          >
+            启用
+          </el-button>
+          <el-button
+            size="mini"
+            type="primary"
             @click="handleView(row)"
           >
             详情
@@ -138,7 +158,7 @@ export default {
   name: "Fence",
   data() {
     return {
-      checkList: ["产品等级", "产品编号", "产品名称", "LOGO", "机构编号", "机构名称", "产品状态","对接方式","创建时间",],
+      checkList: ["产品等级", "产品编号", "产品名称", "LOGO", "机构编号", "产品状态", "对接方式", "创建时间"],
       columns: [
         {
           order: 1,
@@ -168,22 +188,17 @@ export default {
         },
         {
           order: 6,
-          label: "机构名称",
-          prop: "loanLicenseUrl"
-        },
-        {
-          order: 7,
           label: "产品状态",
           prop: "status"
         },
         {
-          order: 8,
+          order: 7,
           label: "对接方式",
           prop: "abutmentWay"
         },
         {
-          order: 9,
-          width:170,
+          order: 8,
+          width: 170,
           label: "创建时间",
           prop: "gmtCreated"
         }
@@ -225,11 +240,11 @@ export default {
       this.fetchData();
     },
     handleView(row) {
-      const {appNo} = row;
+      const { appNo } = row;
       this.$router.push({
-        path: '/prod/edit',
+        path: "/prod/edit",
         query: { appNo }
-      })
+      });
     },
     handleSizeChange(val) {
       this.queryForm.size = val;
@@ -250,6 +265,27 @@ export default {
       this.list = records;
       this.total = total;
       this.listLoading = false;
+    },
+    async handleClick(row) {
+      console.log(row, "我知道");
+      let { appNo, status } = row;
+      status = status === "1" ? "2" : "1";
+      this.$confirm(`此操作将变更该产品状态, 是否继续?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(async () => {
+        const result = await API.prod_switch_upDown({
+          appNo,
+          status
+        });
+
+        if (result.success) {
+          this.$message.success("操作成功");
+          await this.fetchData();
+        }
+
+      });
     }
   }
 };

src/views/prod/new.vue

@@ -254,8 +254,10 @@
             <el-form-item prop="incomeTimeBefore">
               <el-time-picker
                 v-model="form.incomeTimeBefore"
+                value-format="HH:mm:ss"
                 style="width: 120px"
                 placeholder="起始时间"
+
                 :picker-options="{
                   selectableRange: '00:00:00 - 23:59:59'
                 }"
@@ -271,6 +273,7 @@
             <el-form-item prop="incomeTimeLate">
               <el-time-picker
                 v-model="form.incomeTimeLate"
+                value-format="HH:mm:ss"
                 style="width: 120px"
                 placeholder="结束时间"
                 :picker-options="{
@@ -482,8 +485,10 @@ export default {
       this.$refs[formName].validate(async (valid) => {
         if (valid) {
           const form = Object.assign({}, this.form);
-          let result = await API.prod_add({ ...form });
 
+          //console.log(form,'表达');
+          //return false;
+          let result = await API.prod_add({ ...form });
           if (result.success) {
             this.$baseMessage("产品保存成功", "success");
             setTimeout(() => {