Merge branch 'master' of http://git.dashitech.com/seimin/zy-wechat

http/http.js

@@ -6,10 +6,12 @@ let path = "";
 let appIp = "";
 let dsHost = "";
 // #ifdef H5
-let domainName = location.host; //域名+端口
+let pathname = location.pathname.split('/')[1]; //二级目录
+pathname = pathname ? '/' + pathname : '';
 let protocolName = document.location.protocol; //http协议
 let wsName = protocolName === 'http:' ? 'ws' : 'wss'; //ws协议
-path = `${protocolName}//${domainName}/service`;
+export const baseUrl = `${location.origin}${pathname}`;
+path = `${baseUrl}/service`;
 dsHost = location.hostname;
 // #endif
 uni.setStorageSync('path', path);

manifest.json

@@ -71,7 +71,10 @@
         "title" : "",
         "domain" : "",
         "router" : {
+            // 正常打包目录
             "base" : "/app/"
+            // 宜昌打包目录
+            // "base" : "/dstechbh/app/"
         },
         "optimization" : {
             "treeShaking" : {

pages/bindUser/bindUser.vue

@@ -22,6 +22,7 @@
     get,
     post,
     SM,
+    baseUrl,
     webHandle
   } from "../../http/http.js";
   export default {
@@ -103,10 +104,10 @@
                 if (result.confirm) {
                   console.log('用户点击确定',_this.type);
                   if (_this.type) {
-                    location.assign(location.origin + location.pathname + '#/pages/homePage/homePage?type=' +
+                    location.assign(baseUrl + '/' + '#/pages/homePage/homePage?type=' +
                       _this.type);
                   } else {
-                    location.assign(location.origin + location.pathname + '#/pages/homePage/homePage');
+                    location.assign(baseUrl + '/' + '#/pages/homePage/homePage');
                   }
                 } else if (result.cancel) {
                   console.log('用户点击取消');