浏览代码

refactor(ad): adjust some styles

Casper Dai 3 年之前
父节点
当前提交
ae34ac081e
共有 4 个文件被更改,包括 26 次插入20 次删除
  1. 9 9
      src/router/index.js
  2. 11 0
      src/views/ad/api.js
  3. 3 7
      src/views/ad/history/index.vue
  4. 3 4
      src/views/ad/review-order/index.vue

+ 9 - 9
src/router/index.js

@@ -67,8 +67,8 @@ export const asyncRoutes = [
     meta: { title: '智能信发', icon: 'cm' },
     children: [
       {
-        name: 'media',
-        path: 'media',
+        name: 'asset-list',
+        path: 'asset',
         component: () => import('@/views/platform/media/index'),
         access: [Access.MANAGE_CALENDAR, Access.MANAGE_GROUP],
         meta: { title: '媒资管理' }
@@ -135,12 +135,12 @@ export const asyncRoutes = [
         access: Access.MANAGE_CALENDAR,
         meta: { title: '排期发布' }
       },
-      // {
-      //   path: 'review',
-      //   component: () => import('@/views/review/index'),
-      //   access: Access.MANAGE_GROUP,
-      //   meta: { title: '审核管理' }
-      // },
+      {
+        path: 'review',
+        component: () => import('@/views/review/index'),
+        access: Access.MANAGE_GROUP,
+        meta: { title: '审核管理' }
+      },
       {
         path: 'workflow',
         component: Solo,
@@ -362,7 +362,7 @@ export const asyncRoutes = [
         name: 'ad-order-history',
         path: 'order/history',
         component: () => import('@/views/ad/history/index'),
-        meta: { title: '审核记录' }
+        meta: { title: '订单历史' }
       }
     ]
   },

+ 11 - 0
src/views/ad/api.js

@@ -67,3 +67,14 @@ export function rejectAsset ({ keyName }, reason) {
     }
   })
 }
+
+export function getOrdersByDeviceAndDate (deviceId, options) {
+  return request({
+    url: '/ad/tenant/order/device/range',
+    method: 'GET',
+    params: {
+      deviceId,
+      ...options
+    }
+  })
+}

+ 3 - 7
src/views/ad/history/index.vue

@@ -50,8 +50,6 @@ export default {
           { prop: 'range', label: '时段', align: 'right', 'min-width': 100 },
           { prop: 'freq', label: '频率', align: 'right', 'min-width': 140 },
           { prop: 'price', label: '总价(元)', 'min-width': 100, align: 'right' },
-          { prop: 'createTime', label: '提交时间', 'min-width': 140, align: 'right' },
-          { prop: 'auditTime', label: '审核时间', 'min-width': 140, align: 'right' },
           { prop: 'remark', label: '备注', 'min-width': 140, align: 'right' },
           { type: 'invoke', render: [
             { label: '内容', on: this.onView }
@@ -75,18 +73,16 @@ export default {
     }
   },
   methods: {
-    transform ({ id, price, status, createTime, auditTime, expand, orders, assets }) {
-      const { startDate, range, day, duration, count } = orders[0]
+    transform ({ id, price, status, expand, orders, assets }) {
+      const { startDate, startTime, endTime, day, duration, count } = orders[0]
       return {
         id,
         deviceName: orders[0].name,
         startDate,
-        range,
+        range: `${startTime}-${endTime}`,
         price: (price / 100).toFixed(2),
         freq: `${day}天 x ${duration}秒 x ${count}次`,
         remark: status === State.REJECTED ? expand : '-',
-        createTime,
-        auditTime,
         assets
       }
     },

+ 3 - 4
src/views/ad/review-order/index.vue

@@ -115,18 +115,17 @@ export default {
     }
   },
   methods: {
-    transform ({ id, price, status, createTime, auditTime, expand, orders, assets }) {
-      const { startDate, range, day, duration, count } = orders[0]
+    transform ({ id, price, status, createTime, expand, orders, assets }) {
+      const { startDate, startTime, endTime, day, duration, count } = orders[0]
       return {
         id,
         deviceName: orders[0].name,
         startDate,
-        range,
+        range: `${startTime}-${endTime}`,
         price: (price / 100).toFixed(2),
         freq: `${day}天 x ${duration}秒 x ${count}次`,
         remark: status === State.REJECTED ? expand : '-',
         createTime,
-        auditTime,
         assets
       }
     },