团队预约改了部分样式

团队预约改了部分样式

pages/index/index.wxml

@@ -241,9 +241,9 @@
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
         <view>博物馆查询</view>
       </view>
-      <view bindtap="gotoPath" data-title="团队预约" data-path="/pages/pbService/group/index" class="pbservice-item">
+      <view bindtap="gotoPath" data-title="团体预约" data-path="/pages/pbService/group/index" class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
-        <view>团队预约</view>
+        <view>团体预约</view>
       </view>
 
       <view bindtap="gotoPath" data-title="精彩回顾" data-path="/pages/pbService/activity/index" class="pbservice-item">

pages/info/museumInfo/index.js

@@ -409,7 +409,8 @@ Page({
       sku: this.data.info.product_venue.sku[0],
       infoDate: this.data.date,
       infoTime: this.data.time,
-      isGroup: this.data.isGroup
+      isGroup: this.data.isGroup,
+      isTeam: this.data.info.team_order
     }
     wx.navigateTo({
       url: '/pages/order/scene/index?type=museum'

pages/info/museumInfo/index.wxml

@@ -1,20 +1,28 @@
 <!--pages/info/museumInfo/index.wxml-->
 <wxs src="../../../utils/filter.wxs" module="tool" />
-<title title="场馆详情"></title>
+<title title="场馆团体预约" wx:if="{{info.team_order}}"></title>
+<title title="场馆详情" wx:else></title>
 <view class="iconfont icon-fenxiang" bindtap="share"></view>
-<swiper class="swiper" indicator-dots="{{true}}" wx:if="{{info}}"
+<swiper class="swiper" indicator-dots="{{true}}" wx:if="{{info}}" autoplay="{{true}}" interval="{{2000}}"
-  autoplay="{{true}}" interval="{{2000}}" duration="{{300}}">
+  duration="{{300}}">
   <block wx:for="{{info.listimg}}" wx:key="*this">
     <swiper-item>
       <image src="{{item}}" mode="aspectFill"></image>
     </swiper-item>
   </block>
+  <view class="title" wx:if="{{info && info.team_order}}">{{info.title}}（团体预约）</view>
 </swiper>
-<view class="info" wx:if="{{info}}">
+<!-- 普通详情样式 -->
+<view class="info" wx:if="{{info && !info.team_order}}">
   <view class="title">{{info.title}}</view>
   <view class="location"><text class="iconfont icon-location"></text>{{info.address}}</view>
   <view class="location" style="margin-bottom:0"><text class="iconfont icon-dianhua2"></text>{{info.tel}}</view>
 </view>
+<!-- 团体预约的详情样式 -->
+<view class="team_info" wx:if="{{info && info.team_order}}">
+  <view class="location"><text class="iconfont icon-location"></text>{{info.address}}</view>
+  <view class="location" style="margin-bottom:0"><text class="iconfont icon-dianhua2"></text>{{info.tel}}</view>
+</view>
 <view class="menu-box{{fixed?' menu-fixed':''}}" style="top:{{top}}px" wx:if="{{isGroup!=1}}">
   <view class="menu-item{{type==1?' active':''}}" bindtap="changeType" data-type="1">场馆介绍</view>
   <view class="menu-item{{type==2?' active':''}}" bindtap="changeType" data-type="2">场馆活动</view>
@@ -22,7 +30,8 @@
 <view style="height:102rpx;" wx:if="{{fixed}}"></view>
 <view id="content">
   <view wx:if="{{type==1}}">
-    <date wx:if="{{isLogin && product && product.sku && product.product}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime" product="{{product}}"></date>
+    <date wx:if="{{isLogin && product && product.sku && product.product}}" bind:onChangeDate="changeDate"
+      bind:onChangeTime="changeTime" product="{{product}}" isTeam="{{info.team_order}}"></date>
     <view class="detail-title">预订须知</view>
     <rich-text wx:if="{{info}}" class="detail" nodes="{{tool.formateRichText(info.book_info)}}"></rich-text>
     <view class="detail-title">场馆介绍</view>
@@ -43,12 +52,13 @@
     </navigator>
     <view style="font-size:26rpx;text-align:center;line-height:200rpx;" wx:if="{{actList.length==0}}">暂无活动</view>
   </view>
-  <view style="height:104rpx" wx:if="{{info.product_venue && info.product_venue.sku && info.product_venue.sku.length>0}}"></view>
+  <view style="height:104rpx"
+    wx:if="{{info.product_venue && info.product_venue.sku && info.product_venue.sku.length>0}}"></view>
 </view>
 <view class="fixed-btn" wx:if="{{info.product_venue && info.product_venue.sku && info.product_venue.sku.length>0}}">
-  <view bindtap="order" class="btn">参观预约</view>
+  <view bindtap="order" class="btn {{info && info.team_order ? 'team' : ''}}">参观预约</view>
 </view>
-<view style="position:absolute;right:0;left:-10000rpx;top:-200rpx;">
+<view style="position:absolute;right:0;left:-10000rpx;top:-200rpx;z-index:-1">
   <canvas canvas-id='imageCanvas' class='imageCanvas' style="width:551rpx;height:643rpx;" disable-scroll='true'>
   </canvas>
   <canvas class="canvasCode" style="opacity:0;width:500px;height:500px" canvas-id="myQrcode"></canvas>
@@ -59,15 +69,22 @@
     <image class="share-img" src="{{shareImg}}" mode="widthFix"></image>
     <view class="share-tips">
       <view style="position:relative">
-        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/img.png" mode="widthFix"></image>
+        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/img.png" mode="widthFix">
+        </image>
         <view>保存图片到相册</view>
-        <view class="tipimg"><image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok.png" mode="widthFix"></image></view>
+        <view class="tipimg">
+          <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok.png" mode="widthFix"></image>
         </view>
-      <image style="width:36rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/arrow2.png" mode="widthFix"></image>
+      </view>
+      <image style="width:36rpx" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/arrow2.png"
+        mode="widthFix"></image>
       <view style="position:relative">
-        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/code.png" mode="widthFix"></image>
+        <image class="img" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/code.png" mode="widthFix">
+        </image>
         <view>微信识别二维码</view>
-        <view class="tipimg"><image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok1.png" mode="widthFix"></image></view>
+        <view class="tipimg">
+          <image src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/ok1.png" mode="widthFix"></image>
+        </view>
       </view>
     </view>
     <view class="save-btn" bindtap="save">保存到相册</view>

pages/info/museumInfo/index.wxss

@@ -1,9 +1,23 @@
 /* pages/info/museumInfo/index.wxss */
-.swiper,.swiper image {
+.swiper,
+.swiper image {
   width: 100%;
   height: 330rpx;
   display: block;
 }
+
+.swiper {
+  position: relative;
+}
+
+.swiper .title {
+  position: absolute;
+  left: 30rpx;
+  bottom: 20rpx;
+  box-sizing: border-box;
+  color: #FFFFFF;
+}
+
 .info {
   margin: 0 25rpx;
   margin-top: -30rpx;
@@ -14,20 +28,24 @@
   border-radius: 13rpx;
   padding: 30rpx;
 }
+
 .info .title {
   font-size: 31rpx;
   color: #000;
   margin-bottom: 20rpx;
 }
+
 .info .location {
   color: #999999;
   font-size: 24rpx;
   margin-bottom: 20rpx;
 }
+
 .info .location .iconfont {
   margin-right: 10rpx;
   font-size: 26rpx;
 }
+
 .detail-title {
   font-weight: 500;
   font-size: 35rpx;
@@ -35,10 +53,12 @@
   margin: 26rpx;
   margin-top: 45rpx;
 }
+
 .detail {
   display: block;
   padding: 26rpx;
 }
+
 .fixed-btn {
   position: fixed;
   left: 0;
@@ -51,6 +71,7 @@
   align-items: center;
   justify-content: center;
 }
+
 .fixed-btn .btn {
   width: 391rpx;
   line-height: 73rpx;
@@ -61,6 +82,16 @@
   font-size: 31rpx;
   font-weight: 500;
 }
+
+.fixed-btn .btn.team {
+  width: 100%;
+  box-sizing: border-box;
+  height: 100%;
+  line-height: 104rpx;
+  background-color: #0B898E;
+  border-radius: 0;
+}
+
 .menu-box {
   display: flex;
   align-items: center;
@@ -68,15 +99,18 @@
   height: 100rpx;
   border-bottom: 1rpx solid #CCCCCC;
 }
+
 .menu-item {
   font-size: 35rpx;
   line-height: 100rpx;
   position: relative;
 }
+
 .menu-item.active {
   font-size: 37rpx;
   font-weight: bold;
 }
+
 .menu-item.active::after {
   content: "!";
   font-size: 0;
@@ -90,6 +124,7 @@
   margin-left: -33rpx;
   top: 93rpx;
 }
+
 .activity-item {
   display: flex;
   background: #F4F4F4;
@@ -101,6 +136,7 @@
   position: relative;
   justify-content: space-between;
 }
+
 .end-box {
   position: absolute;
   right: 22rpx;
@@ -114,16 +150,19 @@
   color: #fff;
   font-size: 36rpx;
 }
+
 .activity-item .textOver2 {
   font-size: 31rpx;
   color: #333;
 }
+
 .activity-info {
   display: flex;
   height: 193rpx;
   flex-direction: column;
   justify-content: space-between;
 }
+
 .activity-item image {
   flex-shrink: 0;
   display: block;
@@ -131,9 +170,11 @@
   height: 193rpx;
   margin-left: 15rpx;
 }
+
 .activity-info .textOver {
   margin-bottom: 10rpx;
 }
+
 .menu-fixed {
   position: fixed;
   left: 0;
@@ -148,6 +189,7 @@
   bottom: 0;
   width: 100%;
 }
+
 .mask-content .icon-close {
   position: absolute;
   right: 40rpx;
@@ -163,10 +205,12 @@
   align-items: center;
   justify-content: center;
 }
+
 .share-img {
   display: block;
   width: 551rpx;
 }
+
 .share-tips {
   width: 426rpx;
   height: 150rpx;
@@ -182,12 +226,14 @@
   text-align: center;
   line-height: 40rpx;
 }
+
 .share-tips .img {
   display: block;
   width: 55rpx;
   margin: 0 auto;
   margin-bottom: 4rpx;
 }
+
 .tipimg {
   position: absolute;
   left: 50%;
@@ -201,11 +247,13 @@
   justify-content: center;
   top: 34rpx;
 }
+
 .tipimg image {
   width: 21rpx;
   display: block;
 
 }
+
 .save-btn {
   width: 403rpx;
   line-height: 77rpx;
@@ -217,3 +265,24 @@
   font-weight: 500;
   margin-top: 50rpx;
 }
+
+.team_info {
+  position: relative;
+  z-index: 1;
+  background: #FFFFFF;
+  box-shadow: 0px 0px 16rpx 0px rgba(6, 0, 1, 0.1);
+  border-radius: 13rpx;
+  padding: 30rpx;
+}
+
+.team_info .location {
+  color: #666666;
+  font-size: 24rpx;
+  margin-bottom: 20rpx;
+}
+
+.team_info .location .iconfont {
+  margin-right: 10rpx;
+  font-size: 26rpx;
+  color: #0B898E;
+}

pages/order/components/date/index.js

@@ -14,6 +14,11 @@ Component({
     product: {
       type: Object,
       default: {}
+    },
+    // 是否是团体预约的场馆
+    isTeam: {
+      type: Number,
+      default: 0
     }
   },
 

pages/order/components/date/index.wxml

@@ -4,7 +4,7 @@
   <view class="dates-boxes">
     <view bindtap="changeDate" data-date="{{item}}" class="date-item{{activeDate.date==item.date?' active':''}}{{(item.stock<=0 || item.stock==null || item.price==null)?' disable':''}}" wx:for="{{threeDays}}">
       <view>{{item.date}}</view>
-      <view class="price" wx:if="{{item.stock!=0 && item.stock!=null && item.price!=null}}">{{item.price==0 || kjIdCom?'免费':('￥'+item.price/100)}}</view>
+      <view class="price" wx:if="{{ !isTeam && item.stock!=0 && item.stock!=null && item.price!=null}}">{{item.price==0 || kjIdCom?'免费':('￥'+item.price/100)}}</view>
       <!-- <view class="price" wx:if="{{item.stock==null || item.price==null}}">不可定</view> -->
       <view class="price" wx:if="{{item.stock==0}}">售罄</view>
     </view>

pages/pbService/group/index.wxml

@@ -11,7 +11,7 @@
 <navigator url="/pages/info/museumInfo/index?id={{item.id}}&isGroup=1" class="group-item" wx:for="{{list}}">
   <image src="{{item.headimg}}" mode="aspectFill"></image>
   <view class="group-info">
-    <view class="group-title textOver">{{item.title}}</view>
+    <view class="group-title textOver">{{item.title}}（团体预约）</view>
     <view class="iconfont textOver"><text class="icon-dianhua3"></text>电话：{{item.tel}}</view>
     <view class="iconfont textOver"><text class="icon-location1"></text>{{item.address}}</view>
     <view class="group-bottom">

project.private.config.json

@@ -61,8 +61,8 @@
           "scene": null
         },
         {
-          "name": "我的",
+          "name": "团体预约场馆",
-          "pathName": "pages/user/user",
+          "pathName": "pages/pbService/group/index",
           "query": "",
           "scene": null
         }