Merge branch 'master' of http://192.168.20.122:3000/root/qiyewechatApp

UI/src/pages/sellmanage/channelCode.js

@@ -1733,7 +1733,7 @@ editMessage = (data) => {
             let i = 0;
             window.setTimeout(function x() {
               if (i < dataarr.length) {
-                window.location.href = WXMpAPI + "/wx/qrcode/" + self.props.wxAppIdValue + "/download?id=" + dataarr[i];
+                window.location.href = WXMpAPI + "/wx/qrcode/" + self.props.wxAppIdValue + "/download?id=" + dataarr[i]+"&Sso-Token="+SsoToken;
                 i++;
                 setTimeout(x, 1000);
               }

UI/src/utils/config.js

@@ -1,51 +1,33 @@
 const APIV1 = '/api/v1'
-const APIV2 = '/api/v2' 
-const APIV3 = 'http://192.168.50.32:8004'
-const APIV4 = 'http://192.168.50.32:8005'
+const APIV2 = '/api/v2'
+const APIV3 = 'http://119.130.113.245:8004'
+const APIV4 = 'http://119.130.113.245:8005'
 
-const APIV3Auth = 'http://192.168.50.32:13001/oauth2'
-const WXAPIV5= 'http://192.168.50.32:13001/qiyewechat'
-const WXMpAPI= 'http://192.168.50.32:13001/mpwechat'
-const staticMpAPI = 'http://192.168.50.32:13001/mpwechat'
-const ymallAPI = 'http://localhost:8070'
-
-// const APIV3Auth = 'http://192.168.50.32:8031'
-// const WXAPIV5= 'http://localhost:7000'
-// const WXMpAPI= 'http://localhost:8081'
-// const staticMpAPI= 'http://localhost:8081'
+const APIV3Auth = 'http://mem.360lj.com:13000/oauth2'
+const WXAPIV5= 'http://mem.360lj.com:13000/qiyewechat'
+const WXMpAPI= 'http://mem.360lj.com:13000/mpwechat'
+const staticMpAPI = 'http://mem.360lj.com:13000/mpwechat'
 module.exports =  {
   name: '亮健营销平台',
   prefix: 'bird',
-  footerText: 'bird admin  ? 2018 360lj.com',
+  footerText: 'bird admin  © 2018 360lj.com',
   logo: '/logo.svg',
   iconFontCSS: '/iconfont.css',
   iconFontJS: '/iconfont.js',
-  CORS: ['http://localhost:8000',
-  'http://localhost:8070',
-  'http://localhost:7000',
-  'http://192.168.50.32:8031',
-  'http://192.168.50.32:8030',
-  'http://localhost:8030',
-  'http://192.168.50.32:13001',
-  'http://192.168.10.40:13002',
-  'http://localhost:13001',
-  'http://192.168.10.129:8081',
-  'http://192.168.10.40:8081',
-  'http://192.168.50.32:7000',
-  'http://192.168.10.129:7000',
-  'http://192.168.50.39:8081',
-  'http://192.168.10.68:8081',
-  'http://localhost:8081',
-  'http://192.168.50.32:8004',
-  'http://localhost:8005',
-  'http://192.168.50.32:8005',
-  'http://localhost:7000',  
-  'http://192.168.50.32:7000',
+  CORS: [
+    'http://mem.360lj.com:7111',
+    'http://119.130.113.245:8004',
+    'http://119.130.113.245:8005',
+    'http://119.130.113.245:7001',
+    'http://119.130.113.245:8030',
+    'http://mem.360lj.com:13000',
+    'http://mem.360lj.com:7000',
+    'http://mem.360lj.com:7001',
   ],
   //YQL: ['http://localhost:57251'],
   openPages: ['/login','/'],
   apiPrefix: '/api/v1',
-  webApiPrefix: APIV3,
+  webApiPrefix:APIV3,
   authApiPrefix: APIV3Auth,
   APIV1,
   APIV2,
@@ -55,7 +37,6 @@ module.exports =  {
   WXAPIV5,
   WXMpAPI,
   staticMpAPI,
-  ymallAPI,
   ClientId:'f3ed0d90-3fc8-4eba-b83c-a0cfe54c174d',
   ClientSecret:'78e238b4-c199-49ad-b619-69b6a78959d8',
   ApplicationKey:'wechatcp',
@@ -84,4 +65,5 @@ module.exports =  {
     // permissions:`${APIV3}/web/auth/permissions`
     permissions:`${APIV3Auth}/ums/oauth2/list/permission?types=2`,
   },
-}
+  APIV4, 
+}

UI/src/utils/config_prod.js

@@ -1,33 +1,51 @@
 const APIV1 = '/api/v1'
-const APIV2 = '/api/v2'
-const APIV3 = 'http://119.130.113.245:8004'
-const APIV4 = 'http://119.130.113.245:8005'
+const APIV2 = '/api/v2' 
+const APIV3 = 'http://192.168.50.32:8004'
+const APIV4 = 'http://192.168.50.32:8005'
 
-const APIV3Auth = 'http://mem.360lj.com:13000/oauth2'
-const WXAPIV5= 'http://mem.360lj.com:13000/qiyewechat'
-const WXMpAPI= 'http://mem.360lj.com:13000/mpwechat'
-const staticMpAPI = 'http://mem.360lj.com:13000/mpwechat'
+const APIV3Auth = 'http://192.168.50.32:13001/oauth2'
+const WXAPIV5= 'http://192.168.50.32:13001/qiyewechat'
+const WXMpAPI= 'http://192.168.50.32:13001/mpwechat'
+const staticMpAPI = 'http://192.168.50.32:13001/mpwechat'
+const ymallAPI = 'http://localhost:8070'
+
+// const APIV3Auth = 'http://192.168.50.32:8031'
+// const WXAPIV5= 'http://localhost:7000'
+// const WXMpAPI= 'http://localhost:8081'
+// const staticMpAPI= 'http://localhost:8081'
 module.exports =  {
   name: '亮健营销平台',
   prefix: 'bird',
-  footerText: 'bird admin  © 2018 360lj.com',
+  footerText: 'bird admin  ? 2018 360lj.com',
   logo: '/logo.svg',
   iconFontCSS: '/iconfont.css',
   iconFontJS: '/iconfont.js',
-  CORS: [
-    'http://mem.360lj.com:7111',
-    'http://119.130.113.245:8004',
-    'http://119.130.113.245:8005',
-    'http://119.130.113.245:7001',
-    'http://119.130.113.245:8030',
-    'http://mem.360lj.com:13000',
-    'http://mem.360lj.com:7000',
-    'http://mem.360lj.com:7001',
+  CORS: ['http://localhost:8000',
+  'http://localhost:8070',
+  'http://localhost:7000',
+  'http://192.168.50.32:8031',
+  'http://192.168.50.32:8030',
+  'http://localhost:8030',
+  'http://192.168.50.32:13001',
+  'http://192.168.10.40:13002',
+  'http://localhost:13001',
+  'http://192.168.10.129:8081',
+  'http://192.168.10.40:8081',
+  'http://192.168.50.32:7000',
+  'http://192.168.10.129:7000',
+  'http://192.168.50.39:8081',
+  'http://192.168.10.68:8081',
+  'http://localhost:8081',
+  'http://192.168.50.32:8004',
+  'http://localhost:8005',
+  'http://192.168.50.32:8005',
+  'http://localhost:7000',  
+  'http://192.168.50.32:7000',
   ],
   //YQL: ['http://localhost:57251'],
   openPages: ['/login','/'],
   apiPrefix: '/api/v1',
-  webApiPrefix:APIV3,
+  webApiPrefix: APIV3,
   authApiPrefix: APIV3Auth,
   APIV1,
   APIV2,
@@ -37,6 +55,7 @@ module.exports =  {
   WXAPIV5,
   WXMpAPI,
   staticMpAPI,
+  ymallAPI,
   ClientId:'f3ed0d90-3fc8-4eba-b83c-a0cfe54c174d',
   ClientSecret:'78e238b4-c199-49ad-b619-69b6a78959d8',
   ApplicationKey:'wechatcp',
@@ -65,5 +84,4 @@ module.exports =  {
     // permissions:`${APIV3}/web/auth/permissions`
     permissions:`${APIV3Auth}/ums/oauth2/list/permission?types=2`,
   },
-  APIV4, 
-}
+}