Explorar el Código

[活动报名][修改]:[修改merge出现的问题]

tags/河北版C.8.1.01
meo hace 5 años
padre
commit
6cac222f34
Se han modificado 3 ficheros con 3 adiciones y 9 borrados
  1. +2
    -2
      components/banner/index.wxss
  2. +1
    -2
      pages/main/coupons/index.wxss
  3. +0
    -5
      pages/radetail/index.wxml

+ 2
- 2
components/banner/index.wxss Ver fichero

@@ -10,8 +10,8 @@
.index-slide, swiper-item .index-slide, swiper-item
.index-slide-image { .index-slide-image {
display: block; display: block;
width: 690rpx;
height: 258rpx;
width: 710rpx;
height: 265rpx;
margin: 0 auto; margin: 0 auto;
border-radius: 16rpx; border-radius: 16rpx;
overflow: hidden; overflow: hidden;


+ 1
- 2
pages/main/coupons/index.wxss Ver fichero

@@ -1,6 +1,6 @@
@import "../../../app.wxss"; @import "../../../app.wxss";
.index-coupons { .index-coupons {
padding: 0 30rpx;
padding: 0 20rpx;
/* margin-top: 40rpx; */ /* margin-top: 40rpx; */
/* background:linear-gradient(0deg,rgba(235,235,235,1) 0%,rgba(255,255,255,0.8) 100%); */ /* background:linear-gradient(0deg,rgba(235,235,235,1) 0%,rgba(255,255,255,0.8) 100%); */
} }
@@ -15,7 +15,6 @@
color: #999; color: #999;
} }
.coupons c-coupons{ .coupons c-coupons{
width: 335rpx;
height: 354rpx; height: 354rpx;
margin-bottom: 34rpx; margin-bottom: 34rpx;
} }


+ 0
- 5
pages/radetail/index.wxml Ver fichero

@@ -33,11 +33,6 @@
</view> </view>
</view> </view>
</view> </view>
<!-- 自由图文格式 -->
<view wx:if="{{data.type == 2}}">
<view class="content">
<template is="wxParse" data="{{wxParseData:article.nodes}}" />
</view>
</view> </view>
<!-- 自由图文格式 --> <!-- 自由图文格式 -->
<view wx:if="{{data.type == 2}}" style='padding-top:{{navigationBarHeight}}'> <view wx:if="{{data.type == 2}}" style='padding-top:{{navigationBarHeight}}'>


Cargando…
Cancelar
Guardar