commit

app/admin/controller/card/CardProject.php

@@ -58,7 +58,7 @@ class CardProject extends AuthController
     {
         $f = [];
         $f[] = Form::hidden('card_id', $id);
-        $f[] = Form::select('c_id', '绑定内容', 0)->options(
+        $f[] = Form::selectMultiple('c_id', '绑定内容', [])->options(
             DiagnosisCate::field('id as value,name as label')->select()->toArray()
         )->filterable(true)->required();
         $f[] = Form::select('type', '选择类型', '')->options([
@@ -82,6 +82,7 @@ class CardProject extends AuthController
             'type',
             'number',
         ]);
+        $data['c_id'] = implode(',', $data['c_id']);
         if ($data['type'] == 2){
             if (empty($data['number'])) return Json::successful('选择限次,请输入次数');
         }
@@ -100,7 +101,7 @@ class CardProject extends AuthController
     {
         $data = model::find($id);
         $f = [];
-        $f[] = Form::select('c_id', '绑定内容', (string)$data['c_id'])->options(
+        $f[] = Form::selectMultiple('c_id', '绑定内容', explode(',', $data['c_id']))->options(
             DiagnosisCate::field('id as value,name as label')->select()->toArray()
         )->filterable(true)->required();
         $f[] = Form::select('type', '选择类型', (string)$data['type'])->options([

app/admin/model/card/CardProject.php

@@ -8,6 +8,7 @@
 
 namespace app\admin\model\card;
 
+use app\admin\model\diagnosis\DiagnosisCate;
 use app\admin\model\store\StoreProduct;
 use app\admin\model\system\SystemAdmin;
 use app\models\article\ArticleContent;
@@ -33,8 +34,7 @@ class CardProject extends BaseModel
     public static function list($where)
     {
         $model = self::alias('a')
-            ->field('a.*,b.name')
-            ->leftJoin('diagnosis_cate b', 'a.c_id = b.id')
+            ->field('a.*')
             ->order('a.id DESC');
 
         if ($where['id']) $model->where('a.card_id', $where['id']);
@@ -47,6 +47,7 @@ class CardProject extends BaseModel
         $list = $model->select()->toArray();
         foreach ($list as &$item)
         {
+            $item['name'] = implode(',', DiagnosisCate::where('id', 'in', $item['c_id'])->column('name'));
             if ($item['type'] == 1) $item['type'] = '限时';
             if ($item['type'] == 2) $item['type'] = '限次';
         }

app/admin/model/diagnosis/DiagnosisOrder.php

@@ -251,7 +251,8 @@ class DiagnosisOrder extends BaseModel
      */
     public static function card($card_id, $c_id)
     {
-        $equity = UserEquity::where('user_card_id', 'in', $card_id)->where('c_id', 'in', $c_id)->select();
+
+        $equity = UserEquity::where('user_card_id', 'in', $card_id)->where('c_id', 'like', '%'.$c_id.'%')->select();
         if ($equity){
             foreach ($equity as $item){
                 if ($item['type'] == 2){

app/admin/view/card/card_project/index.php

@@ -106,7 +106,7 @@
     layList.tool(function (event,data,obj) {
         switch (event) {
             case 'delete':
-                var url=layList.U({c:'water.water_cate',a:'delete',q:{id:data.id}});
+                var url=layList.U({c:'card.card_project',a:'delete',q:{id:data.id}});
                 var code = {title:"操作提示",text:"确定将该商品移入回收站吗？",type:'info',confirm:'是的，移入回收站'};
                 $eb.$swal('delete',function(){
                     $eb.axios.get(url).then(function(res){

app/api/controller/PublicController.php

@@ -330,4 +330,14 @@ class PublicController
         return app('json')->successful($list);
     }
 
+    /**
+     * 代办基础价格
+     * @return mixed
+     */
+    public function basics()
+    {
+        $data = ['price' => sys_config('basics_price')];
+        return app('json')->success($data);
+    }
+
 }

app/api/controller/diagnosis/DiagnosisOrderController.php

@@ -67,7 +67,7 @@ class DiagnosisOrderController
         foreach ($data['cate'] as $item){
             $da = date('w');
             if ($da == 0) $da = 7;
-            $equity = UserEquity::where('c_id', $item)->where('uid', $request->uid())->order('number DESC')->where('use', 1)->where('start_week', '<=', $da)->where('end_week', '>=', $da)->find();
+            $equity = UserEquity::where('c_id', 'like', '%'.$item.'%')->where('uid', $request->uid())->order('number DESC')->where('use', 1)->where('start_week', '<=', $da)->where('end_week', '>=', $da)->find();
             $cate = DiagnosisCate::where('id', $item)->find();
             if ($equity){
                 $price += 0;
@@ -78,6 +78,13 @@ class DiagnosisOrderController
             $ot_price += $cate['price'];
             $commission += $cate['reward'];
         }
+        if ($data['type'] == 2){
+            $ot_price = sys_config('basics_price');
+        }
+        if ($data['type'] == 2 and !$card_id){
+            $price += sys_config('basics_price');
+        }
+        $card_id = array_unique($card_id);
         if ($card_id){
             $card_id = implode(',', $card_id);
         }

route/api/route.php

@@ -267,6 +267,8 @@ Route::group(function () {
     Route::get('diagnosis/cate', 'diagnosis.DiagnosisCateController/type')->name('type');// 陪诊代办分类
     Route::get('diagnosis/service', 'diagnosis.DiagnosisCateController/service')->name('service'); // 陪诊服务
 
+    Route::get('basics', 'PublicController/basics')->name('basics'); // 代办基础价格
+
 
 })->middleware(\app\http\middleware\AllowOriginMiddleware::class)->middleware(\app\http\middleware\AuthTokenMiddleware::class, false);