作者 李洪娟

Merge branch 'master' of http://114.215.101.231:8099/liuzhen/qiaohu into lihong

... ... @@ -79,7 +79,7 @@ class LogisticsController extends AdminBaseController
foreach ($array as $k=>$v) {
// if(!$this->logistics_model->check($v[1])) {
$insert['mobile'] = $update['mobile'] = $v[0];
$insert['send_time'] = $update['send_time'] = gmdate('Y-m-d H:i:s', (41728.732916667 - $v[1]) * $t);
$insert['send_time'] = $update['send_time'] = date('Y-m-d H:i:s',\PHPExcel_Shared_Date::ExcelToPHP($v[1]));
$insert['version'] = $update['version'] = $v[2];
$insert['express'] = $update['express'] = $v[3];
$insert['is_del'] = $update['is_del'] = $v[4];
... ...
... ... @@ -47,10 +47,10 @@ class CommonController extends HomeBaseController
];
$code_model = new CodeModel();
$code_model->addCode($code_insert);
// $result = explode(',',$this->sendSMS($mobile,$code));
// if($result[0] != 1) {
// $this->error($result[0]);
// }
$result = explode(',',$this->sendSMS($mobile,$code));
if($result[0] != 1) {
$this->error($result[0]);
}
$this->success('发送成功');
}
}
... ...