领券

@@ -44,7 +44,7 @@ const couponController = {
         //     let rowArr = [id];
         //
         //     rowArr.push(item.couponNo);
-        //     arr.push(rowArr);
+        //     arr.push(rowArr);1
         // }
 
         try {
@@ -137,7 +137,7 @@ const couponController = {
                     type: 'number'
                 },
                 {
-                    caption: '创建时间',
+                    caption: '领取时间',
                     type: 'string'
                 }
             ],
@@ -153,7 +153,11 @@ const couponController = {
                     temp.push(couponId);
                     temp.push(item.couponNo);
                     temp.push(item.userId);
-                    temp.push(timeFormat(item.createTime));
+                    if (item.createTime) {
+                        temp.push(timeFormat(item.createTime));
+                    } else {
+                        temp.push('');
+                    }
                     conf.rows.push(temp);
                 });
 

@@ -112,7 +112,7 @@
                         </div>
                     </div>
                     <div class="item form-group">
-                        <div class="col-md-2 col-md-offset-10 action-wrap">
+                        <div class="col-md-2 col-md-offset-5 action-wrap">
                             <button type="button" class="btn btn-primary btn-save">保存</button>
                         </div>
                     </div>

@@ -69,11 +69,8 @@ function bind_table_pagination() {
                         <td class="">${item.createTime}</td>
                         <td class="">
                             <form id="uploadForm" enctype="multipart/form-data">
-                                <div class="x_title form-group">
                                     <input id="up_excel" name="up_excel" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" style="display: inline-block; width: 80%;" type="file">
                                     <button type="button" class="btn btn-danger btn-import" style="display: inline-block;" data-id="${item.id}">导入券码</button>
-                                    <div class="clearfix"></div>
-                                </div>
                             </form>
                             <button class="btn btn-danger btn-export-no" data-id="${item.id}">导出券码
                             </button>