| @@ -85,7 +85,7 @@ | |||||
| <text class='timess' wx:if='{{limitCondition==1}}'>(仅限新用户活动)</text> | <text class='timess' wx:if='{{limitCondition==1}}'>(仅限新用户活动)</text> | ||||
| <text class='timess' wx:if='{{limitCondition==2&&(minLimit||minLimit==0)&&maxLimit}}'>({{minLimit}}-{{maxLimit}}成长值)</text> | <text class='timess' wx:if='{{limitCondition==2&&(minLimit||minLimit==0)&&maxLimit}}'>({{minLimit}}-{{maxLimit}}成长值)</text> | ||||
| <text class='timess' wx:if='{{limitCondition==2&&minLimit&&!maxLimit}}'>(大于{{minLimit}}成长值)</text> | <text class='timess' wx:if='{{limitCondition==2&&minLimit&&!maxLimit}}'>(大于{{minLimit}}成长值)</text> | ||||
| <text class="restNum fr">剩余<text>{{data.remainInventory}}件</text></text> | |||||
| <text class="restNum fr">剩余<text>{{data.remainInventory}}张</text></text> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| @@ -96,7 +96,7 @@ | |||||
| <image src='{{item.merchantImgUrl}}'></image> | <image src='{{item.merchantImgUrl}}'></image> | ||||
| </view> | </view> | ||||
| <view bindtap='gotoDetail' data-id='{{item.id}}'> | <view bindtap='gotoDetail' data-id='{{item.id}}'> | ||||
| <view>{{item.merchantName}}</view> | |||||
| <view class='name'>{{item.merchantName}}</view> | |||||
| <view class='shopVoList'> | <view class='shopVoList'> | ||||
| <view wx:for="{{item.shopVoList}}" wx:key="{{index}}" wx:for-item="itemName"> | <view wx:for="{{item.shopVoList}}" wx:key="{{index}}" wx:for-item="itemName"> | ||||
| <text>{{itemName.buildingName}}{{itemName.floorName}}--{{itemName.shopNumber}}</text> | <text>{{itemName.buildingName}}{{itemName.floorName}}--{{itemName.shopNumber}}</text> | ||||
| @@ -216,8 +216,6 @@ button::after { | |||||
| .fl { | .fl { | ||||
| float: left; | float: left; | ||||
| color: #FD782D; | |||||
| display: flex; | |||||
| } | } | ||||
| .fr { | .fr { | ||||
| @@ -266,22 +264,20 @@ button::after { | |||||
| margin-right: 16rpx; | margin-right: 16rpx; | ||||
| border: 1px solid #e5e5e5; | border: 1px solid #e5e5e5; | ||||
| } | } | ||||
| .posi_logo view:nth-child(2) { | |||||
| /* display: flex; *//* flex-direction: column; *//* flex: 8; */ | |||||
| height: 100rpx; | |||||
| /* padding-left: 30rpx; */ | |||||
| } | |||||
| .posi_logo view:nth-child(2) view:nth-child(1) { | |||||
| .name{ | |||||
| font-size: 32rpx; | font-size: 32rpx; | ||||
| color: #333; | color: #333; | ||||
| width: 90%; | |||||
| letter-spacing: 0; | letter-spacing: 0; | ||||
| width: 500rpx; | |||||
| white-space: nowrap; | white-space: nowrap; | ||||
| text-overflow: ellipsis; | text-overflow: ellipsis; | ||||
| overflow: hidden; | overflow: hidden; | ||||
| } | } | ||||
| .posi_logo view:nth-child(2) view:nth-child(1) { | |||||
| font-size: 32rpx; | |||||
| color: #333; | |||||
| letter-spacing: 0; | |||||
| } | |||||
| .shopVoList { | .shopVoList { | ||||
| display: flex !important; | display: flex !important; | ||||
| @@ -291,10 +287,6 @@ button::after { | |||||
| .shopVoList text { | .shopVoList text { | ||||
| font-size: 20rpx !important; | font-size: 20rpx !important; | ||||
| display: inline-block !important; | |||||
| white-space: nowrap; | |||||
| text-overflow: ellipsis; | |||||
| overflow: hidden; | |||||
| color: #b8b8b8 !important; | color: #b8b8b8 !important; | ||||
| } | } | ||||
| @@ -595,7 +587,6 @@ button::after { | |||||
| margin-left: 20rpx; | margin-left: 20rpx; | ||||
| color: #fff; | color: #fff; | ||||
| 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%); | ||||
| /* box-shadow: 0px 8px 8px 1px rgba(255, 169, 2, 0.32); */ | |||||
| } | } | ||||
| .btns .fl text { | .btns .fl text { | ||||
| @@ -731,7 +722,7 @@ button::after { | |||||
| color: #999; | color: #999; | ||||
| font-size: 32rpx; | font-size: 32rpx; | ||||
| background: #fff; | background: #fff; | ||||
| margin-top: 30rpx; | |||||
| } | } | ||||
| .presslimit { | .presslimit { | ||||
| @@ -98,7 +98,7 @@ | |||||
| <view class='loadingtext' wx:if="{{loadingtext}}">{{loadingtext}}</view> | <view class='loadingtext' wx:if="{{loadingtext}}">{{loadingtext}}</view> | ||||
| </view> | </view> | ||||
| <!-- 商户简介 --> | <!-- 商户简介 --> | ||||
| <view wx:elif="{{currentTab==1}}" > | |||||
| <view wx:elif="{{currentTab==1}}" class='dingdan' > | |||||
| <image src="{{noMerchant}}" wx:if="{{!data.introduction}}" mode="widthFix"></image> | <image src="{{noMerchant}}" wx:if="{{!data.introduction}}" mode="widthFix"></image> | ||||
| <text wx:if="{{data.introduction}}">{{data.introduction}}</text> | <text wx:if="{{data.introduction}}">{{data.introduction}}</text> | ||||
| <text wx:if="{{!data.introduction}}">信息完善中,敬请期待~</text> | <text wx:if="{{!data.introduction}}">信息完善中,敬请期待~</text> | ||||
| @@ -342,10 +342,6 @@ page{ | |||||
| width: 300rpx; | width: 300rpx; | ||||
| margin: 30rpx auto 0; | margin: 30rpx auto 0; | ||||
| } | } | ||||
| .swiperactive text{ | |||||
| display:left; | |||||
| text-align:center; | |||||
| } | |||||
| .modal { | .modal { | ||||
| width: 100%; | width: 100%; | ||||
| height: 100%; | height: 100%; | ||||
| @@ -29,8 +29,8 @@ | |||||
| <view class='price'> | <view class='price'> | ||||
| <view class='price01'> | <view class='price01'> | ||||
| <text class='price-unit'>¥</text> | <text class='price-unit'>¥</text> | ||||
| <text class='price-numHr'>{{item.salePriceStr}}232322323</text> | |||||
| <text class='price02'>¥{{item.priceStr}}232322323</text> | |||||
| <text class='price-numHr'>{{item.salePriceStr}}</text> | |||||
| <text class='price02'>¥{{item.priceStr}}</text> | |||||
| </view> | </view> | ||||
| <view class='right-button'>去拼团</view> | <view class='right-button'>去拼团</view> | ||||
| </view> | </view> | ||||