From d1d11cfcc94a731320db33b1e596c37b76195904 Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Thu, 28 Mar 2019 12:36:03 +0800
Subject: [PATCH 1/4] =?UTF-8?q?[=E5=85=B3=E6=B3=A8=E5=85=AC=E4=BC=97?=
=?UTF-8?q?=E5=8F=B7][=E4=BF=AE=E6=94=B9]:[=E4=BF=AE=E6=94=B9=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/user/index.wxss | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/pages/user/index.wxss b/pages/user/index.wxss
index fad2fab..3a82c6c 100644
--- a/pages/user/index.wxss
+++ b/pages/user/index.wxss
@@ -33,13 +33,14 @@ page{
}
.version {
- width: 500rpx;
- height: 90rpx;
- line-height: 90rpx;
+ position: absolute;
+ right: 0;
+ width: 307rpx;
+ height: 50rpx;
+ bottom: 0;
text-align: center;
font-size: 30rpx;
color: #999;
- margin: 0 auto;
}
.couponnum {
From 63d5c3852b199c7b6d676fb02b95f436c175f1b0 Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Thu, 28 Mar 2019 14:15:37 +0800
Subject: [PATCH 2/4] =?UTF-8?q?[=E6=88=91=E7=9A=84][=E4=BF=AE=E6=94=B9]:[?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=88=91=E7=9A=84=E7=A0=8D=E4=BB=B7=E5=92=8C?=
=?UTF-8?q?=E6=88=91=E7=9A=84=E6=8B=BC=E5=9B=A2]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/bargain/bargain.js | 22 +++++++++++++++-------
pages/spellGroup/spellGroup.js | 21 +++++++++++++--------
pages/user/index.wxml | 21 +++++++++++++++++++++
pages/user/index.wxss | 11 +++++------
4 files changed, 54 insertions(+), 21 deletions(-)
diff --git a/pages/bargain/bargain.js b/pages/bargain/bargain.js
index 30cd546..cacce2a 100644
--- a/pages/bargain/bargain.js
+++ b/pages/bargain/bargain.js
@@ -24,19 +24,27 @@ Page({
loadingUrl: imgurl.loading.url,
flag: 'bargaingoods',
},
- onLoad: function () {
+ onLoad: function (options) {
+ console.log(options)
let that = this;
+ // options.from =='myhtml'
+ // 来自我的列表
+ if (options && options.from =='myhtml'){
+ that.mybargain();
+ }else{
+ that.getList(1, "bargaingoods");
+ that.setData({
+ flag: "bargaingoods",
+ bargaingoods: true,
+ mybargain: false
+ })
+ }
that.getBannerlist();
var todayDate=new Date().getTime();
that.setData({
todayDate:todayDate
})
- that.getList(1, "bargaingoods");
- that.setData({
- flag: "bargaingoods",
- bargaingoods:true,
- mybargain:false
- })
+
},
/**
* banner
diff --git a/pages/spellGroup/spellGroup.js b/pages/spellGroup/spellGroup.js
index 8dee4b7..896d7b6 100644
--- a/pages/spellGroup/spellGroup.js
+++ b/pages/spellGroup/spellGroup.js
@@ -25,21 +25,26 @@ Page({
content:'数据正在加载中',
flag: 'spellList',
},
- onLoad: function () {
+ onLoad: function (options) {
let that = this;
that.getBannerlist();
var todayDate = new Date().getTime();
that.setData({
todayDate: todayDate
})
- that.getList(1, "spellList");
+ if(options&&options.from=='myhtml'){
+ that.getmyList();
+ }
+ else{
+ that.getList(1, "spellList");
+ that.setData({
+ flag: "spellList",
+ spellList: true,
+ myspellList: false,
+ lists: null
+ })
+ }
that.getUserInfo();
- that.setData({
- flag: "spellList",
- spellList: true,
- myspellList: false,
- lists: null
- })
},
//切换拼团列表
getSpellList(){
diff --git a/pages/user/index.wxml b/pages/user/index.wxml
index eeec8e1..560cef2 100644
--- a/pages/user/index.wxml
+++ b/pages/user/index.wxml
@@ -33,6 +33,26 @@
+
+
+
+
+ 我的砍价
+
+
+
+
+
+
+
+
+
+ 我的拼团
+
+
+
+
+
@@ -72,6 +92,7 @@
+
diff --git a/pages/user/index.wxss b/pages/user/index.wxss
index 3a82c6c..7ba95e4 100644
--- a/pages/user/index.wxss
+++ b/pages/user/index.wxss
@@ -1,6 +1,6 @@
page{
- height: 100%;
- overflow: hidden;
+ overflow-y:visible!important;
+ height: auto!important;
}
.icons {
width: 40rpx;
@@ -10,7 +10,6 @@ page{
.user {
background: #fff;
- min-height: 100vh;
}
.navigator-hover {
@@ -141,7 +140,7 @@ page{
.user-btns {
background: #fff;
- margin-top: 65rpx;
+ margin-top: 20rpx;
padding: 0 30rpx;
}
@@ -211,7 +210,7 @@ page{
.gzh {
/* display: none; */
position: absolute;
- bottom: 16%;
+ bottom: 70rpx;
width: 90%;
left: 0;
right: 0;
@@ -229,7 +228,7 @@ page{
.of {
display: block;
- margin-top: 40rpx;
+ /* margin-top: 40rpx; */
height: 170rpx;
}
From b896af5dca71207ab47349b85d94ff0914ee6e1b Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Thu, 28 Mar 2019 14:40:23 +0800
Subject: [PATCH 3/4] =?UTF-8?q?[=E6=88=91=E7=9A=84=E7=A0=8D=E4=BB=B7][?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9]:[=E6=88=91=E7=9A=84=E7=A0=8D=E4=BB=B7?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/bargain/bargain.wxss | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/bargain/bargain.wxss b/pages/bargain/bargain.wxss
index e5e9110..93ccbef 100644
--- a/pages/bargain/bargain.wxss
+++ b/pages/bargain/bargain.wxss
@@ -399,7 +399,7 @@ page{
margin: 0 auto;
border-radius:15rpx;
box-sizing: border-box;
- margin-top: 320rpx;
+ margin-top: 40rpx;
}
.no-data{
width: 690rpx;
From 01b78fc2444448795239c95a8a8c04aa11777e56 Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Thu, 28 Mar 2019 14:40:50 +0800
Subject: [PATCH 4/4] =?UTF-8?q?[=E7=99=BB=E5=BD=95][=E4=BF=AE=E6=94=B9]:[?=
=?UTF-8?q?=E8=8E=B7=E5=BE=97=E6=88=90=E9=95=BF=E5=80=BC]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/index/index.js | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/pages/index/index.js b/pages/index/index.js
index bfb79ef..ee50683 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -187,6 +187,16 @@ Page({
showPages: true
})
app.globalData.token = res.data.token;
+ if (res.data && res.data.score) {
+ if (res.data.score != 0){
+ }else{
+ wx.showToast({
+ title: '获得' + res.data.score+'成长值',
+ duration:2000,
+ icon:"none"
+ })
+ }
+ }
Http.setToken(res.data.token);
if (options&&(options.couponChannelId || options.orderId)){
that.checkuerstatus(options);