diff --git a/index/user.js b/index/user.js
index 742ce6c..02fcb77 100644
--- a/index/user.js
+++ b/index/user.js
@@ -13,6 +13,7 @@ Page({
data: {
navigationBarHeight,
ifStoreApp:ifStoreApp,
+ aboutUs: imgurl.aboutUs.url,
banneColor: bgColor.colorFirst.user.banneColor,
levelBg: bgColor.colorFirst.user.levelBg,
view: bgColor.colorFirst.user.view,
diff --git a/index/user.wxml b/index/user.wxml
index f22cc41..0c1bf4e 100644
--- a/index/user.wxml
+++ b/index/user.wxml
@@ -1,6 +1,11 @@
-
+
+
+
+ 关于我们
+
+
@@ -146,9 +151,4 @@
-
-
- 富茂链客好大一广场
- >
-
\ No newline at end of file
diff --git a/index/user.wxss b/index/user.wxss
index feca8b4..927afb3 100644
--- a/index/user.wxss
+++ b/index/user.wxss
@@ -374,6 +374,7 @@ page{
.top{
width: 100%;
height: 234rpx;
+ position: relative;
}
.usre_level{
height:32rpx;
@@ -406,3 +407,22 @@ page{
.name{
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;
+}
\ No newline at end of file
diff --git a/pages/mallInfo/mallInfo.js b/pages/mallInfo/mallInfo.js
index e899564..dca59f9 100644
--- a/pages/mallInfo/mallInfo.js
+++ b/pages/mallInfo/mallInfo.js
@@ -10,6 +10,7 @@ Page({
* 页面的初始数据
*/
data: {
+ teljpgUrl: imgurl.teljpg.url,
navigationBarHeight,
weekName:[],
times:[],
@@ -37,7 +38,7 @@ Page({
let businessHours = JSON.parse(res.data.businessHours)
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.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(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
+ })
+ }
+ },
})
\ No newline at end of file
diff --git a/pages/mallInfo/mallInfo.wxml b/pages/mallInfo/mallInfo.wxml
index 5590e19..ccb3794 100644
--- a/pages/mallInfo/mallInfo.wxml
+++ b/pages/mallInfo/mallInfo.wxml
@@ -10,9 +10,10 @@
{{introduction}}
营业时间 :
-
- {{item.time}}({{item.weekName}})
-
+
+
+ {{item.time}}({{item.weekName}})
+
@@ -21,7 +22,8 @@
热线电话 :
- {{servicePhone}}
+
+ {{servicePhone}}
diff --git a/pages/mallInfo/mallInfo.wxss b/pages/mallInfo/mallInfo.wxss
index 93553ae..9192e7a 100644
--- a/pages/mallInfo/mallInfo.wxss
+++ b/pages/mallInfo/mallInfo.wxss
@@ -81,9 +81,11 @@ page{
font-size: 30rpx;
display: flex;
}
-.times{
+.timesBox{
display: flex;
flex-direction: column;
+}
+.times{
margin-left: 10rpx;
}
.times text{
@@ -92,3 +94,11 @@ page{
.park > text:nth-child(2) ,.phone > text:nth-child(2){
margin-left: 10rpx;
}
+.tel {
+ margin: 0 10rpx;
+ width: 30rpx;
+ height: 30rpx;
+}
+.phoneNum{
+ color:#FD832D;
+}
\ No newline at end of file
diff --git a/utils/imgurl.js b/utils/imgurl.js
index bb7c9ea..b6ba473 100644
--- a/utils/imgurl.js
+++ b/utils/imgurl.js
@@ -717,5 +717,9 @@ module.exports = {
'url': baseUrl + "chenghr.png",
'name': ''
},
+ "aboutUs":{
+ 'url': baseUrl + "aboutUs1.png",
+ 'name': ''
+ }
}
\ No newline at end of file
diff --git a/utils/util.js b/utils/util.js
index a247da3..151cff5 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -17,10 +17,10 @@ function convertUTCTimeToLocalTime(UTCDateString) {
var day = formatFunc(date2.getDate());
var hour = date2.getHours();
var noon = hour >= 12 ? 'PM' : 'AM';
- hour = hour >= 12 ? hour - 12 : hour;
+ hour = hour >= 24 ? hour - 24 : hour;
hour = formatFunc(hour);
var min = formatFunc(date2.getMinutes());
- var dateStr = year + '-' + mon + '-' + day + ' ' + noon + ' ' + hour + ':' + min;
+ var dateStr = ' ' + hour + ':' + min ;
return dateStr;
}
@@ -195,5 +195,6 @@ module.exports = {
fmtDate: fmtDate,
timechuo: timechuo,
timecha: timecha,
- getProxyImgUrl: getProxyImgUrl
+ getProxyImgUrl: getProxyImgUrl,
+ convertUTCTimeToLocalTime: convertUTCTimeToLocalTime
};