代码提交

app.js

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

pages/info/groupOrderInfo/index.wxml

@@ -1,29 +1,27 @@
 <!--pages/info/groupOrderInfo/index.wxml-->
 <title title="团体信息"></title>
-<view class="box" wx:if="{{info && info.list && info.list.state==0}}">
+<view class="box">
-  <view class="code">{{info.list.state_text}}</view>
+  <view wx:if="{{info.list.state!=2}}" class="code"  style="margin: 42rpx;">{{info.list.team_name}}</view>
-  <view class="code">{{info.list.team_name}}</view>
+  <view wx:if="{{info.list.state==2}}">
+  <view class="code" style="margin-top: 42rpx;">成功预约人数</view>
+  <view class="code" style="margin: 42rpx;">{{info.list.members_count}}</view>
+</view>
   <view class="top-tips top-new-tips">
     <view class="top-tip">场馆名称：{{info.list.scene.title}}</view>
     <view class="line" style="height:25rpx"></view>
     <view class="top-tip">预约时间：{{info.list.order_info.product_list[0].start_time}} ~ {{info.list.order_info.product_list[0].end_time}}</view>
   </view>
-  <view class="top-tips">
+  <view class="top-tips" wx:if="{{info.list.state!=2}}">
     <view class="top-tip">预约人数：{{info.list.member_num}}</view>
     <view class="line"></view>
     <view class="top-tip">填写信息人数：{{info.list.members_count}}</view>
   </view>
-  <button bindtap="showShare" style="width:100%" class="top-btn">立即邀请</button>
+  <button wx:if="{{info.list.state==0}}" bindtap="showShare" style="width:100%" class="top-btn">立即邀请</button>
-  <view class="top-btn full" bindtap="order">提交订单</view>
+  <view wx:if="{{info.list.state==0}}" class="top-btn full" bindtap="order">提交订单</view>
-  <view class="count-down" wx:if="{{restTime}}">组团中({{restTime}})</view>
+  <view class="count-down" >{{info.list.state_text}} <text wx:if="{{restTime}}">{{(restTime)}}</text> </view>
-</view>
-<view wx:else class="box">
-  <view class="code">{{info.list.state_text}}</view>
-  <view class="code">成功预约人数</view>
-  <view class="code" style="margin-top:50rpx">{{info.list.members_count}}</view>
 </view>
 <view class="box" wx:if="{{info && info.list}}">
-  <view wx:if="{{info.list.state==0}}" class="new-tip">倒计时结束后订单将自动提交至后台，订单提交后团员信息将无法修改</view>
+  <view wx:if="{{info.list.state!=2}}" class="new-tip">倒计时结束后订单将自动提交至后台，订单提交后团员信息将无法修改</view>
   <view class="box-title" wx:if="{{info.list.state==0}}">已填写信息团员</view>
   <view class="box-title" wx:else>预约成功团员</view>
   <view class="search-box">

pages/info/groupOrderInfo/index.wxss

@@ -15,8 +15,6 @@ page {
 .code {
   color: #0B898E;
   font-size: 40rpx;
-  font-weight: bold;
-  line-height: 100rpx;
 }
 .top-tips {
   display: flex;
@@ -128,14 +126,14 @@ page {
 .count-down {
   position: absolute;
   left: 50%;
-  line-height: 40rpx;
+  line-height: 50rpx;
   background: #0B898E;
   border-radius: 0px 0px 20rpx 20rpx;
   text-align: center;
   color: #fff;
-  font-size: 26rpx;
+  font-size: 32rpx;
-  width: 300rpx;
+  width: 320rpx;
-  margin-left: -150rpx;
+  margin-left: -160rpx;
   top: 0;
 }
 .top-new-tips {

pages/order/card/index.js

@@ -90,7 +90,7 @@ Page({
   add:function(){
     if(this.data.product.sku.sku_model.traveller_limit_num!=0 && this.data.productNum==this.data.product.sku.sku_model.traveller_limit_num){
       wx.showToast({
-        title: '出行人限购'+this.data.product.sku.sku_model.traveller_limit_num+"份",
+        title: '本产品单笔限购'+this.data.product.sku.sku_model.traveller_limit_num+"份",
         icon:'none'
       })
       return;

pages/order/components/contact/index.js

@@ -253,7 +253,7 @@ Component({
       }
       else if(item.selected!=1 && traveller_limit_num!=0 && num>=traveller_limit_num && traveller_limit_num!=-1){
         wx.showToast({
-          title: '出行人限购'+traveller_limit_num+"份",
+          title: '本产品单笔限购'+traveller_limit_num+"份",
           icon:'none'
         })
         return;

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="{{ !isTeam && item.stock==-1}}">不开放</view>
+      <view class="price" wx:if="{{ !isTeam && item.stock==-1}}">不可定</view>
       <view class="price" wx:elif="{{ !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}}">{{item.tipText?item.tipText:'售罄'}}</view>
@@ -18,7 +18,7 @@
     </view>
   </view>
   <view class="date-times" wx:if="{{timelist.length>0}}">
-    <view bindtap="selectTime" data-index="{{index}}" wx:for="{{timelist}}" class="textOver date-time{{timeIndex==index?' active':''}}{{item.stock_number>0?'':' disable'}}">{{item.start_time}}-{{item.end_time}}<text wx:if="{{(item.stock_number>=10)}}"> 有票</text><text wx:elif="{{item.stock_number==0}}"> 售罄</text><text wx:elif="{{item.stock_number==-1}}">不开放</text><text wx:else>（{{'余票'+item.stock_number}}）</text></view>
+    <view bindtap="selectTime" data-index="{{index}}" wx:for="{{timelist}}" class="textOver date-time{{timeIndex==index?' active':''}}{{item.stock_number>0?'':' disable'}}">{{item.start_time}}-{{item.end_time}}<text wx:if="{{(item.stock_number>=10)}}"> 有票</text><text wx:elif="{{item.stock_number<=0}}"> 售罄</text><text wx:elif="{{item.stock_number==-1}}">不可定</text><text wx:else>（{{'余票'+item.stock_number}}）</text></view>
   </view>
   <!-- <view class="date-times" wx:elif="{{activeDate.is_time_stock}}">
     <view>已售罄</view>

pages/order/scene/index.js

@@ -110,7 +110,7 @@ Page({
     }
     if (this.data.product.sku.sku_model.traveller_limit_num != 0 && this.data.productNum == this.data.product.sku.sku_model.traveller_limit_num) {
       wx.showToast({
-        title: '出行人限购' + this.data.product.sku.sku_model.traveller_limit_num + "份",
+        title: '本产品单笔限购' + this.data.product.sku.sku_model.traveller_limit_num + "份",
         icon: 'none'
       })
       return;

pages/order/sceneCart/index.js

@@ -88,7 +88,7 @@ Page({
   add: function () {
     if (this.data.product.sku.sku_model.traveller_limit_num != 0 && this.data.productNum == this.data.product.sku.sku_model.traveller_limit_num) {
       wx.showToast({
-        title: '出行人限购' + this.data.product.sku.sku_model.traveller_limit_num + "份",
+        title: '本产品单笔限购' + this.data.product.sku.sku_model.traveller_limit_num + "份",
         icon: 'none'
       })
       return;