Merge branch 'master' of gitee.com:yiguanjia/php

www/protected/controllers/JRecordController.php

@@ -12,7 +12,22 @@ class JRecordController extends AdminController
     public function actionIndex()
     {
         $status = CommonFn::getComboboxData(JRecord::$status_options, 100, true, 100);
-
+//        $tmp = Business::model()->findAll();
+//        foreach ($tmp as $k) {
+//            $k->delete();
+//        }
+//        $tmp = JRecord::model()->findAll();
+//        foreach ($tmp as $k) {
+//            $k->delete();
+//        }
+//        $tmp = JCoupon::model()->findAll();
+//        foreach ($tmp as $k) {
+//            $k->delete();
+//        }
+//        $tmp = Gift::model()->findAll();
+//        foreach ($tmp as $k) {
+//            $k->delete();
+//        }
 
         $this->render('index',array(
             'status' => $status
@@ -47,6 +62,7 @@ class JRecordController extends AdminController
         $address = Yii::app()->request->getParam('address','');
         $flow = Yii::app()->request->getParam('flow','');
         $flow_number = Yii::app()->request->getParam('flow_number','');
+        $flow_time = Yii::app()->request->getParam('flow_time','');
         $status = (int)Yii::app()->request->getParam('status',0);
 
         if (!$name ||!$mobile || !$address || !$flow||!$flow_number  ) {
@@ -65,6 +81,7 @@ class JRecordController extends AdminController
         $record->status = $status;
         $record->flow = $flow;
         $record->flow_number = $flow_number;
+        $record->flow_time = strtotime($flow_time);
         $record->save();
         CommonFn::requestAjax(true,'修改成功');exit;
     }

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

@@ -17,6 +17,7 @@ class JRecord extends MongoAr
     public $status;//0未发货 1已发货
     public $flow;//物流商
     public $flow_number;//物流单号
+    public $flow_time;//发货时间
     public $time;
 
 
@@ -60,6 +61,7 @@ class JRecord extends MongoAr
         $newRow['coupon_id'] = (string)$row['coupon_id'];
         $coupon = JCoupon::get(new MongoId($newRow['coupon_id']));
         $newRow['coupon_coding'] = $coupon->coupon_coding;
+        $newRow['coding_num'] = $coupon->coding_num;
         $gift = Gift::get(new MongoId((string)$coupon->gift_id));
         $newRow['pwd'] = $coupon->pwd;
         $newRow['gift_name'] = $gift->title;
@@ -74,6 +76,10 @@ class JRecord extends MongoAr
         $newRow['status'] = CommonFn::get_val_if_isset($row,'status','');
         $newRow['time'] = CommonFn::get_val_if_isset($row,'time','');
         $newRow['time_str'] = date('Y-m-d H:i:s',$newRow['time']);
+        $newRow['flow_time'] =  CommonFn::get_val_if_isset($row,'flow_time','');
+        if ($newRow['flow_time']) {
+            $newRow['flow_time_str'] = date('Y-m-d H:i:s',$newRow['flow_time']);
+        }
         $newRow['status_str'] = self::$status_options[$newRow['status']]['name'];
         if(APPLICATION=='admin'){
             $newRow['action_user'] = CommonFn::get_val_if_isset($row,'action_user',"");

www/protected/views/jCoupon/index.php

@@ -384,26 +384,7 @@
         $('#order_time_str_add').val(date.getTime()/1000);
       }
     });
-    var buttons = $.extend([], $.fn.datebox.defaults.buttons);
-    buttons[0].text = '确定';
-    buttons[0].handler=function(){
-      var vals = $('#server_start_time').datetimebox('spinner').spinner('getValue').split(':');
-      $('#server_start_time_str').val(  parseInt($('#server_start_time_str').val())-(parseInt($('#server_start_time_str').val())+8*3600)%86400 +vals[0]*3600+vals[1]*60);
-
-      var d=new Date(parseInt($('#server_start_time_str').val())*1000);
-
-      $('#server_start_time').datetimebox('setText',formatDate(d));
-      $('#server_start_time').datetimebox('hidePanel');
-    };
 
-    $('#server_start_time').datetimebox({
-      required: false,
-      showSeconds:false,
-      buttons:buttons,
-      onSelect: function(date){
-        $('#server_start_time_str').val(date.getTime()/1000);
-      }
-    });
     var buttons1 = $.extend([], $.fn.datebox.defaults.buttons);
     buttons1[0].text = '确定';
     buttons1[0].handler=function(){

www/protected/views/jRecord/index.php

@@ -105,7 +105,27 @@
                                             <span>提货密码: </span>
                                         </div>
                                         <div class="box_flex f_content">
-                                            <input id="edit_pwd" name="pwd" type="password" style="width: 250px;" readonly  />
+                                            <input id="edit_pwd" name="pwd" type="text" 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">
+                                            <span id="coupon_coding"></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>
                                         </div>
                                     </div>
                                 </li>
@@ -120,6 +140,17 @@
                                         </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="expire_time1" type="text" name="flow_time">
+                                            <input type="hidden" id="expire_time_str" name="flow_time_str">
+                                        </div>
+                                    </div>
+                                </li>
 
                             </ul>
                         </form>
@@ -196,7 +227,7 @@
                             <span>提货密码: </span>
                         </div>
                         <div class="box_flex f_content">
-                            <input  name="pwd" type="password" style="width: 250px;"  />
+                            <input  name="pwd" type="text" style="width: 250px;"  />
                         </div>
                     </div>
                 </li>
@@ -272,8 +303,7 @@
   var jq_set_precedence = $('#set_precedence');
   var jq_action_info = $('#action_info');
   var jq_acc = $('#acc_container');
-
-
+  $('#expire_time1').datetimebox({});
   var jq_edit_extra_dialog = $('#edit_extra_dialog');
   $('body').on('click','.del_extra',function(){
     $(this).parent('div').remove();
@@ -301,6 +331,7 @@
     });
 
 
+
     jq_setStatus.combobox({
       editable: false,
       data: status_data,
@@ -328,89 +359,6 @@
         search_content();
       }
     });
-    jq_edit_extra_dialog.dialog({
-      title: '添加时间段',
-      width: 440,
-      height: 160,
-      closed: true,
-      modal: true,
-      buttons:[{
-        text: '添加',
-        iconCls: 'icon-add',
-        handler: function(){
-          var extras = new Array();
-          if($('#add_extra').val()){
-            extras = JSON.parse($('#add_extra').val());
-          }
-
-          var extra = {};
-          extra.type = $('#edit_extra_type').val();
-          extra.price = $('#edit_extra_price').val();
-          if(!extra.type || !extra.price){
-            $.messager.show({
-              title: '提示',
-              msg: '填错啦',
-              timeout: 3500,
-              showType: 'slide'
-            });
-            //jq_edit_coverage_dialog.dialog('close');
-          }else{
-            extras.push(extra);
-            $('#add_extra').val(JSON.stringify(extras));
-
-            $('#extra_add_info').html($('#extra_add_info').html()+parse_extra_item(extra,false,extras.length));
-            jq_edit_extra_dialog.dialog('close');
-          }
-        }
-      },{
-        text: '取消',
-        iconCls: 'icon-cancel',
-        handler: function(){
-          jq_edit_extra_dialog.dialog('close');
-        }
-      }],
-      onOpen:function(){
-        $('#edit_extra_type').val('');
-        $('#edit_extra_price').val('');
-      }
-    });
-
-    $('#server_start_time').datetimebox({
-      required: false,
-      showSeconds:false,
-      //buttons:buttons_add,
-      onSelect: function(date){
-        var currentDate = new Date();
-        $('#order_time_str_add').val(date.getTime()/1000);
-      }
-    });
-    $('#expire_time').datetimebox({
-      required: false,
-      showSeconds:false,
-      //buttons:buttons_add,
-      onSelect: function(date){
-        var currentDate = new Date();
-        $('#order_time_str_add').val(date.getTime()/1000);
-      }
-    });
-
-
-
-
-
-
-
-    var buttons = $.extend([], $.fn.datebox.defaults.buttons);
-    buttons[0].text = '确定';
-
-
-
-
-
-
-
-
-
 
 
     var p_width = parseInt(w_width / 2);
@@ -501,10 +449,9 @@
       columns:[[
         {field:'id', title:'id', hidden:true},
         {field:'gift_name', title:'礼包名称', },
-        {field:'coupon_coding', title:'礼券编号',},
-        {field:'pwd', title:'提货密码', formatter: function(value, row){
-            return   '******';
-          }},
+        {field:'coupon_coding', title:'礼券编号'},
+        {field:'coding_num', title:'手工编号', width:40,sortable:false},
+        {field:'pwd', title:'提货密码'},
         {field:'name', title:'姓名',width:40 },
         {field:'mobile', title:'手机号', width:40,sortable:false},
         {field:'address', title:'地址', width:40,sortable:false},
@@ -525,12 +472,15 @@
 
         $('#id').val(row.id);
         $('#id_str').html(row.id);
+        $('#coding_num').html(row.coding_num);
+        $('#coupon_coding').html(row.coupon_coding);
         $('#edit_name').val(data.name);
         $('#edit_mobile').val(data.mobile);
         $('#edit_address').val(data.address);
         $('#edit_flow').val(data.flow);
         $('#edit_flow_number').val(data.flow_number);
         $('#edit_pwd').val(data.pwd);
+        $('#expire_time1').datetimebox('setValue', parse_time(data,'flow_time'));
         $('#edit_status').combobox('setValue', row.status);
 
 
@@ -545,6 +495,9 @@
         $('#edit_flow').val('');
         $('#edit_flow_number').val('');
         $('#edit_pwd').val('');
+        $('#expire_time1').datetimebox('setValue', '');
+        $('#coding_num').html('');
+        $('#coupon_coding').html('');
         $('#edit_status').combobox('setValue', 100);