修复渠道展示问题

package-lock.json

@@ -42,6 +42,7 @@
         "unplugin-auto-import": "^0.16.7",
         "unplugin-vue-components": "^0.25.2",
         "vue": "^3.2.13",
+        "webpack-bundle-analyzer": "^4.9.1",
         "webpack-cli": "^5.1.4"
       }
     },

package.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "dev": "vue-cli-service serve --mode development",
+    "dev": "vue-cli-service serve --mode development --report",
     "build": "vue-cli-service build --mode production",
     "lint": "vue-cli-service lint"
   },
@@ -42,6 +42,7 @@
     "unplugin-auto-import": "^0.16.7",
     "unplugin-vue-components": "^0.25.2",
     "vue": "^3.2.13",
+    "webpack-bundle-analyzer": "^4.9.1",
     "webpack-cli": "^5.1.4"
   }
 }

src/api/AccessRestriction.vue/AccessRestriction.js

@@ -1,65 +0,0 @@
-import request from '@/utils/request';
-import qs from 'qs';
-
-// ==================================地区限制====================================
-
-// 地区列表
-export const recordPage = query => {
-    return request({
-        url: '/admin/ip/region/limit/record/page',
-        method: 'get',
-        params: query
-    });
-};
-// 加入白名单
-export const addWhite = query => {
-    return request({
-        url: '/admin/ip/region/limit/record/addWhite',
-        method: 'get',
-        params: query
-    });
-};
-// 解除限制
-export const relieve = query => {
-    return request({
-        url: '/admin/ip/region/limit/record/relieve',
-        method: 'get',
-        params: query
-    });
-};
-// 添加地区访问限制
-export const recordSave = query => {
-    return request({
-        url: '/admin/ip/region/limit/record/save',
-        headers:{"Content-Type": 'application/x-www-form-urlencoded'},
-        method: 'post',
-        data: query
-    });
-};
-// ==================================访问白名单====================================
-
-// 白名单列表
-export const whitePage = query => {
-    return request({
-        url: '/admin/ip/region/white/page',
-        method: 'get',
-        params: query
-    });
-};
-// 移除白名单
-export const whiteDel = query => {
-    return request({
-        url: '/admin/ip/region/white/del',
-        method: 'get',
-        params: query
-    });
-};
-// 添加白名单
-export const whiteSave = query => {
-    return request({
-        url: '/admin/ip/region/white/save',
-        headers:{"Content-Type": 'application/x-www-form-urlencoded'},
-        method: 'post',
-        data: query
-    });
-};

src/components/maintainer/index.vue

@@ -131,12 +131,17 @@ export default {
     },
     methods: {
         getMenu() {
-            this.parentMenus = getStore({ name: 'parent_menus' });
+            let parentMenus = getStore({ name: 'parent_menus' });
-            this.childMenus = getStore({ name: 'child_menus' });
+            let childMenus = getStore({ name: 'child_menus' });
-            store.dispatch('getMenu').then(res => {
+            if (parentMenus && childMenus && parentMenus.length > 0 && childMenus.length > 0) {
-                this.parentMenus = res.parents;
+                this.parentMenus = parentMenus;
-                this.childMenus = res.childs;
+                this.childMenus = childMenus;
-            });
+            } else {
+                store.dispatch('getMenu').then(res => {
+                    this.parentMenus = res.parents;
+                    this.childMenus = res.childs;
+                });
+            }
         },
         getChilds(parentId) {
             return this.childMenus.filter(v => v.parentid == parentId);
@@ -166,7 +171,9 @@ export default {
                         parentIds.push(v.id);
                     });
                 }
+                console.log(parentIds);
                 this.parentMenus = store.getters.parentMenus.filter(v1 => parentIds.filter(v2 => v1.id == v2).length > 0);
+                this.childMenus = store.getters.childMenus.filter(v1 => parentIds.filter(v2 => v1.parentid == v2).length > 0);
             }
         }
     },

src/views/accessRestriction/AccessRestriction.vue

