1

www/protected/controllers/GiftController.php

@@ -21,8 +21,10 @@ class GiftController extends AdminController
 
 
         $tmp = CommonFn::getComboboxData($tmp, 0, false );
+        $type_option = CommonFn::getComboboxData(Gift::$type_options, 1, true, 100);
         $this->render('index',[
-            'gifts' => $tmp
+            'gifts' => $tmp,
+            'type' => $type_option,
         ]);
     }
 
@@ -51,6 +53,7 @@ class GiftController extends AdminController
         $title = Yii::app()->request->getParam('title','');
         $gift_num = Yii::app()->request->getParam('gift_num','');
         $desc = Yii::app()->request->getParam('desc','');
+        $type = Yii::app()->request->getParam('type','');
         $supplier = Yii::app()->request->getParam('supplier','');
 
 
@@ -66,6 +69,7 @@ class GiftController extends AdminController
         $gift->gift_num = $gift_num;
         $gift->desc = $desc;
         $gift->supplier = $supplier;
+        $gift->type = $type;
         $gift->save();
         CommonFn::requestAjax(true,'保存成功');exit;
     }
@@ -75,11 +79,18 @@ class GiftController extends AdminController
         $desc = Yii::app()->request->getParam('desc','');
         $gift_num = Yii::app()->request->getParam('gift_num','');
         $supplier = Yii::app()->request->getParam('supplier','');
-
+        $type = (int)Yii::app()->request->getParam('type','');
+        if ($type == 100) {
+            CommonFn::requestAjax(false,'请选择礼包类型');exit;
+        }
+        if(!$title || !$desc || !$gift_num || !$supplier ) {
+            CommonFn::requestAjax(false,'请填写完整数据');exit;
+        }
         $gift = new Gift();
         $gift->title = $title;
         $gift->gift_num = $gift_num;
         $gift->desc = $desc;
+        $gift->type = $type;
         $gift->supplier = $supplier;
         $gift->save();
         CommonFn::requestAjax(true,'保存成功');exit;

www/protected/controllers/JCouponController.php

@@ -28,7 +28,7 @@ class JCouponController extends AdminController
         }
 
 
