| @@ -319,28 +319,32 @@ page{ | |||||
| margin: 20rpx auto 0; | margin: 20rpx auto 0; | ||||
| } | } | ||||
| .status{ | .status{ | ||||
| display: flex; | |||||
| justify-content: space-around; | |||||
| width: 520rpx; | width: 520rpx; | ||||
| margin: 40rpx auto 0; | margin: 40rpx auto 0; | ||||
| } | } | ||||
| .status button{ | .status button{ | ||||
| display: block; | display: block; | ||||
| width: 520rpx; | |||||
| height: 95rpx; | |||||
| line-height: 95rpx; | |||||
| width: 250rpx; | |||||
| height: 75rpx; | |||||
| line-height: 75rpx; | |||||
| text-align: center; | text-align: center; | ||||
| border: none; | border: none; | ||||
| font-size: 32rpx; | |||||
| } | } | ||||
| button::after{ border: none; } | button::after{ border: none; } | ||||
| .status button:nth-of-type(1){ | .status button:nth-of-type(1){ | ||||
| background:linear-gradient(90deg,rgba(236,59,45,1) 0%,rgba(248,98,52,1) 100%); | |||||
| border:1px solid rgba(236,59,45,1); | |||||
| background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); | |||||
| /* border:1px solid rgba(236,59,45,1); */ | |||||
| border-radius:48rpx; | border-radius:48rpx; | ||||
| margin-bottom: 38rpx; | |||||
| margin-top: 20rpx; | |||||
| margin-bottom: 20rpx; | |||||
| color: #fff; | color: #fff; | ||||
| } | } | ||||
| .status button:nth-of-type(2){ | .status button:nth-of-type(2){ | ||||
| background:#fff; | |||||
| border:1px solid rgba(190,190,190,1); | |||||
| background:linear-gradient(130deg,rgba(50,177,252,1) 0%,rgba(47,108,255,1) 100%); | |||||
| /* border:1px solid rgba(190,190,190,1); */ | |||||
| border-radius:48rpx; | border-radius:48rpx; | ||||
| color: #333; | |||||
| color: #fff; | |||||
| } | } | ||||
| @@ -9,6 +9,7 @@ Page({ | |||||
| navigationBarHeight, | navigationBarHeight, | ||||
| homeSelectedO: imgurl.homeSelectedO.url, | homeSelectedO: imgurl.homeSelectedO.url, | ||||
| isshowposter:false,//是否显示分享弹框 | isshowposter:false,//是否显示分享弹框 | ||||
| fenxiang: imgurl.fenxiang.url, | |||||
| fenxiangUrl: imgurl.fenxiang.url, | fenxiangUrl: imgurl.fenxiang.url, | ||||
| clockUrl: imgurl.clock.url, | clockUrl: imgurl.clock.url, | ||||
| teljpgUrl: imgurl.teljpg.url, | teljpgUrl: imgurl.teljpg.url, | ||||
| @@ -97,7 +97,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}}'> | ||||
| <text>{{item.merchantName}}</text> | |||||
| <view>{{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> | ||||
| @@ -273,9 +273,10 @@ button::after { | |||||
| /* padding-left: 30rpx; */ | /* padding-left: 30rpx; */ | ||||
| } | } | ||||
| .posi_logo view:nth-child(2) text:nth-child(1) { | |||||
| .posi_logo view:nth-child(2) view:nth-child(1) { | |||||
| font-size: 32rpx; | font-size: 32rpx; | ||||
| color: #333; | color: #333; | ||||
| width: 90%; | |||||
| letter-spacing: 0; | letter-spacing: 0; | ||||
| white-space: nowrap; | white-space: nowrap; | ||||
| text-overflow: ellipsis; | text-overflow: ellipsis; | ||||
| @@ -389,8 +390,8 @@ button::after { | |||||
| top: 0; | top: 0; | ||||
| bottom: 0; | bottom: 0; | ||||
| margin: auto; | margin: auto; | ||||
| width: 76rpx; | |||||
| height: 76rpx; | |||||
| width: 50rpx; | |||||
| height: 50rpx; | |||||
| } | } | ||||
| .txt { | .txt { | ||||
| @@ -436,7 +437,7 @@ button::after { | |||||
| text-align: center; | text-align: center; | ||||
| } | } | ||||
| .timess{ | .timess{ | ||||
| color: #af6e34; | |||||
| color: #FD782D; | |||||
| } | } | ||||
| .times text { | .times text { | ||||
| display: inline-block; | display: inline-block; | ||||
| @@ -861,7 +862,7 @@ checkbox-group, radio-group { | |||||
| .quan{ | .quan{ | ||||
| float: left; | float: left; | ||||
| margin:28rpx 15rpx 0 0; | |||||
| margin:18rpx 15rpx 0 0; | |||||
| width: 12rpx; | width: 12rpx; | ||||
| height: 12rpx; | height: 12rpx; | ||||
| background: #E1E1E1; | background: #E1E1E1; | ||||
| @@ -88,8 +88,8 @@ | |||||
| top: 0; | top: 0; | ||||
| bottom: 0; | bottom: 0; | ||||
| margin: auto; | margin: auto; | ||||
| width: 60rpx; | |||||
| height: 60rpx; | |||||
| width: 50rpx; | |||||
| height: 50rpx; | |||||
| } | } | ||||
| .merchants{ | .merchants{ | ||||
| width: 90%; | width: 90%; | ||||
| @@ -119,16 +119,19 @@ | |||||
| padding-left: 30rpx; | padding-left: 30rpx; | ||||
| } | } | ||||
| .shopVo{ | .shopVo{ | ||||
| display: flex; | |||||
| /* display: flex; */ | |||||
| padding-left: 0!important; | padding-left: 0!important; | ||||
| } | } | ||||
| .merchants view:nth-child(2) text:nth-child(1) { | .merchants view:nth-child(2) text:nth-child(1) { | ||||
| display: block; | display: block; | ||||
| overflow: hidden; | |||||
| font-size:32rpx; | font-size:32rpx; | ||||
| color:rgba(60,60,60,1); | color:rgba(60,60,60,1); | ||||
| line-height:44rpx; | line-height:44rpx; | ||||
| width:260rpx; | |||||
| overflow: hidden; | |||||
| text-overflow:ellipsis; | |||||
| white-space: nowrap; | |||||
| } | } | ||||
| .merchants view:nth-child(2) text:nth-child(2) { | .merchants view:nth-child(2) text:nth-child(2) { | ||||
| @@ -140,7 +143,7 @@ | |||||
| overflow: hidden; | overflow: hidden; | ||||
| } | } | ||||
| .merchantName{ | .merchantName{ | ||||
| margin-top:44rpx; | |||||
| margin-top:30rpx; | |||||
| } | } | ||||
| page { | page { | ||||
| padding: 0 0 30rpx; | padding: 0 0 30rpx; | ||||
| @@ -7,6 +7,7 @@ Page({ | |||||
| * 页面的初始数据 | * 页面的初始数据 | ||||
| */ | */ | ||||
| data: { | data: { | ||||
| erweima: imgurl.erweima.url, | |||||
| bannerUrl: imgurl.banner.url, | bannerUrl: imgurl.banner.url, | ||||
| loadingUrl: imgurl.loading.url, | loadingUrl: imgurl.loading.url, | ||||
| nodata: imgurl.nodata.url, | nodata: imgurl.nodata.url, | ||||
| @@ -28,6 +29,15 @@ Page({ | |||||
| score: '0', | score: '0', | ||||
| }, | }, | ||||
| qrcodeH: function () { | |||||
| var that = this; | |||||
| let memberId = that.data.memberId; | |||||
| if (memberId) { | |||||
| wx.navigateTo({ | |||||
| url: '/pages/specialcourtesy/specialcourtesy' | |||||
| }) | |||||
| } | |||||
| }, | |||||
| goback: function () { | goback: function () { | ||||
| wx.switchTab({ | wx.switchTab({ | ||||
| url: '/pages/main/index', | url: '/pages/main/index', | ||||
| @@ -27,8 +27,8 @@ | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <!-- 二维码 --> | <!-- 二维码 --> | ||||
| <view class='qrcode' bindtap='qrcode'> | |||||
| <image src="{{barcode}}" class='qrcodeimg' mode='widthFix'></image> | |||||
| <view class='qrcode' bindtap='qrcodeH'> | |||||
| <image src="{{erweima}}" class='qrcodeimg' mode='widthFix'></image> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| @@ -13,26 +13,6 @@ | |||||
| <view class='section'> | <view class='section'> | ||||
| <view class='sectionTit'> | <view class='sectionTit'> | ||||
| <text>{{order.title}}</text> | <text>{{order.title}}</text> | ||||
| <!-- <view> | |||||
| <text>{{item.title}}</text> | |||||
| <text class='wait' wx:if="{{item.orderStatus==0}}">等待付款</text> | |||||
| <text class='wait' wx:if="{{item.orderStatus==10}}">拼团中</text> | |||||
| <text class='sucess' wx:if="{{item.orderStatus==3}}">待退款</text> | |||||
| <text class='close' wx:if="{{item.orderStatus==2}}">交易关闭</text> | |||||
| <text class='close' wx:if="{{item.orderStatus==6}}">砍价中</text> | |||||
| <text class='sucess' wx:if="{{item.orderStatus==7}}">砍价成功</text> | |||||
| <text class='close' wx:if="{{item.orderStatus==8}}">砍价失败</text> | |||||
| <text class='close' wx:if="{{item.orderStatus==9}}">砍价取消</text> | |||||
| <text class='close' wx:if="{{item.orderStatus==12}}">拼团已过期</text> | |||||
| <text class='close' wx:if="{{item.orderStatus==12}}">拼团失败</text> | |||||
| <text class='close' wx:if="{{item.orderStatus==8}}">砍价失败</text> | |||||
| <text class='close' wx:if="{{item.orderStatus==4}}">已退款</text> | |||||
| <text class='wait' wx:if="{{item.orderStatus==5}}">退款失败</text> | |||||
| <text class='sucess' wx:if="{{item.orderStatus==11}}">拼团成功</text> | |||||
| <text class='sucess' wx:if="{{item.orderStatus==1&&item.salePrice==0&&item.type!=50&&item.type!=51}}">免费领取</text> | |||||
| <text class='sucess' wx:if="{{item.orderStatus==1&&item.salePrice==0&&(item.type==50||item.type==51)}}">积分兑换</text> | |||||
| <text class='sucess' wx:if="{{item.orderStatus==1&&item.salePrice!=0}}">付款成功</text> | |||||
| </view> --> | |||||
| </view> | </view> | ||||
| <view class='detail_msg'> | <view class='detail_msg'> | ||||
| <view class='logo'> | <view class='logo'> | ||||
| @@ -100,7 +80,7 @@ | |||||
| <view wx:if="{{order.merchantVoList.length>=1}}" wx:for="{{order.merchantVoList}}" wx:key="{{index}}"> | <view wx:if="{{order.merchantVoList.length>=1}}" wx:for="{{order.merchantVoList}}" wx:key="{{index}}"> | ||||
| <view class='merchantVoList'> | <view class='merchantVoList'> | ||||
| <image bindtap='gotoDetail' data-id='{{item.id}}' class='merchantImgUrl' src='{{item.merchantImgUrl}}' mode='widthFix'></image> | <image bindtap='gotoDetail' data-id='{{item.id}}' class='merchantImgUrl' src='{{item.merchantImgUrl}}' mode='widthFix'></image> | ||||
| <text bindtap='gotoDetail' data-id='{{item.id}}' class='merchantName'>{{item.merchantName}} {{item.buildingName}}{{item.floorName}}</text> | |||||
| <view bindtap='gotoDetail' data-id='{{item.id}}' class='merchantName'>{{item.merchantName}} {{item.buildingName}}{{item.floorName}}</view> | |||||
| <image wx:if="{{item.linkLinePhone}}" bindtap='phone' data-merchantlinkphone='{{item.linkLinePhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix"></image> | <image wx:if="{{item.linkLinePhone}}" bindtap='phone' data-merchantlinkphone='{{item.linkLinePhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix"></image> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| @@ -27,8 +27,12 @@ page { | |||||
| .merchantName { | .merchantName { | ||||
| color: #3C3C3C!important; | color: #3C3C3C!important; | ||||
| margin-left: 160rpx; | |||||
| /* margin-left: 160rpx; */ | |||||
| font-size: 28rpx; | font-size: 28rpx; | ||||
| float: left; | |||||
| margin-left: 30rpx; | |||||
| height:100%; | |||||
| line-height: 90rpx; | |||||
| } | } | ||||
| .tips view:nth-child(2) { | .tips view:nth-child(2) { | ||||
| @@ -171,12 +175,11 @@ page { | |||||
| font-size: 28rpx; | font-size: 28rpx; | ||||
| color: #A6A6A6; | color: #A6A6A6; | ||||
| position: relative; | position: relative; | ||||
| height: 150rpx; | |||||
| line-height: 150rpx; | |||||
| display: flex; | display: flex; | ||||
| justify-content: space-between; | justify-content: space-between; | ||||
| padding-left: 5%; | padding-left: 5%; | ||||
| padding-right: 5%; | padding-right: 5%; | ||||
| margin-bottom: 10rpx; | |||||
| } | } | ||||
| .classifShop >view:nth-child(1){ | .classifShop >view:nth-child(1){ | ||||
| height: 88rpx!important; | height: 88rpx!important; | ||||
| @@ -485,17 +488,15 @@ radio { | |||||
| .merchantVoList { | .merchantVoList { | ||||
| width: 100%; | width: 100%; | ||||
| position: relative; | |||||
| /* position: relative; */ | |||||
| } | } | ||||
| .merchantVoList .tel { | .merchantVoList .tel { | ||||
| width: 76rpx; | |||||
| position: absolute; | |||||
| top: 0; | |||||
| bottom: 0; | |||||
| margin: auto; | |||||
| right: 14rpx; | |||||
| width: 50rpx; | |||||
| height: 50rpx; | |||||
| float: right; | |||||
| z-index: 10; | z-index: 10; | ||||
| margin-top: 30rpx; | |||||
| } | } | ||||
| .btns { | .btns { | ||||
| @@ -510,13 +511,10 @@ radio { | |||||
| } | } | ||||
| .merchantImgUrl{ | .merchantImgUrl{ | ||||
| width: 120rpx; | width: 120rpx; | ||||
| position: absolute; | |||||
| top: 0; | |||||
| bottom: 0; | |||||
| margin: auto; | |||||
| left: 0; | |||||
| float: left; | |||||
| border-radius: 10rpx; | border-radius: 10rpx; | ||||
| z-index: 10; | z-index: 10; | ||||
| margin: 0 auto; | |||||
| } | } | ||||
| .support-tansfer{ | .support-tansfer{ | ||||
| width: 690rpx; | width: 690rpx; | ||||
| @@ -681,5 +681,9 @@ module.exports = { | |||||
| 'url': baseUrl + "next.png", | 'url': baseUrl + "next.png", | ||||
| 'name': '' | 'name': '' | ||||
| }, | }, | ||||
| 'erweima': { | |||||
| 'url': baseUrl + "erweima.png", | |||||
| 'name': '' | |||||
| }, | |||||
| } | } | ||||