Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

node_modules/uview-ui/components/u-action-sheet/u-action-sheet.vue

@@ -7,7 +7,7 @@
 		<block v-for="(item, index) in list" :key="index">
 			<view @touchmove.stop.prevent @tap="itemClick(index)" :style="[itemStyle(index)]" class="u-action-sheet-item" :class="[index < list.length - 1 ? 'u-border-bottom' : '']"
 			 hover-class="u-hover-class" :hover-stay-time="150">
-				{{item.text}}
+				{{ item[name] || item['name']}}
 			</view>
 		</block>
 		<view class="u-gab" v-if="cancelBtn">
@@ -89,7 +89,12 @@
 			zIndex: {
 				type: [String, Number],
 				default: 0
-			}
+			},
+			// 读取传入的数组对象的属性
+			name: {
+				type: String,
+				default: 'text'
+			},
 		},
 		computed: {
 			// 顶部提示的样式

pages/user-center/user-center.vue

 <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==0" :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,
@@ -19,10 +19,26 @@
 						<view style="display: flex;flex-direction: column;justify-content: center;height: 50px;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;"
 							 @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text>
-							<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>
-								<Text style="margin-right: 10px;">{{ user_info.identity.level_name != null ? user_info.identity.level_name : '普通用户' }}</Text>
-							</view>
+							 <view style="display: flex; align-items: center;">
+								 <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>
+								 	<Text style="margin-right: 10px;">{{ user_info.identity.level_name != null ? user_info.identity.level_name : '普通用户' }}</Text>
+								 	<!-- 公司认证状态 -->
+								 	
+								 </view>
+							 	<view class="componyStatusBox" @click="goIdentification" v-if="is_show_korea==1">
+							 		<view class="renzhen" v-if="companyStatus==2 " >
+							 			未认证
+							 		</view>
+							 		<view class="renzhen" v-if="companyStatus==0"  :style="{'border':'1px solid '+mainColor,'color':mainColor}">
+							 			认证审核中
+							 		</view>
+							 		<view class="companyName" v-if="companyStatus==1">
+							 			{{companyName}}
+							 		</view>
+							 	</view>
+							 </view>
+							
 						</view>
 					</view>
 					<view style="display: flex;flex-direction: column;align-items: center;margin-top: 23px;margin-bottom: 5px;" v-if="meueData.user_center.top_style == 2">
@@ -167,7 +183,7 @@
 			<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 			<tabbars></tabbars>
 		</view>
-		<view  v-if="meueData.user_center && meueData.user_center.is_ppenmiai==1 && isloading== true">
+		<view  v-if="meueData.user_center && meueData.user_center.is_ppenmiai==1 && isloading== true"><!-- 修改 -->
 			<blinddate
 			:meueData='meueData'
 			:user_info ='user_info'
@@ -215,7 +231,10 @@
 				IsEducation: 0, //1是0否是网课模式
 				PointNum:0,
 				setting: {},
-				isCompany:true //TODO 完成动态加载系统所属类型
+				isCompany:true, //TODO 完成动态加载系统所属类型
+				companyStatus:2,
+				companyName:"",
+				is_show_korea:0,//是否显示认证标识
 			};
 		},
 		components: {
@@ -232,7 +251,7 @@
 				0;
 			this.userinfo();
 			this.setting = uni.getStorageSync("basedata").mall.setting;
-			this.isCompany=uni.getStorageSync("user_type")?uni.getStorageSync("user_type")=="company":true; 完成动态加载系统所属类型
+			this.isCompany=uni.getStorageSync("user_type")?uni.getStorageSync("user_type")=="company":true; //完成动态加载系统所属类型
 		},
 		onLoad() {
 			this.navHeight = this.$navHeight - 2;
@@ -246,6 +265,7 @@
 			}
 		},
 		mounted() {
+			this.getComponyStatus()
 			let currentPages = getCurrentPages();
 			let c = this.$uiConfig.is_bang ? 80 : 52;
 			this.bottommargin = c + 10 + 'px';
@@ -259,13 +279,17 @@
 
 			this.is_icon_members_grade = uni.getStorageSync('basedata') ? uni.getStorageSync('basedata').mall.setting.is_icon_members_grade :
 				0;
+			this.is_show_korea= uni.getStorageSync('basedata') ? uni.getStorageSync('basedata').mall.setting.is_show_korea :
+					0;
 			let u = '/' + currentPages[currentPages.length - 1].route;
 			let pages = wx.getStorageSync('basedata') ? wx.getStorageSync('basedata').bar_title : [];
 			uni.setNavigationBarTitle({
 				title: '用户中心'
 			});
+			
 		},
 		onShow() {
+			
 			this.userinfo(2);
 			if (this.mall_UserInfo) {
 				this.getUserPoint()
@@ -355,6 +379,7 @@
 							this.getLogin()
 						}
 						this.isloading= true
+						
 					}
 				);
 				let u = uni.getStorageSync("mall_UserInfo");
@@ -453,6 +478,26 @@
 					url: '/pages/appointment/personal/pointBalance'
 				});
 			},
+			// 获取公司认证信息
+			getComponyStatus(){
+				let that = this
+				let parms = {
+					url: "/api/AppletTrade/GetUserCompany",
+				}
+				this.request2(parms, (res) => {
+					if (res.resultCode == 1&&res.data!=null) {
+						// 获取公司名字和认证状态
+						that.companyStatus=res.data.CompanyStatus
+						that.companyName=res.data.CompanyName
+					}
+				})
+			},
+			//去认证页
+			goIdentification(){
+				uni.navigateTo({
+					url: '/pages/kotra/identification' 
+				})
+			}
 		}
 	};
 </script>
@@ -654,7 +699,7 @@
 
 	.userStyle .member {
 		background: #3b3641;
-		width: 80px;
+		/* width: 80px; */
 		font-size: 10px;
 		color: #fff;
 		height: 18px;
@@ -782,4 +827,13 @@
 	.userBox .paike{
 		margin-top: 15px;display: flex;flex-direction: row;align-items: center;justify-content: space-between;
 	}
+	.componyStatusBox .renzhen{
+		height: 15px;font-size: 10px;margin-top: 10px;color: #555555;border-radius: 7px;border: 1px solid #999999;display: flex;align-items: center;justify-content: center; padding: 0 10rpx; margin-left: 10rpx;
+	}
+	.componyStatusBox .companyName{
+		font-size: 26rpx;
+		font-weight: 500;
+		color: #888888;
+		/* background-color: #F6F6F6FF */
+	}
 </style>
\ No newline at end of file