瀏覽代碼

Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

许成详 6 年之前
父節點
當前提交
6acbb0dc1f

+ 18
- 8
src/pages/system/cardAndCouponManager/givingRecords.vue 查看文件

@@ -15,12 +15,14 @@
15 15
             <el-date-picker
16 16
               v-model="postData.startDate"
17 17
               type="date"
18
+              value-format="yyyy-MM-dd"
18 19
               placeholder="选择起始日期">
19 20
             </el-date-picker>
20 21
             <span>至</span>
21 22
             <el-date-picker
22 23
               v-model="postData.endDate"
23 24
               type="date"
25
+              value-format="yyyy-MM-dd"
24 26
               placeholder="选择截止日期">
25 27
             </el-date-picker>
26 28
           </li>
@@ -37,31 +39,34 @@
37 39
         stripe
38 40
         style="width: 100%">
39 41
         <el-table-column
40
-          prop="xxx"
42
+          prop="GiftName"
41 43
           label="卡券名称">
42 44
         </el-table-column>
43 45
         <el-table-column
44
-          prop="xxx"
46
+          prop="ToName"
45 47
           label="姓名">
46 48
         </el-table-column>
47 49
         <el-table-column
48
-          prop="xxx"
50
+          prop="CustomerName"
49 51
           label="微信昵称">
50 52
         </el-table-column>
51 53
         <el-table-column
52
-          prop="xxx"
54
+          prop="Phone"
53 55
           label="手机号">
54 56
         </el-table-column>
55 57
         <el-table-column
56
-          prop="xxx"
58
+          prop="RecommendName"
57 59
           label="推荐人">
58 60
         </el-table-column>
59 61
         <el-table-column
60
-          prop="xxx"
62
+          prop="CreateDate"
61 63
           label="赠送时间">
64
+          <template slot-scope="scope">
65
+            <span>{{FormatDate(scope.row.CreateDate)}}</span>
66
+          </template>
62 67
         </el-table-column>
63 68
         <el-table-column
64
-          prop="xxx"
69
+          prop="FromName"
65 70
           label="操作人">
66 71
         </el-table-column>
67 72
       </el-table>
@@ -87,9 +92,11 @@ export default {
87 92
       centerDialogVisible: false,
88 93
       total: 0,
89 94
       postData: { // 表格搜索条件
90
-        caseid: '', // 案场id
91 95
         page: 1, // 当前页码
92 96
         pagesize: 10, // 请求数据量
97
+        startDate: '',
98
+        endDate: '',
99
+        referrer: '', // 搜索框
93 100
       },
94 101
       currentList: []
95 102
     }
@@ -132,6 +139,9 @@ export default {
132 139
     handleCurrentChange (val) { // 跳转到分页
133 140
       this.getList()
134 141
     },
142
+    FormatDate (date) {
143
+      return this.toolClass.dateFormat(date, 'yyyy-MM-dd hh:mm:ss')
144
+    },
135 145
   }
136 146
 }
137 147
 </script>

+ 1
- 1
src/pages/system/dataStatistics/goodsOrderList/index.vue 查看文件

@@ -111,7 +111,7 @@
111 111
             <div style="font-size:12px;">下单人:{{returnListItem(goodsOrderList, index).CustomerName}}</div>
112 112
             <span style="display:block;margin-top:10px;font-size:12px;">下单时间:{{toolClass.dateFormat(returnListItem(goodsOrderList, index).CreateDate)}}</span>
113 113
           </div>
114
-          <!-- <div style="padding:10px 10px;font-size:12px;">备注:{{returnListItem(goodsOrderList, index).Remark}}</div> -->
114
+          <div style="padding:10px 10px;font-size:12px;"></div>
115 115
           <div style="text-align: right;font-size: 12px;">城的空间.诚咖啡</div>
116 116
           <div style="height:10px"></div>
117 117
         </div>

+ 1
- 1
src/pages/system/newOrder/newOrderList/index.vue 查看文件

@@ -63,7 +63,7 @@
63 63
             <div style="font-size:12px;">下单人:{{item.UserName}}</div>
64 64
             <span style="display:block;margin-top:10px;font-size:12px;">下单时间:{{toolClass.dateFormat(item.CreateDate)}}</span>
65 65
           </div>
66
-          <!-- <div style="padding:10px 10px;font-size:12px;">备注:{{item.Remark}}</div> -->
66
+          <div style="padding:10px 10px;font-size:12px;"></div>
67 67
           <div style="text-align: right;font-size: 12px;">城的空间.诚咖啡</div>
68 68
           <div style="height:10px"></div>
69 69
         </div>

+ 6
- 0
src/util/api.js 查看文件

@@ -813,6 +813,12 @@ const $api = {
813 813
       method: 'get',
814 814
       url: `${baseUrl}${common}/luckdrawlist/share`
815 815
     }
816
+  },
817
+  record: {
818
+    getRecordList: {
819
+      method: 'get',
820
+      url: `${baseUrl}${common}/card/record`
821
+    }
816 822
   }
817 823
 }
818 824
 export default $api