修改订单列表

quasar.conf.js

@@ -183,7 +183,8 @@ module.exports = function( /* ctx */ ) {
             plugins: [
                 "Meta",
                 "Notify",
-                'Loading'
+                'Loading',
+                'Dialog'
             ]
         },
 

src/boot/utils.js

@@ -26,7 +26,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' //'http://192.168.10.206:8015' ''http://192.168.10.11:8083' '
+            domainUrl = 'http://192.168.10.206:8015' //'http://192.168.10.206:8015' ''http://192.168.10.11:8083' '
         }
         var obj = {
             //主地址

src/components/navs/city-category.vue

-<style>
-.q-ml-lg .block {
-  margin-right: 12px;
-}
-</style>
 <style scoped>
 .header-box {
   max-width: 1200px;

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

-<style>
-.q-ml-lg .block {
-  margin-right: 12px;
-}
-</style>
 <style scoped>
 .header-box {
   max-width: 1200px;

src/utils/enumhelper.js

@@ -2,7 +2,6 @@ const EnumHelper = {
     ParseToEnum(TEnum, value, comparison = '') {
         if (Object.isFrozen) {
             let t = Object.values(TEnum)
-            console.log(t, Symbol(1) == 1)
             let r = t.find(x => (comparison != '' && x[comparison] == value) || (comparison == '' && x == value))
             return r
         } else {

src/utils/listProductType.js

@@ -2,23 +2,33 @@ const ListProductTypeEnum = Object.freeze({
 
     TRIP: {
         value: 1,
-        desc: '線路旅遊'
+        desc: '線路旅遊',
+        bgColor: 'bg-pink-2',
+        color: 'text-pink'
     },
     SCENIC: {
         value: 2,
-        desc: '景點門票'
+        desc: '景點門票',
+        bgColor: 'bg-purple-2',
+        color: 'text-purple'
     },
     HOTEL: {
         value: 3,
-        desc: '酒店住宿'
+        desc: '酒店住宿',
+        bgColor: 'bg-indigo-2',
+        color: 'text-indigo'
     },
     CAR: {
         value: 4,
-        desc: '目的地用車'
+        desc: '目的地用車',
+        bgColor: 'bg-teal-2',
+        color: 'text-teal'
     },
     JALAN: {
         value: 5,
-        desc: '酒店住宿'
+        desc: '酒店住宿',
+        bgColor: 'bg-indigo-2',
+        color: 'text-indigo'
     },
 })
 

src/utils/orderStautsEnum.js

+const OrderStatusEnum = Object.freeze({
+
+    UN_PAY: {
+        value: 1,
+        desc: '待付款',
+        icon: 'iconfont icontime1',
+        color: 'text-orange'
+    },
+    PAYED: {
+        value: 2,
+        desc: '待出行',
+        icon: 'iconfont iconflag',
+        color: 'text-green'
+    },
+    FINISH: {
+        value: 3,
+        desc: '已完成',
+        icon: 'iconfont iconsuccess',
+        color: 'text-dark'
+    },
+    CANCEL: {
+        value: 4,
+        desc: '已取消',
+        icon: 'iconfont iconminus',
+        color: 'text-grey-6'
+    }
+})
+
+export default OrderStatusEnum
\ No newline at end of file

src/utils/producttypeenum.js

+import EnumHelper from "./enumhelper"
+import ListProductTypeEnum from "./listProductType"
+
 const ProductTypeEnum = Object.freeze({
     /**
      * 一日游
@@ -112,4 +115,29 @@ const ProductTypeEnum = Object.freeze({
 
 })
 
-export default ProductTypeEnum
\ No newline at end of file
+const mappingRules = [
+    [-1],
+    [1, 2, 3],
+    [4, 5, 6, 7],
+    [-1],
+    [12, 13, 14],
+    [8, 9, 10, 11]
+]
+
+const mappingListType = (value) => {
+    let val = mappingRules.findIndex(x => {
+        return x.indexOf(value) != -1
+    })
+    if (val && val > 0) {
+        return EnumHelper.ParseToEnum(ListProductTypeEnum, val, 'value')
+    }
+    return {}
+}
+
+const transProductEnum = (value) => {
+    return mappingRules[value]
+}
+
+export default ProductTypeEnum
+
+export { mappingListType, transProductEnum }
\ No newline at end of file