Merge branch 'master' into dev_techan

app.js

@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest113? true : false;
+            data.isTest = data.isTest115? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {

pages/info/sceneProductInfo/index.js

@@ -899,7 +899,6 @@ Page({
   changeMenu: function (e) {
         let index = e.currentTarget.dataset.index,
             that = this;
-
         if (Array.isArray(this.data.skuDoms) && this.data.skuDoms.length>0) {
             console.log('进入暂存数据')
             try {
@@ -1012,7 +1011,7 @@ Page({
         showTabIndex:value
     })
   },
-  changeMenu: function (e) {
+  changePopMenu: function (e) {
     let value = e.currentTarget.dataset.index
     this.setData({
         menuType:value

pages/info/sceneProductInfo/index.wxml

@@ -157,15 +157,15 @@
       product="{{product}}" datePrice="{{skuPriceDate}}" endDays="{{30}}"></date>
       
       <view class="orderNotice" wx:if="{{orderSku}}">
-        <view style="font-weight: 500;font-size: 15px;color: #000000;">预订须知</view>
-        <view class="scroll-menus" wx:if="{{orderProduct&&orderProduct.content}}">
+        <view style="font-weight: 500;font-size: 15px;color: #000000;margin-bottom: 26rpx;">预订须知</view>
+        <view class="scroll-menus" wx:if="{{orderProduct&&orderProduct.product_detail}}">
             <view class="scroll-menu-item{{noticeIndex==0?' active':''}}"
             bindtap="changeNoticeIndex" data-index="0" style="width: 276rpx;">预订须知</view>
             <view class="scroll-menu-item{{noticeIndex==1?' active':''}}"
             bindtap="changeNoticeIndex" data-index="1" style="width: 276rpx;">产品详情</view>
         </view>
         <rich-text wx:if="{{noticeIndex==0}}" class="detail" nodes="{{tool.formateRichText(orderSku.sku_model.bookinfo)}}"></rich-text>
-        <rich-text wx:if="{{noticeIndex==1}}" class="detail" nodes="{{tool.formateRichText(orderProduct.content)}}"></rich-text>
+        <rich-text wx:if="{{noticeIndex==1}}" class="detail" nodes="{{tool.formateRichText(orderProduct.product_detail)}}"></rich-text>
         
       </view>
       <view style="height: 180rpx;"></view>
@@ -288,9 +288,9 @@
 
 <view style="background:white" wx:if="{{showTabIndex==2}}">
     <view class="scroll-menus">
-        <view class="scroll-menu-item{{menuType==0?' active':''}}" bindtap="changeMenu" data-index="0">景点介绍</view>
-        <view class="scroll-menu-item{{menuType==1?' active':''}}" bindtap="changeMenu" data-index="1">开放时间</view>
-        <view class="scroll-menu-item{{menuType==2?' active':''}}" bindtap="changeMenu" data-index="2">优待政策</view>
+        <view class="scroll-menu-item{{menuType==0?' active':''}}" bindtap="changePopMenu" data-index="0">景点介绍</view>
+        <view class="scroll-menu-item{{menuType==1?' active':''}}" bindtap="changePopMenu" data-index="1">开放时间</view>
+        <view class="scroll-menu-item{{menuType==2?' active':''}}" bindtap="changePopMenu" data-index="2">优待政策</view>
     </view>
     <view class="scroll-content" style="padding: 20rpx 33rpx;">
         <view class="info-title">{{menuType==0?"景点介绍":menuType==1?"开放时间":"优待政策"}}</view>

pages/info/sceneProductInfo/index.wxss

@@ -1003,7 +1003,7 @@ line-height: 93rpx;
 
 
 .scroll-menus{
-    padding: 26rpx 33rpx;
+    padding: 0rpx 33rpx 26rpx;
     display: flex;
     justify-content: space-between;
     align-items: center;