Browse Source

第一版修改

wanghuan 4 years ago
parent
commit
dc5636e86b

+ 6 - 0
pages/index/index.js

@@ -56,6 +56,7 @@ Page({
 		util.getData('/getMktInfos',{
 			mi_branche_code: 110000
 		}).then(res => {
+			console.log(res)
 			that.setData({
 				mktarr: res
 			})
@@ -115,6 +116,11 @@ Page({
 			bookingreturn: false
 		})
 	},
+	hrefoKc() {
+		wx.navigateTo({
+			url: '/pages/packages/packages'
+		})
+	},
 	hideAllBox() {
     this.setData({
       //遮罩层隐藏

+ 6 - 5
pages/index/index.wxml

@@ -15,7 +15,8 @@
 				<view class="colum-hot">
 					<view class="hot-box-temp2"></view>
 					<view class="hot-box">
-						<image src="https://api.zhumi.tech/MiniProgram/image/index_m_left.png" class="index_middle_l"></image>
+						<image src="https://api.zhumi.tech/MiniProgram/image/index_m_left.png" class="index_middle_l" 
+						bindtap='hrefoKc'></image>
 					</view>
 					<view class="hot-box-temp"></view>
 					<view class="hot-box">
@@ -25,7 +26,7 @@
 				</view>
 				<view class="cont">
 					<view class="tips-box">
-						<view class="tips-cont">双十一全部精品课程钜惠活动正在进行中...</view>
+						<view class="tips-cont">双十二钜惠倒计时……</view>
 					</view>
 					<image src="https://api.zhumi.tech/MiniProgram/image/recommend.png" class="lang-img" />
 					<image src="https://api.zhumi.tech/MiniProgram/image/hd_banner.jpg" class="hd_banner" />
@@ -33,7 +34,7 @@
 					<scroll-view scroll-x="true" style="height: 550rpx;">
 						<view class="uploadWrap">
 							<block wx:for="{{mktarr}}" wx:key="index">
-								<view class="upload_Item">
+								<view class="{{mktarr[index].mi_mapurl}}">
 									<image class="upload_Item_img" src="{{mktarr[index].mi_mkturl}}"></image>
 									<view class="teache_con">
 										<view class="teahcer_name_box">
@@ -69,9 +70,9 @@
 						</view>
 					</view>
 					<view class="mkt-desc-box">
-						<view class="hot-title">米粒编程(大都汇校区)</view>
+						<view class="hot-title">米粒编程(铁西校区)</view>
 						<view class="hot-mkt">电话:024-25689988,17609810980</view>
-						<view class="hot-mkt">地址: 辽宁省沈阳市铁西区建设西路2号 龙之梦·大都汇4层东侧</view>
+						<view class="hot-mkt">地址: 沈阳市铁西区建设西路2号 龙之梦·大都汇4层东侧</view>
 					</view>
 					<view class="endbottomm"></view>
 				</view>

+ 50 - 12
pages/index/index.wxss

@@ -181,7 +181,7 @@ page {
   display: -webkit-box;
   flex-direction: column;
 } 
-.upload_Item{ 
+.upload_Item_p{ 
 	width: 402rpx; 
 	height: 	512rpx; 
 	margin-right: 24rpx;
@@ -191,6 +191,36 @@ page {
 	-o-background-size: cover;
 	background-position: center 0;
 } 
+.upload_Item_g{ 
+	width: 402rpx; 
+	height: 	512rpx; 
+	margin-right: 24rpx;
+	background-image: url("https://api.zhumi.tech/MiniProgram/teacher/g_bk.png");
+	background-size: cover;
+	 -webkit-background-size: cover;
+	-o-background-size: cover;
+	background-position: center 0;
+} 
+.upload_Item_y{ 
+	width: 402rpx; 
+	height: 	512rpx; 
+	margin-right: 24rpx;
+	background-image: url("https://api.zhumi.tech/MiniProgram/teacher/y_bk.png");
+	background-size: cover;
+	 -webkit-background-size: cover;
+	-o-background-size: cover;
+	background-position: center 0;
+} 
+.upload_Item_b{ 
+	width: 402rpx; 
+	height: 	512rpx; 
+	margin-right: 24rpx;
+	background-image: url("https://api.zhumi.tech/MiniProgram/teacher/b_bk.png");
+	background-size: cover;
+	 -webkit-background-size: cover;
+	-o-background-size: cover;
+	background-position: center 0;
+} 
 .upload_Item_img{ 
   width: 402rpx;
 	height: 336rpx;
@@ -214,8 +244,7 @@ page {
 	margin-bottom: 8rpx;
 }
 .teacher_name {
-	flex: 0.5;
-	width: 128rpx;
+	flex: 0.4;
 	height: 32rpx;
 	margin-left: 32rpx;
 	font-style: normal;
@@ -225,15 +254,13 @@ page {
 	color: #33333F;
 }
 .teacher_name_con {
+	flex: 0.6;
 	font-style: normal;
 	font-weight: normal;
 	font-size: 24rpx;
 	line-height: 40rpx;
 	margin-left: 0rpx;
 }
-.teacher_con {
-	flex: 0.5;
-}
 .t_conntext {
 	margin-top:16rpx;
 	margin-left: 32rpx;
@@ -264,7 +291,7 @@ scroll-view-teacher {
 .campus_Item {
 	position: absolute;
 	width: 686rpx; 
-	height: 162rpx; 
+	height: 170rpx; 
 	margin-left: 32rpx;
 	background-color: white;
 	border-radius: 32rpx 32rpx 0rpx  0rpx ;
@@ -272,24 +299,35 @@ scroll-view-teacher {
 }
 .campus_Item_img {
 	width: 172rpx; 
-  height: 112rpx;
+  height: 114rpx;
 	border-radius: 24rpx;
-	border-color: #ff6160;
+}
+.campus_Item_img:hover{
+	border-color: #0880FF;
 	border-style: solid;
 	border-width: 4rpx;
+	border-radius: 24rpx;
+}
+.campus_Item_img_click {
+	width: 172rpx; 
+  height: 112rpx;
+	border-radius: 24rpx;
+	
 }
 .mkt-img{ 
 	width: 172rpx; 
 	height: 121rpx; 
 	margin-right: 20rpx;
 } 
+
+
 .mkt-img-box {
 	padding-top: 32rpx;
-	height: 121rpx;
+	height: 126rpx;
 }
 .mktWrap {
 	margin-left: 32rpx;
-  height: 116rpx; 
+  height: 126rpx; 
   width:100%; 
   display: flex; 
   display: -webkit-box; 
@@ -347,7 +385,7 @@ scroll-view-teacher {
 	position: fixed;
 	z-index: 90;
 	left: 110rpx;
-	top: 330rpx;
+	top: 430rpx;
 }
 .booking_title {
 	font-style: normal;

+ 2 - 6
pages/mine/mine.wxml

@@ -34,15 +34,11 @@
 				<view class="item_context">查看收益</view>
 				<image class="item_right" src="https://api.zhumi.tech/MiniProgram/image/next.png"/>
 			</view>
-			<!-- <view class = "mitem" bindtap="hrefTest" >
-				<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" bindtap="hrefTest">
 				<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 class="item_context">0</view>
+				<image class="item_right" src="https://api.zhumi.tech/MiniProgram/image/next.png"/>
 			</view>
 			<view class = "mitem" bindtap="hrefCall">
 				<image class="item_icon" src="https://api.zhumi.tech/MiniProgram/image/present.png"/>

+ 3 - 3
pages/mine/mine.wxss

@@ -328,7 +328,7 @@ page {
 	margin-left: 66rpx;
 	float:left;
 	margin-top: 32rpx;
-	width: 4rpx;
+	width: 2rpx;
 	height: 70rpx;
 	background:#CCCCD8;
 }
@@ -348,7 +348,7 @@ page {
 	height: 40rpx;
 }
 .item_title {
-	width: 168rpx;
+	width: 158rpx;
 	height: 40rpx;
 	margin-left: 24rpx;
 	font-style: normal;
@@ -358,7 +358,7 @@ page {
 	color: #000000;
 }
 .item_context {
-	width: 112rpx;
+	width: 122rpx;
 	height: 40rpx;
 	margin-left: 236rpx;
 	font-family: PingFang SC;

+ 1 - 1
pages/promotion/promotion.wxml

@@ -21,7 +21,7 @@
 				</view>
 			</block>
 			<block wx:if="{{arr[index].wp_isexpire == 'N'}}">
-			<view class="pmBox" data-index="{{arr[index].wp_href}}">
+			<view class="pmBoxEnd" data-index="{{arr[index].wp_href}}">
 				<view class="pmimgdiv">
 					<image class="imagepic" src="{{arr[index].wp_url}}" bindload="finish"></image>
 				</view>

+ 8 - 0
pages/promotion/promotion.wxss

@@ -151,6 +151,14 @@ page {
 	box-shadow: 0px 14rpx 44rpx 2rpx rgba(161, 161, 161, 0.5);
 	border-radius: 32rpx;
 }
+.pmBoxEnd {
+	margin-left: 32rpx;
+	margin-right: 32rpx;
+	margin-top: 32rpx;
+	width: 686rpx;
+	height: 418rpx;
+	border-radius: 32rpx;
+}
 .pmtext_left {
 	width: 50%;
 }