From 3ce85e2396c9eeb273228b4e9f85cd11772473d3 Mon Sep 17 00:00:00 2001
From: Waiting <waitinghc@foxmail.com>
Date: Fri, 15 Mar 2024 14:02:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user/index.ts                         |  12 +-
 src/api/user/types.ts                         |  13 ++
 src/pages.json                                |   4 +-
 src/pages/common/login/index.vue              | 176 ++++--------------
 .../coupon/{coupon-list.vue => index.vue}     |  13 +-
 .../subs/trade/{trade-list.vue => index.vue}  |   0
 src/static/images/ic_logo.jpeg                | Bin 0 -> 6176 bytes
 src/store/modules/user/index.ts               |  35 +++-
 8 files changed, 103 insertions(+), 150 deletions(-)
 rename src/pages/mine/subs/coupon/{coupon-list.vue => index.vue} (83%)
 rename src/pages/mine/subs/trade/{trade-list.vue => index.vue} (100%)
 create mode 100644 src/static/images/ic_logo.jpeg

diff --git a/src/api/user/index.ts b/src/api/user/index.ts
index 74fa86d..2dfacbf 100644
--- a/src/api/user/index.ts
+++ b/src/api/user/index.ts
@@ -1,7 +1,7 @@
 /**
  * 用户信息相关接口
  */
-import type { LoginParams, LoginResult } from './types';
+import type { LoginParams, LoginResult, RegisterParams } from './types';
 import { get, post } from '@/utils/request';
 import type { UserState } from '@/store/modules/user/types';
 
