Merge branch 'v4.7.0dev' into v5.0.0dev

# Conflicts:
#	crmeb/route/route.php

crmeb/route/route.php

@@ -14,7 +14,7 @@ Route::miss(function () {
     switch (strtolower($appName)) {
         case config('app.admin_prefix', 'admin'):
         case 'kefu':
-            return view(app()->getRootPath() . 'public' . DS . 'system.html');
+            return view(app()->getRootPath() . 'public' . DS . config('app.admin_prefix', 'admin') . DS . 'index.html');
         case 'home':
             if (request()->isMobile()) {
                 return redirect(app()->route->buildUrl('/'));

template/admin/vue.config.js

@@ -115,7 +115,7 @@ module.exports = {
   devServer: {
     port: 1617, // 端口
   },
-  publicPath: '/',
+  publicPath: '/admin',
   assetsDir: 'system_static',
-  indexPath: process.env.NODE_ENV === 'development' ? 'index.html' : 'system.html',
+  indexPath: 'index.html',
 };

template/uni-app/manifest.json

@@ -179,7 +179,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx3b82801238ca1b57",
+        "appid" : "wx1234567890",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,