diff --git a/components/ShopLiveCard.vue b/components/ShopLiveCard.vue
index 697e319..a886766 100644
--- a/components/ShopLiveCard.vue
+++ b/components/ShopLiveCard.vue
@@ -39,7 +39,7 @@
 	HAS_LIVE = true
 	let livePlayer = null;
 	if (HAS_LIVE) {
-		livePlayer = requirePlugin('live-player-plugin');
+		// livePlayer = requirePlugin('live-player-plugin');
 	}
 	//  #endif
 	let timer = null;
diff --git a/config/index.js b/config/index.js
index 8e753ab..263d6a0 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,8 +1,8 @@
 // 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://139.186.134.205:9006/api'
 // export const VUE_APP_API_URL = 'http://192.168.0.114:8088/api'
-export const VUE_APP_API_URL = 'https://www.cyjyyjy.com/api'
+export const VUE_APP_API_URL = 'https://www.cyjyyjy.com:8096/api'
+// export const VUE_APP_API_URL = 'https://hm2a5x.39nat.com/api'
 //  export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://thapi.xinxintuan.co/api'
 //  export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
diff --git a/manifest.json b/manifest.json
index ca0cb31..873c549 100644
--- a/manifest.json
+++ b/manifest.json
@@ -135,7 +135,7 @@
     },
     "quickapp" : {},
     "mp-weixin" : {
-        "appid" : "wx030578b829a4a49a",
+        "appid" : "wx240613bb73760835",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,
@@ -147,13 +147,6 @@
             "scope.userLocation" : {
                 "desc" : "你的位置信息将用于小程序位置接口的效果展示"
             }
-        },
-        "plugins" : {
-            // #ifdef MP-WEIXIN
-            "live-player-plugin" : {
-                "version" : "1.2.8",
-                "provider" : "wx2b03c6e691cd7370"
-            }
         }
     },
     // #endif
diff --git a/pages.json b/pages.json
index bf17b76..3e8c84a 100644
--- a/pages.json
+++ b/pages.json
@@ -43,20 +43,20 @@
         "navigationBarTitleText": "禅易教育研究院"
       }
     },
-		{
-		  "path": "pages/diandeng/index",
-		  "style": {
-		    "navigationBarTitleText": "",
-				"navigationStyle": "custom"
-		  }
-		},
-		{
-		  "path": "pages/diandeng/lighting",
-		  "style": {
-		    "navigationBarTitleText": "",
-				"navigationStyle": "custom"
-		  }
-		},
+		// {
+		//   "path": "pages/diandeng/index",
+		//   "style": {
+		//     "navigationBarTitleText": "",
+		// 		"navigationStyle": "custom"
+		//   }
+		// },
+		// {
+		//   "path": "pages/diandeng/lighting",
+		//   "style": {
+		//     "navigationBarTitleText": "",
+		// 		"navigationStyle": "custom"
+		//   }
+		// },
 		{
 		  "path": "pages/course/index",
 		  "style": {
diff --git a/pages/course/detail.vue b/pages/course/detail.vue
index 3b242a8..c08ccd3 100644
--- a/pages/course/detail.vue
+++ b/pages/course/detail.vue
@@ -2,7 +2,9 @@
 	<view class="course-detail-index">
 		<view v-if="$store.getters.token || userInfo.uid">
 			<view class="swiper-box">
-				<view class="swiper-item"><image :src="item" mode="aspectFill" v-for="(item,index) in detail.imageArr"></image></view>
+				<view class="swiper-item">
+					<image :src="item" mode="aspectFill" v-for="(item,index) in detail.imageArr" :key="index"></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>
@@ -186,6 +188,7 @@
 <script>
 	// import WucTab from '@/components/wuc-tab/wuc-tab.vue';
 	import { mapState, mapGetters, mapMutations, mapActions } from 'vuex'
+	import dayjs from 'dayjs'
 	import { getUserInfo, bindingPhone, wxappBindingPhone } from '@/api/user'
 	import { getCourseDetail ,enterCourse } from '@/api/knowledge';
 	import Authorization from '@/pages/authorization/index'
@@ -226,12 +229,16 @@
 			} else{
 				this.courseId = this.$yroute.query.id;
 			}
-			if(this.userInfo.uid){
-				this.getDetail()
-				this.$nextTick(()=>{
-					this.getHeightArr()
-				})
-			}
+			this.getDetail()
+			this.$nextTick(()=>{
+				this.getHeightArr()
+			})
+			// if(this.userInfo.uid){
+			// 	this.getDetail()
+			// 	this.$nextTick(()=>{
+			// 		this.getHeightArr()
+			// 	})
+			// }
 		},
 		computed:{
 			userInfo(){
@@ -260,7 +267,8 @@
 			    })
 			      .then(res => {
 			        if(res.success){
-			        	thit.$store.dispatch('userInfo', true)
+								thit.$store.commit('login', res.data.token, dayjs(res.data.expires_time))
+								thit.$store.dispatch('userInfo', true)
 			        	uni.hideLoading()
 			        	uni.showToast({
 			        	  title: res.msg,
diff --git a/pages/home/components/Live.vue b/pages/home/components/Live.vue
index 14c70c1..cbef64e 100644
--- a/pages/home/components/Live.vue
+++ b/pages/home/components/Live.vue
@@ -28,7 +28,7 @@
 	HAS_LIVE = true
 	let livePlayer = null;
 	if (HAS_LIVE) {
-		livePlayer = requirePlugin('live-player-plugin');
+		// livePlayer = requirePlugin('live-player-plugin');
 	}
 	//  #endif
 	import {
diff --git a/pages/home/index.vue b/pages/home/index.vue
index cdf8769..28b7e76 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -158,7 +158,7 @@ import Banner from './components/Banner'
 import HotCommodity from './components/HotCommodity'
 import FirstNewProduct from './components/FirstNewProduct'
 import ProductsRecommended from './components/ProductsRecommended'
-import Live from './components/Live'
+// import Live from './components/Live'
 
 import { getHomeData, getShare, getCanvas } from '@/api/public'
 import cookie from '@/utils/store/cookie'
@@ -188,7 +188,7 @@ export default {
     HotCommodity,
     FirstNewProduct,
     ProductsRecommended,
-    Live,
+    // Live,
   },
   props: {},
   data: function() {
diff --git a/pages/knowledge/index.vue b/pages/knowledge/index.vue
index 6f584e0..c8550da 100644
--- a/pages/knowledge/index.vue
+++ b/pages/knowledge/index.vue
@@ -25,14 +25,14 @@
 			 </view>
 			 <view class="content-box">
 				 <view class="knowledge-list">
-					 <view class="knowledge-item acea-row" v-if="articleList.length > 0" v-for="item in articleList" @click="toDetail(item.id)">
+					 <view class="knowledge-item acea-row" v-if="articleList.length > 0" v-for="item in articleList" :key="item.id" @click="toDetail(item.id)">
 						 <view class="img-box">
 							 <image :src="item.imageInput" mode="aspectFill"></image>
 						 </view>
 						 <view class="knowledge-info-box acea-row row-column row-between">
 							<view style="width: 100%;">
-								<view class="title line1">{{item.title}}</view>
-								<view class="intro">{{item.synopsis}}</view>
+								<view class="title line2">{{item.title}}</view>
+								<view class="intro line1">{{item.synopsis}}</view>
 							</view>
 							<view class="type-box acea-row">
 								<view class="tip" :class="item.chargeType == 0 ? 'free-bg' : item.chargeType == 1 ? '' : 'jifen'">
@@ -116,9 +116,13 @@
 				this.currentTab = item
 				this.tabSelect = index
 				this.moveTo(index)
+				
 				if(item.categoryList.length > 0){
 					this.$set(this, 'active', item.categoryList[0].id)
+				} else{
+					this.$set(this, 'active', null)
 				}
+				console.log(item)
 				this.secondMenu = item.categoryList
 				this.getArticle()
 			},
diff --git a/pages/serviceTeacher/courseDetail.vue b/pages/serviceTeacher/courseDetail.vue
index a401faf..932826f 100644
--- a/pages/serviceTeacher/courseDetail.vue
+++ b/pages/serviceTeacher/courseDetail.vue
@@ -11,7 +11,9 @@
 				<view class="state-box default" v-if="detail.courseState == 3">已取消</view>
 				<view class="name">{{detail.courseName}}</view>
 			</view>
-			<view class="desc">{{detail.courseIntroduce}}</view>
+			<view class="desc">
+				<rich-text class="content" :nodes="detail.courseIntroduce"></rich-text>
+			</view>
 		</view>
 		<view class="course-active-box">
 			<view class="title-box acea-row row-middle">活动时间及地点</view>
@@ -135,7 +137,8 @@
 			getDetail(){
 				getCourseDetail(this.id).then(res=>{
 					if(res.success){
-						this.detail = res.data
+						this.detail = res.data;
+						res.data.courseIntroduce = res.data.courseIntroduce.replace(/\<img/g, "<img style='width: 100%;'")
 					}
 				})
 			},
diff --git a/pages/study/dabang.vue b/pages/study/dabang.vue
index c16d0bb..7407834 100644
--- a/pages/study/dabang.vue
+++ b/pages/study/dabang.vue
@@ -82,16 +82,15 @@
 				<view class="acea-row row-middle" style="width: 75%;">
 					<view class="rank-img" v-if="index == 0"><image src="../../static/num1.png" mode=""></image></view>
 					<view class="rank-img" v-if="index == 1"><image src="../../static/num2.png" mode=""></image></view>
-					<view class="rank-img" v-if="index == 2"><image src="../../static/num3.png" mode=""></image></view>
-					
+					<view class="rank-img" v-if="index == 2"><image src="../../static/num3.png" mode=""></image></view>	
 					<view class="ranking" v-if="index > 2">{{index+1}}</view>
-					
 					<view class="header-img"><image :src="item.headImg" mode=""></image></view>
 					<view class="name line1">{{item.realName}}</view>
 				</view>
 				<view class="acea-row row-column row-center-wrapper">
 					<view>完成打榜{{item.finishNum}}项</view>
-					<view class="jifen">{{item.integral}}积分</view>
+					<!-- <view class="jifen">{{item.integral}}积分</view> -->
+					<view class="jifen">累计打卡{{item.counts}}次</view>
 				</view>
 			</view>
 		</view>
diff --git a/pages/study/detail.vue b/pages/study/detail.vue
index 5167881..b246604 100644
--- a/pages/study/detail.vue
+++ b/pages/study/detail.vue
@@ -93,6 +93,7 @@
 	import { getStudyDetail , enterStudyList } from '@/api/knowledge';
 	import { mapState, mapGetters, mapMutations, mapActions } from 'vuex'
 	import { getUserInfo, bindingPhone, wxappBindingPhone } from '@/api/user'
+	import dayjs from 'dayjs'
 	export default {
 		computed: mapGetters(['userInfo']),
 		data() {
@@ -135,6 +136,7 @@
 			    })
 			      .then(res => {
 			        if(res.success){
+			        	thit.$store.commit('login', res.data.token, dayjs(res.data.expires_time))
 			        	thit.$store.dispatch('userInfo', true)
 			        	uni.hideLoading()
 			        	uni.showToast({
diff --git a/pages/user/PersonalData/index.vue b/pages/user/PersonalData/index.vue
index e751194..f07cb8a 100644
--- a/pages/user/PersonalData/index.vue
+++ b/pages/user/PersonalData/index.vue
@@ -285,6 +285,12 @@ export default {
 						setTimeout(()=>{
 							this.$yrouter.back();
 						},2000)
+					} else{
+						uni.showToast({
+						  title: res.msg,
+						  icon: "none",
+						  duration: 2000,
+						});
 					}
         },
         (err) => {
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index 617df35..b0a8b23 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -226,6 +226,7 @@ import cookie from '@/utils/store/cookie'
 import SwitchWindow from '@/components/SwitchWindow'
 import Authorization from '@/pages/authorization/index'
 import { signCourse } from '@/api/knowledge'
+import dayjs from 'dayjs'
 const NAME = 'User'
 
 export default {
@@ -371,6 +372,7 @@ export default {
     getPhoneNumber: function(e) {
       let thit = this
       // 判断一下这里是不是小程序 如果是小程序，走获取微信手机号进行绑定
+			console.log(e)
       if (e.mp.detail.errMsg == 'getPhoneNumber:ok') {
         uni.showLoading({
           title: '绑定中',
@@ -381,7 +383,9 @@ export default {
         })
           .then(res => {
             // this.User();
+						console.log(res.data)
 						if(res.success){
+							thit.$store.commit('login', res.data.token, dayjs(res.data.expires_time))
 							thit.$store.dispatch('userInfo', true)
 							uni.hideLoading()
 							uni.showToast({