From 7b52a65598ee438ec345f478206fd886845e6a2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=B1=AA?= <781521347@qq.com>
Date: Sat, 15 Jan 2022 18:18:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/knowledge.js                              |    2 +-
 api/user.js                                   |   11 +
 config/index.js                               |    4 +-
 pages.json                                    |    6 +
 pages/authorization/agreementPage.vue         |  162 +++
 pages/course/detail.vue                       |  127 +-
 pages/course/index.vue                        |   22 +-
 pages/course/signIn.vue                       |   65 +-
 pages/user/PersonalData/index.vue             |   57 +-
 pages/user/User/index.vue                     | 1234 +++++++++--------
 pages/user/myCourses/index.vue                |   10 +-
 utils/index.js                                |   53 +-
 wxcomponents/vant/button/index.vue            |   96 ++
 wxcomponents/vant/common/index.css            |    1 +
 wxcomponents/vant/common/style/clearfix.css   |    1 +
 wxcomponents/vant/common/style/ellipsis.css   |    1 +
 wxcomponents/vant/common/style/hairline.css   |    1 +
 .../vant/common/style/mixins/clearfix.css     |    0
 .../vant/common/style/mixins/ellipsis.css     |    0
 .../vant/common/style/mixins/hairline.css     |    0
 wxcomponents/vant/common/style/theme.css      |    0
 wxcomponents/vant/common/style/var.css        |    0
 wxcomponents/vant/icon/index.vue              | 1012 ++++++++++++++
 wxcomponents/vant/info/index.vue              |   20 +
 wxcomponents/vant/loading/index.vue           |   51 +
 25 files changed, 2201 insertions(+), 735 deletions(-)
 create mode 100644 pages/authorization/agreementPage.vue
 create mode 100644 wxcomponents/vant/button/index.vue
 create mode 100644 wxcomponents/vant/common/index.css
 create mode 100644 wxcomponents/vant/common/style/clearfix.css
 create mode 100644 wxcomponents/vant/common/style/ellipsis.css
 create mode 100644 wxcomponents/vant/common/style/hairline.css
 create mode 100644 wxcomponents/vant/common/style/mixins/clearfix.css
 create mode 100644 wxcomponents/vant/common/style/mixins/ellipsis.css
 create mode 100644 wxcomponents/vant/common/style/mixins/hairline.css
 create mode 100644 wxcomponents/vant/common/style/theme.css
 create mode 100644 wxcomponents/vant/common/style/var.css
 create mode 100644 wxcomponents/vant/icon/index.vue
 create mode 100644 wxcomponents/vant/info/index.vue
 create mode 100644 wxcomponents/vant/loading/index.vue

diff --git a/api/knowledge.js b/api/knowledge.js
index d22c493..29e6966 100644
--- a/api/knowledge.js
+++ b/api/knowledge.js
@@ -118,7 +118,7 @@ export function enterCourse(data) {
  * 课程扫码签到
  */
 export function signCourse(data) {
-  return request.get("/user/signCourse?courseId="+data);
+  return request.get("/lession/signCourse?lessionId="+data);
 }
 
 /**
diff --git a/api/user.js b/api/user.js
index 1d48d61..14d3f27 100644
--- a/api/user.js
+++ b/api/user.js
@@ -1,5 +1,16 @@
 import request from '@/utils/request'
 
+
+/**
+ * 获取我参与的课程和学习榜
+ */
+export function myLession(data) {
+  return request.get('/user/myLession', data, {
+    // return request.get("/citys", data, {
+    login: true,
+  })
+}
+
 /**
  * 省市区
  */
diff --git a/config/index.js b/config/index.js
index a4fc5ee..260ea95 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,7 +1,7 @@
 // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api'
-// export const VUE_APP_API_URL = 'http://192.168.0.112:8088/api'
-// export const VUE_APP_API_URL = 'http://192.168.0.111:8088/api'
+// export const VUE_APP_API_URL = 'http://10.11.32.109:8088/api'
+// export const VUE_APP_API_URL = 'http://10.11.32.103:8088/api/'
 export const VUE_APP_API_URL = 'https://www.cyjyyjy.com/api'
 //  export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://thapi.xinxintuan.co/api'
diff --git a/pages.json b/pages.json
index 3f73251..ceb3f5d 100644
--- a/pages.json
+++ b/pages.json
@@ -11,6 +11,12 @@
       "style": {
         "navigationBarTitleText": "微信授权"
       }
+    }, 
+		{
+      "path": "pages/authorization/agreementPage",
+      "style": {
+        "navigationBarTitleText": "用户协议"
+      }
     },
     // {
     //   "path": "pages/user/Login/index",
