Skip to content

I
integral-mall
Commit be7df06a by chenxin
Options

Merge branch 'feature/20201216' into 'master' 

update: 更改样式

See merge request !72
parents 444ad3b4 81c5fc54
Showing with 4 additions and 4 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.f4df810fe1a60f5d404eaa2427a9f9df.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.40.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/activity-select.1.0.2.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.65.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.19.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.24.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.be8aabf13848b6ca3aa7.js></script><script type=text/javascript src=./static/js/app.f1a5c6bcbaf7ee09c337.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.47eaf865c4e523d16c4c0d8cd29abb1d.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.40.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/activity-select.1.0.2.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.65.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.19.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.24.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.be8aabf13848b6ca3aa7.js></script><script type=text/javascript src=./static/js/app.0cf8d16b6afd9206d890.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/app.0cf8d16b6afd9206d890.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.f1a5c6bcbaf7ee09c337.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/goods/coupon/coupon.vue
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<img v-if="scope.row.cardType === 1 && !scope.row.mainImageUrl" src="../../../../static/img/quan03.png" alt /> <img v-if="scope.row.cardType === 1 && !scope.row.mainImageUrl" src="../../../../static/img/quan03.png" alt />
<div class="info-name"> <div class="info-name">
<div> <div>
<el-tooltip :content="'优惠券id：' + scope.row.integralMallProId" effect="light" placement="top-start"> <el-tooltip :content="'优惠券id：' + scope.row.integralMallProId" effect="dark" placement="top-start">
<p class="pro-ellipsis" style="display:inline-block">{{ scope.row.proTitle }}</p> <p class="pro-ellipsis" style="display:inline-block">{{ scope.row.proTitle }}</p>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="scope.row.cardErrorMessage && scope.row.cardErrorMessage !== ''" class="tips-content" popper-class="store-tips" effect="light" :content="scope.row.cardErrorMessage && scope.row.cardErrorMessage !== '' ? '卡券存在异常，请进入详情查看' : ''" placement="top-start"> <el-tooltip v-if="scope.row.cardErrorMessage && scope.row.cardErrorMessage !== ''" class="tips-content" popper-class="store-tips" effect="light" :content="scope.row.cardErrorMessage && scope.row.cardErrorMessage !== '' ? '卡券存在异常，请进入详情查看' : ''" placement="top-start">
......
src/views/goods/gift/gift.vue
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<img :src="scope.row.mainImageUrl" alt /> <img :src="scope.row.mainImageUrl" alt />
<div class="info-name"> <div class="info-name">
<!-- integralMallProId --> <!-- integralMallProId -->
<el-tooltip :content="'礼品id：' + scope.row.integralMallProId" effect="light" placement="top-start"> <el-tooltip :content="'礼品id：' + scope.row.integralMallProId" effect="dark" placement="top-start">
<p class="pro-ellipsis intergral-edit"> <p class="pro-ellipsis intergral-edit">
{{ scope.row.proName }} {{ scope.row.proName }}
<i class="el-icon-edit" @click="editProName(scope.row)"></i> <i class="el-icon-edit" @click="editProName(scope.row)"></i>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment