合并分支 '1iuzhen' 到 'master'

1iuzhen



查看合并请求 !15

@@ -44,7 +44,7 @@ class LogisticsController extends AdminBaseController
         if(isset($param['keyword'])) {
             $where['name'] = ['like','%'.$param['keyword'].'%'];
         }
-        $list = $this->singleData($this->table,$where,2,['create_time'=>'DESC']);
+        $list = $this->singleData($this->table,$where,2,['create_time'=>'DESC','is_del'=>0]);
         $list->appends($param);
         $this->assign('list',$list->items());
         $this->assign('page',$list->render());
@@ -83,6 +83,9 @@ class LogisticsController extends AdminBaseController
             $insert['version'] = $update['version'] = $v[2];
             $insert['express'] = $update['express'] = $v[3];
             $insert['is_del'] = $update['is_del'] = $v[4];
+            if(empty($v[4])) {
+                $insert['is_del'] = $update['is_del'] = 0;
+            }
             $info = $this->logistics_model->where(['express'=>$insert['express']])->find();
             if($info) {
                 $update['id'] = $info['id'];

@@ -388,7 +388,7 @@ class OrderController extends HomeBaseController
         $where = [
             'mobile' => $keyword
         ];
-        $list = $logistics_model->where($where)->order(['send_time'=>'DESC'])->limit(3)->select();
+        $list = $logistics_model->where($where)->order(['send_time'=>'DESC','is_del'=>0])->limit(3)->select();
         $this->assign('list',$list);
         return $this->fetch();
 //        }

@@ -33,7 +33,7 @@
     <div class="swiper-container">
         <div class="swiper-wrapper">
             <volist name="slideList" id="vo">
-                <div class="swiper-slide"><div class="index_swiper"><img src="{:cmf_get_asset_url($vo['image'])}"/></div></div>
+                <div class="swiper-slide"><div class="index_swiper"><img src="{:cmf_get_asset_url($vo['image'])}" style="vertical-align:middle;"/><span style="display:inline-block; height:100%; vertical-align:middle;"></span></div></div>
             </volist>
         </div>
         <!-- Add Pagination -->

@@ -5,7 +5,7 @@
 
 .index_swiper{
 	width: 100%;
-	height: 9.5rem;
+	/*height: 9.5rem;*/
 }
 .swiper-pagination-bullet-active {
     opacity: 1;