From e743d9b9552edd3bbb822f41a240c6768994d623 Mon Sep 17 00:00:00 2001
From: xiaogang <825201136@qq.com>
Date: Tue, 8 Oct 2024 17:39:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=8F=91=E5=88=97=E8=A1=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js                      |  2 +-
 src/util/util.js                 |  1 +
 src/views/account/manage.vue     |  4 ++--
 src/views/distribute/addbud.vue  |  4 ++++
 src/views/distribute/product.vue | 10 ++++++++
 vue.config.js                    | 40 ++++++++++++++++----------------
 6 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/src/main.js b/src/main.js
index a935770..483360d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -30,7 +30,7 @@ Vue.prototype.$http = Axios
 Vue.prototype.$qs = qs;
 Vue.prototype.util = util
 // http://211.137.105.198:8020/
-Vue.prototype.HOST = process.env.NODE_ENV === "production" ? "http://xyfenfa.86698.cn/api/" : "/api/"//
+Vue.prototype.HOST = process.env.NODE_ENV === "production" ? "http://cdxy.qyff.86698.cn/" : "/api/"
 new Vue({
     router,
     store,
diff --git a/src/util/util.js b/src/util/util.js
index 7840757..f72881e 100644
--- a/src/util/util.js
+++ b/src/util/util.js
@@ -19,6 +19,7 @@ import {
     Loading
 } from 'element-ui'
 import { Toast } from 'wot-design'
+axios.defaults.timeout = 10000
 
 function conver(s) {
     return s < 10 ? '0' + s : s;
diff --git a/src/views/account/manage.vue b/src/views/account/manage.vue
index ffdb38c..b51efd7 100644
--- a/src/views/account/manage.vue
+++ b/src/views/account/manage.vue
@@ -42,7 +42,7 @@
         </el-table-column>
         <el-table-column prop="create_time" label="创建时间" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="260"  v-if="account == 'admin'">
+        <el-table-column label="操作" align="center" width="260"  v-if="['admin','管理员'].includes(account)">
           <template slot-scope="scope">
             <div class="flex_warp flex_items">
               <el-button type="primary" size="mini" class="mt5 ml10" @click="recovery(scope.row.id)">额度回收</el-button>
@@ -51,7 +51,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="160"  v-if="account !== 'admin'">
+        <el-table-column label="操作" align="center" width="160"  v-else>
           <template slot-scope="scope">
             <div class="flex_warp flex_items">
               <el-button type="primary" size="mini" class="mt5 ml10" @click="edit(scope.row.id)">编辑</el-button>
diff --git a/src/views/distribute/addbud.vue b/src/views/distribute/addbud.vue
index 2528687..81d8fbc 100644
--- a/src/views/distribute/addbud.vue
+++ b/src/views/distribute/addbud.vue
@@ -150,6 +150,10 @@ export default {
           } else {
             this.$toast.error(res.message);
           }
+        })
+        .catch(e => {
+          console.log(e);
+          this.$toast.error(JSON.stringify(e))
         });
     },
     goedit() {
diff --git a/src/views/distribute/product.vue b/src/views/distribute/product.vue
index 6544b8b..72c01bc 100644
--- a/src/views/distribute/product.vue
+++ b/src/views/distribute/product.vue
@@ -7,6 +7,16 @@
             end-placeholder="结束日期" size="mini" format="yyyy 年 MM 月 dd 日">
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="分发时间">
+          <el-date-picker v-model="form.distribute_time" type="daterange" range-separator="至" start-placeholder="开始日期"
+            end-placeholder="结束日期" size="mini" format="yyyy 年 MM 月 dd 日">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="领取时间">
+          <el-date-picker v-model="form.confirm_time" type="daterange" range-separator="至" start-placeholder="开始日期"
+            end-placeholder="结束日期" size="mini" format="yyyy 年 MM 月 dd 日">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item label="手机号">
           <el-input placeholder="输入手机号" v-model="form.mobile" size="mini" clearable>
           </el-input>
diff --git a/vue.config.js b/vue.config.js
index 6c02be2..80f227b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,9 +1,9 @@
-const UploadToOssPlugin = require('./scripts/uploadToOssPlugin')
+// const UploadToOssPlugin = require('./scripts/uploadToOssPlugin')
 
 module.exports = {
-    publicPath: process.env.NODE_ENV === 'production'
-        ? 'https://cqxy-bank.oss-cn-chengdu.aliyuncs.com/xinye-bank/cms'
-        : '/',
+    // publicPath: process.env.NODE_ENV === 'production'
+    //     ? 'https://cqxy-bank.oss-cn-chengdu.aliyuncs.com/xinye-bank/cms'
+    //     : '/',
     lintOnSave: false,
     productionSourceMap: false,
     css: {
@@ -14,23 +14,23 @@ module.exports = {
             },
         },
     },
-    configureWebpack: config => {
-        if (process.env.NODE_ENV !== 'production') return
-        return {
-            plugins: [
-                new UploadToOssPlugin({
-                    cdnpath: '/xinye-bank/cms',
-                    ossOption: {
-                        region: 'oss-cn-chengdu',
-                        accessKeyId: 'LTAI5tGGZzjf3tvqWk8SQj2G',
-                        accessKeySecret: 'S0NKOAUaYWoK4EGSxrMFmYDzllhvpq',
-                        bucket: 'cqxy-bank'
-                    }
-                })
+    // configureWebpack: config => {
+        // if (process.env.NODE_ENV !== 'production') return
+        // return {
+        //     plugins: [
+        //         new UploadToOssPlugin({
+        //             cdnpath: '/xinye-bank/cms',
+        //             ossOption: {
+        //                 region: 'oss-cn-chengdu',
+        //                 accessKeyId: 'LTAI5tGGZzjf3tvqWk8SQj2G',
+        //                 accessKeySecret: 'S0NKOAUaYWoK4EGSxrMFmYDzllhvpq',
+        //                 bucket: 'cqxy-bank'
+        //             }
+        //         })
 
-            ]
-        }
-    },
+        //     ]
+        // }
+    // },
     pluginOptions: {
         "cube-ui": {
             postCompile: true,