测试打包

build/webpack.base.conf.js

@@ -55,7 +55,7 @@ module.exports = {
       {
         test: /\.js$/,
         loader: 'babel-loader',
-        include: [resolve('src'), resolve('test'), resolve('node_modules/webpack-dev-server/client')]
+        include: [resolve('src'), resolve('test'), resolve('/node_modules/semver')]
       },
       {
         test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,

build/webpack.prod.conf.js

@@ -36,12 +36,14 @@ const webpackConfig = merge(baseWebpackConfig, {
       'process.env': env
     }),
     new UglifyJsPlugin({
+      sourceMap: true,
       uglifyOptions: {
+        ecma: 8,
         compress: {
           warnings: false
         }
       },
-      sourceMap: config.build.productionSourceMap,
+      // sourceMap: config.build.productionSourceMap,
       parallel: true
     }),
     // extract css into its own file

package.json

@@ -116,4 +116,4 @@
     "last 2 versions",
     "not ie <= 8"
   ]
-}
+}

src/pages/eashier/service/service.vue

@@ -431,33 +431,6 @@
                         width="110"
                       ></el-table-column>
                       <!-- cardConsumeMoney cardOver -->
-                      <el-table-column
-                        align="center"
-                        prop="cardConsumeMoney"
-                        label="可用金额"
-                        width="70"
-                      ></el-table-column>
-                      <el-table-column
-                        align="center"
-                        prop="CardCurrentUse"
-                        show-overflow-tooltip
-                        label="当前行可用"
-                        width="110"
-                      >
-                      <template slot-scope="scope">
-                        {{ scope.row.CardCurrentUse?scope.row.CardCurrentUse:scope.row.cardOvers }}
-                      </template>
-                      </el-table-column>
-                        <el-table-column
-                        align="center"
-                        prop="cardSum"
-                        show-overflow-tooltip
-                        label="本单使用"
-                        width="110"
-                      >
-                      <template slot-scope="scope">
-                        {{ scope.row.cardSum?scope.row.cardSum:0 }}
-                      </template></el-table-column>
                       <!-- --- -->
                       <el-table-column align="center" label="类别" width="60">
                         <template slot-scope="scope">
@@ -539,6 +512,33 @@
                         label="赠送剩余"
                         width="70"
                       ></el-table-column>
+                      <el-table-column
+                        align="center"
+                        prop="cardConsumeMoney"
+                        label="可用金额"
+                        width="70"
+                      ></el-table-column>
+                      <el-table-column
+                        align="center"
+                        prop="CardCurrentUse"
+                        show-overflow-tooltip
+                        label="当前行可用"
+                        width="110"
+                      >
+                      <template slot-scope="scope">
+                        {{ scope.row.CardCurrentUse?scope.row.CardCurrentUse:scope.row.cardOvers }}
+                      </template>
+                      </el-table-column>
+                        <el-table-column
+                        align="center"
+                        prop="cardSum"
+                        show-overflow-tooltip
+                        label="本单使用"
+                        width="110"
+                      >
+                      <template slot-scope="scope">
+                        {{ scope.row.cardSum?scope.row.cardSum:0 }}
+                      </template></el-table-column>
                       <el-table-column
                         align="center"
                         prop="storeName"
@@ -1019,7 +1019,7 @@ export default {
             row.spendMoney = (appearPrice*balanceProportion).toFixed(2)*1
             row.giftSpendMoney = (appearPrice*giveProportion).toFixed(2)*1
             row.cardGiftOvers = row.cardGiftOvers - row.giftSpendMoney
-          }else{ //
+          }else{ 
             row.spendMoney = row.cardOvers
             row.giftSpendMoney = row.cardGiftOvers
             row.cardGiftOvers = 0