From 05389ccb9cd0da01a3d88752631adcad82329dcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 14 Nov 2024 15:11:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E9=80=A0=E7=99=BB=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/item/index.vue     |  6 +--
 pages/passport/login.vue | 89 ++++++++++++++++++++++------------------
 utils/common.ts          |  2 +-
 3 files changed, 53 insertions(+), 44 deletions(-)

diff --git a/pages/item/index.vue b/pages/item/index.vue
index b8d466b..2ba9624 100644
--- a/pages/item/index.vue
+++ b/pages/item/index.vue
@@ -12,10 +12,10 @@
             </div>
           </template>
           <el-descriptions title="应用参数" :column="2" border>
-<!--            <el-descriptions-item label="租户ID">{{form.tenantId}}</el-descriptions-item>-->
-<!--            <el-descriptions-item label="插件ID">{{form.menuId || '-'}}</el-descriptions-item>-->
             <el-descriptions-item :span="2" label="应用名称">{{form.tenantName}}</el-descriptions-item>
-<!--            <el-descriptions-item label="管理地址"><a class="cursor-pointer" @click="openUrl(`https://${form.domain}`)">{{form.domain}}</a></el-descriptions-item>-->
+            <el-descriptions-item v-if="form.isBuy" label="租户ID"><span class="text-orange-500">{{form.tenantId}}</span></el-descriptions-item>
+            <el-descriptions-item v-if="form.isBuy" label="插件ID"><span class="text-orange-500">{{form.menuId || '-'}}</span></el-descriptions-item>
+            <el-descriptions-item label="控制台"><a class="cursor-pointer" @click="openUrl(`https://${form.domain}`)">{{form.domain}}</a></el-descriptions-item>
             <el-descriptions-item v-for="(item,index) in form.parameters" :key="index" :label="item.name">{{ item.value }}</el-descriptions-item>
           </el-descriptions>
           <template v-if="form.accounts && form.accounts.length > 0">
diff --git a/pages/passport/login.vue b/pages/passport/login.vue
index 3dede4a..7f3ed89 100644
--- a/pages/passport/login.vue
+++ b/pages/passport/login.vue
@@ -80,13 +80,13 @@
       <!-- 注册界面 -->
       <el-space class="tabs pt-5 text-xl flex justify-center" v-if="!loginBar">
         <el-tabs v-model="activeName" class="demo-tabs ">
-          <el-tab-pane label="手机号注册" name="sms">
-            <span class="text-sm text-gray-400">
-              未注册手机号验证通过后将自动注册
-            </span>
-            <div class="custom-style my-4">
+          <el-tab-pane label="注册账号" name="sms">
+            <div class="custom-style ">
               <el-form :model="form" label-width="auto" class="w-[330px]">
                 <el-form-item>
+                  <span class="text-sm text-gray-400 mb-4">
+                    未注册手机号验证通过后将自动注册
+                  </span>
                   <el-input class="w-full" size="large" maxlength="11" placeholder="请输入手机号码" v-model="form.phone">
                     <template #prepend>+86</template>
                   </el-input>
@@ -101,39 +101,10 @@
                   </el-space>
                 </el-form-item>
                 <el-form-item>
-                  <el-checkbox v-model="form.isAgree">我已阅读并同意</el-checkbox>
-                  <a href="#" class="text-gray-700">《用户协议》</a>
-                  <a href="#" class="text-gray-700">《隐私政策》</a>
-                  <a href="#" class="text-gray-700">《产品服务协议》</a>
-                </el-form-item>
-                <el-form-item>
-                  <el-button type="primary" size="large" class="w-full" :disabled="!form.isAgree" @click="onRegister">注册</el-button>
-                </el-form-item>
-              </el-form>
-            </div>
-          </el-tab-pane>
-          <el-tab-pane label="账号密码注册" name="account">
-            <div class="custom-style my-4">
-              <el-form :model="form" label-width="auto" class="w-[330px]">
-                <el-form-item>
-                  <el-input class="w-full" size="large" maxlength="30" placeholder="登录账号" v-model="form.username" />
-                </el-form-item>
-                <el-form-item>
-                  <el-input type="password" size="large" maxlength="30" placeholder="登录密码" v-model="form.password" />
+                  <el-input class="w-full" size="large" placeholder="公司名称|品牌名称" v-model="form.companyName" />
                 </el-form-item>
                 <el-form-item>
