Explorar el Código

Merge branch 'dev' of https://git.youlane.cn/weapp/C into dev

tags/湖南版5.1.4
luqc hace 6 años
padre
commit
69ba4f24c2
Se han modificado 4 ficheros con 41 adiciones y 21 borrados
  1. +5
    -1
      config/config.js
  2. +1
    -1
      pages/game/index.json
  3. +34
    -18
      pages/main/index.js
  4. +1
    -1
      pages/spellGroup/spellGroup.js

+ 5
- 1
config/config.js Ver fichero

@@ -251,7 +251,11 @@ var config = {
/** /**
* 查询是否已参团 * 查询是否已参团
*/ */
queryAttendStatus:'/orderGroup/queryAttendStatus'
queryAttendStatus:'/orderGroup/queryAttendStatus',
/**
* 专题
*/
topicShow:"/topic/show"
}, },
weapp: { weapp: {
AppId: weappId AppId: weappId


+ 1
- 1
pages/game/index.json Ver fichero

@@ -2,5 +2,5 @@
"usingComponents": { "usingComponents": {
}, },
"navigationBarTitleText": "富茂小游戏"
"navigationBarTitleText": ""
} }

+ 34
- 18
pages/main/index.js Ver fichero

@@ -346,6 +346,7 @@ Page({
// that.checkUserCarStatus(); // that.checkUserCarStatus();
that.getUserInfo(); that.getUserInfo();
that.getBannerlist(); that.getBannerlist();
that.topicShow();
if (app.couponChannelListCallback) { if (app.couponChannelListCallback) {
app.couponChannelListCallback(app.globalData.token); app.couponChannelListCallback(app.globalData.token);
} }
@@ -464,6 +465,21 @@ Page({
}) })
; ;
}, },
// 专题显示
topicShow: function () {
let that = this;
Http.get({
url: config.api.topicShow,
data: {
token: app.globalData.token
}
}).then(res => {
console.log(res);
})
.catch(err => {
console.log(err);
})
},


/** /**
* 检查用户是否有车 * 检查用户是否有车
@@ -486,24 +502,24 @@ Page({
/** /**
* car共同登录 * car共同登录
*/ */
userCarLogin: function() {
var that = this;
if (!app.globalData.carLogin) {
// 共同登录
Http.post({
url: config.api.carInit,
data: {
phone: app.globalData.phone
}
}).then(res => {
app.globalData.carLogin = true;
app.globalData.parkVendor = res.data.vendor;
if (res.data.token != "undefined") {
app.globalData.etcpToken = res.data.token;
}
});
}
},
// userCarLogin: function() {
// var that = this;
// if (!app.globalData.carLogin) {
// // 共同登录
// Http.post({
// url: config.api.carInit,
// data: {
// phone: app.globalData.phone
// }
// }).then(res => {
// app.globalData.carLogin = true;
// app.globalData.parkVendor = res.data.vendor;
// if (res.data.token != "undefined") {
// app.globalData.etcpToken = res.data.token;
// }
// });
// }
// },
/** /**
* 获取用户信息 * 获取用户信息
*/ */


+ 1
- 1
pages/spellGroup/spellGroup.js Ver fichero

@@ -50,7 +50,7 @@ Page({
}, },
onShow(){ onShow(){
let that=this; let that=this;
if (this.data.reloadIf!=null){
if (this.data.reloadIf){
wx.setNavigationBarTitle({ wx.setNavigationBarTitle({
title: '拼团专场' title: '拼团专场'
}) })


Cargando…
Cancelar
Guardar