mirror of
https://gitee.com/beijing_hongye_huicheng/lilishop-ui.git
synced 2025-12-18 08:55:52 +08:00
bug修改
This commit is contained in:
mabo
@@ -18,14 +18,14 @@ export default {
|
||||
* @description api请求基础路径
|
||||
*/
|
||||
api_dev: {
|
||||
common: 'https://common-api.pickmall.cn',
|
||||
buyer: 'https://buyer-api.pickmall.cn',
|
||||
seller: 'https://store-api.pickmall.cn',
|
||||
manager: 'https://admin-api.pickmall.cn',
|
||||
// common: 'http://192.168.0.109:8890',
|
||||
// buyer: 'http://192.168.0.109:8888',
|
||||
// seller: 'http://192.168.0.109:8889',
|
||||
// manager: 'http://192.168.0.109:8887'
|
||||
// common: 'https://common-api.pickmall.cn',
|
||||
// buyer: 'https://buyer-api.pickmall.cn',
|
||||
// seller: 'https://store-api.pickmall.cn',
|
||||
// manager: 'https://admin-api.pickmall.cn',
|
||||
common: 'http://192.168.0.106:8890',
|
||||
buyer: 'http://192.168.0.106:8888',
|
||||
seller: 'http://192.168.0.106:8889',
|
||||
manager: 'http://192.168.0.106:8887'
|
||||
|
||||
},
|
||||
api_prod: {
|
||||
|
||||
@@ -77,10 +77,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
/*平铺*/
|
||||
div.base-info-item > div {
|
||||
margin-left: 5%;
|
||||
}
|
||||
|
||||
div.base-info-item {
|
||||
h4 {
|
||||
@@ -94,13 +90,15 @@ div.base-info-item {
|
||||
line-height: 40px;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
>div{
|
||||
padding-left: 5%;
|
||||
}
|
||||
.form-item-view {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: flex-start;
|
||||
justify-content: space-between;
|
||||
padding-left: 80px;
|
||||
// padding-left: 80px;
|
||||
|
||||
.layout {
|
||||
margin-bottom: 20px;
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
</template>
|
||||
</div>
|
||||
|
||||
<div class="content-goods-publish" v-show="activestep === 1">
|
||||
<div class="content-goods-publish" style="min-width:1350px;" v-show="activestep === 1">
|
||||
<Form ref="baseInfoForm" :model="baseInfoForm" :label-width="120" :rules="baseInfoFormRule">
|
||||
<div class="base-info-item">
|
||||
<h4>基本信息</h4>
|
||||
@@ -255,18 +255,24 @@
|
||||
<img v-if="previewPicture !== ''" :src="previewPicture"/>
|
||||
</div>
|
||||
<Divider/>
|
||||
<div class="sku-upload-list" v-for="(img, __index) in selectedSku.images" :key="__index">
|
||||
<template v-if="img.status === 'finished'">
|
||||
<img :src="img.url"/>
|
||||
<div class="sku-upload-list-cover">
|
||||
<Icon type="ios-eye-outline" @click="handleView(img.url)"></Icon>
|
||||
<Icon type="ios-trash-outline" @click="handleRemove(img, __index)"></Icon>
|
||||
</div>
|
||||
</template>
|
||||
<template v-else>
|
||||
<Progress v-if="img.showProgress" :percent="img.percentage" hide-info></Progress>
|
||||
</template>
|
||||
</div>
|
||||
<vuedraggable
|
||||
:list="selectedSku.images"
|
||||
:animation="200"
|
||||
style="display:inline-block;"
|
||||
>
|
||||
<div class="sku-upload-list" v-for="(img, __index) in selectedSku.images" :key="__index">
|
||||
<template v-if="img.status === 'finished'">
|
||||
<img :src="img.url"/>
|
||||
<div class="sku-upload-list-cover">
|
||||
<Icon type="ios-eye-outline" @click="handleView(img.url)"></Icon>
|
||||
<Icon type="ios-trash-outline" @click="handleRemove(img, __index)"></Icon>
|
||||
</div>
|
||||
</template>
|
||||
<template v-else>
|
||||
<Progress v-if="img.showProgress" :percent="img.percentage" hide-info></Progress>
|
||||
</template>
|
||||
</div>
|
||||
</vuedraggable>
|
||||
<Upload ref="uploadSku" :show-upload-list="false" :default-file-list="row.images"
|
||||
:on-success="handleSuccess" :format="['jpg', 'jpeg', 'png']"
|
||||
:on-format-error="handleFormatError" :on-exceeded-size="handleMaxSize"
|
||||
@@ -297,6 +303,7 @@
|
||||
<Tree
|
||||
ref="tree"
|
||||
:data="shopCategory"
|
||||
style="text-align:left;"
|
||||
show-checkbox
|
||||
@on-select-change="selectTree"
|
||||
@on-check-change="changeSelect"
|
||||
@@ -305,7 +312,7 @@
|
||||
</FormItem>
|
||||
</div>
|
||||
<FormItem class="form-item-view-el" label="商品描述" prop="intro">
|
||||
<editor id="intro" v-model="baseInfoForm.intro"></editor>
|
||||
<editor id="intro" showExpand v-model="baseInfoForm.intro"></editor>
|
||||
</FormItem>
|
||||
<FormItem class="form-item-view-el" label="移动端描述" prop="skuList">
|
||||
<editor id="mobileIntr" v-model="baseInfoForm.mobileIntro"></editor>
|
||||
|
||||
@@ -3,9 +3,7 @@
|
||||
width: 180px;
|
||||
display: flex;
|
||||
}
|
||||
.ivu-menu-vertical .ivu-menu-item-group-title {
|
||||
padding-left: 5px;
|
||||
}
|
||||
|
||||
.ivu-btn-text:hover {
|
||||
background-color: rgba(255,255,255,.2) !important;
|
||||
}
|
||||
@@ -21,3 +19,8 @@
|
||||
.ivu-menu-dark.ivu-menu-vertical .ivu-menu-item-active:not(.ivu-menu-submenu), .ivu-menu-dark.ivu-menu-vertical .ivu-menu-submenu-title-active:not(.ivu-menu-submenu){
|
||||
color: #ed3f14;
|
||||
}
|
||||
/deep/.ivu-menu-vertical .ivu-menu-item-group-title {
|
||||
height: 40px;
|
||||
line-height: 40px;
|
||||
padding-left: 20px;
|
||||
}
|
||||
@@ -90,7 +90,6 @@ export default {
|
||||
initEditor() {
|
||||
let that = this;
|
||||
this.editor = new E(`#${this.id}`);
|
||||
|
||||
// 编辑内容绑定数据
|
||||
this.editor.config.onchange = (html) => {
|
||||
if (this.openXss) {
|
||||
@@ -195,6 +194,7 @@ export default {
|
||||
});
|
||||
},
|
||||
setData(value) {
|
||||
// 设置数据
|
||||
if (!this.editor) {
|
||||
this.initEditor();
|
||||
}
|
||||
@@ -204,15 +204,14 @@ export default {
|
||||
this.$emit("input", this.data);
|
||||
this.$emit("on-change", this.data);
|
||||
}
|
||||
},
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
value: {
|
||||
immediate: true,
|
||||
handler: function (val) {
|
||||
|
||||
this.setData(val);
|
||||
}
|
||||
},
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
@@ -231,6 +230,10 @@ export default {
|
||||
color: #333;
|
||||
}
|
||||
}
|
||||
.w-e-toolbar {
|
||||
// 给工具栏换行
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
.e-code {
|
||||
top: 6px;
|
||||
left: 976px;
|
||||
|
||||
@@ -79,13 +79,11 @@ export default {
|
||||
{
|
||||
title: "活动名称",
|
||||
key: "promotionName",
|
||||
minWidth: 100,
|
||||
fixed: "left",
|
||||
},
|
||||
{
|
||||
title: "优惠券名称",
|
||||
key: "couponName",
|
||||
minWidth: 100,
|
||||
tooltip: true,
|
||||
},
|
||||
{
|
||||
@@ -107,18 +105,16 @@ export default {
|
||||
{
|
||||
title: "领取数量/总数量",
|
||||
key: "publishNum",
|
||||
width: 130,
|
||||
render: (h, params) => {
|
||||
return h(
|
||||
"div",
|
||||
params.row.receivedNum + "/" + params.row.publishNum
|
||||
params.row.receivedNum + "/" + (params.row.publishNum === 0 ? '无限制' : params.row.publishNum)
|
||||
);
|
||||
},
|
||||
},
|
||||
{
|
||||
title: "优惠券类型",
|
||||
key: "couponType",
|
||||
width: 120,
|
||||
render: (h, params) => {
|
||||
let text = "未知";
|
||||
if (params.row.couponType === "DISCOUNT") {
|
||||
@@ -195,8 +191,7 @@ export default {
|
||||
text
|
||||
),
|
||||
]);
|
||||
},
|
||||
minWidth: 70,
|
||||
}
|
||||
},
|
||||
{
|
||||
title: "操作",
|
||||
|
||||
@@ -180,11 +180,11 @@ export default {
|
||||
],
|
||||
publishNum: [
|
||||
{ required: true, message: "请输入发放数量" },
|
||||
{ pattern: regular.integer, message: "请输入正整数" },
|
||||
{ pattern: regular.Integer, message: "请输入正整数" },
|
||||
],
|
||||
couponLimitNum: [
|
||||
{ required: true, message: "请输入领取限制" },
|
||||
{ pattern: regular.integer, message: "请输入正整数" },
|
||||
{ pattern: regular.Integer, message: "请输入正整数" },
|
||||
],
|
||||
description: [{ required: true, message: "请输入范围描述" }],
|
||||
},
|
||||
|
||||
@@ -277,6 +277,7 @@ export default {
|
||||
|
||||
// 将数据回调到liveform里面
|
||||
if (result.success) {
|
||||
console.log(result);
|
||||
let data = result.result;
|
||||
for (let key in data) {
|
||||
this.liveForm[key] = data[key];
|
||||
@@ -494,11 +495,12 @@ export default {
|
||||
this.$refs["liveForm"].validate((valid) => {
|
||||
if (valid) {
|
||||
// 需判断当前是否是添加商品
|
||||
if (this.$route.query.id && this.liveData.length != 0) {
|
||||
if (this.$route.query.id) {
|
||||
this.spinShow = true;
|
||||
this.liveForm.commodityList = JSON.stringify(
|
||||
this.liveForm.commodityList
|
||||
);
|
||||
delete this.liveForm.updateTime
|
||||
// 将当前直播间修改
|
||||
editLive(this.liveForm).then((res) => {
|
||||
if (res.success) {
|
||||
|
||||
Reference in New Issue
Block a user