Skip to content

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

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

parents 95d99fe3 b0b8dfc7
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 43 deletions
pages/kotra/activeSignUp.vue
View file @ b42d4f31
...@@ -36,11 +36,6 @@ ...@@ -36,11 +36,6 @@
margin-bottom: 30rpx; margin-bottom: 30rpx;
} }
.active_InTitle text {
color: red;
margin-right: 5rpx;
}
.checkedNature { .checkedNature {
background-color: #FDCCD4 !important; background-color: #FDCCD4 !important;
color: #F95771 !important; color: #F95771 !important;
...@@ -126,6 +121,11 @@ ...@@ -126,6 +121,11 @@
line-height: 80rpx; line-height: 80rpx;
border-radius: 20rpx; border-radius: 20rpx;
} }
.activeStar{
color:red;
margin-right:5rpx;
font-size:23rpx;
}
</style> </style>
<template> <template>
<view class="activeSignUp"> <view class="activeSignUp">
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
</view> </view>
<view class="active_Info"> <view class="active_Info">
<view class="active_InTitle"> <view class="active_InTitle">
<text>*</text> <text class="activeStar">*</text>
基础信息 基础信息
</view> </view>
<view class="activeMainDiv"> <view class="activeMainDiv">
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
<input class="activeSign_Input" placeholder="请输入对应名称" v-model="signMsg.CompanyName" /> <input class="activeSign_Input" placeholder="请输入对应名称" v-model="signMsg.CompanyName" />
</view> </view>
<view class="activeMainDiv" style="border-bottom:1px solid #F5F6F7"> <view class="activeMainDiv" style="border-bottom:1px solid #F5F6F7">
<view class="activeSignName" style="margin-bottom:30rpx;">性质（单选）</view> <view class="activeSignName" style="margin-bottom:30rpx;"><text class="activeStar">*</text>性质（单选）</view>
<view class="active_Nature"> <view class="active_Nature">
<text v-for="(item,index) in natureList" @click="getckedId(item,index)" <text v-for="(item,index) in natureList" @click="getckedId(item,index)"
:class="{'checkedNature':commonIndex==index}" :key="index">{{item.Name}}</text> :class="{'checkedNature':commonIndex==index}" :key="index">{{item.Name}}</text>
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
</template> </template>
<view v-if="isShowAdd"> <view v-if="isShowAdd">
<view class="activeMainDiv"> <view class="activeMainDiv">
<view class="activeSignName">姓名</view> <view class="activeSignName"><text class="activeStar">*</text>姓名</view>
<input class="activeSign_Input" v-model="pMsg.LinkMan" placeholder="请输入您的姓名" /> <input class="activeSign_Input" v-model="pMsg.LinkMan" placeholder="请输入您的姓名" />
</view> </view>
<view class="activeMainDiv"> <view class="activeMainDiv">
...@@ -197,7 +197,7 @@ ...@@ -197,7 +197,7 @@
<input class="activeSign_Input" v-model="pMsg.CountryInfo" placeholder="所属国籍/省/市" /> <input class="activeSign_Input" v-model="pMsg.CountryInfo" placeholder="所属国籍/省/市" />
</view> </view>
<view class="activeMainDiv"> <view class="activeMainDiv">
<view class="activeSignName">手机号</view> <view class="activeSignName"><text class="activeStar">*</text>手机号</view>
<input class="activeSign_Input" v-model="pMsg.LinkTel" placeholder="请输入您的11位手机号码" /> <input class="activeSign_Input" v-model="pMsg.LinkTel" placeholder="请输入您的11位手机号码" />
</view> </view>
</view> </view>
......
pages/kotra/billboard/billboarddetails.vue
View file @ b42d4f31
...@@ -153,6 +153,7 @@ ...@@ -153,6 +153,7 @@
width: 100px; width: 100px;
font-size: 12px; font-size: 12px;
color: #FFFFFF; color: #FFFFFF;
margin-right: 5px;
} }
.cans_c_r{ .cans_c_r{
width: 1px; width: 1px;
...@@ -198,7 +199,7 @@ ...@@ -198,7 +199,7 @@
<view class="box"> <view class="box">
<view class="box-top"> <view class="box-top">
<image mode="aspectFill" src='https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/bdbandr.jpg' style="width: 100%;height: 500rpx;"></image> <image mode="aspectFill" src='https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/bdbandr.jpg' style="width: 100%;height: 500rpx;"></image>
<view class="box_t_name">{{detailsData?detailsData.ListName:''}}</view> <!-- <view class="box_t_name">{{detailsData?detailsData.ListName:''}}</view> -->
<view class="box_t_state" v-if='detailsData && detailsData.State'> <view class="box_t_state" v-if='detailsData && detailsData.State'>
<view class="box_t_state_c" > <view class="box_t_state_c" >
<span v-if="detailsData.State==1">榜单进行中</span> <span v-if="detailsData.State==1">榜单进行中</span>
...@@ -223,9 +224,9 @@ ...@@ -223,9 +224,9 @@
<view class="box_c_b_item_l">报名时间:</view> <view class="box_c_b_item_l">报名时间:</view>
<view class="box_c_b_item_r">{{detailsData.StartDate}} <span style='margin:0 2px'>至</span>{{detailsData.EndDate}} </view> <view class="box_c_b_item_r">{{detailsData.StartDate}} <span style='margin:0 2px'>至</span>{{detailsData.EndDate}} </view>
</view> </view>
<view class="box_conent_basic_item"> <view class="box_conent_basic_item" v-if='detailsData.FinishDate'>
<view class="box_c_b_item_l">公示时间:</view> <view class="box_c_b_item_l">公示时间:</view>
<view class="box_c_b_item_r">{{detailsData.FinishDate}}</view> <view class="box_c_b_item_r">{{detailsData.FinishDate.split(' ')[0]}}</view>
</view> </view>
<!-- <view class="box_conent_basic_item"> <!-- <view class="box_conent_basic_item">
<view class="box_c_b_item_l">入围名额:</view> <view class="box_c_b_item_l">入围名额:</view>
...@@ -435,6 +436,9 @@ ...@@ -435,6 +436,9 @@
uni.hideLoading() uni.hideLoading()
if (res.resultCode == 1) { if (res.resultCode == 1) {
this.detailsData = res.data this.detailsData = res.data
uni.setNavigationBarTitle({
title: this.detailsData.ListName,
});
// detailsData.Content // detailsData.Content
let richtext = this.detailsData.Content; let richtext = this.detailsData.Content;
let regex = new RegExp('<p', 'gi'); let regex = new RegExp('<p', 'gi');
......
pages/kotra/billboard/components/img-upload.vue
View file @ b42d4f31
...@@ -231,36 +231,64 @@ ...@@ -231,36 +231,64 @@
}); });
chooseFile chooseFile
.then((res) => { .then((res) => {
let file = null; let file = null;
let listOldLength = this.lists.length; let listOldLength = this.lists.length;
res.tempFiles.map((val, index) => { let that = this
// 如果是非多选，index大于等于1或者超出最大限制数量时，不处理 res.tempFiles.forEach((val, index) => {
if (!multiple && index >= 1) return;
if(val.size< (2*1024*1024)){ uni.getImageInfo({
uni.showToast({ src: val.path,
title:'图片不能小于2M', success: function (image) {
icon:'none' if(image.width>image.height){
}) uni.showToast({
}else if (val.size > maxSize) { title:'请上传竖版图片',
this.$emit('on-oversize', val, this.lists); icon:'none'
this.showToast('超出允许的文件大小'); })
} else {
if(maxCount <= lists.length) { }else{
this.$emit('on-exceed', val, this.lists); // 如果是非多选，index大于等于1或者超出最大限制数量时，不处理
this.showToast('超出最大允许的文件个数'); if (!multiple && index >= 1) return;
return ; if(val.size< (2*1024*1024)){
uni.showToast({
title:'图片不能小于2M',
icon:'none'
})
}else if (val.size > maxSize) {
that.$emit('on-oversize', val, that.lists);
that.showToast('超出允许的文件大小');
} else {
if(maxCount <= that.lists.length) {
that.$emit('on-exceed', val, that.lists);
that.showToast('超出最大允许的文件个数');
return ;
}
that.lists.push({
url: val.path,
progress: 0,
error: false
});
// 列表发生改变，发出事件，第二个参数为当前发生变化的项的索引
that.$emit('on-list-change', that.lists);
that.$emit('on-choose-complete', that.lists);
if(that.autoUpload) that.uploadFile(listOldLength);
listOldLength++
}
}
},
fail:function(err){
console.log(err)
} }
lists.push({ })
url: val.path,
progress: 0,
error: false
});
// 列表发生改变，发出事件，第二个参数为当前发生变化的项的索引
this.$emit('on-list-change', this.lists);
}
}) })
// 每次图片选择完，抛出一个事件，并将当前内部选择的图片数组抛出去 // 每次图片选择完，抛出一个事件，并将当前内部选择的图片数组抛出去
this.$emit('on-choose-complete', this.lists); this.$emit('on-choose-complete', this.lists);
console.log(this.lists,listOldLength,'listOldLength')
if(this.autoUpload) this.uploadFile(listOldLength); if(this.autoUpload) this.uploadFile(listOldLength);
}) })
.catch(error => { .catch(error => {
...@@ -292,6 +320,7 @@ ...@@ -292,6 +320,7 @@
}, },
// 上传图片 // 上传图片
uploadFile(index = 0) { uploadFile(index = 0) {
if (this.disabled) return; if (this.disabled) return;
if(this.uploading) return ; if(this.uploading) return ;
// 全部上传完成 // 全部上传完成
......
pages/kotra/brandInformation.vue
View file @ b42d4f31
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
<template> <template>
<view class="brandInformation"> <view class="brandInformation">
<view class="bottom-border" v-if="datas.CompanyStatus==-1"> <view class="bottom-border" v-if="datas.CompanyStatus==-1">
<view class="label-text">关联品牌<span style='color: #E54D42;' >*</span></view> <view class="label-text">关联品牌</view>
<view class="bottom-border_r" style="padding: 10px 0;height: 42px;display: flex;" @click="disabled==false? gobrandsearch():''"> <view class="bottom-border_r" style="padding: 10px 0;height: 42px;display: flex;" @click="disabled==false? gobrandsearch():''">
<input type="text" v-model="glBrandName" :disabled="true" style="padding: 10px 0;width: 1px;flex:1" placeholder="请选择关联品牌" placeholder-style="color:#CECECE;"> <input type="text" v-model="glBrandName" :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> <u-icon name="arrow" color="#A5A4AC" size="30" ></u-icon>
...@@ -132,6 +132,7 @@ ...@@ -132,6 +132,7 @@
</view> </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>
<span style='color: #E54D42;' >*</span>
</view> </view>
<view @click="disabled?'':uploadcard()"> <view @click="disabled?'':uploadcard()">
<view slot="addBtn" class="slot-btn" v-if="model.Logo==''" > <view slot="addBtn" class="slot-btn" v-if="model.Logo==''" >
...@@ -144,6 +145,7 @@ ...@@ -144,6 +145,7 @@
</view> </view>
<view class="label-text" style="margin-top:20px;margin-bottom: 30rpx;"> <view class="label-text" style="margin-top:20px;margin-bottom: 30rpx;">
<text>介绍图</text> <text>介绍图</text>
<span style='color: #E54D42;' >*</span>
<text style="color:#999;font-weight: 400;">（最多9张,第一张为封面图）</text> <text style="color:#999;font-weight: 400;">（最多9张,第一张为封面图）</text>
</view> </view>
<view> <view>
...@@ -214,7 +216,7 @@ ...@@ -214,7 +216,7 @@
</view> </view>
</view> </view>
<view class="bottom-border"> <view class="bottom-border">
<view class="label-text">建筑面积(m²)</view> <view class="label-text">建筑面积(m²)<span style='color: #E54D42;' >*</span></view>
<view class="bottom-border_r" style="padding: 10px 0;height: 42px;display: flex;"> <view class="bottom-border_r" style="padding: 10px 0;height: 42px;display: flex;">
<input type="number" v-model="model.BuiltUpArea" style="width: 1px;flex: 1;" placeholder="请填写建筑面积" :disabled="disabled" placeholder-style="color:#CECECE;"> <input type="number" v-model="model.BuiltUpArea" style="width: 1px;flex: 1;" placeholder="请填写建筑面积" :disabled="disabled" placeholder-style="color:#CECECE;">
<span style='margin: 0 10px;'>~</span> <span style='margin: 0 10px;'>~</span>
...@@ -222,7 +224,7 @@ ...@@ -222,7 +224,7 @@
</view> </view>
</view> </view>
<view class="bottom-border"> <view class="bottom-border">
<view class="label-text">需求面积(m²)</view> <view class="label-text">需求面积(m²)<span style='color: #E54D42;' >*</span></view>
<view class="bottom-border_r" style="padding: 10px 0;height: 42px;display: flex;"> <view class="bottom-border_r" style="padding: 10px 0;height: 42px;display: flex;">
<input type="number" v-model="model.AreaRequirement" style="width: 1px;flex: 1;" placeholder="请填写需求面积" :disabled="disabled" placeholder-style="color:#CECECE;"> <input type="number" v-model="model.AreaRequirement" style="width: 1px;flex: 1;" placeholder="请填写需求面积" :disabled="disabled" placeholder-style="color:#CECECE;">
<span style='margin: 0 10px;'>~</span> <span style='margin: 0 10px;'>~</span>
...@@ -230,19 +232,19 @@ ...@@ -230,19 +232,19 @@
</view> </view>
</view> </view>
<view class="bottom-border"> <view class="bottom-border">
<view class="label-text">客群定位</view> <view class="label-text">客群定位<span style='color: #E54D42;' >*</span></view>
<input type="text" v-model="model.CustomerType" style="padding: 10px 0;" placeholder="请填写客群定位" :disabled="disabled" placeholder-style="color:#CECECE;"> <input type="text" v-model="model.CustomerType" style="padding: 10px 0;" placeholder="请填写客群定位" :disabled="disabled" placeholder-style="color:#CECECE;">
</view> </view>
<view class="bottom-border"> <view class="bottom-border">
<view class="label-text">品牌定位</view> <view class="label-text">品牌定位<span style='color: #E54D42;' >*</span></view>
<input type="text" v-model="model.BrandType" style="padding: 10px 0;" placeholder="请填写品牌定位" :disabled="disabled" placeholder-style="color:#CECECE;"> <input type="text" v-model="model.BrandType" style="padding: 10px 0;" placeholder="请填写品牌定位" :disabled="disabled" placeholder-style="color:#CECECE;">
</view> </view>
<view class="bottom-border"> <view class="bottom-border">
<view class="label-text">拓店区域</view> <view class="label-text">拓店区域<span style='color: #E54D42;' >*</span></view>
<input type="text" v-model="model.StoreExpansion" style="padding: 10px 0;" placeholder="请填写拓店区域" :disabled="disabled" placeholder-style="color:#CECECE;"> <input type="text" v-model="model.StoreExpansion" style="padding: 10px 0;" placeholder="请填写拓店区域" :disabled="disabled" placeholder-style="color:#CECECE;">
</view> </view>
<view class="bottom-border"> <view class="bottom-border">
<view class="label-text">商铺性质</view> <view class="label-text">商铺性质<span style='color: #E54D42;' >*</span></view>
<view class="con6" style="margin-top: 20px;"> <view class="con6" style="margin-top: 20px;">
<u-radio-group v-model="model.ProjectType"> <u-radio-group v-model="model.ProjectType">
<u-radio v-for="(item1, index1) in goodsType" :key="index1" :name="item1.Id" shape="circle" :disabled="disabled"> <u-radio v-for="(item1, index1) in goodsType" :key="index1" :name="item1.Id" shape="circle" :disabled="disabled">
...@@ -758,6 +760,33 @@ ...@@ -758,6 +760,33 @@
this.model.ShopNum = 0 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
}
if(this.model.BrandType=='' ){
uni.showToast({title: '品牌定位不能为空',icon: 'none',})
return
}
if(this.model.StoreExpansion=='' ){
uni.showToast({title: '扩店区域不能为空',icon: 'none',})
return
}
if(this.model.ProjectType == 0){ if(this.model.ProjectType == 0){
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