From 544226147cded2e54867001757fce744e5eb2794 Mon Sep 17 00:00:00 2001
From: qiushanhe <qsh17318531354@163.com>
Date: Tue, 2 Sep 2025 01:04:47 +0800
Subject: [PATCH] sc

---
 package.json              |  3 ++-
 src/jtools/api/user.js    | 18 +++++++++++++++++
 src/jtools/store/user.js  | 19 +++++++++++-------
 src/pages/me/good.vue     |  2 +-
 src/pages/me/index.vue    |  2 +-
 src/pages/me/userInfo.vue | 42 +++++++++++++++++++++++++++------------
 6 files changed, 63 insertions(+), 23 deletions(-)

diff --git a/package.json b/package.json
index a4718c9..91892cc 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "@dcloudio/uni-mp-weixin": "3.0.0-alpha-3060420220922001",
     "dayjs": "^1.11.13",
     "jsencrypt-plus": "^0.1.0",
+    "jweixin-module": "^1.6.0",
     "pinia": "2.0.36",
     "pinia-plugin-persist-uni": "^1.2.0",
     "vue": "^3.2.37",
@@ -30,7 +31,7 @@
     "@dcloudio/uni-cli-shared": "3.0.0-alpha-3060420220922001",
     "@dcloudio/uni-stacktracey": "3.0.0-alpha-3060420220922001",
     "@dcloudio/vite-plugin-uni": "3.0.0-alpha-3060420220922001",
-    "sass": "^1.63.6",
+    "sass": "1.75",
     "sass-loader": "^13.3.2",
     "vite": "^2.9.14"
   }
diff --git a/src/jtools/api/user.js b/src/jtools/api/user.js
index b1b4523..d576c67 100644
--- a/src/jtools/api/user.js
+++ b/src/jtools/api/user.js
@@ -31,3 +31,21 @@ export function getUserLikeList(data) {
     data
   });
 }
+
+// 修改用户信息
+export function updateUserInfo(data) {
+  return request({
+    url: 'sinology-api/sysUser/update',
+    method: 'POST',
+    data
+  });
+}
+
+// 查询用户开通的会员
+export function queryUserMember(data) {
+  return request({
+    url: 'sinology-api/sysMember/queryUserMember',
+    method: 'POST',
+    data
+  });
+}
diff --git a/src/jtools/store/user.js b/src/jtools/store/user.js
index 5b0b33b..d78b063 100644
--- a/src/jtools/store/user.js
+++ b/src/jtools/store/user.js
@@ -1,6 +1,7 @@
 import { defineStore } from 'pinia';
 import { login, getInfo } from '@/jtools/api/login';
 import storage from '@/jtools/storage';
