订阅消息跳转路径

application/api/controller/Demand.php

@@ -114,7 +114,6 @@ class Demand extends Api
             $btnNameFun = function ($opType, $item) {
                 $button = ['name' => '查看详情', 'theme' => 'light'];
                 if ($opType == 'all') {
-                    $button = ['name' => '参与投标', 'theme' => 'danger'];
                     if ($item->status == 1 && $item->isMyWin && $item->winBidding->bidding_status == 2 && $item->winBidding->process_status == 1) {
                         $button = ['name' => '确认接单', 'theme' => 'danger'];
                     } elseif ($item->status == 2 && $item->isMyWin && $item->winBidding->bidding_status == 2 && $item->winBidding->process_status == 2) {
@@ -123,6 +122,8 @@ class Demand extends Api
                         $button = ['name' => '工作完成', 'theme' => 'danger'];
                     } elseif ($item->is_bid) {
                         $button = ['name' => '已投标', 'theme' => 'light'];
+                    } elseif ($item->status == 1) {
+                        $button = ['name' => '参与投标', 'theme' => 'danger'];
                     }
                 } elseif ($opType == 'myQuote') {
                     if ($item->status == 1 && $item->isMyWin && $item->winBidding->bidding_status == 2 && $item->winBidding->process_status == 1) {

application/common/service/CategoryService.php

@@ -25,7 +25,7 @@ class CategoryService
 
     public static function getOptions($type = 'goods', $pid = 0)
     {
-        $list = self::$Model::where('type', $type)->order('weigh asc,id asc')->column('name', 'id');
+        $list = self::$Model::where('type', $type)->where('status', 'normal')->order('weigh asc,id asc')->column('name', 'id');
         return $list;
     }
 

application/common/service/OrderService.php

@@ -533,6 +533,9 @@ class OrderService
             ->select();
 
         foreach ($orderCountList as &$value) {
+            if ($value['tabType'] == OrderService::ORDER_STATUS_FINISHED) {
+                continue;
+            }
             foreach ($countList as $item) {
                 if ($item->order_status == $value['tabType']) {
                     $value['orderNum'] = $item->total;

application/common/service/SubscribeMessageService.php

@@ -22,7 +22,7 @@ class SubscribeMessageService
 
     const MSG_MAP = [
         self::MSG_TEMP_DEMAND_RECEIVE => [
-            'page' => self::PAGE_DEMAND_LIST, //我的报价需求列表
+            'page' => self::PAGE_DEMAND_LIST . '?opType=myQuote', //我的报价需求列表
             'remark' => '恭喜中标，请到我投标的需求确认接单！',
             /*
             工单号:JG202003310001
@@ -33,7 +33,7 @@ class SubscribeMessageService
             'fields' => ['character_string1', 'thing9', 'thing10', 'thing4']
         ],
         self::MSG_TEMP_DEMAND_MATCH_SUCCESS => [
-            'page' => self::PAGE_DEMAND_LIST, //发布的需求列表
+            'page' => self::PAGE_DEMAND_LIST . '?opType=my', //我发布的需求列表
             'remark' => '匹配工程师成功，请到需求详情查看沟通',
             /*
             匹配服务方:字节
@@ -43,7 +43,7 @@ class SubscribeMessageService
             'fields' => ['thing1', 'phrase2', 'thing5'],
         ],
         self::MSG_TEMP_DEMAND_SETTLE => [
-            'page' => self::PAGE_DEMAND_LIST, //我的报价需求列表
+            'page' => self::PAGE_DEMAND_LIST . '?opType=myQuote', //我报价的需求列表
             'remark' => '该工单已结算完成',
             /*
             订单编号：200912162851392635fdbf4149
@@ -53,7 +53,7 @@ class SubscribeMessageService
             'fields' => ['character_string4', 'amount1', 'thing2'],
         ],
         self::MSG_TEMP_WORK_START => [
-            'page' => self::PAGE_DEMAND_LIST, //我的报价需求列表
+            'page' => self::PAGE_DEMAND_LIST . '?opType=myQuote', //我报价的需求列表
             'remark' => '客户已支付预付款，可以开始工作',
             /*
             项目名称：比克大厦四期
@@ -63,7 +63,7 @@ class SubscribeMessageService
             'fields' => ['thing1', 'time2', 'thing4'],
         ],
         self::MSG_TEMP_WORK_ACCEPT => [
-            'page' => self::PAGE_DEMAND_LIST, //我的报价需求列表\
+            'page' => self::PAGE_DEMAND_LIST . '?opType=my', //我发布的需求列表
             'remark' => '需求开发工作已完成，请前去验收成果',
             /*
             工单编号：11021024307548
@@ -74,7 +74,7 @@ class SubscribeMessageService
             'fields' => ['character_string1', 'thing8', 'thing2', 'thing5'],
         ],
         self::MSG_TEMP_WORK_ACCEPT_RESULT => [
-            'page' => self::PAGE_DEMAND_LIST, //我的报价需求列表
+            'page' => self::PAGE_DEMAND_LIST . '?opType=myQuote', //我报价的需求列表
             'remark' => '客户已验收并支付尾款，可以发送源码',
             'remarkFail' => '客户验收未通过，请根据要求修改',
             /*
@@ -98,7 +98,7 @@ class SubscribeMessageService
             'fields' => ['thing1', 'character_string2', 'amount5', 'time4', 'thing3'],
         ],
         self::MSG_TEMP_CONTRACT_SIGN => [
-            'page' => self::PAGE_DEMAND_LIST, //发布的需求列表
+            'page' => self::PAGE_DEMAND_LIST . '?opType=my', //我发布的需求列表
             'remark' => '需求已确认，请前去完成合同签约',
             /*
             合同编号:2019年合字001号
@@ -110,7 +110,7 @@ class SubscribeMessageService
         ],
         self::MSG_TEMP_ORDER_SHIPPED => [
             'page' => self::PAGE_ORDER_LIST, //订单列表
-            'remark' => '发货成功，请到订单详情查看授权码',
+            'remark' => '发货成功，请到订单详情查看激活码',
             /*
             订单号:A12345678984
             商品名称:2019秋冬女装春装新款上衣连衣裙加绒蕾丝