diff --git a/components/dateLsit/dateLsit.js b/components/dateLsit/dateLsit.js
index 67365b6..59e5e32 100644
--- a/components/dateLsit/dateLsit.js
+++ b/components/dateLsit/dateLsit.js
@@ -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 = []
diff --git a/components/dateLsit/dateLsit.wxml b/components/dateLsit/dateLsit.wxml
index 91a9661..57bc0e1 100644
--- a/components/dateLsit/dateLsit.wxml
+++ b/components/dateLsit/dateLsit.wxml
@@ -9,6 +9,6 @@
{{ (item.value==dey&&monthFlgh==item.m&&item.y==yearFlgh)?'':item.value }}
-
+
\ No newline at end of file
diff --git a/components/hot/index.wxss b/components/hot/index.wxss
index a197567..9543151 100644
--- a/components/hot/index.wxss
+++ b/components/hot/index.wxss
@@ -2,7 +2,7 @@
@import "../../app.wxss";
.hotBox{
width:710rpx;
- margin: 20rpx auto 0;
+ margin: 0 auto ;
}
.hotTitle{
width: 100%;
diff --git a/index/index.wxml b/index/index.wxml
index c7e1e93..8d7aa09 100644
--- a/index/index.wxml
+++ b/index/index.wxml
@@ -52,7 +52,8 @@
消费卡
-
+
+
直播厅
@@ -61,19 +62,19 @@
游戏频道
-->
-
+
每日签到
-
+
活动日历
积分商城
-
-
+
+
游戏
@@ -130,9 +131,9 @@
-
+
diff --git a/index/index.wxss b/index/index.wxss
index 3a57963..b68e8d8 100644
--- a/index/index.wxss
+++ b/index/index.wxss
@@ -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{
diff --git a/index/searchbar.js b/index/searchbar.js
index 87f6e33..8c26e4e 100644
--- a/index/searchbar.js
+++ b/index/searchbar.js
@@ -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) {
diff --git a/index/searchbar.wxml b/index/searchbar.wxml
index 3f6c61e..57c2683 100644
--- a/index/searchbar.wxml
+++ b/index/searchbar.wxml
@@ -43,4 +43,7 @@
暂无数据
-
\ No newline at end of file
+
+
+
+
\ No newline at end of file
diff --git a/index/searchbar.wxss b/index/searchbar.wxss
index 8530e8e..c91ae47 100644
--- a/index/searchbar.wxss
+++ b/index/searchbar.wxss
@@ -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;
diff --git a/index/user.js b/index/user.js
index e1ea4bb..c595d8a 100644
--- a/index/user.js
+++ b/index/user.js
@@ -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
diff --git a/index/user.wxml b/index/user.wxml
index 7c86233..473eba3 100644
--- a/index/user.wxml
+++ b/index/user.wxml
@@ -6,10 +6,10 @@
-
+
@@ -17,29 +17,42 @@
-
-
+
+
+
-
- 我的手机号:
- {{curPhone}}
- [微信授权手机号]
+
+
+ {{curPhone}}
+ [微信授权手机号]
-
- 获取微信授权手机号
+
+ 获取微信授权手机号
-
- 我的
- 成长值{{score}}
- |
-
- 更多成长值
-
-
+
+ {{memberName}}
+ {{levelName}}
+
+
+
+
+ 会员码:{{userId}}
+
+ 我的
+ 成长值{{score}}
+ |
+
+ 更多成长值
+
+
+
+
+
+
@@ -66,87 +79,131 @@
+
+
+
+
+ 积分商城
+
+
-
-
-
+
+
+
+ 我的砍价
+ >
+
+
+
+
+ 我的拼团
+ >
+
+
+
+
+ 我的活动
+ >
+
+
+
+
+ 特享礼遇
+ >
+
+
+
+
+ 兑换
+ >
+
+
+
+
+ 关于我们
+ >
+
+
+
+
-
+
-
+
-
+
-
+
+
-
+
-
+
-
+
-
+
+
-
+
-
+
-
+
-
+
+
diff --git a/index/user.wxss b/index/user.wxss
index 4b3226e..102f32e 100644
--- a/index/user.wxss
+++ b/index/user.wxss
@@ -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;
diff --git a/pages/activityCalendar/activityCalendar.js b/pages/activityCalendar/activityCalendar.js
index a11130b..f0fab12 100644
--- a/pages/activityCalendar/activityCalendar.js
+++ b/pages/activityCalendar/activityCalendar.js
@@ -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()
}
diff --git a/pages/activityCalendar/activityCalendar.wxml b/pages/activityCalendar/activityCalendar.wxml
index 626a867..6fa0a26 100644
--- a/pages/activityCalendar/activityCalendar.wxml
+++ b/pages/activityCalendar/activityCalendar.wxml
@@ -6,10 +6,17 @@
签到领取积分
签到领取积分
-
+
{{item.desc}}
- {{score}}积分
+ {{item.score+''}} 积分
已领取
+
+
+ 签到成功
+ 恭喜您已领取{{rewardPoints}}积分
+ 开心收下
+
+
diff --git a/pages/dateLsit/dateLsit.js b/pages/dateLsit/dateLsit.js
index e06b43d..b1fb680 100644
--- a/pages/dateLsit/dateLsit.js
+++ b/pages/dateLsit/dateLsit.js
@@ -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()
diff --git a/pages/dateLsit/dateLsit.wxml b/pages/dateLsit/dateLsit.wxml
index dd836d3..2891624 100644
--- a/pages/dateLsit/dateLsit.wxml
+++ b/pages/dateLsit/dateLsit.wxml
@@ -1,11 +1,11 @@
-
+
{{item.title}}
报名时间:{{item.startTime}}至{{item.endTime}}
活动时间:{{item.activityStartTime}}至{{item.activityEndTime}}
- 当月商场为设置活动,敬请期待!
- 到底了!
+ 当月商场未设置活动,敬请期待!
+ 到底啦!
diff --git a/pages/dateLsit/dateLsit.wxss b/pages/dateLsit/dateLsit.wxss
index fe2ba66..9fa27f8 100644
--- a/pages/dateLsit/dateLsit.wxss
+++ b/pages/dateLsit/dateLsit.wxss
@@ -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;
}
diff --git a/pages/marketAtlas/marketAtlas.wxml b/pages/marketAtlas/marketAtlas.wxml
index 1f3d9d3..af074a9 100644
--- a/pages/marketAtlas/marketAtlas.wxml
+++ b/pages/marketAtlas/marketAtlas.wxml
@@ -4,7 +4,7 @@
-
+
{{item.floorName}}
@@ -19,7 +19,7 @@
- 暂未配置
+ 该商场暂未配置
\ No newline at end of file
diff --git a/pages/marketAtlas/marketAtlas.wxss b/pages/marketAtlas/marketAtlas.wxss
index ec60a0a..0bb06d6 100644
--- a/pages/marketAtlas/marketAtlas.wxss
+++ b/pages/marketAtlas/marketAtlas.wxss
@@ -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;
}
\ No newline at end of file
diff --git a/utils/bgColor.js b/utils/bgColor.js
index e25d99d..99c3b1a 100644
--- a/utils/bgColor.js
+++ b/utils/bgColor.js
@@ -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": {
diff --git a/utils/imgurl.js b/utils/imgurl.js
index a43179f..da39c32 100644
--- a/utils/imgurl.js
+++ b/utils/imgurl.js
@@ -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":''