调整登录，调整部分接口路径，调整上传图片集合到基本请求中去

uniapp/src/api/account.ts

@@ -1,14 +1,18 @@
-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 mobileLogin(data: Record<string, any>) {
+    return request.post({ url: '/login/mobileLogin', data })
+}
+
+// 登录
+export function accountLogin(data: Record<string, any>) {
+    return request.post({ url: '/login/accountLogin', data })
 }
 
 //注册
 export function register(data: Record<string, any>) {
-    return request.post({ url: '/login/register', data: { ...data, client } })
+    return request.post({ url: '/login/register', data })
 }
 
 //忘记密码
@@ -21,6 +25,13 @@ export function getWxCodeUrl() {
     return request.get({ url: '/login/codeUrl', data: { url: location.href } })
 }
 
-export function OALogin(data: Record<string, any>) {
-    return request.get({ url: '/login/oaLogin', data })
+// 微信小程序登录
+
+export function mnpLogin(data: Record<string, any>) {
+    return request.post({ url: '/login/mnpLogin', data })
+}
+
+// 公众号登录
+export function OALogin(data: Record<string, any>) {
+    return request.post({ url: '/login/oaLogin', data })
 }

uniapp/src/api/app.ts

@@ -2,13 +2,25 @@ import request from '@/utils/request'
 
 //发送短信
 export function smsSend(data: any) {
-    return request.post({ url: '/sms/send', data: data })
+    return request.post({ url: '/index/sendSms', data: data })
 }
 
 export function getConfig() {
-    return request.get({ url: '/config' })
+    return request.get({ url: '/index/config' })
 }
 
 export function getPolicy(data: any) {
-    return request.get({ url: '/policy', data: data })
+    return request.get({ url: '/index/policy', data: data })
+}
+
+export function uploadImage(file: any, token?: string) {
+    return request.uploadFile({
+        url: '/upload/image',
+        filePath: file,
+        name: 'file',
+        header: {
+            token
+        },
+        fileType: 'image'
+    })
 }

uniapp/src/api/shop.ts

@@ -2,12 +2,12 @@ import request from '@/utils/request'
 
 //首页数据
 export function getIndex() {
-    return request.get({ url: '/index' })
+    return request.get({ url: '/index/index' })
 }
 
 // 装修页面
 export function getDecorate(data: any) {
-    return request.get({ url: '/decorate', data })
+    return request.get({ url: '/index/decorate', data })
 }
 
 /**
@@ -15,14 +15,5 @@ export function getDecorate(data: any) {
  * @return { Promise }
  */
 export function getHotSearch() {
-    return request.get({ url: '/hotSearch' })
-}
-
-/**
- * @description 搜索
- * @param { string } keyword 关键词
- * @return { Promise }
- */
-export function getSearch(data: { keyword: string; pageNo: number; pageSize: number }) {
-    return request.get({ url: '/search', data })
+    return request.get({ url: '/index/hotSearch' })
 }