| @@ -3,6 +3,7 @@ let config = require("../../config/config.js"); | |||
| let Http = require("../../utils/HttpBasics"); | |||
| let app = getApp(); | |||
| const imgurl = require("../../utils/imgurl"); | |||
| const bgColor = require("../../utils/bgColor.js") | |||
| Component({ | |||
| /** | |||
| * 组件的属性列表 | |||
| @@ -13,24 +14,22 @@ Component({ | |||
| * 组件的初始数据 | |||
| */ | |||
| data: { | |||
| sql: bgColor.colorFirst.main.sql, | |||
| txt: bgColor.colorFirst.main.txt, | |||
| change: imgurl.change.url, | |||
| None: imgurl.None.url, | |||
| jianUrl: imgurl.jian.url, | |||
| barginicon: imgurl.barginicon.url, | |||
| wangmeimeibargin: imgurl.wangmeimeibargin.url, | |||
| list: [], | |||
| pintuanList:[], | |||
| total: '' | |||
| }, | |||
| /** | |||
| * 组件的方法列表 | |||
| */ | |||
| methods: { | |||
| gotoBargainList() { | |||
| wx.navigateTo({ | |||
| url: "/pages/bargain/bargain" | |||
| }) | |||
| }, | |||
| //获取砍价列表 | |||
| getList() { | |||
| let that = this; | |||
| Http.get({ | |||
| @@ -41,12 +40,10 @@ Component({ | |||
| targetAd: 6 | |||
| } | |||
| }).then(res => { | |||
| console.log(res.data.list) | |||
| that.setData({ | |||
| list: res.data.list, | |||
| total: res.data.total | |||
| }); | |||
| console.log(this.data.list) | |||
| }) | |||
| .catch(err => { | |||
| console.log(err) | |||
| @@ -58,14 +55,47 @@ Component({ | |||
| }); | |||
| }) | |||
| }, | |||
| gotomore: function () { | |||
| //获取拼团列表 | |||
| getptList() { | |||
| Http.get({ | |||
| url: config.api.couponChannelList, | |||
| data: { | |||
| pageNum: 1, | |||
| pageSize: 4, | |||
| targetAd: 7 | |||
| } | |||
| }).then(res => { | |||
| this.setData({ | |||
| pintuanList: res.data.list, | |||
| total: res.data.total | |||
| }); | |||
| console.log(this.data.pintuanList) | |||
| }) | |||
| .catch(err => { | |||
| wx.showToast({ | |||
| title: err.errMsg, | |||
| icon: 'none', | |||
| duration: 2000, | |||
| mask: false | |||
| }); | |||
| }) | |||
| }, | |||
| //跳转砍价详情 | |||
| gotokjdetail: function (e) { | |||
| wx.navigateTo({ | |||
| url: "/pages/bargain/bargain" | |||
| url: `/pages/coupon/detail/index?couponChannelId=${ | |||
| e.currentTarget.dataset.couponchannelid | |||
| }&couponId=${ | |||
| e.currentTarget.dataset.couponid | |||
| }&targetAd=${ | |||
| e.currentTarget.dataset.targetad | |||
| }` | |||
| }); | |||
| }, | |||
| gotodetail: function (e) { | |||
| //跳转拼团详情 | |||
| gotoptdetail: function (e) { | |||
| wx.navigateTo({ | |||
| url: `/pages/coupon/detail/index?couponChannelId=${ | |||
| url: `/pages/spellGroup/mySpellGroup/index?couponChannelId=${ | |||
| e.currentTarget.dataset.couponchannelid | |||
| }&couponId=${ | |||
| e.currentTarget.dataset.couponid | |||
| @@ -73,12 +103,13 @@ Component({ | |||
| e.currentTarget.dataset.targetad | |||
| }` | |||
| }); | |||
| } | |||
| }, | |||
| }, | |||
| ready() { | |||
| app.couponChannelListCallback = token => { | |||
| Http.setToken(token); | |||
| this.getList(); | |||
| this.getptList(); | |||
| }; | |||
| if (app.globalData.token && app.globalData.token != null) { | |||
| app.couponChannelListCallback(app.globalData.token); | |||
| @@ -2,25 +2,25 @@ | |||
| <view class='hotBox'> | |||
| <view class='hotTitle'> | |||
| <view class='titleL'> | |||
| <view class='sql'></view> | |||
| <view class='sql' style='background:{{sql}}'></view> | |||
| <text>爆款专区</text> | |||
| </view> | |||
| <view class='titleR'> | |||
| <text>换一换</text> | |||
| <text style='color:{{txt}}'>换一换</text> | |||
| <view> | |||
| <image src='{{change}}' bindtap='' mode='aspectFill'></image> | |||
| </view> | |||
| </view> | |||
| </view> | |||
| <view class='hotCon'> | |||
| <view class='kanjia' wx:if="{{list.length>0}}" > | |||
| <view class='hotCon' > | |||
| <view class='kanjia' wx:if="{{list.length>0}}" bindtap="gotokjdetail" data-couponId='{{list[0].couponId}}' data-couponChannelId="{{list[0].id}}" data-targetAd="{{list[0].targetAd}}" > | |||
| <view > | |||
| <image mode='aspectFill' lazy-load='true' src="{{item.coverImg}}" /> | |||
| <image mode='aspectFill' lazy-load='true' src="{{list[0].coverImg}}" /> | |||
| </view> | |||
| <view class='kjText'> | |||
| <text class='title'>{{item.title}}</text> | |||
| <text class='price'>¥{{item.priceStr}}</text> | |||
| <text class='sale'><text>¥</text>{{item.salePriceStr}}</text> | |||
| <text class='title'>{{list[0].title}}</text> | |||
| <text class='price'>¥{{list[0].priceStr}}</text> | |||
| <text class='sale'><text>¥</text>{{list[0].salePriceStr}}</text> | |||
| <view class=' btn btnk'>砍价</view> | |||
| </view> | |||
| </view> | |||
| @@ -35,20 +35,22 @@ | |||
| </view> | |||
| </view> | |||
| <view class='pintuan'> | |||
| <view wx:if="{{1==0}}"> | |||
| <image></image> | |||
| <view class='pintuan'wx:if="{{list.length>0}}" bindtap="gotoptdetail" data-couponId='{{pintuanList[0].couponId}}' data-couponChannelId="{{pintuanList[0].id}}" data-targetAd="{{pintuanList[0].targetAd}}"> | |||
| <view> | |||
| <image mode='aspectFill' lazy-load='true' src="{{pintuanList[0].coverImg}}" /> | |||
| </view> | |||
| <view class='ptText' wx:if="{{1==0}}"> | |||
| <text class='title'>日本bilii杯子</text> | |||
| <text class='price'>¥2.8</text> | |||
| <text class='sale'> <text>¥</text>1.99</text> | |||
| <view class='btn btnp'>拼团</view> | |||
| <view class='ptText'> | |||
| <text class='title'>{{pintuanList[0].title}}</text> | |||
| <text class='price'>¥{{pintuanList[0].priceStr}}</text> | |||
| <text class='sale'> <text>¥</text>{{pintuanList[0].salePriceStr}}</text> | |||
| <view class='btn btnp' >拼团</view> | |||
| </view> | |||
| <view wx:if="{{1!=0}}"> | |||
| </view> | |||
| <view class='pintuan' wx:if="{{list.length==0}}"> | |||
| <view> | |||
| <image src='{{None}}' bindtap='' mode='aspectFill'></image> | |||
| </view> | |||
| <view class='ptText'wx:if="{{1!=0}}"> | |||
| <view class='ptText'> | |||
| <text class='title'>疯狂补货中...</text> | |||
| <text class='expect'>敬请期待</text> | |||
| <view class='btnp btnNone'>拼团</view> | |||
| @@ -20,7 +20,6 @@ | |||
| .titleR text{ | |||
| float: left; | |||
| margin-right: 10rpx; | |||
| color: #2C8DFF; | |||
| font-family:PingFangSC-Regular!important; | |||
| } | |||
| .titleR view{ | |||
| @@ -36,7 +35,6 @@ | |||
| .sql{ | |||
| width:12rpx; | |||
| height:24rpx; | |||
| background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); | |||
| border-radius:8rpx; | |||
| float: left; | |||
| margin: 20rpx 10rpx 0 0; | |||
| @@ -63,7 +61,6 @@ | |||
| .hotCon image{ | |||
| width: 86rpx; | |||
| height: 86rpx; | |||
| border: 1rpx solid #fff; | |||
| margin: 24rpx 0 46rpx 16rpx; | |||
| } | |||
| .hotCon .btn{ | |||
| @@ -8,7 +8,7 @@ | |||
| justify-content: space-around; | |||
| align-items: center; | |||
| -webkit-box-align: center; | |||
| background: #fff | |||
| /* background: #fff */ | |||
| } | |||
| .i-tabs::after { | |||
| @@ -14,8 +14,9 @@ Page({ | |||
| headbgUrl: imgurl.headbg.url, | |||
| quesBgUrl: imgurl.ques_bg.url, | |||
| close02: imgurl.close02.url, | |||
| share01: imgurl.share01.url, | |||
| fenxiang: imgurl.fenxiang.url, | |||
| fail: imgurl.fail.url, | |||
| homeSelectedO: imgurl.homeSelectedO.url, | |||
| wmhome: imgurl.wmhome.url, | |||
| swiperCurrent: 0, | |||
| hidden: "hidden", | |||
| @@ -19,7 +19,8 @@ | |||
| <view class='coupons_info' style='position:relative;z-index:9'> | |||
| <view class='fenxiang' wx:if="{{data.type!=50&&data.type!=51}}" bindtap='showshare'> | |||
| <image class="fenxiang" src='{{share01}}' mode="widthFix"></image> | |||
| <image class="fenxiang" src='{{fenxiang}}' mode="widthFix"></image> | |||
| <text class='gift'>分享有礼</text> | |||
| <!-- <button class='share user-motto' data-id='{{data.id}}' data-couponId='{{data.couponId}}' data-title='{{data.title}}' id="shareBtn" open-type="share" hover-class="other-button-hover"></button> --> | |||
| </view> | |||
| <view> | |||
| @@ -43,7 +44,6 @@ | |||
| </view> | |||
| <text class='title'>{{data.title}}<text class="elecard" wx:if="{{data.type==100}}">电子卡</text></text> | |||
| <text class="subTitle">{{data.subTitle}}</text> | |||
| <view class='presslimit' wx:if="{{data.type==8}}">{{data.pressLimitNum+'人可砍至底价'}}</view> | |||
| <view class='salePriceStr clearfix'> | |||
| <view class="fl" wx:if="{{data.type!=8}}">售价: | |||
| <text class="pri01" wx:if="{{data.type!=50&&data.type!=51}}">{{data.salePriceStr}}</text> | |||
| @@ -55,18 +55,20 @@ | |||
| <text class='time refound'><text class="use">过期不退款</text></text> | |||
| </text> | |||
| </view> | |||
| <view class="fl" wx:if="{{data.type==8}}">可砍至 | |||
| <text class="pri01">{{data.salePriceStr}}</text>元 | |||
| <text class='throgh'>{{data.priceStr}}元</text> | |||
| <view class="fl" wx:if="{{data.type==8}}"> | |||
| <text class="pri01 pri01Hr">¥</text> | |||
| <text class="pri01">{{data.salePriceStr}}</text> | |||
| <!-- <text class='throgh'>{{data.priceStr}}元</text> --> | |||
| <view class='presslimit' wx:if="{{data.type==8}}"><text>{{data.pressLimitNum+'人可砍至底价'}}</text></view> | |||
| </view> | |||
| <text class="restNum fr">剩余<text>{{data.remainInventory}}件</text></text> | |||
| </view> | |||
| <view class='rest' wx:if="{{data.validType==2}}">有效期:自领取之日起 | |||
| <text class='time'>{{validDays}}</text>天内有效 | |||
| <text class="use">(请在有效期内使用)</text> | |||
| </view> | |||
| <view class='rest' wx:if="{{data.validType==1}}">有效期: | |||
| <text class='time'>{{validStartDate}}至{{validEndDate}}<text class="use">(请在有效期内使用)</text></text> | |||
| <text class='time'>{{validStartDate}}至{{validEndDate}}</text> | |||
| <text class="restNum fr">剩余<text>{{data.remainInventory}}件</text></text> | |||
| </view> | |||
| <view class='rest' wx:if="{{data.type==5}}"> | |||
| <text class='time'>当次有效</text> | |||
| @@ -77,15 +79,16 @@ | |||
| <text class='time'>满{{data.usePriceStr}}元可用</text> | |||
| </view> | |||
| <view class='rest'> | |||
| <text class='txt01'>限购条件:</text> | |||
| <text class='time'>每人限购{{data.useLimitQuantity}}张</text> | |||
| <!-- <text class='txt01'>限购条件:</text> --> | |||
| <view class='quan'></view> | |||
| <text class='time'>限购{{data.useLimitQuantity}}张</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&&!maxLimit}}'>(大于{{minLimit}}成长值)</text> | |||
| </view> | |||
| </view> | |||
| </view> | |||
| <view class='applyshop'>适用门店</view> | |||
| <!-- <view class='applyshop'>适用门店</view> --> | |||
| <view class='posi' style='overflow:{{hidden}};height:{{height}}'> | |||
| <view class='posi_logo' wx:for="{{data.merchantVoList}}" wx:key="index"> | |||
| <view bindtap='gotoDetail' data-id='{{item.id}}'> | |||
| @@ -120,7 +123,8 @@ | |||
| <form bindsubmit="gotopay" data-type='{{data.type}}' report-submit='true'> | |||
| <view class="buy-view app-border-top" style="position:fixed;z-index:{{zIndex}};"> | |||
| <button class='goback' bindtap='goback'> | |||
| <image src='{{wmhome}}' mode="widthFix"></image> | |||
| <image src='{{homeSelectedO}}' mode="widthFix"></image> | |||
| <text class='btnTxt'>首页</text> | |||
| </button> | |||
| <button form-type="submit" disabled='{{showbutton}}' hover-class='active' class='buy' wx:if="{{data.type!=8&&data.type!=50&&data.type!=51&&data.salePriceStr!=0&&data.remainInventory!=0&&endtime!='活动已结束'&&data.activityStatus!=0}}"> | |||
| <text class='txt'>{{data.salePriceStr}}元</text>马上购买</button> | |||
| @@ -137,7 +141,8 @@ | |||
| <view wx:if="{{data.remainInventory!=0&&data.type==8}}" class="btns clearfix" hover-class="none" hover-stop-propagation="false"> | |||
| <button class='goback' bindtap='goback'> | |||
| <image src='{{wmhome}}' mode="widthFix"></image> | |||
| <image src='{{homeSelectedO}}' mode="widthFix"></image> | |||
| <text class='btnTxt'>首页</text> | |||
| </button> | |||
| <form bindsubmit="gotopay" report-submit='true' class="fl"> | |||
| <button form-type="submit" style='background:transparent;color:#fff;' data-discount='discount1' disabled='{{showbutton}}'> | |||
| @@ -13,6 +13,7 @@ button::after { | |||
| position: relative; | |||
| overflow: hidden; | |||
| padding-bottom: 170rpx; | |||
| background: #F4F5F9; | |||
| } | |||
| .banner { | |||
| @@ -81,9 +82,17 @@ button::after { | |||
| } | |||
| .fenxiang image { | |||
| width: 108rpx; | |||
| width:48rpx; | |||
| height: 48rpx; | |||
| position: absolute; | |||
| top: 0; | |||
| right: 16rpx; | |||
| } | |||
| .gift{ | |||
| color: #3C3C3C; | |||
| font-size: 20rpx; | |||
| position: absolute; | |||
| top: 50rpx; | |||
| right: 0; | |||
| } | |||
| @@ -118,7 +127,7 @@ button::after { | |||
| width: 588rpx; | |||
| /* height: 37rpx; */ | |||
| font-size: 26rpx; | |||
| color: #999; | |||
| color: #A6A6A6; | |||
| letter-spacing: 1.16rpx; | |||
| overflow: hidden; | |||
| white-space: nowrap; | |||
| @@ -145,7 +154,7 @@ button::after { | |||
| .time { | |||
| font-size: 24rpx; | |||
| color: #333; | |||
| color: #A6A6A6; | |||
| letter-spacing: 0; | |||
| line-height: 33rpx; | |||
| display: inline-block; | |||
| @@ -171,11 +180,14 @@ button::after { | |||
| .salePriceStr .pri01 { | |||
| font-size: 40rpx; | |||
| color: #ff4949; | |||
| color: #FD782D; | |||
| letter-spacing: 0; | |||
| line-height: 40rpx; | |||
| float: left; | |||
| } | |||
| .salePriceStr .pri01Hr { | |||
| font-size: 24rpx!important; | |||
| } | |||
| .use { | |||
| color: #ff4949; | |||
| margin-left: 10rpx; | |||
| @@ -201,7 +213,7 @@ button::after { | |||
| .fl { | |||
| float: left; | |||
| color: red; | |||
| color: #FD782D; | |||
| } | |||
| .fr { | |||
| @@ -210,8 +222,9 @@ button::after { | |||
| .posi { | |||
| position: relative; | |||
| width: 92%; | |||
| margin: 0 auto; | |||
| width: 100%; | |||
| background: #FFF; | |||
| margin: 18rpx 0 18rpx; | |||
| } | |||
| /* .posi>view:nth-child(2) text:nth-child(1) { | |||
| @@ -227,11 +240,12 @@ button::after { | |||
| .posi_logo { | |||
| position: relative; | |||
| width: 100%; | |||
| width: 92%; | |||
| display: flex; | |||
| padding: 20rpx 0; | |||
| background: #fff; | |||
| z-index: 10; | |||
| margin: 0 auto; | |||
| } | |||
| .posi_logo view:nth-child(1) { | |||
| @@ -287,10 +301,9 @@ button::after { | |||
| } | |||
| .notes { | |||
| width: 92%; | |||
| margin: 0 auto; | |||
| width:100%; | |||
| background: #FFF; | |||
| } | |||
| .active { | |||
| opacity: 0.6; | |||
| } | |||
| @@ -302,11 +315,15 @@ button::after { | |||
| height: 70rpx; | |||
| line-height: 70rpx; | |||
| } | |||
| .notes view:nth-child(1) { | |||
| width: 92%; | |||
| margin: 0 auto; | |||
| } | |||
| .notes view:nth-child(2) { | |||
| background: #fff; | |||
| display: flex; | |||
| flex-direction: column; | |||
| width: 92%; | |||
| margin: 0 auto; | |||
| } | |||
| .notes view:nth-child(2)>text { | |||
| @@ -318,7 +335,7 @@ button::after { | |||
| .buy-view { | |||
| background: #fff; | |||
| height: 96rpx; | |||
| height: 92rpx; | |||
| bottom: 0; | |||
| left: 0; | |||
| right: 0; | |||
| @@ -341,22 +358,22 @@ button::after { | |||
| .goback { | |||
| position: relative; | |||
| float: left; | |||
| width: 122rpx !important; | |||
| height: 95rpx; | |||
| background: rgba(255, 255, 255, 1); | |||
| width: 132rpx !important; | |||
| height: 96rpx; | |||
| background: rgba(255, 255, 255, 1)!important; | |||
| line-height: 95rpx; | |||
| border: 1px solid rgba(227, 227, 227, 1); | |||
| border-radius: 48rpx; | |||
| margin-left: 25rpx; | |||
| border-radius: 32rpx; | |||
| margin-left: 20rpx; | |||
| } | |||
| .goback image { | |||
| position: absolute; | |||
| width: 70rpx; | |||
| width:52rpx; | |||
| height: 50rpx; | |||
| left: 0; | |||
| right: 0; | |||
| top: 0; | |||
| bottom: 0; | |||
| bottom: 50rpx; | |||
| margin: auto; | |||
| } | |||
| @@ -366,8 +383,8 @@ button::after { | |||
| top: 0; | |||
| bottom: 0; | |||
| margin: auto; | |||
| width: 50rpx; | |||
| height: 50rpx; | |||
| width: 76rpx; | |||
| height: 76rpx; | |||
| } | |||
| .txt { | |||
| @@ -556,7 +573,12 @@ button::after { | |||
| padding-bottom: 37rpx; | |||
| padding-top: 37rpx; | |||
| z-index: 12; | |||
| background: #fff; | |||
| /* background: #fff; */ | |||
| } | |||
| .btnTxt{ | |||
| /* margin-top: 30rpx; */ | |||
| color: #FD782D; | |||
| font-size: 20rpx; | |||
| } | |||
| .btns .fr,.btns .fl { | |||
| @@ -707,13 +729,22 @@ button::after { | |||
| } | |||
| .presslimit { | |||
| color: red; | |||
| font-size: 26rpx; | |||
| width: 172rpx; | |||
| height: 34rpx; | |||
| line-height: 34rpx; | |||
| background:rgba(201,201,201,0.1); | |||
| margin-top: 8rpx; | |||
| margin-left: 12rpx; | |||
| color: #FD782D; | |||
| font-size: 20rpx; | |||
| letter-spacing: 1.16rpx; | |||
| overflow: hidden; | |||
| white-space: nowrap; | |||
| text-overflow: ellipsis; | |||
| } | |||
| .presslimit text{ | |||
| margin-left: 22rpx; | |||
| } | |||
| checkbox-group, radio-group { | |||
| height: 400rpx; | |||
| @@ -721,13 +752,15 @@ checkbox-group, radio-group { | |||
| } | |||
| .detailImg { | |||
| width: 92%; | |||
| margin: 10rpx auto 0; | |||
| width: 100%; | |||
| background: #FFF; | |||
| margin: auto; | |||
| } | |||
| .detailImg image { | |||
| display: block; | |||
| width: 100%; | |||
| width: 92%; | |||
| padding: 0 4% 0 4%; | |||
| margin-bottom: 20rpx; | |||
| } | |||
| .content { | |||
| @@ -813,4 +846,13 @@ checkbox-group, radio-group { | |||
| } | |||
| .wx-swiper-dots{ | |||
| margin-bottom: 30rpx; | |||
| } | |||
| .quan{ | |||
| float: left; | |||
| margin:28rpx 15rpx 0 0; | |||
| width: 12rpx; | |||
| height: 12rpx; | |||
| background: #E1E1E1; | |||
| border-radius: 50%; | |||
| } | |||
| @@ -39,6 +39,7 @@ button::after{ border: none; } | |||
| left: 0; | |||
| right: 0; | |||
| z-index: 100000; | |||
| background: #FFF; | |||
| } | |||
| .i-tab { | |||
| @@ -11,7 +11,7 @@ Page({ | |||
| data: { | |||
| poterbg: imgurl.poterbg.url, | |||
| teljpgUrl: imgurl.teljpg.url, | |||
| share01: imgurl.share01.url, | |||
| fenxiang: imgurl.fenxiang.url, | |||
| actUrl: imgurl.act.url, | |||
| wmhome: imgurl.wmhome.url, | |||
| page: 1, | |||
| @@ -15,15 +15,17 @@ | |||
| <view class='merchant-detail'> | |||
| <!-- 品牌信息 --> | |||
| <view class='merchant-brand' style='position:relative;z-index:9'> | |||
| <view> | |||
| <!-- <view> | |||
| <image src='{{data.merchantImgUrl}}' mode='aspectFill'></image> | |||
| </view> | |||
| </view> --> | |||
| <view> | |||
| <text>{{data.merchantName}}</text> | |||
| <text class='title'>{{data.title}}</text> | |||
| </view> | |||
| <view class='fenxiang' wx:if="{{data.type!=50&&data.type!=51}}" bindtap='showshare'> | |||
| <image class="fenxiang" src='{{share01}}' mode="widthFix"></image> | |||
| <image class="fenxiang" src='{{fenxiang}}' mode="widthFix"></image> | |||
| <text class='gift'>分享有礼</text> | |||
| </view> | |||
| </view> | |||
| <!-- 一个商铺 --> | |||
| @@ -31,9 +33,9 @@ | |||
| <view class='merchant-shop'> | |||
| <view class='clearfix' style='width:100%;'> | |||
| <view class='fl'> | |||
| <text>商户位置</text> | |||
| <text>商户位置:</text> | |||
| </view> | |||
| <view class='merchants fr'> | |||
| <view class='merchants'> | |||
| <text wx:for="{{shopVoList}}" wx:key="{{index}}"> | |||
| {{item.buildingName}}{{item.floorName}}--{{item.shopNumber}} | |||
| </text> | |||
| @@ -44,14 +46,14 @@ | |||
| <view class='merchant-shop' wx:if="{{data.linkLinePhone}}"> | |||
| <view class='clearfix' style='width:100%;'> | |||
| <view class='fl'> | |||
| <text>客服电话</text> | |||
| <text>客服电话:</text> | |||
| </view> | |||
| <view class='fr'> | |||
| <view class='frHr'> | |||
| <view style='display:inline-block;text-align:left;margin-right:20rpx;'> | |||
| <text wx:if="{{data.linkLinePhone}}">{{data.linkLinePhone}}</text> | |||
| <text wx:else>{{data.merchantLinkPhone}}</text> | |||
| </view> | |||
| <image bindtap='phone' data-merchantLinkPhone='{{data.linkLinePhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" /> | |||
| <!-- <image bindtap='phone' data-merchantLinkPhone='{{data.linkLinePhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" /> --> | |||
| </view> | |||
| </view> | |||
| </view> | |||
| @@ -53,19 +53,27 @@ | |||
| .merchant-brand, .merchant-shop, .merchant-phone { | |||
| width: 100%; | |||
| display: flex; | |||
| padding: 20rpx 0; | |||
| /* display: flex; */ | |||
| /* padding: 10rpx 0; */ | |||
| background: #fff; | |||
| border-bottom: 1rpx solid #efefef; | |||
| } | |||
| .merchant-brand view:nth-child(1) { | |||
| width: 130rpx; | |||
| border-radius: 16rpx; | |||
| width: 98%; | |||
| height: 130rpx; | |||
| display: flex; | |||
| flex-direction: column; | |||
| white-space: nowrap; | |||
| text-overflow: ellipsis; | |||
| overflow: hidden; | |||
| } | |||
| .merchant-brand view:nth-child(1) image { | |||
| .merchant-brand view:nth-child(1) text:nth-child(1){ | |||
| font-size:32rpx; | |||
| font-family:PingFangSC-Regular; | |||
| font-weight:400; | |||
| color:rgba(60,60,60,1); | |||
| } | |||
| /* .merchant-brand view:nth-child(1) image { | |||
| display: block; | |||
| width: 130rpx; | |||
| height: 130rpx; | |||
| @@ -81,17 +89,19 @@ | |||
| white-space: nowrap; | |||
| text-overflow: ellipsis; | |||
| overflow: hidden; | |||
| } | |||
| } */ | |||
| .merchant-shop text, .merchant-phone text { | |||
| font-size: 30rpx; | |||
| } | |||
| .merchant-shop view, .merchant-phone view { | |||
| .merchant-shop .fl{ | |||
| color: #A6A6A6; | |||
| } | |||
| .merchant-phone view { | |||
| /* display: flex; | |||
| flex: 2; */ | |||
| color: #333; | |||
| color: #A6A6A6; | |||
| } | |||
| .merchant-activity view{ | |||
| color: #333; | |||
| @@ -168,17 +178,22 @@ | |||
| text-align: left; | |||
| font-size: 26rpx; | |||
| margin-bottom: 6rpx; | |||
| height: 26rpx; | |||
| line-height: 26rpx; | |||
| color: #A6A6A6; | |||
| } | |||
| .merchants { | |||
| float: left; | |||
| display: block!important; | |||
| width: 70%; | |||
| margin-left:12rpx; | |||
| } | |||
| .merchant-brand { | |||
| border: none !important; | |||
| width: 92%; | |||
| margin: 0 auto; | |||
| margin: 20rpx auto 0; | |||
| } | |||
| .merchant-brand view:nth-child(2) text:nth-child(1) { | |||
| margin-top: 20rpx; | |||
| @@ -186,8 +201,8 @@ | |||
| } | |||
| .title{ | |||
| font-size: 24rpx; | |||
| color: #666; | |||
| font-size: 26rpx; | |||
| color: #A6A6A6; | |||
| width: 530rpx; | |||
| height: 40rpx; | |||
| white-space: nowrap; | |||
| @@ -244,12 +259,19 @@ | |||
| padding: 0 4% 10rpx; | |||
| } | |||
| .fenxiang image { | |||
| width: 108rpx; | |||
| width: 48rpx; | |||
| height: 48rpx; | |||
| position: absolute; | |||
| top: 16rpx; | |||
| right: 14rpx; | |||
| } | |||
| .gift{ | |||
| color: #3C3C3C; | |||
| font-size: 20rpx; | |||
| position: absolute; | |||
| right: 0; | |||
| top: 65rpx; | |||
| } | |||
| .user-motto { | |||
| width: 270rpx; | |||
| border: 0; | |||
| @@ -399,3 +421,10 @@ button::after{ border: none; } | |||
| bottom: 0; | |||
| margin: auto; | |||
| } | |||
| .frHr{ | |||
| float: left; | |||
| color: #FD832D; | |||
| font-size: 24rpx; | |||
| margin-left: 12rpx; | |||
| margin-top: 12rpx; | |||
| } | |||
| @@ -4,6 +4,9 @@ | |||
| margin-top: 40rpx; | |||
| /* background:linear-gradient(0deg,rgba(235,235,235,1) 0%,rgba(255,255,255,0.8) 100%); */ | |||
| } | |||
| i-tabs i-tabs-scroll { | |||
| background: #F4F5F9!important; | |||
| } | |||
| .loading { | |||
| text-align: center; | |||
| height: 80rpx; | |||
| @@ -3,9 +3,13 @@ const imgurl = require("../../utils/imgurl"); | |||
| const config = require("../../config/config"); | |||
| const QR = require("../../utils/memberqrcode.js"); | |||
| const util = require("../../utils/util"); | |||
| const bgColor = require("../../utils/bgColor.js") | |||
| let app = getApp(); | |||
| Page({ | |||
| data: { | |||
| chengzhangBox: bgColor.colorFirst.main.chengzhangBox, | |||
| activeColor: bgColor.colorFirst.main.activeColor, | |||
| qg: bgColor.colorFirst.main.qg, | |||
| newUrl: "", | |||
| cover: "", | |||
| kanjia:imgurl.kanjia.url, | |||
| @@ -6,12 +6,12 @@ | |||
| <!-- 成长值 --> | |||
| <view class="user-data fl" bindtap='gotoChengzhangzhi'> | |||
| <open-data type="userNickName"></open-data> | |||
| <view class='chengzhangBox'> | |||
| <view class='chengzhangBox' style='background:{{chengzhangBox}}'> | |||
| <text class='chengzhang'>{{levelName}}</text> | |||
| </view> | |||
| <view class="view"> | |||
| <!-- 成长值<text class="score">{{score}}</text> --> | |||
| <progress percent="{{upgradePercent}}" stroke-width="6" activeColor="#FC8B37" /> | |||
| <progress percent="{{upgradePercent}}" stroke-width="6" activeColor="{{activeColor}}" /> | |||
| <text class='remainchengzhangzhi'>还需{{upgradeScore}}成长值可升级</text> | |||
| </view> | |||
| </view> | |||
| @@ -48,8 +48,8 @@ | |||
| <image src='{{xiaofeika}}' mode='aspectFill'></image> | |||
| <text>消费卡</text> | |||
| </view> | |||
| <view class='kjBox' bindtap='gotoGame'> | |||
| <image src='{{xingyun}}' mode='aspectFill'></image> | |||
| <view class='kjBox' > | |||
| <image src='{{xingyun}}' mode='aspectFill' bindtap='gotoGame'></image> | |||
| <text>幸运卡牌</text> | |||
| </view> | |||
| <view class='kjBox' bindtap='gotoJfsc'> | |||
| @@ -63,7 +63,7 @@ | |||
| <image src='{{toutiao}}' mode='aspectFill'></image> | |||
| </view> | |||
| <text>今日好货推荐,满1000减200元…</text> | |||
| <view class='qg'><text>抢购</text></view> | |||
| <view class='qg' style='border-color:{{qg}}'><text>抢购</text></view> | |||
| </view> | |||
| <!-- 爆款专区 --> | |||
| <c-hot id="hot"/> | |||
| @@ -83,7 +83,7 @@ | |||
| </view> | |||
| </view> | |||
| <!-- 限时抢购和消费卡 --> | |||
| <c-rushtobyCard id="rushtobyCard"/> | |||
| <!-- <c-rushtobyCard id="rushtobyCard"/> --> | |||
| <c-coupons id="lists" bind:myevent="onGetCode" class="business" loadingtext="{{loadingtext}}" loading="{{loading}}" /> | |||
| <g-entry id="listss" wx:if="{{showGame&&!played&&!havePlayEd}}" gamedata="{{gamedata}}" bind:myevent="" /> | |||
| </view> | |||
| @@ -221,14 +221,11 @@ page { | |||
| .chengzhangBox{ | |||
| width:70rpx; | |||
| height:32rpx; | |||
| background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); | |||
| line-height: 26rpx; | |||
| border-radius:9px 9px 9px 0px; | |||
| font-family:PingFangSC-Regular; | |||
| font-weight:400; | |||
| color:rgba(255,255,255,1); | |||
| line-height:30rpx; | |||
| text-align: center; | |||
| vertical-align: middle; | |||
| float: left; | |||
| margin-top: 8rpx; | |||
| margin-left: 8rpx; | |||
| @@ -237,7 +234,9 @@ page { | |||
| font-size: 22rpx; | |||
| font-weight: 400; | |||
| color: #FFFFFF; | |||
| margin-left: 4rpx; | |||
| margin-left: 10rpx; | |||
| height:22rpx; | |||
| line-height: 22rpx; | |||
| } | |||
| .integral{ | |||
| margin-left: 70rpx; | |||
| @@ -409,7 +408,7 @@ progress{ | |||
| height: 44rpx; | |||
| line-height: 44rpx; | |||
| border-radius:18rpx; | |||
| border:2rpx solid #FD782D; | |||
| border:2rpx solid; | |||
| float: right; | |||
| text-align: center; | |||
| margin: 20rpx 20rpx 20rpx 0; | |||
| @@ -14,6 +14,7 @@ | |||
| text-align: center; | |||
| z-index: 10000000; | |||
| font-size: 26rpx; | |||
| background: #FFF; | |||
| } | |||
| .i-tab { | |||
| @@ -10,7 +10,9 @@ Page({ | |||
| * 页面的初始数据 | |||
| */ | |||
| data: { | |||
| bannerUrl: imgurl.banner.url, | |||
| banneColor: bgColor.colorFirst.user.banneColor, | |||
| levelBg: bgColor.colorFirst.user.levelBg, | |||
| view: bgColor.colorFirst.user.view, | |||
| redirectUrl: imgurl.redirect.url, | |||
| qrcodeUrl: imgurl.qrcode.url, | |||
| editUrl: imgurl.edit.url, | |||
| @@ -172,7 +174,7 @@ Page({ | |||
| } else if (num1 == 'couponNum2') { | |||
| that.setData({ | |||
| couponNum2: "couponNum2" | |||
| }) | |||
| }); | |||
| }; | |||
| Http.get({ | |||
| @@ -1,12 +1,12 @@ | |||
| <view class="user"> | |||
| <view class="top" ></view> | |||
| <view class="top" style='background:{{banneColor}}'></view> | |||
| <view class='user_title '> | |||
| <view class="user-avatar" bindtap='gotoedit'> | |||
| <open-data class="open" type="userAvatarUrl"></open-data> | |||
| </view> | |||
| <view class="user-name" bindtap='gotoedit'> | |||
| <open-data class="name" type="userNickName" ></open-data> | |||
| <view class=' usre_level'> | |||
| <view class=' usre_level'style='background:{{levelBg}}'> | |||
| <text class='chengzhang '>{{levelName}}</text> | |||
| </view> | |||
| </view> | |||
| @@ -15,7 +15,7 @@ | |||
| <text class="chengzhang_h" >成长值{{score}}</text> | |||
| <text class="my my_line">|</text> | |||
| <text class="my">更多成长值</text> | |||
| <text class="view">一键领取</text> | |||
| <text class="view" style='color:{{view}}'>一键领取</text> | |||
| </view> | |||
| <view class="user-btns"> | |||
| <!-- 我的订单 --> | |||
| @@ -82,7 +82,7 @@ page{ | |||
| .view { | |||
| font-size: 24rpx; | |||
| color: #FD832D; | |||
| /* color: #FD832D; */ | |||
| } | |||
| .view image { | |||
| @@ -352,13 +352,10 @@ page{ | |||
| .top{ | |||
| width: 100%; | |||
| height: 234rpx; | |||
| background:linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%) | |||
| } | |||
| .usre_level{ | |||
| width:70rpx; | |||
| height:32rpx; | |||
| background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); | |||
| border-radius:9px 9px 9px 0px; | |||
| font-family:PingFangSC-Regular; | |||
| font-weight:400; | |||
| @@ -2,14 +2,34 @@ module.exports = { | |||
| colorFirst:{ | |||
| // 我的 | |||
| "user": { | |||
| "banneColor": "linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%))", | |||
| "banneColor": "linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%)", | |||
| "levelBg":"linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%)", | |||
| "view":"#FD832D" | |||
| }, | |||
| //首页 | |||
| "main": { | |||
| "chengzhangBox":"linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%)", | |||
| "activeColor":"#FC8B37", | |||
| "qg":"#FD782D", | |||
| "sql":"linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%)", | |||
| "txt": "#2C8DFF", | |||
| }, | |||
| }, | |||
| colorSecond:{ | |||
| // 我的 | |||
| "user": { | |||
| "banneColor": 'linear-gradient(180deg,rgba(50,177,252,1) 0%,rgba(47,108,255,1) 100%)', | |||
| "banneColor": "linear-gradient(180deg,rgba(50,177,252,1) 0%,rgba(47,108,255,1) 100%)", | |||
| "levelBg": "linear-gradient(180deg,rgba(50,177,252,1) 0%,rgba(47,108,255,1) 100%)", | |||
| "view": "#FF1D30" | |||
| }, | |||
| //首页 | |||
| "main": { | |||
| "chengzhangBox": "linear-gradient(130deg,rgba(50,177,252,1) 0%,rgba(47,108,255,1) 100%)", | |||
| "activeColor": "#2C8DFF", | |||
| "qg": "#31A5FC", | |||
| "sql": "linear-gradient(127deg,rgba(119,192,254,1) 0%,rgba(48,120,255,1) 100%)", | |||
| "txt":"#FF1D30", | |||
| }, | |||
| } | |||
| @@ -645,4 +645,13 @@ module.exports = { | |||
| 'url': baseUrl + "None.png", | |||
| 'name': '' | |||
| }, | |||
| 'fenxiang': { | |||
| 'url': baseUrl + "fenxiang.png", | |||
| 'name': '' | |||
| }, | |||
| 'homeSelectedO': { | |||
| 'url': baseUrl + "homeSelectedO.png", | |||
| 'name': '' | |||
| }, | |||
| } | |||