Bläddra i källkod

[将ext抽离][修改]:[将ext.json抽离出来]

newMall
meo 5 år sedan
förälder
incheckning
3f9784a43a
9 ändrade filer med 176 tillägg och 23 borttagningar
  1. +1
    -2
      custom-tab-bar/index.js
  2. +1
    -2
      index/index.js
  3. +4
    -5
      index/passCar.js
  4. +153
    -1
      index/passCar.wxml
  5. +2
    -3
      index/user.js
  6. +1
    -4
      pages/freeBannerDetail/index.js
  7. +0
    -1
      pages/index/index.js
  8. +0
    -2
      pages/radetail/index.js
  9. +14
    -3
      utils/util.js

+ 1
- 2
custom-tab-bar/index.js Visa fil

@@ -1,5 +1,4 @@
const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}
let ifStoreApp = extConfig.attr.ifStoreApp;
let ifStoreApp = 0;
Component({
data: {
selected: 0,


+ 1
- 2
index/index.js Visa fil

@@ -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");


+ 4
- 5
index/passCar.js Visa fil

@@ -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();


+ 153
- 1
index/passCar.wxml Visa fil

@@ -1,5 +1,157 @@
<view class="con" style="padding-top:{{navigationBarHeight}}">
<navbar text="停车"></navbar>
<view class='container' wx:if="{{ifHaveCarModular == 1}}" style="padding-top:{{navigationBarHeight}}">
<view class='top'>
<view class='header'>
<image src='{{parkUrl}}' mode="widthFix"></image>{{park.addr}}
(<text style='color:#f86661;'>{{park.number}}</text>车位)</view>
</view>
<view class='borderBox'>
<view class='passNumberBox'>
<!-- 有车牌的时候显示 -->
<view class='passUp'>
<view class='addicense_active' wx:if='{{carList.length>0}}'>
<swiper current="{{current}}" bindchange='onSlideChangeEnd' class='swiper swiper-box' circular='true' indicator-dots='{{indicatorDots}}' autoplay='{{autoplay}}' interval='1500' duration='1500'>
<block wx:for='{{carList}}' wx:key="unique">
<swiper-item class="swiper-item" data-memberKeyword='{{item.carNumber}}'>
<view class='clearfix clearfix1'>
<text class='txt01'>{{item.carNumber}}</text>
</view>
</swiper-item>
</block>
</swiper>
</view>
</view>
</view>
</view>
<view class='orderBox' wx:if="{{stopFees.orderId&&carList.length>0&&3>=carList.length}}">
<view class='clearfix'>
<text class="fl">入场时间:</text>
<text class='fr time'>{{stopFees.entranceTime}}</text>
</view>
<view class='clearfix'>
<text class="fl">停车时长:</text>
<text class='fr time'>{{timecha}}</text>
</view>

<!-- <view class='coupon clearfix' bindtap='gotoquan' wx:if="{{couponList.length>0}}"> -->
<view class='coupon clearfix' bindtap='openTicketModal' wx:if="{{couponList.length>0}}">
<text class='fl'><text class='jians'>券</text>优惠券:</text>
<view class="fr">
<text wx:if="{{quantitle}}">{{quantitle}}</text>
<text wx:else>{{totalTicketNum}}张可用</text>
<image class='jiant' src='{{jianUrl}}' mode='widthFix'></image>
</view>
</view>

<view class="clearfix">
<text class="fl">待缴费用:</text>
<text class='fr' style='color:#ff4949;'>{{stopFees.remainingFee}}元</text>
</view>
<!-- 停车费用大于0 -->
<view class="buy-view" wx:if="{{stopFees.orderId&&stopFees.remainingFee>0}}">
<navigator bindfail="bindfail" path="pages/pay/order-pay-open/main" wx:if="{{canIUse}}" class='buy' target="miniProgram" open-type="navigate" app-id="{{etcpAppId}}" extra-data='{{extraData}}' version="{{etcpVersion}}">
立即支付
</navigator>
<view wx:if="{{!canIUse}}" class='buy' bindtap='gotoetcp'>立即支付</view>
</view>

<!-- 停车费用为0 -->
<view wx:if="{{stopFees.remainingFee==0}}" class='buy' bindtap='paySuccess'>立即支付</view>
</view>


<!-- 没有车牌的时候显示 -->
<view class='borderUp' bindtap='jumpToAdd' wx:if="{{carList.length==0}}">
<view class="myCars">
<!-- <image src='{{addUrl}}' mode="widthFix"></image> -->
添加车牌
</view>
<text class='carNumber'>车辆入场后,才能绑车牌</text>
</view>
<view class='bottonBox'>
<view class='textStyle' bindtap='showquan'>
<image src='{{tingcheHr}}'></image>
我的停车券
<view class='detail'>
<image src='{{jianUrl}}'></image>
</view>
</view>

<view class='textStyle' bindtap='gotomange'>
<image src='{{guanliHr}}'></image>
车辆管理
<view class='detail'>
<image src='{{jianUrl}}'></image>
</view>
</view>

<view class='textStyle' bindtap='gotodetail' data-rule='{{park.stopFee}}'>
<image src='{{jiaofei}}'></image>
缴费规则
<view class='detail'>
<image src='{{jianUrl}}'></image>
</view>
</view>

<view class='textStyle' bindtap='passc'>
<image src='{{wentiHr}}'></image>
常见问题
<view class='detail'>
<image src='{{jianUrl}}'></image>
</view>
</view>
</view>
</view>
<view class="con" wx:if="{{ifHaveCarModular == 0}}" style="padding-top:{{navigationBarHeight}}">
<image class="img" src="{{parkUrl}}" mode="widthFix"></image>
<text class="txt1">智慧停车即将上线</text>
<text class="txt2">敬请期待</text>
</view>
<!-- -->
<view bindtap="closeTicketModal" class="gray-bg" catchtouchmove="cancelMove" wx:if="{{showTicketModal}}"></view>
<view class="ticket-modal" wx:if="{{showTicketModal}}">
<view style='padding-top:0;'>
<view class="nocoupon" wx:if="{{ticketList.length==0}}" style="margin-top:100rpx;">
<image src="{{noCoupon}}" mode="widthFix" />
<text class="txt001">请您敬请期待</text>
<text class='txt002'>我们正在筹备一大波优惠活动</text>
<navigator class='nav' url="/index/index" open-type="switchTab" hover-class="other-navigator-hover">
<button hover-class='active'>前往首页看看</button>
</navigator>
</view>
<view wx:if="{{ticketList.length>0}}" class="ticket-title-tip">
<text>停车券</text>
<icon bindtap="closeTicketModal" class="close-icon" type="cancel"></icon>
</view>
<scroll-view bindscrolltolower="getMoreList" scroll-y style="height:800rpx;">
<view class='section' wx:for='{{ticketList}}' wx:key='{{index}}' bindtap="choicecoupon" data-title="{{item.title}}" data-id="{{item.id}}">
<view class='mms'>
<!-- <text>{{index}}</text> -->
<!-- <image class='gou' wx:if="{{item.id==quanid}}" mode='widthFix' src='{{gouHr}}'></image> -->
<view class='detail_msg'>
<view class='info'>
<view class='title'>
<text>{{item.title}}</text>
</view>
<view class='subtitle'>
<text>{{item.subTitle}}</text>
</view>
<view class="btns">
<text class='yuan' style='margin-right:10rpx;'>售价:{{item.salePrice/100}}元</text><text class='yuan' style='text-decoration:line-through' wx:if="{{item.unit==0}}">{{item.price/100}}元</text>
<text class='yuan' style='text-decoration:line-through' wx:if="{{item.unit==1}}">{{item.price/100}}小时</text>
</view>
</view>
</view>
<!-- <image class="liness" src='{{linessUrl}}' mode="widthFix"></image> -->
<view class='expiretime'>
<text class="txt1">有效期至:</text>
<text class="txt1">{{item.expiredTime}}</text>
</view>
</view>
</view>
</scroll-view>
<view class="loading" wx:if="{{loading}}">
<image src="{{loadingUrl}}" mode="widthFix"></image>{{content}}
</view>
</view>
</view>

+ 2
- 3
index/user.js Visa fil

@@ -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


+ 1
- 4
pages/freeBannerDetail/index.js Visa fil

@@ -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,


+ 0
- 1
pages/index/index.js Visa fil

@@ -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");


+ 0
- 2
pages/radetail/index.js Visa fil

@@ -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,


+ 14
- 3
utils/util.js Visa fil

@@ -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) {


Laddar…
Avbryt
Spara