From 0107b6cff6a1ff473ec311d8eb926fa76a65fb3c Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 30 Dec 2024 09:47:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=92=E5=B1=B1=E5=AF=BA=E5=90=AC=E9=92=9F?=
 =?UTF-8?q?=E5=A3=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                 |  2 +-
 pages/component/orderAdv/orderAdv.js   | 42 ++++++--------------------
 pages/info/sceneProductInfo/index.wxml |  6 ++--
 3 files changed, 13 insertions(+), 37 deletions(-)

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 @@
       <view>收藏</view>
     </view>
     <view style="flex:1"></view>
-    <view class="btns">
-      <view class="btn"  bindtap="showCart" wx:if="{{info.product[0].type!='line'}}">加入购物车</view>
+    <view class="btns" wx:if="{{info.id!=914626}}">
+      <view class="btn"  bindtap="showCart" wx:if="{{info.product[0].type!='line' }}">加入购物车</view>
       <!-- <view class="btn {{info.product[0].type=='line' ? 'btn-r':''}}" bindtap="showOrder" wx:if="{{info && info.flag==1}}">立即预订</view> -->
       <view class="btn disable" wx:elif="{{info}}">该商品已下架</view>
     </view>
@@ -158,7 +158,7 @@
         </view>
       </view>
       <view class="sku-names">
-        <view bindtap="selectSku" data-index="{{index}}" data-item="{{item}}" class="sku-name-item textOver{{index==skuIndex?' active':''}} {{item.stock==0&&item.is_third_stock!=1?' disable':''}}" wx:for="{{skuList}}">{{item.sku_name}}</view>
+        <view bindtap="selectSku" data-index="{{index}}" data-item="{{item}}" class="sku-name-item textOver{{index==skuIndex?' active':''}} {{(item.stock==0&&item.is_third_stock!=1)||item.is_salee==1?' disable':''}}" wx:for="{{skuList}}">{{item.sku_name}}</view>
       </view>
       <view class="number-box">
         <text>数量</text>