From f2e64626e1c5a8a2fa3a104b58a1054e8422aeb9 Mon Sep 17 00:00:00 2001
From: songsong428 <srf428110@163.com>
Date: Sun, 29 Mar 2020 14:35:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/user-agreement/user-agreement.vue | 2 +-
 pages/basic-info/basic-info.vue              | 8 ++++++++
 pages/punch-the-clock/punch-the-clock.vue    | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/components/user-agreement/user-agreement.vue b/components/user-agreement/user-agreement.vue
index ada7ac4..162a975 100644
--- a/components/user-agreement/user-agreement.vue
+++ b/components/user-agreement/user-agreement.vue
@@ -9,7 +9,7 @@
 			勾选代表您已同意此协议
 		</view>
 	</view>
-	<view class="flex flex-wrap margin-tb-sm  text-black">
+	<view class="flex flex-wrap margin-tb-sm text-black">
 		<view class="text-df text-bold flex agree-text">
 			本人郑重承诺：
 		</view>
diff --git a/pages/basic-info/basic-info.vue b/pages/basic-info/basic-info.vue
index 225f001..b6e8b1a 100644
--- a/pages/basic-info/basic-info.vue
+++ b/pages/basic-info/basic-info.vue
@@ -77,6 +77,10 @@
       </view>
     </form>
     <user-agreement @changeIntentions="changeIntentions" @changeIntentions1="changeIntentions1" @changeIntentions2="changeIntentions2" v-if="!(userInfo && userInfo.id)"></user-agreement>
+	<view class="flex text-df margin-bottom margin-lr agree-text">
+		微信小程序和企业微信应用同时实名后，可以绑定微信小程序帐号和企业微信应用帐号，方便操作
+	</view>
+	
     <button
       @tap="handleSubmitUserInfo"
       class="bg-cyan margin primary-btn"
@@ -266,4 +270,8 @@ export default {
 .primary-btn {
   border-radius: 15rpx;
 }
+
+.agree-text {
+	line-height: 60rpx;
+}
 </style>
diff --git a/pages/punch-the-clock/punch-the-clock.vue b/pages/punch-the-clock/punch-the-clock.vue
index 679264c..036a642 100644
--- a/pages/punch-the-clock/punch-the-clock.vue
+++ b/pages/punch-the-clock/punch-the-clock.vue
@@ -118,6 +118,7 @@
 			</view>
 		</form>
 		<user-agreement @changeIntentions="changeIntentions" @changeIntentions1="changeIntentions1" @changeIntentions2="changeIntentions2"></user-agreement>
+		
 		<button class="bg-cyan margin primary-btn" hover-class="cc-active" @tap="handleHealthSign">确认提交</button>
 		<!-- 历史 -->
 		<button class="shadow round bg-cyan history-btn iconfont icon-history" hover-class="cc-active" @tap="openPage('/pages/my-code/my-code')"></button>