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

package.json

@@ -22,12 +22,14 @@
         "qrcode.vue": "^1.7.0",
         "qrcodejs2": "^0.0.2",
         "quasar": "^1.22.5",
+        "swiper": "3.0.4",
         "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"
+        "vue-i18n": "^8.0.0",
+        "vuelidate": "^0.7.7"
     },
     "devDependencies": {
         "@quasar/app": "^1.0.0"
@@ -40,4 +42,4 @@
     "browserslist": [
         "last 1 version, not dead, ie >= 11"
     ]
-}
\ No newline at end of file
+}

src/boot/message.js

+import { Notify, QSpinnerIos } from 'quasar'
+
+const message = {
+    warn: (msg) => {
+        Notify.create({
+            message: msg,
+            color: 'warning',
+            textColor: 'dark',
+            position: 'top',
+            icon: 'announcement'
+        })
+    },
+    error: (msg) => {
+        Notify.create({
+            message: msg,
+            type: 'negative',
+            position: 'top'
+        })
+    },
+    success: (msg) => {
+        Notify.create({
+            message: msg,
+            color: 'positive',
+            position: 'top',
+            textColor: 'white',
+            icon: 'check'
+        })
+    }
+}
+
+export default message
\ No newline at end of file

src/boot/user.js

@@ -18,7 +18,7 @@ const user = {
         if (u) {
             localStorage.setItem('b2bUser', JSON.stringify(u))
         } else {
-            localStorage.setItem('b2bUser', JSON.stringify(u))
+            //localStorage.removeItem('b2bUser')
         }
     },
     loginOut() {

src/boot/utils.js

@@ -2,17 +2,17 @@ import Vue from 'vue'
 import axios from 'axios'
 import md5 from 'js-md5'
 // import {eventBus} from './eventBus'
-// import VueCoreVideoPlayer from 'vue-core-video-players'
+import VueCoreVideoPlayer from 'vue-core-video-players'
 import 'viewerjs/dist/viewer.css'
-import Vuelidate from 'vuelidate'
 import user from './user'
+import message from './message'
 import VueViewer from 'v-viewer'
 // import VueCoreVideoPlayer from 'vue-core-video-player'
 Vue.prototype.$EventBus = new Vue()
-    // Vue.use(VueCoreVideoPlayer)
+Vue.use(VueCoreVideoPlayer)
 Vue.use(VueViewer)
 Vue.prototype.$md5 = md5;
-Vue.use(Vuelidate)
+Vue.prototype.$message = message
     //域名管理对象
 Vue.prototype.domainManager = function() {
         let domainUrl = '';

src/components/car/orderPreview.vue

@@ -13,44 +13,32 @@
       <template v-if="dataList.CarType!=3">
         <div class="text-grey-6 f12 q-my-md">選擇機場</div>
         <div class="row wrap">
-          <q-btn @click="handleSelect(item,1)"
-            :color="selectedAirportObj&&item.Id === selectedAirportObj.Id?'primary':'grey-5'"
-            unelevated
-            class="car-tag mr"
-            v-for="item in AirportList"
-            :key="item.Id"
-          >
-            {{ item.AirportName }}
-          </q-btn>
+          <div v-for="(x,i) in dataList.AirportList" :key="i">
+            <q-chip size="14px" clickable @click="handleSelect(x,1)" 
+            :text-color="selectedAirportObj&&selectedAirportObj.Id==x.Id?'white':'dark'" 
+            :color="selectedAirportObj&&selectedAirportObj.Id==x.Id?'primary':'grey-3'" square>{{ x.AirportName }}</q-chip>
+          </div>
         </div>
       </template>
-      <div class="row">
-        <div v-if="dataList.CarType!=1">
+      <div class="row no-wrap">
+        <div v-if="dataList.CarType!=1" :class="{'col':dataList.PlaceList.length>2}">
           <div class="text-grey-6 f12 q-my-md">選擇上車範圍</div>
           <div class="row wrap">
-            <q-btn @click="handleSelect(item,3)"
-              :color="onCarObj&&item.Id === onCarObj.Id?'primary':'grey-5'"
-              unelevated
-              class="car-tag mr"
-              v-for="item in PlaceList"
-              :key="item.Id"
-            >
-              {{ item.Name }}({{ item.Range }}m)
-            </q-btn>
-          </div>
+            <div v-for="(x,i) in dataList.PlaceList" :key="i">
+              <q-chip size="14px" clickable @click="handleSelect(x,3)" 
+              :text-color="onCarObj&&onCarObj.Id==x.Id?'white':'dark'" 
+              :color="onCarObj&&onCarObj.Id==x.Id?'primary':'grey-3'" square>{{ x.Name }}({{ x.Range }}m)</q-chip>
+            </div>
           </div>
-        <div v-if="dataList.CarType!=2">
+        </div>
+        <div v-if="dataList.CarType!=2" :class="{'col':dataList.PlaceList.length>2,'q-ml-md':dataList.CarType!=1}">
           <div class="text-grey-6 f12 q-my-md">選擇下車範圍</div>
           <div class="row wrap">
-            <q-btn @click="handleSelect(item,4)"
-              :color="unCarObj&&item.Id === unCarObj.Id?'primary':'grey-5'"
-              unelevated
-              class="car-tag mr"
-              v-for="item in PlaceList"
-              :key="item.Id"
-            >
-              {{ item.Name }}({{ item.Range }}m)
-            </q-btn>
+            <div v-for="(x,i) in dataList.PlaceList" :key="i">
+              <q-chip size="14px" clickable @click="handleSelect(x,4)" 
+              :text-color="unCarObj&&unCarObj.Id==x.Id?'white':'dark'" 
+              :color="unCarObj&&unCarObj.Id==x.Id?'primary':'grey-3'" square>{{ x.Name }}({{ x.Range }}m)</q-chip>
+            </div>
           </div>
         </div>
       </div>
@@ -58,15 +46,11 @@
       
       <div class="text-grey-6 f12 q-my-md">選擇車類型</div>
       <div class="row wrap">
-        <q-btn @click="handleSelect(item,2)"
-          :color="selectedCarObj&&item.Id === selectedCarObj.Id?'primary':'grey-5'"
-          unelevated
-          class="car-tag mr"
-          v-for="item in CarTypeList"
-          :key="item.Id"
-        >
-          {{ item.CarName }}({{ item.PeopleNum }}人)
-        </q-btn>
+        <div v-for="(x,i) in dataList.CarTypeList" :key="i">
+          <q-chip size="14px" clickable @click="handleSelect(x,2)" 
+          :text-color="selectedCarObj&&selectedCarObj.Id==x.Id?'white':'dark'" 
+          :color="selectedCarObj&&selectedCarObj.Id==x.Id?'primary':'grey-3'" square>{{ x.CarName }}({{ x.PeopleNum }}人)</q-chip>
+        </div>
       </div>
       <div class="text-grey-6 f12 q-my-md">選擇數量</div>
       <div class="row items-end">
@@ -151,16 +135,17 @@
 </template>
 
 <script>
+import { date } from "quasar";
 export default {
-  props: ["dataList","PlaceList","price","CarTypeList","AirportList","configId","Month"],
+  props: ["dataList","price","configId","Month"],
   watch: {
     price: {
       handler(n, o) {
         this.p = n;
         if(n&&n.startDate){
           this.chosenObj.startDate = n.startDate;
-          // this.selectedCar = this.CarTypeList[0].Id
-          // this.selectedCarObj = this.CarTypeList[0]
+          // this.selectedCar = this.dataList.CarTypeList[0].Id
+          // this.selectedCarObj = this.dataList.CarTypeList[0]
         }
         this.calcMoney()
         
@@ -168,9 +153,9 @@ export default {
       deep: true,
       immediate: false
     },
-    CarTypeList: {
+    dataList: {
       handler(n, o) {
-        this.CarTypeList = n;
+        this.dataList = n;
         
       },
       deep: true,
@@ -208,20 +193,8 @@ export default {
         orderInfo: this.chosenObj,
         sumPrice: this.sumPrice,
         Id: this.dataList.Id,
-        onCarObj: {
-          Address: this.onCarObj?this.onCarObj.Address:'',
-          Name: this.onCarObj?this.onCarObj.Name:'',
-          Lat: this.onCarObj?this.onCarObj.Lat:'',
-          Lng: this.onCarObj?this.onCarObj.Lng:'',
-          Range: this.onCarObj?this.onCarObj.Range:'',
-        },
-        unCarObj: {
-          Address: this.unCarObj?this.unCarObj.Address:'',
-          Name: this.unCarObj?this.unCarObj.Name:'',
-          Lat: this.unCarObj?this.unCarObj.Lat:'',
-          Lng: this.unCarObj?this.unCarObj.Lng:'',
-          Range: this.unCarObj?this.unCarObj.Range:''
-        },
+        onCarId: this.onCarObj?this.onCarObj.Id:'',
+        unCarId: this.unCarObj?this.unCarObj.Id:'',
       }
       let key = this.$md5(JSON.stringify(order))
       let pickuporderCars = localStorage.getItem('pickuporderCars')
@@ -233,7 +206,7 @@ export default {
       localStorage.setItem("pickuporderCars",JSON.stringify(pickuporderCars))
       this.CommonJump('/PickuporderForm/'+key, {});
     },
-    //  获取车的详情
+    //  获取车型的详情
     getCarPriceData2() {
       this.priceList = []
       this.apipost(
@@ -260,7 +233,9 @@ export default {
                   isSupportChildren: 1,
                   safeMoney: 0,
                 }
-                arr.push(dataObj)
+                if(date.formatDate(Date.now(), 'YYYY-MM-DD')!=x.Date){
+                  arr.push(dataObj)
+                }
               }
             })
             const temp= JSON.parse(JSON.stringify(r.data.data))

src/components/searchdata/kkday.vue

@@ -248,7 +248,7 @@
           </p>
         </div>
       </div>
-      <div style="display: flex; justify-content: center">
+      <div class="row justify-end">
         <q-pagination
           v-if="PageCount > 1"
           v-model="msg.pageIndex"
@@ -644,7 +644,7 @@ export default {
       var companyId = -1;
       if (localStorage.groupinfo) {
         var groupinfo = JSON.parse(localStorage.groupinfo);
-        companyId = groupinfo.siteList[0].companyId;
+        companyId = groupinfo.siteList[0]&&groupinfo.siteList[0].companyId?groupinfo.siteList[0].companyId:-1;
       }
       if (localStorage.b2bUser) {
         var b2bUser = JSON.parse(window.localStorage.getItem("b2bUser"));
@@ -661,7 +661,7 @@ export default {
           this.$q.loading.hide();
 
           if (res.data.resultCode == 1) {
-            this.PageCount = res.data.data.pageData.pageCount;
+            this.PageCount = res.data.data.pageCount;
             this.TotalCount = res.data.data.pageData.count;
             var tempArray = res.data.data.pageData.list;
             console.log('getSearch data', tempArray)

src/components/trip/block/index.vue

@@ -12,7 +12,8 @@
                     <p class="day">第<span v-if='item.dayNum<10'>0</span>{{item.dayNum}}天</p>
                     <!-- <p>{{item.dateTime}}</p> -->
                 </div>
-                <div class="desc" v-html="item.title"></div>
+                <div class="desc" v-html="item.title!='null'?item.title:''"></div>
+                
             </div>
             <oneday v-if="item.details && item.details.length==1" :day='item' :isDirect="isDirect"></oneday>
             <twoday v-if="item.details && item.details.length==2" :day='item' :isDirect="isDirect"></twoday>

src/components/trip/block/twoday.vue

@@ -53,43 +53,41 @@
                 ></q-img>
               </template>
             </div>
-            <div class="row items-end" style="border: 1px solid #ccc; left: 0">
-              <div class="q-pb-lg">
-                <div class="down q-pa-lg" :class="{ col: index == 0 }">
-                  <div
-                    v-if="item.title != ''"
-                    class="text-h6 text-bold q-pb-sm"
-                    v-html="item.title"
-                    @click.stop="goUrl(item.url)"
-                    style="
-                      cursor: pointer;
-                      white-space: nowrap;
-                      text-overflow: ellipsis;
-                      overflow: hidden;
-                    "
-                  ></div>
-                  <div
-                    class="playInfo"
+            <div class="row items-end col" style="border: 1px solid #ccc; left: 0">
+              <div class="down q-pa-lg q-mb-lg" :class="{ col: index == 0 }">
+                <div
+                  v-if="item.title != ''"
+                  class="text-h6 text-bold q-pb-sm"
+                  v-html="item.title"
+                  @click.stop="goUrl(item.url)"
+                  style="
+                    cursor: pointer;
+                    white-space: nowrap;
+                    text-overflow: ellipsis;
+                    overflow: hidden;
+                  "
+                ></div>
+                <div
+                  class="playInfo"
+                  v-if="item.playTimeHour || item.playTimeMinutes"
+                >
+                  <span class="playInfo-item" v-if="item.ticketName != ''">
+                  </span>
+                  <span
+                    class="playInfo-item"
                     v-if="item.playTimeHour || item.playTimeMinutes"
                   >
-                    <span class="playInfo-item" v-if="item.ticketName != ''">
+                    <i class="iconfont icon-shijian1"></i>
+                    约
+                    <span v-if="item.playTimeHour"
+                      >{{ item.playTimeHour }}小时
                     </span>
-                    <span
-                      class="playInfo-item"
-                      v-if="item.playTimeHour || item.playTimeMinutes"
-                    >
-                      <i class="iconfont icon-shijian1"></i>
-                      约
-                      <span v-if="item.playTimeHour"
-                        >{{ item.playTimeHour }}小时
-                      </span>
-                      <span v-if="item.playTimeMinutes"
-                        >{{ item.playTimeMinutes }}分钟
-                      </span>
+                    <span v-if="item.playTimeMinutes"
+                      >{{ item.playTimeMinutes }}分钟
                     </span>
-                  </div>
-                  <span v-html="item.content"></span>
+                  </span>
                 </div>
+                <span v-html="item.content"></span>
               </div>
             </div>
           </div>

src/components/trip/orderPreview.vue

 <template>
-  <div class="column full-height">
+  <div class="column full-height" v-if="p">
     <div class="col">
       <div class="text-right" v-if="$q.platform.is.desktop">
         <q-btn
@@ -11,7 +11,7 @@
           flat
         />
       </div>
-      <div v-if="p && p.unionCityList">
+      <div v-if="p && p.unionCityList && p.unionCityList.length>0">
         <div class="text-grey-6 f12 q-my-md">出發城市</div>
         <div class="row q-col-gutter-sm">
           <div  v-for="(x,i) in p.unionCityList" :key="i">
@@ -376,12 +376,11 @@ export default {
   watch: {
     price: {
       handler(n, o) {
-        console.log(n)
         this.p = n?n:{};
         if (this.p.startDate) {
           this.chosenObj.startDate = this.p.startDate;
           this.calcMoney();
-          if(this.p.unionCityList && this.p.unionCityList.length>0){
+          if(this.p.unionCityList && this.p.unionCityList.length>0 && this.p.originalB2CPrice==this.p.RealPrice){
             this.currentUnionCity = this.p.unionCityList[0]
           }
         }

src/pages/detailsCar.vue

@@ -118,7 +118,7 @@
       >
         <div class="col q-mr-lg">
           <div class="text-h6 ellipsis-2-lines">{{ dataList.Name }}</div>
-          <div class="text-grey-7 fz17 ellipsis-2-lines">{{ dataList.Description }}</div>
+          <!-- <div class="text-grey-7 fz17 ellipsis-2-lines">{{ dataList.Description }}</div> -->
           <div class="q-mt-md f12 text-grey-6">
             <q-icon
               name="iconfont icondingweixiao"
@@ -141,13 +141,11 @@
               icon="iconfont iconOwner-1"
               label=" 印象自組團"
             />
-            <q-chip
-              v-if="dataList.dayList"
-              class="transparent q-mr-xl no-padding"
+            <q-chip 
+              v-if="dataList.TravelHours>0" class="transparent q-mr-xl no-padding" 
               square
-              icon="iconfont icontime"
-              :label="` 行程時間 ${dataList.dayList.length} 天`"
-            />
+              icon="iconfont icontime" 
+              :label="`包車時長：${dataList.TravelHours} h`" />
             <q-chip
               class="transparent q-mr-xl no-padding"
               square
@@ -282,9 +280,6 @@
                 :dataList="dataList"
                 :configId="msg.configId"
                 :Month="currentYM.str"
-                :PlaceList="dataList.PlaceList"
-                :CarTypeList="dataList.CarTypeList"
-                :AirportList="dataList.AirportList"
                 :price="currentPrice"
                 @reset="resetHandler"
                 @getPriceList="getPriceList"
@@ -316,13 +311,13 @@
                     :label="`${dataList.FreeCancelDay}天前可免费取消`"
                   />
                 </div>
-                <!-- <div class="text-grey f12">
+                <div class="text-grey f12">
                   <ul class="q-pl-md no-margin">
                     <li v-for="(x, i) in warnBuy" class="q-mt-md" :key="i">
                       {{ x }}
                     </li>
                   </ul>
-                </div> -->
+                </div>
               </div>
               <div class="" v-if="$q.platform.is.desktop">
                 <div class="row items-center">
@@ -361,7 +356,13 @@
                   icon="iconfont iconcancel"
                   :label="`${dataList.FreeCancelDay}天前可免费取消`"
                 />
-              </div>
+                  <q-chip
+                  class="transparent q-mr-xl no-padding"
+                  square
+                  icon="iconfont iconroundcheck"
+                  label="6個工作日內（不含例休假）確認"
+                />
+                </div>
               <div class="q-mt-lg row" v-if="$q.platform.is.desktop">
                 <div class="col">
                   <calendar
@@ -375,9 +376,6 @@
                     :dataList="dataList"
                     :configId="msg.configId"
                     :Month="currentYM.str"
-                    :PlaceList="dataList.PlaceList"
-                    :CarTypeList="dataList.CarTypeList"
-                    :AirportList="dataList.AirportList"
                     :price="currentPrice"
                     @reset="resetHandler"
                     @getPriceList="getPriceList"
@@ -658,10 +656,10 @@ export default {
         loop: true,
       },
       warnBuy: [
-        "未满 2 岁幼儿不占位可免费参加（不含座位，餐点，门票，床位），请先于下订时在「备注栏」告知。",
-        "如需要單人房，請購買單房",
-        "不占床2-11(包含)岁幼童可购买儿童价，如需占床請購買成人價",
-        "12歲以上皆視同成人售價",
+        "如一輛車位不夠使用，請購買多輛車",
+        "收費公路費、停車費、入園費等請另行繳納",
+        "由於交通擁堵，時長可能會略有變化",
+        "每增加 30 分鐘，將收取相應的延期費。 （現場支付）",
       ],
       showOrderPreview: false,
       videoPosition: 0,
@@ -942,7 +940,10 @@ export default {
                   isSupportChildren: 1,
                   safeMoney: 0,
                 }
-                arr.push(dataObj)
+                if(date.formatDate(Date.now(), 'YYYY-MM-DD')!=x.Date){
+                  arr.push(dataObj)
+                }
+                
               }
             })
             this.priceList = JSON.parse(JSON.stringify(arr))

src/pages/detailsNew.vue

@@ -777,7 +777,13 @@ export default {
     changeShowOrderPreviewHandler(){
       this.showOrderPreview=!this.showOrderPreview
       if(!this.showOrderPreview){
-        this.currentPrice=null
+        // this.currentPrice=null
+        if(this.currentPrice){
+          this.currentPrice.isSupportChildren=null
+          this.currentPrice.unionCityList=null
+          this.currentPrice.singleRoomPrice=0
+          this.currentPrice.originalB2CPrice=0
+        }
         this.changeTripShowHandler()
       }
     },
@@ -871,7 +877,13 @@ export default {
       //console.log(e)
     },
     resetHandler() {
-      this.currentPrice=null;
+      // this.currentPrice=null;
+      if(this.currentPrice){
+        this.currentPrice.isSupportChildren=null
+        this.currentPrice.unionCityList=null
+        this.currentPrice.singleRoomPrice=0
+        this.currentPrice.originalB2CPrice=0
+      }
       if(this.$q.platform.is.mobile)
         this.$refs.calendarMobile.reset()
       else
@@ -882,7 +894,7 @@ export default {
       this.currentPrice = JSON.parse(JSON.stringify(val.price));
       this.currentPrice.RealPrice = this.currentPrice.RealPrice?this.currentPrice.RealPrice:this.currentPrice.originalB2CPrice
       this.currentPrice.originalB2CPrice = this.currentPrice.RealPrice
-      if(this.currentPrice.unionCityList && this.currentPrice.unionCityList.length>0){
+      if(this.currentPrice.unionCityList && this.currentPrice.unionCityList.length>0 && this.dataList.startCityId!=0){
         this.currentPrice.unionCityList.splice(0,0,{
           cityId:this.dataList.startCityId,
           cityName:this.dataList.startCityName

src/pages/line/pay.vue

+<template>
+  <div class="content-page order-preview">
+    <q-stepper
+      v-model="step"
+      ref="stepper"
+      color="primary"
+      inactive-color="grey-5 "
+      done-color="primary"
+      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>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            step:2
+        }
+    },
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

src/router/routes.js

@@ -51,91 +51,91 @@ const routes = [{
             },
             {
                 path: '/account', //用户信息
-                meta: {isUserCenter: true},
+                meta: { isUserCenter: true },
                 component: () =>
                     import ('pages/usercenter/account.vue')
             },
             {
                 path: '/demandlist', //需求单列表
-                meta: {isUserCenter: true},
+                meta: { isUserCenter: true },
                 component: () =>
                     import ('pages/usercenter/demandlist.vue')
             },
             {
                 path: '/demandinfo/:id', //需求单详情
-                meta: {isUserCenter: true},
+                meta: { isUserCenter: true },
                 component: () =>
                     import ('pages/usercenter/demandinfo.vue')
             },
             {
                 path: '/orderlist', //订单列表
-                meta: {isUserCenter: true},
+                meta: { isUserCenter: true },
                 component: () =>
                     import ('pages/usercenter/orderlist.vue')
             },
             {
                 path: '/orderinfo/:id', //订单详情
-                meta: {isUserCenter: true},
+                meta: { isUserCenter: true },
                 component: () =>
                     import ('pages/usercenter/orderinfo.vue')
             },
             {
                 path: '/passengerList/:id', //旅客名单
-                meta: {isUserCenter: true},
+                meta: { isUserCenter: true },
                 component: () =>
                     import ('pages/usercenter/passengerList.vue')
             },
             {
                 path: '/register', //用户注册
-                meta: {isUserCenter: true},
+                meta: { isUserCenter: true },
                 component: () =>
                     import ('pages/usercenter/register.vue')
             },
             {
                 path: '/loginInfo', //账户设置
-                meta: {isUserCenter: true},
+                meta: { isUserCenter: true },
                 component: () =>
                     import ('pages/usercenter/loginInfo.vue')
             },
             {
                 path: '/setAddress', //地址管理
-                meta: {isUserCenter: true},
+                meta: { isUserCenter: true },
                 component: () =>
                     import ('pages/usercenter/setAddress.vue')
             },
             {
                 path: '/setInfo', //账户设置
-                meta: {isUserCenter: true},
+                meta: { isUserCenter: true },
                 component: () =>
                     import ('pages/usercenter/setInfo.vue')
             },
             {
                 path: '/setUserInfo', //用户信息
-                meta: {isUserCenter: true},
+                meta: { isUserCenter: true },
                 component: () =>
                     import ('pages/usercenter/setUserInfo.vue')
             },
             {
                 path: '/coupon', //优惠券
-                meta: {isUserCenter: true},
+                meta: { isUserCenter: true },
                 component: () =>
                     import ('pages/usercenter/coupon.vue')
             },
             {
                 path: '/order', //用户订单
-                meta: {isUserCenter: true},
+                meta: { isUserCenter: true },
                 component: () =>
                     import ('pages/usercenter/order.vue')
             },
             {
                 path: '/setUsersList', //用户订单
-                meta: {isUserCenter: true},
+                meta: { isUserCenter: true },
                 component: () =>
                     import ('pages/usercenter/setUsersList.vue')
             },
             {
                 path: '/payInfo', //支付管理
-                meta: {isUserCenter: true},
+                meta: { isUserCenter: true },
                 component: () =>
                     import ('pages/usercenter/payInfo.vue')
             },
@@ -154,6 +154,11 @@ const routes = [{
                 component: () =>
                     import ('pages/line/orderPreview.vue')
             },
+            {
+                path: '/pay/:id?', //自定义页面
+                component: () =>
+                    import ('pages/line/pay.vue')
+            },
         ]
 
     },

yarn.lock

@@ -8916,6 +8916,11 @@ svgo@^1.0.0:
     unquote "~1.1.1"
     util.promisify "~1.0.0"
 
+swiper@3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/swiper/-/swiper-3.0.4.tgz#6a9810d33431bb05dbfa4276a8338e20968e3e12"
+  integrity sha512-t/EPKnUHHtH1A3Owj904EO8kWy6QVLeuVT2p1/P/TAzuvY5AI/37265o8f2OrVCK/qoafJ8mT52ymOGb6M0BbA==
+
 swiper@^4.0.7:
   version "4.5.1"
   resolved "https://registry.yarnpkg.com/swiper/-/swiper-4.5.1.tgz#ed43998e780ceb478610079c8d23fd425eca636f"
@@ -9622,6 +9627,11 @@ vue@^2.6.10:
     "@vue/compiler-sfc" "2.7.14"
     csstype "^3.1.0"
 
+vuelidate@^0.7.7:
+  version "0.7.7"
+  resolved "https://registry.yarnpkg.com/vuelidate/-/vuelidate-0.7.7.tgz#5df3930a63ddecf56fde7bdacea9dbaf0c9bf899"
+  integrity sha512-pT/U2lDI67wkIqI4tum7cMSIfGcAMfB+Phtqh2ttdXURwvHRBJEAQ0tVbUsW9Upg83Q5QH59bnCoXI7A9JDGnA==
+
 vuex@3.4.0:
   version "3.4.0"
   resolved "https://registry.npmmirror.com/vuex/-/vuex-3.4.0.tgz"