调整部分内容

package.json

 {
-  "name": "million",
-  "version": "0.0.1",
-  "description": "tw",
-  "productName": "million app",
-  "cordovaId": "org.cordova.quasar.app",
-  "capacitorId": "",
-  "author": "罗超 <alex9012@vip.qq.com>",
-  "private": true,
-  "scripts": {
-    "test": "echo \"No test specified\" && exit 0",
-    "dev": "quasar dev -m ssr",
-    "build": "quasar build -m ssr",
-    "build:pwa": "quasar build -m pwa"
-  },
-  "dependencies": {
-    "@quasar/extras": "^1.15.10",
-    "axios": "^0.18.1",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "dayjs": "^1.11.7",
-    "js-md5": "^0.7.3",
-    "qrcode.vue": "^1.7.0",
-    "qrcodejs2": "^0.0.2",
-    "quasar": "^1.22.5",
-    "v-viewer": "^1.6.4",
-    "vue-awesome-swiper": "^3.0.4",
-    "vue-concise-slider": "^4.2.5",
-    "vue-core-video-player": "^0.2.0",
-    "vue-core-video-players": "0.0.5",
-    "vue-i18n": "^8.0.0"
-  },
-  "devDependencies": {
-    "@quasar/app": "^1.0.0"
-  },
-  "engines": {
-    "node": ">= 10.18.1",
-    "npm": ">= 6.13.4",
-    "yarn": ">= 1.21.1"
-  },
-  "browserslist": [
-    "last 1 version, not dead, ie >= 11"
-  ]
-}
+    "name": "million",
+    "version": "0.0.1",
+    "productDescription": "订完机票和饭店，当地旅游体验就交给印象之旅。自己的行程自己排- 海外潜水、户外攀岩、料理课程、私房景点、 一日游、票券、包车旅游、机场接驳，各式世界当地旅游行程任您挑选",
+    "productName": "印象之旅 - 当地旅游,在地旅游,旅游体验 - 印象之旅",
+    "cordovaId": "org.cordova.quasar.app",
+    "capacitorId": "",
+    "author": "罗超 <alex9012@vip.qq.com>",
+    "private": true,
+    "scripts": {
+        "test": "echo \"No test specified\" && exit 0",
+        "dev": "quasar dev -m ssr",
+        "build": "quasar build -m ssr",
+        "build:pwa": "quasar build -m pwa"
+    },
+    "dependencies": {
+        "@quasar/extras": "^1.15.10",
+        "axios": "^0.18.1",
+        "babel-plugin-transform-remove-console": "^6.9.4",
+        "dayjs": "^1.11.7",
+        "js-md5": "^0.7.3",
+        "qrcode.vue": "^1.7.0",
+        "qrcodejs2": "^0.0.2",
+        "quasar": "^1.22.5",
+        "v-viewer": "^1.6.4",
+        "vue-awesome-swiper": "^3.0.4",
+        "vue-concise-slider": "^4.2.5",
+        "vue-core-video-player": "^0.2.0",
+        "vue-core-video-players": "0.0.5",
+        "vue-i18n": "^8.0.0"
+    },
+    "devDependencies": {
+        "@quasar/app": "^1.0.0"
+    },
+    "engines": {
+        "node": ">= 10.18.1",
+        "npm": ">= 6.13.4",
+        "yarn": ">= 1.21.1"
+    },
+    "browserslist": [
+        "last 1 version, not dead, ie >= 11"
+    ]
+}
\ No newline at end of file

quasar.conf.js

