diff --git a/src/views/business/commonFeedback/index.vue b/src/views/business/commonFeedback/index.vue
index 6bf3662..272cae5 100755
--- a/src/views/business/commonFeedback/index.vue
+++ b/src/views/business/commonFeedback/index.vue
@@ -8,8 +8,7 @@
         <el-input v-model="queryParams.star" placeholder="请输入星级" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="是否正向" prop="isGood">
-        <el-input v-model="queryParams.isGood" placeholder="请输入是否正向" clearable
-          @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.isGood" placeholder="请输入是否正向" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="创建时间">
         <el-date-picker v-model="daterangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
@@ -49,7 +48,12 @@
       <el-table-column label="反馈内容" align="center" prop="content" />
       <el-table-column label="星级" align="center" prop="star" />
       <el-table-column label="是否正向(0正向，1负向)" align="center" prop="isGood" />
-      <el-table-column label="状态" align="center" prop="status" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.status == '0'">正常</el-tag>
+          <el-tag type="danger" v-if="scope.row.status == '1'">封禁</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
diff --git a/src/views/business/commonInfo/index.vue b/src/views/business/commonInfo/index.vue
index 8efdd47..b260e95 100755
--- a/src/views/business/commonInfo/index.vue
+++ b/src/views/business/commonInfo/index.vue
@@ -61,7 +61,12 @@
       <el-table-column label="关于我们" align="center" prop="about" />
       <el-table-column label="个人信息共享清单" align="center" prop="shareInfoList" width="130"/>
       <el-table-column label="个人信息已收集清单" align="center" prop="collectInfoList" width="140" />
-      <el-table-column label="状态" align="center" prop="status" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.status == '0'">正常</el-tag>
+          <el-tag type="danger" v-if="scope.row.status == '1'">停用</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
@@ -82,8 +87,8 @@
       @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-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="auto">
         <el-form-item label="版本号" prop="version">
           <el-input v-model="form.version" placeholder="请输入版本号" />
         </el-form-item>
