From f7d384e55de7b5c965665a75a2c9c95fc56b63c8 Mon Sep 17 00:00:00 2001
From: sfmind <cc130201237@163.com>
Date: Sun, 1 May 2022 22:39:16 +0800
Subject: [PATCH] =?UTF-8?q?api=E6=8C=89=E6=A8=A1=E5=9D=97=E5=8D=95?=
 =?UTF-8?q?=E7=8B=AC=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-app/api/address.js            | 15 ++++++++++++
 yudao-ui-app/api/auth.js               | 12 ++++++++++
 yudao-ui-app/api/index.js              |  7 ++++++
 yudao-ui-app/api/user.js               | 14 +++++++++++
 yudao-ui-app/common/api.js             | 33 --------------------------
 yudao-ui-app/pages/index/index.vue     |  2 +-
 yudao-ui-app/pages/login/login.vue     |  2 +-
 yudao-ui-app/pages/profile/profile.vue |  2 +-
 yudao-ui-app/pages/user/user.vue       |  5 ++--
 yudao-ui-app/store/index.js            |  3 ++-
 10 files changed, 55 insertions(+), 40 deletions(-)
 create mode 100644 yudao-ui-app/api/address.js
 create mode 100644 yudao-ui-app/api/auth.js
 create mode 100644 yudao-ui-app/api/index.js
 create mode 100644 yudao-ui-app/api/user.js
 delete mode 100644 yudao-ui-app/common/api.js

diff --git a/yudao-ui-app/api/address.js b/yudao-ui-app/api/address.js
new file mode 100644
index 000000000..6f4297cd6
--- /dev/null
+++ b/yudao-ui-app/api/address.js
@@ -0,0 +1,15 @@
+//请求工具参考https://ext.dcloud.net.cn/plugin?id=392
+const { http } = uni.$u
+
+//获得用户收件地址列表
+export const getAddressList = params => http.get('/app-api/member/address/list', params)
+//创建用户收件地址
+export const createAddress = data => http.post('/app-api/member/address/create', data)
+//通过ID获得用户收件地址
+export const getAddressById = params => http.get('/app-api/member/address/get', { params })
+//获得默认的用户收件地址
+export const getDefaultUserAddress = params => http.get('/app-api/member/address/get-default', { params })
+//更新用户收件地址
+export const updateAddress = params => http.put('/app-api/member/address/update', params)
+//删除用户收件地址
+export const deleteAddress = params => http.delete('/app-api/member/address/delete', {}, { params })
diff --git a/yudao-ui-app/api/auth.js b/yudao-ui-app/api/auth.js
new file mode 100644
index 000000000..8a49d2b21
--- /dev/null
+++ b/yudao-ui-app/api/auth.js
@@ -0,0 +1,12 @@
+//请求工具参考https://ext.dcloud.net.cn/plugin?id=392
+const { http } = uni.$u
+
+//使用手机 + 密码登录
+export const passwordLogin = data => http.post('/app-api/member/login', data)
+//退出登录
+export const logout = data => http.post('/app-api/member/logout', data)
+//发送手机验证码
+export const sendSmsCode = data => http.post('/app-api/member/send-sms-code', data)
+//使用手机 + 验证码登录
+export const smsLogin = data => http.post('/app-api/member/sms-login', data)
+
diff --git a/yudao-ui-app/api/index.js b/yudao-ui-app/api/index.js
new file mode 100644
index 000000000..5bd7964a3
--- /dev/null
+++ b/yudao-ui-app/api/index.js
@@ -0,0 +1,7 @@
+//请求工具参考https://ext.dcloud.net.cn/plugin?id=392
+const { http } = uni.$u
+
+// 获取滚动图数据
+export const getBannerData = params => http.get('/app-api/index', { params })
+// 获取滚动通知数据
+export const getNoticeData = params => http.get('/app-api/notice', { params })
diff --git a/yudao-ui-app/api/user.js b/yudao-ui-app/api/user.js
new file mode 100644
index 000000000..4202fad29
--- /dev/null
+++ b/yudao-ui-app/api/user.js
@@ -0,0 +1,14 @@
+//请求工具参考https://ext.dcloud.net.cn/plugin?id=392
+const { http } = uni.$u
+
+//获取用户信息
+export const getUserInfo = params => http.get('/app-api/member/user/get', params)
+//修改用户头像
+export const updateAvatar = filePath =>
+  http.upload('/app-api/member/user/update-avatar', {
+    name: 'avatarFile',
+    fileType: 'image',
+    filePath: filePath
+  })
+//修改用户昵称
+export const updateNickname = params => http.put('/app-api/member/user/update-nickname', {}, { params })
diff --git a/yudao-ui-app/common/api.js b/yudao-ui-app/common/api.js
deleted file mode 100644
index 307b37505..000000000
--- a/yudao-ui-app/common/api.js
+++ /dev/null
@@ -1,33 +0,0 @@
-//请求工具参考https://ext.dcloud.net.cn/plugin?id=392
-const { http } = uni.$u
-
-/* login */
-//使用手机 + 密码登录
-export const passwordLogin = params => http.post('/app-api/member/login', params)
-//退出登录
-export const logout = params => http.post('/app-api/member/logout', params)
-//发送手机验证码
-export const sendSmsCode = params => http.post('/app-api/member/send-sms-code', params)
-//使用手机 + 验证码登录
-export const smsLogin = params => http.post('/app-api/member/sms-login', params)
-
-//获取用户信息
-export const getUserInfo = params => http.get('/app-api/member/user/get', params)
-//修改用户头像
-export const updateAvatar = filePath =>
-  http.upload('/app-api/member/user/update-avatar', {
-    name: 'avatarFile',
-    fileType: 'image',
-    filePath: filePath
-  })
-//修改用户昵称
-export const updateNickname = params =>
-  http.put('/app-api/member/user/update-nickname', {}, {
-    params
-  })
-
-/* index */
-// 获取滚动图数据
-export const getBannerData = params => http.get('/app-api/index', params)
-// 获取滚动通知数据
-export const getNoticeData = params => http.get('/app-api/notice', params)
diff --git a/yudao-ui-app/pages/index/index.vue b/yudao-ui-app/pages/index/index.vue
index f0af9775e..293710648 100644
--- a/yudao-ui-app/pages/index/index.vue
+++ b/yudao-ui-app/pages/index/index.vue
@@ -109,7 +109,7 @@
 </template>
 
 <script>
