From 01fa0e3b4ba7e5039973d68032e95ecedd19b88a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Tue, 6 Dec 2022 18:47:02 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=A8=A1=E7=89=88=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E3=80=91=E6=9B=B4=E6=96=B0=E7=AE=A1=E7=90=86=E7=AB=AF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=BA=90=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/src/pages/account/login/index.vue    |  8 ++++----
 .../financialRecords/recharge/index.vue        |  2 +-
 .../systemMenus/components/menusFrom.vue       | 17 -----------------
 template/admin/src/pages/system/file/index.vue | 18 ++++++++++++++----
 4 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/template/admin/src/pages/account/login/index.vue b/template/admin/src/pages/account/login/index.vue
index 8aabea8f2..763ee3313 100644
--- a/template/admin/src/pages/account/login/index.vue
+++ b/template/admin/src/pages/account/login/index.vue
@@ -226,14 +226,14 @@ export default {
             if (data.queue === false) {
               this.$Notice.warning({
                 title: '温馨提示',
-                desc: '您的【消息队列】未开启，没有开启会导致异步任务无法执行。请尽快执行命令开启！！',
+                desc: '您的【消息队列】未开启，没有开启会导致异步任务无法执行。请尽快执行命令开启！！<a href="https://doc.crmeb.com/single/crmeb_v4/6963" target="_blank">点击查看开启方法</a>',
                 duration: 30,
               });
             }
             if (data.timer === false) {
               this.$Notice.warning({
                 title: '温馨提示',
-                desc: '您的【定时任务】未开启，没有开启会导致定时执行的任务无法执行。请尽快执行命令开启！！',
+                desc: '您的【定时任务】未开启，没有开启会导致定时执行的任务无法执行。请尽快执行命令开启！！<a href="https://doc.crmeb.com/single/crmeb_v4/6962" target="_blank">点击查看开启方法</a>',
                 duration: 30,
               });
             }
@@ -267,7 +267,7 @@ export default {
             isNotice = true;
             this.$Notice.warning({
               title: '温馨提示',
-              desc: '您的【长连接】未开启，没有开启会导致客服消息无法发送,后台订单通知无法收到。请尽快执行命令开启！！',
+              desc: '您的【长连接】未开启，没有开启会导致客服消息无法发送,后台订单通知无法收到。请尽快执行命令开启！！<a href="https://doc.crmeb.com/single/crmeb_v4/6931" target="_blank">点击查看开启方法</a>',
               duration: 30,
             });
           }
@@ -277,7 +277,7 @@ export default {
             isNotice = true;
             this.$Notice.warning({
               title: '温馨提示',
-              desc: '您的【长连接】未开启，没有开启会导致客服消息无法发送,后台订单通知无法收到。请尽快执行命令开启！！',
+              desc: '您的【长连接】未开启，没有开启会导致客服消息无法发送,后台订单通知无法收到。请尽快执行命令开启！！<a href="https://doc.crmeb.com/single/crmeb_v4/6931" target="_blank">点击查看开启方法</a>',
               duration: 30,
             });
           }
diff --git a/template/admin/src/pages/finance/financialRecords/recharge/index.vue b/template/admin/src/pages/finance/financialRecords/recharge/index.vue
index b536502f3..8259cc24e 100644
--- a/template/admin/src/pages/finance/financialRecords/recharge/index.vue
+++ b/template/admin/src/pages/finance/financialRecords/recharge/index.vue
@@ -75,7 +75,7 @@
         no-filtered-data-text="暂无筛选结果"
       >
         <template slot-scope="{ row, index }" slot="right">
-          <a href="javascript:void(0);" v-if="row.refund_price <= 0 && row.paid" @click="refund(row)">退款</a>
+          <a href="javascript:void(0);" v-if="row.refund_price <= 0 && row.paid && row.recharge_type != 'system'" @click="refund(row)">退款</a>
           <!--                    <Divider type="vertical"  v-if="row.paid"/>-->
           <a href="javascript:void(0);" v-if="row.paid === 0" @click="del(row, '此条充值记录', index)">删除</a>
         </template>
diff --git a/template/admin/src/pages/setting/systemMenus/components/menusFrom.vue b/template/admin/src/pages/setting/systemMenus/components/menusFrom.vue
index 3cf25f49e..12e27f208 100644
--- a/template/admin/src/pages/setting/systemMenus/components/menusFrom.vue
+++ b/template/admin/src/pages/setting/systemMenus/components/menusFrom.vue
@@ -56,14 +56,6 @@
               <Input v-model="formValidate.api_url" placeholder="请输入接口地址" prop="api_url"></Input>
             </FormItem>
           </Col>
-          <!-- <Col v-bind="grid" v-show="authType">
-            <FormItem label="接口参数：">
-              <Input
-                v-model="formValidate.params"
-                placeholder="举例:a/123/b/234"
-              ></Input>
-            </FormItem>
-          </Col> -->
           <Col v-bind="grid" v-show="authType">
             <FormItem label="路由地址：" prop="menu_path">
               <Input v-model="formValidate.menu_path" placeholder="请输入路由地址"></Input>
@@ -84,15 +76,6 @@
               ></Input>
             </FormItem>
           </Col>
-          <!--<Col v-bind="grid" v-show="authType">-->
-          <!--<FormItem label="顶部菜单：">-->
-          <!--<Select v-model="formValidate.header" filterable allow-create @on-create="handleCreate1">-->
-          <!--<Option v-for="(item,i) in headerOptionsList" :value="item.value" :key="i">{{ item.label-->
-          <!--}}-->
-          <!--</Option>-->
-          <!--</Select>-->
-          <!--</FormItem>-->
-          <!--</Col>-->
 
           <Col v-bind="grid">
             <FormItem label="排序：">
diff --git a/template/admin/src/pages/system/file/index.vue b/template/admin/src/pages/system/file/index.vue
index e9a088fba..654117d67 100644
--- a/template/admin/src/pages/system/file/index.vue
+++ b/template/admin/src/pages/system/file/index.vue
@@ -23,17 +23,24 @@ export default {
 
     this.$nextTick(() => {
       let winwidth = this.$refs.picBox.clientWidth;
-      console.log(winwidth);
+      let winHeight = document.body.clientHeight - 170;
+      console.log(winwidth,winHeight);
       if (winwidth < 1018) {
         this.pageLimit = 18;
+        this.pageLimit = winHeight > 790 ? 24 : 18;
+
       } else if (winwidth < 1185) {
-        this.pageLimit = 18;
+        this.pageLimit = winHeight > 790 ? 30  : 18;
       } else if (winwidth < 1222) {
-        this.pageLimit = 24;
+        this.pageLimit = 30;
       } else if (winwidth < 1327) {
         this.pageLimit = 32;
-      } else if (winwidth > 1483) {
+      } else if (winwidth < 1750) {
         this.pageLimit = 40;
+      } else if (winwidth < 2100) {
+          this.pageLimit = winHeight > 790 ? 60 : 48;
+      } else if (winwidth > 2100) {
+        this.pageLimit = winHeight > 790 ? 75 : 60;
       }
       this.uploadShow = true;
     });
@@ -50,4 +57,7 @@ export default {
 /deep/ .ivu-card-body{
   min-height: 700px;
 }
+/deep/ .conter .pictrueList{
+  max-width 100%
+}
 </style>