diff --git a/pages/authorization/agreementPage.vue b/pages/authorization/agreementPage.vue
new file mode 100644
index 0000000..cae7c7e
--- /dev/null
+++ b/pages/authorization/agreementPage.vue
@@ -0,0 +1,162 @@
+<template>
+	<view class="argeement-page">
+		用户协议：<br/>
+		本隐私政策介绍本公司的隐私数据相关政策和惯例，这将涵盖我们如何收集、使用、处理、存储和/或披露那些通过本公司的移动App收集的关于您的个人信息。请你仔细阅读我们的隐私政策。<br/>
+		一、本公司如何收集您的个人信息<br/>
+		个人信息是可用于唯一地识别或联系某人的数据。<br/>
+		当您使用本公司的系统，注册用户过程中我们将会收集您的个人信息，如：电子邮件地址、电话号码。为了保护个人隐私，您不应提供除本公司特别要求之外的任何其它信息。<br/>
+		二、本公司如何使用您的个人信息<br/>
+		1、通过您的个人信息，向您发送本公司移动App的服务信息。<br/>
+		2、通过您的个人信息实现密码找回功能。<br/>
+		3、除本公司发生重组、合并或出售，可将我们收集的一切个人信息转让给相关第三方外，本公司不会向任何无关第三方提供、出售、出租、分享或交易您的个人信息，除非事先得到您的许可，或该第三方和本公司单独或共同为您提供服务，且在该服务结束后，其将被禁止访问包括其以前能够访问的所有这些信息。<br/>
+		三、个人信息安全<br/>
+		保证您的个人数据的安全对我们来说至关重要。当您在本公司的移动App中注册输入个人数据时，我们会利用安全套接字层技术 (SSL) 对这些信息进行加密。<br/>
+		在数据传输和数据保管两个阶段里，我们会通过广为接受的行业标准（如防火墙、加密和数据隐私法律要求）来保护您向我们提交的信息。<br/>
+		然而，没有任何一种互联网传输或电子存储方法是100%安全的。因此，尽管我们通过商业上可接受的方式来保护您的个人信息，但仍无法保证信息的绝对安全。<br/>
+		四、本公司会将个人信息保存多久<br/>
+		一般来说，本公司仅保留您的个人信息至履行收集目的所需的期限，同时将遵守适用法律规定的数据保留期限。<br/>
+		五、法律免责声明<br/>
+		在法律要求的情况下，以及本公司认为必须披露与您有关的信息来保护本公司的法定权益和/或遵守司法程序、法院指令或适用于本公司的系统的法律程序时，我们有权透露您的个人信息。<br/>
+		如果本公司确定为了执行本公司的条款和条件或保护我们的经营，披露是合理必须的，则我们可披露与您有关的信息。<br/>
+		六、本隐私政策的更改<br/>
+		如果决定更改隐私政策，我们会在本政策中、本公司网站中以及我们认为适当的位置发布这些更改，以便您了解我们如何收集、使用您的个人信息，哪些人可以访问这些信息，以及在什么情况下我们会透露这些信息。<br/>
+		本公司保留随时修改本政策的权利，因此请经常查看。如对本政策作出重大更改，本公司会通过网站通知的形式告知。<br/>
+		
+		用户协议<br/>
+		特别提示<br/>
+		云生态在此特别提醒您（用户）在注册成为用户之前，请认真阅读本《用户协议》（以下简称“协议”），确保您充分理解本协议中各条款。请您审慎阅读并选择接受或不接受本协议。除非您接受本协议所有条款，否则您无权注册、登录或使用本协议所涉服务。您的注册、登录、使用等行为将视为对本协议的接受，并同意接受本协议各项条款的约束。<br/>
+		本协议约定云生态与用户之间关于“云生态软件服务（以下简称“服务”）的权利义务。“用户”是指注册、登录、使用本服务的个人。本协议可由云生态随时更新，更新后的协议条款一旦公布即代替原来的协议条款，恕不再另行通知，用户可在本网站查阅最新版协议条款。在云生态修改协议条款后，如果用户不接受修改后的条款，请立即停止使用云生态提供的服务，用户继续使用云生态提供的服务将被视为接受修改后的协议。<br/>
+		一、用户个人信息保护<br/>
+		1、用户在注册帐号或使用本服务的过程中，可能需要填写或提交一些必要的个人信息，如法律法规、规章规范性文件（以下称“法律法规”）规定的需要填写的身份信息。如用户提交的信息不完整或不符合法律法规的规定，则用户可能无法使用本服务或在使用本服务的过程中受到限制。<br/>
+		2、用户个人信息包括：<br/>
+		1）用户自行提供的用户个人信息（如注册时填写的手机号码，电子邮件等个人信息，使用服务时提供的共享信息等）；<br/>
+		2）其他方分享的用户个人信息；<br/>
+		3）云生态为提供服务而合法收集的用户必要个人信息（如使用服务时系统自动采集的设备或软件信息，浏览历史信息，通讯时间信息等技术信息，用户开启定位功能并使用服务时的地理位置信息等）。
+		其中个人隐私信息是指涉及用户个人身份或个人隐私的信息，比如，用户真实姓名、身份证号、手机号码、手机设备识别码、IP地址、用户聊天记录。非个人隐私信息是指用户对本服务的操作状态以及使用习惯等明确且客观反映在云生态服务器端的基本记录信息、个人隐私信息范围外的其它普通信息，以及用户同意公开的上述隐私信息。云生态保证在取得用户书面同意的情况下收集、使用或公开用户的个人隐私信息，用户同意云生态无需获得用户的另行确认与授权即可收集、使用或公开用户的非个人隐私信息。<br/>
+		3、尊重用户个人信息的私有性是云生态的一贯制度，云生态将采取技术措施和其他必要措施，确保用户个人信息安全，防止在本服务中收集的用户个人信息泄露、毁损或丢失。在发生前述情形或者云生态发现存在发生前述情形的可能时，云生态将及时采取补救措施并告知用户，用户如发现存在前述情形亦需立即与云生态联系。<br/>
+		4、云生态未经用户同意不向任何第三方公开、 透露用户个人隐私信息。但以下特定情形除外：<br/>
+		(1) 云生态根据法律法规规定或有权机关的指示提供用户的个人隐私信息；<br/>
+		(2) 由于用户将其用户密码告知他人或与他人共享注册帐户与密码，由此导致的任何个人信息的泄漏，或其他非因云生态原因导致的个人隐私信息的泄露；<br/>
+		(3) 用户自行向第三方公开其个人隐私信息；<br/>
+		(4) 用户与云生态及合作单位之间就用户个人隐私信息的使用公开达成约定，云生态因此向合作单位公开用户个人隐私信息；<br/>
+		(5) 任何由于黑客攻击、电脑病毒侵入及其他不可抗力事件导致用户个人隐私信息的泄露；<br/>
+		(6) 用户个人信息已经经过处理无法识别特定个人且不能复原。<br/>
+		5、用户同意云生态可在以下事项中使用用户的个人隐私信息：<br/>
+		(1) 云生态向用户及时发送重要通知，如软件更新、本协议条款的变更；<br/>
+		(2) 云生态内部进行审计、数据分析和研究等，以改进云生态的产品、服务和与用户之间的沟通；<br/>
+		(3) 依本协议约定，云生态管理、审查用户信息及进行处理措施；<br/>
+		(4) 适用法律法规规定的其他事项。<br/>
+		除上述事项外，如未取得用户事先同意，云生态不会将用户个人隐私信息使用于任何其他用途。<br/>
+		四、内容规范<br/>
+		1、本条所述内容是指用户使用本服务过程中所制作、上载、复制、发布、传播的任何内容，包括但不限于帐号头像、名称、用户说明等注册信息及认证资料，或文字、语音、图片、视频、图文等发送、回复或自动回复消息和相关链接页面，以及其他使用帐号或本服务所产生的内容。<br/>
+		2、用户不得利用“云生态”帐号或本服务制作、上载、复制、发布、传播如下法律、法规和政策禁止的内容：<br/>
+		(1) 反对宪法所确定的基本原则的；<br/>
+		(2) 危害国家安全，泄露国家秘密，颠覆国家政权，破坏国家统一的；<br/>
+		(3) 损害国家荣誉和利益的；<br/>
+		(4) 煽动民族仇恨、民族歧视，破坏民族团结的；<br/>
+		(5) 破坏国家宗教政策，宣扬邪教和封建迷信的；<br/>
+		(6) 散布谣言，扰乱社会秩序，破坏社会稳定的；<br/>
+		(7) 散布淫秽、色情、赌博、暴力、凶杀、恐怖或者教唆犯罪的；<br/>
+		(8) 侮辱或者诽谤他人，侵害他人合法权益的；<br/>
+		(9) 不遵守法律法规底线、社会主义制度底线、国家利益底线、公民合法权益底线、社会公共秩序底线、道德风尚底线和信息真实性底线的“七条底线”要求的；<br/>
+		(10) 含有法律、行政法规禁止的其他内容的信息。<br/>
+		3、用户不得利用“云生态”帐号或本服务制作、上载、复制、发布、传播如下干扰“云生态”正常运营，以及侵犯其他用户或第三方合法权益的内容：<br/>
+		(1) 含有任何性或性暗示的；<br/>
+		(2) 含有辱骂、恐吓、威胁内容的；<br/>
+		(3) 含有骚扰、垃圾广告、恶意信息、诱骗信息的；<br/>
+		(4) 涉及他人隐私、个人信息或资料的；<br/>
+		(5) 侵害他人名誉权、肖像权、知识产权、商业秘密等合法权利的；<br/>
+		(6) 含有其他干扰本服务正常运营和侵犯其他用户或第三方合法权益内容的信息。<br/>
+		五、使用规则<br/>
+		1、用户在本服务中或通过本服务所传送、发布的任何内容并不反映或代表，也不得被视为反映或代表云生态的观点、立场或政策，云生态对此不承担任何责任。<br/>
+		2、用户不得利用“云生态”帐号或本服务进行如下行为：<br/>
+		(1) 提交、发布虚假信息，或盗用他人头像或资料，冒充、利用他人名义的；<br/>
+		(2) 强制、诱导其他用户关注、点击链接页面或分享信息的；<br/>
+		(3) 虚构事实、隐瞒真相以误导、欺骗他人的；<br/>
+		(4) 利用技术手段批量建立虚假帐号的；<br/>
+		(5) 利用“云生态”帐号或本服务从事任何违法犯罪活动的；<br/>
+		(6) 制作、发布与以上行为相关的方法、工具，或对此类方法、工具进行运营或传播，无论这些行为是否为商业目的；<br/>
+		(7) 其他违反法律法规规定、侵犯其他用户合法权益、干扰“云生态”正常运营或云生态未明示授权的行为。<br/>
+		3、用户须对利用“云生态”帐号或本服务传送信息的真实性、合法性、无害性、准确性、有效性等全权负责，与用户所传播的信息相关的任何法律责任由用户自行承担，与云生态无关。如因此给云生态或第三方造成损害的，用户应当依法予以赔偿。<br/>
+		4、云生态提供的服务中可能包括广告，用户同意在使用过程中显示云生态和第三方供应商、合作伙伴提供的广告。除法律法规明确规定外，用户应自行对依该广告信息进行的交易负责，对用户因依该广告信息进行的交易或前述广告商提供的内容而遭受的损失或损害，云生态不承担任何责任。<br/>
+		5、除非云生态书面许可，用户不得从事下列任一行为：<br/>
+		(1) 删除软件及其副本上关于著作权的信息；<br/>
+		(2) 对软件进行反向工程、反向汇编、反向编译，或者以其他方式尝试发现软件的源代码；<br/>
+		(3) 对云生态拥有知识产权的内容进行使用、出租、出借、复制、修改、链接、转载、汇编、发表、出版、建立镜像站点等；<br/>
+		(4) 对软件或者软件运行过程中释放到任何终端内存中的数据、软件运行过程中客户端与服务器端的交互数据，以及软件运行所必需的系统数据，进行复制、修改、增加、删除、挂接运行或创作任何衍生作品，形式包括但不限于使用插件、外挂或非经云生态授权的第三方工具/服务接入软件和相关系统；<br/>
+		(5) 通过修改或伪造软件运行中的指令、数据，增加、删减、变动软件的功能或运行效果，或者将用于上述用途的软件、方法进行运营或向公众传播，无论这些行为是否为商业目的；<br/>
+		(6) 通过非云生态开发、授权的第三方软件、插件、外挂、系统，登录或使用云生态软件及服务，或制作、发布、传播非云生态开发、授权的第三方软件、插件、外挂、系统。<br/>
+		六、账户管理<br/>
+		1、 “云生态”帐号的所有权归云生态所有，用户完成申请注册手续后，获得“云生态”帐号的使用权，该使用权仅属于初始申请注册人，禁止赠与、借用、租用、转让或售卖。云生态因经营需要，有权回收用户的“云生态”帐号。<br/>
+		2、用户可以通过<br/>
+		1）查看与编辑个人资料页，<br/>
+		2）“设置”页面里的“账号与安全”页面来查询、更改、删除、注销“云生态”帐户上的个人资料、注册信息及传送内容等，但需注意，删除有关信息的同时也会删除用户储存在系统中的文字和图片。用户需承担该风险。<br/>
+		3、用户有责任妥善保管注册帐号信息及帐号密码的安全，因用户保管不善可能导致遭受盗号或密码失窃，责任由用户自行承担。用户需要对注册帐号以及密码下的行为承担法律责任。用户同意在任何情况下不使用其他用户的帐号或密码。在用户怀疑他人使用其帐号或密码时，用户同意立即通知云生态。<br/>
+		4、用户应遵守本协议的各项条款，正确、适当地使用本服务，如因用户违反本协议中的任何条款，云生态在通知用户后有权依据协议中断或终止对违约用户“云生态”帐号提供服务。同时，云生态保留在任何时候收回“云生态”帐号、用户名的权利。<br/>
+		5、如用户注册“云生态”帐号后一年不登录，通知用户后，云生态可以收回该帐号，以免造成资源浪费，由此造成的不利后果由用户自行承担。<br/>
+		6、用户可以通过“设置”页面里的“账号与安全”页面来进行账号注销服务，用户确认注销账号是不可恢复的操作，用户应自行备份与云生态账号相关的信息和数据，用户确认操作之前与云生态账号相关的所有服务均已进行妥善处理。用户确认并同意注销账号后并不代表本云生态账号注销前的账号行为和相关责任得到豁免或减轻，如在注销期间，用户的账号被他人投诉、被国家机关调查或者正处于诉讼、仲裁程序中，云生态有限自行终止用户的账号注销并无需另行得到用户的同意。<br/>
+		八、数据储存<br/>
+		1、云生态不对用户在本服务中相关数据的删除或储存失败负责。<br/>
+		2、云生态可以根据实际情况自行决定用户在本服务中数据的最长储存期限，并在服务器上为其分配数据最大存储空间等。用户可根据自己的需要自行备份本服务中的相关数据。<br/>
+		3、如用户停止使用本服务或本服务终止，云生态可以从服务器上永久地删除用户的数据。本服务停止、终止后，云生态没有义务向用户返还任何数据。<br/>
+		九、风险承担<br/>
+		1、用户理解并同意，“云生态”仅为用户提供信息分享、传送及获取的平台，用户必须为自己注册帐号下的一切行为负责，包括用户所传送的任何内容以及由此产生的任何后果。用户应对“云生态”及本服务中的内容自行加以判断，并承担因使用内容而引起的所有风险，包括因对内容的正确性、完整性或实用性的依赖而产生的风险。云生态无法且不会对因用户行为而导致的任何损失或损害承担责任。
+		2、用户理解并同意，因业务发展需要，云生态保留单方面对本服务的全部或部分服务内容变更、暂停、终止或撤销的权利，用户需承担此风险。<br/>
+		十、知识产权声明<br/>
+		1、除本服务中涉及广告的知识产权由相应广告商享有外，云生态在本服务中提供的内容（包括但不限于网页、文字、图片、音频、视频、图表等）的知识产权均归云生态所有，但用户在使用本服务前对自己发布的内容已合法取得知识产权的除外。<br/>
+		2、除另有特别声明外，云生态提供本服务时所依托软件的著作权、专利权及其他知识产权均归云生态所有。<br/>
+		3、云生态在本服务中所涉及的图形、文字或其组成，以及其他云生态标志及产品、服务名称（以下统称“云生态标识”），其著作权或商标权归云生态所有。未经云生态事先书面同意，用户不得将云生态标识以任何方式展示或使用或作其他处理，也不得向他人表明用户有权展示、使用、或其他有权处理云生态标识的行为。<br/>
+		4、上述及其他任何云生态或相关广告商依法拥有的知识产权均受到法律保护，未经云生态或相关广告商书面许可，用户不得以任何形式进行使用或创造相关衍生作品。<br/>
+		5、用户在使用云生态服务时发表上传的文字、图片、视频、音频、软件以及表演等信息，此部分信息的知识产权归用户，责任由用户承担。但用户的发表、上传行为视为对云生态的授权，用户理解并同意授予云生态及其关联公司全球范围内完全免费、不可撤销、独家、永久、可转授权和可再许可的权利，包括但不限于：复制权、发行权、出租权、展览权、表演权、放映权、广播权、信息网络传播权、摄制权、改编权、翻译权、汇编权以及《著作权法》规定的由著作权人享有的其他著作财产权利及邻接权利。云生态可自行选择是否使用以及使用方式，包括但不限于将前述信息在云生态旗下的服务平台上使用与传播，将上述信息再次编辑后使用，以及由云生态授权给合作方使用、编辑与传播等。<br/>
+		十一、法律责任<br/>
+		1、如果云生态发现或收到他人举报或投诉用户违反本协议约定的，云生态有权不经通知随时对相关内容，包括但不限于用户资料、聊天记录进行审查、删除，并视情节轻重对违规帐号处以包括但不限于警告、帐号封禁 、设备封禁 、功能封禁 的处罚，且通知用户处理结果。<br/>
+		2、因违反用户协议被封禁的用户，在封禁期限届满后自助解封。其中，被实施功能封禁的用户会在封禁期届满后自动恢复被封禁功能。被封禁用户可向云生态网站相关页面提交申诉，云生态将对申诉进行审查，并自行合理判断决定是否变更处罚措施。<br/>
+		3、用户理解并同意，云生态有权依合理判断对违反有关法律法规或本协议规定的行为进行处罚，对违法违规的任何用户采取适当的法律行动，并依据法律法规保存有关信息向有关部门报告等，用户应承担由此而产生的一切法律责任。<br/>
+		4、用户理解并同意，因用户违反本协议约定，导致或产生的任何第三方主张的任何索赔、要求或损失，包括合理的律师费，用户应当赔偿云生态与合作公司、关联公司，并使之免受损害。<br/>
+		十二、不可抗力及其他免责事由<br/>
+		1、用户理解并确认，在使用本服务的过程中，可能会遇到不可抗力等风险因素，使本服务发生中断。不可抗力是指不能预见、不能克服并不能避免且对一方或双方造成重大影响的客观事件，包括但不限于自然灾害如洪水、地震、瘟疫流行和风暴等以及社会事件如战争、动乱、政府行为等。出现上述情况时，云生态将努力在第一时间与相关单位配合，及时进行修复，但是由此给用户或第三方造成的损失，云生态及合作单位在法律允许的范围内免责。<br/>
+		2、本服务同大多数互联网服务一样，受包括但不限于用户原因、网络服务质量、社会环境等因素的差异影响，可能受到各种安全问题的侵扰，如他人利用用户的资料，造成现实生活中的骚扰；用户下载安装的其它软件或访问的其他网站中含有“特洛伊木马”等病毒，威胁到用户的计算机信息和数据的安全，继而影响本服务的正常使用等等。用户应加强信息安全及使用者资料的保护意识，要注意加强密码保护，以免遭致损失和骚扰。<br/>
+		3、用户理解并确认，本服务存在因不可抗力、计算机病毒或黑客攻击、系统不稳定、用户所在位置、用户关机以及其他任何技术、互联网络、通信线路原因等造成的服务中断或不能满足用户要求的风险，因此导致的用户或第三方任何损失，云生态不承担任何责任。<br/>
+		4、用户理解并确认，在使用本服务过程中存在来自任何他人的包括误导性的、欺骗性的、威胁性的、诽谤性的、令人反感的或非法的信息，或侵犯他人权利的匿名或冒名的信息，以及伴随该等信息的行为，因此导致的用户或第三方的任何损失，云生态不承担任何责任。<br/>
+		5、用户理解并确认，云生态需要定期或不定期地对“云生态”平台或相关的设备进行检修或者维护，如因此类情况而造成服务在合理时间内的中断，云生态无需为此承担任何责任，但云生态应事先进行通告。<br/>
+		6、云生态重视对未成年人的保护。云生态将依赖用户提供的个人信息判断用户是否为未成年人。任何18岁以下的未成年人均不得注册帐号或使用本服务<br/>
+		7、因云生态提供的服务系基于地理位置提供的移动社交服务，用户确认，其地理位置信息为非个人隐私信息，用户成功注册“云生态”帐号视为确认授权云生态提取、公开及使用用户的地理位置信息。<br/>用户地理位置信息将作为用户公开资料之一，由云生态向其他用户公开以便云生态向用户提供基于地理位置的移动社交服务。如用户需要终止向其他用户公开其地理位置信息，可随时自行设置为隐身状态。<br/>
+		8、为了改善云生态的技术和服务，向用户提供更好的服务体验，云生态或可会自行收集使用或向第三方提供用户的非个人隐私信息。<br/>
+		9、云生态保证在合法、正当与必要的原则下收集、使用或者公开用户个人信息且不会收集与提供的服务无关的用户个人信息。<br/>
+		10、云生态十分注重保护用户的个人隐私，并制定了《云生态隐私权政策》，用户亦可以通过“设置”页面里的“帮助”来进行具体查看，用户确认并同意使用云生态提供的服务将被视为接受《云生态隐私权政策》。<br/>
+		2、如发生下列任何一种情形，云生态有权变更、中断或终止向用户提供的免费服务或收费服务，而无需对用户或任何第三方承担任何责任：<br/>
+		(1) 根据法律规定用户应提交真实信息，而用户提供的个人资料不真实、或与注册时信息不一致又未能提供合理证明；<br/>
+		(2) 用户违反相关法律法规或本协议的约定；<br/>
+		(3) 按照法律规定或有权机关的要求；<br/>
+		(4) 出于安全的原因或其他必要的情形。<br/>
+		十四、“活动”服务说明与免责条款<br/>
+		1、云生态“活动”功能板块，是以地理位置为基础、发布用户周边文化活动信息的活动信息共享平台（下称“本平台”）。<br/><br/>
+		
+		
+		2、本平台发布之全部文化活动信息,包括但不限于活动地理位置信息，均直接或者间接来自于文化活动主办方。<br/>
+		3、本平台发布文化活动信息，意在宣传文化活动、丰富用户文化生活。本平台用户于本平台“活动”功能板块发布的留言、评论等信息，均系用户自行发布。本平台不对上述信息的真实性、准确性，或及时性、完整性负责。<br/>
+		十五、其他<br/>
+		1、云生态郑重提醒用户注意本协议中免除云生态责任和限制用户权利的条款，请用户仔细阅读，自主考虑风险<br/>
+		2、本协议的效力、解释及纠纷的解决，适用于中华人民共和国法律。若用户和云生态之间发生任何纠纷或争议，首先应友好协商解决，协商不成的，用户同意将纠纷或争议提交云生态住所地有管辖权的人民法院管辖。<br/>
+		3、本协议的任何条款无论因何种原因无效或不具可执行性，其余条款仍有效，对双方具有约束力。<br/>
+		4、由于互联网高速发展，您与云生态签署的本协议列明的条款可能并不能完整罗列并覆盖您云生态所有权利与义务，现有的约定也不能保证完全符合未来发展的需求。因此，云生态隐私权政策、云生态平台行为规范等均为本协议的补充协议，与本协议不可分割且具有同等法律效力。如您使用云生态平台服务，视为您同意上述补充协议。
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return {
+				
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.argeement-page{
+		padding: 0 20rpx 90rpx;
+		font-size: 28rpx;
+		color: rgb(51, 51, 51);
+	}
+</style>
diff --git a/pages/course/detail.vue b/pages/course/detail.vue
index fd4ef20..bd515ac 100644
--- a/pages/course/detail.vue
+++ b/pages/course/detail.vue
@@ -3,13 +3,8 @@
 		<view v-if="$store.getters.token || userInfo.uid">
 			<view class="swiper-box">
 				<view class="swiper-item">
-					<image :src="detail.coverImg" mode="aspectFill" :key="index"></image>
+					<image :src="detail.coverImg" mode="aspectFill"></image>
 				</view>
-				<!-- <swiper :indicator-dots="true" :autoplay="true" :interval="3000" :duration="1000">
-					<swiper-item v-for="(item,index) in detail.imageArr" :key="index">
-						<view class="swiper-item"><image :src="item" mode="aspectFill"></image></view>
-					</swiper-item>
-				</swiper> -->
 			</view>
 			<view class="course-info-box">
 				<view class="course-title acea-row row-between-wrapper">
@@ -19,7 +14,7 @@
 				</view>
 				<view class="tips-box">
 					<view class="tip-item blue">{{detail.categoryName}}</view>
-					<view class="tip-item orange">{{detail.flag[0]}}</view>
+					<!-- <view class="tip-item orange">{{detail.flag[0]}}</view> -->
 				</view>  
 			</view>
 			<view class="tab-box acea-row row-around" :class="isFixedTop?'fixed':''">
@@ -38,8 +33,8 @@
 						<scroll-view class="scroll-view_H" scroll-x="true">
 							<view class="info-box" v-for="(item,index) in detail.masterDtos" :key="index">
 								<image :src="item.photoPath"></image>
-								<view class="name">{{item.name}}</view>
-								<view class="tip">禪易能量高级讲师</view>
+								<view class="name">{{item.realName}}</view>
+								<!-- <view class="tip">{{item.title}}</view> -->
 								<view class="desc" :class="item.introductionType == 0 ? 'left' : 'center'">{{item.introduction}}</view>
 							</view>
 						</scroll-view>
@@ -91,7 +86,6 @@
 							<span>课程安排</span>
 						</view>
 						<view class="plan-box acea-row-nowrap" v-for="(item,index) in detail.scheduleList" :key="index">
-							<!-- <text class="plan-time">第{{index+1}}天</text> -->
 							<text>{{item}}</text>
 						</view>
 					</view>
@@ -113,11 +107,7 @@
 									<view class="time">{{item.courseStartTime.split(' ')[0]}}-{{item.courseEndTime.split(' ')[0]}}</view>
 									<view class="address">{{item.coursePlace}}</view>
 									<view class="type-box acea-row row-between row-middle">
-										<!-- <view class="price">{{item.levelName}}</view> -->
 										<view></view>
-										<!-- <view class="price" v-if="item.level == 2">￥{{item.courseCharge}}</view>
-										<view class="price colG" v-if="item.chargeType == 0">免费</view> -->
-										
 										<view class="signin-btn yellow">去报名</view>
 									</view>
 								</view>
@@ -128,7 +118,7 @@
 			</view>
 			<view class="footer-box acea-row row-between-wrapper">
 				<view class="footer-left">
-					<view class="price" v-if="detail.signState == 1">座位号：{{detail.seat}}</view>
+					<!-- <view class="price" v-if="detail.signState == 1">座位号：{{detail.seat}}</view> -->
 				</view>
 				<view class="footer-right">
 					<view class="btn-box acea-row row-between-wrapper" v-if="yhStatus == 1 || yhStatus == 3 ">
@@ -138,14 +128,15 @@
 						</view>
 						<view class="signin-btn" @click="signInClick(2)">立即报名</view>
 					</view>
-					<view class="signin-btn" v-if="yhStatus == 2 ">报名已截止 请关注下期</view>
+					<view class="signin-btn" v-if="yhStatus == 2 && (yhStatus == 1 || yhStatus == 3)">报名已截止 请关注下期</view>
 					
 					<!-- 在线直播 -->
 					<view class="signin-btn call-btn" v-if="yhStatus == 4 "  @click="signInClick(3)" >立即观看</view>
 					<view class="signin-btn call-btn" v-if="yhStatus == 5 "  @click="signInClick(3)" >查看回放</view>
-					<view class="signin-btn call-btn default-btn" v-if="yhStatus == 6" >未签到</view>
-					<view class="signin-btn call-btn default-btn" v-if="yhStatus == 7" >未签到</view>
+					<view class="signin-btn call-btn" v-if="yhStatus == 6" @click="signTipClick">报名成功，待签到</view>
+					<view class="signin-btn call-btn" v-if="yhStatus == 7" >已签到</view>
 					<view class="signin-btn call-btn" v-if="yhStatus == 8 " @click="signInClick(1)" >等待确认 联系服务老师</view>
+					<view class="signin-btn call-btn default" v-if="yhStatus == 9 " @click="signInClick(1)" >审核未通过 联系服务老师</view>
 					
 					<!-- #ifdef MP-WEIXIN -->
 					<button open-type="getPhoneNumber" 
@@ -198,6 +189,7 @@
 	// import WucTab from '@/components/wuc-tab/wuc-tab.vue';
 	import { mapState, mapGetters, mapMutations, mapActions } from 'vuex'
 	import { getUserInfo, bindingPhone, wxappBindingPhone } from '@/api/user'
+	import { bindPhoneNumber } from '@/utils/index.js'
 	import { getCourseDetail ,enterCourse } from '@/api/knowledge';
 	import Authorization from '@/pages/authorization/index'
 	export default {
@@ -267,54 +259,17 @@
 		},
 		methods: {
 			getPhoneNumber: function(e) {
-			  let thit = this
-			  // 判断一下这里是不是小程序 如果是小程序，走获取微信手机号进行绑定
-			  if (e.mp.detail.errMsg == 'getPhoneNumber:ok') {
-			    uni.showLoading({
-			      title: '绑定中',
-			    })
-			    wxappBindingPhone({
-			      encryptedData: e.mp.detail.encryptedData,
-			      iv: e.mp.detail.iv,
-			    })
-			      .then(res => {
-			        if(res.success){
-			        	thit.$store.dispatch('userInfo', true)
-			        	uni.hideLoading()
-			        	uni.showToast({
-			        	  title: res.msg,
-			        	  icon: 'success',
-			        	  duration: 2000,
-			        	})
-			        } else{
-			        	uni.hideLoading()
-			        	uni.showModal({
-			        		title:'提示！',
-			        		content:'授权已过期，请重新授权后绑定手机号',
-			        		success:function(res){
-			        			if(res.confirm){
-			        				thit.$store.commit('logout')
-			        			}
-			        		},
-			        	})
-			        }
-			      })
-			      .catch(error => {
-			        uni.hideLoading()
-			        thit.$store.dispatch('userInfo', true)
-			        uni.showToast({
-			          title: error.msg || error.response.data.msg || error.response.data.message,
-			          icon: 'none',
-			          duration: 2000,
-			        })
-			      })
-			  } else {
-			    uni.showToast({
-			      title: '已拒绝授权',
-			      icon: 'none',
-			      duration: 2000,
-			    })
-			  }
+			  bindPhoneNumber(e).then((res)=>{
+					if(res.success){
+						uni.showToast({
+							title: '绑定成功！',
+							duration: 1500
+						})
+						setTimeout(()=>{
+							this.getDetail()
+						},1500)
+					}
+				})
 			},
 			setDate(t){
 				let str = t.split(" ")[0].split("-")[1] + "." + t.split(" ")[0].split("-")[2]
@@ -328,12 +283,16 @@
 					},
 				})
 			},
