Ver código fonte

Merge branch 'HuNan_test' into dev

tags/湖南版5.1.4
meo 6 anos atrás
pai
commit
e0311d4895
6 arquivos alterados com 55 adições e 3 exclusões
  1. +1
    -1
      ext.json
  2. +12
    -1
      pages/getuserinfo/index.js
  3. +12
    -0
      pages/index/index.js
  4. +6
    -0
      pages/integralmall/index.js
  5. +1
    -0
      pages/integralmall/index.wxml
  6. +23
    -1
      pages/integralmall/index.wxss

+ 1
- 1
ext.json Ver arquivo

@@ -8,7 +8,7 @@
"attr": {
"configUrl": "https://ciformall.youlane.cn/C/api",
"socketUrl": "wss://mp.youlane.cn/W/ws",
"ifHaveWebSocket": "1",
"ifHaveWebSocket": "0",
"etcpVersion": "release",
"etcpAppId": "wx192b7d2e8dcbefd0",
"etcpCallbackUrl": "https://ciformall.youlane.cn/api/carCallback/etcpPaidCallback"


+ 12
- 1
pages/getuserinfo/index.js Ver arquivo

@@ -134,7 +134,18 @@ Page({
wx.switchTab({
url: '/pages/user/index'
});
} else if (app.globalData.type == 'pc') {
} else if (app.globalData.type == 'in') {
// 首页
wx.switchTab({
url: '/pages/main/index'
});
}
// 积分
else if (app.globalData.type == 'jf') {
wx.redirectTo({
url: '/pages/integralmall/index'
});
}else if (app.globalData.type == 'pc') {
// 停车
wx.switchTab({
url: '/pages/passCar/passCar'


+ 12
- 0
pages/index/index.js Ver arquivo

@@ -162,6 +162,18 @@ Page({
url: '/pages/user/index'
});
}
// 积分
else if (app.globalData.type == 'jf') {
wx.redirectTo({
url: '/pages/integralmall/index'
});
}
// 首页
else if (app.globalData.type == 'in') {
wx.switchTab({
url: '/pages/main/index'
});
}
// 停车
else if (app.globalData.type == 'pc') {
// 停车


+ 6
- 0
pages/integralmall/index.js Ver arquivo

@@ -9,6 +9,7 @@ Page({
bannerUrl: imgurl.banner.url,
loadingUrl: imgurl.loading.url,
nodata: imgurl.nodata.url,
wmhome: imgurl.wmhome.url,
wangmeimeicredit: imgurl.wangmeimeicredit.url,
list: [],
lists: [],
@@ -24,6 +25,11 @@ Page({
reloadIf: false,
creditAmount: 0
},
goback: function () {
wx.switchTab({
url: '/pages/main/index',
})
},
onLoad: function (options) {
let that = this;
var todayDate = new Date().getTime();


+ 1
- 0
pages/integralmall/index.wxml Ver arquivo

@@ -1,3 +1,4 @@
<button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button>
<view class='content-box'>
<view class='topbg'>
<image bindtap='gotojifen' src='{{wangmeimeicredit}}' mode='widthFix'></image>


+ 23
- 1
pages/integralmall/index.wxss Ver arquivo

@@ -321,4 +321,26 @@ image{
font-weight: bold;
font-size: 36rpx;
padding-left: 30rpx;
}
}
button::after{ border: none; }
.goback{
position: fixed;
right: 50rpx;
bottom: 60rpx;
width:100rpx!important;
height:100rpx;
z-index: 100;
background:rgba(255,255,255,1);
line-height: 95rpx;
border:1rpx solid rgba(227,227,227,1);
border-radius:50%;
}
.goback image{
position: absolute;
width: 60rpx;
left: 0;
right: 0;
top: 0;
bottom: 0;
margin: auto;
}

Carregando…
Cancelar
Salvar