| @@ -24,6 +24,7 @@ Component({ | |||
| dey: new Date().getDate(), | |||
| thendata: [], //当前这一周的数组 | |||
| xiala: imgurl.concealBnt.url, | |||
| xiangshang: imgurl.xiangshang.url, | |||
| switchFlag: true, | |||
| activityDateList: [] | |||
| }, | |||
| @@ -129,17 +130,15 @@ Component({ | |||
| handle(e) { //点击号数 | |||
| let item = e.currentTarget.dataset.item | |||
| // if (item.style == '1') { | |||
| // this.front() | |||
| // } else if (item.style == '2') { | |||
| // this.behind() | |||
| // } | |||
| this.triggerEvent("setDate", { | |||
| y: this.data.year, | |||
| m: this.data.month, | |||
| value:item.value | |||
| }) | |||
| if (item.style==0){ | |||
| this.triggerEvent("setDate", { | |||
| y: this.data.year, | |||
| m: this.data.month, | |||
| value: item.value | |||
| }) | |||
| }else{ | |||
| return | |||
| } | |||
| }, | |||
| getDays(year, month) { //获取每月有多少天 | |||
| let tempDateArr = [] | |||
| @@ -9,6 +9,6 @@ | |||
| <view class="{{(item.value==dey&&monthFlgh==item.m&&item.y==yearFlgh)?'today':(item.style == '0'?'weekItme':'noThen')}}" wx:for="{{allFlag?(switchFlag? thendata:dateLsit):dateLsit}}" wx:key="index" bindtap="handle" data-item="{{item}}" style="{{item.act==1?activityStyle:''}}">{{ (item.value==dey&&monthFlgh==item.m&&item.y==yearFlgh)?'':item.value }}</view> | |||
| </view> | |||
| <view class="concealBnt" bindtap="switchs" wx:if="{{allFlag&&yearFlgh==year&&month==monthFlgh}}"> | |||
| <image class="concealBnt" src="{{xiala}}"></image> | |||
| <image class="concealBnt" src="{{ switchFlag?xiala:xiangshang}}"></image> | |||
| </view> | |||
| </view> | |||
| @@ -2,7 +2,7 @@ | |||
| @import "../../app.wxss"; | |||
| .hotBox{ | |||
| width:710rpx; | |||
| margin: 20rpx auto 0; | |||
| margin: 0 auto ; | |||
| } | |||
| .hotTitle{ | |||
| width: 100%; | |||
| @@ -52,7 +52,8 @@ | |||
| <image src='{{typeLsit.sy_xfk.icon}}' mode='aspectFill'></image> | |||
| <view class="text">消费卡</view> | |||
| </view> | |||
| <view class='kjBox' bindtap='goLive' wx:if="{{liveFlag}}"> | |||
| <!-- wx:if="{{liveFlag}}"否配置直播条件预览 --> | |||
| <view class='kjBox' bindtap='goLive'> | |||
| <image src='{{typeLsit.sy_zbt.icon}}' mode='aspectFill'></image> | |||
| <view class="text">直播厅</view> | |||
| </view> | |||
| @@ -61,19 +62,19 @@ | |||
| <view>游戏频道</view> | |||
| </view> --> | |||
| <view class='kjBox' bindtap='goSign'> | |||
| <image src='{{typeLsit.sy_jfsc.icon}}' mode='aspectFill'></image> | |||
| <image src='{{typeLsit.sy_qd.icon}}' mode='aspectFill'></image> | |||
| <view class="text">每日签到</view> | |||
| </view> | |||
| <view class='kjBox' bindtap='goCalendar'> | |||
| <image src='{{typeLsit.sy_jfsc.icon}}' mode='aspectFill'></image> | |||
| <image src='{{typeLsit.sy_hd.icon}}' mode='aspectFill'></image> | |||
| <view class="text">活动日历</view> | |||
| </view> | |||
| <view class='kjBox' bindtap='gotoJfsc'> | |||
| <image src='{{typeLsit.sy_jfsc.icon}}' mode='aspectFill'></image> | |||
| <view class="text">积分商城</view> | |||
| </view> | |||
| <view class='kjBox' bindtap='gotoJfsc'> | |||
| <image src='{{typeLsit.sy_jfsc.icon}}' mode='aspectFill'></image> | |||
| <view class='kjBox' bindtap='gotogame'> | |||
| <image src='{{typeLsit.sy_yx.icon}}' mode='aspectFill'></image> | |||
| <view class="text">游戏</view> | |||
| </view> | |||
| @@ -130,9 +131,9 @@ | |||
| </view> | |||
| </view> | |||
| </view> | |||
| <view class="game-entry" bindtap='gotogame'> | |||
| <!-- <view class="game-entry" bindtap='gotogame'> | |||
| <image src="{{usergift}}" mode="widthFix" class="gameimg"></image> | |||
| </view> | |||
| </view> --> | |||
| <!-- 爆款专区 --> | |||
| <c-hot id="hot" /> | |||
| <view class='product' wx:if="{{showTopic}}" bindtap='gotoTopic'> | |||
| @@ -418,23 +418,24 @@ progress{ | |||
| .channelBox{ | |||
| width:688rpx; | |||
| /* height: 220rpx; */ | |||
| margin:0 auto; | |||
| margin:20rpx auto; | |||
| display: flex; | |||
| flex-wrap:wrap; | |||
| justify-content: space-between; | |||
| background: #F4F5F9; | |||
| } | |||
| .kjBox{ | |||
| width: 25%; | |||
| height: 148rpx; | |||
| height: 118rpx; | |||
| font-size: 24rpx; | |||
| color: #A6A6A6; | |||
| margin-top: 46rpx; | |||
| margin-top: 10rpx; | |||
| text-align: center; | |||
| } | |||
| .kjBox image{ | |||
| width: 104rpx; | |||
| height: 104rpx; | |||
| width: 60rpx; | |||
| height: 60rpx; | |||
| margin: auto | |||
| } | |||
| .text{ | |||
| @@ -18,7 +18,14 @@ Page({ | |||
| page:1, | |||
| isFirstPage:false, | |||
| isLastPage:false, | |||
| teljpgUrl: imgurl.teljpg.url | |||
| teljpgUrl: imgurl.teljpg.url, | |||
| map: imgurl.map.url,//商场地图 | |||
| }, | |||
| //跳转到地图 | |||
| goMap(){ | |||
| wx.navigateTo({ | |||
| url: '/pages/marketAtlas/marketAtlas', | |||
| }) | |||
| }, | |||
| // 左侧点击事件 | |||
| jumpIndex(e) { | |||
| @@ -43,4 +43,7 @@ | |||
| 暂无数据 | |||
| </view> | |||
| </view> | |||
| </view> | |||
| </view> | |||
| <image class="map" src="{{map}}" bindtap="goMap"> | |||
| </image> | |||
| @@ -2,6 +2,14 @@ | |||
| .searchicon{ | |||
| margin-right: 5rpx; | |||
| } | |||
| .map{ | |||
| position: fixed; | |||
| right: 0; | |||
| top: 740rpx; | |||
| height: 100rpx; | |||
| width: 100rpx; | |||
| /* background-color: chartreuse; */ | |||
| } | |||
| .search{ | |||
| z-index:5000; | |||
| left:0; | |||
| @@ -16,6 +16,7 @@ Page({ | |||
| navigationBarHeight, | |||
| ifStoreApp: ifStoreApp, | |||
| aboutUs: imgurl.aboutUs.url, | |||
| rqCode: imgurl.barcode.url, | |||
| banneColor: bgColor.colorFirst.user.banneColor, | |||
| levelBg: bgColor.colorFirst.user.levelBg, | |||
| view: bgColor.colorFirst.user.view, | |||
| @@ -39,6 +40,9 @@ Page({ | |||
| mineFlag: "", | |||
| flag: 'hidden', | |||
| score: '0', | |||
| userId:"", | |||
| memberName:"", | |||
| memberLogo:"", | |||
| curPhone: '', | |||
| name: "", | |||
| birthdate: "", | |||
| @@ -282,6 +286,7 @@ Page({ | |||
| score: res.data.score, | |||
| curPhone: curPhone, | |||
| levelName: res.data.levelName, | |||
| userId: res.data.id | |||
| }) | |||
| if (res.data.nickName) { | |||
| that.setData({ | |||
| @@ -310,7 +315,12 @@ Page({ | |||
| url: config.api.getMallInfo, | |||
| data: {} | |||
| }).then(res => { | |||
| console.log(res) | |||
| if(res.code==200){ | |||
| this.setData({ | |||
| memberName:res.data.name, | |||
| memberLogo:res.data.imgUrl | |||
| }) | |||
| } | |||
| if (res.data.businessHours !== '[]') { | |||
| that.setData({ | |||
| aboutShow: true | |||
| @@ -6,10 +6,10 @@ | |||
| <view wx:if="{{flag=='hidden'}}"></view> | |||
| </view> | |||
| <view class="top" style='background:{{banneColor}}'> | |||
| <view class='aboutUs' bindtap='gomallInfo' wx:if="{{aboutShow == true}}"> | |||
| <!-- <view class='aboutUs' bindtap='gomallInfo' wx:if="{{aboutShow == true}}"> | |||
| <image class='aboutIcons' src="{{aboutUs}}" mode='widthFix'></image> | |||
| <text>关于我们</text> | |||
| </view> | |||
| </view> --> | |||
| </view> | |||
| <view class="top-content" wx:if="{{ifStoreApp!=1}}"> | |||
| <view class='user_title'> | |||
| @@ -17,29 +17,42 @@ | |||
| <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'style='background:{{levelBg}}'> | |||
| <open-data class="name" type="userNickName"></open-data> | |||
| <!-- 会员等级 --> | |||
| <!-- <view class=' usre_level'style='background:{{levelBg}}'> | |||
| <text class='chengzhang '>{{levelName}}</text> | |||
| </view> | |||
| </view> --> | |||
| </view> | |||
| <!-- --> | |||
| <view class="user-name" wx:if="{{curPhone}}" style="margin-top:20rpx;" bindtap='gotoPhoneInfo'> | |||
| <text class="my">我的手机号:</text> | |||
| <text class="chengzhang_h" >{{curPhone}}</text> | |||
| <text class="view" style='color:#F64A16'>[微信授权手机号]</text> | |||
| <view class="user_phone" wx:if="{{curPhone}}" style="margin-top:20rpx;" bindtap='gotoPhoneInfo'> | |||
| <!-- <text class="my">我的手机号:</text> --> | |||
| <text class="chengzhang_h" style="color:#fff">{{curPhone}}</text> | |||
| <text class="view" style='color:#993300'>[微信授权手机号]</text> | |||
| </view> | |||
| <view class="user-name" wx:if="{{!curPhone}}" style="margin-top:20rpx;" bindtap='gotoPhoneInfo'> | |||
| <text class="view" style='color:#F64A16'>获取微信授权手机号</text> | |||
| <view class="user_phone" wx:if="{{!curPhone}}" style="margin-top:20rpx;" bindtap='gotoPhoneInfo'> | |||
| <text class="view" style='color:#993300'>获取微信授权手机号</text> | |||
| </view> | |||
| <!-- --> | |||
| <view class="user-phone" bindtap='gotograde'> | |||
| <text class="my">我的</text> | |||
| <text class="chengzhang_h" >成长值{{score}}</text> | |||
| <text class="my my_line">|</text> | |||
| <!-- <text class="my">更多成长值</text> --> | |||
| <text class="view" style='color:{{view}}'>更多成长值</text> | |||
| </view> | |||
| <view class="user-btns"> | |||
| <view class="marketTitleBox"> | |||
| <view class="marketName">{{memberName}}</view> | |||
| <view class="levelName">{{levelName}}</view> | |||
| </view> | |||
| <view class="user_growth_box"> | |||
| <image src="{{rqCode}}" class="RQcode"></image> | |||
| <view class="memberBox"> | |||
| <view class="memberCode">会员码:{{userId}}</view> | |||
| <view class="user-phone" bindtap='gotograde'> | |||
| <text class="my">我的</text> | |||
| <text class="chengzhang_h">成长值{{score}}</text> | |||
| <text class="my my_line">|</text> | |||
| <!-- <text class="my">更多成长值</text> --> | |||
| <text class="view" style='color:{{view}}'>更多成长值</text> | |||
| </view> | |||
| </view> | |||
| <image src="{{memberLogo}}" class="memberLogo"></image> | |||
| </view> | |||
| </view> | |||
| <view class="user-btns"> | |||
| <!-- 我的订单 --> | |||
| <navigator url="/pages/order/index/index?id=all"> | |||
| <view class="user-btn app-border-bottom"> | |||
| @@ -66,87 +79,131 @@ | |||
| </view> | |||
| </view> | |||
| </navigator> | |||
| <!-- 积分商城 --> | |||
| <navigator url="/pages/integralmall/index"> | |||
| <view class="user-btn app-border-bottom"> | |||
| <view> | |||
| <image class='icons' src="{{wmintegral}}" mode='widthFix'></image>积分商城</view> | |||
| </view> | |||
| </navigator> | |||
| </view> | |||
| </view> | |||
| </view> | |||
| <view class='btns_bg' wx:if="{{ifStoreApp!=1}}"> | |||
| <view class="user-btns"> | |||
| <view class='btns_bg' > | |||
| <navigator url="/pages/bargain/bargain?from=myhtml" open-type="navigate"> | |||
| <view class="particulars_list"> | |||
| <view class="particulars_name">我的砍价</view> | |||
| <view class="particulars_go">></view> | |||
| </view> | |||
| </navigator> | |||
| <navigator url="/pages/spellGroup/spellGroup?from=myhtml" open-type="navigate"> | |||
| <view class="particulars_list"> | |||
| <view class="particulars_name">我的拼团</view> | |||
| <view class="particulars_go">></view> | |||
| </view> | |||
| </navigator> | |||
| <navigator url="/pages/user/myactivity/index" open-type="navigate"> | |||
| <view class="particulars_list"> | |||
| <view class="particulars_name">我的活动</view> | |||
| <view class="particulars_go">></view> | |||
| </view> | |||
| </navigator> | |||
| <navigator url="/pages/specialcourtesy/specialcourtesy"> | |||
| <view class="particulars_list"> | |||
| <view class="particulars_name">特享礼遇</view> | |||
| <view class="particulars_go">></view> | |||
| </view> | |||
| </navigator> | |||
| <navigator url="/pages/exchange/exchange" open-type="navigate"> | |||
| <view class="particulars_list"> | |||
| <view class="particulars_name">兑换</view> | |||
| <view class="particulars_go">></view> | |||
| </view> | |||
| </navigator> | |||
| <navigator url="/pages/mallInfo/mallInfo" open-type="navigate"> | |||
| <view class="particulars_list"> | |||
| <view class="particulars_name">关于我们</view> | |||
| <view class="particulars_go">></view> | |||
| </view> | |||
| </navigator> | |||
| </view> | |||
| <!-- <view class='btns_bg' wx:if="{{ifStoreApp!=1}}"> | |||
| <view class="user-btns"> --> | |||
| <!-- 我的砍价 --> | |||
| <navigator url="/pages/bargain/bargain?from=myhtml" open-type="navigate"> | |||
| <!-- <navigator url="/pages/bargain/bargain?from=myhtml" open-type="navigate"> | |||
| <view class="user-btn app-border-bottom"> | |||
| <view> | |||
| <image class='icons' src="{{wmbarginicon}}" mode='widthFix'></image>我的砍价</view> | |||
| </view> | |||
| </navigator> | |||
| </navigator> --> | |||
| <!-- 我的拼团 --> | |||
| <navigator url="/pages/spellGroup/spellGroup?from=myhtml" open-type="navigate"> | |||
| <!-- <navigator url="/pages/spellGroup/spellGroup?from=myhtml" open-type="navigate"> | |||
| <view class="user-btn app-border-bottom"> | |||
| <view> | |||
| <image class='icons' src="{{wmspellgroup}}" mode='widthFix'></image>我的拼团</view> | |||
| </view> | |||
| </navigator> | |||
| </navigator> --> | |||
| <!-- 积分商城 --> | |||
| <navigator url="/pages/integralmall/index"> | |||
| <!-- <navigator url="/pages/integralmall/index"> | |||
| <view class="user-btn app-border-bottom"> | |||
| <view> | |||
| <image class='icons' src="{{wmintegral}}" mode='widthFix'></image>积分商城</view> | |||
| </view> | |||
| </navigator> | |||
| </navigator> --> | |||
| <!-- 当商场开启使用折扣按钮的时候, --> | |||
| <navigator url="/pages/specialcourtesy/specialcourtesy"> | |||
| <!-- <navigator url="/pages/specialcourtesy/specialcourtesy"> | |||
| <view class="user-btn app-border-bottom"> | |||
| <view> | |||
| <image class='icons' src="{{giftUrl}}" mode='widthFix'></image>特享礼遇</view> | |||
| </view> | |||
| </navigator> | |||
| <navigator url="/pages/user/myactivity/index" open-type="navigate"> | |||
| </navigator> --> | |||
| <!-- <navigator url="/pages/user/myactivity/index" open-type="navigate"> | |||
| <view class="user-btn app-border-bottom"> | |||
| <view> | |||
| <image class='icons' src="{{myactivity}}" mode='widthFix'></image>我的活动</view> | |||
| </view> | |||
| </navigator> | |||
| </navigator> --> | |||
| <!-- 兑换 --> | |||
| <navigator url="/pages/exchange/exchange" open-type="navigate"> | |||
| <!-- <navigator url="/pages/exchange/exchange" open-type="navigate"> | |||
| <view class="user-btn app-border-bottom"> | |||
| <view> | |||
| <image class='icons' src="{{duihuan}}" mode='widthFix'></image>兑换</view> | |||
| </view> | |||
| </navigator> | |||
| </navigator> --> | |||
| <!-- 地图 --> | |||
| <navigator url="/pages/marketAtlas/marketAtlas" open-type="navigate"> | |||
| <!-- <navigator url="/pages/marketAtlas/marketAtlas" open-type="navigate"> | |||
| <view class="user-btn app-border-bottom"> | |||
| <view> | |||
| <image class='icons' src="{{shoppingAtlas}}" mode='widthFix'></image>商场地图</view> | |||
| </view> | |||
| </navigator> | |||
| </navigator> --> | |||
| <!-- 分享好友 --> | |||
| <navigator url="/pages/shareFriend/shareFriend" open-type="navigate"> | |||
| <!-- <navigator url="/pages/shareFriend/shareFriend" open-type="navigate"> | |||
| <view class="user-btn app-border-bottom"> | |||
| <view> | |||
| <image class='icons' src="{{fenxiang}}" mode='widthFix'></image>分享好友</view> | |||
| </view> | |||
| </navigator> | |||
| </view> | |||
| </view> | |||
| </view> --> | |||
| <!-- 小马快店样式 --> | |||
| <view class="top-content" wx:if="{{ifStoreApp==1}}"> | |||
| <!-- <view class="top-content" wx:if="{{ifStoreApp==1}}"> | |||
| <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> | |||
| <view class="user-btns"> | |||
| <open-data class="name" type="userNickName"></open-data> | |||
| </view> --> | |||
| <!-- <view class="user-btns"> --> | |||
| <!-- 我的订单 --> | |||
| <navigator url="/pages/order/index/index?id=all"> | |||
| <!-- <navigator url="/pages/order/index/index?id=all"> | |||
| <view class="user-btn app-border-bottom"> | |||
| <view> | |||
| <image class='icons' src="{{dingUrl}}" mode='widthFix'></image>我的订单</view> | |||
| </view> | |||
| </navigator> | |||
| </navigator> --> | |||
| <!-- 我的券包 --> | |||
| <navigator url="/pages/couponorder/index/index"> | |||
| <!-- <navigator url="/pages/couponorder/index/index"> | |||
| <view class="user-btn app-border-bottom"> | |||
| <view> | |||
| <image class='icons' src="{{quansUrl}}" mode='widthFix'></image>我的券包</view> | |||
| @@ -154,16 +211,16 @@ | |||
| <text class="couponnum" wx:if="{{couponNum=='couponNum'}}"></text> | |||
| </view> | |||
| </view> | |||
| </navigator> | |||
| </navigator> --> | |||
| <!-- 我的砍价 --> | |||
| <navigator url="/pages/bargain/bargain?from=myhtml" open-type="navigate"> | |||
| <!-- <navigator url="/pages/bargain/bargain?from=myhtml" open-type="navigate"> | |||
| <view class="user-btn app-border-bottom"> | |||
| <view> | |||
| <image class='icons' src="{{wmbarginicon}}" mode='widthFix'></image>我的砍价</view> | |||
| </view> | |||
| </navigator> | |||
| </navigator> --> | |||
| <!-- 我的拼团 --> | |||
| <navigator url="/pages/spellGroup/spellGroup?from=myhtml" open-type="navigate"> | |||
| <!-- <navigator url="/pages/spellGroup/spellGroup?from=myhtml" open-type="navigate"> | |||
| <view class="user-btn app-border-bottom"> | |||
| <view> | |||
| <image class='icons' src="{{wmspellgroup}}" mode='widthFix'></image>我的拼团</view> | |||
| @@ -171,7 +228,8 @@ | |||
| </navigator> | |||
| </view> | |||
| </view> | |||
| </view> | |||
| </view> --> | |||
| <view class="margin"></view> | |||
| <view class='of' wx:if="{{canIUse}}"> | |||
| <official-account class="gzh"></official-account> | |||
| @@ -1,13 +1,30 @@ | |||
| page{ | |||
| /* overflow-y:visible!important; */ | |||
| overflow: auto; | |||
| height: 100%!important; | |||
| overflow-y: scroll !important; | |||
| /* height: none; */ | |||
| background: #f6f6f6; | |||
| } | |||
| .icons { | |||
| display: block; | |||
| width: 50rpx; | |||
| margin: 0 auto 10rpx; | |||
| } | |||
| .particulars_list{ | |||
| overflow: hidden; | |||
| border-bottom: 1rpx #ccc solid; | |||
| width: 90%; | |||
| margin: auto; | |||
| height: 80rpx; | |||
| line-height: 80rpx; | |||
| color: #666666; | |||
| font-family: PingFangSC-Regular; | |||
| } | |||
| .particulars_name{ | |||
| float: left | |||
| } | |||
| .particulars_go{ | |||
| color: rgba(0, 0, 0, 0.1); | |||
| float: right; | |||
| } | |||
| .navigator-hover { | |||
| @@ -36,17 +53,63 @@ page{ | |||
| .user-name{ | |||
| font-family: PingFangSC-Medium; | |||
| height: 42rpx; | |||
| margin-top:66rpx; | |||
| margin-top: 66rpx; | |||
| letter-spacing: 0.64rpx; | |||
| line-height: 44rpx; | |||
| font-size: 30rpx; | |||
| color: #3C3C3C; | |||
| font-weight:600; | |||
| display: flex; /*设置显示样式**/ | |||
| align-items: center; /**子view垂直居中*/ | |||
| vertical-align: center; /**垂直居中*/ | |||
| justify-content: center; /**内容居中*/ | |||
| font-size: 32rpx; | |||
| color: #FFFFFF; | |||
| /* font-weight: 600; */ | |||
| display: flex; | |||
| align-items: center; | |||
| vertical-align: center; | |||
| justify-content: center; | |||
| flex-direction: row; | |||
| position: absolute; | |||
| top: -190rpx; | |||
| left: 200rpx; | |||
| } | |||
| .user_phone{ | |||
| font-family: PingFangSC-Medium; | |||
| height: 42rpx; | |||
| letter-spacing: 0.64rpx; | |||
| line-height: 44rpx; | |||
| font-size: 32rpx; | |||
| color: #FFFFFF; | |||
| display: flex; | |||
| align-items: center; | |||
| vertical-align: center; | |||
| justify-content: center; | |||
| flex-direction: row; | |||
| position: absolute; | |||
| top: -96rpx; | |||
| left: 200rpx; | |||
| } | |||
| .user_growth_box{ | |||
| overflow: hidden; | |||
| } | |||
| .RQcode{ | |||
| width: 80rpx; | |||
| height: 80rpx; | |||
| margin: 10rpx 10rpx 0 40rpx; | |||
| float: left; | |||
| } | |||
| .memberLogo{ | |||
| width: 80rpx; | |||
| height: 80rpx; | |||
| margin: 10rpx 10rpx 0 60rpx; | |||
| float: left; | |||
| } | |||
| .memberBox{ | |||
| float: left; | |||
| } | |||
| .memberCode{ | |||
| font-size: 24rpx; | |||
| font-family: PingFangSC-Regular; | |||
| font-weight: 400; | |||
| color: rgba(166,166,166,1); | |||
| line-height: 34rpx; | |||
| margin: 10rpx 0 0 20rpx; | |||
| } | |||
| .user-phone { | |||
| font-family: PingFangSC-Regular; | |||
| @@ -56,19 +119,39 @@ page{ | |||
| color: #000; | |||
| padding: 0 20rpx 20rpx; | |||
| text-align: center; | |||
| margin-top:20rpx; | |||
| } | |||
| .user-avatar { | |||
| position: absolute; | |||
| width: 128rpx; | |||
| height: 128rpx; | |||
| width: 119rpx; | |||
| height: 119rpx; | |||
| border-radius: 50%; | |||
| overflow: hidden; | |||
| top:-64rpx; | |||
| left: 0; | |||
| top:-133rpx; | |||
| left: -500rpx; | |||
| right: 0; | |||
| margin: auto; | |||
| } | |||
| .marketTitleBox{ | |||
| border-radius: 16rpx 16rpx 0 0; | |||
| background-color: #ff9933; | |||
| overflow: hidden; | |||
| } | |||
| .marketName{ | |||
| margin: 30rpx 40rpx; | |||
| font-weight: 600; | |||
| width: 80%; | |||
| font-size: 32rpx; | |||
| color: #fff; | |||
| } | |||
| .levelName{ | |||
| font-size: 34rpx; | |||
| font-weight: 600; | |||
| margin: 0 40rpx 20rpx 40rpx ; | |||
| width: 80%; | |||
| color: #fff; | |||
| } | |||
| .chengzhang { | |||
| font-size: 24rpx; | |||
| @@ -102,13 +185,17 @@ page{ | |||
| height: 120rpx; | |||
| } | |||
| .user-btns{ | |||
| background: #fff; | |||
| display: flex; | |||
| text-align: center; | |||
| flex-wrap: wrap; | |||
| width: 94%; | |||
| background: #fff; | |||
| border-radius: 16rpx; | |||
| margin: 30rpx auto ; | |||
| box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); | |||
| } | |||
| .user-btns navigator{ | |||
| width: 33.3%; | |||
| width: 25%; | |||
| height: 160rpx; | |||
| } | |||
| @@ -129,14 +216,13 @@ page{ | |||
| background: #fff; | |||
| border-radius: 16rpx; | |||
| margin: -100rpx auto 0; | |||
| padding: 10rpx 0; | |||
| box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); | |||
| } | |||
| .btns_bg{ | |||
| width: 94%; | |||
| background: #fff; | |||
| border-radius: 16rpx; | |||
| margin: 30rpx auto 0; | |||
| margin: 30rpx auto; | |||
| padding: 20rpx 0; | |||
| box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); | |||
| } | |||
| @@ -398,9 +484,10 @@ page{ | |||
| line-height:34rpx; | |||
| } | |||
| .chengzhang_h{ | |||
| color: #3C3C3C; | |||
| font-size:24rpx; | |||
| font-weight: 600; | |||
| /* color: #fff; */ | |||
| font-size:28rpx; | |||
| margin-right: 10rpx; | |||
| /* font-weight: 600; */ | |||
| } | |||
| .my_line{ | |||
| margin: 0 10rpx; | |||
| @@ -15,6 +15,7 @@ Page({ | |||
| continueSign:'',//连续签到天数 | |||
| signInDay:'',//0能签到 1是不能签到 | |||
| rules:[],//积分规则 | |||
| rewardPoints:"",//记录签到后的奖励积分 | |||
| }, | |||
| getSignRule(){//查询签到规则 | |||
| Http.get({ | |||
| @@ -27,16 +28,16 @@ Page({ | |||
| if (item.id == 17 || item.id == 18 || item.id == 19 || item.id == 20){ | |||
| tempArr.push(item) | |||
| } | |||
| if (this.data.continueSign>7){ | |||
| }) | |||
| if (this.data.continueSign>=7){ | |||
| tempArr[1].activity=1 | |||
| if (this.data.continueSign > 14){ | |||
| if (this.data.continueSign >= 14){ | |||
| tempArr[2].activity = 1 | |||
| if (tempArr[1].activity = 28){ | |||
| if (tempArr[1].activity >= 28){ | |||
| tempArr[3].activity = 1 | |||
| } | |||
| } | |||
| } | |||
| }) | |||
| this.setData({ | |||
| rules: tempArr | |||
| }) | |||
| @@ -68,6 +69,9 @@ Page({ | |||
| }).then(res=>{ | |||
| let{code}=res | |||
| if(code==200){ | |||
| this.setData({ | |||
| rewardPoints: res.data.credit | |||
| }) | |||
| this.setContinuousDye() | |||
| this.setHide() | |||
| } | |||
| @@ -6,10 +6,17 @@ | |||
| <detelsit allFlag="{{false}}" childUrl="{{childUrl}}" activityStyle=" color:#ff6600"></detelsit> | |||
| <view class="singBtn" bindtap="setSign" wx:if="{{signInDay==0}}">签到领取积分</view> | |||
| <view class="guanSingBtn" wx:if="{{signInDay==1}}">签到领取积分</view> | |||
| <view class="singvAwardBox" wx:for="{{rules}}" wx:key="index"> | |||
| <view class="singvAwardBox" wx:for="{{rules}}" wx:key="index" wx:if="{{item.score!=0}}"> | |||
| <view class="singvLsit"> | |||
| <view class="singvLsit_item_l"> {{item.desc}}</view> | |||
| <view class="singvLsit_item_r"> {{score}}积分</view> | |||
| <view class="singvLsit_item_r"> {{item.score+''}} 积分</view> | |||
| <view class="getBtn" wx:if="{{(index==0&&signInDay==1) || item.activity==1&&index!=0}}">已领取</view> | |||
| </view> | |||
| </view> | |||
| <view class="shadeBox" catchtouchmove="true" wx:if="{{hideFlag}}"> | |||
| <view class="shade"> | |||
| <view class="shadeTitle">签到成功</view> | |||
| <view class="shadeNum">恭喜您已领取{{rewardPoints}}积分</view> | |||
| <view class="shadeBtn" bindtap="setHide">开心收下</view> | |||
| </view> | |||
| </view> | |||
| @@ -19,6 +19,12 @@ Page({ | |||
| startDate:'', | |||
| endDate:'' | |||
| }, | |||
| goActivity(e){ | |||
| let id = e.currentTarget.dataset.id | |||
| wx.navigateTo({ | |||
| url: `/pages/radetail/index?id=${id}`, | |||
| }) | |||
| }, | |||
| getDays(year, month) { //获取每月有多少天 | |||
| let tempDateArr = [] | |||
| let thenDate = new Date(year, month, 0).getDate() | |||
| @@ -1,11 +1,11 @@ | |||
| <navbar back home text="活动日历" background='#fff'></navbar> | |||
| <view style="height:{{navigationBarHeight}} "></view> | |||
| <detelsit allFlag="true" bind:setDate="getDate" childUrl="{{childUrl}}" activityStyle=" color:red"></detelsit> | |||
| <view class="activityBox" wx:for="{{list}}" wx:key="index"> | |||
| <view class="activityBox" wx:for="{{list}}" wx:key="index" bindtap="goActivity" data-id="{{item.id}}"> | |||
| <image class="activity" src="{{item.coverImg}}"></image> | |||
| <view class="title">{{item.title}}</view> | |||
| <view class="text">报名时间:{{item.startTime}}至{{item.endTime}}</view> | |||
| <view class="text">活动时间:{{item.activityStartTime}}至{{item.activityEndTime}}</view> | |||
| </view> | |||
| <view class="noData" wx:if="{{list.length==0}}">当月商场为设置活动,敬请期待!</view> | |||
| <view class="loading" wx:if="{{list.length!=0}}">到底了!</view> | |||
| <view class="noData" wx:if="{{list.length==0}}">当月商场未设置活动,敬请期待!</view> | |||
| <view class="loading" wx:if="{{list.length!=0}}">到底啦!</view> | |||
| @@ -1,7 +1,9 @@ | |||
| .activityBox { | |||
| width: 96%; | |||
| margin: 20rpx auto; | |||
| width: 640rpx; | |||
| background-color: #fff; | |||
| margin: 0 auto 46rpx auto; | |||
| text-align: center; | |||
| border-radius: 20rpx; | |||
| } | |||
| .activity { | |||
| @@ -10,7 +12,7 @@ | |||
| width: 640rpx; | |||
| height: 270rpx; | |||
| top: 11%; | |||
| background-color: dodgerblue; | |||
| /* background-color: dodgerblue; */ | |||
| border-radius: 20rpx; | |||
| } | |||
| @@ -4,7 +4,7 @@ | |||
| <view class="Box"> | |||
| <view class="le_box"> | |||
| <view class="{{tierFalg==index?'floor_a':floor}}" wx:for="{{dataLsit[falgFloor].floors}}" wx:key="index" bindtap="setTierFalg" data-index="{{index}}"> | |||
| <view class="{{tierFalg==index?'floor_a':'floor'}}" wx:for="{{dataLsit[falgFloor].floors}}" wx:key="index" bindtap="setTierFalg" data-index="{{index}}"> | |||
| <text class="text">{{item.floorName}}</text> | |||
| <!-- <text class="active" wx:if="{{tierFalg==index}}"></text> --> | |||
| </view> | |||
| @@ -19,7 +19,7 @@ | |||
| <view class="ri_box"> | |||
| <image mode="widthFix" class="dt_2_img" src="{{tmpePicture}}" wx:if="{{tmpePicture!=''}}" bindtap="lookimg" bindload="imgload"></image> | |||
| <!-- <image class="dt_2_img_w_H" src="{{tmpePicture}}" wx:if="{{tmpePicture!=''}}" bindtap="lookimg" bindload="imgload" wx:if="{{img_W_H_flag}}"></image> --> | |||
| <view class="noIMg" wx:if="{{tmpePicture==''}}">暂未配置</view> | |||
| <view class="noIMg" wx:if="{{tmpePicture==''}}">该商场暂未配置</view> | |||
| </view> | |||
| </view> | |||
| </view> | |||
| @@ -36,33 +36,37 @@ position: fixed; | |||
| .floor_a { | |||
| position: relative; | |||
| width: 139rpx; | |||
| height: 100rpx; | |||
| line-height: 100rpx; | |||
| width: 100rpx; | |||
| height: 60rpx; | |||
| line-height: 60rpx; | |||
| text-align: center; | |||
| font-size: 30rpx; | |||
| /* font-size: 30rpx; */ | |||
| font-family: PingFangSC-Semibold; | |||
| color: #3c3c3c; | |||
| background: #fff; | |||
| color: #fff; | |||
| background: #cc9966; | |||
| font-weight: 500; | |||
| border: 1rpx #fff solid; | |||
| } | |||
| .floor { | |||
| position: relative; | |||
| width: 139rpx; | |||
| height: 100rpx; | |||
| line-height: 100rpx; | |||
| width: 100rpx; | |||
| height: 60rpx; | |||
| line-height: 60rpx; | |||
| text-align: center; | |||
| font-size: 26rpx; | |||
| /* font-size: 30rpx; */ | |||
| font-family: PingFangSC-Semibold; | |||
| color: #a6a6a6; | |||
| background: #fff; | |||
| font-weight: 500; | |||
| color: #000; | |||
| } | |||
| .text { | |||
| width: 100%; | |||
| height: 100rpx; | |||
| height: 60rpx; | |||
| text-align: center; | |||
| line-height: 100rpx; | |||
| line-height: 60rpx; | |||
| font-size: 28rpx; | |||
| } | |||
| .active { | |||
| position: absolute; | |||
| @@ -86,7 +90,7 @@ position: fixed; | |||
| line-height: 60rpx; | |||
| height: 60rpx; | |||
| width: 100rpx; | |||
| background-color: #409EFF; | |||
| background-color: #cc9966; | |||
| color: #fff; | |||
| } | |||
| .areaItem{ | |||
| @@ -103,8 +107,8 @@ position: fixed; | |||
| width: 92%; | |||
| margin: 0 2%; | |||
| text-align: center; | |||
| height: 50vh; | |||
| line-height: 50vh; | |||
| height: 1100rpx; | |||
| line-height: 1100rpx; | |||
| font-size: 36rpx; | |||
| border: #fff solid 10rpx; | |||
| } | |||
| @@ -4,7 +4,8 @@ module.exports = { | |||
| "user": { | |||
| "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" | |||
| "view":"#FD832D", | |||
| "backColor":"#cc6633" | |||
| }, | |||
| //首页 | |||
| "main": { | |||
| @@ -1,5 +1,13 @@ | |||
| const baseUrl = 'https://formall.oss-accelerate.aliyuncs.com/cimg/' | |||
| module.exports = { | |||
| 'xiangshang':{ | |||
| 'url': baseUrl +"xiangshang.png", | |||
| "name":"" | |||
| }, | |||
| 'map':{ | |||
| 'url': baseUrl + "ditufubiao.png", | |||
| "name": "" | |||
| }, | |||
| 'concealBnt':{ | |||
| "url": baseUrl +'xiala.png', | |||
| "naem":'' | |||