diff --git a/app.js b/app.js
index 215d2b7..2d8e4ba 100644
--- a/app.js
+++ b/app.js
@@ -21,7 +21,7 @@ App({
unique_key: "wechatxcx"
}).then(res => {
let data = JSON.parse(res.data);
- data.isTest = data.isTest150? true : false;
+ data.isTest = data.isTest149? true : false;
this.globalData.configJson = data
}).then(() => {
// 获取ui配置文件
diff --git a/pages/component/orderAdv/orderAdv.js b/pages/component/orderAdv/orderAdv.js
index 89c9b32..0dbfd09 100644
--- a/pages/component/orderAdv/orderAdv.js
+++ b/pages/component/orderAdv/orderAdv.js
@@ -75,39 +75,15 @@ Component({
}
break;
case 3:
- if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) &&
- item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) {
- // 外部h5
- app.globalData.weburl = item.tdata.url;
- wx.navigateTo({
- url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata
- .url)
- })
- } else {
- let page = item.tdata.url.split("/");
- page = page[page.length - 1].split("?")
- let url = this.data.urltopage[page[0]];
- if (url && url.indexOf('map') != -1) {
- let types = ['', 'scenic', 'venue', 'post', 'restaurant', 'relic', 'tenscenic',
- 'cinema', 'academes'
- ],
- type = page[1] ? page[1].split("=") : [];
- wx.reLaunch({
- url: url + "?type=" + (type[1] ? types.findIndex(t => t == type[1]) :
- null)
- })
- } else if (url) {
- wx.navigateTo({
- url: url,
- })
- } else {
- app.globalData.weburl = item.tdata.url;
- wx.navigateTo({
- url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item
- .tdata.url)
- })
- }
- }
+ // 外部h5
+ console.log(item)
+ app.globalData.weburl = item.tdata.url;
+ wx.navigateTo({
+ url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.tdata
+ .url)
+ })
+
+
break;
case 4:
if (item.tdata.appid == 'wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')) {
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index 1d0768a..fc15461 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -83,8 +83,8 @@
收藏
-
- 加入购物车
+
+ 加入购物车
该商品已下架
@@ -158,7 +158,7 @@
- {{item.sku_name}}
+ {{item.sku_name}}
数量