作者 李洪娟
提交者 刘朕

合并分支 'lihong' 到 'master'

ceshi

查看合并请求 !1iuzhen
... ... @@ -77,16 +77,16 @@ class LogisticsController extends AdminBaseController
Db::startTrans();
foreach ($array as $k=>$v) {
// if(!$this->logistics_model->check($v[1])) {
$insert['mobile'] = $v[0];
$insert['send_time'] = $v[1];
$insert['version'] = $v[2];
$insert['express'] = $v[3];
$insert['is_del'] = $v[4];
$insert['mobile'] = $update['mobile'] = $v[0];
$insert['send_time'] = $update['send_time'] = $v[1];
$insert['version'] = $update['version'] = $v[2];
$insert['express'] = $update['express'] = $v[3];
$insert['is_del'] = $update['is_del'] = $v[4];
$info = $this->logistics_model->where(['express'=>$insert['express']])->find();
if($info) {
$insert['id'] = $info['id'];
$insert['update_time'] = time();
if(!$this->logistics_model->editLogistics($insert)) {
$update['id'] = $info['id'];
$update['update_time'] = time();
if(!$this->logistics_model->editLogistics($update)) {
Db::rollback();
$this->error('数据导入中出错,请重试');
}
... ...
... ... @@ -3,6 +3,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
<include file="public@head_common"/>
<link rel="stylesheet" type="text/css" href="__TMPL__/public/mobile/css/register_login/login.css" />
<link rel="stylesheet" type="text/css" href="__TMPL__/public/mobile/css/augly.css" />
... ... @@ -45,7 +46,7 @@
<div class="login_img">
<img src="__TMPL__/public/mobile/images/login_pic1.png" class="img_detail" />
<div class="login_text">
<p>用户登录</p>
<p>用户登录2323</p>
<span>仅限天津及唐山地区用户</span>
</div>
</div>
... ... @@ -184,4 +185,4 @@
</script>
</body>
</html>
\ No newline at end of file
</html>
... ...