首店认证修改

pages.json

@@ -708,6 +708,8 @@
 				"path":"carrier/list"//品牌详情
 			},{
 				"path":"identification"//身份识别
+			},{
+				"path":"old_identification"//旧的身份识别
 			},{
 				"path" : "firstShop/firstShop"
 			},{
@@ -720,6 +722,10 @@
 				"path" : "wish/myWishPlan"//我的心愿计划
 			},{
 				"path" : "wish/richText"//心愿计划富文本
+			},{
+				"path":"carrierInformation"//载体信息编辑页面
+			},{
+				"path":"brandSearch"//品牌列表的搜索
 			}]
		}
     ],
     "globalStyle": {

pages/kotra/brandSearch.vue

+<template>
+	<view class="brandSearch">
+		<view style="width: 100%;padding: 5px 15px;">
+			<u-search shape="round" :clearabled="true" @change="search" v-model="keyword" @custom="search"></u-search>
+			<view v-if='BrandClassList.length>0'>
+				<scroll-view scroll-y="true" style="height: calc(100vh - 50px);">
+					<view v-for="(x,y) in BrandClassList" class="box" @click="huoquId(x)">
+						<view style="display: flex;align-items: flex-end;white-space: nowrap;text-overflow: ellipsis;overflow: hidden">
+							<span style='font-size: 14px;font-family: PingFang SC;font-weight: bold;color: #1F1F1F;'>{{type ==1?x.BrandName:x.CarrierName}}</span>
+							<span style='font-size: 12px;color: #1F1F1F;' v-if='type==1'>({{x.FullBrandName}})</span>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+			<u-empty v-if="BrandClassList.length==0" text="暂无数据" mode="list"></u-empty>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				keyword:'',
+				BrandClassList:[],
+				allBrandClassList:[],
+				type:1,//1位品牌 2位载体
+			}
+		},
+		onLoad(options) {
+			if(options && options.type){
+				this.type = options.type
+			}
+			this.getList()
+		},
+		created() {
+			
+		},
+		methods:{
+			getList(){
+				let url = "/api/AppletTrade/GetCenterBrandList"
+				let obj = {BrandName:''}
+				if(this.type==2){
+					url = "/api/AppletTrade/GetCenterCarrierList";
+					obj = {CarrierName:''}
+				}
+				
+				this.request2({
+						url: url,
+						data: obj,
+					},
+					(res) => {
+						if (res.resultCode == 1) {
+							this.BrandClassList =  res.data
+							this.allBrandClassList = JSON.parse(JSON.stringify(res.data)) 
+						}
+					}
+				);
+			},
+			search(){
+				let val = this.keyword
+				 if (val === '') {
+				  this.BrandClassList = JSON.parse(JSON.stringify(this.allBrandClassList))
+				} else {
+				  const needle = val.toLowerCase()
+				  if(this.type==1){
+					  this.BrandClassList = this.allBrandClassList.filter(v => v.BrandName.toLowerCase().indexOf(needle) > -1 || v.FullBrandName.toLowerCase().indexOf(needle) > -1)
+				  }else{
+					  this.BrandClassList = this.allBrandClassList.filter(v => v.CarrierName.toLowerCase().indexOf(needle) > -1 )
+					  
+				  }
+				}
+				
+			},
+			huoquId(x){
+				let pages = getCurrentPages(); // 当前页面
+				let beforePage = pages[pages.length - 2]; // 前一个页面
+				let that = this
+				setTimeout(()=>{
+					 uni.navigateBack({
+						 success: function() {
+							 beforePage.$vm.Children(x.ID,that.type); // 执行前一个页面的方法
+						 }
+					 });
+				},100)
+			}
+		}
+	}
+</script>
+
+<style>
+	.brandSearch{
+		width: 100%;
+		height: 100vh;
+		background: #F6F6F6;
+	}
+	.brandSearch .box{
+		width: 100%;
+		height: 53px;
+		display: flex;
+		align-items: center;
+		border-bottom: 1px solid #DADCE6;
+		
+	}
+</style>

pages/user-center/user-center.vue

@@ -31,14 +31,22 @@
 								 	
 								 </view>
 							 	<view class="componyStatusBox" @click="goIdentification" v-if="is_show_korea==1 && user_info.nickname">
-							 		<view class="renzhen" v-if="companyStatus==2 " >
+							 		<view class="renzhen" v-if="companyStatus==1 " >
 							 			未认证
 							 		</view>
-							 		<view class="renzhen" v-if="companyStatus==0"  :style="{'border':'1px solid '+mainColor,'color':mainColor}">
+									<view class="renzhen" v-if="companyStatus==2 " >
+										认证未完善
+									</view>
+								
+							 		<view class="renzhen" v-if="companyStatus==3"  :style="{'border':'1px solid '+mainColor,'color':mainColor}">
 							 			认证审核中
 							 		</view>
-							 		<view class="companyName" v-if="companyStatus==1">
-							 			{{companyName}}
+									<view class="renzhen" v-if="companyStatus==4 " >
+										未通过
+									</view>
+							 		<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>
+							 			<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>
@@ -242,6 +250,7 @@
 				isCompany:true, //TODO 完成动态加载系统所属类型
 				companyStatus:2,
 				companyName:"",
+				FirstShopType:0,
 				is_show_korea:0,//是否显示认证标识
 				IsDeposit:0,//是否开启储蓄卡功能
 				AppletID:0,//小程序id 5-8日 判断是否是甲鹤
@@ -508,13 +517,14 @@
 			getComponyStatus(){
 				let that = this
 				let parms = {
-					url: "/api/AppletTrade/GetUserCompany",
+					url: "/api/AppletTrade/GetCommpanyStatus",
 				}
 				this.request2(parms, (res) => {
 					if (res.resultCode == 1&&res.data!=null) {
 						// 获取公司名字和认证状态
 						that.companyStatus=res.data.CompanyStatus
 						that.companyName=res.data.CompanyName
+						this.FirstShopType = res.data.FirstShopType
 					}
 				})
 			},