refactor：bug修改

orderPages/bookService/index.vue

@@ -237,7 +237,7 @@ export default {
         //提交订单
         commitOrder(){
 
-            if(this.serviceObject){
+            if(!this.serviceObject){
                 uni.$u.toast('请选择服务对象')
                 return
             }

orderPages/orderDetail/index.vue

@@ -324,8 +324,17 @@ export default {
             uni.scanCode({
                 scanType: ['qrCode'],
                 success: function (res) {
+                    let json = JSON.parse(res.result)
+                    if(json.storeId != order.storeId){
+                        uni.showToast({
+                            icon: 'error',
+                            duration: 3000,
+                            title: '请扫描订单门店二维码'
+                        });
+                        return
+                    }
                     uni.navigateTo({
-                        url:'/orderPages/serviceItems/index?serviceStationId='+ res.result + '&orderId='+order.orderId + '&serviceObjectId=' + order.serviceObjectId
+                        url:'/orderPages/serviceItems/index?serviceStationId='+ json.stationId + '&orderId='+order.orderId + '&serviceObjectId=' + order.serviceObjectId
                     })
                 }
             })

orderPages/storeService/index.vue

@@ -106,7 +106,7 @@ export default {
 
     commonGeneralOrder() {
 
-      if(this.serviceObject){
+      if(!this.serviceObject){
         uni.$u.toast('请选择服务对象')
         return
       }

pages/order/index.vue

@@ -1,7 +1,6 @@
 <template>
 	<view class="content">
 
-		<u-sticky>
 <!--			<view ref="hContentWrap" class="hContentWrap h-content-wrap">-->
 <!--				<view class="tab-bar">-->
 <!--					<view class="tab-item" :class="{ active: currentTab === 0 }" @click="changeTab(0)">-->
@@ -19,7 +18,6 @@
             					transform: 'scale(1.05)'
        							 }" :current="tabIndex" @click="clickTab"></u-tabs>
 			</View>
-		</u-sticky>
 
 		<!-- 订单列表 -->
 		<view :style="{'height':windowHeight}" v-if="currentTab === 0">