Merge branch 'dev' of http://git.gicdev.com/integralMall/integral-mall into dev

2b730e78 · crushh · 66397bf6 · 63d593e6 · 2b730e78 · 2b730e78
Commit 2b730e78 authored Jan 22, 2022 by crushh
6 changed files
--- a/dist/css/main.bd018ce0c6d153ffcceb.css
+++ b/dist/css/main.bd018ce0c6d153ffcceb.css
--- a/dist/index.html
+++ b/dist/index.html
-<!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.70e7660344fd859f14b3.js"></script><link href="/integral-mall/css/main.bd018ce0c6d153ffcceb.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.8c0b7f88b21b9d75a69b.js"></script><link href="/integral-mall/css/main.56d8a19e370a25608bd4.css" rel="stylesheet"></head><body><div id="app"></div><script>(function() {
      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.70e7660344fd859f14b3.js
+++ b/dist/js/main.70e7660344fd859f14b3.js
--- a/dist/js/main.8c0b7f88b21b9d75a69b.js
+++ b/dist/js/main.8c0b7f88b21b9d75a69b.js
--- a/dist/js/main.70e7660344fd859f14b3.js.LICENSE.txt
+++ b/dist/js/main.70e7660344fd859f14b3.js.LICENSE.txt
@@ -3,13 +3,13 @@
 * @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
+ * @version   v4.2.8+1e68dce6
 */

 /*!
- * clipboard.js v2.0.1
- * https://zenorocha.github.io/clipboard.js
- * 
+ * clipboard.js v2.0.8
+ * https://clipboardjs.com/
+ *
 * Licensed MIT © Zeno Rocha
 */


--- a/src/views/activities/flashSale/list.vue
+++ b/src/views/activities/flashSale/list.vue
@@ -100,7 +100,7 @@
            </el-table-column>
            <el-table-column label="上架/售卖/剩余库存">
              <template slot-scope="{ row }">
-                {{ row.activityTotalStock || 0 }}/{{ row|stock }}/{{ row.activityStock || 0 }}
+                {{ row.activityTotalSumStock || 0 }}/{{ row.activityTotalSalesStock }}/{{ row.activityTotalSurplusStock || 0 }}
              </template>
            </el-table-column>
            <el-table-column label="适用会员" :render-header="renderHeader">
@@ -180,13 +180,6 @@ import qs from 'qs';
 import request from '../../../service/request.js';
 import getInputVal from '../../../utils/common.js';
 export default {
-  filters: {
-    stock: ({ activityTotalStock, activityStock }) => {
-      activityTotalStock = activityTotalStock || 0;
-      activityStock = activityStock || 0;
-      return parseFloat((activityTotalStock - activityStock).toFixed(2));
-    },
-  },
  data () {
    return {
      query: {