From 86752408b8f9447a0efaa9b25a3677e6b00c3792 Mon Sep 17 00:00:00 2001 From: aiShuiJiaoDeXioShou <2832294398@qq.com> Date: Mon, 9 Sep 2024 09:02:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A0=E7=89=A9=E5=95=86=E5=9F=8E=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E8=BF=94=E5=9B=9E=EF=BC=8C=E5=BE=AE=E4=BF=A1=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=BC=96=E8=AF=91=E9=80=9A=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- acdr-ui/pages.config.ts | 18 ------- acdr-ui/src/pages.json | 18 ------- acdr-ui/src/pages/certification/index.vue | 2 +- .../commission/components/commission-log.vue | 2 +- acdr-ui/src/pages/mall/commission/goods.vue | 2 +- acdr-ui/src/pages/mall/commission/order.vue | 2 +- acdr-ui/src/pages/mall/pay/recharge-log.vue | 2 +- .../components/s-uploader/s-uploader.vue | 50 +++++++++---------- acdr-ui/src/types/uni-pages.d.ts | 2 +- 9 files changed, 31 insertions(+), 67 deletions(-) diff --git a/acdr-ui/pages.config.ts b/acdr-ui/pages.config.ts index a560307c..a1cdefbb 100644 --- a/acdr-ui/pages.config.ts +++ b/acdr-ui/pages.config.ts @@ -715,24 +715,6 @@ export default defineUniPages({ pagePath: 'pages/my/index', text: '我的 ', }, - { - pagePath: 'pages/mall/index/index', - style: { - hideTabBar: true, - }, - }, - { - pagePath: 'pages/mall/index/cart', - style: { - hideTabBar: true, - }, - }, - { - pagePath: 'pages/mall/index/user', - style: { - hideTabBar: true, - }, - }, ], }, }) diff --git a/acdr-ui/src/pages.json b/acdr-ui/src/pages.json index 85e3eadc..5cc05c5c 100644 --- a/acdr-ui/src/pages.json +++ b/acdr-ui/src/pages.json @@ -1014,24 +1014,6 @@ "selectedIconPath": "static/tabbar/myL.png", "pagePath": "pages/my/index", "text": "我的 " - }, - { - "pagePath": "pages/mall/index/index", - "style": { - "hideTabBar": true - } - }, - { - "pagePath": "pages/mall/index/cart", - "style": { - "hideTabBar": true - } - }, - { - "pagePath": "pages/mall/index/user", - "style": { - "hideTabBar": true - } } ] } diff --git a/acdr-ui/src/pages/certification/index.vue b/acdr-ui/src/pages/certification/index.vue index f23c409b..3ecb62e3 100644 --- a/acdr-ui/src/pages/certification/index.vue +++ b/acdr-ui/src/pages/certification/index.vue @@ -13,7 +13,7 @@ diff --git a/acdr-ui/src/pages/mall/commission/components/commission-log.vue b/acdr-ui/src/pages/mall/commission/components/commission-log.vue index 796933c1..c104bf09 100644 --- a/acdr-ui/src/pages/mall/commission/components/commission-log.vue +++ b/acdr-ui/src/pages/mall/commission/components/commission-log.vue @@ -55,7 +55,7 @@ import { reactive } from 'vue' import _ from 'lodash-es' import dayjs from 'dayjs' import BrokerageApi from '@/sheep/api/trade/brokerage' -import { fen2yuan } from '../../../sheep/hooks/useGoods' +import { fen2yuan } from '@/sheep/hooks/useGoods' const state = reactive({ loadStatus: '', diff --git a/acdr-ui/src/pages/mall/commission/goods.vue b/acdr-ui/src/pages/mall/commission/goods.vue index d222023a..6630d00d 100644 --- a/acdr-ui/src/pages/mall/commission/goods.vue +++ b/acdr-ui/src/pages/mall/commission/goods.vue @@ -63,7 +63,7 @@ import _ from 'lodash-es' import { showShareModal } from '@/sheep/hooks/useModal' import SpuApi from '@/sheep/api/product/spu' import BrokerageApi from '@/sheep/api/trade/brokerage' -import { fen2yuan } from '../../sheep/hooks/useGoods' +import { fen2yuan } from '@/sheep/hooks/useGoods' const state = reactive({ pagination: { diff --git a/acdr-ui/src/pages/mall/commission/order.vue b/acdr-ui/src/pages/mall/commission/order.vue index beff4d04..3a21548f 100644 --- a/acdr-ui/src/pages/mall/commission/order.vue +++ b/acdr-ui/src/pages/mall/commission/order.vue @@ -77,7 +77,7 @@ import _ from 'lodash-es' import { resetPagination } from '@/sheep/util' import BrokerageApi from '@/sheep/api/trade/brokerage' -import { fen2yuan } from '../../sheep/hooks/useGoods' +import { fen2yuan } from '@/sheep/hooks/useGoods' const statusBarHeight = sheep.$platform.device.statusBarHeight * 2 const headerBg = sheep.$url.css('/static/img/shop/user/withdraw_bg.png') diff --git a/acdr-ui/src/pages/mall/pay/recharge-log.vue b/acdr-ui/src/pages/mall/pay/recharge-log.vue index 5847fa48..7de4c812 100644 --- a/acdr-ui/src/pages/mall/pay/recharge-log.vue +++ b/acdr-ui/src/pages/mall/pay/recharge-log.vue @@ -58,7 +58,7 @@ import { onLoad, onReachBottom } from '@dcloudio/uni-app' import _ from 'lodash-es' import PayWalletApi from '@/sheep/api/pay/wallet' import sheep from '@/sheep' -import { fen2yuan } from '../../sheep/hooks/useGoods' +import { fen2yuan } from '@/sheep/hooks/useGoods' const state = reactive({ pagination: { diff --git a/acdr-ui/src/sheep/components/s-uploader/s-uploader.vue b/acdr-ui/src/sheep/components/s-uploader/s-uploader.vue index 41ff6c30..ba5b2b2a 100644 --- a/acdr-ui/src/sheep/components/s-uploader/s-uploader.vue +++ b/acdr-ui/src/sheep/components/s-uploader/s-uploader.vue @@ -54,7 +54,7 @@ import { import uploadImage from './upload-image.vue' import uploadFile from './upload-file.vue' import sheep from '@/sheep' -const fileInput = null +let fileInput = null /** * FilePicker 文件选择上传 * @description 文件选择上传组件，可以选择图片、视频等任意文件并上传到当前绑定的服务空间 @@ -224,7 +224,7 @@ export default { return 'object' }, filesList() { - const files = [] + let files = [] this.files.forEach((v) => { files.push(v) }) @@ -284,7 +284,7 @@ export default { * 公开用户使用，继续上传 */ upload() { - const files = [] + let files = [] this.files.forEach((v, index) => { if (v.status === 'ready' || v.status === 'error') { files.push(Object.assign({}, v)) @@ -317,7 +317,7 @@ export default { } else { if (!newVal) newVal = [] for (let i = 0; i < newVal.length; i++) { - const v = newVal[i] + let v = newVal[i] await newData(v) } } @@ -326,7 +326,7 @@ export default { this.is_reset = false this.formItem.setValue(this.localValue) } - const filesData = Object.keys(newVal).length > 0 ? newVal : [] + let filesData = Object.keys(newVal).length > 0 ? newVal : [] this.files = [].concat(filesData) }, @@ -362,7 +362,7 @@ export default { sizeType: this.sizeType, // TODO 如果为空，video 有问题 extension: _extname.length > 0 ? _extname : undefined, - count: this.limitLength - this.files.length, // 默认9 + count: this.limitLength - this.files.length, //默认9 onChooseFile: this.chooseFileCallback, onUploadProgress: (progressEvent) => { this.setProgress(progressEvent, progressEvent.index) @@ -396,11 +396,11 @@ export default { files = res.tempFiles } - const currentData = [] + let currentData = [] for (let i = 0; i < files.length; i++) { if (this.limitLength - this.files.length <= 0) break files[i].uuid = Date.now() - const filedata = await get_file_data(files[i], this.fileMediatype) + let filedata = await get_file_data(files[i], this.fileMediatype) filedata.progress = 0 filedata.status = 'ready' this.files.push(filedata) @@ -443,10 +443,10 @@ export default { * 成功或失败 */ async setSuccessAndError(res, fn) { - const successData = [] - const errorData = [] - const tempFilePath = [] - const errorTempFilePath = [] + let successData = [] + let errorData = [] + let tempFilePath = [] + let errorTempFilePath = [] for (let i = 0; i < res.length; i++) { const item = res[i] const index = item.uuid ? this.files.findIndex((p) => p.uuid === item.uuid) : item.index @@ -554,7 +554,7 @@ export default { let updateUrl = [] if (this.returnType === 'object') { data = this.backObject(this.files)[0] - this.localValue = data || null + this.localValue = data ? data : null updateUrl = data ? data.url : '' } else { data = this.backObject(this.files) @@ -577,7 +577,7 @@ export default { * @param {Object} files */ backObject(files) { - const newFilesData = [] + let newFilesData = [] files.forEach((v) => { newFilesData.push({ extname: v.extname, @@ -619,22 +619,22 @@ export default { diff --git a/acdr-ui/src/types/uni-pages.d.ts b/acdr-ui/src/types/uni-pages.d.ts index b7864a10..d9cb2619 100644 --- a/acdr-ui/src/types/uni-pages.d.ts +++ b/acdr-ui/src/types/uni-pages.d.ts @@ -104,7 +104,7 @@ interface NavigateToOptions { interface RedirectToOptions extends NavigateToOptions {} interface SwitchTabOptions { - url: "/pages/index/index" | "/pages/space/index" | "/pages/push/index" | "/pages/message/index" | "/pages/my/index" | "/pages/mall/index/index" | "/pages/mall/index/cart" | "/pages/mall/index/user" + url: "/pages/index/index" | "/pages/space/index" | "/pages/push/index" | "/pages/message/index" | "/pages/my/index" } type ReLaunchOptions = NavigateToOptions | SwitchTabOptions;