酒景套餐

app.js

@@ -21,7 +21,7 @@ App({
       unique_key: "wechatxcx"
     }).then(res => {
       let data = JSON.parse(res.data);
-      data.isTest = data.isTest148? true : false;
+      data.isTest = data.isTest149? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件

pages/info/postProductInfo/index.js

@@ -73,8 +73,22 @@ Page({
                 res.data.sku = [sku];
             }
             res.data.flag = res.data.sku.find(item => item.flag == 'on') ? res.data.flag : 0
+
+            let resData = res.data
+            if (resData.product_data) {
+                if (resData.product_data["住"]) {
+                    resData.product_data["住"] = JSON.parse(resData.product_data["住"])
+                }
+                if (resData.product_data["游"]) {
+                    resData.product_data["游"] = JSON.parse(resData.product_data["游"])
+                }
+                if (resData.product_data["食"]) {
+                    resData.product_data["食"] = JSON.parse(resData.product_data["食"])
+                }
+            }
+
             this.setData({
-                info: res.data,
+                info: resData,
                 supplierId: res.data.supplier_id,
                 iShop: res.data.supplier_id ? true : false
             })
@@ -686,6 +700,16 @@ Page({
             util.gotoDetail(item);
         }
     },
+
+    gotolocation: function () {
+        let info = this.data.info;
+        wx.openLocation({
+          latitude: Number(info.scene_lat),
+          longitude: Number(info.scene_lon),
+          name:info.scene_name,
+            address:info.scene_address
+        })
+      },
     /**
      * 生命周期函数--监听页面初次渲染完成
      */

pages/info/postProductInfo/index.wxml

@@ -21,15 +21,61 @@
   <view class="com-price two">￥{{ allowance_data.mini_price / 100 }}起</view>
   <view class="yellow">单品最高补贴{{ allowance_data.max_price / 100 }}元</view>
 </view>
-<view class="top-info" wx:if="{{info}}">
+
-  <view class="title">{{info.title}}</view>
+<view wx:if="{{info}}">
-  <view class="subtitle">{{info.subtitle}}</view>
+    <!-- 酒景套餐 -->
-  <view class="tags-box textOver">
+    <view class="top-info" style="padding: 0;" wx:if="{{info.is_package===1}}">
-    <view class="tag textOver" wx:for="{{info.display_tags}}">{{item}}<view class="line"></view>
+        <div class="wineScene-price-container" >
+            <div class="wineSecne-price">{{info.price/100}}<span class="wineSecne-money">￥{{info.market_price/100}}</span></div>
+            <div>已售{{info.sales_number||0}}份</div>
+        </div>
+        <view style="padding: 26rpx 26rpx 0;">
+            <view class="title" style="font-weight: bold;">{{info.title}}</view>
+            <view class="hotel-custom" style="padding:26rpx 0">
+                <view class="hotel-custom-detail" wx:for="{{info.product_data}}" wx:key="item">
+                    <view class="tip-info">
+                        <view class="tip">{{index}}</view>
+                        <view class="info"></view>
+                    </view>
+                    <view class="hotel-custom-right" style="padding-left: 8rpx;flex:1;width: 1rpx;" >
+                        <view style="display: flex;align-items: center;justify-content: space-between;" wx:for="{{item}}" wx:key="data" wx:for-item="str" wx:for-index="i">
+                            <view class="textOver" style="flex:1;">
+                                {{str.title}}
+                            </view>
+                            <view style="flex-shrink: 0;width: 60rpx;text-align: right;">{{str.unit}}</view>
+                        </view>
+                    </view>
+                </view>
+
+            </view>
+        </view>
+
+        <view style="width: 100%;background:#f2f2f2;padding-top: 16rpx;margin-bottom: -8rpx;" bindtap="gotolocation">
+            <view class="map-container">
+                <view>
+                    <view class="textOver" style="font-weight: 500;font-size: 28rpx;color: #000000;width: 600rpx;">{{info.scene_name}}</view>
+                    <view style="padding-top: 17rpx;">{{info.scene_address}}</view>
+                    
+                </view>
+                <view style="text-align: center;">
+                    <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/wineScene/navigation.png"></image>
+                    <view style="padding-top: 14rpx;">去这里</view>
+                </view>
+            </view>
+        </view>
+    </view>
+    <view class="top-info" wx:else>
+        <view class="title">{{info.title}}</view>
+        <view class="subtitle">{{info.subtitle}}</view>
+        <view class="tags-box textOver">
+            <view class="tag textOver" wx:for="{{info.display_tags}}">{{item}}<view class="line"></view>
+            </view>
+            <view class="tags-price"><text>￥</text><text>{{info.price/100}}</text><text>起</text></view>
+        </view>
     </view>
-    <view class="tags-price"><text>￥</text><text>{{info.price/100}}</text><text>起</text></view>
-  </view>
 </view>
+
+
 <view class="scroll-all-box" id="menus" wx:if="{{info}}">
   <view class="scroll-menus{{fixed?' fixed-menus':''}}" style="top:{{top}}px">
     <view class="scroll-menu-item{{type==1?' active':''}}" bindtap="changeMenu" data-index="1">产品特色</view>

pages/info/postProductInfo/index.wxss

@@ -938,4 +938,99 @@ page {
   align-items: center;
   justify-content: space-between;
   height: 70rpx;
-}
+}
+
+ .wineScene-price-container {
+    width: 750rpx;
+    height: 100rpx;
+    background: linear-gradient(-90deg,#FF413B, #FFAB2E);
+    border-radius: 20rpx 20rpx 0rpx 0rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 26rpx;
+    box-sizing: border-box;
+    color: #FFFFFF;
+    font-size: 24rpx;
+ }
+
+ .wineScene-price-container .wineSecne-price {
+    font-weight: bold;
+    font-size: 36rpx;
+    color: #FFFFFF;
+}
+.wineScene-price-container .wineSecne-money {
+    font-size: 24rpx;
+    font-weight: 500;
+    text-decoration-line: line-through;
+    padding-left: 14rpx;
+}
+.wineScene-price-container .wineSecne-price::before {
+    font-size: 24rpx;
+    content: '￥';
+}
+
+.hotel-custom-detail{
+    display: flex;
+    /* justify-content: space-between; */
+    height: fit-content;
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #666666;
+    margin-bottom: 20rpx;
+}
+.hotel-custom-detail .tip-info{
+    width: 33rpx;
+    position: relative;
+    display: flex;
+    justify-content: center;
+    flex-shrink: 0;
+}
+.hotel-custom-detail .tip-info .tip{
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 23rpx;
+    color: #FFFFFF;
+    width: 33rpx;
+    height: 33rpx;
+    background: #6394FD;
+    border-radius: 50%;
+    position: absolute;
+    top: 0;
+    left: 0;
+    text-align: center;
+    line-height: 33rpx;
+}
+.hotel-custom-detail .tip-info .info{
+    width: 11rpx;
+    height: 100%;
+    background: #D0DFFE;
+    border-radius: 5rpx;
+}
+
+.hotel-custom-right>view{
+    margin-bottom: 20rpx;
+}
+.hotel-custom-right>view:last-of-type{
+    margin-bottom: 0;
+}
+.map-container{
+    background-image: url('https://static.ticket.sz-trip.com/jundaosuzhou/images/wineScene/locationBg.png');
+    background-size: 100% 100%;
+    width: 100%;
+    height: 128rpx;
+    padding: 30rpx 26rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #666666;
+    box-sizing: border-box;
+}
+.map-container image{
+    width: 29rpx;
+    height: 29rpx;
+}

pages/map/index.js

@@ -759,6 +759,40 @@ Page({
     })
   },
 
+// 位页面 gotoUrl 和 gotourls
+  gotoUrl: function(e) {
+    let url = e.currentTarget.dataset.url;
+    app.globalData.weburl = url;
+    wx.navigateTo({
+        // url: '/pages/pbService/web/index?weburl='+encodeURIComponent('https://m.cloud.sz-trip.com/Cloudperform2022'),
+        url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+    })
+},
+// 实时路况跳转外链
+gotoUrls() {
+    // 判断是否登录
+    var token = wx.getStorageSync("jstrip_token"), userId = wx.getStorageSync("jstrip_userid");
+    if(!token || !userId) {
+        let url = 'https://wlsjzx.zdhxwl.cn/kt_h5/index.html'
+        
+        app.globalData.weburl = url;
+        wx.navigateTo({
+            url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+        })
+    }else {
+        commonApi.user_post("uservice/user/userEncry").then(res => {
+            if(res.code == 1) {
+                let url = 'https://wlsjzx.zdhxwl.cn/kt_h5/index.html?userEncry=' + res.data
+                
+                app.globalData.weburl = url;
+                wx.navigateTo({
+                    url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url),
+                })
+            }
+        })
+    }
+},
+
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/map/index.wxml

@@ -1,6 +1,8 @@
 <!--pages/map/index.wxml-->
 <!-- <search bind:onload="search"></search> -->
 <title title="图游"></title>
+
+<view wx:if="{{!isTest}}">
 <map class="map" id="map" style="height:100%" wx:if="{{areas.length>0}}" longitude="{{areas[areaIndex]?areas[areaIndex].lon:longitude}}" latitude="{{areas[areaIndex]?areas[areaIndex].lat:latitude}}" show-location markers="{{list}}" bindmarkertap="onTapMarker" bindregionchange="changeRegion" scale='13'>
 </map>
 <view style="height:{{topHeight}}px"></view>
@@ -307,4 +309,33 @@
 </view>
 <view class="mask" wx:if="{{showAllMask}}" bindtap="closeMask" catchtouchmove="preventTouchMove">
   <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/map/arrow.png" mode="widthFix" class="returnImg"></image>
+</view>
+
+</view>
+
+<view wx:else>
+   
+    <view style="overflow-x:auto;background: #FFFED6;border-radius: 20rpx;background:url('https://static.ticket.sz-trip.com/uploads/20240617/e1c3f60baf65787d593c6a7c79f881c7.png');background-size: 100% 100%;height: 199.33rpx;">
+        <!-- 元旦修改 ggfw为新增类名 -->
+        <view class="pbservice ggfw-list" style="width:100%;margin-top: 43rpx;">
+        <view bindtap="gotoUrl" data-event="sbk" data-title="电子社保卡" data-url="https://m.cloud.sz-trip.com/sbkLogin" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240624/28e0cadbb7363dec9b51b1174bd2c5a5.png" mode="widthFix"></image>
+            <view>电子社保卡</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/55bbad2e7dcec9bd9753fc848488b8f2.png" mode="widthFix"></image>
+            <view>景区舒适度</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="xlqc" data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/" class="pbservice-item ggfw" style="margin-right: 32.33rpx;">
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/311deeac7cd4dbf821b9b394e69431ed.png" mode="widthFix"></image>
+            <view>行李寄存</view>
+        </view>
+        <view bindtap="gotoUrl" data-event="xlqc" data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item ggfw" style="margin-right: 0;">
+
+            <image src="https://static.ticket.sz-trip.com/uploads/20240606/a6ab539577b9003e35061a888ec4aa27.png" mode="widthFix"></image>
+            <view>实时路况</view>
+        </view>
+
+        </view>
+    </view>
 </view>

pages/map/index.wxss

@@ -672,4 +672,45 @@
     /* color: #83D851; */
     text-align: center;
     line-height: 40rpx;
-}
+}
+
+/* // 位页面 */
+.pbservice {
+    /* width: calc(175rpx * 6); */
+    /* 元旦修改 */
+    width: calc(190rpx * 7);
+    display: flex;
+    margin-top: 30rpx;
+    flex-wrap: wrap;
+    /* margin-bottom: 60rpx; */
+    /* 元旦修改 注释margin-bottom */
+    justify-content: center;
+  }
+  .pbservice-item {
+    /* 元旦修改 截止到注释的width*/
+    width: 120rpx;
+    margin-bottom: 33.33rpx;
+    margin-right: 62.33rpx;
+    /* width: 175rpx; */
+    text-align: center;
+    font-size: 25rpx;
+    /* color: #333; */
+    /* 春节调整颜色改版 */
+    color: #54504D;
+    line-height: 24rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+  }
+  .text {
+    width: 200rpx;
+  }
+  .pbservice-item image {
+    /* width: 60rpx;
+    margin-bottom: 20rpx;
+    margin-top: 50rpx; */
+    /* 元旦修改 以上都是之前的*/
+    width: 106rpx;
+    margin-bottom: 10rpx;
+  }

pages/order/orderList/index.wxml

@@ -73,7 +73,7 @@
         
       <view wx:if="{{coupon && coupon.activity.discount_type != 'pricebreak'}}">
         <text>合计：</text><text
-        class="price">¥{{((showPrice + postFee)* coupon.activity.fold/10)>0?((showPrice + postFee)* coupon.activity.fold/10)/100:0}}</text>
+        class="price">¥{{((postFee+showPrice* coupon.activity.fold/10))/100}}</text>
       </view>
       <view wx:else>
         <text>合计：</text>

pages/order/postOrder/index.wxml

@@ -58,7 +58,7 @@
       </view>
       <view wx:else>
         <text>合计：</text><text
-        class="price">¥{{((showPrice + postFee)* coupon.activity.fold/10)>0?((showPrice + postFee)* coupon.activity.fold/10)/100:0}}</text>
+        class="price">¥{{(postFee+showPrice* coupon.activity.fold/10)/100}}</text>
       </view>
     </view>
     <view wx:else>