登录以及个人信息更换接口

pages/user/info.vue

@@ -40,10 +40,10 @@
 
       <view class="bg-white ss-p-x-30">
         <!-- 昵称 + 性别 -->
-        <uni-forms-item name="nickname" label="昵称">
+        <uni-forms-item name="name" label="昵称">
           <uni-easyinput
-            v-model="state.model.nickname"
-            type="nickname"
+            v-model="state.model.name"
+            type="name"
             placeholder="设置昵称"
             :inputBorder="false"
             :placeholderStyle="placeholderStyle"
@@ -58,7 +58,7 @@
                     :value="item.value"
                     color="var(--ui-BG-Main)"
                     style="transform: scale(0.8)"
-                    :checked="parseInt(item.value) === state.model?.sex"
+                    :checked="item.value === state.model?.sex"
                   />
                   <view class="gender-name">{{ item.name }}</view>
                 </view>
@@ -67,9 +67,9 @@
           </view>
         </uni-forms-item>
 
-        <uni-forms-item name="mobile" label="手机号" @tap="onChangeMobile">
+        <uni-forms-item name="phone" label="手机号" @tap="onChangeMobile">
           <uni-easyinput
-            v-model="userInfo.mobile"
+            v-model="userInfo.phone"
             placeholder="请绑定手机号"
             :inputBorder="false"
             disabled
@@ -79,7 +79,7 @@
           >
             <template v-slot:right>
               <view class="ss-flex ss-col-center">
-                <su-radio v-if="userInfo.verification?.mobile" :modelValue="true" />
+                <su-radio v-if="userInfo.verification?.phone" :modelValue="true" />
                 <button v-else class="ss-reset-button ss-flex ss-col-center ss-row-center">
                   <text class="_icon-forward" style="color: #bbbbbb; font-size: 26rpx"></text>
                 </button>
@@ -129,7 +129,7 @@
     </uni-forms>
 
     <!-- 当前社交平台的绑定关系，只处理 wechat 微信场景 -->
-    <view v-if="sheep.$platform.name !== 'H5'">
+    <!-- <view v-if="sheep.$platform.name !== 'H5'">
       <view class="title-box ss-p-l-30">第三方账号绑定</view>
       <view class="account-list ss-flex ss-row-between">
         <view v-if="'WechatOfficialAccount' === sheep.$platform.name" class="ss-flex ss-col-center">
@@ -156,7 +156,7 @@
         <view class="ss-flex ss-col-center">
           <view class="info ss-flex ss-col-center" v-if="state.thirdInfo">
             <image class="avatar ss-m-r-20" :src="sheep.$url.cdn(state.thirdInfo.avatar)" />
-            <text class="name">{{ state.thirdInfo.nickname }}</text>
+            <text class="name">{{ state.thirdInfo.name }}</text>
           </view>
           <view class="bind-box ss-m-l-20">
             <button
@@ -170,7 +170,7 @@
           </view>
         </view>
       </view>
-    </view>
+    </view> -->
 
     <su-fixed bottom placeholder bg="none">
       <view class="footer-box ss-p-20">
