From 4281ac05f957945285ac0efc51ef9aee8915033c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=A8=E6=A0=88=E5=B0=8F=E5=AD=A6=E7=94=9F?=
<1518079521@qq.com>
Date: Sat, 3 Jun 2023 18:28:00 +0800
Subject: [PATCH] uni-app update
---
uni-app/api/pay.ts | 4 +-
uni-app/components/app-link/app-link.vue | 49 ++++---
uni-app/components/diy/graphic-nav/index.vue | 137 ++++++++++--------
uni-app/components/diy/image-ads/index.vue | 50 ++-----
uni-app/components/diy/text/index.vue | 30 ++--
uni-app/locale/language.ts | 16 +-
uni-app/locale/zh-Hans.json | 27 +++-
uni-app/locale/zh-Hans/common.json | 2 +-
.../pages.member.recharge_record_detail.json | 12 +-
uni-app/pages/article/detail.vue | 3 +
uni-app/pages/index/nosite.vue | 16 ++
uni-app/pages/member/recharge_record.vue | 37 +++--
.../pages/member/recharge_record_detail.vue | 86 ++++-------
uni-app/stores/system.ts | 2 +-
uni-app/utils/auth.ts | 6 +-
uni-app/utils/common.ts | 24 ++-
uni-app/utils/interceptor.ts | 14 +-
17 files changed, 279 insertions(+), 236 deletions(-)
create mode 100644 uni-app/pages/index/nosite.vue
diff --git a/uni-app/api/pay.ts b/uni-app/api/pay.ts
index 567f5815c..87d866443 100644
--- a/uni-app/api/pay.ts
+++ b/uni-app/api/pay.ts
@@ -4,12 +4,12 @@ import request from '@/utils/request'
* 支付
*/
export function pay(data : AnyObject) {
- return request.post(`/pay`, data, { showErrorMessage: true })
+ return request.post(`pay`, data, { showErrorMessage: true })
}
/**
* 获取支付信息
*/
export function getPayInfo(outTradeNo : string) {
- return request.get(`/pay/info/${outTradeNo}`, {}, { showErrorMessage: true })
+ return request.get(`pay/info/${outTradeNo}`, {}, { showErrorMessage: true })
}
\ No newline at end of file
diff --git a/uni-app/components/app-link/app-link.vue b/uni-app/components/app-link/app-link.vue
index deda00442..35b2c9fc5 100644
--- a/uni-app/components/app-link/app-link.vue
+++ b/uni-app/components/app-link/app-link.vue
@@ -1,29 +1,38 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/uni-app/components/diy/graphic-nav/index.vue b/uni-app/components/diy/graphic-nav/index.vue
index cf481cf13..963fa30ff 100644
--- a/uni-app/components/diy/graphic-nav/index.vue
+++ b/uni-app/components/diy/graphic-nav/index.vue
@@ -5,28 +5,31 @@
{{diyComponent.navTitle}}
-
+
-
-
-
-
- {{ item.label.text }}
+
+
+
+
+
+
+ {{ item.label.text }}
+
+
+
+
+ {{ item.title }}
-
+
-
- {{ item.title }}
-
-
+
@@ -38,39 +41,43 @@
v-for="(numItem, numIndex) in Math.ceil(diyComponent.list.length / (diyComponent.pageCount * diyComponent.rowCount))">
-
+ :style="{ width: 100 / diyComponent.rowCount + '%' }">
-
+ :style="{ width: 100 / diyComponent.rowCount + '%' }">
-
-
-
+
-
- {{ item.label.text }}
+
+
+
+
+
+ {{ item.label.text }}
+
+
+
+
+ {{ item.title }}
-
+
-
- {{ item.title }}
-
@@ -81,29 +88,31 @@
-
-
-
-
-
- {{ item.label.text }}
+ :style="{ width: 100 / diyComponent.rowCount + '%' }">
+
+
+
+
+
+
+ {{ item.label.text }}
+
+
+
+ {{ item.title }}
-
-
- {{ item.title }}
-
+
diff --git a/uni-app/components/diy/image-ads/index.vue b/uni-app/components/diy/image-ads/index.vue
index 75803249e..46038a172 100644
--- a/uni-app/components/diy/image-ads/index.vue
+++ b/uni-app/components/diy/image-ads/index.vue
@@ -1,18 +1,21 @@
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
@@ -21,7 +24,7 @@
+
+
\ No newline at end of file
diff --git a/uni-app/pages/member/recharge_record.vue b/uni-app/pages/member/recharge_record.vue
index e14497caa..6b87ff118 100644
--- a/uni-app/pages/member/recharge_record.vue
+++ b/uni-app/pages/member/recharge_record.vue
@@ -1,14 +1,12 @@
-
- {{item.from_type_name}}
- {{item.memo}}
- {{item.create_time}}
-
- {{ item.account_data > 0 ? '+' + item.account_data : item.account_data }}
-
-
+
+ {{order.item[0].item_name}}
+ {{order.create_time}}
+ +{{ order.order_money }}
+ {{order.order_status_info.name}}
@@ -22,11 +20,11 @@
import MescrollBody from '@/components/mescroll/mescroll-body/mescroll-body.vue';
import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue';
import useMescroll from '@/components/mescroll/hooks/useMescroll.js';
- import { getRechargeList} from '@/api/member';
+ import { getRechargeList } from '@/api/member';
+ import { redirect } from '@/utils/common'
import { onPageScroll, onReachBottom, onLoad } from '@dcloudio/uni-app';
const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom);
-
const list = ref>([]),
loading = ref(false),
mescrollRef = ref(null);
@@ -68,13 +66,24 @@
mescroll.endErr(); // 请求失败, 结束加载
})
}
-
-
- const toDetailFn = (data)=>{
- redirect({ url: '/pages/member/recharge_record_detail', param: { id: data.order_id }});
+
+ const toDetailFn = (data) => {
+ redirect({ url: '/pages/member/recharge_record_detail', param: { id: data.order_id } });
}
\ No newline at end of file
diff --git a/uni-app/pages/member/recharge_record_detail.vue b/uni-app/pages/member/recharge_record_detail.vue
index 884ed11d1..81a09ad0e 100644
--- a/uni-app/pages/member/recharge_record_detail.vue
+++ b/uni-app/pages/member/recharge_record_detail.vue
@@ -1,77 +1,51 @@
-
+
- -{{ rechargeInfo.apply_money }}
- {{ rechargeInfo.status_name }}
+ ￥{{ rechargeInfo.order_money }}
+ {{rechargeInfo.order_status_info.name}}
-
-
- {{t('cashOutNo')}}
- {{ rechargeInfo.cash_out_no }}
+
+ {{ rechargeInfo.item[0].item_name }}
+ ￥{{ rechargeInfo.order_money }}
- {{t('serviceMoney')}}
- ￥{{ rechargeInfo.service_money }}
+ {{t('orderNo')}}
+ {{ rechargeInfo.order_no }}
{{t('createTime')}}
{{ rechargeInfo.create_time }}
-
- {{t('auditTime')}}
- {{ rechargeInfo.audit_time }}
-
-
- {{t('transferBank')}}
- {{ rechargeInfo.transfer_bank }}
-
-
- {{t('transferAccount')}}
- {{ rechargeInfo.transfer_account }}
-
-
- {{t('refuseReason')}}
- {{ rechargeInfo.refuse_reason }}
-
-
- {{t('transferTypeName')}}
- {{ rechargeInfo.transfer_type_name }}
-
-
- {{t('transferTime')}}
- {{ rechargeInfo.transfer_time }}
-
+ @import '@/styles/member_record_detail.scss';
+
\ No newline at end of file
diff --git a/uni-app/stores/system.ts b/uni-app/stores/system.ts
index d5ad8ebb3..3be64cd2a 100644
--- a/uni-app/stores/system.ts
+++ b/uni-app/stores/system.ts
@@ -20,7 +20,7 @@ const useSystemStore = defineStore('system', {
if (this.site.status == 3) redirect({ url: '/pages/index/close', mode: 'reLaunch' })
})
.catch((err) => {
- redirect({ url: '/pages/index/nonexistence', mode: 'reLaunch' })
+ redirect({ url: '/pages/index/nosite', mode: 'reLaunch' })
})
}
}
diff --git a/uni-app/utils/auth.ts b/uni-app/utils/auth.ts
index f87bddc9b..6886f8765 100644
--- a/uni-app/utils/auth.ts
+++ b/uni-app/utils/auth.ts
@@ -9,5 +9,9 @@ const loginBack = useLogin()
*/
export function checkNeedLogin(route: AnyObject){
const pages = getNeedLoginPages()
- pages.includes(route.path) && !getToken() && loginBack.setLoginBack({ url: route.path, param: route.query || {} })
+ if (pages.includes(route.path) && !getToken()) {
+ setTimeout(() => {
+ loginBack.setLoginBack({ url: route.path, param: route.query || {} })
+ }, 100)
+ }
}
\ No newline at end of file
diff --git a/uni-app/utils/common.ts b/uni-app/utils/common.ts
index 0ec62d37e..109858f38 100644
--- a/uni-app/utils/common.ts
+++ b/uni-app/utils/common.ts
@@ -1,11 +1,12 @@
import { getTabbarPages } from './pages'
import useDiyStore from '@/stores/diy'
import useMemberStore from '@/stores/member'
-import internal from 'stream'
+import pagesZh from '@/locale/zh-Hans.json'
+import pagesEn from '@/locale/en.json'
/**
- * 跳转页面
- */
+* 跳转页面
+*/
export const redirect = (redirect : redirectOptions) => {
// 装修模式禁止跳转
if (useDiyStore().mode == 'decorate') return
@@ -230,4 +231,21 @@ export function getSiteId(siteid : number) {
// #ifndef H5
return siteid
// #endif
+}
+
+/**
+ * 设置html标题
+ * @param {Object} route
+ */
+export function setDocumentTitle(route: string) {
+ if (process.env.NODE_ENV != 'production') return
+ try {
+ const locale: AnyObject = {
+ 'zh-Hans': pagesZh,
+ 'en': pagesEn
+ }
+ const key = route.replace('/', '').replaceAll('/', '.')
+ locale[ uni.getLocale() ][key] && (document.title = locale[ uni.getLocale() ][key])
+ } catch (e) {
+ }
}
\ No newline at end of file
diff --git a/uni-app/utils/interceptor.ts b/uni-app/utils/interceptor.ts
index e253db88c..a46467e59 100644
--- a/uni-app/utils/interceptor.ts
+++ b/uni-app/utils/interceptor.ts
@@ -1,6 +1,6 @@
import { language } from '@/locale'
import { checkNeedLogin } from '@/utils/auth'
-import { redirect, urlDeconstruction, getToken, getSiteId } from '@/utils/common'
+import { redirect, urlDeconstruction, getToken, getSiteId, setDocumentTitle } from '@/utils/common'
import { memberLog } from '@/api/auth'
/**
@@ -16,14 +16,17 @@ export const redirectInterceptor = () => {
// 加载语言包
language.loadLocaleMessages(route.path, uni.getLocale())
-
+
// 开发模式下，如果未配置站点ID，则跳转到开发环境配置页面
// #ifdef H5
if (process.env.NODE_ENV == 'development') {
if ((getSiteId(uni.getStorageSync('wap_site_id') || import.meta.env.VITE_SITE_ID) === '') && route.path != '/pages/index/develop') {
redirect({ url: '/pages/index/develop', mode: 'reLaunch' })
}
- }
+ } else {
+ // 设置网站标题
+ setDocumentTitle(route.path)
+ }
// #endif
// 校验是否需要登录
@@ -55,7 +58,10 @@ export const launchInterceptor = () => {
uni.setStorageSync('develop_before_path', launch.path);
redirect({ url: '/pages/index/develop', mode: 'reLaunch' })
}
- }
+ } else {
+ // 设置网站标题
+ setDocumentTitle(launch.path)
+ }
// #endif
// 加载语言包