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

public/COMPANY_LIST/BOXLUNCH/auth.php

@@ -6,7 +6,11 @@ return [
     
     'JSMS_appKey'=>'5567f6d409efe098392ca27b',//极光短信appKey
     'JSMS_masterSecret'=>'05aa76b3b4be0fb06cbb9c4a',//极光短信secret
-    
+
+    //微信JS
+    'Wechat_js_appId'=>'wx08a4db6a54f73c6f',
+    'Wechat_js_appsecret'=>'8e3a6165ce46e22ea2bb278e0092e71f',
+
     //验证参数
     'signKey'=>'233E2696D14DBM44257C08512CE51EC7',
 ];