新增支付页面

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/trip/orderPreview.vue

@@ -381,7 +381,7 @@ export default {
         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/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')
+            },
         ]
 
     },