diff --git a/src/api/xq/sysPush.js b/src/api/xq/sysPush.js
index 24ff36a..2079ce8 100644
--- a/src/api/xq/sysPush.js
+++ b/src/api/xq/sysPush.js
@@ -42,3 +42,23 @@ export function delSysPush(id) {
     method: 'delete'
   })
 }
+
+export function runSysPush(id) {
+  return request({
+    url: '/xq/sysPush/run',
+    method: 'post',
+    data: {
+      id
+    }
+  })
+}
+
+export function closeSysPush(id) {
+  return request({
+    url: '/xq/sysPush/close',
+    method: 'post',
+    data: {
+      id
+    }
+  })
+}
diff --git a/src/api/xq/userExtend.js b/src/api/xq/userExtend.js
index 8e3f8b5..73c0f04 100644
--- a/src/api/xq/userExtend.js
+++ b/src/api/xq/userExtend.js
@@ -1,6 +1,5 @@
 import request from '@/utils/request'
 
-// 查询用户邀请列表
 export function listUserExtend(query) {
   return request({
     url: '/xq/userExtend/list',
@@ -9,7 +8,6 @@ export function listUserExtend(query) {
   })
 }
 
-// 查询用户邀请详细
 export function getUserExtend(id) {
   return request({
     url: '/xq/userExtend/' + id,
@@ -17,7 +15,6 @@ export function getUserExtend(id) {
   })
 }
 
-// 修改用户邀请
 export function updateIncomeCoin(data) {
   return request({
     url: '/xq/userExtend/updateIncomeCoin',
@@ -26,3 +23,10 @@ export function updateIncomeCoin(data) {
   })
 }
 
+export function updateWxTransNum(data) {
+  return request({
+    url: '/xq/userExtend/updateWxTransNum',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/constant/statusMap.js b/src/constant/statusMap.js
index 808fb84..c76c901 100644
--- a/src/constant/statusMap.js
+++ b/src/constant/statusMap.js
@@ -142,12 +142,6 @@ export const reportTypeList = [
   { value: 4, label: 'IM页面'},
 ]
 
-export const platformTypeList = [
-  { value: '1', label: '支付宝',listClass: listClass.primary},
-  { value: '2', label: '微信',listClass: listClass.danger},
-  { value: 'ADMIN', label: '后台操作',listClass: listClass.info},
-]
-
 export const ipMicList = [
   { value: 1, label: 'IP'},
   { value: 2, label: 'MIC'},
@@ -228,40 +222,6 @@ export const userErrorLogHomeIndexList = [
   { value: 'other', label: '其他',listClass: listClass.success},
 ]
 
-export const systemPushGroupIdList = [
-  { value: 0, label: '单个用户'},
-  { value: 1, label: '全部用户'},
-  { value: 2, label: '男用户'},
-  { value: 3, label: '女用户'},
-  { value: 4, label: '认证女神'},
-]
-
-export const systemPushLogStatus = [
-  { value: 0, label: '未推送',listClass: listClass.info},
-  { value: 1, label: '推送中',listClass: listClass.primary},
-  { value: 2, label: '推送失败',listClass: listClass.danger},
-  { value: 3, label: '推送成功',listClass: listClass.success},
-]
-
-export const systemPushSendTimeTypeList = [
-  { value: 0, label: '手动发送',listClass: listClass.primary},
-  { value: 1, label: '定时发送',listClass: listClass.danger},
-]
-export const systemPushStatusList = [
-  { value: 0, label: '未执行',listClass: listClass.info},
-  { value: 1, label: '执行中',listClass: listClass.warning},
-  { value: 2, label: '队列执行中',listClass: listClass.primary},
-  { value: 3, label: '已完成',listClass: listClass.success},
-  { value: 4, label: '已取消',listClass: listClass.info},
-  { value: 10, label: '执行失败',listClass: listClass.danger}
-]
-export const systemPushTypeList = [
-  { value: 0, label: '纯文字消息',listClass: listClass.info},
-  { value: 1, label: '文本消息',listClass: listClass.primary},
-  { value: 2, label: '单图文消息',listClass: listClass.success},
-  { value: 3, label: '多图文消息',listClass: listClass.warning},
-  { value: 4, label: '纯图文消息',listClass: listClass.warning},
-]
 export const versionPlatformList = [
   { value: 1, label: '安卓'},
   { value: 2, label: 'IOS'},
@@ -358,6 +318,41 @@ export const userCompanyNatureList = [
 
 
 /**  用户 - 为谁征婚 */
+
+export const systemPushGroupIdList = [
+  { value: 0, label: '单个用户'},
+  { value: 1, label: '全部用户'},
+  { value: 2, label: '男用户'},
+  { value: 3, label: '女用户'},
+]
+
+export const systemPushLogStatus = [
+  { value: 0, label: '未推送',listClass: listClass.info},
+  { value: 1, label: '推送中',listClass: listClass.primary},
+  { value: 2, label: '推送失败',listClass: listClass.danger},
+  { value: 3, label: '推送成功',listClass: listClass.success},
+]
+
+export const systemPushSendTimeTypeList = [
+  { value: 0, label: '手动发送',listClass: listClass.primary},
+  { value: 1, label: '定时发送',listClass: listClass.danger},
+]
+export const systemPushStatusList = [
+  { value: 0, label: '未执行',listClass: listClass.info},
+  { value: 1, label: '执行中',listClass: listClass.warning},
+  { value: 2, label: '队列执行中',listClass: listClass.primary},
+  { value: 3, label: '已完成',listClass: listClass.success},
+  { value: 4, label: '已取消',listClass: listClass.info},
+  { value: 10, label: '执行失败',listClass: listClass.danger}
+]
+export const systemPushTypeList = [
+  { value: 0, label: '纯文字消息',listClass: listClass.info},
+  { value: 1, label: '文本消息',listClass: listClass.primary},
+  { value: 2, label: '单图文消息',listClass: listClass.success},
+  { value: 3, label: '多图文消息',listClass: listClass.warning},
+  { value: 4, label: '纯图文消息',listClass: listClass.warning},
+]
+
 export const userForPersonalsList = [
   { value: 1, label: '为自己征婚'},
   { value: 2, label: '为子女征婚' },
@@ -506,6 +501,13 @@ export const payStatusList = [
   { value: 10, label: '无需支付',listClass: listClass.info},
 ]
 
+export const platformTypeList = [
+  { value: "ADMIN", label: '后台管理操作',listClass: listClass.danger},
+  { value: "WX", label: '微信',listClass: listClass.success},
+  { value: "ALI", label: '支付宝',listClass: listClass.primary},
+  { value: "SYS", label: '系统操作',listClass: listClass.info},
+]
+
 export const booleanList = [
   { value: true, label: '是',listClass: listClass.danger},
   { value: false, label: '否',listClass: listClass.info},
@@ -551,3 +553,9 @@ export const reportStatusList = [
   { value: 0, label: '未处理',listClass: listClass.danger},
   { value: 1, label: '已处理',listClass: listClass.primary},
 ]
+
+export const wxTransOrderSourceList = [
+  { value: 1, label: '订单',listClass: listClass.primary},
+  { value: 2, label: 'VIP赠送',listClass: listClass.warning},
+  { value: 3, label: '后台管理新增',listClass: listClass.danger},
+]
diff --git a/src/views/xq/sysPush/add-sys-push-dialog.vue b/src/views/xq/sysPush/add-sys-push-dialog.vue
new file mode 100644
index 0000000..18d6455
--- /dev/null
+++ b/src/views/xq/sysPush/add-sys-push-dialog.vue
@@ -0,0 +1,508 @@
+<template>
+  <el-dialog title="新增系统推送" :close-on-click-modal="false" :visible.sync="open" width="900px" append-to-body>
+    <el-row :gutter="10">
+      <el-col style="width: 550px">
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+          <el-form-item label="群发类型" prop="groupId">
+            <el-select v-model="form.groupId" size="small" style="width: 100%">
+              <el-option
+                  v-for="dict in systemPushGroupIdList"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="form.groupId === 0" label="用户编号" prop="usercode">
+            <el-autocomplete
+                class="inline-input"
+                v-model="form.usercode"
+                :fetch-suggestions="querySearch"
+                placeholder="请输入内容"
+                @select="handleSelect"
+                style="width: 100%"
+            ></el-autocomplete>
+          </el-form-item>
+          <el-form-item label="昵称" v-if="form.groupId === 0 && userInfo.nickname">
+            {{ userInfo.nickname }} 【{{ userInfo.usercode }}】
+          </el-form-item>
+          <el-form-item label="头像" v-if="form.groupId === 0 && userInfo.avatar">
+            <image-avatar :src="userInfo.avatar"/>
+          </el-form-item>
+          <el-form-item label="发送类型" prop="sendTimeType">
+            <el-select v-model="form.sendTimeType" size="small" style="width: 100%">
+              <el-option
+                  v-for="dict in systemPushSendTimeTypeList"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="发送时间" prop="sendTime" v-if="form.sendTimeType === 1">
+            <el-date-picker
+                :picker-options="pickerAfterOptions"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                v-model="form.sendTime"
+                type="datetime"
+                placeholder="选择发送时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="标题" prop="title">
+            <el-input v-model="form.title" placeholder="请输入标题"/>
+          </el-form-item>
+          <el-form-item label="消息类型" prop="type">
+            <el-select v-model="form.type" size="small" @change="typeSelectHandle" style="width: 100%">
+              <el-option
+                  v-for="dict in systemPushTypeList"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="消息内容" prop="onlyText" v-if="form.type === 0">
+            <el-input v-model="form.onlyText" placeholder="请输入消息内容" type="textarea" :rows="2"/>
+          </el-form-item>
+          <el-form-item label="文本一" prop="textText1" v-if="form.type === 1">
+            <el-input v-model="form.textText1" placeholder="请输入第一段文本" type="textarea" :rows="2"/>
+          </el-form-item>
+          <el-form-item label="内容" prop="textContext" v-show="form.type === 1">
+            <el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" @click="textContextAddHandle">追加
+            </el-button>
+            <el-table
+                :data="textContext"
+                ref="textContextRef"
+                style="width: 100%"
+                :row-key="(row) => {return row.id}"
+            >
+              <el-table-column align="center" prop="n" label="字段" min-width="180">
+                <template v-slot="scope">
+                  <el-input v-model="scope.row.n" placeholder="字段"/>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" prop="v" label="值" min-width="180">
+                <template v-slot="scope">
+                  <el-input v-model="scope.row.v" placeholder="值"/>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="操作">
+                <template v-slot="scope">
+                  <el-button size="mini" type="text" @click="textContextRemoveHandle(scope.row)" icon="el-icon-delete"/>
+                  <el-button size="mini" type="text" icon="el-icon-rank"/>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-form-item>
+          <el-form-item label="文本二" prop="textText2" v-if="form.type === 1">
+            <el-input v-model="form.textText2" placeholder="请输入第二段文本" type="textarea" :rows="2"/>
+          </el-form-item>
+          <el-form-item label="链接类型" prop="textLinkType" v-if="form.type === 1">
+            <el-select v-model="form.textLinkType" size="small">
+              <el-option :key="0" label="不可点击" :value="0"/>
+              <el-option :key="1" label="打开H5" :value="1"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="链接地址" prop="textLinkUrl" v-if="form.type === 1 && form.textLinkType === 1">
+            <el-input v-model="form.textLinkUrl" placeholder="请输入链接地址" type="textarea" :rows="2"/>
+          </el-form-item>
+
+          <el-form-item label="标题类型" prop="oneImageTitleType" v-if="form.type === 2">
+            <el-select v-model="form.oneImageTitleType" size="small">
+              <el-option :key="2" label="普通标题" :value="2"/>
+              <el-option :key="1" label="水印标题" :value="1"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="图片" prop="oneImageImage" v-if="form.type === 2">
+            <image-upload2 v-model="form.oneImageImage" custom-tip="建议图片比例16:9"/>
+          </el-form-item>
+          <el-form-item label="文本" prop="oneImageText" v-if="form.type === 2 && form.oneImageTitleType === 2">
+            <el-input v-model="form.oneImageText" placeholder="请输入消息文本" type="textarea" :rows="2"/>
+          </el-form-item>
+          <el-form-item label="链接类型" prop="oneImageLinkType" v-if="form.type === 2">
+            <el-select v-model="form.oneImageLinkType" size="small">
+              <el-option :key="0" label="不可点击" :value="0"/>
+              <el-option :key="1" label="打开H5" :value="1"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="链接地址" prop="oneImageLinkUrl" v-if="form.type === 2 && form.oneImageLinkType === 1">
+            <el-input v-model="form.oneImageLinkUrl" placeholder="请输入链接地址" type="textarea" :rows="2"/>
+          </el-form-item>
+          <el-form-item label="内容" prop="imageContext" v-show="form.type === 3">
+            <el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" @click="imageContextAddHandle">新增</el-button>
+            <span style="color: red">　　建议：第一张图片比例16:9，其他图片正方形。</span>
+            <el-table
+                :data="imageContext"
+                ref="imageContextRef"
+                style="width: 100%"
+                :row-key="(row) => {return row.id}"
+            >
+              <el-table-column align="center" prop="title" label="图片标题" min-width="60" show-overflow-tooltip/>
+              <el-table-column align="center" prop="image" label="图片" min-width="60">
+                <template v-slot="scope">
+                  <image-preview :src="scope.row.image" :width="60" :height="40"/>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" prop="linkType" label="链接类型" min-width="60">
+                <template v-slot="scope">
+                  <span v-if="scope.row.linkType === 0">不可点击</span>
+                  <span v-if="scope.row.linkType === 1">打开H5</span>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" prop="linkUrl" label="链接" min-width="100" show-overflow-tooltip/>
+              <el-table-column align="center" label="操作">
+                <template v-slot="scope">
+                  <el-button size="mini" type="text" @click="imageContextUpdateHandle(scope.row)" icon="el-icon-edit"/>
+                  <el-button size="mini" type="text" @click="imageContextRemoveHandle(scope.row)" icon="el-icon-delete"/>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-form-item>
+          <el-form-item label="图片" prop="onlyImage" v-if="form.type === 4">
+            <image-upload2 v-model="form.onlyImage"/>
+          </el-form-item>
+          <el-form-item label="备注说明" prop="remark">
+            <el-input v-model="form.remark" placeholder="请输入备注说明" type="textarea" :rows="2"/>
+          </el-form-item>
+        </el-form>
+      </el-col>
+      <el-col style="width: 200px;">
+        <preview-client :data="form" :textContext="textContext" :imageContext="imageContext"></preview-client>
+      </el-col>
+    </el-row>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="open = false">取 消</el-button>
+    </div>
+    <el-dialog :title="imageTitle" :close-on-click-modal="false" :visible.sync="imageOpen" width="500px" append-to-body>
+      <el-form ref="imageForm" :model="imageForm" :rules="imageRules" label-width="80px">
+        <el-form-item label="图片标题" prop="title">
+          <el-input v-model="imageForm.title" placeholder="请输入图片标题" />
+        </el-form-item>
+        <el-form-item label="图片" prop="image">
+          <image-upload2 v-model="imageForm.image"/>
+        </el-form-item>
+        <el-form-item label="链接类型" prop="linkType">
+          <el-select v-model="imageForm.linkType" size="small">
+            <el-option :key="0" label="不可点击" :value="0"/>
+            <el-option :key="1" label="打开H5" :value="1"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="链接地址" prop="linkUrl" v-if="this.imageForm.linkType === 1">
+          <el-input v-model="imageForm.linkUrl" placeholder="请输入链接地址" type="textarea" :rows="2"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="imageSubmitForm">确 定</el-button>
+        <el-button @click="imageOpen = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </el-dialog>
+</template>
+
+<script>
+import {
+  systemPushGroupIdList,
+  systemPushLogStatus,
+  systemPushSendTimeTypeList,
+  systemPushStatusList,
+  systemPushTypeList
+} from '@/constant/statusMap'
+import { getUserByUsercode, listUserByUserCode } from '@/api/xq/user'
+import Sortable from 'sortablejs'
+import PreviewClient from '@/components/PreviewInMobileClient/index.vue'
+import {addSysPush, updateSysPush} from "@/api/xq/sysPush";
+
+export default {
+  components: {
+    PreviewClient
+  },
+  data() {
+    return {
+      systemPushGroupIdList, systemPushLogStatus, systemPushSendTimeTypeList, systemPushStatusList, systemPushTypeList,
+      systemName: process.env.VUE_APP_SYSTEM_HOME,
+      open: false,
+      form: {
+        id: undefined,
+        groupId: 0,
+        usercode: undefined,
+
+        onlyText: undefined,
+
+        textText1: undefined,
+        textText2: undefined,
+        textLinkType: 0,
+        textLinkUrl: undefined,
+
+        oneImageTitleType:2,
+        oneImageImage:undefined,
+        oneImageText:undefined,
+        oneImageLinkType: 0,
+        oneImageLinkUrl: undefined,
+
+        onlyImage:undefined,
+
+        sendTimeType: 0,
+        sendTime: undefined,
+        title: undefined,
+        type: 0,
+        remark: undefined
+      },
+      imageForm:{
+        title: undefined,
+        image: undefined,
+        linkType: undefined,
+        linkUrl: undefined
+      },
+      imageOpen: false,
+      imageTitle: '',
+      textContext: [],
+      imageContext:[],
+      userInfo: {},
+      // 表单校验
+      rules: {
+        groupId: [
+          { required: true, message: '群发类型不能为空', trigger: 'blur' }
+        ],
+        sendTimeType: [
+          { required: true, message: '发送类型不能为空', trigger: 'blur' }
+        ],
+        sendTime: [
+          { required: true, message: '发送时间不能为空', trigger: 'blur' }
+        ],
+        title: [
+          { required: true, message: '标题不能为空', trigger: 'blur' }
+        ],
+        type: [
+          { required: true, message: '消息类型不能为空', trigger: 'blur' }
+        ],
+        onlyText: [
+          { required: true, message: '文本消息不能为空', trigger: 'blur' }
+        ],
+        textLinkUrl: [
+          { required: true, message: '链接地址不能为空', trigger: 'blur' }
+        ],
+        oneImageLinkUrl: [
+          { required: true, message: '链接地址不能为空', trigger: 'blur' }
+        ],
+        oneImageImage: [
+          { required: true, message: '图片不能为空', trigger: 'blur' }
+        ],
+        onlyImage: [
+          { required: true, message: '图片不能为空', trigger: 'blur' }
+        ],
+      },
+      imageRules:{
+        image: [
+          { required: true, message: '图片不能为空', trigger: 'blur' }
+        ],
+        linkType: [
+          { required: true, message: '链接类型不能为空', trigger: 'blur' }
+        ],
+        linkUrl: [
+          { required: true, message: '链接不能为空', trigger: 'blur' }
+        ],
+      },
+      buttonLoading: false,
+      pickerAfterOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now();
+        },
+      },
+    }
+  },
+  mounted() {
+  },
+  created() {
+  },
+  methods: {
+    init(id) {
+      this.form.id = id || undefined
+      this.open = true
+      this.$nextTick(() => {
+        // this.$refs['form'].resetFields()
+        this.form = {
+          id: undefined,
+          groupId: 0,
+          usercode: undefined,
+
+          onlyText: undefined,
+
+          textText1: undefined,
+          textText2: undefined,
+          textLinkType: 0,
+          textLinkUrl: undefined,
+
+          oneImageTitleType:2,
+          oneImageImage:undefined,
+          oneImageText:undefined,
+          oneImageLinkType: 0,
+          oneImageLinkUrl: undefined,
+
+          onlyImage:undefined,
+
+          sendTimeType: 0,
+          sendTime: undefined,
+          title: undefined,
+          type: 0,
+          remark: undefined
+        }
+        this.userInfo = {}
+        this.textContext = []
+        this.imageContext = []
+      })
+    },
+    rowDrop() {
+      const tbody = this.$refs.textContextRef.$el.querySelector(
+          ".el-table__body > tbody"
+      );
+      console.log(tbody)
+      const _this = this
+      Sortable.create(tbody, {
+        animation: 180,
+        delay: 0,
+        onEnd({ newIndex, oldIndex }) {
+          const currRow = _this.textContext.splice(oldIndex, 1)[0]
+          _this.textContext.splice(newIndex, 0, currRow)
+        }
+      })
+    },
+    typeSelectHandle(value){
+      if(value === 1){
+        this.$nextTick(() => {
+          this.rowDrop()
+        })
+      }
+    },
+    querySearch(querySearch, cb) {
+      listUserByUserCode(querySearch).then(res => {
+        cb(res.data.map((terminal) => {
+          return {
+            value: terminal,
+            name: terminal
+          }
+        }))
+      })
+    },
+    handleSelect(item) {
+      getUserByUsercode(item.value).then(res => {
+        this.userInfo = res.data
+      })
+    },
+    textContextRemoveHandle(row) {
+      const index = this.textContext.findIndex((item) => {
+        return item.id === row.id
+      })
+      // 根据索引删除数据
+      this.textContext.splice(index, 1)
+    },
+    imageContextAddHandle(){
+      this.imageOpen = true;
+      this.imageTitle = "添加多图文信息";
+      this.$nextTick(() => {
+        this.$refs['imageForm'].resetFields()
+        this.imageForm.id = undefined
+      })
+    },
+    imageContextRemoveHandle(row){
+      const index = this.imageContext.findIndex((item) => {
+        return item.id === row.id
+      })
+      // 根据索引删除数据
+      this.imageContext.splice(index, 1)
+    },
+    imageContextUpdateHandle(row){
+      this.imageOpen = true;
+      this.imageTitle = "编辑多图文信息";
+      this.$nextTick(() => {
+        this.$refs['imageForm'].resetFields()
+        let copy = {}
+        Object.assign(copy,row)
+        this.imageForm = copy;
+      })
+    },
+    imageSubmitForm(){
+      this.$refs["imageForm"].validate(valid => {
+        if (valid) {
+          if (this.imageForm.id != null) {
+            const index = this.imageContext.findIndex((item) => {
+              return item.id === this.imageForm.id
+            })
+            this.imageContext[index].image = this.imageForm.image
+            this.imageContext[index].title = this.imageForm.title
+            this.imageContext[index].linkType = this.imageForm.linkType
+            this.imageContext[index].linkUrl = this.imageForm.linkUrl
+            this.imageOpen = false
+            console.log(this.imageContext)
+          } else {
+            this.imageContext.push({
+              id: this.genNonDuplicateID(),
+              image: this.imageForm.image,
+              linkType: this.imageForm.linkType,
+              linkUrl: this.imageForm.linkUrl,
+              title: this.imageForm.title
+            })
+            this.imageOpen = false
+            console.log(this.imageContext)
+          }
+        }
+      });
+    },
+    textContextAddHandle() {
+      let b = false;
+      if(this.textContext.length === 0){
+        b = true;
+      }
+      this.textContext.push({
+        id: this.genNonDuplicateID(),
+        n: undefined,
+        v: undefined
+      })
+      if(b){
+        this.rowDrop()
+      }
+    },
+    /**
+     * 生成一个用不重复的ID
+     */
+    genNonDuplicateID(randomLength) {
+      if (randomLength) {
+        randomLength = 8
+      }
+      return Number(Math.random().toString().substr(3, randomLength) + Date.now()).toString(36)
+    },
+    // 表单提交
+    submitForm() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.buttonLoading = true
+          if (this.form.id != null) {
+            updateSysPush(this.form).then(data => {
+              this.$modal.msgSuccess('修改成功')
+              this.$modal.buttonLoading = false
+              this.open = false
+              this.$emit('refreshDataList')
+            }).finally(() => {
+              this.buttonLoading = false
+            })
+          } else {
+            addSysPush({
+              master: this.form,
+              textContext: this.textContext,
+              imageContext: this.imageContext
+            }).then(data => {
+              this.$modal.msgSuccess('新增成功')
+              this.buttonLoading = false
+              this.open = false
+              this.$emit('refreshDataList')
+            }).finally(() => {
+              this.buttonLoading = false
+            })
+          }
+
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/xq/sysPush/index.vue b/src/views/xq/sysPush/index.vue
index a15bfcd..76a5f68 100644
--- a/src/views/xq/sysPush/index.vue
+++ b/src/views/xq/sysPush/index.vue
@@ -1,29 +1,27 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="群体类型: 0=单个用户,1=全部用户,2=男用户,3=女用户, 4 =认证女神" prop="groupId">
-        <el-input
-          v-model="queryParams.groupId"
-          placeholder="请输入群体类型: 0=单个用户,1=全部用户,2=男用户,3=女用户, 4 =认证女神"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="群体类型" prop="groupId">
+        <el-select v-model="queryParams.groupId" clearable size="small">
+          <el-option
+              v-for="dict in systemPushGroupIdList"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+              @keyup.enter.native="handleQuery"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="用户id,仅在group_id=单个用户时生效" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入用户id,仅在group_id=单个用户时生效"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="蜜瓜号" prop="usercode">
-        <el-input
-          v-model="queryParams.usercode"
-          placeholder="请输入蜜瓜号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" clearable size="small">
+          <el-option
+              v-for="dict in systemPushStatusList"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+              @keyup.enter.native="handleQuery"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="标题" prop="title">
         <el-input
@@ -33,30 +31,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="发送时间" prop="sendTime">
-        <el-date-picker clearable
-          v-model="queryParams.sendTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择发送时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="已推送人数" prop="num">
-        <el-input
-          v-model="queryParams.num"
-          placeholder="请输入已推送人数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="完成时间" prop="endTime">
-        <el-date-picker clearable
-          v-model="queryParams.endTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择完成时间">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -71,83 +45,72 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['xq:sysPush:add']"
+          v-hasPermi="['cai:sysPush:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['xq:sysPush:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['xq:sysPush:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['xq:sysPush:export']"
-        >导出</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="sysPushList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="" align="center" prop="id" v-if="true"/>
-      <el-table-column label="群体类型: 0=单个用户,1=全部用户,2=男用户,3=女用户, 4 =认证女神" align="center" prop="groupId" />
-      <el-table-column label="消息类型:0=纯文字消息,1=文本消息,2=单图文消息,3=多图文消息" align="center" prop="type" />
-      <el-table-column label="用户id,仅在group_id=单个用户时生效" align="center" prop="userId" />
-      <el-table-column label="蜜瓜号" align="center" prop="usercode" />
-      <el-table-column label="标题" align="center" prop="title" />
-      <el-table-column label="内容" align="center" prop="content" />
-      <el-table-column label="前端参数" align="center" prop="params" />
-      <el-table-column label="备注说明" align="center" prop="remark" />
-      <el-table-column label="发送类型:0=手动发送,1=定时发送" align="center" prop="sendTimeType" />
-      <el-table-column label="发送时间" align="center" prop="sendTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sendTime, '{y}-{m}-{d}') }}</span>
+      <el-table-column label="id" align="center" prop="id" width="100" show-overflow-tooltip/>
+      <el-table-column label="群体类型" align="center" prop="groupId" >
+        <template v-slot="scope">
+          <cai-dict-tag :options="systemPushGroupIdList" :value="scope.row.groupId"/>
         </template>
       </el-table-column>
-      <el-table-column label="已推送人数" align="center" prop="num" />
-      <el-table-column label="状态:0=未执行,1=执行中,2队列执行中,3=已完成" align="center" prop="status" />
-      <el-table-column label="完成时间" align="center" prop="endTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
+      <el-table-column label="消息类型" align="center" prop="type" >
+        <template v-slot="scope">
+          <cai-dict-tag :options="systemPushTypeList" :value="scope.row.type"/>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+      <el-table-column label="用户" align="center" prop="usercode" />
+      <el-table-column label="标题" align="center" prop="title" show-overflow-tooltip/>
+<!--      <el-table-column label="内容" align="center" prop="content" />-->
+<!--      <el-table-column label="前端参数" align="center" prop="params" />-->
+      <el-table-column label="备注说明" align="center" prop="remark" show-overflow-tooltip/>
+      <el-table-column label="发送类型" align="center" prop="sendTimeType" >
+        <template v-slot="scope">
+          <cai-dict-tag :options="systemPushSendTimeTypeList" :value="scope.row.sendTimeType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="发送时间" align="center" prop="sendTime" width="180" />
+<!--      <el-table-column label="已推送人数" align="center" prop="num" />-->
+      <el-table-column label="状态" align="center" prop="status">
+        <template v-slot="scope">
+          <cai-dict-tag :options="systemPushStatusList" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="完成时间" align="center" prop="endtime" width="180" />-->
+      <el-table-column label="创建时间" align="center" prop="createTime" width="160" />
+      <el-table-column label="更新时间" align="center" prop="updateTime" width="160" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="100">
+        <template v-slot="scope">
+          <el-button
+              size="mini"
+              type="text"
+              v-if="scope.row.status === 0"
+              @click="handleRun(scope.row)"
+              v-hasPermi="['cai:sysPush:run']"
+          >执行</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['xq:sysPush:edit']"
-          >修改</el-button>
+            @click="handleInfo(scope.row)"
+            v-hasPermi="['cai:sysPush:edit']"
+          >预览</el-button>
+          <el-button
+              size="mini"
+              type="text"
+              v-if="scope.row.status === 0 && scope.row.sendTimeType === 1"
+              @click="handleClose(scope.row)"
+              v-hasPermi="['cai:sysPush:close']"
+          >取消</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['xq:sysPush:remove']"
+            v-hasPermi="['cai:sysPush:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -161,62 +124,44 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改推送系统消息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="群体类型: 0=单个用户,1=全部用户,2=男用户,3=女用户, 4 =认证女神" prop="groupId">
-          <el-input v-model="form.groupId" placeholder="请输入群体类型: 0=单个用户,1=全部用户,2=男用户,3=女用户, 4 =认证女神" />
-        </el-form-item>
-        <el-form-item label="用户id,仅在group_id=单个用户时生效" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入用户id,仅在group_id=单个用户时生效" />
-        </el-form-item>
-        <el-form-item label="蜜瓜号" prop="usercode">
-          <el-input v-model="form.usercode" placeholder="请输入蜜瓜号" />
-        </el-form-item>
-        <el-form-item label="标题" prop="title">
-          <el-input v-model="form.title" placeholder="请输入标题" />
-        </el-form-item>
-        <el-form-item label="内容">
-          <editor v-model="form.content" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="备注说明" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="发送时间" prop="sendTime">
-          <el-date-picker clearable
-            v-model="form.sendTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择发送时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="已推送人数" prop="num">
-          <el-input v-model="form.num" placeholder="请输入已推送人数" />
-        </el-form-item>
-        <el-form-item label="完成时间" prop="endTime">
-          <el-date-picker clearable
-            v-model="form.endTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择完成时间">
-          </el-date-picker>
-        </el-form-item>
-      </el-form>
+    <add-sys-push-dialog v-if="addSysPushDialogVisible" ref="addSysPushDialog" @refreshDataList="getList" />
+
+    <el-dialog title="系统消息查看" :close-on-click-modal="false" :visible.sync="infoOpen" width="350px" append-to-body>
+      <preview-client :data="infoData.form" :textContext="infoData.textContext" :imageContext="infoData.imageContext"></preview-client>
       <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="infoOpen = false">取 消</el-button>
       </div>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { listSysPush, getSysPush, delSysPush, addSysPush, updateSysPush } from "@/api/xq/sysPush";
+import { closeSysPush, delSysPush, listSysPush, runSysPush } from '@/api/xq/sysPush'
+import {
+  systemPushGroupIdList,
+  systemPushLogStatus,
+  systemPushSendTimeTypeList,
+  systemPushStatusList,
+  systemPushTypeList
+} from '@/constant/statusMap'
+import AddSysPushDialog from '@/views/xq/sysPush/add-sys-push-dialog.vue'
+import PreviewClient from '@/components/PreviewInMobileClient/index.vue'
 
 export default {
   name: "SysPush",
+  components: {
+    AddSysPushDialog,PreviewClient
+  },
   data() {
     return {
+      systemPushGroupIdList,systemPushLogStatus,systemPushSendTimeTypeList,systemPushStatusList,systemPushTypeList,
+      addSysPushDialogVisible: false,
+      infoOpen: false,
+      infoData:{
+        form:{},
+        textContext:[],
+        imageContext:[]
+      },
       // 按钮loading
       buttonLoading: false,
       // 遮罩层
@@ -233,80 +178,32 @@ export default {
       total: 0,
       // 推送系统消息表格数据
       sysPushList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         groupId: undefined,
         type: undefined,
-        userId: undefined,
-        usercode: undefined,
         title: undefined,
         content: undefined,
         params: undefined,
         sendTimeType: undefined,
-        sendTime: undefined,
-        num: undefined,
         status: undefined,
-        endTime: undefined,
       },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "不能为空", trigger: "blur" }
-        ],
-        groupId: [
-          { required: true, message: "群体类型: 0=单个用户,1=全部用户,2=男用户,3=女用户, 4 =认证女神不能为空", trigger: "blur" }
-        ],
-        type: [
-          { required: true, message: "消息类型:0=纯文字消息,1=文本消息,2=单图文消息,3=多图文消息不能为空", trigger: "change" }
-        ],
-        userId: [
-          { required: true, message: "用户id,仅在group_id=单个用户时生效不能为空", trigger: "blur" }
-        ],
-        usercode: [
-          { required: true, message: "蜜瓜号不能为空", trigger: "blur" }
-        ],
-        title: [
-          { required: true, message: "标题不能为空", trigger: "blur" }
-        ],
-        content: [
-          { required: true, message: "内容不能为空", trigger: "blur" }
-        ],
-        params: [
-          { required: true, message: "前端参数不能为空", trigger: "blur" }
-        ],
-        remark: [
-          { required: true, message: "备注说明不能为空", trigger: "blur" }
-        ],
-        sendTimeType: [
-          { required: true, message: "发送类型:0=手动发送,1=定时发送不能为空", trigger: "change" }
-        ],
-        sendTime: [
-          { required: true, message: "发送时间不能为空", trigger: "blur" }
-        ],
-        num: [
-          { required: true, message: "已推送人数不能为空", trigger: "blur" }
-        ],
-        status: [
-          { required: true, message: "状态:0=未执行,1=执行中,2队列执行中,3=已完成不能为空", trigger: "change" }
-        ],
-        endTime: [
-          { required: true, message: "完成时间不能为空", trigger: "blur" }
-        ],
-      }
     };
   },
   created() {
     this.getList();
   },
   methods: {
+    handleInfo(row){
+      let parse = JSON.parse(row.params);
+      this.$set(this.infoData,'form',parse.master)
+      this.$set(this.infoData,'textContext',parse.textContext)
+      this.$set(this.infoData,'imageContext',parse.imageContext)
+      console.log(this.infoData)
+      this.infoOpen = true;
+    },
     /** 查询推送系统消息列表 */
     getList() {
       this.loading = true;
@@ -316,33 +213,6 @@ export default {
         this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        groupId: undefined,
-        type: undefined,
-        userId: undefined,
-        usercode: undefined,
-        title: undefined,
-        content: undefined,
-        params: undefined,
-        remark: undefined,
-        sendTimeType: undefined,
-        sendTime: undefined,
-        num: undefined,
-        status: undefined,
-        endTime: undefined,
-        createTime: undefined,
-        updateTime: undefined
-      };
-      this.resetForm("form");
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -361,45 +231,35 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加推送系统消息";
+      this.addSysPushDialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.addSysPushDialog.init()
+      })
     },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.loading = true;
-      this.reset();
-      const id = row.id || this.ids
-      getSysPush(id).then(response => {
+    handleClose(row){
+      this.$modal.confirm('是否确定取消定时推送系统【"' + row.title + '"】的数据项？').then(() => {
+        this.loading = true;
+        return closeSysPush(row.id);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("取消成功");
+      }).catch(() => {
+      }).finally(() => {
         this.loading = false;
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改推送系统消息";
       });
     },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.buttonLoading = true;
-          if (this.form.id != null) {
-            updateSysPush(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          } else {
-            addSysPush(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          }
-        }
+    handleRun(row){
+      this.$modal.confirm('是否确认执行推送系统【"' + row.title + '"】的数据项？').then(() => {
+        this.loading = true;
+        return runSysPush(row.id);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("执行成功，请等待执行结果");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
       });
     },
     /** 删除按钮操作 */
@@ -417,12 +277,6 @@ export default {
         this.loading = false;
       });
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('xq/sysPush/export', {
-        ...this.queryParams
-      }, `sysPush_${new Date().getTime()}.xlsx`)
-    }
   }
 };
 </script>
diff --git a/src/views/xq/sysPushLog/index.vue b/src/views/xq/sysPushLog/index.vue
index 792ecbf..bc98929 100644
--- a/src/views/xq/sysPushLog/index.vue
+++ b/src/views/xq/sysPushLog/index.vue
@@ -1,145 +1,36 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="系统推送id" prop="sysPushId">
+      <el-form-item label="系统推送ID" prop="sysPushId" label-width="100px">
         <el-input
-          v-model="queryParams.sysPushId"
-          placeholder="请输入系统推送id"
-          clearable
-          @keyup.enter.native="handleQuery"
+            v-model="queryParams.sysPushId"
+            placeholder="请输入系统推送ID"
+            clearable
+            @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="推送人数" prop="num">
-        <el-input
-          v-model="queryParams.num"
-          placeholder="请输入推送人数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="推送返回的结果" prop="result">
-        <el-input
-          v-model="queryParams.result"
-          placeholder="请输入推送返回的结果"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="重试次数" prop="retry">
-        <el-input
-          v-model="queryParams.retry"
-          placeholder="请输入重试次数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="开始发送时间" prop="beginTime">
-        <el-date-picker clearable
-          v-model="queryParams.beginTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择开始发送时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="完成时间" prop="endTime">
-        <el-date-picker clearable
-          v-model="queryParams.endTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择完成时间">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
-    <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="['xq:sysPushLog:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['xq:sysPushLog:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['xq:sysPushLog:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['xq:sysPushLog:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
     <el-table v-loading="loading" :data="sysPushLogList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="" align="center" prop="id" v-if="true"/>
       <el-table-column label="系统推送id" align="center" prop="sysPushId" />
-      <el-table-column label="推送到的用户id" align="center" prop="userJson" />
+      <el-table-column label="推送到的用户id" align="center" prop="userJson" >
+        <template v-slot="scope">
+          <el-button size="mini" type="text" @click="handleShowUser(scope.row)">查看</el-button>
+        </template>
+      </el-table-column>
       <el-table-column label="推送人数" align="center" prop="num" />
-      <el-table-column label="推送状态:0=未推送,1=推送中,2=推送失败,3=推送成功" align="center" prop="status" />
-      <el-table-column label="推送返回的结果" align="center" prop="result" />
-      <el-table-column label="重试次数" align="center" prop="retry" />
-      <el-table-column label="开始发送时间" align="center" prop="beginTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.beginTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="完成时间" align="center" prop="endTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</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="['xq:sysPushLog:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['xq:sysPushLog:remove']"
-          >删除</el-button>
+      <el-table-column label="推送状态" align="center" prop="status">
+        <template v-slot="scope">
+          <cai-dict-tag :options="systemPushLogStatus" :value="scope.row.status"/>
         </template>
       </el-table-column>
+      <el-table-column label="推送返回的结果" align="center" prop="result" show-overflow-tooltip/>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="160" fixed="right"/>
     </el-table>
-
     <pagination
       v-show="total>0"
       :total="total"
@@ -148,55 +39,54 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改推送系统消息记录对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="系统推送id" prop="sysPushId">
-          <el-input v-model="form.sysPushId" placeholder="请输入系统推送id" />
+    <el-dialog title="推送名单" :close-on-click-modal="false" :visible.sync="showUserOpen" width="700px" append-to-body>
+      <el-form :model="userForm" ref="userForm" size="small" :inline="true" label-width="68px">
+        <el-form-item :label="systemName+'号'" prop="name">
+          <el-input
+              v-model="userForm.name"
+              :placeholder="'请输入'+systemName+'号'"
+              clearable
+          />
         </el-form-item>
-        <el-form-item label="推送人数" prop="num">
-          <el-input v-model="form.num" placeholder="请输入推送人数" />
-        </el-form-item>
-        <el-form-item label="推送返回的结果" prop="result">
-          <el-input v-model="form.result" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="重试次数" prop="retry">
-          <el-input v-model="form.retry" placeholder="请输入重试次数" />
-        </el-form-item>
-        <el-form-item label="开始发送时间" prop="beginTime">
-          <el-date-picker clearable
-            v-model="form.beginTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择开始发送时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="完成时间" prop="endTime">
-          <el-date-picker clearable
-            v-model="form.endTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择完成时间">
-          </el-date-picker>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleUserQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetUserQuery">重置</el-button>
         </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+      <div class="people_list" >
+        <div class="people_list-item" v-for="value in userList">
+<!--          <el-tag
+              class="people_list-item_name"
+              :key="value.usercode"
+              type="info"
+              effect="plain">
+            {{ value.usercode }}
+          </el-tag>-->
+          <el-tooltip class="item" effect="dark" :content="value.nickname+'('+value.usercode+')'" placement="top-start">
+            <div class="people_list-item_name">{{value.nickname}}({{ value.usercode }})</div>
+          </el-tooltip>
+        </div>
       </div>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { listSysPushLog, getSysPushLog, delSysPushLog, addSysPushLog, updateSysPushLog } from "@/api/xq/sysPushLog";
+import { listSysPushLog } from '@/api/xq/sysPushLog'
+import {
+  systemPushGroupIdList,
+  systemPushLogStatus,
+  systemPushSendTimeTypeList,
+  systemPushStatusList,
+  systemPushTypeList
+} from '@/constant/statusMap'
 
 export default {
   name: "SysPushLog",
   data() {
     return {
-      // 按钮loading
-      buttonLoading: false,
+      systemPushGroupIdList,systemPushLogStatus,systemPushSendTimeTypeList,systemPushStatusList,systemPushTypeList,
+      systemName: process.env.VUE_APP_SYSTEM_HOME,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -211,54 +101,18 @@ export default {
       total: 0,
       // 推送系统消息记录表格数据
       sysPushLogList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         sysPushId: undefined,
-        userJson: undefined,
-        num: undefined,
         status: undefined,
-        result: undefined,
-        retry: undefined,
-        beginTime: undefined,
-        endTime: undefined,
       },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "不能为空", trigger: "blur" }
-        ],
-        sysPushId: [
-          { required: true, message: "系统推送id不能为空", trigger: "blur" }
-        ],
-        userJson: [
-          { required: true, message: "推送到的用户id不能为空", trigger: "blur" }
-        ],
-        num: [
-          { required: true, message: "推送人数不能为空", trigger: "blur" }
-        ],
-        status: [
-          { required: true, message: "推送状态:0=未推送,1=推送中,2=推送失败,3=推送成功不能为空", trigger: "change" }
-        ],
-        result: [
-          { required: true, message: "推送返回的结果不能为空", trigger: "blur" }
-        ],
-        retry: [
-          { required: true, message: "重试次数不能为空", trigger: "blur" }
-        ],
-        beginTime: [
-          { required: true, message: "开始发送时间不能为空", trigger: "blur" }
-        ],
-        endTime: [
-          { required: true, message: "完成时间不能为空", trigger: "blur" }
-        ],
+      sourceUserList:[],
+      userList: [],
+      showUserOpen: false,
+      userForm:{
+        name: undefined
       }
     };
   },
@@ -275,27 +129,10 @@ export default {
         this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        sysPushId: undefined,
-        userJson: undefined,
-        num: undefined,
-        status: undefined,
-        result: undefined,
-        retry: undefined,
-        beginTime: undefined,
-        endTime: undefined,
-        createTime: undefined,
-        updateTime: undefined
-      };
-      this.resetForm("form");
+    handleShowUser(row){
+      this.userList = JSON.parse(row.userJson);
+      this.sourceUserList = JSON.parse(row.userJson);
+      this.showUserOpen = true
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -307,76 +144,57 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    handleUserQuery(){
+      let name = this.userForm.name
+      console.log(name)
+      if(name){
+        let list = []
+        this.sourceUserList.forEach(value => {
+          console.log(value)
+          if(value.usercode == name){
+            list.push(value)
+          }
+        })
+        this.userList = list
+      }
+    },
+    resetUserQuery(){
+      this.userForm.name = undefined
+      this.userList = this.sourceUserList
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加推送系统消息记录";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.loading = true;
-      this.reset();
-      const id = row.id || this.ids
-      getSysPushLog(id).then(response => {
-        this.loading = false;
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改推送系统消息记录";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.buttonLoading = true;
-          if (this.form.id != null) {
-            updateSysPushLog(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          } else {
-            addSysPushLog(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除推送系统消息记录编号为"' + ids + '"的数据项？').then(() => {
-        this.loading = true;
-        return delSysPushLog(ids);
-      }).then(() => {
-        this.loading = false;
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      }).finally(() => {
-        this.loading = false;
-      });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('xq/sysPushLog/export', {
-        ...this.queryParams
-      }, `sysPushLog_${new Date().getTime()}.xlsx`)
-    }
   }
 };
 </script>
+
+<style lang="scss" scoped>
+.people_list {
+  width: 100%;
+  border: 1px solid #ccc;
+  overflow: auto;
+  padding: 5px;
+  height: 500px;
+}
+.people_list-item {
+  width: 16.5%;
+  height: 22px;
+  padding: 2px 4px;
+  box-sizing: border-box;
+  float: left;
+  margin-bottom: 5px;
+}
+.people_list-item_name {
+  box-sizing: border-box;
+  border-radius: 2px;
+  border: 1px solid #ccc;
+  padding: 0 2px;
+  overflow: hidden;
+  text-overflow:ellipsis;
+  white-space: nowrap;
+}
+</style>
diff --git a/src/views/xq/userExtend/add-wx-trans-dialog.vue b/src/views/xq/userExtend/add-wx-trans-dialog.vue
new file mode 100644
index 0000000..1ec2f45
--- /dev/null
+++ b/src/views/xq/userExtend/add-wx-trans-dialog.vue
@@ -0,0 +1,113 @@
+<template>
+  <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="700px" append-to-body>
+    <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form-item label="调整微信次数" prop="rechargeCoin">
+        <el-input v-model="form.number" placeholder="请输入" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="form.remark" placeholder="请输入" />
+      </el-form-item>
+      <el-form-item label="用户编号" prop="usercode">
+        <el-autocomplete
+            class="inline-input"
+            v-model="form.usercode"
+            :fetch-suggestions="querySearch"
+            placeholder="请输入内容"
+            @select="handleSelect"
+        ></el-autocomplete>
+      </el-form-item>
+      <el-form-item label="昵称" v-if="info.nickname">
+        {{ info.nickname }} 【{{ info.usercode }}】
+      </el-form-item>
+      <el-form-item label="头像" v-if="info.avatar">
+        <image-avatar :src="info.avatar"/>
+      </el-form-item>
+      <el-form-item>
+        注意：调整微信次数为负减，正则加， 请保证次数不能减为负数
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="open = false">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getUserByUsercode, listUserByUserCode } from '@/api/xq/user'
+import { updateIncomeCoin, updateWxTransNum } from '@/api/xq/userExtend'
+
+export default {
+  components: {
+  },
+  data () {
+    return {
+      open: false,
+      title: '',
+      form:{
+        usercode: undefined,
+        number: undefined,
+        remark: undefined
+      },
+      info:{
+      },
+      // 表单校验
+      rules: {
+        usercode: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+        number: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+        remark: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+      },
+      buttonLoading: false,
+    }
+  },
+  created() {
+  },
+  methods: {
+    init () {
+      this.open = true;
+      this.title = "调整用户微信交换次数"
+      this.info = {};
+      this.form.usercode = undefined
+      this.form.rechargeCoin = undefined
+      this.form.remark = undefined
+    },
+    querySearch(querySearch,cb){
+      listUserByUserCode(querySearch).then(res => {
+        cb(res.data.map((terminal) => {
+          return {
+            value: terminal,
+            name: terminal,
+          };
+        }))
+      })
+    },
+    handleSelect(item){
+      getUserByUsercode(item.value).then(res => {
+        this.info = res.data
+      })
+    },
+    // 表单提交
+    submitForm () {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.buttonLoading = true;
+          updateWxTransNum(this.form).then(data => {
+            this.$modal.msgSuccess("操作成功");
+            this.buttonLoading = false;
+            this.open = false
+            this.$emit('refreshDataList')
+          }).finally(() => {
+            this.buttonLoading = false;
+          });
+        }
+      })
+    },
+  }
+}
+</script>
diff --git a/src/views/xq/userExtend/index.vue b/src/views/xq/userExtend/index.vue
index 8d39db7..d38acd7 100644
--- a/src/views/xq/userExtend/index.vue
+++ b/src/views/xq/userExtend/index.vue
@@ -39,10 +39,21 @@
             icon="el-icon-plus"
             size="mini"
             @click="handleAdd"
-            v-hasPermi="['xq:userExtend:add']"
+            v-hasPermi="['xq:userExtend:edit']"
         >收益调整
         </el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleWxTrans"
+          v-hasPermi="['xq:userExtend:edit']"
+        >微信交换次数调整
+        </el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -57,6 +68,7 @@
         </template>
       </el-table-column>
       <el-table-column label="收益" align="center" prop="incomeCoin"/>
+      <el-table-column label="微信交换次数" align="center" prop="wxTransNum"/>
       <el-table-column label="消费统计" align="center" prop="consumeTotal"/>
       <el-table-column label="提现统计" align="center" prop="withdrawTotal"/>
     </el-table>
@@ -70,19 +82,22 @@
     />
 
     <add-account-dialog v-if="addAccountDialogVisible" ref="addAccountDialog" @refreshDataList="getList"/>
+    <add-wx-trans-dialog v-if="addWxTransDialogVisible" ref="addWxTransDialog" @refreshDataList="getList"/>
   </div>
 </template>
 
 <script>
 import { listUserExtend } from '@/api/xq/userExtend'
 import AddAccountDialog from '@/views/xq/userExtend/add-account-dialog.vue'
+import AddWxTransDialog from '@/views/xq/userExtend/add-wx-trans-dialog.vue'
 
 export default {
   name: 'UserExtend',
-  components: { AddAccountDialog },
+  components: { AddAccountDialog,AddWxTransDialog },
   data() {
     return {
       addAccountDialogVisible: false,
+      addWxTransDialogVisible: false,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -117,6 +132,12 @@ export default {
         this.$refs.addAccountDialog.init(row?.usercode)
       })
     },
+    handleWxTrans(row) {
+      this.addWxTransDialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.addWxTransDialog.init(row?.usercode)
+      })
+    },
     /** 查询用户邀请列表 */
     getList() {
       this.loading = true
diff --git a/src/views/xq/vipOrder/index.vue b/src/views/xq/vipOrder/index.vue
index 268b899..b33686d 100644
--- a/src/views/xq/vipOrder/index.vue
+++ b/src/views/xq/vipOrder/index.vue
@@ -66,7 +66,11 @@
       </el-table-column>-->
       <el-table-column label="开通月份" align="center" prop="vipMonth" />
       <el-table-column label="会员价格" align="center" prop="vipPrice" />
-      <el-table-column label="平台" align="center" prop="platformType" />
+      <el-table-column label="平台" align="center" prop="platformType" >
+        <template v-slot="scope">
+          <cai-dict-tag :options="platformTypeList" :value="scope.row.platformType"/>
+        </template>
+      </el-table-column>
       <el-table-column label="状态" align="center" prop="payStatus" >
         <template v-slot="scope">
           <cai-dict-tag :options="payStatusList" :value="scope.row.payStatus" />
@@ -104,13 +108,13 @@
 
 <script>
 import { listVipOrder } from '@/api/xq/vipOrder'
-import { payStatusList, vipTimeList, vipTypeList,booleanList } from '@/constant/statusMap'
+import { payStatusList, vipTimeList, vipTypeList, booleanList, platformTypeList } from '@/constant/statusMap'
 
 export default {
   name: "VipOrder",
   data() {
     return {
-      vipTypeList,vipTimeList,payStatusList,booleanList,
+      vipTypeList,vipTimeList,payStatusList,booleanList,platformTypeList,
       // 遮罩层
       loading: true,
       // 选中数组
diff --git a/src/views/xq/wxTransOrder/index.vue b/src/views/xq/wxTransOrder/index.vue
index 2db867a..9187bef 100644
--- a/src/views/xq/wxTransOrder/index.vue
+++ b/src/views/xq/wxTransOrder/index.vue
@@ -1,58 +1,26 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="用户ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入用户ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="用户号" prop="usercode">
+      <el-form-item label="用户编号" prop="usercode">
         <el-input
           v-model="queryParams.usercode"
-          placeholder="请输入用户号"
+          placeholder="请输入用户编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="跟踪ID" prop="traceId">
+      <el-form-item label="昵称" prop="nickname">
         <el-input
-          v-model="queryParams.traceId"
-          placeholder="请输入跟踪ID"
+          v-model="queryParams.nickname"
+          placeholder="请输入昵称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="WX-ID" prop="wxId">
+      <el-form-item label="手机号" prop="mobile">
         <el-input
-          v-model="queryParams.wxId"
-          placeholder="请输入WX-ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="开通微信交换次数" prop="wxNum">
-        <el-input
-          v-model="queryParams.wxNum"
-          placeholder="请输入开通微信交换次数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="会员价格" prop="wxPrice">
-        <el-input
-          v-model="queryParams.wxPrice"
-          placeholder="请输入会员价格"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="订单说明" prop="orderName">
-        <el-input
-          v-model="queryParams.orderName"
-          placeholder="请输入订单说明"
+          v-model="queryParams.mobile"
+          placeholder="请输入手机号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -65,137 +33,53 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="支付时间" prop="payTime">
-        <el-date-picker clearable
-          v-model="queryParams.payTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择支付时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="appId" prop="appid">
-        <el-input
-          v-model="queryParams.appid"
-          placeholder="请输入appId"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="operateIp">
-        <el-input
-          v-model="queryParams.operateIp"
-          placeholder="请输入"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="来源 1-订单 2-vip赠送 3-后台管理新增" prop="source">
-        <el-input
-          v-model="queryParams.source"
-          placeholder="请输入来源 1-订单 2-vip赠送 3-后台管理新增"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="后台操作管理员ID" prop="adminId">
-        <el-input
-          v-model="queryParams.adminId"
-          placeholder="请输入后台操作管理员ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
-    <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="['xq:wxTransOrder:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['xq:wxTransOrder:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['xq:wxTransOrder:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['xq:wxTransOrder:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
     <el-table v-loading="loading" :data="wxTransOrderList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="" align="center" prop="id" v-if="true"/>
-      <el-table-column label="用户ID" align="center" prop="userId" />
-      <el-table-column label="用户号" align="center" prop="usercode" />
-      <el-table-column label="跟踪ID" align="center" prop="traceId" />
-      <el-table-column label="WX-ID" align="center" prop="wxId" />
-      <el-table-column label="开通微信交换次数" align="center" prop="wxNum" />
-      <el-table-column label="会员价格" align="center" prop="wxPrice" />
-      <el-table-column label="订单说明" align="center" prop="orderName" />
-      <el-table-column label="订单号" align="center" prop="orderNo" />
-      <el-table-column label="平台" align="center" prop="platformType" />
-      <el-table-column label="状态 0-待支付 1-已支付 5-已退款 10-无需支付" align="center" prop="payStatus" />
-      <el-table-column label="支付时间" align="center" prop="payTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d}') }}</span>
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="订单号" align="center" prop="orderNo" show-overflow-tooltip/>
+      <el-table-column label="用户编号" align="center" prop="usercode"/>
+      <el-table-column label="昵称" align="center" prop="nickname" show-overflow-tooltip/>
+      <el-table-column label="手机号" align="center" prop="mobile" width="100"/>
+      <el-table-column label="头像" align="center" prop="avatar">
+        <template v-slot="scope">
+          <image-avatar :src="scope.row.avatar"/>
         </template>
       </el-table-column>
-      <el-table-column label="appId" align="center" prop="appid" />
-      <el-table-column label="" align="center" prop="returnContent" />
-      <el-table-column label="" align="center" prop="operateIp" />
-      <el-table-column label="来源 1-订单 2-vip赠送 3-后台管理新增" align="center" prop="source" />
-      <el-table-column label="后台操作管理员ID" align="center" prop="adminId" />
+      <el-table-column label="次数" align="center" prop="wxNum"/>
+      <el-table-column label="订单价格" align="center" prop="wxPrice"/>
+      <el-table-column label="订单说明" align="center" prop="orderName"/>
+      <el-table-column label="平台" align="center" prop="platformType">
+        <template v-slot="scope">
+          <cai-dict-tag :options="platformTypeList" :value="scope.row.platformType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="payStatus">
+        <template v-slot="scope">
+          <cai-dict-tag :options="payStatusList" :value="scope.row.payStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="支付时间" align="center" prop="payTime" width="160"/>
+      <el-table-column label="来源" align="center" prop="source">
+        <template v-slot="scope">
+          <cai-dict-tag :options="wxTransOrderSourceList" :value="scope.row.source"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="跟踪ID" align="center" prop="traceId" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-info"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['xq:wxTransOrder:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['xq:wxTransOrder:remove']"
-          >删除</el-button>
+          >详情
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -207,75 +91,18 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
-    <!-- 添加或修改微信交换订单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="用户ID" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入用户ID" />
-        </el-form-item>
-        <el-form-item label="用户号" prop="usercode">
-          <el-input v-model="form.usercode" placeholder="请输入用户号" />
-        </el-form-item>
-        <el-form-item label="跟踪ID" prop="traceId">
-          <el-input v-model="form.traceId" placeholder="请输入跟踪ID" />
-        </el-form-item>
-        <el-form-item label="WX-ID" prop="wxId">
-          <el-input v-model="form.wxId" placeholder="请输入WX-ID" />
-        </el-form-item>
-        <el-form-item label="开通微信交换次数" prop="wxNum">
-          <el-input v-model="form.wxNum" placeholder="请输入开通微信交换次数" />
-        </el-form-item>
-        <el-form-item label="会员价格" prop="wxPrice">
-          <el-input v-model="form.wxPrice" placeholder="请输入会员价格" />
-        </el-form-item>
-        <el-form-item label="订单说明" prop="orderName">
-          <el-input v-model="form.orderName" placeholder="请输入订单说明" />
-        </el-form-item>
-        <el-form-item label="订单号" prop="orderNo">
-          <el-input v-model="form.orderNo" placeholder="请输入订单号" />
-        </el-form-item>
-        <el-form-item label="支付时间" prop="payTime">
-          <el-date-picker clearable
-            v-model="form.payTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择支付时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="appId" prop="appid">
-          <el-input v-model="form.appid" placeholder="请输入appId" />
-        </el-form-item>
-        <el-form-item label="">
-          <editor v-model="form.returnContent" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="" prop="operateIp">
-          <el-input v-model="form.operateIp" placeholder="请输入" />
-        </el-form-item>
-        <el-form-item label="来源 1-订单 2-vip赠送 3-后台管理新增" prop="source">
-          <el-input v-model="form.source" placeholder="请输入来源 1-订单 2-vip赠送 3-后台管理新增" />
-        </el-form-item>
-        <el-form-item label="后台操作管理员ID" prop="adminId">
-          <el-input v-model="form.adminId" placeholder="请输入后台操作管理员ID" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listWxTransOrder, getWxTransOrder, delWxTransOrder, addWxTransOrder, updateWxTransOrder } from "@/api/xq/wxTransOrder";
+import { listWxTransOrder } from '@/api/xq/wxTransOrder'
+import { payStatusList, platformTypeList, wxTransOrderSourceList } from '@/constant/statusMap'
 
 export default {
-  name: "WxTransOrder",
+  name: 'WxTransOrder',
   data() {
     return {
-      // 按钮loading
-      buttonLoading: false,
+      payStatusList, wxTransOrderSourceList,platformTypeList,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -290,215 +117,46 @@ export default {
       total: 0,
       // 微信交换订单表格数据
       wxTransOrderList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        userId: undefined,
         usercode: undefined,
-        traceId: undefined,
-        wxId: undefined,
-        wxNum: undefined,
-        wxPrice: undefined,
-        orderName: undefined,
-        orderNo: undefined,
-        platformType: undefined,
-        payStatus: undefined,
-        payTime: undefined,
-        appid: undefined,
-        returnContent: undefined,
-        operateIp: undefined,
-        source: undefined,
-        adminId: undefined,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "不能为空", trigger: "blur" }
-        ],
-        userId: [
-          { required: true, message: "用户ID不能为空", trigger: "blur" }
-        ],
-        usercode: [
-          { required: true, message: "用户号不能为空", trigger: "blur" }
-        ],
-        traceId: [
-          { required: true, message: "跟踪ID不能为空", trigger: "blur" }
-        ],
-        wxId: [
-          { required: true, message: "WX-ID不能为空", trigger: "blur" }
-        ],
-        wxNum: [
-          { required: true, message: "开通微信交换次数不能为空", trigger: "blur" }
-        ],
-        wxPrice: [
-          { required: true, message: "会员价格不能为空", trigger: "blur" }
-        ],
-        orderName: [
-          { required: true, message: "订单说明不能为空", trigger: "blur" }
-        ],
-        orderNo: [
-          { required: true, message: "订单号不能为空", trigger: "blur" }
-        ],
-        platformType: [
-          { required: true, message: "平台不能为空", trigger: "change" }
-        ],
-        payStatus: [
-          { required: true, message: "状态 0-待支付 1-已支付 5-已退款 10-无需支付不能为空", trigger: "change" }
-        ],
-        payTime: [
-          { required: true, message: "支付时间不能为空", trigger: "blur" }
-        ],
-        appid: [
-          { required: true, message: "appId不能为空", trigger: "blur" }
-        ],
-        returnContent: [
-          { required: true, message: "不能为空", trigger: "blur" }
-        ],
-        operateIp: [
-          { required: true, message: "不能为空", trigger: "blur" }
-        ],
-        source: [
-          { required: true, message: "来源 1-订单 2-vip赠送 3-后台管理新增不能为空", trigger: "blur" }
-        ],
-        adminId: [
-          { required: true, message: "后台操作管理员ID不能为空", trigger: "blur" }
-        ],
-        createTime: [
-          { required: true, message: "创建时间不能为空", trigger: "blur" }
-        ],
+        nickname: undefined,
+        mobile: undefined,
+        orderNo: undefined
       }
-    };
+    }
   },
   created() {
-    this.getList();
+    this.getList()
   },
   methods: {
     /** 查询微信交换订单列表 */
     getList() {
-      this.loading = true;
+      this.loading = true
       listWxTransOrder(this.queryParams).then(response => {
-        this.wxTransOrderList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        userId: undefined,
-        usercode: undefined,
-        traceId: undefined,
-        wxId: undefined,
-        wxNum: undefined,
-        wxPrice: undefined,
-        orderName: undefined,
-        orderNo: undefined,
-        platformType: undefined,
-        payStatus: undefined,
-        payTime: undefined,
-        appid: undefined,
-        returnContent: undefined,
-        operateIp: undefined,
-        source: undefined,
-        adminId: undefined,
-        createTime: undefined,
-        updateTime: undefined
-      };
-      this.resetForm("form");
+        this.wxTransOrderList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
+      this.queryParams.pageNum = 1
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
+      this.resetForm('queryForm')
+      this.handleQuery()
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加微信交换订单";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.loading = true;
-      this.reset();
-      const id = row.id || this.ids
-      getWxTransOrder(id).then(response => {
-        this.loading = false;
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改微信交换订单";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.buttonLoading = true;
-          if (this.form.id != null) {
-            updateWxTransOrder(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          } else {
-            addWxTransOrder(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除微信交换订单编号为"' + ids + '"的数据项？').then(() => {
-        this.loading = true;
-        return delWxTransOrder(ids);
-      }).then(() => {
-        this.loading = false;
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      }).finally(() => {
-        this.loading = false;
-      });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('xq/wxTransOrder/export', {
-        ...this.queryParams
-      }, `wxTransOrder_${new Date().getTime()}.xlsx`)
     }
   }
-};
+}
 </script>