准备交付代码

.run/build_staging.run.xml

-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="build:staging" type="js.build_tools.npm" nameIsGenerated="true">
-    <package-json value="$PROJECT_DIR$/package.json" />
-    <command value="run" />
-    <scripts>
-      <script value="build:staging" />
-    </scripts>
-    <node-interpreter value="project" />
-    <envs />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file

.run/serve.run.xml

-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="serve" type="js.build_tools.npm" nameIsGenerated="true">
-    <package-json value="$PROJECT_DIR$/package.json" />
-    <command value="run" />
-    <scripts>
-      <script value="serve" />
-    </scripts>
-    <node-interpreter value="project" />
-    <envs />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file

README.md

@@ -10,6 +10,8 @@
 是不同用户看到的菜单不一样。
 
 
+
+
 ### 测试账号
 - 账号：mr
 - 密码：123456
@@ -30,5 +32,3 @@
 - 接口地址：https://apimanager.feiyiyc.com
 - 访问地址：https://manage.feiyiyc.com
 
-
-### 如果配置新菜单

src/minix/index.js

@@ -129,7 +129,8 @@ export default {
       return this.$enumUtils.toMsg('UserStatusEnum', status);
     },
     // 格式化时间
-    dateFormat: function (row, column) {
+    // dateFormat
+    transDateFormat: function (row, column) {
       const date = row[column.property];
       if (date === undefined) return "";
       return moment(date).format("YYYY-MM-DD HH:mm:ss");

src/views/client/componments/BaseInfo.vue

@@ -117,7 +117,7 @@
           align="center"
           prop="gmtCreated"
           label="绑定时间"
-          :formatter="dateFormat"
+          :formatter="transDateFormat"
         ></el-table-column>
         <el-table-column align="center" label="操作">
           <template slot-scope="scope">
@@ -226,14 +226,6 @@ export default {
     headerStyle() {
       return "tableHeaderStyle";
     },
-    /*日期*/
-    dateFormat: function (row, column) {
-      let date = row[column.property];
-      if (date === undefined) {
-        return "";
-      }
-      return moment(date).format("YYYY-MM-DD HH:mm:ss");
-    },
     // 查看绑卡记录
     ownerBankBind(row, com, title) {
       this.activeComponents = com;

src/views/client/componments/BillList.vue

@@ -109,7 +109,7 @@
           prop="planDate"
           width="120"
           label="计划还款时间"
-          :formatter="dateFormats"
+          :formatter="transDateFormat"
         ></el-table-column>
         <el-table-column
           align="center"
@@ -137,7 +137,7 @@
           prop="gmtModified"
           width="120"
           label="结清时间"
-          :formatter="dateFormats"
+          :formatter="transDateFormat"
         ></el-table-column>
         <el-table-column fixed="right" align="center" width="120" label="操作">
           <template slot-scope="scope">
@@ -510,13 +510,6 @@ export default {
       return row.cardBankAccount + "(" + row.cardBankName + ")";
     },
     /*日期*/
-    dateFormat: function (row, column) {
-      let date = row[column.property];
-      if (date === undefined) {
-        return "";
-      }
-      return moment(date).format("YYYY-MM-DD HH:mm:ss");
-    },
     /*日期*/
     dateFormats: function (row, column) {
       let date = row[column.property];

src/views/client/componments/LoanInfo.vue

@@ -9,8 +9,8 @@
           :header-row-class-name="headerStyle"
           :data="data" stripe style="width: 100%;">
         <el-table-column align="center" width="140" prop="loanNo" label="借款编号"></el-table-column>
-        <el-table-column align="center" prop="gmtCreated" label="申请日期" :formatter="dateFormats"></el-table-column>
-        <el-table-column align="center" prop="startDate" label="放款日期" :formatter="dateFormats"></el-table-column>
+        <el-table-column align="center" prop="gmtCreated" label="申请日期" :formatter="transDateFormat"></el-table-column>
+        <el-table-column align="center" prop="startDate" label="放款日期" :formatter="transDateFormat"></el-table-column>
         <el-table-column align="center" prop="raiseAmt" label="放款本金"></el-table-column>
         <el-table-column align="center" prop="productNameStr" label="产品名称"></el-table-column>
 

src/views/client/componments/Messages.vue

@@ -43,7 +43,7 @@
           align="center"
           prop="sendTime"
           width="150"
-          :formatter="dateFormat"
+          :formatter="transDateFormat"
           label="发送时间"
         ></el-table-column>
       </el-table>
@@ -115,14 +115,6 @@ export default {
         console.log(err.message)
       }
     },
-    /*日期*/
-    dateFormat: function (row, column) {
-      let date = row[column.property]
-      if (date === undefined) {
-        return ''
-      }
-      return moment(date).format("YYYY-MM-DD HH:mm:ss")
-    },
     handleClose() {
       this.$emit("handleClose");
     },

src/views/client/componments/OperateLog.vue

@@ -12,7 +12,7 @@
           style="width: 100%;">
         <el-table-column align="center" prop="typeStr" label="操作类型"></el-table-column>
         <el-table-column align="center" prop="memo" label="备注"></el-table-column>
-        <el-table-column align="center" prop="gmtCreated" label="操作时间" :formatter="dateFormat"></el-table-column>
+        <el-table-column align="center" prop="gmtCreated" label="操作时间" :formatter="transDateFormat"></el-table-column>
       </el-table>
     </div>
     <div class="pages">
@@ -80,14 +80,6 @@ export default {
       }
     },
     /*日期*/
-    dateFormat: function (row, column) {
-      let date = row[column.property]
-      if (date === undefined) {
-        return ''
-      }
-      return moment(date).format("YYYY-MM-DD HH:mm:ss")
-    },
-    /*日期*/
     dateFormats: function (row, column) {
       let date = row[column.property]
       if (date === undefined) {

src/views/client/componments/OwnerBankBind.vue

@@ -14,7 +14,7 @@
             :data="records"
             stripe
             style="width: 100%;">
-          <el-table-column align="center" prop="gmtCreated" label="签约时间" :formatter="dateFormat"></el-table-column>
+          <el-table-column align="center" prop="gmtCreated" label="签约时间" :formatter="transDateFormat"></el-table-column>
           <el-table-column align="center" prop="operaterDesc" label="备注"></el-table-column>
         </el-table>
       </div>

src/views/client/componments/RePayList.vue

@@ -129,14 +129,6 @@ export default {
       return row.cardBankAccount + "(" + row.cardBankName + ")";
     },
     /*日期*/
-    dateFormat: function (row, column) {
-      let date = row[column.property]
-      if (date === undefined) {
-        return ''
-      }
-      return moment(date).format("YYYY-MM-DD HH:mm:ss")
-    },
-    /*日期*/
     dateFormats: function (row, column) {
       let date = row[column.property]
       if (date === undefined) {

src/views/client/componments/ReliefList.vue

@@ -129,14 +129,6 @@ export default {
       return row.cardBankAccount + "(" + row.cardBankName + ")";
     },
     /*日期*/
-    dateFormat: function (row, column) {
-      let date = row[column.property]
-      if (date === undefined) {
-        return ''
-      }
-      return moment(date).format("YYYY-MM-DD HH:mm:ss")
-    },
-    /*日期*/
     dateFormats: function (row, column) {
       let date = row[column.property]
       if (date === undefined) {

src/views/client/detail.vue

@@ -396,15 +396,6 @@ export default {
       return moment(date).format("YYYY-MM-DD ") + row.backedTime
     },
 
-    /*日期*/
-    dateFormat: function (row, column) {
-      let date = row[column.property]
-      if (date == undefined) {
-        return ''
-      }
-      return moment(date).format("YYYY-MM-DD HH:mm:ss")
-    },
-
     /*日期*/
     collectDateFormat: function (row, column) {
       let date = row.collectContact.created;

src/views/client/list.vue

@@ -254,15 +254,6 @@ export default {
       return array;
     },
 
-    /*日期*/
-    dateFormat: function (row, column) {
-      var date = row[column.property]
-      if (date == undefined) {
-        return ''
-      }
-      return moment(date).format("YYYY-MM-DD")
-    },
-
     //产品名称
     productNameFormat: function (row, column) {
       var status = row['productName'];

src/views/merchant/com/base.vue

@@ -657,6 +657,7 @@
             }).then(async (res) => {
               console.log(res, '我哈哈')
               const uploadFileUrl = host + dir
+              console.log(uploadFileUrl,'===')
               this.annexRequestList[index]['imgData'].push({
                 name: file.name,
                 uid: file.name,
@@ -719,7 +720,7 @@
 
             const obj = {
               name: img,
-              uid: `${index}`,
+              uid: img,
               type: fileType,
               url: img
             }