diff --git a/pages/integralmall/index.js b/pages/integralmall/index.js
index c662e20..1da5de4 100644
--- a/pages/integralmall/index.js
+++ b/pages/integralmall/index.js
@@ -10,7 +10,7 @@ Page({
loadingUrl: imgurl.loading.url,
nodata: imgurl.nodata.url,
wmhome: imgurl.wmhome.url,
- wangmeimeicredit: imgurl.wangmeimeicredit.url,
+ barcode: imgurl.barcode.url,
list: [],
lists: [],
myLists: [],
@@ -23,7 +23,7 @@ Page({
loading: true,
content: '数据正在加载中',
reloadIf: false,
- creditAmount: 0
+ creditAmount: 0,
},
goback: function () {
wx.switchTab({
@@ -70,9 +70,10 @@ Page({
pageSize: 1,
}
}).then(res => {
+ console.log(res.data.list[0]),
wx.stopPullDownRefresh();
that.setData({
- creditAmount: res.data.list[0].creditAmount
+ creditAmount: res.data.list[0].creditAmount,
});
})
.catch(err => {
@@ -90,6 +91,39 @@ Page({
url: '/pages/integralmall/integraHistory/index',
})
},
+ getmemberId: function (token) {
+ let that = this;
+ Http.get({
+ url: config.api.getScore,
+ data: {
+ token: token
+ }
+ }).then(res => {
+ that.setData({
+ levelName: res.data.levelName,
+ upgradePercent: res.data.upgradePercent,
+ upgradeScore: res.data.upgradeScore,
+ credit: res.data.credit ? res.data.credit : 0,
+ score: res.data.score
+ })
+ if (res.data.nickName) {
+ that.setData({
+ ismember: true,
+ memberId: res.data.id
+ })
+ var initUrl = JSON.stringify({
+ flagid: res.data.id
+ });
+ }
+ })
+ .catch(err => {
+ wx.showModal({
+ title: '提示',
+ content: err.message,
+ showCancel: false
+ })
+ })
+ },
getList(pageNum) {
var that = this;
console.log(pageNum)
diff --git a/pages/integralmall/index.json b/pages/integralmall/index.json
index 86878ed..28ea0b0 100644
--- a/pages/integralmall/index.json
+++ b/pages/integralmall/index.json
@@ -1,5 +1,7 @@
{
"navigationBarTitleText": "积分商城",
+ "navigationBarBackgroundColor": "#FD832D",
+ "navigationBarTextStyle": "white",
"enablePullDownRefresh": true,
"usingComponents": {
"c-banner": "../../components/spellbanner/index",
diff --git a/pages/integralmall/index.wxml b/pages/integralmall/index.wxml
index bc00569..a6ab592 100644
--- a/pages/integralmall/index.wxml
+++ b/pages/integralmall/index.wxml
@@ -1,37 +1,59 @@
-
- 我的积分
- {{creditAmount}}
+
+
+
+
+
+
+ {{levelName}}
+
+
+
+
+
+
+ 还需1成长值升级
+ {{creditAmount}}
+
+ 可用积分>
+
+
+
+
+
+
暂无数据
-
- 热门好礼
-
{{item.title}}
-
+
{{item.creditPrice}}
积分
+ {{'原价 '+item.priceStr+'元'}}
- {{'原价 '+item.priceStr+'元'}}
立即换购
已兑完
- 剩余{{item.remainInventory}}
+
+
+
+
+ 可用于店内套餐消费
+ 剩余222张
diff --git a/pages/integralmall/index.wxss b/pages/integralmall/index.wxss
index 13cce66..7e34d85 100644
--- a/pages/integralmall/index.wxss
+++ b/pages/integralmall/index.wxss
@@ -1,27 +1,113 @@
/* pages/spellGroup/spellGroup.wxss */
-.topbg image{
+
+.topbg {
+ margin-bottom: 30rpx;
+ position: relative;
+ width:100%;
+ height:234rpx;
+ background:linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%);
+}
+.user-avatar {
+ position: absolute;
+ width: 82rpx;
+ height: 82rpx;
+ border-radius: 50%;
+ overflow: hidden;
+ top:26rpx;
+ left:60rpx;
+}
+.user-avatar open-data {
display: block;
width: 100%;
+ height: 100%;
}
-.topbg {
- position: relative;
+.name{
+ float: left;
+ color: #FFFFFF;
+ font-size:32rpx;
+ font-family:PingFangSC-Medium;
+ font-weight:500;
+ margin:0 20rpx;
+}
+.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;
+ color:rgba(255,255,255,1);
+ line-height:32rpx;
+ float: left;
+ margin-top: 8rpx;
+}
+.chengzhang {
+ font-size: 24rpx;
+ font-weight: 400;
+ color: #FFFFFF;
+ margin-left: 10rpx;
}
-.topbg text{
+.myName{
position: absolute;
- left: 0;
- right: 0;
- text-align: center;
+ left: 152rpx;
+ top:26rpx;
font-size: 32rpx;
- color: #fff;
+ height: 82rpx;
+}
+
+.view {
+ position: absolute;
+ top: 45rpx;
+ left: 170rpx;
}
-.topbg .my{
- top:25rpx;
+progress{
+ width:214rpx;
+ height: 6rpx;
+ display:inline-block;
+ border-radius:60rpx;
+ overflow:hidden;
+}
+.msg{
+ position: absolute;
+ top: 68rpx;
+ left:400rpx;
+ font-size:10px!important;
+ font-family:PingFangSC-Regular;
+ font-weight:400;
+ color:rgba(255,255,255,1);
+ width: 200rpx;
+}
+
+.jifen{
+ font-size: 20rpx;
+ font-weight: 500;
+ color: #FFFFFF;
+ width: 500rpx;
+ height:30rpx;
+ position: absolute;
+ top: 176rpx;
+ left:70rpx;
}
.topbg .score{
- top:60rpx;
- font-size: 56rpx;
- font-weight: bold;
+ font-size: 40rpx;
+ font-weight: 500;
+ position: absolute;
+ top:122rpx;
+ left:70rpx;
+ color: #FFFFFF;
}
+.qrcode{
+ width: 84rpx;
+ height: 84rpx;
+ position: absolute;
+ bottom: 38rpx;
+ right: 48rpx;
+}
+.qrcode image {
+ margin: auto;
+ width: 84rpx;
+}
+
page {
height: auto;
overflow: auto;
@@ -87,33 +173,58 @@ image{
overflow: hidden;
}
.content .sepll-list{
- width: 690rpx;
+ width: 714rpx;
height: 230rpx;
background: #fff;
border-radius: 30rpx;
margin: 0 auto 30rpx;
}
+.content .spell-bot{
+ width: 674rpx;
+ float: left;
+ font-size: 24rpx;
+ height: 60rpx;
+ line-height: 60rpx;
+ border-top: 1rpx #E1E1E1 dashed;
+ margin: 0 20rpx;
+}
+.spell-bot .botMsg{
+ width: 40%;
+ height: 100%;
+ float: left;
+ margin-left: 20rpx;
+ color: #A6A6A6;
+}
+.spell-bot .botNum{
+ width: 40%;
+ height: 100%;
+ float: right;
+ text-align: right;
+ margin-right: 24rpx;
+ color: #FD782D;
+}
.content .spell-left{
- width: 230rpx;
- height: 230rpx;
+ width: 170rpx;
+ height: 170rpx;
float: left;
}
.content .spell-left image{
- width: 180rpx;
- height: 180rpx;
+ width: 120rpx;
+ height: 120rpx;
margin: 25rpx;
border-radius: 8rpx;
}
.content .spell-center{
float: left;
width: 304rpx;
- height: 100%;
+ height: 170rpx;
}
.content .tilte{
- font-size:30rpx;
+ margin-top: 20rpx;
+ font-size:32rpx;
font-family:PingFang-SC-Bold;
font-weight:bold;
- color:rgba(51,51,51,1);
+ color:#3C3C3C;
line-height:44rpx;
padding-top: 16rpx;
overflow: hidden;
@@ -145,16 +256,17 @@ image{
}
.content .price{
overflow: hidden;
- margin-top: 10rpx;
+ margin-top: 20rpx;
}
.content .price01{
- font-size:50rpx;
+ font-size:40rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
- color:rgba(255,50,50,1);
+ color:#FD832D;
line-height:44rpx;
}
.content .price02{
+ display: inline;
font-size: 24rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
@@ -170,21 +282,21 @@ image{
margin-right: 10rpx;
}
.content .spell-right{
- float: left;
+ float: right;
width: 156rpx;
}
.right-button{
- width:120rpx;
- height:48rpx;
+ width:140rpx;
+ height:52rpx;
font-size:26rpx;
- background:linear-gradient(90deg,rgba(236,59,45,1) 0%,rgba(248,98,52,1) 100%);
- border-radius:8rpx;
+ background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
+ border-radius:20rpx;
font-family:PingFang-SC-Medium;
font-weight:500;
text-align: center;
color:rgba(255,255,255,1);
line-height:44rpx;
- margin: 110rpx auto 0;
+ margin: 88rpx 24rpx 0 0;
margin-top: 110rpx;
}
.right-text{
@@ -313,16 +425,7 @@ image{
font-weight:500;
color:rgba(0,0,0,1);
}
-.hottitle{
- height: 100rpx;
- line-height: 100rpx;
-}
-.hottitle text{
- color: #333;
- font-weight: bold;
- font-size: 36rpx;
- padding-left: 30rpx;
-}
+
button::after{ border: none; }
.goback{
position: fixed;
diff --git a/pages/user/index.js b/pages/user/index.js
index c47b3a0..716f675 100644
--- a/pages/user/index.js
+++ b/pages/user/index.js
@@ -4,6 +4,7 @@ var app = getApp();
const Http = require("../../utils/HttpBasics");
const QR = require("../../utils/memberqrcode.js");
const imgurl = require("../../utils/imgurl");
+const bgColor = require("../../utils/bgColor.js")
Page({
/**
* 页面的初始数据
@@ -119,7 +120,7 @@ Page({
onShow: function() {
let that = this;
that.setData({
- appVersion: extConfig.appVersion
+ appVersion: extConfig.appVersion,
})
/**
* couponNum
@@ -159,7 +160,7 @@ Page({
couponNum2: "couponNum2"
})
};
-
+
Http.get({
url: config.api.getScore,
data: {}
diff --git a/pages/user/index.json b/pages/user/index.json
index 53fccaa..2b8eab6 100644
--- a/pages/user/index.json
+++ b/pages/user/index.json
@@ -3,5 +3,7 @@
"i-button": "../../dist/button/index"
},
"navigationBarTitleText": "我的",
+ "navigationBarBackgroundColor": "#FD832D",
+ "navigationBarTextStyle": "white",
"disableScroll": true
}
\ No newline at end of file
diff --git a/pages/user/index.wxml b/pages/user/index.wxml
index 0ed9bd2..ed0e6ae 100644
--- a/pages/user/index.wxml
+++ b/pages/user/index.wxml
@@ -1,34 +1,31 @@
-
+
+
-
-
- {{levelName}}
- 成长值{{score}}>
-
-
-
-
-
-
+
+
+
+ {{levelName}}
-
-
- 编辑
-
-
-
-
+
+ 我的
+ 成长值{{score}}
+ |
+ 更多成长值
+ 一键领取
+
+
我的订单
+
@@ -38,44 +35,52 @@
-
-
+
- 我的砍价
+ 我的卡包
+
+
+
-
+
+
-
+
+
- 我的卡包
-
-
-
+ 我的砍价
-
+
+
- 积分商城
+ 我的拼团
-
-
+
+
- 特享礼遇
+ 积分商城
-
+
+
+
+
+
+
+
- 我的拼团
+ 特享礼遇
diff --git a/pages/user/index.wxss b/pages/user/index.wxss
index 49cee42..ac9e307 100644
--- a/pages/user/index.wxss
+++ b/pages/user/index.wxss
@@ -14,20 +14,6 @@ page{
background: #fff;
}
-.user-title {
- position: relative;
- box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10);
- border-radius: 8px;
- width: 94%;
- padding-left: 30rpx;
- display: flex;
- flex-direction: row;
- box-sizing: border-box;
- background: #fff;
- margin: 28rpx auto 0;
- border-bottom: 6rpx solid orange;
-}
-
.version {
position: absolute;
right: 0;
@@ -57,53 +43,46 @@ page{
width: 100%;
height: 100%;
}
-
+.user-name{
+ font-family: PingFangSC-Medium;
+ height: 42rpx;
+ margin-left: 310rpx;
+ letter-spacing: 0.64rpx;
+ line-height: 44rpx;
+ margin-top: 66rpx;
+ font-size: 30rpx;
+ color: #3C3C3C;
+ font-weight:600;
+}
.user-phone {
font-family: PingFangSC-Regular;
- height: 120rpx;
- margin-left: 149rpx;
+ height: 30rpx;
letter-spacing: 0.64rpx;
line-height: 44rpx;
- margin-top: 43rpx;
font-size: 36rpx;
color: #000;
+ margin:20rpx 0 50rpx 149rpx;
}
-
.user-avatar {
position: absolute;
- left: 30rpx;
- top: 0;
- bottom: 0;
- width: 120rpx;
- height: 120rpx;
+ width: 128rpx;
+ height: 128rpx;
border-radius: 50%;
overflow: hidden;
- margin: auto;
+ top:-64rpx;
+ left: 300rpx;
}
.chengzhang {
font-size: 24rpx;
font-weight: 400;
- color: rgba(122, 122, 122, 1);
+ color: #FFFFFF;
margin-left: 10rpx;
}
-.chengzhang1 {
- position: absolute;
- right: 0;
- bottom: 0;
- top: 0;
- margin: auto;
- text-align: center;
-}
-
-.chengzhang1 text {
- display: block;
-}
-
.view {
font-size: 24rpx;
- color: #AF6E34;
+ color: #FD832D;
}
.view image {
@@ -112,13 +91,6 @@ page{
margin-top: -6rpx;
}
-.chengzhang1 text {
- text-align: center;
- font-size: 26rpx;
- line-height: 33rpx;
- margin-right: 30rpx;
-}
-
.bannerbg {
width: 100%;
}
@@ -136,11 +108,12 @@ page{
.user-btns{
background: #fff;
- margin-top: 20rpx;
+ /* margin-top: 20rpx; */
+ margin: 20rpx 20rpx 0;
display: flex;
justify-content: space-around;
text-align: center;
- margin-bottom: 50rpx;
+ /* margin-bottom: 20rpx; */
}
.user-btns:nth-of-type(3){
margin-bottom: 0;
@@ -149,7 +122,17 @@ page{
font-size: 30rpx;
letter-spacing: 1.16rpx;
}
+.user_title{
+ position: relative;
+ width: 94%;
+ background: #fff;
+ border-radius: 16rpx;
+ margin: -100rpx auto 0;
+ padding: 20rpx 0;
+ box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10);
+}
.btns_bg{
+ position: relative;
width: 94%;
background: #fff;
border-radius: 16rpx;
@@ -366,5 +349,42 @@ page{
margin-top: 20rpx;
}
-.memberIds {
-}
\ No newline at end of file
+.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;
+ color:rgba(255,255,255,1);
+ line-height:32rpx;
+ float: left;
+ margin-top: 8rpx;
+}
+.my{
+ font-size:24rpx;
+ font-family:PingFangSC-Regular;
+ font-weight:400;
+ color:rgba(166,166,166,1);
+ line-height:34rpx;
+}
+.chengzhang_h{
+ color: #3C3C3C;
+ font-size:24rpx;
+ font-weight: 600;
+}
+.my_line{
+ margin: 0 10rpx;
+}
+.usre_level{
+ font-size:20rpx;
+}
+.name{
+ float: left;
+}
diff --git a/utils/bgColor.js b/utils/bgColor.js
new file mode 100644
index 0000000..f58a353
--- /dev/null
+++ b/utils/bgColor.js
@@ -0,0 +1,16 @@
+module.exports = {
+ colorFirst:{
+ // 我的
+ "user": {
+ "banneColor": "linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%))",
+ },
+ },
+ colorSecond:{
+ // 我的
+ "user": {
+ "banneColor": ''
+ },
+ }
+
+
+}
\ No newline at end of file