@@ -280,7 +280,7 @@
   async function onSubmit() {
     const { code } = await UserApi.updateUser({
       avatar: state.model.avatar,
-      nickname: state.model.nickname,
+      name: state.model.name,
       sex: state.model.sex,
     });
     if (code === 0) {

sheep/api/member/auth.js

@@ -4,7 +4,8 @@ const AuthUtil = {
   // 使用手机 + 密码登录
   login: (data) => {
     return request({
-      url: '/member/auth/login',
+      // url: '/member/auth/login',
+      url: '/menduner/system/auth/login',
       method: 'POST',
       data,
       custom: {
@@ -17,7 +18,8 @@ const AuthUtil = {
   // 使用手机 + 验证码登录
   smsLogin: (data) => {
     return request({
-      url: '/member/auth/sms-login',
+      // url: '/member/auth/sms-login',
+      url: '/menduner/system/auth/sms-login',
       method: 'POST',
       data,
       custom: {

sheep/api/member/user.js

@@ -2,10 +2,12 @@ import request from '@/sheep/request';
 
 const UserApi = {
   // 获得基本信息
-  getUserInfo: () => {
+  getUserInfo: (params) => {
     return request({
-      url: '/member/user/get',
+      // url: '/member/user/get',
+      url: '/menduner/system/person/get',
       method: 'GET',
+      params,
       custom: {
         showLoading: false,
         auth: true,

sheep/components/s-auth-modal/components/account-login.vue

@@ -21,8 +21,8 @@
       labelWidth="140"
       labelAlign="center"
     >
-      <uni-forms-item name="mobile" label="账号">
-        <uni-easyinput placeholder="请输入账号" v-model="state.model.mobile" :inputBorder="false">
+      <uni-forms-item name="phone" label="账号">
+        <uni-easyinput placeholder="请输入账号" v-model="state.model.phone" :inputBorder="false">
           <template v-slot:right>
             <button class="ss-reset-button forgot-btn" @tap="showAuthModal('resetPassword')">
               忘记密码
@@ -68,11 +68,11 @@
   // 数据
   const state = reactive({
     model: {
-      mobile: '', // 账号
-      password: '', // 密码
+      phone: '13229740091', // 账号
+      password: 'Citu123', // 密码
     },
     rules: {
-      mobile,
+      phone: mobile,
       password,
     },
   });
@@ -96,6 +96,7 @@
 
     // 提交数据
     const { code, data } = await AuthUtil.login(state.model);
+    if (data) uni.setStorageSync('accountInfo', JSON.stringify(data))
     if (code === 0) {
       closeAuthModal();
     }

sheep/components/s-auth-modal/components/sms-login.vue

@@ -112,7 +112,8 @@
       return;
     }
     // 提交数据
-    const { code } = await AuthUtil.smsLogin(state.model);
+    const { code, data } = await AuthUtil.smsLogin(state.model);
+    if (data) uni.setStorageSync('accountInfo', JSON.stringify(data))
     if (code === 0) {
       closeAuthModal();
     }

sheep/components/s-user-card/s-user-card.vue

@@ -12,7 +12,7 @@
 				</view>
 				<view>
 					<view class="nickname-box ss-flex ss-col-center">
-						<view class="nick-name ss-m-r-20">{{ userInfo?.nickname || nickname }}</view>
+						<view class="nick-name ss-m-r-20">{{ userInfo?.name || nickname }}</view>
 					</view>
 				</view>
 			</view>

sheep/request/index.js

@@ -111,8 +111,10 @@ http.interceptors.request.use(
 http.interceptors.response.use(
 	(response) => {
 		// 约定：如果是 /auth/ 下的 URL 地址，并且返回了 accessToken 说明是登录相关的接口，则自动设置登陆令牌
-		if (response.config.url.indexOf('/member/auth/') >= 0 && response.data?.data?.accessToken) {
-			$store('user').setToken(response.data.data.accessToken, response.data.data.refreshToken);
+		if (response.config.url.indexOf('/system/auth/') >= 0 && response.data?.data?.accessToken) {
+			const userStore = $store('user');
+			userStore.setToken(response.data.data.accessToken, response.data.data.refreshToken);
+			// $store('user').setToken(response.data.data.accessToken, response.data.data.refreshToken);
 		}
 
     // 自定处理【loading 加载中】：如果需要显示 loading，则关闭 loading

sheep/store/user.js

@@ -44,12 +44,13 @@ const user = defineStore({
     isLogin: !!uni.getStorageSync('token'), // 登录状态
     numData: cloneDeep(defaultNumData), // 用户其他数据
     lastUpdateTime: 0, // 上次更新时间
+    accountInfo: uni.getStorageSync('accountInfo') ? JSON.parse(uni.getStorageSync('accountInfo')) : {}, // 账号信息
   }),
 
   actions: {
     // 获取用户信息
     async getInfo() {
-      const { code, data } = await UserApi.getUserInfo();
+      const { code, data } = await UserApi.getUserInfo({ userId: this.accountInfo.userId });
       if (code !== 0) {
         return;
       }