From 5c0105e7865b940eb7229ba547af72cbf6f3a463 Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Wed, 7 Sep 2022 20:58:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/views/decoration/tabbar.vue         |   1 +
 app/src/api/account.ts                        |  12 ++
 app/src/api/app.ts                            |   6 +
 app/src/enums/appEnums.ts                     |  16 ++
 app/src/pages.json                            |   6 +
 app/src/pages/login/login.vue                 | 171 +++++++++++++++---
 app/src/pages/register/register.vue           |  76 ++++++++
 app/src/plugins/modules/pinia.ts              |   6 +
 app/src/static/images/icon_code.png           | Bin 0 -> 2051 bytes
 app/src/static/images/icon_mobile.png         | Bin 0 -> 679 bytes
 app/src/static/images/icon_wx.png             | Bin 0 -> 6285 bytes
 app/src/stores/app.ts                         |   8 +
 app/src/stores/user.ts                        |  12 ++
 .../components/u-form-item/u-form-item.vue    |   4 +-
 app/src/utils/client.ts                       |  57 ++++++
 app/src/utils/request/index.ts                |   9 +-
 16 files changed, 353 insertions(+), 31 deletions(-)
 create mode 100644 app/src/api/account.ts
 create mode 100644 app/src/api/app.ts
 create mode 100644 app/src/pages/register/register.vue
 create mode 100644 app/src/plugins/modules/pinia.ts
 create mode 100644 app/src/static/images/icon_code.png
 create mode 100644 app/src/static/images/icon_mobile.png
 create mode 100644 app/src/static/images/icon_wx.png
 create mode 100644 app/src/stores/app.ts
 create mode 100644 app/src/stores/user.ts
 create mode 100644 app/src/utils/client.ts

diff --git a/admin/src/views/decoration/tabbar.vue b/admin/src/views/decoration/tabbar.vue
index 52650b43..7b378ae9 100644
--- a/admin/src/views/decoration/tabbar.vue
+++ b/admin/src/views/decoration/tabbar.vue
@@ -157,6 +157,7 @@ const setData = async () => {
     getData()
     feedback.msgSuccess('保存成功')
 }
