Merge branch 'dev' of http://gogs.gisvg.com/YDM/caiping into dev

app/admin/controller/project/Cost.php

@@ -1581,7 +1581,7 @@ class Cost extends BaseController
             ['name', '=', '项目动态-财政局'],
             ['name', '=', '项目附件-财政局'],
             ['name', '=', '联系函-财政局'],
-            
+
         ];
         //where0r满足任意一个name值都可以
         $list = Db::name('AdminRule')->whereOr($where)->field('id,name')->select()->toArray();

app/wechat/controller/Officialaccount.php

@@ -313,7 +313,7 @@ class Officialaccount{
 
         $buttons = [
             [
-                "name"       => "系统登录",
+                "name"       => "系统功能",
                 "sub_button" => [
                     [
                         "type" => "view",
@@ -321,6 +321,12 @@ class Officialaccount{
                         // "url"  => "https://open.weixin.qq.com//mobile/index/main",
                         "url"  => $this->url."mobile/Login/Login",
                     ],
+                    [
+                        "type" => "view",
+                        "name" => "项目跟踪",
+                        // "url"  => "https://open.weixin.qq.com//mobile/index/main",
+                        "url"  => $this->url."mobile/temporary/kan_list",
+                    ],
                 ],
 
             ],