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
tianyi 4 weeks ago
parent
4aee879585 9c571462e2
commit
facbe14447
3 changed files with 105 additions and 31 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. 70
      components/tab-bar/delivery.vue
  2. 62
      package1/group/groupBuyList.vue
  3. 4
      package1/group/groupBuySingle.vue

70
components/tab-bar/delivery.vue
View File

@ -127,12 +127,14 @@
<view class=""> <view class="">
{{item.shopName}} {{item.shopName}}
</view> </view>
<view @tap="productDetail(item)" v-if="item.deliveryType == 1" <view class="shop-address-row">
style="width: 32rpx;height: 30rpx;font-weight: 700;font-size: 20rpx;color: #fff;text-align: center;background: #00BFFF;border-radius: 10rpx;margin: 20rpx 0 0 10rpx;line-height: 30rpx;"> <view @tap="productDetail(item)" v-if="item.deliveryType == 1"
祥 class="detail-tag">
</view> 祥
<view style="color: #777;"> </view>
{{item.shopAddress}} <view class="shop-address">
{{item.shopAddress}}
</view>
</view> </view>
</view> </view>
<view class="right"> <view class="right">
@ -179,8 +181,10 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="item.isReturn != null && item.isReturn == 1" style="width: 100%;height: 100rpx;margin-top: 32rpx;"> <view v-if="item.isReturn != null && item.isReturn == 1" class="refund-status">
用户申请 退款中 <view class="refund-status-text">
用户申请退款中
</view>
</view> </view>
<view v-else style="width: 100%;height: 100rpx;margin-top: 32rpx;"> <view v-else style="width: 100%;height: 100rpx;margin-top: 32rpx;">
<img v-if="item.status == 1 && item.arriveTime == null" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/d649c22310874f19a74cf8dfbb1c7240.png" <img v-if="item.status == 1 && item.arriveTime == null" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/d649c22310874f19a74cf8dfbb1c7240.png"
@ -851,6 +855,56 @@
padding-top: 20rpx; padding-top: 20rpx;
} }
.shop-address-row {
display: flex;
align-items: center;
width: 100%;
min-width: 0;
margin-top: 8rpx;
}
.detail-tag {
width: 32rpx;
height: 30rpx;
line-height: 30rpx;
flex-shrink: 0;
font-weight: 700;
font-size: 20rpx;
color: #fff;
text-align: center;
background: #00BFFF;
border-radius: 10rpx;
margin-right: 10rpx;
}
.shop-address {
flex: 1;
min-width: 0;
color: #777;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.refund-status {
width: 100%;
height: 100rpx;
margin-top: 32rpx;
display: flex;
align-items: center;
}
.refund-status-text {
height: 56rpx;
line-height: 56rpx;
padding: 0 24rpx;
background: rgba(255, 117, 88, 0.12);
color: #ff4d35;
border: 1px solid rgba(255, 117, 88, 0.35);
border-radius: 16rpx;
font-weight: 700;
}
.guize-list { .guize-list {
width: 600rpx; width: 600rpx;
padding: 20rpx; padding: 20rpx;

62
package1/group/groupBuyList.vue
View File

@ -121,8 +121,7 @@
¥{{item1.attributeListPrice | sliceMsg}} ¥{{item1.attributeListPrice | sliceMsg}}
</view> </view>
<view class="shop-menu-purchase"> <view class="shop-menu-purchase">
拼团 <text 拼团 <text class="group-price">¥{{item1.productGroupBuyPrices | slicePrice}}</text>
style="color: red;font-size: 24rpx;padding-left: 10rpx;">¥{{item1.productGroupBuyPrices | slicePrice}}</text>
</view> </view>
</view> </view>
</view> </view>
@ -705,55 +704,76 @@
display: flex; display: flex;
height: auto; height: auto;
overflow-y: hidden; overflow-y: hidden;
padding: 10rpx 0 20rpx; padding: 18rpx 0 26rpx;
} }
.menu-member { .menu-member {
width: 140rpx; position: relative;
width: 150rpx;
height: 100%; height: 100%;
margin: 10rpx 0 0 20rpx; margin: 10rpx 0 0 20rpx;
} }
.menu-img { .menu-img {
height: 140rpx; height: 142rpx;
width: 140rpx; width: 142rpx;
border-radius: 20rpx; margin: 0 auto;
border-radius: 24rpx;
box-shadow: 0 10rpx 22rpx rgba(0, 0, 0, 0.12);
overflow: hidden;
img { img {
width: 100%; width: 100%;
height: 100%; height: 100%;
background-size: 100%; background-size: 100%;
border-radius: 20rpx; border-radius: 24rpx;
} }
} }
.menu-content { .menu-content {
font-size: 26rpx; width: 150rpx;
margin-top: 12rpx;
padding: 0 4rpx;
box-sizing: border-box;
font-size: 24rpx;
} }
.shop-menu-name { .shop-menu-name {
margin-top: 10rpx;
font-weight: 700; font-weight: 700;
overflow: hidden; overflow: hidden;
height: 30rpx; height: 32rpx;
line-height: 32rpx;
color: #222;
text-overflow: ellipsis;
white-space: nowrap;
} }
.shop-menu-price { .shop-menu-price {
margin-top: 6rpx; margin-top: 4rpx;
font-weight: 700; color: #a0a0a0;
font-size: 21rpx;
font-weight: 600;
line-height: 28rpx;
} }
.shop-menu-purchase { .shop-menu-purchase {
display: flex; display: inline-block;
background: rgba(255, 57, 57, 0.1); background: linear-gradient(90deg, #fff1ef, #ffe8ec);
height: 36rpx; min-height: 32rpx;
line-height: 36rpx; line-height: 32rpx;
padding: 0 0 0 4rpx; padding: 0 10rpx;
border-radius: 8rpx; border-radius: 10rpx 18rpx 18rpx 10rpx;
font-weight: 700; font-weight: 700;
margin-top: 10rpx; margin-top: 8rpx;
color: #777; color: #ff5a45;
font-size: 20rpx; font-size: 20rpx;
box-shadow: 0 4rpx 10rpx rgba(255, 57, 57, 0.08);
}
.group-price {
color: #ff1f1f;
font-size: 24rpx;
padding-left: 8rpx;
} }
.zaixian { .zaixian {

4
package1/group/groupBuySingle.vue
View File

@ -2869,9 +2869,9 @@
.popup-rally-main, .popup-rally-main,
.join-popup-main { .join-popup-main {
color: #103a32; color: #103a32;
font-size: 36rpx; font-size: 28rpx;
font-weight: 900; font-weight: 900;
line-height: 48rpx; line-height: 34rpx;
} }
.popup-rally-sub, .popup-rally-sub,

Write Preview
Loading…
Cancel
Save