@@ -32,16 +35,65 @@ const linkList = ref([
{
path: '/pages/index/index',
name: '商城首页',
- type: LinkTypeEnum.SHOP_PAGES
+ type: LinkTypeEnum.SHOP_PAGES,
+ isTab: true
},
{
path: '/pages/news/news',
name: '文章资讯',
- type: LinkTypeEnum.SHOP_PAGES
+ type: LinkTypeEnum.SHOP_PAGES,
+ isTab: true
},
{
path: '/pages/user/user',
name: '个人中心',
+ type: LinkTypeEnum.SHOP_PAGES,
+ isTab: true
+ },
+ {
+ path: '/pages/collection/collection',
+ name: '我的收藏',
+ type: LinkTypeEnum.SHOP_PAGES
+ },
+ {
+ path: '/pages/customer_service/customer_service',
+ name: '联系客服',
+ type: LinkTypeEnum.SHOP_PAGES
+ },
+ {
+ path: '/pages/user_set/user_set',
+ name: '个人设置',
+ type: LinkTypeEnum.SHOP_PAGES
+ },
+ {
+ path: '/pages/as_us/as_us',
+ name: '关于我们',
+ type: LinkTypeEnum.SHOP_PAGES
+ },
+ {
+ path: '/pages/user_data/user_data',
+ name: '个人资料',
+ type: LinkTypeEnum.SHOP_PAGES
+ },
+ {
+ path: '/pages/agreement/agreement',
+ name: '隐私政策',
+ query: {
+ type: 'privacy'
+ },
+ type: LinkTypeEnum.SHOP_PAGES
+ },
+ {
+ path: '/pages/agreement/agreement',
+ name: '服务协议',
+ query: {
+ type: 'service'
+ },
+ type: LinkTypeEnum.SHOP_PAGES
+ },
+ {
+ path: '/pages/search/search',
+ name: '搜索',
type: LinkTypeEnum.SHOP_PAGES
}
])
diff --git a/admin/src/utils/util.ts b/admin/src/utils/util.ts
index 119b60bc..d553beb3 100644
--- a/admin/src/utils/util.ts
+++ b/admin/src/utils/util.ts
@@ -16,7 +16,7 @@ export const addUnit = (value: string | number, unit = 'px') => {
* @return {Boolean}
*/
export const isEmpty = (value: unknown) => {
- return value !== null && value !== '' && typeof value !== 'undefined'
+ return value == null && typeof value == 'undefined'
}
/**
diff --git a/app/src/api/news.ts b/app/src/api/news.ts
index c26c5a86..cddb8364 100644
--- a/app/src/api/news.ts
+++ b/app/src/api/news.ts
@@ -2,7 +2,7 @@ import request from '@/utils/request'
/**
* @description 获取文章分类
- * @return { Promise }
+ * @return { Promise }
*/
export function getArticleCate() {
return request.get({ url: '/article/category' })
@@ -10,7 +10,7 @@ export function getArticleCate() {
/**
* @description 获取文章列表
- * @return { Promise }
+ * @return { Promise }
*/
export function getArticleList(data: Record
) {
return request.get({ url: '/article/list', data: data })
@@ -18,8 +18,8 @@ export function getArticleList(data: Record) {
/**
* @description 获取文章详情
- * @param { number } id
- * @return { Promise }
+ * @param { number } id
+ * @return { Promise }
*/
export function getArticleDetail(data: { id: number }) {
return request.get({ url: '/article/detail', data: data })
@@ -27,25 +27,25 @@ export function getArticleDetail(data: { id: number }) {
/**
* @description 加入收藏
- * @param { number } articleId
- * @return { Promise }
+ * @param { number } articleId
+ * @return { Promise }
*/
export function addCollect(data: { articleId: number }) {
- return request.post({ url: '/article/addCollect', data: data })
+ return request.post({ url: '/article/addCollect', data: data }, { isAuth: true })
}
/**
* @description 取消收藏
- * @param { number } id
- * @return { Promise }
+ * @param { number } id
+ * @return { Promise }
*/
export function cancelCollect(data: { articleId: number }) {
- return request.post({ url: '/article/cancelCollect', data: data })
+ return request.post({ url: '/article/cancelCollect', data: data }, { isAuth: true })
}
/**
* @description 获取收藏列表
- * @return { Promise }
+ * @return { Promise }
*/
export function getCollect() {
return request.get({ url: '/article/collect' })
diff --git a/app/src/components/widgets/banner/banner.vue b/app/src/components/widgets/banner/banner.vue
index 4cb00c18..0a27a787 100644
--- a/app/src/components/widgets/banner/banner.vue
+++ b/app/src/components/widgets/banner/banner.vue
@@ -9,7 +9,11 @@
indicator-active-color="#4173ff"
:autoplay="true"
>
-
+
import { useAppStore } from '@/stores/app'
+import { navigateTo } from '@/utils/util'
const props = defineProps({
content: {
@@ -35,6 +40,9 @@ const props = defineProps({
}
})
const { getImageUrl } = useAppStore()
+const handleClick = (link: any) => {
+ navigateTo(link)
+}
diff --git a/app/src/components/widgets/my-service/my-service.vue b/app/src/components/widgets/my-service/my-service.vue
index 28dec2cc..9e4f583b 100644
--- a/app/src/components/widgets/my-service/my-service.vue
+++ b/app/src/components/widgets/my-service/my-service.vue
@@ -11,6 +11,7 @@
v-for="(item, index) in content.data"
:key="index"
class="flex flex-col items-center w-1/4 mb-[15px]"
+ @click="handleClick(item.link)"
>
{{ item.name }}
@@ -21,6 +22,7 @@
v-for="(item, index) in content.data"
:key="index"
class="flex items-center border-light border-solid border-0 border-b h-[100rpx] px-[24rpx]"
+ @click="handleClick(item.link)"
>
{{ item.name }}
@@ -33,6 +35,7 @@
diff --git a/app/src/components/widgets/nav/nav.vue b/app/src/components/widgets/nav/nav.vue
index f8d596a2..b348f22c 100644
--- a/app/src/components/widgets/nav/nav.vue
+++ b/app/src/components/widgets/nav/nav.vue
@@ -5,6 +5,7 @@
v-for="(item, index) in content.data"
:key="index"
class="flex flex-col items-center w-1/5 mb-[30rpx]"
+ @click="handleClick(item.link)"
>
{{ item.name }}
@@ -15,6 +16,7 @@
diff --git a/app/src/components/widgets/user-banner/user-banner.vue b/app/src/components/widgets/user-banner/user-banner.vue
index 95647f8a..aac52319 100644
--- a/app/src/components/widgets/user-banner/user-banner.vue
+++ b/app/src/components/widgets/user-banner/user-banner.vue
@@ -9,7 +9,11 @@
indicator-active-color="#4173ff"
:autoplay="true"
>
-
+
import { useAppStore } from '@/stores/app'
+import { navigateTo } from '@/utils/util'
const props = defineProps({
content: {
@@ -35,6 +40,9 @@ const props = defineProps({
default: () => ({})
}
})
+const handleClick = (link: any) => {
+ navigateTo(link)
+}
const { getImageUrl } = useAppStore()
diff --git a/app/src/components/widgets/user-info/user-info.vue b/app/src/components/widgets/user-info/user-info.vue
index 0813bf65..40319566 100644
--- a/app/src/components/widgets/user-info/user-info.vue
+++ b/app/src/components/widgets/user-info/user-info.vue
@@ -1,10 +1,10 @@
-
+
{{ user.nickname }}
@@ -13,6 +13,9 @@
未登录
+
+
+
+
+
diff --git a/app/src/router/index.ts b/app/src/router/index.ts
index 45a26e36..47114414 100644
--- a/app/src/router/index.ts
+++ b/app/src/router/index.ts
@@ -1,31 +1,27 @@
import { getToken } from '@/utils/auth'
import { generateRoutes } from './transformPages'
-const routes = generateRoutes()
-
-export default async function () {
- const list = ['navigateTo', 'redirectTo', 'reLaunch', 'switchTab']
- list.forEach((item) => {
- uni.addInterceptor(item, {
- invoke(e) {
- // 获取要跳转的页面路径（url去掉"?"和"?"后的参数）
- const url = e.url.split('?')[0]
- const currentRoute = routes.find((item) => {
- return url === item.path
+export const routes = generateRoutes()
+const list = ['navigateTo', 'redirectTo', 'reLaunch', 'switchTab']
+list.forEach((item) => {
+ uni.addInterceptor(item, {
+ invoke(e) {
+ // 获取要跳转的页面路径（url去掉"?"和"?"后的参数）
+ const url = e.url.split('?')[0]
+ const currentRoute = routes.find((item) => {
+ return url === item.path
+ })
+ // 需要登录并且没有token
+ if (currentRoute?.auth && !getToken()) {
+ uni.navigateTo({
+ url: '/pages/login/login'
})
-
- // 需要登录并且没有token
- if (currentRoute?.isAuth && !getToken()) {
- uni.navigateTo({
- url: '/pages/login/login'
- })
- return false
- }
- return e
- },
- fail(err) {
- // 失败回调拦截
- console.log(err)
+ return false
}
- })
+ return e
+ },
+ fail(err) {
+ // 失败回调拦截
+ console.log(err)
+ }
})
-}
+})
diff --git a/app/src/utils/request/index.ts b/app/src/utils/request/index.ts
index 1dc211e3..e0b9a8cf 100644
--- a/app/src/utils/request/index.ts
+++ b/app/src/utils/request/index.ts
@@ -23,7 +23,7 @@ const requestHooks: RequestHooks = {
return options
},
responseInterceptorsHook(response, config) {
- const { isTransformResponse, isReturnDefaultResponse } = config
+ const { isTransformResponse, isReturnDefaultResponse, isAuth } = config
//返回默认响应，当需要获取响应头及其他数据时可使用
if (isReturnDefaultResponse) {
@@ -54,6 +54,11 @@ const requestHooks: RequestHooks = {
case RequestCodeEnum.TOKEN_INVALID:
case RequestCodeEnum.TOKEN_EMPTY:
logout()
+ if (isAuth && !getToken()) {
+ uni.navigateTo({
+ url: '/pages/login/login'
+ })
+ }
return Promise.reject()
default:
@@ -77,6 +82,7 @@ const defaultOptions: HttpRequestOptions = {
ignoreCancel: false,
// 是否携带token
withToken: true,
+ isAuth: false,
requestHooks: requestHooks
}
diff --git a/app/src/utils/request/type.d.ts b/app/src/utils/request/type.d.ts
index fb127e42..f18665a6 100644
--- a/app/src/utils/request/type.d.ts
+++ b/app/src/utils/request/type.d.ts
@@ -14,6 +14,7 @@ export interface RequestConfig {
urlPrefix: string
ignoreCancel: boolean
withToken: boolean
+ isAuth: boolean
}
export interface RequestHooks {
diff --git a/app/src/utils/util.ts b/app/src/utils/util.ts
index f77a3ef0..3010ae56 100644
--- a/app/src/utils/util.ts
+++ b/app/src/utils/util.ts
@@ -1,3 +1,5 @@
+import { isObject } from '@vue/shared'
+
/**
* @description 获取元素节点信息（在组件中的元素必须要传ctx）
* @param { String } selector 选择器 '.app' | '#app'
@@ -23,3 +25,82 @@ export const getRect = (selector: string, all = false, context?: any) => {
.exec()
})
}
+
+/**
+ * @description 获取当前页面实例
+ */
+export function currentPage() {
+ const pages = getCurrentPages()
+ const currentPage = pages[pages.length - 1]
+ return currentPage || {}
+}
+
+/**
+ * @description 后台选择链接专用跳转
+ */
+interface Link {
+ path: string
+ name?: string
+ type: string
+ isTab: boolean
+ query?: Record
+}
+
+export enum LinkTypeEnum {
+ 'SHOP_PAGES' = 'shop',
+ 'CUSTOM_LINK' = 'custom'
+}
+export function navigateTo(link: Link) {
+ console.log(objectToQuery(link.query), link)
+ let url: string
+ switch (link.type) {
+ case LinkTypeEnum.SHOP_PAGES:
+ url = link.query ? `${link.path}?${objectToQuery(link.query)}` : link.path
+ if (link.isTab) {
+ uni.switchTab({ url })
+ } else {
+ uni.navigateTo({ url })
+ }
+ break
+ case LinkTypeEnum.CUSTOM_LINK:
+ uni.navigateTo({ url: `/pages/webview/webview?url=${link.path}` })
+ }
+}
+
+/**
+ * @description 是否为空
+ * @param {unknown} value
+ * @return {Boolean}
+ */
+export const isEmpty = (value: unknown) => {
+ return value == null && typeof value == 'undefined'
+}
+
+/**
+ * @description 对象格式化为Query语法
+ * @param { Object } params
+ * @return {string} Query语法
+ */
+export function objectToQuery(params: Record): string {
+ let query = ''
+ for (const props of Object.keys(params)) {
+ const value = params[props]
+ const part = encodeURIComponent(props) + '='
+ if (!isEmpty(value)) {
+ console.log(encodeURIComponent(props), isObject(value))
+ if (isObject(value)) {
+ for (const key of Object.keys(value)) {
+ if (!isEmpty(value[key])) {
+ const params = props + '[' + key + ']'
+ const subPart = encodeURIComponent(params) + '='
+ query += subPart + encodeURIComponent(value[key]) + '&'
+ }
+ }
+ } else {
+ console.log(part + encodeURIComponent(value), '####')
+ query += part + encodeURIComponent(value) + '&'
+ }
+ }
+ }
+ return query.slice(0, -1)
+}
From 2f272503a639f4a0b8899dd297f1383be97cfa88 Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Fri, 9 Sep 2022 15:19:08 +0800
Subject: [PATCH 03/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E5=83=8F?=
=?UTF-8?q?=E6=88=AA=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/pages.json | 7 +++++++
.../components/u-avatar-cropper/weCropper.js | 10 +++-------
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/app/src/pages.json b/app/src/pages.json
index 537d691c..79f04345 100644
--- a/app/src/pages.json
+++ b/app/src/pages.json
@@ -93,6 +93,13 @@
},
{
"path": "pages/webview/webview"
+ },
+ {
+ "path": "uni_modules/vk-uview-ui/components/u-avatar-cropper/u-avatar-cropper",
+ "style": {
+ "navigationBarTitleText": "头像裁剪",
+ "navigationBarBackgroundColor": "#000000"
+ }
}
],
"globalStyle": {
diff --git a/app/src/uni_modules/vk-uview-ui/components/u-avatar-cropper/weCropper.js b/app/src/uni_modules/vk-uview-ui/components/u-avatar-cropper/weCropper.js
index 7402f8d4..3ef0e318 100644
--- a/app/src/uni_modules/vk-uview-ui/components/u-avatar-cropper/weCropper.js
+++ b/app/src/uni_modules/vk-uview-ui/components/u-avatar-cropper/weCropper.js
@@ -3,11 +3,7 @@
* (c) 2020 dlhandsome
* @license MIT
*/
-(function(global, factory) {
- typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
- typeof define === 'function' && define.amd ? define(factory) :
- (global.WeCropper = factory());
-}(this, (function() {
+
'use strict';
var device = void 0;
@@ -1260,6 +1256,6 @@
WeCropper.prototype.cutt = cut;
WeCropper.prototype.update = update;
- return WeCropper;
+ export default WeCropper
+
-})));
From 0a1cf3fb1adc76ac1e914d5c254ffb317792b76c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B4=AA=E6=A0=91=E6=B3=BD?= <2393354236@qq.com>
Date: Fri, 9 Sep 2022 15:51:52 +0800
Subject: [PATCH 04/17] =?UTF-8?q?=E3=80=90=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
=?UTF-8?q?=E3=80=91=E4=B8=AA=E4=BA=BA=E8=B5=84=E6=96=99=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/pages/user_data/user_data.vue | 105 ++++++++++++--------------
app/src/utils/util.ts | 9 ---
2 files changed, 49 insertions(+), 65 deletions(-)
diff --git a/app/src/pages/user_data/user_data.vue b/app/src/pages/user_data/user_data.vue
index 006eded4..0273b602 100644
--- a/app/src/pages/user_data/user_data.vue
+++ b/app/src/pages/user_data/user_data.vue
@@ -133,11 +133,7 @@
onShow,
onUnload
} from '@dcloudio/uni-app'
- import {
- // apiUserInfoGet,
- // apiUserInfoSet,
- // apiWechatMobileGet,
- // apiHasPassword,
+ import {
getUserInfo,
userEdit,
userBindMobile,
@@ -151,38 +147,42 @@
import {
uploadFile
} from '@/utils/util.ts'
- import {
- getWxCode
- } from '@/utils/util'
- let wxCode = ref < any | null > ('')
// 用户信息
let userInfo = ref < any | null > (null)
// 用户信息的枚举
- const fieldType = ref(FieldType.NONE)
- //显示昵称输入框
- const showNickName = ref < boolean | null > (false)
- //显示昵称输入框
- const showUserName = ref < boolean | null > (false)
+ const fieldType = ref(FieldType.NONE)
+ //选择性别数据
+ const sexList = ref < Array < string > | null > (['男', '女'])
+
+ //显示昵称弹窗
+ const showNickName = ref < boolean | null >(false)
+ //显示账户弹窗
+ const showUserName = ref < boolean | null >(false)
+ //显示性别选择弹窗
+ const showPicker = ref < boolean | null >(false)
+ // 显示手机号验证码调整弹窗 非小程序才需要
+ const showMobilePop = ref < boolean | null > (false)
+
//新昵称
const newNickname = ref < string > ('')
//新账号
- const newUsername = ref < string > ('')
- //手机号码
- const mobile = ref < string > ('')
- //显示性别选择
- const showPicker = ref < boolean | null > (false)
- //选择性别数据
- const sexList = ref < Array < string > | null > (['男', '女'])
-
- //显示昵称输入框
- const showMobilePop = ref < boolean | null > (true)
+ const newUsername = ref < string > ('')
//新的手机号码
const newMobile = ref < string > ('')
+
//修改手机验证码
const mobileCode = ref ('')
const codeTips = ref('')
const uCodeRef = shallowRef()
+
+
+ // 获取用户信息
+ const getUser = async (): Promise < void > => {
+ userInfo.value = await getUserInfo()
+ }
+
+ // 获取验证码显示字段
const codeChange = (text: string) => {
codeTips.value = text
}
@@ -200,7 +200,7 @@
}
}
- // 验证码修改手机号
+ // 验证码修改手机号-非微信小程序
const changeCodeMobile = async () => {
await userBindMobile({
type: userInfo.mobile ? 'change' : 'bind',
@@ -211,11 +211,6 @@
}
- // 获取用户信息
- const getUser = async (): Promise < void > => {
- userInfo.value = await getUserInfo()
- }
-
// 修改用户信息
const setUserInfoFun = async (value: string): Promise < void > => {
await userEdit({
@@ -229,17 +224,20 @@
const uploaderAvatar = () => {
fieldType.value = FieldType.AVATAR
uni.navigateTo({
- url: '/uni_modules/uview-ui/components/u-avatar-cropper/u-avatar-cropper?destWidth=300&rectWidth=200&fileType=jpg',
+ url: '/uni_modules/vk-uview-ui/components/u-avatar-cropper/u-avatar-cropper?destWidth=300&rectWidth=200&fileType=jpg',
})
}
-
- // 修改用户昵称
- const changeNameConfirm = () => {
- if (newNickname.value == '') return toast('昵称不能为空')
- if (newNickname.value.length > 10) return toast('昵称长度不得超过十位数')
- showNickName.value = false
- fieldType.value = FieldType.NICKNAME
- setUserInfoFun(newNickname.value)
+
+ // 显示修改用户性别弹窗
+ const changeSex = () => {
+ showPicker.value = true
+ fieldType.value = FieldType.SEX
+ }
+
+ // 修改用户性别
+ const changeSexConfirm = (value) => {
+ setUserInfoFun(value[0] + 1)
+ showPicker.value = false
}
// 修改用户账号
@@ -252,29 +250,25 @@
showUserName.value = false
}
- // 显示修改用户性别弹窗
- const changeSex = () => {
- showPicker.value = true
- fieldType.value = FieldType.SEX
+ // 修改用户昵称
+ const changeNameConfirm = () => {
+ if (newNickname.value == '') return toast('昵称不能为空')
+ if (newNickname.value.length > 10) return toast('昵称长度不得超过十位数')
+ showNickName.value = false
+ fieldType.value = FieldType.NICKNAME
+ setUserInfoFun(newNickname.value)
}
- // 修改用户性别
- const changeSexConfirm = (value) => {
- setUserInfoFun(value[0] + 1)
- showPicker.value = false
- }
-
- // 绑定｜｜修改用户手机号
+ // 微信小程序 绑定｜｜修改用户手机号
const getPhoneNumber = async (e): Promise < void > => {
- // wxCode.value = await getWxCode()
- console.log('wxCode.value', wxCode.value)
fieldType.value = FieldType.MOBILE
const {
encryptedData,
- iv
+ iv,
+ code,
} = e.detail
- let data = {
- code: wxCode.value,
+ let data = {
+ code,
encrypted_data: encryptedData,
iv,
}
@@ -311,7 +305,6 @@
onShow(async () => {
getUser()
- wxCode.value = await getWxCode()
})
onUnload(() => {
diff --git a/app/src/utils/util.ts b/app/src/utils/util.ts
index d2e9e3ab..55d92038 100644
--- a/app/src/utils/util.ts
+++ b/app/src/utils/util.ts
@@ -136,12 +136,3 @@ export function uploadFile(path: any) {
})
})
}
-
-export const getWxCode = (): Promise => {
- return new Promise((resolve, reject) => {
- uni.login({
- desc: '获取用户信息，完善用户资料',
- success: (res: Event) => resolve(res.code)
- })
- })
-}
From f1a80f7c5e438d3710748279f1d139271534b450 Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Fri, 9 Sep 2022 15:59:18 +0800
Subject: [PATCH 05/17] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?=
=?UTF-8?q?=E5=8F=8A=E6=B3=A8=E5=86=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/widgets/user-info/user-info.vue | 11 +++++++----
app/src/pages/login/login.vue | 16 ++++++++++++++--
app/src/pages/register/register.vue | 18 ++++++++++++++++--
.../vk-uview-ui/components/u-image/u-image.vue | 1 -
4 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/app/src/components/widgets/user-info/user-info.vue b/app/src/components/widgets/user-info/user-info.vue
index 40319566..c6c1e9c1 100644
--- a/app/src/components/widgets/user-info/user-info.vue
+++ b/app/src/components/widgets/user-info/user-info.vue
@@ -1,5 +1,5 @@
-
+
- {{ user.nickname }}
+
+ {{ user.nickname }}
+ 账号：{{ user.username }}
+
- 未登录
+ 未登录
- {{ item.name }}