From 34373775c96cfaf6a5d3380a6e56711bc2e17570 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Fri, 2 Aug 2019 18:17:47 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=88=A0=E9=99=A4=E6=88=90=E9=95=BF=E5=80=BC?= =?UTF-8?q?=E6=B2=A1=E7=94=A8=E4=BB=A3=E7=A0=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [个人信息][增加]:[增加返回首页] [停车][增加]:[停车列表从0开始] --- app.json | 1 - pages/addPark/addPark.wxss | 2 +- pages/coupon/detail/index.wxss | 2 +- pages/edit/edit.js | 2 ++ pages/edit/edit.json | 4 +++- pages/edit/edit.wxml | 5 +++-- pages/main/index.wxml | 6 +++--- pages/passCar/couponList/couponList.js | 2 +- pages/radetail/index.wxss | 1 - pages/user/scoreHistory/index.js | 28 -------------------------- pages/user/scoreHistory/index.json | 3 --- pages/user/scoreHistory/index.wxml | 4 ---- pages/user/scoreHistory/index.wxss | 14 ------------- 13 files changed, 14 insertions(+), 60 deletions(-) delete mode 100644 pages/user/scoreHistory/index.js delete mode 100644 pages/user/scoreHistory/index.json delete mode 100644 pages/user/scoreHistory/index.wxml delete mode 100644 pages/user/scoreHistory/index.wxss diff --git a/app.json b/app.json index 36c4516..cf0e512 100644 --- a/app.json +++ b/app.json @@ -60,7 +60,6 @@ "pages/discountCardList/discountCardList", "pages/cardListDetail/cardListDetail", "pages/freeBannerDetail/index", - "pages/user/scoreHistory/index", "pages/paySuccess/paySuccess", "pages/ConsumeDetail/ConsumeDetail", "pages/externallinks/index", diff --git a/pages/addPark/addPark.wxss b/pages/addPark/addPark.wxss index c484ac8..7c77cb5 100644 --- a/pages/addPark/addPark.wxss +++ b/pages/addPark/addPark.wxss @@ -159,7 +159,7 @@ page{ .addpark-back { font-size: 30rpx; - color: #5aadfb; + color: #FD832D; float: right; margin: 25rpx 25rpx; } diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss index 9ddd340..bc54d76 100644 --- a/pages/coupon/detail/index.wxss +++ b/pages/coupon/detail/index.wxss @@ -455,10 +455,10 @@ button::after { .b1 { position: fixed; - top: 0px; bottom: 0px; left: 0px; right: 0px; + top:170rpx; background: rgba(0, 0, 0, 0.8); overflow: hidden; z-index: 10; diff --git a/pages/edit/edit.js b/pages/edit/edit.js index 587a6ba..c6789f0 100644 --- a/pages/edit/edit.js +++ b/pages/edit/edit.js @@ -1,3 +1,4 @@ +const navigationBarHeight = (getApp().statusBarHeight + 60) + 'px' const util = require("../../utils/util.js"); const Http = require("../../utils/HttpBasics"); const config = require("../../config/config"); @@ -8,6 +9,7 @@ Page({ * 页面的初始数据 */ data: { + navigationBarHeight, chevronUrl: imgurl.chevron.url, date: '1988-03-12', flag: 1, diff --git a/pages/edit/edit.json b/pages/edit/edit.json index bfcbe4c..88eeb8e 100644 --- a/pages/edit/edit.json +++ b/pages/edit/edit.json @@ -1,3 +1,5 @@ { - "navigationBarTitleText": "我的资料" + "usingComponents": { + "navbar": "../../components/navbar/navbar" + } } \ No newline at end of file diff --git a/pages/edit/edit.wxml b/pages/edit/edit.wxml index 68d8fc8..a6f4828 100644 --- a/pages/edit/edit.wxml +++ b/pages/edit/edit.wxml @@ -1,5 +1,6 @@ -
- + + + 姓名 diff --git a/pages/main/index.wxml b/pages/main/index.wxml index d0856cc..280db74 100644 --- a/pages/main/index.wxml +++ b/pages/main/index.wxml @@ -72,7 +72,7 @@ - + + --> + diff --git a/pages/passCar/couponList/couponList.js b/pages/passCar/couponList/couponList.js index 621a23f..dcf9d88 100644 --- a/pages/passCar/couponList/couponList.js +++ b/pages/passCar/couponList/couponList.js @@ -36,7 +36,7 @@ Page({ allow_load: true }, onLoad() { - this.getList(0, 0); + this.getList(0, 1); }, //点击跳转到券详情页面 diff --git a/pages/radetail/index.wxss b/pages/radetail/index.wxss index 9a94c5c..f16c40b 100644 --- a/pages/radetail/index.wxss +++ b/pages/radetail/index.wxss @@ -1134,7 +1134,6 @@ scroll-view { line-height: 40rpx; margin-bottom: 20rpx; color: #666; - padding-left: 2%; } diff --git a/pages/user/scoreHistory/index.js b/pages/user/scoreHistory/index.js deleted file mode 100644 index e0751ab..0000000 --- a/pages/user/scoreHistory/index.js +++ /dev/null @@ -1,28 +0,0 @@ -var config = require("../../../config/config.js"); -var app = getApp(); -const Http = require("../../../utils/HttpBasics"); -Page({ - /** - * 页面的初始数据 - */ - data: { - }, - onShow(options){ - this.record(); - }, - record:function(){ - Http.get({ - url: config.api.scoreHistory, - data: { - token:"d012a284-5e83-4062-be18-9bb01eaf868d", - pageNum:1, - pageSize:100 - } - }) - .then(res => { - console.log(res) - }) - .catch(err => { - }) - } -}); \ No newline at end of file diff --git a/pages/user/scoreHistory/index.json b/pages/user/scoreHistory/index.json deleted file mode 100644 index cd2bb5f..0000000 --- a/pages/user/scoreHistory/index.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "navigationBarTitleText": "成长值" -} \ No newline at end of file diff --git a/pages/user/scoreHistory/index.wxml b/pages/user/scoreHistory/index.wxml deleted file mode 100644 index 367ae93..0000000 --- a/pages/user/scoreHistory/index.wxml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/pages/user/scoreHistory/index.wxss b/pages/user/scoreHistory/index.wxss deleted file mode 100644 index fbef774..0000000 --- a/pages/user/scoreHistory/index.wxss +++ /dev/null @@ -1,14 +0,0 @@ -.content .title{ - display: block; - text-align: center; - font-size: 30rpx; - color: #333; - height: 80rpx; - line-height: 80rpx; -} -.list{ - width: 690rpx; - margin: 0 auto; - color:#666; - font-size: 28rpx; -} \ No newline at end of file