浏览代码

Merge branch 'developer' of http://git.caimei365.com/zhengjinyi/caimei-applets-weisha into developer

zhengjinyi 4 年之前
父节点
当前提交
af8217d1af

+ 164 - 0
components/vcode-input/vcode-input.vue

@@ -0,0 +1,164 @@
+<template>
+	<view class="vcode-input-body">
+		<text class="vcode-input-item" 
+		:class="isBorderLine?'vcode-input-line':'vcode-input-border'"
+		v-for="(v,index) in sum" 
+		:key="index"
+		@tap.stop="setFocus"
+		:style="{
+			borderColor:text.length===index&&focus?borderActiveColor:(text.length>index?borderValueColor:borderColor),
+			color:text.length>index?borderValueColor:borderColor}"
+		>
+			{{ text[index]?text[index]:'' }}
+		</text>
+		<view class="hidden-input">
+			<input
+			id="vcodeInput"
+			ref="vcodeInput"
+			type="number" 
+			:show-confirm-bar="false"
+			auto-blur
+			:focus="focus"
+			:maxlength="sum"
+			v-model="value"
+			@blur="setBlur"
+			:password="isPassword"
+			placeholder="验证码"/>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:'VcodeInput',
+		props: {
+			sum:{
+				type: Number,
+				default: 6
+			},
+			isBorderLine:{
+				type:Boolean,
+				default:false
+			},
+			borderColor:{
+				type:String,
+				default:'#e8e8e8'
+			},
+			borderValueColor:{
+				type:String,
+				default:'#e8e8e8'
+			},
+			borderActiveColor:{
+				type:String,
+				default:'#e8e8e8'
+			},
+			isAutoComplete:{
+				type: Boolean,
+				default: true
+			},
+			isPassword:{
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				focus:false,
+				text:[],
+				value:''
+			};
+		},
+		watch:{
+			value(value,oldVal){
+				if(this.isAutoComplete){
+					if(value.length>=this.sum){
+						this.focus=false;
+						this.$emit('vcodeInput', value);
+					}
+				}else{
+					this.$emit('vcodeInput', value);
+				}
+				if(this.isPassword){
+					let val='';
+					for (let i = 0; i < value.length; i++) {
+						val+='●';
+					}
+					this.text=val;
+				}else{
+					this.text=value.split("");
+				}
+				
+			}
+		},
+		mounted() {
+			this.$nextTick(() => {
+				this.initInput()
+			})
+		},
+		methods:{
+			initInput(){
+				this.focus=true;
+				// #ifdef H5
+				this.$refs.vcodeInput.$refs.input.setAttribute('type','number');
+				this.$refs.vcodeInput.$refs.input.setAttribute('pattern','[0-9]*')
+				// #endif
+			},
+			setBlur(){
+				this.$nextTick(() => {
+					this.focus=false;
+				})
+			},
+			setFocus(){
+				this.focus= !this.focus;
+			},
+			clearValue(){
+				this.value='';
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.vcode-input-body{
+	margin-left: -36rpx;
+	margin-right: -36rpx;
+	position: relative;
+	overflow: hidden;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	justify-content: center;
+	align-items: center;
+}
+.vcode-input-item{
+	width: 76rpx;
+	height: 76rpx;
+	margin-left: 12rpx;
+	margin-right: 12rpx;
+	line-height: 76rpx;
+	text-align: center;
+	font-weight: 500;
+	color: #c4761f !important;
+	border-radius: 4rpx;
+}
+.vcode-input-border{
+	border-style: solid;
+	border-width: 2rpx;
+	border-color: $uni-border-color;
+	border-radius: 4rpx;
+}
+.vcode-input-line{
+	border-bottom-style: solid;
+	border-bottom-width: 2rpx;
+	border-color: $uni-border-color;
+}
+.hidden-input{
+	width: 0px;
+	height: 0px;
+	position: absolute;
+	left: -1px;
+	top: -1px;
+	overflow: hidden;
+}
+</style>

+ 10 - 16
pages.json

@@ -7,23 +7,17 @@
 				"enablePullDownRefresh": true
 			}
 		}, {
-			"path": "pages/login/authorize",
+			"path": "pages/authorization/authorization",
 			"style": {
 				"navigationBarTitleText": "微信授权"
 			}
-		},
-		{
+		}, {
 			"path": "pages/login/login",
 			"style": {
 				"navigationBarTitleText": "登录"
 			}
-		}, {
-			"path": "pages/authorization/authorization",
-			"style": {
-				"navigationBarTitleText": "微信授权",
-				"navigationStyle": "custom"
-			}
-		}, {
+		},
+		{
 			"path": "pages/tabBar/category/index",
 			"style": {
 				"navigationBarTitleText": "分类",
@@ -50,6 +44,11 @@
 		{
 			"root": "pages/user/", //机构个人中心模块
 			"pages": [{
+					"path": "club/club-list",
+					"style": {
+						"navigationBarTitleText": "机构列表"
+					}
+				}, {
 					"path": "cart/cart",
 					"style": {
 						"navigationBarTitleText": "购物车"
@@ -61,12 +60,7 @@
 						"navigationBarTitleText": "立即下单"
 					}
 				},
-				{
-					"path": "club/club-list",
-					"style": {
-						"navigationBarTitleText": "机构列表"
-					}
-				},
+
 				{
 					"path": "address/addressManage",
 					"style": {

+ 13 - 13
pages/authorization/authorization.vue

@@ -1,9 +1,8 @@
 <template>
 	<view class="container login" :style="{paddingTop:CustomBar+'px'}">
-		<cu-custom :navbar-data='nvabarData' @navigateBack="hanldNavigateBack"></cu-custom>
+		<!-- <cu-custom :navbar-data='nvabarData' @navigateBack="hanldNavigateBack"></cu-custom> -->
 		<view class="login-main">
-			<image class="logo" src="https://static.caimei365.com/app/img/icon/login-logo@3x.png" mode=""></image>
-			<text class="logo-text">生美/医美采购服务平台</text>
+			<image class="logo" src="../../static/ws/logo.png" mode="widthFix"></image>
 		</view>
 		<view class="login-content">
 			<text>您暂未授权采美采购小程序获取您的信息,将无法正常使用小程序的功能。如需正常使用,请点击“授权”按钮,并允许头像、昵称等信息的授权。</text>
@@ -116,11 +115,12 @@
 			flex-direction: column;
 			align-items: center;
 			height: auto;
-			padding:200rpx 0 0 0;
+			padding:80rpx 0 0 0;
 			.logo{
-				width: 200rpx;
-				height: 170rpx;
+				width:152rpx;
+				height: 152rpx;
 				display: block;
+				border-radius: 50%;
 			}
 			.logo-text{
 				font-size: $font-size-40;
@@ -131,9 +131,9 @@
 		}
 		.login-content{
 			width: 580rpx;
-			margin: 95rpx auto;
-			line-height: 40rpx;
-			font-size: $font-size-24;
+			margin: 70rpx auto;
+			line-height: 48rpx;
+			font-size: 26rpx;
 			color: #666666;
 			text-align: justify;
 		}
@@ -145,8 +145,8 @@
 			align-items: center;
 			margin: 0 auto;
 			.login-btn{
-				width: 630rpx;
-				height: 80rpx;
+				width: 600rpx;
+				height: 90rpx;
 				border-radius: 40rpx;
 				font-size: $font-size-32;
 				line-height: 80rpx;
@@ -159,8 +159,8 @@
 				&.back{
 					height: 76rpx;
 					background: #FFFFFF;
-					border: 1px solid #08A267;
-					color: #08A267;
+					border: 1px solid #666;
+					color: #666;
 					margin-top: 30rpx;
 				}
 			}

+ 17 - 12
pages/index/index.vue

@@ -6,7 +6,7 @@
 			<view class="user-info">
 				<image src="@/static/ws/default_avatar.png" mode="widthFix"></image>
 				<view class="ws-login" @click="toAuthorize">请登录</view>
-				<!-- <view class="user-text"> 瑞恺迪光电科技有限公司有限公司撒娇观看了 </view> -->
+				<!-- <view class="user-text"> 瑞恺迪光电科技有限公司有限公司 </view> -->
 			</view>
 			<!-- 背景图 -->
 			<image class="user-bg" src="@/static/ws/user_bg.png" mode="widthFix"></image>
@@ -16,30 +16,30 @@
 		<view class="order-wrap">
 			<view class="more">
 				<text class="title">我的订单</text>
-				<view> <text class="more-right">全部订单</text> <text class="iconfont iconchakangengduo"></text> </view>
+				<view> <text class="more-right">全部订单</text> <text class="iconfont icon-chakangengduo"></text> </view>
 			</view>
 			<view class="line"></view>
 			<view class="order-nav">
 				<view class="order-nav-item">
-					<image src="../../static/ws/dh_dqr_01.png" mode="widthFix"></image> <text>待确认</text>
+					<image src="@/static/ws/dh_dqr_01.png" mode="widthFix"></image> <text>待确认</text>
 				</view>
 				<view class="order-nav-item">
-					<image src="../../static/ws/dh_dfk_02.png" mode="widthFix"></image> <text>待付款</text>
+					<image src="@/static/ws/dh_dfk_02.png" mode="widthFix"></image> <text>待付款</text>
 				</view>
 				<view class="order-nav-item">
-					<image src="../../static/ws/dh_dfh_03.png" mode="widthFix"></image> <text>待发货</text>
+					<image src="@/static/ws/dh_dfh_03.png" mode="widthFix"></image> <text>待发货</text>
 				</view>
 				<view class="order-nav-item">
-					<image src="../../static/ws/dh_yfh_04.png" mode="widthFix"></image> <text>已发货</text>
+					<image src="@/static/ws/dh_yfh_04.png" mode="widthFix"></image> <text>已发货</text>
 				</view>
 				<view class="order-nav-item"> <image src="../../static/ws/dh_tk_05.png" mode="widthFix"></image> <text>退款</text> </view>
 			</view>
 		</view>
 		<!-- 订单状态区域END -->
 		<!-- 帮机构下单 -->
-		<view class="place-order">
-			<view class="place-left"> <text class="iconfont iconbangjigouxiadan"></text> <text class="title">帮机构下单</text> </view>
-			<text class="iconfont iconchakangengduo"></text>
+		<view class="place-order" @click="toClubList">
+			<view class="place-left"> <text class="iconfont icon-bangjigouxiadan"></text> <text class="title">帮机构下单</text> </view>
+			<text class="iconfont icon-chakangengduo"></text>
 		</view>
 		<!-- 帮机构下单END -->
 		<!-- 客服 -->
@@ -100,9 +100,14 @@ export default {
 		...mapState(['hasLogin', 'userInfo'])
 	},
 	methods: {
-		toAuthorize(){
+		toClubList() {
 			uni.navigateTo({
-				url:'/pages/login/authorize'
+				url: '../user/club/club-list'
+			})
+		},
+		toAuthorize() {
+			uni.navigateTo({
+				url: '/pages/authorization/authorization'
 			})
 		},
 		getUserInfo() {
@@ -410,7 +415,7 @@ export default {
 	background: linear-gradient(to right, #fccd90, #b6762f);
 	color: #fff;
 	border-radius: 24rpx;
-	.iconfont{
+	.iconfont {
 		font-size: 30rpx;
 		margin-right: 6rpx;
 	}

+ 0 - 58
pages/login/authorize.vue

@@ -1,58 +0,0 @@
-<template>
-	<view class="container">
-		<view class="authorize">
-			<image src="../../static/ws/logo.png" mode="widthFix"></image>
-			<view class="text">
-				您暂未授权<text>维沙采购商城</text>小程序获取您的信息将无法正常使用小程序的功能,如需正常使用,请点击 “<text>授权</text>” 按钮打开头像,昵称等信息的授权
-			</view>
-			<view class="btns">
-				<button type="primary">微信授权</button>
-				<button type="default">取消</button>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-</script>
-
-<style lang="scss">
-	.authorize{
-		width: 572rpx;
-		margin: 180rpx auto 0;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		image{
-			width: 152rpx;
-			height: 152rpx;
-			border-radius: 50%;
-		}
-		.text{
-			font-size: 26rpx;
-			line-height: 48rpx;
-			margin: 60rpx 0;
-			color: #666;
-			text{
-				color: #333;
-			}
-		}
-		.btns{
-			button{
-				width: 540rpx;
-				height: 90rpx;
-				border-radius: 45rpx;
-				font-size: 30rpx;
-				line-height: 90rpx;
-				text-align: center;
-				margin-top: 20rpx;
-				&:last-child{
-					background-color: #fff;
-					border: 1rpx solid #b4b4b4;
-					box-sizing: border-box;
-				}
-			}
-			
-		}
-	}
-</style>

+ 150 - 175
pages/login/login.vue

@@ -1,198 +1,173 @@
-
 <template>
 	<view class="container login">
-		<view class="login-main">
-			<image class="logo" src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/logo.png" mode=""></image>
-		</view>
+		<view class="login-main"> <image class="logo" src="/static/ws/logo.png" mode="widthFix"></image> </view>
+		<view class="login-title"> <image src="/static/ws/invitation_code.png" mode="widthFix"></image> <text>邀请码</text> </view>
 		<view class="login-input">
-			<input type="number" 
-				   v-model="invitationCode"  
-				   maxlength="6" 
-				   class="input" 
-				   placeholder="请输入邀请码"
-			/>
+			<!-- 邀请码输入框 -->
+			<vcode-input ref="VcodeInput" @vcodeInput="vcodeInput"></vcode-input>
 		</view>
-		<view class="login-row" @click.stop="this.$api.navigateTo('/pages/login/register-select')"><text>免费注册</text></view>
-		<view class="login-btn"  @click.stop="goLogin">登录</view>
-		<view class="login-btn-last" @click.stop="this.$api.navigateTo('/pages/login/login')">账号登录</view>
+		<view class="logo-message"><text>邀请码错误,请联系采美客服获取最新邀请码</text> </view> <button class="login-btn">登录</button>
 	</view>
 </template>
 
 <script>
-	import authorize from '@/common/config/authorize.js'
-	import wxLogin from "@/common/config/wxLogin.js"
-	import {mapState,mapMutations } from 'vuex';
-	import { invitationCodeLogin  } from '@/services/use.js'
-	export default{
-		data() {
-			return{
-				invitationCode:'',  //获取用户登录的邀请码
-			}
+import VcodeInput from '@/components/vcode-input/vcode-input'
+export default {
+	components: {
+		VcodeInput
+	},
+	data() {
+		return {}
+	},
+	onLoad() {},
+	methods: {
+		// 用户输入的值
+		vcodeInput(val) {
+			console.log(val)
 		},
-		onLoad(option) {
-
+		// 控制组件获取焦点
+		setFocus() {
+			this.$refs.VcodeInput.setFocus()
 		},
-		computed: {
-			...mapState(['isWxAuthorize','isLoginType','isLoginProductId','isLoginOrderId'])
+		// 控制组件失去焦点
+		setBlur() {
+			this.$refs.VcodeInput.setBlur()
 		},
-		methods:{
-			...mapMutations(['login']),
-			goLogin() {
-				if( this.invitationCode == ''){
-					this.$util.msg('请输入邀请码',2000)
-					return
-				}
-				wx.getUserInfo({
-					success: res => {
-						this.isUserInfo = false
-						this.userInfo = res.userInfo;
-						let params ={
-								invitationCode:this.invitationCode,
-								nickName:res.userInfo.nickName,
-								headimgurl:res.userInfo.avatarUrl,
-						}							
-						invitationCodeLogin(params).then(response =>{
-							this.login(response.data)
-							wxLogin.wxLoginAuthorize()
-							if(response.data.userIdentity === 3){
-								setTimeout(()=>{
-									this.$api.navigateTo('/supplier/pages/index/index')
-								},1000)
-							}else{
-								setTimeout(()=>{
-									switch(this.isLoginType){
-										case 9:
-											this.$api.navigateTo(`/h5/pages/activity/activity_mid`)
-											break;
-										case 8:
-											this.$api.navigateTo(`/pages/goods/product?id=${this.isLoginProductId}`)
-											break;
-										case 7:
-											this.$api.navigateTo(`/pages/user/order/order-details?type=share&orderID=${this.isLoginOrderId}`)
-											break;
-										default:
-											this.$api.switchTabTo('/pages/tabBar/user/user')
-									}
-								},1000)
-							}
-						}).catch(error =>{
-							this.$util.msg(error.msg,2000)
-							this.isUserInfo = false
-						})
-					}
-				})
+		// 清除已输入
+		clearValue() {
+			this.$refs.VcodeInput.clearValue()
+		}
+	}
+}
+/*
+import authorize from '@/common/config/authorize.js'
+import wxLogin from "@/common/config/wxLogin.js"
+import {mapState,mapMutations } from 'vuex';
+import { invitationCodeLogin  } from '@/services/use.js'
+export default{
+	data() {
+		return{
+			invitationCode:'',  //获取用户登录的邀请码
+		}
+	},
+	onLoad(option) {
+
+	},
+	computed: {
+		...mapState(['isWxAuthorize','isLoginType','isLoginProductId','isLoginOrderId'])
+	},
+	methods:{
+		...mapMutations(['login']),
+		goLogin() {
+			if( this.invitationCode == ''){
+				this.$util.msg('请输入邀请码',2000)
+				return
 			}
+			wx.getUserInfo({
+				success: res => {
+					this.isUserInfo = false
+					this.userInfo = res.userInfo;
+					let params ={
+							invitationCode:this.invitationCode,
+							nickName:res.userInfo.nickName,
+							headimgurl:res.userInfo.avatarUrl,
+					}
+					invitationCodeLogin(params).then(response =>{
+						this.login(response.data)
+						wxLogin.wxLoginAuthorize()
+						if(response.data.userIdentity === 3){
+							setTimeout(()=>{
+								this.$api.navigateTo('/supplier/pages/index/index')
+							},1000)
+						}else{
+							setTimeout(()=>{
+								switch(this.isLoginType){
+									case 9:
+										this.$api.navigateTo(`/h5/pages/activity/activity_mid`)
+										break;
+									case 8:
+										this.$api.navigateTo(`/pages/goods/product?id=${this.isLoginProductId}`)
+										break;
+									case 7:
+										this.$api.navigateTo(`/pages/user/order/order-details?type=share&orderID=${this.isLoginOrderId}`)
+										break;
+									default:
+										this.$api.switchTabTo('/pages/tabBar/user/user')
+								}
+							},1000)
+						}
+					}).catch(error =>{
+						this.$util.msg(error.msg,2000)
+						this.isUserInfo = false
+					})
+				}
+			})
 		}
 	}
+}*/
 </script>
 
 <style lang="scss">
-	.login{
-		width: 100%;
-		height: auto;
-		.model-warp.none{
-			display: none;			
-		}
-		.model-warp.show{
-			display: block;
-		}
-		.login-main{
-			width: 100%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			height: 189rpx;
-			padding:60rpx 0 40rpx 0;
-			margin-bottom: 70rpx;
-			.logo{
-				width:467rpx;
-				height: 189rpx;
-				display: block;
-			}
-		}
-		.login-input{
-			width: 600rpx;
-			height: 88rpx;
-			padding: 24rpx 0;
-			margin: 0 auto;
-			margin-bottom: 30rpx;
-			background: #FFFFFF;
-			position: relative;
-			box-sizing: border-box;
-			border-bottom: 1px solid #E1E1E1;
-			.input{
-				width: 100%;
-				height: 100%;
-				background: #FFFFFF;
-				font-size: $font-size-28;
-				line-height: 88rpx;
-				color: #333333;
-			}
-		}
-		.login-row{
-			padding: 0 75rpx;
-			font-size: $font-size-28;
-			line-height: 40rpx;
-			color: #E15616;
-			margin-bottom: 48rpx;
-			text-align: right;
+.login {
+	display: flex;
+	align-items: center;
+	flex-direction: column;
+	.login-main,
+	.login-title,
+	.logo-message {
+		width: 590rpx;
+	}
+	.login-main {
+		display: flex;
+		justify-content: center;
+		margin: 180rpx 0 60rpx;
+		image {
+			width: 151rpx;
+			height: 151rpx;
+			border-radius: 50%;
 		}
-		.login-btn{
-			width: 600rpx;
-			height: 88rpx;
-			border-radius: 44rpx;
-			font-size: $font-size-28;
-			line-height: 88rpx;
-			color: #FFFFFF;
-			margin: 0 auto;
-			text-align: center;
-			background: $btn-confirm;
+	}
+	.login-title {
+		display: flex;
+		justify-content: flex-start;
+		image {
+			width: 40rpx;
+			height: 40rpx;
+			margin-right: 6rpx;
 		}
-		.login-btn-last{
-			width: 600rpx;
-			height: 86rpx;
-			border-radius: 44rpx;
-			font-size: $font-size-28;
-			line-height: 88rpx;
-			color: $color-system;
-			margin: 0 auto;
+	}
+	.login-btn {
+		width: 600rpx;
+		height: 90rpx;
+		text-align: center;
+		line-height: 90rpx;
+		background-color: #000;
+		border-radius: 45rpx;
+		color: #fff;
+	}
+	.login-input {
+		margin: 30rpx 0;
+	}
+	.logo-message {
+		margin-bottom: 64rpx;
+		font-size: 24rpx;
+		line-height: 33rpx;
+		color: #ff2a2a;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		&::before {
+			content: '!';
+			display: block;
+			width: 22rpx;
+			height: 22rpx;
+			background: #ff2a2a;
+			border-radius: 50%;
+			color: #fff;
 			text-align: center;
-			border: 1px solid $color-system;
-			margin-top: 20rpx;
-		}
-		.model-authorization{
-			width: 100%;
-			height: 100%;
-			position: fixed;
-			top: 0;
-			left: 0;
-			z-index: 999;
-			.authorization{
-				width: 518rpx;
-				height: 320rpx;
-				position: absolute;
-				background: rgba(255,255,255,.7);
-				left: 0;
-				right: 0;
-				bottom: 0;
-				top: 0;
-				margin: auto;
-				.to-btn{
-					position: absolute;
-					top: 0;
-					left: 0;
-					right: 0;
-					bottom: 0;
-					margin: auto;
-					width: 70%;
-					height: 88rpx;
-					font-size: $font-size-28;
-					line-height: 88rpx;
-					color: #FFFFFF;
-					text-align: center;
-					border-radius: 44rpx;
-				}
-			}
+			line-height: 22rpx;
+			margin-right: 6rpx;
 		}
 	}
+}
 </style>

+ 35 - 23
pages/user/club/club-list.vue

@@ -24,24 +24,30 @@
 			</view>
 			<view v-else class="club-list">
 				<scroll-view scroll-y="true" >
-					<view class="list" v-for="(item, index) in clubList" :key="index">
+					<view class="list">
 						<view class="list-left">
-							<view class="list-head"><image :src="item.headpic ? item.headpic : 'https://static.caimei365.com/app/img/icon/icon-club@3x.png'" mode=""></image></view>
+							<view class="list-head"><image src="https://static.caimei365.com/app/img/icon/icon-club@3x.png" mode=""></image></view>
 						</view>
 						<view class="list-item">
 							<view class="list-title">
-								<text class="list-name">{{item.name}}</text>
-								<text class="list-hist" @click.stop="_goHistory(item)"><text class="iconfont icon-dingdanxuanzhong"></text>订单列表</text>
+								<text class="list-name">机构名称名称</text>
 							</view>
-							<view class="list-opea">
-								<view class="btn org" @click.stop="_goImmediately(item)">
-									<text>立即下单</text>
+							<view class="list-contact">
+								<view class="list-row">
+									<text class="iconfont icon-lianxiren"></text>
+									<text>李艳华</text>
+								</view>
+								<view class="list-row">
+									<text class="iconfont icon-dianhua"></text>
+									<text>18888888888</text>
 								</view>
-								<view class="btn gre" @click.stop="_goSecond(item)">
-									<text>二手下单</text>
+							</view>
+							<view class="list-opea">
+								<view class="btn border-btn" @click.stop="_goHistory()">
+									<text>订单列表</text>
 								</view>
-								<view class="btn yel" @click.stop="_goBuyagain(item)">
-									<text>再次购买</text>
+								<view class="btn border-btn" @click.stop="_goImmediately()">
+									<text>立即下单</text>
 								</view>
 							</view>
 						</view>
@@ -323,35 +329,41 @@
 						-webkit-line-clamp: 1;
 						overflow: hidden;
 					}
-					.list-hist{
-						display: block;
-						float: right;
-						color: #E19B30;
-						font-size: $font-size-24;
-						text-align: right;
-						padding-right: 30rpx;
-						.icon-dingdanxuanzhong{
-							font-size: $font-size-34;
-							color: #E19B30;
+				}
+				.list-contact{
+					.list-row{
+						display: flex;
+						justify-content: flex-start;
+						align-items: center;
+						text{
+							font-size: 24rpx;
+						}
+						.iconfont{
+							font-size: 24rpx;
 						}
 					}
 				}
 				.list-opea{
 					width: 100%;
 					display: flex;
+					justify-content: flex-end;
 					flex: 4;
 					color: #166CE1;
 					flex-direction: row;
 					align-items: center;
 					.btn{
-						width: 156rpx;
-						height: 60rpx;
+						width: 160rpx; 
+						height: 56rpx;
 						line-height: 60rpx;
 						border-radius: 30rpx;
 						font-size: $font-size-24;
 						color: $text-color;
 						text-align: center;
 						margin: 0 17rpx;
+						border: 1px solid #333333;
+						&.border-btn{
+							color: #333;
+						}
 						&.org{
 							background:rgba(22,225,77,.1);
 							color: #16E14D;

+ 0 - 0
static/ws/invitation code.png → static/ws/invitation_code.png