Browse Source

Merge branch 'master' of 121.43.114.153:/home/git/repositories/mshop

# Conflicts:
#	src/lib/api.js
huanggang 7 years ago
parent
commit
fb82586296

File diff suppressed because it is too large
+ 1 - 1
dist/index.html


File diff suppressed because it is too large
+ 2 - 0
dist/mshop/js/app.18377e3b2a489a645a57.js


File diff suppressed because it is too large
+ 1 - 0
dist/mshop/js/app.18377e3b2a489a645a57.js.map


File diff suppressed because it is too large
+ 0 - 2
dist/mshop/js/app.1e582410089d6e621692.js


File diff suppressed because it is too large
+ 0 - 1
dist/mshop/js/app.1e582410089d6e621692.js.map


File diff suppressed because it is too large
+ 2 - 2
dist/mshop/js/manifest.c21d08a840c0db92e470.js


File diff suppressed because it is too large
+ 1 - 1
dist/mshop/js/manifest.c21d08a840c0db92e470.js.map


+ 0 - 1
src/lib/api.js

@@ -1,5 +1,4 @@
 let envHost = process.env.API_ROOT;
 let envHost = process.env.API_ROOT;
-
 class Api {
 class Api {
 
 
     static host() {
     static host() {

+ 3 - 1
src/wechat/WechatShare.js

@@ -11,7 +11,9 @@ class WechatShare
     {
     {
         let sign_url = window.location.href + "#";
         let sign_url = window.location.href + "#";
         sign_url = encodeURIComponent(sign_url.substring(0, sign_url.indexOf('#')));
         sign_url = encodeURIComponent(sign_url.substring(0, sign_url.indexOf('#')));
-        let url = "http://a.lrlz.com/mobile/index.php?act=mshop&op=signurl&client_type=ajax&sign_url="+sign_url+"&callback=";
+        var host = window.location.protocol + '//' + window.location.host;
+        let url = host + "/mobile/index.php?act=mshop&op=signurl&client_type=ajax&sign_url="+sign_url+"&callback=";
+
         let pThis = this;
         let pThis = this;
         this.getJSONP(url, function (res)
         this.getJSONP(url, function (res)
         {
         {