-        $tmp1 = CommonFn::getComboboxData($tmp1, 0, false );
+        $tmp1 = CommonFn::getComboboxData($tmp1, 100, true, 100);
 
         $this->render('index',array(
             'status' => $status,
@@ -81,15 +81,16 @@ class JCouponController extends AdminController
         $coding_num = (int)Yii::app()->request->getParam('coding_num','');
         $gift_id = Yii::app()->request->getParam('gift_id','');
         $channel = Yii::app()->request->getParam('bus_id','');
+        $bus = Yii::app()->request->getParam('bus','');
         $expire_time = Yii::app()->request->getParam('expire_time_str','');
-        if (!$num ||!$channel || !$gift_id || !$expire_time) {
+        if (!$bus || !$num ||!$channel || !$gift_id || !$expire_time) {
             CommonFn::requestAjax(false,'请填写完整信息');exit;
         }
         $gift = Gift::get(new MongoId($gift_id));
         if (empty($gift)) {
             CommonFn::requestAjax(false,'礼包不存在');exit;
         }
-        if ($coding_num > 1000000) {
+        if ($coding_num > 100000) {
             CommonFn::requestAjax(false,'起始值重复');exit;
         }
         /*$c = new EMongoCriteria();
@@ -102,7 +103,7 @@ class JCouponController extends AdminController
         for($i=0; $i<$num; $i++) {
             $coupon = new JCoupon();
             $coupon->gift_id = $gift_id;
-            $tmp1 = $coding_num + 1000000;
+            $tmp1 = $coding_num + 100000;
             $coupon->coding_num = date('d').substr($tmp1,1);
 
             $flag = true;
@@ -159,6 +160,26 @@ class JCouponController extends AdminController
         $parsedRows = JCoupon::model()->parse($rows);
         $res=Service::factory('JCouponService')->push($parsedRows);
     }
+    public function actionOutputExcel1()
+    {
+        $start_num = Yii::app()->request->getParam('start_num','');
+        $total = Yii::app()->request->getParam('num','');
+        $id = Yii::app()->request->getParam('id','');
+        $criteria = new EMongoCriteria();
+        $num = substr($start_num,0,strlen($start_num) - 4);
+        for ($i=0;$i<$total;$i++) {
+            $criteria = new EMongoCriteria();
+            $day = intval("1".substr($start_num,-4,4)) +$i;
+            $tmp = $num.substr($day,1,strlen($day) - 1);
+            $criteria->coupon_coding('==',$tmp);
+            $coupon = JCoupon::model()->find($criteria);
+            if (!empty($coupon)) {
+                $coupon->channel = $id;
+                $coupon->save();
+            }
+        }
+        CommonFn::requestAjax(true,'修改成功');exit;
+    }
 
 
 }

www/protected/controllers/JRecordController.php

@@ -12,7 +12,7 @@ class JRecordController extends AdminController
     public function actionIndex()
     {
         $status = CommonFn::getComboboxData(JRecord::$status_options, 100, true, 100);
-//        $tmp = Business::model()->findAll();
+        $tmp = Business::model()->findAll();
 //        foreach ($tmp as $k) {
 //            $k->delete();
 //        }
@@ -90,15 +90,13 @@ class JRecordController extends AdminController
         $name = Yii::app()->request->getParam('name','');
         $mobile = Yii::app()->request->getParam('mobile','');
         $address = Yii::app()->request->getParam('address','');
-        $flow = Yii::app()->request->getParam('flow','');
-        $flow_number = Yii::app()->request->getParam('flow_number','');
-//        $status = (int)Yii::app()->request->getParam('status',0);
         $pwd = Yii::app()->request->getParam('pwd','');
+        $coding_num = Yii::app()->request->getParam('coding_num','');
 
-        if (!$name ||!$mobile || !$address || !$flow||!$flow_number  || !$pwd) {
+        if (!$name ||!$mobile || !$address   || !$pwd) {
             CommonFn::requestAjax(false,'请填写完整信息');exit;
         }
-        $coupon = JCoupon::getByPwdOne($pwd);
+        $coupon = JCoupon::getByPwdOne($pwd, $coding_num);
         if (empty($coupon) || $coupon->status >= 2) {
             CommonFn::requestAjax(false,'兑换券不存在或已失效');exit;
         }
@@ -111,8 +109,6 @@ class JRecordController extends AdminController
         $record->address = $address;
         $record->coupon_id = (string)$coupon->_id;
         $record->status = 0;
-        $record->flow = $flow;
-        $record->flow_number = $flow_number;
         $record->time = time();
         $record->save();
         $coupon->status = 1;
@@ -128,6 +124,10 @@ class JRecordController extends AdminController
         $criteria->time('>=',strtotime($start_time));
         $criteria->time('<=',strtotime($end_time));
         $cursor = JRecord::model()->findAll($criteria);
+        foreach ($cursor as $item) {
+            $item->status = 2;
+            $item->save();
+        }
         $rows = CommonFn::getRowsFromCursor($cursor);
         $parsedRows = JRecord::model()->parse($rows);
         $res=Service::factory('JRecordService')->push($parsedRows);

www/protected/modules/j/controllers/JRecordController.php

@@ -18,6 +18,19 @@
          if (!$name ||!$mobile || !$address  || !$pwd || !$user_id || !$coding_num) {
              CommonFn::requestAjax(false,'请填写完整信息');exit;
          }
+         $c = new EMongoCriteria();
+         $c->coding_num('==',$pwd);
+         $coupon = JCoupon::model()->find($c);
+         if (empty($coupon)) {
+             CommonFn::requestAjax(false,'密码错误');exit;
+         }
+         $c = new EMongoCriteria();
+         $c->coding_num('==',$coding_num);
+         $coupon = JCoupon::model()->find($c);
+         if (empty($coupon)) {
+             CommonFn::requestAjax(false,'验证码错误');exit;
+         }
+
          $coupon = JCoupon::getByPwdOne($pwd,$coding_num);
          if (empty($coupon) || $coupon->status >= 2) {
              CommonFn::requestAjax(false,'兑换券不存在或已失效');exit;

www/protected/modules/j/models/Gift.php

@@ -15,6 +15,7 @@ class Gift extends MongoAr
     public $gift_num;//礼包编号
     public $desc;
     public $supplier;//供货商 联系人 联系方式
+    public $type = 0;
 
 
 
@@ -34,6 +35,11 @@ class Gift extends MongoAr
         return 'j_gift';
     }
 
+    public static $type_options = [
+        0 => ['name' => '食品'],
+        1 => ['name' => '服务'],
+        2 => ['name' => '实物'],
+    ];
 
     public static function get($_id) {
         if(CommonFn::isMongoId($_id)){
@@ -59,6 +65,8 @@ class Gift extends MongoAr
         $newRow['supplier'] = $bus->source;
         $newRow['desc'] = CommonFn::get_val_if_isset($row,'desc','');
         $newRow['gift_num'] = CommonFn::get_val_if_isset($row,'gift_num','');
+        $newRow['type'] = CommonFn::get_val_if_isset($row,'type','');
+        $newRow['type_str'] = self::$type_options[(int)$newRow['type']]['name'];
         $newRow['mobile'] = $bus->mobile;
         $newRow['name'] =  $bus->name;
         if(APPLICATION=='admin'){

www/protected/modules/j/models/JCoupon.php

@@ -14,7 +14,7 @@ class JCoupon extends MongoAr
     public $user_id;
     public $gift_id;
     public $pwd;//提货密码
-    public $coding_num;//手工编号
+    public $coding_num;//验证码
     public $coupon_coding;//礼品券编号 AABBB1806000001
     public $expire_time;//过期时间
     public $channel;//渠道

www/protected/modules/j/models/JRecord.php

@@ -28,6 +28,7 @@ class JRecord extends MongoAr
     static public $status_options = array(
         0 => array('name' => '未发货'),
         1 => array('name' => '已发货'),
+        2 => array('name' => '已导出'),
     );
 
     public static function model($className=__CLASS__)
@@ -65,12 +66,14 @@ class JRecord extends MongoAr
         $gift = Gift::get(new MongoId((string)$coupon->gift_id));
         $newRow['pwd'] = $coupon->pwd;
         $newRow['gift_name'] = $gift->title;
+        $newRow['gift_type'] = Gift::$type_options[$gift->type]['name'];
         $newRow['gift_id'] = $gift->gift_num;
         $newRow['address'] = CommonFn::get_val_if_isset($row,'address','');
         $newRow['user_info'] = CommonFn::get_val_if_isset($row,'user_info','');
         $newRow['name'] = $newRow['user_info']['name'];
         $newRow['mobile'] = $newRow['user_info']['mobile'];
-
+        $bus = Business::get(new MongoId($gift->supplier));
+        $newRow['supplier_info'] = $bus->source.'-'.$bus->name.'-'.$bus->mobile;
         $newRow['flow'] = CommonFn::get_val_if_isset($row,'flow','');
         $newRow['flow_number'] = CommonFn::get_val_if_isset($row,'flow_number','');
         $newRow['status'] = CommonFn::get_val_if_isset($row,'status','');

www/protected/services/JCouponService.php

@@ -31,17 +31,19 @@ class JCouponService extends Service
         $num = 1;
         $objPHPExcel->setActiveSheetIndex(0)
             //Excel的第A列，uid是你查出数组的键值，下面以此类推
-            ->setCellValue('A' . $num, '礼品券编号')//$name
-//            ->setCellValue('B' . $num, '手工编号')//$phone
-            ->setCellValue('B' . $num, '密码')//$sex
+            ->setCellValue('A' . $num, '礼包名称')//$name
+            ->setCellValue('B' . $num, '礼品券编号')//$name
+            ->setCellValue('C' . $num, '提货密码')//$name
+            ->setCellValue('D' . $num, '有效期')//$sex
         ;
         $num += 1;
         foreach($data as $key => $value){
             $objPHPExcel->setActiveSheetIndex(0)
                 //Excel的第A列，uid是你查出数组的键值，下面以此类推
-                ->setCellValue('A' . $num, $value['coupon_coding'])
-//                ->setCellValue('B' . $num, $value['coding_num'])
-                ->setCellValue('B' . $num, $value['pwd_str'])
+                ->setCellValue('A' . $num, $value['gift_name'])
+                ->setCellValue('B' . $num, $value['coupon_coding'])
+                ->setCellValue('C' . $num, $value['pwd_str'])
+                ->setCellValue('D' . $num, $value['expire_time_str'])
             ;
             $num += 1;
         }

www/protected/services/JRecordService.php

@@ -31,16 +31,14 @@ class JRecordService extends Service
         $num = 1;
         $objPHPExcel->setActiveSheetIndex(0)
             //Excel的第A列，uid是你查出数组的键值，下面以此类推
-            ->setCellValue('A' . $num, '礼包编号')//$name
-            ->setCellValue('B' . $num, '提货密码')//$phone
-            ->setCellValue('C' . $num, '姓名')//$sex
-            ->setCellValue('D' . $num, '手机号')//$address
+            ->setCellValue('A' . $num, '礼包名称')//$name
+            ->setCellValue('B' . $num, '类型')//$phone
+            ->setCellValue('C' . $num, '礼券编号')//$sex
+            ->setCellValue('D' . $num, '收货人')//$address
             //->setCellValue('G' . $num, 'charge_id')
-            ->setCellValue('E' . $num, '物流商')//$address
-            ->setCellValue('F' . $num, '物流号码')//$work_time_part
+            ->setCellValue('E' . $num, '收货地址')//$address
+            ->setCellValue('F' . $num, '供货商信息')//$work_time_part
             //->setCellValue('F' . $num, '订单处理时间')
-            ->setCellValue('G' . $num, '状态')//$work_time
-            ->setCellValue('H' . $num, '兑换时间')//$reg_time
             /*->setCellValue('I' . $num, '工种')//$work_type
             ->setCellValue('J' . $num, '服务技能')//$skill
             ->setCellValue('K'.$num,'自述')//$readme
@@ -52,19 +50,12 @@ class JRecordService extends Service
         foreach($data as $key => $value){
             $objPHPExcel->setActiveSheetIndex(0)
                 //Excel的第A列，uid是你查出数组的键值，下面以此类推
-                ->setCellValue('A' . $num, $value['gift_id'])
-                ->setCellValue('B' . $num, $value['pwd'])
-                ->setCellValue('C' . $num, $value['name'])
-                ->setCellValue('D' . $num, $value['mobile'])
-                ->setCellValue('E' . $num, $value['flow'])
-                ->setCellValue('F' . $num, $value['flow_number'])
-                ->setCellValue('G' . $num, $value['status_str'])
-                ->setCellValue('H' . $num, $value['time_str'])
-                /*->setCellValue('J' . $num, $value[''])
-                ->setCellValue('K'.$num,$value['readme'])
-                ->setCellValue('L'.$num,JGEmploye::$status_options[intval($value['status'])]['name'])
-                ->setCellValue('M'.$num,$value['desc'])
-                ->setCellValue('N'.$num,$value['store_id'])*/
+                ->setCellValue('A' . $num, $value['gift_name'])
+                ->setCellValue('B' . $num, $value['gift_type'])
+                ->setCellValue('C' . $num, $value['coupon_coding'])
+                ->setCellValue('D' . $num, $value['name'])
+                ->setCellValue('E' . $num, $value['address'])
+                ->setCellValue('F' . $num, $value['supplier_info'])
             ;
             $num += 1;
         }

www/protected/views/gift/index.php

@@ -75,38 +75,47 @@
                                         </div>
                                     </div>
                                 </li>
-
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                            <span>供货商: </span>
-                                        </div>
-                                        <div class="box_flex f_content">
-                                            <input id="edit_gift" name="gift" style="width: 250px;"  />
-                                            <input id="edit_gift_id" name="supplier" type='hidden' style="width: 250px;"  />
-                                        </div>
-                                    </div>
-                                </li>
                                 <li class="f_item">
                                     <div class="box">
                                         <div class="f_label">
-                                            <span>供货商联系人: </span>
+                                            <span>礼包类型: </span>
                                         </div>
                                         <div class="box_flex f_content">
-                                            <input id="edit_supplier_name" name="supplier_name" style="width: 250px;"  readonly />
+                                            <input id="edit_types" name="type" style="width: 250px;"  />
                                         </div>
                                     </div>
                                 </li>
                                 <li class="f_item">
                                     <div class="box">
                                         <div class="f_label">
-                                            <span>供货商联系方式: </span>
+                                            <span>供货商: </span>
                                         </div>
                                         <div class="box_flex f_content">
-                                            <input id="edit_supplier_mobile" name="supplier_mobile" style="width: 250px;" readonly  />
+                                            <input id="edit_gift" name="gift" style="width: 250px;"  />
+                                            <input id="edit_gift_id" name="supplier" type='hidden' style="width: 250px;"  />
                                         </div>
                                     </div>
                                 </li>
+<!--                                <li class="f_item">-->
+<!--                                    <div class="box">-->
+<!--                                        <div class="f_label">-->
+<!--                                            <span>供货商联系人: </span>-->
+<!--                                        </div>-->
+<!--                                        <div class="box_flex f_content">-->
+<!--                                            <input id="edit_supplier_name" name="supplier_name" style="width: 250px;"  readonly />-->
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!--                                </li>-->
+<!--                                <li class="f_item">-->
+<!--                                    <div class="box">-->
+<!--                                        <div class="f_label">-->
+<!--                                            <span>供货商联系方式: </span>-->
+<!--                                        </div>-->
+<!--                                        <div class="box_flex f_content">-->
+<!--                                            <input id="edit_supplier_mobile" name="supplier_mobile" style="width: 250px;" readonly  />-->
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!--                                </li>-->
 
 
                             </ul>
@@ -173,6 +182,16 @@
                         </div>
                     </div>
                 </li>
+                <li class="f_item">
+                    <div class="box">
+                        <div class="f_label">
+                            <span>礼包类型: </span>
+                        </div>
+                        <div class="box_flex f_content">
+                            <input id="types" name="type" style="width: 250px;"  />
+                        </div>
+                    </div>
+                </li>
 
             </ul>
 
@@ -228,10 +247,10 @@
     var jq_add_dialog = $('#add_dialog');
     var jq_add_form = $('#add_form');
     var gifts = <?php echo json_encode($gifts); ?>;
+    var type_options = <?php echo json_encode($type); ?>;
     var jq_set_precedence = $('#set_precedence');
     var jq_action_info = $('#action_info');
     var jq_acc = $('#acc_container');
-    console.log(gifts);
     $('#gift').combobox({
       editable: false,
       data: gifts,
@@ -239,6 +258,10 @@
         $('#gift_id').val(e.attributes.id);
       }
     });
+    $('#types').combobox({
+      editable: false,
+      data: type_options
+    });
     $('#edit_gift').combobox({
       editable: false,
       data: gifts,
@@ -246,6 +269,10 @@
         $('#edit_gift_id').val(e.attributes.id);
       }
     });
+    $('#edit_types').combobox({
+      editable: false,
+      data: type_options
+    });
     var jq_edit_extra_dialog = $('#edit_extra_dialog');
     $('body').on('click','.del_extra',function(){
         $(this).parent('div').remove();
@@ -507,6 +534,7 @@
                 $('#edit_desc').val(data.desc);
                $('#edit_gift_id').val(data.supplier_id);
                 //$('#edit_gift').combobox('value',data.supplier_id);
+                $('#edit_types').combobox('setValue',data.type);
                 gifts.find((res,index) => {
                   if (res.attributes.id == data.supplier_id) {
                     $('#edit_gift').combobox('setValue',index);
@@ -531,6 +559,7 @@
               $('#edit_gift').combobox('setValue','全部');
                 jq_dg_content.datagrid('clearSelections');
                 jq_setStatus.combobox('setValue', 100);
+              $('#edit_types').combobox('setValue',100);
             }
 
         });

www/protected/views/jCoupon/index.php

@@ -19,9 +19,22 @@
                 <span class="tb_label">状态: </span>
                 <input id="filter_status" />
                 <div class="left">
-                    礼品券编号：<input id="start_num" />
+                    导出批次号：<input id="start_num" />
+                    <a href="#" class='easyui-linkbutton' plain="true" iconCls="icon-add" onclick="export_order();return false;">导出兑换券</a>
                 </div>
-                <a href="#" class='easyui-linkbutton' plain="true" iconCls="icon-add" onclick="export_order();return false;">导出兑换券</a>
+                <div class="left">
+                    <div>
+                        礼品券编号起始值：<input id="start1_num" />
+                        修改数量：<input id="num1" />
+                    </div>
+                    <div>
+                        发行渠道：<input id="bus1"   />
+                        <input id="bus_id1" type='hidden' />
+                        <a href="#" class='easyui-linkbutton' plain="true" iconCls="icon-add" onclick="confirm_data();return false;">批量修改</a>
+
+                    </div>
+                </div>
+
             </div>
             <div style="margin: 3px 2px;padding:5px;border: 1px solid #95B8E7;">
                 <a href="#" class='easyui-linkbutton' plain="true" iconCls="icon-add" onclick="add_content();return false;">新增兑换券</a>
@@ -70,7 +83,7 @@
                                 <li class="f_item">
                                     <div class="box">
                                         <div class="f_label">
-                                            <span>手工编号: </span>
+                                            <span>验证码: </span>
                                         </div>
                                         <div class="box_flex f_content">
                                             <span id="coding_num"></span>
@@ -152,7 +165,7 @@
                 <li class="f_item">
                     <div class="box">
                         <div class="f_label">
-                            <span>手工编号起始值: </span>
+                            <span>验证码起始值: </span>
                         </div>
                         <div class="box_flex f_content">
                             <input id="coding_num" name="coding_num" style="width: 250px;"  />
@@ -301,6 +314,13 @@
         $('#bus_id').val(e.attributes.id);
       }
     });
