Skip to content

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

优化功能

parent 434deeec
Hide whitespace changes
Inline Side-by-side
Showing with 202 additions and 32 deletions
pages/kotra/BrandEnterSetIn/components/brandInformation.vue
View file @ 4afa1eb9
......@@ -666,9 +666,10 @@
if (res.resultCode == 1) {
uni.hideLoading()
uni.showToast({title: res.message,icon: 'none',})
setTimeout(()=>{
uni.navigateBack()
},1500)
// setTimeout(()=>{
// uni.navigateBack()
// },1500)
this.$emit('finish')
}
})
},
......
pages/kotra/BrandEnterSetIn/components/buildingInformation.vue
View file @ 4afa1eb9
......@@ -886,9 +886,10 @@ export default {
if (res.resultCode == 1) {
uni.hideLoading();
uni.showToast({ title: res.message, icon: "none" });
setTimeout(() => {
uni.navigateBack();
}, 1500);
// setTimeout(() => {
// uni.navigateBack();
// }, 1500);
this.$emit('finish')
}
});
},
......
pages/kotra/BrandEnterSetIn/components/carrierInformation.vue
View file @ 4afa1eb9
......@@ -989,9 +989,10 @@ export default {
if (res.resultCode == 1) {
uni.hideLoading();
uni.showToast({ title: res.message, icon: "none" });
setTimeout(() => {
uni.navigateBack();
}, 1500);
this.$emit('finish')
// setTimeout(() => {
// uni.navigateBack();
// }, 1500);
}
});
},
......
pages/kotra/BrandEnterSetIn/components/companyInformation.vue 0 → 100644
View file @ 4afa1eb9
<template>
<view style="padding-top: 30px;">
<view class="company-box">
<view class="banner-box">
<image :src="model.BannerList[0]" mode="aspectFill" class="banner"></image>
<view class="status-layer">
<img :src="statusImages[company.CompanyStatus]" />
</view>
</view>
<div class="info">
<view class="name">
{{model.BrandName?model.BrandName:''}}
{{model.Name?model.Name:''}}
{{model.CarrierName?model.CarrierName:''}}
</view>
<view>
<view class="tag-box" style="display: flex; overflow: hidden;margin-top: 10rpx;">
<text class="tag1">{{allTypeCnName[company.FirstShopType-1]}}</text
><text class="tag2">{{ model.CategoryName }}</text>
</view>
</view>
<view class="company-name">
企业名称：{{company.CompanyName}}
</view>
<div class="reject" v-if="company.CompanyStatus==2">
<view class="">驳回原因</view>
<view style="font-size: 24rpx;margin-top: 10rpx;">
{{company.RejectRemark}}
</view>
</div>
<view class="option-box" v-if="company.CompanyStatus>0">
<view class="item" @click="setEditorHandler">修改</view>
<view class="split" v-if="company.CompanyStatus==2"></view>
<view class="item" v-if="company.CompanyStatus==2" style="color: #F60;">删除</view>
</view>
</div>
</view>
</view>
</template>
<script>
export default {
props:{
company:{
type:Object
}
},
data() {
return {
model:[],
allTypeList:['BrandModel','CarrierModel','EnterpriseServicesModel','buildingApplyForModel'],
allTypeCnName:['品牌','载体','企业','楼宇'],
statusImages:[
'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638699743437937519.png',
'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638699743172273668.png',
'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638699743172742181.png'
]
}
},
mounted() {
this.model = this.company[this.allTypeList[this.company.FirstShopType-1]]
console.log(this.model)
},
methods: {
setEditorHandler(){
this.$emit('change',1)
}
}
}
</script>
<style>
.company-box {
margin:0 30px;
border-radius: 16rpx;
background-color: #FFF;
overflow: hidden;
}
.company-box .banner{
width: 100%;
max-height: 160px;
background-color: #f1f1f1;
}
.company-box .banner-box{
position: relative;
}
.company-box .banner-box .status-layer{
background-color: rgba(0,0,0,.65);
position: absolute;
left: 0;
right: 0;
bottom: 0;
top: 0;
z-index: 2;
display: flex;
justify-content: center;
align-items: center;
}
.company-box .banner-box .status-layer image{
width: 192rpx;
height: 160rpx;
}
.company-box .reject{
background: #FCEAEA;
border-radius: 10rpx;
padding: 14rpx;
color: #DD8D8D;
font-size: 28rpx;
margin-top: 14px;
}
.company-box .info{
padding:12px;
}
.company-box .info .name{
font-size: 16px;
font-weight: bold;
}
.company-box .info .company-name{
font-size: 12px;
color: #999;
margin-top: 5px;
}
.company-box .tag-box {
border-radius: 6rpx;
overflow: hidden;
}
.company-box .tag-box .tag1 {
padding: 7rpx 10rpx;
background-color: #1f1f1f;
font-size: 20rpx;
color: #ffffff;
}
.company-box .tag-box .tag2 {
padding: 7rpx 10rpx;
background-image: linear-gradient(90deg, #e8cea5, #caa974);
font-size: 20rpx;
color: #1f1f1f;
border-top-right-radius: 6rpx;
border-bottom-right-radius: 6rpx;
}
.company-box .option-box{
margin-top: 28rpx;
padding: 28rpx 0 8rpx 0;
border-top: 1px solid #f1f1f1;
display: flex;
align-items: center;
}
.company-box .option-box .item{
flex: 1;
font-size: 28rpx;
text-align: center;
}
.company-box .option-box .split{
height:40rpx;
background: #EFEFEF;
width: 1px;
}
</style>
pages/kotra/BrandEnterSetIn/components/enterInformation.vue
View file @ 4afa1eb9
......@@ -826,9 +826,10 @@
if (res.resultCode == 1) {
uni.hideLoading()
uni.showToast({title: res.message,icon: 'none',})
setTimeout(()=>{
uni.navigateBack()
},1500)
// setTimeout(()=>{
// uni.navigateBack()
// },1500)
this.$emit('finish')
}
})
},
......
pages/kotra/BrandEnterSetIn/enterIndex.vue
View file @ 4afa1eb9
<template>
<view class="page" v-if="loading">
<view v-if="nowStatus == 4" class="stepBox" style="padding-top: 20px">
<view v-if="nowStatus == 40" class="stepBox" style="padding-top: 20px">
<view v-if="ChooseidentityId == 1">
<brandInformation ref="brandinfo" :datas="dataOne"></brandInformation>
</view>
......@@ -11,23 +11,26 @@
></carrierInformation>
</view>
</view>
<view class="progressBox" v-if="nowStatus != 4">
<view class="progressName">
<text class="cur" :style="{color:mainColor}">{{ stepName }}</text>
<text class="nex">{{ nextSepName }}</text>
</view>
<u-line-progress
class="progress"
:percent="percent"
:show-percent="false"
:height="10"
inactive-color="#DADCE6"
:active-color="mainColor"
></u-line-progress>
</view>
<view> </view>
<companyInformation v-if="nowStatus != 1 && dataOne" :company="dataOne" @change="()=>nowStatus=1"></companyInformation>
<template v-else>
<view class="progressBox" v-if="nowStatus != 4">
<view class="progressName">
<text class="cur" :style="{color:mainColor}">{{ stepName }}</text>
<text class="nex">{{ nextSepName }}</text>
</view>
<u-line-progress
class="progress"
:percent="percent"
:show-percent="false"
:height="10"
inactive-color="#DADCE6"
:active-color="mainColor"
></u-line-progress>
</view>
<view> </view>
<view class="stepBox" v-if="nowStatus != 4">
<view class="stepBox" v-if="nowStatus != 4">
<view class="stepItem" v-if="step == 1">
<view
style="width: 100%; display: flex"
......@@ -160,19 +163,20 @@
</view>
<view class="stepItem" v-if="step == 3" style="padding-bottom: 0">
<view v-if="ChooseidentityId == 1">
<brandInformation ref="brandinfo" :datas="dataOne"></brandInformation>
<brandInformation ref="brandinfo" :datas="dataOne" @finish="()=>getUserCompany()"></brandInformation>
</view>
<view v-if="ChooseidentityId == 2">
<carrierInformation
ref="carrierinfo"
:datas="dataOne"
@finish="()=>getUserCompany()"
></carrierInformation>
</view>
<view v-if="ChooseidentityId == 3">
<enterInformation ref="enterinfo" :datas="dataOne"></enterInformation>
<enterInformation ref="enterinfo" :datas="dataOne" @finish="()=>getUserCompany()"></enterInformation>
</view>
<view v-if="ChooseidentityId == 4">
<buildingInformation ref="buildinginfo" :datas="dataOne"></buildingInformation>
<buildingInformation ref="buildinginfo" :datas="dataOne" @finish="()=>getUserCompany()"></buildingInformation>
</view>
</view>
......@@ -182,6 +186,7 @@
</view>
</view>
</view>
</template>
</view>
</template>
......@@ -191,6 +196,7 @@ import carrierInformation from "./components/carrierInformation.vue";
import buildingInformation from "./components/buildingInformation.vue";
import brandInformation from "./components/brandInformation.vue";
import enterInformation from "./components/enterInformation.vue";
import companyInformation from './components/companyInformation.vue'
export default {
components: {
rangeSlider,
......@@ -198,6 +204,7 @@ export default {
buildingInformation,
brandInformation,
enterInformation,
companyInformation
},
computed: {},
data() {
......
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