From 3f9784a43a3146cd82822e48f2e812537d62f38f Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Thu, 21 Nov 2019 17:25:57 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=B0=86ext=E6=8A=BD=E7=A6=BB][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:[=E5=B0=86ext.json=E6=8A=BD=E7=A6=BB=E5=87=BA?= =?UTF-8?q?=E6=9D=A5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- custom-tab-bar/index.js | 3 +- index/index.js | 3 +- index/passCar.js | 9 +- index/passCar.wxml | 154 +++++++++++++++++++++++++++++++- index/user.js | 5 +- pages/freeBannerDetail/index.js | 5 +- pages/index/index.js | 1 - pages/radetail/index.js | 2 - utils/util.js | 17 +++- 9 files changed, 176 insertions(+), 23 deletions(-) diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js index b3c4a44..59109a8 100644 --- a/custom-tab-bar/index.js +++ b/custom-tab-bar/index.js @@ -1,5 +1,4 @@ -const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} -let ifStoreApp = extConfig.attr.ifStoreApp; +let ifStoreApp = 0; Component({ data: { selected: 0, diff --git a/index/index.js b/index/index.js index b1cd89f..fd3c434 100644 --- a/index/index.js +++ b/index/index.js @@ -1,5 +1,4 @@ -const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} -let ifStoreApp = extConfig.attr.ifStoreApp; +let ifStoreApp = 0; const navigationBarHeight = (getApp().statusBarHeight + 60) + 'px' const Http = require("../utils/HttpBasics"); const imgurl = require("../utils/imgurl"); diff --git a/index/passCar.js b/index/passCar.js index 6092b44..0fd5f75 100644 --- a/index/passCar.js +++ b/index/passCar.js @@ -1,6 +1,5 @@ const navigationBarHeight = (getApp().statusBarHeight + 50) + 'px' -const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} let app = getApp(); const format = require("../utils/util.js"); let config = require("../config/config.js"); @@ -235,10 +234,10 @@ Page({ } var that = this; that.setData({ - etcpAppId: extConfig.attr.etcpAppId, - etcpVersion: extConfig.attr.etcpVersion, - etcpCallbackUrl: extConfig.attr.etcpCallbackUrl, - ifHaveCarModular: extConfig.attr.ifHaveCarModular + etcpAppId: 'wx192b7d2e8dcbefd0', + etcpVersion: 'C.9.1.9', + etcpCallbackUrl: 'https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback', + ifHaveCarModular: 0 }) if (app.globalData.token) { that.getList(); diff --git a/index/passCar.wxml b/index/passCar.wxml index 6a561fb..cb0e1a8 100644 --- a/index/passCar.wxml +++ b/index/passCar.wxml @@ -1,5 +1,157 @@ - + + + + + {{park.addr}} + ({{park.number}}车位) + + + + + + + + + + + {{item.carNumber}} + + + + + + + + + + + 入场时间: + {{stopFees.entranceTime}} + + + 停车时长: + {{timecha}} + + + + + 优惠券: + + {{quantitle}} + {{totalTicketNum}}张可用 + + + + + + 待缴费用: + {{stopFees.remainingFee}}元 + + + + + 立即支付 + + 立即支付 + + + + 立即支付 + + + + + + + + 添加车牌 + + 车辆入场后,才能绑车牌 + + + + + 我的停车券 + + + + + + + + 车辆管理 + + + + + + + + 缴费规则 + + + + + + + + 常见问题 + + + + + + + 智慧停车即将上线 敬请期待 + + + + + + + + 请您敬请期待 + 我们正在筹备一大波优惠活动 + + + + + + 停车券 + + + + + + + + + + + {{item.title}} + + + {{item.subTitle}} + + + 售价:{{item.salePrice/100}}元{{item.price/100}}元 + {{item.price/100}}小时 + + + + + + 有效期至: + {{item.expiredTime}} + + + + + + {{content}} + + \ No newline at end of file diff --git a/index/user.js b/index/user.js index 64ddc50..9c2c130 100644 --- a/index/user.js +++ b/index/user.js @@ -1,7 +1,6 @@ var app = getApp(); const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' -const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} -let ifStoreApp = extConfig.attr.ifStoreApp; +let ifStoreApp = 0; const Http = require("../utils/HttpBasics"); const imgurl = require("../utils/imgurl"); var config = require("../config/config.js"); @@ -158,7 +157,7 @@ Page({ } that.setData({ - appVersion: extConfig.appVersion, + appVersion: 'C.9.1.9', }) /** * couponNum diff --git a/pages/freeBannerDetail/index.js b/pages/freeBannerDetail/index.js index 255ab5c..99a20e9 100644 --- a/pages/freeBannerDetail/index.js +++ b/pages/freeBannerDetail/index.js @@ -3,9 +3,6 @@ const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' var WxParse = require('../../wxParse/wxParse.js'); const config = require("../../config/config"); const Http = require("../../utils/HttpBasics"); -const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} -let configUrls = extConfig.attr.configUrl; -console.log(configUrls) Page({ @@ -32,7 +29,7 @@ Page({ }) if (options&&options.id){ wx.request({ - url: configUrls + config.api.printHtmlById, + url: 'https://ctest.malls.iformall.com/C/api' + config.api.printHtmlById, data: { token: app.globalData.token, id: options.id, diff --git a/pages/index/index.js b/pages/index/index.js index d6728bb..2f3d4cf 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -1,4 +1,3 @@ -const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} const Http = require("../../utils/HttpBasics"); const imgurl = require("../../utils/imgurl"); const config = require("../../config/config"); diff --git a/pages/radetail/index.js b/pages/radetail/index.js index 2a9e34d..440e1f2 100644 --- a/pages/radetail/index.js +++ b/pages/radetail/index.js @@ -5,8 +5,6 @@ const Http = require("../../utils/HttpBasics"); const util = require("../../utils/util"); var WxParse = require('../../wxParse/wxParse.js'); const imgurl = require("../../utils/imgurl"); -const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} -let configUrls = extConfig.attr.configUrl; Page({ data: { fenxiang: imgurl.fenxiang1.url, diff --git a/utils/util.js b/utils/util.js index 151cff5..17b4fc0 100644 --- a/utils/util.js +++ b/utils/util.js @@ -1,8 +1,19 @@ var barcode = require("./barcode"); var qrcode = require("./qrcode"); - -const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} -let imgProxy = extConfig.attr.imgProxy; +let imgProxy = [ + { + "newUrl": "https://ctest.malls.iformall.com/img", + "orgUrl": "https://iformall-net.s3.cn-northwest-1.amazonaws.com.cn" + }, + { + "newUrl": "https://ctest.malls.iformall.com/img1", + "orgUrl": "https://s3.cn-northwest-1.amazonaws.com.cn" + }, + { + "newUrl": "https://ctest.malls.iformall.com/img2", + "orgUrl": "https://wx.qlogo.cn" + } +]; function convertUTCTimeToLocalTime(UTCDateString) { if (!UTCDateString) {