Skip to content

I
integral-mall
Commit c6089df9 by crushh
Options

update: dist

parent 5a379915
Showing with 610 additions and 144 deletions
src/components/goodsSelect.vue
...@@ -174,7 +174,7 @@ export default { ...@@ -174,7 +174,7 @@ export default {
selectListMore: { selectListMore: {
type: Object, type: Object,
default () { default () {
return []; return {};
}, },
}, },
}, },
...@@ -381,15 +381,7 @@ export default { ...@@ -381,15 +381,7 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped>
.w-100 {
width: 100px;
}
.w-160 {
width: 160px;
}
.w-300 {
width: 300px;
}
.gift-info img { .gift-info img {
width: 48px; width: 48px;
height: 48px; height: 48px;
......
src/components/store/store-group.vue
...@@ -248,7 +248,7 @@ export default { ...@@ -248,7 +248,7 @@ export default {
}, },
// 右侧搜索 // 右侧搜索
getRightList () { getRightList () {
var newData = this.selectLeftList.filter(item => { const newData = this.selectLeftList.filter(item => {
if (item.storeGroupName.indexOf(this.searchValue) > -1) { if (item.storeGroupName.indexOf(this.searchValue) > -1) {
return item; return item;
} }
...@@ -273,7 +273,7 @@ export default { ...@@ -273,7 +273,7 @@ export default {
return false; return false;
} }
// 过滤数据只保留部分有用字段 // 过滤数据只保留部分有用字段
this.selectLeftList.map(v => { this.selectLeftList.forEach(v => {
delete v.children; delete v.children;
delete v.parentGroupId; delete v.parentGroupId;
delete v.groupLevel; delete v.groupLevel;
...@@ -333,9 +333,7 @@ export default { ...@@ -333,9 +333,7 @@ export default {
.search-content { .search-content {
margin: 10px; margin: 10px;
} }
.w-180 {
width: 180px;
}
.border-radius20 /deep/ input { .border-radius20 /deep/ input {
border-radius: 20px; border-radius: 20px;
} }
......
src/components/store/store-part.vue
...@@ -185,7 +185,7 @@ export default { ...@@ -185,7 +185,7 @@ export default {
this.totalPage = res.data.result.totalPage; this.totalPage = res.data.result.totalPage;
if (this.selectLeftList.length) { if (this.selectLeftList.length) {
for (const item of this.selectLeftList) { for (const item of this.selectLeftList) {
let obj; let obj = '';
obj = this.tableData.find(i => { obj = this.tableData.find(i => {
return i.integralMallPickUpPointId === item.integralMallPickUpPointId; return i.integralMallPickUpPointId === item.integralMallPickUpPointId;
}); });
...@@ -244,7 +244,7 @@ export default { ...@@ -244,7 +244,7 @@ export default {
}, },
// 右侧搜索 // 右侧搜索
getRightList () { getRightList () {
var newData = this.selectLeftList.filter(item => { const newData = this.selectLeftList.filter(item => {
if (item.pickUpPointName.indexOf(this.searchValue) > -1) { if (item.pickUpPointName.indexOf(this.searchValue) > -1) {
return item; return item;
} }
...@@ -260,7 +260,7 @@ export default { ...@@ -260,7 +260,7 @@ export default {
return false; return false;
} }
// 过滤数据只保留部分有用字段 // 过滤数据只保留部分有用字段
this.selectLeftList.map(v => { this.selectLeftList.forEach(v => {
delete v.storeId; delete v.storeId;
delete v.pickUpPointAddress; delete v.pickUpPointAddress;
delete v.pickUpPointPhone; delete v.pickUpPointPhone;
...@@ -315,9 +315,7 @@ export default { ...@@ -315,9 +315,7 @@ export default {
.search-content { .search-content {
margin: 10px; margin: 10px;
} }
.w-180 {
width: 180px;
}
.border-radius20 /deep/ input { .border-radius20 /deep/ input {
border-radius: 20px; border-radius: 20px;
} }
......
src/main.js
...@@ -18,6 +18,9 @@ Vue.use(VueAxios, axios); ...@@ -18,6 +18,9 @@ Vue.use(VueAxios, axios);
Vue.axios.defaults.withCredentials = true; // 跨域cookie访问 Vue.axios.defaults.withCredentials = true; // 跨域cookie访问
Vue.config.productionTip = false; Vue.config.productionTip = false;
window.ELEMENT.Dialog.props.closeOnClickModal.default = false; // 全局设置点击蒙层不关闭
/* eslint-disable no-new */ /* eslint-disable no-new */
/* eslint-disable no-new */ /* eslint-disable no-new */
window.getLimit(router, 'integral-mall').then(() => { window.getLimit(router, 'integral-mall').then(() => {
......
src/router/index.js
...@@ -19,6 +19,8 @@ import editDeliver from '../views/setting/editDeliver'; ...@@ -19,6 +19,8 @@ import editDeliver from '../views/setting/editDeliver';
import orderDetail from '../views/order/orderDetail'; import orderDetail from '../views/order/orderDetail';
import recordList from '../views/setting/recordList'; import recordList from '../views/setting/recordList';
import convenSet from '../views/setting/convenSet'; import convenSet from '../views/setting/convenSet';
import ruleList from '../views/goods/ruleList/ruleList';
import ruleInfo from '../views/goods/ruleList/info';
Vue.use(VueClipboard); Vue.use(VueClipboard);
/** /**
...@@ -101,6 +103,30 @@ const router = new Router({ ...@@ -101,6 +103,30 @@ const router = new Router({
component: flashSaleInfo, component: flashSaleInfo,
}, },
{ {
path: '/ruleList',
name: 'ruleList',
component: ruleList,
meta: {
useMenuLimit: true,
},
},
{
path: '/editRule',
name: 'editRule',
component: ruleInfo,
meta: {
type: 'edit',
},
},
{
path: '/addRule',
name: 'addRule',
component: ruleInfo,
meta: {
type: 'add',
},
},
{
path: '/giftExchange', path: '/giftExchange',
name: 'giftExchange', name: 'giftExchange',
component: giftExchange, component: giftExchange,
......
src/views/activities/flashSale/detail.vue
...@@ -1305,12 +1305,7 @@ export default { ...@@ -1305,12 +1305,7 @@ export default {
.disabled { .disabled {
pointer-events: none; pointer-events: none;
} }
.section {
background: #fff;
margin: 24px;
padding: 24px;
margin-bottom: 80px;
}
.w-300 { .w-300 {
width: 300px; width: 300px;
} }
......
src/views/activities/flashSale/list.vue
...@@ -256,26 +256,11 @@ export default { ...@@ -256,26 +256,11 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped>
.section {
background: #fff;
margin: 24px;
padding: 24px;
}
.m-r-10 { .m-r-10 {
margin-right: 10px; margin-right: 10px;
} }
.w-280 {
width: 280px;
}
.w-300 {
width: 300px;
}
.w-140 {
width: 140px;
}
.w-160 {
width: 160px;
}
.gift-info img { .gift-info img {
width: 75px; width: 75px;
height: 75px; height: 75px;
......
src/views/goods/coupon/coupon.vue
...@@ -907,11 +907,7 @@ export default { ...@@ -907,11 +907,7 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped>
.section {
background: #fff;
margin: 24px;
padding: 24px;
}
.m-r-10 { .m-r-10 {
margin-right: 10px; margin-right: 10px;
} }
......
src/views/goods/coupon/info.vue
...@@ -1697,11 +1697,8 @@ export default { ...@@ -1697,11 +1697,8 @@ export default {
width: 100px; width: 100px;
} }
.section { .section {
background: #fff; padding:0 0 24px 0;
margin: 24px; margin-bottom:80px;
padding-bottom: 24px;
margin-bottom: 80px;
/* padding: 24px; */
} }
.section-content h3 { .section-content h3 {
......
src/views/goods/gift/gift.vue
...@@ -70,6 +70,18 @@ ...@@ -70,6 +70,18 @@
</div> </div>
<div class="search-content-item" style="height:32px;"> <div class="search-content-item" style="height:32px;">
<el-select <el-select
v-model="ruleRelationFlag"
placeholder="上架规则"
clearable
class="w-140"
@change="getListCurr"
>
<el-option label="已关联上架规则" :value="1" />
<el-option label="未关联上架规则" :value="0" />
</el-select>
</div>
<div class="search-content-item" style="height:32px;">
<el-select
v-model="category" v-model="category"
placeholder="礼品分类" placeholder="礼品分类"
class="w-140" class="w-140"
...@@ -309,8 +321,7 @@ ...@@ -309,8 +321,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
fixed="right" prop="shelf"
prop="shelf "
label="状态" label="状态"
min-width="110px" min-width="110px"
> >
...@@ -318,6 +329,12 @@ ...@@ -318,6 +329,12 @@
{{ scope.row.shelf ? (scope.row.shelf == 1 ? '已下架' : scope.row.shelf == 2 ? '已上架' : '待上架') : '--' }} {{ scope.row.shelf ? (scope.row.shelf == 1 ? '已下架' : scope.row.shelf == 2 ? '已上架' : '待上架') : '--' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
fixed="right"
prop="ruleTitle"
label="上架规则"
min-width="110px"
/>
<el-table-column fixed="right" label="操作" min-width="220px"> <el-table-column fixed="right" label="操作" min-width="220px">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
...@@ -331,7 +348,7 @@ ...@@ -331,7 +348,7 @@
</el-button> </el-button>
<el-button <el-button
type="text" type="text"
v-if="((scope.row.status === 2 && scope.row.canEdit && scope.row.releaseType === 2 && scope.row.isShelves === 1) || (scope.row.status === 1 && scope.row.canEdit)) && $getButtonLimit($buttonCode.giftNew)" v-if="((scope.row.status === 2 && scope.row.canEdit && scope.row.releaseType === 2 && scope.row.isShelves === 1 && !scope.row.ruleTitle) || (scope.row.status === 1 && scope.row.canEdit)) && $getButtonLimit($buttonCode.giftNew)"
:limit-code="$buttonCode.giftNew" :limit-code="$buttonCode.giftNew"
@click="deleteList(scope.row, 2)" @click="deleteList(scope.row, 2)"
> >
...@@ -547,6 +564,7 @@ export default { ...@@ -547,6 +564,7 @@ export default {
stockDialog: false, stockDialog: false,
enterpriseId: '', enterpriseId: '',
specialOrder: false, specialOrder: false,
ruleRelationFlag: '',
}; };
}, },
created () { created () {
...@@ -659,6 +677,7 @@ export default { ...@@ -659,6 +677,7 @@ export default {
stockStatus: this.stockStatus ? this.stockStatus : -1, stockStatus: this.stockStatus ? this.stockStatus : -1,
goodsType: this.goodsType, // 商品类型 goodsType: this.goodsType, // 商品类型
showSelfFlag: this.showSelfStatus ? 1 : 0, showSelfFlag: this.showSelfStatus ? 1 : 0,
ruleRelationFlag: this.ruleRelationFlag,
}; };
this.loading = true; this.loading = true;
request.post('/api-integral-mall/page-gift', qs.stringify(params)).then(res => { request.post('/api-integral-mall/page-gift', qs.stringify(params)).then(res => {
...@@ -1073,11 +1092,7 @@ export default { ...@@ -1073,11 +1092,7 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped>
.section {
background: #fff;
margin: 24px;
padding: 24px;
}
.w-300 { .w-300 {
width: 300px; width: 300px;
} }
......
src/views/goods/gift/info.vue
...@@ -2734,10 +2734,8 @@ export default { ...@@ -2734,10 +2734,8 @@ export default {
width: 100px; width: 100px;
} }
.section { .section {
background: #fff; padding:0 0 24px 0;
margin: 24px; margin-bottom:80px;
padding-bottom: 24px;
margin-bottom: 80px;
} }
.section-content h3 { .section-content h3 {
height: 55px; height: 55px;
......
src/views/goods/ruleList/info.vue 0 → 100644
<template>
<div class="mall-section-container">
<div class="mall-content-section">
<div class="mall-content-title">
<el-breadcrumb separator="/">
<el-breadcrumb-item :to="{ path: '' }">
<a href="/report/#/memberSummary">首页</a>
</el-breadcrumb-item>
<el-breadcrumb-item>积分商城</el-breadcrumb-item>
<el-breadcrumb-item>商品</el-breadcrumb-item>
<el-breadcrumb-item>上架规则</el-breadcrumb-item>
<el-breadcrumb-item>新建上架规则</el-breadcrumb-item>
</el-breadcrumb>
<h3>
<span>新建上架规则</span>
</h3>
</div>
<div class="section">
<el-form
ref="ruleForm"
:rules="rules"
:model="ruleForm"
label-width="160px"
size="small"
>
<el-form-item label="上架规则名称" prop="activityName">
<el-input
maxlength="12"
show-word-limit
placeholder="请输入上架规则名称"
v-model="ruleForm.activityName"
style="width:340px"
/>
</el-form-item>
<el-form-item label="上架规则名称备注" prop="activityRemark">
<el-input
maxlength="30"
show-word-limit
placeholder="请输入上架规则说明"
v-model="ruleForm.activityRemark"
style="width:340px"
/>
</el-form-item>
<el-form-item label="适用人群" prop="activityTime">
<vue-gic-people
:projectName="projectName"
:searchBackTxt.sync="searchBackTxt"
:conditionList.sync="conditionList"
:triggerReset="true"
:useId="useId"
:hasSearchData="hasSearchData"
:sceneValue="sceneValue"
ref="peopleFilter"
@findFilter="findFilter"
@getBackData="getBackData"
@editHide="editHide"
@editShow="editShow"
@hideBtn="hideBtn"
/>
<div class="gic-people--button" v-show="toggleTag">
<el-button size="small" type="primary" @click="getData">
确 定
</el-button>
<el-button size="small" @click="cancelFilter">
取 消
</el-button>
</div>
</el-form-item>
<div class="confim-btn">
<el-button type="primary" size="small" @click="nextStep()">
确认新建
</el-button>
</div>
</el-form>
</div>
</div>
</div>
</template>
<script>
export default {
data () {
const activityTimeVal = (rule, value, callback) => {
callback(new Error('请填写'));
};
return {
ruleForm: {
},
rules: {
activityName: [
{ required: true, message: '请填写', trigger: 'blur' },
],
activityTime: [
{ required: true, message: '请填写', trigger: 'blur', validator: activityTimeVal },
],
},
projectName: 'integral-mall',
searchBackTxt: '', // 保存选中的筛选条件用来不走接口查缩略信息
conditionList: [],
useId: '',
hasSearchData: '',
sceneValue: 'member', // 场景值
responseParams: [], // 回显的数据
};
},
methods: {
// 子组件触发父组件事件,返回过滤条件数据
findFilter (value) {
},
// 获取需要回显的数据, 供保存时候使用
getBackData () {
},
// 显示保存按钮,隐藏确认按钮显示 (子组件会调用)
editHide () {
},
// 显示编辑,保存按钮隐藏,确认按钮显示 (子组件会调用)
editShow () {
},
// 隐藏保存按钮和确认按钮 (子组件会调用)
// 传个参数给父组件 来查数据
hideBtn (refresh) {
},
},
};
</script>
<style>
</style>
src/views/goods/ruleList/ruleList.vue 0 → 100644
<template>
<div class="mall-section-container">
<div class="mall-content-section">
<div class="mall-content-title">
<el-breadcrumb separator="/">
<el-breadcrumb-item :to="{ path: '' }">
<a href="/report/#/memberSummary">首页</a>
</el-breadcrumb-item>
<el-breadcrumb-item>积分商城</el-breadcrumb-item>
<el-breadcrumb-item>商品</el-breadcrumb-item>
<el-breadcrumb-item>上架规则</el-breadcrumb-item>
</el-breadcrumb>
<h3>
<span>上架规则</span>
</h3>
</div>
<div class="section">
<div class="search-wrap">
<div class="table-page-search-wrapper">
<el-input
v-model="searchValue"
placeholder="请输入上架规则名称"
prefix-icon="el-icon-search"
clearable
class="w-260"
@keyup.enter.native="getSearchList"
@clear="getSearchList"
/>
</div>
<el-button
type="primary"
size="small"
:disabled="tableDate.length>=20"
@click="addRule"
>
新建上架规则({{ tableDate.length }}/20)
</el-button>
</div>
<el-table
ref="table"
:data="tableDate"
style="width: 100%"
>
<el-table-column
prop="ruleTitle"
min-width="120px"
label="上架规则"
>
<template slot-scope="{row}">
<div>
<div class="title">
{{ row.title }}
</div>
<div
style="font-size: 12px;color: rgb(144, 147, 153);"
>
{{ row.tips }}
</div>
</div>
</template>
</el-table-column>
<el-table-column
prop="ruleTitle"
label="已关联商品"
>
<template slot-scope="{row}">
<span style="margin-right:20px">
{{ row.number }}
</span>
<el-button
type="text"
@click="relatingDetail(row)"
>
查看
</el-button>
</template>
</el-table-column>
<el-table-column
prop="ruleTitle"
label="操作"
>
<template slot-scope="{row}">
<el-button
type="text"
@click="relating(row)"
>
关联商品
</el-button>
<el-button
type="text"
@click="editRule(row)"
>
编辑
</el-button>
<el-button
type="text"
@click="copyRule(row)"
>
复制
</el-button>
<el-button
type="text"
@click="delRule(row)"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<el-dialog :title="title" :visible.sync="dialogTableVisible" width="850px">
<div :class="['infoTips',title=='查看关联商品'?'infoTips_waring':'']">
<i :class="['el-icon-info','infoTipsIcon',title=='查看关联商品'?'infoTips_waring':'']" />
<div class="infoTipsContent">
{{ title=='查看关联商品'?'移除规则后，上架规则不再作用于商品，商品将不能在会员小程序-积分商城上展示，请谨慎操作！':'选中已关联上架规则的商品，则规则被更新' }}
<br>
</div>
</div>
<div class="search-wrap">
<div class="table-page-search-wrapper">
<el-select
v-model="relateForm.type"
clearable
class="w-160"
placeholder="所有商品类型"
@change="changeType"
>
<el-option label="礼品" :value="0" />
<el-option label="优惠券" :value="1" />
</el-select>
<el-select
v-model="relateForm.relate"
clearable
placeholder="是否已关联上架规则"
class="w-180"
@change="changeType"
>
<el-option label="已关联上架规则" :value="0" />
<el-option label="未关联上架规则" :value="1" />
</el-select>
<el-input
placeholder="请输入礼品名称/礼品编码"
v-model="relateForm.date"
clearable
size="small"
class="w-260"
/>
</div>
<el-button type="primary" size="small" v-if="title=='查看关联商品'">
批量移除
</el-button>
</div>
<el-table :data="relatingGoodsTable" v-loading="loading" @selection-change="handleSelectionChange">
<el-table-column
type="selection"
width="55"
/>
<el-table-column property="date" label="商品信息" min-width="160">
<template slot-scope="{row}">
<div class="img-text">
<img :src="row.mallProImageUrl" alt="">
<div class="text">
<p class="goods-descript">
{{ row.proName }}
</p>
<p class="goods-code">
{{ row.proCode }}
</p>
</div>
</div>
</template>
</el-table-column>
<el-table-column property="type" label="商品类型" width="100" />
<el-table-column property="price" label="成本" width="100" />
<el-table-column property="stock" label="当前库存" width="100" />
<el-table-column property="relate" label="是否已关联规则" min-width="120">
<template slot-scope="{row}">
<p class="goods-descript">
{{ row.relate }}
</p>
</template>
</el-table-column>
</el-table>
<div class="pagination-conteiner" style="padding:10px 0 0 0;">
<div class="pagination">
<el-pagination
layout="prev, pager, next"
:total="50"
/>
</div>
</div>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="dialogTableVisible=false">取消</el-button>
<el-button
type="primary"
size="small"
:loading="btnLoading"
@click="submit"
v-if="title=='选择关联商品'"
>确定</el-button>
</span>
</el-dialog>
</div>
</div>
</div>
</template>
<script>
export default {
data () {
return {
loading: false,
tableDate: [
],
relatingGoodsTable: [
],
multipleSelection: [],
dialogTableVisible: false,
title: '选择关联商品',
relateForm: {
date: '',
type: '',
relate: '',
},
searchValue: '',
total: 100,
};
},
mounted () {
this.getList();
},
methods: {
getList () {
for (let i = 0; i < 19; i++) {
this.tableDate.push(
{
title: '新客积分兑换上架规则规则',
tips: '上架规则说明内容内容上架规则说明内容内容上架规则说明内容内容',
number: 236,
},
);
}
},
relatingDetail (row) {
this.dialogTableVisible = true;
this.title = '查看关联商品';
this.getRelatingGoodsTable(row);
},
relating (row) {
this.dialogTableVisible = true;
this.title = '选择关联商品';
},
editRule (row) {
this.$router.push({ path: '/editRule', query: { id: row.id } });
},
addRule (row) {
this.$router.push({ path: '/addRule' });
},
copyRule (row) {
},
delRelating (row) {
this.$confirm('上架规则删除后，无法被商品关联使用，是否确认删除？', '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
this.$message.success('删除成功');
this.getList();
});
},
handleSelectionChange (val) {
this.multipleSelection = val;
},
getRelatingGoodsTable (row) {
this.loading = true;
for (let i = 0; i < 5; i++) {
this.relatingGoodsTable.push({
mallProImageUrl: 'https://pic01-10001430.image.myqcloud.com/f39e4665-db45-487e-847a-673fedddab44',
proName: '上架规则说明内容内容上架规则说明内容内容上架规则说明内容内容',
proCode: 236,
type: '实物礼品',
price: 1000.00,
stock: 1000,
relate: '新客积分兑换上架规则规则',
});
}
this.loading = false;
},
},
};
</script>
<style lang="less" scoped>
.img-text{
height: 60px;
align-items: center;
display: flex;
img{
width: 60px;
height: 60px;
border-radius: 5px;
}
.text {
margin-left: 10px;
font-size: 12px;
line-height: 20px;
.goods-descript {
width:180px;
color: #303133;
font-size: 14px;
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap;
}
.goods-code {
font-size: 12px;
color: #909399;
}
}
}
</style>
src/views/goods/soldStatistics/statistics.vue
...@@ -16,10 +16,8 @@ ...@@ -16,10 +16,8 @@
</div> </div>
<div class="section"> <div class="section">
<div style="margin-bottom:22px"> <div style="margin-bottom:22px">
<div class="infoTips"> <div class="infoTips" style="width:auto;">
<div class="infoTipsTitle"> <i class="el-icon-info infoTipsIcon" />
<i class="el-icon-info" style="color:#1890FF" /> 温馨提示
</div>
<div class="infoTipsContent"> <div class="infoTipsContent">
<p>1.使用该功能请在常规设置中关闭“无库存自动下架”的设置项；</p> <p>1.使用该功能请在常规设置中关闭“无库存自动下架”的设置项；</p>
<p>2.若礼品增加库存后将清空之前的统计数；</p> <p>2.若礼品增加库存后将清空之前的统计数；</p>
...@@ -233,11 +231,7 @@ export default { ...@@ -233,11 +231,7 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped>
.section {
background: #fff;
margin: 24px;
padding: 24px;
}
.w-280 { .w-280 {
width: 280px; width: 280px;
} }
...@@ -268,20 +262,5 @@ export default { ...@@ -268,20 +262,5 @@ export default {
color: #909399; color: #909399;
font-size: 13px; font-size: 13px;
} }
.infoTips {
margin-bottom: 20px;
background: #e6f7ff;
border-radius: 4px;
border: 1px solid #91d5ff;
padding: 13px 16px;
color: #606266;
}
.infoTipsTitle {
font-size: 14px;
line-height: 22px;
}
.infoTipsContent {
line-height: 22px;
font-size: 13px;
}
</style> </style>
src/views/order/couponExchange.vue
...@@ -651,11 +651,7 @@ export default { ...@@ -651,11 +651,7 @@ export default {
} }
} }
} }
.section {
background: #fff;
margin: 24px;
padding: 24px;
}
.goods-list-content { .goods-list-content {
margin: 0 25px 25px 25px; margin: 0 25px 25px 25px;
padding: 22px 24px 24px 24px; padding: 22px 24px 24px 24px;
......
src/views/order/giftExchange.vue
...@@ -1149,11 +1149,6 @@ export default { ...@@ -1149,11 +1149,6 @@ export default {
} }
</style> </style>
<style scoped> <style scoped>
.section {
background: #fff;
margin: 24px;
padding: 24px;
}
.goods-list-content { .goods-list-content {
margin: 0 25px 25px 25px; margin: 0 25px 25px 25px;
......
src/views/order/refundList.vue
...@@ -562,11 +562,7 @@ export default { ...@@ -562,11 +562,7 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped>
.section {
background: #fff;
margin: 24px;
padding: 24px;
}
.m-r-10 { .m-r-10 {
margin-right: 10px; margin-right: 10px;
} }
......
src/views/setting/convenSet.vue
...@@ -206,11 +206,7 @@ export default { ...@@ -206,11 +206,7 @@ export default {
.mall-section-container { .mall-section-container {
padding-bottom: 58px; padding-bottom: 58px;
} }
.section {
background: #fff;
margin: 24px;
padding: 24px;
}
.icon-type-title { .icon-type-title {
display: flex; display: flex;
align-items: center; align-items: center;
......
src/views/setting/deliverSet.vue
...@@ -510,7 +510,7 @@ export default { ...@@ -510,7 +510,7 @@ export default {
.section { .section {
background: #fff; background: #fff;
margin: 24px; margin: 24px;
/* padding: 24px; */ padding: 0;
} }
.header-top { .header-top {
/* margin: 15px 0 22px 0; */ /* margin: 15px 0 22px 0; */
......
src/views/setting/editDeliver.vue
...@@ -29,12 +29,10 @@ ...@@ -29,12 +29,10 @@
<div class="section-content"> <div class="section-content">
<h3>自提点信息</h3> <h3>自提点信息</h3>
<el-form-item label="自提点类型" required> <el-form-item label="自提点类型" required>
<template>
<el-radio v-model="form.shopType" :label="0"> <el-radio v-model="form.shopType" :label="0">
从门店中选择 从门店中选择
</el-radio> </el-radio>
<!-- <el-radio v-model="radio" label="1">手动新增自提点</el-radio> --> <!-- <el-radio v-model="radio" label="1">手动新增自提点</el-radio> -->
</template>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="选择门店" label="选择门店"
...@@ -114,7 +112,6 @@ ...@@ -114,7 +112,6 @@
</el-form-item> </el-form-item>
<div v-if="form.dateType === 1"> <div v-if="form.dateType === 1">
<el-form-item label="现货提货配置" required> <el-form-item label="现货提货配置" required>
<template>
<div class="radio-item"> <div class="radio-item">
<el-radio v-model="form.radio" :label="1"> <el-radio v-model="form.radio" :label="1">
门店有货可提情况，下单当天 门店有货可提情况，下单当天
...@@ -152,7 +149,6 @@ ...@@ -152,7 +149,6 @@
</el-form-item> </el-form-item>
<span>天后，买家可提货</span> <span>天后，买家可提货</span>
</div> </div>
</template>
</el-form-item> </el-form-item>
<el-form-item v-if="$store.state.product.erpGoodsFlag" label="商户调货配置" prop="transferDelayDay"> <el-form-item v-if="$store.state.product.erpGoodsFlag" label="商户调货配置" prop="transferDelayDay">
门店调货情况，下单<el-input 门店调货情况，下单<el-input
...@@ -203,7 +199,6 @@ ...@@ -203,7 +199,6 @@
</el-form-item> </el-form-item>
</div> </div>
<el-form-item label="超期订单处理" required> <el-form-item label="超期订单处理" required>
<template>
<div> <div>
<el-radio v-model="form.overTimeType" :label="1"> <el-radio v-model="form.overTimeType" :label="1">
超期后，订单自动完成，不退款 超期后，订单自动完成，不退款
...@@ -214,7 +209,6 @@ ...@@ -214,7 +209,6 @@
超期后，订单自动维权，自动向买家退款 超期后，订单自动维权，自动向买家退款
</el-radio> </el-radio>
</div> </div>
</template>
</el-form-item> </el-form-item>
<el-form-item label="买家自提时段" required /> <el-form-item label="买家自提时段" required />
<div style="margin-top:-45px;"> <div style="margin-top:-45px;">
...@@ -836,7 +830,7 @@ export default { ...@@ -836,7 +830,7 @@ export default {
.section { .section {
background: #fff; background: #fff;
margin: 24px; margin: 24px;
padding-bottom: 24px; padding: 0 0 24px 0;
} }
.section-content h3 { .section-content h3 {
height: 55px; height: 55px;
......
src/views/setting/recordList.vue
...@@ -178,11 +178,7 @@ export default { ...@@ -178,11 +178,7 @@ export default {
.w-280 { .w-280 {
width: 280px; width: 280px;
} }
.section {
background: #fff;
margin: 24px;
padding: 24px;
}
.header-top { .header-top {
/* margin: 15px 0 22px 0; */ /* margin: 15px 0 22px 0; */
} }
......
static/css/common.css
...@@ -218,10 +218,8 @@ input:focus { ...@@ -218,10 +218,8 @@ input:focus {
.pagination{ .pagination{
float:right; float:right;
} }
.w-260{
width:260px; .user-header-pop {
}
.user-header-pop {
min-width: 95px; min-width: 95px;
} }
.el-popover.user-header-pop { .el-popover.user-header-pop {
...@@ -261,6 +259,11 @@ input:focus { ...@@ -261,6 +259,11 @@ input:focus {
.mall-content-title h3 i:hover{ .mall-content-title h3 i:hover{
color:#909399; color:#909399;
} }
.section {
background: #fff;
margin: 24px;
padding: 24px;
}
/*编辑按钮*/ /*编辑按钮*/
.el-icon-edit{ .el-icon-edit{
...@@ -346,21 +349,6 @@ input[type="number"] { ...@@ -346,21 +349,6 @@ input[type="number"] {
-moz-appearance: textfield; -moz-appearance: textfield;
} }
/* .el-input__inner{
line-height:0px!important;
}
.el-input__inner::-webkit-input-placeholder {
line-height:normal!important;
}
::-moz-placeholder {
line-height:normal!important;
}
:-ms-input-placeholder {
line-height:normal!important;
} */
.icon-xinxixianshi{ .icon-xinxixianshi{
color: #909399; color: #909399;
font-size: 14px; font-size: 14px;
...@@ -374,4 +362,65 @@ input[type="number"] { ...@@ -374,4 +362,65 @@ input[type="number"] {
fill: currentColor; fill: currentColor;
overflow: hidden; overflow: hidden;
} }
/** 宽度*/
.w-260{
width:260px;
}
.w-280 {
width: 280px;
}
.w-300 {
width: 300px;
}
.w-140 {
width: 140px;
}
.w-160 {
width: 160px;
}
.w-100 {
width: 100px;
}
.w-180 {
width: 180px;
}
/** 提示 */
.infoTips {
display: flex;
padding: 5px 16px;
align-items: baseline;
color: #606266;
background: #e6f7ff;
border-radius: 2px;
margin-bottom: 20px;
width: fit-content;
}
.infoTipsIcon {
width: 12px;
color:#1890FF;
font-size: 12px;
margin-right: 9px;
}
.infoTipsContent {
line-height: 22px;
font-size: 12px;
color:#303133 ;
}
.infoTips_waring{
background: #FCF6F1;
color: #FA8C16;
}
/** 搜索条件 */
.search-wrap{
display: flex;
justify-content: space-around;
align-items: flex-start;
margin-bottom: 20px;
}
.table-page-search-wrapper{
flex: 1;
display: flex;
align-items: center;
gap: 10px;
flex-wrap: wrap;
}
\ No newline at end of file
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