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

src/components/navs/hor-big-one.vue

@@ -213,39 +213,69 @@
                 :src="LoginUser.photo"
               />
               <img class="avatar" v-else src="../../assets/img/avatar.png" />
+              
               <!-- <span>{{LoginUser.name || LoginUser.mailbox}}</span> -->
             </template>
-            <div class="row no-wrap q-pa-md">
+            <div class="row no-wrap">
               <div class="column">
-                <q-list>
-                  <q-item clickable v-close-popup to="/account">
+                <q-list class="text-grey-8" dense>
+                  <q-item clickable v-close-popup to="/setUserInfo">
                     <q-item-section avatar>
-                      <q-avatar icon="folder" text-color="#474747" />
+                      <q-avatar icon="iconfont iconpeople1"/>
                     </q-item-section>
                     <q-item-section>
-                      <q-item-label>帳號設定</q-item-label>
+                      <q-item-label>個人信息</q-item-label>
                     </q-item-section>
                   </q-item>
-                  <q-item clickable v-close-popup to="/orderlist">
+                  <q-item clickable v-close-popup to="/coupon">
                     <q-item-section avatar>
-                      <q-avatar icon="assignment" text-color="#474747" />
+                      <q-avatar icon="iconfont iconqianbao"/>
                     </q-item-section>
                     <q-item-section>
-                      <q-item-label>我的訂單</q-item-label>
+                      <q-item-label>優惠券</q-item-label>
                     </q-item-section>
                   </q-item>
-                  <q-item clickable v-close-popup to="/demandlist">
+                  <q-item clickable v-close-popup to="/order">
                     <q-item-section avatar>
-                      <q-avatar icon="assignment" text-color="#474747" />
+                      <q-avatar icon="iconfont iconorder"/>
                     </q-item-section>
                     <q-item-section>
-                      <q-item-label>我的需求單</q-item-label>
+                      <q-item-label>訂單</q-item-label>
                     </q-item-section>
                   </q-item>
                   <q-separator inset class="q-mx-lg" />
-                  <div class="flex flex-center padding-top">
-                    <q-btn label="登出" @click="loginOut" flat v-close-popup />
-                  </div>
+                  <q-item clickable v-close-popup to="/setUsersList">
+                    <q-item-section avatar>
+                      <q-avatar icon="iconfont iconpeople"/>
+                    </q-item-section>
+                    <q-item-section>
+                      <q-item-label>出行人信息管理</q-item-label>
+                    </q-item-section>
+                  </q-item>
+                  <q-item clickable v-close-popup to="/setAddress">
+                    <q-item-section avatar>
+                      <q-avatar icon="iconfont iconemail"/>
+                    </q-item-section>
+                    <q-item-section>
+                      <q-item-label>管理邮寄地址</q-item-label>
+                    </q-item-section>
+                  </q-item>
+                  <q-item clickable v-close-popup to="/setInfo">
+                    <q-item-section avatar>
+                      <q-avatar icon="iconfont iconset"/>
+                    </q-item-section>
+                    <q-item-section>
+                      <q-item-label>賬戶設置</q-item-label>
+                    </q-item-section>
+                  </q-item>
+                  <q-item clickable v-close-popup @click="loginOut">
+                    <q-item-section avatar>
+                      <q-avatar icon="iconfont iconlog-in"/>
+                    </q-item-section>
+                    <q-item-section>
+                      <q-item-label>登出</q-item-label>
+                    </q-item-section>
+                  </q-item>
                 </q-list>
               </div>
               <!-- <q-separator vertical inset class="q-mx-lg" />

src/pages/line/orderPreview.vue

@@ -713,7 +713,7 @@ export default {
         BrandId: 0,
         TradeWay: 0,
         PlatformOrder: "",
-        GuestNum: this.chosenObj.crCount + this.chosenObj.etCount,
+        GuestNum: this.chosenObj.crCount + this.chosenObj.etCount +this.chosenObj+yeCount,
         IsChildrenTour: this.price.isSupportChildren,
         IsBirdDiscount: 2,
         PredictRoomNum:

src/pages/usercenter/order.vue

 <style lang="scss" scoped>
 </style>
 <template>
-  <div  :class="$q.platform.is.desktop ? 'q-ma-lg content': 'full-width'" style="min-height:80vh">
+  <div  :class="$q.platform.is.desktop ? 'q-ma-lg col': 'full-width'" style="min-height:80vh">
     <div class="" :class="{'row items-center':$q.platform.is.desktop,'column':$q.platform.is.mobile}">
       <div :class="{'row items-center':$q.platform.is.mobile}">
         <q-btn-dropdown color="dark" flat dense :label="`訂單狀態：${orderStatusFiled}`" class="q-px-md" :class="{'col':$q.platform.is.mobile}">
@@ -53,7 +53,7 @@
         <div class="text-grey-6 q-mt-sm">下單日期：{{ item.createTimeStr }}</div>
       </div>
       <div class="q-mt-sm" :class="{'row':$q.platform.is.desktop,'column':$q.platform.is.mobile}">
-          <div class="row col">
+          <div class="row col full-width">
             <q-img
             :src="item.goodsPic"
             class="rounded-borders q-mr-md"