Merge branch 'master' of http://gitlab.oytour.com/viitto/million

src/pages/detailHotal.vue

@@ -55,14 +55,13 @@
         </q-field>
         <q-field v-if="$q.platform.is.desktop" stack-label label="人数及客房" standout
         class="q-ml-lg"
-        :style="{'min-width': $q.platform.is.desktop?'190px':'130px',
-        'min-max': $q.platform.is.desktop?'190px':'col',}" dense>
+        style="min-width:190px" dense>
           <div class="self-center full-width no-outline" tabindex="0">
              {{numberOfAdults}}成人 
             <template v-if="numberOfChildren>0"> {{numberOfChildren}}儿童</template> 
              {{roomGroup}}房
           </div>
-          <q-popup-proxy :offset="[0, 10]" ref="qDateProxy2">
+          <q-popup-proxy :offset="[0, 10]">
             <div class="q-pa-lg q-py-lg bg-white">
               <div class="items-center"
               :clss="{'row':$q.platform.is.desktop,'column':$q.platform.is.mobile}">
@@ -175,15 +174,6 @@
                 </div>
                 <q-separator v-if="index!=(msg.searchroomGroup.length-1)" color="grey-2" class="q-my-md" />
               </div>
-              <div class="row q-pt-md">
-                <q-btn
-                    color="primary"
-                    unelevated
-                    class="q-px-xl col"
-                    label="确定"
-                    @click="getData(),$refs.qDateProxy2.hide()"
-                  />
-              </div>
             </div>
           </q-popup-proxy>
         </q-field>