+    $('#bus1').combobox({
+      editable: false,
+      data: bus,
+      onSelect: function(e){
+        $('#bus_id1').val(e.attributes.id);
+      }
+    });
     jq_setStatus_add.combobox({
       editable: false,
       data: (function () {
@@ -512,7 +532,7 @@
         {field:'id', title:'id', hidden:true},
         {field:'gift_name', title:'礼包名称',width:40 },
         {field:'pwd', title:'提货密码', width:40,sortable:false},
-        {field:'coding_num', title:'手工编号', width:40,sortable:false},
+        {field:'coding_num', title:'验证码', width:40,sortable:false},
         {field:'coupon_coding', title:'礼品券编号', width:40,sortable:false},
         {field:'expire_time', title:'过期时间', width:40,sortable:true,formatter: function(value, row){
           return   row.expire_time_str;
@@ -692,5 +712,27 @@
     }
     window.location.href = module_router+'/OutputExcel&start_num='+start_num;
   }
+  function confirm_data() {
+    let start1_num = $('#start1_num').val();
+    let num1 = $('#num1').val();
+    let bus_id1 = $('#bus_id1').val();
+    console.log(start1_num);
+    console.log(num1);
+    console.log(bus_id1);
+    if (!start1_num || !num1 || !bus_id1) {
+      alert('请填写完整');return ;
+    }
+    $.get(module_router+'/OutputExcel1&start_num='+start1_num+'&num='+num1+'&id='+bus_id1,res => {
+      console.log(res);
+      $.messager.show({
+        title : '提示',
+        msg : '保存成功',
+        timeout : 3500,
+        showType : 'slide'
+      });
+      jq_dg_content.datagrid('reload');
+    });
+
+  }
 
 </script>

www/protected/views/jRecord/index.php

@@ -24,7 +24,7 @@
             </div>
             <div style="margin: 3px 2px;padding:5px;border: 1px solid #95B8E7;">
                 开始 <input type="text" id="server_start_time" />
-                结束 <input type="text" id="expire_time" />
+                结束 <input type="text" id="server_end_time" />
                 <a href="#" class='easyui-linkbutton' iconCls="icon-add" plain="true" onclick="export_order();return false;">导出提货记录 </a>
                 <a href="#" class='easyui-linkbutton' plain="true" iconCls="icon-add" onclick="add_content();return false;">新增提货记录</a>
             </div>
@@ -122,7 +122,37 @@
                                 <li class="f_item">
                                     <div class="box">
                                         <div class="f_label">
-                                            <span>手工编码: </span>
+                                            <span>礼包名称: </span>
+                                        </div>
+                                        <div class="box_flex f_content">
+                                            <span id="gift_name"></span>
+                                        </div>
+                                    </div>
+                                </li>
+                                <li class="f_item">
+                                    <div class="box">
+                                        <div class="f_label">
+                                            <span>类型: </span>
+                                        </div>
+                                        <div class="box_flex f_content">
+                                            <span id="gift_type"></span>
+                                        </div>
+                                    </div>
+                                </li>
+                                <li class="f_item">
+                                    <div class="box">
+                                        <div class="f_label">
+                                            <span>兑换时间: </span>
+                                        </div>
+                                        <div class="box_flex f_content">
+                                            <span id="jr_time"></span>
+                                        </div>
+                                    </div>
+                                </li>
+                                <li class="f_item">
+                                    <div class="box">
+                                        <div class="f_label">
+                                            <span>验证码: </span>
                                         </div>
                                         <div class="box_flex f_content">
                                             <span id="coding_num"></span>
@@ -201,26 +231,6 @@
                         </div>
                     </div>
                 </li>
-                <li class="f_item">
-                    <div class="box">
-                        <div class="f_label">
-                            <span>物流商: </span>
-                        </div>
-                        <div class="box_flex f_content">
-                            <input  name="flow" style="width: 250px;"  />
-                        </div>
-                    </div>
-                </li>
-                <li class="f_item">
-                    <div class="box">
-                        <div class="f_label">
-                            <span>物流号码: </span>
-                        </div>
-                        <div class="box_flex f_content">
-                            <input  name="flow_number" style="width: 250px;"  />
-                        </div>
-                    </div>
-                </li>
                 <li class="f_item">
                     <div class="box">
                         <div class="f_label">
@@ -231,19 +241,16 @@
                         </div>
                     </div>
                 </li>
-                <!--<li class="f_item">
+                <li class="f_item">
                     <div class="box">
                         <div class="f_label">
-                            <span>状态: </span>
+                            <span>验证码: </span>
                         </div>
                         <div class="box_flex f_content">
-                            <input id="setStatus_add" name="status" style="width: 250px;"  />
-
+                            <input  name="coding_num" type="text" style="width: 250px;"  />
                         </div>
                     </div>
-                </li>-->
-
-
+                </li>
 
             </ul>
 
@@ -304,6 +311,8 @@
   var jq_action_info = $('#action_info');
   var jq_acc = $('#acc_container');
   $('#expire_time1').datetimebox({});
+  $('#server_start_time').datetimebox({});
+  $('#server_end_time').datetimebox({});
   var jq_edit_extra_dialog = $('#edit_extra_dialog');
   $('body').on('click','.del_extra',function(){
     $(this).parent('div').remove();
@@ -450,7 +459,7 @@
         {field:'id', title:'id', hidden:true},
         {field:'gift_name', title:'礼包名称', },
         {field:'coupon_coding', title:'礼券编号'},
-        {field:'coding_num', title:'手工编号', width:40,sortable:false},
+        {field:'coding_num', title:'验证码', width:40,sortable:false},
         {field:'pwd', title:'提货密码'},
         {field:'name', title:'姓名',width:40 },
         {field:'mobile', title:'手机号', width:40,sortable:false},
@@ -474,6 +483,9 @@
         $('#id_str').html(row.id);
         $('#coding_num').html(row.coding_num);
         $('#coupon_coding').html(row.coupon_coding);
+        $('#gift_type').html(row.gift_type);
+        $('#gift_name').html(row.gift_name);
+        $('#jr_time').html(row.time_str);
         $('#edit_name').val(data.name);
         $('#edit_mobile').val(data.mobile);
         $('#edit_address').val(data.address);
@@ -637,7 +649,7 @@
   }
   function export_order() {
     let start_time = $('#server_start_time').datebox('getValue');
-    let end_time = $('#expire_time').datebox('getValue');
+    let end_time = $('#server_start_time').datebox('getValue');
     console.log(start_time);
     if (!start_time && !end_time) {
       alert('请选择时间');