Merge remote-tracking branch 'origin/master'

pages/ticket/index.vue

@@ -34,8 +34,8 @@
         <u-list-item v-for="(item, index) in listData"
                      :key="index"
                      class="fl-mb-sm fl-px-sm">
-          <view class="fl-card row">
+          <view class="fl-card row fl-px-sm">
-            <view class="col-6 font-16 row justify-center items-center"
+            <view class="col-6 font-16 row  items-center "
                   style="font-weight:bolder">{{item.name}}</view>
             <view class="col-3  row justify-center items-center"
                   :style="{color:item.typeNum!=0?'#40BE94':'#AFAFAF'}">

static/pageData.json

@@ -1,52 +1,23 @@
 {
   "ticketData": [
     {
-      "name": "门票系统的某个场馆",
+      "name": "上海场馆",
-      "typeNum": "3"
+      "typeNum": "2"
-    },
-    {
-      "name": "门票系统的某个场馆",
-      "typeNum": "3"
-    },
-    {
-      "name": "门票系统的某个场馆",
-      "typeNum": "0"
-    },
-    {
-      "name": "门票系统的某个场馆",
-      "typeNum": "0"
-    },
-    {
-      "name": "门票系统的某个场馆",
-      "typeNum": "0"
-    },
-    {
-      "name": "门票系统的某个场馆",
-      "typeNum": "0"
-    },
-    {
-      "name": "门票系统的某个场馆",
-      "typeNum": "0"
-    },
-    {
-      "name": "门票系统的某个场馆",
-      "typeNum": "0"
-    },
-    {
-      "name": "门票系统的某个场馆",
-      "typeNum": "0"
     },
+
     {
-      "name": "门票系统的某个场馆",
+      "name": "苏州博物馆",
       "typeNum": "0"
     },
+
     {
-      "name": "门票系统的某个场馆",
+      "name": "相门联动展览馆",
-      "typeNum": "0"
+      "typeNum": "3"
     },
+
     {
-      "name": "门票系统的某个场馆",
+      "name": "苏州金鸡湖联合上海展览馆",
-      "typeNum": "0"
+      "typeNum": "1"
     }
   ],
   "elector": [
@@ -56,101 +27,23 @@
       "canReserve": "1023",
       "total": "20000"
     },
-    {
-      "url": "../../static/elector-1.png",
-      "name": "首都博物馆节假日门票",
-      "canReserve": "11123",
-      "total": "20000"
-    },
-    {
-      "url": "../../static/elector-1.png",
-      "name": "首都博物馆工作日门票",
-      "canReserve": "0",
-      "total": "2000"
-    },
-    {
-      "url": "../../static/elector-2.png",
-      "name": "首都博物馆元旦门票",
-      "canReserve": "23",
-      "total": "2000"
-    },
-    {
-      "url": "../../static/elector-2.png",
-      "name": "首都博物馆元旦门票",
-      "canReserve": "23",
-      "total": "2000"
-    },
     {
       "url": "../../static/elector-2.png",
-      "name": "首都博物馆元旦门票",
+      "name": "首都博物馆工作日门票",
-      "canReserve": "23",
+      "canReserve": "1667",
-      "total": "2000"
+      "total": "20000"
-    },
-    {
-      "url": "../../static/elector-2.png",
-      "name": "首都博物馆元旦门票",
-      "canReserve": "23",
-      "total": "2000"
-    },
-    {
-      "url": "../../static/elector-2.png",
-      "name": "首都博物馆元旦门票",
-      "canReserve": "23",
-      "total": "2000"
-    },
-    {
-      "url": "../../static/elector-2.png",
-      "name": "首都博物馆元旦门票",
-      "canReserve": "23",
-      "total": "2000"
-    },
-    {
-      "url": "../../static/elector-2.png",
-      "name": "首都博物馆元旦门票",
-      "canReserve": "23",
-      "total": "2000"
-    },
-    {
-      "url": "../../static/elector-2.png",
-      "name": "首都博物馆元旦门票",
-      "canReserve": "23",
-      "total": "2000"
-    },
-    {
-      "url": "../../static/elector-2.png",
-      "name": "首都博物馆元旦门票",
-      "canReserve": "23",
-      "total": "2000"
-    },
-    {
-      "url": "../../static/elector-2.png",
-      "name": "首都博物馆元旦门票",
-      "canReserve": "23",
-      "total": "2000"
-    },
-    {
-      "url": "../../static/elector-2.png",
-      "name": "首都博物馆元旦门票",
-      "canReserve": "23",
-      "total": "2000"
-    },
-    {
-      "url": "../../static/elector-2.png",
-      "name": "首都博物馆元旦门票",
-      "canReserve": "23",
-      "total": "2000"
     },
     {
-      "url": "../../static/elector-2.png",
+      "url": "../../static/elector-3.png",
       "name": "首都博物馆元旦门票",
-      "canReserve": "23",
+      "canReserve": "0",
-      "total": "2000"
+      "total": "20000"
     },
     {
-      "url": "../../static/elector-2.png",
+      "url": "../../static/elector-4.png",
-      "name": "首都博物馆元旦门票",
+      "name": "首都博物馆节假日门票",
-      "canReserve": "23",
+      "canReserve": "3668",
-      "total": "2000"
+      "total": "20000"
     }
   ]
 }