liaofei
/
mall-app-t
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(商品): 规格修改 

feat(我的): 提现，钱包记录
This commit is contained in:
Ankkaya 2024-08-29 18:06:05 +08:00
parent b577f0730c
commit 860b5221a9
13 changed files with 839 additions and 611 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pages/index/my.vue
View File

@ -20,13 +20,14 @@
<view class="remain flex justify-between align-center"> <view class="remain flex justify-between align-center">
<view class="left flex align-center"> <view class="left flex align-center">
<view class="unit self-start">￥</view> <view class="unit self-start">￥</view>
<view class="sremain ss-font-60">{{ remain }}</view> <view class="sremain ss-font-60">{{ fen2yuan(remain) }}</view>
</view> </view>
<button @click="peach.$router.go('/pages/user/wallet/money')" class="right-btn ss-reset-button"> <button @click="peach.$router.go('/pages/user/wallet/money')" class="right-btn ss-reset-button">
查看详情 查看详情
</button> </button>
</view> </view>
<view class="cent ss-m-t-20"> 总获取积分 {{ userInfo.point }} </view> <view class="cent ss-m-t-20"> 总获取积分 {{ userInfo.point }} </view>
<view class="cent ss-m-t-20"> 冻结金额￥ {{ fen2yuan(freezePrice || 0) }} </view>
</view> </view>
<view class="menu ss-m-t-70"> <view class="menu ss-m-t-70">
@ -47,6 +48,7 @@
<script setup> <script setup>
import { ref, computed } from 'vue' import { ref, computed } from 'vue'
import { fen2yuan } from '@/peach/hooks/useGoods'
import { onShow } from '@dcloudio/uni-app' import { onShow } from '@dcloudio/uni-app'
import AuthUtil from '@/peach/api/member/auth' import AuthUtil from '@/peach/api/member/auth'
import peach from '@/peach' import peach from '@/peach'
@ -88,6 +90,10 @@ const remain = computed(() => {
return userStore.userWallet?.balance return userStore.userWallet?.balance
}) })
const freezePrice = computed(() => {
return userStore.userWallet?.freezePrice
})
const userInfo = computed(() => { const userInfo = computed(() => {
return userStore.userInfo return userStore.userInfo
}) })
@ -137,7 +143,7 @@ onShow(() => {
} }
.statistic { .statistic {
height: 200rpx; height: 230rpx;
background-color: #fffefe; background-color: #fffefe;
opacity: 0.9; opacity: 0.9;
border-radius: 26rpx; border-radius: 26rpx;

203
pages/product/components/item.vue
View File

@ -1,89 +1,89 @@
<template> <template>
<div class="sku-item"> <div class="sku-item">
<uni-forms label-width="176rpx" label-position="left"> <uni-forms label-width="176rpx" label-position="left">
<template v-if="specType"> <template v-if="specType">
<template v-for="item in formData.properties"> <template v-for="item in formData.properties">
<uni-forms-item :label="item.propertyName"> <uni-forms-item :label="item.propertyName">
<uni-easyinput type="text" :value="item.valueName" disabled /> <uni-easyinput type="text" :value="item.valueName" disabled />
</uni-forms-item> </uni-forms-item>
</template> </template>
</template> </template>
<uni-forms-item label="商品封面图" name="picUrl" label-position="top"> <uni-forms-item label="商品封面图" name="picUrl" label-position="top">
<p-uploader <p-uploader
v-model:url="formData.picUrl" v-model:url="formData.picUrl"
:readonly="!canEdit" :readonly="!canEdit"
fileMediatype="image" fileMediatype="image"
limit="1" limit="1"
mode="grid" mode="grid"
:imageStyles="{ width: '168rpx', height: '168rpx' }" :imageStyles="{ width: '168rpx', height: '168rpx' }"
/> />
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="商品条码" name="barCode"> <uni-forms-item label="商品条码" name="barCode">
<uni-easyinput <uni-easyinput
type="text" type="text"
trim="all" trim="all"
v-model="formData.barCode" v-model="formData.barCode"
:disabled="!canEdit" :disabled="!canEdit"
placeholder="请输入商品条码" placeholder="请输入商品条码"
/> />
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="销售价" name="price"> <uni-forms-item label="销售价" name="price">
<uni-easyinput <uni-easyinput
type="digit" type="digit"
trim="all" trim="all"
v-model="formData.price" v-model="formData.price"
:disabled="!canEdit" :disabled="!canEdit"
placeholder="请输入商品销售价" placeholder="请输入商品销售价"
/> />
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="市场价" name="marketPrice"> <uni-forms-item label="市场价" name="marketPrice">
<uni-easyinput <uni-easyinput
type="digit" type="digit"
trim="all" trim="all"
v-model="formData.marketPrice" v-model="formData.marketPrice"
:disabled="!canEdit" :disabled="!canEdit"
placeholder="请输入商品销售价" placeholder="请输入商品销售价"
/> />
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="成本价" name="costPrice"> <uni-forms-item label="成本价" name="costPrice">
<uni-easyinput <uni-easyinput
type="digit" type="digit"
trim="all" trim="all"
v-model="formData.costPrice" v-model="formData.costPrice"
:disabled="!canEdit" :disabled="!canEdit"
placeholder="请输入商品销售价" placeholder="请输入商品销售价"
/> />
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="库存" name="stock"> <uni-forms-item label="库存" name="stock">
<uni-easyinput <uni-easyinput
type="number" type="number"
trim="all" trim="all"
v-model="formData.stock" v-model="formData.stock"
:disabled="!canEdit" :disabled="!canEdit"
placeholder="请输入商品库存" placeholder="请输入商品库存"
/> />
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="重量（kg）" name="weight"> <uni-forms-item label="重量（kg）" name="weight">
<uni-easyinput <uni-easyinput
type="digit" type="digit"
trim="all" trim="all"
v-model="formData.weight" v-model="formData.weight"
:disabled="!canEdit" :disabled="!canEdit"
placeholder="请输入商品重量" placeholder="请输入商品重量"
/> />
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="体积（m³）" name="volume"> <uni-forms-item label="体积（m³）" name="volume">
<uni-easyinput <uni-easyinput
type="digit" type="digit"
trim="all" trim="all"
v-model="formData.volume" v-model="formData.volume"
:disabled="!canEdit" :disabled="!canEdit"
placeholder="请输入商品体积" placeholder="请输入商品体积"
/> />
</uni-forms-item> </uni-forms-item>
</uni-forms> </uni-forms>
</div> </div>
</template> </template>
<script setup> <script setup>
@ -91,36 +91,35 @@ import { ref, watch, computed, defineProps } from 'vue'
import peach from '@/peach' import peach from '@/peach'
import { canEdit } from '../js/sku' import { canEdit } from '../js/sku'
const props = defineProps({ const props = defineProps({
skus: { skus: {
type: Array, type: Array,
default: () => [], default: () => [],
}, },
}) })
const formData = ref({}) const formData = ref({})
const specType = computed(() => peach.$store('trade').specType) const specType = computed(() => peach.$store('trade').specType)
watch( watch(
() => props.skus, () => props.skus,
(newVal) => { (newVal) => {
console.log(newVal) // 如果是单规格，取 sku 第一条数据
// 如果是单规格，取 sku 第一条数据 if (!specType.value) {
if (!specType.value) { if (newVal) formData.value = newVal[0] ?? {}
if (newVal) formData.value = newVal[0] ?? {} return
return }
} formData.value = newVal ?? {}
formData.value = newVal ?? {} },
}, { immediate: true }
{ immediate: true }
) )
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.sku-item { .sku-item {
margin: 40rpx; margin: 40rpx;
padding-top: 40rpx; padding-top: 40rpx;
} }
.sku-item:first-child { .sku-item:first-child {
border-top: 1px solid var(--ui-BG-Main); border-top: 1px solid var(--ui-BG-Main);
} }
</style> </style>

4
pages/product/components/propertyDetail.vue
View File

@ -6,9 +6,9 @@
<view class="property-name-text">规格名</view> <view class="property-name-text">规格名</view>
<view class="property-name-value">{{ item.name }}</view> <view class="property-name-value">{{ item.name }}</view>
</view> </view>
<view class="property-value ss-flex ss-gap-40"> <view class="property-value ss-flex ss-gap-40" style="flex-wrap: wrap">
<view class="property-value-text">规格值</view> <view class="property-value-text">规格值</view>
<view class="property-value-value ss-flex ss-gap-10"> <view v-if="item.propertyValues.length > 0" class="property-value-value ss-flex ss-gap-10">
<view <view
v-for="sitem in item.propertyValues" v-for="sitem in item.propertyValues"
@tap="chooseProperty(sitem)" @tap="chooseProperty(sitem)"

14
pages/product/components/propertyList.vue
View File

@ -16,7 +16,11 @@
> >
{{ item.name }} {{ item.name }}
</view> </view>
<view v-if="canEdit" style="height: 60rpx" @click="addPropertyClick"> <view
v-if="canEdit"
style="height: 60rpx; position: relative; top: 5px; display: inline-block"
@click="addPropertyClick"
>
<text style="color: #ff3300; font-size: 30px" class="cicon-add-round-o"></text> <text style="color: #ff3300; font-size: 30px" class="cicon-add-round-o"></text>
</view> </view>
</view> </view>
@ -127,6 +131,7 @@ const inputFormdata = ref({
function addPropertyClick() { function addPropertyClick() {
propertyTitle.value = '新增' propertyTitle.value = '新增'
inputFormdata.value.name = '' inputFormdata.value.name = ''
inputFormdata.value.id = ''
inputDialogRef.value.open() inputDialogRef.value.open()
} }
@ -160,12 +165,11 @@ defineExpose({
.popup-content { .popup-content {
height: 500rpx; height: 500rpx;
padding: 40rpx; padding: 40rpx;
display: flex;
flex-wrap: wrap;
gap: 20rpx;
justify-content: flex-start;
.property-item { .property-item {
display: inline-block;
margin-right: 10px;
margin-bottom: 10px;
text-align: center; text-align: center;
line-height: 60rpx; line-height: 60rpx;
height: 60rpx; height: 60rpx;

56
pages/product/js/config.js
View File

@ -1,34 +1,34 @@
export const SPEC_TYPE = [ export const SPEC_TYPE = [
{ {
label: '单规格', label: '单规格',
value: false, value: false,
}, },
{ {
label: '多规格', label: '多规格',
value: true, value: true,
}, },
] ]
// sku 相关属性校验 // sku 相关属性校验
export const SKU_RULE_CONFIG = [ export const SKU_RULE_CONFIG = [
{ {
name: 'stock', name: 'stock',
rule: (arg) => arg >= 0, rule: (arg) => arg >= 0,
message: '商品库存必须大于等于 1 ！！！', message: '商品库存必须大于等于 1 ！！！',
}, },
{ {
name: 'price', name: 'price',
rule: (arg) => arg >= 0.01, rule: (arg) => arg >= 0.01,
message: '商品销售价格必须大于等于 0.01 元！！！', message: '商品销售价格必须大于等于 0.01 元！！！',
}, },
{ {
name: 'marketPrice', name: 'marketPrice',
rule: (arg) => arg >= 0.01, rule: (arg) => arg >= 0.01,
message: '商品市场价格必须大于等于 0.01 元！！！', message: '商品市场价格必须大于等于 0.01 元！！！',
}, },
{ {
name: 'costPrice', name: 'costPrice',
rule: (arg) => arg >= 0.01, rule: (arg) => arg >= 0.01,
message: '商品成本价格必须大于等于 0.00 元！！！', message: '商品成本价格必须大于等于 0.01 元！！！',
}, },
] ]

66
pages/product/js/sku.js
View File

@ -29,11 +29,16 @@ async function showPropertyList() {
} }
function onRDPickerConfirm(e) { function onRDPickerConfirm(e) {
formData.value.specType = SPEC_TYPE[e.value[0]].value if (formData.value.specType !== SPEC_TYPE[e.value[0]].value) {
formData.value.specText = SPEC_TYPE[e.value[0]].label peach.$store('trade').specType = SPEC_TYPE[e.value[0]].value
peach.$store('trade').selectedProperty = []
// 如果商品规格不一致，则需要重新初始化 sku 列表 formData.value.specType = SPEC_TYPE[e.value[0]].value
initSku() formData.value.specText = SPEC_TYPE[e.value[0]].label
// 如果商品规格不一致，则需要重新初始化 sku 列表
initSku()
}
} }
function pickerProperty() { function pickerProperty() {
@ -46,6 +51,7 @@ function pickerProperty() {
async function onPropertyConfirm(e) { async function onPropertyConfirm(e) {
await getGoodsProperty() await getGoodsProperty()
changeSubProperty()
} }
function onConfirm() { function onConfirm() {
@ -59,30 +65,32 @@ async function getGoodsProperty() {
// 把 propertyList 中 id 相同的属性合并，并去重 // 把 propertyList 中 id 相同的属性合并，并去重
propertyList.value = peach.$store('trade').selectedProperty || [] propertyList.value = peach.$store('trade').selectedProperty || []
let tempSkus = peach.$store('trade').skus || []
// 根据已经选择数据，设置默认选中 // 根据已经选择数据，设置默认选中
data.forEach((item) => { data.forEach((item) => {
// 判断属性是否已经选中 // 判断属性是否已经选中
let propertyParent = propertyList.value.find((sitem) => sitem?.id === item.id) let propertyParent = propertyList.value.find((sitem) => sitem?.id === item.id)
item.checked = propertyParent ? true : false item.checked = propertyParent ? true : false
// 如果属性已经选中，查询子类中是否有选中 tempSkus.forEach((sitem) => {
if (item.checked) { sitem.properties.forEach((titem) => {
item.propertyValues.forEach((child) => { item.propertyValues.forEach((child) => {
let childResult = propertyParent?.children.some((schild) => schild === child.id) if (!child.checked) {
child.checked = childResult ? true : false child.checked = titem.valueId === child.id ? true : false
}
})
}) })
} })
}) })
goodsPropertyList.value = data goodsPropertyList.value = data
console.log(goodsPropertyList.value)
} }
function changeSubProperty() { function changeSubProperty() {
// 修改子属性状态，需要同步更新 skus 的显示 // 修改子属性状态，需要同步更新 skus 的显示
console.log(goodsPropertyList.value)
// 过滤父属性 checked 选项，深拷贝避免后面循环改变元数据内容 // 过滤父属性 checked 选项，深拷贝避免后面循环改变元数据内容
let temp = JSON.parse(JSON.stringify(goodsPropertyList.value.filter((item) => item.checked))) let temp = JSON.parse(JSON.stringify(goodsPropertyList.value.filter((item) => item.checked)))
temp.forEach((item) => { temp.forEach((item) => {
@ -115,7 +123,32 @@ function changeSubProperty() {
tempSkus.push(obj) tempSkus.push(obj)
} }
tempSkus.forEach((item) => {
skus.value.forEach((sitem) => {
if (sitem.properties.length === item.properties.length && item.properties.length > 0) {
let sitemIds = sitem.properties.map((child) => child.valueId)
let itemIds = item.properties.map((tchild) => tchild.valueId)
let isExist = sitemIds.every((schild) => itemIds.includes(schild))
if (isExist) {
item.picUrl = sitem.picUrl
item.barCode = sitem.barCode
item.price = sitem.price
item.marketPrice = sitem.marketPrice
item.costPrice = sitem.costPrice
item.stock = sitem.stock
item.weight = sitem.weight
item.volume = sitem.volume
}
}
})
})
skus.value = tempSkus skus.value = tempSkus
peach.$store('trade').$patch({
skus: skus.value,
})
} }
/** /**
@ -168,6 +201,7 @@ function submitProperty() {
peach.$store('trade').$patch({ peach.$store('trade').$patch({
skus: skus.value, skus: skus.value,
specType: formData.value.specType, specType: formData.value.specType,
isSave: true,
}) })
peach.$router.back() peach.$router.back()
} catch (e) { } catch (e) {
@ -278,10 +312,10 @@ const inputPropertyValueFormdata = ref({
remark: '', remark: '',
}) })
function addPropertyValueClick(item) { function addPropertyValueClick(item) {
console.log(item)
propertyValueTitle.value = '新增' propertyValueTitle.value = '新增'
inputPropertyValueFormdata.value.name = '' inputPropertyValueFormdata.value.name = ''
inputPropertyValueFormdata.value.propertyId = item.id inputPropertyValueFormdata.value.propertyId = item.id
inputPropertyValueFormdata.value.id = ''
inputPropertyValueDialogRef.value.open() inputPropertyValueDialogRef.value.open()
} }
@ -296,11 +330,12 @@ async function dialogInputPropertyValueConfirm(value) {
await GoodsApi.createPropertyValue(inputPropertyValueFormdata.value) await GoodsApi.createPropertyValue(inputPropertyValueFormdata.value)
} }
await getGoodsProperty() await getGoodsProperty()
changeSubProperty()
inputPropertyValueDialogRef.value.close() inputPropertyValueDialogRef.value.close()
} }
function longPropertyValuePress(item) { function longPropertyValuePress(item) {
console.log(item)
if (canEdit.value) { if (canEdit.value) {
// 震动提示 // 震动提示
uni.vibrateShort() uni.vibrateShort()
@ -317,6 +352,7 @@ function longPropertyValuePress(item) {
if (res.tapIndex === 1) { if (res.tapIndex === 1) {
await GoodsApi.delPropertyValue({ id: item.id }) await GoodsApi.delPropertyValue({ id: item.id })
await getGoodsProperty() await getGoodsProperty()
changeSubProperty()
} }
}, },
}) })

20
pages/product/manageGoods.vue
View File

@ -153,7 +153,7 @@
<script setup> <script setup>
import { ref, computed } from 'vue' import { ref, computed } from 'vue'
import { onLoad, onPageScroll } from '@dcloudio/uni-app' import { onLoad, onPageScroll, onShow } from '@dcloudio/uni-app'
import _ from 'lodash' import _ from 'lodash'
import GoodsApi from '@/peach/api/trade/goods' import GoodsApi from '@/peach/api/trade/goods'
import piaoyiEditor from '@/uni_modules/piaoyi-editor/components/piaoyi-editor/piaoyi-editor.vue' import piaoyiEditor from '@/uni_modules/piaoyi-editor/components/piaoyi-editor/piaoyi-editor.vue'
@ -408,9 +408,6 @@ function saveContens(e) {
} }
function onSubmit() { function onSubmit() {
console.log('res', formData.value)
console.log('richtext', richValues.value)
formData.value.skus = peach.$store('trade').skus formData.value.skus = peach.$store('trade').skus
formRef.value formRef.value
@ -486,6 +483,21 @@ onLoad(async (options) => {
} }
}) })
onShow(() => {
let isSave = peach.$store('trade').isSave
if (isSave) {
formData.value.skus = peach.$store('trade').skus
formData.value.specType = peach.$store('trade').specType
peach.$store('trade').isSave = false
} else {
peach.$store('trade').$patch({
skus: formData.value.skus || [],
specType: formData.value.specType,
})
}
})
onPageScroll((e) => { onPageScroll((e) => {
if (canEdit.value && e.scrollTop > 200) { if (canEdit.value && e.scrollTop > 200) {
richReadOnly.value = false richReadOnly.value = false

476
pages/user/wallet/money.vue
View File

@ -1,62 +1,77 @@
<template> <template>
<pb-layout <pb-layout
navbar="inner" navbar="inner"
class="wallet-wrap" class="wallet-wrap"
iconColor="#fff" iconColor="#fff"
leftIcon="leftIcon" leftIcon="leftIcon"
color="#fff" color="#fff"
title="余额" title="余额"
:bgStyle="bgStyle" :bgStyle="bgStyle"
> >
<view class="header-box ss-row-center ss-col-center"> <view class="header-box ss-row-center ss-col-center">
<view class="card-box ss-flex ss-row-between ss-col-center"> <view class="card-box ss-flex ss-row-between ss-col-center">
<view class="ss-flex ss-flex-col ss-row-between ss-col-top ss-gap-40"> <view class="ss-flex ss-flex-col ss-row-between ss-col-top ss-gap-40">
<view class="card-head ss-flex ss-col-center"> <view class="card-head ss-flex ss-col-center">
<view class="card-title ss-m-r-10">账户余额（元）</view> <view class="card-title ss-m-r-10">账户余额（元）</view>
<view <view
@tap="state.showMoney = !state.showMoney" @tap="state.showMoney = !state.showMoney"
class="ss-eye-icon" class="ss-eye-icon"
:class="state.showMoney ? 'cicon-eye' : 'cicon-eye-off'" :class="state.showMoney ? 'cicon-eye' : 'cicon-eye-off'"
/> />
</view> </view>
<view class="money-num">{{ state.showMoney ? fen2yuan(userWallet.balance) : '*****' }}</view> <view class="money-num">{{ state.showMoney ? fen2yuan(userWallet.balance) : '*****' }}</view>
</view>
<button class="ss-reset-button topup-btn" @tap="peach.$router.go('/pages/user/wallet/withdraw')">
提现
</button>
</view>
</view> </view>
<button class="ss-reset-button topup-btn" @tap="peach.$router.go('/pages/user/wallet/withdraw')">提现</button>
</view>
</view>
<p-empty v-if="state.pagination.total === 0" :marginTop="40" text="暂无数据" icon="/static/data-empty.png" /> <pb-sticky>
<!-- 统计 -->
<!-- 钱包记录 --> <view class="filter-box ss-p-x-30 ss-flex ss-col-center ss-row-between">
<view v-if="state.pagination.total > 0"> <uni-datetime-picker v-model="state.data" type="daterange" @change="onChangeTime" :end="state.today">
<view class="wallet-list ss-flex border-bottom" v-for="item in state.pagination.list" :key="item.id"> <button class="ss-reset-button date-btn">
<view class="list-content"> <text>{{ dateFilterText }}</text>
<view class="title-box ss-flex ss-row-between ss-m-b-20"> <text class="cicon-drop-down ss-seldate-icon"></text>
<text class="title ss-line-1"> </button>
{{ item.title }} </uni-datetime-picker>
</text> <view class="total-box">
<view class="money"> <view class="ss-m-b-10">总收入￥{{ fen2yuan(state.summary.totalIncome) }}</view>
<text v-if="item.price >= 0" class="add">+{{ fen2yuan(item.price) }}</text> <view>总支出￥{{ fen2yuan(state.summary.totalExpense) }}</view>
<text v-else class="minus">{{ fen2yuan(item.price) }}</text>
</view>
</view>
<text class="time">
{{ peach.$helper.timeFormat(state.createTime, 'yyyy-mm-dd hh:MM:ss') }}
</text>
</view>
</view>
</view> </view>
<uni-load-more </view>
v-if="state.pagination.total > 0" <pb-tabs :list="tabMaps" @change="onChange" :scrollable="false" :current="state.currentTab"></pb-tabs>
:status="state.loadStatus" </pb-sticky>
:content-text="{
contentdown: '上拉加载更多', <p-empty v-if="state.pagination.total === 0" :marginTop="40" text="暂无数据" icon="/static/data-empty.png" />
}"
/> <!-- 钱包记录 -->
</pb-layout> <view v-if="state.pagination.total > 0">
<view class="wallet-list ss-flex border-bottom" v-for="item in state.pagination.list" :key="item.id">
<view class="list-content">
<view class="title-box ss-flex ss-row-between ss-m-b-20">
<text class="title ss-line-1">
{{ item.title }}
</text>
<view class="money">
<text v-if="item.price >= 0" class="add">+{{ fen2yuan(item.price) }}</text>
<text v-else class="minus">{{ fen2yuan(item.price) }}</text>
</view>
</view>
<text class="time">
{{ peach.$helper.timeFormat(state.createTime, 'yyyy-mm-dd hh:MM:ss') }}
</text>
</view>
</view>
</view>
<uni-load-more
v-if="state.pagination.total > 0"
:status="state.loadStatus"
:content-text="{
contentdown: '上拉加载更多',
}"
/>
</pb-layout>
</template> </template>
<script setup> <script setup>
@ -70,203 +85,264 @@ import PayWalletApi from '@/peach/api/pay/wallet'
import { resetPagination } from '@/peach/utils' import { resetPagination } from '@/peach/utils'
const bgStyle = { const bgStyle = {
backgroundImage: '/static/bg-page.png', backgroundImage: '/static/bg-page.png',
imageType: 'local', imageType: 'local',
backgroundColor: '#fff', backgroundColor: '#fff',
description: '', description: '',
} }
// const headerBg = peach.$url.css('/static/img/shop/user/wallet_card_bg.png') // const headerBg = peach.$url.css('/static/img/shop/user/wallet_card_bg.png')
// 数据 // 数据
const state = reactive({ const state = reactive({
showMoney: false, showMoney: false,
pagination: { currentTab: 0,
list: [], pagination: {
total: 0, list: [],
pageNo: 1, total: 0,
pageSize: 8, pageNo: 1,
}, pageSize: 8,
loadStatus: '', },
loadStatus: '',
summary: {
totalIncome: 0,
totalExpense: 0,
},
today: '',
})
const tabMaps = [
{
name: '全部',
value: '',
},
{
name: '收入',
value: '1',
},
{
name: '支出',
value: '2',
},
]
// 格式化时间段
const dateFilterText = computed(() => {
if (state.date[0] === state.date[1]) {
return state.date[0]
} else {
return state.date.join('~')
}
}) })
const userWallet = computed(() => peach.$store('user').userWallet) const userWallet = computed(() => peach.$store('user').userWallet)
// 获得钱包记录分页 // 获得钱包记录分页
async function getLogList() { async function getLogList() {
state.loadStatus = 'loading' state.loadStatus = 'loading'
// const { data, code } = await PayWalletApi.getWalletTransactionPage({ const { data, code } = await PayWalletApi.flowList({
// pageNo: state.pagination.pageNo, pageNo: state.pagination.pageNo,
// pageSize: state.pagination.pageSize, pageSize: state.pagination.pageSize,
type: tabMaps[state.currentTab].value,
'createTime[0]': state.date[0] + ' 00:00:00',
'createTime[1]': state.date[1] + ' 23:59:59',
})
// }) if (code !== 0) {
return
}
// state.pagination.list = _.concat(state.pagination.list, data.list) state.pagination.list = _.concat(state.pagination.list, data.list)
// state.pagination.total = data.total state.pagination.total = data.total
// state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore' state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore'
}
// 钱包统计
async function getStatistic() {
let res = await PayWalletApi.statistics({
createTime: [state.date[0] + ' 00:00:00', state.date[1] + ' 23:59:59'],
})
if (code !== 0) {
return
}
state.summary = data
}
// 处理 tab 切换
function onChange(e) {
state.currentTab = e.index
// 重新加载列表
resetPagination(state.pagination)
getLogList()
getStatistic()
} }
onLoad(() => { onLoad(() => {
getLogList() state.today = dayjs().format('YYYY-MM-DD')
// 刷新钱包的缓存 state.date = [state.today, state.today]
// peach.$store('user').getWallet() getLogList()
getStatistic()
// 刷新钱包的缓存
// peach.$store('user').getWallet()
}) })
onReachBottom(() => { onReachBottom(() => {
if (state.loadStatus === 'noMore') { if (state.loadStatus === 'noMore') {
return return
} }
state.pagination.pageNo++ state.pagination.pageNo++
getLogList() getLogList()
}) })
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.header-box { .header-box {
.card-box { .card-box {
width: 100%; width: 100%;
min-height: 250rpx; min-height: 250rpx;
padding: 0 40rpx; padding: 0 40rpx;
background-size: 100% 100%; background-size: 100% 100%;
border-radius: 30rpx; border-radius: 30rpx;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
z-index: 1; z-index: 1;
box-sizing: border-box; box-sizing: border-box;
.card-head { .card-head {
color: $white; color: $white;
font-size: 30rpx; font-size: 30rpx;
}
.ss-eye-icon {
font-size: 40rpx;
color: $white;
}
.money-num {
font-size: 70rpx;
line-height: 70rpx;
font-weight: 500;
color: $white;
font-family: OPPOSANS;
}
.reduce-num {
font-size: 26rpx;
font-weight: 400;
color: $white;
}
.topup-btn {
width: 150rpx;
height: 60rpx;
line-height: 60rpx;
border-radius: 30px;
font-size: 26rpx;
font-weight: 500;
background-color: $white;
color: var(--ui-BG-Main);
}
} }
.ss-eye-icon {
font-size: 40rpx;
color: $white;
}
.money-num {
font-size: 70rpx;
line-height: 70rpx;
font-weight: 500;
color: $white;
font-family: OPPOSANS;
}
.reduce-num {
font-size: 26rpx;
font-weight: 400;
color: $white;
}
.topup-btn {
width: 150rpx;
height: 60rpx;
line-height: 60rpx;
border-radius: 30px;
font-size: 26rpx;
font-weight: 500;
background-color: $white;
color: var(--ui-BG-Main);
}
}
} }
// 筛选 // 筛选
.filter-box { .filter-box {
height: 114rpx; height: 114rpx;
background-color: $bg-page; background-color: $bg-page;
.total-box { .total-box {
font-size: 24rpx; font-size: 24rpx;
font-weight: 500; font-weight: 500;
color: $dark-9; color: $dark-9;
} }
.date-btn { .date-btn {
background-color: $white; width: fit-content;
line-height: 54rpx; background-color: $white;
border-radius: 27rpx; line-height: 54rpx;
padding: 0 20rpx; border-radius: 27rpx;
font-size: 24rpx; padding: 0 20rpx;
font-weight: 500; font-size: 24rpx;
color: $dark-6; font-weight: 500;
color: $dark-6;
.ss-seldate-icon {
font-size: 50rpx; .ss-seldate-icon {
color: $dark-9; font-size: 50rpx;
} color: $dark-9;
} }
}
} }
// tab // tab
.wallet-tab-card { .wallet-tab-card {
.tab-item { .tab-item {
height: 80rpx; height: 80rpx;
position: relative; position: relative;
.tab-title { .tab-title {
font-size: 30rpx; font-size: 30rpx;
}
.cur-tab-title {
font-weight: $font-weight-bold;
}
.tab-line {
width: 60rpx;
height: 6rpx;
border-radius: 6rpx;
position: absolute;
left: 50%;
transform: translateX(-50%);
bottom: 2rpx;
background-color: var(--ui-BG-Main);
}
} }
.cur-tab-title {
font-weight: $font-weight-bold;
}
.tab-line {
width: 60rpx;
height: 6rpx;
border-radius: 6rpx;
position: absolute;
left: 50%;
transform: translateX(-50%);
bottom: 2rpx;
background-color: var(--ui-BG-Main);
}
}
} }
// 钱包记录 // 钱包记录
.wallet-list { .wallet-list {
padding: 30rpx; padding: 30rpx;
background-color: #ffff; background-color: #ffff;
.head-img { .head-img {
width: 70rpx; width: 70rpx;
height: 70rpx; height: 70rpx;
border-radius: 50%; border-radius: 50%;
background: $gray-c; background: $gray-c;
}
.list-content {
justify-content: space-between;
align-items: flex-start;
flex: 1;
.title {
font-size: 28rpx;
color: $dark-3;
width: 400rpx;
} }
.list-content { .time {
justify-content: space-between; color: $gray-c;
align-items: flex-start; font-size: 22rpx;
flex: 1; }
}
.title { .money {
font-size: 28rpx; font-size: 28rpx;
color: $dark-3; font-weight: bold;
width: 400rpx; font-family: OPPOSANS;
}
.time { .add {
color: $gray-c; color: var(--ui-BG-Main);
font-size: 22rpx;
}
} }
.money { .minus {
font-size: 28rpx; color: $dark-3;
font-weight: bold;
font-family: OPPOSANS;
.add {
color: var(--ui-BG-Main);
}
.minus {
color: $dark-3;
}
} }
}
} }
</style> </style>

106
pages/user/wallet/withdraw.vue
View File

@ -1,53 +1,97 @@
<template> <template>
<pb-layout navbar="normal" class="withdraw-wrap" leftIcon="leftIcon" title="提现" :bgStyle="bgStyle"> <pb-layout navbar="normal" class="withdraw-wrap" leftIcon="leftIcon" title="提现" :bgStyle="bgStyle">
<view class="alert ss-m-x-40 ss-m-y-20"> <view class="alert ss-m-x-40 ss-m-y-20"> 提现至 </view>
提现至
</view>
<view class="method ss-m-x-40 ss-flex ss-col-center ss-row-between"> <view class="method ss-m-x-40 ss-flex ss-col-center ss-row-between">
<view class="left ss-flex ss-gap-20 ss-col-center"> <view class="left ss-flex ss-gap-20 ss-col-center">
<view class="cicon-weixin" style="color:#2f9326;font-size: 60rpx"></view> <view class="cicon-weixin" style="color: #2f9326; font-size: 60rpx"></view>
<view class="info"> <view class="info">
<view class="label">其选择提现方式</view> <view class="label">微信</view>
<view class="note ss-m-t-10">立即到账</view> <view class="note ss-m-t-10">极速到账</view>
</view> </view>
</view> </view>
<view class="cicon-angle m-t-40"></view> <!-- <view class="cicon-angle m-t-40"></view> -->
</view> </view>
<view class="detail ss-m-40 ss-p-30"> <view class="detail ss-m-40 ss-p-30">
<view class="label ss-m-b-50">提现金额</view> <view class="label ss-m-b-50">提现金额</view>
<view class="account ss-m-t-135 ss-m-b-20 ss-flex ss-row-between"> <view class="account ss-m-t-15 ss-m-b-20 ss-flex ss-row-between">
<uni-easyinput :styles="{ backgroundColor: 'transparent' }" :clearable="false" :inputBorder="false" <uni-easyinput
type="number" trim="all" placeholder="请输入提现金额" /> v-model="formData.amount"
<view class="all self-end">全部提现</view> :styles="{ backgroundColor: 'transparent' }"
:clearable="false"
:inputBorder="false"
type="digit"
trim="all"
placeholder="请输入提现金额"
/>
<view class="all self-end" @click="allWithdraw">全部提现</view>
</view> </view>
<view class="note ss-flex ss-row-between"> <view class="note ss-flex ss-row-between">
<view class="last"> <view class="last"> 最低提现金额￥{{ config?.takingRule }} </view>
剩余额度￥{{ state.last }} <view class="can-use"> 余额￥{{ fen2yuan(remain) }} </view>
</view> </view>
<view class="can-use"> <view class="last">
可用额度￥{{ state.canUse }} 提现费率{{ config?.takingRate }} 即每提现 1000 元扣除手续费￥{{ 1000 * config?.takingRate }}
</view>
</view> </view>
</view> </view>
<view class="footer-box"> <view class="footer-box">
<button class="ss-reset-button draw-btn ui-Shadow-Main" @tap="onSubmit">提现</button> <button class="ss-reset-button draw-btn ui-Shadow-Main" @tap="onSubmit">提现</button>
</view> </view>
</pb-layout> </pb-layout>
</template> </template>
<script setup> <script setup>
import { ref } from 'vue' import { ref, computed } from 'vue'
import { onLoad } from '@dcloudio/uni-app'
import { fen2yuan } from '@/peach/hooks/useGoods'
import peach from '@/peach'
import WalletApi from '@/peach/api/pay/wallet'
const bgStyle = { const bgStyle = {
backgroundColor: '#fff', backgroundColor: '#fff',
description: '', description: '',
} }
const state = ref({ const config = ref(null)
last: 1000,
canUse: 10000 const userStore = peach.$store('user')
const remain = computed(() => {
return userStore.userWallet?.balance
})
const formData = ref({
amount: 0,
})
async function getWithdrawConfig() {
let res = await WalletApi.withdrawConfig()
config.value = res.data
}
function allWithdraw() {
formData.value.amount = fen2yuan(remain.value)
}
async function onSubmit() {
if (!formData.value.amount || formData.value.amount <= 0) {
peach.$helper.toast('请输入正确的金额')
return
}
try {
await WalletApi.withdraw({
amount: formData.value.amount * 100,
})
setTimeout(() => {
peach.$router.back()
}, 1000)
} catch (e) {
console.log(e)
}
}
onLoad(() => {
getWithdrawConfig()
}) })
</script> </script>
@ -63,14 +107,14 @@ const state = ref({
font-size: 26rpx; font-size: 26rpx;
.note { .note {
color: #b5b5b5 color: #b5b5b5;
} }
} }
} }
} }
.detail { .detail {
background-color: rgba(236, 236, 236, .3); background-color: rgba(236, 236, 236, 0.3);
border-radius: 20rpx; border-radius: 20rpx;
.label { .label {
@ -79,7 +123,6 @@ const state = ref({
} }
.account { .account {
:deep(.uni-easyinput__content-input) { :deep(.uni-easyinput__content-input) {
font-size: 28px; font-size: 28px;
} }
@ -95,7 +138,7 @@ const state = ref({
.account::before { .account::before {
content: '￥'; content: '￥';
font-size: 48rpx; font-size: 48rpx;
color: #333 color: #333;
} }
.note { .note {
@ -103,7 +146,16 @@ const state = ref({
font-size: 26rpx; font-size: 26rpx;
} }
.last {
color: #a3a3a3;
font-size: 26rpx;
margin-top: 5px;
}
.can-use {
color: #333;
font-size: 26rpx;
}
} }
.footer-box { .footer-box {
@ -120,4 +172,4 @@ const state = ref({
} }
} }
} }
</style> </style>

47
peach/api/pay/wallet.js
View File

@ -1,7 +1,46 @@
import request from "@/peach/request"; import request from '@/peach/request'
const PayWalletApi = { const PayWalletApi = {
getWalletTransactionPage: () => {}, // 提现余额
}; withdraw: (data) => {
return request({
url: '/pay/wallet/withdraw',
method: 'post',
data,
custom: {
showSuccess: true,
successMsg: '提现成功',
},
})
},
export default PayWalletApi; // 提现配置信息
withdrawConfig: () => {
return request({
url: '/shop/particulars-config/get',
method: 'get',
})
},
// 钱包流水记录
flowList: (params) => {
const queryString = Object.keys(params)
.map((key) => encodeURIComponent(key) + '=' + params[key])
.join('&')
return request({
url: `/pay/wallet-transaction/page?${queryString}`,
method: 'get',
})
},
// 钱包统计
statistics: (params) => {
const queryString = `createTime=${params.createTime[0]}&createTime=${params.createTime[1]}`
return request({
url: `/pay/wallet-transaction/get-summary?${queryString}`,
method: 'get',
})
},
}
export default PayWalletApi

6
peach/api/trade/goods.js
View File

@ -107,7 +107,7 @@ const GoodsApi = {
// 创建商品属性值 // 创建商品属性值
createPropertyValue: (data) => { createPropertyValue: (data) => {
return request({ return request({
url: '/property/value/create', url: '/product/property/value/create',
method: 'POST', method: 'POST',
data, data,
custom: { custom: {
@ -118,7 +118,7 @@ const GoodsApi = {
// 删除商品属性值 // 删除商品属性值
delPropertyValue: (data) => { delPropertyValue: (data) => {
return request({ return request({
url: '/property/value/delete', url: '/product/property/value/delete',
method: 'DELETE', method: 'DELETE',
params: data, params: data,
custom: { custom: {
@ -129,7 +129,7 @@ const GoodsApi = {
// 修改商品属性值 // 修改商品属性值
editPropertyValue: (data) => { editPropertyValue: (data) => {
return request({ return request({
url: '/property/value/update', url: '/product/property/value/update',
method: 'PUT', method: 'PUT',
data, data,
custom: { custom: {

398
peach/components/p-goods-column/p-goods-column.vue
View File

@ -1,58 +1,58 @@
<template> <template>
<view class="ss-goods-wrap"> <view class="ss-goods-wrap">
<view v-if="size === 'lg'" class="lg-goods-card ss-flex ss-col-stretch" :style="[elStyles]" @click="onClick"> <view v-if="size === 'lg'" class="lg-goods-card ss-flex ss-col-stretch" :style="[elStyles]" @click="onClick">
<image class="lg-img-box" :src="peach.$url.cdn(data.image || data.picUrl)" mode="aspectFill"></image> <image class="lg-img-box" :src="peach.$url.cdn(data.image || data.picUrl)" mode="aspectFill"></image>
<view class="lg-goods-content ss-flex-1 ss-flex-col ss-row-between ss-p-b-10 ss-p-t-20"> <view class="lg-goods-content ss-flex-1 ss-flex-col ss-row-between ss-p-b-10 ss-p-t-20">
<view> <view>
<view <view
v-if="goodsFields.title?.show || goodsFields.name?.show" v-if="goodsFields.title?.show || goodsFields.name?.show"
class="lg-goods-title ss-line-2" class="lg-goods-title ss-line-2"
:style="[{ color: titleColor }]" :style="[{ color: titleColor }]"
> >
{{ data.title || data.name }} {{ data.title || data.name }}
</view> </view>
<view <view
v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show" v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
class="lg-goods-subtitle ss-m-t-10 ss-line-1" class="lg-goods-subtitle ss-m-t-10 ss-line-3"
:style="[{ color: subTitleColor, background: subTitleBackground }]" :style="[{ color: subTitleColor, background: subTitleBackground }]"
> >
{{ data.subtitle || data.introduction }} {{ data.subtitle || data.introduction }}
</view> </view>
</view> </view>
<view> <view>
<view class="ss-flex ss-col-bottom ss-m-t-10"> <view class="ss-flex ss-col-bottom ss-m-t-10">
<view <view
v-if="goodsFields.price?.show" v-if="goodsFields.price?.show"
class="lg-goods-price ss-m-r-12 ss-flex ss-col-bottom font-OPPOSANS" class="lg-goods-price ss-m-r-12 ss-flex ss-col-bottom font-OPPOSANS"
:style="[{ color: goodsFields.price.color }]" :style="[{ color: goodsFields.price.color }]"
> >
<text class="ss-font-24">{{ priceUnit }}</text> <text class="ss-font-24">{{ priceUnit }}</text>
{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }} {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
</view>
<view
v-if="
(goodsFields.original_price?.show || goodsFields.marketPrice?.show) &&
(data.original_price > 0 || data.marketPrice > 0)
"
class="goods-origin-price ss-flex ss-col-bottom font-OPPOSANS"
:style="[{ color: originPriceColor }]"
>
<text class="price-unit ss-font-20">{{ priceUnit }}</text>
<view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view>
</view>
</view>
<view class="ss-m-t-8 ss-flex ss-col-center ss-flex-wrap">
<view class="sales-text">{{ salesAndStock }}</view>
</view>
</view>
</view> </view>
<view
v-if="
(goodsFields.original_price?.show || goodsFields.marketPrice?.show) &&
(data.original_price > 0 || data.marketPrice > 0)
"
class="goods-origin-price ss-flex ss-col-bottom font-OPPOSANS"
:style="[{ color: originPriceColor }]"
>
<text class="price-unit ss-font-20">{{ priceUnit }}</text>
<view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view>
</view>
</view>
<view class="ss-m-t-8 ss-flex ss-col-center ss-flex-wrap">
<view class="sales-text">{{ salesAndStock }}</view>
</view>
</view> </view>
<view class="ss-flex ss-row-around" :style="btnStyles"> </view>
<button class="ss-reset-button btn-group" @click="clickGoods('detail')">详情</button>
<button class="ss-reset-button btn-group" @click="clickGoods('edit')">编辑</button>
<button class="ss-reset-button btn-group btn-del" @click="clickGoods('del')">删除</button>
</view>
</view> </view>
<view class="ss-flex ss-row-around" :style="btnStyles">
<button class="ss-reset-button btn-group" @click="clickGoods('detail')">详情</button>
<button class="ss-reset-button btn-group" @click="clickGoods('edit')">编辑</button>
<button class="ss-reset-button btn-group btn-del" @click="clickGoods('del')">删除</button>
</view>
</view>
</template> </template>
<script setup> <script setup>
@ -64,185 +64,185 @@ import { fen2yuan, formatSales, formatStock } from '@/peach/hooks/useGoods'
import { unix } from 'dayjs' import { unix } from 'dayjs'
const props = defineProps({ const props = defineProps({
goodsFields: { goodsFields: {
type: [Array, Object], type: [Array, Object],
default() { default() {
return { return {
price: { show: true }, price: { show: true },
stock: { show: true }, stock: { show: true },
name: { show: true }, name: { show: true },
introduction: { show: true }, introduction: { show: true },
marketPrice: { show: true }, marketPrice: { show: true },
salesCount: { show: true }, salesCount: { show: true },
} }
},
},
data: {
type: Object,
default: {},
},
size: {
type: String,
default: '',
},
originPriceColor: {
type: String,
default: '#C4C4C4',
},
topRadius: {
type: Number,
default: 0,
},
bottomRadius: {
type: Number,
default: 0,
},
priceUnit: {
type: String,
default: '￥',
},
titleColor: {
type: String,
default: '#333',
},
subTitleColor: {
type: String,
default: '#999999',
},
subTitleBackground: {
type: String,
default: '',
}, },
},
data: {
type: Object,
default: {},
},
size: {
type: String,
default: '',
},
originPriceColor: {
type: String,
default: '#C4C4C4',
},
topRadius: {
type: Number,
default: 0,
},
bottomRadius: {
type: Number,
default: 0,
},
priceUnit: {
type: String,
default: '￥',
},
titleColor: {
type: String,
default: '#333',
},
subTitleColor: {
type: String,
default: '#999999',
},
subTitleBackground: {
type: String,
default: '',
},
}) })
const emits = defineEmits(['click', 'refresh']) const emits = defineEmits(['click', 'refresh'])
function onClick() { function onClick() {
emits('click') emits('click')
} }
const elStyles = computed(() => { const elStyles = computed(() => {
return { return {
background: props.background, background: props.background,
'border-top-left-radius': props.topRadius + 'px', 'border-top-left-radius': props.topRadius + 'px',
'border-top-right-radius': props.topRadius + 'px', 'border-top-right-radius': props.topRadius + 'px',
} }
}) })
const btnStyles = computed(() => { const btnStyles = computed(() => {
return { return {
background: '#fff', background: '#fff',
'border-bottom-left-radius': props.bottomRadius + 'px', 'border-bottom-left-radius': props.bottomRadius + 'px',
'border-bottom-right-radius': props.bottomRadius + 'px', 'border-bottom-right-radius': props.bottomRadius + 'px',
padding: '8px 0', padding: '8px 0',
} }
}) })
// 格式化销量、库存信息 // 格式化销量、库存信息
const salesAndStock = computed(() => { const salesAndStock = computed(() => {
let text = [] let text = []
if (props.goodsFields.salesCount?.show) { if (props.goodsFields.salesCount?.show) {
text.push(formatSales(props.data.sales_show_type, props.data.salesCount)) text.push(formatSales(props.data.sales_show_type, props.data.salesCount))
} }
if (props.goodsFields.stock?.show) { if (props.goodsFields.stock?.show) {
text.push(formatStock(props.data.stock_show_type, props.data.stock)) text.push(formatStock(props.data.stock_show_type, props.data.stock))
} }
return text.join(' | ') return text.join(' | ')
}) })
function clickGoods(mark) { function clickGoods(mark) {
if (mark === 'detail' || mark === 'edit') { if (mark === 'detail' || mark === 'edit') {
peach.$store('trade').$patch({ peach.$store('trade').$patch({
selectedProperty: null, selectedProperty: null,
goodsInfo: null, goodsInfo: null,
skus: null, skus: null,
specType: false, specType: false,
}) })
peach.$router.go('/pages/product/manageGoods', { peach.$router.go('/pages/product/manageGoods', {
id: props.data.id, id: props.data.id,
mark: mark, mark: mark,
title: mark === 'detail' ? '商品详情' : '编辑商品', title: mark === 'detail' ? '商品详情' : '编辑商品',
}) })
} else if (mark === 'del') { } else if (mark === 'del') {
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '是否删除该商品？', content: '是否删除该商品？',
success: async (res) => { success: async (res) => {
if (res.confirm) { if (res.confirm) {
await GoodsApi.delProduct({ id: props.data.id }) await GoodsApi.delProduct({ id: props.data.id })
uni.showToast({ uni.showToast({
title: '删除成功', title: '删除成功',
icon: 'none', icon: 'none',
}) })
emits('refresh') emits('refresh')
} }
}, },
}) })
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.ss-goods-wrap { .ss-goods-wrap {
.lg-goods-card { .lg-goods-card {
overflow: hidden; overflow: hidden;
position: relative; position: relative;
z-index: 1; z-index: 1;
background-color: $white; background-color: $white;
height: 280rpx; height: 280rpx;
.lg-img-box { .lg-img-box {
width: 280rpx; width: 280rpx;
height: 280rpx; height: 280rpx;
margin-right: 20rpx; margin-right: 20rpx;
}
.lg-goods-title {
font-size: 28rpx;
font-weight: 500;
color: #333333;
// line-height: 36rpx;
// width: 410rpx;
}
.lg-goods-subtitle {
font-size: 24rpx;
font-weight: 400;
color: #999999;
// line-height: 30rpx;
// width: 410rpx;
}
.lg-goods-price {
font-size: 30rpx;
color: $red;
line-height: 36rpx;
}
.sales-text {
display: table;
font-size: 24rpx;
transform: scale(0.8);
margin-left: 0rpx;
color: #c4c4c4;
}
} }
.btn-group { .lg-goods-title {
width: 140rpx; font-size: 28rpx;
height: 55rpx; font-weight: 500;
line-height: 55rpx; color: #333333;
background: var(--ui-BG-1); // line-height: 36rpx;
border-radius: 25rpx; // width: 410rpx;
font-size: 24rpx;
color: #000;
} }
.btn-del { .lg-goods-subtitle {
color: var(--ui-BG-Main); font-size: 24rpx;
background-color: var(--ui-BG-Main-opacity-1); font-weight: 400;
color: #999999;
// line-height: 30rpx;
// width: 410rpx;
} }
.lg-goods-price {
font-size: 30rpx;
color: $red;
line-height: 36rpx;
}
.sales-text {
display: table;
font-size: 24rpx;
transform: scale(0.8);
margin-left: 0rpx;
color: #c4c4c4;
}
}
.btn-group {
width: 140rpx;
height: 55rpx;
line-height: 55rpx;
background: var(--ui-BG-1);
border-radius: 25rpx;
font-size: 24rpx;
color: #000;
}
.btn-del {
color: var(--ui-BG-Main);
background-color: var(--ui-BG-Main-opacity-1);
}
} }
</style> </style>

44
peach/store/trade.js
View File

@ -2,32 +2,36 @@ import { ref, computed } from 'vue'
import { defineStore } from 'pinia' import { defineStore } from 'pinia'
const useTradeStore = defineStore('trade', () => { const useTradeStore = defineStore('trade', () => {
// 已选择规格类型 // 已选择规格类型
const selectedProperty = ref(null) const selectedProperty = ref(null)
// 商品信息 // 商品信息
const goodsInfo = ref(null) const goodsInfo = ref(null)
// 详情标记 // 详情标记
const detailTag = ref('edit') const detailTag = ref('edit')
// 规格类型，默认单规格 // 是否触发保存操作
const specType = ref(false) const isSave = ref(false)
// 商品属性 // 规格类型，默认单规格
const skus = ref(null) const specType = ref(false)
// 商品是否可编辑 // 商品属性
const canEdit = computed(() => (detailTag.value === 'detail' ? false : true)) const skus = ref(null)
return { // 商品是否可编辑
selectedProperty, const canEdit = computed(() => (detailTag.value === 'detail' ? false : true))
goodsInfo,
skus, return {
canEdit, selectedProperty,
detailTag, goodsInfo,
specType, skus,
} canEdit,
detailTag,
specType,
isSave,
}
}) })
export default useTradeStore export default useTradeStore