diff --git a/pages/index/index.js b/pages/index/index.js index 2cdd269..2780952 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -327,8 +327,10 @@ Page({ } break; case 3: + console.log(item.tdata); if((item.tdata.indexOf('http://')!=-1 || item.tdata.indexOf('https://')!=-1) && item.tdata.indexOf('m.cloud.sz-trip.com')==-1){ // 外部h5 + console.log(item.tdata) app.globalData.weburl = item.tdata; wx.navigateTo({ url:"/pages/pbService/web/index" diff --git a/pages/login/index.js b/pages/login/index.js index e80e20e..248f073 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -37,7 +37,7 @@ Page({ }, getUserInfo:function(e,type){ let that = this; - if (e.detail && !e.detail.userInfo || !e.userInfo){ + if (e.detail && (!e.detail.userInfo)){ wx.reLaunch({ url: '/pages/index/index', }) diff --git a/pages/pbService/web/index.js b/pages/pbService/web/index.js index f34040a..0d59da0 100644 --- a/pages/pbService/web/index.js +++ b/pages/pbService/web/index.js @@ -14,7 +14,7 @@ Page({ */ onLoad: function (options) { this.setData({ - webUrl:"https://m.cloud.sz-trip.com/" + webUrl:app.globalData.weburl }) }, diff --git a/pages/user/user.wxml b/pages/user/user.wxml index 4383a28..8b44e01 100644 --- a/pages/user/user.wxml +++ b/pages/user/user.wxml @@ -60,9 +60,9 @@ 实名认证 - + diff --git a/utils/https.js b/utils/https.js index 8a5b5ea..0beebeb 100644 --- a/utils/https.js +++ b/utils/https.js @@ -1,8 +1,8 @@ var app = getApp(); import util from "../utils/util" import userApi from "../utils/https/user.js"; -const baseUrl = "https://test.api.cloud.sz-trip.com/api/"; -// const baseUrl = "https://api.cloud.sz-trip.com/api/"; +// const baseUrl = "https://test.api.cloud.sz-trip.com/api/"; +const baseUrl = "https://api.cloud.sz-trip.com/api/"; const orders = ['','weight','distance','sale_number','sale_price','price']; //封装GET请求 function _get(url,data) {