Skip to content

M
mallapp
Commit 35cdf5ac authored by Mac's avatar Mac
Browse files
Options

1

parent 663f1ef9
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 14 deletions
pages/kotra/brandInformation.vue
View file @ 35cdf5ac
...@@ -121,14 +121,15 @@ ...@@ -121,14 +121,15 @@
</view> </view>
</u-popup> </u-popup>
</view> </view>
<view class="bottom-border">
<view class="label-text">品牌全名 <span style='color: #E54D42;' >*</span></view>
<input type="text" v-model="model.FullBrandName" style="padding: 10px 0;" placeholder="请填写品牌全名" :disabled="disabled||disabled2?true:false" placeholder-style="color:#CECECE;">
</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>
<input type="text" v-model="model.BrandName" style="padding: 10px 0;" placeholder="请填写品牌名" :disabled="disabled|| disabled2?true:false" placeholder-style="color:#CECECE;"> <input type="text" v-model="model.BrandName" style="padding: 10px 0;" placeholder="请填写品牌名" :disabled="disabled|| disabled2?true:false" 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.FullBrandName" style="padding: 10px 0;" placeholder="请填写品牌全名" :disabled="disabled||disabled2?true:false" placeholder-style="color:#CECECE;">
</view>
<view class="label-text" style="margin-top:20px;margin-bottom: 30rpx;"> <view class="label-text" style="margin-top:20px;margin-bottom: 30rpx;">
<text>Logo</text> <text>Logo</text>
</view> </view>
...@@ -429,11 +430,45 @@ ...@@ -429,11 +430,45 @@
this.model.CompanyId = this.datas.CompanyId this.model.CompanyId = this.datas.CompanyId
if(this.datas.CompanyStatus!=undefined && this.datas.IsComplete != undefined){//判断是否填写过了 if(this.datas.CompanyStatus!=undefined && this.datas.IsComplete != undefined){//判断是否填写过了
this.model = this.datas.BrandModel // this.model = this.datas.BrandModel
this.model.CompanyId = this.datas.CompanyId this.model.CompanyId = this.datas.CompanyId
// if(this.model.OpenShopWish==-1){ let data = this.datas.BrandModel
// this.ShopWish == 0; this.model.ID = data.ID?data.ID:0;
// }; this.model.ExistBrandId = data.ExistBrandId?data.ExistBrandId:0;
this.model.Logo = data.Logo?data.Logo:'';
this.model.BannerList = data.BannerList?data.BannerList:[];
this.model.VideoUrl = data.VideoUrl?data.VideoUrl:'';
this.model.FullBrandName = data.FullBrandName?data.FullBrandName:'';
this.model.BrandName = data.BrandName?data.BrandName:'';
this.model.ShopNum = data.ShopNum?data.ShopNum:'';
this.model.BuiltUpArea = data.BuiltUpArea?data.BuiltUpArea:0;
this.model.EndBuiltUpArea = data.EndBuiltUpArea?data.EndBuiltUpArea:0;
this.model.CustomerType = data.CustomerType?data.CustomerType:'';
this.model.BrandType = data.BrandType?data.BrandType:'';
this.model.StoreExpansion = data.StoreExpansion?data.StoreExpansion:'';
this.model.ProjectType = data.ProjectType?data.ProjectType:0;
this.model.AreaRequirement = data.AreaRequirement?data.AreaRequirement:0;
this.model.EndAreaRequirement = data.EndAreaRequirement?data.EndAreaRequirement:0;
this.model.Advertising = data.Advertising?data.Advertising:'';
this.model.Other = data.Other? data.Other:'';
this.model.ShopSize = data.ShopSize?data.ShopSize:1;
this.model.Plumbing = data.Plumbing?data.Plumbing:1;
this.model.Caliber = data.Caliber?data.Caliber:1;
this.model.Sewage = data.Sewage?data.Sewage:1;
this.model.RanQi = data.RanQi?data.RanQi:1;
this.model.DianLiang = data.DianLiang?data.DianLiang:'';
this.model.PaiYan = data.PaiYan? data.PaiYan:1;
this.model.KongTiao = data.KongTiao?data.KongTiao:1;
this.model.XinFeng = data.XinFeng?data.XinFeng:1;
this.model.BrandClassId = data.BrandClassId?data.BrandClassId:'';
this.model.RanQiBZ = data.RanQiBZ?data.RanQiBZ:'';
this.model.IsDianLiang = data.IsDianLiang? data.IsDianLiang:1;
this.model.PaiYanBZ = data.PaiYanBZ?data.PaiYanBZ:'';
this.model.ShopSize = data.ShopSize?data.ShopSize:'';
this.model.IsShopSize = data.IsShopSize?data.IsShopSize:1;
this.model.OpenShopWish = data.OpenShopWish?data.OpenShopWish:5;
if(this.model.BannerList && this.model.BannerList.length>0){ if(this.model.BannerList && this.model.BannerList.length>0){
this.model.BannerList.forEach(x=>{ this.model.BannerList.forEach(x=>{
let obj ={ let obj ={
...@@ -448,7 +483,7 @@ ...@@ -448,7 +483,7 @@
if(!this.model.Logo){ if(!this.model.Logo){
this.model.Logo = '' this.model.Logo = ''
} }
this.BrandClassName = this.model.ClassName; this.BrandClassName = data.ClassName;
if(this.datas.CompanyStatus==0 && this.datas.IsComplete==1){//审核中 if(this.datas.CompanyStatus==0 && this.datas.IsComplete==1){//审核中
this.disabled = true this.disabled = true
...@@ -668,6 +703,7 @@ ...@@ -668,6 +703,7 @@
this.model.PaiYanBZ = data.PaiYanBZ; this.model.PaiYanBZ = data.PaiYanBZ;
this.model.ShopSize = data.ShopSize; this.model.ShopSize = data.ShopSize;
this.model.IsShopSize = data.IsShopSize; this.model.IsShopSize = data.IsShopSize;
this.model.OpenShopWish = data.OpenShopWish?data.OpenShopWish:5;
this.glBrandName = data.BrandName this.glBrandName = data.BrandName
this.disabled2 = true this.disabled2 = true
......
pages/kotra/carrierInformation.vue
View file @ 35cdf5ac
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
<view v-for="(x,y) in MetroList" :key='y' style="border-bottom: 3rpx #DADCE6 solid;"> <view v-for="(x,y) in MetroList" :key='y' style="border-bottom: 3rpx #DADCE6 solid;">
<view class="bottom-border_r" > <view class="bottom-border_r" >
<input type="text" v-model="x.MetroNum" :disabled="disabled" style="padding: 10px 0;width: 70px;margin-right: 5px;border-bottom:1rpx #DADCE6 solid ;" placeholder="地铁线路" placeholder-style="color:#CECECE;"> <input type="text" v-model="x.MetroNum" :disabled="disabled" style="padding: 10px 0;width: 70px;margin-right: 5px;border-bottom:1rpx #DADCE6 solid ;" placeholder="地铁线路" placeholder-style="color:#CECECE;">
<view style="width: 20px;">号</view> <view style="width: 20px;">号线</view>
<input type="text" v-model="x.MetroName" :disabled="disabled" style="padding: 10px 0;width: 1px;flex:1;margin-right: 5px;border-bottom:1rpx #DADCE6 solid ;" placeholder="站点名称" placeholder-style="color:#CECECE;"> <input type="text" v-model="x.MetroName" :disabled="disabled" style="padding: 10px 0;width: 1px;flex:1;margin-right: 5px;border-bottom:1rpx #DADCE6 solid ;" placeholder="站点名称" placeholder-style="color:#CECECE;">
</view> </view>
<view class="bottom-border_r"> <view class="bottom-border_r">
...@@ -290,7 +290,28 @@ ...@@ -290,7 +290,28 @@
this.model.CompanyId = this.datas.CompanyId this.model.CompanyId = this.datas.CompanyId
if(this.datas.CompanyStatus!=undefined && this.datas.IsComplete != undefined){//判断是否填写过了 if(this.datas.CompanyStatus!=undefined && this.datas.IsComplete != undefined){//判断是否填写过了
this.model = this.datas.CarrierModel let data = this.datas.CarrierModel
// this.model = this.datas.CarrierModel
this.model.ID = data.ID?data.ID:0;
this.model.ExistCarrierId = data.ExistCarrierId?data.ExistCarrierId:0;
this.model.CarrierName = data.CarrierName?data.CarrierName:'';
this.model.Logo = data.Logo? data.Logo:'';
this.model.BannerList = data.BannerList?data.BannerList:[];
this.model.VideoUrl = data.VideoUrl?data.VideoUrl:'';
this.model.Address = data.Address?data.Address:'';
this.model.LatAndLon = data.LatAndLon?data.LatAndLon:'';
this.model.Developers = data.Developers?data.Developers:'';
this.model.OpenTime = data.OpenTime?data.OpenTime:'';
this.model.ProjectType = data.ProjectType?data.ProjectType:0;
this.model.CarrierSize = data.CarrierSize?data.CarrierSize:0;
this.model.LayersNum = data.LayersNum?data.LayersNum:'';
this.model.CarNum = data.CarNum?data.CarNum:0;
this.model.CarrierPlan = data.CarrierPlan?data.CarrierPlan:'';
this.model.CarrierTarget = data.CarrierTarget?data.CarrierTarget:'';
this.model.Location = data.Location? data.Location:'';
this.model.Crowd = data.Crowd?data.Crowd:'';
this.model.CarrierMetroList = data.CarrierMetroList?data.CarrierMetroList:[];
this.MetroList = this.model.CarrierMetroList this.MetroList = this.model.CarrierMetroList
if(this.model.BannerList && this.model.BannerList.length>0){ if(this.model.BannerList && this.model.BannerList.length>0){
this.model.BannerList.forEach(x=>{ this.model.BannerList.forEach(x=>{
......
pages/kotra/identification.vue
View file @ 35cdf5ac
...@@ -680,8 +680,9 @@ ...@@ -680,8 +680,9 @@
} }
.con2 { .con2 {
width: 100%;
position: relative; position: relative;
overflow: hidden;
.conImage { .conImage {
width: 590rpx; width: 590rpx;
height: 367rpx; height: 367rpx;
......
pages/user-center/user-center.vue
View file @ 35cdf5ac
...@@ -409,8 +409,7 @@ ...@@ -409,8 +409,7 @@
} }
break; break;
case "/pages/kotra/wish/list": case "/pages/kotra/wish/list":
console.log('asdas ',this.FirstShopType) if(this.FirstShopType == 1 && this.companyStatus == 5){
if(this.FirstShopType == 1){
flag = true; flag = true;
}else{ }else{
flag = false; flag = false;
......
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