Browse Source

更新下代码

master
yvette 5 years ago
parent
commit
7543a76308
  1. 2
      pages/index/index.js
  2. 2
      pages/login/index.js
  3. 2
      pages/pbService/web/index.js
  4. 4
      pages/user/user.wxml
  5. 4
      utils/https.js

2
pages/index/index.js

@ -327,8 +327,10 @@ Page({
} }
break; break;
case 3: 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){ if((item.tdata.indexOf('http://')!=-1 || item.tdata.indexOf('https://')!=-1) && item.tdata.indexOf('m.cloud.sz-trip.com')==-1){
// 外部h5 // 外部h5
console.log(item.tdata)
app.globalData.weburl = item.tdata; app.globalData.weburl = item.tdata;
wx.navigateTo({ wx.navigateTo({
url:"/pages/pbService/web/index" url:"/pages/pbService/web/index"

2
pages/login/index.js

@ -37,7 +37,7 @@ Page({
}, },
getUserInfo:function(e,type){ getUserInfo:function(e,type){
let that = this; let that = this;
if (e.detail && !e.detail.userInfo || !e.userInfo){ if (e.detail && (!e.detail.userInfo)){
wx.reLaunch({ wx.reLaunch({
url: '/pages/index/index', url: '/pages/index/index',
}) })

2
pages/pbService/web/index.js

@ -14,7 +14,7 @@ Page({
*/ */
onLoad: function (options) { onLoad: function (options) {
this.setData({ this.setData({
webUrl:"https://m.cloud.sz-trip.com/" webUrl:app.globalData.weburl
}) })
}, },

4
pages/user/user.wxml

@ -60,9 +60,9 @@
<navigator url="verify/index" class="user-box-line" wx:if="{{info && info.name_verification=='UNCERTFIED'}}"> <navigator url="verify/index" class="user-box-line" wx:if="{{info && info.name_verification=='UNCERTFIED'}}">
实名认证 实名认证
</navigator> </navigator>
<navigator url="order/team/list" class="user-box-line"> <!-- <navigator url="order/team/list" class="user-box-line">
团队订单 团队订单
</navigator> </navigator> -->
</view> </view>
<view class="user-box" style="margin-bottom:0"> <view class="user-box" style="margin-bottom:0">
<navigator url="linkman/index" class="user-box-line"> <navigator url="linkman/index" class="user-box-line">

4
utils/https.js

@ -1,8 +1,8 @@
var app = getApp(); var app = getApp();
import util from "../utils/util" import util from "../utils/util"
import userApi from "../utils/https/user.js"; import userApi from "../utils/https/user.js";
const baseUrl = "https://test.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 baseUrl = "https://api.cloud.sz-trip.com/api/";
const orders = ['','weight','distance','sale_number','sale_price','price']; const orders = ['','weight','distance','sale_number','sale_price','price'];
//封装GET请求 //封装GET请求
function _get(url,data) { function _get(url,data) {

Loading…
Cancel
Save