样式优化

common/request.js

@@ -5,10 +5,11 @@ import api from './api.js'
 var num = 1
 //接口api   
 // export const BASE_URL = 'https://api.xyyxt.net'   //release
-export const BASE_URL = 'https://test.xyyxt.net'   //预发布
+// export const BASE_URL = 'https://test.xyyxt.net'   //预发布
 // export const BASE_URL = 'http://42.192.164.187:19005'    //test
 // export const BASE_URL = 'http://192.168.1.222:5055'    //后端本地更新到222
 // export const BASE_URL = 'http://192.168.1.24:5055'    //后端本地
+export const BASE_URL = 'http://192.168.1.7:5055'    //后端本地
 
  //图片上传api
 // export const BASE_IMG_URL = 'https://file.xyyxt.net/'     //release

pages/learn/index.vue

@@ -21,7 +21,7 @@
 			<view v-if="allCourse" class="had_courses">
 				<!-- 直播 -->
 				<view v-if="livingLists.length" class="lives">
-					<view v-for="(live, l_index) in livingLists" :key="l_index" class="live_item">
+					<view v-for="(live, l_index) in livingLists" :key="l_index" class="live_item" @click="toLiveLook(live)">
 						<view class="live_con">
 							<view class="live_status">
 								<image v-if="bgShow(live.liveStartTime, live.watchStatus)" src="/static/learn/living.png" class="liv_icon"></image>
@@ -32,7 +32,7 @@
 											'futuring': lookTimeStatus(live.liveStartTime, live.watchStatus) == 4,
 											'curring': [2,3].includes(lookTimeStatus(live.liveStartTime, live.watchStatus))}"
 									>
-									<text v-if="lookTimeStatus(live.liveStartTime, live.watchStatus) == 1" @click="toLiveLook(live)">点击观看</text>
+									<text v-if="lookTimeStatus(live.liveStartTime, live.watchStatus) == 1">点击观看</text>
 									<text v-if="lookTimeStatus(live.liveStartTime, live.watchStatus) == 2">即将开播</text>
 									<template v-if="lookTimeStatus(live.liveStartTime, live.watchStatus) == 3">
 										剩余：

pages/shopping/shoppingCart.vue

@@ -64,14 +64,15 @@
 						<view class="check_alls">
 							<u-checkbox label="all" name="all" shape="circle" @change="checkboxAllChange" v-model="allChecked"></u-checkbox>
 							<text class="checkall">全选</text>
-							<text class="rmb">￥</text>
-							<view class="priceTag">{{ toFixed(totalPrice) }}</view>
+							<!-- <text class="rmb">￥</text> -->
+							<view class="all_sum">结算：</view>
+							<view class="priceTag">¥ {{ toFixed(totalPrice) }}</view>
 						</view>
 						<view style="display: flex;align-items: center;">
 							<!-- <view style="color: #999999;margin-right: 8rpx;">合计</view> -->
 							<view style="display: flex;color: #FFFFFF;align-items: center;" @click="goBuy()">
 								<view class="btn2">结算</view>
-								<u-icon name="arrow-right" color="#fff" size="30"></u-icon>
+								<!-- <u-icon name="arrow-right" color="#fff" size="30"></u-icon> -->
 							</view>
 						</view>
 					</view>
