From a341c44c4dae92fde95a61abf4a1e276ac41dba0 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 8 Jan 2023 12:12:31 +0800
Subject: [PATCH] =?UTF-8?q?mp=EF=BC=9A=E5=AE=9E=E7=8E=B0=20tag=20=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E7=9A=84=E5=89=8D=E7=AB=AF=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin/src/api/mp/tag.js              |  52 +++++
 .../src/api/wechatMp/wxAccountFansTag.js      |  54 -----
 yudao-ui-admin/src/api/wechatMp/wxFansTag.js  |  54 -----
 yudao-ui-admin/src/views/mp/account/index.vue |   8 +-
 yudao-ui-admin/src/views/mp/tag/index.vue     | 213 ++++++++----------
 5 files changed, 148 insertions(+), 233 deletions(-)
 create mode 100644 yudao-ui-admin/src/api/mp/tag.js
 delete mode 100644 yudao-ui-admin/src/api/wechatMp/wxAccountFansTag.js
 delete mode 100644 yudao-ui-admin/src/api/wechatMp/wxFansTag.js

diff --git a/yudao-ui-admin/src/api/mp/tag.js b/yudao-ui-admin/src/api/mp/tag.js
new file mode 100644
index 000000000..b0f3b4f0f
--- /dev/null
+++ b/yudao-ui-admin/src/api/mp/tag.js
@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 创建公众号标签
+export function createTag(data) {
+  return request({
+    url: '/mp/tag/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新公众号标签
+export function updateTag(data) {
+  return request({
+    url: '/mp/tag/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除公众号标签
+export function deleteTag(id) {
+  return request({
+    url: '/mp/tag/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得公众号标签
+export function getTag(id) {
+  return request({
+    url: '/mp/tag/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得公众号标签分页
+export function getTagPage(query) {
+  return request({
+    url: '/mp/tag/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 同步公众号标签
+export function syncTag(accountId) {
+  return request({
+    url: '/mp/tag/sync?accountId=' + accountId,
+    method: 'post'
+  })
+}
diff --git a/yudao-ui-admin/src/api/wechatMp/wxAccountFansTag.js b/yudao-ui-admin/src/api/wechatMp/wxAccountFansTag.js
deleted file mode 100644
index dff041ee9..000000000
--- a/yudao-ui-admin/src/api/wechatMp/wxAccountFansTag.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import request from '@/utils/request'
-
-// 创建粉丝标签关联
-export function createWxAccountFansTag(data) {
-  return request({
-    url: '/wechatMp/wx-account-fans-tag/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新粉丝标签关联
-export function updateWxAccountFansTag(data) {
-  return request({
-    url: '/wechatMp/wx-account-fans-tag/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除粉丝标签关联
-export function deleteWxAccountFansTag(id) {
-  return request({
-    url: '/wechatMp/wx-account-fans-tag/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得粉丝标签关联
-export function getWxAccountFansTag(id) {
-  return request({
-    url: '/wechatMp/wx-account-fans-tag/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得粉丝标签关联分页
-export function getWxAccountFansTagPage(query) {
-  return request({
-    url: '/wechatMp/wx-account-fans-tag/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 导出粉丝标签关联 Excel
-export function exportWxAccountFansTagExcel(query) {
-  return request({
-    url: '/wechatMp/wx-account-fans-tag/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}
diff --git a/yudao-ui-admin/src/api/wechatMp/wxFansTag.js b/yudao-ui-admin/src/api/wechatMp/wxFansTag.js
deleted file mode 100644
index 50b9f8788..000000000
--- a/yudao-ui-admin/src/api/wechatMp/wxFansTag.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import request from '@/utils/request'
-
-// 创建粉丝标签
-export function createWxFansTag(data) {
-  return request({
-    url: '/wechatMp/fans-tag/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新粉丝标签
-export function updateWxFansTag(data) {
-  return request({
-    url: '/wechatMp/fans-tag/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除粉丝标签
-export function deleteWxFansTag(id) {
-  return request({
-    url: '/wechatMp/fans-tag/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得粉丝标签
-export function getWxFansTag(id) {
-  return request({
-    url: '/wechatMp/fans-tag/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得粉丝标签分页
-export function getWxFansTagList(query) {
-  return request({
-    url: '/wechatMp/fans-tag/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 导出粉丝标签 Excel
-export function exportWxFansTagExcel(query) {
-  return request({
-    url: '/wechatMp/fans-tag/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}
diff --git a/yudao-ui-admin/src/views/mp/account/index.vue b/yudao-ui-admin/src/views/mp/account/index.vue
index 87f116212..74f7c2c15 100644
--- a/yudao-ui-admin/src/views/mp/account/index.vue
+++ b/yudao-ui-admin/src/views/mp/account/index.vue
@@ -137,8 +137,6 @@ export default {
     return {
       // 遮罩层
       loading: true,
-      // 导出遮罩层
-      exportLoading: false,
       // 显示搜索条件
       showSearch: true,
       // 总条数
@@ -167,8 +165,6 @@ export default {
         appSecret: [{required: true, message: '公众号密钥不能为空', trigger: 'blur'}],
         token: [{required: true, message: '公众号 token 不能为空', trigger: 'blur'}],
       },
-      // 禁用属性
-      disabled: false,
     }
   },
   created() {
@@ -190,7 +186,6 @@ export default {
     /** 取消按钮 */
     cancel() {
       this.open = false
-      this.disabled = false
       this.reset()
     },
     /** 表单重置 */
@@ -232,7 +227,6 @@ export default {
         this.form = response.data
         this.open = true
         this.title = '修改公众号账号'
-        this.disabled = true
       })
     },
     /** 提交按钮 */
@@ -283,7 +277,7 @@ export default {
     /** 清空二维码 API 配额的按钮操作 */
     handleCleanQuota(row) {
       const id = row.id
-      this.$modal.confirm('是否清空生成公众号账号编号为"' + row.name + '"的 API 配额?').then(function () {
+      this.$modal.confirm('是否确认清空生成公众号账号编号为"' + row.name + '"的 API 配额?').then(function () {
         return clearAccountQuota(id)
       }).then(() => {
         this.$modal.msgSuccess('清空 API 配额成功')
diff --git a/yudao-ui-admin/src/views/mp/tag/index.vue b/yudao-ui-admin/src/views/mp/tag/index.vue
index b2c2fc5af..7c9ccdd10 100644
--- a/yudao-ui-admin/src/views/mp/tag/index.vue
+++ b/yudao-ui-admin/src/views/mp/tag/index.vue
@@ -3,10 +3,14 @@
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="公众号" prop="accountId">
+        <el-select v-model="queryParams.accountId" placeholder="请选择公众号">
+          <el-option v-for="item in accounts" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="标签名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入标签名称" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -17,54 +21,41 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['wechatMp:fans-tag:create']">新增
+                   v-hasPermi="['mp:tag:create']">新增
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-                   :loading="exportLoading"
-                   v-hasPermi="['wechatMp:fans-tag:export']">导出
+        <el-button type="info" plain icon="el-icon-refresh" size="mini" @click="handleSync"
+                   v-hasPermi="['mp:tag:sync']">同步
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    <div style="display: flex;width: auto">
-      <div class="left_column" style="border: 1px solid #EBEEF5FF; width: 15%;height: auto">
-        <div style="padding: 10px 20px; border-bottom: 1px solid #ebeef5; box-sizing: border-box;"><span
-          style="font-size: 16px">公众号名称</span></div>
-
-        <div style="margin-top: 10px;margin-right: 5px;margin-left: 5px">
-          <input type="text" placeholder="输入关键字进行过滤"
-                 class="el-input__inner"/>
-        </div>
-
-        <div style="margin-top: 10px;margin-right: 5px;margin-left: 5px">
-          <div style="margin-right: 5px;margin-left: 5px" v-for="(account,index) in accountList" @click="getAccountTag(account.appId)">{{ account.name }}</div>
-        </div>
-      </div>
-      <div class="right_column" style="width: 85%">
-        <!-- 列表 -->
-        <el-table v-loading="loading" :data="list">
-          <el-table-column label="编号" align="center" prop="id"/>
-          <el-table-column label="标签名称" align="center" prop="name"/>
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-            <template slot-scope="scope">
-              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                         v-hasPermi="['wechatMp:fans-tag:update']">修改
-              </el-button>
-              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                         v-hasPermi="['wechatMp:fans-tag:delete']">删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <!-- 分页组件 -->
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                    @pagination="getList"/>
-
-      </div>
-    </div>
 
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="编号" align="center" prop="id"/>
+      <el-table-column label="标签名称" align="center" prop="name"/>
+      <el-table-column label="粉丝数" align="center" prop="count"/>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['mp:tag:update']">修改
+          </el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['mp:tag:delete']">删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
 
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -72,12 +63,6 @@
         <el-form-item label="标签名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入标签名称"/>
         </el-form-item>
-        <el-form-item label="粉丝数量" prop="count">
-          <el-input v-model="form.count" placeholder="请输入粉丝数量"/>
-        </el-form-item>
-        <el-form-item label="微信账号ID" prop="wxAccountId">
-          <el-input v-model="form.wxAccountId" placeholder="请输入微信账号ID"/>
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -87,89 +72,83 @@
   </div>
 </template>
 
-<style>
-.left_column {
-  height: 100%;
-  position: relative;
-  overflow: auto;
-}
-</style>
-
 <script>
 import {
-  createWxFansTag,
-  deleteWxFansTag,
-  exportWxFansTagExcel,
-  getWxFansTag,
-  getWxFansTagList,
-  updateWxFansTag
-} from '@/api/wechatMp/wxFansTag'
-import {getAccountPage} from '@/api/mp/account'
+  createTag,
+  updateTag,
+  deleteTag,
+  getTag,
+  getTagPage,
+  syncTag,
+} from '@/api/mp/tag'
+import { getSimpleAccounts} from '@/api/mp/account'
 
 export default {
-  name: 'WxFansTag',
+  name: 'MpTag',
   components: {},
   data() {
     return {
       // 遮罩层
       loading: true,
-      // 导出遮罩层
-      exportLoading: false,
       // 显示搜索条件
       showSearch: true,
       // 总条数
       total: 0,
-      // 粉丝标签列表
+      // 公众号标签列表
       list: [],
-      // 账号列表
-      accountList: [],
       // 弹出层标题
       title: '',
       // 是否显示弹出层
       open: false,
-      dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
-        appId: null,
+        accountId: null,
+        name: null,
       },
       // 表单参数
-      form: {},
+      form: {
+        accountId: undefined,
+        name: undefined,
+      },
       // 表单校验
-      rules: {}
+      rules: {
+        name: [{ required: true, message: '请输入标签名称', trigger: 'blur' }]
+      },
+
+      // 公众号账号列表
+      accounts: []
     }
   },
   created() {
-    this.getAccountList()
+    getSimpleAccounts().then(response => {
+      this.accounts = response.data;
+      // 默认选中第一个
+      if (this.accounts.length > 0) {
+        this.queryParams.accountId = this.accounts[0].id;
+      }
+      // 加载数据
+      this.getList();
+    })
   },
   methods: {
     /** 查询列表 */
-    getList(appId) {
+    getList() {
+      // 如果没有选中公众号账号，则进行提示。
+      if (!this.queryParams.accountId) {
+        this.$message.error('未选中公众号，无法查询标签')
+        return false
+      }
+
       this.loading = false
-      this.queryParams.appId = appId
       // 处理查询参数
       let params = {...this.queryParams}
       // 执行查询
-      getWxFansTagList(params).then(response => {
-        this.list = response.data
+      getTagPage(params).then(response => {
+        this.list = response.data.list
+        this.total = response.data.total
         this.loading = false
       })
     },
-    /** 查询列表 */
-    getAccountList() {
-      // 执行查询
-      getAccountPage().then(response => {
-        this.accountList = response.data.list
-      })
-    },
-
-    /**
-     * 获取帐户标签
-     * @param appId 公众号appId
-     */
-    getAccountTag(appId) {
-      this.getList(appId)
-    },
-
     /** 取消按钮 */
     cancel() {
       this.open = false
@@ -178,7 +157,8 @@ export default {
     /** 表单重置 */
     reset() {
       this.form = {
-        appId: undefined,
+        accountId: undefined,
+        name: undefined,
       }
       this.resetForm('form')
     },
@@ -189,24 +169,27 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeCreateTime = []
       this.resetForm('queryForm')
+      // 默认选中第一个
+      if (this.accounts.length > 0) {
+        this.queryParams.accountId = this.accounts[0].id;
+      }
       this.handleQuery()
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset()
       this.open = true
-      this.title = '添加粉丝标签'
+      this.title = '添加公众号标签'
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()
       const id = row.id
-      getWxFansTag(id).then(response => {
+      getTag(id).then(response => {
         this.form = response.data
         this.open = true
-        this.title = '修改粉丝标签'
+        this.title = '修改公众号标签'
       })
     },
     /** 提交按钮 */
@@ -215,9 +198,10 @@ export default {
         if (!valid) {
           return
         }
+        this.form.accountId = this.queryParams.accountId;
         // 修改的提交
         if (this.form.id != null) {
-          updateWxFansTag(this.form).then(response => {
+          updateTag(this.form).then(response => {
             this.$modal.msgSuccess('修改成功')
             this.open = false
             this.getList()
@@ -225,7 +209,7 @@ export default {
           return
         }
         // 添加的提交
-        createWxFansTag(this.form).then(response => {
+        createTag(this.form).then(response => {
           this.$modal.msgSuccess('新增成功')
           this.open = false
           this.getList()
@@ -235,31 +219,24 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const id = row.id
-      this.$modal.confirm('是否确认删除粉丝标签编号为"' + id + '"的数据项?').then(function () {
-        return deleteWxFansTag(id)
+      this.$modal.confirm('是否确认删除公众号标签编号为"' + id + '"的数据项?').then(function () {
+        return deleteTag(id)
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess('删除成功')
       }).catch(() => {
       })
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      // 处理查询参数
-      let params = {...this.queryParams}
-      params.pageNo = undefined
-      params.pageSize = undefined
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime')
-      // 执行导出
-      this.$modal.confirm('是否确认导出所有粉丝标签数据项?').then(() => {
-        this.exportLoading = true
-        return exportWxFansTagExcel(params)
-      }).then(response => {
-        this.$download.excel(response, '粉丝标签.xls')
-        this.exportLoading = false
+    /** 同步标签 */
+    handleSync() {
+      const accountId = this.queryParams.accountId
+      this.$modal.confirm('是否确认同步标签？').then(function () {
+        return syncTag(accountId)
+      }).then(() => {
+        this.$modal.msgSuccess('同步标签成功')
       }).catch(() => {
       })
-    }
+    },
   }
 }
 </script>