ソースを参照

fix(merchant): 登录状态校验与页面适配优化

EvilDragon 5 ヶ月 前
コミット
a082c0d172

+ 1 - 1
packages/merchant/env/.env.production

@@ -1,5 +1,5 @@
 # 变量必须以 VITE_ 为前缀才能暴露给外部读取
-NODE_ENV = 'development'
+NODE_ENV = 'production'
 # 是否去除console 和 debugger
 VITE_DELETE_CONSOLE = true
 # 是否开启sourcemap

+ 3 - 0
packages/merchant/src/pages/home/index.vue

@@ -105,6 +105,9 @@ onShow(async () => {
 })
 onLoad(() => {
   console.log(isLogined.value)
+  if (!isLogined.value) {
+    uni.reLaunch({ url: '/pages/login/index' })
+  }
 })
 onShareAppMessage(() => ({}))
 </script>

+ 42 - 40
packages/merchant/src/pages/login/index.vue

@@ -37,49 +37,51 @@ onLoad(() => {
 </script>
 <template>
   <div class="flex-grow flex flex-col items-center justify-start px-7.5 bg-[#ffffff] pt-[100px]">
-    <div class="flex flex-col justify-start mb-[57px] title">
-      <div class="text-black text-2xl font-normal font-['PingFang SC']">你好!</div>
-      <div class="text-black text-2xl font-normal font-['PingFang SC'] mt-[9px]">
-        欢迎来到筑巢荟
+    <template v-if="!(isLogined ?? true)">
+      <div class="flex flex-col justify-start mb-[57px] title">
+        <div class="text-black text-2xl font-normal font-['PingFang SC']">你好!</div>
+        <div class="text-black text-2xl font-normal font-['PingFang SC'] mt-[9px]">
+          欢迎来到筑巢荟
+        </div>
       </div>
-    </div>
-    <div class="w-full flex flex-col gap-6.5">
-      <div class="bg-[#F6F6F6] flex items-center h-12.5 px-5 rounded-full gap-4">
-        <wd-img :src="loginAccountIcon" mode="widthFix" width="19" />
-        <wd-input
-          no-border
-          type="number"
-          placeholder="请输入手机号"
-          v-model="formData.mobile"
-          custom-class="bg-transparent!"
-        />
+      <div class="w-full flex flex-col gap-6.5">
+        <div class="bg-[#F6F6F6] flex items-center h-12.5 px-5 rounded-full gap-4">
+          <wd-img :src="loginAccountIcon" mode="widthFix" width="19" />
+          <wd-input
+            no-border
+            type="number"
+            placeholder="请输入手机号"
+            v-model="formData.mobile"
+            custom-class="bg-transparent!"
+          />
+        </div>
+        <div class="bg-[#F6F6F6] flex items-center h-12.5 px-5 rounded-full gap-4">
+          <wd-img :src="loginPswIcon" mode="widthFix" width="19" />
+          <wd-input
+            no-border
+            type="number"
+            placeholder="请输入密码"
+            v-model="formData.password"
+            custom-class="flex-1 bg-transparent!"
+          />
+        </div>
       </div>
-      <div class="bg-[#F6F6F6] flex items-center h-12.5 px-5 rounded-full gap-4">
-        <wd-img :src="loginPswIcon" mode="widthFix" width="19" />
-        <wd-input
-          no-border
-          type="number"
-          placeholder="请输入密码"
-          v-model="formData.password"
-          custom-class="flex-1 bg-transparent!"
-        />
+      <div class="w-full flex items-center justify-between mt-[19px]">
+        <wd-checkbox :modelValue="true" shape="square">记住密码</wd-checkbox>
+        <div class="text-[#2357e9] text-xs font-normal font-['PingFang SC']">忘记密码?</div>
       </div>
-    </div>
-    <div class="w-full flex items-center justify-between mt-[19px]">
-      <wd-checkbox :modelValue="true" shape="square">记住密码</wd-checkbox>
-      <div class="text-[#2357e9] text-xs font-normal font-['PingFang SC']">忘记密码?</div>
-    </div>
-    <div class="w-full mt-[50px]">
-      <wd-button block :round="false" @click="handleLogin">登录</wd-button>
-    </div>
-    <div class="mt-8">
-      <span class="text-black/40 text-xs font-normal font-['PingFang SC'] leading-tight">
-        登录即代表您已阅读并同意筑巢荟的
-      </span>
-      <span class="text-[#2357e9] text-xs font-normal font-['PingFang SC'] leading-tight">
-        《服务使用协议》
-      </span>
-    </div>
+      <div class="w-full mt-[50px]">
+        <wd-button block :round="false" @click="handleLogin">登录</wd-button>
+      </div>
+      <div class="mt-8">
+        <span class="text-black/40 text-xs font-normal font-['PingFang SC'] leading-tight">
+          登录即代表您已阅读并同意筑巢荟的
+        </span>
+        <span class="text-[#2357e9] text-xs font-normal font-['PingFang SC'] leading-tight">
+          《服务使用协议》
+        </span>
+      </div>
+    </template>
   </div>
 </template>