Merge branch 'bugfix/1月5生产bug' of http://git.gicdev.com/integralMall/integral-mall into dev

f5cc90b2 · chenyu · ee409036 · dd603754 · f5cc90b2 · f5cc90b2
Commit f5cc90b2 authored Jan 05, 2022 by chenyu
5 changed files
--- a/dist/index.html
+++ b/dist/index.html
+<<<<<<< HEAD
 <!doctype html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="stylesheet" href="./static/css/iconfont.css"><link rel="stylesheet" href="./static/css/common.css"><link rel="shortcut icon" type="image/x-icon" href="./static/img/favicon.ico"><title>积分商城</title><script defer="defer" src="/integral-mall/js/main.0a469ed03caa298a9c81.js"></script><link href="/integral-mall/css/main.52c4deb15efb4d4ae020.css" rel="stylesheet"></head><body><div id="app"></div><script>(function() {
+=======
+<!doctype html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="stylesheet" href="./static/css/iconfont.css"><link rel="stylesheet" href="./static/css/common.css"><link rel="shortcut icon" type="image/x-icon" href="./static/img/favicon.ico"><title>积分商城</title><script defer="defer" src="/integral-mall/js/main.78a75912449ccae3cef5.js"></script><link href="/integral-mall/css/main.52c4deb15efb4d4ae020.css" rel="stylesheet"></head><body><div id="app"></div><script>(function() {
+>>>>>>> dd603754dd1f450f87e576cbd180937eb972647e
      var src = '/component/static/import-component.js?timestrap=' + new Date().getTime();
      var host = window.location.host;
      host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;

--- a/dist/js/main.0a469ed03caa298a9c81.js
+++ b/dist/js/main.0a469ed03caa298a9c81.js
--- a/dist/js/main.78a75912449ccae3cef5.js
+++ b/dist/js/main.78a75912449ccae3cef5.js
--- a/dist/js/main.78a75912449ccae3cef5.js.LICENSE.txt
+++ b/dist/js/main.78a75912449ccae3cef5.js.LICENSE.txt
+/*!
+ * @overview es6-promise - a tiny implementation of Promises/A+.
+ * @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald)
+ * @license   Licensed under MIT license
+ *            See https://raw.githubusercontent.com/stefanpenner/es6-promise/master/LICENSE
+ * @version   v4.2.6+9869a4bc
+ */
+
+/*!
+ * clipboard.js v2.0.1
+ * https://zenorocha.github.io/clipboard.js
+ * 
+ * Licensed MIT © Zeno Rocha
+ */
+
+/*!
+ * vue-treeselect v0.0.35 | (c) 2017-2018 Riophae Lee
+ * Released under the MIT License.
+ * https://vue-treeselect.js.org/
+ */
+
+/**!
+ * Sortable 1.10.2
+ * @author	RubaXa   <trash@rubaxa.org>
+ * @author	owenm    <owen23355@gmail.com>
+ * @license MIT
+ */
--- a/src/views/order/couponExchange.vue
+++ b/src/views/order/couponExchange.vue
@@ -327,7 +327,7 @@ export default {
      orderStatus: '-1',
      dateValue: [new Date() - 90 * 24 * 60 * 60 * 1000, new Date().valueOf()],
      // 导出数据控件
-      projectName: 'integral-mall', // 当前项目名
+      projectName: 'gic-web', // 当前项目名
      projectName2: '', // 当前项目名,跳转企业管理下的报表中心需要
      dialogVisible: false,
      excelUrl: '/api-integral-mall/download-exchange-list-execl', // 下载数据的地址