From 8a70e509f69d9c40ba67f51392acb32407a17468 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Fri, 19 Oct 2018 16:33:51 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=88=91=E7=9A=84=EF=BC=8C=E5=81=9C=E8=BD=A6?= =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8][=E4=BF=AE=E6=94=B9]=EF=BC=9A?= =?UTF-8?q?=E6=88=91=E7=9A=84=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E5=81=9C=E8=BD=A6=E4=BC=98=E6=83=A0=E5=88=B8?= =?UTF-8?q?=E6=8D=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/img/active.gif | Bin 0 -> 32851 bytes assets/img/edit.png | Bin 0 -> 2045 bytes assets/img/redirect.png | Bin 0 -> 364 bytes pages/coupon/detail/index.js | 2 +- pages/couponorder/detail/index.js | 12 +- pages/edit/edit.js | 142 ++- pages/edit/edit.wxml | 2 +- pages/index/index.js | 5 +- pages/index/index.wxml | 6 +- pages/order/detail/index.js | 2 +- pages/order/index/index.js | 2 +- pages/passCar/choicecoupon/choicecoupon.js | 2 +- pages/passCar/couponDetail/couponDetail.js | 4 +- pages/passCar/couponDetail/couponDetail.wxml | 70 +- pages/passCar/couponDetail/couponDetail.wxss | 2 +- pages/passCar/couponList/couponList.js | 4 +- pages/passCar/passCar.js | 962 ++++++++++--------- pages/rushToBuy/index.js | 2 +- pages/user/index.js | 272 +++--- pages/user/index.wxml | 152 +-- pages/user/index.wxss | 62 +- 21 files changed, 832 insertions(+), 873 deletions(-) create mode 100644 assets/img/active.gif create mode 100644 assets/img/edit.png create mode 100644 assets/img/redirect.png diff --git a/assets/img/active.gif b/assets/img/active.gif new file mode 100644 index 0000000000000000000000000000000000000000..74ce8f121f1c14a814d0947e7edc0ae54cee128f GIT binary patch literal 32851 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 literal 0 HcmV?d00001 diff --git a/assets/img/redirect.png b/assets/img/redirect.png new file mode 100644 index 0000000000000000000000000000000000000000..f0d9fcf56be0d4502f5c24838f854bdee5e1e5b0 GIT binary patch literal 364 zcmeAS@N?(olHy`uVBq!ia0vp^AhsX}8<2dWZ2J^QF%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl}2EbxddW?&F10b#~_Y4R074UC>Hjv*Ssy%)W`n;b=sef(ME+Su5gC7QdW z^=(VWU8jzHF0;)V=O0+)vzCQ><1|GTmx_ZXXT0y7+i(0u>%I2k9|vyE`B`XToE%}e z`tU&(F5Vw<6?0h)by?HbPgv#f`1)(Bq*b*y{5Ut-sMs&GW%7;;-hVkZ=Z2AL!!Q#S6%PgD^14D?x)78&q Iol`;+0Fu>`_5c6? literal 0 HcmV?d00001 diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index f38df9f..851f70b 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -103,7 +103,7 @@ Page({ if (res.data.endTime){ that.countdown(res.data.endTime); //当前时间与优惠券下架时间做计算 - var endTime = util.formatTime(res.data.endTime, "yyyy-MM-dddd hh:mm:ss"); + var endTime = util.formatTime(res.data.endTime, "yyyy-MM-dd hh:mm:ss"); if (util.timechuo(endTime).indexOf('-') == 0) { that.setData({ endtime: "活动已结束", diff --git a/pages/couponorder/detail/index.js b/pages/couponorder/detail/index.js index 11a67bf..6f5f01c 100644 --- a/pages/couponorder/detail/index.js +++ b/pages/couponorder/detail/index.js @@ -66,9 +66,9 @@ Page({ }); } that.setData({ - expiredTime: util.formatTime(that.data.data.expiredTime, "yyyy-MM-dddd hh:mm:ss"), - updateDate: util.formatTime(that.data.data.updateDate, "yyyy-MM-dddd hh:mm:ss"), - createDate: util.formatTime(that.data.data.createDate, "yyyy-MM-dddd hh:mm:ss") + expiredTime: util.formatTime(that.data.data.expiredTime, "yyyy-MM-dd hh:mm:ss"), + updateDate: util.formatTime(that.data.data.updateDate, "yyyy-MM-dd hh:mm:ss"), + createDate: util.formatTime(that.data.data.createDate, "yyyy-MM-dd hh:mm:ss") }); }); } @@ -89,9 +89,9 @@ Page({ data: res.data }); that.setData({ - expiredTime: util.formatTime(that.data.data.expiredTime, "yyyy-MM-dddd hh:mm:ss"), - updateDate: util.formatTime(that.data.data.updateDate, "yyyy-MM-dddd hh:mm:ss"), - createDate: util.formatTime(that.data.data.createDate, "yyyy-MM-dddd hh:mm:ss") + expiredTime: util.formatTime(that.data.data.expiredTime, "yyyy-MM-dd hh:mm:ss"), + updateDate: util.formatTime(that.data.data.updateDate, "yyyy-MM-dd hh:mm:ss"), + createDate: util.formatTime(that.data.data.createDate, "yyyy-MM-dd hh:mm:ss") }); util.barcode("barcode", options.quancode, 510, 100); util.qrcode("qrcode", options.quancode, 350, 350); diff --git a/pages/edit/edit.js b/pages/edit/edit.js index 7e86e21..d49df5a 100644 --- a/pages/edit/edit.js +++ b/pages/edit/edit.js @@ -13,7 +13,8 @@ Page({ items: [ { name: 1, value: '男', checked: false }, { name: 2, value: '女', checked: false }, - ] + ], + username: "" }, /** * 获得生日 @@ -34,7 +35,7 @@ Page({ console.log(res); that.setData({ name: res.name, - address: res, + address: JSON.stringify(res), }) }, fail: function (error) { @@ -60,15 +61,15 @@ Page({ var sex = that.data.sex; } if (that.data.address) { - var address = JSON.stringify(that.data.address); + var address = that.data.address; } else { var address = null; } - console.log(e.detail.value.username) if (e.detail.value.username) { var username = e.detail.value.username; - } else if (that.data.username) { + } + else if (that.data.username) { var username = that.data.username; } else { @@ -79,11 +80,6 @@ Page({ } else { var birthdate = null; } - console.log(username); - console.log(address); - console.log(sex); - console.log(birthdate); - if (username == null || address == null || sex == 0 || birthdate == null) { wx.showModal({ title: '提示', @@ -91,6 +87,10 @@ Page({ showCancel: false }) } else { + console.log(username) + console.log(address) + console.log(sex) + console.log(birthdate) Http.post({ url: config.api.updateInfo, data: { @@ -114,7 +114,6 @@ Page({ }) }) } - }, radioChange: function (e) { console.log(e.detail.value) @@ -128,80 +127,51 @@ Page({ */ onLoad: function (options) { let that = this; - that.setData({ - username: options.name, - sex: options.sex, - date: util.fmtDate(parseInt(options.birthdate)), - name: JSON.parse(options.address).name, - address: JSON.parse(options.address), - flag: 2 - }); - if (options.sex == "1") { - var checked = 'items[' + 0 + '].checked' - that.setData({ - [checked]: true - }) - that.setData({ - flagsex: 1 - }) - } else if (options.sex == "2") { - var checked = 'items[' + 1 + '].checked' - that.setData({ - [checked]: true - }) - that.setData({ - flagsex: 1 - }) - console.log(that.data.items); - } - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - console.log("oShow") - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - + Http.get({ + url: config.api.getScore, + data: {} + }).then(res => { + console.log(res); + if (res.data.address && JSON.parse(res.data.address).name) { + that.setData({ + address: res.data.address, + name: JSON.parse(res.data.address).name, + }) + } + if (!JSON.parse(res.data.address).name) { + that.setData({ + name: null, + }) + } + if (res.data.name) { + that.setData({ + username: res.data.name + }) + } + if (res.data.sex) { + if (res.data.sex == 1) { + var checked = 'items[' + 0 + '].checked' + that.setData({ + [checked]: true, + flagsex: 1 + }) + } else if (res.data.sex == 2) { + var checked = 'items[' + 1 + '].checked' + that.setData({ + [checked]: true, + flagsex: 1 + }) + } + that.setData({ + sex: res.data.sex + }) + } + if (res.data.birthdate) { + that.setData({ + date: util.fmtDate(parseInt(res.data.birthdate)), + flag: 2 + }) + } + }) } }) \ No newline at end of file diff --git a/pages/edit/edit.wxml b/pages/edit/edit.wxml index 952c31f..48ff95f 100644 --- a/pages/edit/edit.wxml +++ b/pages/edit/edit.wxml @@ -2,7 +2,7 @@ 姓名 - + 生日 diff --git a/pages/index/index.js b/pages/index/index.js index c7dd268..07dd747 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -1,3 +1,4 @@ + const Http = require("../../utils/HttpBasics"); const config = require("../../config/config"); let app = getApp(); @@ -26,6 +27,7 @@ Page({ url: '../game/index', }) }, + /** * 生命周期函数--监听页面初次渲染完成 */ @@ -159,7 +161,7 @@ Page({ } Http.setToken(res.data.token); that.checkUserCarStatus(); - // that.getUserInfo(); + that.getUserInfo(); that.getBannerlist(); if (app.couponChannelListCallback) { app.couponChannelListCallback(app.globalData.token); @@ -273,7 +275,6 @@ Page({ wx.getUserInfo({ success: res => { // 可以将 res 发送给后台解码出 unionId - debugger console.log("getUserInfo", res); } }); diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 936062a..32a4334 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -1,11 +1,13 @@ + - + + \ No newline at end of file diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index dde4692..3e02bea 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -77,7 +77,7 @@ Page({ }); //createDate 创建时间 - var createDate = util.formatTime(res.data.createDate, "yyyy-MM-dddd hh:mm:ss"); + var createDate = util.formatTime(res.data.createDate, "yyyy-MM-dd hh:mm:ss"); console.log(createDate); that.setData({ createDate: createDate diff --git a/pages/order/index/index.js b/pages/order/index/index.js index 45e1094..328e592 100644 --- a/pages/order/index/index.js +++ b/pages/order/index/index.js @@ -105,7 +105,7 @@ Page({ for (let i = 0; i < that.data.list.length; i++) { - var createDate1 = util.formatTime(that.data.list[i].createDate, "yyyy-MM-dddd hh:mm:ss"); + var createDate1 = util.formatTime(that.data.list[i].createDate, "yyyy-MM-dd hh:mm:ss"); /** * 修改list的endtime * 渲染到页面 diff --git a/pages/passCar/choicecoupon/choicecoupon.js b/pages/passCar/choicecoupon/choicecoupon.js index 966a00f..7e3bdd2 100644 --- a/pages/passCar/choicecoupon/choicecoupon.js +++ b/pages/passCar/choicecoupon/choicecoupon.js @@ -56,7 +56,7 @@ Page({ res.data.list.map(file => { file.expiredTime = format.formatTime( file.expiredTime, - "yyyy-MM-dddd hh:mm:ss" + "yyyy-MM-dd hh:mm:ss" ); }); if (pageNum > res.data.pages) { diff --git a/pages/passCar/couponDetail/couponDetail.js b/pages/passCar/couponDetail/couponDetail.js index 01dff39..e3b5a04 100644 --- a/pages/passCar/couponDetail/couponDetail.js +++ b/pages/passCar/couponDetail/couponDetail.js @@ -36,8 +36,8 @@ Page({ }); that.setData({ expiredTime: util.fmtDate(that.data.data.expiredTime), - updateDate: util.formatTime(that.data.data.updateDate, "yyyy-MM-dddd hh:mm:ss"), - createDate: util.formatTime(that.data.data.createDate, "yyyy-MM-dddd hh:mm:ss") + updateDate: util.formatTime(that.data.data.updateDate, "yyyy-MM-dd hh:mm:ss"), + createDate: util.formatTime(that.data.data.createDate, "yyyy-MM-dd hh:mm:ss") }); util.barcode("barcode", options.quancode, 510, 100); util.qrcode("qrcode", options.quancode, 350, 350); diff --git a/pages/passCar/couponDetail/couponDetail.wxml b/pages/passCar/couponDetail/couponDetail.wxml index 665d66e..0500566 100644 --- a/pages/passCar/couponDetail/couponDetail.wxml +++ b/pages/passCar/couponDetail/couponDetail.wxml @@ -1,36 +1,36 @@ - - - - - - - - 优免2小时券优免2小时券优免2小时券优免2小时券优免2小时券优免2小时券优免2小时券优免2小时券优免2小时券优免2小时券 - {{data.subTitle}} - - ¥{{data.salePrice/100}} - {{data.price/100}}小时 - 满{{data.usePrice/100}}元可用 - 仅限本店使用 - - - - - - 下单时间{{createDate}} - 核销时间{{updateDate}} - 过期时间{{updateDate}} - 退款时间{{updateDate}} - 有效期至:{{expiredTime}} - 订单编号{{data.orderId}} - 实付金额{{data.couponPrice/100}}元 - - - - 购买须知 - - - {{data.remark}} - - + + + + + + + {{data.title}} + {{data.subTitle}} + + ¥{{data.salePrice/100}} + + {{data.price/100}}小时 + 满{{data.usePrice/100}}元可用 + 仅限本店使用 + + + + + + 下单时间{{createDate}} + 核销时间{{updateDate}} + 过期时间{{updateDate}} + 退款时间{{updateDate}} + 有效期至:{{expiredTime}} + 订单编号{{data.orderId}} + 实付金额{{data.couponPrice/100}}元 + + + + 购买须知 + + + {{data.remark}} + + \ No newline at end of file diff --git a/pages/passCar/couponDetail/couponDetail.wxss b/pages/passCar/couponDetail/couponDetail.wxss index 0262613..9e59aa9 100644 --- a/pages/passCar/couponDetail/couponDetail.wxss +++ b/pages/passCar/couponDetail/couponDetail.wxss @@ -131,7 +131,7 @@ font-size: 26rpx; color: #999; width: 420rpx; - height: 32rpx; + height: 40rpx; white-space: nowrap; text-overflow:ellipsis; overflow: hidden; diff --git a/pages/passCar/couponList/couponList.js b/pages/passCar/couponList/couponList.js index faffdc6..9b78762 100644 --- a/pages/passCar/couponList/couponList.js +++ b/pages/passCar/couponList/couponList.js @@ -61,7 +61,7 @@ Page({ title: "加载中" }); Http.get({ - url: config.api.couponOrderList + "?type=5", + url: config.api.couponOrderCarList + "?type=5", data: { pageNum: pageNum, pageSize: 8, @@ -72,7 +72,7 @@ Page({ res.data.list.map(file => { file.expiredTime = format.formatTime( file.expiredTime, - "yyyy-MM-dddd hh:mm:ss" + "yyyy-MM-dd hh:mm:ss" ); }); console.log("姐姐的订单列表"); diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index 544efe8..7668ea4 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -1,480 +1,484 @@ -let config = require("../../config/config.js"); -let Http = require("../../utils/HttpBasics"); -let Util = require("../../utils/util"); -let app = getApp(); -Page({ - data: { - park: null, - carList: [], - payList: [], - addCar: null, - tcq: 2, - flag: "", - extraData: {}, - desc: '', - title: '', - indicatorDots: true, - autoplay: false, - interval: 5000, - duration: 1000, - current: 0, - stopFees: {}, - canIUse: wx.canIUse("navigator") - }, - /** - * 车牌轮播滑动 - */ - onSlideChangeEnd: function(e) { - var that = this; - /** - * 获得当前的车牌号码 - */ - var listCardNum = (that.data.carList)[e.detail.current].carNumber; - console.log(listCardNum); - that.setData({ - listCardNum: listCardNum - }); - /** - * 获得停车费用 - */ - that.getStopFee(listCardNum); - }, - gotomange: function() { - wx.navigateTo({ - url: '/pages/managelicenseplate/managelicenseplate', - }) - }, - gotoetcp:function(){ - wx.navigateToMiniProgram({ - appId:'wx192b7d2e8dcbefd0', - extraData: this.data.extraData, - envVersion:'release' - }) - }, - showquan: function() { - wx.navigateTo({ - url: '/pages/passCar/couponList/couponList', - }) - }, - /** - * 待完成 - */ - gotodetail: function(e) { - console.log(e.target.dataset.rule); - wx.showModal({ - title: '缴费规则', - content: e.target.dataset.rule, - showCancel: false, - }) - }, - onShow: function(options) { - var that = this; - that.getList(); - that.init(); - /** - * 只有用户选择了优惠券 - * 才会进行券和车牌的绑定 - */ - if (wx.getStorageSync("chosed") && that.data.quanid) { - that.bindCoupon(that.data.quanid); - wx.setStorage({ - key: 'chosed', - data: '', - }) - }; - that.initUsrCarList(); - if (that.data.addCar) { - // 绑车牌 - if (app.globalData.carLogin) { - that.bindCar(that.data.addCar); - } else { - that.bindCar(that.data.addCar); - } - that.setData({ - addCar: null - }); - } - }, - onLoad: function(options) { - var that = this; - /** - * 获得分享小程序的 - * title - * desc - */ - Http.get({ - url: config.api.getWeapNote, - data: { - appId: config.weapp.AppId, - } - }) - .then(res => { - let weapNote = JSON.parse(res.data.weapNote); - that.setData({ - desc: weapNote.carpage.desc, - title: weapNote.carpage.title - }) - }); - }, - - - jumpToAdd: function() { - wx.navigateTo({ - url: `/pages/addPark/addPark?flags=managepalte` - }); - }, - passc: function() { - wx.navigateTo({ - url: '/pages/ques/ques', - }) - }, - - - /** - * 券绑定车牌 - */ - bindCoupon: function(quanid) { - var that = this; - /** - * etcp - */ - var etcpData = { - etcpToken: app.globalData.etcpToken, - carNumber: that.data.listCardNum, - couponOrderId: quanid - }; - console.log(etcpData); - /** - * 停简单 - */ - var tjdData = { - carNumber: that.data.listCardNum - }; - var postCouponData = app.globalData.parkVendor == 1 ? etcpData : tjdData; - Http.post({ - url: config.api.getCarCoupon, - data: postCouponData - }) - .then(res => { - that.initUsrCarList(); - }) - .catch(error => { - wx.showModal({ - content: error.message, - showCancel: false, - confirmText: "确定", - }) - console.log(error); - }) - }, - /** - * 选择优惠券 - */ - gotoquan: function() { - let that = this; - console.log(that.data.quanid); - if (that.data.quanid) { - wx.navigateTo({ - url: `/pages/passCar/choicecoupon/choicecoupon?quanid=${that.data.quanid}`, - }) - } else { - wx.navigateTo({ - url: '/pages/passCar/choicecoupon/choicecoupon', - }) - } - - }, - - //获取名下停车券列表 - getList() { - var that = this; - Http.get({ - url: config.api.couponOrderCarList + "?type=5&couponOrderStatus=0", - data: { - pageNum: 1, - pageSize: 8, - couponOrderStatus: 0 - } - }).then(res => { - console.log(res); - that.setData({ - couponList: res.data.list - }); - }); - }, - - - /** - * 共同登录 - */ - init: function(carNumber) { - var that = this; - app.parkInitCallback = token => { - that.initPark(); - that.getParkStatus(); - if (!app.globalData.carLogin) { - /** - * 判断是否授权手机号 - */ - Http.post({ - url: config.api.checkPhoneStatus, - data: {} - }) - .then(res => { - console.log(res); - Http.post({ - url: config.api.carInit, - data: { - phone: app.globalData.phone - } - }).then(res => { - console.log(res); - app.globalData.carLogin = true; - app.globalData.parkVendor = res.data.vendor; - if (res.data.token) { - app.globalData.etcpToken = res.data.token; - } - /** - * 获得停车费用 - */ - that.initUsrCarList("flags"); - console.log(app.globalData.etcpToken); - }); - }) - .catch(err => { - console.log(err); - if (err.code == 11005) { - // 用户手机未授权 - /** - * 将值传到用户手机号授权的页面 - * - */ - wx.redirectTo({ - url: "/pages/getphoneInfo/index" - }); - } else if (err.code == 11006) { - // 用户手机已加密 - wx.redirectTo({ - url: "/pages/phoneinput/phoneinput" - }); - } - }) - } - }; - if (app.globalData.token && app.globalData.token != null) { - app.parkInitCallback(app.globalData.token); - } - }, - /** - * 绑定车牌 - */ - // bindCar: function(carNum) { - // var that = this; - // // ETCP - // var etcpData = { - // etcpToken: app.globalData.etcpToken, - // carNumber: carNum - // }; - // var tjdData = { - // carNumber: carNum - // }; - // var postData = app.globalData.parkVendor == 1 ? etcpData : tjdData; - // Http.post({ - // url: config.api.bindCar, - // data: postData - // }) - // .then(res => { - // console.log(res); - // // that.initUsrCarList(); - // wx.showModal({ - // title: "提示", - // showCancel: false, - // content: "绑车牌成功!", - // success: function() {} - // }); - // }) - // .catch(error => { - // console.log(error); - // wx.showModal({ - // title: "提示", - // showCancel: false, - // content: error.message, - // success: function() {} - // }); - // }); - // }, - - bindCar: function (carNum) { - var that = this; - // ETCP - var etcpData = { - etcpToken: app.globalData.etcpToken, - carNumber: carNum - }; - var tjdData = { - carNumber: carNum - }; - var postData = app.globalData.parkVendor == 1 ? etcpData : tjdData; - Http.post({ - url: config.api.bindCar, - data: postData - }) - .then(res => { - console.log(res); - that.setData({ - addCar: null - }); - that.initUsrCarList(); - wx.showModal({ - title: "提示", - showCancel: false, - content: "绑车牌成功!", - success: function () { } - }); - }) - .catch(error => { - console.log(error); - wx.showModal({ - title: "提示", - showCancel: false, - content: error.data.message, - success: function () { } - }); - }); - }, - /** - * 车场信息获取 - */ - initPark: function() { - var that = this; - Http.get({ - url: config.api.getParkInfo, - data: {} - }).then(res => { - that.setData({ - park: res.data - }); - }); - }, - - /** - * 车场状态获取 - */ - getParkStatus: function() { - var that = this; - Http.get({ - url: config.api.getParkStatus, - }) - .then(res => { - console.log(res); - }); - }, - - - /** - * 绑定车获取 - */ - initUsrCarList: function(flag) { - console.log(flag); - var that = this; - Http.get({ - url: config.api.getUserCarList, - data: {} - }).then(res => { - console.log(res) - that.setData({ - carList: res.data - }); - /** - * flag ==flags - * 表示从首页onShow进来的 - */ - if (flag == "flags" && res.data.length > 0) { - var listCardNum = res.data[0].carNumber; - console.log(listCardNum); - that.setData({ - listCardNum: listCardNum - }) - /** - * 获得停车费用 - */ - that.getStopFee(listCardNum); - } - }) - }, - - /** - * 获得停车费用修改 - */ - getStopFee: function(carNumber) { - var that = this; - var postData = - app.globalData.parkVendor == 1 ? { - etcpToken: app.globalData.etcpToken, - carNumber: carNumber - } : { - carNumber: carNumber, - outCarId: outCarId - }; - Http.post({ - url: config.api.getCarStopFee, - data: postData - }) - .then(res => { - var extraDataStr = { - params: { - token: app.globalData.etcpToken, - syncId: res.data.orderId, - payType: 6, // 小程序支付 - CarNumber: carNumber, - returnUrl: "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback", - source: "FUMAO-001", - actionId: "1" //操作ID,1:小程序支付 - } - }; - that.setData({ - extraData: extraDataStr - }); - that.setData({ - stopFees: res.data - }) - that.setData({ - timecha: Util.timecha(res.data.exitTime, res.data.entranceTime) - }) - }) - .catch(error => { - console.log(error); - wx.showModal({ - title: '提示', - content: error.message, - showCancel: false - }) - that.setData({ - stopFees: {} - }) - }); - }, - - /** - * 下拉刷新 - */ - onPullDownRefresh: function(e) { - let that = this; - that.initUsrCarList("flags"); - wx.stopPullDownRefresh(); - }, - // 用户点击右上角分享 - onShareAppMessage: function() { - return { - title: this.data.title, - desc: this.data.desc, - success: function(res) { - wx.showToast({ - title: "分享成功", - duration: 1000, - icon: "success" - }); - } - } - } +let config = require("../../config/config.js"); +let Http = require("../../utils/HttpBasics"); +let Util = require("../../utils/util"); +let app = getApp(); +Page({ + data: { + park: null, + carList: [], + payList: [], + addCar: null, + tcq: 2, + flag: "", + extraData: {}, + desc: '', + title: '', + indicatorDots: true, + autoplay: false, + interval: 5000, + duration: 1000, + current: 0, + stopFees: {}, + canIUse: wx.canIUse("navigator") + }, + /** + * 车牌轮播滑动 + */ + onSlideChangeEnd: function(e) { + var that = this; + /** + * 获得当前的车牌号码 + */ + var listCardNum = (that.data.carList)[e.detail.current].carNumber; + console.log(listCardNum); + that.setData({ + listCardNum: listCardNum + }); + /** + * 获得停车费用 + */ + that.getStopFee(listCardNum); + }, + gotomange: function() { + wx.navigateTo({ + url: '/pages/managelicenseplate/managelicenseplate', + }) + }, + gotoetcp:function(){ + wx.navigateToMiniProgram({ + appId:'wx192b7d2e8dcbefd0', + extraData: this.data.extraData, + envVersion:'release' + }) + }, + showquan: function() { + wx.navigateTo({ + url: '/pages/passCar/couponList/couponList', + }) + }, + gotodetail: function(e) { + console.log(e.target.dataset.rule); + wx.showModal({ + title: '缴费规则', + content: e.target.dataset.rule, + showCancel: false, + }) + }, + onShow: function(options) { + var that = this; + that.getList(); + that.init(); + /** + * 只有用户选择了优惠券 + * 才会进行券和车牌的绑定 + */ + if (wx.getStorageSync("chosed") && that.data.quanid) { + that.bindCoupon(that.data.quanid); + wx.setStorage({ + key: 'chosed', + data: '', + }) + }; + that.initUsrCarList(); + if (that.data.addCar) { + // 绑车牌 + if (app.globalData.carLogin) { + that.bindCar(that.data.addCar); + } else { + that.bindCar(that.data.addCar); + } + that.setData({ + addCar: null + }); + } + }, + onLoad: function(options) { + var that = this; + /** + * 获得分享小程序的 + * title + * desc + */ + Http.get({ + url: config.api.getWeapNote, + data: { + appId: config.weapp.AppId, + } + }) + .then(res => { + let weapNote = JSON.parse(res.data.weapNote); + that.setData({ + desc: weapNote.carpage.desc, + title: weapNote.carpage.title + }) + }); + }, + + + jumpToAdd: function() { + wx.navigateTo({ + url: `/pages/addPark/addPark?flags=managepalte` + }); + }, + passc: function() { + wx.navigateTo({ + url: '/pages/ques/ques', + }) + }, + + + /** + * 券绑定车牌 + */ + bindCoupon: function(quanid) { + var that = this; + /** + * etcp + */ + var etcpData = { + etcpToken: app.globalData.etcpToken, + carNumber: that.data.listCardNum, + couponOrderId: quanid + }; + console.log(etcpData); + /** + * 停简单 + */ + var tjdData = { + carNumber: that.data.listCardNum + }; + var postCouponData = app.globalData.parkVendor == 1 ? etcpData : tjdData; + Http.post({ + url: config.api.getCarCoupon, + data: postCouponData + }) + .then(res => { + that.initUsrCarList(); + }) + .catch(error => { + wx.showModal({ + content: error.message, + showCancel: false, + confirmText: "确定", + }) + console.log(error); + }) + }, + /** + * 选择优惠券 + */ + gotoquan: function() { + let that = this; + console.log(that.data.quanid); + if (that.data.quanid) { + wx.navigateTo({ + url: `/pages/passCar/choicecoupon/choicecoupon?quanid=${that.data.quanid}`, + }) + } else { + wx.navigateTo({ + url: '/pages/passCar/choicecoupon/choicecoupon', + }) + } + + }, + + //获取名下停车券列表 + getList() { + var that = this; + Http.get({ + url: config.api.couponOrderCarList + "?type=5&couponOrderStatus=0", + data: { + pageNum: 1, + pageSize: 8, + couponOrderStatus: 0 + } + }).then(res => { + console.log(res); + that.setData({ + couponList: res.data.list + }); + }); + }, + + + /** + * 共同登录 + */ + init: function(carNumber) { + var that = this; + app.parkInitCallback = token => { + that.initPark(); + that.getParkStatus(); + if (!app.globalData.carLogin) { + /** + * 判断是否授权手机号 + */ + Http.post({ + url: config.api.checkPhoneStatus, + data: {} + }) + .then(res => { + console.log(res); + Http.post({ + url: config.api.carInit, + data: { + phone: app.globalData.phone + } + }).then(res => { + console.log(res); + app.globalData.carLogin = true; + app.globalData.parkVendor = res.data.vendor; + if (res.data.token) { + app.globalData.etcpToken = res.data.token; + } + /** + * 获得停车费用 + */ + that.initUsrCarList("flags"); + console.log(app.globalData.etcpToken); + }); + }) + .catch(err => { + console.log(err); + if (err.code == 11005) { + // 用户手机未授权 + /** + * 将值传到用户手机号授权的页面 + * + */ + wx.redirectTo({ + url: "/pages/getphoneInfo/index" + }); + } else if (err.code == 11006) { + // 用户手机已加密 + wx.redirectTo({ + url: "/pages/phoneinput/phoneinput" + }); + } + }) + } + }; + if (app.globalData.token && app.globalData.token != null) { + app.parkInitCallback(app.globalData.token); + } + }, + /** + * 绑定车牌 + */ + // bindCar: function(carNum) { + // var that = this; + // // ETCP + // var etcpData = { + // etcpToken: app.globalData.etcpToken, + // carNumber: carNum + // }; + // var tjdData = { + // carNumber: carNum + // }; + // var postData = app.globalData.parkVendor == 1 ? etcpData : tjdData; + // Http.post({ + // url: config.api.bindCar, + // data: postData + // }) + // .then(res => { + // console.log(res); + // // that.initUsrCarList(); + // wx.showModal({ + // title: "提示", + // showCancel: false, + // content: "绑车牌成功!", + // success: function() {} + // }); + // }) + // .catch(error => { + // console.log(error); + // wx.showModal({ + // title: "提示", + // showCancel: false, + // content: error.message, + // success: function() {} + // }); + // }); + // }, + + bindCar: function (carNum) { + var that = this; + // ETCP + var etcpData = { + etcpToken: app.globalData.etcpToken, + carNumber: carNum + }; + var tjdData = { + carNumber: carNum + }; + var postData = app.globalData.parkVendor == 1 ? etcpData : tjdData; + Http.post({ + url: config.api.bindCar, + data: postData + }) + .then(res => { + console.log(res); + that.setData({ + addCar: null + }); + that.initUsrCarList(); + wx.showModal({ + title: "提示", + showCancel: false, + content: "绑车牌成功!", + success: function () { } + }); + }) + .catch(error => { + console.log(error); + wx.showModal({ + title: "提示", + showCancel: false, + content: error.data.message, + success: function () { } + }); + }); + }, + /** + * 车场信息获取 + */ + initPark: function() { + var that = this; + Http.get({ + url: config.api.getParkInfo, + data: {} + }) + .then(res => { + that.setData({ + park: res.data + }) + }) + .catch(error=>{ + console.log(error) + }) + }, + + /** + * 车场状态获取 + */ + getParkStatus: function() { + var that = this; + Http.get({ + url: config.api.getParkStatus, + }) + .then(res => { + console.log(res); + }) + .catch(error=>{ + console.log(error) + }) + }, + + + /** + * 绑定车获取 + */ + initUsrCarList: function(flag) { + console.log(flag); + var that = this; + Http.get({ + url: config.api.getUserCarList, + data: {} + }).then(res => { + console.log(res) + that.setData({ + carList: res.data + }); + /** + * flag ==flags + * 表示从首页onShow进来的 + */ + if (flag == "flags" && res.data.length > 0) { + var listCardNum = res.data[0].carNumber; + console.log(listCardNum); + that.setData({ + listCardNum: listCardNum + }) + /** + * 获得停车费用 + */ + that.getStopFee(listCardNum); + } + }) + }, + + /** + * 获得停车费用修改 + */ + getStopFee: function(carNumber) { + var that = this; + var postData = + app.globalData.parkVendor == 1 ? { + etcpToken: app.globalData.etcpToken, + carNumber: carNumber + } : { + carNumber: carNumber, + outCarId: outCarId + }; + Http.post({ + url: config.api.getCarStopFee, + data: postData + }) + .then(res => { + var extraDataStr = { + params: { + token: app.globalData.etcpToken, + syncId: res.data.orderId, + payType: 6, // 小程序支付 + CarNumber: carNumber, + returnUrl: "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback", + source: "FUMAO-001", + actionId: "1" //操作ID,1:小程序支付 + } + }; + that.setData({ + extraData: extraDataStr + }); + that.setData({ + stopFees: res.data + }) + that.setData({ + timecha: Util.timecha(res.data.exitTime, res.data.entranceTime) + }) + }) + .catch(error => { + console.log(error); + wx.showModal({ + title: '提示', + content: error.message, + showCancel: false + }) + that.setData({ + stopFees: {} + }) + }); + }, + + /** + * 下拉刷新 + */ + onPullDownRefresh: function(e) { + let that = this; + that.initUsrCarList("flags"); + wx.stopPullDownRefresh(); + }, + // 用户点击右上角分享 + onShareAppMessage: function() { + return { + title: this.data.title, + desc: this.data.desc, + success: function(res) { + wx.showToast({ + title: "分享成功", + duration: 1000, + icon: "success" + }); + } + } + } }); \ No newline at end of file diff --git a/pages/rushToBuy/index.js b/pages/rushToBuy/index.js index 2f5162a..b73bda8 100644 --- a/pages/rushToBuy/index.js +++ b/pages/rushToBuy/index.js @@ -65,7 +65,7 @@ Page({ list: tmpArr }) for (let i = 0; i < that.data.list.length; i++) { - var startTime = util.formatTime(that.data.list[i].endTime, "yyyy-MM-dddd hh:mm:ss"); + var startTime = util.formatTime(that.data.list[i].endTime, "yyyy-MM-dd hh:mm:ss"); var alsell = Math.floor((that.data.list[i].inventory - (that.data.list[i].remainInventory))/(that.data.list[i].inventory)*100); util.timechuo(startTime); console.log(alsell); diff --git a/pages/user/index.js b/pages/user/index.js index a31da60..1010671 100644 --- a/pages/user/index.js +++ b/pages/user/index.js @@ -1,156 +1,118 @@ -var config = require("../../config/config.js"); -var app = getApp(); -const Http = require("../../utils/HttpBasics"); -Page({ - /** - * 页面的初始数据 - */ - data: { - canIUse: wx.canIUse('official-account'), - flag: 'hidden', - score:'0' - }, - /** - * 跳转到成长值的页面 - */ - gotograde:function(){ - wx.navigateTo({ - url: '/pages/grade/grade', - }) - }, - // getrun:function(){ - // let that = this; - // wx.getWeRunData({ - // success: function (res) { - // console.log(res); - // Http.post({ - // url: config.api.getWeRunData, - // data: { - // encryptedData: res.encryptedData, - // iv: res.iv - // } - // }).then(res => { - // console.log(res); - // that.setData({ - // step: res.data.stepInfoList[30].step - // }) - // }) - // } - // }) - // }, - /** - * - */ - // getxinghao:function(){ - // wx.getSystemInfo({ - // success:function(res){ - // console.log(res); - // wx.showModal({ - // content: res.brand, - // }) - // } - // }) - // }, - navigateTo() { - wx.navigateTo({ - url: `/pages/login/index` - }); - }, - showVersion: function() { - /** - * 长按显示版本号 - */ - let that = this; - if (that.data.flag == 'hidden') { - that.setData({ - flag: 'show' - }); - } - console.log(that.data.flag) - }, - gotoedit:function(){ - wx.navigateTo({ - url: `/pages/edit/edit?name=${this.data.name}&birthdate=${this.data.birthdate}&sex=${this.data.sex}&address=${this.data.address}`, - }) - }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function(options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function() {}, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function() { - let that = this; - let num = wx.getStorageSync('couponNum'); - wx.hideTabBarRedDot({ - index: 2 - }); - console.log("我是渲染") - if (num == 'couponNum1') { - wx.setStorage({ - key: 'couponNum', - data: "couponNum1", - }) - that.setData({ - couponNum: "couponNum1" - }) - } else if (num == 'couponNum') { - that.setData({ - couponNum: "couponNum" - }) - }; - Http.get({ - url: config.api.getScore, - data: {} - }).then(res=>{ - console.log(res); - that.setData({ - score: res.data.score, - levelName: res.data.levelName - }) - if(res.data.address&&res.data.name&&res.data.sex&&res.data.birthdate){ - that.setData({ - address: res.data.address, - name: res.data.name, - sex: res.data.sex, - birthdate: res.data.birthdate - }) - } - }); - // that.getrun(); - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function() {}, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function() {}, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function() {}, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function() {}, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function() {} +var config = require("../../config/config.js"); +var app = getApp(); +const Http = require("../../utils/HttpBasics"); +Page({ + /** + * 页面的初始数据 + */ + data: { + canIUse: wx.canIUse('official-account'), + flag: 'hidden', + score:'0', + name:"", + birthdate:"", + sex:"" + }, + /** + * 跳转到成长值的页面 + */ + gotograde:function(){ + wx.navigateTo({ + url: '/pages/grade/grade', + }) + }, + // getrun:function(){ + // let that = this; + // wx.getWeRunData({ + // success: function (res) { + // console.log(res); + // Http.post({ + // url: config.api.getWeRunData, + // data: { + // encryptedData: res.encryptedData, + // iv: res.iv + // } + // }).then(res => { + // console.log(res); + // that.setData({ + // step: res.data.stepInfoList[30].step + // }) + // }) + // } + // }) + // }, + /** + * + */ + // getxinghao:function(){ + // wx.getSystemInfo({ + // success:function(res){ + // console.log(res); + // wx.showModal({ + // content: res.brand, + // }) + // } + // }) + // }, + navigateTo() { + wx.navigateTo({ + url: `/pages/login/index` + }); + }, + showVersion: function() { + /** + * 长按显示版本号 + */ + let that = this; + if (that.data.flag == 'hidden') { + that.setData({ + flag: 'show' + }); + } + console.log(that.data.flag) + }, + gotoedit:function(){ + wx.navigateTo({ + url: '/pages/edit/edit', + }) + }, + /** + * 生命周期函数--监听页面显示 + */ + onShow: function() { + let that = this; + let num = wx.getStorageSync('couponNum'); + wx.hideTabBarRedDot({ + index: 2 + }); + console.log("我是渲染") + if (num == 'couponNum1') { + wx.setStorage({ + key: 'couponNum', + data: "couponNum1", + }) + that.setData({ + couponNum: "couponNum1" + }) + } else if (num == 'couponNum') { + that.setData({ + couponNum: "couponNum" + }) + }; + Http.get({ + url: config.api.getScore, + data: {} + }).then(res=>{ + console.log(res); + that.setData({ + score: res.data.score, + levelName: res.data.levelName, + address: res.data.address, + birthdate: res.data.birthdate, + name: res.data.name, + address: res.data.sex, + }) + }); + // that.getrun(); + } }); \ No newline at end of file diff --git a/pages/user/index.wxml b/pages/user/index.wxml index 52d3c2d..5584be8 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -1,77 +1,77 @@ - - - - - - - - - - - 完善个人信息(获得成长值) - - - 当前成长值 - {{score}} - - - {{levelName}} - - - - - - - 我的订单 - - 查看全部 - - - - - - - 待付款 - - - - - - - - 已完成 - - - - - - - - - 券包 - - - - - - - - - - 智能停车 - - - - - - - - - - 版本号:2.1.8 - - - - - + + + + + + + + + + + {{levelName}} + 成长值{{score}} + + + + + + + + + + + + + 我的订单 + + 查看全部 + + + + + + + 待付款 + + + + + + + + 已完成 + + + + + + + + + 券包 + + + + + + + + + + 智能停车 + + + + + + + + + + 版本号:2.1.9 + + + + + \ No newline at end of file diff --git a/pages/user/index.wxss b/pages/user/index.wxss index 13f6f34..ed52daa 100644 --- a/pages/user/index.wxss +++ b/pages/user/index.wxss @@ -1,22 +1,25 @@ -.icons{ +.icons { width: 40rpx; margin-right: 20rpx; vertical-align: middle; } + .user { background: #fff; min-height: 100vh; } -.navigator-hover{ - opacity: 1!important; + +.navigator-hover { + opacity: 1 !important; background: #fff; } + .user-title { position: relative; box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); border-radius: 8px; - width: 698rpx; - padding: 0 30rpx; + width: 728rpx; + padding-left: 30rpx; display: flex; flex-direction: row; box-sizing: border-box; @@ -34,7 +37,8 @@ overflow: hidden; border: 1px solid red; } */ -.version{ + +.version { width: 600rpx; height: 300rpx; line-height: 300rpx; @@ -87,16 +91,18 @@ } .chengzhang { - font-size: 22rpx; - color: #999; - line-height: 40rpx; + font-size: 24rpx; + font-weight: 400; + color: rgba(122, 122, 122, 1); + margin-left: 10rpx; } .chengzhang1 { position: absolute; - right: 24rpx; + right: 0; bottom: 0; - top: 19rpx; + /* top: 19rpx; */ + top: 42rpx; } .chengzhang1 text { @@ -109,17 +115,21 @@ vertical-align: top; } -.chengzhang1 .view { - font-size: 44rpx; +.view { + font-size: 24rpx; color: #01bffe; - line-height: 67rpx; } - +.view image{ + width: 12rpx; + vertical-align: middle; + margin-top: -6rpx; +} .chengzhang1 text { text-align: center; - font-size: 24rpx; + font-size: 26rpx; color: #333; line-height: 33rpx; + margin-right: 30rpx; } .bannerbg { @@ -205,23 +215,33 @@ .user-out-btn::after { opacity: 0; } -.gzh{ + +.gzh { display: none; position: absolute; bottom: 6%; width: 90%; left: 0; right: 0; - margin: auto; + margin: auto; z-index: 1000000; background: #ccc; border-radius: 16rpx; overflow: hidden; - box-shadow:0 6px 20px 0 rgba(0,0,0,0.15); + box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.15); } -.act{ + +.act { display: none; } -.of{ + +.of { display: block; } +.activeimg{ + width: 176rpx!important; + position: absolute; + bottom: 0; + right: 0; + z-index: 10000; +} \ No newline at end of file