-			test(){
+			setStatus(){
 				let yhStatus = 0;
 				let detail = this.detail;
 				let enterEndTime = detail.enterEndTime.replace(/-/g, '/')
 				let enterStartTime = detail.enterStartTime.replace(/-/g, '/')
 				let courseEndTime = detail.courseEndTime.replace(/-/g, '/')
+				if(!this.userInfo.phone){
+					this.yhStatus = -1;  
+					return 
+				}
 				if ( !detail.enterState ){
 					yhStatus = 0;
 					if( new Date(enterEndTime) >= new Date() && new Date(enterStartTime) <= new Date() ){
@@ -343,7 +302,6 @@
 					}else if(new Date(enterStartTime) > new Date()){
 						yhStatus = 3; // 报名时间没开始
 					}
-					
 				}else{
 					// 是否已经超过课程时间
 					if (detail.status == 1 && detail.courseType == 1){
@@ -353,20 +311,29 @@
 							yhStatus = 5; //查看回放
 						}
 					}else if (detail.status == 1 && detail.courseType == 0){
-						if (detail.signState == 0){
-							yhStatus = 6;	//线下课程未签到
-						}else{
-							yhStatus = 7;	//已签到
-						}
-					}else {
-						if (detail.status == 0 ){
-							yhStatus = 8; // 报名没有被确认
+						if(detail.payState == 0){
+							yhStatus = 9  //后台审核未通过
+						} else{
+							if(detail.signState == 0){
+								yhStatus = 6;	//后台审核成功，线下课程未签到
+							} else if(detail.signState == 1){
+								yhStatus = 7;	 //已签到
+							}
 						}
+					}else if(detail.status == 0){
+						yhStatus = 8; // 报名没有被确认
 					}
 				}
 				this.yhStatus = yhStatus;
 				// console.log(this.yhStatus)
 			},
+			signTipClick(){
+				uni.showModal({
+					title: '提示！',
+					content: '您已经报名成功，请到开课地点使用微信扫一扫扫描课程二维码签到。',
+					showCancel: false
+				})
+			},
 			getDetail(){
 				uni.showLoading({
 					title:'正在加载中...'
@@ -386,9 +353,8 @@
 					// console.log(this.times,'times')
 					uni.stopPullDownRefresh()
 				}).then(()=>{
-					this.test();
+					this.setStatus();
 				})
-				
 			},
 			signInClick(type){
 				if(this.userInfo.realName == null){
@@ -453,7 +419,10 @@
 						uni.showModal({
 							title: '提示！',
 							content: res.msg,
-							showCancel:false
+							showCancel:false,
+							success: (result)=> {
+								this.getDetail()
+							}
 						});
 					}
 				})
diff --git a/pages/course/index.vue b/pages/course/index.vue
index fca129d..105f0d3 100644
--- a/pages/course/index.vue
+++ b/pages/course/index.vue
@@ -12,7 +12,7 @@
 			<!-- #endif -->
 		<!-- </view> -->
 		<view class="content-box">
-			<view class="tab-box" :class="isFixedTop ? 'fixed' : ''">
+			<view class="tab-box">
 				<!-- <wuc-tab :tab-list="tabList" :tabCur.sync="TabCur" @change="tabChange"
 					tab-class="text-center text-black bg-white" select-class="text-orange text-xl">
 				</wuc-tab> -->
