gukai
/
mobile-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upda

Browse Source
pull/2/head
张宇 2 years ago
parent 7d6f464545
commit e328d30ad7
32 changed files with 866 additions and 152 deletions
Show Stats Download Patch File Download Diff File

10
api/modules/system.js
Unescape Escape View File

@ -11,4 +11,14 @@ export default {
}); });
}, },
resourcesList(data) {
return request({
url: "/admin/system/resourcesList",
method: "POST",
data,
});
},
}; };

19
api/store/goods.js
Unescape Escape View File

@ -38,4 +38,23 @@ export default {
}); });
}, },
goodsItem(data) {
return request({
url: "/admin/goods/goodsItem",
method: "POST",
data,
});
},
goodsEdit(data) {
return request({
url: "/admin/goods/goodsEdit",
method: "POST",
data,
});
},
}; };

BIN
assets/images/folder.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
assets/images/iphonex-modal.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 37 KiB

BIN
assets/images/video.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 875 B

2
components/kevy-loading/kevy-loading.vue
Unescape Escape View File

@ -252,7 +252,7 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.t-content { .t-content {
position: fixed; position: absolute;
z-index: 999999; z-index: 999999;
top: 0; top: 0;
bottom: 0; bottom: 0;

189
components/myUpload/index copy.vue
Unescape Escape View File

@ -0,0 +1,189 @@
<template>
<view class="" style="z-index: 999;">
<wd-popup v-model="show" closable position="left" custom-style="width: 86vw;" @close="handleClose">
<div class="pop myUpload">
<div class="bg-white overflow-hidden h-full" style="background-clip: content-box;">
<view class="bg-gray-100 p-4 flex">
<view class="mr-4">
<wd-button @tap="chooseFile">上传文件</wd-button>
</view>
<view>
<wd-button @tap="chooseFile">确认选择</wd-button>
</view>
</view>
<div v-if="LArr.length" class="shadow-lg ">
<div class="text px-2 mt-3 font-bold">已选择 ({{ LArr.length }} 张)</div>
<div class="bg-gray images flex gap-2 overflow-x-auto p-4 pt-2 ">
<view @click="onClickCheck({ url: img })" class=" border-gray-100 border-solid flex rounded-[14px] relative"
v-for="img of LArr">
<wd-img mode="aspectFill" radius="10" :width="100" :height="100" :src="img" />
<view class="absolute bg-white opacity-80 inset-0 flex items-center justify-center border-spacing-1">取消选择
</view>
</view>
</div>
</div>
<div v-else class="shadow-lg ">
<div class="text p-3 font-bold">可选择 ({{ LArr.length }} 张)</div>
</div>
<view class="overflow-hidden rounded-t-3xl">
<myList ref="myListRef" :apiObj="system.resourcesList" :params="{ ...params, classify_id }">
<template #default="{ list }">
<view class="grid grid-cols-2 gap-4 p-4 overflow-hidden rounded-t-3xl">
<view
class="relative flex flex-col items-center justify-center bg-gray-100 p-4 rounded-md overflow-hidden"
v-for="item of list" v-show="item.type === 1">
<div class="list-item-img" @click="onClickCheck(item)" v-if="item.type === 1"
:style="{ backgroundImage: 'url(' + item.url + ')' }"></div>
<div class="list-item-img" @dblclick="onClickDir(item)" v-if="item.type === 3"
:style="{ backgroundImage: 'url(' + folderPng + ')' }"></div>
<div class="list-item-name">{{ item.name }}</div>
<view @click="onClickCheck(item)"
class="absolute bg-white opacity-80 inset-2 flex items-center justify-center border-spacing-1"
v-if="LArr.includes(item.url)">取消选择</view>
</view>
</view>
</template>
</myList>
</view>
</div>
</div>
</wd-popup>
</view>
</template>
<script setup>
import { ref } from 'vue'
import system from '@/api/modules/system.js'
import myList from "/components/myList/index.vue"
import folderPng from '@/assets/images/folder.png'
import { uploadImage } from '@/utils/request';
const myListRef = ref(null)
const formData = ref({
parent_id: 0,
type: "image",
})
const chooseFile = async () => {
uni.chooseImage({
count: 1, // 默认9
sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
sourceType: ['album'], // 从相册选择
success: async (res) => {
try {
if (!res.tempFilePaths || !res.tempFilePaths.length) {
throw new Error('未选择文件或文件路径无效。');
}
const filePath = res.tempFilePaths[0];
const result = await uploadImage({ filePath, formData: formData.value, name: "image" })
console.log('成功上传图片：', result);
myListRef.value.upData()
// 根据需要处理结果
} catch (error) {
console.error('选择文件或上传图片时出错：', error.message);
// 处理错误
}
}
});
}
const emit = defineEmits(['update:modelValue']);
const props = defineProps({
modelValue: {
type: String,
default: ""
},
size: {
type: Number,
default: 1
},
})
const LArr = ref([])
const onClickCheck = (row) => {
const index = LArr.value.findIndex(item => item === row.url)
if (index > -1) {
LArr.value.splice(index, 1)
} else {
if (props.size > LArr.value.length) {
LArr.value.unshift(row.url)
} else {
uni.showToast({
title: `已选择 ${LArr.value.length} 张`,
icon: 'none'
})
console.log(`已选择 ${LArr.value.length} 张`);
}
}
}
const show = ref(true)
// if (Array.isArray(props.modelValue)) {
// } else {
// }
// defineExpose({
// upData
// })
</script>
<style lang="scss">
.list-item-img {
width: 100%;
height: 80px;
background-position: center center;
background-size: contain;
background-repeat: no-repeat;
}
.list-item-name {
text-align: center;
padding: 5px 10px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-size: 12px;
width: 100%;
}
.pop {
// position: fixed;
background: rgba(0, 0, 0, 0.256);
background-clip: border-box;
z-index: 9;
overflow: hidden;
inset: 0px;
}
</style>

216
components/myUpload/index.vue
Unescape Escape View File

@ -0,0 +1,216 @@
<template>
<view>
<view v-if="props.modelValue.length" @click="open(true)" class="flex gap-2 overflow-x-auto">
<view class=" border-gray-100 border-solid flex rounded-[14px] relative"
v-for="img of (Array.isArray(props.modelValue) ? props.modelValue : [props.modelValue])" :key="img">
<wd-img mode="aspectFill" radius="10" :width="100" :height="100" :src="img" />
</view>
</view>
<view v-else @click="open(true)" class="flex gap-2 overflow-x-auto">
<view style="width: 100px;height: 100px;"
class=" border-gray-100 border-solid flex rounded-[14px] relative flex-col items-center justify-center">
<wd-icon name="image" size="28px"></wd-icon>
<view class="mt-2 font-bold text-[12px]">请选择</view>
</view>
</view>
<wd-popup :z-index="998" v-model="show" closable position="left" custom-style="width: 86vw;" @close="close(false)">
<view class="pop myUpload">
<view class="bg-white overflow-hidden h-full" style="background-clip: content-box;">
<view class="bg-gray-100 p-4 flex">
<view class="mr-4">
<wd-button type="warning" @tap="chooseFile">上传文件</wd-button>
</view>
<view>
<wd-button @tap="ok">确认选择</wd-button>
</view>
</view>
<view v-if="LArr.length" class="shadow-lg ">
<view class="text px-2 mt-3 font-bold">已选择 ({{ LArr.length }} 张)</view>
<view class="bg-gray images flex gap-2 overflow-x-auto p-4 pt-2 ">
<view @click="onClickCheck({ url: img })" class=" border-gray-100 border-solid flex rounded-[14px] relative"
v-for="img of LArr" :key="img">
<wd-img mode="aspectFill" radius="10" :width="100" :height="100" :src="img" />
<view class="absolute bg-white opacity-80 inset-0 flex items-center justify-center border-spacing-1">取消选择
</view>
</view>
</view>
</view>
<view v-else class="shadow-lg ">
<view class="text p-3 font-bold">可选择 ({{ size }} 张)</view>
</view>
<view class="overflow-hidden rounded-t-3xl">
<myList ref="myListRef" :apiObj="system.resourcesList">
<template #default="{ list }">
<view class="grid grid-cols-2 gap-4 p-4 overflow-hidden rounded-t-3xl">
<view
class="relative flex flex-col items-center justify-center bg-gray-100 p-4 rounded-md overflow-hidden"
v-for="item of list" :key="item.id" v-show="item.type === 1">
<view class="list-item-img" @click="onClickCheck(item)" v-if="item.type === 1"
:style="{ backgroundImage: 'url(' + item.url + ')' }"></view>
<view class="list-item-img" @dblclick="onClickDir(item)" v-if="item.type === 3"
:style="{ backgroundImage: 'url(' + folderPng + ')' }"></view>
<view class="list-item-name">{{ item.name }}</view>
<view @click="onClickCheck(item)"
class="absolute bg-white opacity-80 inset-2 flex items-center justify-center border-spacing-1"
v-if="LArr.includes(item.url)">取消选择</view>
</view>
</view>
</template>
</myList>
</view>
</view>
</view>
</wd-popup>
</view>
</template>
<script setup>
import { ref, computed } from 'vue'
import system from '@/api/modules/system.js'
import myList from "/components/myList/index.vue"
import folderPng from '@/assets/images/folder.png'
import { uploadImage } from '@/utils/request';
const myListRef = ref(null)
const formData = ref({
parent_id: 0,
type: "image",
})
const chooseFile = async () => {
uni.chooseImage({
count: 1, // 默认9
sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
sourceType: ['album'], // 从相册选择
success: async (res) => {
try {
if (!res.tempFilePaths || !res.tempFilePaths.length) {
throw new Error('未选择文件或文件路径无效。');
}
const filePath = res.tempFilePaths[0];
const result = await uploadImage({ filePath, formData: formData.value, name: "image" })
console.log('成功上传图片：', result);
myListRef.value.upData()
// 根据需要处理结果
} catch (error) {
console.error('选择文件或上传图片时出错：', error.message);
// 处理错误
}
}
});
}
const emit = defineEmits(['update:modelValue']);
const props = defineProps({
modelValue: {
type: String,
default: ""
},
size: {
type: Number,
default: 1
},
})
const LArr = ref([])
const show = ref(false)
const open = (O) => {
show.value = O
if (O) {
myListRef.value.upData()
}
if (props.modelValue) {
if (Array.isArray(props.modelValue)) {
LArr.value = JSON.parse(JSON.stringify(props.modelValue))
} else {
LArr.value = [props.modelValue]
}
}
}
open(false)
const close = () => {
// LArr.value = []
}
const ok = () => {
if (props.size == 1) {
emit("update:modelValue", LArr.value.pop())
} else {
emit("update:modelValue", LArr.value)
}
show.value = false
}
const onClickCheck = (row) => {
const index = LArr.value.findIndex(item => item === row.url)
if (index > -1) {
LArr.value.splice(index, 1)
} else {
if (props.size > LArr.value.length) {
LArr.value.unshift(row.url)
} else {
uni.showToast({
title: `已选择 ${LArr.value.length} 张`,
icon: 'none'
})
console.log(`已选择 ${LArr.value.length} 张`);
}
}
}
</script>
<style lang="scss">
.list-item-img {
width: 100%;
height: 80px;
background-position: center center;
background-size: contain;
background-repeat: no-repeat;
}
.list-item-name {
text-align: center;
padding: 5px 10px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-size: 12px;
width: 100%;
}
.pop {
// position: fixed;
background: rgba(0, 0, 0, 0.256);
background-clip: border-box;
overflow: hidden;
inset: 0px;
}
</style>

6
pages/index/index.vue
Unescape Escape View File

@ -1,10 +1,5 @@
<template> <template>
<view class="content"> <view class="content">
<wd-button>主要按钮</wd-button>
<wd-button type="success">成功按钮</wd-button>
<wd-button type="info">信息按钮</wd-button>
<wd-button type="warning">警告按钮</wd-button>
<wd-button type="error">危险按钮</wd-button>
</view> </view>
</template> </template>
@ -21,7 +16,6 @@ if (token) {
utils.toUrl("/pages/login/index") utils.toUrl("/pages/login/index")
} }
</script> </script>
<style> <style>

26
pages/login/index.vue
Unescape Escape View File

@ -27,6 +27,16 @@ const model = ref({
const loading = ref(false) const loading = ref(false)
const form = ref(null) const form = ref(null)
// if (token) {
// const user_info = uni.getStorageSync("user_info");
// if (user_info.type == 1) {
// utils.toUrl("/store/index/index")
// }
// } else {
// utils.toUrl("/pages/login/index")
// }
function handleSubmit() { function handleSubmit() {
loading.value = true loading.value = true
form.value form.value
@ -47,17 +57,25 @@ function handleSubmit() {
title: "登录成功", title: "登录成功",
}); });
console.log(res.data.user_info);
if (res.data.user_info.type == 1) { if (res.data.user_info.type == 1) {
utils.toUrl("/store/index/index") utils.toUrl("/store/index/index")
} else {
uni.showToast({
title: '登录平台开发中 ···',
icon: 'none'
})
} }
loading.value = false
} else {
uni.showToast({
title: res.message,
icon: 'none'
})
loading.value = false
} }
loading.value = false loading.value = false
}) })
} }
}) })
.catch((error) => { .catch((error) => {

58
store/goods/components/skuEdit.vue
Unescape Escape View File

@ -1,7 +1,9 @@
<template> <template>
<view class="skuEdit"> <view class="skuEdit">
<wd-table rowHeight="100" :data="Pdata.use_sku == 0
<wd-table :data="skuLibrary" :stripe="false"> ? skuDefault
: skuLibrary
" :stripe="false">
<wd-table-col prop="name" label="SKU"> <wd-table-col prop="name" label="SKU">
<template #value="scope"> <template #value="scope">
@ -45,9 +47,20 @@
</view> </view>
</template> </template>
</wd-table-col> </wd-table-col>
<wd-table-col prop="major" label="产品图">
<template #value="scope">
<view class="overflow-hidden w-full h-full flex items-center justify-center">
<view class="px-2 pb-1 bg-white flex items-center justify-center mt-4 overflow-hidden">
<myUpload v-model="scope.row.pic_url"></myUpload>
</view>
</view>
</template>
</wd-table-col>
</wd-table> </wd-table>
<view class="bg-gray-100 rounded mb-2"> <view v-show="Pdata.use_sku == 1" class="bg-gray-100 rounded mb-2">
<div class="p-2 bg-white w-full"> <div class="p-2 bg-white w-full">
<div class="name mb-2 text-xs">规格设置</div> <div class="name mb-2 text-xs">规格设置</div>
<view class="flex bg-white px-3 py-1 rounded w-full"> <view class="flex bg-white px-3 py-1 rounded w-full">
@ -58,7 +71,6 @@
</view> </view>
</div> </div>
<div class="p-2 bg-white"> <div class="p-2 bg-white">
<div style="display: flex; flex-flow: column; align-items: flex-start;"> <div style="display: flex; flex-flow: column; align-items: flex-start;">
<div class="name mb-2 text-xs">规格组</div> <div class="name mb-2 text-xs">规格组</div>
@ -89,17 +101,26 @@
</view> </view>
<wd-toast />
</view> </view>
</template> </template>
<script> <script>
import myUpload from "@/components/myUpload/index.vue"
import { useToast } from '@/uni_modules/wot-design-uni' import { useToast } from '@/uni_modules/wot-design-uni'
const toast = useToast() const toast = useToast()
export default { export default {
name: "skuEdit", name: "skuEdit",
props: {
Pdata: {
type: Object,
default: () => ({})
},
},
components: {
myUpload
},
data() { data() {
return { return {
// sku规格开始 // sku规格开始
@ -128,7 +149,16 @@ export default {
// sku规格结束 // sku规格结束
} }
}, },
created() {
this.skuDefault = this.Pdata.skuDefault.length ? this.Pdata.skuDefault : this.skuDefault
this.skuLibrary = this.Pdata.skuLibrary
this.skuGroup = this.Pdata.skuGroup
},
methods: { methods: {
successImage($event, index) {
console.log($event, index);
},
/** /**
* 处理规格数据 * 处理规格数据
*/ */
@ -217,6 +247,15 @@ export default {
}, },
// 添加规格组 // 添加规格组
addSkuGroup() { addSkuGroup() {
if (!this.addGroupData.name) {
uni.showToast({
title: '请填写规格组名称',
icon: 'none'
})
return
}
// 添加一个一个规格类 // 添加一个一个规格类
console.log("添加了一个规格组"); console.log("添加了一个规格组");
this.skuGroup.push(this.addGroupData); this.skuGroup.push(this.addGroupData);
@ -280,7 +319,14 @@ export default {
if (!this.addGouppItemData[index]) { if (!this.addGouppItemData[index]) {
toast.error('请填写规格名称!') if (!this.addGroupData.name) {
uni.showToast({
title: '请填写规格名称',
icon: 'none'
})
return
}
return return
} }

303
store/goods/edit.vue
Unescape Escape View File

@ -1,36 +1,53 @@
<template> <template>
<view class="content p-2 bg-gray-100"> <view v-if="load" class="content p-2 bg-gray-100">
<wd-toast />
<wd-form ref="form" :model="model"> <wd-form ref="form" :model="model">
<wd-cell-group border> <wd-cell-group border>
<div class="bg-gray-100"> <div class="bg-gray-100">
<div class="bg-gray-100 rounded mb-2"> <div class="bg-gray-100 rounded mb-2">
<div class="bg-white flex flex-col pt-3 pl-3"> <div class="bg-white flex flex-col pt-3 pl-3">
<div class="name mb-2 text-xs">缩略图</div> <div class="name mb-2 text-xs">缩略图</div>
<wd-upload :limit="1" :file-list="fileList" :action="action" :formData="formData" :header="header" <myUpload v-model="model.pic_url"></myUpload>
@success="successImage" name="image" :before-remove="beforeRemove"></wd-upload>
</div> </div>
</div> </div>
</div> </div>
<!-- <div class="bg-gray-100"> <div class="bg-gray-100">
<div class="bg-gray-100 rounded mb-2"> <div class="bg-gray-100 rounded mb-2">
<div class="bg-white flex flex-col pt-3 pl-3"> <div class="bg-white flex flex-col pt-3 pl-3">
<div class="name mb-2 text-xs">商品主图</div> <div class="name mb-2 text-xs">商品主图</div>
<wd-upload :file-list="fileList" :action="action" :formData="formData" :header="header" <myUpload v-model="model.pic_list" :size="4"></myUpload>
@change="handleChange" name="image"></wd-upload>
</div> </div>
</div> </div>
</div> --> </div>
<view class="h-2 bg-gray-100"></view> <view class="h-2 bg-gray-100"></view>
<view class=" p-3 rounded mb-2"> <view class=" p-3 rounded mb-2">
<div class="name mb-2 text-xs">商品名称</div> <div class="name mb-2 text-xs">商品名称</div>
<view class="bg-white px-3 py-1 rounded"> <view class="bg-white px-3 py-1 rounded">
<wd-textarea v-model="model.value" auto-height /> <wd-textarea v-model="model.name" auto-height />
</view>
</view>
<view class="h-2 bg-gray-100"></view>
<view class=" p-3 rounded mb-2">
<div class="name mb-2 text-xs">商品分类</div>
<view class="bg-white px-3 py-1 rounded">
<wd-checkbox-group v-model="model.classify_list">
<view class="flex overflow-auto flex-wrap">
<div class="grid grid-cols-3">
<wd-checkbox style="width: 100%;" shape="button" v-for="cat of classifyList"
:modelValue="JSON.stringify(cat.parentIds)">
{{ cat.name }}
</wd-checkbox>
</div>
</view>
</wd-checkbox-group>
</view> </view>
</view> </view>
@ -40,8 +57,7 @@
<div class="p-2 bg-white"> <div class="p-2 bg-white">
<div class="name mb-2 text-xs">服务内容</div> <div class="name mb-2 text-xs">服务内容</div>
<view class="bg-white px-3 py-1 rounded"> <view class="bg-white px-3 py-1 rounded">
<wd-input type="text" v-model="value" placeholder="例子: 正品保障,极速发货,7天退换货。多个请使用英文逗号“,”分隔" <wd-input type="text" v-model="model.server_project" placeholder="例子: 正品保障,极速发货,7天退换货。多个请使用英文逗号“,”分隔" />
@change="handleChange" />
</view> </view>
</div> </div>
</view> </view>
@ -51,11 +67,12 @@
<view class=" p-3 rounded mb-2"> <view class=" p-3 rounded mb-2">
<div class="name mb-2 text-xs">商品重量</div> <div class="name mb-2 text-xs">商品重量</div>
<view class="bg-white px-3 py-2 rounded flex items-center mb-4"> <view class="bg-white px-3 py-2 rounded flex items-center mb-4">
<wd-input-number v-model="value" @change="handleChange" /> <wd-input-number v-model="model.weight" />
<view class="text-xs from-neutral-300 ml-4">千克</view> <view class="text-xs from-neutral-300 ml-4">千克</view>
</view> </view>
<wd-picker class="w-full" :columns="freightRules" label="运费模板" v-model="model.freight_id" /> <wd-picker v-if="freightRules.length" class="w-full" :columns="freightRules" label="运费模板"
v-model="model.freight_id" />
</view> </view>
@ -63,18 +80,33 @@
<view class="p-3 rounded mb-2"> <view class="p-3 rounded mb-2">
<div class="name mb-2 text-xs">商品状态</div> <div class="name mb-2 text-xs">商品状态</div>
<view class="bg-white px-3 py-2 rounded flex items-center mb-4"> <view class="bg-white px-3 py-2 rounded flex items-center">
<wd-switch v-model="model.status" /> <wd-switch v-model="model.status" :active-value="1" :inactive-value="0" />
</view>
</view>
<view class="h-2 bg-gray-100"></view>
<view class="p-3 rounded mb-2">
<div class="name mb-2 text-xs">规格</div>
<view class="bg-white px-3 py-2 rounded flex items-center">
<wd-radio-group shape="button" v-model="model.use_sku">
<wd-radio :value="0">单规格</wd-radio>
<wd-radio :value="1">多规格</wd-radio>
</wd-radio-group>
</view> </view>
</view> </view>
<view class="h-2 bg-gray-100"></view> <view class="h-2 bg-gray-100"></view>
<skuEdit></skuEdit> <skuEdit ref="skuEditRef" :skuGroup="skuGroup"
:Pdata="{ skuDefault, skuLibrary, skuGroup, use_sku: model.use_sku }">
</skuEdit>
</wd-cell-group> </wd-cell-group>
<view class="footer mt-4"> <view class="footer mt-4">
<wd-button type="primary" size="large" block>保存</wd-button> <wd-button @click="saveGoods" type="primary" size="large" block>保存</wd-button>
</view> </view>
</wd-form> </wd-form>
</view> </view>
@ -82,10 +114,15 @@
<script setup> <script setup>
import { ref } from 'vue' import { ref } from 'vue'
import system from '@/api/modules/system.js'
import goods from '@/api/store/goods.js'
import { useToast, useMessage } from '@/uni_modules/wot-design-uni' import { useToast, useMessage } from '@/uni_modules/wot-design-uni'
import goods from '@/api/store/goods.js'
import system from '@/api/modules/system.js'
import skuEdit from "./components/skuEdit.vue" import skuEdit from "./components/skuEdit.vue"
import myUpload from "@/components/myUpload/index.vue"
import {
onLoad,
onShow
} from "@dcloudio/uni-app";
const fileList = ref([]) const fileList = ref([])
@ -94,34 +131,18 @@ const beforeRemove = ({ file, resolve, index }) => {
resolve(true) resolve(true)
} }
const action = 'https://saasdemo.byin.vip/admin/system/uploadImage'
const token = uni.getStorageSync("token");
const header = {
Authorization: `Bearer ${token}`
}
const formData = {
parent_id: 0,
type: "image",
}
function successImage(e) {
fileList.value.push({
url: e.file.url
})
}
const model = ref({ const model = ref({
classify_list: [], // 商品分类组 classify_list: [], // 商品分类组
name: "", // 商品名称 name: "", // 商品名称
keywords: "", // 商品关键词 keywords: "", // 商品关键词
sort: 1000, sort: 1000,
status: 0, // 商品状态 status: 0, // 商品状态
freight_id: 0, //运费规则 freight_id: 99999999, //运费规则
weight: 0, // 商品重量 weight: 0, // 商品重量
pic_url: "", // 商品缩略图 pic_url: "", // 商品缩略图
pic_list: [], // 商品图组 pic_list: [], // 商品图组
video: "", // 商品视频 video: "", // 商品视频
detail: "", // 图文详情 detail: "默认", // 图文详情
use_sku: 0, // 是否使用规格 use_sku: 0, // 是否使用规格
sku_list: [], // 规格信息 sku_list: [], // 规格信息
is_discount: 0, // 是否有折扣 is_discount: 0, // 是否有折扣
@ -133,35 +154,199 @@ const model = ref({
check_price: 0, // 佣金 check_price: 0, // 佣金
}) })
const form = ref() const load = ref(false)
const skuGroup = ref([])
const skuDefault = ref([])
const skuLibrary = ref([])
const skuEditRef = ref(null)
const freightRules = ref([{
label: "默认",
value: "99999999"
}])
onLoad(async (e) => {
function handleSubmit1() { const GetfreightRules = () => {
form.value goods.freightRules().then(res => {
.validate()
.then(({ valid, errors }) => { freightRules.value = [
if (valid) { ...freightRules.value,
showSuccess({ ...res.data.rows.map(item => {
msg: '校验通过' return {
label: item.name,
value: item.id
}
}) })
} ]
})
}
GetfreightRules()
if (e.id) {
const res = await goods.goodsItem({
id: e.id
})
model.value = res.data
model.value.pic_list = res.data.pic_list.map(({ pic_url }) => pic_url);
if (!model.value.freight_id) {
model.value.freight_id = 99999999
}
model.value.classify_list = model.value.classify_list.map(item => JSON.stringify(item))
if (res.data.use_sku == 0) {
skuDefault.value = res.data.goods_sku;
} else {
skuLibrary.value = res.data.goods_sku;
}
skuGroup.value = res.data.sku_group ? res.data.sku_group : [];
load.value = true
} else {
load.value = true
}
})
// const form = ref()
const saveGoods = async () => {
// 判断商品分类是否为空
if (model.value.classify_list.length === 0) {
return uni.showToast({
title: '请选择商品分类!',
icon: 'none'
})
}
// 判断商品名称是否为空
if (model.value.name.trim() === "") {
return uni.showToast({
title: '请输入商品名称!',
icon: 'none'
})
}
// 判断商品关键词是否为空
// if (model.value.keywords.trim() === "") {
// return uni.showToast({
// title: '请输入商品关键词!',
// icon: 'none'
// })
// }
// 判断商品重量是否为非负数
if (model.value.weight < 0) {
return uni.showToast({
title: '请输入合法的商品重量!',
icon: 'none'
})
}
// 判断商品缩略图是否为空
if (String(model.value.pic_url).trim() === "") {
return uni.showToast({
title: '请上传商品缩略图!',
icon: 'none'
})
}
// 判断商品图组是否为空
if (model.value.pic_list.length === 0) {
return uni.showToast({
title: '请上传商品图片组!',
icon: 'none'
})
}
model.value.sku_group = []
model.value.sku_list = []
model.value.dist_price = Number.parseInt(model.value.dist_price)
if (model.value.use_sku == 1) {
model.value.sku_group = skuEditRef.value.skuGroup;
model.value.sku_list = skuEditRef.value.skuLibrary;
} else {
model.value.sku_list = skuEditRef.value.skuDefault;
}
if (!model.value.sku_list.length) {
uni.showToast({
title: '规格不完整，请调整!',
icon: 'none'
}) })
.catch((error) => { }
console.log(error, 'error')
if (!model.value.sku_list.every(item => Boolean(item.price !== "" && item.stock !== "" && item.original_price !== ""))) {
uni.showToast({
title: '规格不完整，请调整!',
icon: 'none'
}) })
console.log("规格不完整，请调整!");
return
}
let freight_id = model.value.freight_id
if (freight_id = 99999999) {
freight_id = 0
}
const pic_list = model.value.pic_list.map(item => ({
pic_url: item
}))
const classify_list = model.value.classify_list.map(item => JSON.parse(item))
const res = await goods.goodsEdit({ ...model.value, pic_list, freight_id, classify_list });
console.log(res);
if (res.code == 0) {
uni.showToast({
title: '商品信息保存成功!',
icon: 'success'
})
}
} }
const freightRules = ref([]) const classifyList = ref([])
const GetfreightRules = () => { const getClassify = () => {
goods.freightRules().then(res => { function flattenCategories(categories, parentIds = []) {
freightRules.value = res.data.rows.map(item => { let flatCategories = [];
return {
label: item.name, for (const category of categories) {
value: item.id const categoryWithParents = {
...category,
parentIds: [...parentIds, category.id],
};
flatCategories.push(categoryWithParents);
if (category.children && category.children.length > 0) {
flatCategories = flatCategories.concat(flattenCategories(category.children, [...parentIds, category.id]));
} }
}) }
return flatCategories;
}
goods.classify.list().then(res => {
classifyList.value = flattenCategories(res.data)
console.log(classifyList.value);
}) })
} }
GetfreightRules() getClassify()
</script> </script>
<style lang="scss"></style> <style lang="scss"></style>

14
store/goods/index.vue
Unescape Escape View File

@ -48,7 +48,7 @@
style="margin-right: 8px;">下架</wd-button> style="margin-right: 8px;">下架</wd-button>
<wd-button @click="changeS(item)" v-if="item.status !== 1" size="small" <wd-button @click="changeS(item)" v-if="item.status !== 1" size="small"
style="margin-right: 8px;">上架</wd-button> style="margin-right: 8px;">上架</wd-button>
<wd-button @click="utils.toUrl('/store/goods/edit')" size="small">编辑</wd-button> <wd-button @click="utils.toUrl('/store/goods/edit?id=' + item.id)" size="small">编辑</wd-button>
</view> </view>
</template> </template>
</wd-card> </wd-card>
@ -64,9 +64,15 @@
<script setup> <script setup>
import { ref } from 'vue' import { ref } from 'vue'
import { useToast } from '@/uni_modules/wot-design-uni' import { useToast } from '@/uni_modules/wot-design-uni'
import goods from '@/api/store/goods.js'
import myList from "/components/myList/index.vue" import myList from "/components/myList/index.vue"
import goods from '@/api/store/goods.js'
import utils from '@/utils/utils.js' import utils from '@/utils/utils.js'
import {
onLoad,
onShow
} from "@dcloudio/uni-app";
const toast = useToast() const toast = useToast()
const classify_id = ref(0) const classify_id = ref(0)
@ -147,6 +153,10 @@ const getClassify = () => {
}) })
} }
getClassify() getClassify()
onShow(() => {
search({ value: '' })
})
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

2
store/order/index.vue
Unescape Escape View File

@ -67,7 +67,6 @@
<view> <view>
<span class="mr-2" v-if="item.shop">{{ item.shop.name }}</span> <span class="mr-2" v-if="item.shop">{{ item.shop.name }}</span>
<span class="mr-2" v-else>商城自营</span> <span class="mr-2" v-else>商城自营</span>
<span class="font-bold">({{ status[item.status + 1].content }})</span> <span class="font-bold">({{ status[item.status + 1].content }})</span>
</view> </view>
@ -90,7 +89,6 @@
</view> </view>
</view> </view>
<view class="bg-gray-50 p-2"> <view class="bg-gray-50 p-2">
<view class="text-[12px]" v-if="item.user"> <view class="text-[12px]" v-if="item.user">
<view class="mb-1"> <view class="mb-1">

21
uni_modules/wot-design-uni/changelog.md
Unescape Escape View File

@ -1,16 +1,25 @@
## 0.2.3（2023-12-27） ## 0.2.5（2023-12-28）
## 0.2版本正式发布，支持Form自定义表单校验 ## [0.2.5](https://github.com/Moonofweisheng/wot-design-uni/compare/v0.2.4...v0.2.5) (2023-12-28)
> 请注意Input组件有破坏性更新
### [0.2.3](https://github.com/Moonofweisheng/wot-design-uni/compare/v0.2.2...v0.2.3) (2023-12-27)
### ✏️ Documentation | 文档 ### Bug Fixes | Bug 修复
* ✏️ 修复动态表单演示页面标题错误的问题 ([7c65359](https://github.com/Moonofweisheng/wot-design-uni/commit/7c65359c88614ae53c4800d0946d8e09ef547a26)) * 修复 Form 导入FormRules、ErrorMessage时未指定为type的问题 ([c88c84e](https://github.com/Moonofweisheng/wot-design-uni/commit/c88c84e8b71fc2404643a623c28f4953ffe36e71))
* 修复 SwipeAction 组件在H5端导致页面无法上下滚动的问题 ([1f68ce1](https://github.com/Moonofweisheng/wot-design-uni/commit/1f68ce13c8109dd92ca4bf055f66aa8dff24c83d)), closes [#149](https://github.com/Moonofweisheng/wot-design-uni/issues/149)
# 更新日志 # 更新日志
### [0.2.5](https://github.com/Moonofweisheng/wot-design-uni/compare/v0.2.4...v0.2.5) (2023-12-28)
### 🐛 Bug Fixes | Bug 修复
* 🐛 修复 Form 导入FormRules、ErrorMessage时未指定为type的问题 ([c88c84e](https://github.com/Moonofweisheng/wot-design-uni/commit/c88c84e8b71fc2404643a623c28f4953ffe36e71))
* 🐛 修复 SwipeAction 组件在H5端导致页面无法上下滚动的问题 ([1f68ce1](https://github.com/Moonofweisheng/wot-design-uni/commit/1f68ce13c8109dd92ca4bf055f66aa8dff24c83d)), closes [#149](https://github.com/Moonofweisheng/wot-design-uni/issues/149)
### [0.2.4](https://github.com/Moonofweisheng/wot-design-uni/compare/v0.2.3...v0.2.4) (2023-12-27)
### [0.2.3](https://github.com/Moonofweisheng/wot-design-uni/compare/v0.2.2...v0.2.3) (2023-12-27) ### [0.2.3](https://github.com/Moonofweisheng/wot-design-uni/compare/v0.2.2...v0.2.3) (2023-12-27)

2
uni_modules/wot-design-uni/components/composables/useCell.ts
Unescape Escape View File

@ -1,4 +1,4 @@
import { getCurrentInstance, inject, onMounted, onBeforeMount, ref, watch } from 'vue' import { getCurrentInstance, inject, onBeforeMount, ref, watch } from 'vue'
export function useCell() { export function useCell() {
const border = ref<boolean>(false) // 是否展示边框 const border = ref<boolean>(false) // 是否展示边框

10
uni_modules/wot-design-uni/components/composables/useChildren.ts
Unescape Escape View File

@ -1,12 +1,12 @@
import { import {
VNode,
provide, provide,
reactive, reactive,
InjectionKey,
getCurrentInstance, getCurrentInstance,
VNodeNormalizedChildren, type VNode,
ComponentPublicInstance, type InjectionKey,
ComponentInternalInstance type VNodeNormalizedChildren,
type ComponentPublicInstance,
type ComponentInternalInstance
} from 'vue' } from 'vue'
// 小程序端不支持从vue导出的isVNode方法，参考uni-mp-vue的实现 // 小程序端不支持从vue导出的isVNode方法，参考uni-mp-vue的实现

11
uni_modules/wot-design-uni/components/composables/useParent.ts
Unescape Escape View File

@ -1,4 +1,13 @@
import { ref, inject, computed, onUnmounted, InjectionKey, getCurrentInstance, ComponentPublicInstance, ComponentInternalInstance } from 'vue' import {
ref,
inject,
computed,
onUnmounted,
type InjectionKey,
getCurrentInstance,
type ComponentPublicInstance,
type ComponentInternalInstance
} from 'vue'
type ParentProvide<T> = T & { type ParentProvide<T> = T & {
link(child: ComponentInternalInstance): void link(child: ComponentInternalInstance): void

2
uni_modules/wot-design-uni/components/wd-calendar/wd-calendar.vue
Unescape Escape View File

@ -117,7 +117,7 @@ import { dayjs } from '../common/dayjs'
import { deepClone, isArray, isEqual, padZero } from '../common/util' import { deepClone, isArray, isEqual, padZero } from '../common/util'
import { getWeekNumber, isRange } from '../wd-calendar-view/utils' import { getWeekNumber, isRange } from '../wd-calendar-view/utils'
import { useCell } from '../composables/useCell' import { useCell } from '../composables/useCell'
import { FORM_KEY, FormItemRule } from '../wd-form/types' import { FORM_KEY, type FormItemRule } from '../wd-form/types'
import { useParent } from '../composables/useParent' import { useParent } from '../composables/useParent'
const defaultDisplayFormat = (value, type) => { const defaultDisplayFormat = (value, type) => {

2
uni_modules/wot-design-uni/components/wd-cell/wd-cell.vue
Unescape Escape View File

@ -60,7 +60,7 @@ export default {
import { computed } from 'vue' import { computed } from 'vue'
import { useCell } from '../composables/useCell' import { useCell } from '../composables/useCell'
import { useParent } from '../composables/useParent' import { useParent } from '../composables/useParent'
import { FORM_KEY, FormItemRule } from '../wd-form/types' import { FORM_KEY, type FormItemRule } from '../wd-form/types'
interface Props { interface Props {
title?: string title?: string

2
uni_modules/wot-design-uni/components/wd-col-picker/wd-col-picker.vue
Unescape Escape View File

@ -97,7 +97,7 @@ export default {
import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue' import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
import { debounce, getRect, getType } from '../common/util' import { debounce, getRect, getType } from '../common/util'
import { useCell } from '../composables/useCell' import { useCell } from '../composables/useCell'
import { FORM_KEY, FormItemRule } from '../wd-form/types' import { FORM_KEY, type FormItemRule } from '../wd-form/types'
import { useParent } from '../composables/useParent' import { useParent } from '../composables/useParent'
const $container = '.wd-col-picker__selected-container' const $container = '.wd-col-picker__selected-container'

2
uni_modules/wot-design-uni/components/wd-datetime-picker/wd-datetime-picker.vue
Unescape Escape View File

@ -144,7 +144,7 @@ import { computed, getCurrentInstance, nextTick, onBeforeMount, onMounted, ref,
import { deepClone, getType, isArray, isDef, isEqual, padZero } from '../common/util' import { deepClone, getType, isArray, isDef, isEqual, padZero } from '../common/util'
import { useCell } from '../composables/useCell' import { useCell } from '../composables/useCell'
import { type DateTimeType, getPickerValue } from '../wd-datetime-picker-view/type' import { type DateTimeType, getPickerValue } from '../wd-datetime-picker-view/type'
import { FORM_KEY, FormItemRule } from '../wd-form/types' import { FORM_KEY, type FormItemRule } from '../wd-form/types'
import { useParent } from '../composables/useParent' import { useParent } from '../composables/useParent'
interface Props { interface Props {
customClass?: string customClass?: string

2
uni_modules/wot-design-uni/components/wd-form-item/wd-form-item.vue
Unescape Escape View File

@ -36,7 +36,7 @@ export default {
import { computed, ref } from 'vue' import { computed, ref } from 'vue'
import { useParent } from '../composables/useParent' import { useParent } from '../composables/useParent'
import WdCell from '../wd-cell/wd-cell.vue' import WdCell from '../wd-cell/wd-cell.vue'
import { FORM_KEY, FormItemRule } from '../wd-form/types' import { FORM_KEY, type FormItemRule } from '../wd-form/types'
interface Props { interface Props {
prop: string prop: string

2
uni_modules/wot-design-uni/components/wd-form/wd-form.vue
Unescape Escape View File

@ -19,7 +19,7 @@ export default {
import { reactive, watch } from 'vue' import { reactive, watch } from 'vue'
import { deepClone, getPropByPath, isDef, isPromise } from '../common/util' import { deepClone, getPropByPath, isDef, isPromise } from '../common/util'
import { useChildren } from '../composables/useChildren' import { useChildren } from '../composables/useChildren'
import { FormRules, FORM_KEY, ErrorMessage, FormItemRule } from './types' import { type FormRules, FORM_KEY, type ErrorMessage } from './types'
interface Props { interface Props {
// 表单数据对象 // 表单数据对象

2
uni_modules/wot-design-uni/components/wd-input/wd-input.vue
Unescape Escape View File

@ -88,7 +88,7 @@ export default {
import { computed, onBeforeMount, ref, watch } from 'vue' import { computed, onBeforeMount, ref, watch } from 'vue'
import { objToStyle, requestAnimationFrame } from '../common/util' import { objToStyle, requestAnimationFrame } from '../common/util'
import { useCell } from '../composables/useCell' import { useCell } from '../composables/useCell'
import { FORM_KEY, FormItemRule } from '../wd-form/types' import { FORM_KEY, type FormItemRule } from '../wd-form/types'
import { useParent } from '../composables/useParent' import { useParent } from '../composables/useParent'
interface Props { interface Props {

52
uni_modules/wot-design-uni/components/wd-picker/wd-picker.vue
Unescape Escape View File

@ -1,24 +1,20 @@
<template> <template>
<view <view :class="`wd-picker ${disabled ? 'is-disabled' : ''} ${size ? 'is-' + size : ''} ${cell.border.value ? 'is-border' : ''} ${alignRight ? 'is-align-right' : ''
:class="`wd-picker ${disabled ? 'is-disabled' : ''} ${size ? 'is-' + size : ''} ${cell.border.value ? 'is-border' : ''} ${ } ${error ? 'is-error' : ''} ${customClass}`">
alignRight ? 'is-align-right' : ''
} ${error ? 'is-error' : ''} ${customClass}`"
>
<!--文案--> <!--文案-->
<view class="wd-picker__field" @click="showPopup"> <view class="wd-picker__field" @click="showPopup">
<slot v-if="useDefaultSlot"></slot> <slot v-if="useDefaultSlot"></slot>
<view v-else class="wd-picker__cell"> <view v-else class="wd-picker__cell">
<view <view v-if="label || useLabelSlot"
v-if="label || useLabelSlot"
:class="`wd-picker__label ${customLabelClass} ${isRequired ? 'is-required' : ''}`" :class="`wd-picker__label ${customLabelClass} ${isRequired ? 'is-required' : ''}`"
:style="labelWidth ? 'min-width:' + labelWidth + ';max-width:' + labelWidth + ';' : ''" :style="labelWidth ? 'min-width:' + labelWidth + ';max-width:' + labelWidth + ';' : ''">
>
<template v-if="label">{{ label }}</template> <template v-if="label">{{ label }}</template>
<slot v-else name="label"></slot> <slot v-else name="label"></slot>
</view> </view>
<view class="wd-picker__body"> <view class="wd-picker__body">
<view class="wd-picker__value-wraper"> <view class="wd-picker__value-wraper">
<view :class="`wd-picker__value ${ellipsis && 'is-ellipsis'} ${customValueClass} ${showValue ? '' : 'wd-picker__placeholder'}`"> <view
:class="`wd-picker__value ${ellipsis && 'is-ellipsis'} ${customValueClass} ${showValue ? '' : 'wd-picker__placeholder'}`">
{{ showValue ? showValue : placeholder }} {{ showValue ? showValue : placeholder }}
</view> </view>
<wd-icon v-if="!disabled && !readonly" custom-class="wd-picker__arrow" name="arrow-right" /> <wd-icon v-if="!disabled && !readonly" custom-class="wd-picker__arrow" name="arrow-right" />
@ -28,16 +24,8 @@
</view> </view>
</view> </view>
<!--弹出层，picker-view 在隐藏时修改值，会触发多次change事件，从而导致所有列选中第一项，因此picker在关闭时不隐藏 --> <!--弹出层，picker-view 在隐藏时修改值，会触发多次change事件，从而导致所有列选中第一项，因此picker在关闭时不隐藏 -->
<wd-popup <wd-popup v-model="popupShow" position="bottom" :hide-when-close="false" :close-on-click-modal="closeOnClickModal"
v-model="popupShow" :z-index="zIndex" :safe-area-inset-bottom="safeAreaInsetBottom" @close="onCancel" custom-class="wd-picker__popup">
position="bottom"
:hide-when-close="false"
:close-on-click-modal="closeOnClickModal"
:z-index="zIndex"
:safe-area-inset-bottom="safeAreaInsetBottom"
@close="onCancel"
custom-class="wd-picker__popup"
>
<view class="wd-picker__wraper"> <view class="wd-picker__wraper">
<!--toolBar--> <!--toolBar-->
<view class="wd-picker__toolbar" @touchmove="noop"> <view class="wd-picker__toolbar" @touchmove="noop">
@ -53,21 +41,10 @@
</view> </view>
</view> </view>
<!--pickerView--> <!--pickerView-->
<wd-picker-view <wd-picker-view ref="pickerViewWd" :custom-class="customViewClass" v-model="pickerValue" :columns="displayColumns"
ref="pickerViewWd" :loading="isLoading" :loading-color="loadingColor" :columns-height="columnsHeight" :value-key="valueKey"
:custom-class="customViewClass" :label-key="labelKey" @change="pickerViewChange" @pickstart="onPickStart" @pickend="onPickEnd"
v-model="pickerValue" :column-change="columnChange" />
:columns="displayColumns"
:loading="isLoading"
:loading-color="loadingColor"
:columns-height="columnsHeight"
:value-key="valueKey"
:label-key="labelKey"
@change="pickerViewChange"
@pickstart="onPickStart"
@pickend="onPickEnd"
:column-change="columnChange"
/>
</view> </view>
</wd-popup> </wd-popup>
</view> </view>
@ -89,7 +66,7 @@ import { getCurrentInstance, onBeforeMount, ref, watch, computed, onMounted, nex
import { deepClone, defaultDisplayFormat, getType, isDef } from '../common/util' import { deepClone, defaultDisplayFormat, getType, isDef } from '../common/util'
import { useCell } from '../composables/useCell' import { useCell } from '../composables/useCell'
import { type ColumnItem, formatArray } from '../wd-picker-view/type' import { type ColumnItem, formatArray } from '../wd-picker-view/type'
import { FORM_KEY, FormItemRule } from '../wd-form/types' import { FORM_KEY, type FormItemRule } from '../wd-form/types'
import { useParent } from '../composables/useParent' import { useParent } from '../composables/useParent'
interface Props { interface Props {
@ -229,6 +206,7 @@ watch(
(newValue) => { (newValue) => {
pickerValue.value = newValue pickerValue.value = newValue
// 获取初始选中项,并展示初始选中文案 // 获取初始选中项,并展示初始选中文案
if (isDef(newValue)) { if (isDef(newValue)) {
if (pickerViewWd.value && pickerViewWd.value.getSelects) { if (pickerViewWd.value && pickerViewWd.value.getSelects) {
nextTick(() => { nextTick(() => {
@ -458,7 +436,7 @@ function setShowValue(items) {
const { valueKey, labelKey } = props const { valueKey, labelKey } = props
showValue.value = (props.displayFormat || defaultDisplayFormat)(items, { valueKey, labelKey }) showValue.value = (props.displayFormat || defaultDisplayFormat)(items, { valueKey, labelKey })
} }
function noop() {} function noop() { }
function onPickStart() { function onPickStart() {
isPicking.value = true isPicking.value = true
} }

2
uni_modules/wot-design-uni/components/wd-select-picker/wd-select-picker.vue
Unescape Escape View File

@ -112,7 +112,7 @@ import { getCurrentInstance, onBeforeMount, ref, watch, nextTick, computed } fro
import { useCell } from '../composables/useCell' import { useCell } from '../composables/useCell'
import { getRect, getType, isArray, isDef, requestAnimationFrame } from '../common/util' import { getRect, getType, isArray, isDef, requestAnimationFrame } from '../common/util'
import { useParent } from '../composables/useParent' import { useParent } from '../composables/useParent'
import { FORM_KEY, FormItemRule } from '../wd-form/types' import { FORM_KEY, type FormItemRule } from '../wd-form/types'
type SelectPickerType = 'checkbox' | 'radio' type SelectPickerType = 'checkbox' | 'radio'

13
uni_modules/wot-design-uni/components/wd-swipe-action/wd-swipe-action.vue
Unescape Escape View File

@ -3,9 +3,8 @@
<view <view
:class="`wd-swipe-action ${customClass}`" :class="`wd-swipe-action ${customClass}`"
@click.stop="onClick()" @click.stop="onClick()"
@touchmove="stopPropagation ? nothing : ''"
@touchstart="startDrag" @touchstart="startDrag"
@touchmove.prevent="onDrag" @touchmove="onDrag"
@touchend="endDrag" @touchend="endDrag"
@touchcancel="endDrag" @touchcancel="endDrag"
> >
@ -58,7 +57,6 @@ const props = withDefaults(defineProps<Props>(), {
const queue = inject<Queue | null>(queueKey, null) const queue = inject<Queue | null>(queueKey, null)
const wrapperStyle = ref<string>('') const wrapperStyle = ref<string>('')
const stopPropagation = ref<boolean>(false)
// 滑动开始时，wrapper的偏移量 // 滑动开始时，wrapper的偏移量
const originOffset = ref<number>(0) const originOffset = ref<number>(0)
@ -131,8 +129,7 @@ function changeState(value: string, old?: string) {
} }
}) })
} }
/** 防穿透函数的占位符 **/
function nothing() {}
/** /**
* @description 获取左/右操作按钮的宽度 * @description 获取左/右操作按钮的宽度
* @return {Promise<[Number, Number]>} 左宽度、右宽度 * @return {Promise<[Number, Number]>} 左宽度、右宽度
@ -202,12 +199,11 @@ function onDrag(event) {
if (props.disabled) return if (props.disabled) return
touch.touchMove(event) touch.touchMove(event)
if (touch.direction.value === 'vertical') { if (touch.direction.value === 'vertical') {
stopPropagation.value = false
return return
} else { } else {
stopPropagation.value = true event.preventDefault()
event.stopPropagation()
} }
touching.value = true touching.value = true
@ -238,7 +234,6 @@ function endDrag() {
if (props.disabled) return if (props.disabled) return
// 滑出"操作按钮"的阈值 // 滑出"操作按钮"的阈值
const THRESHOLD = 0.3 const THRESHOLD = 0.3
stopPropagation.value = false
touching.value = false touching.value = false
getWidths().then(([leftWidth, rightWidth]) => { getWidths().then(([leftWidth, rightWidth]) => {

2
uni_modules/wot-design-uni/components/wd-textarea/wd-textarea.vue
Unescape Escape View File

@ -78,7 +78,7 @@ export default {
import { computed, onBeforeMount, ref, watch } from 'vue' import { computed, onBeforeMount, ref, watch } from 'vue'
import { objToStyle, requestAnimationFrame } from '../common/util' import { objToStyle, requestAnimationFrame } from '../common/util'
import { useCell } from '../composables/useCell' import { useCell } from '../composables/useCell'
import { FORM_KEY, FormItemRule } from '../wd-form/types' import { FORM_KEY, type FormItemRule } from '../wd-form/types'
import { useParent } from '../composables/useParent' import { useParent } from '../composables/useParent'
type ConfirmType = 'send' | 'search' | 'next' | 'go' | 'done' type ConfirmType = 'send' | 'search' | 'next' | 'go' | 'done'

1
uni_modules/wot-design-uni/components/wd-watermark/wd-watermark.vue
Unescape Escape View File

@ -491,7 +491,6 @@ async function drawImageOffScreen(
img.crossOrigin = 'anonymous' img.crossOrigin = 'anonymous'
img.referrerPolicy = 'no-referrer' img.referrerPolicy = 'no-referrer'
img.referrerPolicy = 'no-referrer'
if (isBase64Image(image)) { if (isBase64Image(image)) {
img.src = image img.src = image
} else { } else {

4
uni_modules/wot-design-uni/package.json
Unescape Escape View File

@ -2,7 +2,7 @@
"id": "wot-design-uni", "id": "wot-design-uni",
"name": "wot-design-uni", "name": "wot-design-uni",
"displayName": "wot-design-uni 基于vue3+Typescript的高颜值组件库", "displayName": "wot-design-uni 基于vue3+Typescript的高颜值组件库",
"version": "0.2.3", "version": "0.2.5",
"description": "一个基于Vue3+TS开发的uni-app组件库，提供60+高质量组件，支持暗黑模式和自定义主题。", "description": "一个基于Vue3+TS开发的uni-app组件库，提供60+高质量组件，支持暗黑模式和自定义主题。",
"keywords": [ "keywords": [
"wot-design-uni", "wot-design-uni",
@ -12,7 +12,7 @@
"暗黑模式" "暗黑模式"
], ],
"main": "index.ts", "main": "index.ts",
"repository":"https://github.com/Moonofweisheng/wot-design-uni.git", "repository": "https://github.com/Moonofweisheng/wot-design-uni.git",
"engines": { "engines": {
"HBuilderX": "^3.8.7" "HBuilderX": "^3.8.7"
}, },

39
utils/request.js
Unescape Escape View File

@ -139,3 +139,42 @@ export function uploadFile({
}); });
}) })
} }
const uploadImage = async ({ filePath, formData, name } = {}) => {
return new Promise(async (resolve, reject) => {
try {
const token = uni.getStorageSync("token");
const header = {
Authorization: `Bearer ${token}`
};
const formData = {
parent_id: 0,
type: "image",
};
uni.uploadFile({
url: 'https://saasdemo.byin.vip/admin/system/uploadImage',
filePath: filePath,
name: name || 'file', // 表单中文件字段的名称
formData: formData,
header: header,
success: (uploadFileRes) => {
const result = JSON.parse(uploadFileRes.data);
resolve(result)
}
});
} catch (error) {
reject(error)
}
})
};
export { uploadImage };

Write Preview
Loading…
Cancel
Save