Merge branch 'develop' of http://gits.hdlkeji.com:3000/xiegeng/ship-expert into develop

app/data/controller/api/Login.php

@@ -212,7 +212,7 @@ class Login extends Auth
     public function getloginset(){
         $info= [
             'service_agreement'=>htmlspecialchars_decode(sysconf('user_login.service_agreement')),
-            'protection_policy'=>htmlspecialchars_decode(sysconf('user_login.protection_policy')),
+            'protection_policy'=>htmlspecialchars_decode(sysconf('user.privacy_policy')),
         ];
         $this->success('成功',$info);
     }

app/data/controller/api/business/Purchase.php

@@ -492,6 +492,21 @@ class Purchase extends Controller
         $model->save();
         $this->success('操作成功');
     }
+
+    /**
+     *@Title("提醒完成")
+     * @Param ("user_id",desc="用户ID")
+     */
+    public function reminder(Request $request){
+        $data=$this->_vali([
+            'user_id.require'=>'user_id必须'
+        ],'get');
+
+        $alias = DataUser::mk()->where('id',$data['user_id'])->value('jgalias');
+        $content = '您报价的订单已匹配完成，请及时查看';
+        $alias ? jgpush($content,$alias) : '';
+        $this->success('操作成功');
+    }
     /**
      * @Title("匹配订单")
      * @Method("POST")