ttt

app.wxss

@@ -32,7 +32,7 @@
 
 /*  底部悬浮导航  */
 .fix_nav_wp {
-	height: 84rpx;
+	height: 110rpx;
 	position: fixed;
 	left: 0;
 	bottom: 0;
@@ -85,15 +85,14 @@
 }
 
 .fix_nav_wp .nav_link .plus_sm {
-	margin-top: 8rpx;
-	width: 100rpx;
-	height: 100rpx;
+	margin-top: 18rpx;
+	width: 40rpx;
+	height: 40rpx;
 }
 
 .fix_nav_wp .nav_link .imagesmall {
-	margin-top: -120rpx;
-	width: 60rpx;
-	height: 50rpx;
+	width: 40rpx;
+	height: 40rpx;
 }
 
 .fix_nav_wp .nav_link .imagebig {
@@ -105,17 +104,31 @@
 	height: 50rpx;
 	line-height: 2rpx;
 	font-weight: 900;
-	color: #7B7B7B;
+	color: #CCCCD8;
 }
 
 .txt {
-	margin-top: -96rpx;
+	margin-top: 14rpx;
+	font-family: PingFang SC;
+	font-style: normal;
+	font-weight: normal;
+	font-size: 20rpx;
+	line-height: 20rpx;
+	/* identical to box height, or 100% */
+
+	text-align: center;
+	color: #666672;
+
 }
 
 .fix_nav_wp .nav_link.current .txt {
 	color: #00a2e9;
 }
 
+.fix_nav_wp .nav_link .txt_fb {
+	line-height: 3rpx;
+}
+
 .fix_nav_wp .nav_link .del_ico {
 	display: block;
 }
@@ -153,7 +166,7 @@
 
 .fix_nav_wp .on_cor .del_ico,
 .fix_nav_wp .on_cor .txt {
-	color: #53C7B6
+	color: #666672;
 }
 
 /* 清楚按钮的默认样式  */
@@ -190,13 +203,6 @@
 	border-bottom: none;
 }
 
-.ranimg {
-	margin-left: -6rpx;
-	margin-top: -82rpx;
-	width: 140rpx;
-	height: 140rpx;
-}
-
 .endbottom {
 	height: 200rpx;
 }

components/navBar/navBar.wxml

@@ -1,7 +1,9 @@
 <view class="navbar" style='height:{{navH}}px'>
-	<view class="backhome" wx:if="{{backHome}}" bindtap="navBack"><image class="backimage" src="https://yuesuo.yueguanjia.com/MiniProgram/images/goback.png"></image></view>
+	<view class="backhome" wx:if="{{backHome}}" bindtap="navBack">
+		<image class="backimage" src="https://api.zhumi.tech/MiniProgram/image/back.png"/>
+	</view>
 	<view wx:elif="{{none}}"></view>
-	<view class="nav_position" wx:else bindtap="tocity">
+	<!-- <view class="nav_position" wx:else bindtap="tocity">
 		<view class="icon_position box">
 			<image class="icon_position_image" src="https://yuesuo.yueguanjia.com/MiniProgram/images/position.png"></image>
 		</view>
@@ -9,7 +11,7 @@
 		<view class="icon_down box">
 			<image class="icon_down_img" src="https://yuesuo.yueguanjia.com/MiniProgram/images/downHome.png"></image>
 		</view>
-	</view>
+	</view> -->
 
 	<view class='navbar-title'>
 		{{pageName}}

components/navBar/navBar.wxss

@@ -6,7 +6,7 @@
 	top: 0;
 	left: 0;
 	z-index: 10;
