bug

30ae1c49 · zhangmeng · 9c910114 · 30ae1c49 · 30ae1c49 · 9c910114
Commit 30ae1c49 authored Oct 25, 2018 by zhangmeng
6 changed files
--- a/dist.zip
+++ b/dist.zip
--- 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.1a875b355f7fb3a51b80b92040f6b7df.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.6aa504af45df73167746.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.1a875b355f7fb3a51b80b92040f6b7df.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.9d0049f43b425982d328.js></script></body></html>
\ No newline at end of file
--- a/dist/static/js/app.6aa504af45df73167746.js
+++ b/dist/static/js/app.6aa504af45df73167746.js
--- a/dist/static/js/app.9d0049f43b425982d328.js
+++ b/dist/static/js/app.9d0049f43b425982d328.js
--- a/src/views/mall/coupon/list.vue
+++ b/src/views/mall/coupon/list.vue
@@ -42,8 +42,7 @@
    </el-table-column>
    <el-table-column label="显示状态" align="center" prop="proShowStatus" width="120">
      <template slot-scope="scope" >
-        <span v-if="scope.row.proShowStatus == 1">显示</span>
-        <span v-else>不显示</span>
+        {{renderShowStatus(scope.row)}}
      </template>
    </el-table-column>
    <el-table-column label="操作" align="left" width="140px">
@@ -157,6 +156,20 @@ export default {
 				}
        return dhzt_show;
      },
+      renderShowStatus(item) {
+          //商品显示状态 1:上架状态就显示 2:兑换状态下显示
+          var dhzt_show =  this.renderStatus(item);
+        var pro_show_status = item.proShowStatus ;
+        var proShowStatus = "不显示" ;
+        // var mall_show_status = "mall_show_no" ;
+        if(item.status==2) {
+          if((item.releaseType==1 || (item.releaseType == 2 && new Date().getTime() >= (item.limitTimeBegin || 0)) ) && ( pro_show_status==1 || (pro_show_status==2 &&  (dhzt_show=="正常" || dhzt_show=='无库存'))) ) {
+            proShowStatus = "显示" ;
+            // mall_show_status = "mall_show_ok" ;
+          }
+        }
+        return proShowStatus;
+      },
      search() {
        this.listParams.currentPage = 1;
        this.getPageCardsList();

--- a/src/views/mall/gift/list.vue
+++ b/src/views/mall/gift/list.vue
@@ -75,8 +75,7 @@
    </el-table-column>
    <el-table-column label="显示状态" align="center" prop="proShowStatus" width="120">
      <template slot-scope="scope" >
-        <span v-if="scope.row.proShowStatus == 1">显示</span>
-        <span v-else>不显示</span>
+        {{renderShowStatus(scope.row)}}
      </template>
    </el-table-column>
    <el-table-column label="操作" align="left" width="140px" fixed="right">
@@ -208,6 +207,21 @@ export default {
 				}
        return dhzt_show;
      },
+      renderShowStatus(item) {
+          //商品显示状态 1:上架状态就显示 2:兑换状态下显示
+          var dhzt_show =  this.renderStatus(item);
+        var pro_show_status = item.proShowStatus ;
+        var proShowStatus = "不显示" ;
+        // var mall_show_status = "mall_show_no" ;
+        if(item.status==2) {
+          if((item.releaseType==1 || (item.releaseType == 2 && new Date().getTime() >= (item.limitTimeBegin || 0)) ) && ( pro_show_status==1 || (pro_show_status==2 &&  (dhzt_show=="正常" || dhzt_show=='无库存'))) ) {
+            proShowStatus = "显示" ;
+            // mall_show_status = "mall_show_ok" ;
+          }
+        }
+        return proShowStatus;
+      },
+
      // 列表的方法
      search() {
        this.listParams.currentPage = 1;