Skip to content

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

1

parent b80d1691
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 64 deletions
pages/kotra/brand/detail.vue
View file @ 0a6b0b62
......@@ -8,8 +8,8 @@
{{details.BrandName}}
</view>
<view class="tag-box" v-if="details.FirstShopYear!=null && details.FirstShopYear!=''">
<view class="tag1" style="width: 30px;">{{details.FirstShopYear}}</view>
<view class="tag2" style="width: 30px;">首店</view>
<view class="tag1" style="width: 35px;height: 100%;">{{details.FirstShopYear}}</view>
<view class="tag2" style="width: 35px;height: 100%;">首店</view>
</view>
</view>
<view class="score-box flex item-center" v-if="details.OpenShopWish!=-1">
......@@ -86,8 +86,8 @@
</view>
</view>
<view class="info1-item">
<view class="info1-con">
{{details.ShopNum}}
<view class="info1-con" >
{{details.ProjectName}}
</view>
<view class="info1-title">
对标载体
......@@ -155,7 +155,7 @@
</view>
</view>
<view style="width: 100%;height: 360rpx;" v-if="details.WishDescription && details.WishDescription !=''">
<image :src="details.WishCard" style="width: 100%;height: 360rpx;border-radius: 20px;"></image>
<image :src="details.WishCard" style="width: 100%;height: 360rpx;border-radius: 20px;" @click="previewImage2(details.WishCard)"></image>
</view>
</view>
<view class="brand-title">
......@@ -310,6 +310,7 @@
tooltipShow: false,
tooltipBtns: ["今日sad"],
eleId: "", //点击元素
islook:false,//是否可以浏览心愿
}
},
onLoad(options) {
......@@ -318,7 +319,7 @@
this.ID = options.id
this.GetBrandDetails()
}
uni.getSystemInfo({
success(res) {
that.titleStyle = {
......@@ -455,6 +456,19 @@
},
});
},
previewImage2(i) {
uni.previewImage({
urls: [this.details.WishCard],
current: 0,
longPressActions: {
itemList: ["发送给朋友", "保存图片", "收藏"],
success: function(data) {},
fail: function(err) {
console.log(err.errMsg);
},
},
});
},
scroll(e) {
this.boxOption = Math.floor((e.detail.scrollTop - 50) / 1.5);
this.titleStyle.opacity = ((e.detail.scrollTop - 100) < 0 ? 0 : Math.floor(e.detail.scrollTop - 100)) +
......@@ -561,15 +575,20 @@
width: 70px;
display: flex;
margin-top: 4px;
height: 20px;
.tag1 {
padding: 7rpx 10rpx;
display: flex;
align-items: center;
justify-content: center;
background-color: #1F1F1F;
font-size: 20rpx;
color: #FFFFFF;
}
.tag2 {
padding: 7rpx 10rpx;
display: flex;
align-items: center;
justify-content: center;
background-image: linear-gradient(90deg, #E8CEA5, #CAA974);
font-size: 20rpx;
color: #1F1F1F;
......@@ -622,7 +641,7 @@
width: 200rpx;
.info1-con {
font-size: 32rpx;
font-size: 30rpx;
font-weight: bold;
color: #F30329;
text-align: center;
......
pages/kotra/brandInformation.vue
View file @ 0a6b0b62
......@@ -188,7 +188,30 @@
<view class="bottom-border">
<view class="label-text">店铺数量<span style='color: #E54D42;' >*</span></view>
<input type="text" v-model="model.ShopNum" style="padding: 10px 0;" placeholder="请填写店铺数量" :disabled="disabled" placeholder-style="color:#CECECE;">
<input type="number" v-model="model.ShopNum" style="padding: 10px 0;" placeholder="请填写店铺数量" :disabled="disabled" placeholder-style="color:#CECECE;">
</view>
<view class="bottom-border">
<view class="label-text">开店意愿<span style='color: #E54D42;' >*</span></view>
<view class="bottom-border_r " style="padding: 10px 0;height: 42px;display: flex;">
<!-- <radio-group @change="radioChange2($event)" style="display: flex;">
<label v-for="(item, index) in radiolist" :key="index" style="display: flex;margin-right: 10px;">
<view style="transform:scale(0.7)">
<radio :value="item.Id" :checked="item.Id == ShopWish" :disabled="disabled" color='#2979ff'/>
</view>
<view>{{item.name}}</view>
</label>
</radio-group> -->
<u-rate
:disabled="disabled"
v-model="model.OpenShopWish"
:current="model.OpenShopWish?model.OpenShopWish:'5'"
:active-color="mainColor" inactive-color="#DDDDDD"
active-icon="star"
inactive-icon="star-o"
size="40"
@change='score'
></u-rate>
</view>
</view>
<view class="bottom-border">
<view class="label-text">建筑面积</view>
......@@ -297,29 +320,7 @@
</radio-group>
</view>
</view>
<view class="bottom-border">
<view class="label-text">开店意愿<span style='color: #E54D42;' >*</span></view>
<view class="bottom-border_r " style="padding: 10px 0;height: 42px;display: flex;">
<!-- <radio-group @change="radioChange2($event)" style="display: flex;">
<label v-for="(item, index) in radiolist" :key="index" style="display: flex;margin-right: 10px;">
<view style="transform:scale(0.7)">
<radio :value="item.Id" :checked="item.Id == ShopWish" :disabled="disabled" color='#2979ff'/>
</view>
<view>{{item.name}}</view>
</label>
</radio-group> -->
<u-rate
:disabled="disabled"
v-model="model.OpenShopWish"
:current="model.OpenShopWish?model.OpenShopWish:'5'"
:active-color="mainColor" inactive-color="#DDDDDD"
active-icon="star"
inactive-icon="star-o"
size="40"
@change='score'
></u-rate>
</view>
</view>
<view style="margin-top: 30px;">
<view class="butBox2" @click="brandSubmit" v-if='!disabled'>
<text v-if='datas.CompanyStatus && datas.CompanyStatus==1'>确定修改</text>
......
pages/kotra/identification.vue
View file @ 0a6b0b62
<template>
<view class="page" v-if='loading'>
<view v-if='nowStatus == 4' class="stepBox" style="padding-top: 20px;">
<view v-if='nowStatus == 4 ' class="stepBox" style="padding-top: 20px;">
<view v-if='ChooseidentityId==1'>
<brandInformation ref='brandinfo' :datas='dataOne'></brandInformation>
</view>
......@@ -8,7 +8,7 @@
<carrierInformation ref='carrierinfo' :datas='dataOne'></carrierInformation>
</view>
</view>
<view class="progressBox" v-if='nowStatus != 4'>
<view class="progressBox" v-if='nowStatus != 4 '>
<view class="progressName">
<text class="cur">{{stepName}}</text>
<text class="nex">{{nextSepName}}</text>
......@@ -36,9 +36,9 @@
{{item.name}} <text class="tip" v-if="item.tip">{{item.tip}}</text>
</view>
<view class="con1" v-if="item.type==1">
<input class="input" type="text" v-model="dataOne[item.field]" :placeholder="item.text" :disabled="nowStatus==3?true:false"
<input class="input" type="text" v-model="dataOne[item.field]" :placeholder="item.text" :disabled="nowStatus==3|| nowStatus==5?true:false"
placeholder-style="color: #CECECEFF" @focus="inputFcous(item)" />
<view v-if='nowStatus!=3' style="width: 50rpx;height: 50rpx;display: flex;align-items: center;justify-content: center;position: absolute;
<view v-if='nowStatus!=3 && nowStatus!=5 ' style="width: 50rpx;height: 50rpx;display: flex;align-items: center;justify-content: center;position: absolute;
top: -2rpx;
right: 10rpx;
z-index: 10;" @click="delInputText(item.field)">
......@@ -54,7 +54,7 @@
<!-- 上传成功 -->
<image :src="dataOne.BusinessLicense" v-if="businessLicenseUploadIsSuccess" class="conImage"
mode="heightFix"></image>
<view class="reupload" v-if="businessLicenseUploadIsSuccess && nowStatus!=3" @click="chooseImg" >
<view class="reupload" v-if="businessLicenseUploadIsSuccess && (nowStatus!=3 && nowStatus!=5)" @click="chooseImg" >
重新上传
</view>
</view>
......@@ -99,23 +99,7 @@
<view class="butBox" @click="nextStep">
<image :src="nextIcon" class="next" mode="widthFix" ></image>
</view>
</view>
<!-- 审核未通过 -->
<!-- <view v-if="dataOne.CompanyStatus!=1">
<view class="butBox" @click="nextStep">
<image :src="nextIcon" class="next" mode="widthFix" v-if="step!=3"></image>
<text v-if="step==4">完成</text>
</view>
<view class="skip" v-if="step==4">
<text @click="finish">跳过</text>
</view>
</view> -->
<!-- 审核通过 -->
<!-- <view class="butBox" v-if="dataOne.CompanyStatus==1" @click="backBtn">
<image :src="nextIcon" class="next" mode="widthFix" v-if="step!=4"></image>
<text v-if="step==4">返回</text>
</view> -->
</view>
</view>
......@@ -273,6 +257,7 @@
newCompanyId:0,
nowStatus:1,//此时的状态
loading:false,
editType:0,//是否是从修改进入的 1是 0否
}
},
methods: {
......@@ -459,14 +444,27 @@
if (this.step <= 4) {
if (this.step == 1) {
//审核中或审核通过就不提交请求
if(this.nowStatus!=3){
if(this.nowStatus!=3 && this.nowStatus!=2 && this.nowStatus!=5){
this.stepName = "第2步 选择身份"
this.nextSepName = "第3步"
this.step++
this.percent += this.percent
}else{//审核中的去查看
this.step=3
this.percent = 100;
if(this.nowStatus==2){//不通过的时候不能去选择身份了
this.stepOne()
}else{
this.step=3
this.percent = 100;
if(this.dataOne.FirstShopType == 1){
this.stepName = "第3步 品牌信息"
this.nextSepName = "完成"
}else{
this.stepName = "第3步 载体信息"
this.nextSepName = "完成"
}
}
}
......@@ -511,12 +509,17 @@
this.dataOne = res.data
this.businessLicenseUploadIsSuccess = true
this.dataOne.CompanyId = res.data.CompanyId
console.log(this.dataOne)
if(this.dataOne.CompanyStatus==0 && this.dataOne.IsComplete==1){//审核中
this.nowStatus = 3
}
if(this.dataOne.CompanyStatus==1){//审核通过
this.nowStatus = 4
if(this.editType == 0){//从企业菜单今天 可以看企业菜单但是不能修改
this.nowStatus = 5
}
}
if(this.dataOne.CompanyStatus==2){//审核不通过
this.nowStatus = 2
}
this.ChooseidentityId = this.dataOne.FirstShopType;
if(this.dataOne.FirstShopType && this.dataOne.FirstShopType==1){
......@@ -539,15 +542,21 @@
uni.requestSubscribeMessage({
tmplIds: template,
complete(res) {
that.step++
that.percent += that.percent
if(that.nowStatus == 2){
that.step=3
that.percent = 100;
}else{
that.step++
that.percent += that.percent
}
if(that.ChooseidentityId == 1){
that.stepName = "第3步 品牌信息"
that.nextSepName = "完成"
}else{
that.stepName = "第3步 载体信息"
that.nextSepName = "第4步"
that.nextSepName = "完成"
}
}
})
......@@ -568,10 +577,17 @@
}
},
onLoad(options) {
if(options&& options.editType){ //是否是从修改进去的
this.editType = options.editType
}
this.getUserCompany()
},
created() {
this.getUserCompany()
},
mounted() {
// this.getCustomerTypeEnumList()
......
pages/user-center/user-center.vue
View file @ 0a6b0b62
......@@ -44,7 +44,10 @@
<view class="renzhen" v-if="companyStatus==4 " >
未通过
</view>
<view style="margin-top: 10px;" 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;">
{{companyName}}
</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>
......@@ -558,7 +561,7 @@
//去认证页
goIdentification(){
uni.navigateTo({
url: '/pages/kotra/identification'
url: '/pages/kotra/identification?editType=1'
})
}
}
......
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