diff --git a/manifest.json b/manifest.json
index c2817a2..a2d9b62 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "瑜伽汇",
     "appid" : "__UNI__B6E0086",
     "description" : "瑜伽汇",
-    "versionName" : "1.0.22",
-    "versionCode" : 1022,
+    "versionName" : "1.0.1",
+    "versionCode" : 101,
     "transformPx" : false,
     "app-plus" : {
         "flexible" : true,
@@ -37,8 +37,7 @@
             "Payment" : {},
             "Record" : {},
             "Geolocation" : {},
-            "Maps" : {},
-            "OAuth" : {}
+            "Maps" : {}
         },
         /* 横竖屏设置 */
         "screenOrientation" : [ "portrait-primary", "landscape-primary" ],
@@ -88,9 +87,7 @@
             //,"idfa" : true
             "sdkConfigs" : {
                 "ad" : {},
-                "speech" : {
-                    "ifly" : {}
-                },
+                "speech" : {},
                 "push" : {},
                 "payment" : {
                     "alipay" : {
@@ -100,8 +97,8 @@
                 "geolocation" : {
                     "amap" : {
                         "name" : "amapC3ZVrznQc",
-                        "__platform__" : [ "android" ],
-                        "appkey_ios" : "",
+                        "__platform__" : [ "ios", "android" ],
+                        "appkey_ios" : "4b35267e3ea9a8dc9993b51a8335bc4c",
                         "appkey_android" : "f2e79a46af6f940428350d977bdfae4d"
                     },
                     "system" : {
@@ -111,7 +108,7 @@
                 "maps" : {
                     "amap" : {
                         "name" : "amapCmiOEDcOx",
-                        "appkey_ios" : "f2e79a46af6f940428350d977bdfae4d",
+                        "appkey_ios" : "4b35267e3ea9a8dc9993b51a8335bc4c",
                         "appkey_android" : "f2e79a46af6f940428350d977bdfae4d"
                     }
                 },
@@ -153,6 +150,45 @@
             }
         },
         "nativePlugins" : {
+            "JG-JCore" : {
+                "JPUSH_APPKEY_ANDROID" : "d5edb270e4b1cc29616e1dd5",
+                "JPUSH_APPKEY_IOS" : "d5edb270e4b1cc29616e1dd5",
+                "JPUSH_CHANNEL_ANDROID" : "developer-default",
+                "JPUSH_CHANNEL_IOS" : "developer-default",
+                "__plugin_info__" : {
+                    "name" : "极光推送 JCore 官方 SDK",
+                    "description" : "极光推送 JCore 官方 SDK HBuilder 插件版本",
+                    "platforms" : "Android,iOS",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=4028",
+                    "android_package_name" : "com.sdlyoga.app",
+                    "ios_bundle_id" : "com.yjhyoga.app",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "4028",
+                    "parameters" : {
+                        "JPUSH_APPKEY_ANDROID" : {
+                            "des" : "[Android]极光portal配置应用信息时分配的AppKey",
+                            "key" : "JPUSH_APPKEY",
+                            "value" : ""
+                        },
+                        "JPUSH_APPKEY_IOS" : {
+                            "des" : "[iOS]极光portal配置应用信息时分配的AppKey",
+                            "key" : "JCore:APP_KEY",
+                            "value" : ""
+                        },
+                        "JPUSH_CHANNEL_ANDROID" : {
+                            "des" : "[Android]用于统计分发渠道，不需要可填默认值developer-default",
+                            "key" : "JPUSH_CHANNEL",
+                            "value" : ""
+                        },
+                        "JPUSH_CHANNEL_IOS" : {
+                            "des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default",
+                            "key" : "JCore:CHANNEL",
+                            "value" : ""
+                        }
+                    }
+                }
+            },
             "JG-JPush" : {
                 "JPUSH_ADVERTISINGID_IOS" : "",
                 "JPUSH_DEFAULTINITJPUSH_IOS" : "",
@@ -174,12 +210,12 @@
                 "JPUSH_XIAOMI_APPID" : "",
                 "JPUSH_XIAOMI_APPKEY" : "",
                 "__plugin_info__" : {
-                    "name" : "瑜伽汇",
-                    "description" : "瑜伽汇",
+                    "name" : "极光推送 JPush 官方 SDK",
+                    "description" : "极光推送JPush官方SDK HBuilder插件版本",
                     "platforms" : "Android,iOS",
                     "url" : "https://ext.dcloud.net.cn/plugin?id=4035",
                     "android_package_name" : "com.sdlyoga.app",
-                    "ios_bundle_id" : "",
+                    "ios_bundle_id" : "com.yjhyoga.app",
                     "isCloud" : true,
                     "bought" : 1,
                     "pid" : "4035",
@@ -282,43 +318,18 @@
                     }
                 }
             },
-            "JG-JCore" : {
-                "JPUSH_APPKEY_ANDROID" : "d5edb270e4b1cc29616e1dd5",
-                "JPUSH_APPKEY_IOS" : "d5edb270e4b1cc29616e1dd5",
-                "JPUSH_CHANNEL_ANDROID" : "",
-                "JPUSH_CHANNEL_IOS" : "",
+            "youyacao-Jcore" : {
                 "__plugin_info__" : {
-                    "name" : "瑜伽汇",
-                    "description" : "瑜伽汇",
-                    "platforms" : "Android,iOS",
-                    "url" : "https://ext.dcloud.net.cn/plugin?id=4028",
+                    "name" : "极光JCore官方SDK ·官方伙伴发布·基础版依赖包",
+                    "description" : "极光JCore官方SDK ·官方伙伴发布·基础版依赖包",
+                    "platforms" : "Android",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=4752",
                     "android_package_name" : "com.sdlyoga.app",
-                    "ios_bundle_id" : "",
+                    "ios_bundle_id" : "com.yjhyoga.app",
                     "isCloud" : true,
                     "bought" : 1,
-                    "pid" : "4028",
-                    "parameters" : {
-                        "JPUSH_APPKEY_ANDROID" : {
-                            "des" : "[Android]极光portal配置应用信息时分配的AppKey",
-                            "key" : "JPUSH_APPKEY",
-                            "value" : ""
-                        },
-                        "JPUSH_APPKEY_IOS" : {
-                            "des" : "[iOS]极光portal配置应用信息时分配的AppKey",
-                            "key" : "JCore:APP_KEY",
-                            "value" : ""
-                        },
-                        "JPUSH_CHANNEL_ANDROID" : {
-                            "des" : "[Android]用于统计分发渠道，不需要可填默认值developer-default",
-                            "key" : "JPUSH_CHANNEL",
-                            "value" : ""
-                        },
-                        "JPUSH_CHANNEL_IOS" : {
-                            "des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default",
-                            "key" : "JCore:CHANNEL",
-                            "value" : ""
-                        }
-                    }
+                    "pid" : "4752",
+                    "parameters" : {}
                 }
             }
         }
diff --git a/pages.json b/pages.json
index 66f23c4..4d6aba1 100644
--- a/pages.json
+++ b/pages.json
@@ -440,6 +440,32 @@
 	      "enablePullDownRefresh": false
 	  }
 	},
+	
+	{
+	    "path" : "pages/user/info",
+	    "style" :                                                                                    
+	    {
+	        "navigationBarTitleText": "",
+	        "enablePullDownRefresh": false
+	    }
+	},
+	{
+	    "path" : "pages/user/infofw",
+	    "style" :                                                                                    
+	    {
+	        "navigationBarTitleText": "用户服务协议",
+	        "enablePullDownRefresh": false
+	    }
+	},
+	{
+	    "path" : "pages/user/infoys",
+	    "style" :                                                                                    
+	    {
+	        "navigationBarTitleText": "隐私政策条款",
+	        "enablePullDownRefresh": false
+	    }
+	},
+	
 
 	// ……其他页面配置 更新版本
 	{
diff --git a/pages/cart/cart.vue b/pages/cart/cart.vue
index 71a555b..6de44ed 100644
--- a/pages/cart/cart.vue
+++ b/pages/cart/cart.vue
@@ -1,11 +1,9 @@
 <template>
     <view class="page">
         <view class="page-header" :style="{ paddingTop: geStatusBarHeight() + 'px'}">
-            <view :class="['title', carts.length > 0 ? '' : 'text-center']">购物车</view>
-            <block v-if="carts.length > 0">
-                <view class="edit" v-if="btnType === 'edit'" @click="$u.throttle(btnTool('edit'), 2000)">管理</view>
-                <view class="edit" v-if="btnType === 'done'" @click="$u.throttle(btnTool('done'), 2000)">完成</view>
-            </block>
+            <view class="text-center">购物车</view>
+            <view class="edit" v-if="carts.length > 0&&btnType === 'edit'" @click="$u.throttle(btnTool('edit'), 2000)">管理</view>
+            <view class="edit" v-if="carts.length > 0&&btnType === 'done'" @click="$u.throttle(btnTool('done'), 2000)">完成</view>
         </view>
 		<view class="cart-top"></view>
 		<!-- 购物车商品 -->
@@ -213,9 +211,8 @@
 			this.userid = user.userid? user.userid:'';
 			this.phone = user.userphone;
 	        this.checked = false;
-			this.getapicart();
+			this.getapicart(); 
 			
-			 
 			var messageNum=getmessageNum();
 			console.log("messageNum",messageNum)
 			if(messageNum>0){
@@ -352,8 +349,8 @@
 				var ret = false;
 				fcarts.forEach((cell)=>{
 					if(id==cell.storeNmae){
-						ret=cell["check"];
-						return;
+						ret=cell["check"]?cell["check"]:false;
+						return false;
 					}
 				});
 				return ret;
@@ -364,7 +361,7 @@
 				fcarts.forEach((cell)=>{
 					cell.cartList.forEach((ii)=>{
 						if(ii.id==id){
-							ret=ii["check"];
+							ret=ii["check"]?ii["check"]:false;
 							return;
 						}
 					});
@@ -669,23 +666,27 @@
 .page-header {
 	position: fixed;
 	width: 100%;
-	z-index: 99;
-    padding: 30rpx 30rpx;
+	height: 160rpx; 
+	/* #ifdef H5 */
+	height: 100rpx;
+	/* #endif */
+	z-index: 999;
+    padding: 0 30rpx;
     display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	align-items: center;
     color: #fff;
-    font-size: 36rpx;
     background-color: #00a89b;
-	align-items: center;
+	font-size: 32rpx; 
     .text-center {
-        width: 100%;
-        text-align: center;
+		display: flex;
+		transform: translateY(-50%); 
+		flex: 1;
     }
-    .edit {
-        position: absolute;
-        top: 30rpx;
-        transform: translateY(-50%);
-        right: 20rpx;
-        font-size: 32rpx;
+    .edit { 
+		display: flex;
+        transform: translateY(-50%); 
     }
 }
 .cart-bottom{
@@ -699,7 +700,7 @@
 .cart-top{
 	width: 100%;
 	height: 1rpx;
-	margin-top: 166rpx;
+	margin-top: 180rpx;
 	/* #ifdef H5 */
 	margin-top: calc( var(--window-top) + 105rpx);
 	/* #endif */
diff --git a/pages/category/category.vue b/pages/category/category.vue
index c7cd54f..52217f8 100644
--- a/pages/category/category.vue
+++ b/pages/category/category.vue
@@ -1123,8 +1123,8 @@
 		height: 90rpx;
 	}
 	.cur .ptext{
-		color: #000;
-		font-size: 34rpx;
+		color: #00a89b;
+		font-size: 36rpx;
 	}
 	.cur .pline{
 		width: 40%;
diff --git a/pages/chatbox/chat.vue b/pages/chatbox/chat.vue
index b4ccdc8..0f2379b 100644
--- a/pages/chatbox/chat.vue
+++ b/pages/chatbox/chat.vue
@@ -1,9 +1,9 @@
 <template>
   <view class="page">
     <!-- 页面头部 -->
-    <view class="page-header" :style="{ paddingTop: geStatusBarHeight() + 8 + 'px' }">
+    <view class="page-header" :style="{ paddingTop: geStatusBarHeight() }">
       <view class="text-center">消息</view>
-      <uni-icons type="staff-filled" size="30" color="#ffffff" @click="gotoContacts"></uni-icons>
+      <uni-icons type="staff-filled" size="32" color="#ffffff" @click="gotoContacts"></uni-icons>
     </view>
 
     <view class="wrapcon">
@@ -221,21 +221,26 @@ export default {
 .page-header {
   position: fixed;
   width: 100%;
+  height: 150rpx; 
+  /* #ifdef H5 */
+   height: 100rpx; 
+  /* #endif */ 
+  padding: 0 30rpx 16rpx;
   z-index: 999;
-  padding: 40rpx 30rpx 30rpx 30rpx;
   display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: flex-end;
   color: #fff;
   font-size: 36rpx;
   background-color: #00a89b;
   .text-center {
     width: 100%;
-    text-align: center;
+	display: flex;
+	flex: 1;
+	font-weight: 600;
   }
-  .edit {
-    position: absolute;
-    top: 50%;
-    transform: translateY(-50%);
-    right: 30rpx;
+  .edit {  
     font-size: 32rpx;
   }
 }
@@ -245,11 +250,11 @@ export default {
   position: relative;
   margin: 180rpx 0 0 0;
   min-height: calc(100vh - 180rpx);
-  /* #ifdef H5 */
-  margin: calc(110rpx + var(--window-top)) 0 0 0;
-  min-height: calc(100vh - var(--window-top) - var(--window-bottom) - 180rpx);
-  /* #endif */
   overflow-y: auto;
+  /* #ifdef H5 */
+  margin: calc(100rpx + var(--window-top)) 0 0 0;
+  min-height: calc(100vh - var(--window-top) - var(--window-bottom) - 100rpx);
+  /* #endif */ 
 }
 .listcell {
   background: #fff;
diff --git a/pages/components/selShop.vue b/pages/components/selShop.vue
index b63a2f8..6579725 100644
--- a/pages/components/selShop.vue
+++ b/pages/components/selShop.vue
@@ -248,7 +248,7 @@ export default {
 		position: relative;
 		overflow: hidden;
 		background-color: #FFFFFF;
-		margin: 40rpx 5% 240rpx 5%;
+		margin: 140rpx 5%;
 		border-radius: 50rpx;
 	}
 	.rclose{
diff --git a/pages/login/login.vue b/pages/login/login.vue
index d5a6cea..5440d6c 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -28,6 +28,28 @@
 						<view class="regtxtl"></view> -->
 						<view class="regtxtr" @click="gotoregister">注册账号 → </view>
 					</view>
+					
+					<view class="xycon">
+						<view class="sitem">
+							<view class="selbtn">
+								<uni-data-checkbox multiple v-model="checkbox1" :localdata="checkboxitem"></uni-data-checkbox>
+							</view>
+							<view class="conright">
+								<text class="sname">
+									我已阅读并同意 
+								</text>
+								<text class="adress" @click="gotofw">
+									《用户服务协议》
+								</text>
+								<text class="sname">
+									与
+								</text>
+								<text class="adress" @click="gotoys">
+									《隐私政策条款》
+								</text>
+							</view>
+						</view>
+					</view>
 
 				</uni-forms>
 
@@ -38,9 +60,9 @@
 </template>
 
 <script>
-	//#ifdef APP-PLUS
+	// #ifdef APP-PLUS
 	// const jpushModule = uni.requireNativePlugin('JG-JPush');
-	//#endif
+	// #endif
 	import {myCache} from '../../utils/utils.js';
 	export default {
 		data() {
@@ -60,6 +82,12 @@
 				address:'',
 				longitude:'', // 经度
 				latitude:'', // 维度
+				checkbox1: [1],
+				checkboxitem: [{
+					text: '',
+					value: 1,
+				}],
+				ifxy: false // 是否选择协议
 			}
 		},
 		onLoad(){
@@ -273,6 +301,11 @@
 			},
 			// 密码登录
 			async loginpwdDo(){
+				
+				// 是否阅读协议
+				if(!this.checkxy()){
+					return false;
+				}
 
 				// 手机号码 密码是否输入
 				if(!this.form.phonenumber){
@@ -350,6 +383,7 @@
 						nickName:user.nickName,
 						username:user.userName,
 						userphone:user.phoneNumber,
+						signature:user.signature,
 						avatar:user.avatar
 					});
 					myCache('userInfo',user);
@@ -363,7 +397,26 @@
 					// var shoplist=[shop]
 					// myCache('shoplist',shoplist);
 				}
-        getApp().$vm.init(user.userId)
+				getApp().$vm.init(user.userId)
+			},
+			checkxy(){
+				console.log(this.checkbox1);
+				if(this.checkbox1.length>0&&this.checkbox1[0]){
+					return true;
+				}
+				else{
+					uni.showModal({
+						title: '提示',
+						content: '请阅读并同意用户服务协议、隐私政策条款!',
+						cancelText: '取消',
+						confirmText: '确定',
+						success: ress => {
+							if (ress.confirm) {
+							}
+						}
+					});
+					return false;
+				}
 			},
 			async loadshop(){
 				// 获取门店
@@ -403,6 +456,18 @@
 					myCache('shoplist',shoplist);
 				}
 			},
+			
+			gotofw(){
+				uni.navigateTo({
+					url: `/pages/user/infofw`
+				});
+			},
+			gotoys(){
+				uni.navigateTo({
+					url: `/pages/user/infoys`
+				});
+			},
+			
 		}
 
 	}
@@ -530,7 +595,7 @@
 		}
 		.formregion {
 			width: 100%;
-			padding: 30px 50rpx;
+			padding: 30px 50rpx 20rpx;
 			background-color: #fff;
 			border-radius: 10px;
 			margin-top: 20rpx;
@@ -567,4 +632,41 @@
 		padding: 0 0 40rpx 0;
 
 	}
+	
+	.xycon{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 50rpx 0 0;
+		width: 100%;
+		.sitem {
+			display: flex;
+			flex-direction: row;
+			.conright{
+				flex: 1;
+				margin: 10rpx 0;
+				margin-left: -36rpx;
+			}
+			.selbtn{
+				width: 80rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				margin-left: 10rpx;
+			}
+			.sname{
+				font-size: 24rpx; 
+				font-weight: 400;
+				color: #23262F;
+				line-height: 36rpx;
+			}
+			.adress{
+				font-size: 24rpx; 
+				font-weight: 400;
+				color: #00a89b;
+				line-height: 36rpx;
+			}
+		}
+	}
+	
 </style>
diff --git a/pages/login/register.vue b/pages/login/register.vue
index a061c15..db5e400 100644
--- a/pages/login/register.vue
+++ b/pages/login/register.vue
@@ -33,7 +33,32 @@
 					
 				</uni-forms>
 				
+				<view class="xycon">
+					<view class="sitem">
+						<view class="selbtn">
+							<uni-data-checkbox multiple v-model="checkbox1" :localdata="checkboxitem"></uni-data-checkbox>
+						</view>
+						<view class="conright">
+							<text class="sname">
+								我已阅读并同意 
+							</text>
+							<text class="adress" @click="gotofw">
+								《用户服务协议》
+							</text>
+							<text class="sname">
+								与
+							</text>
+							<text class="adress" @click="gotoys">
+								《隐私政策条款》
+							</text>
+						</view>
+					</view>
+				</view>
+				
 			</view>
+			
+			 
+			
 			<u-toast ref="uToast" />
 		</view>
 	</view>
@@ -63,6 +88,12 @@
 				address:'',
 				longitude:'', // 经度
 				latitude:'', // 维度
+				checkbox1: [1],
+				checkboxitem: [{
+					text: '',
+					value: 1,
+				}],
+				ifxy: false // 是否选择协议
 			}
 		},
 		onLoad(){
@@ -188,6 +219,11 @@
 			// 注册
 			async loginpwdDo(){
 				
+				// 是否阅读协议
+				if(!this.checkxy()){
+					return false;
+				}
+				
 				// 手机号码 密码是否输入
 				if(!this.form.phonenumber){
 					this.$refs.uToast.show({
@@ -257,7 +293,36 @@
 						duration: 2000
 					});
 				}
-			}
+			},
+			checkxy(){
+				console.log(this.checkbox1);
+				if(this.checkbox1.length>0&&this.checkbox1[0]){
+					return true;
+				}
+				else{
+					uni.showModal({
+						title: '提示',
+						content: '请阅读并同意用户服务协议、隐私政策条款!',
+						cancelText: '取消',
+						confirmText: '确定',
+						success: ress => {
+							if (ress.confirm) {
+							}
+						}
+					});
+					return false;
+				}
+			},
+			gotofw(){
+				uni.navigateTo({
+					url: `/pages/user/infofw`
+				});
+			},
+			gotoys(){
+				uni.navigateTo({
+					url: `/pages/user/infoys`
+				});
+			},
 			
 		}
 
@@ -423,4 +488,42 @@
 		padding: 0 0 40rpx 0;
 		width: 100%;
 	}
+	
+	.xycon{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 50rpx 0 0;
+		width: 100%;
+		.sitem {
+			display: flex;
+			flex-direction: row;
+			.conright{
+				flex: 1;
+				margin: 10rpx 0;
+				margin-left: -36rpx;
+			}
+			.selbtn{
+				width: 80rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				margin-left: 10rpx;
+			}
+			.sname{
+				font-size: 24rpx; 
+				font-weight: 400;
+				color: #23262F;
+				line-height: 36rpx;
+			}
+			.adress{
+				font-size: 24rpx; 
+				font-weight: 400;
+				color: #00a89b;
+				line-height: 36rpx;
+			}
+		}
+	}
+	
+	
 </style>
diff --git a/pages/message/contact.vue b/pages/message/contact.vue
index a7cf952..180c94e 100644
--- a/pages/message/contact.vue
+++ b/pages/message/contact.vue
@@ -494,46 +494,44 @@ import { mapState, mapActions, mapGetters } from 'vuex'
 			}
 			.cur1{
 				color:#ff7530;
-				font-size: 32rpx;
+				font-size: 36rpx;
 				font-weight: 600;
 			}
 			.cur2{
 				color:#46a0fb;
-				font-size: 32rpx;
+				font-size: 36rpx;
 				font-weight: 600;
 			}
 			.cur3{
 				color:#5bd171;
-				font-size: 32rpx;
+				font-size: 36rpx;
 				font-weight: 600;
 			}
 			.cur5{
 				color:#d4237a;
-				font-size: 32rpx;
+				font-size: 36rpx;
 				font-weight: 600;
 			}
 			.cur6{
 				color:#00a89b;
-				font-size: 32rpx;
+				font-size: 36rpx;
 				font-weight: 600;
 			}
 			.cur4{
 				color:#fca600;
-				font-size: 32rpx;
+				font-size: 36rpx;
 				font-weight: 600;
 			}
 		}
 	}
 	.wrapcon{
-		margin: 370rpx 0 0 0;
-		/* #ifdef H5 */
-		margin: 300rpx 0 0 0;
-		/* #endif */
+		margin: 420rpx 0 0 0; 
 		padding: 0;
 		width: 100%;
 		position: relative;
-		min-height: calc(100vh - 350rpx);
+		min-height: calc(100vh - 420rpx);
 		/* #ifdef H5 */
+		margin: 300rpx 0 0 0;
 		min-height: calc(100vh - var(--window-top) - var(--window-bottom) - 350rpx);
 		/* #endif */
 		overflow-y: auto;
diff --git a/pages/product/cdetail.vue b/pages/product/cdetail.vue
index e437937..4faf6e9 100644
--- a/pages/product/cdetail.vue
+++ b/pages/product/cdetail.vue
@@ -142,7 +142,7 @@
 				<view class="sitem" @tap="gotoCart">
 					<uni-icons type="cart" size="25" color="#919191"></uni-icons>
 					<view class="txt">购物车</view>
-					<view class="cnum">{{cartnum}}</view>
+					<view class="cnum" v-if="cartnum>0">{{cartnum}}</view>
 				</view>
 			</view>
 			<button type="primary" class="bbtn" @tap="gobuy($event,1)" data-img="/static/image/cart.png">加入购物车</button>
diff --git a/pages/teacher/course.vue b/pages/teacher/course.vue
index b2ef30f..0e42ec4 100644
--- a/pages/teacher/course.vue
+++ b/pages/teacher/course.vue
@@ -12,7 +12,7 @@
 					</uni-th>
 					<uni-th width="80" align="center" v-for="(item, index) in columnTitles" :key="index">
 						<view class="rightcell">
-							<view class="ctitle">{{item.day}}</view>
+							<view class="ctitle">{{item.day?item.day.substring(5):""}}</view>
 							<view class="ctitle">{{item.weekName}}</view>
 							<view class="cnum" v-if="item.count>0">{{item.count}}</view>
 						</view>
diff --git a/pages/user/courselist.vue b/pages/user/courselist.vue
index 2efbc1c..c26f482 100644
--- a/pages/user/courselist.vue
+++ b/pages/user/courselist.vue
@@ -109,7 +109,7 @@
 						</uni-th>
 						<uni-th width="80" align="center" v-for="(item, index) in columnTitles" :key="index">
 							<view class="rightcell">
-								<view class="ctitle">{{item.day}}</view>
+								<view class="ctitle">{{item.day?item.day.substring(5):""}}</view>
 								<view class="ctitle">{{item.weekName}}</view>
 								<view class="cnum" v-if="item.count>0">{{item.count}}</view>
 							</view>
@@ -909,7 +909,8 @@
 		display: flex;
 		flex-direction: row;
 		background-color: #FFFFFF;
-		padding-top: 10rpx;
+		min-height: 100rpx;
+		width: 100%;
 		border-bottom: 1px solid #ddd;
 		.hback{
 			display: flex;
@@ -1280,7 +1281,7 @@
     }
     .courcon{
     	width: 100%;
-    	height: calc(100vh - 100rpx);
+    	height: calc(100vh - 200rpx);
     	/* #ifdef H5 */
     	height: calc(100vh - 100rpx - var(--window-top));
     	/* #endif */
diff --git a/pages/user/info.vue b/pages/user/info.vue
index 48933a7..8ae2a76 100644
--- a/pages/user/info.vue
+++ b/pages/user/info.vue
@@ -12,9 +12,6 @@
 				<mp-html v-if="id==1" :content="html1" :markdown="true" :lazy-load="true"/>
 				<mp-html v-if="id==2" :content="html2" :markdown="true" :lazy-load="true"/>
 				<mp-html v-if="id==3" :content="html3" :markdown="true" :lazy-load="true"/>
-				<mp-html v-if="id==4" :content="html4" :markdown="true" :lazy-load="true"/>
-				<mp-html v-if="id==5" :content="html5" :markdown="true" :lazy-load="true"/>
-				<mp-html v-if="id==9" :content="html9" :markdown="true" :lazy-load="true"/>
 			</view>
 		</view>
 		
@@ -38,14 +35,11 @@
 		},
 		data() {
 			return {
-				id:1, // 1、用户授权协议  2、用户隐私协议 3、用户注册协议 4、征信授权协议 5、租赁服务协议 6、
+				id:1, // 1、用户服务协议  2、隐私政策条款 3、用户注册协议
 				title: "用户授权协议",
 				html1:``,
 				html2:``,
 				html3:``,
-				html4:``,
-				html5:``,
-				html9:``,
 			}
 		},
 		onShow(){
@@ -57,52 +51,24 @@
 			}
 		},
 		async onReady(){
-			// 1、用户授权协议  2、用户隐私协议 3、用户注册协议 4、征信授权协议 5、租赁服务协议 6、
+			// 1、用户服务协议  2、隐私政策条款 3、用户注册协议
 			if(this.id==1)
 			{
 				uni.setNavigationBarTitle({
-				  title: "用户授权协议",
+				  title: "用户服务协议",
 				});
 				this.getxy();
 			}
 			else if(this.id==2)
 			{
 				uni.setNavigationBarTitle({
-				  title: "用户隐私协议",
+				  title: "隐私政策条款",
 				});
 				this.getxy();
 			}
-			else if(this.id==3)
-			{
-				uni.setNavigationBarTitle({
-				  title: "用户注册协议",
-				});
-				this.getxy();
-			}
-			else if(this.id==4)
-			{
-				uni.setNavigationBarTitle({
-				  title: "征信授权协议",
-				});
-				this.getxy();
-			}
-			else if(this.id==5)
-			{
-				uni.setNavigationBarTitle({
-				  title: "租赁服务协议",
-				});
-				this.getxy();
-			}
-			else if(this.id==9)
-			{
-				uni.setNavigationBarTitle({
-				  title: "招商入驻",
-				});
-				this.getInvestmentInfo();
-			}
 			else{
 				uni.setNavigationBarTitle({
-				  title: "租赁服务协议及相关",
+				  title: "用户注册协议",
 				});
 			}
 			 
@@ -112,60 +78,29 @@
 			this.$refs.topId.topData(e.scrollTop);
 		},
 		methods:{
-			async getInvestmentInfo(){
-				try{
-					uni.showLoading({
-						title: '数据加载中...'
-					});
-					const {data: res} = await uni.$http.post('/platform/getInvestmentInfo');
-					if(res){
-						this.html9=res;
-						this.$forceUpdate();
-					}
-				}
-				catch(e){
-					console.log(e)
-				}
-			},
 			async getxy(){
 				if(this.id){
 					try{
 						uni.showLoading({
 							title: '数据加载中...'
 						});
-						const {data: res} = await uni.$http.post('/platform/getProtocol');
-						// Conten1:用户授权协议
-						// Conten2:用户隐私协议
+						const {data: res} = await uni.$http.get('/yoga/api/privacyPolicy');
+						// Conten1:用户服务协议
+						// Conten2:隐私政策条款
 						// Conten3:用户注册协议
-						// Conten4:征信授权协议
-						// Conten5:租赁服务协议
 						if(res){
-							// console.log(res.content1)
-							// console.log(res.content2)
-							// console.log(res.content3)
-							// console.log(res.content4)
-							// console.log(res.content5)
-							 
 							if(this.id==1){
-								// 1、用户授权协议  2、用户隐私协议 3、用户注册协议 4、征信授权协议 5、租赁服务协议 6、
+								// 1、用户服务协议  2、隐私政策条款 3、用户注册协议
 								this.html1=res.content1;
 							}
 							else if(this.id==2){
-								// 1、用户授权协议  2、用户隐私协议 3、用户注册协议 4、征信授权协议 5、租赁服务协议 6、
+								// 1、用户服务协议  2、隐私政策条款 3、用户注册协议
 								this.html2=res.content2;
 							}
 							else if(this.id==3){
-								// 1、用户授权协议  2、用户隐私协议 3、用户注册协议 4、征信授权协议 5、租赁服务协议 6、
+								// 1、用户服务协议  2、隐私政策条款 3、用户注册协议
 								this.html3=res.content3;
 							}
-							else if(this.id==4){
-								// 1、用户授权协议  2、用户隐私协议 3、用户注册协议 4、征信授权协议 5、租赁服务协议 6、
-								this.html4=res.content4;
-							}
-							else if(this.id==5){
-								// 1、用户授权协议  2、用户隐私协议 3、用户注册协议 4、征信授权协议 5、租赁服务协议 6、
-								this.html5=res.content5;
-							}
 							this.$forceUpdate();
 						}
 					}
diff --git a/pages/user/infofw.vue b/pages/user/infofw.vue
new file mode 100644
index 0000000..f8619fa
--- /dev/null
+++ b/pages/user/infofw.vue
@@ -0,0 +1,23 @@
+<template>
+	<view>
+		<web-view :webview-styles="webviewStyles" src="https://yoga.runpengsoft.com/yoga/api/termsOfService"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				webviewStyles: {
+					progress: {
+						color: '#ffffff'
+					}
+				}
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/user/infoys.vue b/pages/user/infoys.vue
new file mode 100644
index 0000000..13ee840
--- /dev/null
+++ b/pages/user/infoys.vue
@@ -0,0 +1,23 @@
+<template>
+	<view>
+		<web-view :webview-styles="webviewStyles" src="https://yoga.runpengsoft.com/yoga/api/privacyPolicy"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				webviewStyles: {
+					progress: {
+						color: '#ffffff'
+					}
+				}
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 105b659..1edeecd 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -156,12 +156,20 @@
 					</view>
 					<view class="title">{{servers[11].name}}</view>
 				</view>
+				<!-- 退出登录 -->
 				<view v-if="userid" class="product-item" @click="gotoServe(99)">
 					<view class="image-wrapper">
 						<image class="imgicon" :src="servers[15].img" mode="aspectFill" lazy-load></image>
 					</view>
 					<view class="title">{{servers[15].name}}</view>
 				</view>
+				<!-- 账户注销 -->
+				<view v-if="userid" class="product-item" @click="gotoServe(98)">
+					<view class="image-wrapper">
+						<image class="imgicon" :src="servers[16].img" mode="aspectFill" lazy-load></image>
+					</view>
+					<view class="title">{{servers[16].name}}</view>
+				</view>
 			</scroll-view>
 		</view>
 
@@ -303,6 +311,12 @@
 						img:'../../static/image/tc.png',
 						name:'退出登录',
 					},
+					{
+						key:98,
+						img:'../../static/image/zx.png',
+						name:'账户注销',
+					},
+					
 				],
 			};
 		},
