From d24463a089e665721492c383f9b97f88aa5e8e23 Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Tue, 30 Oct 2018 17:04:58 +0800
Subject: [PATCH] =?UTF-8?q?[=E7=BD=91=E7=BB=9C=E5=BC=82=E5=B8=B8=E6=83=85?=
=?UTF-8?q?=E5=86=B5=E7=9A=84=E5=88=A4=E6=96=AD=EF=BC=8C=E6=88=90=E9=95=BF?=
=?UTF-8?q?=E5=80=BC][=E5=A2=9E=E5=8A=A0=EF=BC=8C=E4=BF=AE=E6=94=B9]:?=
=?UTF-8?q?=E6=88=90=E9=95=BF=E5=80=BC=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E7=9A=84=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/couponorder/detail/index.js | 2 +-
pages/couponorder/detail/index.wxml | 4 +--
pages/grade/grade.js | 9 ++---
pages/grade/grade.wxml | 52 ++---------------------------
pages/grade/grade.wxss | 4 +++
pages/index/coupons/index.js | 11 +++++-
pages/index/coupons/index.wxml | 1 +
pages/index/coupons/index.wxss | 6 ++++
pages/index/index.js | 12 +++++--
pages/index/index.wxml | 2 +-
10 files changed, 39 insertions(+), 64 deletions(-)
diff --git a/pages/couponorder/detail/index.js b/pages/couponorder/detail/index.js
index 2dcd534..d040255 100644
--- a/pages/couponorder/detail/index.js
+++ b/pages/couponorder/detail/index.js
@@ -17,7 +17,7 @@ Page({
//存储计时器
setInter: "",
staticGamedata: {},
- showIf:false
+ showIf:false,
},
onUnload: function() {
let that = this;
diff --git a/pages/couponorder/detail/index.wxml b/pages/couponorder/detail/index.wxml
index 42ee36f..ee7b375 100644
--- a/pages/couponorder/detail/index.wxml
+++ b/pages/couponorder/detail/index.wxml
@@ -73,12 +73,10 @@
退款时间:
{{updateDate}}
-
订单编号:
{{data.orderId}}
-
@@ -92,7 +90,7 @@
- 新用户专享神秘礼物
+ 专享神秘礼物
独家福利,抢完即止
\ No newline at end of file
diff --git a/pages/grade/grade.js b/pages/grade/grade.js
index c69f422..ed37577 100644
--- a/pages/grade/grade.js
+++ b/pages/grade/grade.js
@@ -36,16 +36,11 @@ Page({
}
})
.then(res=>{
- console.log(res);
+ console.log(JSON.parse(res.data.score.rules));
that.setData({
flags: 'have',
- consumptionScoreNumber: res.data.score.consumptionScoreNumber,
- loginscoreNumber: res.data.score.loginScoreNumber,
- personscoreNumber: res.data.score.personScoreNumber,
- phonescoreNumber: res.data.score.phoneScoreNumber,
- wifiscoreNumber: res.data.score.wifiScoreNumber,
- bindCarScoreNumber: res.data.score.bindCarScoreNumber,
+ rules: JSON.parse(res.data.score.rules),
levelList: res.data.levelList
})
})
diff --git a/pages/grade/grade.wxml b/pages/grade/grade.wxml
index 3b2b348..ee01e6b 100644
--- a/pages/grade/grade.wxml
+++ b/pages/grade/grade.wxml
@@ -2,59 +2,13 @@
生成规则
diff --git a/pages/grade/grade.wxss b/pages/grade/grade.wxss
index 2fd1882..3c04a39 100644
--- a/pages/grade/grade.wxss
+++ b/pages/grade/grade.wxss
@@ -55,6 +55,7 @@
text-align: center;
display: inline-block;
padding-left: 3rpx;
+ margin-right: 30rpx;
}
.view text {
@@ -63,6 +64,9 @@
text-align: center;
color: #fd9643;
line-height: 32rpx;
+ width: 80rpx;
+ margin: 0 auto;
+ white-space: normal;
}
.scroll-view-item > text {
diff --git a/pages/index/coupons/index.js b/pages/index/coupons/index.js
index b13d4c2..e0962b7 100644
--- a/pages/index/coupons/index.js
+++ b/pages/index/coupons/index.js
@@ -7,7 +7,16 @@ Component({
/**
* 组件的属性列表
*/
- properties: {},
+ properties: {
+ loading: {
+ type: Boolean,
+ value: ''
+ },
+ loadingtext: {
+ type: String,
+ value: ''
+ },
+ },
/**
* 组件的初始数据
diff --git a/pages/index/coupons/index.wxml b/pages/index/coupons/index.wxml
index a9cf615..c13001a 100644
--- a/pages/index/coupons/index.wxml
+++ b/pages/index/coupons/index.wxml
@@ -9,4 +9,5 @@
我们正在筹备一大波优惠活动
{{content}}
+ {{loadingtext}}
\ No newline at end of file
diff --git a/pages/index/coupons/index.wxss b/pages/index/coupons/index.wxss
index fd2f4c4..03d4418 100644
--- a/pages/index/coupons/index.wxss
+++ b/pages/index/coupons/index.wxss
@@ -44,3 +44,9 @@
height: 300rpx;
margin: 0 auto 16rpx;
}
+.loadingtext{
+ text-align: center;
+ color: #888;
+ font-size: 30rpx;
+ margin-top:30rpx;
+}
diff --git a/pages/index/index.js b/pages/index/index.js
index a9c6000..afb9e9e 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -6,6 +6,7 @@ Page({
data: {
market: app.globalData.market,
list: [],
+ loading:true,
swiperCurrent: 0,
title:'',
desc:'',
@@ -222,7 +223,15 @@ Page({
console.log("checkUserStatus:res", res);
})
.catch(err => {
- console.log("checkUserStatus:err", err);
+ console.log(err);
+ if(err.errMsg=='request:fail timeout'){
+ setTimeout(function(){
+ that.setData({
+ loading:false,
+ loadingtext:"网络异常,请检查您的网络设置"
+ })
+ },3000)
+ }
if (err.code == 11004) {
// 用户昵称未授权
wx.redirectTo({
@@ -255,7 +264,6 @@ Page({
token: token
}
}).then(res => {
- console.log(res.data,77777)
if (res.data.id){
_this.setData({
showIf:true
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 85edb56..4bd69dd 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -10,6 +10,6 @@
独家福利,抢完即止
-
+
\ No newline at end of file