hz/ylst-pc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: bug

Browse Source 
1.1、商品->产品名称统一，名称、作品标签
1.8、品牌  文字内容设置入口打开
This commit is contained in:
wanganmao
2023-01-28 10:28:43 +08:00
parent 75a47bd726
commit 6d3e5789ea
10 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/Creative/3d/crossyo/shelves-vue-demo/view/ShopEditorDemo.vue
View File

@@ -40,7 +40,7 @@
<template #tab>
<span style="font-size: 16px;">
<img :src="BagSvg" />
商品
产品
</span>
</template>
</a-tab-pane>

2
src/views/Creative/3d/crossyo/shelves-vue/asset/icon2/image-add-ware.svg
View File

@@ -26,5 +26,5 @@
c-2.27,1.58-5.38,0.54-7.98,0.84c-4.4-0.22-9.35,0.94-13.1-2.02c0.92-1.66,2.09-3.17,3.49-4.44
C191.316,143.869,198.636,136.069,206.456,128.789z"/>
</g>
<text transform="matrix(1 0 0 1 173.1057 201.5)" fill="#6FB944" font-family="'AdobeHeitiStd-Regular-GBpc-EUC-H'" font-size="28">上传商品</text>
<text transform="matrix(1 0 0 1 173.1057 201.5)" fill="#6FB944" font-family="'AdobeHeitiStd-Regular-GBpc-EUC-H'" font-size="28">上传产品</text>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

4
src/views/Creative/3d/crossyo/shelves-vue/components/editor/TabListWare.vue
View File

@@ -1,7 +1,7 @@
<template>
<div class="yo-scrollbar" style="max-height: calc(100vh - 155px)">
<div class="yo-title-s16">商品库</div>
<a-input placeholder="请输入商品名" :value="searchText" @update:value="val => searchText = val">
<div class="yo-title-s16">产品库</div>
<a-input placeholder="请输入产品名" :value="searchText" @update:value="val => searchText = val">
<template #prefix>
<img :src="SearchSvg" />
</template>

12
src/views/Creative/3d/crossyo/shelves-vue/components/editor/TabPropCellWare.vue
View File

@@ -1,22 +1,22 @@
<template>
<div class="yo-scrollbar2" style="max-height: calc(100vh - 155px)">
<div v-if="cell" class="yo-title-s16">商品{{ cell.name }}设置</div>
<div v-if="cell" class="yo-title-s16">产品{{ cell.name }}设置</div>
<div v-if="cell" class="yo-content">
<!-- <div class="yo-title-s14">品牌</div>
<div class="yo-title-s14">品牌</div>
<a-input placeholder="请输入品牌名" v-model:value="cell.surveyLogo" @change="changeCellLogo">
</a-input>
<a-divider /> -->
<a-divider />
<div class="yo-title-s14">价签</div>
<a-input placeholder="请输入价格" v-model:value="cell.surveyPrice" @change="changeCellSign">
</a-input>
<a-divider />
<div class="yo-title-s14">商品数量
<div class="yo-title-s14">产品数量
<a-input-number class="yo-input-number-small" v-model:value="cell.pileNumber" :min="2"
:max="cell.maxPileNumber__" :step="2" controls-position="right" style="float: right;"
@change="changeCellPileNumber" />
</div>
<a-divider />
<div class="yo-title-s14">商品方向
<div class="yo-title-s14">产品方向
<a-input-number class="yo-input-number-small" v-model:value="cell.pileRotationY" :min="-180" :max="180"
:step="1" controls-position="right" style="float: right;" @change="changeCellPileRotationY" />
</div>
@@ -24,7 +24,7 @@
@change="changeCellPileRotationY" />
<a-divider />
<a-button class="yo-btn-green" type="primary" @click="changeCellRemoveWare">删除商品</a-button>
<a-button class="yo-btn-green" type="primary" @click="changeCellRemoveWare">删除产品</a-button>
</div>
<div v-else class="empty1">请先选择一个货位</div>

4
src/views/Creative/MyCreation.vue
View File

@@ -114,7 +114,7 @@
<div v-if="[0, 3].includes(current[0])" class="empty-new">
<img src="@/assets/creative/3dmodel.png" alt="">
<div class="title">
3D商品模型
3D产品模型
</div>
<div class="desc">
720°立体3D建模，高拟真产品效果展示
@@ -223,7 +223,7 @@ const createToMaterial = (row) => {
Modal.confirm({
title: "添加到素材库",
content: "确认将此3D商品模型添加到素材库？",
content: "确认将此3D产品模型添加到素材库？",
async onOk () {
const data = row.materials[0].space_json;

2
src/views/Creative/components/ChooseMaterialForEmpty3D.vue
View File

@@ -13,7 +13,7 @@
<img v-if="formData.imageUrl" :src="formData.imageUrl" alt="avatar" style="width: 100%;"/>
<div v-else>
<UploadOutlined />
<div class="ant-upload-text">上传商品贴图</div>
<div class="ant-upload-text">上传产品贴图</div>
</div>
</a-upload>
<div style="padding: 40px;">

2
src/views/Creative/components/CreateCreative/Creative.constant.js
View File

@@ -19,7 +19,7 @@ export const CREATIVE_TYPE_S = [
},
{
type: CREATIVE_TYPE.MODEL_3D,
name: "3D商品模型",
name: "3D产品模型",
color: "#FF374F",
bgColor: "rgba(255,55,79,0.2)",
},

4
src/views/Creative/components/CreateCreative/ThreedCreative.vue
View File

@@ -4,7 +4,7 @@
<a-step title="作品信息" />
<a-step title="选择环境" />
<a-step title="选择货架" />
<a-step title="选择商品" />
<a-step title="选择产品" />
</a-steps>
<a-form ref="formNameRef" v-if="step==0" :label-col="{ span: 6 }" :wrapper-col="{ span: 14 }" :model="formData" :rules="rules" style="margin: 40px 0;">
<a-form-item label="作品名称" name="title">
@@ -139,7 +139,7 @@ const ok = async () => {
}
if(step.value == 3) {
if(formData.value.data.wares.length <= 0) {
message.warning("请选择商品")
message.warning("请选择产品")
return;
}
}

2
src/views/Creative/components/CreateMaterial/Material.constant.js
View File

@@ -33,7 +33,7 @@ export const THREE_D_TYPE_S = [
// },
{
type: THREE_D_TYPE.WARE,
name: "商品模型",
name: "产品模型",
color: "#F3C100",
},
// {

2
src/views/Creative/components/PreviewerCreation/Model3DPreviewer.vue
View File

@@ -1,5 +1,5 @@
<template>
<a-modal v-model:visible="visible" title="3D商品模型" width="1000px" @ok="ok" :footer="null">
<a-modal v-model:visible="visible" title="3D产品模型" width="1000px" @ok="ok" :footer="null">
<iframe v-if="visible" :src="url" frameborder="0" style="width: 100%; height: 500px;"></iframe>
</a-modal>
</template>