root
/
school_uni
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

master
wangfukang 4 weeks ago
parent
9221f38b32 feeca70681
commit
2ad6daf8ef
2 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      package1/group/groupBuySingle.vue
  2. 9
      pages/index/index.vue

5
package1/group/groupBuySingle.vue
View File

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

9
pages/index/index.vue
View File

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

Write Preview
Loading…
Cancel
Save