Skip to content

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

1

parent 4f046637
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 23 deletions
pages/kotra/carrier/list.vue
View file @ 89701ec4
......@@ -176,7 +176,11 @@
url: '/pages/kotra/carrier/detail?id=' + id+"&&type="+type,
});
},
searchHandler(val){},
searchHandler(val){
this.msg.CarrierName=val
this.getCarrierPageList()
},
//触底事件
lower(e) {
if (this.msg.pageIndex < this.pageCount) {
......
pages/kotra/identification.vue
View file @ 89701ec4
......@@ -14,7 +14,7 @@
<view v-for="(item,index) in stepOneList" :key="index">
<view class="itemBox">
<view class="name">
{{item.name}}
{{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"
......@@ -45,7 +45,7 @@
<view v-for="(item,index) in stepTwoList" :key="index">
<view class="itemBox">
<view class="name">
{{item.name}}
{{item.name}}&nbsp; <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="dataTwo[item.field]" :placeholder="item.text"
......@@ -67,7 +67,9 @@
<view class="con3" v-if="item.type==3">
<!-- 区间滑块 -->
<view class="sliderCurNumBox">
<input class="sliderCurNum" disabled type="text" v-model="dataTwo.BuiltUpArea" />-
<view style="display: flex; align-items: baseline;" v-if="dataTwo.BuiltUpArea>0">
<input class="sliderCurNum" disabled type="text" v-model="dataTwo.BuiltUpArea" />-
</view>
<input class="sliderCurNum" disabled type="text" v-model="dataTwo.EndBuiltUpArea" />m²
</view>
<rangeSlider :width="592" :height="120" :liveMode="true" background-color="#DADCE6D9"
......@@ -97,7 +99,7 @@
<view v-for="(item,index) in stepThreeList" :key="index">
<view class="itemBox">
<view class="name">
{{item.name}}
{{item.name}}&nbsp; <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="dataThree[item.field]" :placeholder="item.text"
......@@ -165,7 +167,8 @@
nextSepName: "第2步",
// type=1：输入框，2：照片
stepOneList: [{
name: "营业执照 （点击图片上传营业执照)",
name: "营业执照",
tip:"(点击图片上传营业执照)",
type: 2
}, {
name: "企业名称",
......@@ -217,6 +220,7 @@
type: 1
}, {
name: "客户群体",
tip:"(可多选)",
text: "",
field: "CustomerType",
type: 4,
......@@ -225,12 +229,13 @@
//type=1：输入框，2：单选，3：范围
stepThreeList: [{
name: "扩店区域",
text: "请输入品牌全名",
text: "请输入扩店区域",
field: "StoreExpansion",
delIcon:false,
type: 1
}, {
name: "商品性质",
name: "商品性质 ",
tip:"(单选)",
text: "",
field: "ProjectType",
type: 2
......@@ -470,7 +475,10 @@
this.dataTwo.CustomerType = ids.toString()
let parms = {
url: "/api/AppletTrade/SetBrand",
data: this.dataTwo
data: {
...this.dataTwo,
...this.dataThree
}
}
this.request2(parms, (res) => {
if (res.resultCode == 1) {
......@@ -484,7 +492,6 @@
//步骤三
stepThree() {
let that = this
this.dataThree.CompanyId = this.dataOne.CompanyId
this.dataThree.AreaRequirement = this.AreaRequire[0]
this.dataThree.EndAreaRequirement = this.AreaRequire[1]
let parms = {
......@@ -496,7 +503,6 @@
}
this.request2(parms, (res) => {
if (res.resultCode == 1) {
// that.getUserCompanyBrand(this.dataOne.CompanyId)
that.finish()
}
})
......@@ -508,6 +514,7 @@
},
//下一步
nextStep() {
console.log(this.dataOne.CompanyStatus,this.step)
if (this.percent > 100) {
this.percent = 100
}
......@@ -515,17 +522,30 @@
if (this.step == 1) {
//审核中或审核通过就不提交请求
if (this.dataOne.CompanyStatus != 0 || this.dataOne.CompanyStatus != 1) {
this.stepOne()
} else {
this.stepName = "第2步 品牌信息"
this.nextSepName = "第3步"
this.step++
this.percent += this.percent
} else {
this.stepOne()
}
} else if (this.step == 2) {
this.stepTwo()
//审核中或审核通过就不提交请求
if (this.dataOne.CompanyStatus != 0 || this.dataOne.CompanyStatus != 1) {
this.stepName = "第3步 扩店需求"
this.nextSepName = "完成"
this.step++
this.percent += this.percent
} else {
this.stepTwo()
}
} else if (this.step == 3) {
this.stepThree()
//审核中或审核通过就不提交请求
if (this.dataOne.CompanyStatus != 0 || this.dataOne.CompanyStatus != 1) {
this.finish()
}else{
this.stepThree()
}
}
}
},
......@@ -594,7 +614,6 @@
that.dataThree.AreaRequirement = res.data.AreaRequirement
that.dataThree.EndAreaRequirement = res.data.EndAreaRequirement
}
console.log(that.dataThree)
})
},
// 单选
......@@ -699,6 +718,11 @@
font-weight: bold;
color: #1F1F1F;
margin-bottom: 38rpx;
.tip{
font-weight: 400;
color: #AAAAAAFF;
margin-left: 10rpx;
}
}
.con1 {
......
pages/user-center/user-center.vue
View file @ 89701ec4
<template>
<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==1" :class="{'dark':isCompany}"><!-- 修改 -->
<view class="userStyle" v-if="meueData.user_center && meueData.user_center.is_ppenmiai==0" :class="{'dark':isCompany}"><!-- 修改 -->
<view class="headStatus" v-if="scrollTop > 50" :style="[headStyle,
{
zIndex: scrollTop < 10 ? 'unset' : 2,
......@@ -265,7 +265,7 @@
}
},
mounted() {
this.getUserCompany()
this.getComponyStatus()
let currentPages = getCurrentPages();
let c = this.$uiConfig.is_bang ? 80 : 52;
this.bottommargin = c + 10 + 'px';
......@@ -379,6 +379,7 @@
this.getLogin()
}
this.isloading= true
}
);
let u = uni.getStorageSync("mall_UserInfo");
......@@ -477,17 +478,17 @@
url: '/pages/appointment/personal/pointBalance'
});
},
// 获取公司认证信息
getUserCompany() {
getComponyStatus(){
let that = this
let parms = {
url: "/api/AppletTrade/GetUserCompany",
}
this.request2(parms, (res) => {
if (res.resultCode == 1) {
that.companyStatus=res.data.CompanyStatus
that.companyName=res.data.CompanyName
if (res.resultCode == 1&&res.data!=null) {
// 获取公司名字和认证状态
that.companyStatus=res.data.CompanyStatus
that.companyName=res.data.CompanyName
}
})
},
......
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