| @@ -12,7 +12,7 @@ | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view class='hotCon' > | |||||
| <view class='hotCon clearfix'> | |||||
| <view class='kanjia' wx:if="{{kSize}}" bindtap="gotokjdetail" data-couponId='{{kData.couponId}}' data-couponChannelId="{{kData.id}}" data-targetAd="{{kData.targetAd}}" > | <view class='kanjia' wx:if="{{kSize}}" bindtap="gotokjdetail" data-couponId='{{kData.couponId}}' data-couponChannelId="{{kData.id}}" data-targetAd="{{kData.targetAd}}" > | ||||
| <view > | <view > | ||||
| <image mode='aspectFill' lazy-load='true' src="{{kData.coverImg}}" /> | <image mode='aspectFill' lazy-load='true' src="{{kData.coverImg}}" /> | ||||
| @@ -2,7 +2,6 @@ | |||||
| @import "../../app.wxss"; | @import "../../app.wxss"; | ||||
| .hotBox{ | .hotBox{ | ||||
| width:710rpx; | width:710rpx; | ||||
| height: 220rpx; | |||||
| margin: 20rpx auto 0; | margin: 20rpx auto 0; | ||||
| } | } | ||||
| .hotTitle{ | .hotTitle{ | ||||
| @@ -27,6 +27,6 @@ | |||||
| <view class='names' wx:if="{{!address}}">请选择地址</view> | <view class='names' wx:if="{{!address}}">请选择地址</view> | ||||
| <image class="rArrow" src="{{chevronUrl}}" mode='widthFix'></image> | <image class="rArrow" src="{{chevronUrl}}" mode='widthFix'></image> | ||||
| </view> | </view> | ||||
| <button class='btn' wx:if="{{!username}}" formType="submit" hover-class='active' style='background:#CECECE' >完成</button> | |||||
| <button class='btn' wx:if="{{!username}}" formType="submit" hover-class='active' style='background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%)' >完成</button> | |||||
| <button class='btn' wx:if="{{username}}" formType="submit" hover-class='active' style='background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);'>完成</button> | <button class='btn' wx:if="{{username}}" formType="submit" hover-class='active' style='background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);'>完成</button> | ||||
| </form> | </form> | ||||
| @@ -32,7 +32,7 @@ | |||||
| <!-- 多个商铺 --> | <!-- 多个商铺 --> | ||||
| <view class='merchant-shop shopHr'> | <view class='merchant-shop shopHr'> | ||||
| <view class='clearfix' style='width:100%;'> | <view class='clearfix' style='width:100%;'> | ||||
| <view class='fl'> | |||||
| <view class='wz'> | |||||
| <text>商户位置:</text> | <text>商户位置:</text> | ||||
| </view> | </view> | ||||
| <view class='merchants'> | <view class='merchants'> | ||||
| @@ -122,6 +122,8 @@ page{ | |||||
| .merchant-shop view:nth-child(2) { | .merchant-shop view:nth-child(2) { | ||||
| font-size: 30rpx; | font-size: 30rpx; | ||||
| color: #A6A6A6; | color: #A6A6A6; | ||||
| line-height: 26rpx; | |||||
| /* padding: 0 10rpx 0 30rpx; */ | |||||
| } | } | ||||
| .merchant-activity view:nth-child(1) { | .merchant-activity view:nth-child(1) { | ||||
| font-size:30rpx; | font-size:30rpx; | ||||
| @@ -181,24 +183,20 @@ page{ | |||||
| .merchants text { | .merchants text { | ||||
| display: inline-block; | display: inline-block; | ||||
| /* text-align: left; */ | |||||
| font-size: 26rpx; | font-size: 26rpx; | ||||
| margin-bottom: 6rpx; | |||||
| /* height: 26rpx; */ | |||||
| line-height: 22rpx; | |||||
| color: #A6A6A6; | color: #A6A6A6; | ||||
| margin-right: 10rpx; | |||||
| line-height: 22rpx; | |||||
| } | } | ||||
| .posi{ | .posi{ | ||||
| color: #FD832D!important; | color: #FD832D!important; | ||||
| } | } | ||||
| .merchants { | |||||
| float: left; | |||||
| display: block!important; | |||||
| width: 70%; | |||||
| margin-left:12rpx; | |||||
| .wz{ | |||||
| color: #A6A6A6; | |||||
| font-size: 24rpx; | |||||
| } | |||||
| .notes view{ | |||||
| color: #A6A6A6; | |||||
| } | } | ||||
| .merchant-brand { | .merchant-brand { | ||||
| border: none !important; | border: none !important; | ||||
| width: 92%; | width: 92%; | ||||
| @@ -24,11 +24,11 @@ | |||||
| <view style=' margin-left: 24rpx;margin-top: 24rpx;'> | <view style=' margin-left: 24rpx;margin-top: 24rpx;'> | ||||
| <image src='{{item.merchantImgUrl}}'></image> | <image src='{{item.merchantImgUrl}}'></image> | ||||
| </view> | </view> | ||||
| <view> | |||||
| <text class='merchantName'>{{item.merchantName}}</text> | |||||
| <view class='leftBox'> | |||||
| <view class='merchantName'>{{item.merchantName}}</view> | |||||
| <view class='shopVo'> | <view class='shopVo'> | ||||
| <view class='shopVoList' wx:for="{{item.shopVoList}}" wx:key="{{index}}" wx:for-item="itemName"> | |||||
| <text>{{itemName.buildingName}}{{itemName.floorName}}--{{itemName.shopNumber}}</text><text class='douhao' wx:if="{{item.shopVoList.length>1}}">,</text> | |||||
| <view class='shopVoList' > | |||||
| <text wx:for="{{item.shopVoList}}" wx:key="{{index}}" wx:for-item="itemName">{{itemName.buildingName}}{{itemName.floorName}}--{{itemName.shopNumber}}</text> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| @@ -102,47 +102,31 @@ | |||||
| margin-top: 100rpx; | margin-top: 100rpx; | ||||
| color: #999; | color: #999; | ||||
| } | } | ||||
| .merchants view:nth-child(1) { | |||||
| border-radius: 16rpx; | |||||
| .leftBox{ | |||||
| padding: 20rpx 0; | |||||
| } | } | ||||
| .merchants view:nth-child(1) image { | .merchants view:nth-child(1) image { | ||||
| display: block; | display: block; | ||||
| width: 120rpx; | width: 120rpx; | ||||
| height: 120rpx; | height: 120rpx; | ||||
| border-radius: 16rpx; | border-radius: 16rpx; | ||||
| } | } | ||||
| .merchants view:nth-child(2) { | |||||
| padding-left: 30rpx; | |||||
| } | |||||
| .shopVo{ | .shopVo{ | ||||
| /* display: flex; */ | |||||
| padding-left: 0!important; | |||||
| margin-left: 20rpx; | |||||
| } | } | ||||
| .merchants view:nth-child(2) text:nth-child(1) { | |||||
| display: block; | |||||
| font-size:32rpx; | |||||
| color:rgba(60,60,60,1); | |||||
| line-height:44rpx; | |||||
| width:260rpx; | |||||
| .merchantName{ | |||||
| color: #3C3C3C; | |||||
| font-size: 32rpx; | |||||
| margin-left: 20rpx; | |||||
| width: 60%; | |||||
| overflow: hidden; | overflow: hidden; | ||||
| text-overflow:ellipsis; | text-overflow:ellipsis; | ||||
| white-space: nowrap; | white-space: nowrap; | ||||
| margin-top: 10rpx; | |||||
| } | } | ||||
| .merchants view:nth-child(2) text:nth-child(2) { | |||||
| font-size: 24rpx; | |||||
| color: #b8b8b8; | |||||
| padding-top: 3rpx; | |||||
| height: 36rpx; | |||||
| line-height: 56rpx; | |||||
| overflow: hidden; | |||||
| } | |||||
| .merchantName{ | |||||
| margin-top:30rpx; | |||||
| .shopVo text{ | |||||
| float: left; | |||||
| } | } | ||||
| page { | page { | ||||
| padding: 0 0 30rpx; | padding: 0 0 30rpx; | ||||
| @@ -295,7 +279,6 @@ page { | |||||
| font-weight: 500; | font-weight: 500; | ||||
| color: rgba(85, 85, 85, 1); | color: rgba(85, 85, 85, 1); | ||||
| font-size: 26rpx; | font-size: 26rpx; | ||||
| /* width: 123rpx; */ | |||||
| padding-right: 20rpx; | padding-right: 20rpx; | ||||
| } | } | ||||
| @@ -333,9 +316,6 @@ page { | |||||
| color: rgba(255, 255, 255, 1); | color: rgba(255, 255, 255, 1); | ||||
| } | } | ||||
| /* .active1 { | |||||
| opacity: 0.6; | |||||
| } */ | |||||
| .btns { | .btns { | ||||
| width:137rpx; | width:137rpx; | ||||
| @@ -363,24 +343,20 @@ page { | |||||
| text-align: center; | text-align: center; | ||||
| font-size: 28rpx; | font-size: 28rpx; | ||||
| color: #999; | color: #999; | ||||
| /* padding: 20rpx 0 40rpx; */ | |||||
| } | } | ||||
| .mr{ | .mr{ | ||||
| margin-top: 200rpx!important; | margin-top: 200rpx!important; | ||||
| } | } | ||||
| .all{ | |||||
| /* background: #F4F5F9; */ | |||||
| } | |||||
| .shopVoList{ | .shopVoList{ | ||||
| display: flex!important; | |||||
| padding-left: 0!important; | padding-left: 0!important; | ||||
| flex-direction:row!important; | |||||
| } | |||||
| .shopVoList text{ | |||||
| font-size: 20rpx!important; | |||||
| display: inline-block!important; | display: inline-block!important; | ||||
| width: 330rpx; | |||||
| white-space: nowrap; | white-space: nowrap; | ||||
| text-overflow: ellipsis; | text-overflow: ellipsis; | ||||
| overflow: hidden; | overflow: hidden; | ||||
| } | |||||
| .shopVoList text{ | |||||
| font-size: 20rpx!important; | |||||
| color: #b8b8b8!important; | color: #b8b8b8!important; | ||||
| margin-right: 10rpx; | |||||
| } | } | ||||
| @@ -43,23 +43,21 @@ | |||||
| margin:0 20rpx; | margin:0 20rpx; | ||||
| } | } | ||||
| .usre_level{ | .usre_level{ | ||||
| width:70rpx; | |||||
| height:32rpx; | height:32rpx; | ||||
| background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); | background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); | ||||
| border-radius:9px 9px 9px 0px; | border-radius:9px 9px 9px 0px; | ||||
| font-family:PingFangSC-Regular; | font-family:PingFangSC-Regular; | ||||
| font-weight:400; | font-weight:400; | ||||
| color:rgba(255,255,255,1); | color:rgba(255,255,255,1); | ||||
| line-height:32rpx; | |||||
| line-height:28rpx; | |||||
| float: left; | float: left; | ||||
| margin-top: 8rpx; | margin-top: 8rpx; | ||||
| overflow: hidden; | |||||
| } | } | ||||
| .chengzhang { | .chengzhang { | ||||
| font-size: 24rpx; | font-size: 24rpx; | ||||
| font-weight: 400; | font-weight: 400; | ||||
| color: #FFFFFF; | color: #FFFFFF; | ||||
| margin-left: 10rpx; | |||||
| padding: 0 8rpx; | |||||
| } | } | ||||
| .myName{ | .myName{ | ||||
| float: left; | float: left; | ||||
| @@ -69,7 +67,6 @@ | |||||
| margin-top:36rpx; | margin-top:36rpx; | ||||
| } | } | ||||
| .view{ | .view{ | ||||
| /* margin-top:25rpx; */ | |||||
| display: block; | display: block; | ||||
| margin: 60rpx 0 0 20rpx; | margin: 60rpx 0 0 20rpx; | ||||
| } | } | ||||
| @@ -89,7 +86,6 @@ progress{ | |||||
| .btoml{ | .btoml{ | ||||
| float: left; | float: left; | ||||
| height: 100%; | height: 100%; | ||||
| /* margin-left: 60rpx; */ | |||||
| width: 50%; | width: 50%; | ||||
| } | } | ||||
| .jifen{ | .jifen{ | ||||
| @@ -109,9 +105,6 @@ progress{ | |||||
| font-size: 40rpx; | font-size: 40rpx; | ||||
| font-weight: 500; | font-weight: 500; | ||||
| float: left; | float: left; | ||||
| /* position: absolute; | |||||
| top:240rpx; | |||||
| left:70rpx; */ | |||||
| color: #FFFFFF; | color: #FFFFFF; | ||||
| margin-right: 10rpx; | margin-right: 10rpx; | ||||
| } | } | ||||
| @@ -130,7 +123,6 @@ page { | |||||
| height: auto; | height: auto; | ||||
| overflow: auto; | overflow: auto; | ||||
| background: #f7f7f7; | background: #f7f7f7; | ||||
| /* background-image: url('https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/spell-bg.png'); */ | |||||
| background-size: cover; | background-size: cover; | ||||
| background-repeat: no-repeat; | background-repeat: no-repeat; | ||||
| } | } | ||||
| @@ -70,7 +70,7 @@ | |||||
| <view class='qg' style='border-color:{{qg}}'><text>抢购</text></view> | <view class='qg' style='border-color:{{qg}}'><text>抢购</text></view> | ||||
| </view> | </view> | ||||
| <!-- 专题 --> | <!-- 专题 --> | ||||
| <view class='product' wx:if="{{showTopic}}" bindtap='gotoTopic'> | |||||
| <!-- <view class='product' wx:if="{{showTopic}}" bindtap='gotoTopic'> | |||||
| <view class='gift' > | <view class='gift' > | ||||
| <image src='{{giftHr}}' mode='aspectFill' ></image> | <image src='{{giftHr}}' mode='aspectFill' ></image> | ||||
| </view> | </view> | ||||
| @@ -79,11 +79,21 @@ | |||||
| <view class='title'>{{topicTitle}}</view> | <view class='title'>{{topicTitle}}</view> | ||||
| </view> | </view> | ||||
| <view class='next'> | <view class='next'> | ||||
| <image src='{{next}}' mode='aspectFill' ></image> | |||||
| <image src='{{next}}' mode='widthFix' ></image> | |||||
| </view> | </view> | ||||
| </view> | |||||
| </view> --> | |||||
| <!-- 爆款专区 --> | <!-- 爆款专区 --> | ||||
| <c-hot id="hot"/> | <c-hot id="hot"/> | ||||
| <view class='product' wx:if="{{showTopic}}" bindtap='gotoTopic'> | |||||
| <image src='{{cover}}' mode='widthFix' ></image> | |||||
| <!-- <view class='textBox'> | |||||
| <view class='name'>{{name}}</view> | |||||
| <view class='title'>{{topicTitle}}</view> | |||||
| </view> | |||||
| <view class='next'> | |||||
| <image src='{{next}}' mode='aspectFill' ></image> | |||||
| </view> --> | |||||
| </view> | |||||
| <!-- 砍价专场 --> | <!-- 砍价专场 --> | ||||
| <!-- <c-bargain id="bargain"/> --> | <!-- <c-bargain id="bargain"/> --> | ||||
| <!-- 拼团专场 --> | <!-- 拼团专场 --> | ||||
| @@ -219,7 +219,6 @@ page { | |||||
| float: left; | float: left; | ||||
| } | } | ||||
| .chengzhangBox{ | .chengzhangBox{ | ||||
| width:70rpx; | |||||
| height:32rpx; | height:32rpx; | ||||
| line-height: 26rpx; | line-height: 26rpx; | ||||
| border-radius:9px 9px 9px 0px; | border-radius:9px 9px 9px 0px; | ||||
| @@ -228,15 +227,15 @@ page { | |||||
| color:rgba(255,255,255,1); | color:rgba(255,255,255,1); | ||||
| float: left; | float: left; | ||||
| margin-top: 8rpx; | margin-top: 8rpx; | ||||
| margin-left: 8rpx; | |||||
| } | } | ||||
| .chengzhang { | .chengzhang { | ||||
| font-size: 22rpx; | font-size: 22rpx; | ||||
| font-weight: 400; | font-weight: 400; | ||||
| color: #FFFFFF; | color: #FFFFFF; | ||||
| margin-left: 10rpx; | |||||
| height:22rpx; | height:22rpx; | ||||
| line-height: 22rpx; | line-height: 22rpx; | ||||
| padding: 0 8rpx; | |||||
| } | } | ||||
| .integral{ | .integral{ | ||||
| margin-left: 70rpx; | margin-left: 70rpx; | ||||
| @@ -293,13 +292,14 @@ page { | |||||
| margin-top: 6rpx; | margin-top: 6rpx; | ||||
| } | } | ||||
| .product{ | .product{ | ||||
| height: 124rpx; | |||||
| /* padding: 0 30rpx; */ | |||||
| margin-top: 30rpx; | |||||
| margin-bottom: 10rpx; | |||||
| background: #FFF; | |||||
| width: 710rpx; | width: 710rpx; | ||||
| margin: 0 auto; | |||||
| margin: 30rpx auto 10rpx; | |||||
| border-radius: 16rpx; | |||||
| overflow: hidden; | |||||
| } | |||||
| .product image{ | |||||
| display: block; | |||||
| width: 100%; | |||||
| } | } | ||||
| .textBox{ | .textBox{ | ||||
| /* display: block; */ | /* display: block; */ | ||||
| @@ -77,7 +77,7 @@ page{ | |||||
| font-size: 24rpx; | font-size: 24rpx; | ||||
| font-weight: 400; | font-weight: 400; | ||||
| color: #FFFFFF; | color: #FFFFFF; | ||||
| margin-left: 10rpx; | |||||
| padding: 0 8rpx; | |||||
| } | } | ||||
| .view { | .view { | ||||
| @@ -354,7 +354,6 @@ page{ | |||||
| height: 234rpx; | height: 234rpx; | ||||
| } | } | ||||
| .usre_level{ | .usre_level{ | ||||
| width:70rpx; | |||||
| height:32rpx; | height:32rpx; | ||||
| border-radius:9px 9px 9px 0px; | border-radius:9px 9px 9px 0px; | ||||
| font-family:PingFangSC-Regular; | font-family:PingFangSC-Regular; | ||||