qj-common 4.1.40 → 4.1.42

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (29) hide show
  1. package/package.json +1 -1
  2. package/src/components/Upload/upload.vue +1 -1
  3. package/src/main.js +0 -1
  4. package/src/utils/getQueryString.js +1 -1
  5. package/src/utils/request.js +9 -9
  6. package/src/views/404.vue +1 -1
  7. package/src/views/layout/components/Navbar.vue +10 -10
  8. package/src/views/layout/theme/darkBlue/components/LeftNavbar(/345/261/225/347/244/272/345/205/250/351/203/250/350/217/234/345/215/225).vue +1 -1
  9. package/src/views/layout/theme/darkBlue/components/LeftNavbar.3.vue +1 -1
  10. package/src/views/layout/theme/darkBlue/components/LeftNavbar.vue +1 -1
  11. package/src/views/layout/theme/darkBlue/components/Navbar.vue +1 -1
  12. package/src/views/layout-default/components/LeftNavbar.vue +1 -1
  13. package/src/views/layout-default/theme/darkBlue/components/LeftNavbar.vue +1 -1
  14. package/src/views/layout-default/theme/darkBlue/components/Navbar.vue +1 -1
  15. package/src/views/pc/default/footer-modules/footerHDB.vue +6 -6
  16. package/src/views/pc/default/header-modules/headerA.vue +1 -1
  17. package/src/views/pc/default/header-modules/headerFLPT.vue +3 -3
  18. package/src/views/pc/default/header-modules/headerMh.vue +1 -1
  19. package/src/views/pc/default/header-modules/headerayd.vue +1 -1
  20. package/src/views/pc/default/header-modules/zgl.vue +2 -2
  21. package/src/views/pc/default/top-modules/DgTopShortcut/index.vue +1 -1
  22. package/src/views/pc/default/top-modules/topHDB.vue +11 -11
  23. package/src/views/pc/default/top-modules/topMh.vue +7 -3
  24. package/src/views/pc/default/top-modules/topSDX.vue +1 -1
  25. package/src/views/pc/default/top-modules/ymTop.vue +1 -1
  26. package/src/views/uploadDialog/index copy.vue +3 -3
  27. package/src/views/uploadDialog/index.vue +5 -5
  28. package/src/views/uploadDialog/indexOlay.vue +3 -3
  29. package/src/views/uploadDialog/indexPM.vue +3 -3
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "qj-common",
3
- "version": "4.1.40",
3
+ "version": "4.1.42",
4
4
  "description": "common files && template for qj-paas",
5
5
  "scripts": {
6
6
  "gulp": "gulp css"
package/src/components/Upload/upload.vue CHANGED
@@ -53,7 +53,7 @@ export default {
53
53
  };
54
54
  },