-                  <el-input class="w-full" size="large" maxlength="11" placeholder="请输入手机号码" v-model="form.phone">
-                    <template #prepend>+86</template>
-                  </el-input>
-                </el-form-item>
-                <el-form-item>
-                  <el-space class="flex justify-between w-full">
-                    <el-input size="large" placeholder="短信验证码" maxlength="6" class="w-full" v-model="form.code" @keyup.enter.prevent="onSubmitBySms" />
-                    <el-button size="large" class="w-full" :disabled="!!countdownTime" @click="checkUser">
-                      <span v-if="!countdownTime">发送验证码</span>
-                      <span v-else>已发送 {{ countdownTime }} s</span>
-                    </el-button>
-                  </el-space>
+                  <el-input class="w-full" size="large" placeholder="邮箱地址" v-model="form.email" />
                 </el-form-item>
                 <el-form-item>
                   <el-checkbox v-model="form.isAgree">我已阅读并同意</el-checkbox>
@@ -147,6 +118,41 @@
               </el-form>
             </div>
           </el-tab-pane>
+<!--          <el-tab-pane label="账号密码注册" name="account">-->
+<!--            <div class="custom-style my-4">-->
+<!--              <el-form :model="form" label-width="auto" class="w-[330px]">-->
+<!--                <el-form-item>-->
+<!--                  <el-input class="w-full" size="large" maxlength="30" placeholder="登录账号" v-model="form.username" />-->
+<!--                </el-form-item>-->
+<!--                <el-form-item>-->
+<!--                  <el-input type="password" size="large" maxlength="30" placeholder="登录密码" v-model="form.password" />-->
+<!--                </el-form-item>-->
+<!--                <el-form-item>-->
+<!--                  <el-input class="w-full" size="large" maxlength="11" placeholder="请输入手机号码" v-model="form.phone">-->
+<!--                    <template #prepend>+86</template>-->
+<!--                  </el-input>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item>-->
+<!--                  <el-space class="flex justify-between w-full">-->
+<!--                    <el-input size="large" placeholder="短信验证码" maxlength="6" class="w-full" v-model="form.code" @keyup.enter.prevent="onSubmitBySms" />-->
+<!--                    <el-button size="large" class="w-full" :disabled="!!countdownTime" @click="checkUser">-->
+<!--                      <span v-if="!countdownTime">发送验证码</span>-->
+<!--                      <span v-else>已发送 {{ countdownTime }} s</span>-->
+<!--                    </el-button>-->
+<!--                  </el-space>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item>-->
+<!--                  <el-checkbox v-model="form.isAgree">我已阅读并同意</el-checkbox>-->
+<!--                  <a href="#" class="text-gray-700">《用户协议》</a>-->
+<!--                  <a href="#" class="text-gray-700">《隐私政策》</a>-->
+<!--                  <a href="#" class="text-gray-700">《产品服务协议》</a>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item>-->
+<!--                  <el-button type="primary" size="large" class="w-full" :disabled="!form.isAgree" @click="onRegister">注册</el-button>-->
+<!--                </el-form-item>-->
+<!--              </el-form>-->
+<!--            </div>-->
+<!--          </el-tab-pane>-->
         </el-tabs>
       </el-space>
     </el-card>
@@ -186,9 +192,15 @@ const countdownTime = ref(0);
 // 验证码倒计时定时器
 let countdownTimer: number | null = null;
 
+if(getIdBySpm(0) == 'register'){
+  loginBar.value = false;
+}
+
 // 配置信息
 const { form } = useFormData<User>({
   userId: undefined,
+  companyName: undefined,
+  email: undefined,
   username: '',
   phone: '',
   password: '',
@@ -255,9 +267,6 @@ const navigateTo = (url: string) => {
 }
 
 const onLoginBar = () => {
-  // if(loginBar.value){
-  //   return navigateTo(`/passport/register`)
-  // }
   loginBar.value = !loginBar.value
   activeName.value = loginBar.value ? 'account' : 'sms'
 }
@@ -329,7 +338,7 @@ const onRegister = async () => {
     text: 'Loading'
   })
   await useClientRequest<ApiResult<LoginResult>>('/register',{method: "post",body: {
-      companyName: '应用名称',
+      companyName: form.companyName,
       username: form.phone,
       phone: form.phone,
       password: form.password,
diff --git a/utils/common.ts b/utils/common.ts
index 948f6b1..0df87ec 100644
--- a/utils/common.ts
+++ b/utils/common.ts
@@ -172,7 +172,7 @@ export function loginAdminByToken(): void {
     const user = useUser();
     const uid = user.value?.userId;
     const tid = user.value?.tenantId;
-    openSpmUrl(`https://${tid}.websoft.top/token-login`,undefined, uid, true,true)
+    openSpmUrl(`https://console.websoft.top/token-login`,undefined, uid, true,true)
 }