Merge branch 'dev' into 'master'

推广放开 See merge request !16

Merge branch 'dev' into 'master'
推广放开 See merge request !16
102c081c · damodmg · 0ba572a0 · e52eeffd · 102c081c · 102c081c
Commit 102c081c authored Jan 28, 2019 by damodmg
5 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.84b3c9128e17b961834dadc04a29a1e8.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.1d87220f45614803533c.js></script><script type=text/javascript src=/integral-mall/static/js/app.98a1e814b5694c054da4.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.84b3c9128e17b961834dadc04a29a1e8.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.1d87220f45614803533c.js></script><script type=text/javascript src=/integral-mall/static/js/app.8ebf3f61795b617aa6c2.js></script></body></html>
\ No newline at end of file
--- a/dist/static/js/app.8ebf3f61795b617aa6c2.js
+++ b/dist/static/js/app.8ebf3f61795b617aa6c2.js
--- a/dist/static/js/app.98a1e814b5694c054da4.js
+++ b/dist/static/js/app.98a1e814b5694c054da4.js
--- a/src/views/mall/coupon/list.vue
+++ b/src/views/mall/coupon/list.vue
@@ -47,7 +47,7 @@
    </el-table-column>
    <el-table-column label="操作" align="left" min-width="160px">
        <template slot-scope="scope">
-          <el-button type="text" @click="getLink(scope.row.integralMallProId)" style="display:none">推广</el-button>
+          <el-button type="text" @click="getLink(scope.row.integralMallProId)">推广</el-button>
          <el-button type="text" @click="$router.push('/coupon/info/'+scope.row.integralMallProId)">编辑</el-button>
          <dm-delete @confirm="delData(scope.row)" tips="是否删除该优惠券?">
            <el-button type="text">删除</el-button>

--- a/src/views/mall/gift/list.vue
+++ b/src/views/mall/gift/list.vue
@@ -86,7 +86,7 @@
    </el-table-column>
    <el-table-column label="操作" align="left" fixed="right" min-width="160">
        <template slot-scope="scope">
-          <el-button type="text" @click="getLink(scope.row.integralMallProId)" style="display:none">推广</el-button>
+          <el-button type="text" @click="getLink(scope.row.integralMallProId)">推广</el-button>
          <el-button type="text" @click="$router.push('/gift/info/'+scope.row.integralMallProId)">编辑</el-button>
          <dm-delete @confirm="delData(scope.row)" tips="是否删除该优惠券?">
            <el-button type="text">删除</el-button>