@@ -322,7 +336,7 @@
 				this.avatar = user.avatar?user.avatar:'../../static/image/logo.png';
 				this.nickName= user.nickName? user.nickName:'';
 				this.phone = user.phonenumber;
-				this.signature = user.signature;
+				// this.signature = user.signature?user.signature:this.signature;
 				this.roleId=user.roleId?user.roleId:[];
 			}
 
@@ -606,7 +620,7 @@
 						}
 					});
 				}
-				else if(ii==13){
+				else if(ii==98){
 					// 注销账号
 					uni.showModal({
 						title: '提示',
@@ -668,13 +682,14 @@
 				};
 				const {data: res} = await uni.$http.post('/appiso/deleteBuyer',params);
 				console.log("账号注销返回",res)
-				if (res) {
+				if (res&&res.data) {
 					// 清除登录缓存
 					this.openId = "";
 					this.phone = "";
-					this.avatar = "";
+					this.avatar = "../../static/image/logo.png";
 					this.userid = "";
 					this.nickName = "";
+					this.signature = "";
 					this.userInfo={
 						id:'',
 						avatar: "../../static/image/logo.png",
@@ -682,11 +697,48 @@
 						phone: "",
 						isauth:0,
 					};
+					this.$forceUpdate();
+					
+					// 清除缓存
+					myCache('token','');
 					myCache('user','');
 					myCache('userInfo','');
 					myCache('phone','');
 					myCache('openId','');
 					myCache('userid','');
+					// 门店信息退出
+					myCache('shop','');
+					myCache('myshop','');
+					myCache('myshopid','');
+					myCache('shoplist','');
+					
+					// 订单信息数字清除
+					this.menus[0].num=0;
+					this.menus[1].num=0;
+					this.menus[2].num=0;
+					this.menus[3].num=0;
+					this.favoritesnum=0;// 我的收藏
+					
+					// 清空购物车
+					var cartnum=getcartNum();
+					if(cartnum>0){
+						// 底部菜单消息角标
+						uni.setTabBarBadge({
+							//显示未读消息条数
+						    index: 4,
+						    text: cartnum+''
+						});
+					}
+					else{
+						uni.removeTabBarBadge({
+							index: 4
+						})
+					}
+					
+					// app清除角标的数量
+					//#ifdef APP-PLUS
+					plus.runtime.setBadgeNumber(-1);
+					//#endif
 
 					uni.showModal({
 						title: '提示',
diff --git a/pages/user/userEdit.vue b/pages/user/userEdit.vue
index ff1bc18..85615a5 100644
--- a/pages/user/userEdit.vue
+++ b/pages/user/userEdit.vue
@@ -228,6 +228,15 @@
 						this.messageText = `提交成功！`;
 						this.$refs.message.open();
 						myCache("ifuserEdit", true); 
+						var user = myCache('userInfo');
+						myCache('user',{
+							userid:user.userid,
+							nickName:that.valiFormData.nickName,
+							username:user.username,
+							userphone:user.userphone,
+							signature:that.valiFormData.signature,
+							avatar:that.valiFormData.avatar
+						});
 						setTimeout(() => {
 							// 返回  关闭当前页面
 							uni.navigateBack({