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

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

@@ -28,6 +28,7 @@ use app\data\service\payment\WechatPaymentService;
 use app\data\service\PaymentService;
 use app\data\service\UserAdminService;
 use app\data\service\UserUpgradeService;
+use app\data\service\UserVipPaymentService;
 use think\admin\Storage;
 use think\db\Query;
 use think\exception\HttpResponseException;
@@ -305,7 +306,7 @@ class Center extends Auth
                          }else{
                              switch ($data['difference_pay_type']){
                                  case 'wx':
-                                     $order =PaymentService::instance('M7712738901746185928')->create('oB4A641a1UxxruiYRJyCM42djTf8',$order_no,1,'开通vip','开通');
+                                     $order =UserVipPaymentService::instance('M7712738901746185928')->create('oB4A641a1UxxruiYRJyCM42djTf8',$order_no,1,'开通vip','开通');
                                      $retrun_data['order_no'] = $order_no;
                                      $retrun_data['pay_type'] = 'wx';
                                      $retrun_data['pay'] = $order;
@@ -654,6 +655,24 @@ class Center extends Auth
     }
 
     /**
+     * @Title("删除银行卡")
+     * @Method("post")
+     * @Header("api-name",type="string",require=1,default="",desc="访问类型")
+     * @Header("api-token",type="string",require=1,default="",desc="token")
+     * @Param("id",type="string",require=0,default="",desc="修改，则必传之前提交的ID")
+     */
+    public function delbank(){
+        $data = $this->_vali([
+            'id.require'=>'id必须',
+        ]);
+
+        if (DataUserBankCard::mk()->where('id',$data['id'])->update(['is_del'=>0,'update_at'=>date('Y-m-d H:i:s')])){
+            $this->success('删除成功');
+        }
+        $this->error('删除失败，请稍后重试');
+    }
+
+    /**
      * @Title("意见反馈列表")
      * @Method("post")
      * @Header("api-name",type="string",require=1,default="",desc="访问类型")

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

@@ -192,13 +192,13 @@ class ShipEngineMaintenance extends Auth
             ->where('offer_id',$this->uuid)
             ->field('id,price')
             ->select();
-        $list['imgs'] = array_filter(explode(',',DataUserRepairOffer::mk()->where('repair_id',$data['id'])
+        $imgs = array_filter(explode(',',DataUserRepairOffer::mk()->where('repair_id',$data['id'])
             ->where('offer_id',$this->uuid)
             ->where('price','>',0)
             ->order('id desc')
             ->limit(1)
             ->value('imgs')));
-        $this->success('成功',$list);
+        $this->success('成功',compact('list','imgs'));
     }