Merge branch 'master' of http://8.140.253.224:3000/root/school_uni

package1/group/groupBuySingle.vue

@@ -1692,7 +1692,7 @@
 		background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/8bc15960c2dc40268e295d6dd23aecce.png') no-repeat;
 		width: 100%;
 		height: 340rpx;
-		background-size: 100% 100%;
+		background-size: 100%;
 		position: relative;
 		overflow: hidden;
 	}
@@ -1735,7 +1735,7 @@
 
 	/* content 上移，叠在背景图下方，减少头部空白 */
 	.content {
-		margin-top: -150rpx;
+		margin-top: -155rpx;
 		position: relative;
 		z-index: 1;
 		height: auto;
@@ -2586,6 +2586,7 @@
 
 	.group-live-card .zaixian-swiper {
 		height: 92rpx;
+		margin-top: 10px;
 	}
 
 	.missing-count {

pages/index/index.vue

@@ -26,7 +26,7 @@
 						
 						<swiper class="swiper" vertical circular :autoplay="orderLists.length <= 0"  v-if="orderLists.length <= 0"
 							:interval="onlineWorkerInterval" :duration="onlineWorkerDuration"
-							style="height: 170rpx;margin-top: -120rpx;">
+							style="height: 150rpx;margin-top: -120rpx;">
 							<swiper-item>
 								<view class="order-msg-box">
 									<view class="order-msg-left">
@@ -93,7 +93,7 @@
 						</swiper>
 						<swiper class="swiper" vertical circular :autoplay="orderLists.length > 0"
 							:interval="onlineWorkerInterval" :duration="onlineWorkerDuration"
-							style="height: 170rpx;margin-top: -120rpx;">
+							style="height: 150rpx;margin-top: -120rpx;">
 							<swiper-item v-if="orderLists.length > 0" v-for="(item,index) in orderLists" :key="index"
 								@tap="goOrderDetail(item)">
 								<view class="order-msg-box">
@@ -1562,7 +1562,7 @@
 		height: 200rpx;
 		display: flex;
 		align-items: center;
-		margin: 30rpx auto 0;
+		margin: 0 auto;
 		padding: 14rpx 10rpx;
 		box-sizing: border-box;
 		border-radius: 38rpx;
@@ -2473,8 +2473,7 @@
 	.qusong1 {
 		width: 40rpx;
 		height: 40rpx;
-		background: linear-gradient(135deg, #0d4d42 0%, #38d9b8 100%);
-		color: #fff;
+		background: linear-gradient(90deg, #e3ff96, #a6ffea);
 		border-radius: 40rpx;
 		text-align: center;
 		line-height: 40rpx;