Merge branch 'occupy' into all

src/components/site/order_modal/order_modal.vue

@@ -14,6 +14,12 @@
 					<view class="ov-view">{{ orderInfo.order_no || '' }}</view>
 				</view>
 			</view>
+			<view class="om-info-line" v-if="orderInfo.is_show_take_up_use_text">
+				<view class="oil-view">占用用途：</view>
+				<view class="oil-view">
+					<view class="ov-view">{{ orderInfo.take_up_use_text || '' }}</view>
+				</view>
+			</view>
 			<view class="om-info-line" v-if="orderInfo.type != 'take_up_venue'">
 				<view class="oil-view">创建时间：</view>
 				<view class="oil-view">
@@ -60,6 +66,7 @@
 				</view>
 			</block>
 			
+			<view class="om-take-up-tip" v-if="orderInfo.is_show_back_stage_take_up_tips">{{ orderInfo.back_stage_take_up_tips || '' }}</view>
 
 			<view class="om-border"></view>
 
@@ -398,6 +405,12 @@ export default {
 			height: 2upx;
 			background-color: #D8D8D8;
 		}
+		.om-take-up-tip{
+			line-height: 34upx;
+			font-size: 24upx;
+			color: #EA5061;
+			@include textHide(1);
+		}
 		.om-total{
 			margin-top: 20upx;
 			margin-bottom: 40upx;

src/pages/site/confirm/confirm.vue

@@ -39,11 +39,31 @@
             </view>
             <view class="sc-ipt">
                 <view class="si-price">
-                    <view class="sp-tit">收取金额</view>
-                    <view class="sp-frame"><input v-model="ocPrice" type="number" /></view>
+                    <view class="si-tit"><text>* </text>收取金额</view>
+                    <view class="sp-frame"><text>￥</text><input v-model="ocPrice" type="number" /></view>
+                </view>
+                <view class="si-usage">
+                    <view class="su-line">
+                        <view class="si-tit"><text>* </text>占用用途</view>
+                        <view class="su-ls">
+                            <view :class="[ocUsage == 1 ? 'active' : '']" @click="ocUsage = 1">
+                                <text>客户订场</text>
+                                <image v-if="ocUsage == 1" mode="aspectFit" src='/static/images/icon/selected_tag.png'></image>
+                            </view>
+                            <view :class="[ocUsage == 2 ? 'active' : '']" @click="ocUsage = 2">
+                                <text>散客</text>
+                                <image v-if="ocUsage == 2" mode="aspectFit" src='/static/images/icon/selected_tag.png'></image>
+                            </view>
+                            <view :class="[ocUsage == 3 ? 'active' : '']" @click="ocUsage = 3">
+                                <text>锁场</text>
+                                <image v-if="ocUsage == 3" mode="aspectFit" src='/static/images/icon/selected_tag.png'></image>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="su-tip">注：占用用途如选择“散客”，用户端次卡列表将会显示该占用场次为散客时间</view>
                 </view>
                 <view class="si-reason">
-                    <view class="sr-tit">占用原因</view>
+                    <view class="si-tit">占用原因</view>
                     <view class="sr-frame">
                         <textarea placeholder="多行输入…"  v-model="ocReaon"></textarea>
                     </view>
@@ -65,6 +85,7 @@ export default {
         return {
             ocPrice: '',
             ocReaon: '',
+            ocUsage: 1, // 1 -> 客户订场， 2-> 散客， 3-> 锁场
             light_up: false,
         }
     },
@@ -88,8 +109,8 @@ export default {
             this.light_up = e.detail.value
         },
         confirmOccupy: util.debounce(function(){
-            let { storeInfo, dateInfo, venueList, typeInfo } = this.occupyInfo;
-            let { ocPrice, ocReaon, light_up } = this;
+            let { storeInfo, dateInfo, venueList, typeInfo} = this.occupyInfo;
+            let { ocPrice, ocReaon, light_up, ocUsage } = this;
             util.showLoad();
             servers.post({
                 url: API.venue.venueTakeUp,
@@ -99,12 +120,13 @@ export default {
                     amount: +ocPrice,
                     group: storeInfo.id,
                     date: dateInfo.dateStr,
+                    take_up_use: ocUsage,
                     items: venueList.map(el=>{
                         return {
                             venue_id: el.parentObj.venue_id,
                             venue_name: el.parentObj.venue_name,
                             duration: el.durations,
-                            price: el.price
+                            price: el.price,
                         }
                     }),
                     light_up,
@@ -248,37 +270,91 @@ export default {
             padding-top: 40upx;
             padding-bottom: 62upx;
             width: 682upx;
+            .si-tit{
+                flex-shrink: 0;
+                margin-right: 28upx;
+                line-height: 40upx;
+                font-size: 28upx;
+                color: #333;
+                >text{
+                    color: #EA5061;
+                }
+            }
             .si-price{
                 margin-bottom: 12upx;
                 @include centerFlex(flex-start);
-                .sp-tit{
-                    flex-shrink: 0;
-                    margin-right: 28upx;
-                    line-height: 40upx;
-                    font-size: 28upx;
-                    color: #333;
-                }
+                
                 .sp-frame{
                     padding: 0 20upx;
-                    width: 262upx;
-                    height: 56upx;
+                    width: 434upx;
+                    height: 96upx;
                     border: 2upx solid #D8D8D8;
                     border-radius: 10upx;
+                    @include centerFlex(flex-start);
+                    >text{
+                        flex-shrink: 0;
+                        flex-grow: 0;
+                        font-size: 32upx;
+                        line-height: 44upx;
+                        color: #333;
+
+                    }
                     >input{
-                        width: 100%;
+                        flex-grow: 1;
                         height: 100%;
                         font-size: 28upx;
                         color: #333;
                     }
                 }
             }
+            .si-usage{
+                padding: 24upx 0;
+                .su-line{
+                    @include centerFlex(flex-start);
+                    .su-ls{
+                        margin-bottom: 20upx;
+                        @include centerFlex(flex-start);
+                        >view{
+                            
+                            padding: 0 10upx;
+                            width: 152upx;
+                            height: 72upx;
+                            line-height: 68upx;
+                            text-align: center;
+                            border-radius: 10upx;
+                            border: 2upx solid #D8D8D8;
+                            font-size: 24upx;
+                            color: #9a9a9d;
+                            @include textHide(1);
+                            &:not(:last-child){
+                                margin-right: 20upx;
+                            }
+                            
+                        }
+                        .active{
+                            position: relative;
+                            color: $themeColor;
+                            border-color: $themeColor;
+                            >image{
+                                position: absolute;
+                                right: -2upx;
+                                top: -2upx;
+                                width: 36upx;
+                                height: 36upx;
+                            }
+                        }
+                    }
+                }
+                .su-tip{
+                    font-size: 24upx;
+                    line-height: 34upx;
+                    color: #9a9a9d;
+                }
+                
+            }
             .si-reason{
-              .sr-tit{
-                margin-bottom: 18upx;
-                font-size: 28upx;
-                color: #333;
-              }  
               .sr-frame{
+                  margin-top: 20upx;
                   padding: 20upx 10upx;
                   width: 682upx;
                   height: 260upx;