Skip to content

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

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

parents 2990aff8 96fa1cd9
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 301 deletions
pages/kotra/BrandEnterSetIn/components/brandInformation.vue
View file @ 4e667601
......@@ -139,7 +139,7 @@
</view>
<view @click="disabled?'':uploadcard()">
<view slot="addBtn" class="slot-btn" v-if="model.Logo==''" >
<image class="image" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616498310000_18.png" mode="widthFix"></image>
<image class="image" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/ybminiappimg.png" mode="widthFix"></image>
</view>
<view class="slot-btn" v-if="model.Logo!=''" @click="disabled?previewImage([model.Logo],1):''">
<image style="width: 220rpx;height: 220rpx;" :src="model.Logo" mode="aspectFill"></image>
......@@ -154,7 +154,7 @@
<view>
<u-upload :action="action" :max-count="9" :max-size="2*1024*1024" :deletable='!disabled' :file-list="fileList" @on-remove="onRemove1" :custom-btn="true" @on-success="uploadSuccessHandler">
<view slot="addBtn" class="slot-btn" v-if='disabled==false'>
<image class="image" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616498310000_18.png" mode="widthFix"></image>
<image class="image" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/ybminiappimg.png" mode="widthFix"></image>
</view>
</u-upload>
</view>
......@@ -182,7 +182,7 @@
</view>
<view v-if="model.VideoUrl=='' ">
<view slot="addBtn" class="slot-btn" @click="disabled?'': upvideo()">
<image class="image" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/1616573063000_398.png" mode="widthFix"></image>
<image class="image" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/ybminiappvideo.png" mode="widthFix"></image>
</view>
</view>
</view>
......@@ -323,7 +323,7 @@
BrandType: "", //品牌定位
// StoreExpansion: "", //扩店区域
// ProjectType: 0, //商铺性质
// AreaRequirement: 0, //
AreaRequirement: 0, //
// EndAreaRequirement: 0, //
// Advertising: "", //广告
// Other: "", //其他 9-27 改为招引需求
......@@ -397,45 +397,10 @@
this.model.CompanyId = this.datas.CompanyId
if(this.datas.CompanyStatus!=undefined && this.datas.IsComplete != undefined){//判断是否填写过了
let data = this.datas.BrandModel
this.model = this.datas.BrandModel
this.model.CompanyId = this.datas.CompanyId
// let data = this.datas.BrandModel
// 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.IsInChengdu = data.IsInChengdu?data.IsInChengdu:0;
// this.model.BrandClassId= data.CategoryId?data.CategoryId:'';
// 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;
this.BrandClassName = data.ClassName
this.glBrandName = data.BrandName
if(this.model.BannerList && this.model.BannerList.length>0){
......@@ -671,83 +636,20 @@
url: '/pages/kotra/brandSearch?type=1'
})
},
brandchildren(Id){//主页面调取方法
this.request2({
url: "/api/AppletTrade/GetBrandDetailsForCompany",
data: {ID:Id},
},
(res) => {
if (res.resultCode == 1) {
let data = res.data
this.model.ExistBrandId = data.ID;
this.model.Logo = data.Logo;
this.model.BannerList = data.BannerList;
this.model.VideoUrl = data.VideoUrl;
this.model.FullBrandName = data.FullBrandName;
this.model.BrandName = data.BrandName;
this.model.ShopNum = data.ShopNum;
this.model.BuiltUpArea = data.BuiltUpArea;
this.model.EndBuiltUpArea = data.EndBuiltUpArea;
this.model.CustomerType = data.CustomerType;
this.model.BrandType = data.BrandType;
this.model.StoreExpansion = data.StoreExpansion;
this.model.ProjectType = data.ProjectType;
this.model.AreaRequirement = data.AreaRequirement;
this.model.EndAreaRequirement = data.EndAreaRequirement;
this.model.Advertising = data.Advertising;
this.model.Other = data.Other;
this.model.ShopSize = data.ShopSize;
this.model.Plumbing = data.Plumbing;
this.model.Caliber = data.Caliber;
this.model.Sewage = data.Sewage;
this.model.RanQi = data.RanQi;
this.model.DianLiang = data.DianLiang;
this.model.PaiYan = data.PaiYan;
this.model.KongTiao = data.KongTiao;
this.model.XinFeng = data.XinFeng;
this.model.IsInChengdu = data.IsInChengdu;
this.model.BrandClassId= data.CategoryId;
this.model.RanQiBZ = data.RanQiBZ;
this.model.IsDianLiang = data.IsDianLiang;
this.model.PaiYanBZ = data.PaiYanBZ;
this.model.ShopSize = data.ShopSize;
this.model.IsShopSize = data.IsShopSize;
this.model.OpenShopWish = data.OpenShopWish?data.OpenShopWish:5;
this.glBrandName = data.BrandName
this.disabled2 = true
this.disabled3 = true
if(this.model.BannerList.length>0){
this.model.BannerList.forEach(x=>{
let obj ={
url:x
}
this.fileList.push(obj)
})
}
this.BrandClassList.forEach(x=>{
if(this.model.BrandClassId== x.ID){
this.BrandClassName = x.ClassName;
}
})
}
}
);
},
brandSubmit(){
if(this.model.BrandClassId== ''){
uni.showToast({title: '请选择品牌分类',icon: 'none',})
return
}
if(this.model.FullBrandName == ''){
uni.showToast({title: '请输入品牌全名',icon: 'none',})
return
}
if(this.model.BrandName == ''){
uni.showToast({title: '请输入品牌名',icon: 'none',})
return
}
if(this.model.FullBrandName == ''){
uni.showToast({title: '请输入品牌全名',icon: 'none',})
return
}
if(this.model.Logo == ''){
uni.showToast({title: '请上传Logo',icon: 'none',})
return
......@@ -760,18 +662,9 @@
this.model.ShopNum = 0
}
if(this.model.BuiltUpArea=='' ){//设为默认值
this.model.BuiltUpArea = 0
}
if( this.model.EndBuiltUpArea==''){
this.model.EndBuiltUpArea = 0
}
if(this.model.AreaRequirement=='' ){
this.model.AreaRequirement = 0
}
if( this.model.EndAreaRequirement==''){
this.model.EndAreaRequirement = 0
}
if(this.model.CustomerType=='' ){
uni.showToast({title: '客群定位不能为空',icon: 'none',})
return
......@@ -780,17 +673,6 @@
uni.showToast({title: '品牌定位不能为空',icon: 'none',})
return
}
// if(this.model.StoreExpansion=='' ){
// uni.showToast({title: '扩店区域不能为空',icon: 'none',})
// return
// }
// if(this.model.ProjectType == 0){
// uni.showToast({title: '请选择商铺性质',icon: 'none',})
// return
// }
console.log(this.model,'保存')
uni.showLoading({
title:'提交中...'
......
pages/kotra/BrandEnterSetIn/components/buildingInformation.vue
View file @ 4e667601
......@@ -783,51 +783,6 @@ export default {
url: "/pages/kotra/brandSearch?type=2",
});
},
carrierchildren(Id) {
this.request2(
{
url: "/api/AppletTrade/GetCarrierDetailsForCompany",
data: { ID: Id },
},
(res) => {
if (res.resultCode == 1) {
let data = res.data;
this.model.ExistCarrierId = Id; //绑定id
this.model.CarrierName = data.CarrierName;
this.model.Logo = data.Logo;
this.model.BannerList = data.BannerList;
this.model.VideoUrl = data.VideoUrl;
this.model.Address = data.Address;
this.model.LatAndLon = data.LatAndLon;
this.model.Developers = data.Developers;
this.model.OpenTime = data.OpenTime.split("T")[0];
this.model.ProjectType = data.ProjectType;
this.model.CarrierSize = data.CarrierSize;
this.model.LayersNum = data.LayersNum;
this.model.CarNum = data.CarNum;
this.model.CarrierPlan = data.CarrierPlan;
this.model.CarrierTarget = data.CarrierTarget;
this.model.Location = data.Location;
this.model.Crowd = data.Crowd;
this.model.CarrierMetroList = data.CarrierMetroList;
if (this.model.BannerList.length > 0) {
this.model.BannerList.forEach((x) => {
let obj = {
url: x,
};
this.fileList.push(obj);
});
}
this.disabled2 = true; //选择了关联载体就不能修改昵称
this.model.CompanyId = this.datas.CompanyId;
this.MetroList = this.model.CarrierMetroList;
this.glCarrierName = this.model.CarrierName;
}
}
);
},
carrierSubmit() {
if (this.model.Name == "") {
uni.showToast({ title: "请输入楼宇名称", icon: "none" });
......
pages/kotra/BrandEnterSetIn/components/carrierInformation.vue
View file @ 4e667601
......@@ -194,7 +194,7 @@
<view slot="addBtn" class="slot-btn" v-if="model.Logo == ''">
<image
class="image"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616498310000_18.png"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/ybminiappimg.png"
mode="widthFix"
></image>
</view>
......@@ -232,7 +232,7 @@
<view slot="addBtn" class="slot-btn" v-if="disabled == false">
<image
class="image"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616498310000_18.png"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/ybminiappimg.png"
mode="widthFix"
></image>
</view>
......@@ -318,7 +318,7 @@
>载体类型<span style="color: #e54d42">*</span></view
>
<view class="bottom-border_r" style="padding: 10px 0;height: 42px;display: flex;"
@click="disabled || disabled3?'':(showTypeStatus= true,showType=1)">
@click="disabled ||disabled2?'':(showTypeStatus= true,showType=1)">
<input type="text" v-model="BrandClassName" :disabled="true" style="padding: 10px 0;width: 1px;flex:1" placeholder="请选择品牌分类" placeholder-style="color:#CECECE;">
<u-icon name="arrow" color="#A5A4AC" size="30" ></u-icon>
</view>
......@@ -621,7 +621,9 @@ export default {
this.datas.IsComplete != undefined
) {
//判断是否填写过了
this.model = this.datas.EnterpriseServicesModel
let data = this.datas.CarrierModel
this.model = this.datas.CarrierModel
// this.BrandClassName = data.ClassName
if (this.model.BannerList && this.model.BannerList.length > 0) {
this.model.BannerList.forEach((x) => {
......@@ -906,51 +908,6 @@ export default {
url: "/pages/kotra/brandSearch?type=2",
});
},
carrierchildren(Id) {
this.request2(
{
url: "/api/AppletTrade/GetCarrierDetailsForCompany",
data: { ID: Id },
},
(res) => {
if (res.resultCode == 1) {
let data = res.data;
this.model.ExistCarrierId = Id; //绑定id
this.model.CarrierName = data.CarrierName;
this.model.Logo = data.Logo;
this.model.BannerList = data.BannerList;
this.model.VideoUrl = data.VideoUrl;
this.model.Address = data.Address;
this.model.LatAndLon = data.LatAndLon;
this.model.Developers = data.Developers;
this.model.OpenTime = data.OpenTime.split("T")[0];
this.model.ProjectType = data.ProjectType;
this.model.CarrierSize = data.CarrierSize;
this.model.LayersNum = data.LayersNum;
this.model.CarNum = data.CarNum;
this.model.CarrierPlan = data.CarrierPlan;
this.model.CarrierTarget = data.CarrierTarget;
this.model.Location = data.Location;
this.model.Crowd = data.Crowd;
this.model.CarrierMetroList = data.CarrierMetroList;
if (this.model.BannerList.length > 0) {
this.model.BannerList.forEach((x) => {
let obj = {
url: x,
};
this.fileList.push(obj);
});
}
this.disabled2 = true; //选择了关联载体就不能修改昵称
this.model.CompanyId = this.datas.CompanyId;
this.MetroList = this.model.CarrierMetroList;
this.glCarrierName = this.model.CarrierName;
}
}
);
},
carrierSubmit() {
if (this.model.CarrierName == "") {
uni.showToast({ title: "请输入载体名", icon: "none" });
......
pages/kotra/BrandEnterSetIn/components/enterInformation.vue
View file @ 4e667601
......@@ -758,70 +758,6 @@
url: '/pages/kotra/brandSearch?type=1'
})
},
brandchildren(Id){//主页面调取方法
this.request2({
url: "/api/AppletTrade/GetBrandDetailsForCompany",
data: {ID:Id},
},
(res) => {
if (res.resultCode == 1) {
let data = res.data
this.model.ExistBrandId = data.ID;
this.model.Logo = data.Logo;
this.model.BannerList = data.BannerList;
this.model.VideoUrl = data.VideoUrl;
this.model.FullBrandName = data.FullBrandName;
this.model.BrandName = data.BrandName;
this.model.ShopNum = data.ShopNum;
this.model.BuiltUpArea = data.BuiltUpArea;
this.model.EndBuiltUpArea = data.EndBuiltUpArea;
this.model.CustomerType = data.CustomerType;
this.model.BrandType = data.BrandType;
this.model.StoreExpansion = data.StoreExpansion;
this.model.ProjectType = data.ProjectType;
this.model.AreaRequirement = data.AreaRequirement;
this.model.EndAreaRequirement = data.EndAreaRequirement;
this.model.Advertising = data.Advertising;
this.model.Other = data.Other;
this.model.ShopSize = data.ShopSize;
this.model.Plumbing = data.Plumbing;
this.model.Caliber = data.Caliber;
this.model.Sewage = data.Sewage;
this.model.RanQi = data.RanQi;
this.model.DianLiang = data.DianLiang;
this.model.PaiYan = data.PaiYan;
this.model.KongTiao = data.KongTiao;
this.model.XinFeng = data.XinFeng;
this.model.IsInChengdu = data.IsInChengdu;
this.model.BrandClassId = data.BrandClassId;
this.model.RanQiBZ = data.RanQiBZ;
this.model.IsDianLiang = data.IsDianLiang;
this.model.PaiYanBZ = data.PaiYanBZ;
this.model.ShopSize = data.ShopSize;
this.model.IsShopSize = data.IsShopSize;
this.model.OpenShopWish = data.OpenShopWish?data.OpenShopWish:5;
this.glBrandName = data.BrandName
this.disabled2 = true
this.disabled3 = true
if(this.model.BannerList.length>0){
this.model.BannerList.forEach(x=>{
let obj ={
url:x
}
this.fileList.push(obj)
})
}
this.BrandClassList.forEach(x=>{
if(this.model.BrandClassId == x.ID){
this.CategoryName = x.ClassName;
}
})
}
}
);
},
brandSubmit(){
if(!this.model.EType){
uni.showToast({title: '请选择企业类别',icon: 'none',})
......
pages/kotra/BrandEnterSetIn/enterIndex.vue
View file @ 4e667601
......@@ -654,19 +654,6 @@ export default {
},
});
},
Children(ID, type) {
if (type == 1) {
if (Object.keys(this.$refs).length > 0 && this.$refs.brandinfo) {
//判断
this.$refs.brandinfo.brandchildren(ID);
}
} else {
if (Object.keys(this.$refs).length > 0 && this.$refs.carrierinfo) {
//判断
this.$refs.carrierinfo.carrierchildren(ID);
}
}
},
},
onLoad(options) {
if (options && options.editType) {
......
pages/kotra/brand/list.vue
View file @ 4e667601
......@@ -115,7 +115,8 @@
<u-empty v-if="g.length == 0" text="暂无内容" mode="list"></u-empty>
<view
style="height: calc(100% - 192px); padding: 2px 10px"
style=" padding: 2px 10px"
:style="{ height: TenantId==18?'calc(100% - 127px)':'calc(100% - 192px)'}"
v-if="g.length > 0"
>
<scroll-view
......
pages/kotra/carrier/list.vue
View file @ 4e667601
......@@ -127,7 +127,9 @@
mode="list"
class="noBox"
></u-empty>
<view style="height: calc(100% - 191px)" v-if="dataList&&dataList.length > 0">
<view
:style="{ height: TenantId==18?'calc(100% - 101px)':'calc(100% - 191px)'}"
v-if="dataList&&dataList.length > 0">
<scroll-view
:scroll-y="true"
:enable-back-to-top="true"
......
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