-import { getBannerData, getNoticeData } from '../../common/api'
+import { getBannerData, getNoticeData } from '../../api/index'
 
 export default {
   components: {},
diff --git a/yudao-ui-app/pages/login/login.vue b/yudao-ui-app/pages/login/login.vue
index 9cd2c7b02..993c84bb4 100644
--- a/yudao-ui-app/pages/login/login.vue
+++ b/yudao-ui-app/pages/login/login.vue
@@ -48,7 +48,7 @@
 </template>
 
 <script>
-import { passwordLogin, sendSmsCode, smsLogin } from '../../common/api'
+import { passwordLogin, sendSmsCode, smsLogin } from '../../api/auth'
 
 export default {
   data() {
diff --git a/yudao-ui-app/pages/profile/profile.vue b/yudao-ui-app/pages/profile/profile.vue
index ac129959f..2d15cb492 100644
--- a/yudao-ui-app/pages/profile/profile.vue
+++ b/yudao-ui-app/pages/profile/profile.vue
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { getUserInfo, updateAvatar, updateNickname } from '../../common/api'
+import { getUserInfo, updateAvatar, updateNickname } from '../../api/user'
 
 export default {
   data() {
diff --git a/yudao-ui-app/pages/user/user.vue b/yudao-ui-app/pages/user/user.vue
index 44a7c822a..3cb57feda 100644
--- a/yudao-ui-app/pages/user/user.vue
+++ b/yudao-ui-app/pages/user/user.vue
@@ -3,7 +3,7 @@
     <view class="user-header">
       <view class="user-info" @click="loginOrJump('/pages/profile/profile')">
         <u-avatar size="80" :src="userInfo.avatar"></u-avatar>
-        <text class="nick-name">{{ hasLogin ? userInfo.nickname || '游客' : '点击登录' }}</text>
+        <text class="nick-name">{{ hasLogin ? userInfo.nickname || '游客' : '登录/注册' }}</text>
       </view>
     </view>
 
@@ -90,10 +90,9 @@ export default {
         content: '您确定要退出登录吗',
         success: res => {
           if (res.confirm) {
-            console.log('用户点击确定')
             this.$store.dispatch('logout')
           } else if (res.cancel) {
-            console.log('用户点击取消')
+            //console.log('用户点击取消')
           }
         }
       })
diff --git a/yudao-ui-app/store/index.js b/yudao-ui-app/store/index.js
index 604de14c1..2bda31387 100644
--- a/yudao-ui-app/store/index.js
+++ b/yudao-ui-app/store/index.js
@@ -1,6 +1,7 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
-import { getUserInfo, logout } from '@/common/api'
+import { logout } from '@/api/auth'
+import { getUserInfo } from '@/api/user'
 
 Vue.use(Vuex) // vue的插件机制