浏览代码

1.2版需求

xiuli.gao 2 年之前
父节点
当前提交
cc78353ca9

+ 1 - 2
.idea/workspace.xml

2
 <project version="4">
2
 <project version="4">
3
   <component name="ChangeListManager">
3
   <component name="ChangeListManager">
4
     <list default="true" id="326b77ef-a0bc-4d8a-bd1c-34c4541ee400" name="Changes" comment="">
4
     <list default="true" id="326b77ef-a0bc-4d8a-bd1c-34c4541ee400" name="Changes" comment="">
5
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6
-      <change beforePath="$PROJECT_DIR$/project/src/components/orderManage/charge.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/orderManage/charge.vue" afterDir="false" />
5
+      <change beforePath="$PROJECT_DIR$/project/src/components/detials/orderCharge.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/detials/orderCharge.vue" afterDir="false" />
7
     </list>
6
     </list>
8
     <option name="SHOW_DIALOG" value="false" />
7
     <option name="SHOW_DIALOG" value="false" />
9
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
8
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

+ 1 - 1
index.html

7
         hm.src = "https://hm.baidu.com/hm.js?d61b9e2caf4d46ccda7471b5385e2333";
7
         hm.src = "https://hm.baidu.com/hm.js?d61b9e2caf4d46ccda7471b5385e2333";
8
         var s = document.getElementsByTagName("script")[0];
8
         var s = document.getElementsByTagName("script")[0];
9
         s.parentNode.insertBefore(hm, s);
9
         s.parentNode.insertBefore(hm, s);
10
-      })();</script><link href=./static/css/app.eadf5f87e14b45b319f0f7a740625952.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.972c098eb15f3e7356ae.js></script><script type=text/javascript src=./static/js/app.0c630d10b6a0b9c934c5.js></script></body></html>
10
+      })();</script><link href=./static/css/app.94f6f3bd6cd19504dc74fdf1303cde35.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.196e9aac2970b9df5b19.js></script><script type=text/javascript src=./static/js/app.0c630d10b6a0b9c934c5.js></script></body></html>

+ 6 - 1
project/src/components/detials/orderCharge.vue

12
         <template v-slot="{ row,$index }">
12
         <template v-slot="{ row,$index }">
13
           <span v-if="item.prop == 'order_id'">
13
           <span v-if="item.prop == 'order_id'">
14
               {{row[item.prop]?row[item.prop]:'-'}}
14
               {{row[item.prop]?row[item.prop]:'-'}}
15
+          </span>
16
+          <span v-else-if="item.prop == 'name'">
17
+              {{row[item.prop]?row[item.prop]:'-'}}
15
             </span>
18
             </span>
16
           <span v-else-if="item.prop == 'pay_status'">
19
           <span v-else-if="item.prop == 'pay_status'">
17
               {{row[item.prop]?(row[item.prop]==1?'已付款':'未付款'):'-'}}
20
               {{row[item.prop]?(row[item.prop]==1?'已付款':'未付款'):'-'}}
51
         { prop: "playlet_name", label: "剧名", min_width: 160 },
54
         { prop: "playlet_name", label: "剧名", min_width: 160 },
52
         // { prop: "recall_rate2", label: "订单类型", },
55
         // { prop: "recall_rate2", label: "订单类型", },
53
         { prop: "ad_report_action_type", label: "回传类型", },
56
         { prop: "ad_report_action_type", label: "回传类型", },
54
-        { prop: "ad_report_status", label: "回传结果", },
57
+        { prop: "ad_report_order_status", label: "下单回传结果", },
58
+        { prop: "ad_report_purchase_status", label: "付费回传结果", },
59
+        // { prop: "ad_report_status", label: "回传结果", },
55
       ],
60
       ],
56
       page:1,
61
       page:1,
57
       pages:0,
62
       pages:0,

文件差异内容过多而无法显示
+ 1 - 1
static/css/app.eadf5f87e14b45b319f0f7a740625952.css


文件差异内容过多而无法显示
+ 1 - 0
static/js/0.d5460ff5d744ebf17807.js


文件差异内容过多而无法显示
+ 0 - 1
static/js/0.da352ca6968ea08bac33.js


文件差异内容过多而无法显示
+ 1 - 0
static/js/manifest.196e9aac2970b9df5b19.js


文件差异内容过多而无法显示
+ 0 - 1
static/js/manifest.972c098eb15f3e7356ae.js