diff --git a/.env.development b/.env.development index fd86701..0434f5f 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VITE_APP_TITLE='uniapp-vue3-project' VITE_APP_ENV='development' # 接口地址 -VITE_APP_BASE_API='https://apidev.lakeapp.cn/' +VITE_APP_BASE_API='https://apidev.lakeapp.cn/ext/' # 删除console VITE_DROP_CONSOLE=false diff --git a/deploy.ts b/deploy.ts index 7e2794a..dc79cd0 100644 --- a/deploy.ts +++ b/deploy.ts @@ -14,6 +14,7 @@ const WX_DESC = envType == 'production' ? '正式环境' : '测试环境' (async () => { // @ts-ignore const manifest = path.resolve(__dirname, './src/manifest.json') + console.log(manifest) // @ts-ignore const manifestConfig = JSON.parse(fs.readFileSync(manifest).toString()) const appId = manifestConfig['mp-weixin'].appid diff --git a/src/api/goods/index.ts b/src/api/goods/index.ts new file mode 100644 index 0000000..da0beab --- /dev/null +++ b/src/api/goods/index.ts @@ -0,0 +1,14 @@ +import { get } from '@/utils'; + +enum URL { + CategoryList = '/goods/category_list', + GoodsList = '/goods/category_list', + GoodsDetail = '/goods/info', + Order = '/user/logout', +} + +export const getCategoryList = () => get({ url: URL.CategoryList }); + +export const getGoodsList = () => get({ url: URL.GoodsList }); + +export const getGoodsDetail = () => get({ url: URL.GoodsDetail }); diff --git a/src/api/user/index.ts b/src/api/user/index.ts index 24eab72..f00e447 100644 --- a/src/api/user/index.ts +++ b/src/api/user/index.ts @@ -1,18 +1,19 @@ /** * 用户信息相关接口 */ -import type { LoginByCodeParams, LoginParams, LoginResult } from './types'; +import type { LoginParams, LoginResult } from './types'; import { get, post } from '@/utils/request'; import type { UserState } from '@/store/modules/user/types'; enum URL { - login = '/user/login', - loginByCode = '/user/loginByCode', + // login = '/member/login', + login = 'wechat/LoginByMa', + loginByCode = 'wechat/LoginByMaCode', logout = '/user/logout', profile = '/user/profile', } export const getUserProfile = () => get({ url: URL.profile }); export const login = (data: LoginParams) => post({ url: URL.login, data }); -export const loginByCode = (data: LoginByCodeParams) => post({ url: URL.loginByCode, data }); +export const loginByCode = (code: string, companyId: string) => post({ url: URL.loginByCode + `?code=${code}` }); export const logout = () => post({ url: URL.logout }); diff --git a/src/api/user/types.ts b/src/api/user/types.ts index 11a793f..1771c49 100644 --- a/src/api/user/types.ts +++ b/src/api/user/types.ts @@ -1,6 +1,8 @@ export interface LoginParams { - phone: string; + // phone: string; code: string; + userInfo: any; + referrerUserId: string; } export interface LoginByCodeParams { diff --git a/src/manifest.json b/src/manifest.json index 0714903..106b349 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,11 +1,10 @@ { - "name": "SUKE-MP", + "name": "SURE-MP", "appid": "", "description": "", "versionName": "1.0.0", "versionCode": "100", "transformPx": false, - /* 5+App特有相关 */ "app-plus": { "usingComponents": true, @@ -18,12 +17,11 @@ "autoclose": true, "delay": 0 }, - /* 模块配置 */ "modules": {} }, - /* 小程序特有相关 */ "mp-weixin": { +// "appid": "wx92e663dc11d0c0a8", "appid": "wx67a750d0ceed4d88", "setting": { diff --git a/src/pages.json b/src/pages.json index 196985e..bc8eb0c 100644 --- a/src/pages.json +++ b/src/pages.json @@ -59,6 +59,17 @@ } ] }, + { + "root": "pages/mall/subs", + "pages": [ + { + "path": "goods/goods-detail", + "style": { + "navigationBarTitleText": "商品详情" + } + } + ] + }, { "root": "pages/mine/subs", "pages": [ @@ -93,7 +104,7 @@ } }, { - "path": "trade/index", + "path": "trade/trade-list", "style": { "navigationBarTitleText": "消费记录" } diff --git a/src/pages/common/login/index.vue b/src/pages/common/login/index.vue index 328838f..12b40a9 100644 --- a/src/pages/common/login/index.vue +++ b/src/pages/common/login/index.vue @@ -1,47 +1,48 @@ - - diff --git a/src/pages/mall/subs/order/order-confirm.vue b/src/pages/mall/subs/order/order-confirm.vue new file mode 100644 index 0000000..f45039f --- /dev/null +++ b/src/pages/mall/subs/order/order-confirm.vue @@ -0,0 +1,11 @@ + + + + + diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue index 240c42a..aa1e72d 100644 --- a/src/pages/mine/index.vue +++ b/src/pages/mine/index.vue @@ -94,7 +94,7 @@ const serviceList = [ { title: '消费记录', icon: assetsUrl('ic_member_service_record.png'), - path: '/pages/mine/subs/trade/index' + path: '/pages/mine/subs/trade/trade-list' }, { title: '关注公众号', diff --git a/src/pages/mine/subs/order/components/order-item.vue b/src/pages/mine/subs/order/components/order-item.vue index fc9cce8..039eec9 100644 --- a/src/pages/mine/subs/order/components/order-item.vue +++ b/src/pages/mine/subs/order/components/order-item.vue @@ -1,13 +1,145 @@ diff --git a/src/pages/mine/subs/order/order-list.vue b/src/pages/mine/subs/order/order-list.vue index b7c8965..7f98b21 100644 --- a/src/pages/mine/subs/order/order-list.vue +++ b/src/pages/mine/subs/order/order-list.vue @@ -1,9 +1,13 @@ diff --git a/src/pages/mine/subs/trade/index.vue b/src/pages/mine/subs/trade/index.vue deleted file mode 100644 index b242b35..0000000 --- a/src/pages/mine/subs/trade/index.vue +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/src/pages/mine/subs/trade/trade-list.vue b/src/pages/mine/subs/trade/trade-list.vue new file mode 100644 index 0000000..326e2d9 --- /dev/null +++ b/src/pages/mine/subs/trade/trade-list.vue @@ -0,0 +1,52 @@ + + + + + diff --git a/src/static/images/ic_arrow_right_gray.png b/src/static/images/ic_arrow_right_gray.png new file mode 100644 index 0000000..9fa6236 Binary files /dev/null and b/src/static/images/ic_arrow_right_gray.png differ diff --git a/src/static/images/ic_goods_order.png b/src/static/images/ic_goods_order.png new file mode 100644 index 0000000..3ff3323 Binary files /dev/null and b/src/static/images/ic_goods_order.png differ diff --git a/src/static/images/ic_goods_shoppingcart.png b/src/static/images/ic_goods_shoppingcart.png new file mode 100644 index 0000000..82775f7 Binary files /dev/null and b/src/static/images/ic_goods_shoppingcart.png differ diff --git a/src/static/images/ic_goods_store.png b/src/static/images/ic_goods_store.png new file mode 100644 index 0000000..2ea0af7 Binary files /dev/null and b/src/static/images/ic_goods_store.png differ diff --git a/src/static/images/ic_share.png b/src/static/images/ic_share.png new file mode 100644 index 0000000..d48a336 Binary files /dev/null and b/src/static/images/ic_share.png differ diff --git a/src/static/images/ic_triangle_down.png b/src/static/images/ic_triangle_down.png new file mode 100644 index 0000000..9445a82 Binary files /dev/null and b/src/static/images/ic_triangle_down.png differ diff --git a/src/store/modules/user/index.ts b/src/store/modules/user/index.ts index ce8eb0e..83c3cfb 100644 --- a/src/store/modules/user/index.ts +++ b/src/store/modules/user/index.ts @@ -2,9 +2,8 @@ import { defineStore } from 'pinia'; import type { UserState, providerType } from './types'; import { getUserProfile, - loginByCode, login as userLogin, - logout as userLogout, + logout as userLogout, login } from '@/api/user/index'; import { clearToken, setToken } from '@/utils/auth'; import type { LoginParams } from '@/api/user/types'; @@ -14,12 +13,12 @@ const useUserStore = defineStore('user', { user_id: '', user_name: '江阳小道', avatar: '', - token: '', + token: '' }), getters: { userInfo(state: UserState): UserState { return { ...state }; - }, + } }, actions: { // 设置用户的信息 @@ -41,12 +40,12 @@ const useUserStore = defineStore('user', { try { const result = await userLogin(loginForm); const token = result?.token; - if (token) { + if(token) { setToken(token); } resolve(result); } catch (error) { - reject(error) + reject(error); } }); }, @@ -62,8 +61,12 @@ const useUserStore = defineStore('user', { uni.login({ provider, success: async (result: UniApp.LoginRes) => { - if (result.code) { - const res = await loginByCode({ code: result.code }); + if(result.code) { + const res = await login({ + code: result.code, + userInfo: (await uni.getUserInfo()).userInfo, + referrerUserId: '1727303781559697409' + }); resolve(res); } else { reject(new Error(result.errMsg)); @@ -72,11 +75,11 @@ const useUserStore = defineStore('user', { fail: (err: any) => { console.error(`login error: ${err}`); reject(err); - }, + } }); }); - }, - }, + } + } }); export default useUserStore; diff --git a/src/utils/request/interceptors.ts b/src/utils/request/interceptors.ts index 7d1f105..79c6f53 100644 --- a/src/utils/request/interceptors.ts +++ b/src/utils/request/interceptors.ts @@ -26,6 +26,7 @@ function requestInterceptors() { const token = getToken(); if(token && config.header) { config.header.token = token; + config.header.Authorization = token; } return config; },