From 17393e222f09db523450d50f7cb8d654d743c155 Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Wed, 12 Dec 2018 14:55:47 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=88=B8=E5=95=86=E6=88=B7=E5=8F=B7=E7=9A=84?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=89=B9=E4=BA=AB=E7=A4=BC=E9=81=87?=
=?UTF-8?q?=EF=BC=8C=E8=8E=B7=E5=8F=96=E6=89=93=E6=8A=98=E5=95=86=E6=88=B7?=
=?UTF-8?q?=E5=88=97=E8=A1=A8][=E4=BF=AE=E6=94=B9]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/config.js | 7 ++-
pages/couponorder/detail/index.js | 6 +--
pages/couponorder/detail/index.wxml | 21 +++++---
pages/couponorder/detail/index.wxss | 6 +--
pages/grade/grade.js | 11 ++++
pages/passCar/couponList/couponList.js | 3 ++
pages/passCar/passCar.js | 12 +++--
pages/specialcourtesy/specialcourtesy.js | 25 ++++++++--
pages/specialcourtesy/specialcourtesy.wxml | 58 +++-------------------
pages/user/index.js | 19 +++++++
pages/user/index.wxml | 3 +-
11 files changed, 96 insertions(+), 75 deletions(-)
diff --git a/config/config.js b/config/config.js
index 3a5e8fe..16cbb28 100755
--- a/config/config.js
+++ b/config/config.js
@@ -163,7 +163,12 @@ var config = {
/**
* 提交问卷
*/
- answerQuestion:"/wxQuestion/answerQuestion"
+ answerQuestion:"/wxQuestion/answerQuestion",
+ /**
+ *
+ 获取打折商户列表
+ */
+ discountMerchantList:"/mall/discountMerchantList"
},
weapp: {
diff --git a/pages/couponorder/detail/index.js b/pages/couponorder/detail/index.js
index 01c4792..18d5fb3 100644
--- a/pages/couponorder/detail/index.js
+++ b/pages/couponorder/detail/index.js
@@ -150,11 +150,11 @@ Page({
});
})
},
- phone: function () {
+ phone: function (e) {
let that = this;
- if (that.data.data.merchantLinkPhone) {
+ if (e.currentTarget.dataset.merchantlinkphone) {
wx.makePhoneCall({
- phoneNumber: that.data.data.merchantLinkPhone
+ phoneNumber: e.currentTarget.dataset.merchantlinkphone
});
}
}
diff --git a/pages/couponorder/detail/index.wxml b/pages/couponorder/detail/index.wxml
index d969019..e7a3b65 100644
--- a/pages/couponorder/detail/index.wxml
+++ b/pages/couponorder/detail/index.wxml
@@ -39,17 +39,22 @@
适用门店
-
-
-
+
+
+
+
+
+
+ {{item.merchantName}}
+ {{item.addr}}{{item.buildingName}}{{item.floorName}}
+
+
+
+
-
- {{data.merchantName}}
- {{data.addr}}{{data.buildingName}}{{data.floorName}}
-
-
+
diff --git a/pages/couponorder/detail/index.wxss b/pages/couponorder/detail/index.wxss
index c8c6906..e4bd287 100644
--- a/pages/couponorder/detail/index.wxss
+++ b/pages/couponorder/detail/index.wxss
@@ -103,7 +103,7 @@ page {
left: 0;
right: 0;
margin: auto;
- top: 5rpx;
+ top: -50rpx;
border-radius: 50%;
overflow: hidden;
}
@@ -201,7 +201,6 @@ page {
padding: 30rpx 4% 0;
display: flex;
position: relative;
- z-index: 100;
}
.shiji {
@@ -226,7 +225,6 @@ page {
.posi_logo view:nth-child(2) {
position: relative;
- z-index: 100;
display: flex;
flex-direction: column;
flex: 8;
@@ -268,7 +266,7 @@ page {
margin: auto;
width: 50rpx;
height: 50rpx;
- z-index: 1000000;
+ z-index: 10;
}
.notes view:nth-child(1) {
diff --git a/pages/grade/grade.js b/pages/grade/grade.js
index 20d3b2c..9a26ef4 100644
--- a/pages/grade/grade.js
+++ b/pages/grade/grade.js
@@ -36,6 +36,17 @@ Page({
}
})
.then(res=>{
+ // if true 则开启特享礼遇
+ if (res.data.discountEnable) {
+ that.setData({
+ discountEnable: true
+ })
+ }
+ else {
+ that.setData({
+ discountEnable: false
+ })
+ }
that.setData({
flags: 'have',
rules: JSON.parse(res.data.score.rules).concat(JSON.parse(res.data.score.rules)[1].childs),
diff --git a/pages/passCar/couponList/couponList.js b/pages/passCar/couponList/couponList.js
index 9f07bf1..5aaa087 100644
--- a/pages/passCar/couponList/couponList.js
+++ b/pages/passCar/couponList/couponList.js
@@ -88,6 +88,9 @@ Page({
});
})
.catch(err => {
+ setTimeout(function () {
+ wx.hideLoading();
+ }, 1200);
wx.showToast({
title: err.errMsg,
icon: 'none',
diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js
index 67b75bd..76dbac8 100644
--- a/pages/passCar/passCar.js
+++ b/pages/passCar/passCar.js
@@ -19,6 +19,7 @@ Page({
duration: 1000,
current: 0,
stopFees: {},
+ scroll:true,
canIUse: wx.canIUse("navigator")
},
/**
@@ -36,7 +37,9 @@ Page({
/**
* 获得停车费用
*/
- that.getStopFee(listCardNum);
+ // if(that.data.scroll){
+ // that.getStopFee(listCardNum);
+ // }
},
gotomange: function() {
wx.navigateTo({
@@ -549,7 +552,9 @@ Page({
stopFees: res.data,
timecha: Util.timecha(res.data.exitTime, res.data.entranceTime)
});
- console.log(that.data.extraData)
+ // that.setData({
+ // scroll:true
+ // })
})
.catch(error => {
console.log(error)
@@ -559,7 +564,8 @@ Page({
showCancel: false
})
that.setData({
- stopFees: {}
+ stopFees: {},
+ // scroll: false
})
});
},
diff --git a/pages/specialcourtesy/specialcourtesy.js b/pages/specialcourtesy/specialcourtesy.js
index 252e8b0..89032bb 100644
--- a/pages/specialcourtesy/specialcourtesy.js
+++ b/pages/specialcourtesy/specialcourtesy.js
@@ -1,6 +1,7 @@
-// pages/specialcourtesy/specialcourtesy.js
+var config = require("../../config/config.js");
+var app = getApp();
+const Http = require("../../utils/HttpBasics");
Page({
-
/**
* 页面的初始数据
*/
@@ -21,12 +22,28 @@ Page({
onReady: function () {
},
-
+ phone: function (e) {
+ console.log(e)
+ let that = this;
+ wx.makePhoneCall({
+ phoneNumber: e.currentTarget.dataset.merchantlinkphone
+ });
+ },
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
-
+ let that = this;
+ Http.get({
+ url: config.api.discountMerchantList,
+ data: {}
+ })
+ .then(res=>{
+ console.log(res)
+ that.setData({
+ discountMerchantList:res.data
+ })
+ })
},
/**
diff --git a/pages/specialcourtesy/specialcourtesy.wxml b/pages/specialcourtesy/specialcourtesy.wxml
index 303e3f0..19a1b86 100644
--- a/pages/specialcourtesy/specialcourtesy.wxml
+++ b/pages/specialcourtesy/specialcourtesy.wxml
@@ -5,63 +5,19 @@
以下为商城会员对应门店的优惠折扣
-
+
>
- 7.9折
- 缤纷卡
- 美车堂
+ {{item.vipDiscountRate1/100}}折
+ {{item.merchantName}}
-
-
-
-
-
- >
-
-
- 7.9折
- 缤纷卡
- 美车堂
-
-
-
-
-
-
- >
-
-
- 7.9折
- 缤纷卡
- 美车堂
-
-
-
-
-
-
- >
-
-
- 7.9折
- 缤纷卡
- 美车堂
-
diff --git a/pages/user/index.js b/pages/user/index.js
index b28942d..d8d427c 100644
--- a/pages/user/index.js
+++ b/pages/user/index.js
@@ -136,7 +136,26 @@ Page({
mask: false
});
})
+ //暂时注释
// that.getrun();
+ // 判断是否显示特享礼遇
+ Http.get({
+ url: config.api.scoreLevelInfo,
+ data: {}
+ })
+ .then(res=>{
+ // if true 则开启特享礼遇
+ if (res.data.discountEnable){
+ that.setData({
+ discountEnable:true
+ })
+ }
+ else{
+ that.setData({
+ discountEnable: false
+ })
+ }
+ })
},
hideQrcode:function(){
let that = this;
diff --git a/pages/user/index.wxml b/pages/user/index.wxml
index 58700bc..bd784e5 100644
--- a/pages/user/index.wxml
+++ b/pages/user/index.wxml
@@ -71,7 +71,8 @@
-
+
+
特享礼遇