From e48580604c0f157783ff0b2e007179b064b85923 Mon Sep 17 00:00:00 2001
From: DCloud_LXH <283700113@qq.com>
Date: Sat, 28 May 2022 14:10:03 +0800
Subject: [PATCH] chore(mp): hostName

---
 .../src/api/protocols/enhanceSystemInfo.ts    |  4 +-
 packages/uni-mp-weixin/dist/uni.api.esm.js    |  7 +--
 packages/uni-mp-weixin/dist/uni.compiler.js   | 50 +++++++++----------
 3 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/packages/uni-mp-core/src/api/protocols/enhanceSystemInfo.ts b/packages/uni-mp-core/src/api/protocols/enhanceSystemInfo.ts
index 44dbc0b15..d864a9541 100644
--- a/packages/uni-mp-core/src/api/protocols/enhanceSystemInfo.ts
+++ b/packages/uni-mp-core/src/api/protocols/enhanceSystemInfo.ts
@@ -91,7 +91,9 @@ export function populateParameters(
   let deviceBrand = getDeviceBrand(brand, model, isQuickApp)
 
   // hostName
-  let _hostName = hostName || __PLATFORM__.split('-')[1] // mp-jd
+  const _platform =
+    __PLATFORM__ === 'mp-weixin' ? 'WeChat' : __PLATFORM__.split('-')[1]
+  let _hostName = hostName || _platform // mp-jd
   if (__PLATFORM__ === 'mp-weixin') {
     if (environment) {
       _hostName = environment
diff --git a/packages/uni-mp-weixin/dist/uni.api.esm.js b/packages/uni-mp-weixin/dist/uni.api.esm.js
index 0f29a5a02..0fbe5e996 100644
--- a/packages/uni-mp-weixin/dist/uni.api.esm.js
+++ b/packages/uni-mp-weixin/dist/uni.api.esm.js
@@ -1,8 +1,8 @@
 import { isArray, hasOwn, isString, isPlainObject, isObject, capitalize, toRawType, makeMap, isFunction, isPromise, remove, extend } from '@vue/shared';
 import { Emitter, onCreateVueApp, invokeCreateVueAppHook } from '@dcloudio/uni-shared';
 
-function getBaseSystemInfo() {
-  return wx.getSystemInfoSync()
+function getBaseSystemInfo() {
+  return wx.getSystemInfoSync()
 }
 
 function validateProtocolFail(name, msg) {
@@ -875,7 +875,8 @@ function populateParameters(fromRes, toRes) {
     // deviceModel
     let deviceBrand = getDeviceBrand(brand, model, isQuickApp);
     // hostName
-    let _hostName = hostName || "mp-weixin".split('-')[1]; // mp-jd
+    const _platform = 'WeChat' ;
+    let _hostName = hostName || _platform; // mp-jd
     {
         if (environment) {
             _hostName = environment;
diff --git a/packages/uni-mp-weixin/dist/uni.compiler.js b/packages/uni-mp-weixin/dist/uni.compiler.js
index 05148b824..b2c39317d 100644
--- a/packages/uni-mp-weixin/dist/uni.compiler.js
+++ b/packages/uni-mp-weixin/dist/uni.compiler.js
@@ -10,29 +10,29 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var initMiniProgramPlugin__default = /*#__PURE__*/_interopDefaultLegacy(initMiniProgramPlugin);
 var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
 
-var uniad_app_json = function (appJson) {
-  if (!appJson.plugins) {
-    appJson.plugins = {};
-  }
-  if (!appJson.plugins['uni-ad']) {
-    appJson.plugins['uni-ad'] = {
-      version: '1.0.3',
-      provider: 'wx999bf02c8e05dfc9',
-    };
-  }
-  if (!appJson.plugins['coral-adv']) {
-    appJson.plugins['coral-adv'] = {
-      version: '1.0.7',
-      provider: 'wx0e203209e27b1e66',
-    };
-  }
-
-  if (!appJson.usingComponents) {
-    appJson.usingComponents = {};
-  }
-  if (!appJson.usingComponents['uniad-plugin']) {
-    appJson.usingComponents['uniad-plugin'] = 'plugin://uni-ad/ad';
-  }
+var uniad_app_json = function (appJson) {
+  if (!appJson.plugins) {
+    appJson.plugins = {};
+  }
+  if (!appJson.plugins['uni-ad']) {
+    appJson.plugins['uni-ad'] = {
+      version: '1.0.3',
+      provider: 'wx999bf02c8e05dfc9',
+    };
+  }
+  if (!appJson.plugins['coral-adv']) {
+    appJson.plugins['coral-adv'] = {
+      version: '1.0.7',
+      provider: 'wx0e203209e27b1e66',
+    };
+  }
+
+  if (!appJson.usingComponents) {
+    appJson.usingComponents = {};
+  }
+  if (!appJson.usingComponents['uniad-plugin']) {
+    appJson.usingComponents['uniad-plugin'] = 'plugin://uni-ad/ad';
+  }
 };
 
 var uniadAppJson = uniad_app_json;
@@ -207,8 +207,8 @@ const options = {
                 if (filename) {
                     return `<wxs src="${filename}.wxs" module="${filter.name}"/>`;
                 }
-                return `<wxs module="${filter.name}">
-${filter.code}
+                return `<wxs module="${filter.name}">
+${filter.code}
 </wxs>`;
             },
         }, extname: '.wxml', compilerOptions }),
-- 
GitLab