login

src/views/gameCdKey/list/index.vue

@@ -124,7 +124,7 @@
 
     <el-dialog v-model="dialogVisible" title="下载列表" width="250px" center>
       <div v-for="k in filenames" :key="k">
-        <a :href="baseURL+'upload_file?filename='+k" :download="k" target="_blank">{{ k }}</a> <br/><br/>
+        <a :href="baseURL+'download_file?filename='+k" :download="k" target="_blank">{{ k }}</a> <br/><br/>
       </div>
     </el-dialog>
   </div>

src/views/gameCdKey/setKey/index.vue

@@ -308,7 +308,7 @@ export default defineComponent({
     };
     const onDownload = () => {
       if (state.filename) {
-        window.open(baseURL + 'upload_file?filename=' + state.filename);
+        window.open(baseURL + 'download_file?filename=' + state.filename);
       }
       // state.disabled = true;
     }

src/views/gameManage/copyUnit/index.vue

@@ -330,8 +330,10 @@ export default defineComponent({
 						}, 1000);
 					}
 				})
-				.finally(() => {
+				.catch(() => {
 					state.disabled = true;
+				})
+				.finally(() => {
 				});
 		};
 
@@ -412,10 +414,8 @@ export default defineComponent({
 		};
 		const onDownload = (file: string) => {
 			if (file) {
-				window.open(baseURL + 'upload_file?filename=' + file);
+				window.open(baseURL + 'download_file?filename=' + file);
 			}
-
-			// state.disabled = true;
 		};
 		// 打开修改字典弹窗
 		const switchServer = () => {

src/views/login/component/email.vue

@@ -21,7 +21,7 @@
 			</el-col>
 			<el-col :span="1"></el-col>
 			<el-col :span="8">
-				<el-button class="login-content-code" @click="smsCode">{{ $t('message.email.codeText') }}</el-button>
+				<el-button class="login-content-code" @click="smsCode" >{{ $t('message.email.codeText') }}</el-button>
 			</el-col>
 		</el-form-item>
 		<el-form-item class="login-animation3">

src/views/system/user/component/editUser.vue

@@ -48,16 +48,16 @@
 							</el-cascader>
 						</el-form-item>
 					</el-col>
-<!--					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">-->
-<!--						<el-form-item label="手机号" prop="mobile">-->
-<!--							<el-input v-model="ruleForm.mobile" placeholder="请输入手机号" clearable></el-input>-->
-<!--						</el-form-item>-->
-<!--					</el-col>-->
-<!--					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">-->
-<!--						<el-form-item label="邮箱" prop="email">-->
-<!--							<el-input v-model="ruleForm.email" placeholder="请输入" clearable></el-input>-->
-<!--						</el-form-item>-->
-<!--					</el-col>-->
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="手机号" prop="mobile">
+							<el-input v-model="ruleForm.mobile" placeholder="请输入手机号" clearable></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="邮箱" prop="email">
+							<el-input v-model="ruleForm.email" placeholder="请输入" clearable></el-input>
+						</el-form-item>
+					</el-col>
 <!--					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">-->
 <!--						<el-form-item label="性别" prop="sex">-->
 <!--							<el-select v-model="ruleForm.sex" placeholder="请选择" clearable class="w100">-->

src/views/system/user/index.vue

@@ -33,16 +33,16 @@
                     @keyup.enter.native="userList"
                 />
               </el-form-item>
-<!--              <el-form-item label="手机号码" prop="mobile">-->
-<!--                <el-input-->
-<!--                    v-model="tableData.param.mobile"-->
-<!--                    placeholder="请输入手机号码"-->
-<!--                    clearable-->
-<!--                    size="default"-->
-<!--                    style="width: 240px"-->
-<!--                    @keyup.enter.native="userList"-->
-<!--                />-->
-<!--              </el-form-item>-->
+              <el-form-item label="手机号码" prop="mobile">
+                <el-input
+                    v-model="tableData.param.mobile"
+                    placeholder="请输入手机号码"
+                    clearable
+                    size="default"
+                    style="width: 240px"
+                    @keyup.enter.native="userList"
+                />
+              </el-form-item>
               <el-form-item label="状态" prop="status" style="width: 200px;">
                 <el-select
                     v-model="tableData.param.status"
@@ -106,7 +106,8 @@
                 <span v-for="(item,index) of scope.row.roleInfo" :key="'role-'+index">   {{item.name+'   '}}   </span>
               </template>
             </el-table-column>
-<!--            <el-table-column prop="mobile" label="手机号" show-overflow-tooltip></el-table-column>-->
+            <el-table-column prop="mobile" label="手机号" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="userEmail" label="邮箱" show-overflow-tooltip></el-table-column>
             <el-table-column prop="userStatus" label="用户状态" show-overflow-tooltip>
               <template #default="scope">
                 <el-switch