Merge remote-tracking branch 'origin/develop' into develop

app/admin/view/maintenance/audit.html

@@ -34,7 +34,7 @@
         </div>
 
         <div class="layui-form-item">
-            <label class="layui-form-label">身份证人面照片</label>
+            <label class="layui-form-label">人面照片</label>
             <div class="layui-input-block">
                 <div class="headimg" data-tips-image="{$row.id_card_img1|default=""}">
                     <img src='{$row.id_card_img1|default=""}' alt="">
@@ -42,7 +42,7 @@
             </div>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label">身份证国徽面照片</label>
+            <label class="layui-form-label">国徽面照片</label>
             <div class="layui-input-block">
                 <div class="headimg" data-tips-image="{$row.id_card_img2|default=""}">
                     <img src='{$row.id_card_img2|default=""}' alt="">
@@ -50,18 +50,21 @@
             </div>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label">营业执照图片</label>
+            <label class="layui-form-label">营业执照</label>
             <div class="layui-input-block">
                 <div class="headimg" data-tips-image="{$row.business_img|default=""}">
                 <img src='{$row.business_img|default=""}' alt="">
             </div>
         </div>
+
         <div class="layui-form-item">
-            <label class="layui-form-label">视频</label>
+            <label class="layui-form-label">营业执照</label>
             <div class="layui-input-block">
-                <a target="_blank" data-iframe='{$row.video|default=""}' data-title="查看媒体">查看</a>
+                <div class="headimg" data-tips-image="{$row.business_img|default=""}">
+                <img src='{$row.business_img|default=""}' alt="">
             </div>
         </div>
+
         <div class="layui-form-item">
             <label class="layui-form-label">文件</label>
             <div class="layui-input-block">

app/data/controller/api/auth/Center.php

@@ -1093,7 +1093,6 @@ class Center extends Auth
                     ->paginate();
                 break;
             case 2:
-                $this->uuid = 55;
                 $status = $data['status'];
                 $list = DataUserRepairOffer::mk()
                     ->hasWhere('repair',function (Query $query){
@@ -1125,6 +1124,7 @@ class Center extends Auth
                     ->order('id desc')
                     ->group('repair_id')
                     ->paginate();
+                $list = $list->toArray();
                 foreach ($list['data'] as &$v){
                     $in = DataUserRepairOffer::mk()
                         ->where('repair_id',$v['repair_id'])
@@ -1207,7 +1207,14 @@ class Center extends Auth
                             $query->field('id,nickname,headimg,phone');
                         }]);
                     }])
-                    ->findOrEmpty();
+                    ->find()->toArray();
+                $in = DataUserRepairOffer::mk()
+                    ->where('repair_id',$info['repair_id'])
+                    ->where('offer_id',$info['offer_id'])
+                    ->order('id desc')
+                    ->limit(1)
+                    ->field('id,price')->find();
+                $info['price'] = $in['price'];
                 break;
         }
         $this->success('成功',$info);