| @@ -13,6 +13,7 @@ Page({ | |||||
| data: { | data: { | ||||
| navigationBarHeight, | navigationBarHeight, | ||||
| ifStoreApp:ifStoreApp, | ifStoreApp:ifStoreApp, | ||||
| aboutUs: imgurl.aboutUs.url, | |||||
| banneColor: bgColor.colorFirst.user.banneColor, | banneColor: bgColor.colorFirst.user.banneColor, | ||||
| levelBg: bgColor.colorFirst.user.levelBg, | levelBg: bgColor.colorFirst.user.levelBg, | ||||
| view: bgColor.colorFirst.user.view, | view: bgColor.colorFirst.user.view, | ||||
| @@ -1,6 +1,11 @@ | |||||
| <navbar text="我的" background='#FD832D' color="white"></navbar> | <navbar text="我的" background='#FD832D' color="white"></navbar> | ||||
| <view class="user" style="padding-top:{{navigationBarHeight}};"> | <view class="user" style="padding-top:{{navigationBarHeight}};"> | ||||
| <view class="top" style='background:{{banneColor}}'></view> | |||||
| <view class="top" style='background:{{banneColor}}'> | |||||
| <view class='aboutUs' bindtap='gomallInfo'> | |||||
| <image class='aboutIcons' src="{{aboutUs}}" mode='widthFix'></image> | |||||
| <text>关于我们</text> | |||||
| </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_title'> | ||||
| <view class="user-avatar" bindtap='gotoedit'> | <view class="user-avatar" bindtap='gotoedit'> | ||||
| @@ -146,9 +151,4 @@ | |||||
| <view class='of' wx:if="{{canIUse}}"> | <view class='of' wx:if="{{canIUse}}"> | ||||
| <official-account class="gzh"></official-account> | <official-account class="gzh"></official-account> | ||||
| </view> | </view> | ||||
| <view class='of1' bindtap='gomallInfo'> | |||||
| <image class='img'></image> | |||||
| <view>富茂链客好大一广场</view> | |||||
| <view>></view> | |||||
| </view> | |||||
| </view> | </view> | ||||
| @@ -374,6 +374,7 @@ page{ | |||||
| .top{ | .top{ | ||||
| width: 100%; | width: 100%; | ||||
| height: 234rpx; | height: 234rpx; | ||||
| position: relative; | |||||
| } | } | ||||
| .usre_level{ | .usre_level{ | ||||
| height:32rpx; | height:32rpx; | ||||
| @@ -406,3 +407,22 @@ page{ | |||||
| .name{ | .name{ | ||||
| float: left; | float: left; | ||||
| } | } | ||||
| .aboutUs{ | |||||
| border-radius: 12rpx; | |||||
| background: #fff; | |||||
| position: absolute; | |||||
| right: 20rpx; | |||||
| display: flex; | |||||
| padding: 10rpx 20rpx; | |||||
| } | |||||
| .aboutUs .aboutIcons { | |||||
| display: block; | |||||
| width: 50rpx; | |||||
| height: 40rpx; | |||||
| line-height: 40rpx; | |||||
| } | |||||
| .aboutUs text { | |||||
| line-height: 60rpx; | |||||
| font-size: 28rpx; | |||||
| color: #888; | |||||
| } | |||||
| @@ -10,6 +10,7 @@ Page({ | |||||
| * 页面的初始数据 | * 页面的初始数据 | ||||
| */ | */ | ||||
| data: { | data: { | ||||
| teljpgUrl: imgurl.teljpg.url, | |||||
| navigationBarHeight, | navigationBarHeight, | ||||
| weekName:[], | weekName:[], | ||||
| times:[], | times:[], | ||||
| @@ -37,7 +38,7 @@ Page({ | |||||
| let businessHours = JSON.parse(res.data.businessHours) | let businessHours = JSON.parse(res.data.businessHours) | ||||
| businessHours.map((item,index)=>{ | businessHours.map((item,index)=>{ | ||||
| item.weekName = [that.data.dateArr.filter(e => e.value == item.week[0])[0].name, that.data.dateArr.filter(e => e.value == item.week[1])[0].name], | item.weekName = [that.data.dateArr.filter(e => e.value == item.week[0])[0].name, that.data.dateArr.filter(e => e.value == item.week[1])[0].name], | ||||
| item.time = [util.fmtDate(item.time[0]), util.fmtDate(item.time[1])] | |||||
| item.time = [util.convertUTCTimeToLocalTime(item.time[0]), util.convertUTCTimeToLocalTime(item.time[1])] | |||||
| console.log(item.time) | console.log(item.time) | ||||
| }) | }) | ||||
| console.log(businessHours,222) | console.log(businessHours,222) | ||||
| @@ -58,5 +59,12 @@ Page({ | |||||
| }) | }) | ||||
| }) | }) | ||||
| }, | }, | ||||
| phone: function (e) { | |||||
| let that = this; | |||||
| if (e.currentTarget.dataset.merchantlinkphone) { | |||||
| wx.makePhoneCall({ | |||||
| phoneNumber: e.currentTarget.dataset.merchantlinkphone | |||||
| }) | |||||
| } | |||||
| }, | |||||
| }) | }) | ||||
| @@ -10,9 +10,10 @@ | |||||
| <text class='introduction'>{{introduction}}</text> | <text class='introduction'>{{introduction}}</text> | ||||
| <view class='time'> | <view class='time'> | ||||
| <text>营业时间 :</text> | <text>营业时间 :</text> | ||||
| <view class='' wx:for="{{businessHoursH}}" wx:key="index" > | |||||
| <text>{{item.time}}({{item.weekName}})</text> | |||||
| <!-- <text>{{item.times}}</text> --> | |||||
| <view class='timesBox'> | |||||
| <view class='times' wx:for="{{businessHoursH}}" wx:key="index" > | |||||
| <text>{{item.time}}({{item.weekName}})</text> | |||||
| </view> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view class='park'> | <view class='park'> | ||||
| @@ -21,7 +22,8 @@ | |||||
| </view> | </view> | ||||
| <view class='phone'> | <view class='phone'> | ||||
| <text>热线电话 :</text> | <text>热线电话 :</text> | ||||
| <text>{{servicePhone}}</text> | |||||
| <image bindtap='phone' data-merchantLinkPhone='{{servicePhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" /> | |||||
| <text class='phoneNum' bindtap='phone' data-merchantLinkPhone='{{servicePhone}}'>{{servicePhone}}</text> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| @@ -81,9 +81,11 @@ page{ | |||||
| font-size: 30rpx; | font-size: 30rpx; | ||||
| display: flex; | display: flex; | ||||
| } | } | ||||
| .times{ | |||||
| .timesBox{ | |||||
| display: flex; | display: flex; | ||||
| flex-direction: column; | flex-direction: column; | ||||
| } | |||||
| .times{ | |||||
| margin-left: 10rpx; | margin-left: 10rpx; | ||||
| } | } | ||||
| .times text{ | .times text{ | ||||
| @@ -92,3 +94,11 @@ page{ | |||||
| .park > text:nth-child(2) ,.phone > text:nth-child(2){ | .park > text:nth-child(2) ,.phone > text:nth-child(2){ | ||||
| margin-left: 10rpx; | margin-left: 10rpx; | ||||
| } | } | ||||
| .tel { | |||||
| margin: 0 10rpx; | |||||
| width: 30rpx; | |||||
| height: 30rpx; | |||||
| } | |||||
| .phoneNum{ | |||||
| color:#FD832D; | |||||
| } | |||||
| @@ -717,5 +717,9 @@ module.exports = { | |||||
| 'url': baseUrl + "chenghr.png", | 'url': baseUrl + "chenghr.png", | ||||
| 'name': '' | 'name': '' | ||||
| }, | }, | ||||
| "aboutUs":{ | |||||
| 'url': baseUrl + "aboutUs1.png", | |||||
| 'name': '' | |||||
| } | |||||
| } | } | ||||
| @@ -17,10 +17,10 @@ function convertUTCTimeToLocalTime(UTCDateString) { | |||||
| var day = formatFunc(date2.getDate()); | var day = formatFunc(date2.getDate()); | ||||
| var hour = date2.getHours(); | var hour = date2.getHours(); | ||||
| var noon = hour >= 12 ? 'PM' : 'AM'; | var noon = hour >= 12 ? 'PM' : 'AM'; | ||||
| hour = hour >= 12 ? hour - 12 : hour; | |||||
| hour = hour >= 24 ? hour - 24 : hour; | |||||
| hour = formatFunc(hour); | hour = formatFunc(hour); | ||||
| var min = formatFunc(date2.getMinutes()); | var min = formatFunc(date2.getMinutes()); | ||||
| var dateStr = year + '-' + mon + '-' + day + ' ' + noon + ' ' + hour + ':' + min; | |||||
| var dateStr = ' ' + hour + ':' + min ; | |||||
| return dateStr; | return dateStr; | ||||
| } | } | ||||
| @@ -195,5 +195,6 @@ module.exports = { | |||||
| fmtDate: fmtDate, | fmtDate: fmtDate, | ||||
| timechuo: timechuo, | timechuo: timechuo, | ||||
| timecha: timecha, | timecha: timecha, | ||||
| getProxyImgUrl: getProxyImgUrl | |||||
| getProxyImgUrl: getProxyImgUrl, | |||||
| convertUTCTimeToLocalTime: convertUTCTimeToLocalTime | |||||
| }; | }; | ||||