提交

26dacd64 · zhangmeng · 0832a1f3 · 26dacd64 · 0832a1f3 · 26dacd64
Commit 26dacd64 authored Oct 22, 2018 by zhangmeng
6 changed files
--- 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="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/integral-mall/static/css/app.b8dab552e8f82147adf86b0b7ffcbe61.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/integral-mall/static/js/manifest.003beacb9c9ae622c7f2.js></script><script type=text/javascript src=/integral-mall/static/js/vendor.8c76da9bb476bff35558.js></script><script type=text/javascript src=/integral-mall/static/js/app.05d8b952c8526f2b3e14.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/integral-mall/static/css/app.b8dab552e8f82147adf86b0b7ffcbe61.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/integral-mall/static/js/manifest.003beacb9c9ae622c7f2.js></script><script type=text/javascript src=/integral-mall/static/js/vendor.8c76da9bb476bff35558.js></script><script type=text/javascript src=/integral-mall/static/js/app.b2c7e560cf1951841f64.js></script></body></html>
\ No newline at end of file
--- a/dist/static/js/app.05d8b952c8526f2b3e14.js
+++ b/dist/static/js/app.05d8b952c8526f2b3e14.js
--- a/dist/static/js/app.b2c7e560cf1951841f64.js
+++ b/dist/static/js/app.b2c7e560cf1951841f64.js
--- a/src/views/mall/common/update-count.vue
+++ b/src/views/mall/common/update-count.vue
@@ -16,7 +16,6 @@
 <script>
 import { updateStockService, updateIntegralCostService,updateCashCostService } from '@/service/api/mallApi.js';

-
 export default {
    props: {
        model: {
@@ -38,6 +37,10 @@ export default {
        async submit() {
          // try {
            console.log(this.theType)
+            if (this.theType === 'cashCost' && this.model.inputValue > this.model.costValue) {
+              this.$tips({type:'warning',message:'现金费用不能大于礼品成本'});
+              return;
+            }
            let res = null;
            if (this.theType === 'virtualStock') { // 库存
              res = await updateStockService({proId:this.model.integralMallProId,stock:this.model.inputValue});

--- a/src/views/mall/coupon/list.vue
+++ b/src/views/mall/coupon/list.vue
@@ -22,7 +22,7 @@
    </el-table-column>
    <el-table-column label="现金费用" align="left" prop="cashCost" width="180">
      <template slot-scope="scope">
-          <updateCount :model="scope.row" theType="cashCost" :precision="2" typeName="元" @refresh="getPageCardsList"></updateCount>
+          <updateCount :model="scope.row"  theType="cashCost" :precision="2" typeName="元" @refresh="getPageCardsList"></updateCount>
      </template>
    </el-table-column>
    <el-table-column label="库存" align="left" prop="virtualStock" width="180">

--- a/src/views/mall/gift/info.js
+++ b/src/views/mall/gift/info.js
@@ -244,8 +244,8 @@ export default {

      console.log(this.form.cashCost,this.form.costValue)

-      if (this.form.costValue - this.form.cashCost < 0) {
-        this.$tips({type:'warning',message:'礼品成本要大于等于现金费用'});
+      if (this.form.costValue < this.form.cashCost) {
+        this.$tips({type:'warning',message:'现金费用不能大于礼品成本'});
        return;
      }
      if (!this.imageList.length) {