+getData()
 </script>
 <style lang="scss" scoped>
 .decoration-tabbar {
diff --git a/app/src/api/account.ts b/app/src/api/account.ts
new file mode 100644
index 00000000..a23ff489
--- /dev/null
+++ b/app/src/api/account.ts
@@ -0,0 +1,12 @@
+import { client } from '@/utils/client'
+import request from '@/utils/request'
+
+// 登录
+export function login(data: Record<string, any>) {
+    return request.post({ url: '/login/check', data: { ...data, client } })
+}
+
+//注册
+export function register(data: Record<string, any>) {
+    return request.post({ url: '/login/register', data: { ...data, client } })
+}
diff --git a/app/src/api/app.ts b/app/src/api/app.ts
new file mode 100644
index 00000000..a3c70262
--- /dev/null
+++ b/app/src/api/app.ts
@@ -0,0 +1,6 @@
+import request from '@/utils/request'
+
+//注册
+export function smsSend(data: Record<string, any>) {
+    return request.post({ url: '/sms/send', data: data })
+}
diff --git a/app/src/enums/appEnums.ts b/app/src/enums/appEnums.ts
index 1fedaf22..9072c4bc 100644
--- a/app/src/enums/appEnums.ts
+++ b/app/src/enums/appEnums.ts
@@ -3,3 +3,19 @@ export enum ThemeEnum {
     LIGHT = 'light',
     DARK = 'dark'
 }
+
+// 客户端
+export enum ClientEnum {
+    MP_WEIXIN = 1, // 微信-小程序
+    OA_WEIXIN = 2, // 微信-公众号
+    H5 = 3, // H5
+    IOS = 5, //苹果
+    ANDROID = 6 //安卓
+}
+
+export enum SMSEnum {
+    LOGIN = 101,
+    BIND_MOBILE = 102,
+    CHANGE_MOBILE = 103,
+    FIND_PASSWORD = 104
+}
diff --git a/app/src/pages.json b/app/src/pages.json
index dbc3c8c8..5526df9f 100644
--- a/app/src/pages.json
+++ b/app/src/pages.json
@@ -23,6 +23,12 @@
             "style": {
                 "navigationBarTitleText": "登录"
             }
+        },
+        {
+            "path": "pages/register/register",
+            "style": {
+                "navigationBarTitleText": "注册"
+            }
         }
     ],
     "globalStyle": {
diff --git a/app/src/pages/login/login.vue b/app/src/pages/login/login.vue
index 2dfa6ddf..7a136291 100644
--- a/app/src/pages/login/login.vue
+++ b/app/src/pages/login/login.vue
@@ -1,46 +1,169 @@
 <template>
-    <view class="login">
+    <view class="login min-h-full flex flex-col items-center px-[40rpx] pt-[80rpx] box-border">
         <view>
             <u-image src="" mode="widthFix" height="160" width="160" />
         </view>
         <view class="mt-4">这里是商城名称</view>
         <view class="w-full mt-[60rpx]">
-            <u-form :model="formData" borderBottom>
-                <u-form-item borderBottom>
-                    <u-icon class="mr-2" :size="36" name="/static/images/icon_user.png" />
-                    <u-input
-                        v-model="formData.mobile"
-                        :border="false"
-                        placeholder="请输入账号/手机号码"
-                    />
-                </u-form-item>
-                <u-form-item borderBottom>
-                    <u-icon class="mr-2" :size="36" name="/static/images/icon_password.png" />
-                    <u-input placeholder="请输入密码" :border="false" />
-                    <view
-                        class="border-l border-solid border-0 border-light pl-3 text-muted leading-4"
-                    >
-                        忘记密码？
-                    </view>
-                </u-form-item>
+            <u-form borderBottom>
+                <template v-if="scene == LoginTypeEnum.ACCOUNT">
+                    <u-form-item borderBottom>
+                        <u-icon class="mr-2" :size="36" name="/static/images/icon_user.png" />
+                        <u-input
+                            class="flex-1"
+                            v-model="formData.username"
+                            :border="false"
+                            placeholder="请输入账号/手机号码"
+                        />
+                    </u-form-item>
+                    <u-form-item borderBottom>
+                        <u-icon class="mr-2" :size="36" name="/static/images/icon_password.png" />
+                        <u-input
+                            class="flex-1"
+                            v-model="formData.password"
+                            type="password"
+                            placeholder="请输入密码"
+                            :border="false"
+                        />
+                        <view
+                            class="border-l border-solid border-0 border-light pl-3 text-muted leading-4 ml-3"
+                        >
+                            忘记密码？
+                        </view>
+                    </u-form-item>
+                </template>
+                <template v-if="scene == LoginTypeEnum.MOBILE">
+                    <u-form-item borderBottom>
+                        <u-icon class="mr-2" :size="36" name="/static/images/icon_mobile.png" />
+                        <u-input
+                            class="flex-1"
+                            v-model="formData.mobile"
+                            :border="false"
+                            placeholder="请输入手机号码"
+                        />
+                    </u-form-item>
+                    <u-form-item borderBottom>
+                        <u-icon class="mr-2" :size="36" name="/static/images/icon_code.png" />
+                        <u-input
+                            class="flex-1"
+                            v-model="formData.code"
+                            placeholder="请输入验证码"
+                            :border="false"
+                        />
+                        <view
+                            class="border-l border-solid border-0 border-light pl-3 text-muted leading-4 ml-3 w-[180rpx]"
+                            @click="sendSms"
+                        >
+                            <u-verification-code
+                                ref="uCodeRef"
+                                :seconds="60"
+                                @change="codeChange"
+                                change-text="x秒"
+                            />
+                            {{ codeTips }}
+                        </view>
+                    </u-form-item>
+                </template>
             </u-form>
+            <view class="mt-[60rpx]">
+                <u-checkbox v-model="isCheckAgreement" shape="circle">
+                    <view class="text-xs flex">
+                        已阅读并同意
+                        <navigator class="text-primary">《服务协议》</navigator>
+                        和<navigator class="text-primary">《隐私协议》</navigator>
+                    </view>
+                </u-checkbox>
+            </view>
+            <view class="mt-[40rpx]">
+                <u-button type="primary" shape="circle" @click="accountLogin(scene)">
+                    登 录
+                </u-button>
+            </view>
+
+            <view class="text-content flex justify-between mt-[40rpx]">
+                <view v-if="scene == LoginTypeEnum.MOBILE" @click="scene = LoginTypeEnum.ACCOUNT">
+                    账号密码登录
+                </view>
+                <view v-if="scene == LoginTypeEnum.ACCOUNT" @click="scene = LoginTypeEnum.MOBILE">
+                    短信验证码登录
+                </view>
+                <navigator url="/pages/register/register">注册账号</navigator>
+            </view>
+            <view class="mt-[80rpx]">
+                <u-divider>第三方登录</u-divider>
+                <div class="flex justify-center mt-[40rpx]">
+                    <div class="flex flex-col items-center" @click="wxLogin">
+                        <u-icon name="/static/images/icon_wx.png" size="80" />
+                        <div class="text-sm mt-[10px]">微信登录</div>
+                    </div>
+                </div>
+            </view>
         </view>
     </view>
 </template>
 
 <script setup lang="ts">
-import { reactive } from 'vue'
-
+import { login } from '@/api/account'
+import { smsSend } from '@/api/app'
+import { SMSEnum } from '@/enums/appEnums'
+import { reactive, ref, shallowRef } from 'vue'
+enum LoginTypeEnum {
+    MOBILE = 'mobile',
+    ACCOUNT = 'account',
+    MNP = 'mnp'
+}
+const uCodeRef = shallowRef()
+const scene = ref(LoginTypeEnum.ACCOUNT)
+const codeTips = ref('')
+const isCheckAgreement = ref(false)
 const formData = reactive({
+    username: '',
+    password: '',
+    code: '',
     mobile: ''
 })
+
+const codeChange = (text: string) => {
+    codeTips.value = text
+}
+
+const sendSms = async () => {
+    if (!formData.mobile) return uni.$u.toast('请输入手机号码')
+    if (uCodeRef.value?.canGetCode) {
+        await smsSend({
+            scene: SMSEnum.LOGIN,
+            mobile: formData.mobile
+        })
+        uni.$u.toast('发送成功')
+        uCodeRef.value?.start()
+    }
+}
+const accountLogin = async (scene: LoginTypeEnum) => {
+    if (!isCheckAgreement.value) return uni.$u.toast('请勾选已阅读并同意《服务协议》和《隐私协议》')
+    if (scene == LoginTypeEnum.ACCOUNT) {
+        if (!formData.username) return uni.$u.toast('请输入账号/手机号码')
+        if (!formData.password) return uni.$u.toast('请输入密码')
+    }
+    if (scene == LoginTypeEnum.MOBILE) {
+        if (!formData.mobile) return uni.$u.toast('请输入手机号码')
+        if (!formData.code) return uni.$u.toast('请输入验证码')
+    }
+
+    await login({ ...formData, scene })
+    uni.$u.toast('登录成功')
+    uni.navigateBack()
+}
+
+const wxLogin = async () => {
+    const data: any = await uni.login({
+        provider: 'weixin'
+    })
+    accountLogin(LoginTypeEnum.MNP)
+}
 </script>
 
 <style lang="scss">
 page {
     height: 100%;
 }
-.login {
-    @apply min-h-full flex flex-col items-center px-[40rpx] pt-[80rpx] box-border;
-}
 </style>
diff --git a/app/src/pages/register/register.vue b/app/src/pages/register/register.vue
new file mode 100644
index 00000000..68652dc4
--- /dev/null
+++ b/app/src/pages/register/register.vue
@@ -0,0 +1,76 @@
+<template>
+    <view class="register min-h-full flex flex-col items-center px-[40rpx] pt-[40rpx] box-border">
+        <view class="w-full">
+            <u-form borderBottom :label-width="150">
+                <u-form-item label="创建账号" borderBottom>
+                    <u-input
+                        class="flex-1"
+                        v-model="accountData.username"
+                        :border="false"
+                        placeholder="请输入账号"
+                    />
+                </u-form-item>
+                <u-form-item label="设置密码" borderBottom>
+                    <u-input
+                        class="flex-1"
+                        type="password"
+                        v-model="accountData.password"
+                        placeholder="请输入字母+数字组合的密码"
+                        :border="false"
+                    />
+                </u-form-item>
+                <u-form-item label="确认密码" borderBottom>
+                    <u-input
+                        class="flex-1"
+                        type="password"
+                        v-model="accountData.password2"
+                        placeholder="请确认密码"
+                        :border="false"
+                    />
+                </u-form-item>
+            </u-form>
+            <view class="mt-[60rpx]">
+                <u-checkbox v-model="isCheckAgreement" shape="circle">
+                    <view class="text-xs flex">
+                        已阅读并同意
+                        <navigator class="text-primary">《服务协议》</navigator>
+                        和<navigator class="text-primary">《隐私协议》</navigator>
+                    </view>
+                </u-checkbox>
+            </view>
+            <view class="mt-[40rpx]">
+                <u-button type="primary" shape="circle" @click="accountRegister"> 注册 </u-button>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script setup lang="ts">
+import { register } from '@/api/account'
+import { reactive, ref } from 'vue'
+
+const isCheckAgreement = ref(false)
+
+const accountData = reactive({
+    username: '',
+    password: '',
+    password2: ''
+})
+
+const accountRegister = async () => {
+    if (!isCheckAgreement.value) return uni.$u.toast('请勾选已阅读并同意《服务协议》和《隐私协议》')
+    if (!accountData.username) return uni.$u.toast('请输入账号')
+    if (!accountData.password) return uni.$u.toast('请输入密码')
+    if (!accountData.password2) return uni.$u.toast('请输入确认密码')
+    if (accountData.password != accountData.password2) return uni.$u.toast('两次输入的密码不一致')
+    await register(accountData)
+    uni.$u.toast('组册成功')
+    uni.navigateBack()
+}
+</script>
+
+<style lang="scss">
+page {
+    height: 100%;
+}
+</style>
diff --git a/app/src/plugins/modules/pinia.ts b/app/src/plugins/modules/pinia.ts
new file mode 100644
index 00000000..c5b769f3
--- /dev/null
+++ b/app/src/plugins/modules/pinia.ts
@@ -0,0 +1,6 @@
+import { App } from 'vue'
+import { createPinia } from 'pinia'
+const pinia = createPinia()
+export default (app: App) => {
+    app.use(pinia)
+}
diff --git a/app/src/static/images/icon_code.png b/app/src/static/images/icon_code.png
new file mode 100644
index 0000000000000000000000000000000000000000..143e6d9730d812cbe424c2a612a955e17bba7c48
GIT binary patch
literal 2051
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

literal 0
HcmV?d00001

diff --git a/app/src/static/images/icon_mobile.png b/app/src/static/images/icon_mobile.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5e76812938009610f503287df443ff6fc09cca3
GIT binary patch
literal 679
zcmV;Y0$BZtP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px%VM#<mR9HvtSUsx~K@>fA^IV_cf`wuui1DLTaA#9QLDFk!YJHtnew2Px3YK<?
zjo4Vkhn=0U4}=7=D*;6i^D8!m;*!ag8)snMx0~cWQ_jFNJ2RJa&z#wrdk8g+nTd#a
zJRTp+vg{s!EdVD05CG5gy5;hHYUXClyu-|oTdmeNX7-3^R<}@s?`jrInx+Q;ya#X<
zfCLdB(%AH>^>(aLm@D%#BDxla;ipBQDgpI+y+*g&)k%^(AfhKG@HT)R5lxx-8Gv&o
zkpCpc%nt#Ki0C|kI{=OY_@3wa#df>>%O+iBV;3MhQ9w1D&CdWX0C=O6x)I0mMyJ!6
zCP{LMh+Y9W0YICrv9Sg4^C*g*+Qf##;T6yGJ_6Vfwv|#J?AXeHMx)UYt@RH8$C&wg
z6h+%{9B+y?1e9#2@B4?f*0M$O)@U>+&-33(sh=hxFAT%!U@+M9eg7+f(*SNMrC!?P
z_6leW;3$BuQtF)zA{r14iRh~|XtTF$_xt@rzVCklaAqxl3JlG+Y_4kNO8v>01!@5a
zvq2CDptAsOE2Uoi7eiHm7M*uH<^U~Y$uZ;@(pt~|L++FnwO~(%xjGy}wYR-v$mqr~
z<Zk<_Ux<4T)m^gg`Qe@)?)gzFf&aP)#`P#(uH`~;nRd!$&^imn%2Ik&KtT}D+Dhr7
z*}%-NqbS;1=IxY$+WBdkUIq~F%WROKHFnHfW)`ogwuCMM61U4(H>UvHHBQOi?U<sD
z78q8m?%F(@b<*~2SQSBur8k*O?lbevf~B`AAYpR?U}rX)JzB-m`vdg(USVJRKzslI
N002ovPDHLkV1lw>JxTxo

literal 0
HcmV?d00001

diff --git a/app/src/static/images/icon_wx.png b/app/src/static/images/icon_wx.png
new file mode 100644
index 0000000000000000000000000000000000000000..48102711d22676a011ea133dc1d182c85d364fd9
GIT binary patch
literal 6285
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
DvWWNI

literal 0
HcmV?d00001

diff --git a/app/src/stores/app.ts b/app/src/stores/app.ts
new file mode 100644
index 00000000..82bdc1ec
--- /dev/null
+++ b/app/src/stores/app.ts
@@ -0,0 +1,8 @@
+import { defineStore } from 'pinia'
+
+export const useAppStore = defineStore({
+    id: 'userStore',
+    state: () => ({}),
+    getters: {},
+    actions: {}
+})
diff --git a/app/src/stores/user.ts b/app/src/stores/user.ts
new file mode 100644
index 00000000..4a821b83
--- /dev/null
+++ b/app/src/stores/user.ts
@@ -0,0 +1,12 @@
+import { getClient } from '@/utils/client'
+import { defineStore } from 'pinia'
+
+export const useAppStore = defineStore({
+    id: 'appStore',
+    // convert to a function
+    state: () => ({
+        client: getClient()
+    }),
+    getters: {},
+    actions: {}
+})
diff --git a/app/src/uni_modules/vk-uview-ui/components/u-form-item/u-form-item.vue b/app/src/uni_modules/vk-uview-ui/components/u-form-item/u-form-item.vue
index 9111eea5..34d2944c 100644
--- a/app/src/uni_modules/vk-uview-ui/components/u-form-item/u-form-item.vue
+++ b/app/src/uni_modules/vk-uview-ui/components/u-form-item/u-form-item.vue
@@ -429,7 +429,7 @@
 	.u-form-item {
 		@include vue-flex;
 		// align-items: flex-start;
-		padding: 10rpx 0;
+		padding: 15rpx 0;
 		font-size: 28rpx;
 		color: $u-main-color;
 		box-sizing: border-box;
@@ -485,10 +485,8 @@
 
 				&__slot {
 					flex: 1;
-					/* #ifndef MP */
 					@include vue-flex;
 					align-items: center;
-					/* #endif */
 				}
 
 				&__icon {
diff --git a/app/src/utils/client.ts b/app/src/utils/client.ts
new file mode 100644
index 00000000..f030591c
--- /dev/null
+++ b/app/src/utils/client.ts
@@ -0,0 +1,57 @@
+import { ClientEnum } from '@/enums/appEnums'
+
+/**
+ * @description 判断是否为微信环境
+ * @return { Boolean }
+ */
+export const isWeixinClient = () => {
+    // #ifdef H5
+    return /MicroMessenger/i.test(navigator.userAgent)
+    // #endif
+}
+
+/**
+ * @description 获取当前是什么端
+ * @return { Object }
+ */
+
+export const getClient = () => {
+    //@ts-ignore
+    return handleClientEvent({
+        // 微信小程序
+        MP_WEIXIN: () => ClientEnum['MP_WEIXIN'],
+        // 微信公众号
+        OA_WEIXIN: () => ClientEnum['OA_WEIXIN'],
+        // H5
+        H5: () => ClientEnum['H5'],
+        // APP
+        IOS: () => ClientEnum['IOS'],
+        ANDROID: () => ClientEnum['ANDROID'],
+        // 其它
+        OTHER: () => null
+    })
+}
+
+// 根据端处理事件
+//@ts-ignore
+export const handleClientEvent = ({ MP_WEIXIN, OA_WEIXIN, H5, IOS, ANDROID, OTHER }) => {
+    // #ifdef MP-WEIXIN
+    return MP_WEIXIN()
+    // #endif
+
+    // #ifdef H5
+    return isWeixinClient() ? OA_WEIXIN() : H5()
+    // #endif
+
+    // #ifdef APP-PLUS
+    const system = uni.getSystemInfoSync()
+    if (system.platform == 'ios') {
+        return IOS()
+    } else {
+        return ANDROID()
+    }
+    // #endif
+    return OTHER()
+}
+
+export const client = getClient()
diff --git a/app/src/utils/request/index.ts b/app/src/utils/request/index.ts
index 12c13d50..57fef43b 100644
--- a/app/src/utils/request/index.ts
+++ b/app/src/utils/request/index.ts
@@ -32,11 +32,11 @@ const requestHooks: RequestHooks = {
         if (!isTransformResponse) {
             return response.data
         }
+        console.log(response.data)
         const { code, data, msg } = response.data as any
         switch (code) {
             case RequestCodeEnum.SUCCESS:
                 return data
-
             case RequestCodeEnum.PARAMS_TYPE_ERROR:
             case RequestCodeEnum.PARAMS_VALID_ERROR:
             case RequestCodeEnum.REQUEST_METHOD_ERROR:
@@ -47,7 +47,8 @@ const requestHooks: RequestHooks = {
             case RequestCodeEnum.NO_PERMISSTION:
             case RequestCodeEnum.FAILED:
             case RequestCodeEnum.SYSTEM_ERROR:
-                return Promise.reject(data)
+                uni.$u.toast(msg)
+                return Promise.reject(msg)
 
             case RequestCodeEnum.TOKEN_INVALID:
             case RequestCodeEnum.TOKEN_EMPTY:
@@ -63,13 +64,13 @@ const defaultOptions: HttpRequestOptions = {
     requestOptions: {
         timeout: 10 * 1000
     },
-    baseUrl: 'https://likeadmin-java.yixiangonline.com',
+    baseUrl: import.meta.env.VITE_APP_BASE_URL,
     //是否返回默认的响应
     isReturnDefaultResponse: false,
     // 需要对返回数据进行处理
     isTransformResponse: true,
     // 接口拼接地址
-    urlPrefix: '/api',
+    urlPrefix: 'api',
     // 忽略重复请求
     ignoreCancel: false,
     // 是否携带token