@@ -1,355 +0,0 @@
-<template>
-  <div class="outer">
-    <div class="search">
-      <div class="searchLeft">
-        <span>用户平台ID</span>
-        <el-input
-          v-model="userId"
-          size="default"
-          placeholder="用户平台ID"
-          class="input"
-        ></el-input>
-      </div>
-    </div>
-    <!-- 按钮 -->
-    <div class="buttonBox">
-      <el-button class="primary" type="primary" size="default" @click="add()"
-        >新增</el-button
-      >
-      <el-button class="primary" type="primary" size="default" @click="search()"
-        >查询</el-button
-      >
-    </div>
-    <!-- 列表 -->
-    <el-table
-      v-loading="loading"
-      :data="tableData"
-      border
-      style="width: 100%; margin-top: 25px"
-    >
-      <el-table-column prop="erbanNo" align="center" label="用戶id" />
-      <el-table-column prop="nick" align="center" label="用戶昵称" />
-      <el-table-column prop="phone" align="center" label="手机号" />
-      <el-table-column prop="signTime" align="center" label="注册时间" />
-      <el-table-column prop="createTime" align="center" label="进入访问限制时间" />
-      <el-table-column prop="inviteCode" align="center" label="邀请码" />
-      <el-table-column prop="signDeviceId" align="center" label="注册设备" />
-      <el-table-column prop="deviceIds" align="center" label="访问设备" />
-      <el-table-column prop="lastCheckIpRegion" align="center" label="最近一次访问地点" />
-      <el-table-column align="center" label="平台"
-        ><template v-slot="scope">{{
-          scope.row.os == "android" ? "安卓" : "苹果"
-        }}</template>
-      </el-table-column>
-      <el-table-column align="center" label="sim卡信息" width="150"
-        ><template v-slot="scope">
-          <div v-html="tableArrFormat(scope.row)"></div>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="系统语言" width="200">
-        <template v-slot="scope">
-          {{langFormat(scope.row.lang)}}
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="操作" width="300">
-        <template v-slot="scope">
-          <el-button
-            @click="unfreeze(scope.row)"
-            class="primary"
-            type="primary"
-            size="default"
-            >解除限制</el-button
-          >
-          <el-button
-            @click="addWhite(scope.row)"
-            class="primary"
-            type="primary"
-            size="default"
-            >加入白名单</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <el-pagination
-      style="margin-top: 10px"
-      class="paginationClass"
-      v-model:current-page="currentPage"
-      v-model:page-size="pageSize"
-      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500]"
-      :small="small"
-      :disabled="disabled"
-      :background="background"
-      layout="sizes, prev, pager, next"
-      :total="total"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-    />
-    <!-- 公共二次确认删除弹窗 -->
-    <el-dialog v-model="delDialog" title="提示" width="30%" center>
-      <span> {{ delDialogText }}</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="delDialog = false">取消</el-button>
-          <el-button type="primary" @click="sureClick(val, type)"> 确认 </el-button>
-        </span>
-      </template>
-    </el-dialog>
-    <!-- 添加弹窗 -->
-    <el-dialog v-model="addSure" title="提示" width="30%" center>
-      <div class="selectBox">
-        <span class="left" style="margin-right: 20px">用户ID</span>
-        <el-input
-          v-model="selectUserId"
-          size="default"
-          placeholder="用户平台ID"
-          class="right"
-          style="width: 70%"
-        ></el-input>
-      </div>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="addSure = false">取消</el-button>
-          <el-button type="primary" @click="addSureClick()"> 添加 </el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-<script>
-import {
-  recordPage,
-  addWhite,
-  relieve,
-  recordSave,
-} from "@/api/AccessRestriction.vue/AccessRestriction.js";
-import { ElMessage } from "element-plus";
-export default {
-  name: "AccessRestriction",
-  data() {
-    return {
-      userId: "", //用戶id
-      loading: false, //列表loading
-      tableData: [
-        {
-          erbanNo: "123123123",
-        },
-      ], //列表数据
-      total: 10, //总页数
-      currentPage: 1, //页码
-      pageSize: 10, //条数
-      delDialog: false, //控制公共弹窗展示
-      delDialogText: "确定要解除限制吗?", //公共弹窗标题
-      type: null, //1解除限制 2加入白名单
-      obj: {}, //存放公共参数
-      addSure: false, //控制确认添加弹窗展示
-      selectUserId: "", //添加用户id
-    };
-  },
-  created() {
-    this.getData();
-  },
-  methods: {
-    // 初始化
-    getData() {
-      this.loading = true;
-      recordPage({
-        page: this.currentPage,
-        pageSize: this.pageSize,
-        userErBanNo: this.userId,
-      }).then((res) => {
-        this.tableData = res.data.records;
-        this.loading = false;
-        this.total = res.data.total;
-      });
-    },
-    // 搜索
-    search() {
-      this.getData();
-    },
-    // 新增
-    add() {
-      this.addSure = true;
-    },
-    // 确认新增
-    addSureClick() {
-      this.addSure = false;
-      this.delDialogText = "确定要添加地区限制访问吗?";
-      this.delDialog = true;
-      this.type = 3;
-    },
-    // 解除限制按钮
-    unfreeze(row) {
-      console.log(row);
-      this.delDialogText = "确定要解除限制吗?";
-      this.delDialog = true;
-      this.type = 1;
-      this.obj = row;
-    },
-    // 加入白名单
-    addWhite(row) {
-      console.log(row);
-      this.delDialogText = "确定要加入白名单吗?";
-      this.delDialog = true;
-      this.type = 2;
-      this.obj = row;
-    },
-    // 二次确认
-    sureClick() {
-      if (this.type == 1) {
-        relieve({ uid: this.obj.uid }).then((res) => {
-          if (res.code == 200) {
-            ElMessage({
-              showClose: true,
-              message: res.message,
-              type: "success",
-            });
-            this.getData();
-          } else {
-            ElMessage({
-              showClose: true,
-              message: res.message,
-              type: "error",
-            });
-          }
-        });
-      } else if (this.type == 2) {
-        addWhite({ uid: this.obj.uid }).then((res) => {
-          if (res.code == 200) {
-            ElMessage({
-              showClose: true,
-              message: res.message,
-              type: "success",
-            });
-            this.getData();
-          } else {
-            ElMessage({
-              showClose: true,
-              message: res.message,
-              type: "error",
-            });
-          }
-        });
-      }
-      if (this.type == 3) {
-        recordSave({ erBanNoStr: this.selectUserId }).then((res) => {
-          if (res.code == 200) {
-            this.selectUserId = "";
-            ElMessage({
-              showClose: true,
-              message: res.message,
-              type: "success",
-            });
-            this.getData();
-          } else {
-            ElMessage({
-              showClose: true,
-              message: res.message,
-              type: "error",
-            });
-          }
-        });
-      }
-      this.getData();
-      this.delDialog = false;
-    },
-    // 分页导航
-    handleSizeChange(val) {
-      this.getData();
-    },
-    handleCurrentChange(val) {
-      this.getData();
-    },
-    // sim格式化
-    tableArrFormat(val) {
-      //   console.log("aaaaaaaaaaaaa", val.simCards);
-      var str = "";
-      if (!val.simCards) {
-        return;
-      }
-      val.simCards.forEach((res, i) => {
-        str += `
-                sim卡${i + 1}: ${
-          res == 452
-            ? "越南"
-            : res == 454
-            ? "香港"
-            : res == 460
-            ? "中国"
-            : res == 466
-            ? "台湾"
-            : res == 456
-            ? "柬埔寨"
-            : res == 502
-            ? "马来西亚"
-            : res == 525
-            ? "新加坡"
-            : res == 510
-            ? "印尼"
-            : res == 414
-            ? "缅甸"
-            : res == 515
-            ? "菲律宾"
-            : res == 520
-            ? "泰国"
-            : res == 457
-            ? "老挝"
-            : res
-        }<br>
-            `;
-      });
-      return str;
-    },
-    // sim格式化
-    langFormat(val) {
-      var str = "";
-      if (val == null) {
-        str = "空";
-      }else if(val.match(/cn/gi)||val.match(/hans/gi)){
-        str = `${val}【简体中文】`;
-      }else if(val.match(/tw/gi)||val.match(/hant/gi)||val.match(/hk/gi)||val.match(/mo/gi)){
-        str = `${val}【繁体中文】`;
-      }else{
-        str = val;
-      }
-      return str;
-    },
-  },
-};
-</script>
-<style lang="less" scoped>
-.outer {
-  padding-top: 20px;
-  background: #ecf0f5;
-  border-top: 3px solid #d2d6de;
-  .search {
-    width: 100%;
-    height: 41px;
-    .searchLeft,
-    .searchRight {
-      width: 20%;
-      float: left;
-      span {
-        margin-right: 10px;
-      }
-      .input {
-        width: 75%;
-      }
-    }
-  }
-  .buttonBox {
-    margin-top: 10px;
-  }
-  .authorityBox {
-    .authoritySpan {
-      margin-right: 20px;
-    }
-    .authorityInpput {
-      width: 50%;
-    }
-  }
-  .dialogTableVisibleBut {
-    margin: -25px 0 20px 0px;
-  }
-}
-</style>

