diff --git a/ext.json b/ext.json
index fb955ed..417e619 100644
--- a/ext.json
+++ b/ext.json
@@ -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"
diff --git a/pages/getuserinfo/index.js b/pages/getuserinfo/index.js
index b237e40..d0be1b9 100755
--- a/pages/getuserinfo/index.js
+++ b/pages/getuserinfo/index.js
@@ -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'
diff --git a/pages/index/index.js b/pages/index/index.js
index 2fa9446..b4176dc 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -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') {
// 停车
diff --git a/pages/integralmall/index.js b/pages/integralmall/index.js
index 50aaaf8..fd93b76 100644
--- a/pages/integralmall/index.js
+++ b/pages/integralmall/index.js
@@ -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();
diff --git a/pages/integralmall/index.wxml b/pages/integralmall/index.wxml
index ee06c5f..611a66a 100644
--- a/pages/integralmall/index.wxml
+++ b/pages/integralmall/index.wxml
@@ -1,3 +1,4 @@
+
diff --git a/pages/integralmall/index.wxss b/pages/integralmall/index.wxss
index 625ed66..e2f92b6 100644
--- a/pages/integralmall/index.wxss
+++ b/pages/integralmall/index.wxss
@@ -321,4 +321,26 @@ image{
font-weight: bold;
font-size: 36rpx;
padding-left: 30rpx;
-}
\ No newline at end of file
+}
+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;
+}