From 0c9ec9bcc545ed36f6eddd989cc79ff9635ce512 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, 11 Oct 2022 10:57:21 +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=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E6=BA=90=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/api/systemOutAccount.js    |  30 +-
 .../main/components/header-notice/index.vue   |   2 +-
 .../components/main/components/user/user.vue  |   2 +-
 .../order/orderList/components/tableList.vue  |   2 +-
 .../admin/src/pages/order/refund/index.vue    |  10 +-
 .../src/pages/product/productList/index.vue   |   2 +-
 .../src/pages/setting/devisePage/list.vue     |   2 +-
 .../pages/setting/systemOutAccount/index.vue  | 297 ++++++++++++------
 .../system/maintain/systemFile/opendir.vue    |   1 +
 .../admin/src/pages/user/grade/card/index.vue |   2 +-
 template/admin/src/pages/user/level/index.vue |   2 +-
 template/admin/src/pages/user/list/index.vue  |   2 +-
 12 files changed, 232 insertions(+), 122 deletions(-)

diff --git a/template/admin/src/api/systemOutAccount.js b/template/admin/src/api/systemOutAccount.js
index 740f61935..0c5c99781 100644
--- a/template/admin/src/api/systemOutAccount.js
+++ b/template/admin/src/api/systemOutAccount.js
@@ -41,7 +41,7 @@ export function outSaveApi(data) {
   return request({
     url: `setting/system_out_account/save`,
     method: 'post',
-    params: data
+    data
   });
 }
 
