积分商城

f9d153f2 · zhangmeng · 7f91987e · f9d153f2 · f9d153f2 · 7f91987e
Commit f9d153f2 authored Oct 24, 2018 by zhangmeng
7 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.83e601e6706306d2b179b491198c1e92.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.468b1a0927c2f59e9881.js></script><script type=text/javascript src=/integral-mall/static/js/app.51dd4ddd738b3a3dbd3e.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.83e601e6706306d2b179b491198c1e92.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.468b1a0927c2f59e9881.js></script><script type=text/javascript src=/integral-mall/static/js/app.4eb568c3cf727e0cc117.js></script></body></html>
\ No newline at end of file
--- a/dist/static/js/app.4eb568c3cf727e0cc117.js
+++ b/dist/static/js/app.4eb568c3cf727e0cc117.js
--- a/dist/static/js/app.51dd4ddd738b3a3dbd3e.js
+++ b/dist/static/js/app.51dd4ddd738b3a3dbd3e.js
--- a/src/views/mall/common/card-temp.vue
+++ b/src/views/mall/common/card-temp.vue
@@ -60,7 +60,7 @@ export default {
        pageSize:20,
        requestProject:'gic-web',
        coupCardId:this.activeId,
-        cardType:2
+        cardType:'0 , 1'
      },
      total:0,
      tableList:[],

--- a/src/views/mall/coupon/info.js
+++ b/src/views/mall/coupon/info.js
--- a/src/views/mall/gift/info.js
+++ b/src/views/mall/gift/info.js
--- a/src/views/mall/goods/list.vue
+++ b/src/views/mall/goods/list.vue
@@ -191,6 +191,7 @@ export default {
          orderOptService({optType:2,integralMallProExchangeId:row.integralMallProExchangeId,cancelReason:value}).then(res => {
            if (res.errorCode === 0) {
              this.$tips({type:'success',message:'取消订单成功'});
+              this.getPageUndeliverList();
            } else {
              this.$tips({type:'error',message:'取消订单失败'});
            }
@@ -230,6 +231,7 @@ export default {
          orderOptService({optType:1,integralMallProExchangeId:row.integralMallProExchangeId,deliveryContent:value}).then(res => {
            if (res.errorCode === 0) {
              this.$tips({type:'success',message:'发货成功'});
+              this.getPageUndeliverList();
            } else {
              this.$tips({type:'error',message:'发货失败'});
            }