Merge remote branch 'origin/dev' into dev

4/3日修改
测试
2 changed files with 3 additions and 3 deletions
--- a/gold-system/src/views/index.vue
+++ b/gold-system/src/views/index.vue
@ -164,8 +164,8 @@ const handleSelect = (index) => {
              <span>金币充值</span>
            </template>
            <el-menu-item index="/addRecharge">新增充值</el-menu-item>
            <!-- <el-menu-item index="/adminRecharge">客服充值明细</el-menu-item>
            <el-menu-item index="/allRecharge">所有充值明细</el-menu-item> -->
            <el-menu-item index="/adminRecharge">客服充值明细</el-menu-item>
            <el-menu-item index="/allRecharge">所有充值明细</el-menu-item>
          </el-sub-menu>
          <el-sub-menu
--- a/gold-system/src/views/login.vue
+++ b/gold-system/src/views/login.vue
@ -49,7 +49,7 @@ const login = async function () {
        result.data.data.permission == "2" ||
        result.data.data.permission == "3"
      ) {
        router.push("/usergold");
        router.push("/workspace");
      } else if (result.data.data.permission == "4") {
        router.push("/noPermission");
      }
Author	SHA1	Message	Date
donghaolin	db8de3dd94	Merge remote branch 'origin/dev' into dev	3 months ago
donghaolin	372311744a	4/3日修改	3 months ago
donghaolin	20532016c7	测试	3 months ago
donghaolin	41d0880940	这是二期的修改	3 months ago