@@ -9,6 +9,7 @@ enum URL {
   // login = '/member/login',
   login = '/wc/wechat/LoginByMa',
   loginByCode = '/wc/wechat/LoginByMaCode',
+  register = '/wc/wechat/register',
   logout = '/user/logout',
   profile = '/user/profile',
   addressList = '/ext/addr/list',
@@ -22,6 +23,9 @@ enum URL {
 export const getUserProfile = () => get<UserState>({ url: URL.profile });
 export const login = (data: LoginParams) => post<LoginResult>({ url: URL.login, data });
 export const loginByCode = (code: string, companyId: string) => post<any>({ url: URL.loginByCode + `?code=${code}` });
+
+export const register = (data: RegisterParams) => post<LoginResult>({ url: URL.register, data });
+
 export const logout = () => post<any>({ url: URL.logout });
 
 export const getAddressList = () => get<any>({ url: URL.addressList });
@@ -31,3 +35,9 @@ export const addressUpdate = (data: any) => post<any>({ url: URL.addressUpdate,
 export const addressDelete = (id: string) => post<any>({ url: URL.addressDelete + `?id=${id}` });
 
 export const getDynamicCode = () => post<any>({ url: URL.dynamicCode });
+
+export const getCouponList = (params: {
+  obj: { memberId: string, status: number },
+  pageNum: number,
+  pageSize: number
+}) => get<any>({ url: '/couponseUse/pageList' });
diff --git a/src/api/user/types.ts b/src/api/user/types.ts
index 5f9b590..2855de9 100644
--- a/src/api/user/types.ts
+++ b/src/api/user/types.ts
@@ -7,6 +7,19 @@ export interface LoginParams {
   referrerUserId: string;
 }
 
+export interface RegisterParams {
+  unionId: string,
+  openId: string,
+  maOpenId: string,
+  image: string,
+  nickName: string,
+  telephone: string,
+  birthday: string,
+  companyId: string,
+  creatorId: string,
+  gender: number
+}
+
 export interface LoginByCodeParams {
   code: string;
 }
diff --git a/src/pages.json b/src/pages.json
index a8e557b..92a1d92 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -120,7 +120,7 @@
           }
         },
         {
-          "path": "coupon/coupon-list",
+          "path": "coupon/index",
           "style": {
             "navigationBarTitleText": "优惠券"
           }
@@ -138,7 +138,7 @@
           }
         },
         {
-          "path": "trade/trade-list",
+          "path": "trade/index",
           "style": {
             "navigationBarTitleText": "消费记录"
           }
diff --git a/src/pages/common/login/index.vue b/src/pages/common/login/index.vue
index 758b79b..102fb15 100644
--- a/src/pages/common/login/index.vue
+++ b/src/pages/common/login/index.vue
@@ -1,45 +1,14 @@
 <template>
-  <view>
-    <view class='login-form-wrap'>
-      <view class='title'>
-        欢迎登录
-      </view>
-      <input v-model='tel' class='u-border-bottom' type='number' placeholder='请输入手机号'>
-      <view class='u-border-bottom my-40rpx flex'>
-        <input v-model='code' class='flex-1' type='number' placeholder='请输入验证码'>
-        <view>
-          <u-code ref='uCodeRef' @change='codeChange' />
-          <u-button :text='tips' type='success' size='mini' @click='getCode' />
-        </view>
-      </view>
-      <button :style='[inputStyle]' class='login-btn' @tap='submit'>
-        登录
-      </button>
+  <view class='content'>
+    <view class='title'>
+      欢迎登录VIP顾客中心
+    </view>
 
-      <view class='alternative'>
-        <view class='password'>
-          密码登录
-        </view>
-        <view class='issue'>
-          遇到问题
-        </view>
-      </view>
-    </view>
-    <view class='login-type-wrap'>
-      <view class='item wechat' @click.stop='wechatLogin'>
-        <view class='icon'>
-          <u-icon size='35' name='weixin-fill' color='rgb(83,194,64)' />
-        </view>
-        微信
-        <!--        <button open-type='getUserInfo' @getuserinfo='bindGetUserInfo'>确认授权</button>-->
-      </view>
-      <view class='item QQ'>
-        <view class='icon'>
-          <u-icon size='35' name='qq-fill' color='rgb(17,183,233)' />
-        </view>
-        QQ
-      </view>
-    </view>
+    <image class='logo' :src='assetsUrl("ic_logo.jpeg")' />
+
+    <button class='login-btn' @tap='wechatLogin'>
+      微信登录
+    </button>
     <view class='hint'>
       登录代表同意
       <text class='link'>
@@ -51,45 +20,10 @@
 </template>
 
 <script setup lang='ts'>
-import uCode from 'uview-plus/components/u-code/u-code.vue';
-import { setToken } from '@/utils/auth';
 import { useUserStore } from '@/store';
+import { assetsUrl } from '@/utils/assets';
 
 const userStore = useUserStore();
-const tel = ref<string>('18502811111');
-const code = ref<string>('1234');
-const tips = ref<string>();
-const uCodeRef = ref<InstanceType<typeof uCode> | null>(null);
-
-const inputStyle = computed<CSSStyleDeclaration>(() => {
-  const style = {} as CSSStyleDeclaration;
-  if(tel.value && code.value) {
-    style.color = '#fff';
-    style.backgroundColor = uni.$u.color.warning;
-  }
-  return style;
-});
-
-function codeChange(text: string) {
-  tips.value = text;
-}
-
-function getCode() {
-  if(uCodeRef.value?.canGetCode) {
-    // 模拟向后端请求验证码
-    uni.showLoading({
-      title: '正在获取验证码'
-    });
-    setTimeout(() => {
-      uni.hideLoading();
-      uni.$u.toast('验证码已发送');
-      // 通知验证码组件内部开始倒计时
-      uCodeRef.value?.start();
-    }, 1000);
-  } else {
-    uni.$u.toast('倒计时结束后再发送');
-  }
-}
 
 function wechatLogin() {
   uni.showLoading();
@@ -98,77 +32,49 @@ function wechatLogin() {
     uni.reLaunch({ url: '/pages/home/index' });
   });
 }
-
-function submit() {
-  if(uni.$u.test.mobile(tel.value)) {
-    setToken('1234567890');
-    uni.reLaunch({ url: '/pages/home/index' });
-  }
-}
 </script>
 
 <style lang='scss' scoped>
-.login-form-wrap {
-  margin: 80rpx auto 0;
-  width: 600rpx;
-
-  .title {
-    margin-bottom: 100rpx;
-    font-size: 60rpx;
-    text-align: left;
-    font-weight: 500;
-  }
-
-  input {
-    padding-bottom: 6rpx;
-    margin-bottom: 10rpx;
-    text-align: left;
-  }
-
-  .tips {
-    margin-top: 8rpx;
-    margin-bottom: 60rpx;
-    color: $u-info;
-  }
-
-  .login-btn {
-    padding: 12rpx 0;
-    font-size: 30rpx;
-    color: $u-tips-color;
-    background-color: rgb(253 243 208);
-    border: none;
-
-    &::after {
-      border: none;
-    }
-  }
-
-  .alternative {
-    display: flex;
-    justify-content: space-between;
-    margin-top: 30rpx;
-    color: $u-tips-color;
-  }
+.content {
+  background: #FFFFFF;
+  height: 100vh;
 }
 
-.login-type-wrap {
-  display: flex;
-  justify-content: space-between;
-  padding: 350rpx 150rpx 150rpx;
+.title {
+  font-size: 60rpx;
+  text-align: left;
+  font-weight: 500;
+  margin: 50rpx;
+}
 
-  .item {
-    display: flex;
-    align-items: center;
-    font-size: 28rpx;
-    color: $u-content-color;
-    flex-direction: column;
+.logo {
+  width: 300rpx;
+  height: 300rpx;
+  align-self: center;
+  margin: 30rpx;
+  border-radius: 50%;
+}
+
+.login-btn {
+  padding: 12rpx 0;
+  font-size: 30rpx;
+  color: #FFFFFF;
+  background-color: #1cbf1e;
+  border: none;
+  border-radius: 45rpx;
+  margin: 100rpx 45rpx 0 45rpx;
+
+  &::after {
+    border: none;
   }
 }
 
 .hint {
-  padding: 20rpx 40rpx;
+  padding: 20rpx 50rpx;
   font-size: 20rpx;
   color: $u-tips-color;
+  position: absolute;
+  bottom: 0;
 
   .link {
     color: $u-warning;
diff --git a/src/pages/mine/subs/coupon/coupon-list.vue b/src/pages/mine/subs/coupon/index.vue
similarity index 83%
rename from src/pages/mine/subs/coupon/coupon-list.vue
rename to src/pages/mine/subs/coupon/index.vue
index 8977a3d..4127f1b 100644
--- a/src/pages/mine/subs/coupon/coupon-list.vue
+++ b/src/pages/mine/subs/coupon/index.vue
@@ -8,8 +8,9 @@
 <script lang='ts' setup>
 
 import CouponItem from './components/coupon-item.vue';
+import { getCouponList } from '@/api/user';
 
-const coupons = [{
+const coupons = ref([{
   id: 1,
   title: '优惠券',
   desc: '满100减10',
@@ -59,8 +60,16 @@ const coupons = [{
   useTime: '2024-12-31',
   status: 0,
   useStatus: '未使用'
-}];
+}]);
 
+onLoad(async () => {
+  const { data } = await getCouponList({
+    obj: {
+      memberId: item?.id, status: 0
+    }, pageNum: 1, pageSize: 1000
+  });
+  coupons.value = data.list;
+});
 </script>
 
 <style lang='scss' scoped>
diff --git a/src/pages/mine/subs/trade/trade-list.vue b/src/pages/mine/subs/trade/index.vue
similarity index 100%
rename from src/pages/mine/subs/trade/trade-list.vue
rename to src/pages/mine/subs/trade/index.vue
diff --git a/src/static/images/ic_logo.jpeg b/src/static/images/ic_logo.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..fdabbec7ca8163497633a2385c1f5820f476236d
GIT binary patch
literal 6176
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

literal 0
HcmV?d00001

diff --git a/src/store/modules/user/index.ts b/src/store/modules/user/index.ts
index 4d3b8c0..d71f27a 100644
--- a/src/store/modules/user/index.ts
+++ b/src/store/modules/user/index.ts
@@ -1,8 +1,8 @@
 import { defineStore } from 'pinia';
 import type { providerType, UserState } from './types';
-import { getUserProfile, login as userLogin, login, logout as userLogout } from '@/api/user/index';
+import { getUserProfile, login, logout as userLogout, register } from '@/api/user/index';
 import { clearToken, setCompanyId, setToken } from '@/utils/auth';
-import type { LoginParams } from '@/api/user/types';
+import type { RegisterParams } from '@/api/user/types';
 
 const useUserStore = defineStore('user', {
   state: (): UserState => <UserState>({
@@ -37,6 +37,7 @@ const useUserStore = defineStore('user', {
       return { ...state };
     }
   },
+
   actions: {
     // 设置用户的信息
     setUserInfo(partial: Partial<UserState>) {
@@ -51,27 +52,25 @@ const useUserStore = defineStore('user', {
       const result = await getUserProfile();
       this.setUserInfo(result);
     },
-    // 异步登录并存储token
-    login(loginForm: LoginParams) {
+
+    userRegister(registerForm: RegisterParams) {
       return new Promise(async (resolve, reject) => {
         try {
-          const result = await userLogin(loginForm);
-          const token = result?.token;
-          if(token) {
-            setToken(token);
-          }
+          const result = await register(registerForm);
           resolve(result);
         } catch (error) {
           reject(error);
         }
       });
     },
+
     // Logout
     async logout() {
       await userLogout();
       this.resetInfo();
       clearToken();
     },
+
     // 小程序授权登录
     authLogin(provider: providerType = 'weixin') {
       return new Promise((resolve, reject) => {
@@ -91,9 +90,25 @@ const useUserStore = defineStore('user', {
               const res = await login({
                 code: result.code,
                 userInfo: userInfo,
-                referrerUserId: '1727303781559697409'
+                referrerUserId: '1731886841265598466'
               });
 
+              if(res.user == undefined || res.user.id === null) {
+                const registerForm = {
+                  unionId: res.user.unionId,
+                  openId: res.user.openId,
+                  maOpenId: res.user.maOpenId,
+                  image: res.user.image,
+                  nickName: res.user.nickName,
+                  telephone: res.user.telephone,
+                  birthday: res.user.birthday,
+                  companyId: res.user.companyId,
+                  creatorId: res.user.creatorId,
+                  gender: res.user.gender
+                };
+                await this.userRegister(registerForm);
+              }
+
               this.setUserInfo(res.user);
               setToken(res.token);
               setCompanyId(res.user.companyId);