宠物商城首页返回,微信小程序编译通过
This commit is contained in:
parent
76a3b19a06
commit
86752408b8
@ -715,24 +715,6 @@ export default defineUniPages({
|
|||||||
pagePath: 'pages/my/index',
|
pagePath: 'pages/my/index',
|
||||||
text: '我的 ',
|
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,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
@ -1014,24 +1014,6 @@
|
|||||||
"selectedIconPath": "static/tabbar/myL.png",
|
"selectedIconPath": "static/tabbar/myL.png",
|
||||||
"pagePath": "pages/my/index",
|
"pagePath": "pages/my/index",
|
||||||
"text": "我的 "
|
"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
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
<TopBar />
|
<TopBar />
|
||||||
<image
|
<image
|
||||||
class="absolute w-full h-full"
|
class="absolute w-full h-full"
|
||||||
:src="'@/static/certification/certification_bg.png'"
|
:src="'/static/certification/certification_bg.png'"
|
||||||
mode="aspectFill"
|
mode="aspectFill"
|
||||||
></image>
|
></image>
|
||||||
<view class="flex justify-center items-center h-screen bg-gray-100 pt-10">
|
<view class="flex justify-center items-center h-screen bg-gray-100 pt-10">
|
||||||
|
@ -55,7 +55,7 @@ import { reactive } from 'vue'
|
|||||||
import _ from 'lodash-es'
|
import _ from 'lodash-es'
|
||||||
import dayjs from 'dayjs'
|
import dayjs from 'dayjs'
|
||||||
import BrokerageApi from '@/sheep/api/trade/brokerage'
|
import BrokerageApi from '@/sheep/api/trade/brokerage'
|
||||||
import { fen2yuan } from '../../../sheep/hooks/useGoods'
|
import { fen2yuan } from '@/sheep/hooks/useGoods'
|
||||||
|
|
||||||
const state = reactive({
|
const state = reactive({
|
||||||
loadStatus: '',
|
loadStatus: '',
|
||||||
|
@ -63,7 +63,7 @@ import _ from 'lodash-es'
|
|||||||
import { showShareModal } from '@/sheep/hooks/useModal'
|
import { showShareModal } from '@/sheep/hooks/useModal'
|
||||||
import SpuApi from '@/sheep/api/product/spu'
|
import SpuApi from '@/sheep/api/product/spu'
|
||||||
import BrokerageApi from '@/sheep/api/trade/brokerage'
|
import BrokerageApi from '@/sheep/api/trade/brokerage'
|
||||||
import { fen2yuan } from '../../sheep/hooks/useGoods'
|
import { fen2yuan } from '@/sheep/hooks/useGoods'
|
||||||
|
|
||||||
const state = reactive({
|
const state = reactive({
|
||||||
pagination: {
|
pagination: {
|
||||||
|
@ -77,7 +77,7 @@ import _ from 'lodash-es'
|
|||||||
|
|
||||||
import { resetPagination } from '@/sheep/util'
|
import { resetPagination } from '@/sheep/util'
|
||||||
import BrokerageApi from '@/sheep/api/trade/brokerage'
|
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 statusBarHeight = sheep.$platform.device.statusBarHeight * 2
|
||||||
const headerBg = sheep.$url.css('/static/img/shop/user/withdraw_bg.png')
|
const headerBg = sheep.$url.css('/static/img/shop/user/withdraw_bg.png')
|
||||||
|
@ -58,7 +58,7 @@ import { onLoad, onReachBottom } from '@dcloudio/uni-app'
|
|||||||
import _ from 'lodash-es'
|
import _ from 'lodash-es'
|
||||||
import PayWalletApi from '@/sheep/api/pay/wallet'
|
import PayWalletApi from '@/sheep/api/pay/wallet'
|
||||||
import sheep from '@/sheep'
|
import sheep from '@/sheep'
|
||||||
import { fen2yuan } from '../../sheep/hooks/useGoods'
|
import { fen2yuan } from '@/sheep/hooks/useGoods'
|
||||||
|
|
||||||
const state = reactive({
|
const state = reactive({
|
||||||
pagination: {
|
pagination: {
|
||||||
|
@ -54,7 +54,7 @@ import {
|
|||||||
import uploadImage from './upload-image.vue'
|
import uploadImage from './upload-image.vue'
|
||||||
import uploadFile from './upload-file.vue'
|
import uploadFile from './upload-file.vue'
|
||||||
import sheep from '@/sheep'
|
import sheep from '@/sheep'
|
||||||
const fileInput = null
|
let fileInput = null
|
||||||
/**
|
/**
|
||||||
* FilePicker 文件选择上传
|
* FilePicker 文件选择上传
|
||||||
* @description 文件选择上传组件,可以选择图片、视频等任意文件并上传到当前绑定的服务空间
|
* @description 文件选择上传组件,可以选择图片、视频等任意文件并上传到当前绑定的服务空间
|
||||||
@ -224,7 +224,7 @@ export default {
|
|||||||
return 'object'
|
return 'object'
|
||||||
},
|
},
|
||||||
filesList() {
|
filesList() {
|
||||||
const files = []
|
let files = []
|
||||||
this.files.forEach((v) => {
|
this.files.forEach((v) => {
|
||||||
files.push(v)
|
files.push(v)
|
||||||
})
|
})
|
||||||
@ -284,7 +284,7 @@ export default {
|
|||||||
* 公开用户使用,继续上传
|
* 公开用户使用,继续上传
|
||||||
*/
|
*/
|
||||||
upload() {
|
upload() {
|
||||||
const files = []
|
let files = []
|
||||||
this.files.forEach((v, index) => {
|
this.files.forEach((v, index) => {
|
||||||
if (v.status === 'ready' || v.status === 'error') {
|
if (v.status === 'ready' || v.status === 'error') {
|
||||||
files.push(Object.assign({}, v))
|
files.push(Object.assign({}, v))
|
||||||
@ -317,7 +317,7 @@ export default {
|
|||||||
} else {
|
} else {
|
||||||
if (!newVal) newVal = []
|
if (!newVal) newVal = []
|
||||||
for (let i = 0; i < newVal.length; i++) {
|
for (let i = 0; i < newVal.length; i++) {
|
||||||
const v = newVal[i]
|
let v = newVal[i]
|
||||||
await newData(v)
|
await newData(v)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -326,7 +326,7 @@ export default {
|
|||||||
this.is_reset = false
|
this.is_reset = false
|
||||||
this.formItem.setValue(this.localValue)
|
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)
|
this.files = [].concat(filesData)
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -396,11 +396,11 @@ export default {
|
|||||||
files = res.tempFiles
|
files = res.tempFiles
|
||||||
}
|
}
|
||||||
|
|
||||||
const currentData = []
|
let currentData = []
|
||||||
for (let i = 0; i < files.length; i++) {
|
for (let i = 0; i < files.length; i++) {
|
||||||
if (this.limitLength - this.files.length <= 0) break
|
if (this.limitLength - this.files.length <= 0) break
|
||||||
files[i].uuid = Date.now()
|
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.progress = 0
|
||||||
filedata.status = 'ready'
|
filedata.status = 'ready'
|
||||||
this.files.push(filedata)
|
this.files.push(filedata)
|
||||||
@ -443,10 +443,10 @@ export default {
|
|||||||
* 成功或失败
|
* 成功或失败
|
||||||
*/
|
*/
|
||||||
async setSuccessAndError(res, fn) {
|
async setSuccessAndError(res, fn) {
|
||||||
const successData = []
|
let successData = []
|
||||||
const errorData = []
|
let errorData = []
|
||||||
const tempFilePath = []
|
let tempFilePath = []
|
||||||
const errorTempFilePath = []
|
let errorTempFilePath = []
|
||||||
for (let i = 0; i < res.length; i++) {
|
for (let i = 0; i < res.length; i++) {
|
||||||
const item = res[i]
|
const item = res[i]
|
||||||
const index = item.uuid ? this.files.findIndex((p) => p.uuid === item.uuid) : item.index
|
const index = item.uuid ? this.files.findIndex((p) => p.uuid === item.uuid) : item.index
|
||||||
@ -554,7 +554,7 @@ export default {
|
|||||||
let updateUrl = []
|
let updateUrl = []
|
||||||
if (this.returnType === 'object') {
|
if (this.returnType === 'object') {
|
||||||
data = this.backObject(this.files)[0]
|
data = this.backObject(this.files)[0]
|
||||||
this.localValue = data || null
|
this.localValue = data ? data : null
|
||||||
updateUrl = data ? data.url : ''
|
updateUrl = data ? data.url : ''
|
||||||
} else {
|
} else {
|
||||||
data = this.backObject(this.files)
|
data = this.backObject(this.files)
|
||||||
@ -577,7 +577,7 @@ export default {
|
|||||||
* @param {Object} files
|
* @param {Object} files
|
||||||
*/
|
*/
|
||||||
backObject(files) {
|
backObject(files) {
|
||||||
const newFilesData = []
|
let newFilesData = []
|
||||||
files.forEach((v) => {
|
files.forEach((v) => {
|
||||||
newFilesData.push({
|
newFilesData.push({
|
||||||
extname: v.extname,
|
extname: v.extname,
|
||||||
@ -619,22 +619,22 @@ export default {
|
|||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
@import '@/scss/index.scss';
|
@import '@/scss/index.scss';
|
||||||
.uni-file-picker {
|
.uni-file-picker {
|
||||||
|
/* #ifndef APP-NVUE */
|
||||||
|
box-sizing: border-box;
|
||||||
|
overflow: hidden;
|
||||||
/* width: 100%; */
|
/* width: 100%; */
|
||||||
/* #endif */
|
/* #endif */
|
||||||
/* flex: 1; */
|
/* flex: 1; */
|
||||||
position: relative;
|
position: relative;
|
||||||
/* #ifndef APP-NVUE */
|
|
||||||
box-sizing: border-box;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.uni-file-picker__header {
|
.uni-file-picker__header {
|
||||||
|
padding-top: 5px;
|
||||||
|
padding-bottom: 10px;
|
||||||
/* #ifndef APP-NVUE */
|
/* #ifndef APP-NVUE */
|
||||||
display: flex;
|
display: flex;
|
||||||
/* #endif */
|
/* #endif */
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
padding-top: 5px;
|
|
||||||
padding-bottom: 10px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.file-title {
|
.file-title {
|
||||||
@ -660,17 +660,17 @@ export default {
|
|||||||
}
|
}
|
||||||
.file-subtitle {
|
.file-subtitle {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
bottom: 0;
|
|
||||||
left: 50%;
|
left: 50%;
|
||||||
|
transform: translateX(-50%);
|
||||||
|
bottom: 0;
|
||||||
|
width: 140rpx;
|
||||||
|
height: 36rpx;
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
width: 140rpx;
|
|
||||||
height: 36rpx;
|
|
||||||
font-size: 24rpx;
|
|
||||||
font-weight: 500;
|
|
||||||
color: #fff;
|
color: #fff;
|
||||||
|
font-weight: 500;
|
||||||
background: rgba(#000, 0.3);
|
background: rgba(#000, 0.3);
|
||||||
transform: translateX(-50%);
|
font-size: 24rpx;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
2
acdr-ui/src/types/uni-pages.d.ts
vendored
2
acdr-ui/src/types/uni-pages.d.ts
vendored
@ -104,7 +104,7 @@ interface NavigateToOptions {
|
|||||||
interface RedirectToOptions extends NavigateToOptions {}
|
interface RedirectToOptions extends NavigateToOptions {}
|
||||||
|
|
||||||
interface SwitchTabOptions {
|
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;
|
type ReLaunchOptions = NavigateToOptions | SwitchTabOptions;
|
||||||
|
Loading…
Reference in New Issue
Block a user