-	background: #00C7C6;
+	background: #ffffff;
 }
 
 .nav_position {
@@ -55,15 +55,16 @@
 .navbar-title {
 	width: 100%;
 	height: 88rpx;
-	line-height: 88rpx;
+	line-height: 76rpx;
 	text-align: center;
 	position: absolute;
 	bottom: 0;
 	left: 0;
 	z-index: 10;
-	background-color: #00C7C6;
-	color: #fff;
-	font-size: 30rpx;
+	background-color: #ffffff;
+	color:#000000;
+	font-size: 34rpx;
+	font-weight: normal;
 }
 
 .navbar-action-wrap {

components/tabBar/tabBar.js

@@ -20,7 +20,7 @@ Component({
 	data: {
 		isFullscreen: false,
 		navList: [{
-				name: "悦所", //文本
+				name: "首页", //文本
 				current: 0, //是否是当前页，0不是  1是
 				style: 0, //样式
 				typea: "https://api.zhumi.tech/MiniProgram/image/home.png", //不同图标
@@ -28,15 +28,15 @@ Component({
 				fn: 'index'
 			},
 			{
-				name: "服务",
+				name: "课程",
 				current: 0,
 				style: 0,
-				typea: "https://api.zhumi.tech/MiniProgram/image/packages.png", //不同图标
-				typec: "https://api.zhumi.tech/MiniProgram/image/packagesc.png",
+				typea: "https://api.zhumi.tech/MiniProgram/image/course.png", //不同图标
+				typec: "https://api.zhumi.tech/MiniProgram/image/coursec.png",
 				fn: 'packages'
 			},
 			{
-				name: "超人妈妈学院",
+				// name: "超人妈妈学院",
 				current: 0,
 				style: 2,
 				ico: '',

components/tabBar/tabBar.wxml

@@ -1,28 +1,32 @@
 <view class="flex fix_nav_wp {{isFullscreen ? 'isFullscreen' : ''}}">
-	<image src='https://api.zhumi.tech/MiniProgram/image/menuback.png' class="menuback"></image>
 	<block wx:for="{{navList}}" wx:key="navDataId">
-		<view class="nav_link" data-fn="{{item.fn}}" bindtap="gotoPage">
-			<button class="defalut_btn {{item.current==0?'':'on_cor'}}">
 				<!-- 未选中 -->
 				<block wx:if="{{item.style==0}}">
-					<view class="plus_sm">
-						<image src="{{item.typea}}" class="imagesmall tabbarImg{{index}}" />
-					</view>
-					<text class="txt">{{item.name}}</text>
+				<view class="nav_link" data-fn="{{item.fn}}" bindtap="gotoPage">
+					<button class="defalut_btn {{item.current==0?'':'on_cor'}}">
+						<view class="plus_sm">
+							<image src="{{item.typea}}" class="imagesmall tabbarImg" />
+						</view>
+						<text class="txt">{{item.name}}</text>
+					</button>
+				</view>
 				</block>
 				<!-- 选中 -->
 				<block wx:elif="{{item.style==1}}">
-					<view class="plus_sm">
-						<image src='{{item.typec}}' class="imagesmall tabbarImg{{index}}" />
-					</view>
-					<text class="txt txt_fb">{{item.name}}</text>
+					<view class="nav_link" data-fn="{{item.fn}}" bindtap="gotoPage">
+					<button class="defalut_btn {{item.current==0?'':'on_cor'}}">
+						<view class="plus_sm">
+							<image src='{{item.typec}}' class="imagesmall tabbarImg" />
+						</view>
+						<text class="txt txt_fb">{{item.name}}</text>
+					</button>
+				</view>
 				</block>
 				<!-- tabBar中间项 -->
 				<block wx:elif="{{item.style==2}}">
-					<image src='https://api.zhumi.tech/MiniProgram/image/logo.png' class="ranimg" />
-					<text class="txt txt_fb">{{item.name}}</text>
+					<button open-type="contact" bindcontact="handleContact" class = "kfbutton" plain="true">
+					<image src='https://api.zhumi.tech/MiniProgram/image/talk.png' class="ranimg" />
+				</button>
 				</block>
-			</button>
-		</view>
 	</block>
 </view>

components/tabBar/tabBar.wxss

@@ -1,28 +1,25 @@
 /**app.wxss**/
 @import "/app.wxss";
 
-.ranimg {
-	width: 100rpx;
-	height: 100rpx;
-	margin-top: -62rpx;
-}
 
-.fix_nav_wp .nav_link .tabbarImg0 {
-	width: 90rpx;
+.kfbutton[plain]{
+  padding: 0;
+  border:none;   
+  width: 150rpx;
+	height: 150rpx;
+	margin-top: -26rpx;
 }
-
-.fix_nav_wp .nav_link .tabbarImg1 {
-	width: 50rpx;
+.kfbutton::after{ 
+	border:none;
 }
-
-.fix_nav_wp .nav_link .tabbarImg3 {
-	width: 46rpx;
+.ranimg {
+	width: 130rpx;
+	height: 130rpx;
 }
 
-.fix_nav_wp .nav_link .tabbarImg4 {
-	width: 44rpx;
+.fix_nav_wp .nav_link .tabbarImg0 {
+	width: 90rpx;
 }
-
 /* 全面屏 */
 .isFullscreen {
 	padding-bottom: 20rpx;

pages/index/index.wxml

@@ -1,7 +1,6 @@
 <view>
 	<view class="container">
 		<view class="view-page ">
-			<navbar page-name="个人中心" none="true"></navbar>
 			<swiper class="swiper" indicator-dots="true" indicator-color="#B5B5B5" indicator-active-color="#6D6D6D"
 				autoplay="true" interval="5000" duration="{{duration}}">
 				<block wx:for="{{arr}}" wx:key="index">
@@ -11,11 +10,10 @@
 					</swiper-item>
 				</block>
 			</swiper>
-			<view class="cont">
-				<view class="colum-logo-temp"></view>
-				<view class="colum-logo">logo</view>
-				<view class="colum-hot-temp"></view>
+			<view class = "box_logo">
+				<image src="https://api.zhumi.tech/MiniProgram/image/index_logo.png" class="index_logo" />
 				<view class="colum-hot">
+					<view class="hot-box-temp2"></view>
 					<view class="hot-box">
 						<view class="hot-title-temp"></view>
 						<view class="hot-title">一级标题</view>
@@ -30,21 +28,17 @@
 						<view class="hot-cont">十级四阶段</view>
 					</view>
 				</view>
-				<view class="colum-hot-temp"></view>
-				<view class="tips-box">
-					<view class="tips-icon">111</view>
-					<view class="tips-cont">双11XXXXXXXXXXXXXX</view>
-				</view>
-				<view class="lang-img">……</view>
-				<view class="colum-hot-temp"></view>
-				<view class="recommend"></view>
-				<view class="colum-hot-temp"></view>
-				<view class="colum-hot-temp"></view>
-				<view class="hot-title">优秀师资</view>
+				<view class = "cont">
+					<view class="tips-box">
+						<view class="tips-icon">111</view>
+						<view class="tips-cont">双11XXXXXXXXXXXXXX</view>
+					</view>
+					<image src = "https://api.zhumi.tech/MiniProgram/image/recommend.png" class="lang-img"/>
+					<view class = "hot-middle"></view>
+					<view class="hot-title">优秀师资</view>
 				<scroll-view scroll-x="true">
 					<view class="uploadWrap">
 						<block wx:for="{{mktarr}}" wx:key="index">
-							<!--bindtap="markertap" -->
 							<view class="upload_Item" data-name='{{mktarr[index].mi_mktname}}'
 								data-address='{{mktarr[index].mi_mktaddress}}' data-latitude='{{mktarr[index].mi_latitude}}'
 								data-longitude='{{mktarr[index].mi_longitude}}'>
@@ -60,14 +54,11 @@
 						</block>
 					</view>
 				</scroll-view>
-				<view class="colum-hot-temp"></view>
-				<view class="colum-hot-temp"></view>
 				<view class="hot-title">查找校区</view>
 				<view class="colum-hot-temp"></view>
 				<view class="campus-box">
 					<image src="{{mktImgage}}" class = "campus-image"></image>
 				</view>
-				<!--bindtap="markertap" -->
 				<view class="campus_Item" data-name='{{mktarr[0].mi_mktname}}' data-address='{{mktarr[0].mi_mktaddress}}'
 					data-latitude='{{mktarr[0].mi_latitude}}' data-longitude='{{mktarr[0].mi_longitude}}'>
 					<view class="mkt-img-box">
@@ -92,9 +83,9 @@
 						<view class="hot-mkt">地址: 辽宁省沈阳市铁西区XXXXXXX</view>
 						<view class="hot-title-temp"></view>
 					</view>
-					<view class="endbottomm"></view>
+					<view class = "endbottomm" ></view>
+				</view>
 			</view>
-			
 			<tabbar _tabBarInd="{{0}}"></tabbar>
 		</view>
 	</view>

pages/index/index.wxss

@@ -1,28 +1,48 @@
+page {
+	background-color:  #F2F2F6;
+}
 .view-page {
 	width: 100%;
 	left: 0;
 	top: 0;
 	box-sizing: border-box;
-	position: absolute;
 	overflow: hidden;
+	background-color: #F2F2F6;
 }
 .swiper {
 	width: 100%;
-	padding: 0 32rpx 0 32rpx;
 	box-sizing: border-box;
-	height: 532rpx;
+	height: 580rpx;
 }
 .slide-image {
-	height: 532rpx !important;
+	height: 580rpx !important;
 	width: 100%;
 }
-.cont {
+.contmiddle {
+	position: absolute;
 	width: 100%;
-	background-color: #F2F2F6;
-	border-radius: 36rpx 36rpx 0 0;
-	flex-direction: column;
-	height: 100%;
+	height: 88px;
+	margin-top: 100rpx;
+	background: #F2F2F6;
+	border-radius: 36rpx 36rpx 0px 0px;
+}
+.box_logo{
+	position: absolute;
+	width: 100%;
+	height: 380rpx;
+	left: 0px;
+	top: 544rpx;
+	background: #F2F2F6;
+	border-radius: 36rpx 36rpx 0px 0px;
+}
+
+.index_logo {
+	position: absolute;
+	width: 100%;
+	height: 176rpx;
+	left: 0px;
 }
+
 .colum-logo-temp {
 	height: 58rpx;
 }
@@ -35,14 +55,19 @@
 	height: 24rpx;
 }
 .colum-hot {
+	position: absolute;
 	height: 208rpx;
-	margin: 0 32rpx 0 32rpx;
-	border-radius: 36rpx;
+	margin: 0 32rpx 0 0rpx;
+	border-radius: 36rpx 36rpx 0rpx 0rpx;
+	top: 144rpx;
 	display: flex;
 }
 .hot-box-temp {
 	width: 24rpx;
 }
+.hot-box-temp2 {
+	width: 32rpx;
+}
 .hot-box {
 	height: 208rpx;
 	width: 332rpx;
@@ -50,10 +75,15 @@
 	background-color: white;
 	box-shadow:0rpx 9rpx 18rpx 0rpx rgba(229,229,234,0.56);
 }
+.hot-title-box {
+	top:1440rpx;
+	position: absolute;
+}
 .hot-title-temp {
 	height: 32rpx;
 }
 .hot-title {
+	margin-top:32rpx;
 	margin-left: 32rpx;
 	color: #000000;
 	font-size: 36rpx;
@@ -69,6 +99,8 @@
 	color: #ff6106;
 } 
 .tips-box {
+	margin-top: 16rpx;
+	position: absolute;
 	margin-left: 32rpx;
 	height: 72rpx;
 	width: 686rpx;
@@ -77,6 +109,7 @@
 	box-shadow:0rpx 9rpx 18rpx 0rpx rgba(229,229,234,0.56);
 	display: flex;
 }
+
 .tips-icon {
 	margin-left: 6rpx;
 	line-height: 72rpx;
@@ -90,10 +123,27 @@
 	line-height: 72rpx;
 }
 .lang-img {
+	margin-top: 116rpx;
+	margin-left: 64rpx;
+	width: 622rpx;
+	height: 954rpx;
+}
+.cont {	
+	margin-top: 365rpx;
 	width: 100%;
-	text-align: center;
-	height: 200rpx;
-	line-height: 200rpx;
+	background-color:  #F2F2F6;
+	flex-direction: column;
+}
+.hot-middle {
+
+	width: 686rpx;
+	height: 290rpx;
+	margin-top: 64rpx;
+	margin-left: 32rpx;
+	background: #C4C4C4;
+	border: 1px solid #9999A5;
+	box-sizing: border-box;
+	border-radius: 32rpx;
 }
 .recommend {
 	width: 686rpx;
@@ -112,7 +162,7 @@
   height:400rpx; 
   width:100%; 
   display: flex; 
-  display: -webkit-box; 
+  display: -webkit-box;
   flex-direction: column;
 } 
 .upload_Item{ 
@@ -229,4 +279,6 @@ scroll-view-teacher {
 	width: 686rpx;
 	height: 450rpx;
 	border-radius: 32rpx;
-}
+}
+
+

pages/mine/mine.js

@@ -26,7 +26,7 @@ Page({
 		usertype: '',
 		userInfo: {},
 		nickName: '登录',
-		avatarUrl: 'https://yuesuo.yueguanjia.com/MiniProgram/images/head.png',
+		avatarUrl: 'https://api.zhumi.tech/MiniProgram/image/head.png',
 		hasUserInfo: false,
 		canIUse: wx.canIUse('button.open-type.getUserInfo')
 	},
@@ -85,7 +85,6 @@ Page({
 			util.getData('/checkDcIntroducers', {
 				wv_phone: app.globalData.userphone
 			}).then(res => {
-				console.log(res)
 				if (res != "") {
 					_this.setData({
 						dcshow: true,
@@ -122,7 +121,6 @@ Page({
 		const _this = this;
 		wx.checkSession({
 			success(res) {
-				console.log(res)
 				app.setUserInfo().then(res => {
 					_this.init()
 				});

pages/mine/mine.json

@@ -1,7 +1,5 @@
 {
-  "navigationBarTitleText": "个人中心",
 	"usingComponents": {
-    "navbar": "/components/navBar/navBar",
     "tabbar": "/components/tabBar/tabBar"
   }
 }

pages/mine/mine.wxml

@@ -1,174 +1,54 @@
 <view>
 	<view class="container">
-		<!-- <view class="load" style='display:{{loaddisplay}}'>
-			<image class="loadimg" style='display:{{loaddisplay}}' src='https://yuesuo.yueguanjia.com/MiniProgram/images/timg.gif'></image>
-		</view> -->
-		<view class="view-page ">
-			<navbar page-name="个人中心" none="true"></navbar>
-			<view class="page-content" style='height:calc(100vh - {{navH}}px)'>
-				<!-- 是介绍人 -->
-				<view class="my_userinfo_blue" wx:if="{{dcshow}}">
-					<view class="userinfo_box">
-						<view class="avatar">
-							<image src="{{avatarUrl}}"></image>
-						</view>
-						<view class="name ys-ellipsis" bindtap="tologin">{{nickName}}</view>
-					</view>
-					<image wx:if="{{phoneauth}}" src='https://yuesuo.yueguanjia.com/MiniProgram/images/qrcodeW.png' class="qrcode"
-					 bindtap="hrefQrcode"></image>
-					<image wx:elif="{{!phoneauth&&nickName!='登录'}}" src='https://yuesuo.yueguanjia.com/MiniProgram/images/phoneauth.png' class="phoneauth" bindtap="hrefAuthPhone"></image>
-					<view class="vipcont">
-						<view class="list">
-							<view class="count">{{wv_register_count}}</view>
-							<view class="text ys-font12">已注册</view>
-						</view>
-						<view class="list">
-							<view class="count">{{wv_contract_count}}</view>
-							<view class="text ys-font12">已签约</view>
-						</view>
-						<view class="list">
-							<view class="count">{{wv_finish_count}}</view>
-							<view class="text ys-font12">已完成</view>
-						</view>
-						<view class="list">
-							<view class="count">{{wv_extract_count}}</view>
-							<view class="text ys-font12">已返现</view>
-						</view>
-					</view>
+		<view class="head_page">
+			<view class="my_userinfo" >
+				<view class="avatar">
+					<image src="{{avatarUrl}}"></image>
 				</view>
-				<!-- 不是介绍人登陆 -->
-				<view class="my_userinfo" wx:else>
-					<view class="avatar">
-						<image src="{{avatarUrl}}"></image>
-					</view>
-					<view class="name ys-ellipsis" bindtap="tologin">{{nickName}}</view>
-					<view wx:if="{{phoneauth}}"></view>
-					<image  wx:elif="{{!phoneauth&&nickName!='登录'}}" src='https://yuesuo.yueguanjia.com/MiniProgram/images/phoneauth.png' class="phoneauth" bindtap="hrefAuthPhone"></image>
-				</view>
-				<!-- 是否设置过孕期 -->
-				<view class="set_status" wx:if="{{isSetstatus}}" bindtap="selectlife">
-					<view class="status_title">
-						<view class="hide_title" wx:if="{{pushCont.wc_type=='B01'}}">宝宝出生第 <span>{{pushCont.wc_showtime}}</span>
-							{{pushCont.wct_frequency}}</view>
-						<view class="hide_title" wx:if="{{pushCont.wc_type=='P01'}}">孕期第 <span>{{pushCont.wc_showtime}}</span>
-							{{pushCont.wct_frequency}}</view>
-					</view>
-					<image src="https://yuesuo.yueguanjia.com/MiniProgram/images/greyright.png"></image>
-				</view>
-				<view class="set_status" bindtap="selectlife" wx:else>
-					<view class="status_title">设置状态</view>
-					<image src="https://yuesuo.yueguanjia.com/MiniProgram/images/greyright.png"></image>
-				</view>
-				<view class="mineall">
-					<view class="minelist" wx:if="{{dcshow}}">
-						<view class='minelistleft'></view>
-						<view class="minelisticon">
-							<image src="https://yuesuo.yueguanjia.com/MiniProgram/images/mydc.png" class="imglisticon"></image>
-						</view>
-						<view class='minelistnameleft'></view>
-						<view class="minelistname" bindtap="hrefDc">
-							我的推荐
-						</view>
-						<view class="minelistright" bindtap="hrefDc">
-							<image src="https://yuesuo.yueguanjia.com/MiniProgram/images/littlegrey.png" class="imglistright"></image>
-						</view>
-					</view>
-					<view class="minelist">
-						<view class='minelistleft'></view>
-						<view class="minelisticon">
-							<image src="https://yuesuo.yueguanjia.com/MiniProgram/images/myeq.png" class="imglisticon"></image>
-						</view>
-						<view class='minelistnameleft'></view>
-						<view class="minelistname" bindtap="hrefEq">
-							我的设备
-						</view>
-						<view class="minelistright" bindtap="hrefEq">
-							<image src="https://yuesuo.yueguanjia.com/MiniProgram/images/littlegrey.png" class="imglistright"></image>
-						</view>
-					</view>
-					<view class="minelist">
-						<view class='minelistleft'></view>
-						<view class="minelisticon">
-							<image src="https://yuesuo.yueguanjia.com/MiniProgram/images/myaddress.png" class="imglisticon"></image>
-						</view>
-						<view class='minelistnameleft'></view>
-						<view class="minelistname" bindtap="hrefAdd">
-							我的地址
-						</view>
-						<view class="minelistright" bindtap="hrefAdd">
-							<image src="https://yuesuo.yueguanjia.com/MiniProgram/images/littlegrey.png" class="imglistright"></image>
-						</view>
-					</view>
-					<view class="minelist">
-						<view class='minelistleft'></view>
-						<view class="minelisticon">
-							<image src="https://yuesuo.yueguanjia.com/MiniProgram/images/myservices.png" class="imglisticon"></image>
-						</view>
-						<view class='minelistnameleft'></view>
-						<view class="minelistname" bindtap='review'>
-							体质测评
-						</view>
-						<view class="minelistright" bindtap='review'>
-							<image src="https://yuesuo.yueguanjia.com/MiniProgram/images/littlegrey.png" class="imglistright"></image>
-						</view>
-					</view>
-					<view class="minelist">
-						<view class='minelistleft'></view>
-						<view class="minelisticon">
-							<image src="https://yuesuo.yueguanjia.com/MiniProgram/images/mycoupon.png" class="imglisticon"></image>
-						</view>
-						<view class='minelistnameleft'></view>
-						<view class="minelistname" bindtap="hrefCp">
-							我的优惠券
-						</view>
-						<view class="minelistright" bindtap="hrefCp">
-							<image src="https://yuesuo.yueguanjia.com/MiniProgram/images/littlegrey.png" class="imglistright"></image>
-						</view>
-					</view>
-					<view class="minelist">
-						<view class='minelistleft'></view>
-						<view class="minelisticon">
-							<image src="https://yuesuo.yueguanjia.com/MiniProgram/images/myorder.png" class="imglisticon"></image>
-						</view>
-						<view class='minelistnameleft'></view>
-						<view class="minelistname" bindtap="hrefOrder">
-							我的订单
-						</view>
-						<view class="minelistright" bindtap="hrefOrder">
-							<image src="https://yuesuo.yueguanjia.com/MiniProgram/images/littlegrey.png" class="imglistright"></image>
-						</view>
-					</view>
-					<view class="minelist">
-						<view class='minelistleft'></view>
-						<view class="minelisticon">
-							<image src="https://yuesuo.yueguanjia.com/MiniProgram/images/myservices.png" class="imglisticon"></image>
-						</view>
-						<view class='minelistnameleft'></view>
-						<view class="minelistname" bindtap='calling'>
-							联系客服
-						</view>
-						<view class="minelistright" bindtap='calling'>
-							<image src="https://yuesuo.yueguanjia.com/MiniProgram/images/littlegrey.png" class="imglistright"></image>
-						</view>
-					</view>
-					<view class="minelist">
-						<view class='minelistleft'></view>
-						<view class="minelisticon">
-							<image src="https://yuesuo.yueguanjia.com/MiniProgram/images/aboutus.png" class="imgaboutus"></image>
-						</view>
-						<view class='minelistnameleft'></view>
-						<view class="minelistname" bindtap='hrefAboutus'>
-							关于我们
-						</view>
-						<view class="minelistright" bindtap='hrefAboutus'>
-							<image src="https://yuesuo.yueguanjia.com/MiniProgram/images/littlegrey.png" class="imglistright"></image>
-						</view>
-					</view>
-				</view>
-				<div class="endbottomm"> </div>
+				<view class="name">{{nickName}}</view>
+				<view wx:if="{{phoneauth}}"></view>
+				<image  wx:elif="{{!phoneauth&&nickName!='登录'}}" src='https://api.zhumi.tech/MiniProgram/image/phoneauth.png' class="phoneauth" bindtap="hrefAuthPhone"></image>
+			</view>
+		</view>
+		<view class = "v_show">
+			<view class = "show_lef">
+				<view class = "show_title">88</view>
+				<view class = "show_content">注释文字</view>
+			</view>
+			<view class = "show_line"></view>
+			<view class = "show_lef">
+				<view class = "show_title">88</view>
+				<view class = "show_content">注释文字</view>
+			</view>
+			<view class = "show_line"></view>
+			<view class = "show_lef">
+				<view class = "show_title">88</view>
+				<view class = "show_content">注释文字</view>
 			</view>
-
-			<tabbar _tabBarInd="{{4}}"></tabbar>
 		</view>
+		<view class = "mine_items">
+			<view class = "mitem">
+				<image class="item_icon" src="https://api.zhumi.tech/MiniProgram/image/principal.png"/>
+				<view class="item_title">正文突出显示</view>
+				<view class="item_context">查看收益</view>
+				<image class="item_right" src="https://api.zhumi.tech/MiniProgram/image/next.png"/>
+			</view>
+			<view class = "mitem">
+				<image class="item_icon" src="https://api.zhumi.tech/MiniProgram/image/coupon.png"/>
+				<view class="item_title">正文突出显示</view>
+				<image class="item_right2" src="https://api.zhumi.tech/MiniProgram/image/next.png"/>
+			</view>
+			<view class = "mitem">
+				<image class="item_icon" src="https://api.zhumi.tech/MiniProgram/image/present.png"/>
+				<view class="item_title">正文突出显示</view>
+				<image class="item_right2" src="https://api.zhumi.tech/MiniProgram/image/next.png"/>
+			</view>
+			<view class = "mitem">
+				<image class="item_icon" src="https://api.zhumi.tech/MiniProgram/image/site.png"/>
+				<view class="item_title">正文突出显示</view>
+				<image class="item_right2" src="https://api.zhumi.tech/MiniProgram/image/next.png"/>
+			</view>
+		</view> 
+		<tabbar _tabBarInd="{{4}}"></tabbar>
 	</view>
 </view>

pages/mine/mine.wxss

@@ -1,8 +1,13 @@
 /* 用户头像名字 */
+page {
+	background-color:  #F2F2F6;
+}
 .my_userinfo {
-	height: 310rpx;
+	height: 136rpx;
+	width: 136rpx;
 	display: flex;
-	padding: 56rpx 56rpx 28rpx;
+	margin-top: 128rpx;
+	margin-left: 78rpx;
 	box-sizing: border-box;
 }
 
@@ -24,11 +29,22 @@
 	border-radius: 200rpx;
 }
 
-.my_userinfo .name {
+.my_userinfo  {
 	font-size: 40rpx;
 	font-weight: 500;
 	line-height: 170rpx;
 	width: 322rpx;
+	color: thistle;
+}
+.name {
+	width: 144rpx;
+	height: 36rpx;
+	margin-left: 0rpx;
+	margin-top: 0rpx;
+	font-style: normal;
+	font-weight: bold;
+	font-size: 36rpx;
+	color: #FFFFFF;
 }
 
 .userinfo_box {
@@ -48,7 +64,7 @@
 	border-radius: 200rpx;
 }
 
-.my_userinfo_blue .name {
+.my_userinfo_blue {
 	font-size: 40rpx;
 	font-weight: 500;
 	line-height: 136rpx;
@@ -77,7 +93,7 @@
 	height: 60rpx;
 	width: 150rpx;
 	position: absolute;
-	top: 112rpx;
+	top: 192rpx;
 	right: 0;
 }
 .vipcont {
@@ -97,8 +113,6 @@
 	margin-bottom: 16rpx;
 }
 
-.vipcont .list .text {}
-
 /* 设置用户状态 */
 .set_status {
 	display: flex;
@@ -264,4 +278,106 @@
 	line-height: 40rpx;
 	color: #00C7C6;
 	font-weight: 500;
+}
+.head_page {
+	width: 790rpx;
+	height: 402rpx;
+	left: 0rpx;
+	top: 0rpx;
+	background: linear-gradient(330.87deg, #0880FF 17.85%, #3999FF 87.23%);
+	border-radius: 0 0 13% 13%;  
+}
+.v_show {
+	width: 686rpx;
+	height: 134rpx;
+	left: 32rpx;
+	background: #FFFFFF;
+	box-shadow: 0px 8rpx 16rpx rgba(204, 204, 216, 0.56);
+	border-radius: 32rpx;
+	display: flex;
+	margin-top: -70rpx;
+}
+.show_lef {
+	width: 96rpx;
+	height: 70rpx;
+	margin-left: 66rpx;
+	margin-top: 32rpx;
+}
+.show_title {
+	width: 96rpx;
+	height: 30rpx;
+	font-style: normal;
+	font-weight: bold;
+	font-size: 40rpx;
+	line-height: 30rpx;
+	text-align: center;
+	color: #000000;
+}
+.show_content {
+	width: 96rpx;
+	height: 24rpx;
+	margin-top: 16rpx;
+	font-style: normal;
+	font-weight: normal;
+	font-size: 24rpx;
+	line-height: 24rpx;
+	text-align: center;
+	color: #999999;
+}
+.show_line {
+	margin-left: 66rpx;
+	float:left;
+	margin-top: 32rpx;
+	width: 4rpx;
+	height: 70rpx;
+	background:#CCCCD8;
+}
+.mine_items {
+	width: 100%;
+	margin-top: 70rpx;
+}
+.mitem {
+	width: 622rpx;
+	margin-right: 64rpx;
+	margin-left: 64rpx;
+	display: flex;
+	margin-bottom: 64rpx;
+}
+.item_icon {
+	width: 40rpx;
+	height: 40rpx;
+}
+.item_title {
+	width: 168rpx;
+	height: 40rpx;
+	margin-left: 24rpx;
+	font-style: normal;
+	font-weight: bold;
+	font-size: 28rpx;
+	line-height: 40rpx;
+	color: #000000;
+}
+.item_context {
+	width: 112rpx;
+	height: 40rpx;
+	margin-left: 236rpx;
+	font-family: PingFang SC;
+	font-style: normal;
+	font-weight: normal;
+	font-size: 28rpx;
+	line-height: 40rpx;
+	text-align: right;
+	color: #999999;
+}
+.item_right {
+	width: 18rpx;
+	height: 28rpx;
+	margin-left: 28rpx;
+	margin-top: 8rpx;
+}
+.item_right2 {
+	width: 18rpx;
+	height: 28rpx;
+	margin-left: 370rpx;
+	margin-top: 8rpx;
 }

pages/packages/packages.js

@@ -1,18 +1,36 @@
 const app = getApp()
-var util = require("../../utils/util.js")
+
 Page({
 	data: {
-		list: []
+		list: [],
+		coursesList: [
+			"https://api.zhumi.tech/MiniProgram/courses/step1.png",
+			"https://api.zhumi.tech/MiniProgram/courses/step2.png",
+			"https://api.zhumi.tech/MiniProgram/courses/step3.png",
+			"https://api.zhumi.tech/MiniProgram/courses/step4.png"
+		],
+		coursesText1List: [
+		{"title": "兴趣","context": "通过绿色的闯关式教学游戏，打造适合孩子的趣味课堂，让孩子爱上编程。"},
+		{"title": "自信","context": "循序渐进的展开新知识，让孩子先通过一般难度，建立自信，培养学习热情。"},
+		{"title": "拓展","context": "将学科知识综合运用到教学过程，引导孩子的求知欲望，树立自主学习的意识。"},
+		{"title": "挑战","context": "逐步提升的难度，让孩子专注于挑战，培养独立思考的习惯和面对挫折的勇气。"},
+		{"title": "成就","context": "综合运用所学的知识，不断尝试多样的解决方案，并从中获得巨大的成就感。"}
+		],
+		coursesText2List: [
+			{"title": "思考","context": "赋予孩子发散思考的能力，锻炼如何分析问题，并将脑中的创意变成可被执行的创造力。"},
+			{"title": "记忆","context": "运用一些词汇、符号和图像来把一长串枯燥的信息,变成彩色的、容易记忆的、有结构的图。"},
+			{"title": "理解","context": "运用一些词汇、符号和图像来把一长串枯燥的信息,变成彩色的、容易记忆的、有结构的图。"},
+			{"title": "沟通","context": "清晰的思路、高度概括的关键词和完善的结构，让表达更准确，沟通更简单、更高效。"}
+			]
+
 	},
 	onLoad: function() {
 		let _this = this;
 		_this.setData({
 			navH: app.globalData.navHeight
 		})
-
 	},
 	gotolist: function(e) {
-		// console.log(e.currentTarget.dataset.id)
 		wx.navigateTo({
 			url: '/pages/packages/packageslist/packageslist?id=' + e.currentTarget.dataset.id
 		})

pages/packages/packages.json

@@ -1,5 +1,4 @@
 {
-  "navigationBarTitleText": "优选套餐",
 	"usingComponents": {
     "navbar": "/components/navBar/navBar",
     "tabbar": "/components/tabBar/tabBar"

pages/packages/packages.wxml

@@ -1,11 +1,57 @@
 <view class="packages">
 	<view class="view-page">
-		<navbar page-name="优选套餐"></navbar>
-		<view class="page-content" style='height:calc(100vh - {{navH}}px)'>
-			<view class="pkgimg" wx:for="{{list}}" bindtap="gotolist" data-id="{{item.id}}" wx:key="index">
-				<image mode='widthFix' src='{{item.img_href}}'></image>
+		<navbar page-name="课程"></navbar>
+		<view class="page-content" >
+			<view class = "banner"></view>
+			<view class = "con-title1">用编程赋予孩子国际竞争力</view>
+			<view class = "con-min1">国际化的课程体系</view>
+			<view class = "con-middle">
+				<view class = "txt1" style="white-space:pre-wrap">课程直通信奥（NOIP）</view>
+				<view class = "txt2" style="white-space:pre-wrap">美国CSTAK-12教学标准</view>
+				<view class = "txt3" style="white-space:pre-wrap">4~18岁课程全覆盖</view>
+			</view> 
+			<scroll-view scroll-x="true">
+				<view class="coursesWrap">
+					<block wx:for="{{coursesList}}" wx:key="index">
+						<view class="courses-img">
+							<image class="courses_Item_img" src="{{coursesList[index]}}" />
+						</view>
+						<view class="viewright-courses" wx:if="{{index == coursesList.length -1}}"></view>
+					</block>
+				</view>
+			</scroll-view>
+			<view class = "con-title2">趣味化的教学模式</view>
+			<view class = "con-min2">兴趣是孩子最好的老师</view>
+			<view class = "longImg"></view>
+			<view class = "con-title3">CBL挑战式教学法</view>
+			<view class = "con-min3">最好的教学方式 是让学习变的更好玩</view>
+			<scroll-view scroll-x="true">
+				<view class="coursesText1">
+					<block wx:for="{{coursesText1List}}" wx:key="index">
+						<view class="courses-text-box">
+							<view class = "courses-text-title">{{coursesText1List[index].title}}</view>
+							<view class = "courses-text-context">{{coursesText1List[index].context}}</view>
+							<view class="viewright-courses" wx:if="{{index == coursesList.length -1}}"></view>
+						</view>
+					</block>
+				</view>
+			</scroll-view>
+			<view class = "longImg2"></view>
+			<view class = "con-title4">MMR导图式学习法</view>
+			<view class = "con-min4">良好的思维习惯 能够让孩子受用一生</view>
+			<scroll-view scroll-x="true">
+				<view class="coursesText1">
+					<block wx:for="{{coursesText2List}}" wx:key="index">
+						<view class="courses-text-box">
+							<view class = "courses-text-title">{{coursesText2List[index].title}}</view>
+							<view class = "courses-text-context">{{coursesText2List[index].context}}</view>
+							<view class="viewright-courses" wx:if="{{index == coursesList.length -1}}"></view>
+						</view>
+					</block>
+				</view>
+			</scroll-view>
+			<view class = "endbottomm" ></view>
 			</view>
-		</view>
 		<tabbar _tabBarInd="{{1}}"></tabbar>
 	</view>
 </view>

pages/packages/packages.wxss

@@ -1,20 +1,216 @@
 /**index.wxss**/
 page {
-    background-color: #ffffff;
-}
-.packages{
-	
-}
-.tttt{
-	width: 750rpx;
-	height: 336rpx;
-	background-color: violet;
-	margin-top:100rpx;
-}
-.pkgimg image{
-	bottom: 0;
-	width: 95%;
-	left: 50%;
-	position: absolute;
-	transform: translate(-50%);
+    background-color:  #F2F2F6;
+}
+
+.page-content{
+	width: 100%;
+}
+.banner {
+	width: 100%;
+	height: 384rpx;
+	left: 0rpx;
+	top: 0rpx;
+	background: rgba(196, 196, 196, 0.7);
+}
+.con-title1 {
+	width: 432rpx;
+	height: 36rpx;
+	margin-left: 158rpx;
+	margin-top: 76rpx;
+	font-style: normal;
+	font-weight: bold;
+	font-size: 36rpx;
+	line-height: 36rpx;
+	color: #000000;
+}
+.con-min1 {
+	width: 192rpx;
+	height: 36rpx;
+	margin-left: 280rpx;
+	margin-top: 10rpx;
+	font-style: normal;
+	font-weight: normal;
+	font-size: 24rpx;
+	line-height: 24rpx;
+	color: #000000;
+}
+.con-middle {
+	width: 100%;
+	height: 64rpx;
+	display: flex;
+	margin-top: 144rpx;
+}
+.txt1 {
+	width: 144rpx;
+	height: 64rpx;
+	margin-left: 80rpx;
+	font-style: normal;
+	font-weight: normal;
+	font-size: 24rpx;
+	line-height: 32rpx;
+	text-align: center;
+	color: #1A1A20;
+}
+.txt2 {
+	width: 180rpx;
+	height: 64rpx;
+	margin-left: 68rpx;
+	font-style: normal;
+	font-weight: normal;
+	font-size: 24rpx;
+	line-height: 32rpx;
+	text-align: center;
+	color: #1A1A20;
+}
+.txt3 {
+	width: 128rpx;
+	height: 64rpx;
+	margin-left: 70rpx;
+	font-style: normal;
+	font-weight: normal;
+	font-size: 24rpx;
+	line-height: 32rpx;
+	text-align: center;
+	color: #1A1A20;
+}
+.coursesWrap {
+	margin-left: 56rpx;
+	margin-top: 44rpx;
+	width: 638rpx;
+	height: 812rpx;
+	margin-right: 24rpx;
+	display: flex; 
+  display: -webkit-box;
+  flex-direction: column;
+}
+.courses-img {
+	width: 638rpx;
+	height: 812rpx;
+	margin-right: 24rpx;
+}
+.courses_Item_img {
+	width: 638rpx;
+	height: 812rpx;
+	border-radius: 32rpx;
+}
+.viewright-courses {
+	width: 18rpx; 
+  height: 130rpx; 
+}
+.con-title2 {
+	width: 288rpx;
+	height: 36rpx;
+	margin-left: 226rpx;
+	margin-top: 114rpx;
+	font-style: normal;
+	font-weight: bold;
+	font-size: 36rpx;
+	line-height: 36rpx;
+	color: #000000;
+}
+.con-min2 {
+	width: 240rpx;
+	height: 36rpx;
+	margin-left: 252rpx;
+	margin-top: 10rpx;
+	font-style: normal;
+	font-weight: normal;
+	font-size: 24rpx;
+	line-height: 24rpx;
+	color: #0880FF;
+}
+.longImg {
+	width: 638rpx;
+	height: 364rpx;
+	margin-left: 58rpx;
+	margin-top: 84rpx;
+	background: #84E793;
+	border-radius: 32rpx 32rpx 0px 0px;
+}
+.longImg2 {
+	width: 638rpx;
+	height: 364rpx;
+	margin-left: 58rpx;
+	margin-top: 50rpx;
+	background: #84E793;
+	border-radius: 32rpx 32rpx 0px 0px;
+}
+.con-title3 {
+	width: 290rpx;
+	height: 28rpx;
+	margin-left: 114rpx;
+	margin-top: 42rpx;
+	font-style: normal;
+	font-weight: bold;
+	font-size: 36rpx;
+	line-height: 36rpx;
+	color: #000000;
+}
+.con-min3 {
+	width: 392rpx;
+	height: 24rpx;
+	margin-left: 114rpx;
+	margin-top: 20rpx;
+	font-style: normal;
+	font-weight: normal;
+	font-size: 24rpx;
+	line-height: 24rpx;
+	color: #000000;
+}
+.coursesText1 {
+	margin-left: 82rpx;
+	margin-top: 104rpx;
+	width: 270rpx;
+	height: 306rpx;
+	margin-right: 82rpx;
+	display: flex; 
+  display: -webkit-box;
+  flex-direction: column;
+}
+.courses-text-box {
+	width: 270rpx;
+	height: 212rpx;
+	margin-right: 24rpx;
+}
+.courses-text-title {
+	width: 270rpx;
+	height: 28rpx;
+	font-style: normal;
+	font-weight: bold;
+	font-size: 36rpx;
+	line-height: 28rpx;
+	color: #000000;
+}
+.courses-text-context {
+	margin-top: 24rpx;
+	width: 270rpx;
+	height: 160rpx;
+	font-style: normal;
+	font-weight: normal;
+	font-size: 24rpx;
+	line-height: 40rpx;
+	color: #000000;
+}
+.con-title4 {
+	width: 320rpx;
+	height: 28rpx;
+	margin-left: 114rpx;
+	margin-top: 42rpx;
+	font-style: normal;
+	font-weight: bold;
+	font-size: 36rpx;
+	line-height: 36rpx;
+	color: #000000;
+}
+.con-min4 {
+	width: 392rpx;
+	height: 24rpx;
+	margin-left: 114rpx;
+	margin-top: 18rpx;
+	font-style: normal;
+	font-weight: normal;
+	font-size: 24rpx;
+	line-height: 24rpx;
+	color: #000000;
 }

pages/promotion/promotion.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "近期活动",
+  "navigationBarTitleText": "活动",
 	"usingComponents": {
     "navbar": "/components/navBar/navBar",
     "tabbar": "/components/tabBar/tabBar"

pages/promotion/promotion.wxml

@@ -1,53 +1,26 @@
 <view>
 	<view class="load" style='display:{{loaddisplay}}'>
-		<image class="loadimg" style='display:{{loaddisplay}}' src='https://yuesuo.yueguanjia.com/MiniProgram/images/timg.gif'></image>
+		<image class="loadimg" style='display:{{loaddisplay}}' src='https://api.zhumi.tech/MiniProgram/image/timg.gif'></image>
 	</view>
 	<view class="view-page">
-		<navbar page-name="近期活动"></navbar>
+		<navbar page-name="活动"></navbar>
 		<view class="page-content" style='height:calc(100vh - {{navH}}px)'>
 			<view class="margintopp"></view>
 			<block wx:for="{{arr}}" wx:key="index">
-				<block wx:if="{{arr[index].wp_isexpire == 'Y'}}">
-					<view class="pmBox" bindtap="hrefPm" data-index="{{arr[index].wp_href}}">
-						<view class="pmimgdiv">
-							<image class="imagepic" src="{{arr[index].wp_url}}" bindload="finish"></image>
-						</view>
-						<view class="pmtextdiv">
-							<view class="pmdescription">
-								<span class="fontdescription">{{arr[index].wp_desc}}</span>
-							</view>
-							<view class="pmddate">
-								<view class="fontdate">
-									{{arr[index].wp_startdate}} -- {{arr[index].wp_enddate}}
-								</view>
-								<view class="pmdgo">
-									<image src='https://yuesuo.yueguanjia.com/MiniProgram/images/rightarrowmine.png' class="arrow"></image>
-								</view>
-							</view>
-						</view>
+				<view class="pmBox" bindtap="hrefPm" data-index="{{arr[index].wp_href}}">
+					<view class="pmimgdiv">
+						<image class="imagepic" src="{{arr[index].wp_url}}" bindload="finish"></image>
 					</view>
-				</block>
-				<block wx:if="{{arr[index].wp_isexpire == 'N'}}">
-					<view class="pmBox">
-						<view class="pmimgdiv" data-index="{{arr[index].wp_href}}">
-							<image class="imagepic" src="{{arr[index].wp_url}}" bindload="finish"></image>
+					<view class="pmtextdiv">
+						<view class = "pmtext_left">
+							<view class="pmdescription">二级标题</view>
+							<view class="pmddate">注释文字</view>
 						</view>
-						<view class="pmtextdiv" data-index="{{arr[index].wp_href}}">
-							<view class="pmdescription">
-								<span class="fontdescription">{{arr[index].wp_desc}}</span>
-							</view>
-							<view class="pmddate">
-								<view class="expire">已过期</view>
-								<view class="fontdate">
-									{{arr[index].wp_startdate}} -- {{arr[index].wp_enddate}}
-								</view>
-								<view class="pmdgo">
-									<image src='https://yuesuo.yueguanjia.com/MiniProgram/images/rightarrowmine.png' class="arrow"></image>
-								</view>
-							</view>
+						<view class = "pmtext_right">
+							<view class = "button_right">按钮文字</view>
 						</view>
 					</view>
-				</block>
+				</view>
 			</block>
 			<div class="endbottom"> </div>
 		</view>

pages/promotion/promotion.wxss

@@ -33,42 +33,40 @@ page {
 }
 
 .imagepic {
-	width: 100%;
-	height: 100%;
+	width: 686rpx;
+	height: 290rpx;
 	display: inline-block;
-	border-radius: 30rpx 30rpx 0px 0px;
+	border-radius: 32rpx;
 }
 
 .pmimgdiv {
-	width: 100%;
-	height: 274rpx;
+	width: 686rpx;
+	height: 290rpx;
 	line-height: 360rpx;
 	border-radius: 30rpx 30rpx 0px 0px;
 }
 
 .pmtextdiv {
-	width: 100%;
-	display: flex;
-	flex-direction: column;
+	width: 686rpx;
 	height: 128rpx;
+	display: flex;
 	background-color: #ffffff;
 	border-radius: 0px 0px 30rpx 30rpx;
 }
 
 .pmdescription {
-	margin-left: 36rpx;
-	padding-top: 18rpx;
-	height: 44rpx;
-	line-height: 44rpx;
-	float: left;
-}
-
-.fontdescription {
-	color: #000000;
-	font-weight: Bold;
+	width: 128rpx;
+	margin-left: 32rpx;
+	margin-top: 24rpx;
+	height: 32rpx;
+	font-style: normal;
+	font-weight: bold;
 	font-size: 32rpx;
+	line-height: 32rpx;
+	text-align: center;
 }
 
+
 .fontdate {
 	flex: 7;
 	color: #8C8C8C;
@@ -89,13 +87,16 @@ page {
 }
 
 .pmddate {
-	display: flex;
-	flex-direction: row;
-	padding-top: 16rpx;
-	/* height: 80rpx; */
-	margin-left: 36rpx;
-	margin-right: 36rpx;
-	float: left;
+	margin-top: 16rpx;
+	margin-left: 32rpx;
+	width: 96rpx;
+	height: 24rpx;
+	font-style: normal;
+	font-weight: normal;
+	font-size: 24rpx;
+	line-height: 24rpx;
+	text-align: center;
+	color: #999999;
 }
 
 .pmddate2 {
@@ -143,11 +144,32 @@ page {
 }
 
 .pmBox {
-	margin-left: 4%;
-	margin-right: 4%;
-	margin-bottom: 40rpx;
-	width: 92%;
-	height: 402rpx;
+	margin-left: 32rpx;
+	margin-right: 32rpx;
+	margin-top: 32rpx;
+	width: 686rpx;
+	height: 418rpx;
 	box-shadow: 0px 14rpx 44rpx 2rpx rgba(161, 161, 161, 0.5);
-	border-radius: 30rpx;
+	border-radius: 32rpx;
+}
+.pmtext_left {
+	width: 50%;
+}
+.pmtext_right {
+	width: 50%;
+}
+.button_right {
+	width: 160rpx;
+	height: 60rpx;
+	margin-left: 151rpx;
+	margin-top: 36rpx;
+	background: #0880FF;
+	box-shadow: 0px 16rpx 32rpx rgba(8, 128, 255, 0.36);
+	border-radius: 24rpx;
+	font-style: normal;
+	font-weight: bold;
+	font-size: 28rpx;
+	line-height: 60rpx;
+	text-align: center;
+	color: #FFFFFF;
 }

project.config.json

@@ -37,7 +37,7 @@
   "projectname": "tyOutlets",
   "simulatorType": "wechat",
   "simulatorPluginLibVersion": {},
-  "libVersion": "2.13.1",
+  "libVersion": "2.14.0",
   "condition": {
     "search": {
       "list": []