@@ -107,8 +107,9 @@
 		onLoad() {
 			//获取节点距离顶部的距离
 			uni.createSelectorQuery().select('.tab-box').boundingClientRect((res) => {
-				if (res && res.top > 0) {
-					this.tabInitTop= res.top;
+				console.log(res)
+				if (res && res.height > 0) {
+					this.tabInitTop= res.height;
 				}
 			}).exec();
 			getCategory().then((res) => {
@@ -140,7 +141,8 @@
 		},
 		methods: {
 			onPageScroll(res) {
-			 let scrollTop = res.scrollTop;
+				let scrollTop = res.scrollTop;
+				console.log(this.tabInitTop)
 				var isSatisfy = scrollTop >= this.tabInitTop? true : false;
 				//只有处于吸顶的临界值才会不相等
 				if (this.isFixedTop === isSatisfy) {
@@ -185,7 +187,7 @@
 				this.active == null ? cid = this.currentTab.id : cid = this.active
 				getCourses({categoryId: cid,listState:0}).then((res) => {
 					if (res.success) {
-						this.courseList = res.data
+						this.courseList = res.data.reverse()
 					}
 					uni.hideLoading()
 					uni.stopPullDownRefresh()
@@ -260,8 +262,13 @@
 }
 .content-box{
 	width: 100%;
+	padding-top: 96rpx;
 	box-sizing: border-box;
 	.tab-box{
+		width: 100%;
+		height: 96rpx;
+		position: fixed;
+		top: 0;
 		box-shadow: 0px 6px 12px 0px rgba(227,227,227,0.29);
 		.tabs{
 			width:auto;
@@ -292,8 +299,9 @@
 		padding: 30rpx 32rpx;
 	}
 	.fixed{
-		position: -webkit-sticky;
-		position: sticky;
+		width: 100%;
+		// position: -webkit-sticky;
+		position: fixed;
 		top: 0;
 		z-index: 99;
 	}
diff --git a/pages/course/signIn.vue b/pages/course/signIn.vue
index 3bb5e83..66ec975 100644
--- a/pages/course/signIn.vue
+++ b/pages/course/signIn.vue
@@ -3,7 +3,7 @@
 		<view v-if="$store.getters.token || userInfo.uid">
 			<view class="swiper-box">
 				<view class="swiper-item">
-					<image :src="detail.imageArr[0]" mode="aspectFill" :key="index"></image>
+					<image :src="detail.coverImg" mode="aspectFill"></image>
 				</view>
 			</view>
 			<view class="course-info-box">
@@ -14,7 +14,7 @@
 				</view>
 				<view class="tips-box">
 					<view class="tip-item blue">{{detail.categoryName}}</view>
-					<view class="tip-item orange">{{detail.levelName}}</view>
+					<!-- <view class="tip-item orange">{{detail.levelName}}</view> -->
 				</view>  
 			</view>
 			<view class="course-desc-box content" id="content2">
@@ -50,7 +50,16 @@
 					</view>
 				</view>
 			</view>
-			<view class="sign-btn" @click="signIn">立即签到</view>
+			<view class="course-desc-box" >
+				<view class="title-box acea-row row-middle">
+					<view class="left-line"></view>
+					<span>课程安排</span>
+				</view>
+				<view class="plan-box acea-row-nowrap" v-for="(item,index) in detail.scheduleList" :key="index">
+					<text>{{item}}</text>
+				</view>
+			</view>
+			<view class="sign-btn" @click="signIn">{{detail.signState == 0 ? '立即签到' : '已签到' }}</view>
 		</view>
 		<Authorization v-else />
 	</view>
@@ -81,7 +90,7 @@
 			if (!url) {
 			  url = handleUrlParam(getCurrentPageUrlWithArgs())
 			}
-			console.log(url)
+			console.log(url,'urlurlurlurl')
 			if (url && url.id) {
 			  this.courseId = url.id
 			}
@@ -89,6 +98,9 @@
 				this.getDetail()
 			}
 		},
+		onPullDownRefresh() {
+			this.getDetail()
+		},
 		methods:{
 			getDetail(){
 				uni.showLoading({
@@ -97,34 +109,28 @@
 				let nowTime = Date.parse(new Date())/1000;
 				getCourseDetail({id:this.courseId}).then((res)=>{
 					uni.hideLoading()
-					res.data.courseIntroduce = res.data.courseIntroduce.replace(/\<img/g, "<img style='width: 100%;'")
 					this.detail = res.data
-					let t = res.data.signEndTime.replace(/-/g, '/');
-					let endTime = Date.parse(new Date(t))/1000
-					this.times = endTime - nowTime;
-					this.day = Math.floor(this.times / (60 * 60 * 24));
-					this.hour = Math.floor(this.times / (60 * 60)) - (this.day * 24);
-					this.minute = Math.floor(this.times / 60) - (this.day * 24 * 60) - (this.hour * 60);
-					this.second = Math.floor(this.times) - (this.day * 24 * 60 * 60) - (this.hour * 60 * 60) - (this.minute * 60);
-					// console.log(this.times)
 					uni.stopPullDownRefresh()
 				})
 			},
 			signIn(){
-				signCourse(this.courseId).then((res)=>{
-					if(res.success){
-						uni.showModal({
-							title:'提示!',
-							content:'签到成功！'
-						})
-					} else{
-						uni.showToast({
-							title:res.msg,
-							icon:'none',
-							duration:5000
-						})
-					}
-				})
+				if(this.detail.signState == 0){
+					signCourse(this.courseId).then((res)=>{
+						if(res.success){
+							uni.showModal({
+								title:'提示!',
+								content:'签到成功！',
+								showCancel: false
+							})
+						} else{
+							uni.showToast({
+								title:res.msg,
+								icon:'none',
+								duration:5000
+							})
+						}
+					})
+				}
 			},
 		}
 	}
@@ -202,9 +208,12 @@
 		width: 100%;
 		background:#fff;
 		border-radius: 8rpx;
-		padding: 0rpx 24rpx 30rpx;
+		padding: 30rpx 24rpx;
 		margin-bottom: 20rpx;
 	}
+	.content{
+		padding-top: 0;
+	}
 	.course-card-item{
 		font-size: 26rpx;
 		margin-bottom: 12rpx;
diff --git a/pages/user/PersonalData/index.vue b/pages/user/PersonalData/index.vue
index f07cb8a..c2789a1 100644
--- a/pages/user/PersonalData/index.vue
+++ b/pages/user/PersonalData/index.vue
@@ -74,6 +74,18 @@
 					</picker>
 			  </view>
 			</view>
+			<view class="item acea-row row-between-wrapper">
+			  <view>常住地址</view>
+			  <view class="input">
+			    <input type="text" v-model="addres" placeholder="请输入常住地址" />
+			  </view>
+			</view>
+			<view class="item acea-row row-between-wrapper">
+			  <view>紧急联系人</view>
+			  <view class="input">
+			    <input type="text" v-model="contacts" placeholder="请输入紧急联系人" />
+			  </view>
+			</view>
       <!-- 
         <view class="item acea-row row-between-wrapper" @click="goChangePassword()">
           <view>密码</view>
@@ -85,6 +97,15 @@
       -->
     </view>
 		<view class="tips">会员信息仅用于身份确认，不做他用。</view>
+		<view class="argeement-box">
+				<checkbox-group  @change="argeementClick">
+					<checkbox value="1" style="transform:scale(0.7);position: relative; top: 3rpx;" :checked="isCheck" />
+				</checkbox-group>
+				<view class="acea-row">
+					我已阅读并同意
+					<navigator url="/pages/authorization/agreementPage"  open-type="navigate" style="color: rgb(255, 50, 50);">《用户协议及隐私政策》</navigator>
+				</view>
+		</view>
     <view class="modifyBnt" @click="submit">保存修改</view>
     <!-- #ifndef MP-WEIXIN -->
     <view
@@ -125,7 +146,10 @@ export default {
 			second: 60,
 			time: null,
 			city: '省/市/区',
-			verifyCode:''
+			verifyCode:'',
+			address: '',
+			contacts: '',
+			isCheck: false
     };
   },
   computed: mapGetters(["userInfo"]),
@@ -133,9 +157,12 @@ export default {
     this.avatar = this.userInfo.avatar;
     this.isWeixin = isWeixin();
     this.getUserInfo();
-		this.userInfo.city ? this.city = this.userInfo.city : this.userInfo.city = '省/市/区';
+		this.userInfo.city ? this.city = this.userInfo.city : '省/市/区';
   },
   methods: {
+		argeementClick(e){
+			e.detail.value > 0 ? this.isCheck = true : this.isCheck = false
+		},
 		bindPickerChange(e){
 			this.city = e.detail.value.join(' ')
 		},
@@ -251,6 +278,13 @@ export default {
     submit: function () {
       let userInfo = this.userInfo;
 			console.log(userInfo)
+			if(!this.isCheck){
+				uni.showToast({
+					title:'请填阅读并勾选用户协议',
+					icon: "none"
+				})
+				return 
+			}
 			if(userInfo.realName == '' || userInfo.realName == null){
 				uni.showToast({
 					title:'请填写真实姓名',
@@ -272,7 +306,9 @@ export default {
 				idCard: this.userInfo.idCard,
 				code: this.verifyCode,
 				phone: this.userInfo.phone,
-				city: this.city
+				city: this.city,
+				address: this.address,
+				contacts: this.contacts
       }).then(
         (res) => {
 					if(res.success){
@@ -328,6 +364,9 @@ export default {
 };
 </script>
 <style scoped lang="less">
+	.personal-data .list .item{
+		font-size: 28rpx !important;
+	}
 	.modifyBnt{
 		height: 80rpx !important;
 		line-height: 80rpx !important;
@@ -363,4 +402,16 @@ export default {
 			margin-right: 10rpx;
 		}
 	}
+	.argeement-box{
+		font-size: 24rpx;
+		color: #666;
+		text-align: center;
+		display: flex;
+		align-items: center;
+		justify-content: start;
+		padding-left: 20rpx;
+	}
+	.argeement-box view{
+		width: 60%;
+	}
 </style>
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index de33e16..c23efd6 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -1,79 +1,79 @@
 <template>
-  <view class="user">
-    <view v-if="$store.getters.token || userInfo.uid" class="content">
-      <view class="header acea-row row-between-wrapper">
+	<view class="user">
+		<view v-if="$store.getters.token || userInfo.uid" class="content">
+			<view class="header acea-row row-between-wrapper">
 				<image src="../../../static/user-index-bg.png" mode="" class="header-bg"></image>
-        <view class="picTxt acea-row row-between-wrapper">
-          <view class="pictrue">
-            <image :src="userInfo.avatar" />
-          </view>
-          <view class="text">
-            <view class="acea-row row-middle">
-              <view class="name line1">{{ userInfo.nickname }}</view>
-              <view class="member acea-row row-middle">
-                <!-- <image :src="userInfo.vipIcon" /> -->
-                <text>{{ userInfo.levelName}}</text>
-              </view>
-            </view>
-            <view @click="goPersonalData()" class="id" v-if="userInfo.phone">
-              <text>ID：{{ userInfo.uid || 0 }}</text>
-              <text class="iconfont icon-bianji1"></text>
-            </view>
-            <!-- #ifdef MP-WEIXIN -->
-            <button open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" class="binding" v-else>
-              <text>点击绑定手机号</text>
-            </button>
-            <!-- #endif -->
-
-            <!-- #ifndef MP-WEIXIN -->
-            <button class="binding" @click="goBindPhone()" v-else>
-              <text>点击绑定手机号</text>
-            </button>
-            <!-- #endif -->
-          </view>
-        </view>
+				<view class="picTxt acea-row row-between-wrapper">
+					<view class="pictrue">
+						<image :src="userInfo.avatar" />
+					</view>
+					<view class="text">
+						<view class="acea-row row-middle">
+							<view class="name line1">{{ userInfo.nickname }}</view>
+							<view class="member acea-row row-middle">
+								<!-- <image :src="userInfo.vipIcon" /> -->
+								<text>{{ userInfo.levelName}}</text>
+							</view>
+						</view>
+						<view @click="goPersonalData()" class="id" v-if="userInfo.phone">
+							<text>ID：{{ userInfo.uid || 0 }}</text>
+							<text class="iconfont icon-bianji1"></text>
+						</view>
+						<!-- #ifdef MP-WEIXIN -->
+						<button open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" class="binding" v-else>
+							<text>点击绑定手机号</text>
+						</button>
+						<!-- #endif -->
+
+						<!-- #ifndef MP-WEIXIN -->
+						<button class="binding" @click="goBindPhone()" v-else>
+							<text>点击绑定手机号</text>
+						</button>
+						<!-- #endif -->
+					</view>
+				</view>
 				<view class="jifen-box" @click="goIntegral">积分：{{userInfo.integral}}</view>
-        <!-- <text class="iconfont icon-shezhi" @click="goPersonalData()"></text> -->
-      </view>
+				<!-- <text class="iconfont icon-shezhi" @click="goPersonalData()"></text> -->
+			</view>
 			<view class="teacher-box acea-row-nowrap row-between row-middle">
-				
+
 				<view class="teacher-box-r acea-row row-between row-middle" v-if="userInfo.isPromoter == 0">
 					<image :src="userInfo.workPhoto" v-if="userInfo.workPhoto"></image>
 					<image src="../../../static/default-headerimg.png" v-else></image>
 					<text @click="call">{{userInfo.sellerName || '点击联系服务老师'}} </text>
 				</view>
 				<view class=" teacher-box-l acea-row-nowrap row-between row-middle" v-if="userInfo.isPromoter == 0">
-					<!-- <text>服务老师</text> -->
 					<image src="../../../static/call-icon.png" class="call-icon" @click="call"></image>
-					<!-- <view class="vertical-line"></view> -->
 				</view>
 				<view class="" style="color: #fff;" v-else @click="toServiceIndex()">服务老师主页</view>
 			</view>
-			<view class="myjoin-box" v-if="(userInfo.memberStudyVo.cyCourseDtos && userInfo.memberStudyVo.cyCourseDtos.length > 0) || (userInfo.memberStudyVo.studyListDtos && userInfo.memberStudyVo.studyListDtos.length > 0)">
+			<view class="myjoin-box"
+				v-if="(memberStudyVo.courseDtos && memberStudyVo.courseDtos.length > 0) || (memberStudyVo.studyListDtos && memberStudyVo.studyListDtos.length > 0)">
 				<view class="t-word">我参与的</view>
 				<scroll-view class="scroll-view_H" scroll-x="true">
-					<view class="course-box" 
-					v-for="(item,index) in userInfo.memberStudyVo.cyCourseDtos" :key="index"
-					@click="toCourseDetail(item.id)">
+					<view class="course-box" v-for="(item,index) in memberStudyVo.courseDtos" :key="index"
+						@click="toCourseDetail(item.id)">
 						<view class="course-info">
-							<view class="course-name line1">{{item.courseName}}</view>
-							<view class="time">{{item.courseStartTime.split(' ')[0]}}~{{item.courseEndTime.split(' ')[0]}}</view>
+							<view class="course-name line2">{{item.courseName}}</view>
+							<view class="time">{{item.courseStartTime}}~{{item.courseEndTime}}</view>
 						</view>
 						<view class="address-box acea-row row-between row-middle">
 							<view class="address line1">地点：{{item.coursePlace}}</view>
-							<!-- <view class="btn" @click.stop="startQr()" v-if="item.signState == 2">扫一扫</view> -->
-							<view class="btn" v-if="item.signState == 1">已签到</view>
+							<!-- <view class="btn" @click.stop="startQr()" v-if="item.signState == 2 ">扫一扫</view> -->
+							<!-- <view class="btn">已报名</view> -->
 						</view>
 					</view>
 				</scroll-view>
 				<view class="bangdan-box">
 					<view class="bangdan-list">
 						<scroll-view class="scroll-view_H" scroll-x="true">
-							<view class="bangdan-item" v-for="(item,index) in userInfo.memberStudyVo.studyListDtos" :key="index">
+							<view class="bangdan-item" v-for="(item,index) in memberStudyVo.studyListDtos" :key="index"
+								@click="toStudyDetail(item.id)">
 								<view class="bangdan-name line1">{{item.listName}}</view>
 								<view class="acea-row row-between-wrapper">
-									<view class="signin-day">已连续{{item.signTimes}}天</view>
-									<view class="signin-btn" @click="toStudyDabang(item)">{{item.enterState ? '已打卡' : '立即打卡'}}</view>
+									<view class="signin-day">已打卡{{item.signTimes || 0}}天</view>
+									<view class="signin-btn" @click="toStudyDabang(item)">
+										{{item.enterState ? '已打卡' : '立即打卡'}}</view>
 								</view>
 							</view>
 						</scroll-view>
@@ -81,7 +81,7 @@
 				</view>
 			</view>
 			<view class="wrapper">
-        <!-- <view class="nav acea-row row-middle">
+				<!-- <view class="nav acea-row row-middle">
           <view @click="goUserAccount()" class="item">
             <text>我的余额</text>
             <text class="num">{{ userInfo.nowMoney || 0 }}</text>
@@ -99,82 +99,84 @@
             <text class="num">{{ userInfo.couponCount || 0 }}</text>
           </view>
         </view> -->
-        <view class="myOrder">
-          <view class="title acea-row row-between-wrapper">
-            <text>我的订单</text>
-            <text @click="goMyOrder()" class="allOrder">
-              <text>全部订单</text>
-              <text class="iconfont icon-jiantou"></text>
-            </text>
-          </view>
-          <view class="orderState acea-row row-middle">
-            <view @click="goMyOrder(0)" class="item">
-              <view class="pictrue">
-                <!-- <image :src="`${$VUE_APP_RESOURCES_URL}/images/dfk.png`" /> -->
-								<image src="../../../static/myorder-icon1.png" /> 
-                <text class="order-status-num" v-if="userInfo.orderStatusNum.unpaidCount > 0">
+				<view class="myOrder">
+					<view class="title acea-row row-between-wrapper">
+						<text>我的订单</text>
+						<text @click="goMyOrder()" class="allOrder">
+							<text>全部订单</text>
+							<text class="iconfont icon-jiantou"></text>
+						</text>
+					</view>
+					<view class="orderState acea-row row-middle">
+						<view @click="goMyOrder(0)" class="item">
+							<view class="pictrue">
+								<!-- <image :src="`${$VUE_APP_RESOURCES_URL}/images/dfk.png`" /> -->
+								<image src="../../../static/myorder-icon1.png" />
+								<text class="order-status-num" v-if="userInfo.orderStatusNum.unpaidCount > 0">
 									{{ userInfo.orderStatusNum.unpaidCount }}
 								</text>
-              </view>
-              <view>待付款</view>
-            </view>
-            <view @click="goMyOrder(1)" class="item">
-              <view class="pictrue">
-                <image src="../../../static/myorder-icon2.png" /> 
-                <text class="order-status-num" v-if="userInfo.orderStatusNum.unshippedCount > 0">
+							</view>
+							<view>待付款</view>
+						</view>
+						<view @click="goMyOrder(1)" class="item">
+							<view class="pictrue">
+								<image src="../../../static/myorder-icon2.png" />
+								<text class="order-status-num" v-if="userInfo.orderStatusNum.unshippedCount > 0">
 									{{ userInfo.orderStatusNum.unshippedCount }}
 								</text>
-              </view>
-              <view>待发货</view>
-            </view>
-            <view @click="goMyOrder(2)" class="item">
-              <view class="pictrue">
-                <image src="../../../static/myorder-icon3.png" /> 
-                <text class="order-status-num" v-if="userInfo.orderStatusNum.receivedCount > 0">
+							</view>
+							<view>待发货</view>
+						</view>
+						<view @click="goMyOrder(2)" class="item">
+							<view class="pictrue">
+								<image src="../../../static/myorder-icon3.png" />
+								<text class="order-status-num" v-if="userInfo.orderStatusNum.receivedCount > 0">
 									{{ userInfo.orderStatusNum.receivedCount }}
 								</text>
-              </view>
-              <text>待收货</text>
-            </view>
-            <view @click="goMyOrder(3)" class="item">
-              <view class="pictrue">
-                <image src="../../../static/myorder-icon4.png" /> 
-                <text class="order-status-num" v-if="userInfo.orderStatusNum.evaluatedCount > 0">{{ userInfo.orderStatusNum.evaluatedCount }}</text>
-              </view>
-              <text>待评价</text>
-            </view>
-            <view @click="goReturnList()" class="item">
-              <view class="pictrue">
-                <image src="../../../static/myorder-icon5.png" /> 
-                <text class="order-status-num" v-if="userInfo.orderStatusNum.refundCount > 0">{{ userInfo.orderStatusNum.refundCount }}</text>
-              </view>
-              <text>售后/退款</text>
-            </view>
-          </view>
-        </view>
-        <view class="myService">
-          <view class="serviceList acea-row row-middle">
-					
+							</view>
+							<text>待收货</text>
+						</view>
+						<view @click="goMyOrder(3)" class="item">
+							<view class="pictrue">
+								<image src="../../../static/myorder-icon4.png" />
+								<text class="order-status-num"
+									v-if="userInfo.orderStatusNum.evaluatedCount > 0">{{ userInfo.orderStatusNum.evaluatedCount }}</text>
+							</view>
+							<text>待评价</text>
+						</view>
+						<view @click="goReturnList()" class="item">
+							<view class="pictrue">
+								<image src="../../../static/myorder-icon5.png" />
+								<text class="order-status-num"
+									v-if="userInfo.orderStatusNum.refundCount > 0">{{ userInfo.orderStatusNum.refundCount }}</text>
+							</view>
+							<text>售后/退款</text>
+						</view>
+					</view>
+				</view>
+				<view class="myService">
+					<view class="serviceList acea-row row-middle">
+
 						<view class="item" @click="goUserCourse()">
-						  <view class="pictrue">
-						    <image src="../../../static/user-menu1.png" />
-						  </view>
-						  <view class="cell">我的课程</view>
-						  <text class="iconfont icon-jiantou"></text>
+							<view class="pictrue">
+								<image src="../../../static/user-menu1.png" />
+							</view>
+							<view class="cell">我的课程</view>
+							<text class="iconfont icon-jiantou"></text>
 						</view>
 						<view class="item" @click="goUserBangdan()">
-						  <view class="pictrue">
-						    <image src="../../../static/user-menu2.png" />
-						  </view>
-						  <view class="cell">打卡榜打卡</view>
-						  <text class="iconfont icon-jiantou"></text>
+							<view class="pictrue">
+								<image src="../../../static/user-menu2.png" />
+							</view>
+							<view class="cell">打卡榜打卡</view>
+							<text class="iconfont icon-jiantou"></text>
 						</view>
 						<view class="item" @click="goUserFeedBack()">
-						  <view class="pictrue">
-						    <image src="../../../static/user-menu3.png" />
-						  </view>
-						  <view class="cell">建议反馈</view>
-						  <text class="iconfont icon-jiantou"></text>
+							<view class="pictrue">
+								<image src="../../../static/user-menu3.png" />
+							</view>
+							<view class="cell">建议反馈</view>
+							<text class="iconfont icon-jiantou"></text>
 						</view>
 						<!-- <view class="item" @click="goUserJoinUs()">
 						  <view class="pictrue">
@@ -184,20 +186,20 @@
 						  <text class="iconfont icon-jiantou"></text>
 						</view> -->
 						<view class="item" @click="goAddressManagement()">
-						  <view class="pictrue">
-						    <image src="../../../static/user-menu5.png" />
-						  </view>
-						  <view class="cell">收货地址</view>
-						  <text class="iconfont icon-jiantou"></text>
+							<view class="pictrue">
+								<image src="../../../static/user-menu5.png" />
+							</view>
+							<view class="cell">收货地址</view>
+							<text class="iconfont icon-jiantou"></text>
 						</view>
 						<view class="item noBorder" @click="toServiceIndex()">
-						  <view class="pictrue">
-						    <image src="../../../static/user-menu6.png" />
-						  </view>
-						  <view class="cell">我是服务老师</view>
-						  <text class="iconfont icon-jiantou"></text>
+							<view class="pictrue">
+								<image src="../../../static/user-menu6.png" />
+							</view>
+							<view class="cell">我是服务老师</view>
+							<text class="iconfont icon-jiantou"></text>
 						</view>
-            <!-- <template v-for="(item, MyMenusIndex) in MyMenus">
+						<!-- <template v-for="(item, MyMenusIndex) in MyMenus">
               <view class="item" :key="MyMenusIndex" @click="goPages(MyMenusIndex)">
                 <view class="pictrue">
                   <image :src="item.pic" />
@@ -206,530 +208,546 @@
                 <text class="iconfont icon-jiantou"></text>
               </view>
             </template> -->
-          </view>
-        </view>
-      </view>
-      <!-- <SwitchWindow
+					</view>
+				</view>
+			</view>
+			<!-- <SwitchWindow
         v-on:changeswitch="changeswitch"
         :switchActive="switchActive"
         :login_type="userInfo.login_type"
       ></SwitchWindow>-->
-    </view>
-    <Authorization v-else />
-  </view>
+		</view>
+		<Authorization v-else />
+	</view>
 </template>
 <script>
-import { mapState, mapGetters, mapMutations, mapActions } from 'vuex'
-import { getUserInfo, getMenuUser, bindingPhone, wxappBindingPhone } from '@/api/user'
-import { isWeixin, VUE_APP_RESOURCES_URL } from '@/utils'
-import cookie from '@/utils/store/cookie'
-import SwitchWindow from '@/components/SwitchWindow'
-import Authorization from '@/pages/authorization/index'
-import { signCourse } from '@/api/knowledge'
-const NAME = 'User'
-
-export default {
-  name: NAME,
-  components: {
-    SwitchWindow,
-    Authorization,
-  },
-  props: {},
-  data() {
-    return {
-      MyMenus: [],
-      switchActive: false,
-      isWeixin: false
-    }
-  },
-  computed: mapGetters(['userInfo']),
-	watch: {},
-  methods: {
-    ...mapMutations(['updateAuthorizationPage']),
-		startQr: function() {
-		  uni.scanCode({
-		    success: res => {
-		      // let option = handleUrlParam(res.result)
-					let id = res.result;
-					signCourse(id).then((res)=>{
-						if(res.success){
-							uni.showModal({
-								title:'提示!',
-								content:'签到成功！您的座位号是' + res.data,
-							})
-						} else{
-							uni.showToast({
-								title:res.msg,
-								icon:'none',
-								duration:5000
-							})
-						}
-					})
-		    },
-		  })
-		},
-		call(){
-			uni.makePhoneCall({
-				phoneNumber: this.userInfo.sellerPhone || this.userInfo.customerPhone
-			})
-		},
-		toServiceIndex(){
-			this.$yrouter.push('/pages/serviceTeacher/index')
-		},
-		goUserCourse() {
-		  this.$yrouter.push('/pages/user/myCourses/index')
-		},
-		goUserBangdan() {
-		  this.$yrouter.push('/pages/user/myBangdan/index')
-		},
-		goUserFeedBack() {
-		  this.$yrouter.push('/pages/user/feedBack/index')
-		},
-		goUserJoinUs() {
-		  this.$yrouter.push('/pages/user/joinUs/index')
+	import {
+		mapState,
+		mapGetters,
+		mapMutations,
+		mapActions
+	} from 'vuex'
+	import {
+		getUserInfo,
+		getMenuUser,
+		bindingPhone,
+		wxappBindingPhone,
+		myLession
+	} from '@/api/user'
+	import {
+		isWeixin,
+		VUE_APP_RESOURCES_URL,
+		bindPhoneNumber,
+		handleUrlParam
+	} from '@/utils'
+	import cookie from '@/utils/store/cookie'
+	import SwitchWindow from '@/components/SwitchWindow'
+	import Authorization from '@/pages/authorization/index'
+	import {
+		signCourse
+	} from '@/api/knowledge'
+	const NAME = 'User'
+
+	export default {
+		name: NAME,
+		components: {
+			SwitchWindow,
+			Authorization,
 		},
-    goReturnList() {
-      this.$yrouter.push('/pages/order/ReturnList/index')
-    },
-		goAddressManagement(){
-			this.$yrouter.push('/pagesB/pages/user/address/AddressManagement/index')
-			// this.$yrouter.push('/pagesB/pages/shop/Live/LiveList/index')
+		props: {},
+		data() {
+			return {
+				MyMenus: [],
+				switchActive: false,
+				isWeixin: false,
+				memberStudyVo: {}
+			}
 		},
-		toCourseDetail(id){
-			this.$yrouter.push({
-			  path: '/pages/course/detail',
-			  query: {
-			    id:id,
-			  },
-			})
-			
+		computed: mapGetters(['userInfo']),
+		watch: {},
+		mounted() {
+			this.getMyLession()
 		},
-		toStudyDabang(item){
-			if(item.enterState){
+		methods: {
+			...mapMutations(['updateAuthorizationPage']),
+			startQr: function() {
+				uni.scanCode({
+					success: res => {
+						// let option = handleUrlParam(res.result)
+						console.log(handleUrlParam(res.result).id)
+						let id = handleUrlParam(res.result).id;
+						signCourse(id).then((res) => {
+							if (res.success) {
+								uni.showModal({
+									title: '提示!',
+									content: '签到成功！您的座位号是' + res.data,
+								})
+							} else {
+								uni.showToast({
+									title: res.msg,
+									icon: 'none',
+									duration: 5000
+								})
+							}
+						})
+					},
+				})
+			},
+
+			getMyLession() {
+				myLession().then((res) => {
+					this.memberStudyVo = res.data
+				})
+			},
+
+			call() {
+				uni.makePhoneCall({
+					phoneNumber: this.userInfo.sellerPhone || this.userInfo.customerPhone
+				})
+			},
+			toServiceIndex() {
+				this.$yrouter.push('/pages/serviceTeacher/index')
+			},
+			goUserCourse() {
+				this.$yrouter.push('/pages/user/myCourses/index')
+			},
+			goUserBangdan() {
+				this.$yrouter.push('/pages/user/myBangdan/index')
+			},
+			goUserFeedBack() {
+				this.$yrouter.push('/pages/user/feedBack/index')
+			},
+			goUserJoinUs() {
+				this.$yrouter.push('/pages/user/joinUs/index')
+			},
+			goReturnList() {
+				this.$yrouter.push('/pages/order/ReturnList/index')
+			},
+			goAddressManagement() {
+				this.$yrouter.push('/pagesB/pages/user/address/AddressManagement/index')
+				// this.$yrouter.push('/pagesB/pages/shop/Live/LiveList/index')
+			},
+			toCourseDetail(id) {
+				this.$yrouter.push({
+					path: '/pages/course/detail',
+					query: {
+						id: id,
+					},
+				})
+			},
+			toStudyDabang(item) {
 				this.$yrouter.push({
 					path: '/pages/study/dabang',
 					query: {
 						id: item.id,
 					},
 				})
-			} else{
-				if(item.isClockTime){
-					this.$yrouter.push({
-						path: '/pages/study/editDabang',
-						query: {
-							id: item.id,
-						},
+			},
+			toStudyDetail(id) {
+				this.$yrouter.push({
+					path: '/pages/study/detail',
+					query: {
+						id: id,
+					},
+				})
+			},
+			goMyOrder(type) {
+				this.$yrouter.push({
+					path: '/pages/order/MyOrder/index',
+					query: {
+						type,
+					},
+				})
+			},
+			goBindPhone() {
+				this.$yrouter.push({
+					path: '/pages/user/BindingPhone/index',
+				})
+			},
+			goUserCoupon() {
+				this.$yrouter.push('/pages/user/coupon/UserCoupon/index')
+			},
+			goIntegral() {
+				if (this.userInfo.phone) {
+					this.$yrouter.push('/pagesB/pages/user/signIn/Integral/index')
+				} else {
+					uni.showToast({
+						title: '请先绑定手机号',
+						icon: 'none',
+						duration: 2000
+					})
+				}
+			},
+			goUserPromotion() {
+				this.$yrouter.push('/pages/user/promotion/UserPromotion/index')
+			},
+			goUserAccount() {
+				this.$yrouter.push({
+					path: '/pages/user/UserAccount/index',
+				})
+			},
+			goPersonalData() {
+				this.$yrouter.push('/pages/user/PersonalData/index')
+			},
+			getPhoneNumber: function(e) {
+				bindPhoneNumber(e).then((res) => {
+					if (res.success) {
+						uni.showToast({
+							title: '绑定成功！',
+							duration: 1500
+						})
+						setTimeout(() => {
+							this.$store.dispatch('getUser', true)
+						}, 1500)
+					}
+				})
+			},
+			changeswitch: function(data) {
+				this.switchActive = data
+			},
+			MenuUser: function() {
+				let that = this
+				getMenuUser()
+					.then(res => {
+						uni.hideLoading()
+						that.MyMenus = res.data.routine_my_menus
+					})
+					.catch(error => {
+						uni.hideLoading()
+						console.log(error)
 					})
-				} else{
+			},
+			goPages: function(index) {
+				let url = this.MyMenus[index].uniapp_url
+				if (url === '/pages/user/promotion/UserPromotion/index' && this.userInfo.statu === 1) {
+					if (!this.userInfo.isPromoter) {
+						uni.showToast({
+							title: '您还没有推广权限！！',
+							icon: 'none',
+							duration: 2000,
+						})
+						return
+					}
+				}
+
+				if (url === '/pages/orderAdmin/OrderIndex/index' && !this.userInfo.adminid) {
 					uni.showToast({
-						title:'未到打卡时间！',
-						icon:'none',
-						duration:2000
+						title: '您还不是管理员！！',
+						icon: 'none',
+						duration: 2000,
 					})
+					return
 				}
+				if (url === '/pages/orderAdmin/OrderCancellation/index' && !this.userInfo.checkStatus) {
+					uni.showToast({
+						title: '您没有核销权限,请后台店员设置！！',
+						icon: 'none',
+						duration: 2000,
+					})
+					return
+				}
+
+				this.$yrouter.push({
+					path: this.MyMenus[index].uniapp_url,
+				})
+			},
+			goPages2: function() {
+				this.$yrouter.push({
+					path: '/pages/shop/GoodsList/index',
+					query: {
+						// id: 0,
+						title: '积分商城',
+						isIntegral: true,
+					},
+				})
+			},
+		},
+		watch: {
+			userInfo() {
+				// this.MenuUser()
+			},
+		},
+		onShow() {
+			if (this.$store.getters.token) {
+				this.$store.dispatch('getUser', true)
+				// this.MenuUser()
+				this.isWeixin = isWeixin()
 			}
-			
 		},
-    goMyOrder(type) {
-      this.$yrouter.push({
-        path: '/pages/order/MyOrder/index',
-        query: {
-          type,
-        },
-      })
-    },
-    goBindPhone() {
-      this.$yrouter.push({
-        path: '/pages/user/BindingPhone/index',
-      })
-    },
-    goUserCoupon() {
-      this.$yrouter.push('/pages/user/coupon/UserCoupon/index')
-    },
-    goIntegral() {
-			if(this.userInfo.phone){
-				this.$yrouter.push('/pagesB/pages/user/signIn/Integral/index')
-			} else{
-				uni.showToast({
-					title: '请先绑定手机号',
-					icon: 'none',
-					duration: 2000
-				})
+		onPullDownRefresh() {
+			if (this.$store.getters.token) {
+				this.$store.dispatch('getUser', true)
+				// this.MenuUser()
+				this.isWeixin = isWeixin()
+				this.getMyLession()
 			}
-      
-    },
-    goUserPromotion() {
-      this.$yrouter.push('/pages/user/promotion/UserPromotion/index')
-    },
-    goUserAccount() {
-      this.$yrouter.push({
-        path: '/pages/user/UserAccount/index',
-      })
-    },
-    goPersonalData() {
-      this.$yrouter.push('/pages/user/PersonalData/index')
-    },
-    getPhoneNumber: function(e) {
-      let thit = this
-      // 判断一下这里是不是小程序 如果是小程序，走获取微信手机号进行绑定
-      if (e.mp.detail.errMsg == 'getPhoneNumber:ok') {
-        uni.showLoading({
-          title: '绑定中',
-        })
-        wxappBindingPhone({
-          encryptedData: e.mp.detail.encryptedData,
-          iv: e.mp.detail.iv,
-        })
-          .then(res => {
-            // this.User();
-						if(res.success){
-							thit.$store.dispatch('userInfo', true)
-							uni.hideLoading()
-							uni.showToast({
-							  title: res.msg,
-							  icon: 'success',
-							  duration: 2000,
-							})
-						} else{
-							uni.hideLoading()
-							uni.showModal({
-								title:'提示！',
-								content:'授权已过期，请重新授权后绑定手机号',
-								success:function(res){
-									if(res.confirm){
-										thit.$store.commit('logout')
-									}
-								},
-							})
-						}
-          })
-      } else {
-        uni.showToast({
-          title: '已拒绝授权',
-          icon: 'none',
-          duration: 2000,
-        })
-      }
-    },
-    changeswitch: function(data) {
-      this.switchActive = data
-    },
-    MenuUser: function() {
-      let that = this
-      getMenuUser()
-        .then(res => {
-          uni.hideLoading()
-          that.MyMenus = res.data.routine_my_menus
-        })
-        .catch(error => {
-          uni.hideLoading()
-          console.log(error)
-        })
-    },
-    goPages: function(index) {
-      let url = this.MyMenus[index].uniapp_url
-      if (url === '/pages/user/promotion/UserPromotion/index' && this.userInfo.statu === 1) {
-        if (!this.userInfo.isPromoter) {
-          uni.showToast({
-            title: '您还没有推广权限！！',
-            icon: 'none',
-            duration: 2000,
-          })
-          return
-        }
-      }
-
-      if (url === '/pages/orderAdmin/OrderIndex/index' && !this.userInfo.adminid) {
-        uni.showToast({
-          title: '您还不是管理员！！',
-          icon: 'none',
-          duration: 2000,
-        })
-        return
-      }
-      if (url === '/pages/orderAdmin/OrderCancellation/index' && !this.userInfo.checkStatus) {
-        uni.showToast({
-          title: '您没有核销权限,请后台店员设置！！',
-          icon: 'none',
-          duration: 2000,
-        })
-        return
-      }
-
-      this.$yrouter.push({
-        path: this.MyMenus[index].uniapp_url,
-      })
-    },
-    goPages2: function() {
-      this.$yrouter.push({
-        path: '/pages/shop/GoodsList/index',
-        query: {
-          // id: 0,
-          title: '积分商城',
-          isIntegral: true,
-        },
-      })
-    },
-  },
-  watch: {
-    userInfo() {
-      // this.MenuUser()
-    },
-  },
-  onShow() {
-    if (this.$store.getters.token) {
-      this.$store.dispatch('getUser', true)
-      // this.MenuUser()
-      this.isWeixin = isWeixin()
-    }
-  },
-	onPullDownRefresh() {
-		if (this.$store.getters.token) {
-		  this.$store.dispatch('getUser', true)
-		  // this.MenuUser()
-		  this.isWeixin = isWeixin()
-		}
-	},
-	
-  onHide() {
-    console.log('离开用户中心')
-    this.updateAuthorizationPage(false)
-  },
-}
+		},
+
+		onHide() {
+			console.log('离开用户中心')
+			this.updateAuthorizationPage(false)
+		},
+	}
 </script>
 
 <style lang="less">
-.header{
-	width: 100%;
-	height: 336rpx !important;
-	padding: 0 !important;
-	position: relative !important;
-	.header-bg{
+	.header {
 		width: 100%;
-		height: 100%;
-		position: absolute;
-		top: 0;
-		z-index: 2;
-	}
-	.picTxt{
-		position: absolute !important;
-		left: 32rpx;
-		z-index: 3;
-		.text {
-			.name {
-				font-size: 36rpx;
-				max-width: 260rpx;
-				color: #A8873D;
-			}
-		}
-		.binding{
-			background: #BF922B !important;
-			border-color: #BF922B !important;
-		}
-	}
-	.jifen-box{
-		width: 200rpx;
-		height: 62rpx;
-		background: #BF922B;
-		border-radius: 30rpx;
-		text-align: center;
-		line-height: 62rpx;
-		position: absolute;
-		right: 30rpx;
-		top: 30rpx;
-		z-index: 4;
-		color: #fff;
-		font-size: 28rpx;
-	}
-}
-
-.teacher-box{
-	width: 690rpx;
-	height: 112rpx;
-	padding-left: 28rpx;
-	padding-right: 40rpx;
-	background: linear-gradient(180deg, #332810 0%, #4E4229 100%);
-	border-radius: 10rpx;
-	position: relative;
-	left: 50%;
-	top: -56rpx;
-	margin-left: -345rpx;
-	z-index: 7;
-	.teacher-box-l {
-		color: #FFFADD;
-		font-size: 28rpx;
-		.call-icon{
-			width: 56rpx;
-			height: 56rpx;
-		}
-		text{
-			display: inline-block;
-			margin-left:20rpx;
-			margin-right:14rpx;
+		height: 336rpx !important;
+		padding: 0 !important;
+		position: relative !important;
+
+		.header-bg {
+			width: 100%;
+			height: 100%;
+			position: absolute;
+			top: 0;
+			z-index: 2;
 		}
-		.vertical-line{
-			width: 2rpx;
-			height: 34rpx;
-			background: #FFFADD;
+
+		.picTxt {
+			position: absolute !important;
+			left: 32rpx;
+			z-index: 3;
+
+			.text {
+				.name {
+					font-size: 36rpx;
+					max-width: 260rpx;
+					color: #A8873D;
+				}
+			}
+
+			.binding {
+				background: #BF922B !important;
+				border-color: #BF922B !important;
+			}
 		}
-	}
-	.teacher-box-r{
-		color: #F9EDCC;
-		font-size: 24rpx;
-		image{
-			width: 88rpx;
-			height: 88rpx;
-			border: 1px solid #fff;
-			border-radius: 25px;
-			margin-right: 30rpx;
+
+		.jifen-box {
+			width: 200rpx;
+			height: 62rpx;
+			background: #BF922B;
+			border-radius: 30rpx;
+			text-align: center;
+			line-height: 62rpx;
+			position: absolute;
+			right: 30rpx;
+			top: 30rpx;
+			z-index: 4;
+			color: #fff;
+			font-size: 28rpx;
 		}
 	}
-}
-.myjoin-box{
-	width: 690rpx;
-	// height: 506rpx;
-	background: #FFFFFF;
-	border-radius: 10rpx;
-	padding: 30rpx;
-	margin: -26rpx auto 0;
-	.t-word{
-		font-size: 32rpx;
-		color: #222;
-		margin-bottom: 30rpx;
-	}
-	.course-box{
-		width: 94%;
-		height: 190rpx;
-		background: #FFF5DE;
+
+	.teacher-box {
+		width: 690rpx;
+		height: 112rpx;
+		padding-left: 28rpx;
+		padding-right: 40rpx;
+		background: linear-gradient(180deg, #332810 0%, #4E4229 100%);
 		border-radius: 10rpx;
-		padding: 26rpx 20rpx 20rpx 42rpx;
-		color: #C89560;
-		font-size: 24rpx;
-		display: inline-block;
-		margin-bottom: 30rpx;
-		margin-right: 20rpx;
-		.course-item{
-			width: 100%;
-			display: inline-block;
-		}
-		.course-info{
-			
-			margin-bottom: 10rpx;
-			.course-name{
-				color: #C89560;
-				font-size: 28rpx;
-				line-height: 40rpx;
-				margin-bottom: 4rpx;
-				font-weight: 500;
+		position: relative;
+		left: 50%;
+		top: -56rpx;
+		margin-left: -345rpx;
+		z-index: 7;
+
+		.teacher-box-l {
+			color: #FFFADD;
+			font-size: 28rpx;
+
+			.call-icon {
+				width: 56rpx;
+				height: 56rpx;
 			}
-		}
-		.address-box{
-			.address{
-				width: calc(100% - 190rpx);
+
+			text {
+				display: inline-block;
+				margin-left: 20rpx;
+				margin-right: 14rpx;
 			}
-			.btn{
-				width: 172rpx;
-				height: 56rpx;
-				background: linear-gradient(180deg, #FFCC5D 0%, #FCA535 100%);
-				border-radius: 28rpx;
-				text-align: center;
-				line-height: 56rpx;
-				font-size: 32rpx;
-				color: #fff;
+
+			.vertical-line {
+				width: 2rpx;
+				height: 34rpx;
+				background: #FFFADD;
+			}
+		}
+
+		.teacher-box-r {
+			color: #F9EDCC;
+			font-size: 24rpx;
+
+			image {
+				width: 88rpx;
+				height: 88rpx;
+				border: 1px solid #fff;
+				border-radius: 25px;
+				margin-right: 30rpx;
 			}
 		}
 	}
-	.scroll-view_H{
-		white-space: nowrap;
-		width: 100%;
-	}
-	.bangdan-box{
-		width: 100%;
-		box-sizing: border-box;
-		.bangdan-item{
-			width: 310rpx;
-			height: 152rpx;
-			box-sizing: border-box;
-			padding: 20rpx;
-			color: #fff;
-			display: inline-block;
-			background: linear-gradient(143deg, #FDAF97 0%, #ED5E48 100%);
+
+	.myjoin-box {
+		width: 690rpx;
+		// height: 506rpx;
+		background: #FFFFFF;
+		border-radius: 10rpx;
+		padding: 30rpx;
+		margin: -26rpx auto 0;
+
+		.t-word {
+			font-size: 32rpx;
+			color: #222;
+			margin-bottom: 30rpx;
+		}
+
+		.course-box {
+			width: 94%;
+			height: 190rpx;
+			background: #FFF5DE;
 			border-radius: 10rpx;
-			font-size: 28rpx;
+			padding: 26rpx 20rpx 20rpx 42rpx;
+			color: #C89560;
+			font-size: 24rpx;
+			display: inline-block;
+			margin-bottom: 30rpx;
 			margin-right: 20rpx;
-			.bangdan-name{
-				margin-bottom: 28rpx;
+			.course-item {
+				width: 100%;
+				display: inline-block;
 			}
-			.signin-day{
-				font-size: 24rpx;
+			.course-info {
+				margin-bottom: 10rpx;
+				.course-name {
+					width: 100%;
+					color: #C89560;
+					font-size: 28rpx;
+					line-height: 40rpx;
+					margin-bottom: 4rpx;
+					font-weight: 500;
+				}
 			}
-			.signin-btn{
-				width: 122rpx;
-				height: 48rpx;
-				background: linear-gradient(180deg, #FEECCB 0%, #FCAB3B 100%);
-				border-radius: 8px;
-				border-radius: 8rpx;
-				text-align: center;
-				line-height: 48rpx;
-				color: #C71A00;
-				font-size: 24rpx;
+
+			.address-box {
+				.address {
+					width: calc(100% - 190rpx);
+				}
+
+				.btn {
+					width: 172rpx;
+					height: 56rpx;
+					background: linear-gradient(180deg, #FFCC5D 0%, #FCA535 100%);
+					border-radius: 28rpx;
+					text-align: center;
+					line-height: 56rpx;
+					font-size: 32rpx;
+					color: #fff;
+				}
+			}
+		}
+
+		.scroll-view_H {
+			white-space: nowrap;
+			width: 100%;
+		}
+
+		.bangdan-box {
+			width: 100%;
+			box-sizing: border-box;
+
+			.bangdan-item {
+				width: 310rpx;
+				height: 152rpx;
+				box-sizing: border-box;
+				padding: 20rpx;
+				color: #fff;
+				display: inline-block;
+				background: linear-gradient(143deg, #FDAF97 0%, #ED5E48 100%);
+				border-radius: 10rpx;
+				font-size: 28rpx;
+				margin-right: 20rpx;
+
+				.bangdan-name {
+					margin-bottom: 28rpx;
+				}
+
+				.signin-day {
+					font-size: 24rpx;
+				}
+
+				.signin-btn {
+					width: 122rpx;
+					height: 48rpx;
+					background: linear-gradient(180deg, #FEECCB 0%, #FCAB3B 100%);
+					border-radius: 8px;
+					border-radius: 8rpx;
+					text-align: center;
+					line-height: 48rpx;
+					color: #C71A00;
+					font-size: 24rpx;
+				}
 			}
 		}
 	}
-}
-.content{
-	padding-bottom: 100rpx;
-}
-.user .wrapper {
-	background:#F5F6F7;
-  padding: 0 30rpx;
-}	
-	
-.footer-line-height {
-  height: 1 * 100rpx;
-}
-
-.order-status-num {
-  background-color: #fff;
-  color: #eb3729;
-  border-radius: 15px;
-  position: absolute;
-  right: -0.14 * 100rpx;
-  top: -0.15 * 100rpx;
-  font-size: 0.2 * 100rpx;
-  padding: 0 0.08 * 100rpx;
-  border: 1px solid #eb3729;
-}
-
-.pictrue {
-  position: relative;
-}
-
-.switch-h5 {
-  margin-left: 0.2 * 100rpx;
-}
-
-.binding {
-  margin-top: 0.1 * 100rpx;
-  display: inline-block;
-  padding: 0.05 * 100rpx 0.2 * 100rpx;
-  background-color: #ca1f10;
-  border-radius: 50px;
-  font-size: 0.22 * 100rpx;
-  line-height: 1.5;
-  border: 1px solid #e8695e;
-  color: #ffffff;
-}
-.noBorder{
-	border: none !important;
-}
-.by {
-  text-align: center;
-  padding: 30rpx 0;
-}
-
-.by-text {
-  text-align: center;
-  font-size: 24rpx;
-}
+
+	.content {
+		padding-bottom: 100rpx;
+	}
+
+	.user .wrapper {
+		background: #F5F6F7;
+		padding: 0 30rpx;
+	}
+
+	.footer-line-height {
+		height: 1 * 100rpx;
+	}
+
+	.order-status-num {
+		background-color: #fff;
+		color: #eb3729;
+		border-radius: 15px;
+		position: absolute;
+		right: -0.14 * 100rpx;
+		top: -0.15 * 100rpx;
+		font-size: 0.2 * 100rpx;
+		padding: 0 0.08 * 100rpx;
+		border: 1px solid #eb3729;
+	}
+
+	.pictrue {
+		position: relative;
+	}
+
+	.switch-h5 {
+		margin-left: 0.2 * 100rpx;
+	}
+
+	.binding {
+		margin-top: 0.1 * 100rpx;
+		display: inline-block;
+		padding: 0.05 * 100rpx 0.2 * 100rpx;
+		background-color: #ca1f10;
+		border-radius: 50px;
+		font-size: 0.22 * 100rpx;
+		line-height: 1.5;
+		border: 1px solid #e8695e;
+		color: #ffffff;
+	}
+
+	.noBorder {
+		border: none !important;
+	}
+
+	.by {
+		text-align: center;
+		padding: 30rpx 0;
+	}
+
+	.by-text {
+		text-align: center;
+		font-size: 24rpx;
+	}
 </style>
diff --git a/pages/user/myCourses/index.vue b/pages/user/myCourses/index.vue
index bd02c81..c902342 100644
--- a/pages/user/myCourses/index.vue
+++ b/pages/user/myCourses/index.vue
@@ -17,17 +17,15 @@
 						<view class="info-box">
 							<view class="">时间：{{item.courseStartTime.split(' ')[0]}}至{{item.courseEndTime.split(' ')[0]}}</view>
 							<view class="">地点：{{item.coursePlace}}</view>
-							<view class="">座位号：{{item.seat || '暂未安排座位'}}</view>
-							<!-- <view class="">酒店安排：江汉区江汉路22号武汉大酒店0801号房</view> -->
 						</view>
 					</view>
 				</view>
-				<view class="course-item-r acea-row" v-if="active == 1" @click="startQr()">
-					<view class="saoyisao" v-if="item.signState == 2"><image src="../../../static/saoyisao-icon.png"></image></view>
-					<text>{{item.signState == 1 ? '已签到' : '扫一扫'}}</text>
+				<view class="course-item-r acea-row" v-if="active == 1">
+					<!-- <view class="saoyisao" v-if="item.signState == 2"><image src="../../../static/saoyisao-icon.png"></image></view>
+					<text>{{item.signState == 1 ? '已签到' : '扫一扫'}}</text> -->
+					<text>已签到</text>
 				</view>
 				<view class="course-item-r colG acea-row" v-else>
-					<!-- <view class="saoyisao"><image src="../../../static/saoyisao-icon.png"></image></view> -->
 					<text>已结束</text>
 				</view>
 			</view>
diff --git a/utils/index.js b/utils/index.js
index 82af3d9..32cbc05 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -2,7 +2,7 @@ import Vue from 'vue'
 
 // import MpvueRouterPatch from 'mpvue-router-patch'
 // Vue.use(MpvueRouterPatch)
-import { wxappAuth, getUserInfo } from '@/api/user'
+import { wxappAuth, getUserInfo, wxappBindingPhone } from '@/api/user'
 import store from '@/store'
 import dayjs from 'dayjs'
 import cookie from '@/utils/store/cookie'
@@ -1132,3 +1132,54 @@ export function handleErrorMessage(err) {
     duration: 2000,
   })
 }
+
+// 微信小程序绑定手机号
+export function bindPhoneNumber(e){
+	return new Promise((resolve) =>{
+		// 判断一下这里是不是小程序 如果是小程序，走获取微信手机号进行绑定
+		if (e.mp.detail.errMsg == 'getPhoneNumber:ok') {
+		  uni.showLoading({ title: '绑定中...', })
+			uni.login({
+			  provider: 'weixin',
+			  success: function (loginRes) {
+					wxappBindingPhone({
+					  encryptedData: e.mp.detail.encryptedData,
+					  iv: e.mp.detail.iv,
+						code: loginRes.code
+					}).then(res => {
+						resolve(res)
+						if(res.success){
+							store.dispatch('userInfo', true)
+							uni.hideLoading()
+						} else{
+							uni.hideLoading()
+							uni.showModal({
+								title:'提示！',
+								content:'授权已过期，请重新授权后绑定手机号',
+								success:function(res){
+									if(res.confirm){
+										store.commit('logout')
+									}
+								},
+							})
+						}
+					}).catch(error => {
+						uni.hideLoading()
+						store.dispatch('userInfo', true)
+						uni.showToast({
+							title: error.msg || error.response.data.msg || error.response.data.message,
+							icon: 'none',
+							duration: 2000,
+						})
+					})
+			  }
+			});
+		} else {
+		  uni.showToast({
+		    title: '不在微信小程序',
+		    icon: 'none',
+		    duration: 2000,
+		  })
+		}
+	})
+}
\ No newline at end of file
diff --git a/wxcomponents/vant/button/index.vue b/wxcomponents/vant/button/index.vue
new file mode 100644
index 0000000..082a862
--- /dev/null
+++ b/wxcomponents/vant/button/index.vue
@@ -0,0 +1,96 @@
+<template>
+<uni-shadow-root class="vant-button-index"><button :id="id" :class="'custom-class '+(utils.bem('button', [type, size, { block, round, plain, square, loading, disabled, hairline, unclickable: disabled || loading }]))+' '+(hairline ? 'van-hairline--surround' : '')" hover-class="van-button--active hover-class" :lang="lang" :style="(style)+' '+(customStyle)" :open-type="openType" :business-id="businessId" :session-from="sessionFrom" :send-message-title="sendMessageTitle" :send-message-path="sendMessagePath" :send-message-img="sendMessageImg" :show-message-card="showMessageCard" :app-parameter="appParameter" :aria-label="ariaLabel" @click="onClick" @getuserinfo="bindGetUserInfo" @contact="bindContact" @getphonenumber="bindGetPhoneNumber" @error="bindError" @launchapp="bindLaunchApp" @opensetting="bindOpenSetting">
+  <block v-if="loading">
+    <van-loading custom-class="loading-class" :size="loadingSize" :type="loadingType" :color="type === 'default' ? '#c9c9c9' : 'white'"></van-loading>
+    <view v-if="loadingText" class="van-button__loading-text">
+      {{ loadingText }}
+    </view>
+  </block>
+  <block v-else>
+    <van-icon v-if="icon" size="1.2em" :name="icon" class="van-button__icon" custom-style="line-height: inherit;"></van-icon>
+    <view class="van-button__text">
+      <slot></slot>
+    </view>
+  </block>
+</button></uni-shadow-root>
+</template>
+<wxs src="../wxs/utils.wxs" module="utils"></wxs>
+<script>
+import VanIcon from '../icon/index.vue'
+import VanLoading from '../loading/index.vue'
+global['__wxVueOptions'] = {components:{'van-icon': VanIcon,'van-loading': VanLoading}}
+
+global['__wxRoute'] = 'vant/button/index'
+import { VantComponent } from '../common/component';
+import { button } from '../mixins/button';
+import { openType } from '../mixins/open-type';
+VantComponent({
+    mixins: [button, openType],
+    classes: ['hover-class', 'loading-class'],
+    data: {
+        style: ''
+    },
+    props: {
+        icon: String,
+        plain: Boolean,
+        block: Boolean,
+        round: Boolean,
+        square: Boolean,
+        loading: Boolean,
+        hairline: Boolean,
+        disabled: Boolean,
+        loadingText: String,
+        customStyle: String,
+        loadingType: {
+            type: String,
+            value: 'circular'
+        },
+        type: {
+            type: String,
+            value: 'default'
+        },
+        size: {
+            type: String,
+            value: 'normal'
+        },
+        loadingSize: {
+            type: String,
+            value: '20px'
+        },
+        color: {
+            type: String,
+            observer(color) {
+                let style = '';
+                if (color) {
+                    style += `color: ${this.data.plain ? color : 'white'};`;
+                    if (!this.data.plain) {
+                        // Use background instead of backgroundColor to make linear-gradient work
+                        style += `background: ${color};`;
+                    }
+                    // hide border when color is linear-gradient
+                    if (color.indexOf('gradient') !== -1) {
+                        style += 'border: 0;';
+                    }
+                    else {
+                        style += `border-color: ${color};`;
+                    }
+                }
+                if (style !== this.data.style) {
+                    this.setData({ style });
+                }
+            }
+        }
+    },
+    methods: {
+        onClick() {
+            if (!this.data.disabled && !this.data.loading) {
+                this.$emit('click');
+            }
+        }
+    }
+});
+export default global['__wxComponents']['vant/button/index']
+</script>
+<style platform="mp-weixin">
+@import '../common/index.css';.van-button{position:relative;display:-webkit-inline-flex;display:inline-flex;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;box-sizing:border-box;padding:0;line-height:20px;text-align:center;vertical-align:middle;-webkit-appearance:none;-webkit-text-size-adjust:100%;height:44px;height:var(--button-default-height,44px);font-size:16px;font-size:var(--button-default-font-size,16px);transition:opacity .2s;transition:opacity var(--animation-duration-fast,.2s);border-radius:2px;border-radius:var(--button-border-radius,2px)}.van-button:before{position:absolute;top:50%;left:50%;width:100%;height:100%;border:inherit;border-radius:inherit;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);opacity:0;content:" ";background-color:#000;background-color:var(--black,#000);border-color:#000;border-color:var(--black,#000)}.van-button:after{border-width:0}.van-button--active:before{opacity:.15}.van-button--unclickable:after{display:none}.van-button--default{color:#323233;color:var(--button-default-color,#323233);background-color:#fff;background-color:var(--button-default-background-color,#fff);border:1px solid #ebedf0;border:1px solid var(--button-default-border-color,#ebedf0)}.van-button--primary{color:#fff;color:var(--button-primary-color,#fff);background-color:#07c160;background-color:var(--button-primary-background-color,#07c160);border:1px solid #07c160;border:1px solid var(--button-primary-border-color,#07c160)}.van-button--info{color:#fff;color:var(--button-info-color,#fff);background-color:#1989fa;background-color:var(--button-info-background-color,#1989fa);border:1px solid #1989fa;border:1px solid var(--button-info-border-color,#1989fa)}.van-button--danger{color:#fff;color:var(--button-danger-color,#fff);background-color:#ee0a24;background-color:var(--button-danger-background-color,#ee0a24);border:1px solid #ee0a24;border:1px solid var(--button-danger-border-color,#ee0a24)}.van-button--warning{color:#fff;color:var(--button-warning-color,#fff);background-color:#ff976a;background-color:var(--button-warning-background-color,#ff976a);border:1px solid #ff976a;border:1px solid var(--button-warning-border-color,#ff976a)}.van-button--plain{background-color:#fff;background-color:var(--button-plain-background-color,#fff)}.van-button--plain.van-button--primary{color:#07c160;color:var(--button-primary-background-color,#07c160)}.van-button--plain.van-button--info{color:#1989fa;color:var(--button-info-background-color,#1989fa)}.van-button--plain.van-button--danger{color:#ee0a24;color:var(--button-danger-background-color,#ee0a24)}.van-button--plain.van-button--warning{color:#ff976a;color:var(--button-warning-background-color,#ff976a)}.van-button--large{width:100%;height:50px;height:var(--button-large-height,50px)}.van-button--normal{padding:0 15px;font-size:14px;font-size:var(--button-normal-font-size,14px)}.van-button--small{min-width:60px;min-width:var(--button-small-min-width,60px);height:30px;height:var(--button-small-height,30px);padding:0 8px;padding:0 var(--padding-xs,8px);font-size:12px;font-size:var(--button-small-font-size,12px)}.van-button--mini{display:inline-block;min-width:50px;min-width:var(--button-mini-min-width,50px);height:22px;height:var(--button-mini-height,22px);font-size:10px;font-size:var(--button-mini-font-size,10px)}.van-button--mini+.van-button--mini{margin-left:5px}.van-button--block{display:-webkit-flex;display:flex;width:100%}.van-button--round{border-radius:999px;border-radius:var(--button-round-border-radius,999px)}.van-button--square{border-radius:0}.van-button--disabled{opacity:.5;opacity:var(--button-disabled-opacity,.5)}.van-button__text{display:inline}.van-button__icon+.van-button__text:not(:empty),.van-button__loading-text{margin-left:4px}.van-button__icon{min-width:1em;line-height:inherit!important;vertical-align:top}.van-button--hairline{padding-top:1px;border-width:0}.van-button--hairline:after{border-color:inherit;border-width:1px;border-radius:4px;border-radius:calc(var(--button-border-radius, 2px)*2)}.van-button--hairline.van-button--round:after{border-radius:999px;border-radius:var(--button-round-border-radius,999px)}.van-button--hairline.van-button--square:after{border-radius:0}
+</style>
\ No newline at end of file
diff --git a/wxcomponents/vant/common/index.css b/wxcomponents/vant/common/index.css
new file mode 100644
index 0000000..6e6891f
--- /dev/null
+++ b/wxcomponents/vant/common/index.css
@@ -0,0 +1 @@
+.van-ellipsis{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.van-multi-ellipsis--l2{-webkit-line-clamp:2}.van-multi-ellipsis--l2,.van-multi-ellipsis--l3{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-box-orient:vertical}.van-multi-ellipsis--l3{-webkit-line-clamp:3}.van-clearfix:after{display:table;clear:both;content:""}.van-hairline,.van-hairline--bottom,.van-hairline--left,.van-hairline--right,.van-hairline--surround,.van-hairline--top,.van-hairline--top-bottom{position:relative}.van-hairline--bottom:after,.van-hairline--left:after,.van-hairline--right:after,.van-hairline--surround:after,.van-hairline--top-bottom:after,.van-hairline--top:after,.van-hairline:after{position:absolute;box-sizing:border-box;-webkit-transform-origin:center;transform-origin:center;content:" ";pointer-events:none;top:-50%;right:-50%;bottom:-50%;left:-50%;border:0 solid #eee;-webkit-transform:scale(.5);transform:scale(.5)}.van-hairline--top:after{border-top-width:1px}.van-hairline--left:after{border-left-width:1px}.van-hairline--right:after{border-right-width:1px}.van-hairline--bottom:after{border-bottom-width:1px}.van-hairline--top-bottom:after{border-width:1px 0}.van-hairline--surround:after{border-width:1px}
\ No newline at end of file
diff --git a/wxcomponents/vant/common/style/clearfix.css b/wxcomponents/vant/common/style/clearfix.css
new file mode 100644
index 0000000..a0ca838
--- /dev/null
+++ b/wxcomponents/vant/common/style/clearfix.css
@@ -0,0 +1 @@
+.van-clearfix:after{display:table;clear:both;content:""}
\ No newline at end of file
diff --git a/wxcomponents/vant/common/style/ellipsis.css b/wxcomponents/vant/common/style/ellipsis.css
new file mode 100644
index 0000000..1e9dbc9
--- /dev/null
+++ b/wxcomponents/vant/common/style/ellipsis.css
@@ -0,0 +1 @@
+.van-ellipsis{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.van-multi-ellipsis--l2{-webkit-line-clamp:2}.van-multi-ellipsis--l2,.van-multi-ellipsis--l3{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-box-orient:vertical}.van-multi-ellipsis--l3{-webkit-line-clamp:3}
\ No newline at end of file
diff --git a/wxcomponents/vant/common/style/hairline.css b/wxcomponents/vant/common/style/hairline.css
new file mode 100644
index 0000000..f64e2f8
--- /dev/null
+++ b/wxcomponents/vant/common/style/hairline.css
@@ -0,0 +1 @@
+.van-hairline,.van-hairline--bottom,.van-hairline--left,.van-hairline--right,.van-hairline--surround,.van-hairline--top,.van-hairline--top-bottom{position:relative}.van-hairline--bottom:after,.van-hairline--left:after,.van-hairline--right:after,.van-hairline--surround:after,.van-hairline--top-bottom:after,.van-hairline--top:after,.van-hairline:after{position:absolute;box-sizing:border-box;-webkit-transform-origin:center;transform-origin:center;content:" ";pointer-events:none;top:-50%;right:-50%;bottom:-50%;left:-50%;border:0 solid #eee;-webkit-transform:scale(.5);transform:scale(.5)}.van-hairline--top:after{border-top-width:1px}.van-hairline--left:after{border-left-width:1px}.van-hairline--right:after{border-right-width:1px}.van-hairline--bottom:after{border-bottom-width:1px}.van-hairline--top-bottom:after{border-width:1px 0}.van-hairline--surround:after{border-width:1px}
\ No newline at end of file
diff --git a/wxcomponents/vant/common/style/mixins/clearfix.css b/wxcomponents/vant/common/style/mixins/clearfix.css
new file mode 100644
index 0000000..e69de29
diff --git a/wxcomponents/vant/common/style/mixins/ellipsis.css b/wxcomponents/vant/common/style/mixins/ellipsis.css
new file mode 100644
index 0000000..e69de29
diff --git a/wxcomponents/vant/common/style/mixins/hairline.css b/wxcomponents/vant/common/style/mixins/hairline.css
new file mode 100644
index 0000000..e69de29
diff --git a/wxcomponents/vant/common/style/theme.css b/wxcomponents/vant/common/style/theme.css
new file mode 100644
index 0000000..e69de29
diff --git a/wxcomponents/vant/common/style/var.css b/wxcomponents/vant/common/style/var.css
new file mode 100644
index 0000000..e69de29
diff --git a/wxcomponents/vant/icon/index.vue b/wxcomponents/vant/icon/index.vue
new file mode 100644
index 0000000..d104ccb
--- /dev/null
+++ b/wxcomponents/vant/icon/index.vue
@@ -0,0 +1,1012 @@
+<template>
+<uni-shadow-root class="vant-icon-index"><view :class="'custom-class '+(classPrefix)+' '+(isImageName ? 'van-icon--image' : classPrefix + '-' + name)" :style="(color ? 'color: ' + color + ';' : '')+(size ? 'font-size: ' + sizeWithUnit + ';' : '')+(customStyle)" @click="onClick">
+  <van-info v-if="info !== null || dot" :dot="dot" :info="info" custom-class="van-icon__info"></van-info>
+  <image v-if="isImageName" :src="name" mode="aspectFit" class="van-icon__image"></image>
+</view></uni-shadow-root>
+</template>
+
+<script>
+import VanInfo from '../info/index.vue'
+global['__wxVueOptions'] = {components:{'van-info': VanInfo}}
+
+global['__wxRoute'] = 'vant/icon/index'
+import { VantComponent } from '../common/component';
+import { addUnit } from '../common/utils';
+VantComponent({
+    props: {
+        dot: Boolean,
+        info: null,
+        size: {
+            type: null,
+            observer: 'setSizeWithUnit'
+        },
+        color: String,
+        customStyle: String,
+        classPrefix: {
+            type: String,
+            value: 'van-icon'
+        },
+        name: {
+            type: String,
+            observer(val) {
+                this.setData({
+                    isImageName: val.indexOf('/') !== -1
+                });
+            }
+        }
+    },
+    data: {
+        sizeWithUnit: null,
+    },
+    methods: {
+        onClick() {
+            this.$emit('click');
+        },
+        setSizeWithUnit(size) {
+            this.setData({
+                sizeWithUnit: addUnit(size)
+            });
+        }
+    }
+});
+export default global['__wxComponents']['vant/icon/index']
+</script>
+<style platform="mp-weixin">
+@import '../common/index.css';
+
+@font-face {
+    font-weight: 400;
+    font-family: vant-icon;
+    font-style: normal;
+    font-display: auto;
+    src: url(https://img.yzcdn.cn/vant/vant-icon-d3825a.woff2) format("woff2"), url(https://img.yzcdn.cn/vant/vant-icon-d3825a.woff) format("woff"), url(https://img.yzcdn.cn/vant/vant-icon-d3825a.ttf) format("truetype")
+}
+
+.van-icon {
+    position: relative;
+    font: normal normal normal 14px/1 vant-icon;
+    font-size: inherit;
+    text-rendering: auto;
+    -webkit-font-smoothing: antialiased
+}
+
+.van-icon,
+.van-icon:before {
+    display: inline-block
+}
+
+.van-icon-add-o:before {
+    content: "\F000"
+}
+
+.van-icon-add-square:before {
+    content: "\F001"
+}
+
+.van-icon-add:before {
+    content: "\F002"
+}
+
+.van-icon-after-sale:before {
+    content: "\F003"
+}
+
+.van-icon-aim:before {
+    content: "\F004"
+}
+
+.van-icon-alipay:before {
+    content: "\F005"
+}
+
+.van-icon-apps-o:before {
+    content: "\F006"
+}
+
+.van-icon-arrow-down:before {
+    content: "\F007"
+}
+
+.van-icon-arrow-left:before {
+    content: "\F008"
+}
+
+.van-icon-arrow-up:before {
+    content: "\F009"
+}
+
+.van-icon-arrow:before {
+    content: "\F00A"
+}
+
+.van-icon-ascending:before {
+    content: "\F00B"
+}
+
+.van-icon-audio:before {
+    content: "\F00C"
+}
+
+.van-icon-award-o:before {
+    content: "\F00D"
+}
+
+.van-icon-award:before {
+    content: "\F00E"
+}
+
+.van-icon-bag-o:before {
+    content: "\F00F"
+}
+
+.van-icon-bag:before {
+    content: "\F010"
+}
+
+.van-icon-balance-list-o:before {
+    content: "\F011"
+}
+
+.van-icon-balance-list:before {
+    content: "\F012"
+}
+
+.van-icon-balance-o:before {
+    content: "\F013"
+}
+
+.van-icon-balance-pay:before {
+    content: "\F014"
+}
+
+.van-icon-bar-chart-o:before {
+    content: "\F015"
+}
+
+.van-icon-bars:before {
+    content: "\F016"
+}
+
+.van-icon-bell:before {
+    content: "\F017"
+}
+
+.van-icon-bill-o:before {
+    content: "\F018"
+}
+
+.van-icon-bill:before {
+    content: "\F019"
+}
+
+.van-icon-birthday-cake-o:before {
+    content: "\F01A"
+}
+
+.van-icon-bookmark-o:before {
+    content: "\F01B"
+}
+
+.van-icon-bookmark:before {
+    content: "\F01C"
+}
+
+.van-icon-browsing-history-o:before {
+    content: "\F01D"
+}
+
+.van-icon-browsing-history:before {
+    content: "\F01E"
+}
+
+.van-icon-brush-o:before {
+    content: "\F01F"
+}
+
+.van-icon-bulb-o:before {
+    content: "\F020"
+}
+
+.van-icon-bullhorn-o:before {
+    content: "\F021"
+}
+
+.van-icon-calender-o:before {
+    content: "\F022"
+}
+
+.van-icon-card:before {
+    content: "\F023"
+}
+
+.van-icon-cart-circle-o:before {
+    content: "\F024"
+}
+
+.van-icon-cart-circle:before {
+    content: "\F025"
+}
+
+.van-icon-cart-o:before {
+    content: "\F026"
+}
+
+.van-icon-cart:before {
+    content: "\F027"
+}
+
+.van-icon-cash-back-record:before {
+    content: "\F028"
+}
+
+.van-icon-cash-on-deliver:before {
+    content: "\F029"
+}
+
+.van-icon-cashier-o:before {
+    content: "\F02A"
+}
+
+.van-icon-certificate:before {
+    content: "\F02B"
+}
+
+.van-icon-chart-trending-o:before {
+    content: "\F02C"
+}
+
+.van-icon-chat-o:before {
+    content: "\F02D"
+}
+
+.van-icon-chat:before {
+    content: "\F02E"
+}
+
+.van-icon-checked:before {
+    content: "\F02F"
+}
+
+.van-icon-circle:before {
+    content: "\F030"
+}
+
+.van-icon-clear:before {
+    content: "\F031"
+}
+
+.van-icon-clock-o:before {
+    content: "\F032"
+}
+
+.van-icon-clock:before {
+    content: "\F033"
+}
+
+.van-icon-close:before {
+    content: "\F034"
+}
+
+.van-icon-closed-eye:before {
+    content: "\F035"
+}
+
+.van-icon-cluster-o:before {
+    content: "\F036"
+}
+
+.van-icon-cluster:before {
+    content: "\F037"
+}
+
+.van-icon-column:before {
+    content: "\F038"
+}
+
+.van-icon-comment-circle-o:before {
+    content: "\F039"
+}
+
+.van-icon-comment-circle:before {
+    content: "\F03A"
+}
+
+.van-icon-comment-o:before {
+    content: "\F03B"
+}
+
+.van-icon-comment:before {
+    content: "\F03C"
+}
+
+.van-icon-completed:before {
+    content: "\F03D"
+}
+
+.van-icon-contact:before {
+    content: "\F03E"
+}
+
+.van-icon-coupon-o:before {
+    content: "\F03F"
+}
+
+.van-icon-coupon:before {
+    content: "\F040"
+}
+
+.van-icon-credit-pay:before {
+    content: "\F041"
+}
+
+.van-icon-cross:before {
+    content: "\F042"
+}
+
+.van-icon-debit-pay:before {
+    content: "\F043"
+}
+
+.van-icon-delete:before {
+    content: "\F044"
+}
+
+.van-icon-descending:before {
+    content: "\F045"
+}
+
+.van-icon-description:before {
+    content: "\F046"
+}
+
+.van-icon-desktop-o:before {
+    content: "\F047"
+}
+
+.van-icon-diamond-o:before {
+    content: "\F048"
+}
+
+.van-icon-diamond:before {
+    content: "\F049"
+}
+
+.van-icon-discount:before {
+    content: "\F04A"
+}
+
+.van-icon-down:before {
+    content: "\F04B"
+}
+
+.van-icon-ecard-pay:before {
+    content: "\F04C"
+}
+
+.van-icon-edit:before {
+    content: "\F04D"
+}
+
+.van-icon-ellipsis:before {
+    content: "\F04E"
+}
+
+.van-icon-empty:before {
+    content: "\F04F"
+}
+
+.van-icon-envelop-o:before {
+    content: "\F050"
+}
+
+.van-icon-exchange:before {
+    content: "\F051"
+}
+
+.van-icon-expand-o:before {
+    content: "\F052"
+}
+
+.van-icon-expand:before {
+    content: "\F053"
+}
+
+.van-icon-eye-o:before {
+    content: "\F054"
+}
+
+.van-icon-eye:before {
+    content: "\F055"
+}
+
+.van-icon-fail:before {
+    content: "\F056"
+}
+
+.van-icon-failure:before {
+    content: "\F057"
+}
+
+.van-icon-filter-o:before {
+    content: "\F058"
+}
+
+.van-icon-fire-o:before {
+    content: "\F059"
+}
+
+.van-icon-fire:before {
+    content: "\F05A"
+}
+
+.van-icon-flag-o:before {
+    content: "\F05B"
+}
+
+.van-icon-flower-o:before {
+    content: "\F05C"
+}
+
+.van-icon-free-postage:before {
+    content: "\F05D"
+}
+
+.van-icon-friends-o:before {
+    content: "\F05E"
+}
+
+.van-icon-friends:before {
+    content: "\F05F"
+}
+
+.van-icon-gem-o:before {
+    content: "\F060"
+}
+
+.van-icon-gem:before {
+    content: "\F061"
+}
+
+.van-icon-gift-card-o:before {
+    content: "\F062"
+}
+
+.van-icon-gift-card:before {
+    content: "\F063"
+}
+
+.van-icon-gift-o:before {
+    content: "\F064"
+}
+
+.van-icon-gift:before {
+    content: "\F065"
+}
+
+.van-icon-gold-coin-o:before {
+    content: "\F066"
+}
+
+.van-icon-gold-coin:before {
+    content: "\F067"
+}
+
+.van-icon-good-job-o:before {
+    content: "\F068"
+}
+
+.van-icon-good-job:before {
+    content: "\F069"
+}
+
+.van-icon-goods-collect-o:before {
+    content: "\F06A"
+}
+
+.van-icon-goods-collect:before {
+    content: "\F06B"
+}
+
+.van-icon-graphic:before {
+    content: "\F06C"
+}
+
+.van-icon-home-o:before {
+    content: "\F06D"
+}
+
+.van-icon-hot-o:before {
+    content: "\F06E"
+}
+
+.van-icon-hot-sale-o:before {
+    content: "\F06F"
+}
+
+.van-icon-hot-sale:before {
+    content: "\F070"
+}
+
+.van-icon-hot:before {
+    content: "\F071"
+}
+
+.van-icon-hotel-o:before {
+    content: "\F072"
+}
+
+.van-icon-idcard:before {
+    content: "\F073"
+}
+
+.van-icon-info-o:before {
+    content: "\F074"
+}
+
+.van-icon-info:before {
+    content: "\F075"
+}
+
+.van-icon-invition:before {
+    content: "\F076"
+}
+
+.van-icon-label-o:before {
+    content: "\F077"
+}
+
+.van-icon-label:before {
+    content: "\F078"
+}
+
+.van-icon-like-o:before {
+    content: "\F079"
+}
+
+.van-icon-like:before {
+    content: "\F07A"
+}
+
+.van-icon-live:before {
+    content: "\F07B"
+}
+
+.van-icon-location-o:before {
+    content: "\F07C"
+}
+
+.van-icon-location:before {
+    content: "\F07D"
+}
+
+.van-icon-lock:before {
+    content: "\F07E"
+}
+
+.van-icon-logistics:before {
+    content: "\F07F"
+}
+
+.van-icon-manager-o:before {
+    content: "\F080"
+}
+
+.van-icon-manager:before {
+    content: "\F081"
+}
+
+.van-icon-map-marked:before {
+    content: "\F082"
+}
+
+.van-icon-medal-o:before {
+    content: "\F083"
+}
+
+.van-icon-medal:before {
+    content: "\F084"
+}
+
+.van-icon-more-o:before {
+    content: "\F085"
+}
+
+.van-icon-more:before {
+    content: "\F086"
+}
+
+.van-icon-music-o:before {
+    content: "\F087"
+}
+
+.van-icon-music:before {
+    content: "\F088"
+}
+
+.van-icon-new-arrival-o:before {
+    content: "\F089"
+}
+
+.van-icon-new-arrival:before {
+    content: "\F08A"
+}
+
+.van-icon-new-o:before {
+    content: "\F08B"
+}
+
+.van-icon-new:before {
+    content: "\F08C"
+}
+
+.van-icon-newspaper-o:before {
+    content: "\F08D"
+}
+
+.van-icon-notes-o:before {
+    content: "\F08E"
+}
+
+.van-icon-orders-o:before {
+    content: "\F08F"
+}
+
+.van-icon-other-pay:before {
+    content: "\F090"
+}
+
+.van-icon-paid:before {
+    content: "\F091"
+}
+
+.van-icon-passed:before {
+    content: "\F092"
+}
+
+.van-icon-pause-circle-o:before {
+    content: "\F093"
+}
+
+.van-icon-pause-circle:before {
+    content: "\F094"
+}
+
+.van-icon-pause:before {
+    content: "\F095"
+}
+
+.van-icon-peer-pay:before {
+    content: "\F096"
+}
+
+.van-icon-pending-payment:before {
+    content: "\F097"
+}
+
+.van-icon-phone-circle-o:before {
+    content: "\F098"
+}
+
+.van-icon-phone-circle:before {
+    content: "\F099"
+}
+
+.van-icon-phone-o:before {
+    content: "\F09A"
+}
+
+.van-icon-phone:before {
+    content: "\F09B"
+}
+
+.van-icon-photo-o:before {
+    content: "\F09C"
+}
+
+.van-icon-photo:before {
+    content: "\F09D"
+}
+
+.van-icon-photograph:before {
+    content: "\F09E"
+}
+
+.van-icon-play-circle-o:before {
+    content: "\F09F"
+}
+
+.van-icon-play-circle:before {
+    content: "\F0A0"
+}
+
+.van-icon-play:before {
+    content: "\F0A1"
+}
+
+.van-icon-plus:before {
+    content: "\F0A2"
+}
+
+.van-icon-point-gift-o:before {
+    content: "\F0A3"
+}
+
+.van-icon-point-gift:before {
+    content: "\F0A4"
+}
+
+.van-icon-points:before {
+    content: "\F0A5"
+}
+
+.van-icon-printer:before {
+    content: "\F0A6"
+}
+
+.van-icon-qr-invalid:before {
+    content: "\F0A7"
+}
+
+.van-icon-qr:before {
+    content: "\F0A8"
+}
+
+.van-icon-question-o:before {
+    content: "\F0A9"
+}
+
+.van-icon-question:before {
+    content: "\F0AA"
+}
+
+.van-icon-records:before {
+    content: "\F0AB"
+}
+
+.van-icon-refund-o:before {
+    content: "\F0AC"
+}
+
+.van-icon-replay:before {
+    content: "\F0AD"
+}
+
+.van-icon-scan:before {
+    content: "\F0AE"
+}
+
+.van-icon-search:before {
+    content: "\F0AF"
+}
+
+.van-icon-send-gift-o:before {
+    content: "\F0B0"
+}
+
+.van-icon-send-gift:before {
+    content: "\F0B1"
+}
+
+.van-icon-service-o:before {
+    content: "\F0B2"
+}
+
+.van-icon-service:before {
+    content: "\F0B3"
+}
+
+.van-icon-setting-o:before {
+    content: "\F0B4"
+}
+
+.van-icon-setting:before {
+    content: "\F0B5"
+}
+
+.van-icon-share:before {
+    content: "\F0B6"
+}
+
+.van-icon-shop-collect-o:before {
+    content: "\F0B7"
+}
+
+.van-icon-shop-collect:before {
+    content: "\F0B8"
+}
+
+.van-icon-shop-o:before {
+    content: "\F0B9"
+}
+
+.van-icon-shop:before {
+    content: "\F0BA"
+}
+
+.van-icon-shopping-cart-o:before {
+    content: "\F0BB"
+}
+
+.van-icon-shopping-cart:before {
+    content: "\F0BC"
+}
+
+.van-icon-shrink:before {
+    content: "\F0BD"
+}
+
+.van-icon-sign:before {
+    content: "\F0BE"
+}
+
+.van-icon-smile-comment-o:before {
+    content: "\F0BF"
+}
+
+.van-icon-smile-comment:before {
+    content: "\F0C0"
+}
+
+.van-icon-smile-o:before {
+    content: "\F0C1"
+}
+
+.van-icon-smile:before {
+    content: "\F0C2"
+}
+
+.van-icon-star-o:before {
+    content: "\F0C3"
+}
+
+.van-icon-star:before {
+    content: "\F0C4"
+}
+
+.van-icon-stop-circle-o:before {
+    content: "\F0C5"
+}
+
+.van-icon-stop-circle:before {
+    content: "\F0C6"
+}
+
+.van-icon-stop:before {
+    content: "\F0C7"
+}
+
+.van-icon-success:before {
+    content: "\F0C8"
+}
+
+.van-icon-thumb-circle-o:before {
+    content: "\F0C9"
+}
+
+.van-icon-thumb-circle:before {
+    content: "\F0CA"
+}
+
+.van-icon-todo-list-o:before {
+    content: "\F0CB"
+}
+
+.van-icon-todo-list:before {
+    content: "\F0CC"
+}
+
+.van-icon-tosend:before {
+    content: "\F0CD"
+}
+
+.van-icon-tv-o:before {
+    content: "\F0CE"
+}
+
+.van-icon-umbrella-circle:before {
+    content: "\F0CF"
+}
+
+.van-icon-underway-o:before {
+    content: "\F0D0"
+}
+
+.van-icon-underway:before {
+    content: "\F0D1"
+}
+
+.van-icon-upgrade:before {
+    content: "\F0D2"
+}
+
+.van-icon-user-circle-o:before {
+    content: "\F0D3"
+}
+
+.van-icon-user-o:before {
+    content: "\F0D4"
+}
+
+.van-icon-video-o:before {
+    content: "\F0D5"
+}
+
+.van-icon-video:before {
+    content: "\F0D6"
+}
+
+.van-icon-vip-card-o:before {
+    content: "\F0D7"
+}
+
+.van-icon-vip-card:before {
+    content: "\F0D8"
+}
+
+.van-icon-volume-o:before {
+    content: "\F0D9"
+}
+
+.van-icon-volume:before {
+    content: "\F0DA"
+}
+
+.van-icon-wap-home-o:before {
+    content: "\F0DB"
+}
+
+.van-icon-wap-home:before {
+    content: "\F0DC"
+}
+
+.van-icon-wap-nav:before {
+    content: "\F0DD"
+}
+
+.van-icon-warn-o:before {
+    content: "\F0DE"
+}
+
+.van-icon-warning-o:before {
+    content: "\F0DF"
+}
+
+.van-icon-warning:before {
+    content: "\F0E0"
+}
+
+.van-icon-weapp-nav:before {
+    content: "\F0E1"
+}
+
+.van-icon-wechat:before {
+    content: "\F0E2"
+}
+
+.van-icon-youzan-shield:before {
+    content: "\F0E3"
+}
+
+.vant-icon-index {
+    display: -webkit-inline-flex;
+    display: inline-flex;
+    -webkit-align-items: center;
+    align-items: center;
+    -webkit-justify-content: center;
+    justify-content: center
+}
+
+.van-icon--image {
+    width: 1em;
+    height: 1em
+}
+
+.van-icon__image {
+    width: 100%;
+    height: 100%
+}
+
+.van-icon__info {
+    z-index: 1
+}
+</style>
\ No newline at end of file
diff --git a/wxcomponents/vant/info/index.vue b/wxcomponents/vant/info/index.vue
new file mode 100644
index 0000000..212bccc
--- /dev/null
+++ b/wxcomponents/vant/info/index.vue
@@ -0,0 +1,20 @@
+<template>
+<uni-shadow-root class="vant-info-index"><view v-if="info !== null && info !== '' || dot" :class="'custom-class van-info '+(utils.bem('info', { dot }))" :style="customStyle">{{ dot ? '' : info }}</view></uni-shadow-root>
+</template>
+<wxs src="../wxs/utils.wxs" module="utils"></wxs>
+<script>
+
+global['__wxRoute'] = 'vant/info/index'
+import { VantComponent } from '../common/component';
+VantComponent({
+    props: {
+        dot: Boolean,
+        info: null,
+        customStyle: String
+    }
+});
+export default global['__wxComponents']['vant/info/index']
+</script>
+<style platform="mp-weixin">
+@import '../common/index.css';.van-info{position:absolute;top:0;right:0;box-sizing:border-box;white-space:nowrap;text-align:center;-webkit-transform:translate(50%,-50%);transform:translate(50%,-50%);-webkit-transform-origin:100%;transform-origin:100%;min-width:16px;min-width:var(--info-size,16px);padding:0 3px;padding:var(--info-padding,0 3px);color:#fff;color:var(--info-color,#fff);font-weight:500;font-weight:var(--info-font-weight,500);font-size:12px;font-size:var(--info-font-size,12px);font-family:PingFang SC,Helvetica Neue,Arial,sans-serif;font-family:var(--info-font-family,PingFang SC,Helvetica Neue,Arial,sans-serif);line-height:14px;line-height:calc(var(--info-size, 16px) - var(--info-border-width, 1px)*2);background-color:#ee0a24;background-color:var(--info-background-color,#ee0a24);border:1px solid #fff;border:var(--info-border-width,1px) solid var(--white,#fff);border-radius:16px;border-radius:var(--info-size,16px)}.van-info--dot{min-width:0;border-radius:100%;width:8px;width:var(--info-dot-size,8px);height:8px;height:var(--info-dot-size,8px);background-color:#ee0a24;background-color:var(--info-dot-color,#ee0a24)}
+</style>
\ No newline at end of file
diff --git a/wxcomponents/vant/loading/index.vue b/wxcomponents/vant/loading/index.vue
new file mode 100644
index 0000000..c7051ff
--- /dev/null
+++ b/wxcomponents/vant/loading/index.vue
@@ -0,0 +1,51 @@
+<template>
+<uni-shadow-root class="vant-loading-index"><view :class="'custom-class van-loading '+(vertical ? 'van-loading--vertical' : '')">
+  <view :class="'van-loading__spinner van-loading__spinner--'+(type)" :style="'color: '+(color)+'; width: '+(sizeWithUnit)+'; height: '+(sizeWithUnit)">
+    <view v-for="(item,index) in ('item in 12')" :key="item.index" v-if="type === 'spinner'" class="van-loading__dot"></view>
+  </view>
+  <view class="van-loading__text" :style="'font-size: '+(textSizeWithUnit)+';'">
+    <slot></slot>
+  </view>
+</view></uni-shadow-root>
+</template>
+
+<script>
+
+global['__wxRoute'] = 'vant/loading/index'
+import { VantComponent } from '../common/component';
+import { addUnit } from '../common/utils';
+VantComponent({
+    props: {
+        color: String,
+        vertical: Boolean,
+        type: {
+            type: String,
+            value: 'circular'
+        },
+        size: {
+            type: String,
+            observer: 'setSizeWithUnit'
+        },
+        textSize: {
+            type: String,
+            observer: 'setTextSizeWithUnit'
+        }
+    },
+    methods: {
+        setSizeWithUnit(size) {
+            this.setData({
+                sizeWithUnit: addUnit(size)
+            });
+        },
+        setTextSizeWithUnit(size) {
+            this.set({
+                textSizeWithUnit: addUnit(size)
+            });
+        }
+    }
+});
+export default global['__wxComponents']['vant/loading/index']
+</script>
+<style platform="mp-weixin">
+@import '../common/index.css';.vant-loading-index{font-size:0;line-height:1}.van-loading{display:-webkit-inline-flex;display:inline-flex;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;color:#c8c9cc;color:var(--loading-spinner-color,#c8c9cc)}.van-loading__spinner{position:relative;box-sizing:border-box;width:30px;width:var(--loading-spinner-size,30px);max-width:100%;max-height:100%;height:30px;height:var(--loading-spinner-size,30px);-webkit-animation:van-rotate .8s linear infinite;animation:van-rotate .8s linear infinite;-webkit-animation:van-rotate var(--loading-spinner-animation-duration,.8s) linear infinite;animation:van-rotate var(--loading-spinner-animation-duration,.8s) linear infinite}.van-loading__spinner--spinner{-webkit-animation-timing-function:steps(12);animation-timing-function:steps(12)}.van-loading__spinner--circular{border:1px solid transparent;border-top-color:initial;border-radius:100%}.van-loading__text{margin-left:8px;margin-left:var(--padding-xs,8px);color:#969799;color:var(--loading-text-color,#969799);font-size:14px;font-size:var(--loading-text-font-size,14px);line-height:20px;line-height:var(--loading-text-line-height,20px)}.van-loading__text:empty{display:none}.van-loading--vertical{-webkit-flex-direction:column;flex-direction:column}.van-loading--vertical .van-loading__text{margin:8px 0 0;margin:var(--padding-xs,8px) 0 0}.van-loading__dot{position:absolute;top:0;left:0;width:100%;height:100%}.van-loading__dot:before{display:block;width:2px;height:25%;margin:0 auto;background-color:currentColor;border-radius:40%;content:" "}.van-loading__dot:first-of-type{-webkit-transform:rotate(30deg);transform:rotate(30deg);opacity:1}.van-loading__dot:nth-of-type(2){-webkit-transform:rotate(60deg);transform:rotate(60deg);opacity:.9375}.van-loading__dot:nth-of-type(3){-webkit-transform:rotate(90deg);transform:rotate(90deg);opacity:.875}.van-loading__dot:nth-of-type(4){-webkit-transform:rotate(120deg);transform:rotate(120deg);opacity:.8125}.van-loading__dot:nth-of-type(5){-webkit-transform:rotate(150deg);transform:rotate(150deg);opacity:.75}.van-loading__dot:nth-of-type(6){-webkit-transform:rotate(180deg);transform:rotate(180deg);opacity:.6875}.van-loading__dot:nth-of-type(7){-webkit-transform:rotate(210deg);transform:rotate(210deg);opacity:.625}.van-loading__dot:nth-of-type(8){-webkit-transform:rotate(240deg);transform:rotate(240deg);opacity:.5625}.van-loading__dot:nth-of-type(9){-webkit-transform:rotate(270deg);transform:rotate(270deg);opacity:.5}.van-loading__dot:nth-of-type(10){-webkit-transform:rotate(300deg);transform:rotate(300deg);opacity:.4375}.van-loading__dot:nth-of-type(11){-webkit-transform:rotate(330deg);transform:rotate(330deg);opacity:.375}.van-loading__dot:nth-of-type(12){-webkit-transform:rotate(1turn);transform:rotate(1turn);opacity:.3125}@-webkit-keyframes van-rotate{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes van-rotate{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}
+</style>
\ No newline at end of file