@@ -50,10 +50,32 @@ export function outSaveApi(data) {
  * @param {Object} param id {Number} 账号ID
  * @param {Object} param data {Object} 传值
  */
-export function outSavesApi(id, data) {
+export function outSavesApi(data) {
   return request({
-    url: `setting/system_out_account/update/${id}`,
+    url: `setting/system_out_account/update/${data.id}`,
     method: 'post',
-    params: data
+    data
+  });
+}
+
+/**
+ * 对外账号设置推送
+ * @param {*} id 
+ * @returns 
+ */
+export function outSetUp(id) {
+  return request({
+    url: `setting/system_out_account/set_up/${id}`,
+    method: 'get'
+  });
+}
+
+/**
+ * 对外接口列表
+ */
+export function interfaceList() {
+  return request({
+    url: `setting/system_out_interface/list`,
+    method: 'get'
   });
 }
\ No newline at end of file
diff --git a/template/admin/src/components/main/components/header-notice/index.vue b/template/admin/src/components/main/components/header-notice/index.vue
index 27db62a94..a94689783 100644
--- a/template/admin/src/components/main/components/header-notice/index.vue
+++ b/template/admin/src/components/main/components/header-notice/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="header-notice">
-    <Dropdown @on-click="jumpUrl" transfer="true">
+    <Dropdown @on-click="jumpUrl" :transfer="true">
       <div>
         <Badge dot :count="needList.length ? needList.length : 0">
           <Icon type="ios-notifications-outline" size="26"></Icon>
diff --git a/template/admin/src/components/main/components/user/user.vue b/template/admin/src/components/main/components/user/user.vue
index 80baf287a..7c3a2b819 100644
--- a/template/admin/src/components/main/components/user/user.vue
+++ b/template/admin/src/components/main/components/user/user.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="user-avatar-dropdown">
-    <Dropdown @on-click="handleClick" transfer="true">
+    <Dropdown @on-click="handleClick" :transfer="true">
       <!--<Badge :dot="!!messageUnreadCount">-->
       <!--<Avatar :src="avatars"/>-->
       <!--</Badge>-->
diff --git a/template/admin/src/pages/order/orderList/components/tableList.vue b/template/admin/src/pages/order/orderList/components/tableList.vue
index 1b2a104ff..d2f6bdc42 100644
--- a/template/admin/src/pages/order/orderList/components/tableList.vue
+++ b/template/admin/src/pages/order/orderList/components/tableList.vue
@@ -101,7 +101,7 @@
           "
         />
         <template>
-          <Dropdown @on-click="changeMenu(row, $event)" transfer="true">
+          <Dropdown @on-click="changeMenu(row, $event)" :transfer="true">
             <a href="javascript:void(0)"
               >更多
               <Icon type="ios-arrow-down"></Icon>
diff --git a/template/admin/src/pages/order/refund/index.vue b/template/admin/src/pages/order/refund/index.vue
index 5b00a9222..792b451a4 100644
--- a/template/admin/src/pages/order/refund/index.vue
+++ b/template/admin/src/pages/order/refund/index.vue
@@ -111,8 +111,8 @@
         </template>
         <template slot-scope="{ row, index }" slot="statusName">
           <div v-html="row.refund_reason" class="pt5"></div>
-          <div class="pictrue-box">
-            <div v-viewer v-if="row.refund_img" v-for="(item, index) in row.refund_img || []" :key="index">
+          <div class="pictrue-box" v-if="row.refund_img.length">
+            <div v-viewer v-for="(item, index) in row.refund_img || []" :key="index">
               <img class="pictrue mr10" v-lazy="item" :src="item" />
             </div>
           </div>
@@ -167,7 +167,7 @@
           <!--            "-->
           <!--          />-->
           <template>
-            <Dropdown @on-click="changeMenu(row, $event)">
+            <Dropdown @on-click="changeMenu(row, $event)" transfer="true">
               <a href="javascript:void(0)"
                 >更多
                 <Icon type="ios-arrow-down"></Icon>
@@ -217,9 +217,7 @@
                 <DropdownItem name="7" v-show="[1, 2].includes(row.refund_type) && row.is_pink_cancel === 0"
                   >不退款</DropdownItem
                 >
-                <DropdownItem name="8" v-show="row.is_del == 1"
-                  >删除订单</DropdownItem
-                >
+                <DropdownItem name="8" v-show="row.is_del == 1">删除订单</DropdownItem>
               </DropdownMenu>
             </Dropdown>
           </template>
diff --git a/template/admin/src/pages/product/productList/index.vue b/template/admin/src/pages/product/productList/index.vue
index dfa351889..ab6ea80a9 100644
--- a/template/admin/src/pages/product/productList/index.vue
+++ b/template/admin/src/pages/product/productList/index.vue
@@ -45,7 +45,7 @@
           ><Button type="primary" class="bnt mr15" icon="md-add">添加商品</Button></router-link
         >
         <Button v-auth="['product-crawl-save']" type="success" class="bnt mr15" @click="onCopy">商品采集</Button>
-        <Dropdown class="bnt mr15" @on-click="batchSelect" transfer="true">
+        <Dropdown class="bnt mr15" @on-click="batchSelect" :transfer="true">
           <Button type="info">
             批量操作
             <Icon type="ios-arrow-down"></Icon>
diff --git a/template/admin/src/pages/setting/devisePage/list.vue b/template/admin/src/pages/setting/devisePage/list.vue
index 4270e103c..5438e3cff 100644
--- a/template/admin/src/pages/setting/devisePage/list.vue
+++ b/template/admin/src/pages/setting/devisePage/list.vue
@@ -34,7 +34,7 @@
           </div>
           <Divider type="vertical" v-if="row.status || row.type" />
           <template>
-            <Dropdown @on-click="changeMenu(row, index, $event)" transfer="true">
+            <Dropdown @on-click="changeMenu(row, index, $event)" :transfer="true">
               <a href="javascript:void(0)"
                 >更多
                 <Icon type="ios-arrow-down"></Icon>
diff --git a/template/admin/src/pages/setting/systemOutAccount/index.vue b/template/admin/src/pages/setting/systemOutAccount/index.vue
index d3ee3be73..2da8c178e 100644
--- a/template/admin/src/pages/setting/systemOutAccount/index.vue
+++ b/template/admin/src/pages/setting/systemOutAccount/index.vue
@@ -35,7 +35,7 @@
             </FormItem>
           </Col>
         </Row> -->
-        <Row type="flex" v-if="total == 0">
+        <Row type="flex">
           <Col v-bind="grid">
             <Button v-auth="['setting-system_admin-add']" type="primary" @click="add" icon="md-add">添加账号</Button>
           </Col>
@@ -50,12 +50,12 @@
         :loading="loading"
         highlight-row
       >
-        <template slot-scope="{ row, index }" slot="roles">
+        <template slot-scope="{ row }" slot="roles">
           <div v-if="row.roles.length !== 0">
             <Tag color="blue" v-for="(item, index) in row.roles.split(',')" :key="index" v-text="item"></Tag>
           </div>
         </template>
-        <template slot-scope="{ row, index }" slot="status">
+        <template slot-scope="{ row }" slot="status">
           <i-switch
             v-model="row.status"
             :value="row.status"
@@ -69,6 +69,8 @@
           </i-switch>
         </template>
         <template slot-scope="{ row, index }" slot="action">
+          <a @click="setUp(row)">设置</a>
+          <Divider type="vertical" />
           <a @click="edit(row)">编辑</a>
           <Divider type="vertical" />
           <a @click="del(row, '删除账号', index)">删除</a>
@@ -85,37 +87,62 @@
         />
       </div>
     </Card>
-    		<Modal v-model="modals" scrollable :title="type == 0?'添加账号':'编辑账号'" :mask-closable="false" :closable="false">
-			<Form ref="modalsdate" :model="modalsdate" :rules="type == 0 ? ruleValidate : editValidate" :label-width="50" label-position="right">
-				<FormItem label="账号" prop="appid" >
-					<div style="display: flex;">
-						<Input type="text" v-model="modalsdate.appid" :disabled='type != 0'></Input>
-					</div>
-				</FormItem>
-				<FormItem label="密码" prop="appsecret">
-					<div style="display: flex;">
-						<Input type="text" v-model="modalsdate.appsecret" class="input"></Input>
-						<Button type="primary" @click="reset" class="reset">重置</Button>
-					</div>
-				</FormItem>
-				<FormItem label="描述" prop="title">
-					<div style="display: flex;">
-						<Input type="textarea" v-model="modalsdate.title"></Input>
-					</div>
-				</FormItem>
-			</Form>
-			<div slot="footer">
-				<Button v-if="modalsid == ''" type="primary" @click="ok('modalsdate')">确定</Button>
-				<Button v-else type="primary" @click="oks('modalsdate')">确定</Button>
-				<Button @click="cancel">取消</Button>
-			</div>
-		</Modal>
+    <Modal
+      v-model="modals"
+      scrollable
+      :title="type == 0 ? '添加账号' : '编辑账号'"
+      :mask-closable="false"
+      width="700"
+      :closable="false"
+    >
+      <Form
+        ref="modalsdate"
+        :model="modalsdate"
+        :rules="type == 0 ? ruleValidate : editValidate"
+        :label-width="70"
+        label-position="right"
+      >
+        <FormItem label="账号" prop="appid">
+          <div style="display: flex">
+            <Input type="text" v-model="modalsdate.appid" :disabled="type != 0"></Input>
+          </div>
+        </FormItem>
+        <FormItem label="密码" prop="appsecret">
+          <div style="display: flex">
+            <Input type="text" v-model="modalsdate.appsecret" class="input"></Input>
+            <Button type="primary" @click="reset" class="reset">重置</Button>
+          </div>
+        </FormItem>
+        <FormItem label="描述" prop="title">
+          <div style="display: flex">
+            <Input type="textarea" v-model="modalsdate.title"></Input>
+          </div>
+        </FormItem>
+        <FormItem label="接口权限" prop="title">
+          <!-- <CheckboxGroup v-model="modalsdate.rules">
+            <Checkbox
+              :disabled="[2, 3].includes(item.id)"
+              style="width: 30%"
+              v-for="item in intList"
+              :key="item.id"
+              :label="item.id"
+              >{{ item.name }}</Checkbox
+            >
+          </CheckboxGroup> -->
+          <Tree :data="intList" multiple show-checkbox ref="tree" @on-check-change="selectTree"></Tree>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="primary" @click="ok('modalsdate')">确定</Button>
+        <Button @click="cancel">取消</Button>
+      </div>
+    </Modal>
   </div>
 </template>
 
 <script>
 import { mapState } from 'vuex';
-import { accountListApi, outSaveApi, outSavesApi, setShowApi } from '@/api/systemOutAccount';
+import { accountListApi, outSaveApi, outSavesApi, setShowApi, outSetUp, interfaceList } from '@/api/systemOutAccount';
 export default {
   name: 'systemOut',
   data() {
@@ -141,7 +168,24 @@ export default {
       },
       status: '',
       list: [],
+      intList: [],
+      columns: [
+        {
+          type: 'selection',
+          width: 60,
+          align: 'center',
+        },
+        {
+          title: '接口名称',
+          key: 'name',
+        },
+      ],
       columns1: [
+        {
+          title: '编号',
+          key: 'id',
+          minWidth: 80,
+        },
         {
           title: '账号',
           key: 'appid',
@@ -186,26 +230,19 @@ export default {
       modals: false,
       modalsid: '',
       type: 0,
-      modalsdate:{
-        appid: "",
+      modalsdate: {
+        appid: '',
         appsecret: '',
-        title: ''
+        title: '',
+        rules: [],
       },
       ruleValidate: {
-        appid: [
-         { required: true, message: '请输入正确的账号 (4到30位之间)', trigger: 'blur', min:4, max:30}
-        ],
-        appsecret: [
-          { required: true, message: '请输入正确的密码 (6到32位之间)', trigger: 'blur', min:6, max:32 }
-        ],
-        title: [
-          {message: '请输入正确的描述 (不能多于200位数)', trigger: 'blur', max:200 }
-        ]
+        appid: [{ required: true, message: '请输入正确的账号 (4到30位之间)', trigger: 'blur', min: 4, max: 30 }],
+        appsecret: [{ required: true, message: '请输入正确的密码 (6到32位之间)', trigger: 'blur', min: 6, max: 32 }],
+        title: [{ message: '请输入正确的描述 (不能多于200位数)', trigger: 'blur', max: 200 }],
       },
       editValidate: {
-        appsecret: [
-          { required: false, message: '请输入正确的密码 (6到32位之间)', trigger: 'blur', min:6, max:32 }
-        ]
+        appsecret: [{ required: false, message: '请输入正确的密码 (6到32位之间)', trigger: 'blur', min: 6, max: 32 }],
       },
     };
   },
@@ -261,16 +298,77 @@ export default {
     },
     // 添加
     add() {
-      this.modals = true
-      this.type = 0
+      this.modals = true;
+      this.type = 0;
+      this.modalsdate = {
+        appid: '',
+        appsecret: '',
+        title: '',
+        rules: [],
+      };
+      this.getIntList();
+    },
+    selectTree(e, i) {
+      console.log(e, i);
+    },
+    getIntList(type, list) {
+      interfaceList().then((res) => {
+        this.intList = res.data;
+        if (!type) {
+          this.intList.map((item) => {
+            if (item.id === 1) {
+              item.checked = true;
+              item.disableCheckbox = true;
+              if (item.children.length) {
+                item.children.map((v) => {
+                  v.checked = true;
+                  v.disableCheckbox = true;
+                });
+              }
+            }
+          });
+        } else {
+          list.map((item) => {
+            this.intList.map((e) => {
+              if (e.id === 1) {
+                e.checked = true;
+                e.disableCheckbox = true;
+                if (e.children.length) {
+                  e.children.map((v) => {
+                    v.checked = true;
+                    v.disableCheckbox = true;
+                  });
+                }
+              }
+              listData(e.children || [], item);
+            });
+          });
+        }
+        function listData(list, id) {
+          if (list.length) {
+            list.map((v) => {
+              if (v.id == id) {
+                v.checked = true;
+              }
+              if (v.children) {
+                listData(v.children);
+              }
+            });
+          }
+        }
+      });
     },
     // 编辑
     edit(row) {
-      this.modals = true
-      this.modalsdate.appid = row.appid
-      this.modalsdate.title = row.title
-      this.modalsid = row.id
-      this.type = 1
+      this.modals = true;
+      this.modalsdate.appid = row.appid;
+      this.modalsdate.title = row.title;
+      this.modalsdate.rules = row.rules.map((e) => {
+        return Number(e);
+      });
+      this.modalsid = row.id;
+      this.type = 1;
+      this.getIntList('edit', this.modalsdate.rules);
     },
     // 删除
     del(row, tit, num) {
@@ -290,6 +388,10 @@ export default {
           this.$Message.error(res.msg);
         });
     },
+    // 编辑
+    setUp(row) {
+      this.$modalForm(outSetUp(row.id)).then(() => this.getList());
+    },
     // 搜索
     userSearchs() {
       this.formValidate.status = this.status === 'all' ? '' : this.status;
@@ -297,74 +399,61 @@ export default {
       this.list = [];
       this.getList();
     },
-    ok(name){
+    ok(name) {
+      console.log(this.$refs.tree.getCheckedAndIndeterminateNodes());
+      let fuc = this.modalsid ? outSavesApi : outSaveApi;
       this.$refs[name].validate((valid) => {
         if (valid) {
-          outSaveApi(this.modalsdate).then(res=>{
-            this.modalsdate = {
-              appid: "",
-              appsecret: '',
-              title: ''
-            }
-            this.modals = false,
-            this.$Message.success(res.msg);
-            this.modalsid = ''
-            this.getList()
-          }).catch(err=>{
-            this.$Message.error(err.msg);
-          })
+          this.modalsdate.rules = [];
+          this.$refs.tree.getCheckedAndIndeterminateNodes().map((node) => {
+            this.modalsdate.rules.push(node.id);
+          });
+          if (this.modalsid) this.modalsdate.id = this.modalsid;
+          fuc(this.modalsdate)
+            .then((res) => {
+              this.modalsdate = {
+                appid: '',
+                appsecret: '',
+                title: '',
+                rules: [],
+              };
+              (this.modals = false), this.$Message.success(res.msg);
+              this.modalsid = '';
+              this.getList();
+            })
+            .catch((err) => {
+              this.$Message.error(err.msg);
+            });
         } else {
-          this.$Message.warning("请完善数据");
+          this.$Message.warning('请完善数据');
         }
       });
     },
-    oks(name){
-      this.$refs[name].validate((valid) => {
-        if (valid) {
-          delete this.modalsdate.appid
-          outSavesApi(this.modalsid,this.modalsdate).then(res=>{
-            this.modalsdate = {
-              appid: "",
-              appsecret: '',
-              title: ''
-            }
-            this.modals = false,
-            this.$Message.success(res.msg);
-            this.modalsid = ''
-            this.getList()
-          }).catch(err=>{
-            this.$Message.error(err.msg);
-          })
-        } else {
-          this.$Message.warning("请完善数据");
-        }
-      });
-    },
-    cancel(){
-      this.modalsid = ''
+    cancel() {
+      this.modalsid = '';
       this.modalsdate = {
-        appid: "",
+        appid: '',
         appsecret: '',
-        title: ''
-      }
-      this.modals = false
+        title: '',
+      };
+      this.modals = false;
     },
-    reset(){
-      let len = 16
-      let chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678' 
-      let maxPos = chars.length
-      let pwd = ''
+    reset() {
+      let len = 16;
+      let chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678';
+      let maxPos = chars.length;
+      let pwd = '';
       for (let i = 0; i < len; i++) {
-        pwd += chars.charAt(Math.floor(Math.random() * maxPos))
+        pwd += chars.charAt(Math.floor(Math.random() * maxPos));
       }
-      this.modalsdate.appsecret =  pwd
+      this.modalsdate.appsecret = pwd;
     },
   },
 };
 </script>
 
 <style scoped>
-  .reset {
-    margin-left: 10px;
-  }
+.reset {
+  margin-left: 10px;
+}
 </style>
diff --git a/template/admin/src/pages/system/maintain/systemFile/opendir.vue b/template/admin/src/pages/system/maintain/systemFile/opendir.vue
index 2e4993b77..fd7663ae2 100644
--- a/template/admin/src/pages/system/maintain/systemFile/opendir.vue
+++ b/template/admin/src/pages/system/maintain/systemFile/opendir.vue
@@ -284,6 +284,7 @@ export default {
         };
       } else {
         params = this.formItem;
+        params.fileToken = this.fileToken;
       }
       if (!is_edit) this.loading = true;
       opendirListApi(params)
diff --git a/template/admin/src/pages/user/grade/card/index.vue b/template/admin/src/pages/user/grade/card/index.vue
index e5636632e..27edd7e92 100644
--- a/template/admin/src/pages/user/grade/card/index.vue
+++ b/template/admin/src/pages/user/grade/card/index.vue
@@ -51,7 +51,7 @@
         </template>
         <template slot-scope="{ row, index }" slot="action">
           <template>
-            <Dropdown @on-click="changeMenu(row, $event, index)" transfer="true">
+            <Dropdown @on-click="changeMenu(row, $event, index)" :transfer="true">
               <a href="javascript:void(0)">
                 更多
                 <Icon type="ios-arrow-down"></Icon>
diff --git a/template/admin/src/pages/user/level/index.vue b/template/admin/src/pages/user/level/index.vue
index 98d62c2fd..ddd19d9a8 100644
--- a/template/admin/src/pages/user/level/index.vue
+++ b/template/admin/src/pages/user/level/index.vue
@@ -109,7 +109,7 @@
           <a @click="edit(row)">编辑</a>
           <Divider type="vertical" />
           <template>
-            <Dropdown @on-click="changeMenu(row, $event, index)" transfer="true">
+            <Dropdown @on-click="changeMenu(row, $event, index)" :transfer="true">
               <a href="javascript:void(0)">
                 更多
                 <Icon type="ios-arrow-down"></Icon>
diff --git a/template/admin/src/pages/user/list/index.vue b/template/admin/src/pages/user/list/index.vue
index 1db166df4..d8406dcf0 100644
--- a/template/admin/src/pages/user/list/index.vue
+++ b/template/admin/src/pages/user/list/index.vue
@@ -281,7 +281,7 @@
           <a @click="edit(row)">编辑</a>
           <Divider type="vertical" />
           <template>
-            <Dropdown @on-click="changeMenu(row, $event, index)" transfer="true">
+            <Dropdown @on-click="changeMenu(row, $event, index)" :transfer="true">
               <a href="javascript:void(0)">
                 更多
                 <Icon type="ios-arrow-down"></Icon>