master
271556543@qq.com 3 years ago
parent c1309c01a0
commit a82e712f70

@ -1,7 +1,7 @@
<template> <template>
<div class="upload-container"> <div class="upload-container">
<el-button :style="{background:color,borderColor:color}" icon="el-icon-upload" size="mini" type="primary" @click=" dialogVisible=true"> <el-button :style="{background:color,borderColor:color}" icon="el-icon-upload" size="mini" type="primary" @click=" dialogVisible=true">
upload 上传
</el-button> </el-button>
<el-dialog :visible.sync="dialogVisible"> <el-dialog :visible.sync="dialogVisible">
<el-upload <el-upload
@ -16,14 +16,14 @@
list-type="picture-card" list-type="picture-card"
> >
<el-button size="small" type="primary"> <el-button size="small" type="primary">
Click upload 点击上传
</el-button> </el-button>
</el-upload> </el-upload>
<el-button @click="dialogVisible = false"> <el-button @click="dialogVisible = false">
Cancel 取消
</el-button> </el-button>
<el-button type="primary" @click="handleSubmit"> <el-button type="primary" @click="handleSubmit">
Confirm 确认
</el-button> </el-button>
</el-dialog> </el-dialog>
</div> </div>

@ -214,14 +214,14 @@ export default {
], ],
boss_phone:[ boss_phone:[
{ required: true, message: '请填写法人/老板电话', trigger: 'blur' }, { required: true, message: '请填写法人/老板电话', trigger: 'blur' },
{pattern: /^[1][3-9][\d]{9}/,message:'请输入正确手机号'} {pattern: /^[1][3-9][\d]{9}/,message:'手机号格式错误'}
], ],
contact:[ contact:[
{ required: true, message: '请填写联系人', trigger: 'blur' } { required: true, message: '请填写联系人', trigger: 'blur' }
], ],
phone:[ phone:[
{ required: true, message: '请填写联系人电话', trigger: 'blur' }, { required: true, message: '请填写联系人电话', trigger: 'blur' },
{pattern: /^[1][3-9][\d]{9}/,message:'请输入正确手机号'} {pattern: /^[1][3-9][\d]{9}/,message:'手机号格式错误'}
], ],
username:[ username:[
{ required: true, message: '请填写简称/用户名', trigger: 'blur' } { required: true, message: '请填写简称/用户名', trigger: 'blur' }

@ -147,7 +147,7 @@ export default {
], ],
contactNumber:[ contactNumber:[
{required:true,message:'请填写联系电话'}, {required:true,message:'请填写联系电话'},
{pattern: /^[1][3-9][\d]{9}/,message:'请输入正确手机号'} {pattern: /^[1][3-9][\d]{9}/,message:'手机号格式错误'}
], ],
address:[ address:[
{required:true,message:'请填写地址'} {required:true,message:'请填写地址'}

@ -98,7 +98,7 @@ export default {
], ],
money:[ money:[
{required:true,message:"请填写金额"}, {required:true,message:"请填写金额"},
{pattern:/^[0-9]+/,message:"请填写数字"} {pattern:/^[0-9]+/,message:"手机号格式错误"}
], ],
payment:[ payment:[
{required:true,message:"请选择支付方式"} {required:true,message:"请选择支付方式"}

@ -208,7 +208,7 @@ export default {
], ],
sort:[ sort:[
{required:true,message:"请填写排序"}, {required:true,message:"请填写排序"},
{pattern:/^[0-9]+/,message:"请填写数字"} {pattern:/^[0-9]+/,message:"手机号格式错误"}
], ],
effectDate:[ effectDate:[
{required:true,message:"请选择日期"} {required:true,message:"请选择日期"}
@ -428,11 +428,11 @@ export default {
border-radius: 6px; border-radius: 6px;
} }
.img__delete{ .img__delete{
transform: scale(0.8,0.8); transform: scale(0.7,0.7);
position: absolute; position: absolute;
top: 1px; top: 1px;
right: 12px; left: 2%;
} }
</style> </style>

@ -467,7 +467,7 @@ export default {
type:'success', type:'success',
message:'编辑商品成功' message:'编辑商品成功'
}) })
this.isShow = false this.isShow = false
this.$emit('refresh') this.$emit('refresh')
}) })
} }
@ -534,10 +534,10 @@ export default {
border-radius: 6px; border-radius: 6px;
} }
.img__delete{ .img__delete{
transform: scale(0.8,0.8); transform: scale(0.7,0.7);
position: absolute; position: absolute;
top: 1px; top: 1px;
right: 12px; left: 4%;
} }
</style> </style>

@ -6,10 +6,12 @@
<slot> <slot>
<div class="selector"> <div class="selector">
<div class="selector-item"> <div class="selector-item">
<div class="selector-item__label">产品名称</div>
<Input v-model="select.name" style="width: 200px;" placeholder="产品名称搜索" /> <Input v-model="select.name" style="width: 200px;" placeholder="产品名称搜索" />
</div> </div>
<div class="selector-item"> <div class="selector-item">
<Select clearable v-model="select.merchantId" style="width: 200px;" placeholder="所属商户"> <div class="selector-item__label">所属商户</div>
<Select clearable v-model="select.merchantId" style="width: 180px;" placeholder="所属商户">
<Scroll :on-reach-bottom="loadMoreMerchant"> <Scroll :on-reach-bottom="loadMoreMerchant">
<Option v-for="item in merchants" :value="item.id" :key="item.id"> <Option v-for="item in merchants" :value="item.id" :key="item.id">
{{item.name}} {{item.name}}
@ -18,15 +20,17 @@
</Select> </Select>
</div> </div>
<div class="selector-item"> <div class="selector-item">
<Select clearable style="width: 200px;" clearable placeholder="状态选择" v-model="select.state"> <div class="selector-item__label">状态选择</div>
<Select clearable style="width: 140px;" clearable placeholder="状态选择" v-model="select.state">
<Option v-for="item in [{value:'active',label:'已上架'},{label:'已下架',value:'inactive'}]" :value="item.value">{{item.label}}</Option> <Option v-for="item in [{value:'active',label:'已上架'},{label:'已下架',value:'inactive'}]" :value="item.value">{{item.label}}</Option>
</Select> </Select>
</div> </div>
<div class="selector-item"> <div class="selector-item">
<div class="selector-item__label">类别选择</div>
<el-cascader <el-cascader
clearable clearable
placeholder="类别选择" placeholder="类别选择"
style="width: 200px;" style="width: 180px;"
size="small" size="small"
:options="types" :options="types"
:show-all-levels="false" :show-all-levels="false"
@ -256,9 +260,15 @@ export default {
align-items: center; align-items: center;
align-content: center; align-content: center;
&-item{ &-item{
display: flex;
align-items: center;
margin-top: 6px; margin-top: 6px;
margin-right: 10px; margin-right: 10px;
&__label{
word-break: keep-all;
}
} }
} }

@ -56,7 +56,7 @@ export default {
], ],
phone:[ phone:[
{required:true,message:'请填写电话'}, {required:true,message:'请填写电话'},
{pattern: /^[1][3-9][\d]{9}/,message:'请输入正确手机号'} {pattern: /^[1][3-9][\d]{9}/,message:'手机号格式错误'}
] ]
} }
} }

Loading…
Cancel
Save