+import { queryUserMember } from '@/jtools/api/user';
 
 const useUserStore = defineStore({
   id: 'user',
@@ -25,6 +26,7 @@ const useUserStore = defineStore({
           this.isLogin = true;
           this.token = resp.data.token;
           this.userInfo = resp.data;
+          this.searchVip()
           storage.set('isLogin', true);
           storage.set('token', resp.data.token);
           storage.set('userInfo', resp.data);
@@ -60,17 +62,20 @@ const useUserStore = defineStore({
       getInfo().then(resp => {
         if (resp.code == '0000') {
           this.userInfo = resp.data;
-          if (resp.data.driverTypeId && resp.data.modelId) {
-            this.currentType = {
-              modelId: resp.data.modelId,
-              typeId: resp.data.driverTypeId,
-              showName: `${resp.data.modelName} - ${resp.data.driverTypeName}`
-            };
-          }
+          this.searchVip()
           storage.set('userInfo', resp.data);
         }
       });
     },
+    searchVip() {
+      queryUserMember({ userId: this.userInfo.userId }).then(resp => {
+        if (resp.code == '0000') {
+          // this.vipInfo = resp.data;
+          console.log(resp);
+          
+        }
+      });
+    },
     setUserInfo(info) {
       this.userInfo = info;
     },
diff --git a/src/pages/me/good.vue b/src/pages/me/good.vue
index c209913..5073de4 100644
--- a/src/pages/me/good.vue
+++ b/src/pages/me/good.vue
@@ -62,7 +62,7 @@
           _this.total = res.data.total
         });
       },
-      handleClick(item) {
+      handleClick(chapter) {
         uni.navigateTo({
           url: `/pages/course/detail?id=${chapter.chapterId}`
         });
diff --git a/src/pages/me/index.vue b/src/pages/me/index.vue
index f2048b0..dc6e0bf 100644
--- a/src/pages/me/index.vue
+++ b/src/pages/me/index.vue
@@ -4,7 +4,7 @@
       <!-- 用户信息 -->
       <view class="user-info" @tap="next('/pages/me/userInfo')">
         <view class="fl1 flex ai-c">
-          <u-avatar size="48"></u-avatar>
+          <u-avatar size="48" :src="userInfo?.avatar"></u-avatar>
           <view class="ml10 fs16 fw600">
             <view>{{ isLogin ? userInfo?.userName : '点击登陆' }}</view>
             <view class="fs12 cor-999">{{ isLogin ? userInfo?.phone : '未登录' }}</view>
diff --git a/src/pages/me/userInfo.vue b/src/pages/me/userInfo.vue
index dbd3662..8df87bc 100644
--- a/src/pages/me/userInfo.vue
+++ b/src/pages/me/userInfo.vue
@@ -18,14 +18,14 @@
     </view>
     <view class="flex ai-c jc-sb p15 bb1">
       <view class="fs14">性别</view>
-      <view class="flex" @tap="showPicker">
-        <text class="cor-666">{{ form.sex || '请选择性别' }}</text>
+      <view class="flex" @tap="showSexPicker">
+        <text class="cor-666">{{ ['男', '女'][form.sex] || '请选择性别' }}</text>
         <u-icon name="arrow-right" size="16" class="ml10"></u-icon>
       </view>
     </view>
     <view class="flex ai-c jc-sb p15 bb1">
       <view class="fs14">生日</view>
-      <view class="flex" @tap="showPicker">
+      <view class="flex" @tap="showDate = true">
         <text class="cor-666">{{ form.birthday || '请选择出生日期' }}</text>
         <u-icon name="arrow-right" size="16" class="ml10"></u-icon>
       </view>
@@ -39,18 +39,21 @@
      <view class="p15 mt20">
       <u-button type="primary" @tap="submit">保存</u-button>
     </view>
+
+    <u-datetime-picker :show="showDate" mode="date" closeOnClickOverlay v-model="form.birthday" :minDate="Number(new Date('1900-01-01'))" @confirm="confirmDate" @cancel="showDate=false"></u-datetime-picker>
   </view>
 </template>
 
 <script>
-// import { updateUserInfo } from '@/jtools/api/user'
+import { updateUserInfo } from '@/jtools/api/user'
 import useUserStore from '@/jtools/store/user' //引入store
   export default {
     name: 'UserInfo',
     data() {
-      return {
-        form: {...useUserStore().userInfo},
+       return {
+        form: {...useUserStore().userInfo, sex: useUserStore().userInfo.sex || 0},
         saving: false,
+        showDate: false
       }
     },
     methods: {
@@ -76,23 +79,36 @@ import useUserStore from '@/jtools/store/user' //引入store
           }
         })
       },
-      uploadAvatar(url) { 
+      uploadAvatar(url) {
+        const _this = this 
         uni.uploadFile({
-          url: import.meta.env.VITE_UPLOAD_URL + 'wrj-api/system/file/upload', // 仅为示例，非真实的接口地址
+          url: import.meta.env.VITE_UPLOAD_URL + 'sinology-api/system/file/upload', // 仅为示例，非真实的接口地址
           filePath: url,
           name: 'file',
           success: (res) => {
-            // setTimeout(() => {
-            // resolve(JSON.parse(res.data).data);
-            // }, 100);
+            console.log(JSON.parse(res.data).data);
+            
+            _this.form.avatar = JSON.parse(res.data).data
             this.saving = false;
           },
           fail: () => {
-            resolve(null);
+            uni.showToast({ title: '上传失败', icon: 'none' });
             this.saving = false;
           }
         });
-      }
+      },
+      showSexPicker() {
+        uni.showActionSheet({
+          itemList: ['男', '女'],
+          success: (res) => {
+            this.form.sex = res.tapIndex
+          }
+        })
+      },
+      confirmDate(e) { 
+        this.showDate = false;
+        this.form.birthday = uni.$u.timeFormat(e.value, 'yyyy-mm-dd');
+      },
     }
   }
 </script>