55
55
  mounted() {
56
- let hrefs = window.locationProxy.href, hosts = window.locationProxy.host;
56
+ let hrefs = window.location.href, hosts = window.location.host;
57
57
  if (hrefs && hosts) {
58
58
  let name = hrefs.split(hosts)[1] ? hrefs.split(hosts)[1].split('/')[1] : null;
59
59
  this.secDomainName = name && name !== 'paas' && process.env.NODE_ENV != 'development' ? process.env.API_ROOT + '/' + name : process.env.API_ROOT
package/src/main.js CHANGED
@@ -53,7 +53,6 @@ window.locationProxy = new Proxy(window.location, {
53
53
  const resultArr = a.match(reg);
54
54
  const path = resultArr[1];
55
55
  // eslint-disable-next-line turbo/no-undeclared-env-vars
56
- const app = process.env.APP_PATH;
57
56
  value = `/main${path}${b}`;
58
57
  window.history.pushState(null, '', value);
59
58
  } else {
package/src/utils/getQueryString.js CHANGED
@@ -1,5 +1,5 @@
1
1
  export function getQueryString(name){
2
2
  var reg = new RegExp( "(^|&)" + name + "=([^&]*)(&|$)" );
3
- var r = window.locationProxy.search.substr(1).match(reg);
3
+ var r = window.location.search.substr(1).match(reg);
4
4
  if (r!= null ) return unescape(r[2]); return null ;
5
5
  }
package/src/utils/request.js CHANGED
@@ -103,7 +103,7 @@ var loading = true,
103
103
  var ajaxCount = 0;
104
104
  let that = Vue.prototype;
105
105
 
106
- let hrefs = window.locationProxy.href, hosts = window.locationProxy.host;
106
+ let hrefs = window.location.href, hosts = window.location.host;
107
107
  var secDomainName='';
108
108
  if(window.__POWERED_BY_QIANKUN__) {
109
109
  secDomainName = process.env.API_ROOT
@@ -299,19 +299,19 @@ service.interceptors.response.use(
299
299
  window.sessionStorage.clear();
300
300
  window.localStorage.clear();
301
301
  let nJson = JSON.parse(res.data.dataObj);
302
- let nUrl = window.locationProxy.origin + window.locationProxy.pathname + window.locationProxy.hash.split('?')[0];
303
- if (window.locationProxy.hash.split('?')[1]) {
304
- sessionStorage.setItem('urlParams', JSON.stringify(window.locationProxy.hash.split('?')[1]));
305
- nUrl = nUrl + '?' + window.locationProxy.hash.split('?')[1];
302
+ let nUrl = window.location.origin + window.location.pathname + window.location.hash.split('?')[0];
303
+ if (window.location.hash.split('?')[1]) {
304
+ sessionStorage.setItem('urlParams', JSON.stringify(window.location.hash.split('?')[1]));
305
+ nUrl = nUrl + '?' + window.location.hash.split('?')[1];
306
306
  }
307
307
  if (process.env.NODE_ENV === 'development') {
308
308
  if(!window.qs){
309
- window.locationProxy.href = secDomainName + nJson.loginurl + '?url=' + nUrl;
309
+ window.location.href = secDomainName + nJson.loginurl + '?url=' + nUrl;
310
310
  }else{
311
311
  setLocalStorage('saas-token', window.qs['saas-token']);
312
312
  Cookies.set('saas-token-plat', window.qs['saas-token'])
313
313
  }
314
- // window.locationProxy.href = process.env.API_ROOT + nJson.loginurl
314
+ // window.location.href = process.env.API_ROOT + nJson.loginurl
315
315
  } else {
316
316
  // 如果检查到没有登录，则清除保存的登录cookie
317
317
  if(!window.qs){
@@ -325,9 +325,9 @@ service.interceptors.response.use(
325
325
  if(window.__POWERED_BY_QIANKUN__) {
326
326
  window.history.pushState(null, '', '/login');
327
327
  } else if (nUrl.indexOf('login') < 0 && !proappEnvLayout.proappEnvOpentype) {
328
- window.locationProxy.href =secDomainName + nJson.loginurl + '?url=' + nUrl;
328
+ window.location.href =secDomainName + nJson.loginurl + '?url=' + nUrl;
329
329
  } else {
330
- window.locationProxy.href =secDomainName + nJson.loginurl;
330
+ window.location.href =secDomainName + nJson.loginurl;
331
331
  }
332
332
  }else{
333
333
  setLocalStorage('saas-token', window.qs['saas-token']);
package/src/views/404.vue CHANGED
@@ -38,7 +38,7 @@ export default {
38
38
  location.href = location.origin;
39
39
  },
40
40
  reload() {
41
- window.locationProxy.reload();
41
+ window.location.reload();
42
42
  },
43
43
  },
44
44
  };
package/src/views/layout/components/Navbar.vue CHANGED
@@ -169,8 +169,8 @@ export default {
169
169
  this.proappRemark = this.proappEnvLayout.proappRemark.split('>');
170
170
  }
171
171
 
172
- console.log(window.locationProxy.href, 'window.locationProxy.href本地路由');
173
- if (window.locationProxy.href.indexOf('listDMkf') == -1) {
172
+ console.log(window.location.href, 'window.location.href本地路由');
173
+ if (window.location.href.indexOf('listDMkf') == -1) {
174
174
  if(this.proappEnvLayout.tenantCode === '2019071800001392'){ // tenantCode 判断
175
175
  let userId = sessionStorage.getItem('personalInfo') ? JSON.parse(sessionStorage.getItem('personalInfo')).userId : '';
176
176
  getUserserviceInfo({
@@ -370,19 +370,19 @@ export default {
370
370
  } else {
371
371
  path = '/paas/index/index.html';
372
372
  }
373
- console.log(path, window.locationProxy.origin, 'logout');
374
- if (window.locationProxy.origin) {
373
+ console.log(path, window.location.origin, 'logout');
374
+ if (window.location.origin) {
375
375
  //this.secDomainName
376
- if (this.secDomainName && this.secDomainName != 'null' && this.secDomainName != window.locationProxy.origin) {
377
- window.locationProxy.href = `${this.secDomainName}${path}`;
376
+ if (this.secDomainName && this.secDomainName != 'null' && this.secDomainName != window.location.origin) {
377
+ window.location.href = `${this.secDomainName}${path}`;
378
378
  } else {
379
- window.locationProxy.href = `${window.locationProxy.origin}${path}`;
379
+ window.location.href = `${window.location.origin}${path}`;
380
380
  }
381
381
  //无论url是什么，强制刷新页面，另外reload()有true和false参
382
- window.locationProxy.reload()
382
+ window.location.reload()
383
383
  } else {
384
- window.locationProxy.href = path;
385
- window.locationProxy.reload()
384
+ window.location.href = path;
385
+ window.location.reload()
386
386
  }
387
387
  // }
388
388
  });
package/src/views/layout/theme/darkBlue/components/LeftNavbar(/345/261/225/347/244/272/345/205/250/351/203/250/350/217/234/345/215/225).vue CHANGED
@@ -142,7 +142,7 @@ export default {
142
142
  url = item.menuAction;
143
143
  }
144
144
  });
145
- window.locationProxy.href = url;
145
+ window.location.href = url;
146
146
  console.log(key, keyPath);
147
147
  },
148
148
  handleOpen(key, keyPath) {
package/src/views/layout/theme/darkBlue/components/LeftNavbar.3.vue CHANGED
@@ -62,7 +62,7 @@ export default {
62
62
  url = item.menuAction;
63
63
  }
64
64
  });
65
- window.locationProxy.href = url;
65
+ window.location.href = url;
66
66
  console.log(key, keyPath);
67
67
  },
68
68
  handleOpen(key, keyPath) {
package/src/views/layout/theme/darkBlue/components/LeftNavbar.vue CHANGED
@@ -160,7 +160,7 @@ export default {
160
160
  url = item.menuAction;
161
161
  }
162
162
  });
163
- window.locationProxy.href = url;
163
+ window.location.href = url;
164
164
  console.log(key, keyPath);
165
165
  },
166
166
  handleOpen(key, keyPath) {
package/src/views/layout/theme/darkBlue/components/Navbar.vue CHANGED
@@ -45,7 +45,7 @@ export default {
45
45
  });
46
46
  },
47
47
  search() {
48
- window.locationProxy.href = `/paas/pc-mall#/searchResult?searchParam=${
48
+ window.location.href = `/paas/pc-mall#/searchResult?searchParam=${
49
49
  this.keywords
50
50
  }`;
51
51
  }
package/src/views/layout-default/components/LeftNavbar.vue CHANGED
@@ -56,7 +56,7 @@ export default {
56
56
  url = item.menuAction;
57
57
  }
58
58
  });
59
- window.locationProxy.href = url;
59
+ window.location.href = url;
60
60
  console.log(key, keyPath);
61
61
  },
62
62
  getAppInfo() {
package/src/views/layout-default/theme/darkBlue/components/LeftNavbar.vue CHANGED
@@ -159,7 +159,7 @@ export default {
159
159
  url = item.menuAction;
160
160
  }
161
161
  });
162
- window.locationProxy.href = url;
162
+ window.location.href = url;
163
163
  console.log(key, keyPath);
164
164
  },
165
165
  handleOpen(key, keyPath) {
package/src/views/layout-default/theme/darkBlue/components/Navbar.vue CHANGED
@@ -45,7 +45,7 @@ export default {
45
45
  });
46
46
  },
47
47
  search() {
48
- window.locationProxy.href = `/paas/pc-mall#/searchResult?searchParam=${
48
+ window.location.href = `/paas/pc-mall#/searchResult?searchParam=${
49
49
  this.keywords
50
50
  }`;
51
51
  }
package/src/views/pc/default/footer-modules/footerHDB.vue CHANGED
@@ -68,7 +68,7 @@ export default {
68
68
  flowClickFn("FOOT", "-", "积分商城");
69
69
  // this.isLogin();
70
70
  // //跳转积分商城
71
- // window.locationProxy.href = `/paas/pc-mall/index.html#/classificationHdb`;
71
+ // window.location.href = `/paas/pc-mall/index.html#/classificationHdb`;
72
72
  this.isLogin(`/paas/pc-mall/index.html#/classificationHdb`);
73
73
  },
74
74
  getPointsMall() {},
@@ -78,18 +78,18 @@ export default {
78
78
  if (personalInfoStr) {
79
79
  const personalInfoObj = JSON.parse(personalInfoStr);
80
80
  if (!personalInfoObj.userInfoCode) {
81
- window.locationProxy.href = `/paas/index/index.html#/loginPc`;
81
+ window.location.href = `/paas/index/index.html#/loginPc`;
82
82
  } else {
83
- window.locationProxy.href = url;
83
+ window.location.href = url;
84
84
  }
85
85
  } else {
86
- window.locationProxy.href = `/paas/index/index.html#/loginPc`;
86
+ window.location.href = `/paas/index/index.html#/loginPc`;
87
87
  }
88
88
  },
89
89
  toCommonQuestion() {
90
90
  flowClickFn("FOOT", "-", "常见问题");
91
91
  // 跳转常见问题
92
- window.locationProxy.href = `/paas/pc-mall/index.html#/commonQuestionHdb`;
92
+ window.location.href = `/paas/pc-mall/index.html#/commonQuestionHdb`;
93
93
  // this.$router.push({
94
94
  // path: '/commonQuestionHdb',
95
95
  // });
@@ -97,7 +97,7 @@ export default {
97
97
  toAboutUs() {
98
98
  flowClickFn("FOOT", "-", "关于我们");
99
99
  // 跳转关于我们
100
- window.locationProxy.href = `/paas/pc-mall/index.html#/aboutUs`;
100
+ window.location.href = `/paas/pc-mall/index.html#/aboutUs`;
101
101
  // this.$router.push({
102
102
  // path: '/aboutUs',
103
103
  // });
package/src/views/pc/default/header-modules/headerA.vue CHANGED
@@ -41,7 +41,7 @@ export default {
41
41
  this.tginfoKey = res.rows[0] && res.rows[0].tginfoKey ? res.rows[0].tginfoKey.split('/') : [];
42
42
  }
43
43
  });
44
- let href = window.locationProxy.href;
44
+ let href = window.location.href;
45
45
  if (href.indexOf('#/searchResult?searchParam') > 0) {
46
46
  this.searchVal = sessionStorage.getItem('searchVals');
47
47
  }
package/src/views/pc/default/header-modules/headerFLPT.vue CHANGED
@@ -45,7 +45,7 @@ export default {
45
45
  this.tginfoKey = res.rows[0] && res.rows[0].tginfoKey ? res.rows[0].tginfoKey.split('/') : [];
46
46
  }
47
47
  });
48
- let href = window.locationProxy.href;
48
+ let href = window.location.href;
49
49
  if (href.indexOf('#/searchResult?searchParam') > 0) {
50
50
  this.searchVal = sessionStorage.getItem('searchVals');
51
51
  }
@@ -53,7 +53,7 @@ export default {
53
53
  methods: {
54
54
  searchs(val) {
55
55
  sessionStorage.setItem('searchVals', val || '');
56
- window.locationProxy.href =
56
+ window.locationProxy.href=
57
57
  "/paas/welfare-cli-pc/index.html#/searchResult?searchParam=" + val;
58
58
  // this.$router.push({
59
59
  // path: "/searchResult",
@@ -63,7 +63,7 @@ export default {
63
63
  // });
64
64
  },
65
65
  goCart() {
66
- window.locationProxy.href =
66
+ window.locationProxy.href=
67
67
  "/paas/welfare-cli-pc/index.html#/car";
68
68
  // this.$router.push({
69
69
  // path: "/car"
package/src/views/pc/default/header-modules/headerMh.vue CHANGED
@@ -89,7 +89,7 @@
89
89
  }
90
90
  },
91
91
  searchs(item) {
92
- window.locationProxy = item.contlistUrl
92
+ window.location = item.contlistUrl
93
93
  },
94
94
  goHome() {
95
95
  location.href = `${this.orginHref}#/islandStore`;
package/src/views/pc/default/header-modules/headerayd.vue CHANGED
@@ -89,7 +89,7 @@
89
89
  }
90
90
  },
91
91
  searchs(item) {
92
- window.locationProxy = item.contlistUrl
92
+ window.location = item.contlistUrl
93
93
  },
94
94
  goHome() {
95
95
  location.href = `${this.orginHref}#/islandStore`;
package/src/views/pc/default/header-modules/zgl.vue CHANGED
@@ -196,7 +196,7 @@
196
196
  ];
197
197
  this.$set(this.classlist[3], "flag", true);
198
198
  }
199
- this.hrefs = window.locationProxy.href.indexOf('pc-mall');
199
+ this.hrefs = window.location.href.indexOf('pc-mall');
200
200
  },
201
201
  computed: {
202
202
  proappEnvLogo() {
@@ -245,7 +245,7 @@
245
245
  },
246
246
  getQueryVariable(variable) {
247
247
  // debugger
248
- var query = window.locationProxy.hash.substring(1).split("?") ? window.locationProxy.hash.substring(1).split("?")[1] : [];
248
+ var query = window.location.hash.substring(1).split("?") ? window.location.hash.substring(1).split("?")[1] : [];
249
249
  var vars = query ? query.split("&") : [];
250
250
  for(var i = 0; i < vars.length; i++) {
251
251
  var pair = vars[i].split("=");
package/src/views/pc/default/top-modules/DgTopShortcut/index.vue CHANGED
@@ -60,7 +60,7 @@ export default {
60
60
  };
61
61
  },
62
62
  created() {
63
- let hrefs = window.locationProxy.href, hosts = window.locationProxy.host;
63
+ let hrefs = window.location.href, hosts = window.location.host;
64
64
  if (hrefs && hosts) {
65
65
  let name = hrefs.split(hosts)[1] ? hrefs.split(hosts)[1].split('/')[1] : null;
66
66
  this.secDomainName = name && name !== 'paas' && process.env.NODE_ENV != 'development' ? process.env.API_ROOT + '/' + name : process.env.API_ROOT
package/src/views/pc/default/top-modules/topHDB.vue CHANGED
@@ -227,23 +227,23 @@ export default {
227
227
  this.userInfo = JSON.parse(window.sessionStorage.getItem('personalInfo'));
228
228
  if (this.userInfo.userinfoQuality == 'sales') {
229
229
  window.localStorage.setItem('flagSale', true);
230
- window.locationProxy.href = '/paas/pc-mall/index.html#/userIndexHDB';
230
+ window.location.href = '/paas/pc-mall/index.html#/userIndexHDB';
231
231
  if (window.localStorage.getItem('flagSale')) {
232
232
  this.flagSale = true;
233
233
  this.flagSale = JSON.parse(window.localStorage.getItem('flagSale'));
234
234
  }
235
235
  } else {
236
- window.locationProxy.href = '/paas/index/index.html#/choice';
236
+ window.location.href = '/paas/index/index.html#/choice';
237
237
  }
238
238
  } else {
239
- window.locationProxy.href = '/paas/index/index.html#/choice';
239
+ window.location.href = '/paas/index/index.html#/choice';
240
240
  }
241
241
  },
242
242
  toLogin() {
243
243
  // this.$router.push({
244
244
  // path: '/loginPc',
245
245
  // });
246
- window.locationProxy.href = '/paas/index/index.html#/loginPc';
246
+ window.location.href = '/paas/index/index.html#/loginPc';
247
247
  flowClickFn("NAV", "-", "登录");
248
248
  },
249
249
  outLogin() {
@@ -287,7 +287,7 @@ export default {
287
287
  },
288
288
  goToShop() {
289
289
  // window.open('/paas/pc-mall/index.html#/indeshdb', '_blank');
290
- window.locationProxy.href = `/paas/pc-mall/index.html#/indeshdb`;
290
+ window.location.href = `/paas/pc-mall/index.html#/indeshdb`;
291
291
  window.localStorage.setItem('flagSale', false);
292
292
  if (window.localStorage.getItem('flagSale')) {
293
293
  this.flagSale = JSON.parse(window.localStorage.getItem('flagSale'));
@@ -299,17 +299,17 @@ export default {
299
299
  if (personalInfoStr) {
300
300
  const personalInfoObj = JSON.parse(personalInfoStr);
301
301
  if (!personalInfoObj.userInfoCode) {
302
- window.locationProxy.href = `/paas/index/index.html#/loginPc`;
302
+ window.location.href = `/paas/index/index.html#/loginPc`;
303
303
  } else {
304
- window.locationProxy.href = url;
304
+ window.location.href = url;
305
305
  }
306
306
  } else {
307
- window.locationProxy.href = `/paas/index/index.html#/loginPc`;
307
+ window.location.href = `/paas/index/index.html#/loginPc`;
308
308
  }
309
309
  },
310
310
  toPromotionZone() {
311
311
  flowClickFn("NAV", "-", "促销专区");
312
- window.locationProxy.href = `/paas/pc-mall/index.html#/promotionIndexHDB`;
312
+ window.location.href = `/paas/pc-mall/index.html#/promotionIndexHDB`;
313
313
  },
314
314
  toIndex(data) {
315
315
  if (data && data === "logo") {
@@ -323,11 +323,11 @@ export default {
323
323
  } else {
324
324
  url = '/paas/pc-mall/index.html#/indeshdb';
325
325
  }
326
- window.locationProxy.href = url;
326
+ window.location.href = url;
327
327
  },
328
328
  toClassification() {
329
329
  flowClickFn("NAV", "-", "产品中心");
330
- window.locationProxy.href = `/paas/pc-mall/index.html#/productClassification`;
330
+ window.location.href = `/paas/pc-mall/index.html#/productClassification`;
331
331
  },
332
332
  },
333
333
  // computed: {
package/src/views/pc/default/top-modules/topMh.vue CHANGED
@@ -27,7 +27,8 @@
27
27
  @click="toUser()"/>
28
28
  <span v-if="$route.path === `/order`">个人中心</span>
29
29
  <span v-else @click="toIndex()">个人中心</span>
30
-
30
+ <span>&nbsp;&nbsp;</span>
31
+ <span @click="goToOrder()">我的订单</span>
31
32
  <!-- <span @click="toIndex()" :class="[ $route.path === `/islandStore` ? 'c-theme' : '' ]">个人中心</span> -->
32
33
  </block>
33
34
  <!-- <span @click="toHelp()" :class="[ $route.path === `/helpindex` ? 'c-theme' : '' ]">帮助中心</span> -->
@@ -91,13 +92,16 @@ export default {
91
92
  })
92
93
  },
93
94
  toUser() {
94
- location.href = '/paas/b2b-bus-pc-mh/index.html#/order'
95
+ location.href = '/paas/b2b-cli-pc-mh/index.html#/myAccount'
95
96
  },
96
97
  toIndex() {
97
- location.href = '/paas/b2b-bus-pc-mh/index.html#/order'
98
+ location.href = '/paas/b2b-cli-pc-mh/index.html#/myAccount'
98
99
  },
99
100
  toHelp() {
100
101
  location.href = '/paas/b2b-cli-pc-mh/index.html#/helpindex'
102
+ },
103
+ goToOrder(){
104
+ location.href = '/paas/b2b-cli-pc-mh/index.html#/order'
101
105
  }
102
106
  }
103
107
  }
package/src/views/pc/default/top-modules/topSDX.vue CHANGED
@@ -172,7 +172,7 @@ export default {
172
172
  });
173
173
  },
174
174
  goSupplier(){
175
- window.locationProxy.href="http://gys.icmold.com";
175
+ window.location.href="http://gys.icmold.com";
176
176
  },
177
177
  tocar() {
178
178
  location.href =
package/src/views/pc/default/top-modules/ymTop.vue CHANGED
@@ -176,7 +176,7 @@ export default {
176
176
  });
177
177
  },
178
178
  goSupplier(){
179
- window.locationProxy.href="http://gys.icmold.com";
179
+ window.location.href="http://gys.icmold.com";
180
180
  },
181
181
  tocar() {
182
182
  location.href =
package/src/views/uploadDialog/index copy.vue CHANGED
@@ -186,12 +186,12 @@ export default {
186
186
  !response.success
187
187
  ) {
188
188
  let nJson = JSON.parse(response.data.dataObj);
189
- let nUrl = window.locationProxy.href;
189
+ let nUrl = window.location.href;
190
190
  if (process.env.NODE_ENV === "development") {
191
- window.locationProxy.href =
191
+ window.location.href =
192
192
  process.env.API_ROOT + nJson.loginurl + "?url=" + nUrl;
193
193
  } else {
194
- window.locationProxy.href = nJson.loginurl + "?url=" + nUrl;
194
+ window.location.href = nJson.loginurl + "?url=" + nUrl;
195
195
  }
196
196
  return;
197
197
  }
package/src/views/uploadDialog/index.vue CHANGED
@@ -156,8 +156,8 @@
156
156
  },
157
157
 
158
158
  mounted() {
159
- let hrefs = window.locationProxy.href,
160
- hosts = window.locationProxy.host;
159
+ let hrefs = window.location.href,
160
+ hosts = window.location.host;
161
161
  if (hrefs && hosts) {
162
162
  let name = hrefs.split(hosts)[1] ? hrefs.split(hosts)[1].split('/')[1] : null;
163
163
  this.secDomainName = name && name !== 'paas' && process.env.NODE_ENV != 'development' ? process.env.API_ROOT +
@@ -308,11 +308,11 @@
308
308
  console.log(fileList, '999');
309
309
  if (response && typeof response == 'object' && 'success' in response && !response.success) {
310
310
  let nJson = JSON.parse(response.data.dataObj);
311
- let nUrl = window.locationProxy.href;
311
+ let nUrl = window.location.href;
312
312
  if (process.env.NODE_ENV === 'development') {
313
- window.locationProxy.href = this.secDomainName + nJson.loginurl + '?url=' + nUrl;
313
+ window.location.href = this.secDomainName + nJson.loginurl + '?url=' + nUrl;
314
314
  } else {
315
- window.locationProxy.href = this.secDomainName + nJson.loginurl + '?url=' + nUrl;
315
+ window.location.href = this.secDomainName + nJson.loginurl + '?url=' + nUrl;
316
316
  }
317
317
  return;
318
318
  }
package/src/views/uploadDialog/indexOlay.vue CHANGED
@@ -329,12 +329,12 @@ export default {
329
329
  !response.success
330
330
  ) {
331
331
  let nJson = JSON.parse(response.data.dataObj);
332
- let nUrl = window.locationProxy.href;
332
+ let nUrl = window.location.href;
333
333
  if (process.env.NODE_ENV === "development") {
334
- window.locationProxy.href =
334
+ window.location.href =
335
335
  process.env.API_ROOT + nJson.loginurl + "?url=" + nUrl;
336
336
  } else {
337
- window.locationProxy.href = nJson.loginurl + "?url=" + nUrl;
337
+ window.location.href = nJson.loginurl + "?url=" + nUrl;
338
338
  }
339
339
  return;
340
340
  }
package/src/views/uploadDialog/indexPM.vue CHANGED
@@ -306,12 +306,12 @@
306
306
  !response.success
307
307
  ) {
308
308
  let nJson = JSON.parse(response.data.dataObj);
309
- let nUrl = window.locationProxy.href;
309
+ let nUrl = window.location.href;
310
310
  if (process.env.NODE_ENV === "development") {
311
- window.locationProxy.href =
311
+ window.location.href =
312
312
  process.env.API_ROOT + nJson.loginurl + "?url=" + nUrl;
313
313
  } else {
314
- window.locationProxy.href = nJson.loginurl + "?url=" + nUrl;
314
+ window.location.href = nJson.loginurl + "?url=" + nUrl;
315
315
  }
316
316
  return;
317
317
  }