Skip to content

M
mallapp
Commit ba457b23 authored by 罗超's avatar 罗超
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

parents bba97c6f d9fd993f
Show whitespace changes
Inline Side-by-side
Showing with 108 additions and 71 deletions
pages/kotra/BrandEnterSetIn/components/brandInformation.vue
View file @ ba457b23
...@@ -398,14 +398,13 @@ ...@@ -398,14 +398,13 @@
} }
if(this.datas.CompanyStatus==1){ if(this.datas.CompanyStatus==1){
this.disabled2 = true // this.disabled2 = true
} }
if(this.model.ExistBrandId>0){ if(this.model.ExistBrandId>0){
this.disabled2 = true // this.disabled2 = true
this.disabled3 = true // this.disabled3 = true
} }
this.BrandClassName = data.ClassName;
}else{ }else{
this.model.CompanyId = this.datas.CompanyId this.model.CompanyId = this.datas.CompanyId
} }
...@@ -614,23 +613,23 @@ ...@@ -614,23 +613,23 @@
}, },
brandSubmit(){ brandSubmit(){
if(this.model.BrandClassId== ''){ if(this.model.BrandClassId== ''||!this.model.BrandClassId){
uni.showToast({title: '请选择品牌分类',icon: 'none',}) uni.showToast({title: '请选择品牌分类',icon: 'none',})
return return
} }
if(this.model.BrandName == ''){ if(this.model.BrandName == ''||!this.model.BrandName){
uni.showToast({title: '请输入品牌名',icon: 'none',}) uni.showToast({title: '请输入品牌名',icon: 'none',})
return return
} }
if(this.model.FullBrandName == ''){ if(this.model.FullBrandName == ''||!this.model.FullBrandName){
uni.showToast({title: '请输入品牌全名',icon: 'none',}) uni.showToast({title: '请输入品牌全名',icon: 'none',})
return return
} }
if(this.model.Logo == ''){ if(this.model.Logo == ''||!this.model.Logo){
uni.showToast({title: '请上传Logo',icon: 'none',}) uni.showToast({title: '请上传Logo',icon: 'none',})
return return
} }
if(this.model.BannerList.length == 0){ if(this.model.BannerList.length == 0||!this.model.BannerList){
uni.showToast({title: '请上传品牌介绍图',icon: 'none',}) uni.showToast({title: '请上传品牌介绍图',icon: 'none',})
return return
} }
...@@ -638,14 +637,14 @@ ...@@ -638,14 +637,14 @@
this.model.ShopNum = 0 this.model.ShopNum = 0
} }
if(this.model.AreaRequirement=='' ){ if(this.model.AreaRequirement==''){
this.model.AreaRequirement = 0 this.model.AreaRequirement = 0
} }
if(this.model.CustomerType=='' ){ if(this.model.CustomerType==''||!this.model.CustomerType){
uni.showToast({title: '客群定位不能为空',icon: 'none',}) uni.showToast({title: '客群定位不能为空',icon: 'none',})
return return
} }
if(this.model.BrandType=='' ){ if(this.model.BrandType==''||!this.model.BrandType){
uni.showToast({title: '品牌定位不能为空',icon: 'none',}) uni.showToast({title: '品牌定位不能为空',icon: 'none',})
return return
} }
......
pages/kotra/BrandEnterSetIn/components/buildingInformation.vue
View file @ ba457b23
...@@ -59,6 +59,35 @@ ...@@ -59,6 +59,35 @@
height: auto; height: auto;
} }
} }
.u-action-sheet-item {
display: flex;
line-height: 1;
justify-content: center;
align-items: center;
font-size: 14px;
padding: 34rpx 0;
}
.pubox{
width: 100%;
}
.pubox-top{
width: 100%;
height: 45px;
display: flex;
align-items: center;
justify-content: space-between;
font-size: 14px;
color: #111;
}
.u-gab {
height: 12rpx;
background-color: rgb(234, 234, 236);
}
.u-actionsheet-cancel {
color: $u-main-color;
}
} }
</style> </style>
...@@ -110,12 +139,12 @@ ...@@ -110,12 +139,12 @@
overflow: hidden; overflow: hidden;
margin-right: 5px; margin-right: 5px;
" "
v-if="model.Address != ''" v-if="model.Address"
>{{ model.Address }}</text >{{ model.Address }}</text
> >
<text <text
style="width: 1px; flex: 1; color: #cecece" style="width: 1px; flex: 1; color: #cecece"
v-if="model.Address == ''" v-if="!model.Address"
>请选择地址</text >请选择地址</text
> >
<u-icon name="arrow" color="#A5A4AC" size="30"></u-icon> <u-icon name="arrow" color="#A5A4AC" size="30"></u-icon>
...@@ -172,9 +201,16 @@ ...@@ -172,9 +201,16 @@
</view> </view>
<view class="bottom-border"> <view class="bottom-border">
<view class="label-text">楼宇等级<span style='color: #E54D42;' >*</span></view> <view class="label-text">楼宇等级<span style='color: #E54D42;' >*</span></view>
<view class="bottom-border_r" style="padding: 10px 0;height: 42px;display: flex;" @click="disabled || disabled2?'':showTypeStatus= true"> <view class="bottom-border_r" style="padding: 10px 0;height: 42px;display: flex;"
<input type="text" v-model="BrandClassName" :disabled="true" style="padding: 10px 0;width: 1px;flex:1" @click="disabled || disabled2?'':showTypeStatus= true">
placeholder="请选择楼宇等级" placeholder-style="color:#CECECE;"> <view style="padding: 10px 0;width: 1px;flex:1">
<template v-if="CategoryName">
{{CategoryName}}
</template>
<text v-else style="color:#CECECE;">
请选择楼宇等级
</text>
</view>
<u-icon name="arrow" color="#A5A4AC" size="30" ></u-icon> <u-icon name="arrow" color="#A5A4AC" size="30" ></u-icon>
</view> </view>
<u-popup v-model="showTypeStatus" mode="bottom" > <u-popup v-model="showTypeStatus" mode="bottom" >
...@@ -258,19 +294,6 @@ ...@@ -258,19 +294,6 @@
placeholder-style="color:#CECECE;" placeholder-style="color:#CECECE;"
/> />
</view> </view>
<view class="bottom-border">
<view class="label-text"
>开发商<span style="color: #e54d42">*</span></view
>
<input
type="text"
v-model="model.Developers"
:disabled="disabled"
style="padding: 10px 0"
placeholder="请填写开发商"
placeholder-style="color:#CECECE;"
/>
</view>
<view class="bottom-border"> <view class="bottom-border">
<view class="label-text" <view class="label-text"
>物业公司<span style="color: #e54d42">*</span></view >物业公司<span style="color: #e54d42">*</span></view
...@@ -343,16 +366,22 @@ ...@@ -343,16 +366,22 @@
</view> </view>
<view class="bottom-border"> <view class="bottom-border">
<view class="label-text">月租金</view> <view class="label-text">月租金</view>
<view
class="bottom-border_r"
style="padding: 10px 0; height: 42px; display: flex"
>
<input <input
type="number" type="number"
v-model="model.RentFee" v-model="model.RentFee"
:disabled="disabled" :disabled="disabled"
style="padding: 10px 0" style="padding: 10px 0;flex: 1;margin-right: 10px;"
placeholder="请填写月租金" placeholder="请填写月租金"
placeholder-style="color:#CECECE;" placeholder-style="color:#CECECE;"
/> />
<span>元/m²</span> <span>元/m²</span>
</view> </view>
</view>
<view class="bottom-border"> <view class="bottom-border">
<view class="label-text">产业方向</view> <view class="label-text">产业方向</view>
<textarea <textarea
...@@ -468,7 +497,7 @@ export default { ...@@ -468,7 +497,7 @@ export default {
Other:"",// 其他需求 Other:"",// 其他需求
ContactName:"",// 联系人 ContactName:"",// 联系人
ContactPhone:"",// 联系电话 ContactPhone:"",// 联系电话
BannerList:"",// 楼宇图片 BannerList:[],// 楼宇图片
CompanyId:"",// 认证id CompanyId:"",// 认证id
}, },
showOpenTime: false, showOpenTime: false,
...@@ -501,6 +530,7 @@ export default { ...@@ -501,6 +530,7 @@ export default {
{value: 1,name:'是'}, {value: 1,name:'是'},
{value: 0,name:'否'}, {value: 0,name:'否'},
], ],
showTypeStatus: false,
}; };
}, },
onLoad(options) { onLoad(options) {
...@@ -523,6 +553,7 @@ export default { ...@@ -523,6 +553,7 @@ export default {
) { ) {
//判断是否填写过了 //判断是否填写过了
this.model = this.datas.buildingApplyForModel this.model = this.datas.buildingApplyForModel
this.CategoryName = this.model.CategoryName;
this.model.CompanyId = this.datas.CompanyId; this.model.CompanyId = this.datas.CompanyId;
let data = this.datas.buildingApplyForModel; let data = this.datas.buildingApplyForModel;
// this.model = this.datas.CarrierModel // this.model = this.datas.CarrierModel
...@@ -557,17 +588,22 @@ export default { ...@@ -557,17 +588,22 @@ export default {
this.disabled = true; this.disabled = true;
} }
if (this.datas.CompanyStatus == 1) { if (this.datas.CompanyStatus == 1) {
this.disabled2 = true; // this.disabled2 = true;
} }
if (this.model.ExistCarrierId > 0) { if (this.model.CategoryId > 0) {
this.disabled2 = true; // this.disabled2 = true;
this.glCarrierName = this.model.CarrierName;
} }
} else { } else {
this.model.CompanyId = this.datas.CompanyId this.model.CompanyId = this.datas.CompanyId
} }
}, },
methods: { methods: {
clickItem(x) {//类型选择
this.model.CategoryId = x.ID
this.CategoryName = x.ClassName
this.showTypeStatus = false
},
radioChange(evt) { radioChange(evt) {
for (let i = 0; i < this.OperateList; i++) { for (let i = 0; i < this.OperateList; i++) {
if (this.OperateList[i].value === evt.detail.value) { if (this.OperateList[i].value === evt.detail.value) {
...@@ -794,15 +830,15 @@ export default { ...@@ -794,15 +830,15 @@ export default {
}); });
}, },
carrierSubmit() { carrierSubmit() {
if (this.model.Name == "") { if (this.model.Name == ""||!this.model.Name) {
uni.showToast({ title: "请输入楼宇名称", icon: "none" }); uni.showToast({ title: "请输入楼宇名称", icon: "none" });
return; return;
} }
if (this.model.Developers == "") { if (this.model.Developers == ""||!this.model.Developers) {
uni.showToast({ title: "请输入开发商", icon: "none" }); uni.showToast({ title: "请输入开发商", icon: "none" });
return; return;
} }
if (this.model.Address == "") { if (this.model.Address == ""||!this.model.Address) {
uni.showToast({ title: "请输入楼宇位置", icon: "none" }); uni.showToast({ title: "请输入楼宇位置", icon: "none" });
return; return;
} }
...@@ -810,19 +846,23 @@ export default { ...@@ -810,19 +846,23 @@ export default {
uni.showToast({ title: "请输入面积", icon: "none" }); uni.showToast({ title: "请输入面积", icon: "none" });
return; return;
} }
if (this.model.BannerList.length == 0) { if (this.model.BannerList.length == 0||!this.model.BannerList) {
uni.showToast({ title: "请上传品牌介绍图", icon: "none" }); uni.showToast({ title: "请上传品牌介绍图", icon: "none" });
return; return;
} }
if (!this.model.CategoryId) { if (this.model.CategoryId==""||!this.model.CategoryId) {
uni.showToast({ title: "请选择楼宇等级", icon: "none" }); uni.showToast({ title: "请选择楼宇等级", icon: "none" });
return; return;
} }
if (this.model.OperationTime == "") { if (this.model.OperationTime == ""||!this.model.OperationTime) {
uni.showToast({ title: "请选择投运时间", icon: "none" }); uni.showToast({ title: "请选择投运时间", icon: "none" });
return; return;
} }
if (this.model.PropertyComp == ""||!this.model.PropertyComp) {
uni.showToast({ title: "请填写物业公司", icon: "none" });
return;
}
console.log(this.model, "保存"); console.log(this.model, "保存");
uni.showLoading({ uni.showLoading({
title: "提交中...", title: "提交中...",
......
pages/kotra/BrandEnterSetIn/components/carrierInformation.vue
View file @ ba457b23
...@@ -664,11 +664,10 @@ export default { ...@@ -664,11 +664,10 @@ export default {
this.disabled = true; this.disabled = true;
} }
if (this.datas.CompanyStatus == 1) { if (this.datas.CompanyStatus == 1) {
this.disabled2 = true; // this.disabled2 = true;
} }
if (this.model.ExistCarrierId > 0) { if (this.model.ExistCarrierId > 0) {
this.disabled2 = true; // this.disabled2 = true;
this.glCarrierName = this.model.CarrierName;
} }
} else { } else {
this.model.CompanyId = this.datas.CompanyId; this.model.CompanyId = this.datas.CompanyId;
...@@ -919,19 +918,19 @@ export default { ...@@ -919,19 +918,19 @@ export default {
}); });
}, },
carrierSubmit() { carrierSubmit() {
if (this.model.CarrierName == "") { if (this.model.CarrierName == ""||!this.model.CarrierName) {
uni.showToast({ title: "请输入载体名", icon: "none" }); uni.showToast({ title: "请输入载体名", icon: "none" });
return; return;
} }
if (this.model.Developers == "") { if (this.model.Developers == ""||!this.model.Developers) {
uni.showToast({ title: "请输入开发商", icon: "none" }); uni.showToast({ title: "请输入开发商", icon: "none" });
return; return;
} }
if (this.model.Address == "") { if (this.model.Address == ""||!this.model.Address) {
uni.showToast({ title: "请输入项目地址", icon: "none" }); uni.showToast({ title: "请输入项目地址", icon: "none" });
return; return;
} }
if (this.model.Logo == "") { if (this.model.Logo == ""||!this.model.Logo) {
uni.showToast({ title: "请上传Logo", icon: "none" }); uni.showToast({ title: "请上传Logo", icon: "none" });
return; return;
} }
...@@ -946,7 +945,7 @@ export default { ...@@ -946,7 +945,7 @@ export default {
uni.showToast({ title: "请输入可租赁面积", icon: "none" }); uni.showToast({ title: "请输入可租赁面积", icon: "none" });
return; return;
} }
if (this.model.BannerList.length == 0) { if (this.model.BannerList.length == 0||!this.model.BannerList) {
uni.showToast({ title: "请上传品牌介绍图", icon: "none" }); uni.showToast({ title: "请上传品牌介绍图", icon: "none" });
return; return;
} }
...@@ -954,11 +953,11 @@ export default { ...@@ -954,11 +953,11 @@ export default {
// if (this.model.CarNum == "") { // if (this.model.CarNum == "") {
// this.model.CarNum = 0; // this.model.CarNum = 0;
// } // }
if (this.model.OpenTime == "") { if (this.model.OpenTime == ""||!this.model.OpenTime) {
uni.showToast({ title: "请输入开业时间", icon: "none" }); uni.showToast({ title: "请输入开业时间", icon: "none" });
return; return;
} }
if (this.model.CarrierSize == "") { if (this.model.CarrierSize == ""||!this.model.CarrierSize) {
uni.showToast({ title: "请输入商业体量", icon: "none" }); uni.showToast({ title: "请输入商业体量", icon: "none" });
return; return;
} }
......
pages/kotra/BrandEnterSetIn/components/enterInformation.vue
View file @ ba457b23
...@@ -390,7 +390,7 @@ ...@@ -390,7 +390,7 @@
model:{ model:{
ID:"",// 企业服务主键Id ID:"",// 企业服务主键Id
Name:"",// 企业名称 Name:"",// 企业名称
BannerList:"",// 企业图片 BannerList: [],// 企业图片
Introduction:"",// 企业简介 Introduction:"",// 企业简介
DevIntention:"",// 企业发展意向 DevIntention:"",// 企业发展意向
Address:"",// 楼宇位置 Address:"",// 楼宇位置
...@@ -483,12 +483,12 @@ ...@@ -483,12 +483,12 @@
} }
if(this.datas.CompanyStatus==1){ if(this.datas.CompanyStatus==1){
this.disabled2 = true // this.disabled2 = true
} }
if(this.model.ExistBrandId>0){ if(this.model.ExistBrandId>0){
this.disabled2 = true // this.disabled2 = true
this.disabled3 = true // this.disabled3 = true
} }
}else{ }else{
this.model.CompanyId = this.datas.CompanyId this.model.CompanyId = this.datas.CompanyId
...@@ -624,7 +624,6 @@ ...@@ -624,7 +624,6 @@
uploadSuccessHandler(data, index, lists) { uploadSuccessHandler(data, index, lists) {
let r = JSON.parse(data); let r = JSON.parse(data);
this.model.BannerList.push(r.data); this.model.BannerList.push(r.data);
console.log(this.model.BannerList,'----333')
}, },
uploadcard(){ uploadcard(){
uni.chooseImage({ uni.chooseImage({
...@@ -770,19 +769,19 @@ ...@@ -770,19 +769,19 @@
}) })
}, },
brandSubmit(){ brandSubmit(){
if(!this.model.EType){ if(this.model.EType==""||!this.model.EType){
uni.showToast({title: '请选择企业类别',icon: 'none',}) uni.showToast({title: '请选择企业类别',icon: 'none',})
return return
} }
if(this.model.Name == ''){ if(this.model.Name == ''||!this.model.Name){
uni.showToast({title: '请输入企业名称',icon: 'none',}) uni.showToast({title: '请输入企业名称',icon: 'none',})
return return
} }
if(this.model.BannerList.length == 0){ if(this.model.BannerList.length == 0||!this.model.BannerList){
uni.showToast({title: '请上传企业介绍图',icon: 'none',}) uni.showToast({title: '请上传企业介绍图',icon: 'none',})
return return
} }
if(!this.model.CategoryId){ if(this.model.CategoryId==""||!this.model.CategoryId){
uni.showToast({title: '请选择楼宇等级',icon: 'none',}) uni.showToast({title: '请选择楼宇等级',icon: 'none',})
return return
} }
...@@ -797,11 +796,11 @@ ...@@ -797,11 +796,11 @@
if( this.model.RentFee==''){ if( this.model.RentFee==''){
this.model.RentFee = 0 this.model.RentFee = 0
} }
if(!this.model.ContactName){ if(this.model.ContactName==""||!this.model.ContactName){
uni.showToast({title: '请填写联系人',icon: 'none',}) uni.showToast({title: '请填写联系人',icon: 'none',})
return return
} }
if(!this.model.ContactPhone){ if(this.model.ContactPhone==""||!this.model.ContactPhone){
uni.showToast({title: '请填写联系人电话',icon: 'none',}) uni.showToast({title: '请填写联系人电话',icon: 'none',})
return return
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment