From 6bfc95dd8e8418a621362975883cd44d3ec431dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=B1=AA?= <781521347@qq.com>
Date: Wed, 4 Aug 2021 10:00:31 +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

---
 App.vue                                     |  12 +-
 api/diandeng.js                             |  57 +++
 api/user.js                                 |  15 +-
 assets/css/base.less                        |  10 +-
 components/CitySelect.vue                   |   4 +-
 components/OrderGoods.vue                   |  14 +-
 config/index.js                             |   5 +-
 pages.json                                  |  29 +-
 pages/course/detail.vue                     |  87 ++--
 pages/course/index.vue                      |  32 +-
 pages/diandeng/index.vue                    | 534 ++++++++++++++++++++
 pages/diandeng/lighting.vue                 | 453 +++++++++++++++++
 pages/home/index.vue                        | 116 ++---
 pages/knowledge/detail.vue                  |   1 -
 pages/knowledge/index.vue                   |  25 +-
 pages/order/MyOrder/index.vue               | 131 ++++-
 pages/order/OrderDetails/index.vue          | 110 +++-
 pages/order/OrderSubmission/index.vue       |   3 +-
 pages/order/ReturnList/index.vue            |   6 +
 pages/serviceTeacher/index.vue              |  33 +-
 pages/serviceTeacher/setSelfData.vue        |   8 +-
 pages/shop/GoodsClass/index.vue             |   7 +-
 pages/shop/GoodsCon/index.vue               |   6 +-
 pages/study/dabang.vue                      |  14 +-
 pages/study/detail.vue                      |  43 +-
 pages/study/editDabang.vue                  |  20 +-
 pages/user/PersonalData/index.vue           | 161 +++++-
 pages/user/User/index.vue                   |  93 ++--
 pages/user/feedBack/index.vue               |   2 +-
 pages/user/myBangdan/index.vue              |  53 +-
 pages/user/myCourses/index.vue              |  39 +-
 pagesB/pages/user/signIn/Integral/index.vue | 353 +++++++++----
 static/course-icon1.png                     | Bin 511 -> 615 bytes
 static/course-icon2.png                     | Bin 825 -> 629 bytes
 static/course-icon3.png                     | Bin 562 -> 511 bytes
 static/course-icon4.png                     | Bin 642 -> 578 bytes
 static/glod.png                             | Bin 0 -> 12213 bytes
 static/jifen1.png                           | Bin 1632 -> 1996 bytes
 static/jifen2.png                           | Bin 1590 -> 1851 bytes
 static/jifen3.png                           | Bin 1594 -> 1623 bytes
 static/jifen4.png                           | Bin 1442 -> 0 bytes
 static/myorder-icon1.png                    | Bin 1575 -> 1007 bytes
 static/myorder-icon2.png                    | Bin 1627 -> 1311 bytes
 static/myorder-icon3.png                    | Bin 1645 -> 2453 bytes
 static/myorder-icon4.png                    | Bin 1396 -> 912 bytes
 static/myorder-icon5.png                    | Bin 1654 -> 1775 bytes
 static/tips.png                             | Bin 0 -> 662 bytes
 static/xyddImages/back.png                  | Bin 0 -> 228 bytes
 static/xyddImages/border2.png               | Bin 0 -> 1476 bytes
 static/xyddImages/btn-bg.png                | Bin 0 -> 2180 bytes
 static/xyddImages/light-bg.png              | Bin 0 -> 8166 bytes
 static/xyddImages/light-border.png          | Bin 0 -> 7751 bytes
 static/xyddImages/light-l.png               | Bin 0 -> 6596 bytes
 static/xyddImages/tabs-box-bg.png           | Bin 0 -> 2191 bytes
 54 files changed, 2097 insertions(+), 379 deletions(-)
 create mode 100644 api/diandeng.js
 create mode 100644 pages/diandeng/index.vue
 create mode 100644 pages/diandeng/lighting.vue
 create mode 100644 static/glod.png
 delete mode 100644 static/jifen4.png
 create mode 100644 static/tips.png
 create mode 100644 static/xyddImages/back.png
 create mode 100644 static/xyddImages/border2.png
 create mode 100644 static/xyddImages/btn-bg.png
 create mode 100644 static/xyddImages/light-bg.png
 create mode 100644 static/xyddImages/light-border.png
 create mode 100644 static/xyddImages/light-l.png
 create mode 100644 static/xyddImages/tabs-box-bg.png

diff --git a/App.vue b/App.vue
index b9bfc6e..cfb81bb 100644
--- a/App.vue
+++ b/App.vue
@@ -103,7 +103,17 @@ export default {
 		/* .wx-checkbox-input.wx-checkbox-input-checked {
 			border: none !important;
 		} */
-	
+	radio .wx-radio-input {
+		transform: scale(0.6);
+		border-radius: 50% !important;
+		/* color: #ffffff !important; */
+	}
+		
+	radio .wx-radio-input.wx-radio-input-checked {
+		color: #fff;
+		background: #FDBF68;
+		border-color: #FDBF68 !important;
+	}
 	/* #endif */
 
 </style>
diff --git a/api/diandeng.js b/api/diandeng.js
new file mode 100644
index 0000000..6802616
--- /dev/null
+++ b/api/diandeng.js
@@ -0,0 +1,57 @@
+import request from "@/utils/request";
+
+/**
+ * 获取祈福灯列表
+ */
+export function getLightList(data) {
+  return request.post("/BlessingLamp/listBlessingLamp", data);
+}
+
+/**
+ * 获取祈福灯广场
+ */
+export function blessingList(data) {
+  return request.get("/Blessing/blessingList?type="+data);
+}
+
+/**
+ * 获取我的祈福灯
+ */
+export function myBlessings(data) {
+  return request.get("/Blessing/myBlessings");
+}
+
+/**
+ * 为他人祈福
+ */
+export function blessingOthers(data) {
+  return request.post("/Blessing/blessingOthers",data);
+}
+
+/**
+ * 获取祈福灯详情
+ */
+export function blessingLampDetail(data) {
+  return request.get("/BlessingLamp/blessingLampDetail?id=" + data);
+}
+
+/**
+ * 点灯
+ */
+export function addBlessing(data) {
+  return request.post("/Blessing/addBlessing", data);
+}
+
+/**
+ * 万年历
+ */
+export function getWanniali(data) {
+  return request.get("/Wannianli/getWanniali?date", data);
+}
+
+/**
+ * 点灯开关
+ */
+export function getBlessingFlag(data) {
+  return request.get("/getBlessingFlag", data);
+}
\ No newline at end of file
diff --git a/api/user.js b/api/user.js
index b3119ab..885a438 100644
--- a/api/user.js
+++ b/api/user.js
@@ -447,4 +447,17 @@ export function getMyCourseList(q) {
  * */
 export function getStudyList(q) {
   return request.get('/StudyList/getStudyListByMemberId?type='+q)
-}
\ No newline at end of file
+}
+
+/*
+ * 获取签到状态
+ * */
+export function integral(q) {
+  return request.post('/user/integral')
+}
+/*
+ * 签到
+ * */
+export function signIntegral(q) {
+  return request.post('/sign/integral')
+}
diff --git a/assets/css/base.less b/assets/css/base.less
index a24722f..76017af 100644
--- a/assets/css/base.less
+++ b/assets/css/base.less
@@ -4,17 +4,17 @@
 */
 
 .font-color-red {
-  color: #E5270F !important;
+  color: #F99C10 !important;
 }
 .bg-color-red {
-  background-color: #E5270F !important;
+  background-color: #F99C10 !important;
 }
 .icon-color {
-  color: #E5270F;
+  color: #F99C10;
 }
 .cart-color {
-  color: #E5270F !important;
-  border: 1px solid #E5270F !important;
+  color: #F99C10 !important;
+  border: 1px solid #F99C10 !important;
 }
 /* padding20 */
 .padding20 {
diff --git a/components/CitySelect.vue b/components/CitySelect.vue
index 8d4e887..007458d 100644
--- a/components/CitySelect.vue
+++ b/components/CitySelect.vue
@@ -250,8 +250,8 @@ export default {
     text-overflow: ellipsis;
     max-width: 40%;
     &.active {
-      color: #f23030 !important;
-      border-bottom: 1rpx solid #f23030;
+      color: #F99C10 !important;
+      border-bottom: 1rpx solid #F99C10;
     }
   }
 }
diff --git a/components/OrderGoods.vue b/components/OrderGoods.vue
index b2f141a..3dbb08b 100644
--- a/components/OrderGoods.vue
+++ b/components/OrderGoods.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="orderGoods">
-    <view class="total">共{{ cartInfo.length }}件商品</view>
+    <!-- <view class="total">共{{ cartInfo.length }}件商品</view> -->
     <view class="goodWrapper">
       <view class="item acea-row-nowrap" v-for="cart in cartInfo" :key="cart.id">
         <view class="pictrue">
@@ -9,10 +9,13 @@
         <view class="text">
           <view class="acea-row row-between-wrapper">
             <view class="name line1">{{ cart.productInfo.storeName }}</view>
-            <view class="num">x {{ cart.cartNum }}</view>
+            
           </view>
-          <view class="attr line1" v-if="cart.productInfo.attrInfo">{{ cart.productInfo.attrInfo.sku }}</view>
-					<view class="money"><text class="sm-word">￥</text>{{ cart.productInfo.price }}<text class="sm-word">+{{ cart.productInfo.giveIntegral }}积分</text></view>
+					<view class="acea-row-nowrap row-middle">
+						<view class="attr" v-if="cart.productInfo.attrInfo">{{ cart.productInfo.attrInfo.sku }}</view>
+						<view class="num">x {{ cart.cartNum }}</view>
+					</view>
+					<view class="money"><text class="sm-word">￥</text>{{ cart.productInfo.price }}<text class="sm-word" v-if="cart.productInfo.giveIntegral > 0">+{{ cart.productInfo.giveIntegral }}积分</text></view>
           <!-- <view class="money font-color-red" v-if="isIntegral">{{ cart.costPrice }}积分</view>
           <view class="money" v-else><text class="sm-word">￥</text>{{ cart.truePrice }}</view> -->
           <view class="evaluate" v-if="evaluate == 3 && cart.isReply == 0" @click="routerGo(cart)">评价</view>
@@ -60,6 +63,8 @@ export default {
 					border-radius: 10rpx;
 				}
 				.attr{
+					width: auto;
+					margin-right: 12rpx;
 					color: #999;
 					font-size: 24rpx;
 					line-height: 34rpx;
@@ -77,6 +82,7 @@ export default {
 						font-size: 38rpx;
 						color: #E5270F;
 						font-weight: 500;
+						margin-top: 38rpx;
 					}
 					.sm-word{
 						font-size: 24rpx;
diff --git a/config/index.js b/config/index.js
index b14cf5c..397aa11 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,10 +1,11 @@
 // 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 = 'http://192.168.0.114: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'
 //  export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
 export const VUE_APP_RESOURCES_URL = 'https://h5.yixiang.co/static'
+   
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 42c5513..bf17b76 100644
--- a/pages.json
+++ b/pages.json
@@ -3,7 +3,7 @@
     {
       "path": "pages/Loading/index",
       "style": {
-        "navigationBarTitleText": "禪易精舍"
+        "navigationBarTitleText": "禅易教育研究院"
       }
     },
     {
@@ -40,13 +40,28 @@
     {
       "path": "pages/home/index",
       "style": {
-        "navigationBarTitleText": "禪易"
+        "navigationBarTitleText": "禅易教育研究院"
       }
     },
+		{
+		  "path": "pages/diandeng/index",
+		  "style": {
+		    "navigationBarTitleText": "",
+				"navigationStyle": "custom"
+		  }
+		},
+		{
+		  "path": "pages/diandeng/lighting",
+		  "style": {
+		    "navigationBarTitleText": "",
+				"navigationStyle": "custom"
+		  }
+		},
 		{
 		  "path": "pages/course/index",
 		  "style": {
-		    "navigationBarTitleText": "学习"
+		    "navigationBarTitleText": "课程",
+				"enablePullDownRefresh": true
 		  }
 		},
 		{
@@ -214,7 +229,7 @@
 		{
 		  "path": "pages/serviceTeacher/index",
 		  "style": {
-		    "navigationBarTitleText": "禪易"
+		    "navigationBarTitleText": "禅易教育研究院"
 		  }
 		},
 		{
@@ -604,13 +619,13 @@
         "pagePath": "pages/home/index",
         "iconPath": "static/tab1-d.png",
         "selectedIconPath": "static/tab1.png",
-        "text": "禪易"
-      },
+        "text": "首页"
+      }, 
 			{
 			  "pagePath": "pages/course/index",
 			  "iconPath": "static/tab2-d.png",
 			  "selectedIconPath": "static/tab2.png",
-			  "text": "学习"
+			  "text": "课程"
 			},
 			{
 			  "pagePath": "pages/knowledge/index",
diff --git a/pages/course/detail.vue b/pages/course/detail.vue
index 07c9ad2..3b242a8 100644
--- a/pages/course/detail.vue
+++ b/pages/course/detail.vue
@@ -2,11 +2,12 @@
 	<view class="course-detail-index">
 		<view v-if="$store.getters.token || userInfo.uid">
 			<view class="swiper-box">
-				<swiper :indicator-dots="true" :autoplay="true" :interval="3000" :duration="1000">
+				<view class="swiper-item"><image :src="item" mode="aspectFill" v-for="(item,index) in detail.imageArr"></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>
+				</swiper> -->
 			</view>
 			<view class="course-info-box">
 				<view class="course-title">{{detail.courseName}}</view>
@@ -33,7 +34,7 @@
 								<image :src="item.photoPath"></image>
 								<view class="name">{{item.name}}</view>
 								<view class="tip">禪易能量高级讲师</view>
-								<view class="desc">{{item.introduction}}</view>
+								<view class="desc" :class="item.introductionType == 0 ? 'left' : 'center'">{{item.introduction}}</view>
 							</view>
 						</scroll-view>
 					</view>
@@ -42,7 +43,8 @@
 							<view class="left-line"></view>
 							<span>课程简介</span>
 						</view>
-						<text class="desc">{{detail.courseIntroduce}}</text>
+						<!-- <text class="desc">{{detail.courseIntroduce}}</text> -->
+						<rich-text class="content" :nodes="detail.courseIntroduce"></rich-text>
 					</view>
 					<view class="course-desc-box content" id="content2">
 						<view class="title-box acea-row row-middle">
@@ -98,11 +100,12 @@
 									<view class="time">{{courseStartTime}}~{{courseEndTime}}</view>
 									<view class="address">{{item.coursePlace}}</view>
 									<view class="type-box acea-row row-between row-middle">
-										<view class="price">{{item.levelName}}</view>
+										<!-- <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 red">去报名</view>
+										<view class="signin-btn yellow">去报名</view>
 									</view>
 								</view>
 							</view>
@@ -122,14 +125,14 @@
 					<view class="btn-box acea-row row-between-wrapper" v-if="userInfo.phone != '' && teacherId != null && detail.haveSeller == 0 && detail.enterState == 0">
 						<view class="count-down">
 							<view>距离截止时间还剩</view>
-							<uni-countdown color="#EB5744" :day="day" :hour="hour" :minute="minute" :second="second" />
+							<uni-countdown color="#F99C10" :day="day" :hour="hour" :minute="minute" :second="second" />
 						</view>
 						<view class="signin-btn" @click="signInClick(2)">立即报名</view>
 					</view>
 					<view class="btn-box acea-row row-between-wrapper" v-if="userInfo.phone != '' && detail.haveSeller == 1 && detail.enterState == 0">
 						<view class="count-down">
 							<view>距离截止时间还剩</view>
-							<uni-countdown color="#EB5744" :day="day" :hour="hour" :minute="minute" :second="second" />
+							<uni-countdown color="#F99C10" :day="day" :hour="hour" :minute="minute" :second="second" />
 						</view>
 						<view class="signin-btn" @click="signInClick(2)">立即报名</view>
 					</view>
@@ -143,13 +146,13 @@
 					<!-- #ifdef MP-WEIXIN -->
 					<button open-type="getPhoneNumber" 
 					@getphonenumber="getPhoneNumber" v-if="userInfo.phone == '' && detail.haveSeller == 0 && detail.enterState == 0" class="binding signin-btn call-btn" v-else>
-					  <text>绑定手机号</text>
+					  <text>点击绑定手机号</text>
 					</button>
 					<!-- #endif -->
 					
 					<!-- #ifndef MP-WEIXIN -->
 					<button class="binding" @click="goBindPhone()"  v-if="userInfo.phone == '' && detail.haveSeller == 0">
-					  <text>绑定手机号</text>
+					  <text>点击绑定手机号</text>
 					</button>
 					<!-- #endif -->
 				</view>
@@ -256,14 +259,26 @@
 			      iv: e.mp.detail.iv,
 			    })
 			      .then(res => {
-			        // this.User();
-			        thit.$store.dispatch('userInfo', true)
-			        uni.hideLoading()
-			        uni.showToast({
-			          title: res.msg,
-			          icon: 'success',
-			          duration: 2000,
-			        })
+			        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()
@@ -301,8 +316,8 @@
 				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
-					console.log(this.detail,'this.detail')
 					let t = res.data.signEndTime.replace(/-/g, '/');
 					let endTime = Date.parse(new Date(t))/1000
 					this.times = endTime - nowTime;
@@ -511,6 +526,14 @@
 	.swiper-box{
 		width: 100%;
 		height: 340rpx;
+		.swiper-item{
+			width: 100%;
+			height: 100%;
+			image{
+				width: 100%;
+				height: 100%;
+			}
+		}
 		swiper{
 			height: 100%;
 			.swiper-item{
@@ -574,7 +597,7 @@
 		.tab-item-active{
 			font-size: 32rpx;
 			font-weight: bold;
-			border-bottom: 4rpx solid #EB5744;
+			border-bottom: 4rpx solid #F99C10;
 		}
 	}
 	.fixed{
@@ -631,6 +654,12 @@
 				width: 100%;
 				white-space: pre-wrap;
 			}
+			.left{
+				text-align: left;
+			}
+			.center{
+				text-align: center;
+			}
 		}
 		.title-box{
 			font-size: 36rpx;
@@ -641,7 +670,7 @@
 			.left-line{
 				width: 6rpx;
 				height: 32rpx;
-				background-color: #EB5744;
+				background-color: #F99C10;
 				margin-right: 16rpx;
 			}
 		}
@@ -673,14 +702,14 @@
 		.recommend-box{
 			.title-box{
 				font-size: 32rpx;
-				color: #EB5744;
+				color: #F99C10;
 				.title{
 					margin: 0 10rpx;
 				}
 				.row-line{
 					width: 36rpx;
 					height: 2rpx;
-					border: 2rpx solid #EB5744;
+					border: 2rpx solid #F99C10;
 				}
 			}
 			.knowledge-list {
@@ -721,10 +750,10 @@
 						.type-box {
 							font-size: 24rpx;
 							color: #999;
-							margin-top: 28rpx;
+							margin-top: 20rpx;
 							.price{
 								font-size: 28rpx;
-								color: #EA533E;
+								color: #F99C10;
 								font-weight: 500;
 							}
 							.signin-btn{
@@ -766,7 +795,7 @@
 		left: 0;
 		.price{
 			font-size: 44rpx;
-			color: #EA533E;
+			color: #F99C10;
 		}
 		.fz24{
 			font-size: 24rpx;
@@ -778,7 +807,7 @@
 				width: 410rpx;
 				height: 80rpx;
 				border-radius: 44px;
-				border: 2rpx solid #EB5744;
+				border: 2rpx solid #F99C10;
 				box-sizing: border-box;
 				overflow: hidden;
 				.count-down{
@@ -788,7 +817,7 @@
 					color: #999;
 				}
 				.colR{
-					color: #EB5744;
+					color: #F99C10;
 				}
 				.signin-btn{
 					width: 178rpx;
@@ -796,7 +825,7 @@
 					line-height: 84rpx;
 					font-size: 32rpx;
 					color: #fff;
-					background: #EB5744;
+					background: #F99C10;
 				}
 			}
 			.call-btn{
diff --git a/pages/course/index.vue b/pages/course/index.vue
index 4f7a8f4..8cf1774 100644
--- a/pages/course/index.vue
+++ b/pages/course/index.vue
@@ -28,7 +28,7 @@
 				</SecondMenu>
 			</view>
 			<view class="bangdan-box" v-if="studyList.length > 0">
-			<view class="active-word">学习榜</view>
+			<view class="active-word">打卡榜</view>
 				<view class="bangdan-list">
 					<scroll-view class="scroll-view_H" scroll-x="true"  v-if="studyList.length > 0">
 						<view class="bangdan-item" 
@@ -61,9 +61,10 @@
 						<view class="address">{{item.coursePlace}}</view>
 						<view class="type-box acea-row row-between row-middle">
 							<!-- <view class="price">￥{{item.courseCharge}}</view> -->
-							<view class="price">{{item.levelName}}</view>
+							<!-- <view class="price">{{item.levelName}}</view> -->
+							<view></view>
 							<!-- <view class="price colG" v-if="item.chargeType == 0">免费</view> -->
-							<view class="signin-btn red">去报名</view>
+							<view class="signin-btn yellow">去报名</view>
 						</view>
 					</view>
 				</view>
@@ -192,7 +193,6 @@
 			},
 			getCourses() {
 				var cid = null;
-				console.log(this.currentTab)
 				this.active == null ? cid = this.currentTab.id : cid = this.active
 				getCourses({categoryId: cid,listState:0,uid:this.userInfo.uid}).then((res) => {
 					if (res.success) {
@@ -236,6 +236,24 @@
 				this.categoryTitle = item.categoryName;
 				this.getStudyList()
 				this.getCourses()
+			},
+			onPullDownRefresh() {
+				getCategory().then((res) => {
+					this.tabList = res.data
+					this.$set(this, 'secondMenu', res.data[0].categoryList)
+					this.$set(this, 'currentTab', res.data[0])
+					this.categoryTitle = res.data[0].categoryName;
+					if (res.data[0].categoryList.length > 0) {
+						this.$set(this, 'active', res.data[0].categoryList[0].id)
+						this.categoryTitle = this.categoryTitle +'·'+res.data[0].categoryList[0].categoryName
+					} else{
+						// this.$set(this, 'tabSelect', 0)
+						// this.scrollLeft = 0
+					}
+				}).then(() => {
+					this.getStudyList()
+					this.getCourses()
+				})
 			}
 		}
 	}
@@ -287,8 +305,8 @@
 				color: #999999;
 			}
 			.tab-item-active{
-				color: #EA533E;
-				border-bottom: 2px solid #EA533E;
+				color: #F99C10;
+				border-bottom: 2px solid #F99C10;
 				font-weight: bold;
 			}
 		}
@@ -408,7 +426,7 @@
 				.type-box {
 					font-size: 24rpx;
 					color: #999;
-					margin-top: 28rpx;
+					margin-top: 20rpx;
 					.price{
 						font-size: 28rpx;
 						color: #EA533E;
diff --git a/pages/diandeng/index.vue b/pages/diandeng/index.vue
new file mode 100644
index 0000000..c2e0db9
--- /dev/null
+++ b/pages/diandeng/index.vue
@@ -0,0 +1,534 @@
+<template>
+	<view class="container" id="container">
+		<view class="back-btn" :style="{top:CustomBar + 'rpx'}" @click="backPrevPage()">
+			<image src="../../static/xyddImages/back.png" mode=""></image>
+		</view>
+		<view class="float-light"><image src="https://qiniu.upload.gznl.top/d4bd8c56-2c69-4f1d-b664-8c2cb476f17c.png"></view>
+		<view class="float-light float-light2"><image src="https://qiniu.upload.gznl.top/d4bd8c56-2c69-4f1d-b664-8c2cb476f17c.png"></view>
+		<view class="float-light float-light3"><image src="https://qiniu.upload.gznl.top/d4bd8c56-2c69-4f1d-b664-8c2cb476f17c.png"></view>
+		<view class="tabs-box acea-row row-middle row-center">
+			<view class="tab-item" :class="current == 0 ? 'active' : ''" @click="tabClick(0)">点灯祈福</view>
+			<view class="col-line"></view>
+			<view class="tab-item" :class="current == 1 ? 'active' : ''" @click="tabClick(1)">祈福灯广场</view>
+			<view class="col-line"></view>
+			<view class="tab-item" :class="current == 2 ? 'active' : ''" @click="tabClick(2)">我的祈福灯</view>
+		</view>
+		<!-- 点灯祈福 -->
+		<view class="content-box content1-box" v-if="current == 0">
+			<view class="content1-top-box acea-row row-center-wrapper">
+				<view class="top-box-content">
+					<view class="acea-row-nowrap">
+						<view class="light-box">
+							<view class="light-l-box">
+								<image :src="topLight[0].lampPic" alt="">
+								<text>{{topLight[0].lampName}}</text>
+							</view>
+						</view>
+						<view class="light-desc-box">
+							<view class="light-name">{{topLight[0].lampName}}</view>
+							<!-- <view class="current-year">{{topLight[0].lampIntroduce}}</view> -->
+							<view class="light-desc">{{topLight[0].lampIntroduce}}</view>
+						</view>
+					</view>
+					<view class="btn-box" @click="toLighting(topLight[0].id)">我要点灯</view>
+				</view>
+				<view class="right-image"><image src="https://qiniu.upload.gznl.top/3a51ab9e-3b02-4dca-aec3-7c7f00a2b6cb.png" ></view>
+				<view class="cloud1"><image src="https://qiniu.upload.gznl.top/e5277b85-8a22-4448-931b-b0f0540b1dd7.png" ></view>
+				<view class="cloud2"><image src="https://qiniu.upload.gznl.top/f442f228-c6e8-4491-a8cf-feff34be6f61.png" ></view>
+			</view>
+			<view class="light-list-box acea-row row-between">
+				<view class="light-item" v-for="(item,index) in lightList" :key="item.id">
+					<view class="light-name">{{item.lampName}}</view>
+					<view class="light-box"><image :src="item.lampPic" ></view>
+					<view class="btn" @click="toLighting(item.id)"><image src="../../static/xyddImages/btn-bg.png" alt=""></view>
+				</view>
+			</view>
+		</view>
+		<!-- 祈福灯广场 -->
+		<view class="content-box content2-box" v-if="current == 1">
+			<view class="content2-top-box">
+				<view class="right-image"><image src="https://qiniu.upload.gznl.top/3a51ab9e-3b02-4dca-aec3-7c7f00a2b6cb.png" ></view>
+				<view class="cloud2"><image src="https://qiniu.upload.gznl.top/f442f228-c6e8-4491-a8cf-feff34be6f61.png" ></view>
+				<view class="title-box"><image src="https://qiniu.upload.gznl.top/09668a77-149a-4e88-be8b-5d3edff449a6.png" alt=""></view>
+				<view class="content2-tabs-box acea-row row-between">
+					<view class="content2-tab-item" :class="active == 1 ? 'content2-tab-item-active' : ''" @click="tab2Click(1)">最新祈福灯</view>
+					<view class="content2-tab-item" :class="active == 2 ? 'content2-tab-item-active' : ''" @click="tab2Click(2)">本周最亮祈福灯</view>
+					<view class="content2-tab-item" :class="active == 3 ? 'content2-tab-item-active' : ''" @click="tab2Click(3)">最亮祈福灯</view>
+				</view>
+				<view class="lightUp-list">
+					<view class="lightUp-item acea-row row-middle" v-for="(item,index) in lightingList" :key="item.id">
+						<view class="light-l-box">
+							<image :src="item.lampPhoto" alt="">
+							<text>{{item.blessingLampName}}</text>
+						</view>
+						<view class="userInfo-box">
+							<view class="user-name red">{{item.blessingPersonRealname}}</view>
+							<view class="word line2">{{item.blessingContent}}</view>
+							<view class="word2">已有<text class="red">{{item.beBlessedTimes}}</text>人为Ta祈福</view>
+						</view>
+						<view class="btn-box" 
+						:class="!item.isVote ? '' : 'default'" 
+						@click="blessingOthers(item)">{{item.isVote ? '已祈福' : '为他祈福'}}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 我的祈福灯 -->
+		<view class="content-box content2-box" v-if="current == 2">
+			<view class="content2-top-box">
+				<view class="right-image"><image src="https://qiniu.upload.gznl.top/3a51ab9e-3b02-4dca-aec3-7c7f00a2b6cb.png" ></view>
+				<view class="cloud2"><image src="https://qiniu.upload.gznl.top/f442f228-c6e8-4491-a8cf-feff34be6f61.png" ></view>
+				<view class="title-box"><image src="https://qiniu.upload.gznl.top/35dc97c2-5b89-4248-8b78-728fb384d70f.png" alt=""></view>
+				<view class="lightUp-list">
+					<view class="lightUp-item acea-row row-middle" v-for="(item,index) in lightingList" :key="item.id">
+						<view class="light-l-box">
+							<image :src="item.lampPhoto" alt="">
+							<text>{{item.blessingLampName}}</text>
+						</view>
+						<view class="userInfo-box">
+							<view class="user-name red">{{item.blessingPersonRealname}}</view>
+							<view class="word line2">{{item.blessingContent}}</view>
+							<view class="word2">已有<text class="red">{{item.beBlessedTimes}}</text>人为Ta祈福</view>
+						</view>
+						<view class="btn-box">已亮{{item.lightedDays}}天</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { getLightList, blessingList, myBlessings, blessingOthers } from '@/api/diandeng.js'
+	export default{
+		data(){
+			return {
+				current: 0,
+				active: 1,
+				CustomBar: this.CustomBar,
+				lightList: [],
+				topLight:null,
+				lightingList:[],
+				
+			}
+		},
+		onLoad(){
+			uni.showLoading({
+				title:'正在加载中...'
+			})
+			this.getLightList();
+		},
+		mounted(){
+			console.log(this.CustomBar);
+		},
+		methods: {
+			getLightList(){
+				getLightList().then((res)=>{
+					if(res.success){
+						this.lightList = res.data
+						this.topLight = res.data.filter((item)=>{
+							return item.isTop == 1
+						})
+					}
+					uni.hideLoading()
+				})
+			},
+			tabClick(idx){
+				this.current = idx;
+				if(idx == 1){
+					this.getLihtingList()
+				} else if(idx == 2){
+					this.getMyLihtingList()
+				}
+			},
+			//获取我的祈福灯
+			getMyLihtingList(){
+				myBlessings().then((res)=>{
+					if(res.success){
+						this.lightingList = res.data
+					}
+				})
+			},
+			//获取祈福灯广场
+			getLihtingList(){
+				blessingList(this.active).then((res)=>{
+					if(res.success){
+						this.lightingList = res.data
+					}
+				})
+			},
+			tab2Click(idx){
+				this.active = idx;
+				this.getLihtingList(idx)
+			},
+			blessingOthers(item){
+				let that = this;
+				if(item.isVote){
+					uni.showToast({
+						title: '已为他祈福过了！',
+						icon: 'none'
+					})
+					return 
+				}
+				uni.showModal({
+				    title: '提示',
+				    content: '是否确认为Ta祈福？',
+				    success: function (res) {
+							if (res.confirm) {
+								blessingOthers({blessingId:item.id}).then((res)=>{
+									if(res.success){
+										uni.showToast({
+											title: '祈福成功！'
+										})
+										that.getLihtingList(that.active)
+									}
+								})
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+				    }
+				});
+				
+			},
+			
+			backPrevPage(){
+				this.$yrouter.switchTab("/pages/home/index");
+			},
+			toLighting(i){
+				this.$yrouter.push({
+				  path: '/pages/diandeng/lighting',
+				  query: {
+						id: i
+				  },
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="less">
+	image{
+		width: 100%;
+		height: 100%;
+	}
+	@font-face {
+		font-family: mFont;
+		src: url('https://www.cyjyyjy.com:8081/static/PangMenZhengDaoCuShuTi-2.ttf');
+	}
+	.back-btn{
+		width: 72rpx;
+		height: 72rpx;
+		position: fixed;
+		left: 40rpx;
+		text-align: center;
+		line-height: 72rpx;
+		z-index: 99;
+		image{
+			width: 36rpx;
+			height: 36rpx;
+		}
+	}
+	.container{
+		width: 100%;
+		height: 2600rpx;
+		overflow: hidden;
+		background: url(https://qiniu.upload.gznl.top/c3478068-dcaf-4a09-86e8-f018700edd3d.png) no-repeat center;
+		background-size: 100% 100%;
+		padding-top: 360rpx;
+		position: relative;
+	}
+	.float-light{
+		width: 70rpx;
+		height: 154rpx;
+		position: absolute;
+		animation: lightMove 15s ease-in;
+		animation-iteration-count: infinite;
+		opacity: 0.4;
+	}
+	.float-light2{
+		animation: lightMove2 25s ease-in;
+		animation-iteration-count: infinite;
+	}
+	.float-light3{
+		animation: lightMove3 20s ease-in;
+		animation-iteration-count: infinite;
+	}
+	@keyframes lightMove{
+		0%{
+			bottom: -100rpx;
+			left: 0rpx;
+		}
+		100%{
+			bottom: 100%;
+			left: 500rpx;
+		}
+	}
+	@keyframes lightMove2{
+		0%{
+			bottom: -200rpx;
+			left: 300rpx;
+		}
+		100%{
+			bottom: 100%;
+			left: 240rpx;
+		}
+	}
+	@keyframes lightMove3{
+		0%{
+			bottom: -200rpx;
+			left: 600rpx;
+		}
+		100%{
+			bottom: 100%;
+			left: 0rpx;
+		}
+	}
+	.tabs-box{
+		width: 685rpx;
+		height: 95rpx;
+		background: url(../../static/xyddImages/tabs-box-bg.png) no-repeat center;
+		background-size: 100% 100%;
+		margin: 0 auto;
+		font-size: 32rpx;
+		color: #CECECE;
+	}
+	.tabs-box .active{
+		font-size: 32rpx;
+		color: #F7D08E;
+	}
+	.col-line{
+		width: 1rpx;
+		height: 28rpx;
+		background: #F7D08E;
+		margin: 0 16rpx;
+	}
+	.content1-box .content1-top-box{
+		width: 685rpx;
+		height: 350rpx;
+		border: 2rpx solid #F7D08E;
+		border-radius: 8rpx;
+		margin: 36rpx auto 0; 
+		position: relative;
+	}
+	.content1-box .content1-top-box .top-box-content{
+		width: 534rpx;
+		height: 314rpx;
+		background: #FFDA9B;
+		border: 2rpx solid #F7D08E;
+		border-radius: 12rpx;
+		box-sizing: border-box;
+		padding: 20rpx 22rpx 12rpx 34rpx;
+		font-size: 28rpx;
+		color: #FFDCAB;
+		position: relative;
+	}
+	.light-l-box{
+		width: 112rpx;
+		height: 244rpx;
+		background: url(../../static/xyddImages/light-bg.png) no-repeat center;
+		background-size: 100% 100%;
+		font-family: mFont;
+		box-sizing: border-box;
+		padding-top: 48rpx;
+		text-align: center;
+	}
+	.light-l-box image{
+		width: 72rpx;
+		height: 74rpx;
+		display: block;
+		margin: 0 auto;
+	}
+	.light-desc-box{
+		margin-left: 28rpx;
+		font-family: mFont;
+	}
+	.light-desc-box .light-name{
+		font-size: 36rpx;
+		line-height: 50rpx;
+		color: #FF322D;
+	}
+	.current-year{
+		font-size: 28rpx;
+		color: #FF9C10;
+		margin: 6rpx 0 12rpx;
+		line-height: 28rpx;
+	}
+	.light-desc{
+	  font-size: 30rpx;
+		line-height: 28rpx;
+		color: #FF9C10;
+	}
+	.top-box-content .btn-box{
+		width: 232rpx;
+		height: 48rpx;
+		background: linear-gradient(180deg, #FFD190 0%, #E88739 100%);
+		border-radius: 4rpx;
+		text-align: center;
+		line-height: 48rpx;
+		color: #fff;
+		font-size: 28rpx;
+		position: absolute;
+		bottom: 10px;
+		left: 50%;
+		margin-left: -122rpx;
+		z-index: 10;
+	}
+	.right-image{
+		width: 234rpx;
+		height: 200rpx;
+		position: absolute;
+		top: -70rpx;
+		right: -30rpx;
+	}
+	.cloud1{
+		width: 212rpx;
+		height: 212rpx;
+		position: absolute;
+		top: 140rpx;
+		right: -30rpx;
+	}
+	.cloud2{
+		width: 422rpx;
+		height: 212rpx;
+		position: absolute;
+		bottom: -60rpx;
+		left: -40rpx;
+	}
+	.light-list-box{
+		width: 100%;
+		box-sizing: border-box;
+		padding: 0 32rpx;
+		margin-top: 30rpx;
+	}
+	.light-item{
+		width: 202rpx;
+		height: 228rpx;
+		background: url(../../static/xyddImages/light-border.png) no-repeat center;
+		background-size: 100% 100%;
+		position: relative;
+		font-family: mFont;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		margin-bottom: 46rpx;
+	}
+	.light-item .light-name{
+		position: absolute;
+		left: 12rpx;
+		top: 16rpx;
+		font-size: 28rpx;
+		color: #F7D08E;
+		writing-mode:tb-rl;
+	}
+	.light-item .light-box{
+		width: 144rpx;
+		height: 156rpx;
+	}
+	.light-item .btn{
+		width: 102rpx;
+		height: 34rpx;
+	}
+	
+	.content2-top-box{
+		width: 685rpx;
+		min-height: 900rpx;
+		background: #FFDA9B;
+		border: 2rpx solid #F7D08E;
+		border-radius: 12rpx;
+		position: relative;
+		margin: 50rpx auto 0;
+	}
+	.content2-top-box .right-image{
+		position: absolute;
+		left: -60rpx;
+		top: -100rpx;
+		transform: rotateY(180deg) scale(0.9);
+	} 
+	.content2-top-box .cloud2{
+		
+	}
+	.content2-top-box .title-box{
+		width: 466rpx;
+		height: 104rpx;
+		margin: 20rpx auto;
+	}
+	.content2-tabs-box{
+		font-size: 24rpx;
+		color: #B5B5B5;
+		padding: 0 28rpx;
+		box-sizing: border-box;
+	}
+	.content2-tab-item-active{
+		border-bottom: 6rpx solid #F3B153;
+		color: #000;
+	}
+	.lightUp-list{
+		height: 800rpx;
+		padding: 0 28rpx;
+		overflow-y: scroll;
+		box-sizing: border-box;
+		margin-top: 24rpx;
+	}
+	.lightUp-list .lightUp-item{
+		width: 632rpx;
+		height: 218rpx;
+		background: #FFE7BC;
+		border-radius: 8rpx;
+		font-size: 24rpx;
+		margin-bottom: 32rpx;
+	}
+	.lightUp-item .light-l-box{
+		color: #FFDCAB;
+		margin-left: 52rpx;
+		margin-right: 36rpx;
+	}
+	.lightUp-item .light-l-box{
+		width: 100rpx;
+		height: 200rpx;
+		padding-top: 32rpx;
+	}
+	.lightUp-item .light-l-box image{
+		width: 68rpx;
+		height: 70rpx;
+	}
+	.userInfo-box{
+		width: 286rpx;
+		font-size: 24rpx;
+		color: #292929;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		justify-content: flex-start;
+	}
+	.userInfo-box .red{
+		color: #F53F3F;
+	}
+	.user-name{
+		margin-top: 30rpx;
+	}
+	.word{
+		margin-top: 32rpx;
+		margin-bottom: 8rpx;
+		line-height: 34rpx;
+	}
+	.lightUp-list .btn-box{
+		margin-left: 0;
+	}
+	.btn-box{
+		width: 148rpx;
+		height: 59rpx;
+		background: linear-gradient(180deg, #F7D08E 0%, #ECBE71 100%);
+		border-radius: 12rpx;
+		text-align: center;
+		line-height: 59rpx;
+		font-size: 24rpx;
+		color: #fff;
+		margin-left: 74rpx;
+		margin-top: 50rpx;
+	}
+	.default{
+		background: #999;
+	}
+		
+</style>
diff --git a/pages/diandeng/lighting.vue b/pages/diandeng/lighting.vue
new file mode 100644
index 0000000..cba555b
--- /dev/null
+++ b/pages/diandeng/lighting.vue
@@ -0,0 +1,453 @@
+<template>
+	<view class="container" id="container">
+		<view class="back-btn" :style="{top:CustomBar + 'rpx'}" @click="backPrevPage()">
+			<image src="../../static/xyddImages/back.png" mode=""></image>
+		</view>
+		<view class="float-light"><image src="https://qiniu.upload.gznl.top/d4bd8c56-2c69-4f1d-b664-8c2cb476f17c.png"></view>
+		<view class="float-light float-light2"><image src="https://qiniu.upload.gznl.top/d4bd8c56-2c69-4f1d-b664-8c2cb476f17c.png"></view>
+		<view class="float-light float-light3"><image src="https://qiniu.upload.gznl.top/d4bd8c56-2c69-4f1d-b664-8c2cb476f17c.png"></view>
+		<!-- 点灯祈福 -->
+		<view class="content-box content1-box">
+			<view class="content1-top-box acea-row row-center-wrapper">
+				<view class="right-image"><image src="https://qiniu.upload.gznl.top/3a51ab9e-3b02-4dca-aec3-7c7f00a2b6cb.png" ></view>
+				<view class="form-box">
+					<form action="" method="post">
+						<view class="input-box">
+							<text class="label-box">您的姓名</text>
+							<input type="text" placeholder="请输入姓名" v-model="form.blessingPersonRealname"/>
+						</view>
+						<view class="input-box">
+							<text class="label-box">出生日期</text>
+							<picker mode="date" :value="form.blessingPersonBirth" :start="startDate" :end="endDate" @change="bindDateChange">
+									<view class="input">{{form.blessingPersonBirth}}</view>
+							</picker>
+						</view>
+						<view class="input-box noBorder">
+							<text class="label-box">您的愿望</text>
+							<textarea type="text" placeholder="请输入心中愿望（140字以内）" v-model="form.blessingContent" maxlength="140"></textarea>
+						</view>
+					</form>
+				</view>
+			</view>
+			<view class="radio-box acea-row row-middle">
+				<text>在祈福灯广场显示：</text>
+				<radio-group  @change="radioChange" class="acea-row row-middle">
+					<label class="radio acea-row row-middle">
+						<radio value="1" :checked="form.isShow == 1" /><text>显示</text>
+					</label>
+					<label class="radio acea-row row-middle">
+						<radio value="0" :checked="form.isShow == 0" /><text>不显示</text>
+					</label>
+				</radio-group>
+			</view>
+			<view class="submit-btn" @click="lightingHandler">我要点灯</view>
+		</view>
+		<!-- 我的祈福灯 -->
+		<view class="content-box content2-box">
+			<view class="content2-top-box">
+				<view class="tips-box">温馨提示：{{lightDetail.lampName}}祈福扣除{{lightDetail.lampPrice}}积分</view>
+				<view class="cloud2"><image src="https://qiniu.upload.gznl.top/f442f228-c6e8-4491-a8cf-feff34be6f61.png" ></view>
+				<view class="top-box-content">
+					<view class="acea-row-nowrap">
+						<view class="light-box">
+							<view class="light-l-box">
+								<image :src="lightDetail.lampPic" alt="">
+								<text>{{lightDetail.lampName}}</text>
+							</view>
+						</view>
+						<view class="light-desc-box">
+							<view class="light-name">{{lightDetail.lampName}}介绍</view>
+							<view class="light-desc">{{lightDetail.lampDetail}}</view>
+						</view>
+					</view>
+					<view class="effect-box mt50">
+						<view class="light-name">时效</view>
+						<view class="words">{{lightDetail.lightDays}}天</view>
+					</view>
+					<view class="effect-box">
+						<view class="light-name">适用对象：</view>
+						<view class="words">对2021年有着美好期待的人，所有祈求好运的人。</view>
+					</view>
+					<view class="effect-box">
+						<view class="light-name">祈福提示：</view>
+						<view class="words">祈福点灯后，在点灯期限内您的许愿灯将会一直长明在“我的祈福灯”您可以随时查看，如果您选择公开展示您的祈福灯，则祈福灯会同时出现在“祈福广场”中，与其它朋友的祈福灯一直常明。</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { addBlessing, blessingLampDetail } from '@/api/diandeng.js'
+	export default{
+		data(){
+			return {
+				id:null,
+				form:{
+					blessingPersonRealname:'',
+					blessingPersonBirth:'2021-7-20',
+					blessingContent:'',
+					isShow: 1
+				},
+				CustomBar: this.CustomBar,
+				lightDetail:{}
+				
+			}
+		},
+		onLoad(){
+			this.id = this.$yroute.query.id;
+			this.blessingLampDetail();
+		},
+		mounted(){
+			
+		},
+		methods: {
+			blessingLampDetail(){
+				blessingLampDetail(this.id).then(res=>{
+					if(res.success){
+						this.lightDetail = res.data
+					}
+				})
+			},
+			bindDateChange: function(e) {
+				this.form.blessingPersonBirth = e.target.value;
+			},
+			lightingHandler(){
+				var that = this;
+				this.form.blessingLampId = this.id;
+				if(that.form.blessingPersonRealname == ''){
+					uni.showToast({
+						title: '请填写姓名！',
+						icon: 'none'
+					})
+					return 
+				}
+				if(that.form.blessingContent == ''){
+					uni.showToast({
+						title: '请填写您的愿望！',
+						icon: 'none'
+					})
+					return 
+				}
+				uni.showModal({
+				    title: '提示',
+				    content: '是否确认点灯？',
+				    success: function (res) {
+							if (res.confirm) {
+								addBlessing(that.form).then((res)=>{
+									if(res.success){
+										uni.showToast({
+											title: '操作成功！',
+											duration:1500
+										})
+										setTimeout(()=>{
+											uni.navigateBack({
+												delta:1
+											})
+										},1500)
+									} else{
+										uni.showToast({
+											title: res.msg,
+											icon: 'none',
+											duration:1500
+										})
+									}
+								})
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+				    }
+				});
+			},
+			radioChange(e){
+				// console.log(e)
+				this.form.isShow = e.detail.value
+			},
+			backPrevPage(){
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="less">
+	image{
+		width: 100%;
+		height: 100%;
+	}
+	@font-face {
+		font-family: mFont;
+		src: url('https://www.cyjyyjy.com:8081/static/PangMenZhengDaoCuShuTi-2.ttf');
+	}
+	.back-btn{
+		width: 72rpx;
+		height: 72rpx;
+		position: fixed;
+		z-index: 99;
+		left: 40rpx;
+		text-align: center;
+		line-height: 72rpx;
+		z-index: 99;
+		image{
+			width: 36rpx;
+			height: 36rpx;
+		}
+	}
+	
+	.container{
+		width: 100%;
+		height: 2600rpx;
+		overflow: hidden;
+		background: url(https://qiniu.upload.gznl.top/c3478068-dcaf-4a09-86e8-f018700edd3d.png) no-repeat center;
+		background-size: 100% 100%;
+		padding-top: 360rpx;
+		position: relative;
+	}
+	.float-light{
+		width: 70rpx;
+		height: 154rpx;
+		position: absolute;
+		animation: lightMove 15s ease-in;
+		animation-iteration-count: infinite;
+		opacity: 0.4;
+	}
+	.float-light2{
+		animation: lightMove2 25s ease-in;
+		animation-iteration-count: infinite;
+	}
+	.float-light3{
+		animation: lightMove3 20s ease-in;
+		animation-iteration-count: infinite;
+	}
+	@keyframes lightMove{
+		0%{
+			bottom: -100rpx;
+			left: 0rpx;
+		}
+		100%{
+			bottom: 100%;
+			left: 500rpx;
+		}
+	}
+	@keyframes lightMove2{
+		0%{
+			bottom: -200rpx;
+			left: 300rpx;
+		}
+		100%{
+			bottom: 100%;
+			left: 240rpx;
+		}
+	}
+	@keyframes lightMove3{
+		0%{
+			bottom: -200rpx;
+			left: 600rpx;
+		}
+		100%{
+			bottom: 100%;
+			left: 0rpx;
+		}
+	}
+	.content1-box .content1-top-box{
+		width: 685rpx;
+		height: 350rpx;
+		border-radius: 8rpx;
+		margin: 36rpx auto 0; 
+		position: relative;
+		background: #FFDA9B;
+		box-sizing: border-box;
+		padding: 24rpx 24rpx 0;
+	}
+	.form-box{
+		width: 100%;
+		height: 100%;
+	}
+	.input-box{
+		font-size: 30rpx;
+		color: #F8560E;
+		display: flex;
+		align-items: center;
+		width: 100%;
+		height: 68rpx;
+		border-bottom: 2rpx solid #FFCC84;
+	}
+	.input-box .label-box{
+		margin-right: 32rpx;
+	}
+	.input-box input{
+		background: transparent;
+		height: 100%;
+		border:0;
+		outline:none;
+		color: #414141;
+	}
+	.input{
+		color: #414141;
+	}
+	.noBorder{
+		border: none;
+	}
+	.input-box textarea{
+		width: 72%;
+		padding-top: 4rpx;
+		height: 100%;
+		background: transparent;
+		border:0;
+		outline:none;
+		color: #414141;
+	}
+	.radio-box{
+		font-size: 24rpx;
+		color: #FFDEAF;
+		justify-content: flex-end;
+		padding-right: 34rpx;
+		box-sizing: border-box;
+		padding-top: 28rpx;
+	}
+	.radio{
+		margin-right: 20rpx;
+	}
+	.submit-btn{
+		width: 360rpx;
+		height: 64rpx;
+		background: linear-gradient(180deg, #F7D08E 0%, #ECBE71 100%);
+		text-align: center;
+		line-height: 64rpx;
+		color: #fff;
+		border-radius: 12rpx;
+		font-size: 36rpx;
+		margin: 40rpx 0;
+		position: relative;
+		left: 50%;
+		margin-left: -180rpx;
+	}
+	.content2-box .top-box-content{
+		padding: 0 68rpx;
+		height: 314rpx;
+		background: #FFDA9B;
+		border-radius: 12rpx;
+		box-sizing: border-box;
+		padding: 10rpx 22rpx 50rpx 34rpx;
+		font-size: 28rpx;
+		color: #FFDCAB;
+	}
+	.mt50{
+		margin-top: 50rpx;
+	}
+	.light-l-box{
+		width: 112rpx;
+		height: 244rpx;
+		background: url(../../static/xyddImages/light-bg.png) no-repeat center;
+		background-size: 100% 100%;
+		font-family: mFont;
+		box-sizing: border-box;
+		padding-top: 48rpx;
+		text-align: center;
+	}
+	.light-l-box image{
+		width: 72rpx;
+		height: 74rpx;
+		display: block;
+		margin: 0 auto;
+	}
+	.light-desc-box{
+		margin-left: 28rpx;
+	}
+	.light-name{
+		font-size: 36rpx;
+		line-height: 44rpx;
+		color: #F18D00;
+		margin-bottom: 16rpx;
+	}
+	.current-year{
+		font-size: 28rpx;
+		color: #FF9C10;
+		margin: 6rpx 0 12rpx;
+		line-height: 24rpx;
+	}
+	.light-desc{
+	  font-size: 28rpx;
+		line-height: 46rpx;
+		color: #232323;
+	}
+	.top-box-content .btn-box{
+		width: 232rpx;
+		height: 48rpx;
+		background: linear-gradient(180deg, #FFD190 0%, #E88739 100%);
+		border-radius: 4rpx;
+		text-align: center;
+		line-height: 48rpx;
+		color: #fff;
+		font-size: 28rpx;
+		margin: -30rpx auto;
+	}
+	.right-img{
+		width: 234rpx;
+		height: 200rpx;
+		position: absolute;
+		top: -70rpx;
+		right: -30rpx;
+	}
+	.cloud1{
+		width: 212rpx;
+		height: 212rpx;
+		position: absolute;
+		top: 14rpx;
+		right: -30rpx;
+	}
+	.cloud2{
+		width: 422rpx;
+		height: 212rpx;
+		position: absolute;
+		bottom: -60rpx;
+		left: -40rpx;
+	}
+	
+	.content2-top-box{
+		width: 685rpx;
+		min-height: 972rpx;
+		background: #FFDA9B;
+		border: 2rpx solid #F7D08E;
+		border-radius: 12rpx;
+		position: relative;
+		margin: 0rpx auto 0;
+	}
+	
+	.effect-box{
+		margin-bottom: 20rpx;
+		.light-name{
+			font-size: 34rpx;
+		}
+	}
+	
+	.words{
+		font-size: 28rpx;
+		color: #232323;
+		line-height: 42rpx;
+	}
+	
+	.btn-box{
+		width: 148rpx;
+		height: 59rpx;
+		background: linear-gradient(180deg, #F7D08E 0%, #ECBE71 100%);
+		border-radius: 12rpx;
+		text-align: center;
+		line-height: 59rpx;
+		font-size: 24rpx;
+		color: #fff;
+		margin-left: 74rpx;
+		margin-top: 50rpx;
+	}
+	
+	.tips-box{
+		font-size: 24rpx;
+		margin: 20rpx 0;
+		color: #F93030;
+		text-align: center;
+	}
+		
+</style>
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 51ceace..cdf8769 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -19,7 +19,7 @@
 			<view class="today-fortune-box">
 				<view class="top-box acea-row row-between-wrapper">
 					<view class="title">今日·宜忌</view>
-					<view>{{dateStr}}</view>
+					<view>{{year}}年{{month}}月{{day}}日</view>
 				</view>
 				<view class="date-box acea-row row-middle row-center">
 					<view class="date-btn prev-btn"><image src="../../static/prev.png"></image></view>
@@ -27,28 +27,28 @@
 					<view class="date-btn next-btn"><image src="../../static/next.png"></image></view>
 				</view>
 				<view class="week-box">
-					<span class="week">{{week}}</span>
-					<span>辛丑牛年 甲午月 丙戌日</span>
+					<span class="week">星期{{week}}</span>
+					<span>{{suici}}</span>
 				</view>
-				<view class="fortune-detail">
+				<view class="fortune-detail"> 
 					<view class="fortune-n acea-row-nowrap mt20">
 						<view class="fortune-icon nice">宜</view>
-						<view class="fortune">安机械 移徙 入宅 出行 祭祀 祈福 动土祭祀 祈福 动土</view>
+						<view class="fortune">{{yi}}</view>
 					</view>
 					<view class="fortune-b acea-row-nowrap mt20">
 						<view class="fortune-icon bad">忌</view>
-						<view class="fortune">开市 伐木 作梁 作灶 </view>
+						<view class="fortune">{{ji}}</view>
 					</view>
 				</view>
-				<view class="qiuqian-box">
-					<image class="qiuqian-bg" src="../../static/qiuqian-bg.png"></image>
-					<view class="txt-box acea-row row-between-wrapper">
-						<view>今日还没有求签哦！</view>
-						<view class="qiuqin-btn">每日一签</view>
-					</view>
+				<view class="qiuqian-box" v-if="flag == 1">
+					<image class="qiuqian-bg" @click="todiandeng()" src="https://qiniu.upload.gznl.top/90a6420b-abd9-41e2-be4f-dcf10fe93bed.png"></image>
+					<!-- <view class="txt-box acea-row row-between-wrapper">
+						<view></view>
+						<view class="qiuqin-btn" @click="todiandeng()">祈福点灯</view>
+					</view> -->
 				</view>
 			</view>
-			<view class="fortune-menu-box acea-row row-between">
+			<!-- <view class="fortune-menu-box acea-row row-between">
 				<view class="fortune-menu-item acea-row row-middle" @click="toWebView()">
 					<image src="../../static/f-menu1.png" mode=""></image>
 					<text>周公解梦</text>
@@ -61,7 +61,7 @@
 					<image src="../../static/f-menu3.png" mode=""></image>
 					<text>八字财运</text>
 				</view>
-			</view>
+			</view> -->
 		</view>
 		<!-- 推荐课程 -->
 		<view class="recommend-box p30">
@@ -129,7 +129,8 @@
 						<view class="author-box acea-row row-between">
 							<view class="acea-row">
 								<view class="author">{{item.author}}</view>
-								<view class="time">{{item.addTime}}</view>
+								<view class="time">{{item.addTime.split(' ')[0]}}</view>
+								<view>{{item.visit}}人阅读</view>
 							</view>
 							<view class="tips" 
 								:class="item.chargeType == 0 ? 'free-bg' : item.chargeType == 1 ? '' : 'jifen'">
@@ -165,6 +166,8 @@ import { isWeixin, handleUrlParam } from '@/utils/index'
 
 import { signCourse } from '@/api/knowledge'
 
+import { getWanniali , getBlessingFlag } from '@/api/diandeng'
+
 import { openShareAll } from '@/libs/wechat'
 
 const HAS_COUPON_WINDOW = 'has_coupon_window'
@@ -221,14 +224,19 @@ export default {
       benefit: [],
       couponList: [],
       bgImage: '',
-			chinese: ['〇', '一', '二', '三', '四', '五', '六', '七', '八', '九'],
-			weeks: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"],
 			week:'',
+			suici:'',
+			year:'',
+			month:'',
+			day:'',
+			ji:'',
+			yi:'',
 			dateStr:'',
 			todayDate:'',
 			courseList: [],
 			studyList: [],
-			articleList: []
+			articleList: [],
+			flag:0
     }
   },
   computed: {
@@ -252,11 +260,14 @@ export default {
 		uni.showLoading({
 			title:'正在加载中...'
 		})
-    getCanvas()
-      .then(res => {})
-      .catch(error => {
-        this.homeData = JSON.parse(error.data.json)
-      })
+    // getCanvas()
+    //   .then(res => {})
+    //   .catch(error => {
+    //     this.homeData = JSON.parse(error.data.json)
+    //   })
+		getBlessingFlag().then((res)=>{
+			this.flag = res.data
+		})
     getHomeData().then(res => {
 			uni.hideLoading()
       that.logoUrl = res.data.logoUrl
@@ -275,54 +286,43 @@ export default {
 			that.$set(that, 'articleList', res.data.articleDtos)
       uni.hideLoading()
       that.setOpenShare()
-      // that.doColorThief()
     })
+		
+		getWanniali(this.dateStr2).then((res)=>{
+			console.log(res)
+			var data = res.data
+			if(res.success){
+				this.suici =  JSON.parse(data.huangli.suici).join(' ')
+				this.week = data.week
+				this.todayDate = data.lunarmonth + data.lunarday
+				this.year = data.year
+				this.month = data.month
+				this.day = data.day
+				this.ji = JSON.parse(data.huangli.ji).join(' ')
+				this.yi = JSON.parse(data.huangli.yi).join(' ')
+			}
+		})
   },
   methods: {
     ...mapActions(['getLocation']),
 		
-		// toWebView(){
-		// 	uni.navigateTo({
-		// 		url:'/pages/webView/index'
-		// 	})
-		// },
+		todiandeng(){
+			uni.navigateTo({
+				url:'/pages/diandeng/index'
+			})
+		},
 		setDate(t){
-			console.log()
 			let str = t.split(" ")[0].split("-")[1] + "." + t.split(" ")[0].split("-")[2]
 			return str
 		},
 		getDate(){
 			var today = new Date();
 			var y = today.getFullYear().toString();
-			console.log('y',y)
 			var m = (today.getMonth()+1).toString();
 			var d = today.getDate().toString();
-			// var d = '22'
 			var day = today.getDay();
-			this.dateStr = y + '年' + m + '月' + d + '日' ;
-			this.week = this.weeks[day]
-			if (m.length == 2) {
-				if (m.charAt(0) == "0") {
-						this.todayDate += (this.chinese[m.charAt(1)] + "月");
-				}
-				if (m.charAt(0) == "1") {
-						this.todayDate += ("十" + this.chinese[m.charAt(1)] + "月");
-				}
-			} else {
-				this.todayDate += (this.chinese[m.charAt(0)] + "月");
-			}
-			//如果日为两位数，则返回十的月份拼接两次数据，其它则返回寻常的值
-			// console.log(d[d.length-1],'ddddddd')
-			if (d.length == 2) {
-				if(d[d.length-1] == 0){
-					this.todayDate += (this.chinese[d.charAt(0)] + "十" + '日');
-				} else{
-					this.todayDate += (this.chinese[d.charAt(0)] + "十" + this.chinese[d.charAt(1)]);
-				}
-			}
-			else {
-					this.todayDate += (this.chinese[d.charAt(0)]) + '日';
-			}
+			this.dateStr = y + '年' + m + '月' + d + '日';
+			this.dateStr2 = y + '-' + m + '-' + d ;
 		},
     onShareTimeline: function() {
       return {
@@ -834,7 +834,9 @@ export default {
 				// text-indent: 1em;
 				.author{
 					color: #EA533E;
-					margin-right: 12rpx;
+				}
+				.time{
+					margin: 0 12rpx;
 				}
 				.tips{
 					width: 100rpx;
diff --git a/pages/knowledge/detail.vue b/pages/knowledge/detail.vue
index d1e8c15..0ec5481 100644
--- a/pages/knowledge/detail.vue
+++ b/pages/knowledge/detail.vue
@@ -41,7 +41,6 @@ export default{
 	},
 	onLoad(){
 		this.id = this.$yroute.query.id;
-		
 	},
 	onShow(){
 		this.getDetail();
diff --git a/pages/knowledge/index.vue b/pages/knowledge/index.vue
index 1a28f27..6f584e0 100644
--- a/pages/knowledge/index.vue
+++ b/pages/knowledge/index.vue
@@ -30,9 +30,9 @@
 							 <image :src="item.imageInput" mode="aspectFill"></image>
 						 </view>
 						 <view class="knowledge-info-box acea-row row-column row-between">
-							<view class="line1">
+							<view style="width: 100%;">
 								<view class="title line1">{{item.title}}</view>
-								<view class="intro line2">{{item.synopsis}}</view>
+								<view class="intro">{{item.synopsis}}</view>
 							</view>
 							<view class="type-box acea-row">
 								<view class="tip" :class="item.chargeType == 0 ? 'free-bg' : item.chargeType == 1 ? '' : 'jifen'">
@@ -183,8 +183,8 @@
 			color: #999999;
 		}
 		.tab-item-active{
-			color: #EA533E;
-			border-bottom: 2px solid #EA533E;
+			color: #F99C10;
+			border-bottom: 2px solid #F99C10;
 			font-weight: bold;
 		}
 	}
@@ -202,10 +202,10 @@
 	.introduce-box{
 		width: calc(100% - 60rpx);
 		height: auto;
-		box-shadow: 0px 6rpx 14rpx 8rpx rgba(255,234,231,0.5);
+		box-shadow: 0px 6rpx 14rpx 8rpx rgba(255, 237, 204, 1);
 		border-radius: 8px;
 		overflow: hidden;
-		margin: 0rpx auto 30rpx;
+		margin: 10rpx auto 30rpx;
 		padding-bottom: 30rpx;
 		padding-left: 10rpx;
 		position: relative;
@@ -232,7 +232,7 @@
 		display: block;
 		width: 16rpx;
 		height: 100%;
-		background: #FAEFED;
+		// background: #F7D08E;
 		position: absolute;
 		left: -1rpx;
 		top: 50%;
@@ -271,11 +271,20 @@
 					line-height: 32rpx;
 				}
 				.intro{
-					height: 82rpx;
+					// height: 82rpx;
 					font-size: 28rpx;
 					color: #999999;
 					line-height: 40rpx;
 					margin: 8rpx 0 36rpx;
+					overflow:hidden; 
+					
+					text-overflow:ellipsis;
+					
+					display:-webkit-box; 
+					
+					-webkit-box-orient:vertical;
+					
+					-webkit-line-clamp:2; 
 				}
 				.type-box{
 					font-size: 24rpx;
diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index f8e7b4f..59324bb 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -1,51 +1,53 @@
 <template>
   <view class="my-order" ref="container">
-    <view class="header bg-color-red">
+    <!-- <view class="header">
       <view class="picTxt acea-row row-between-wrapper">
         <view class="text">
           <view class="name">订单信息</view>
           <view>累计订单：{{ orderData.orderCount || 0 }} 总消费：￥{{ orderData.sumPrice || 0 }}</view>
         </view>
       </view>
-    </view>
+    </view> -->
     <view class="nav acea-row row-around">
       <view class="item" :class="{ on: type === 0 }" @click="changeType(0)">
         <view>待付款</view>
-        <view class="num">{{ orderData.unpaidCount || 0 }}</view>
+        <!-- <view class="num">{{ orderData.unpaidCount || 0 }}</view> -->
       </view>
       <view class="item" :class="{ on: type === 1 }" @click="changeType(1)">
         <view>待发货</view>
-        <view class="num">{{ orderData.unshippedCount || 0 }}</view>
+        <!-- <view class="num">{{ orderData.unshippedCount || 0 }}</view> -->
       </view>
       <view class="item" :class="{ on: type === 2 }" @click="changeType(2)">
         <view>待收货</view>
-        <view class="num">{{ orderData.receivedCount || 0 }}</view>
+        <!-- <view class="num">{{ orderData.receivedCount || 0 }}</view> -->
       </view>
       <view class="item" :class="{ on: type === 3 }" @click="changeType(3)">
         <view>待评价</view>
-        <view class="num">{{ orderData.evaluatedCount || 0 }}</view>
+        <!-- <view class="num">{{ orderData.evaluatedCount || 0 }}</view> -->
       </view>
       <view class="item" :class="{ on: type === 4 }" @click="changeType(4)">
         <view>已完成</view>
-        <view class="num">{{ orderData.completeCount || 0 }}</view>
+        <!-- <view class="num">{{ orderData.completeCount || 0 }}</view> -->
       </view>
     </view>
     <view class="list">
       <view class="item" v-for="(order, orderListIndex) in orderList" :key="orderListIndex">
         <view class="title acea-row row-between-wrapper">
           <view class="acea-row row-middle">
-            <span class="sign cart-color acea-row row-center-wrapper" v-if="order.combinationId > 0">拼团</span>
+            <!-- <span class="sign cart-color acea-row row-center-wrapper" v-if="order.combinationId > 0">拼团</span>
             <span class="sign cart-color acea-row row-center-wrapper" v-if="order.seckillId > 0">秒杀</span>
             <span class="sign cart-color acea-row row-center-wrapper" v-if="order.bargainId > 0">砍价</span>
-            <span class="sign cart-color acea-row row-center-wrapper" v-if="order.storeId > 0">门店</span>
-            {{ order.createTime }}
+            <span class="sign cart-color acea-row row-center-wrapper" v-if="order.storeId > 0">门店</span> -->
+           订单号 {{ orderList[0].orderId }}
           </view>
-          <view class="font-color-red">{{ getStatus(order) }}</view>
+          <view class="state">{{ getStatus(order) }}</view>
         </view>
         <view @click="goOrderDetails(order)">
-          <view class="item-info acea-row row-between row-top" v-for="(cart, cartInfoIndex) in order.cartInfo" :key="cartInfoIndex">
+          <view class="item-info acea-row-nowrap row-between row-top" v-for="(cart, cartInfoIndex) in order.cartInfo" :key="cartInfoIndex">
             <view class="pictrue">
-              <image :src="cart.productInfo.image" @click.stop="$yrouter.push({ path: '/pages/shop/GoodsCon/index', query: { id: cart.productInfo.id } })" v-if="cart.combinationId === 0 && cart.bargainId === 0 && cart.seckillId === 0" />
+              <image :src="cart.productInfo.image" 
+								@click.stop="$yrouter.push({ path: '/pages/shop/GoodsCon/index', query: { id: cart.productInfo.id } })" 
+								v-if="cart.combinationId === 0 && cart.bargainId === 0 && cart.seckillId === 0" />
               <image
                 :src="cart.productInfo.image"
                 @click.stop="
@@ -78,19 +80,23 @@
               />
             </view>
             <view class="text acea-row row-between">
-              <view class="name line2">{{ cart.productInfo.storeName }}</view>
-              <view class="money">
-                <view v-if="order.payType != 'integral'"> ￥{{ cart.productInfo.attrInfo ? cart.productInfo.attrInfo.price : cart.productInfo.price }} </view>
-                <view v-if="order.payType == 'integral'"> {{ order.payIntegral }}积分 </view>
-                <view>x{{ cart.cartNum }}</view>
-              </view>
+              <view class="name">
+								<view class="line1">{{ cart.productInfo.storeName }}</view>
+								<view class="money acea-row row-column">
+									<view class="cart-num">数量x{{ cart.cartNum }}</view>
+								  <view class="money-txt" v-if="order.payType != 'integral'"> ￥{{ cart.productInfo.attrInfo ? cart.productInfo.attrInfo.price : cart.productInfo.price }} </view>
+								  <view class="money-txt" v-if="order.payType == 'integral'"> {{ order.payIntegral }}积分 </view>
+								  
+								</view>
+							</view>
+              
             </view>
           </view>
         </view>
         <view class="totalPrice">
           共{{ order.cartInfo.length || 0 }}件商品，总金额
-          <text class="money font-color-red" v-if="order.payType != 'integral'">￥{{ order.payPrice }}</text>
-          <text class="money font-color-red" v-if="order.payType == 'integral'">{{ order.payIntegral }}积分</text>
+          <text class="money" v-if="order.payType != 'integral'">￥{{ order.payPrice }}</text>
+          <text class="money" v-if="order.payType == 'integral'">{{ order.payIntegral }}积分</text>
         </view>
         <view class="bottom acea-row row-right row-middle">
           <template v-if="order._status._type == 0">
@@ -150,7 +156,7 @@ export default {
     return {
       offlinePayStatus: 2,
       orderData: {},
-      type: '',
+      type: 0,
       page: 1,
       limit: 20,
       loaded: false,
@@ -284,6 +290,87 @@ export default {
 </script>
 
 <style scoped lang="less">
+.header{
+	width: 100%;
+	background: #F99C10;
+}
+.my-order{
+	width: 100%;
+	.nav{
+		width: 100%;
+		height: auto;
+		margin: 0;
+		.item{
+			padding: 28rpx 0;
+			color: #222;
+			font-size: 32rpx;
+		}
+		.on{
+			border-color: #F99C10 !important;
+		}
+	}
+	.list{
+		width: 710rpx;
+		margin: 20rpx auto 0;
+		.item{
+			border-radius: 10rpx;
+			.title{
+				font-size: 24rpx;
+				color: #222;
+				.state{
+					font-size: 32rpx;
+					color: #E5270F;
+				}
+			}
+			.item-info {
+				.pictrue {
+					width: 170rpx;
+					height: 170rpx;
+					image{
+						width: 170rpx;
+						height: 170rpx;
+					}
+					margin-right: 30rpx;
+				}
+			}
+			.item-info{
+				.text{
+					.money{
+						text-align: left;
+						.cart-num{
+							font-size: 24rpx;
+							color: #999;
+							margin-bottom: 40rpx;
+						}
+						.money-txt{
+							color: #E5270F;
+							font-size: 44rpx;
+						}
+					}
+				}
+				.name{
+					width: 100%;
+					font-size: 28rpx;
+					color: #222;
+				}
+			}
+			.totalPrice {
+				font-size: 26rpx;
+				color: #282828;
+				text-align: right;
+				margin: 27rpx 0 0 30rpx;
+				padding: 30rpx 30rpx 0rpx 0;
+				border: none;
+				border-top: 1rpx solid #eee;
+				.money{
+					color: #E5270F;
+				}
+			}
+		}
+	}
+}
+
+
 .noCart {
   margin-top: 0.17 * 100rpx;
   padding-top: 0.1 * 100rpx;
diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue
index af3a7a6..63dc3a8 100644
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@@ -1,14 +1,30 @@
 <template>
   <view class="order-details">
     <!-- 给header上与data上加on为退款订单-->
-    <view class="header bg-color-red acea-row row-middle" :class="refundOrder ? 'on' : ''">
+    <view class="header" :class="refundOrder ? 'on' : ''">
       <view class="data" :class="refundOrder ? 'on' : ''">
-        <view class="state">{{ orderInfo._status._msg }}</view>
-        <view>{{ orderInfo.createTime }}</view>
+        <!-- <view>{{ orderInfo.createTime }}</view> -->
+				<view class="status" v-if="status.type === 0 || status.type === 9">待付款</view>
+				<view class="status" v-if="status.type === 1 && orderInfo.shippingType === 2">待核销</view>
+				<view class="status" v-if="status.type === 1">待发货</view>
+				<view class="status" v-if="status.type === 2 && orderInfo.shippingType === 1">待收货</view>
+				<view class="status" v-if="status.type === 3">待评价</view>
+				<view class="status" v-if="status.type === 4">已完成</view>
+				
+				<view class="state">{{ orderInfo._status._msg }}</view>
       </view>
+			
+			<view class="address">
+			  <view class="name">
+			    {{ orderInfo.realName }}
+			    <text class="phone">{{ orderInfo.userPhone }}</text>
+			    <text @click="telPhone(orderInfo.userPhone)" class="iconfont icon-tonghua font-color-red"></text>
+			  </view>
+			  <view class="line2">{{ orderInfo.userAddress }}</view>
+			</view>
     </view>
     <template v-if="!refundOrder">
-      <view class="nav">
+      <!-- <view class="nav">
         <view class="navCon acea-row row-between-wrapper">
           <view :class="{ on: status.type === 0 || status.type === 9 }">待付款</view>
           <view :class="{ on: status.type === 1 }" v-if="orderInfo.shippingType === 2">待核销</view>
@@ -57,8 +73,8 @@
                 : ''
             ]"></view>
         </view>
-      </view>
-      <div class="writeOff" v-if="orderInfo.shippingType === 2 && orderInfo.paid === 1">
+      </view> -->
+      <!-- <div class="writeOff" v-if="orderInfo.shippingType === 2 && orderInfo.paid === 1">
         <div class="title">核销信息</div>
         <div class="grayBg">
           <div class="pictrue">
@@ -112,32 +128,32 @@
       </div>
       <view class="line" v-if="orderInfo.shippingType === 1">
         <image :src="`${$VUE_APP_RESOURCES_URL}/images/line.jpg`" />
-      </view>
+      </view> -->
     </template>
     <OrderGoods :evaluate="status.type || 0" :isIntegral="isIntegral" :cartInfo="orderInfo.cartInfo || []"></OrderGoods>
     <view class="wrapper">
-      <view class="item acea-row row-between">
+      <view class="item acea-row">
         <view>订单编号：</view>
-        <view class="conter acea-row row-middle row-right">
+        <view class="conter acea-row row-middle row-between">
           {{ orderInfo.orderId }}
             <!-- #ifndef H5 -->
           <text class="copy copy-data" @click="copyClipboard(orderInfo.orderId)">复制</text>
           <!-- #endif -->
         </view>
       </view>
-      <view class="item acea-row row-between">
+      <view class="item acea-row ">
         <view>下单时间：</view>
         <view class="conter">{{ orderInfo.createTime }}</view>
       </view>
-      <view class="item acea-row row-between">
+      <view class="item acea-row ">
         <view>订单类型：</view>
         <view class="conter">{{ orderTypeName }}</view>
       </view>
-      <view class="item acea-row row-between">
+      <view class="item acea-row ">
         <view>支付状态：</view>
         <view class="conter">{{ orderInfo.paid ? "已支付" : "未支付" }}</view>
       </view>
-      <view class="item acea-row row-between">
+      <view class="item acea-row ">
         <view>支付方式：</view>
         <view class="conter">{{ orderInfo._status._payType }}</view>
       </view>
@@ -219,8 +235,8 @@
       </view>
       <view class="actualPay acea-row row-right">
         实付款：
-        <text class="money font-color-red" v-if="!isIntegral">￥{{ orderInfo.payPrice }}</text>
-        <text class="money font-color-red" v-if="isIntegral">{{ orderInfo.payIntegral }}积分</text>
+        <text class="money" v-if="!isIntegral">￥{{ orderInfo.payPrice }}</text>
+        <text class="money" v-if="isIntegral">{{ orderInfo.payIntegral }}积分</text>
       </view>
     </view>
     <view style="height:100rpx;" v-if="!refundOrder && offlineStatus"></view>
@@ -503,6 +519,65 @@
 </script>
 
 <style scoped lang="less">
+	.order-details{
+		
+		.header {
+			height: 250rpx;
+			background: linear-gradient(161deg, #F7C37A 0%, #E29F40 100%);;
+			padding: 40rpx 30rpx;
+			position: relative;
+			margin-bottom: 110rpx;
+			font-size: 28rpx;
+			color: #fff;
+			.data{
+				.state{
+					font-size: 28rpx;
+					margin-top: 10rpx;
+				}
+			}
+			.status{
+				font-size: 44rpx;
+				color: #fff;
+				line-height: 60rpx;
+			}
+		}
+		.address{
+			font-size: 26rpx;
+			color: #868686;
+			background-color: #fff;
+			position: absolute;
+			width: 710rpx;
+			height: 170rpx;
+			left: 20rpx;
+			bottom: -85rpx;
+			border-radius: 10rpx;
+			.name{
+				color: #222222;
+				font-size: 32rpx;
+				line-height: 44rpx;
+				margin-bottom: 22rpx;
+			}
+		}
+	} 
+	.order-details .wrapper .item{
+		color: #666;
+		.conter{
+			text-align: left;
+			color: #222;
+			width: 545rpx;
+			.copy{
+				width: 88rpx;
+				height: 40rpx;
+				border: 2rpx solid #F7C37A;
+				border-radius: 20rpx;
+				color: #F7C37A;
+				line-height: 40rpx;
+				text-align: center;
+				padding: 0;
+				font-size: 26rpx;
+			}
+		}
+	} 
   .geoPage {
     position: fixed;
     width: 100%;
@@ -570,7 +645,10 @@
     text-align: center;
     padding-top: 0.04 * 100rpx;
   }
-
+	.order-details .wrapper .actualPay .money {
+		color: #E5270F;
+		font-weight: normal;
+	}
   .order-details .writeOff .rules {
     margin: 0.46 * 100rpx 0.3 * 100rpx 0 0.3 * 100rpx;
     border-top: 0.01 * 100rpx solid #f0f0f0;
diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue
index 7db0f85..e4885b8 100644
--- a/pages/order/OrderSubmission/index.vue
+++ b/pages/order/OrderSubmission/index.vue
@@ -152,7 +152,7 @@
     <view class="footer acea-row row-between-wrapper">
       <view>
         合计:
-        <text class="font-color-red total-word" v-if="!isIntegral">￥{{ orderPrice.payPrice }}+{{orderPrice.usedIntegral}}积分</text>
+        <text class="total-word" v-if="!isIntegral">￥{{ orderPrice.payPrice }}</text>
         <!-- <text class="font-color-red total-word" v-if="isIntegral">{{ orderPrice.payIntegral }}积分</text> -->
       </view>
       <view class="settlement" @click="createOrder">立即结算</view>
@@ -569,6 +569,7 @@ export default {
 .order-submission{
 	.footer{
 		.total-word{
+			color: #e93323;
 			font-weight: bold;
 			font-size: 32rpx;
 		}
diff --git a/pages/order/ReturnList/index.vue b/pages/order/ReturnList/index.vue
index e23125f..e012249 100644
--- a/pages/order/ReturnList/index.vue
+++ b/pages/order/ReturnList/index.vue
@@ -97,3 +97,9 @@ export default {
   }
 };
 </script>
+<style lang="less">
+	.pictrue{
+		text-align: center;
+		padding-top: 78rpx;
+	}
+</style>
diff --git a/pages/serviceTeacher/index.vue b/pages/serviceTeacher/index.vue
index 1db7d0f..118db9c 100644
--- a/pages/serviceTeacher/index.vue
+++ b/pages/serviceTeacher/index.vue
@@ -1,6 +1,9 @@
 <template>
 	<view class="index-box">
-		<view class="back-home-btn" @click="toUserIndex"><image src="../../static/backhome-icon.png" ></image></view>
+		<view class="back-home-btn" @click="toUserIndex">
+			<image src="../../static/backhome-icon.png" ></image>
+			<text>回到首页</text>
+		</view>
 		<view class="userInfo-box acea-row row-column row-center-wrapper">
 			<view class="headerimg-box">
 				<image :src="userInfo.avatar" mode="aspectFill" v-if="userInfo.isPromoter == 0"></image>
@@ -76,14 +79,22 @@
 		background: url(https://www.cyjyyjy.com:8081/static/teacher-index-bg.png);
 		background-size: cover;
 		.back-home-btn{
-			width: 80rpx;
-			height: 80rpx;
 			position: absolute;
-			right: 30rpx;
-			top: 30rpx;
+			left: 50%;
+			margin-left: -40rpx;
+			bottom: 56rpx;
+			text-align: center;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
 			image{
-				width: 100%;
-				height: 100%;
+				width: 80rpx;
+				height: 80rpx;
+			}
+			text{
+				color: #fff;
+				font-size: 28rpx;
 			}
 		}
 		.userInfo-box{
@@ -93,7 +104,7 @@
 				border-radius: 50px;
 				border: 8rpx solid #d9d9d9;
 				overflow: hidden;
-				margin: 150rpx 0 30rpx;
+				margin: 100rpx 0 30rpx;
 				image{
 					width: 100%;
 					height: 100%;
@@ -104,13 +115,15 @@
 				margin-bottom: 12rpx;
 			}
 		}
-		.btn-box{
+		.btn-box{ 
 			width: 590rpx;
 			height: 264rpx;
 			background-color: #fff;
 			border-radius: 10rpx;
 			font-size: 38rpx;
-			margin: 60rpx auto;
+			margin: 40rpx auto;
+			transform: scale(.8);
+			box-shadow: 0px 6rpx 14rpx 8rpx rgba(0, 0, 0, 0.1);
 			image{
 				width: 104rpx;
 				height: 104rpx;
diff --git a/pages/serviceTeacher/setSelfData.vue b/pages/serviceTeacher/setSelfData.vue
index 801db23..8f18b99 100644
--- a/pages/serviceTeacher/setSelfData.vue
+++ b/pages/serviceTeacher/setSelfData.vue
@@ -34,10 +34,10 @@
 				<view class="input-box acea-row row-middle">
 					<radio-group  @change="radioChange">
 						<label class="radio">
-							<radio value="0" color="#E5270F" style="transform:scale(0.7)" :checked="form.gender == 0" /><text>男</text>
+							<radio value="0" color="#F99C10" :checked="form.gender == 0" /><text>男</text>
 						</label>
 						<label class="radio">
-							<radio value="1" color="#E5270F" style="transform:scale(0.7)" :checked="form.gender == 1" /><text>女</text>
+							<radio value="1" color="#F99C10" :checked="form.gender == 1" /><text>女</text>
 						</label>
 					</radio-group>
 				</view>
@@ -87,6 +87,9 @@
 			}
 		},
 		onLoad(){
+			if(this.userInfo.phone){
+				this.form.phone = this.userInfo.phone;
+			}
 			if(this.userInfo.isPromoter == 1){
 				let info = this.userInfo;
 				this.form.imgPath = info.workPhoto;
@@ -131,7 +134,6 @@
 						}
 					})
 				}
-				
 			},
 			timeup(){
 				this.second = this.second - 1;
diff --git a/pages/shop/GoodsClass/index.vue b/pages/shop/GoodsClass/index.vue
index b3b7072..cb1c121 100644
--- a/pages/shop/GoodsClass/index.vue
+++ b/pages/shop/GoodsClass/index.vue
@@ -22,10 +22,10 @@
 		</view> -->
 		<view class="userInfo-box acea-row row-between row-middle">
 			<view class="userInfo-l acea-row row-center-wrapper">
-				<image src="../../../static/img1.png"></image>
+				<image :src="userInfo.avatar"></image>
 				<view class="userInfo">
 					<view>亲爱的，{{getTime()}}</view>
-					<view class="name">{{userInfo.nickname}}</view>
+					<view class="name line1">{{userInfo.nickname}}</view>
 				</view>
 			</view>
 			<view class="userInfo-r">
@@ -47,7 +47,7 @@
 						<image :src="goods.image"></image>
 						<view class="goods-desc-box">
 							<view class="goods-name line1">{{goods.storeName}}</view>
-							<view class="price">{{goods.price}}元+{{goods.giveIntegral}}积分</view>
+							<view class="price">{{goods.price}}元<text v-if="goods.giveIntegral > 0">+{{goods.giveIntegral}}积分</text></view>
 							<view class="buy-count">已出售{{goods.sales}}{{goods.unitName}}</view>
 						</view>
 					</view>
@@ -269,6 +269,7 @@ export default {
 			line-height: 40rpx;
 			margin-left: 20rpx;
 			.name{
+				width: 340rpx;
 				font-size: 24rpx;
 				color: #999;
 				line-height: 34rpx;
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 76c8aec..ee4be13 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -11,7 +11,7 @@
             <text>￥</text>
             <text class="num">{{ attr.productSelect.price || storeInfo.price }}</text>
             <!-- <text class="vip-money" v-if="storeInfo.vipPrice && storeInfo.vipPrice > 0">￥{{ attr.productSelect.vipPrice || storeInfo.vipPrice }}</text> -->
-						<text class="vip-money">+{{storeInfo.giveIntegral}}积分</text>
+						<text class="vip-money" v-if="storeInfo.giveIntegral>0">+{{storeInfo.giveIntegral}}积分</text>
             <!-- <image :src="`${$VUE_APP_RESOURCES_URL}/images/vip.png`" class="image" v-if="storeInfo.vipPrice && storeInfo.vipPrice > 0" /> -->
           </view>
           <view class="money font-color-red" v-if="isIntegral">
@@ -125,7 +125,7 @@
         <view class="conter" v-html="storeInfo.description"></view>
       </view>
 
-      <view style="height: 100rpx"></view>
+      <!-- <view style="height: 100rpx"></view> -->
       <!-- 操作栏 -->
       <view class="footer acea-row row-between-wrapper">
         <!-- #ifdef MP-WEIXIN -->
@@ -779,7 +779,7 @@ export default {
 
 <style scoped lang="less">
 	.product-con{
-		padding-bottom: 200rpx;
+		padding-bottom: 160rpx;
 		.footer{
 			height: 160rpx;
 		}
diff --git a/pages/study/dabang.vue b/pages/study/dabang.vue
index 4367070..8fc6c64 100644
--- a/pages/study/dabang.vue
+++ b/pages/study/dabang.vue
@@ -4,7 +4,7 @@
 			<view class="dabang-name">{{detail.studyListDto.listName}}</view>
 			<!-- <view class="desc">抱朴书院孕育自华夏优秀传统文化，以“博学致用，朴含虚”为院训，以“弘扬国粹，利益社会”为动力。</view> -->
 			<view class="time-box">
-				 <span>时间：{{detail.studyListDto.listStartTime}} 至 {{detail.studyListDto.listEndTime}}（共21天）</span>
+				 <span>时间：{{detail.studyListDto.listStartTime}} 至 {{detail.studyListDto.listEndTime}}（共{{detail.studyListDto.clockTimes}}天）</span>
 				 <view class="sanjiao"></view>
 			</view>
 		</view>
@@ -23,7 +23,7 @@
 						<image :src="detail.avatar"></image>
 					</view>
 					<view class="user-progress">
-						<view class="name">{{detail.realName}}</view>
+						<view class="name line1">{{detail.realName}}</view>
 						<view class="progress">
 							<view class="pro-icon"><image src="../../static/course-icon1.png" mode=""></image></view>
 							已坚持<text class="colO">{{detail.finishTimes}}</text>/{{detail.totalTimes}}
@@ -41,8 +41,9 @@
 				<view class="progress-r acea-row row-column row-center-wrapper">
 					<text>{{detail.enterState ? '今日已打卡' : '今日未打卡'}}</text>
 					<view class="dabang-btn default" v-if="detail.enterState">已打卡</view>
-					<view class="dabang-btn" @click="toEdit" v-if="detail.isClockTime && !detail.enterState">立即打卡</view>
-					<view class="dabang-btn default" v-if="!detail.isClockTime && !detail.enterState">未开始</view>
+					<view class="dabang-btn default" v-if="detail.studyListDto.listState == 0">未开始</view>
+					<view class="dabang-btn" @click="toEdit" v-if="detail.studyListDto.isClockTime && !detail.enterState && detail.studyListDto.listState == 1">立即打卡</view>
+					<view class="dabang-btn default" v-if="!detail.studyListDto.isClockTime && !detail.enterState && detail.studyListDto.listState == 1">未开始</view>
 				</view>
 			</view>
 		</view>
@@ -62,10 +63,10 @@
 						<view class="create-time">{{item.recordTime}}</view>
 					</view>
 				</view>
-				<view class="share-word">
+				<view class="share-word" :class="item.isShow == 0 ? 'line1' : ''">
 					{{item.content}}
 				</view>
-				<view class="img-box acea-row">
+				<view class="img-box acea-row" v-if="item.isShow == 1">
 					<image :src="imgUrl" mode="aspectFill" @tap="previewImage(item.imgPaths,idx)" v-for="(imgUrl,idx) in item.imgPaths" :key="idx"></image>
 				</view>
 				<view class="zan-box acea-row row-middle row-right" @click="voteClick(item)">
@@ -291,6 +292,7 @@
 			.user-progress{
 				font-size: 28rpx;
 				.name{
+					width: 340rpx;
 					font-size: 32rpx;
 					font-weight: 500;
 					color: #222222;
diff --git a/pages/study/detail.vue b/pages/study/detail.vue
index dff0630..5167881 100644
--- a/pages/study/detail.vue
+++ b/pages/study/detail.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="course-detail-index">
 		<view class="banner-box">
-			<image :src="detail.imgPath"></image>
+			<image :src="detail.imgPath" mode="aspectFill"></image>
 		</view>
 		<view class="tab-box acea-row row-around" :class="isFixedTop?'fixed':''">
 			<view class="tab-item" :class="active == '0' ? 'tab-item-active' : ''" @click="handelScroll('content1','0')">榜单介绍</view>
@@ -57,11 +57,11 @@
 						</view>
 						<view class="course-card-item acea-row-nowrap row-middle row-top">
 							<view class="label">积分用途：</view>
-							<view class="info">可用于兑换积分商城内商品并抵扣一定款项（1积分=1元）</view>
+							<view class="info">可用于限定课程及商品、活动参与名额的兑换</view>
 						</view>
 						<view class="course-card-item acea-row-nowrap row-middle row-top">
 							<view class="label">奖惩机制：</view>
-							<view class="info">积极打卡满{{detail.clockTimes}}天可获得全部积分，消极应对无积分奖励。积极打卡满{{detail.clockTimes}}天可获得全部积分，消极应对无积分奖励。积极打卡满{{detail.clockTimes}}天可获得全部积分，消极应对无积分奖励。</view>
+							<view class="info">积极打卡满{{detail.clockTimes}}天可获得全部积分，消极应对无积分奖励。</view>
 						</view>
 					</view>
 				</view>
@@ -75,7 +75,7 @@
 				@getphonenumber="getPhoneNumber" 
 				v-if="userInfo.phone == ''" 
 				class="signin-btn" v-else>
-			  <text>绑定手机号</text>
+			  <text>点击绑定手机号</text>
 			</button>
 			<!-- #endif -->
 			
@@ -134,15 +134,27 @@
 			      iv: e.mp.detail.iv,
 			    })
 			      .then(res => {
-			        // this.User();
-			        thit.$store.dispatch('userInfo', true)
-			        uni.hideLoading()
-			        uni.showToast({
-			          title: res.msg,
-			          icon: 'success',
-			          duration: 2000,
-			        })
-							this.getDetail()
+			        if(res.success){
+			        	thit.$store.dispatch('userInfo', true)
+			        	uni.hideLoading()
+			        	uni.showToast({
+			        	  title: res.msg,
+			        	  icon: 'success',
+			        	  duration: 2000,
+			        	})
+								this.getDetail()
+			        } else{
+			        	uni.hideLoading()
+			        	uni.showModal({
+			        		title:'提示！',
+			        		content:'授权已过期，请重新授权后绑定手机号',
+			        		success:function(res){
+			        			if(res.confirm){
+			        				thit.$store.commit('logout')
+			        			}
+			        		},
+			        	})
+			        }
 			      })
 			      .catch(error => {
 			        uni.hideLoading()
@@ -164,6 +176,7 @@
 			getDetail(){
 				getStudyDetail(this.studyId).then((res)=>{
 					this.detail = res.data
+					res.data.content = res.data.content.replace(/\<img/g, "<img style='width: 100%;'")
 				})
 			},
 			signInClick(){
@@ -333,7 +346,7 @@
 		}
 		.tab-item-active{
 			font-weight: bold;
-			border-bottom: 4rpx solid #EB5744;
+			border-bottom: 4rpx solid #F99C10;
 		}
 	}
 	.fixed{
@@ -396,7 +409,7 @@
 			.left-line{
 				width: 6rpx;
 				height: 32rpx;
-				background-color: #EB5744;
+				background-color: #F99C10;
 				margin-right: 16rpx;
 			}
 		}
diff --git a/pages/study/editDabang.vue b/pages/study/editDabang.vue
index d2f7ca9..031e2f0 100644
--- a/pages/study/editDabang.vue
+++ b/pages/study/editDabang.vue
@@ -15,6 +15,11 @@
 				<view>上传图片</view>
 			</view>
 		</view>
+		<view class="isShow-box acea-row row-middle row-right">
+			<text>是否显示打卡内容：</text>
+			<switch checked @change="switchChange" color="#FDBF68" />
+			<text>{{isShow == 1 ? '显示' : '不显示'}}</text>
+		</view>
 		<view class="submit-btn" @click="submitClick()">发布</view>
 	</view>
 </template>
@@ -28,6 +33,7 @@
 		},
 		data: function() {
 			return {
+				isShow: 1,
 				studyId: '',
 				uploadPictures: [],
 				content: "",
@@ -38,6 +44,9 @@
 			this.studyId = this.$yroute.query.id;
 		},
 		methods:{
+			switchChange(e){
+				this.isShow = e.target.value ? 1 : 0
+			},
 			chooseImage() {
 				chooseImages(img => {
 					console.log(img)
@@ -55,7 +64,8 @@
 				let data = {
 					content: this.content,
 					imgPaths: this.uploadPictures,
-					studylistId: this.studyId
+					studylistId: this.studyId,
+					isShow: this.isShow
 				}
 				studyListPublish(data).then((res)=>{
 					if(res.success){
@@ -121,6 +131,10 @@
 				right: -12rpx;
 			}
 		}
+		
+	}
+	.isShow-box{
+		font-size: 24rpx;
 	}
 	.submit-btn{
 		width: 340rpx;
@@ -133,5 +147,7 @@
 		color: #fff;
 		margin: 72rpx auto;
 	}
-		
+	switch{
+		transform: scale(0.7);
+	}
 </style>
diff --git a/pages/user/PersonalData/index.vue b/pages/user/PersonalData/index.vue
index 42eb2ea..e751194 100644
--- a/pages/user/PersonalData/index.vue
+++ b/pages/user/PersonalData/index.vue
@@ -8,7 +8,7 @@
               <div class="pictrue">
                 <img :src="avatar" />
               </div>
-              <image :src="`${$VUE_APP_RESOURCES_URL}/images/alter.png`" class="alter" />
+              <!-- <image :src="`${$VUE_APP_RESOURCES_URL}/images/alter.png`" class="alter" /> -->
             </view>
             <view class="text">
               <view class="name line1">{{ userInfo.nickname }}</view>
@@ -26,29 +26,54 @@
       <view class="item acea-row row-between-wrapper">
         <view>昵称</view>
         <view class="input">
-          <input type="text" v-model="userInfo.nickname" />
+          <input type="text" disabled v-model="userInfo.nickname" />
         </view>
       </view>
 			<view class="item acea-row row-between-wrapper">
 			  <view>真实姓名</view>
 			  <view class="input">
-			    <input type="text" placeholder="请填写真实姓名" placeholder-style="color:#EA533E" v-model="userInfo.realName" />
+			    <input type="text"  placeholder="请填写真实姓名" placeholder-style="color:#EA533E" v-model="userInfo.realName" />
 			  </view>
 			</view>
-      <view class="item acea-row row-between-wrapper">
+			<view class="item acea-row row-between-wrapper">
+			  <view>身份证号码</view>
+			  <view class="input">
+			    <input type="idcard" placeholder="请填写真实身份证号码" maxlength="18" v-model="userInfo.idCard" />
+			  </view>
+			</view>
+      <!-- <view class="item acea-row row-between-wrapper">
         <view>ID号</view>
         <view class="input acea-row row-between-wrapper">
           <input type="text" :value="userInfo.uid" disabled class="id" />
           <text class="iconfont icon-suozi"></text>
         </view>
-      </view>
+      </view> -->
       <view class="item acea-row row-between-wrapper">
         <view>手机号</view>
         <view class="input">
           <input type="text" v-if="userInfo.phone" v-model="userInfo.phone" />
-          <input type="text" v-else value="未绑定" disabled class="id" />
+          <input type="text" v-else placeholder="未绑定" v-model="userInfo.phone" disabled class="id" />
         </view>
       </view>
+			<view class="item acea-row row-between-wrapper">
+			  <view>验证码</view>
+			  <view class="acea-row row-middle ">
+			  	<view class="input-box acea-row row-middle row-right">
+			  		<input type="text" v-model="verifyCode" maxlength="6" placeholder="请输入短信验证码" />
+			  	</view>
+			  	<view class="countdown" :class="disabled ? 'default' : ''" @click="sendCode">
+			  		{{disabled ? second + '秒后重新发送' : '发送验证码'}}
+			  	</view>
+			  </view>
+			</view>
+			<view class="item acea-row row-between-wrapper">
+			  <view>区域</view>
+			  <view class="input">
+			    <picker @change="bindPickerChange"  mode="region" :range="array">
+							<view class="uni-input">{{city}}</view>
+					</picker>
+			  </view>
+			</view>
       <!-- 
         <view class="item acea-row row-between-wrapper" @click="goChangePassword()">
           <view>密码</view>
@@ -59,7 +84,8 @@
         </view>
       -->
     </view>
-    <view class="modifyBnt bg-color-red" @click="submit">保存修改</view>
+		<view class="tips">会员信息仅用于身份确认，不做他用。</view>
+    <view class="modifyBnt" @click="submit">保存修改</view>
     <!-- #ifndef MP-WEIXIN -->
     <view
       class="logOut cart-color acea-row row-center-wrapper"
@@ -71,6 +97,7 @@
 <script>
 import { mapGetters } from "vuex";
 import { trim, isWeixin, chooseImage } from "@/utils";
+import { getVerificationCode } from "@/api/serverTeacher"
 import { VUE_APP_API_URL } from "@/config";
 import {
   postUserEdit,
@@ -94,6 +121,11 @@ export default {
       currentAccounts: 0,
       switchUserInfo: [],
       userIndex: 0,
+			disabled: false,
+			second: 60,
+			time: null,
+			city: '省/市/区',
+			verifyCode:''
     };
   },
   computed: mapGetters(["userInfo"]),
@@ -101,8 +133,57 @@ export default {
     this.avatar = this.userInfo.avatar;
     this.isWeixin = isWeixin();
     this.getUserInfo();
+		this.userInfo.city ? this.city = this.userInfo.city : this.userInfo.city = '省/市/区';
   },
   methods: {
+		bindPickerChange(e){
+			this.city = e.detail.value.join(' ')
+		},
+		sendCode(){
+			var reg=/^1[3456789]\d{9}$/;
+			if (this.userInfo.phone === '') {
+				uni.showModal({
+					title: '手机号码不能为空',
+					type: 'none'
+				});
+				return 
+			} else if(!reg.test(this.userInfo.phone)){
+				uni.showModal({
+					title: '请输入有效的手机号码',
+					type: 'none'
+				});
+				return 
+			} else{
+				getVerificationCode({phone:this.userInfo.phone}).then((res)=>{
+					if(res.success){
+						uni.showToast({
+							title:'短信已发送！'
+						})
+						if(this.disabled == false){
+							clearInterval(this.timer)
+							this.disabled = true;
+							this.timer = setInterval(()=>{   //设置延迟执行
+								this.timeup()
+							},1000);
+						}
+					} else{
+						uni.showToast({
+							title:res.msg,
+							icon:'none'
+						})
+					}
+				})
+			}
+		},
+		timeup(){
+			this.second = this.second - 1;
+			if (this.second == 0) {
+				this.second = 60;
+				this.disabled = false
+				clearInterval(this.timer)
+				return;
+			}
+		},
     goChangePassword() {
       this.$yrouter.push("/pages/user/ChangePassword/index");
     },
@@ -169,28 +250,42 @@ export default {
 
     submit: function () {
       let userInfo = this.userInfo;
-			if(userInfo.realName == ''){
+			console.log(userInfo)
+			if(userInfo.realName == '' || userInfo.realName == null){
 				uni.showToast({
 					title:'请填写真实姓名',
 					icon: "none"
 				})
 				return 
 			}
+			if(this.verifyCode == ''){
+				uni.showModal({
+					title: '请输入手机短信验证码',
+					type: 'none'
+				});
+				return 
+			}
       postUserEdit({
         nickname: trim(this.userInfo.nickname),
         avatar: this.avatar,
-				realName: trim(this.userInfo.realName)
+				realName: trim(this.userInfo.realName),
+				idCard: this.userInfo.idCard,
+				code: this.verifyCode,
+				phone: this.userInfo.phone,
+				city: this.city
       }).then(
         (res) => {
-          this.$store.dispatch("userInfo", true);
-          uni.showToast({
-            title: res.msg,
-            icon: "none",
-            duration: 2000,
-          });
-					setTimeout(()=>{
-						this.$yrouter.back();
-					},2000)
+					if(res.success){
+						this.$store.dispatch("userInfo", true);
+						uni.showToast({
+						  title: res.msg,
+						  icon: "none",
+						  duration: 2000,
+						});
+						setTimeout(()=>{
+							this.$yrouter.back();
+						},2000)
+					}
         },
         (err) => {
           uni.showToast({
@@ -231,5 +326,35 @@ export default {
 		height: 80rpx !important;
 		line-height: 80rpx !important;
 		font-size: 32rpx !important;
+		background: #F99C10;
+	}
+	.countdown{
+		min-width: 140rpx;
+		height: 58rpx;
+		padding: 0 10rpx;
+		font-size: 24rpx;
+		background-color: #F99C10;
+		color: #fff;
+		line-height: 58rpx;
+		text-align: center;
+		border-radius: 10rpx;
+	}
+	.tips{
+		color: #F99C10;
+		font-size: 28rpx;
+		line-height: 34rpx;
+		padding: 24rpx;
+		box-sizing: border-box;
+	}
+	.default{
+		background: #999;
+		color: #fff;
+	}
+	.input-box{
+		text-align: right;
+		input{
+			width: 80%;
+			margin-right: 10rpx;
+		}
 	}
 </style>
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index ee72d8a..617df35 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -21,13 +21,13 @@
             </view>
             <!-- #ifdef MP-WEIXIN -->
             <button open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" class="binding" v-else>
-              <text>绑定手机号</text>
+              <text>点击绑定手机号</text>
             </button>
             <!-- #endif -->
 
             <!-- #ifndef MP-WEIXIN -->
             <button class="binding" @click="goBindPhone()" v-else>
-              <text>绑定手机号</text>
+              <text>点击绑定手机号</text>
             </button>
             <!-- #endif -->
           </view>
@@ -166,7 +166,7 @@
 						  <view class="pictrue">
 						    <image src="../../../static/user-menu2.png" />
 						  </view>
-						  <view class="cell">学习榜打卡</view>
+						  <view class="cell">打卡榜打卡</view>
 						  <text class="iconfont icon-jiantou"></text>
 						</view>
 						<view class="item" @click="goUserFeedBack()">
@@ -176,13 +176,13 @@
 						  <view class="cell">建议反馈</view>
 						  <text class="iconfont icon-jiantou"></text>
 						</view>
-						<view class="item" @click="goUserJoinUs()">
+						<!-- <view class="item" @click="goUserJoinUs()">
 						  <view class="pictrue">
 						    <image src="../../../static/user-menu4.png" />
 						  </view>
 						  <view class="cell">企业招聘</view>
 						  <text class="iconfont icon-jiantou"></text>
-						</view>
+						</view> -->
 						<view class="item" @click="goAddressManagement()">
 						  <view class="pictrue">
 						    <image src="../../../static/user-menu5.png" />
@@ -190,7 +190,7 @@
 						  <view class="cell">收货地址</view>
 						  <text class="iconfont icon-jiantou"></text>
 						</view>
-						<view class="item" @click="toServiceIndex()">
+						<view class="item noBorder" @click="toServiceIndex()">
 						  <view class="pictrue">
 						    <image src="../../../static/user-menu6.png" />
 						  </view>
@@ -346,8 +346,16 @@ export default {
       this.$yrouter.push('/pages/user/coupon/UserCoupon/index')
     },
     goIntegral() {
-			return
-      this.$yrouter.push('/pagesB/pages/user/signIn/Integral/index')
+			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')
@@ -362,7 +370,6 @@ export default {
     },
     getPhoneNumber: function(e) {
       let thit = this
-      console.log(e)
       // 判断一下这里是不是小程序 如果是小程序，走获取微信手机号进行绑定
       if (e.mp.detail.errMsg == 'getPhoneNumber:ok') {
         uni.showLoading({
@@ -374,24 +381,37 @@ export default {
         })
           .then(res => {
             // this.User();
-            thit.$store.dispatch('userInfo', true)
-            uni.hideLoading()
-            uni.showToast({
-              title: res.msg,
-              icon: 'success',
-              duration: 2000,
-            })
-          })
-          .catch(error => {
-            uni.hideLoading()
-            thit.$store.dispatch('userInfo', true)
-            console.log(error)
-            uni.showToast({
-              title: error.msg || error.response.data.msg || error.response.data.message,
-              icon: 'none',
-              duration: 2000,
-            })
+						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)
+          //   console.log(error)
+          //   uni.showToast({
+          //     title: error.msg || error.response.data.msg || error.response.data.message,
+          //     icon: 'none',
+          //     duration: 2000,
+          //   })
+          // })
         // // 获取当前环境的服务商
         // uni.getProvider({
         //   service: "oauth",
@@ -482,7 +502,6 @@ export default {
         })
         return
       }
-      console.log(this.userInfo)
       if (url === '/pages/orderAdmin/OrderCancellation/index' && !this.userInfo.checkStatus) {
         uni.showToast({
           title: '您没有核销权限,请后台店员设置！！',
@@ -509,17 +528,17 @@ export default {
   },
   watch: {
     userInfo() {
-      this.MenuUser()
+      // this.MenuUser()
     },
   },
   onShow() {
     if (this.$store.getters.token) {
       //
-      uni.showLoading({
-        title: '加载中',
-      })
+      // uni.showLoading({
+      //   title: '加载中',
+      // })
       this.$store.dispatch('getUser', true)
-      this.MenuUser()
+      // this.MenuUser()
       this.isWeixin = isWeixin()
     }
   },
@@ -563,11 +582,12 @@ export default {
 		width: 200rpx;
 		height: 62rpx;
 		background: #BF922B;
-		border-radius: 31rpx;
+		border-radius: 30rpx;
 		text-align: center;
 		line-height: 62rpx;
 		position: absolute;
-		right: 50rpx;
+		right: 30rpx;
+		top: 30rpx;
 		z-index: 4;
 		color: #fff;
 		font-size: 28rpx;
@@ -718,7 +738,6 @@ export default {
 }
 
 .order-status-num {
-  min-width: 0.33 * 100rpx;
   background-color: #fff;
   color: #eb3729;
   border-radius: 15px;
@@ -749,7 +768,9 @@ export default {
   border: 1px solid #e8695e;
   color: #ffffff;
 }
-
+.noBorder{
+	border: none !important;
+}
 .by {
   text-align: center;
   padding: 30rpx 0;
diff --git a/pages/user/feedBack/index.vue b/pages/user/feedBack/index.vue
index 84fcb1a..4b3aae9 100644
--- a/pages/user/feedBack/index.vue
+++ b/pages/user/feedBack/index.vue
@@ -72,7 +72,7 @@
 	.submit-btn{
 		width: 208rpx;
 		height: 80rpx;
-		background: #6E85EB;
+		background: #F99C10;
 		color: #fff;
 		text-align: center;
 		line-height: 80rpx;
diff --git a/pages/user/myBangdan/index.vue b/pages/user/myBangdan/index.vue
index a8d0288..00dd7f4 100644
--- a/pages/user/myBangdan/index.vue
+++ b/pages/user/myBangdan/index.vue
@@ -5,6 +5,11 @@
 			<view class="tab-item" :class="active == 2 ? 'tab-item-active' : ''" @click="tabClick(2)">已完成</view>
 		</view>
 		<view class="dabang-list-box">
+			<view class="no-content" v-if="studyList.length == 0">
+				<image class="noContent" src="https://qiniu.upload.gznl.top/704d5b2c-730f-4a95-b9a0-1b0c8aa8b74f.png"></image>
+				<text>暂无学习榜打卡哦~</text>
+				<view class="btn" @click="toStudy()">去参加</view>
+			</view>
 			<view class="dabang-item" v-for="(item,index) in studyList" :key="index" @click="toDabang(item.id)">
 				<view class="dabang-info">
 					<view class="bangdan-name line1">{{item.listName}}</view>
@@ -20,17 +25,6 @@
 					<view>{{item.listState == 1 ? '进行中' : '已结束'}} {{item.signTimes}}/{{item.clockTimes}}</view>
 				</view>
 			</view>
-			<!-- <view class="dabang-item">
-				<view class="dabang-info">
-					<view class="bangdan-name line1">连续21天打卡站桩</view>
-					<view class="time">2021.5.28-2021.618</view>
-					<view class="time">30积分</view>
-				</view>
-				<view class="dabang-btm colR acea-row row-between-wrapper">
-					<view>-30积分</view>
-					<view>打榜失败</view>
-				</view>
-			</view> -->
 		</view>
 	</view>
 </template>
@@ -67,6 +61,11 @@
 				  },
 				})
 			},
+			toStudy(){
+				uni.switchTab({
+					url:"/pages/course/index"
+				})
+			},
 			tabClick(idx){
 				this.active = idx;
 				this.getList()
@@ -89,7 +88,35 @@
 		}
 		.tab-item-active{
 			font-weight: 600;
-			border-bottom: 4rpx solid #EB5744;
+			border-bottom: 4rpx solid #F99C10;
+		}
+	}
+	.no-content{
+		font-size: 28rpx;
+		color: #666666;
+		text-align: center;
+		padding: 30rpx 0;
+		image{
+			width: 100%;
+			height: 740rpx;
+			transform: scale(0.8);
+		}
+		text{
+			font-size: 36rpx;
+			color: #d8d8d8;
+			position: relative;
+			top: -110rpx;
+		}
+		.btn{
+			width: 437rpx;
+			height: 78rpx;
+			background: rgba(248, 163, 45, 0.61);
+			border-radius: 44rpx;
+			line-height: 78rpx;
+			text-align: center;
+			color: #fff;
+			font-size: 32rpx;
+			margin: 0 auto;
 		}
 	}
 	.dabang-list-box{
@@ -119,7 +146,7 @@
 				color: #8FB85B;
 			}
 			.colR{
-				color:#EB5744;
+				color:#F99C10;
 			}
 		}
 	}
diff --git a/pages/user/myCourses/index.vue b/pages/user/myCourses/index.vue
index f1ecec4..0516b6c 100644
--- a/pages/user/myCourses/index.vue
+++ b/pages/user/myCourses/index.vue
@@ -6,7 +6,10 @@
 			<view class="tab-item" :class="active == 3 ? 'tab-item-active' : ''" @click="tabClick(3)">可报名</view>
 		</view>
 		<view class="course-list-box" v-if="active == 1 || active == 2">
-			<view class="no-content" v-if="courseList.length == 0">暂无内容...</view>
+			<view class="no-content" v-if="courseList.length == 0">
+				<image class="noContent" src="https://qiniu.upload.gznl.top/6cefe3b3-d5ae-41b4-9d52-3e35986d7e5c.png"></image>
+				<text>暂无课程</text>
+			</view>
 			<view class="course-item acea-row row-between" v-for="(item,index) in courseList" :key="index">
 				<view class="course-item-l">
 					<view class="course-info">
@@ -30,7 +33,10 @@
 			</view>
 		</view>
 		<view class="knowledge-list" v-else>
-			<view class="no-content" v-if="courseList.length == 0">暂无内容...</view>
+			<view class="no-content" v-if="courseList.length == 0">
+				<image class="noContent" src="https://qiniu.upload.gznl.top/6cefe3b3-d5ae-41b4-9d52-3e35986d7e5c.png"></image>
+				<text>暂无课程</text>
+			</view>
 			<view class="knowledge-item acea-row" v-for="item in courseList" @click="toDetail(item.id)">
 				<view class="img-box">
 					<image :src="item.imageArr[0]" mode="aspectFill"></image>
@@ -46,20 +52,6 @@
 					</view>
 				</view>
 			</view>
-			<!-- <view class="knowledge-item acea-row">
-				<view class="img-box">
-					<image src="../../static/img1.png" mode=""></image>
-				</view>
-				<view class="knowledge-info-box">
-					<view class="title line1">《阴阳五行》一个人的阴阳五的阴阳五行…</view>
-					<view class="time">2021-5-31-6.3  8:30-18:30</view>
-					<view class="address">中国 武汉</view>
-					<view class="type-box acea-row row-between row-middle">
-						<view class="price">￥3000</view>
-						<view class="signin-btn red">去报名</view>
-					</view>
-				</view>
-			</view> -->
 		</view>
 	</view>
 </template>
@@ -123,7 +115,7 @@
 		}
 		.tab-item-active{
 			font-weight: 600;
-			border-bottom: 4rpx solid #EB5744;
+			border-bottom: 4rpx solid #F99C10;
 		}
 	}
 	.no-content{
@@ -131,6 +123,17 @@
 		color: #666666;
 		text-align: center;
 		padding: 30rpx 0;
+		image{
+			width: 100%;
+			height: 740rpx;
+			transform: scale(0.8);
+		}
+		text{
+			font-size: 36rpx;
+			color: #d8d8d8;
+			position: relative;
+			top: -110rpx;
+		}
 	}
 	.course-list-box{
 		width: 100%;
@@ -161,7 +164,7 @@
 				flex-direction: column;
 				justify-content: center;
 				align-items: center;
-				color: #EB5744;
+				color: #F99C10;
 				border-left: 1px solid #d8d8d8;
 				image{
 					width: 50rpx;
diff --git a/pagesB/pages/user/signIn/Integral/index.vue b/pagesB/pages/user/signIn/Integral/index.vue
index 1bc7a75..642f532 100644
--- a/pagesB/pages/user/signIn/Integral/index.vue
+++ b/pagesB/pages/user/signIn/Integral/index.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="integral-details" ref="container">
-    <view class="header acea-row row-between row-middle">
+    <!-- <view class="header acea-row row-between row-middle">
 			<view class="acea-row row-column row-between">
 				<view class="integral">{{ info.integral }}</view>
 				<view class="rule">
@@ -8,58 +8,72 @@
 					<text class="icon-font"></text>
 				</view>
 			</view>
-      <!-- <view class="currentScore">当前积分</view> -->
 			<view class="integral-shop">积分商城</view>
-      <!-- <view class="line"></view> -->
-      <!--<view class="nav acea-row">-->
-      <!--<view class="item">-->
-      <!--<view class="num">{{ info.sum_integral }}</view>-->
-      <!--<view>累计积分</view>-->
-      <!--</view>-->
-      <!--<view class="item">-->
-      <!--<view class="num">{{ info.deduction_integral }}</view>-->
-      <!--<view>累计消费</view>-->
-      <!--</view>-->
-      <!--<view class="item">-->
-      <!--<view class="num">{{ info.today_integral }}</view>-->
-      <!--<view>今日获得</view>-->
-      <!--</view>-->
-      <!--</view>-->
-    </view>
+    </view> -->
+		<view class="week-signIn-box">
+			<view class="signIn-box-title acea-row row-between-wrapper">
+				<view class="title-l">可用积分：<text class="colR">{{ integral }}</text></view>
+				<view class="title-r" @click="toShop">去兑换 <text class="iconfont icon-jiantou"></text></view>
+			</view>
+			<view class="day-list acea-row row-between">
+				<view class="day-item acea-row row-column row-center row-middle" 
+				:class=" index+1 <= signNum ? 'active' : '' " 
+				v-for="(item,index) in signInfos" 
+				:key="index"
+				v-if="index < signInfos.length - 1">
+					<view>{{item.day}}</view>
+					<image src="../../../../../static/glod.png"></image>
+					<text class="fz20">+{{item.signNum}}积分</text>
+				</view>
+				<view class="day-item day-item-last acea-row row-center row-middle"
+				 :class=" signNum == signInfos.length+1 ? 'active' : '' " v-else>
+					<view class="acea-row row-column row-center">
+						<view>{{signInfos[signInfos.length-1].day}}</view>
+						<text class="colG">签到大礼包</text>
+						<text class="fz20">+{{signInfos[signInfos.length-1].signNum}}积分</text>
+					</view>
+					<image src="../../../../../static/glod.png"></image>
+				</view>
+			</view>
+			<view class="tips-box acea-row">
+				<image src="../../../../../static/tips.png"></image>
+				<text>连续签到积分累加</text>
+			</view>
+			<view class="signIn-btn acea-row row-column row-center row-middle" :class="isDaySign ? 'default' : ''" @click="handelSignin">
+				<text class="b-word">{{isDaySign ? '今日已签到' : '立即签到'}}</text>
+				<text>本轮累计签到{{signNum}}天</text>
+			</view>
+		</view>
     <view class="wrapper">
-			<view class="content-title">做任务赚积分</view>
+			<!-- <view class="content-title">做任务赚积分</view> -->
 			<view class="menu-list">
-				<view class="menu-item acea-row row-between row-middle">
+				<view class="menu-item acea-row row-between row-middle noBorder">
 					<view class="menu-item-l acea-row row-middle">
 						<view class="icon"><image src="../../../../../static/jifen1.png" mode=""></image></view>
-						<text>完成个人信息</text>
-						<text class="integral">+10积分</text>
+						<view class="acea-row row-column">
+							<text>完成个人信息</text>
+							<text class="integral">+{{completedNum}}积分</text>
+						</view>
 					</view>
-					<view class="btn">去完成</view>
+					<view class="btn" @click="toPersonalData" :class="isCompleted ? 'default' : ''">{{isCompleted ? '已完成' : '去完成'}}</view>
 				</view>
 				<view class="menu-item acea-row row-between row-middle">
 					<view class="menu-item-l acea-row row-middle">
 						<view class="icon"><image src="../../../../../static/jifen2.png" mode=""></image></view>
-						<text>每日签到</text>
-						<text class="integral">+10积分</text>
+						<view class="acea-row row-column">
+							<text>每日签到</text>
+						</view>
 					</view>
-					<view class="btn">去签到</view>
+					<view class="btn" :class="isDaySign ? 'default' : ''">{{isDaySign ? '已签到' : '去签到'}}</view>
 				</view>
 				<view class="menu-item acea-row row-between row-middle">
 					<view class="menu-item-l acea-row row-middle">
 						<view class="icon"><image src="../../../../../static/jifen3.png" mode=""></image></view>
-						<text>阅读文章2篇</text>
-						<text class="integral">+10积分</text>
+						<view class="acea-row row-column">
+							<text>报名学习打榜</text>
+						</view>
 					</view>
-					<view class="btn">去完成</view>
-				</view>
-				<view class="menu-item acea-row row-between row-middle">
-					<view class="menu-item-l acea-row row-middle">
-						<view class="icon"><image src="../../../../../static/jifen4.png" mode=""></image></view>
-						<text>报名1项课程</text>
-						<text class="integral">+80积分</text>
-					</view>
-					<view class="btn">去完成</view>
+					<view class="btn" @click="toCourse">去完成</view>
 				</view>
 			</view>
       <!-- <view class="nav acea-row">
@@ -108,11 +122,11 @@
       <!--</view>-->
       <!--</view>-->
     </view>
-    <Loading :loaded="loaded" :loading="loading"></Loading>
+    <!-- <Loading :loaded="loaded" :loading="loading"></Loading> -->
   </view>
 </template>
 <script>
-import { getIntegralList, postSignUser } from "@/api/user";
+import { getIntegralList, postSignUser, signIntegral, integral } from "@/api/user";
 import Loading from "@/components/Loading";
 import { dataFormat } from "@/utils";
 
@@ -140,18 +154,68 @@ export default {
       },
       list: [],
       info: [],
+			isDaySign: false,
+			integral: 0,
+			signInfos: [],
+			isCompleted: false,
+			completedNum: 0,
+			signNum:null,
       loaded: false,
       loading: false
     };
   },
+	onShow(){
+		this.getIntegral();
+	},
   mounted: function() {
-    this.getIntegral();
-    this.getInfo();
-  },
-  onReachBottom() {
-    !this.loading && this.getInfo();
+    
+    // this.getInfo();
   },
+  // onReachBottom() {
+  //   !this.loading && this.getInfo();
+  // },
   methods: {
+		getIntegral(){
+			uni.showLoading({
+				title: '正在加载中...'
+			})
+			integral().then((res)=>{
+				console.log(res)
+				if(res.success){
+					this.signInfos = res.data.signInfos
+					this.signNum = res.data.signNum
+					this.isDaySign = res.data.isDaySign
+					this.integral = res.data.integral
+					this.isCompleted = res.data.isCompleted
+					this.completedNum = res.data.completedNum
+				}
+				uni.hideLoading()
+			})
+		},
+		handelSignin(){
+			signIntegral().then((res)=>{
+				if(res.success){
+					uni.showToast({
+						title: '签到成功！'
+					})
+					this.getIntegral();
+				} else{
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+				}
+			})
+		},
+		toShop(){
+			this.$yrouter.switchTab("/pages/shop/GoodsClass/index");
+		},
+		toPersonalData(){
+			this.$yrouter.push("/pages/user/PersonalData/index");
+		},
+		toCourse(){
+			this.$yrouter.switchTab("/pages/course/index");
+		},
     dataFormat,
     goSignIn() {
       this.$yrouter.push("/pages/user/signIn/Sign/index");
@@ -162,49 +226,155 @@ export default {
     nav: function(index) {
       this.current = index;
     },
-    getInfo: function() {
-      let that = this;
-      if (that.loaded == true || that.loading == true) return;
-      that.loading = true;
-      getIntegralList(that.where).then(
-        res => {
-          that.loading = false;
-          that.loaded = res.data.length < that.where.limit;
-          that.loadTitle = that.loaded ? "人家是有底线的" : "上拉加载更多";
-          that.where.page = that.where.page + 1;
-          that.list.push.apply(that.list, res.data);
-        },
-        err => {
-          uni.showToast({
-						title: err.msg || err.response.data.msg|| err.response.data.message,
-						icon: 'none',
-						duration: 2000
-					});
-        }
-      );
-    },
-    getIntegral: function() {
-      let that = this;
-      postSignUser(that.data).then(
-        res => {
-          that.info = res.data;
-        },
-        err => {
-          uni.showToast({
-						title: err.msg || err.response.data.msg|| err.response.data.message,
-						icon: 'none',
-						duration: 2000
-					});
-        }
-      );
-    }
+    // getInfo: function() {
+    //   let that = this;
+    //   if (that.loaded == true || that.loading == true) return;
+    //   that.loading = true;
+    //   getIntegralList(that.where).then(
+    //     res => {
+    //       that.loading = false;
+    //       that.loaded = res.data.length < that.where.limit;
+    //       that.loadTitle = that.loaded ? "人家是有底线的" : "上拉加载更多";
+    //       that.where.page = that.where.page + 1;
+    //       that.list.push.apply(that.list, res.data);
+    //     },
+    //     err => {
+    //       uni.showToast({
+				// 		title: err.msg || err.response.data.msg|| err.response.data.message,
+				// 		icon: 'none',
+				// 		duration: 2000
+				// 	});
+    //     }
+    //   );
+    // },
+    // getIntegral: function() {
+    //   let that = this;
+    //   postSignUser(that.data).then(
+    //     res => {
+    //       that.info = res.data;
+    //     },
+    //     err => {
+    //       uni.showToast({
+				// 		title: err.msg || err.response.data.msg|| err.response.data.message,
+				// 		icon: 'none',
+				// 		duration: 2000
+				// 	});
+    //     }
+    //   );
+    // }
   }
 };
 </script>
 <style lang="less" scoped>
 .integral-details {
 	height: 100vh;
-	background: #fff;
+	background: #EEEEEE;
+	box-sizing: border-box;
+	padding: 20rpx 30rpx;
+	.week-signIn-box{
+		width: 100%;
+		background: #fff;
+		padding: 30rpx 30rpx 40rpx;
+		font-size: 28rpx;
+		box-shadow: 0px 6px 12px rgba(0, 0, 0, 0.16);
+		border-radius: 22rpx;
+		margin: 20rpx 0;
+		.signIn-box-title{
+			.title-l{
+				font-size: 32rpx;
+				color: #222;
+				.colR{
+					color: #FF0D0D;
+				}
+			}
+			.title-r{
+				font-size: 20rpx;
+				color: #f8c06f;
+				width: 104rpx;
+				height: 30rpx;
+				line-height: 30rpx;
+				text-align: center;
+				background: #F3F3F3;
+				border-radius: 14rpx;
+				.icon-jiantou{
+					font-size: 20rpx;
+					margin-top: 2rpx;
+				}
+			}
+		}
+		.day-list{
+			.day-item{
+				width: 148rpx;
+				height: 160rpx;
+				background: #EFEFF1;
+				border-radius: 12rpx;
+				color: #fff;
+				font-size: 24rpx;
+				color: #333;
+				margin-top: 28rpx;
+				.fz20{
+					font-size: 20rpx;
+					color: #AFAFAF;
+				}
+				image{
+					width: 72rpx;
+					height: 72rpx;
+				}
+			}
+			.day-item-last{
+				width: 312rpx;
+				.colG{
+					color: #AFAFAF;
+					margin: 10rpx 0 0;
+				}
+				image{
+					width: 106rpx;
+					height: 106rpx;
+					margin-left: 30rpx;
+				}
+			}
+			.active{
+				color: #fff;
+				background: #F7C37A;
+				.fz20{
+					color: #fff;
+				}
+				.colG{
+					color: #fff;
+				}
+			}
+		}
+		.tips-box{
+			font-size: 24rpx;
+			color: #D1D1D1;
+			margin: 28rpx 0 48rpx;
+			image{
+				width: 36rpx;
+				height: 36rpx;
+				margin-right: 8rpx;
+			}
+		}
+		.signIn-btn{
+			width: 424rpx;
+			height: 110rpx;
+			background: linear-gradient(320deg, #FBBE66 0%, #FABF69 100%);
+			box-shadow: 0px 6rpx 12rpx #F7D08E;
+			border-radius: 56rpx;
+			margin: 0 auto;
+			font-size: 20rpx;
+			color: #fff;
+			.b-word{
+				font-size: 40rpx;
+				line-height: 56rpx;
+			}
+		}
+		
+	}
+	.default{
+		color: #999 !important;
+		background: #EFEFF1 !important;
+		box-shadow: 0px 6rpx 12rpx #EFEFF1  !important;
+	}
 	.header{
 		background-image: none;
 		width: 750rpx;
@@ -237,9 +407,11 @@ export default {
 		}
 	}
 	.wrapper{
-		
-		padding: 0 30rpx;
+		background: #fff;
+		padding: 30rpx;
 		font-size: 28rpx;
+		box-shadow: 0px 6px 12px rgba(0, 0, 0, 0.16);
+		border-radius: 22rpx;
 		.content-title{
 			font-size: 36rpx;
 			font-weight: 600;
@@ -248,10 +420,13 @@ export default {
 			margin: 50rpx 0;
 		}
 		.menu-list{
+			margin-top: 20rpx;
 			.menu-item{
 				width: 100%;
-				height: 136rpx;
+				height: 100rpx;
 				border-top: 1px solid #ececec;
+				font-size: 28rpx;
+				color: #222;
 				image{
 					width: 76rpx;
 					height: 76rpx;
@@ -260,20 +435,22 @@ export default {
 					margin-right: 20rpx;
 				}
 				.integral{
-					font-size: 32rpx;
-					color: #FD513B;
-					margin-left: 20rpx;
+					font-size: 24rpx;
+					color: #FCBF64;
 				}
 				.btn{
 					width: 122rpx;
 					height: 52rpx;
-					background: #FD513B;
+					background: #FCBF64;
 					border-radius: 30rpx;
 					text-align: center;
 					line-height: 52rpx;
 					color: #fff;
 				}
 			}
+			.noBorder{
+				border: none;
+			}
 		}
 	}
 }
diff --git a/static/course-icon1.png b/static/course-icon1.png
index 38a651eb93770417f52e1541ebb630a3f66a9d8a..a3d9976a02c17cc8383f0544b31f92cae47ac64b 100644
GIT binary patch
literal 615
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`Z?gjXSxB}__t3v<pZ}_yQ^8bmd
z?|X}X94!5Dr0mzxs$YjIzV0vkcBuNt;ffyzs(u`){C24P`@!<>hpWCH1hOkZ3?K<&
zfY1*h31fdd1eB@*s`&v_gFs*{AjJ^D>hH%}zMp9Qac;_w^HYDEpZ4Rz^dA>y{Jg&W
z=k*o8Zm#)tYu&GV+kV~K{_FmZ-$3+W_wR>$em~s%`{BOdkAP_Z?<a?UKRNRE{oTJG
zfau=e&rkmS`0($?$A7=R{QLL!|NsBbpWIyp^r1#ckY6wZGmEgeysEl^v5A?Bt5-x^
zTzpym@)aw0@4j^T`s>#pK79QA_1Et|f4|%~_nCo#QNYv1F~s8Z*(sU+ha5y)xy7z4
zZPJ|T%9zQ%WreQ7Z0+dh|Nkorr@h?saH`1>{(1Su#goiFzmq=vBl!~R?uP=R%i~Ti
zZ!C^eme?A6bmJ|S<#VU{J)3u=aJpbnWSV~b=?QJ8&!^9vvNL&?%?te%50;-dzMc})
zH~+qqlwe=QtmL4HbL})z4n0zu>~*`@zw}RTT+ou^XZyCie0j<GZt616yQWHOcLjXX
zI3_%WZH0(KW{=ln<|PUzpMQ}5E);VxYB!USf5FTp(^GU#G{j$JJRXwDwMxm$oN1}_
zp-U%!RRz}Ww++0n9QSFqZFhn0wx>%(cL$wK-dQnyuEg_$L18~0iIuKOe_-hGRJ-);
i!HgT>nvef~;{I`WOJSH!od_^I89ZJ6T-G@yGywob<6$TO

literal 511
zcmV<b0RaAqP)<h;3K|Lk000e1NJLTq0015U0015c0{{R34DMc#0001)P)t-s0002h
zRV(dTLF-pU>{mqWS48YrL+e*V>sLhUS48VqMeA5a>s(3eT}td>Q0!t*>|;{xXjkoN
zSn!8>@QQu$jDPWsfbx}z^P-pZrJMAnob|7!_Oz_`!Mgaxzxc_+`Pb6=*V6jf)cV`k
z`rg|6-`o4)-uvR;`{m;N?CJgV^ZoYq{`U3$_xAqy_x}6({`~y@{rvy`{~7{=aR2}S
z33O6UQve1lkCVLA^88LzRZ9Q>0Srk*K~yNug_G%af-n$;BOn+NEY`Ag0VBmCP{euv
zhbuBTksNI9pUla3xMViQdKsqe@QEDTG#F}Ot@w;q)?%Pb{zS_gxA;?8{eQ{XkFv6<
z%PjKA-(cn#ZjuUGk*1=BD%p&eCbKaJawtOY7I|R-d4RVz!;FG+7rS>)H@=>cI}Dxk
zZa)M+@58ab=ID<&ffzr8FFa#NB;HnqJH>8M`Gg|~`4saIBEnhgsn}~X!lmFU=AtCr
zq=d!G7^My2n(zUBKX-`h8T0kqH(WjxbNRGhug8<}G?^IbF)^RYLS=s}i!AD0lcLI&
zjFK&xZD>ag)r^B?n3Pd$lu^_SvThADOZ4vw{sE2KFJp(qP;dYM002ovPDHLkV1htK
B2krm>

diff --git a/static/course-icon2.png b/static/course-icon2.png
index 96e1348fe835a5bdf71c0ddf9f60971cf4ed3481..479b5d951fa81497e954c24a947961856d32defa 100644
GIT binary patch
delta 605
zcmdnV_LXIVay`S70G|+71_p-zt3v<pZ}>km?f=z=9|uc+>?`}cul(nc@*jt*ejKj+
zaj5Fsp-Le70YpbCza6glb{I$krK-Lk0wR$3cc2KE1c?B}K?o=aV;`ycezf8H@s{r=
z+J2nr`*C){k8_iM)?Z!t^V;HHH&*?+x#ricb-!+J_;qK~ue)1*-P`u-{*K>|_Wgc*
z;P>N0zn=ink>5{`|9*b@4-maL`{&igKd&$Ud3*iO``dp%Kl%IR#ow>5{(gJ&4~Twz
z`1kYEzh7Ve{rU0l@2`J<fB*aU_y7O@yBhDZ13jux666=mz|6wRrmC)8uieqv)!X0S
zKVjn3sk66k-F4vl?XN$7{r+nq`t2M81EYeci(`m{WbVPvu%-YJ)(eZL-pny$;$@$j
zbLG@Cos}kQfB*k~xz;ABbI;zykgU1`a}LC>KA^Q$?$X18oh+gEmR^0ckJq&=|E}8F
zxt0v3YEpYUm#FP!6P7;kNU-;X^RgrLg1w8iwq>{|pOkbpdG%q1RJ_sS)s9aU7wnqe
zRK1EJWNoL2PgKZ)U4re|S^;~z4_k|_*mpG1g;lF?5!2NOnPVXfx{fL?W4hXHVH4c=
z%16d;rGqHn(g(&%n0os}VlFcD8cdUHp1?LE<G<HA|Jj@uUU{5T)n(ZtmwJkMErZ<J
z4Pp8-?SkcA`LwQ|RK+#(mdn=}|KF(;o~}P0nlO82_r?=H=FGHe_*t9g$JX32bFWcI
p<<kZ}cJI^(?$=<yMmPLo?pV0C@qW(qRluNS@O1TaS?83{1OQB1V@d!3

delta 803
zcmV+;1Kj-e1i1!~BYy!zP)t-s0002hRV(dTLF-pU>{mqWS48YrL+e*V>sLhUS48Vq
zMeA5a>sdzYT1V?!N$Xup>t9UkUrp>`PwZh(>|;^vW>xKISM6z7?Q2`@Y+UVaT<vaM
z?QUM}Z(r_kVD55a?sH@Ab7byxWbSok?|N(RdTj4~Zts3??|*-B?|^adfO7DNd+>>T
z@sWk{m5B0|it?6=@|TP9nT_(Aj`Ew2@|%$JoRIUJk@KCB^P!jYrJMArpY^Sz^{%D$
zucq~}sr9p~_PVq8zPI<nyZFk)`OnGu(8~GJ&H2>N`PI<+*VFph)%x1j`rFs~-rD-!
z+xy?#`{3OB;D6ow;@|t@;QQp^`{v{P<>LJ4<^1X9{ORZX>gfFI>HY5P{qODl@b3Nf
z^!@hr{`U3$_xAqy`2P9${`&d;`uhI+`~Lj={{H^||Nk-@a6bS5010$bPE!B|E02@B
z)bjjJR8>m=00EmxL_t(2&xMocTf#69#!D&1FhmsG1AiwD6kMPpsJKuZATk^XR_fsW
z|G(R$B`rKWdLMG{<@Y4HTrPs3nP``tq{E!DT@-Y)NqwY;^+`5H9Y!43JgX>5<!m!x
zOgJc)bnQzvU|1vR)8{1ZTz%)!0&uxCJuoo6bqN$k_5DS`&cs+9<(2lSD`nKjn6e8p
zb^ao*hJVbghOSWbQy~lNMk$mAtyvG2kYe`}=ooCa!qi8yijs{`6>c?y)H9sGIdy40
z@if)vNN{|CC|wKW<MBK|*GF-|aTQbAm_@#ykp4WfS}=tw$0}$Y6vSx|heE3amE-qb
zxWVxwLfxCsp~!KDrP-0%9x@z9aNT{e9M(AYzJH>tEUS3&a!ht{=e8Er^MD;<Vs{Sv
zR(ybaj|G#^*Y}c1mw!Izi4~J=)W+L%vfhdrQfRm6F{;D58hO@}XAdeH%6*C|TR-uH
zjLVpmjb@@egW3Wii*Gn-Q>~dq-sG+$sIi#ZIy75d<c&;iqX~Sho3Uj52Aa*@-prVh
h!yNYiC;IaX{sN7tWCp`AcSHaH002ovPDHLkV1j8)&KUpz

diff --git a/static/course-icon3.png b/static/course-icon3.png
index 9d12aa107e8c88f349df8e8e77244cf440bb846a..dd855e0e01db53a96d02684a6d1848e3dc714104 100644
GIT binary patch
delta 485
zcmdnQ@}GHvO8wpdpAc6D28REuLjUh?_&+o4|J8;c2TOnKEBm~!{O6JKABU@c9IpIv
zsOsCHN+9|HL`N#W9j^Fx7)S!8s=glrB9QoZpa_@*i2%hx2q*|+AF2I*r0)CC`rl6u
z|9*Px_p{@_pP%~kqW;XEm*@Vxy7=eK)xRI^{`>y!-;ekIetrJ;>)XHI-~asqq96bM
z{QCFz&;LI^{{Q*)|1S{z{tx8-1ERnG|NZ;_|G$LkLy!*?N`m}?8JJmE*;LiFwL3by
zdi(qPCrq3=b@tY+yAE8x{q^Us-+wJcznufBz3A!U7@~20>*f06LQMt&Y!6snH!6o!
zy<y#ue00zM<e33{MxJ_o{}m-arOvo{QjfvY)mZn7=;@qLh2ASA0?K}|i?sMRzdzt#
zZhwN0P4!SzooxF{xkrDNFb9<We6#9;bB&voM9SQ?$uS;VW(XKGgl#$6b0)La;lJR<
z3U}4SX^$4q@K4&;^;7j(T*Mi3!}~}7{OFwjUq>gk`}q4Oj+xdm5jB3d9Mxa99o1%v
z4Y0lC)2{SxdT@)4=z{(o7d_`sKW-y?^5hJY9I;!bma~nPo|SNHJ;g3<JV&}&o0k#j
OJ)nF2T-G@yGywqKvK^BE

delta 537
zcmV+!0_Oey1F{5=B!A3MOjJbx007lhEA3f9>sLhVS48YrMC?~X>sLeTS48VqMC)5g
z>s(3eT}ta+OY2@t>t9UlVNmt4sP?w5_P4M0xUlxRv-Z5T_r|~Z(#`qP&iU8U`q$I?
z+SdBq*!tYr`rX<4-P!xz+WX$y``_F9;N1J*-TUF*`{LjG<bUD&<l_6~;``>~`|0NV
z=;i$E>iq5N{O;`i@b3Na@BQ)b{qphs^YZ=m^!@hr{`U3$_xJw!`2P9%{`&d;`}+R-
z`~Lj={{8&^{r&#_{{R2~2#naq00009bW%=J00t|Mlf2aO{7zI=O8@`?3`s;mR4C7d
zlj&B&AP|K~Ab+H|C0ezcam8A9+p2MGH1q!NBtw=qf#Uta03T;y4tEGq@+l8RLm{U=
zDde$^u&Bd4O@neh=oPUyC^rJ+tU8|0ia5)w9j5NBGsC=ybExzCgo^c8P{P%?bNCJ|
zrF)wSaDo*bz>|~`GO3k;8m6#|^%2bR{IJn}TJ&;{bAOE?F$=qSZQ-V_QzxFhEwN1t
zH_n{NuRff3{AtJW=m^8*mlekej4;Y?10VMzMUxok7YhUTVR%wfac;gm8bU?I*^ha5
zbbD7)ar&!qxTdfq*B{F34{d1sG1YdUwH+Fo!oD^WTG3{v?v}RV(#WRRY8w~|y#JfX
b*@AyT#1ce8O4CLh00000NkvXXu0mjf(=S0K

diff --git a/static/course-icon4.png b/static/course-icon4.png
index 29a1d80e4dbb0e27bab82b9b482e7f9104809bdb..8dfac54b361ead5add7616279131845a13377ce9 100644
GIT binary patch
delta 554
zcmV+_0@eM31;PZ7BYyzfP)t-s00030s#X8Lfd83h|J8u_!FBk)cJsb>`NVhl!+Q9`
zdHBM5_QHAg!g=_@dHBS6_QQDg!+G|@dicY7_riMj!g=_@dH2J4_QHAh!+H0@diTS6
z_rrSk!+H0^diTS6_rrSk#C-R~e)q+I_s4|y$cFgIi1^Bi_<zca_{)s=%#QfYkoeD)
z_|TX6(wq6$sQTHg`rfwt;k^6g#rx*T{OZyC>(l)1+5GR^{qW!Y^5p&V<o)yJ{q*Sl
z_3Hih?Ed!b{`c<w`0)Pu^8Wht{`>a+{P_O<{r~^}y+x8E0000WbW%=J00RUC1|=se
zD~O4TjgOCykbjYtm7BG-y1>`l_4)ey{Wul&&Hw-a_DMuRR4C7V(^*r(FcbygLlLYi
zSl1Gkg9`3i<GzE6z5o9g`9Q15B<Xp~H*+V;2>_tk?kHMOowX+Bsjc?tNpHCZ0MQNu
z*{%a<Gnf{z*e9pr$%O33*d&>0t!I{LtuvAd(qfQ3p?_FRp{iJcRZKtU4&R&n=<w*x
zIMa#4+`ldL?tm_nS2GcjpUhY?nMcneuV)PL`BdcdGQ`)ph)Ax7K0bUXxAru4`Sk1m
zVBZ%GznItZ;jsPKqiQ}bSyi$6tAm$QBt@BQzL}S41Mz^I_^S9$4q{*{T;v46!d^&s
sBLIk2x+6a9E=9#JYpi>|U;_Yt0f3m54{7#$!T<mO07*qoM6N<$f_Ju2vH$=8

delta 618
zcmV-w0+s#31cC*SBYy!DP)t-s0002hRV(dTLF-pU>{mqWS48YrL+e*V>sLhUS48Vq
zMeA5a>sUtXT1V?$O6*`x>|#*tWK-;AQ|xC}?Ppf)X;|%STkULI?QLD|a$@dtWA1ch
z?s#eLd1~)_Z0~+>?|^dfhIsLff$@)m@sWk{mWuM1i}IO`^M9L=^P!gWqL}okp7g7t
z^{=M&u&4I5t@gXK_PezA!@c;&!T8R}`OnGu(#`qP&iU2R`qj|-+12{m)%x4l`rO$2
z;NAP--TUF*`{LjG<KO$^;QQs`{O08R=j8n7<^1U7{OIQV>*@UM>;3QT{qXMn@bCTd
z@cs1j{`U6%_kZ^O`1k($`TqO*{`~y@{rvv@{r>*_{{H^||Nrl^5-9)x010$bPE!B|
zE02@B)bjjJR8>m=009(9L_t(2&xO<1TEajO1>i{`o1=)mS5)ka3MzI~?6IIRpqcl7
z4=-d1rk<<$_TO*!<_r-L>4qinFTyf(`io}Th>2}#M1MqD4hhL=L}Vf{CXsFf4US0z
zuyry3l%$lOZ?c=`wv@62z#yyh(931;=!w@EED~uf2x*KiJGTL!xe>1V8){r_)gnAr
z=gJ@e6!!UUD#9r2@xvT2bKSWXVqm4|ZLYiSTF+50WAdE&Y8pvA|K$75QW9@@&E?{2
zdnX^qBVz}AIsuFx@$q<+XPuw&008uFx84^beDPIO<KoACnESqK!H-oQ3UQtf1FrC}
zVv)u|)ghiORi-jO24%Y8T~(%xDrOWpYYj4%D0KyY0jqRKmz)v(ivR!s07*qoM6N<$
Ef(}V%ApigX

diff --git a/static/glod.png b/static/glod.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb549b411d81c87fd50bc0b66f4878d5fefbe989
GIT binary patch
literal 12213
zcmV;mFG|pfP)<h;3K|Lk000e1NJLTq004{t004{#1^@s6uE0S)001BWNkl<Zc%1Eh
z36Ld8dETE{_0H~oeazJ}vpd7=z%0Wdc9%dF3%fE%T4RM20xd`@WGO6R1q&!_$>6Y!
zA|&jPEjesC3^GE5<bXhcxi&znBLv9YtT4yUVl6D}$<9po^fi6=yQ(VFk#)VSzy8ds
z_g?q1%PKoEs$N!AR_6bI_5FYTnN`g$T(|%SnAi|io6cpH<G5^?bBoGNNe)pifj&0O
zxwdPDZR6O<J)nBaDq&cVlmW;vAhMO4QjtRS<1GHoh-3I#hOVLN!uK+zqWg`U_8Tzc
z0L7$q3IIjt+O9X9H%ziAR4<bV02F{E0S2mFMfal8z5{2!0J9%Jv9U=JNXi~7YC}<y
z#QBuDu>r(%Zw#I%C2;lwFlB^Y7AR$aFznWJud;2YlF28bz=4mMeuG7^6nI7j&RC!s
z2QW_rP>RY;WkvTH6*xAan98WF4i=LVSxMFz7C2+E&8UDG1uUZgWxvZz?Xb0b7$;XR
zD*}qG47X<#;2a3sSOIgx*+0qrzVDG=`+fn1I)@irV=6PXX_z!BSoAVs01p_HIV^BW
zv&{`>|0F%<zDIt|Dh6&ns-=Ab3sxXUfJn+X+Q+{g;<vs}W!tfFbJ2Zq8yWH2)K^MA
zWlXY3C!^{%Or=axi3*2d6&n*!>|tV?Va^THk?C(8nwfm`yz6wH!MS%0XZ|&eiFpQM
z4w!5)fO;eoIT2T}2LQeV=z!##64-{6d__q2vJjQae$e>d=I(V5tZqH`s@6|QFp5OX
zg3E2^GE}C^lk$i3RGMv+j&-InC2OQtnWPcHvY$XH3zEz^lZ`8l`PqAKtW~yN<naDY
zjQh`HAdeOaWRxU<tw`bCABgI`J#YGJOB**`*zFwe#8qKnlmSnf^MC*vAW%?1D*}b}
zc+u2=4J_lZN)dC6lusVM=k#>*@!MRd`;R&Iei#61w$2@3>IqT#svp!px79xV>4mkM
zzgGZ?VKNl36A+-mWz_Fd$4r13*96&Er3{N;n+@82=J@>Vz4LQZ-+iU)w11kj;Q0mZ
z{=Ot3oxk^k=3lJuT>pusjhmJTg$u+cWdQ_;eZT;mQ9wf;rvS6xCTLU^F*<w>?>pDc
z|Mid6s~dMXy#KP;fqW{YAQ08hcKfp*dUWY0|4$&Q0RjvKqH)*<D}8Jeg#j}TSjw`B
zl`(8(la0lRYY%_%)m3-<Uoa+47qs<BouuTC_x;wNURt~5W4oObdqV<;Vk8)XZAJ!-
z4wzxUQq}|w%On^;;qQt1QuEZ2&-`MwvhxN8^6--y2}33cY_0E2z3bxY%RjK!oo^dJ
zA_@RhhH=2Mg#yqF4VYoTG7PJb0MSg3`>f-iculRk@vj-kWBZ_=CvB3zmV5o#|NhXG
zSAH}QRUd()41mDGHv0ye1Te#ZrHsGAiG3q5sO{PLzx+oN^~K-eEO^dSNA2S$A)RmU
zbx-`qN0xr-D+FLnTMQ;3_RIP;R?sNGj0=`BqaKP?s4btJd}#XQ+?RgKb-J%9VJ3f2
zlk|i7M;F##@}D<$&uzvaC<B@za|MK-1H*vE2ACqSl<`+e14ZR$&42tSn)Rjs#6TW-
zngS)0B(T+XcmB5?T6)!|HPDO;93Xx}S<sjOGY(j+ehD>aGErZgICJE0-s(D?*FKF|
z#hCn{@xLEieZ}wYb;Hq=4iFoFY~X=WK|=v%Sg=qIEoK%YXim<3@$BKLZ~YNt!MXhx
z^$$*x(s^iY=eciKSij|w0<cg_V{(j#1`P(xC}6>kZlUQJn4r6Eo2V`QHvl>Leba2<
z0r-6Y5da7uK#GBg!rpQK?gDTJz^wu}mG4_q0od+dZ~iS0E#3Yp1e!9Y3OmCifkp>R
z(a_lhma^t2lh2=g-|K7c*1vheOppRXuMN=K1L$`Eye@#>Q;+U&^)LqD)&MGXfNBGv
zHUUs;M!<SvlI;1@|Mh`|Uw*d%G-b?G5onA<?gTKDSsDi{)Y^`44U5Y=)n}jh;D2zP
z_8kW<UImKw7C>h^0?M%9D4P_B6mS|XfaY`rrUOoX(ERXs7GL|@zG(DgWd;WSW*pF9
zfk_H57#uJ}IN!)9D%af2+PV1;{||@v{>g!fQ<<3Eb%4E%2r%D|qyRH93oto%pe8I3
zwNE~{^z*;b^JjVmY*Q9Awy6b30Hbs1L4n0-R+pP+kAD1}4)5K1AktF|vb_q>-Y$qe
zJ&}n4G+O|zBM}1~Kng_d3y-Y4>P_wbv9`uC2L>7)Fcesd;wvVwBuglrm|5!Q=0EhV
z0|85C2Viq4@=u=3N%=W5^8k&heQ#tSYM*~_>5ez{{F!d7@MIR80#K1}WAbHEAI7#u
zbZoG=yjwkg{Jn2?c=xt_m6CE?*B2sYc`7BvG;=2-hj|}UAnKob;L1P$SH7tC4*)dj
zJ~l`C{-|K#`XcD-=im3+4)5G%Zqtxi4Sf|*t~><L-P^ZnpRlajtlF;nApCv1v68Wp
zHL(EQA@pR5nc<wn1}|V07y&Hl{`uqYxwGQz{=&X#V{a2+;k%KqB1c(Y^d!lu?Wzx|
zFRD-b)Gj4!C3BNLN`l6U18j~k)7ZlNlo?7J_sk<7y{+bK{N}#MA_xFhF9EDP4&ZxF
zS)Amu>Wk{r+GRCOy)ShtnV&uKvD*+(SP9VRI>yYBZgI4!DAr;E4by4x#Pk=QHCem#
z`)U+6wgi-~a^+!w-HoS~uQE*9S&z(A7zP*{HEgnW@%N8UfAK7G4=9}#=@<}!r0*pa
z*)Ix(q&aF<mnIHR-1`oYV*GHw8X~V<0uZ9a$xrdr>i{f11aRmYfQjj``ocg?9+~*Y
zA8vJ?^_q5nK3V>WlhodON_46ZuNies(FloKK!VFcB%hi4_`l=KJ3IE1vU3$+<>J!=
zEJ;#*UA+jfwK_J_aOOQz>4JCz(-x7p`7@xKB+750Xv+u`wSV^TM}Dm0?EKu=VA)&-
zSX+oE0_D>$uV0Dsm~vFQID7abFUNYam?cX0pksuxVPIey43^BzTlI%$C#x5KN3Hr9
ztDje|0Bo!r_{039Pg`q|EXKnOo2*`Zo6?PCM2q!n!a#16lsjl}hDchwcKVZVVGtY{
ztB2~TQi6IqvI>=zEXHISr4yx_0+Upv_Y@zxNivxt(~Z&q(dn7HUsT~cKRcFiHdX;P
z*T%MHKX6&eM9F3h*(%*A9T~nVVH-W+Z6OWWoZc{V=DE}L2mk$8LufS`+E{-2nxCSi
zWV5$5&eOn@j+CxUdMt2ylWm4!%9x>CK0Eip+d1@~J@OOK>jEra{s;3@lvfs_q4$W_
zD;+6a73s6cG*Ks*9HAU|>h4OTSy_C;$jDdAB3CZOVg7$e)}&;#aygROi1JptQaURD
zi8ZiC#bHXBqR@Al{_{H+1V={(%-R)ze(xXHqij~PS{vO7R=QF;GfWfMOjC*xw}d&O
zK;zWi)kfW2{nfB7qomz!fSs)aU=?h7t&c6*maY4s>MxO$%o>vbldX|1S30Y^s~_q5
zN7@Et@px-ANic#B!%nsC{uu_r+(>8-e1NOeXHxbfL$t<Lt@7s;0H>PIs$6B}MCYc;
zx7|OH6pP;?s1(%iqN%!l?4y!hFxt`xrL$A5yI*C~t<8sV4JTP0BhI`^-C6$SkS0e-
zs>5ogcHa{lbc@vhcr|J=Lu?R6kOKhe0SL9;$crf7$OLQvM5cfig903)ZW*mv5~_dw
z=pIs7>K-8}*(n(wIWf}Zb!YjXaprwg$V$-@f|-U>laDr(MZQbxu3I?st{thhYE-m+
z5T+<eEL5hLxGu7|Oz)1`B>sXA%-aFhTUE=|U;uuDVnbk5K)Nk}$}C8CDq^VUVD?(+
z0|aegy)|ILMig<_Pr#_8WZ0Sos15&yg3_JR;bU8Od@gR7u;^O{jkNhNMyF`Py>$D?
z?6S7J|H8|ph&@DYHf95Y1;QkOE0*wgfQe2l4jap;-YYZL09l;{S)BnH0){w01Y-qQ
zZyCM)vCm1#^2Di;>YQ*dz8U~Nuj!RynH(-KU`*_i0%op$Vcz9?FBwSyoen_fAQx-P
z*xYm@g;rYT7t9z3$!p+tuLAV80R*?OjAAWy+yPmggP?f=WVNNq8J!CPxay|g1*sN)
zfdRAQCMC<x9zdfxbVV+2->h`G-o5dP))9(nGAv_a7^DAkr2dtE3Q~;rO}X_o7@3($
zBvrML5`3kk{vJU6nEj2!N()4F2Au9%?8{Ir6Z=I9i_8U4I~?YLH78Qg1+TLM{dN~B
zOn~bg1X|*xWO`y0??5_Am+Rdd->ZRwVj40IQ^YPQh-%K&(H3;8C}sQL7j26`g4dVO
zTYDI!-?6`@!yS;7DUj|&<iL`yAB%ku<vhC)vxNFL)G7MlZC-@-(u3gjgK&w9Jjgz`
z+W_6pNEb)Cv<K>NIW=!U4YOi)x#tvz?)i~|PU}|>7AYuuyH_FDRSs?6*e1y<Agj|L
z-R8h%gd3e@WOU4_fvg__nJ|l~&cFk2XBC3IWpKa)&c<EuQ6g_#9dWv#dtT|3(lshe
zBvTl;%TzF1`{pfKx-OY~A7F3yK+RF2+o-V;z-xoIvkbg34ZLc$pb9LCWum0bpQinc
z<Rw`(G+&_;Erlk>Y!cmV5bbrSumD`nfTzy%0VX9|HPm*8|K~KbwQt_K+P(Rrrf1WL
zi8M*Ja51m4wU?wEJ4{wXz<pX3Z_8@L9Cn5=U_l?ejf)U;He*Ma&dM)Q&avc;*eoTW
z(YFjFuZIq=IzQ@rzCP)7z}s8^v9|^;2T-mHkK1*ieHXEeht-P^P-Sa3Ti7KR(6cQ9
z&#+95uhm^>-x#(~%HiDp?d>OoU6QTCB)GB<-u43c+o!;39tLK7DV~9FCxBPyfO&g^
zO2R%40^zbU2|;ZxW*E9J3Y-e0thWwsooCra8cAt?l9KW4>=5#b+T}v~CZ*e+I2;tQ
z3lxNdGYC6c``q(EifY6Z5jsnuxYq;d_YY7~8d&0nJDfqqRYS)Bg54DmoeeX~#AZn-
z|HP>eYDuOHm=l6UhH)Lo$Sx`e?G1qb7F1mZP8|NpJXZ(#%qSW6N>1b^x(jtFDo1Od
z`=OFk1Z1R_^pKnU@(V)2u$ZQkr>BT%4%&A?RVNL0xLRoj(A!-Ge`^tVZ337>|E~%a
zj}g@tINTiw6=M4a4v5;J$bYdc!;oGZg1xK2{B~-N7}f8CWSZSwfVl#e(HRdSH=)Td
zE5LlU>|9bISRf3xZ~jmuOi1Grr9iWDfPgVoD<g$f900Gs1>W`*sLY%IRyR9^q4UdX
zz+#^z>Q~e^<rFJGh4WA3#S*-&1@N{Op%V0fJ8~dls*MK)8U>iy8T0WBSO&i<u=xVb
z;k7!x6ky09wZrzVj~IrP@3Er1b~k(eehJEg!K5P&2XL8yerF4U_9pPkqy^k=92r(a
z)LwiK9y!HMGjfPc??|a&;np&+?mAQ)0giII57=cJ+*{jGvQ`VMxG7jE^ZQbQ!}iV@
zhSm~;rxe4qoCju^@aHnjQU*8ePBgKXJZgzK)6=K`Do_ZM(ePTC2hZCDZ)*vh`ZVww
z{X(YV1U3J}Dp!H4$ZurW!k}L0+nCIe6d-zg5Og*|N89D<B{Ejbs-v<@u3DL83<a7A
z!>2?fIyW{;O!{+5$J@dAwIYV0Y!=|MY5xDtrZ1J1`m9KtJDou%)2#Uj`mwQuMxUe}
zG{rJb&<1~V0fN2NXxTxyv;k!Xq1lnuiG-g(y0s{<rzR<>Yh)1mF1@SY1KHUIhl%ih
zVX$t$O-@Emx)Y0zb;?A2H66xIe5m6RSTLESOj(t!UYj<Mvn<QlQl}f4rR27HEG%)l
z63Gtp#FYR{L~1g1egl68{M~hMr{<%@RaCW31BBCz{`r!coOGHHRHs3xbv1(aUxMx~
zcpI01`+H&BY^Xq8**<41i8PeQTP1VT{ZoJq*d@_VsAGVy5m+c~k~D{R`$XgfCY>zV
z(@t+-_w~?w1~?;trldYpNZtu&W+ga&KOFW3-EDB{Eu$|JI=@Z>m=NJMi~=hnrc9C=
zN_V!xKwXV{;5u3?eZPDd3M>>*l4DBdw$VVk)j%Va2e)&)#GDe-hYc7kX_+JTj)x)3
z%&8?L()F^VDIkDTW~4>+*_c=+;HJz{z2bue0iE6!1lvpCsPF6=0(okPt=7AM-;The
zhT0^%ND!TE5If7z;C+~=F>qZ+L%bL$WSoQnq3c{PPs+Mpd4|!<nk#lsAiIItB}^_V
zAX$bnZ!R-`QifqXKXP~h)sBbddS@6bW*MveW3Z^_fY;&$R4inIhTDTiunXP2iy)`w
z066_g4e3-MsLcWoM@RKopafuq4}5PCro7AGPS(|TLSrUU=lA2~5<%8q8#b9hkpYd&
z|MolxBbP?uX$%vChB0r}!Y)9WBs_DS{$`@z8jKT_-D6oEqEg?>PSWY-Ob*tVq{sFv
zg)_@_kd;{gw=p2maM@%Rs?q~5=z}l}ktMhwD$yrW728C<Vg6hud~jI+PHiq)9uck|
zhR~^IzM2f&4)3==OhXJ1D6k}DO7<?{rzOlHu+ywYO8pkXLO}U46vF^ENeuj%)Q2gX
z{2>0~Ys?%OoFdSaaiEdxtjAR#ZTd`Xn)u*=jMl731te1tP6g_mS~QMO(*i&<Ot}8O
zc^pLTNbE$%VGG4P{S9z-x=IPfqd*&@VlYr($($4a@B_n54HYWDfImwRMgRoEfL4IF
z5nuwp4qU{{!ZJEACNI!NNE&D)0h+WwC48A8z^E@%`fczlmd~1oX37AV5GWj&Q-vsA
zD~vutpr#s}YPM>qgbTnO#c1JM31h71)j^Qau>mZ}Z{-e<(-O#c(U^uwziu!?`nJ%A
ziObadzC@Q6C^(1#qnjd~Y4j&cBJ)<}sWTjuYIKvnvtv4~Sb;JfxefOkZ^%eNFZ#z9
zVhkS!`!D+UxpN>wrYSIiRBC;fgWplkEtWF*FhHD?`OSpiOqoS$GY&xc(Mh??ACnqr
zlCfvPGUhc&v>>TN@k8SWGE$gr-R(go;e+tH;CX?XY={<fjglzqf!W2xKtkpp3N$Lp
z_%R}6m<Dh&29j#<Y;}^do^l4|aqv!=Ctft1ky!=njDpL`q!O|Z0pp8s1sZer)0-~a
zMj4W;Vmh@hNBxZ#^~H)u<_H5QEwcbdXj`F`=SRqi-A?ggGD)EQ1}RyGfoMdwzr@fN
zw8tGF%PNd8V>0WTj%JQxpEHoq>r1F9Qxbk@+maXziCD-#1o)^F;Q0c$2jHk#Yd+#2
z5c?<sl}iMk4BME@pmwr8MWfatOCHbT<n&JttHHVzAktwqei6Zx6eu!2j48(eGMP5q
zU)$lZ?-D#;LVxKZ_|l2j3gHV`IOo%BO+u|TQw}szfZyvvXL|>F-FTrA)80!8UtMy5
ztB10)1@(R(s`aS<!!A%v`<ep<0T9YuQInq;law__@$y+w1`F88lOrVw&}C9i<m{=9
z4IB+HAoDC^G-q+8RNV!D39%P`qD#Ww+9hcBSU6ad>F`mjgGmSu&4sJ;+~!2#e^e8_
z4(zQi!S?Dp^gGf2VPZ)i;;uOk52qm-t_R%pfdx=twk;xn0)XV!NNas`m_b<PRd`Cr
zMI$6YJ`7H2nH268Fz--QIg38;i;<11a5(}MItPDJco;!ij#oGf!}PVF15;|!QOL}3
zNc{2e1<5rK+f|UxF<{lYooTu|z&96R8oJ;#WrzcYL>k5n6#%&kw6btNwZOypz9xs)
zxIh5;H7+L@22TehOHE~rBX?6f+lU7f!({Kp+?}ZMWF@^A{38?-%T$R*Q;8){2dZR*
z2Qz$IfH_dB*Py0iB$=1-b#TZ36-9dB^EP-v7er98+KnpoV5%jfDTVM;AzHmmt5?Qf
zZV>T59v$_)YRVje0VEhORq7R9eX>ypOUy9L-8G3-|6%fBGG#(kHX|WxrBVz=N`mEC
zqT&oXL;5etXv@Md7)M2NXYpK;QwLE$0^ru;&vFnpT|}SzkSz8^WMD<9iVlm(QvgmQ
zo}<F|j%5<`!>IulzOTJE{M0~(T@WbJWh@p`#p1Q8x&G#Zbp!uJf{>MjVT?GSd>AS*
zA10Qoaz*P14d9#*Yc4?B%a4%s7>+(CT4b6EO;WrLS4ilnf7S`i0s$5Fuf)}|?7tr-
zQs7jf+o)PuNG+ydt^+QUQ0ebR>x0X*o9d&<6y^32c$#khh7wgs_%J@3ST4isHo&A8
z`)p<j0;!E?_#oH@7DYEJ0DJxHC<z0E+$W|DprqhcINsZfM@F)wuIxi)(4Ub4Gpp_>
zga^{^h7*)Sn<U*Y%z(q-@Csy(l*~;dB!OZup_PcP_uZK#?Fu7sOn}K;&}GLLTbYrD
zK>y4wIe_k?8n3Uo%aNVNI6~h?K|U(rM<y9Mvm!J%1u>X|N}*Zmg7kYJg%50))!-&`
zlz<{(6cdmVnUnMngNt+@CO)Qgj4mQUQz~}8<-YLoqrJPcbj(C{C`z%+RCS>6w9Og<
z^nQSL9yO{ekrIaWg)}ayJn*Czg$Dvuu(^^vD?>Z**ugD1I+BUZi4l^30mBHP?MFgW
zIxf>P6JRoT+;h%vN$GBcQ{Z7ElOeO_vFb`sl4?B2EMs63WZLQuG6tPR&Po=(FNdBq
z+_$6xd}{K~kERA3UexG8+tY1^T?`H{<-agZ=78!;eh~j5M(I}R*wCU(vN25N0v{$H
zt%&s(rp`+e^JcMjsQ{Hy{$vectCt@kCDAU>!k|gH&H1&-Uq*44ZXckoCIQvVwefrz
zy2L8@#&YkpQm4z1Ii!X8R6S~@-0OKDJQ=P6<weVg801+(2aCxZQ6D#$uEmjf0x$yS
z0n7Mo^3l8`=~Tufg%|hu`~wyL>I(-A6xje?dMXmnp*p~3H|zM~!5U^6(13;4(O3Wz
znPwR>%+|sZbo)WLmMC*c8hjQ|tvWE-szZIU39M4Fn!upjh0Wy+=y?K?_Zp?vhbYp^
z!m*btde8tLB#&PFGfoYVU@2f16JQcqoBS6tU>D_{bL>0Wlg-IR%>|+h;dalt{(;H<
z{n^ekjcKqMNs{WsL&TgCpz|p3;8XybB($SG2eZ4q0bWnU%Zkwxr$|gl5OwvoW1zlv
z9KFC~8#4F15bSJ1&<`ip^6ggVa2~#|?^YBTWwcsAN_(VNqJ60|3IP%dFv+!t>NLA#
zSVrX7rtO^jc3B)?hB0<)t^SJd9_!rYski;J(*q*?h6*Y02^U~O4X@F6c@yVXTK3Z>
z5kqW4Qc-agE^)XIO(z+oWrfI+7@reBh5Nw5=xksGi~~MQ*8&igsFJkC40dF=lvc&f
zqN#x)+;+?^x!;ya$WYFeNY)g?kn=~$D2aJ%^;bMt64I$jqE60~dHhh%gV}FY#MK)j
z>4-sOHDL`CGaPLIJkm#_AO@KikafvYEK|ZHCBAeuR@z|gHd0&s6e^6X&pU>miRG(O
z5P#K5jaa!30s>%(JH&ax3;B9^x;3ziZkmJ!8hy!wk}(y3$*g_JGmOXPzSZYPx`vkJ
z%1jJH(Gqmr)8DA{*KSBV6>3QHWfJM&pxcQiz$06OYm%ovGfdb0AKej#{2Cgw-x)P2
zzK2urPI?g6E!8Wp1yciRjfWe*dOHA&@$|tV8(8%ClF4_$j<0ESq-2auZ_a-anW41G
zoyzHZQL88nq={Qjz@U-qwU>WAyjdUyNDUIy<{Oh{H5qoeo}J6k?Px%G@#cAt+?)u?
z3`%C1Oj`?(BCuw4UUChKSJBz-V``giK8GI76v#+jqkNZSvKQY+X!;4X-$A6W_1eq6
z4q5nFvA~HFu^X1|Z`NOW#phFxq;@eD_MpSs3;R-L+wqJ^yAX?V!o|4WQF7>u%0U+N
z7o{@auM4w`y_fxHgWi`h|9kG4$!y)a4icTDQvn0r_<ZWo&H62iHl1T^aN+<ED=*UD
z9p~(qGl)+ZCeRR1J^if;z+7!m8<hhs>-JmEWUGh_=3^1Y8F&Jq7bw%j2L}w<mn>ZR
z8Fj7TzZF{Uo%{F&DGP~YVaV!wCDT^L%wm*|;%&#d?jDOY1qB@JR+_q;p0hIXsxN|s
zfJASa4J>orWVS<Pa)7Co5XcBmWe~6Z?Q{kB{QzWYX6fAT3+Q;!+cP6G0oiuVl-o>m
z#tdm~C}bCd6_60DO#JNU4UA&MfNMDcmxT!2soi+B&kx^M4OX<MF9QfPZ_qKkHZoI<
z@`m=2#LP-knVn~n+EUJR`GXvMlt^k$H06LwqD<=%3k39b_F!pY4|aPpeE&<JYt(AT
zMh#%5$>7i=%RfRmnMQKDG}D=WJSxJm798o-<f77SHOl(vC<PPHRv<3xJ4f$Rx+K^I
zY&dWYU7{{Z^H%-Ee|u!_6N9L)h=<w9vIi*#!)82Uy1oVQcWZf#;z%#G*gQE$uTLT+
z;b5RaxoWgit0*8u+rH1jX$6VS=jw}`j`{)wK%)ZX=Z3IUfs(K!%qlS=qD(Kuvea)N
zVF1Fk9>mNs>nk1FbZlrb$uJN%)iG2c7hA9U`k~!VE^*nJPaDhPH|~<pm6}+l<pP{&
z04!)<r(y*xBiR5bGF~sEf9XM@Au7Hn(s3qU!x=QIiF^%nL=eSaIC=+<Jdpwj7Jc$i
z;l)s8*d?jsWFwMgDRz+=b`j86QaUU!KZ0nvbWxKzx<I1i5oVbycIr3&)pX~}uZub!
zFVj@cqadDmti<al0am&IeK9yE1%q}+>|s%$5u<}9i60LA&ql@tiy*)vwQ>`?Bz34E
z^!1b3o9L{S0EhDZB*0GNhQC%iBwTR4>K4RU000kgNkl<ZML@LBIIPZf1z&i1=1rd!
zP}$BnY=IcWXaX^4EO!1X4B-6K;5He@5O-FqBNwj_8Jf*F*%JLe$nUo^%Y7v($L2wx
zay`D12I)|}N_G`SIMqpPOw&OiGS0Np+2xsE|4f07F&5I_rcn}gQRbQOoVng^{l>e=
zQBQzJ2*il#cn#oqJ%0!Ml%>N<IrvRIg?N}MiQm*CF>Zzu_odpZ_a%^qAvEE?D48kQ
z>4llmPn_|HD=y!y-*C6m9no47S?Hk2xt2C|$(3K4{f$ovS=-3i$RKMkbAr=rdQJ<V
z!O@duvA<;f5=EU6fH9ykqm7!APS_&SnKq%}v#CFsEo5b*WTj+g(o!13q3c$<x-|Qn
zpDLqU6D}yg*wB{Qdd^&TtNG%O<&>0}CP*T*M5I=EP&dsCzRW2T3N{6}s9|WbKd{kx
zA|?EZVf~gQ>HZe3mt-;Y;N<!x4bp{df0T@rtX%B|skzf+OzI%oDqSg^*>qZj1qv`G
z;wDvi>Cl@$=kuw@Q(6?7?~<EeBHA?N0KA}u?n*svWtheg0K+B|`$O0dqWlmOgP48?
z#IZ8Wl989Dk>^iEvcmGygQq#U4+5!5M@m;F*cx=6!-CBunJ6pstO!=~S6i?7v+$oS
zrb19_TD5%w?HMH;s{&j<K{u76T;tP<n1&Ju^*CVmp;*IoosrD7s4V5r;J)a`@V%65
zl;2{C8YkdL99&-x_9Gz5)v4RxuXJV7qm5OH07I$6rXsmK{R`jjR-f_Z)Kd>o2QniX
z!ZfLTT?61ugT7;cv*slFXwD_$Bx}Bae!QrMri{<Ub!M25XuFTvhx<iITFFGoCc`S2
zT{Isq9U%>5u5`0J^NZiISqh6pGKz936d9fy(~ZJ~B;Pyy*7u)VeADx}=tbW%^^?bh
z<%1mz1>TbM>}J&Q$2!?#(h#d*Xdf^C)T3;f|LJJ(VN8AvW*)sP-O4;GSvi{+0paVP
z(THS%gLBFKqy|(y`;an^fZCSQ4FSs{{Tdm@)HRBtjHv8ZuiIX0{mgqZF_MgrA;=JQ
zj%l9L1UT2Uw+cJJCW6f{3Z`(w`9<|*%!ytn`k&@jmLkA{fpfM2@Z4thKrW_(<eJKR
zAZMi$rJEAgq7W<)PYnp<_v;rk;zoh?Y-hx?ICtmQCp+K#Otbf$m*+#DF{3z1sGoQv
zAW6?`sE^+R+`pS`MY>R2{|8@CoKZ8PZCp6)TV^_w0IIv_(aTBLP}lj1$P7tTZ(6?`
zfHncCuLCAJ)~-GKGfF20b3++I%r?0emt`0eb>(jS*!=H)FyK>*`Iv*wFlccP#WbgC
z05?rVrVKxQ6ibxxKd5J{?2-cA9~y?8$Skv9NwWGTpX&2<_3VKRvuLuz&aT!Mr30l4
z3qWkTH8Kn@*=1AZdRf>Y&pFh+c;qc_m(1;CC{qWH9$>S9X1)UOk`{!^|4E}r3}a10
zS6!eI{VuwOI=5)3Y#sU&5}kCSz8<d>gGG06GiE3Pk&^wTBX53((uD>Tn@K7%q$!Y!
zhSj)|<Ts`={dcf6aqHsh)T{n9T+=AxVV*DItnFv~8^e%$k^{VS3gBe5Jpb7&HT4_~
z%Tm;RP4!UcW5!f$`jRPt3A8R(U|%H$2PI2CJzpx>Z%+K^0@jN`XOxbOnOfc;kXOKo
z8*ySklNS%a@#}T(;$5xwJ+BUHPCwu&wfBs)eXi|G<kP5D-p~X%Rsp!b1JDz3U69{W
zBPD7dh<#j!{S#c4@hdF**hfjWH4gB+M$9Uxa>{3s`kY$AH1U3X-gfimyOiuLu-Ac7
zCdiO!iF4<jch(89;>;0%pv?Zp)Q>;h+WX3M#a}%`YD-!)NGVIv_Ni(ls4c&|LMdgL
zlx+KLweAJ``c`%EOby_L696shpGfHSX?|0n0Yu*y(RuCK`OiLl^6ekhfZ&(d$5AXB
zKO5sPm}P{v4Tjhc9=_%e-+%7nuTIy!i#LTw68ezwzkbD(lDzL~T1BT?{G0~BHPwi1
z*8QxY@pTjn;X1)m1_(@)Qgcc+T&woy+=x|Dpb)H*>}Ns;2rNPe3qZGW>Ru&lgYwJl
z7a8F&vkMn4w9tQ&b+j$cE)2G=_Pe5$SMWKG*sGnp__}{t^B0~M@lU*h&WTs%Ioj{c
zH^`Y?!78nK0N?EbYzF!BsC`p?MWbsB8WUhl`!f!}xjMj6!++?<tfD`<IzV(*i2>Df
zPu~CFssHtkfKT*dR`E4<@z8!ioRf(`+gL{dX378<3N$VP4F(SeQo3L9uQs1~>5Xqn
zLBj~JI2xEZ0UDcP71KQ02Uzwpgk`+0Or0jB;(gO^Rj=~9uB%4OQl?Hlf{U3&2aOzn
z<>71p=$)Q>sExpYfnfrPZvYJGEGK|rL$HjEX>82nIAXW<tc$O|v)+IF#`u4|8JI>p
zmM{_&n3E)R1;8Z_V6hLdBL?Nen4qFm<U6Sk1fQq^Tw4LCTRwJ!*(tMpL!Xbz`zvbO
zt)9N{(5ZL-alj{g2n04JDZ?zrnKuQP2?Q1l92;oL0w>*a*{?kF(wly%*?r)aEKCt-
z5+E_eHc%2cDk;Dy##!+JHt>gHO4eagGOlCR0XXVLj51a5InbOrL$m7v;pn27?RNeA
zmma?Mo$nK@>RDK$=(h<hM&Bj@3}%=jrg4X08+=Z<J+tuEpPb(P{42xHK<S|2B|yVQ
zFeys#n<4_vw#ovaBO);jlT<s@%C{De99IRD8D4HBIW-b10*lCjMQ%;r`sa_G{Jp<2
z0L5mOFsoqD;89b~308n<S^zT)XiUBh2^h6KzV^pA9bNy>uQ2fHgBECJN%v=XNr!kC
z#!w3C$p|=}`d^7!yaP0;sCg~5=vo1#R{mQxBuD@OMIQxWzeO((Pp@=WX770Kl_Ph4
z!vYivFchnp{1)5DDIHeh$w#4;CC?y^%>-JxK)?0#aap>(a`?`B+x6!zUAy#qce=sm
z@kp3*@QHdZwYelYcqxv@!*AV8f!1Ou2^@8fibC1^3@ZXko@N7zL|_RJaN_fPXL{+<
z{9E6(H5tA<Z!;xDCdO)VAm6%7q)9PMT_b!>u#Gc<c``8!#Ws%XuQ$#t{M(<K=-mI(
zlsPgy$MU~%IML?cjOyGDo2-Gt0-)qrW&p6g#`C`P*vbF$5#OEbAP|^X!^S2>%wmfE
z%EX7!|2ZTDm|;gwMiW%9?;Kx!_YFrjKKxoPI<3rWh9=-JY^H{Aj>iR2sbC&jl&+6}
zOhAzXFbUq+S)Kj)4_rC&`uhka+kBET{z_R>lwlhMm>K~Ved`dwDau0uMbEYV#i`Sa
zZ@azOec(r;@1o*Xl?4p~4+hD80w%LhfTRd4c>^HZ_4EJt@e^<RSg(3&$D-&W7AYDD
zQRXSYtfFrdz<>ob!<Z+d*)f0wm!)+cS^v<pk6!(=+bjOnYcc@PL4pH(Cg1?j%rh)_
zjL}}1pBkWmBJs1EUwP-bhc2%i`lY*8=kEB9Vf11G!mxm`nIRG^p{OogxKJfTY%@)q
zQg8_~Wn~s3b0&TFn&m%u@$A;${1g|RX%aXL0|%8Cy51N(s8C{*Sf&MX?jjxuY2^qg
zf;YA{reE=wmyf;q?<8}50wlJKfl(&LQpWkkj&H~?6$@DK)<I^9WQP*qupPsI<ZiH8
zKe_Y=w@&YV;U~E0PUe7NYB`SCP^<&QK9!849_qK{H5UXV!RxzQled0)VgAiu@ST~i
zVKh_5Bo!UQ_2}j&u&|1t00Wws!2p&~9N}?t?jEkcQ9rTrKYwI;=kqUff}O(|<#Plc
zn?J*b1PcZVV4zt17R`y(uM3>1wXLZi{p{k=U;m2l&UTR!F=+NP7sgu97PPX^B)J7*
z<_6%9O5G=*n6^ANRnD=s_dI`Q`)_Zq_Z~kFEPnezhdX8z%rao`X)t(5X2~i)v#*y4
zd>s?r+UW;2TR(o!^5I|kd&ykN;WTZ>%@i0Zpyc=vGYtM`=a}GggWH19lL<Iw0A(_B
z_&#ZSnw@XY9=-a37frP9yRqW0T|@dQMLx{13{&L8pfb-re0i^V!-bVYul-uP@!Soh
z7#nEHn5Cj~O#VuMK!Sln0S7Q(06m|)1k+&Ori_161fZNBV*pR4T~m8sJvz7f7td>U
zzJ0#xEuLi%WY-iF0fhpNab#pZM}p(`D<>XlH=gsr`pi$?zccZ}E5s8_fn*r}g*s*f
z8U;=hvk0wM8J<*tafs*9WSYthxhWG>#%xg_qs$YPbM15ejoR$ir%q3{?>$rNJ$9z*
zt(@et-69}i28#_iTDjoO?SAFxLa%n_vEAlPk8Mof_PFoP_AE{$m5Y3sGT@=WW&)+v
zxiuKs&?HfV&;16C2{1MjL;-~Y4aI)Ay(;l~@3D!g-Fr^fdygNkc*}EcurcTQn=LN8
zlU(*1ApHsh;WFt*|AK<Ko&@#ZE8M=|^|oM*J>O~V_|ELQS2?!ct({)mnY?+STRXEy
zIEeUZHL;6Hu_hqce%pXIHdui8iYC+csU%`0=v&+KXxb*n9KA7do%+_%esi>M0<AEB
zJm}WWY^!YWaP(x81Ldihz#<I*8P+7(7{qp7kr^ri3)W}mznL(!KMrV|xS^D=DX?IG
zI9g|PrqO>hbRKD%;&$l!c-#aQ;NZ4nA!6`Qz@fIf!-*AZVjId-+0Ne&u;f5PeW#Zp
z&@gmNKi38tj?OiVAyP2tETaQMB7jN_5Yhk=6KH?{Op)trb9*I{MH#T@ilmfU1cWkW
zri?)Xs4uvG_!#KxVf2%9u;_{sn&6XEWS&fo!eDU>Wdivwg4oA?3>6kAipmTF7z#9$
z8Nw!sGEW#RW!T1M&dP!Xw-bXt2NodyBbx~{`gT~*n9y4UAf0KX28dCdUJMkSZ7@(w
zfT3)<E?^s2h6T;AzcFi#0v0Q?B#H820F~(%4Feh-1WDrPSdtwJIFfc?-^B(N3>qNz
zfnXSuA5%o%_$j5pLV?ES%h*6METfbG3)Qcj3~Zw$hELXnib10@0_70fs9Oh?4j%02
zN=@mK0LXqZ3?Mm}Km(Tkm0=i)6)3hC7bN-?P#FalTYt%a;Yay1Wk5rLMOV-$;E@DC
zY`)8r*@r1IOGT!tEJ$n&2WX!H3-voqCLd;4&?Lt(SoG`k5f5%07PQG<kwb#TWR7g3
zBvXH}0I{$srIclwGJvp^*~|}Rj;QwQWw@_V0)YPy{HsB52Zg9=00000NkvXXu0mjf
D96$|i

literal 0
HcmV?d00001

diff --git a/static/jifen1.png b/static/jifen1.png
index 52162d40eed9cf82430b15fe715104d3bdedcb4d..7ecdc1c3323964f072ab389fa578374d97b8ff22 100644
GIT binary patch
literal 1996
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

literal 1632
zcmV-m2A}zfP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS000ITNkl<ZXhZE;TWnNS6y1C7RMArC%s^25piqMlO28k20TT%kOpHZ^58(qP
zfPf|fA%ZB1Mj@h6sEOfiKqLJ4XsZcmtW~4&5kD{m5o3Xx2tu6)tu-{Ad$;S%blOfk
z_ug~v%nu1CAp!1wt+UVGdz~{(*ZAUVJbt<kAeTYu=(xji(sM{?iV#(?&^RK&AGNqm
zn9gIj+OTD(LZNUoj~H>L6xlB-1CmVM<B%*TkvYVCn^8a_e?g}?M0}7Vk*|z&2M7lO
zfZd*G+v(S#TpQH!Ks{uv!Lq^|k(J*~?HK`(uCB38clQ<?gOzX;Hg)DBpT_aqA1W)`
z$`uvuy0*0eVAo@II$h69vvrLJkwZ4VMm8298~^C&YXOi{YP=)P7ce+M$7l&;T0<O~
z$CZ_5{cQOHkdDMG$EJE18s%rK#NXRd;EPb;-+0;e1Rx?6PAc&;+Tg?z2d8IF<V+|+
zGniu?ZVIjd5Ioz-#4%=`ujegaiW@&5Id_)$^4~<|!*TekNgi03{ky>up<`AgazElg
zc??~y0PIv^HM+uX17BIuvwsl3^%~J71YR?ZWWw#4zw^mokVuTSr#2Ezoo;59X^mAG
z-J=Zv9cPqdr+<aQXd_Qu{}QiULNo<|uiKQr+xSLD4-<d#5y{TI$OwSxul7)7q#9Z1
z9IR3>19l>@2fMXO-+oq-w>?jE`4UOpK3CO@Ogm(Dxyuw*mO3jETjvWvIy)yj>7Et{
zTE+kt%q7|U646YLQK7Q5WC6)5Z<rn>I}|RPiXnG;U|d5o5Onvc<plAT4J1bzd<&Hq
zgMqAgf@JP}W_u*G*NR40`v8bv0Li-5%rc~N02-QnRe1&Kr1oKw+C{#yc>*FAtY|Ec
zH0EVMuEb|L4u5ZEwO3mAXz0qh1cBjpCx+XJ+~+(1b~64VN^xr-0IG=BK29`zILWp*
z-Ax>Lo4DySlB12m+z4&PF?zKifOIlZ4@3)sS%#LH0qa*~2NurwkdA@jMhAEM7rI9P
zih745(Fa{JkWi_a78rn1{NY>TIt;Qgx1bx%BB_~<AqKN87-Se`^2k!6#g7Jd0fz8n
zI2xPjc7!lKc}yVdYVxALXO=qWI4Wu;^sVypOyDxUcYuwC8wJvQwONs9)erzcW;v<k
zReUhIs3^`un67!j>IS7i)h;yUNZkN1tPp@O0Q`p!Wm^8#E^mJ!%Xt<r&F-uTJwUw>
zh#oh7*gu)|h+Z1BVi;(Jt>PTqh4hb*>Lv(Yo_kpfucwf*b*|OBd-WSAe1z0@&}Y3O
z&UKr8?*~1{`FK<|G2CP=n5q{IftF_x>$XvDIu2&}F3Eu-#qWNv1%7sYmU^#v($l6-
z8`T_SiWY-9$o8FCXR39cZ#4oVpxk-)g26W3ta%MGZ7MO?S?|A15Qw_e44em=06eKg
zrVbKu^<p;GGZ;;0CV(=Roq<^`q%3j~WG*kZV02nJ`x1O+e`#w#-IqPPnhu?o&P0uq
zCe@AHFEqW>Im77{?<scW>@8p8MX_<Ak!f5JJ2lW<;VWe_eh4GNo3QNKLEQW~E-#p-
zIeHKTh<de9l%oo-79LkoG|<DiQa(1=ML_^~b*{oo+-cN8-^eZ)8@dl+02RH)S9|w=
zk*j#An}mBnn-+lVP>b(U48Q2$N?|}~2krpR6f))YuvOtCliz`COf5wWfo%w#3`HV$
zf&1WHX6W*MTFgABU;WAW$BV$x4pD3k-EiaGTwZ?B&7}Y1uIfrXf=uv;(#54^DUNeL
z!|#RK7l3kwq8^8$J`NC*v|JY}q#kvN=W#Upr=KY;02vT?skT$e_lmkR`$ePt5PfP@
zMwS$MMl`O0!3vod>r`qPli<=zF^zakMB>7-$r>4b$L%G$XaG3_>gOiM?g0p1hX2#f
zq6->qx*Q5wWl!U0rML-VC0mqpNhD_5OdD8aKI-EpBj+Mr`0e<ZC0vKIj)@p-6$PL#
zBO*6bDs`_z&O_MF$@nQ^B(|oq|Aj-;^TZW=OEK|pDA0OL)sKUPoUc_90Hp{dsEz9Y
eg6>?Y^!^7*C}dBJtMq070000<MNUMnLSTXeZRe~2

diff --git a/static/jifen2.png b/static/jifen2.png
index 221037759db92044df3bc25f9a429c9a02a95c16..187750cec4366f214e5f7a3482a92f8d6b4e1610 100644
GIT binary patch
literal 1851
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
ZuAb3enl^gR5&i!lp4)wh_uRu1{sjPrW}^TA

literal 1590
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

diff --git a/static/jifen3.png b/static/jifen3.png
index bee4174eccc88c3593cd7a49360acb32b1311fa9..8788cdf6fb9a72c23187417b15743fad2f8cde5c 100644
GIT binary patch
literal 1623
zcmZWpc{r4N6#le4_M4IFCK+22LzZl<WH6JG?IOBm&sMr+eeSIY87`rcCM}n;WJyHA
zb(JM$jm#JZbB(BZVrC54Irp2H>Yw{O=R4o|z2`medH?vnU!t9@wX}r11cD&aL;~Ic
zeIMmNVr$XNC1!6$kTp7XN1ZIuBS1UQ=>T+K)B`X8M&WZe00r1X!07@G1GqiF9f7G)
z_(FrpZeaHUhYFlNV4*l2rl`Q9!Sn!3Qec|S&ul78Q-R$FY#PkafP?b;fkP1loj>xW
z54bd#>W4|HV4Tj^WTPB`EUL_*!30{PvuLIQcYx352g>Q^D{}=3Xn~6G`2u`WKtPwG
z@eLG6p*kp2h@dT0=UYY{3e<!fQCwK?_X^?%`5S_65lW$5VJ)Ny4Se7ALxgYRJD+br
zu=+=r-x35`prEkkdk`Fj`Tv$O5V*Y-$P#c*2JT@XTM=@U;jtRzYCygg<l~@FABs((
z%mQB6LzNS}bb@LZsP~0e{?HH%Em83H61=+vZL!di0Nv@(a|<Y0(4PzR0-!&E!D1LL
zg@0cFvl^H+Fj@y6>tMVQ#+y)MB38P}=oga~>R{`LtQQp(6BCz|+8`r?!N|%hC}NdV
zRCny$rKzcf!)fd2?B1=br>AeQ$I!&YbpL^ahs@0J$L;JLot#}x`<;o1ynN+K^wn#L
zNhvAUQ`2wUxRG%?Gm}it&VHO*TwMCB>_t^|U427Sb4O>_`|c0Dlzzs@=*O|K@$pYA
z*5o9c!{zb5&d$xvFDxuBE-fvuthQ+eCLzdL0ugWS<l0zAV;yqxloRE82X!C$)8C$$
zSP+n@eK_luhL?kM#*QFjToXb3q94J+7n_8Ok6f)im5iIlMUa<RbAjX2`{(vW_^}5~
zKOrQhtZYWGM#<BVprTS8Lp96zm(exF2g2UHH&f{Gco}&i#Vhbku=vPhweSQLO^u@a
zVm%L{T#Yu(lL*Z-x^|l@cU7jmCAcT$SA>lirjrZLi?@#cWS_QYL;BcCvc{1ZW5!-r
zqFkPrao1jZYq@-*<g=_{%%*_evf`C6{4aqk0YOWWIr?2yrf%n=@L{|mg=h4p#6h>S
z_ru?)<QZsbcWLJ9@&X$rCe$ysHDIka-*FGYxhJ@>#`;%nee#}Pxjj5o6CwV)S?P86
zv~6uBb+FoVya!)$jEt#GkSS@Lb;WGKN{6Z5&Hv1K6@sa?u20+aTbxYOaPy}+l1-2*
z$$60!T3cBe??%QeDD6*{QnGbOs0bE8qWu?rgGnF$2$t`*!fr%wmH3$kU8Vvy%R(V9
zb=NvXOliPF4MCU{4NOGIS_>!oYDgnSd--Hq!qy>k>n2*<dTsA=-JDp0o{^_He)<j$
zC;L=FuW0?$ww#5V3KQ}^l6v?G%r=$Q*X7x+(P7yuZdJ-&nR}e2eAi6O^>s1CmE)E_
zFY;{UwPN>*yb<3}6f-yAX{8&ONbz4VvZ-u5aw5W@lIHk6D1oJHzYk|WZ{b3+JX{d&
zTEHDIkTR%|457C^Q<%ag>EmpdUGk+Q5rn$^n6$GPg6IwMqBn*|$#iI)RG)~K+}YkR
z_NeZBOsF5xu=TkWc?V^vd9giHXI8y~bRf1dS!!14E^DK~!m8Hxubr9Mi@A5hv5(9i
zu)cUWZogzO!`^VYZ7f`Nx{>_Q+vh>`*Vd$i9*>?MYp%)AZjHL>IN8}x>2NGJpoO(;
z);nF7VV#oocPqth>{O`M#Ob2)lHumSo>b$)!1>g&7Ew>l&JvwuW15Lwc5mUJ>dy>0
zf8&2dxCF-wC3%sA_9qRD*2>{~Hx>UnYnyJIZ1XGBx5OccIhiTqN5xo9+dW*j>Tmek
zdZE{No;Rv)UBDtT?K3QV&P!h>b-mRt^gnm`#H}n07Q@sWT;1Yr6cE5rOuB~t?+DS-
L7XS3H$JPG;C$ree

literal 1594
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

diff --git a/static/jifen4.png b/static/jifen4.png
deleted file mode 100644
index 85328d2f9fd001c227205434478abd70e9e1c2b1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1442
zcmV;T1zq}yP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS000G9Nkl<ZXhZE;eP~r>7=PY#?)r4@ew4F<oGq5aO#hmK60S&zXcj8eUm+6d
zUwuerCG}5bC4Cr#Mj2LrR1h>HnM!L31~ZC`A!amlLFHQaoYU68;XUW+_nzzYew=gP
z_ndoN418gK?B3_=_k6tX^E_A3G(TdR+fNq(Oh%ALM{n}HLMJiJXQCFtG>3@sCyy9n
zK_}s@A-L?QVWj%R%$diNh<;rWVB22q5w9oaP7>m}NCq+g4xT=P#4eG^d>x6mgg6!e
zc)QJY3){fl6<2X7A0oELG*eF?DnCb+7YP85k6-IeOl(0KJP1XpsLB-d1*G3QMnl7M
zqOoyASGG0)cs=J93f)4`GF{<u=n##Ah{hU3<8K{)EdcB|b3OLHguokggeE{UXb5A4
zNT*MzWGMmgsI}B{sT+c>QVC1=`w@V+6Cl2?CATI3W^VKx>pNV7Z3!EvCyx2Jk)aMD
za-(4kp#WgKaBZtc2(eO6+l8TGrXDksxeIonJgQG90N1fL;8xgiVa$psRnSH=o!zMo
z0N$VBIkqgItCgz8|0Qww8=}8XDM`x+X3ZvEyp-t589IC;Mmp1qD2!DS2S&iP^KT&U
zA67~pK1E{7V=#XBJn8&f%GrJ$EdD>Y_5A0OeguEBnu(u(ji`CHQWdh{Wiy-ItOUSg
zW9?qy%m4^Yl~nQcqrUO{0*v@-KZ%b&Al}nk#^%%D@QbgPi<97=0eBei^Q+H<!PF+Q
z+22Y@t0Lf9)=s>%52@uLMyqZoTECIFYYovy??(dw1>*BhiFWO%0v)QG>1{+|g91SQ
z4>VcVC;<!{LHcY$3cO0RU{NdpR4GHLl!nYqwj~q*y30lAE`LzV0mc6VfDAL$jyB_`
zNgK;j2<fvK>9e(70DfwqY2v$AQ)mrHCD9{*Vxp&zMlS^dDA-mv5Ur{UK<5e)eFut#
zd)rD9!+!=BaZCWR^-g87_XGp5^8L7L7uN&8H(Y{Pu#o7@ZADSITB~lMxB!?Br?R;v
z!6{^0C-KGEF;D@cGW;igA@S~8#Im68f52xJz59rI_v4mYO|&GS3y+gR7)whFxx5B!
z>ooLU8Y==?Ocg}&089YDWnmGR_5k9i(9}gBJcSDN6!8=RkRvB<q2<Y6qf-O`@4zQ`
z2kr~5fqEXYsRI!HkYV#M&vOgMv}}oYgOrPoA){t1A*ExC)GOo|%Bvg`RR(5cGn<=N
zDkr&iS}SbjM3LKR;_YT8_ef0uJZ9bO73c_v^adJCR@zflsb=|dZ+#X+E2gr_VJFxb
zu94z}qA_>0CV*lZ<#(eIDE0%j&g4{ec044^xmrig&vLAk#>;6;Z=|dmW~8pbnHY0H
z3pR1b&=Q|}vO^7%Lw)}t;?lWT1BH<Du<Va?hI;1HM#Cl72klJ5*DAV$y@s)MlY|WP
zp%IW@$gLc1qyuQL&$X^~8xlhR6Mu`H(5<jzB8a{AY7rZ0ybJwcyfKFEBv=Lw!|V`E
zO;(sN^>Wv7T2T)Y#8fYL^H}b7s5aC}0Dd~z_8frNhoUZfM3QiEh>Rbx1L~^W0Yy%s
zQU<>!9Q#A<nK>ppbemt8>C9T>yqryxM=Ju8Qv8jz<E+EJ;T3$AQ%a9UkY~Y9noZgF
z!Zy)$MW8GiesP}x2(b>IM{+`d5pX*1Hq3^{vG2)8!(69wwyb5YpiP1q`x9|_B<0NG
z`0cpIWU(E&ekc-e330vN^F<-Gt{}&`!z1rrxU(HUMKmEUY51qPsEg(L`X7AfK;eMF
w;xib%H?Gm8e2D-^!jQN!E&_<_xup310~(u*Ps~8c^Z)<=07*qoM6N<$f@~w5Qvd(}

diff --git a/static/myorder-icon1.png b/static/myorder-icon1.png
index 8470a93f4676606cafe0a0aedc0768f261260d0a..e197d3d611f99dcf89f961e8f0a123795dad7fae 100644
GIT binary patch
literal 1007
zcmV<L0}%X)P)<h;3K|Lk000e1NJLTq001li001ut1^@s6m=Gwh000BFNkl<ZXx{CZ
zO^B9N6vu!6``mZl`Or}_OU+CjwNeo&2h19$BG*O~l*<+cF8W%Di+E{S25nj-(y}6h
zXc0jhi!g*NYW!GKxbQ0qODad5d7pd#EsU`!Yd+p*oEJQBclSBZpZ_`Mf6lpLn$7zg
zk(=W!lxYoSAmImumH`Wa<3V~@>t8&4weRD!fc&O$6DjrOpv}pCP@~P2z*10@2pE9@
zmS_9~Fuj0%v@wg4Wy!gp#DJaGTUw6YBPf7?3E)3*j+tz>0=ur}TP*?j?qePF^)01{
zcVv6egu9jLL(E4+Ok|A7|MfO9oG&iv-T3O+mND!`Bk;Hva=u)V#g=6E3#}%3G0-7$
z4N+ji7=s?S`}%Bk4gl{@39yHD&Lf4}Qg(mx$h~2h)xKOTJrZ?r<Z`$t3h*D6<@+ZL
z*e9Rw;^)p=Nnvfyc}r??r*d8;X%5h3Q$vp93-d%n$U|-r)F6*5hyB^kd35Cs$*d48
zMD&2_mOF$r4Z_k4Bgc1X^S+DYW4P@6omm$ST{xc(&o1i)*TOztI|BP?d(+jGfWY96
z?n?eTw<FT5b&gLnoH_X0IX%6nIR@B=p1Z3owGEhaMZp!oz17g<4p8?v3ozT9h_zy`
z`gb3ZKYwAfLw?!TDxh}dqJ>mc1UTUF`nExr1YargR7@(LRn{hO@vnC)>D?0*YIj*0
zaOv$)_SU}%{!BHyLwHjJ&#jEf)~8ZWBwMtLITLYiBNaArN>j=;0o-;ByNwuDy8*VZ
z7u|n^QyF`7iYYN#Jz)DMi6L93ZO%{0SIXa2ni4|CEZ!3NQ#FepM`9V&jFWCuDfmK#
zMdvd)vwQg5$OpYQcCJdXyr-7(e2Qk6tjEGSSta22PM$jb_L3!w2UGGh66=t<(d2i+
zARmZOK}uLTCB3<9(SmM^T_$g7&B&_WfKAH}`C{$hsiUP?<Lvud=Q~xV!{xCx3&QQF
z7jkH&5LK1Ky(_!RzH&5vTkG@>phc}}&DErYtymP>>*3NF?7i40u!pfnv73`VnX;Oq
zyWH8Hq!tg1G%vkTFFJp**cikO*prqu!;sQPk5t#{>?1+!CXIgCR4q!m2Njc+wVd;>
zRZnZ{a`tOd?F+$StkJ0yd53&l>BDVpGha%4a(zXr7;l?x9MG0KU2ZdmX}6TfxrzSr
z%sP`TlOyD#SR2}7$@lj$D8G^&_F%eT#y$)hbhgaA9{GCzJ7N7`PbTaD=FU)YIHBN|
d>W}Up`U5FfT*g``pK|~J002ovPDHLkV1m=t>~jDB

literal 1575
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
Z{sVtcJX5>|rP2TZ002ovPDHLkV1i9#<#PZ4

diff --git a/static/myorder-icon2.png b/static/myorder-icon2.png
index d5c7a12eefd929aaf824fc34f7817a3c14647c38..83e9866c5e387281c75d76506cf896be4ce66267 100644
GIT binary patch
literal 1311
zcmV+)1>pLLP)<h;3K|Lk000e1NJLTq001)p001xu1^@s6yfs3E000E$Nkl<ZXx{Cb
zTZmO<6vuyS?>%EWUdl_NnWShc1tKa1WoSy^txU=XA0ns-f)Yidm*7B=`C<<RQ$&GX
zAXK7@IVRy$f?8zWBEz9k(}%Ro(MD(HoW0k-hcidVoXa`QZuSr@STCDz?{EFTbzk2$
z0OfK44+eK7@->FtjoAp0kro+_I3u(>gg1%UX}9I_q)evzT;wBIgYyDV&A(5VfDJ*+
zI-8Zdl;(#6hO>yoUqq@#q7Qfw(lbe<<@NQsC{-}>WHl%Prw@6Exj#F1WPU`NU?NE~
z0HbfofRV)2V}R4Cfk7HZHdIYe7@VqRkdqn3>FynY_^(j5nlVcojQ$6clGCK^Gg+CL
zK@4hmdH_w)bi}~!(jn%jnElEz>&D45)Qo@t&Q;y$iQdPU)b&~ya3c6-%`)!TaIoug
zrf*7^&bcG7?$;V<eB#M#+Pi9WH(;F1m;%rWN_t-F9+<e(#mhRmdSK^Z5ZQ4@lPiZk
zLcY>Z#!qU~!(so*GYDFM=<ndVFM|wn@wibx0o(hJ&lF0SDtk|8XyClAub!ILKfq8?
z0Jxf62D({+YPI{Z;o0XI2TbiEB<<CJLG>`WX+Ab=Due^CF-x`n4h`=>{#+oK<4O2Z
z!?uO1CNHXM%P!BT)J3%vdqaSz22FkxhEDF<gQ{<U2@hdMH-fhX29Hl1H13d~HoE|z
z_F!7_84J+RNodeGdOYCkZ-=q-u~T)RB*bieT>r$;Y-_VPZpTxUK~+PF?%+Kgu)&xG
zgv}?gKMnz^G1JO^($5Gy#+pw+(u%B{IY)p7jKVI<udMS-2Q$O5=9AdzJ@}Zp&=Vjz
zx?D*BvaI`=LVL5@E>O}+_{&FF(+~LITfo9@zzDnW^A-P+vIbKu&4~QUfJg;`rXvJR
zM=JYHw*5>=ik6}nz42Z3hfXt2uCyz??Vy!;04NEPq%w!hP&0P5{JoLGO3^H{Jmc-g
z9u}inZzeVB4|&EqYNeNlnt7hN9L=gyFp#V@6RTJR^i~EdT5SZ%(>FI}JvBFJ<QYE(
zHYL;XtVqdcTw5{SN?%_%2?)Iy&D>MiT|}3H!uo-V?lG8!`uqm1=>MU5?=wI!WKrF3
zZE@=|<R5?+`fO&_aXOR6x4eTU1lG27@q|b|8(C?R@PHXhi?&eK5w*zmHfH<VYn1M&
ztyOJ1Yr^aDlD{WxVcDi`6cDdU94<WyrG}`3ro@uZ8iB^rv*eS7<8c;a<$_THd>@WI
z{jSa0S19X^&+n_DEo`aiCko**_C)vBZRw=d>#`DU#@s8IAIG63$7!5ce&RU)rzc7p
zkr&F}M;=Niy69WGXlmtq5%~)2_g9<-Td_GQ-+Ra9k?#OqEOQSbKi=GW@pwgGxWGXv
z*^U&KF=@;ruOl3AwxU3^VsjF?_M3bklFHbpfb`bjA9tOt2#h_l<6>yZ^T->KtLy6q
zx#V95`Kooc^wY}!hdDIoTx|9n^5Z?2S0dN;3r&T$EO%{-T$a;m%iO67tyZ!*okX@a
zj7@=}wYGf6nSY$}as-9x^JWAJY7NcmM79F3F^Ge;w&IKP-4)?I(sysnteQD`=)Fiw
z5-}}+f@Fu>laHg3!M8T=%T#V#wQb=5@|PC5f(4SMAX?3W1BnVBRvq4Tpfin>=r101
VwCqe!36%f<002ovPDHLkV1jUDg@phB

literal 1627
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
Z*S{>YI5%4j!iN9=002ovPDHLkV1hh*8ax01

diff --git a/static/myorder-icon3.png b/static/myorder-icon3.png
index 3a3eb55f0d2f7257fb9807c6dea463e5fd696033..8c73715729880d1893d1ab3c84cc1e9eb29a6492 100644
GIT binary patch
literal 2453
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
TI>%aM00000NkvXXu0mjfbgHOT

literal 1645
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

diff --git a/static/myorder-icon4.png b/static/myorder-icon4.png
index d8087a5440e9996f96aed7bd93a847ae60ceaee0..0c459d308c8bc40ce9ccf1066adee87031c5a8a0 100644
GIT binary patch
literal 912
zcmX9*3rv#-5bk){VK8lGqEQk%=s+;*VA+z50TcS5T}vq-gbI$wu%nKbs3U+V5+>^~
zL6bS>BHM^eC(+XO2OUy*)V5Gyv@oX*C|X-vQHCrGu-dzSElcjc`|fggxyz@Jh*Ls>
zw*^xuln?=*li`gqUT0DLy(py|_>@9<O)C-Y;d)c@x`6EBlNuh`mF(kJxui0lR42KW
ziEdSbuQJ)-nL0sEHF(U&pj${10w6vCLWI|Ldz48qdBSJrW7s2J$5hY=K*a+!f4xnJ
zDlV#dpkzZA2UJ|>VuLan%=PP2^*;W8-P@z#`(_Ctbc?{dttSnxOW;NZ{FVv5S<sse
zH*=s*3ff%I=E1Ff(4P+j1u$3ygP*}rF%0booeXp(aJvNba?l?DeJSY6!0-haO2JqL
z#!4_Agy9Mpu7r^)7&!zZN5FIlOx0kjfziV-S_@-e!dNwo*TC<!FmV(nzVe-FJ`U!S
zU}*r$sr7$bVDc19orb&L!QJoS-UYbd2KRr2=?<9b0P7W;y^OQJ;+zs6YVaX}k9zRY
z4Yc>7LyM35(K&=p9lCC#OOH>CIB&wg|G>pR@%cSmn#N@t{_DUMC$6|~Z2?~_qI(J5
z|KO_?a&?|udq%=b5<MhI);$nj^Xj+jaE3UO63TcpJp8SQ$f)SpoZN!_veNR3{-MdK
zJAchuZFale;cz&e&L>Y_zVhU~%_{WDpCjNT?coofo#3+l(l?*9nRScVdhtSeVES%@
zzFgh+kvjMM#|yI?{fUBDm$d$Q0<o15udd{_>zZO1RSKqGR0~tEb1x%mFqAG+#IT#>
zVIq2ABlRL@YlMzQ4^miC0yfgeFB~DOW{Or-ZEZ8f^0^NZRB>BG<Bnzqwe?nn=@Oe3
zTDSO~wZ*j-n^;&}9w-~z=`M1YovCX3sp17Ma@m;AirZ(b30}_Fv3%6NJ;*qbzbS-e
zJ+9r*F=vyzw%5v1J)hf%ly^QX+>zHuJj)UdZ+l=lIF>e09Uj+eb)CDoDQz_$;;+U<
zPAe?DrtGk8TKjowDyM{*>`#BHkfb#24ZA~Y|AA`CVqW>Wlc@+SdN+Erur<hT-}Oc(
z>s)&CXhq_ZF)h=1>GcLbl>fq#qJ(o+s(ak|^XcfzIp1yxFf?j<rad%TfYGp_ZouRJ
XP2Kx9=bI}_ywXqvTro$PT+sL*e1sO(

literal 1396
zcmWlZ2~bm46ovzW6;NpbQ9v=GrR}ss!Gr`6l9vTY5ReHdY7!s>i2~Wf5+r~@h!q?`
zI=D;~m8Bq#Run1iut)`5rr7F;qJS(4rD!RLCFCu)H#6UR@0>g5{O8_(?!50}V<Of#
zdODIwq&0jVR{+0M>$7SFd@nT24v|Q<?y*tvVK4=dA_xL>;XqCYi8P=^fH)W^IUoxG
zLOPHH0x<>TaKV9qrDT7gLO?DopaC`4oIn9d6re`Ti8OOYh_yGF0#pp3425MDH3GD3
zpkl)Uph3V<J_b`I1L|W+CN8DpN+ysaxP*plSXNm%0|vN)iL02n76vdya7Cy!P_tk$
z>>?BlRJa`#QV2PN(69(OlYk;nP{9B?7Jw@%7AWF_qmdYtO$sEmEG&hNCkJAQfv^`#
zq7f>lMNGxSR7)Zi6;W|H0~J$H5e1GW)ClatB-V{VaX6Pyv#bG}1!K6VWn0S(JgdHx
zj!A=XB?I=NVk(*#h$aQ1$uv{~p`$5uR0;`#(_tBw8iXC(fu%u$F&Shhb|@G-v=ciF
z3Bl4sunb5jmKlmc6EZ^Zj8Hri!hoZ#$A_Lk$Dl1L1Xm+gm!LmzGdeb&1>xY?96W~$
zw?|}gh-?U#fN3ryjL?S>d60182qc2Yk01;X9#Oy}3L$&~+Eu^<g?y`TMUn7mN;lFo
zcr!9}f|xjxjjf&2T30vs^&2*B^7h_LCX=`LY~8xe*Vp&Uul)R}3^p%HD3+!kOjoGX
z8eP7@Xe=o!JNf<jnp>@H?d|PdU0vPX_x>Cld^J2gGBP^)`t{iO#N_0gsp;w2+1dAV
z^NSzN=4BMaa2#J`rbNS=d6~~;#q;_{s$~hTEVoiur~gj8_^Hgkcl5~m*moT{tT1~c
zH<{%SzRID}(~V8Gp<Z!WHVqhLX*t<8&gcVe{(xkvb7{n+RP~LUnfyl&cdcIQ+r7I_
z8Qx?3>qE<vW1N{!q(yg?=Uf~Lu7<X4@1j`H8PmW~o8UrxLRipj@U0Ua=$mZu_O5+g
zvM5iTn3q&nbiT9`C^y$8^#4$*u#i8#uoHaad9pVzFXd;cPgre;hgXNmt<|B<k1{eM
zF0A(wY;#%eIeyk(8Ra0@_m;xBIIfb(Uf6z3ZuQXVj{T;4RP~0I;oQ_({F!6xol>?=
z(ECOE%|%g*LtWaHj*k78>+6S%PdMqers|k|`d|3dGk1ob(wPAZC--QpH%)J?3!iAL
zimsZYMbct#g`aYsx*0TOm&RLjPgB0r({8C>pc~C})6@T6cQ#-pGr(Oke7}MG)(K<Y
zeXz2!&ByQZx5Xl#!Ia^$_D+U5#l4q*s@N!Pd@kwR&?p<;-`()cW@SAxc0bo79qvRB
z#o(>H`Os~=f`3)d8;bK63RBHD{uwS9xS`5@bTJ~|_~yfQtYEXEXS%t$%2hJ6MX$#$
z#R+%)_&fu1iF0mxIoUKgpPQauK9pbPeY)SbV)Rtho@f5McypPy{969grfb(4|A^X`
z=XdzP@~2co^Zp~egIvA-+@;&`(Ju9-_;gpEQf@ob{t7Q0r){BQdr?`1CNfe~K9O>!
zNY?Y7*78nEuK!gOW@{-@SjuZQw(g!Ttnp|oJK<<=Z(mXpKH+5%H3&TxqQ|1nH&&b%
zU#hrpHJd+BIl3+`rekmiCF}N$%EPiGhk?f%aIdtf-ZNvGmJ4TgFMO`K{(I|EVr2X2
mnnFY8NW$KS#0n>X3+J2%bKcASgH~Jrt0aC{4EH)a+4w&U<igzm

diff --git a/static/myorder-icon5.png b/static/myorder-icon5.png
index be1a59f227ca3486d0dc0b9ec4dec89d1750f8f5..1bbbca0c2858c0dc004972d1509096bacfd09778 100644
GIT binary patch
literal 1775
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
RrYQgb002ovPDHLkV1hIeWv&1K

literal 1654
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
ASpWb4

diff --git a/static/tips.png b/static/tips.png
new file mode 100644
index 0000000000000000000000000000000000000000..dbe94fdb39233cfb68a26cdf4e77222fd9d7b378
GIT binary patch
literal 662
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`Z?gjXSxB}__VDR?s+xPF^fB5j>
z@#DuIKYsl5=@U@o<;$1v-o1Mb2CrVd0@4sJgoKDdWPv15JrDpHZ;${`1c`^jgs22-
z0_lRQgfoy;BMY85apLURv**vBzk2oRty{P5+_`i2?%n(M?>~6(;L)Q;Po6vhIvZlR
z+?Qrupbu?Ig8YIRm|6G)1ciizEiA1a96i0geSG~wBO;@Ediwe&Oq?`j=EC(mcJ1D?
zcmII{2M--Sa`eRcYd3G*dH?a}uiyXX{JW;fz`&^O>Eak-aeC^Mn^A`h1X}%b14RM?
zU5>W8MqljOBz|hcNvrq&o#H-tUY=m~_0H3pdZUvmX$+2O3zN3nuKydQIV0fpCCLwQ
z%)gx)Q|uyxl$8~a{q5j4*=6i<Y*XY)aqWbl*uH@874q68=hBqdz1iQ9dhm{4=d$R7
z6}Jo{3!gW2WGGriGB^ZpNpo>AzW9@^A-k{r2bY60`%Z^j*B$qDMqhKRX<j9_>d;kZ
zJ*%n}%>Mk9Cl|Op6pD@UIykE%LwC7@mzuu%WYyCrr|ff8ywCC~G22e=f6Lrojw{!6
zbc89smSMQ}IQ}~$gGIOg{mZcv?T?rqdR!mHrM`E?^Y1~9+{^D@>B;Rp{9whJq<OrV
z>z>Rq`ZP7zXT=_4o{oi+`)8DfZ4Al&`g?8EN{L-(^yP1f&8>Ej%K`>JgQu&X%Q~lo
FCIEdai>d$s

literal 0
HcmV?d00001

diff --git a/static/xyddImages/back.png b/static/xyddImages/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..738da3a3b68b30a7a12e4582938fb8186134c41c
GIT binary patch
literal 228
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|mSQK*5Dp-y;YjHK@@IRxIEGmG
zuf1}cw?To2HDDKG-UBwPNqNgAzu@S5z>(J=?!?hDJ;3vafyr?*-3cpnmQHc$P+7EF
z#A~T@w@im5BX8`4_A?A+4&KIBx?ae;Ed8n=c%_>~fW1&a-0*^Y$NY<}{hZa#v#;Np
zu<V@g^_(zu_TsnClMc!hZn)!MHht!vEw(dL^Xs+0J(awe%GJ|a$GT}XN9E#$3zxI(
YWu6}<{BLD~6403pp00i_>zopr0F1~{`v3p{

literal 0
HcmV?d00001

diff --git a/static/xyddImages/border2.png b/static/xyddImages/border2.png
new file mode 100644
index 0000000000000000000000000000000000000000..5db8addddf4a80a0489d8262336fd2c9e3470b35
GIT binary patch
literal 1476
zcmeAS@N?(olHy`uVBq!ia0y~yU|Pq(z!=BD3=}Dj&fNgyxCi)zxB|KV|1<n=X!!ph
zh*tgI-|+uT+U;$V{@<ST|5)Gu$9@0LH2lBV{p~{E{|kNJF86-BGU5BRp6}=TzhCVB
zak~A-rT!mhx_(>+qDddmcl`jNi9arO{<t{d=h^<Bm-~O5@A+||@5hCn9~b++p6~r}
zq4($co^NM+zFqA7cE0!f#s04sK!QIm_5x*rwtNGsywDHiegi5y-v`tMRQ3a;5oicl
z0Z0lg4&wHFzt9UpK%<ZtAOpebzXMfX=mRV0`+gC~fN{Z!fwllepa^IJ2tl|Y?O<^*
z11Ja*hgbwx4-tWKi%*CI1A{WBB*-tAfsu)cnT3^|os*M`TUuIHPF_J#Nl95*Syfe4
zU0qYt)y>_*%O@ZxI5Z_aJu^EeH#aXoKfj=$u&B7Cw6wfp?)=4zmn>beX4B>^TXyZ<
zz4yZ9tJkmJxOwaLosS<sefs?6%hzw;fByRQ`_JFM|FqfEcQG(9AMkW>45_&F_S*3v
zQ3ny%i`fS{x)^(Ah%&ReoUu%IJphWMdq4kgWL|PXenZuUYipJ-FT49{Rpo7cn|be8
zW?i0HS5g=KH}~}2b&(n2->)q@8r5HC%#r)sYE!`Lne$9DV)JwMT~qd)wDRLZQ`WPQ
zn@f|_JdJ`vP5-E#Jb${jY+-2a^*Xhmdp56nr#|y;zED(Ig4xNvtM2YqN&dDV_p#@$
z-LI-9olJeUAop~<+RiZl$#XWat+k%|#B;CTro$3j@+?lS{xu<GsbNNJ{UkrtPTh?7
zNhd^iHpNU_9WzlI%yL|JLi7n&k?T5z@Cn*QtROj{#FMTVN1zB$f_0}7P=eM<yJDV#
zY&;PPat(|#2;2n;m?v7GkZ@fG4kZ|8K*I|u!j!_nF;p}a6niiZJ>&65{mwd{O}E6h
ztg}CPylQsJ4Pd(SpJe{k=A>uxg<Y3D=Uu(3qCYL7d7JKBpQ4p)&nL+kv*$|t8g1YC
zDs9sH>bH)kzy0+nTD*$wp6blKH`0Zowmv$QGwHkZs#Scdp3Bbht=q)?HqzR}aI(sN
zzH|G}e`V@@-K+b>`qNRVEpIPBJX*c`qu+IfEvu`mAI#@J^y^~#W!cRa=AHY}{P^|1
blwZ;XvV~pEjGpg+We9_(tDnm{r-UW|%&`ID

literal 0
HcmV?d00001

diff --git a/static/xyddImages/btn-bg.png b/static/xyddImages/btn-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..1dcabfd7caa80f0ea13f9c887404f79ad14a1536
GIT binary patch
literal 2180
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
GLSTZ>`!1{i

literal 0
HcmV?d00001

diff --git a/static/xyddImages/light-bg.png b/static/xyddImages/light-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e98404d53c5bf6fee41232f67a3547f255a57c9
GIT binary patch
literal 8166
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
CG1_$i

literal 0
HcmV?d00001

diff --git a/static/xyddImages/light-border.png b/static/xyddImages/light-border.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa1dd7853c7fcbd9ab4d09c661dd477ef3741d7b
GIT binary patch
literal 7751
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
Krc&xt;C}$g@52!Q

literal 0
HcmV?d00001

diff --git a/static/xyddImages/light-l.png b/static/xyddImages/light-l.png
new file mode 100644
index 0000000000000000000000000000000000000000..db4d1fee3b0b7b342682d475e2530b6bf4b6ac50
GIT binary patch
literal 6596
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
C#jADz

literal 0
HcmV?d00001

diff --git a/static/xyddImages/tabs-box-bg.png b/static/xyddImages/tabs-box-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac255700593a05f56874beb4ce288b7643172d67
GIT binary patch
literal 2191
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
E0eDXuvj6}9

literal 0
HcmV?d00001