src/views/accessRestriction/AccessWhitelist.vue

@@ -1,354 +0,0 @@
-<template>
-  <div class="outer">
-    <!-- 搜索 -->
-    <div class="search">
-      <div class="searchLeft">
-        <span>用户平台ID</span>
-        <el-input
-          v-model="userId"
-          size="default"
-          placeholder="用户平台ID"
-          class="input"
-        ></el-input>
-      </div>
-      <div class="searchRight">
-        <span>用户手机号</span>
-        <el-input
-          v-model="userPhone"
-          size="default"
-          placeholder="用户手机号"
-          class="input"
-        ></el-input>
-      </div>
-    </div>
-    <!-- 按钮 -->
-    <div class="buttonBox">
-      <el-button class="primary" type="primary" size="default" @click="add()"
-        >新增</el-button
-      >
-      <el-button class="primary" type="primary" size="default" @click="search()"
-        >查询</el-button
-      >
-    </div>
-    <!-- 列表 -->
-    <el-table
-      v-loading="loading"
-      :data="tableData"
-      border
-      style="width: 100%; margin-top: 25px"
-    >
-      <el-table-column prop="erbanNo" align="center" label="用戶id" />
-      <el-table-column prop="phone" align="center" label="用戶手机号" />
-      <el-table-column prop="nick" align="center" label="昵称" />
-      <el-table-column prop="signTime" align="center" label="注册时间" />
-      <el-table-column prop="roleName" align="center" label="身份" />
-      <el-table-column prop="createTime" align="center" label="进入白名单时间" />
-      <el-table-column prop="lastCheckTime" align="center" label="最近一次访问时间" />
-      <el-table-column align="center" label="进入白名单来源">
-        <template v-slot="scope">
-          {{
-            scope.row.source == 1
-              ? "手动添加"
-              : scope.row.source == 2
-              ? "手机号申请通过"
-              : scope.row.source == 3
-              ? "限制访问记录添加"
-              : "未知来源"
-          }}
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="操作" width="400">
-        <template v-slot="scope">
-          <el-button
-            @click="delWhite(scope.row)"
-            class="primary"
-            type="primary"
-            size="default"
-            >移除白名单</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <el-pagination
-      style="margin-top: 10px"
-      class="paginationClass"
-      v-model:current-page="currentPage"
-      v-model:page-size="pageSize"
-      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500]"
-      :small="small"
-      :disabled="disabled"
-      :background="background"
-      layout="sizes, prev, pager, next"
-      :total="total"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-    />
-    <!-- 公共二次确认删除弹窗 -->
-    <el-dialog v-model="delDialog" title="提示" width="30%" center>
-      <span> {{ delDialogText }}</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="delDialog = false">取消</el-button>
-          <el-button type="primary" @click="sureClick(val, type)"> 确认 </el-button>
-        </span>
-      </template>
-    </el-dialog>
-    <!-- 添加弹窗 -->
-    <el-dialog v-model="addSure" title="提示" width="30%" center>
-      <div class="selectBox">
-        <span class="left">添加号码类型</span>
-        <el-select
-          v-model="value"
-          fit-input-width="true"
-          placeholder="请选择"
-          class="right"
-        >
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </div>
-      <div class="selectBox" v-if="value == 1">
-        <span class="left">用户ID</span>
-        <el-input
-          v-model="selectUserId"
-          size="default"
-          placeholder="用户平台ID"
-          class="right"
-        ></el-input>
-      </div>
-      <div class="selectBox" v-else>
-        <span class="left">手机号</span>
-        <el-input
-          v-model="selectUserPhone"
-          size="default"
-          placeholder=""
-          class="right"
-          style="width: 56%"
-        >
-        </el-input>
-        <b>+86</b>
-      </div>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="addSure = false">取消</el-button>
-          <el-button type="primary" @click="addSureClick()"> 添加 </el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-<script>
-import {
-  whitePage,
-  whiteDel,
-  whiteSave,
-} from "@/api/AccessRestriction.vue/AccessRestriction.js";
-import { ElMessage } from "element-plus";
-export default {
-  name: "AccessWhitelist",
-  data() {
-    return {
-      userId: "", //用戶id
-      userPhone: "", //用戶手机号
-      loading: false, //列表loading
-      tableData: [], //列表数据
-      total: 10, //总页数
-      currentPage: 1, //页码
-      pageSize: 10, //条数
-      delDialog: false, //控制公共弹窗展示
-      delDialogText: "确定要移除白名单吗?", //公共弹窗标题
-      addSure: false, //控制确认添加弹窗展示
-      value: "1", //选择器
-      options: [
-        {
-          value: "1",
-          label: "用户id",
-        },
-        {
-          value: "2",
-          label: "用户手机号",
-        },
-      ],
-      selectUserId: "", //添加弹窗用户id
-      selectUserPhone: "", //添加弹窗用户手机号
-      obj: {}, //存放公共参数
-    };
-  },
-  created() {
-    this.getData();
-  },
-  methods: {
-    // 初始化
-    getData() {
-      this.loading = true;
-      whitePage({
-        page: this.currentPage,
-        pageSize: this.pageSize,
-        userErBanNo: this.userId,
-        phone: this.userPhone,
-      }).then((res) => {
-        this.tableData = res.data.records;
-        this.loading = false;
-        this.total = res.data.total;
-      });
-    },
-    // 新增
-    add() {
-      this.addSure = true;
-    },
-    // 搜索
-    search() {
-      this.getData();
-    },
-    // 移除白名单
-    delWhite(row) {
-      console.log(row);
-      this.obj = row;
-      this.delDialog = true;
-    },
-    // 二次确认
-    sureClick() {
-      whiteDel({ id: this.obj.id }).then((res) => {
-        if (res.code == 200) {
-          ElMessage({
-            showClose: true,
-            message: res.message,
-            type: "success",
-          });
-          this.getData();
-        } else {
-          ElMessage({
-            showClose: true,
-            message: res.message,
-            type: "error",
-          });
-        }
-        this.delDialog = false;
-      });
-    },
-    // 添加确认
-    addSureClick() {
-      var objs = {};
-      if (this.value == 1) {
-        objs = {
-          userErBanNoStr: this.selectUserId,
-        };
-      } else {
-        let phone = this.selectUserPhone;
-        if (phone) {
-          phone = '86' + phone;
-        }
-        objs = {
-          phone: phone,
-        };
-      }
-      whiteSave(objs).then((res) => {
-        this.selectUserId = "";
-        this.selectUserPhone = "";
-        if (res.code == 200) {
-          ElMessage({
-            showClose: true,
-            message: res.message,
-            type: "success",
-          });
-          this.getData();
-        } else {
-          ElMessage({
-            showClose: true,
-            message: res.message,
-            type: "error",
-          });
-        }
-        this.getData();
-      });
-      this.addSure = false;
-    },
-    // 分页导航
-    handleSizeChange(val) {
-      this.getData();
-    },
-    handleCurrentChange(val) {
-      this.getData();
-    },
-  },
-};
-</script>
-<style lang="less" scoped>
-.outer {
-  padding-top: 20px;
-  background: #ecf0f5;
-  border-top: 3px solid #d2d6de;
-  .search {
-    width: 100%;
-    height: 41px;
-    .searchLeft,
-    .searchRight {
-      width: 20%;
-      float: left;
-      span {
-        margin-right: 10px;
-      }
-      .input {
-        width: 75%;
-      }
-    }
-  }
-  .buttonBox {
-    margin-top: 10px;
-  }
-  .authorityBox {
-    .authoritySpan {
-      margin-right: 20px;
-    }
-    .authorityInpput {
-      width: 50%;
-    }
-  }
-  .dialogTableVisibleBut {
-    margin: -25px 0 20px 0px;
-  }
-  .selectBox {
-    margin-bottom: 10px;
-    display: flex;
-    justify-content: space-between;
-    width: 70%;
-    .left {
-      display: block;
-      margin-right: 25px;
-      white-space: nowrap;
-    }
-    .right {
-      width: 70%;
-      position: relative;
-    }
-
-    b {
-      font-style: normal;
-      position: absolute;
-      left: 135px;
-      width: 54px;
-      height: 32px;
-      line-height: 32px;
-      text-align: center;
-      border-top-right-radius: 0;
-      border-bottom-right-radius: 0;
-      border-top-left-radius: 5px;
-      border-bottom-left-radius: 5px;
-      border-right: 1px solid #dcdfe6;
-      border-left: 1px solid #dcdfe6;
-      border-bottom: 1px solid #dcdfe6;
-      border-top: 1px solid #dcdfe6;
-      background: #fff;
-    }
-  }
-}
-input[type="file"] {
-  display: none;
-}
-</style>