diff --git a/src/views/business/commonLimitSetting/index.vue b/src/views/business/commonLimitSetting/index.vue
index 3f9f320..4c47025 100755
--- a/src/views/business/commonLimitSetting/index.vue
+++ b/src/views/business/commonLimitSetting/index.vue
@@ -2,52 +2,25 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="适用群组" prop="limitGroup">
-        <el-input
-          v-model="queryParams.limitGroup"
-          placeholder="请输入适用群组"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.limitGroup" placeholder="请输入适用群组" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="对应等级" prop="limitLevel">
-        <el-input
-          v-model="queryParams.limitLevel"
-          placeholder="请输入对应等级"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.limitLevel" placeholder="请输入对应等级" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="提现限制" prop="cashoutLimit">
-        <el-input
-          v-model="queryParams.cashoutLimit"
-          placeholder="请输入提现限制"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.cashoutLimit" placeholder="请输入提现限制" clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="转账限制" prop="transferLimit">
-        <el-input
-          v-model="queryParams.transferLimit"
-          placeholder="请输入转账限制"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.transferLimit" placeholder="请输入转账限制" clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="支付限制" prop="payLimit">
-        <el-input
-          v-model="queryParams.payLimit"
-          placeholder="请输入支付限制"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.payLimit" placeholder="请输入支付限制" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="收款限制" prop="receiveLimit">
-        <el-input
-          v-model="queryParams.receiveLimit"
-          placeholder="请输入收款限制"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.receiveLimit" placeholder="请输入收款限制" 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>
@@ -57,93 +30,51 @@
 
     <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="['business:commonLimitSetting:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['business:commonLimitSetting: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="['business:commonLimitSetting:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['business:commonLimitSetting: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="['business:commonLimitSetting:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['business:commonLimitSetting: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="['business:commonLimitSetting:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['business:commonLimitSetting:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="commonLimitSettingList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="ID" align="center" prop="id" v-if="true"/>
       <el-table-column label="适用群组" align="center" prop="limitGroup" />
       <el-table-column label="对应等级" align="center" prop="limitLevel" />
       <el-table-column label="提现限制" align="center" prop="cashoutLimit" />
       <el-table-column label="转账限制" align="center" prop="transferLimit" />
       <el-table-column label="支付限制" align="center" prop="payLimit" />
       <el-table-column label="收款限制" align="center" prop="receiveLimit" />
-      <el-table-column label="状态" align="center" prop="status" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.status == '0'">启用</el-tag>
+          <el-tag type="danger" v-if="scope.row.status == '1'">停用</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="handleDetail(scope.row)"
-            >详情</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['business:commonLimitSetting:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['business:commonLimitSetting:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleDetail(scope.row)">详情</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:commonLimitSetting:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['business:commonLimitSetting:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改阈值设置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -174,214 +105,223 @@
     </el-dialog>
 
     <!-- 阈值设置详情 -->
-        <el-dialog :title="title" :visible.sync="detailOpen" width="700px" append-to-body>
-            <el-form ref="form" :model="form" label-width="auto">
-                    <el-form-item label="适用群组：">
-                      {{form.limitGroup}}
+    <el-dialog :title="title" :visible.sync="detailOpen" width="700px" append-to-body>
+      <el-form ref="form" :model="form" label-width="auto">
+        <el-form-item label="适用群组：">
+          {{form.limitGroup}}
 
-                    </el-form-item>
-                    <el-form-item label="对应等级：">
-                      {{form.limitLevel}}
-                    </el-form-item>
-                    <el-form-item label="提现限制：">
-                      {{form.cashoutLimit}}
-                    </el-form-item>
-                    <el-form-item label="转账限制：">
-                      {{form.transferLimit}}
-                    </el-form-item>
-                    <el-form-item label="支付限制：">
-                      {{form.payLimit}}
-                    </el-form-item>
-                    <el-form-item label="收款限制：">
-                      {{form.receiveLimit}}
-                    </el-form-item>
-                  </el-form>
-                  <div slot="footer" class="dialog-footer">
-                    <el-button @click="cancel">关 闭</el-button>
-                  </div>
-        </el-dialog>
+        </el-form-item>
+        <el-form-item label="对应等级：">
+          {{form.limitLevel}}
+        </el-form-item>
+        <el-form-item label="提现限制：">
+          {{form.cashoutLimit}}
+        </el-form-item>
+        <el-form-item label="转账限制：">
+          {{form.transferLimit}}
+        </el-form-item>
+        <el-form-item label="支付限制：">
+          {{form.payLimit}}
+        </el-form-item>
+        <el-form-item label="收款限制：">
+          {{form.receiveLimit}}
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel">关 闭</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listCommonLimitSetting, getCommonLimitSetting, delCommonLimitSetting, addCommonLimitSetting, updateCommonLimitSetting } from "@/api/business/commonLimitSetting";
+  import {
+    listCommonLimitSetting,
+    getCommonLimitSetting,
+    delCommonLimitSetting,
+    addCommonLimitSetting,
+    updateCommonLimitSetting
+  } from "@/api/business/commonLimitSetting";
 
-export default {
-  name: "CommonLimitSetting",
-  data() {
-    return {
-      // 按钮loading
-      buttonLoading: false,
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 阈值设置表格数据
-      commonLimitSettingList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 是否显示详情弹出层
-      detailOpen: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        limitGroup: undefined,
-        limitLevel: undefined,
-        cashoutLimit: undefined,
-        transferLimit: undefined,
-        payLimit: undefined,
-        receiveLimit: undefined,
-        status: undefined,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        limitGroup: [
-          { required: true, message: "适用群组不能为空", trigger: "blur" }
-        ],
-        limitLevel: [
-          { required: true, message: "对应等级不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询阈值设置列表 */
-    getList() {
-      this.loading = true;
-      listCommonLimitSetting(this.queryParams).then(response => {
-        this.commonLimitSettingList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.detailOpen = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        limitGroup: undefined,
-        limitLevel: undefined,
-        cashoutLimit: undefined,
-        transferLimit: undefined,
-        payLimit: undefined,
-        receiveLimit: undefined,
-        status: undefined,
-        delFlag: undefined,
-        createBy: undefined,
-        createTime: undefined,
-        updateBy: undefined,
-        updateTime: undefined
+  export default {
+    name: "CommonLimitSetting",
+    data() {
+      return {
+        // 按钮loading
+        buttonLoading: false,
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 阈值设置表格数据
+        commonLimitSettingList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 是否显示详情弹出层
+        detailOpen: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          limitGroup: undefined,
+          limitLevel: undefined,
+          cashoutLimit: undefined,
+          transferLimit: undefined,
+          payLimit: undefined,
+          receiveLimit: undefined,
+          status: undefined,
+        },
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+          limitGroup: [{
+            required: true,
+            message: "适用群组不能为空",
+            trigger: "blur"
+          }],
+          limitLevel: [{
+            required: true,
+            message: "对应等级不能为空",
+            trigger: "blur"
+          }],
+        }
       };
-      this.resetForm("form");
     },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
+    created() {
       this.getList();
     },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    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 = "添加阈值设置";
-    },
-    /** 详情按钮操作 */
-    handleDetail(row){
+    methods: {
+      /** 查询阈值设置列表 */
+      getList() {
+        this.loading = true;
+        listCommonLimitSetting(this.queryParams).then(response => {
+          this.commonLimitSettingList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.detailOpen = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          id: undefined,
+          limitGroup: undefined,
+          limitLevel: undefined,
+          cashoutLimit: undefined,
+          transferLimit: undefined,
+          payLimit: undefined,
+          receiveLimit: undefined,
+          status: undefined,
+          delFlag: undefined,
+          createBy: undefined,
+          createTime: undefined,
+          updateBy: undefined,
+          updateTime: undefined
+        };
+        this.resetForm("form");
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      // 多选框选中数据
+      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 = "添加阈值设置";
+      },
+      /** 详情按钮操作 */
+      handleDetail(row) {
         this.reset();
         this.form = row;
         this.detailOpen = true;
         this.title = "阈值设置";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.loading = true;
-      this.reset();
-      const id = row.id || this.ids
-      getCommonLimitSetting(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) {
-            updateCommonLimitSetting(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          } else {
-            addCommonLimitSetting(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(() => {
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
         this.loading = true;
-        return delCommonLimitSetting(ids);
-      }).then(() => {
-        this.loading = false;
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      }).finally(() => {
-        this.loading = false;
-      });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('business/commonLimitSetting/export', {
-        ...this.queryParams
-      }, `commonLimitSetting_${new Date().getTime()}.xlsx`)
+        this.reset();
+        const id = row.id || this.ids
+        getCommonLimitSetting(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) {
+              updateCommonLimitSetting(this.form).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              }).finally(() => {
+                this.buttonLoading = false;
+              });
+            } else {
+              addCommonLimitSetting(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 delCommonLimitSetting(ids);
+        }).then(() => {
+          this.loading = false;
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {}).finally(() => {
+          this.loading = false;
+        });
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download('business/commonLimitSetting/export', {
+          ...this.queryParams
+        }, `commonLimitSetting_${new Date().getTime()}.xlsx`)
+      }
     }
-  }
-};
+  };
 </script>
diff --git a/src/views/business/commonNotify/index.vue b/src/views/business/commonNotify/index.vue
index 7fa6ba8..61106ac 100755
--- a/src/views/business/commonNotify/index.vue
+++ b/src/views/business/commonNotify/index.vue
@@ -45,13 +45,18 @@
       <el-table-column label="唯一ID" align="center" prop="id" v-if="true" />
       <el-table-column label="触发事务ID" align="center" prop="eventId" />
       <el-table-column label="消息类型(系统、通知、活动等)" align="center" prop="messageType" />
-      <el-table-column label="消息场景(支付、提现等)" align="center" prop="messageScene" />
+      <el-table-column label="消息场景" align="center" prop="messageScene" />
       <el-table-column label="发送者" align="center" prop="sender" />
       <el-table-column label="接收者" align="center" prop="receiver" />
       <el-table-column label="标题" align="center" prop="title" />
-      <el-table-column label="内容" align="center" prop="content" />
-      <el-table-column label="内容" align="center" prop="imgUrl" />
-      <el-table-column label="状态" align="center" prop="status" />
+      <el-table-column label="内容" align="center" prop="content" show-overflow-tooltip/>
+      <el-table-column label="文件地址" align="center" prop="imgUrl" show-overflow-tooltip/>
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.status == '0'">正常</el-tag>
+          <el-tag type="danger" v-if="scope.row.status == '1'">封禁</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleDetail(scope.row)">详情</el-button>
diff --git a/src/views/business/dealCashout/index.vue b/src/views/business/dealCashout/index.vue
index c7a28d3..dca4cd3 100755
--- a/src/views/business/dealCashout/index.vue
+++ b/src/views/business/dealCashout/index.vue
@@ -52,7 +52,12 @@
       <el-table-column label="目标账户" align="center" prop="toAccount" />
       <el-table-column label="账单唯一编号" align="center" prop="billCode" />
       <el-table-column label="提现金额" align="center" prop="amount" />
-      <el-table-column label="提现类型" align="center" prop="transferType" />
+      <el-table-column label="提现类型" align="center" prop="transferType">
+      <template slot-scope="scope">
+          <el-tag type="success" v-if="scope.row.transferType == '0'">直接提</el-tag>
+          <el-tag type="danger" v-if="scope.row.transferType == '1'">审核</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="提现备注" align="center" prop="remark" />
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
@@ -87,11 +92,8 @@
       @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-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="auto">
         <el-form-item label="提现账户" prop="userAccount">
           <el-input v-model="form.userAccount" placeholder="请输入提现账户" />
         </el-form-item>
diff --git a/src/views/business/dealPay/index.vue b/src/views/business/dealPay/index.vue
index 5769e4e..9cf492a 100755
--- a/src/views/business/dealPay/index.vue
+++ b/src/views/business/dealPay/index.vue
@@ -49,7 +49,12 @@
       <el-table-column label="目标账户" align="center" prop="toAccount" />
       <el-table-column label="账单唯一编号" align="center" prop="billCode" />
       <el-table-column label="付款金额" align="center" prop="amount" />
-      <el-table-column label="付款类型" align="center" prop="transferType" />
+      <el-table-column label="付款类型" align="center" prop="transferType">
+      <template slot-scope="scope">
+          <el-tag type="success" v-if="scope.row.transferType == '0'">直接付</el-tag>
+          <el-tag type="danger" v-if="scope.row.transferType == '1'">审核</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="二维码解析" align="center" prop="qrCode" />
       <el-table-column label="付款备注" align="center" prop="remark" />
       <el-table-column label="状态" align="center" prop="status">
diff --git a/src/views/business/dealReceive/index.vue b/src/views/business/dealReceive/index.vue
index a35dbb2..304cd21 100755
--- a/src/views/business/dealReceive/index.vue
+++ b/src/views/business/dealReceive/index.vue
@@ -52,7 +52,12 @@
       <el-table-column label="目标账户" align="center" prop="toAccount" />
       <el-table-column label="账单唯一编号" align="center" prop="billCode" />
       <el-table-column label="收款金额" align="center" prop="amount" />
-      <el-table-column label="提现类型" align="center" prop="transferType" />
+      <el-table-column label="提现类型" align="center" prop="transferType">
+      <template slot-scope="scope">
+          <el-tag type="success" v-if="scope.row.transferType == '0'">直接收</el-tag>
+          <el-tag type="danger" v-if="scope.row.transferType == '1'">审核</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="二维码解析" align="center" prop="qrCode" />
       <el-table-column label="提现备注" align="center" prop="remark" />
       <el-table-column label="状态" align="center" prop="status">
@@ -82,11 +87,8 @@
       @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-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="auto">
         <el-form-item label="收款账户" prop="userAccount">
           <el-input v-model="form.userAccount" placeholder="请输入收款账户" />
         </el-form-item>
diff --git a/src/views/business/dealTopUp/index.vue b/src/views/business/dealTopUp/index.vue
index 9a94718..50248e6 100644
--- a/src/views/business/dealTopUp/index.vue
+++ b/src/views/business/dealTopUp/index.vue
@@ -54,7 +54,12 @@
       <el-table-column label="目标账户" align="center" prop="toAccount" />
       <el-table-column label="账单唯一编号" align="center" prop="billCode" />
       <el-table-column label="充值金额" align="center" prop="amount" />
-      <el-table-column label="充值类型" align="center" prop="transferType" />
+      <el-table-column label="充值类型" align="center" prop="transferType">
+        <template slot-scope="scope">
+            <el-tag type="success" v-if="scope.row.transferType == '0'">直接充</el-tag>
+            <el-tag type="danger" v-if="scope.row.transferType == '1'">审核</el-tag>
+          </template>
+        </el-table-column>
       <el-table-column label="充值备注" align="center" prop="remark" />
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
@@ -78,11 +83,8 @@
       @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-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="auto">
         <el-form-item label="充值账户" prop="userAccount">
           <el-input v-model="form.userAccount" placeholder="请输入充值账户" />
         </el-form-item>
diff --git a/src/views/business/dealTransfer/index.vue b/src/views/business/dealTransfer/index.vue
index 87754ee..64932de 100755
--- a/src/views/business/dealTransfer/index.vue
+++ b/src/views/business/dealTransfer/index.vue
@@ -46,11 +46,16 @@
       <el-table-column label="接收账户" align="center" prop="toAccount" />
       <el-table-column label="账单唯一编号" align="center" prop="billCode" />
       <el-table-column label="转账金额" align="center" prop="amount" />
-      <el-table-column label="转账类型" align="center" prop="transferType" />
+      <el-table-column label="转账类型" align="center" prop="transferType">
+        <template slot-scope="scope">
+            <el-tag type="success" v-if="scope.row.transferType == '0'">直接转</el-tag>
+            <el-tag type="danger" v-if="scope.row.transferType == '1'">审核</el-tag>
+          </template>
+        </el-table-column>
       <el-table-column label="转账备注" align="center" prop="remark" />
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.status == '0'">提交</el-tag>
+          <el-tag v-if="scope.row.status == '0'">发起</el-tag>
           <el-tag type="danger" v-if="scope.row.status == '1'">拒绝</el-tag>
           <el-tag type="success" v-if="scope.row.status == '2'">通过</el-tag>
         </template>
diff --git a/src/views/business/recordTransaction/index.vue b/src/views/business/recordTransaction/index.vue
index 80be852..ed7e54c 100755
--- a/src/views/business/recordTransaction/index.vue
+++ b/src/views/business/recordTransaction/index.vue
@@ -49,7 +49,15 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="用户ID" align="center" prop="senderId" />
       <el-table-column label="账户编号" align="center" prop="senderAccount" />
-      <el-table-column label="交易类型" align="center" prop="type" />
+      <el-table-column label="交易类型" align="center" prop="type">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.type == 'BT'">转账</el-tag>
+          <el-tag v-if="scope.row.type == 'BP'">支付</el-tag>
+          <el-tag v-if="scope.row.type == 'BC'">提现</el-tag>
+          <el-tag v-if="scope.row.type == 'BR'">收款</el-tag>
+          <el-tag v-if="scope.row.type == 'BU'">充值</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="目标用户账户编号" align="center" prop="receiverAccount" />
       <el-table-column label="交易前金额" align="center" prop="previousBalance" />
       <el-table-column label="交易金额" align="center" prop="changeBalance" />
@@ -60,7 +68,12 @@
           <span>{{ parseTime(scope.row.time, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="status" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.status == '0'">正常</el-tag>
+          <el-tag type="danger" v-if="scope.row.status == '1'">封禁</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
@@ -81,8 +94,8 @@
       @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-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="auto">
         <el-form-item label="账户编号" prop="senderAccount">
           <el-input v-model="form.senderAccount" placeholder="请输入账户编号" />
         </el-form-item>
diff --git a/src/views/business/userAccount/index.vue b/src/views/business/userAccount/index.vue
index 0d0b69d..9e695d2 100755
--- a/src/views/business/userAccount/index.vue
+++ b/src/views/business/userAccount/index.vue
@@ -42,8 +42,18 @@
       <el-table-column label="账户唯一编号" align="center" prop="accountCode" />
       <el-table-column label="账户名称" align="center" prop="accountName" />
       <el-table-column label="账户余额" align="center" prop="accountAmount" />
-      <el-table-column label="状态" align="center" prop="status" />
-      <el-table-column label="删除标志" align="center" prop="delFlag" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.status == '0'">正常</el-tag>
+          <el-tag type="danger" v-if="scope.row.status == '1'">冻结</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="删除标志" align="center" prop="delFlag">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.delFlag == '0'">存在</el-tag>
+          <el-tag type="danger" v-if="scope.row.delFlag == '2'">已删除</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
@@ -69,8 +79,8 @@
       @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-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="auto">
         <el-form-item label="账户唯一ID" prop="accountId">
           <el-input v-model="form.accountId" placeholder="请输入账户唯一ID" />
         </el-form-item>
diff --git a/src/views/business/userCard/index.vue b/src/views/business/userCard/index.vue
index 89ba13e..7dfba15 100755
--- a/src/views/business/userCard/index.vue
+++ b/src/views/business/userCard/index.vue
@@ -48,7 +48,12 @@
       <el-table-column label="银行卡余额" align="center" prop="cardAmount" />
       <el-table-column label="银行名称" align="center" prop="bankName" />
       <el-table-column label="具体分行" align="center" prop="deptName" />
-      <el-table-column label="卡状态" align="center" prop="status" />
+      <el-table-column label="卡状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.status == '0'">正常</el-tag>
+          <el-tag type="danger" v-if="scope.row.status == '1'">停用</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
@@ -74,8 +79,8 @@
       @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-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="auto">
         <el-form-item label="银行卡号" prop="cardNum">
           <el-input v-model="form.cardNum" placeholder="请输入银行卡号" />
         </el-form-item>
@@ -98,7 +103,7 @@
     <!-- 用户银行卡详情 -->
     <el-dialog :title="title" :visible.sync="detailOpen" width="700px" append-to-body>
       <el-form ref="form" :model="form" label-width="auto">
-        <el-form-item label="用户ID：" >
+        <el-form-item label="用户ID：">
           {{form.userId}}
         </el-form-item>
         <el-form-item label="银行卡号：">
diff --git a/src/views/business/userFriend/index.vue b/src/views/business/userFriend/index.vue
index 4348cd2..bdd473b 100755
--- a/src/views/business/userFriend/index.vue
+++ b/src/views/business/userFriend/index.vue
@@ -46,8 +46,18 @@
       <el-table-column label="唯一ID" align="center" prop="id" v-if="true" />
       <el-table-column label="用户id" align="center" prop="userId" />
       <el-table-column label="好友id" align="center" prop="friendId" />
-      <el-table-column label="状态" align="center" prop="status" />
-      <el-table-column label="删除标志" align="center" prop="delFlag" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.status == '0'">正常</el-tag>
+          <el-tag type="danger" v-if="scope.row.status == '1'">拉黑</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="删除标志" align="center" prop="delFlag">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.delFlag == '0'">存在</el-tag>
+          <el-tag type="danger" v-if="scope.row.delFlag == '2'">已删除</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
@@ -89,7 +99,7 @@
     <!-- 用户好友详情 -->
     <el-dialog :title="title" :visible.sync="detailOpen" width="700px" append-to-body>
       <el-form ref="form" :model="form" label-width="auto">
-        <el-form-item label="用户id：" >
+        <el-form-item label="用户id：">
           {{form.userId}}
         </el-form-item>
         <el-form-item label="好友id：">
diff --git a/src/views/business/userInfo/index.vue b/src/views/business/userInfo/index.vue
index 079b355..ac4e0a3 100755
--- a/src/views/business/userInfo/index.vue
+++ b/src/views/business/userInfo/index.vue
@@ -57,8 +57,18 @@
       <el-table-column label="手机号" align="center" prop="phone" />
       <el-table-column label="年龄" align="center" prop="age" />
       <el-table-column label="地址" align="center" prop="addr" />
-      <el-table-column label="用户状态" align="center" prop="status" />
-      <el-table-column label="删除标志" align="center" prop="delFlag" />
+      <el-table-column label="用户状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.status == '0'">正常</el-tag>
+          <el-tag type="danger" v-if="scope.row.status == '1'">停用</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="删除标志" align="center" prop="delFlag">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.delFlag == '0'">存在</el-tag>
+          <el-tag type="danger" v-if="scope.row.delFlag == '2'">已删除</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
@@ -84,8 +94,8 @@
       @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-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="auto">
         <el-form-item label="用户唯一编码" prop="userCode">
           <el-input v-model="form.userCode" placeholder="请输入用户唯一编码" />
         </el-form-item>
diff --git a/src/views/business/userPasswd/index.vue b/src/views/business/userPasswd/index.vue
index 5b577fb..8f11c25 100755
--- a/src/views/business/userPasswd/index.vue
+++ b/src/views/business/userPasswd/index.vue
@@ -38,11 +38,22 @@
     <el-table v-loading="loading" :data="userPasswdList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="用户id" align="center" prop="userId" />
-      <el-table-column label="支付密码(数字组合)" align="center" prop="payPasswd" show-overflow-tooltip/>
+      <el-table-column label="支付密码(数字组合)" align="center" prop="payPasswd" show-overflow-tooltip />
       <el-table-column label="设备锁(九宫)" align="center" prop="phoneLock" />
       <el-table-column label="登录密码(数字组合)" align="center" prop="loginPasswd" />
-      <el-table-column label="支付状态" align="center" prop="payStatus" />
-      <el-table-column label="删除标志" align="center" prop="delFlag" />
+      <el-table-column label="支付状态" align="center" prop="payStatus">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.payStatus == '0'">正常</el-tag>
+          <el-tag v-if="scope.row.payStatus == '1'">仅收款</el-tag>
+          <el-tag type="danger" v-if="scope.row.payStatus == '2'">冻结</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="删除标志" align="center" prop="delFlag">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.delFlag == '0'">存在</el-tag>
+          <el-tag type="danger" v-if="scope.row.delFlag == '2'">已删除</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
@@ -68,7 +79,7 @@
       @pagination="getList" />
 
     <!-- 添加或修改用户密码对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="700px" 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" />