Skip to content

I
integral-mall
Commit dab2cca1 by 萱草
Options

update: UI调整

parent 10a4b4d6
Showing with 14 additions and 8 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.4666fda7ca73b526099f472b3b3890a5.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.45.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.71.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.30.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.2.28.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.175ccdf2bfbfc0694b7c.js></script><script type=text/javascript src=./static/js/app.2603a1b09aa749d6b771.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=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.3d23fa6b5b64c9a2eeac1af64fff2c71.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.45.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.71.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.30.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.2.28.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.175ccdf2bfbfc0694b7c.js></script><script type=text/javascript src=./static/js/app.ef643ba00a6ef71e262b.js></script></body></html>
\ No newline at end of file
dist/static/css/app.3d23fa6b5b64c9a2eeac1af64fff2c71.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.4666fda7ca73b526099f472b3b3890a5.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.2603a1b09aa749d6b771.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.ef643ba00a6ef71e262b.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/activities/flashSale/detail.vue
......@@ -93,7 +93,7 @@
<img :src="row.mainImageUrl" alt />
<div class="info-name">
<div style="display:flex;flex-direction:column;justify-content:center;margin-top:7px">
<p class="pro-ellipsis">{{ row.proName }}</p>
<p :class="[row.giftType ? 'pro-ellipsis2' : '']">{{ row.proName }}</p>
<!-- <p class="pro-ellipsis" :class="[row.giftType ? 'height40' : '']">{{ row.proName }}</p> -->
<p class="category-ellipsis">礼品编码：{{ row.proCode }}</p>
</div>
......@@ -134,7 +134,7 @@
</el-table-column>
<el-table-column label="活动库存" min-width="100px">
<template v-slot:header>
<span>活动库存</span>
<span style="font-weight:500">活动库存</span>
<el-tooltip effect="dark" placement="top">
<div slot="content" v-if="!isEdit" style="width:175px;line-height:16px">设置后将会从礼品本身的库存中扣除相应的库存作为活动库存;<br />限兑数量为0或空时表示不限兑</div>
<div slot="content" v-else style="width:140px;line-height:16px">活动剩余库存/活动总库存</div>
......@@ -156,7 +156,7 @@
<el-switch v-if="row.isShow && isEdit" v-model="row.activityProStatus" disabled></el-switch>
</template>
</el-table-column>
<el-table-column label="操作" min-width="90px">
<el-table-column label="操作" min-width="130px">
<template slot-scope="{ row }">
<div style="font-size:0px">
<el-button type="text" v-if="row.giftType && row.children && row.children.length && !row.isShow && isEdit && !overStatus" class="mr20" @click="updateSkuStock(row)">调整库存</el-button>
......@@ -200,7 +200,7 @@
</el-table-column>
</el-table>
</div>
<div class="add-sku">
<div class="add-sku" v-if="!isEdit">
<div class="add-sku-button">
<el-button @click="addGoods" type="text" :disabled="isEdit || selectList.length === 20">添加商品&nbsp;({{ selectList.length }}/20)</el-button>
</div>
......@@ -1192,6 +1192,12 @@ export default {
/* width: 230px; */
font-size: 14px;
}
.pro-ellipsis2 {
color: #606266;
line-height: 22px;
font-size: 14px;
margin-bottom: 8px;
}
.category-ellipsis {
color: #909399;
font-size: 12px;
......
src/views/goods/coupon/coupon.vue
......@@ -144,7 +144,7 @@
<el-button type="text" v-if="scope.row.canEdit">删除</el-button>
</dm-delete> -->
<el-dropdown style="margin-left:20px;" @command="command => handleCommand(command, scope.row, scope.$index)" placement="bottom-start">
<span class="el-dropdown-link" style="color:#2f54ed;cursor: pointer;"> <i class="el-icon-more"></i> </span>
<span class="el-dropdown-link" style="color:#1890ff;cursor: pointer;"> <i class="el-icon-more"></i> </span>
<el-dropdown-menu slot="dropdown" style="width:110px;">
<!-- <el-dropdown-item command="1" v-if="scope.row.changeType === '5' && scope.row.canEdit">券码</el-dropdown-item> -->
<el-dropdown-item command="2" v-if="scope.row.isDifferentialPricing">阶梯价</el-dropdown-item>
......
src/views/goods/gift/gift.vue
......@@ -142,7 +142,7 @@
<el-button type="text" v-if="scope.row.status === 1 && scope.row.canEdit" @click="deleteList(scope.row, 2)">上架</el-button>
<el-button type="text" @click="goAdd(scope.row)">编辑</el-button>
<el-dropdown style="margin-left:20px;" @command="command => handleCommand(command, scope.row, scope.$index)" placement="bottom-start">
<span class="el-dropdown-link" style="color:#2f54ed;cursor: pointer;"> <i class="el-icon-more"></i> </span>
<span class="el-dropdown-link" style="color:#1890ff;cursor: pointer;"> <i class="el-icon-more"></i> </span>
<el-dropdown-menu slot="dropdown" style="width:110px;">
<el-dropdown-item command="1" v-if="scope.row.changeType === '5' && scope.row.canEdit">券码</el-dropdown-item>
<el-dropdown-item command="2" v-if="scope.row.isDifferentialPricing">阶梯价</el-dropdown-item>
......
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