src/views/flowteam/FlowTeamInvitecodeManageView.vue

@@ -256,21 +256,6 @@ export default {
                                 return date.format('yyyy-MM-dd hh:mm:ss');
                             }
                         },
-                        { 
-                            field: 'source', 
-                            title: '邀请码填写类型', 
-                            align: 'center', 
-                            width: '5%',
-                            formatter: function (val) {
-                                let value = '';
-                                if (val == 0) {
-                                    value = '自填';
-                                } else if (val == 1) {
-                                    value = '补填';
-                                }
-                                return value;
-                            } 
-                        },
                         {
                             field: 'memberId',
                             title: '操作',

src/views/resource/ResourceView.vue

@@ -327,14 +327,12 @@ export default {
             this.resource.endTime = row.endTime;
             this.resource.seqNo = row.seqNo;
             let ruleValue = row.ruleValue;
-            for (let i = 0, len = this.rules.length; i < len; i++) {
+            if (ruleValue) {
-                let ruleCode = this.rules[i].ruleCode;
+                let ruleObj = JSON.parse(ruleValue);
-                let rule = null;
+                for (let i = 0, len = this.rules.length; i < len; i++) {
-                if (ruleValue) {
+                    let ruleCode = this.rules[i].ruleCode;
-                    let ruleObj = JSON.parse(ruleValue);
+                    this.resource.ruleValue[ruleCode] = ruleObj[ruleCode];
-                    rule = ruleObj[ruleCode];
                 }
-                this.resource.ruleValue[ruleCode] = rule;
             }
             this.editDialog = true;
         },

src/views/resource/SplashView.vue

@@ -270,15 +270,13 @@ export default {
             this.resource.endTime = row.endTime;
             this.resource.seqNo = row.seqNo;
             let ruleValue = row.ruleValue;
-            for (let i = 0, len = this.rules.length; i < len; i++) {
+            if (ruleValue) {
-                let ruleCode = this.rules[i].ruleCode;
+                let ruleObj = JSON.parse(ruleValue);
-                let rule = null;
+                for (let i = 0, len = this.rules.length; i < len; i++) {
-                if (ruleValue) {
+                    let ruleCode = this.rules[i].ruleCode;
-                    let ruleObj = JSON.parse(ruleValue);
+                    this.resource.ruleValue[ruleCode] = ruleObj[ruleCode];
-                    rule = ruleObj[ruleCode];
                 }
-                this.resource.ruleValue[ruleCode] = rule;
+            } 
-            }
             this.editDialog = true;
         },
         editDialogClick() {

src/views/treasure/SeizeTreasurePoolItemView.vue

@@ -435,8 +435,8 @@ export default {
                 }
                 TableHelper.doRefresh('#table');
                 $("#editModal").modal('hide');
-                showPoolCount();
             });
+            showPoolCount();
         }
     },
 

src/views/users/GiftManageView.vue

@@ -850,13 +850,6 @@ export default {
                     $("#nobleId").btComboBox('disable');
                     ComboboxHelper.setDef("#nobleId", '0');
                     ComboboxHelper.setDef("#giftType", '2');
-                    $("input:radio[name='giftStatus']")[1].checked = true;
-                    $("input:radio[name='hasEffect']")[0].checked = true;
-                    $("input:radio[name='hasVggPic']")[0].checked = true;
-                    $("input:radio[name='hasSvga']")[0].checked = true;
-                    $("input:radio[name='isLatest']")[1].checked = true;
-                    $("input:radio[name='isTimeLimit']")[1].checked = true;
-                    $("input:radio[name='roomExclude']")[0].checked = true;
                     $('#giftType').val('');
                     $("#notifyStaySecond").val('');
                     $("#isSkipRoom").val('');

src/views/users/PhoneAuthApplyAdminView.vue

@@ -23,7 +23,7 @@
                             <div class="col-sm-2">
                                 <select name="status" id="status" data-btn-class="btn-warning" class="form-control">
                                     <option value="" selected="selected">全部</option>
-                                    <option value="1">未处理</option>
+                                    <option value="1">待审核</option>
                                     <option value="2">通过</option>
                                     <option value="3">拒绝</option>
                                 </select>
@@ -87,6 +87,24 @@
 <script>
 import TableHelper from '@/utils/bootstrap-table-helper';
 
+var picker1 = $("#beginDate").datetimepicker({
+    format: 'yyyy-mm-dd hh:ii:00',
+    autoclose: true,
+    todayBtn: true
+});
+var picker2 = $("#endDate").datetimepicker({
+    format: 'yyyy-mm-dd hh:ii:00',
+    autoclose: true,
+    todayBtn: true
+});
+// picker1.on('changeDate', function () {
+//     var date = $('#beginDate').datetimepicker('getDate');
+//     picker2.datetimepicker('setStartDate', date);
+// });
+// picker2.on('changeDate', function () {
+//     var date = $('#endDate').datetimepicker('getDate');
+//     picker1.datetimepicker('setEndDate', date);
+// });
 export default {
     name: "PhoneAuthApplyAdminView",
     setup() {
@@ -100,16 +118,6 @@ export default {
     methods: {
         initData() {
             $(function () {
-                $("#beginDate").datetimepicker({
-                    format: 'yyyy-mm-dd hh:ii:00',
-                    autoclose: true,
-                    todayBtn: true
-                });
-                $("#endDate").datetimepicker({
-                    format: 'yyyy-mm-dd hh:ii:00',
-                    autoclose: true,
-                    todayBtn: true
-                });
                 $('#table').bootstrapTable('destroy');
                 $('#table').bootstrapTable({
                     columns: [
@@ -121,6 +129,7 @@ export default {
                             }
                         },
                         { field: 'phone', title: '申请手机号', align: 'center', width: '5%' },
+                        { field: 'authCode', title: '授权码', align: 'center', width: '5%' },
                         {
                             field: 'status',
                             title: '授权状态',

vue.config.js

@@ -3,6 +3,7 @@ var webpack = require('webpack')
 var AutoImport = require('unplugin-auto-import/webpack')
 var Components = require('unplugin-vue-components/webpack')
 var { ElementPlusResolver } = require('unplugin-vue-components/resolvers')
+var BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
 module.exports = defineConfig({
   transpileDependencies: true,
   chainWebpack: config => {
@@ -27,6 +28,9 @@ module.exports = defineConfig({
       Components({
         resolvers: [ElementPlusResolver()],
       }),
+      new BundleAnalyzerPlugin({
+        openAnalyzer: false
+      })
     ],
   },
   devServer: {
@@ -43,9 +47,5 @@ module.exports = defineConfig({
         }
       }
     },
-    client: {
-        //当出现编译错误或警告时，在浏览器中是否显示全屏覆盖。  示例为只显示错误信息
-        overlay:false
-      },
   },
 })