@@ -165,7 +165,10 @@ module.exports = function( /* ctx */ ) {
                 'QParallax',
                 'QField',
                 'QTree',
-                'QRating'
+                'QRating',
+                'QStepper',
+                'QStep',
+                'QToggle'
             ],
 
             directives: [

src/App.vue

@@ -10,7 +10,7 @@ export default {
 };
 </script>
 <style>
-@import url("//at.alicdn.com/t/c/font_1890699_fpmgpq29nve.css");
+@import url("//at.alicdn.com/t/c/font_1890699_l4zj0bx0p69.css");
 @font-face {
   font-family: "oswald";
   src: url("https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/smallapp/Oswald-Regular.ttf");
@@ -23,6 +23,11 @@ export default {
 .text-subtitle1 {
   font-size: 1.25rem !important;
 }
+.content-page{
+  width: 100%;
+  max-width: 1200px;
+  margin: 0 auto;
+}
 body {
   font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto,
     Helvetica Neue, Arial, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol,

src/boot/utils.js

@@ -20,7 +20,7 @@ Vue.prototype.domainManager = function() {
             domainUrl = "http://testapi.oytour.com";
         } else if (domainNameUrl.indexOf('oytour') !== -1) {
             domainUrl = "http://reborn.oytour.com";
-            domainUrl = 'http://192.168.10.11:8083'
+            domainUrl = 'http://192.168.10.206'
         }
         var obj = {
             //主地址

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

@@ -117,8 +117,9 @@ margin-left: 10px;
 .category-item {
   width: 160px;
   padding: 10px;
-border-radius: 8px;
-font-weight: bold;
+  border-radius: 8px;
+  font-weight: bold;
+  font-size: 18px !important;
 }
 .font-16 {
   font-size: 16px;
@@ -129,6 +130,8 @@ border-radius: 8px;
 line-height: 34px;
 padding:0 8px;
 cursor: pointer;
+font-size:14px;
+font-weight: 400;
 }
 .category-l2:hover {
   background-color: #eee;

src/components/trip/orderPreview.vue

@@ -122,6 +122,63 @@
         </div>
       </div>
 
+      <div class="row items-end q-mt-md" v-if="p.isSupportChildren == 1">
+        <div class="col" :class="{'column':$q.platform.is.mobile}">
+          <div>
+            <span class="text-subtitle2 text-weight-bold">儿童</span>
+          <span class="text-grey-6 f12 q-ml-sm">(2-11歲,占床)</span>
+          </div>
+          <div v-if="$q.platform.is.mobile">
+            <span class="text-grey-7 product-price" style="font-size: 13px">
+              CNY
+              {{ moneyFormat(p.childNeedPrice, 0) }} /每人
+            </span>
+          </div>
+        </div>
+        <div class="row items-end">
+          <span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px">
+            CNY
+            {{ moneyFormat( p.childNeedPrice, 0) }} /每人
+          </span>
+          <q-input
+            style="width: 150px"
+            @input="changePeople"
+            v-model="chosenObj.etCount"
+            class="col"
+            :class="{
+              'q-ml-sm q-px-none q-pl-none': $q.platform.is.desktop,
+            }"
+            mask="#"
+            reverse-fill-mask
+            dense
+            standout
+            readonly
+            :disable="!p.remainNum"
+          >
+            <template v-slot:prepend>
+              <q-btn
+                color="primary"
+                size="sm"
+                class="q-px-none"
+                flat
+                icon="remove"
+                @click="addPeople('etCount', -1)"
+              />
+            </template>
+            <template v-slot:append>
+              <q-btn
+                color="primary"
+                size="sm"
+                class="q-px-none"
+                flat
+                icon="add"
+                @click="addPeople('etCount', 1)"
+              />
+            </template>
+          </q-input>
+        </div>
+      </div>
+
       <div class="row items-end q-mt-md" v-if="p.isSupportChildren == 1">
         <div class="col" :class="{'column':$q.platform.is.mobile}">
           <div>

src/pages/city/cityDetail.vue

@@ -82,8 +82,8 @@
 </style>
 <template>
   <div class="back">
-    <div v-if="detail" class="wapper">
-      <q-breadcrumbs gutter="none">
+    <div v-if="detail" class="wapper q-pt-md">
+      <q-breadcrumbs gutter="none" class=" q-mb-md">
         <q-breadcrumbs-el label="Home" />
         <q-breadcrumbs-el label="Components" />
         <q-breadcrumbs-el label="Breadcrumbs" />

src/pages/detailsNew.vue

@@ -758,9 +758,9 @@ export default {
     if (localStorage.baseifo) {
       this.TripConfig = JSON.parse(window.localStorage.getItem("baseifo"));
     }
-    // this.getData();
+    this.getData();
     window.addEventListener("scroll", this.menu);
-    this.getCarData();
+    //this.getCarData();
   },
   methods: {
     getTopNum(x) {
@@ -786,7 +786,7 @@ export default {
       // }
       this.stickyHeight = document.querySelector(".q-header--hidden")
         ? "translateY(0px)"
-        : "translateY(85px)";
+        : "translateY(50px)";
       this.currentHeight = temp;
       if (
         this.videoPosition > 0 &&

src/pages/line/orderPreview.vue

+<template>
+  <div class="content-page order-preview">
+    <q-stepper
+      v-model="step"
+      ref="stepper"
+      color="primary"
+      inactive-color="grey-5 "
+      class="bg-transparent"
+      flat
+      animated
+    >
+      <q-step
+        :name="1"
+        title="確認訂單"
+        icon="settings"
+        :done="step > 1"
+      ></q-step>
+
+      <q-step
+        :name="2"
+        title="付款"
+        icon="iconfont iconPayment-1"
+        :done="step > 2"
+      ></q-step>
+
+      <q-step
+        :name="3"
+        title="訂購完成"
+        icon="iconfont iconicon_finish_R"
+        :done="step == 3"
+      ></q-step>
+    </q-stepper>
+    <div
+      class="row q-pa-md"
+      style="min-width: 375px; margin: 0 auto"
+      :class="{
+        'row': $q.screen.width >= 1200 && $q.platform.is.desktop,
+        'column': $q.screen.width < 1200 || $q.platform.is.mobile,
+      }"
+    >
+      <div class="col">
+        <q-card flat class="q-pa-md">
+            <div class="text-subtitle1 text-weight-bolder">訂購人資訊</div>
+            <q-separator color="grey-2" class="q-my-md"/>
+            <div class="row q-col-gutter-md">
+                <div :class="filedWidth">
+                    <q-input standout v-model="userInfo.lastName" label="名字"  :rules="[val => !!val || '請輸入名字']"/>
+                </div>
+                <div :class="filedWidth">
+                    <q-input standout v-model="userInfo.firstName" label="姓氏"  :rules="[val => !!val || '請輸入姓氏']"/>
+                </div>
+                <div  :class="filedWidth">
+                    <q-select v-model="userInfo.country" @input="changeCountry" :options="countrys" emit-value option-label="Name" option-value="ID" map-options label="國家/地區" standout />
+                </div>
+                <div  :class="filedWidth">
+                    <q-input standout v-model="userInfo.firstName" label="電話"  :rules="[val => !!val || '請輸入行動電話']">
+                        <template v-slot:prepend>
+                            <div class="text-subtitle2">+{{ userInfo.areaCode }}</div>
+                        </template>
+                    </q-input>
+                </div>
+                <div  :class="filedWidth">
+                    <q-input standout v-model="userInfo.mail" label="郵箱地址"  :rules="[val => !!val || '請輸入郵箱地址']" />
+                </div>
+                <div  :class="filedWidth">
+                    <q-toggle v-model="isUpdateUserInfo" label="同步更新會員資料" />
+                </div>
+            </div>
+        </q-card>
+        
+        <q-card flat class="q-pa-md q-mt-lg">
+            <div class="text-subtitle1 text-weight-bolder q-mb-md">旅客資料</div>
+            
+            <div class="row">
+                <q-img src="https://image.kkday.com/v2/image/get/s1.kkday.com/product_138437/20230217083232_t5rcO/jpg" class="rounded-borders" spinner-color="grey-3" style="width:80px;" />
+                <div class="q-ml-md col">
+                    <div class="text-subtitle1 ellipsis">【夏季限定】加拿大三日游 | 班夫&贾斯珀国家公园&哥伦比亚冰原 | 卡加利出发卡加利出发卡加利出发</div>
+                    <div class="text-caption text-grey-6 ellipsis q-mt-sm">加拿大三日游 | 班夫&贾斯珀国家公园&哥伦比亚冰原</div>
+                </div>
+            </div>
+            <div class="q-mt-md row">
+                <div class="text-grey-9">
+                    <q-icon name="iconfont iconrili" size="20px" class="q-mr-sm" />
+                    <span>2023-02-27</span>
+                </div>
+                <div class="text-grey-9 q-ml-md">
+                    <q-icon name="iconfont iconpeople" size="20px" class="q-mr-sm" />
+                    <span class="q-mr-sm" >成人 x 2</span>
+                    <span class="q-mr-sm" >兒童 x 2</span>
+                </div>
+            </div>
+            <q-separator color="grey-2" class="q-my-md"/>
+        </q-card>
+        
+      </div>
+      <div
+        :class="{
+          'q-ml-lg': !($q.screen.width < 1200 || $q.platform.is.mobile),
+          'q-mt-lg': $q.screen.width < 1200 || $q.platform.is.mobile,
+        }"
+      >
+        <div
+          class="rounded-borders bg-white q-pa-md"
+          style="width: 300px"
+          :style="{
+            width:
+              $q.screen.width < 1200 || $q.platform.is.mobile
+                ? '100%'
+                : '300px',
+          }"
+        >222</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      step: 1,
+      userInfo:{
+        lastName:'',
+        firstName:'',
+        country:0,
+        phone:'',
+        areaCode:'',
+        mail:''
+      },
+      isUpdateUserInfo:false,
+      countrys:[],
+      areaCodes:[]
+    };
+  },
+  computed:{
+    filedWidth(){
+        return {
+            'col-12': this.$q.screen.width < 1200,
+            'col-6':this.$q.screen.width >= 1200
+        }
+    }
+  },
+  created() {
+
+  },
+  mounted() {
+    this.initCountry()
+  },
+  methods: {
+    initCountry(){
+        this.apipost(
+        "GetCountryInfo_post",
+        {},
+        (r) => {
+            this.countrys = r.data.data.countList
+            this.userInfo.country = this.countrys[0].ID
+            
+            this.areaCodes = r.data.data.phoneCountList
+            this.changeCountry(this.userInfo.country)
+            this.areaCodes.forEach(x=>{
+                let temp = this.countrys.find(y=>y.ID==x.ID)
+                x.EnName=`${temp.EnName}(${x.PhoneCode})`
+            })
+        });
+    },
+    changeCountry(id){
+        this.userInfo.areaCode = this.areaCodes.find(x=>x.ID==id).PhoneCode
+        
+    }
+  },
+};
+</script>
+
+<style>
+.order-preview .q-stepper__content {
+  display: none !important;
+}
+.order-preview .q-toggle__track{
+    height: 0.7em;
+    border-radius: 0.35em;
+    opacity: .38;
+    width: 50px;
+}
+.order-preview .q-toggle__thumb{
+    top: 0.42em;
+    left: 0.45em;
+    width: 0.5em;
+    height: 0.5em;
+    transition: left 0.22s ease-in-out;
+    user-select: none;
+    z-index: 0;
+}
+.order-preview .q-toggle__inner--truthy .q-toggle__thumb{
+    left: 0.94em;
+}
+.order-preview .q-toggle__inner{
+    width: 1.9em;
+}
+.order-preview .q-toggle__label{
+    margin-top: 12px;
+}
+</style>

src/router/routes.js

@@ -90,6 +90,11 @@ const routes = [{
                 component: () =>
                     import ('pages/city/cityDetail.vue')
             },
+            {
+                path: '/lineOrderPriview/:id?', //自定义页面
+                component: () =>
+                    import ('pages/line/orderPreview.vue')
+            },
         ]
 
     },