@@ -648,34 +649,41 @@ page {
 	font-weight: 500;
 	color: #FFFFFF;
 	margin-right: 8rpx;
+	width: 232rpx;
+	height: 92rpx;
+	line-height: 92rpx;
+	text-align: center;
+	background: #FC3F3F;
+	border-radius: 120rpx;
 }
 .bottomBox {
 	position: fixed;
 	bottom: 0;
 	width: 100%;
 	left: 0;
-	height: 180rpx;
+	height: 132rpx;
 	background-color: #ffffff;
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
-	padding: 0 30rpx;
-	border-radius: 24rpx 24rpx 0rpx 0rpx;
+	padding: 0 32rpx;
+	box-shadow: 0px -2px 6px 0px rgba(0,0,0,0.1000);
 	.bottons_all {
-		width: 674rpx;
-		height: 104rpx;
-		background: #007AFF;
-		border-radius: 52rpx;
+		// width: 674rpx;
+		// height: 104rpx;
+		// background: #007AFF;
+		// border-radius: 52rpx;
+		width: 100%;
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		padding: 0rpx 26rpx 0rpx 23rpx;
+		// padding: 0rpx 26rpx 0rpx 23rpx;
 	}
 	.priceTag {
-		font-size: 35rpx;
+		font-size: 32rpx;
 		font-family: PingFang SC;
 		font-weight: bold;
-		color: #ffffff;
+		color: #FC3F3F;
 		display: flex;
 		flex-direction: row-reverse;
 		margin-right: 20rpx;
@@ -683,21 +691,26 @@ page {
 	.check_alls {
 		display: flex;
 		align-items: center;
-		color: #fff;
-		.rmb {
-			margin-right: 9rpx;
-			margin-left: 35rpx;
-			font-size: 20rpx;
-			position: relative;
-			top: -14rpx;
-			left: 0rpx;
-		}
+		color: #969696;
+		// .rmb {
+		// 	// margin-right: 9rpx;
+		// 	// margin-left: 35rpx;
+		// 	// font-size: 20rpx;
+		// 	// position: relative;
+		// 	// top: -14rpx;
+		// 	// left: 0rpx;
+		// }
+	}
+	.all_sum {
+		font-size: 28rpx;
+		font-weight: 800;
+		color: #303030;
+		margin-left: 35rpx;
 	}
 	.checkall {
 		font-weight: 500;
-		color: #FFFFFF;
-		font-size: 22rpx;
-		
+		color: #969696;
+		font-size: 28rpx;
 	}
 }
 </style>

pages/wd/index.vue

@@ -53,7 +53,7 @@
 						<view>我的题库通</view>
 					</view>
 				</view>
-				<!-- <navigator  hover-class="none" url="/pages5/liveDetail/list" class="menu_box" >
+				<navigator  hover-class="none" url="/pages5/liveDetail/list" class="menu_box" >
 					<view class="box_left">
 						<image src="/static/icon/my_icon12.png" class="my_icon"></image>
 						<view>我的直播课</view>
@@ -63,7 +63,7 @@
 						<text>{{ total2 }}</text>
 						个课程直播中
 					</view>
-				</navigator> -->
+				</navigator>
 				<navigator  hover-class="none" url="/pages2/learn/my_learn" class="menu_box" >
 					<view class="box_left">
 						<image src="/static/icon/my_icon2.png" class="my_icon"></image>

pages2/bank/detail.vue

@@ -2,41 +2,26 @@
 	<view>
 		<nav-bar title="题库详情"></nav-bar>
 		<view style="background-color: #FFFFFF;">
-			<!-- <view> -->
-				<image :src="$method.splitImgHost(goodsData.coverUrl, true)" style="width: 100%;height: 400rpx;"></image>
-				<!-- <view style="padding:20rpx">
-					<view style="display: flex;margin-top: 13rpx;">
-						<view class="yearTag" v-if="goodsData.year">{{ goodsData.year }}</view>
-						<view class="titleTag">{{ goodsData.goodsName }}</view>
-					</view> -->
-					<!-- <view style="display: flex;justify-content: space-between;margin-top: 13rpx;" v-if="false">
-						<view class="noteTag"><image src="/static/icon/wk_icon1.png" class="wk_icon"></image>
-						共 <text class="blackFont">{{goodsData.updateTime}}</text> 张卷 <text class="blackFont">1200</text> 道题  </view>
-						
-					</view> -->
-				<!-- </view> -->
-			<!-- </view> -->
+			<image :src="$method.splitImgHost(goodsData.coverUrl, true)" style="width: 100%;height: 400rpx;"></image>
 			
-			<!-- <u-line color="#D6D6DB" /> -->
-		</view>
-
-		<view class="contents">
 			<view class="cou_title">
 				<view class="title_name">
 					<view class="titleTag">{{ goodsData.goodsName }}</view>
 				</view>
 				<view style="display: flex;justify-content: space-between;margin-top: 13rpx;">
+					<view class="prices">
+						<!-- <text class="price_sym"></text> -->
+						<text class="price_word">¥ {{ goodsData.standPrice }}</text>
+					</view>
 					<view class="noteTag">
 						<!-- 共 <text class="blackFont">{{ goodsData.chapterNum }} 张卷 {{goodsData || '-'}}</text> 道题 -->
 					</view>
-					<view class="prices">
-						<text class="price_sym">¥</text>
-						<text class="price_word">{{ goodsData.standPrice }}</text>
-					</view>
 				</view>
-				<view><u-line color="#D6D6DB" /></view>
 			</view>
+		</view>
 
+		<view class="contents">
+			
 			<!-- <view>
 				<view><u-tabs :list="list" item-width="50%" font-size="30" bar-width="24" :current="current" @change="change" active-color="#007AFF"></u-tabs></view>
 			</view> -->
@@ -359,7 +344,7 @@ export default {
 </script>
 <style>
 page {
-	background-color: #ffffff;
+	background-color: #F2F2F2;
 }
 </style>
 <style lang="scss" scope>
@@ -367,32 +352,13 @@ page {
 	width: 100%;
 	height: 100%;
 	background-color: #ffffff;
-	border-radius: 24rpx 24rpx 0rpx 0rpx;
-	position: relative;
-	top: -27rpx;
-	left: 0;
-	.cou_title {
-		height: 210rpx;
-		padding: 27rpx 56rpx 0rpx 56rpx;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-around;
-	}
-	.prices {
-		.price_sym {
-			font-size: 20rpx;
-			color: #333333;
-			position: relative;
-			top: -23rpx;
-			left: 0;
-			margin-right: 10rpx;
-		}
-		.price_word {
-			font-size: 42rpx;
-			font-weight: bold;
-			color: #FC3F3F;
-		}
-	}
+	margin-top: 16rpx;
+	overflow: hidden;
+	// border-radius: 24rpx 24rpx 0rpx 0rpx;
+	// position: relative;
+	// top: -27rpx;
+	// left: 0;
+	
 	// tab
 	.tabs {
 		// width: 100%;
@@ -423,7 +389,28 @@ page {
 		}
 	}
 }
-
+.cou_title {
+	// height: 210rpx;
+	padding: 24rpx 32rpx 40rpx 32rpx;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-around;
+}
+.prices {
+	// .price_sym {
+	// 	font-size: 20rpx;
+	// 	color: #333333;
+	// 	position: relative;
+	// 	top: -23rpx;
+	// 	left: 0;
+	// 	margin-right: 10rpx;
+	// }
+	.price_word {
+		font-size: 40rpx;
+		font-weight: 800;
+		color: #FC3F3F;
+	}
+}
 .courseName {
 	white-space: nowrap;
 	overflow: hidden;
@@ -647,10 +634,10 @@ page {
 	color: #ff2d55;
 }
 .titleTag {
-	font-size: 32rpx;
+	font-size: 36rpx;
 	font-weight: bold;
 	color: #333333;
-	margin-left: 8rpx;
+	// margin-left: 8rpx;
 }
 .yearTag {
 	width: 80rpx;

pages2/order/confirm_list.vue

@@ -30,7 +30,11 @@
 			</view>
 		</view>
 		<view class="bottomBox safeArea">
-			<view class="priceTag">¥ {{detail.standPrice}}</view>
+			<view class="sums">
+				<text class="all_sum">订单金额：</text>
+				<text class="priceTag">¥ {{detail.standPrice}}</text>
+			</view>
+			
 			<view style="display: flex;color: #FFFFFF;align-items: center;">
 				<view class="btn2" :class="{able:isAble()}" @click="goBuy()">确认购买</view>
 			</view>
@@ -483,14 +487,15 @@ export default {
 		flex-direction: row-reverse;
 	}
 	.btn2{
-		width: 200rpx;
-		height: 64rpx;
-		background: linear-gradient(0deg, #015EEA, #00C0FA);
-		opacity: 0.6;
-		border-radius: 32rpx;
+		width: 232rpx;
+		height: 92rpx;
+		background: #FC3F3F;
+		border-radius: 120rpx;
+		// width: 200rpx;
+		// height: 64rpx;
+		// background: linear-gradient(0deg, #015EEA, #00C0FA);
 		text-align: center;
-		line-height: 64rpx;
-		
+		line-height: 92rpx;
 		&.able {
 			opacity: 1;
 		}
@@ -500,14 +505,23 @@ export default {
 		bottom: 0;
 		width: 100%;
 		left: 0;
-		height:98rpx ;
+		height: 132rpx ;
 		background-color: #FFFFFF;
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
 		box-sizing: unset;
+		box-shadow: 0px -2px 6px 0px rgba(0,0,0,0.1000);
 		>view{
 			margin: 0 30rpx;
 		}
+		.sums {
+			display: flex;
+		}
+		.all_sum {
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #303030;
+		}
 	}
 </style>

pages2/order/confirm_success.vue

@@ -22,7 +22,7 @@
 							继续选课
 						</view>
 						<view class="btn2" @click="goOrder">
-							我的订单
+							立即学习
 						</view>
 					</view>
 				</view>
@@ -111,9 +111,12 @@ export default {
 			});
 		},
 		goOrder(){
-			uni.redirectTo({
-			    url: '/pages2/order/index?current=1'
-			});
+			// uni.redirectTo({
+			//     url: '/pages2/order/index?current=1'
+			// });
+			uni.switchTab({
+				url:'/pages/learn/index'
+			})
 		},
 		radioChange(e) {
 			// console.log(e);

pages3/course/detail.vue

@@ -23,26 +23,26 @@
 					></polyv-player>
 				</view>
 				
-			<!-- </view> -->
-		</view>
-		<view class="contents">
-			<view class="cou_title">
-				<view class="title_name">
-					<!-- <view class="yearTag" v-if="detail.year">{{detail.year}}</view> -->
-					<view class="titleTag">{{detail.goodsName}}</view>
-				</view>
-				<view style="display: flex;justify-content: space-between;margin-top: 13rpx;">
-					<view class="noteTag">
-						<!-- <image src="/static/icon/wk_icon1.png" class="wk_icon"></image> -->
-						共 <text class="blackFont">{{courseList.length}} 课程 {{detail.classHours || '-'}}</text> 学时
+				<view class="cou_title">
+					<view class="title_name">
+						<!-- <view class="yearTag" v-if="detail.year">{{detail.year}}</view> -->
+						<view class="titleTag">{{detail.goodsName}}</view>
 					</view>
-					<view class="prices">
-						<text class="price_sym">¥</text>
-						<text class="price_word">{{ detail.standPrice }}</text>
+					<view style="display: flex;justify-content: space-between;margin-top: 13rpx;">
+						<view class="prices">
+							<!-- <text class="price_sym">¥</text> -->
+							<text class="price_word">¥ {{ detail.standPrice }}</text>
+						</view>
+						<view class="noteTag">
+							<!-- <image src="/static/icon/wk_icon1.png" class="wk_icon"></image> -->
+							共 <text class="blackFont">{{courseList.length}} 课程 {{detail.classHours || '-'}}</text> 学时
+						</view>
 					</view>
 				</view>
-				<view><u-line color="#D6D6DB" /></view>
-			</view>
+			<!-- </view> -->
+		</view>
+		<view class="contents">
+			
 			<!-- <u-line color="#D6D6DB" /> -->
 			<!-- <view style="height: 80rpx;">
 				<view><u-tabs :list="list" :item-width="itemWidth()" font-size="30" bar-width="24"  :current="current" @change="change" active-color="#007AFF"></u-tabs></view>
@@ -447,7 +447,7 @@ export default {
 </script>
 <style >
 	page{
-		background-color: #ffffff;
+		background-color: #F2F2F2;
 	}
 </style>
 <style lang="scss" scope>
@@ -495,30 +495,32 @@ export default {
 		width: 100%;
 		height: 100%;
 		background-color: #ffffff;
-		border-radius: 24rpx 24rpx 0rpx 0rpx;
-		position: relative;
-		top: -27rpx;
-		left: 0;
+		margin-top: 16rpx;
+		overflow: hidden;
+		// border-radius: 24rpx 24rpx 0rpx 0rpx;
+		// position: relative;
+		// top: -27rpx;
+		// left: 0;
 	}
 	.cou_title {
-		height: 210rpx;
-		padding: 27rpx 56rpx 0rpx 56rpx;
+		// height: 210rpx;
+		padding: 24rpx 32rpx 40rpx 32rpx;
 		display: flex;
 		flex-direction: column;
 		justify-content: space-around;
 	}
 	.prices {
-		.price_sym {
-			font-size: 20rpx;
-			color: #333333;
-			position: relative;
-			top: -23rpx;
-			left: 0;
-			margin-right: 10rpx;
-		}
+		// .price_sym {
+		// 	font-size: 20rpx;
+		// 	color: #333333;
+		// 	position: relative;
+		// 	top: -23rpx;
+		// 	left: 0;
+		// 	margin-right: 10rpx;
+		// }
 		.price_word {
-			font-size: 42rpx;
-			font-weight: bold;
+			font-size: 40rpx;
+			font-weight: 800;
 			color: #FC3F3F;
 		}
 	}
@@ -619,18 +621,18 @@ export default {
 		bottom: 0;
 		width: 100%;
 		left: 0;
-		height:98rpx ;
+		height: 132rpx ;
 		background-color: #FFFFFF;
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
 		padding: 0 24rpx;
-		box-shadow: 0px -5px 20px 1px rgba(1,99,235,0.1000);
+		box-shadow: 0rpx -2rpx 6rpx 0rpx rgba(0,0,0,0.1000);
 		.icons {
 			display: flex;
 			.share_w {
-				font-size: 20rpx;
-				color: #666666;
+				font-size: 24rpx;
+				color: #333;
 				margin-top: 6rpx;
 			}
 			.icon_item {
@@ -681,7 +683,7 @@ export default {
 		font-size: 30rpx;
 		font-family: PingFang SC;
 		font-weight: 400;
-		color: #666;
+		color: #A7B0B8;
 		align-items: center;
 	}
 	.priceTag{