Skip to content

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

修改

parent c769ace4
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 21 deletions
pages/kotra/brandInformation.vue
View file @ a01ac1e0
...@@ -469,7 +469,7 @@ ...@@ -469,7 +469,7 @@
this.model.IsShopSize = data.IsShopSize?data.IsShopSize:1; this.model.IsShopSize = data.IsShopSize?data.IsShopSize:1;
this.model.OpenShopWish = data.OpenShopWish?data.OpenShopWish:5; this.model.OpenShopWish = data.OpenShopWish?data.OpenShopWish:5;
this.glBrandName = data.BrandName
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 ={
...@@ -493,6 +493,10 @@ ...@@ -493,6 +493,10 @@
if(this.datas.CompanyStatus==1){ if(this.datas.CompanyStatus==1){
this.disabled2 = true this.disabled2 = true
} }
if(this.model.ExistBrandId>0){
this.disabled2 = true
this.disabled3 = true
}
} }
...@@ -749,8 +753,8 @@ ...@@ -749,8 +753,8 @@
return return
} }
if( this.model.ShopNum==''){ if( this.model.ShopNum==''){
uni.showToast({title: '请输入店铺数量',icon: 'none',}) this.model.ShopNum = 0
return
} }
if(this.model.ProjectType == 0){ if(this.model.ProjectType == 0){
uni.showToast({title: '请选择商铺性质',icon: 'none',}) uni.showToast({title: '请选择商铺性质',icon: 'none',})
......
pages/kotra/carrierInformation.vue
View file @ a01ac1e0
...@@ -301,7 +301,7 @@ ...@@ -301,7 +301,7 @@
this.model.Address = data.Address?data.Address:''; this.model.Address = data.Address?data.Address:'';
this.model.LatAndLon = data.LatAndLon?data.LatAndLon:''; this.model.LatAndLon = data.LatAndLon?data.LatAndLon:'';
this.model.Developers = data.Developers?data.Developers:''; this.model.Developers = data.Developers?data.Developers:'';
this.model.OpenTime = data.OpenTime?data.OpenTime:''; this.model.OpenTime = data.OpenTime?data.OpenTime.split('T')[0]:'';
this.model.ProjectType = data.ProjectType?data.ProjectType:0; this.model.ProjectType = data.ProjectType?data.ProjectType:0;
this.model.CarrierSize = data.CarrierSize?data.CarrierSize:0; this.model.CarrierSize = data.CarrierSize?data.CarrierSize:0;
this.model.LayersNum = data.LayersNum?data.LayersNum:''; this.model.LayersNum = data.LayersNum?data.LayersNum:'';
...@@ -324,6 +324,7 @@ ...@@ -324,6 +324,7 @@
this.model.BannerList = []; this.model.BannerList = [];
this.fileList= [] this.fileList= []
} }
this.glCarrierName = this.model.CarrierName
if(!this.model.Logo){ if(!this.model.Logo){
this.model.Logo = '' this.model.Logo = ''
} }
...@@ -333,6 +334,9 @@ ...@@ -333,6 +334,9 @@
if(this.datas.CompanyStatus==1){ if(this.datas.CompanyStatus==1){
this.disabled2 = true this.disabled2 = true
} }
if(this.model.ExistCarrierId>0){
this.disabled2 = true
}
} }
}, },
methods:{ methods:{
...@@ -563,7 +567,7 @@ ...@@ -563,7 +567,7 @@
this.model.Address = data.Address; this.model.Address = data.Address;
this.model.LatAndLon = data.LatAndLon; this.model.LatAndLon = data.LatAndLon;
this.model.Developers = data.Developers; this.model.Developers = data.Developers;
this.model.OpenTime = data.OpenTime; this.model.OpenTime = data.OpenTime.split('T')[0];
this.model.ProjectType = data.ProjectType; this.model.ProjectType = data.ProjectType;
this.model.CarrierSize = data.CarrierSize; this.model.CarrierSize = data.CarrierSize;
this.model.LayersNum = data.LayersNum; this.model.LayersNum = data.LayersNum;
...@@ -582,6 +586,7 @@ ...@@ -582,6 +586,7 @@
this.fileList.push(obj) this.fileList.push(obj)
}) })
} }
this.disabled2 = true;//选择了关联载体就不能修改昵称
this.model.CompanyId = this.datas.CompanyId this.model.CompanyId = this.datas.CompanyId
this.MetroList = this.model.CarrierMetroList this.MetroList = this.model.CarrierMetroList
...@@ -616,10 +621,9 @@ ...@@ -616,10 +621,9 @@
uni.showToast({title: '请输入商业体量',icon: 'none',}) uni.showToast({title: '请输入商业体量',icon: 'none',})
return return
} }
// if(this.model.CarNum == ''){ if(this.model.CarNum == ''){
// uni.showToast({title: '请输入车位数量',icon: 'none',}) this.model.CarNum = 0
// return }
// }
if(this.model.OpenTime == ''){ if(this.model.OpenTime == ''){
uni.showToast({title: '请输入开业时间',icon: 'none',}) uni.showToast({title: '请输入开业时间',icon: 'none',})
return return
...@@ -628,7 +632,7 @@ ...@@ -628,7 +632,7 @@
uni.showLoading({ uni.showLoading({
title:'提交中...' title:'提交中...'
}) })
this.model.CarrierMetroList = this.MetroList
let parms = { let parms = {
url: "/api/AppletTrade/SetCarrierApplyFor", url: "/api/AppletTrade/SetCarrierApplyFor",
data: this.model data: this.model
......
pages/user-center/user-center.vue
View file @ a01ac1e0
<template> <template>
<scroll-view :scroll-y="true" @scroll="scrollHandler" @scrolltoupper="scrollTopHandler" style="height: 100vh;"> <scroll-view :scroll-y="true" @scroll="scrollHandler" @scrolltoupper="scrollTopHandler" style="height: 100vh;">
<view class="userStyle" v-if="meueData.user_center && meueData.user_center.is_ppenmiai==0" :class="{'dark':isCompany}"><!-- 修改 --> <view class="userStyle" style="height: 100%;" v-if="meueData.user_center && meueData.user_center.is_ppenmiai==0" :class="{'dark':isCompany}"><!-- 修改 -->
<view class="headStatus" v-if="scrollTop > 50" :style="[headStyle, <view class="headStatus" v-if="scrollTop > 50" :style="[headStyle,
{ {
zIndex: scrollTop < 10 ? 'unset' : 2, zIndex: scrollTop < 10 ? 'unset' : 2,
...@@ -17,8 +17,15 @@ ...@@ -17,8 +17,15 @@
v-if="meueData.user_center.top_style == 1"> v-if="meueData.user_center.top_style == 1">
<u-avatar :src="user_info.avatar" size="140" shape="circle" style="margin-left: 50rpx;"></u-avatar> <u-avatar :src="user_info.avatar" size="140" shape="circle" style="margin-left: 50rpx;"></u-avatar>
<view style="display: flex;flex-direction: column;justify-content: center;height: 60px;margin-left: 20rpx"> <view style="display: flex;flex-direction: column;justify-content: center;height: 60px;margin-left: 20rpx">
<Text class="nickname" style="color: #FFF;font-size: 40rpx;font-weight:800;max-width: 200px;overflow: hidden;display: inline-block;white-space: nowrap; text-overflow:ellipsis;" <view style="display: flex;align-items: center;">
@click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text> <Text class="nickname" style="color: #FFF;font-size: 40rpx;font-weight:800;max-width: 380rpx;overflow: hidden;display: inline-block;white-space: nowrap; text-overflow:ellipsis;"
@click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text>
<view v-if="companyStatus==5" style="margin-left: 10rpx;">
<image v-if="FirstShopType==1" style='width: 140rpx;height: 44rpx;' src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pinpaivip.png"></image>
<image v-if="FirstShopType==2" style='width: 140rpx;height: 44rpx;' src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/zaitivip.png"></image>
</view>
</view>
<!-- 判断是甲鹤小程序 --> <!-- 判断是甲鹤小程序 -->
<view v-if="AppletID == 5 && isAttestationEdu==1"> <view v-if="AppletID == 5 && isAttestationEdu==1">
<u-tag text="甲鹤学员" bg-color='#40766E' color='#FFF' size='mini' border-color='#40766E'/> <u-tag text="甲鹤学员" bg-color='#40766E' color='#FFF' size='mini' border-color='#40766E'/>
...@@ -34,22 +41,21 @@ ...@@ -34,22 +41,21 @@
<view class="renzhen" v-if="companyStatus==1 " > <view class="renzhen" v-if="companyStatus==1 " >
未认证 未认证
</view> </view>
<view class="renzhen" v-if="companyStatus==2 " > <view class="renzhen" v-if="companyStatus==2 " style="border:1px solid #FFA800;color: #FFA800;">
认证未完善 认证未完善
</view> </view>
<view class="renzhen" v-if="companyStatus==3" :style="{'border':'1px solid '+mainColor,'color':mainColor}"> <view class="renzhen" v-if="companyStatus==3" style="border:1px solid #2961FE;color: #2961FE;">
认证审核中 认证审核中
</view> </view>
<view class="renzhen" v-if="companyStatus==4 " > <view class="renzhen" v-if="companyStatus==4 " :style="{'border':'1px solid '+mainColor,'color':mainColor}">
未通过 未通过
</view> </view>
<view style="margin-top: 10px;display: flex;align-items: flex-start;" v-if="companyStatus==5"> <view style="margin-top: 10px;display: flex;align-items: flex-start;" v-if="companyStatus==5">
<view style="font-weight: 500;font-size: 13px;max-width: 360rpx;overflow: hidden;margin-right: 10px;display: inline-block;white-space: nowrap; text-overflow:ellipsis;"> <view style="font-weight: 500;font-size: 13px;max-width: 360rpx;overflow: hidden;margin-right: 10px;display: inline-block;white-space: nowrap; text-overflow:ellipsis;">
{{companyName}} {{companyName}}
</view> </view>
<image v-if="FirstShopType==1" style='width: 140rpx;height: 44rpx;' src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pinpaivip.png"></image>
<image v-if="FirstShopType==2" style='width: 140rpx;height: 44rpx;' src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/zaitivip.png"></image>
</view> </view>
</view> </view>
</view> </view>
...@@ -61,7 +67,14 @@ ...@@ -61,7 +67,14 @@
<Text style="color: #FFF;font-size: 40rpx;font-weight:800;" class="nickname" @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text> <Text style="color: #FFF;font-size: 40rpx;font-weight:800;" class="nickname" @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text>
<view class="member" v-if="is_icon_members_grade == 1&&user_info.nickname"> <view class="member" v-if="is_icon_members_grade == 1&&user_info.nickname">
<image :src="user_info.identity.level_icon" mode="aspectFill" style="width: 22px;height: 22px;border-radius: 11px;"></image> <image :src="user_info.identity.level_icon" mode="aspectFill" style="width: 22px;height: 22px;border-radius: 11px;"></image>
<Text style="margin-right: 10px;">{{ user_info.identity.level_name != null ? user_info.identity.level_name : '普通用户' }}</Text> <view style="display: flex;align-items: center;justify-content: center;">
<Text style="margin-right: 10px;">{{ user_info.identity.level_name != null ? user_info.identity.level_name : '普通用户' }}</Text>
<view v-if="companyStatus==5" style="margin-left: 10rpx;">
<image v-if="FirstShopType==1" style='width: 140rpx;height: 44rpx;' src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pinpaivip.png"></image>
<image v-if="FirstShopType==2" style='width: 140rpx;height: 44rpx;' src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/zaitivip.png"></image>
</view>
</view>
</view> </view>
<view v-if="AppletID == 5 && isAttestationEdu == 1"> <view v-if="AppletID == 5 && isAttestationEdu == 1">
<u-tag text="甲鹤学员" bg-color='#40766E' color='#FFF' size='mini' border-color='#40766E'/> <u-tag text="甲鹤学员" bg-color='#40766E' color='#FFF' size='mini' border-color='#40766E'/>
...@@ -81,8 +94,9 @@ ...@@ -81,8 +94,9 @@
未通过 未通过
</view> </view>
<view style="margin-top: 10px;" v-if="companyStatus==5"> <view style="margin-top: 10px;" v-if="companyStatus==5">
<image v-if="FirstShopType==1" style='width: 140rpx;height: 44rpx;' src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pinpaivip.png"></image> <view style="font-weight: 500;font-size: 13px;max-width: 360rpx;overflow: hidden;margin-right: 10px;display: inline-block;white-space: nowrap; text-overflow:ellipsis;">
<image v-if="FirstShopType==2" style='width: 140rpx;height: 44rpx;' src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/zaitivip.png"></image> {{companyName}}
</view>
</view> </view>
</view> </view>
</view> </view>
......
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