Skip to content

I
integral-mall
Commit c6089df9 by crushh
Options

update: dist

parent 5a379915
Showing with 661 additions and 195 deletions
src/components/goodsSelect.vue
......@@ -174,7 +174,7 @@ export default {
selectListMore: {
type: Object,
default () {
return [];
return {};
},
},
},
......@@ -381,15 +381,7 @@ export default {
};
</script>
<style scoped>
.w-100 {
width: 100px;
}
.w-160 {
width: 160px;
}
.w-300 {
width: 300px;
}
.gift-info img {
width: 48px;
height: 48px;
......
src/components/store/store-group.vue
......@@ -248,7 +248,7 @@ export default {
},
// 右侧搜索
getRightList () {
var newData = this.selectLeftList.filter(item => {
const newData = this.selectLeftList.filter(item => {
if (item.storeGroupName.indexOf(this.searchValue) > -1) {
return item;
}
......@@ -273,7 +273,7 @@ export default {
return false;
}
// 过滤数据只保留部分有用字段
this.selectLeftList.map(v => {
this.selectLeftList.forEach(v => {
delete v.children;
delete v.parentGroupId;
delete v.groupLevel;
......@@ -333,9 +333,7 @@ export default {
.search-content {
margin: 10px;
}
.w-180 {
width: 180px;
}
.border-radius20 /deep/ input {
border-radius: 20px;
}
......
src/components/store/store-part.vue
......@@ -185,7 +185,7 @@ export default {
this.totalPage = res.data.result.totalPage;
if (this.selectLeftList.length) {
for (const item of this.selectLeftList) {
let obj;
let obj = '';
obj = this.tableData.find(i => {
return i.integralMallPickUpPointId === item.integralMallPickUpPointId;
});
......@@ -244,7 +244,7 @@ export default {
},
// 右侧搜索
getRightList () {
var newData = this.selectLeftList.filter(item => {
const newData = this.selectLeftList.filter(item => {
if (item.pickUpPointName.indexOf(this.searchValue) > -1) {
return item;
}
......@@ -260,7 +260,7 @@ export default {
return false;
}
// 过滤数据只保留部分有用字段
this.selectLeftList.map(v => {
this.selectLeftList.forEach(v => {
delete v.storeId;
delete v.pickUpPointAddress;
delete v.pickUpPointPhone;
......@@ -315,9 +315,7 @@ export default {
.search-content {
margin: 10px;
}
.w-180 {
width: 180px;
}
.border-radius20 /deep/ input {
border-radius: 20px;
}
......
src/main.js
......@@ -18,6 +18,9 @@ Vue.use(VueAxios, axios);
Vue.axios.defaults.withCredentials = true; // 跨域cookie访问
Vue.config.productionTip = false;
window.ELEMENT.Dialog.props.closeOnClickModal.default = false; // 全局设置点击蒙层不关闭
/* eslint-disable no-new */
/* eslint-disable no-new */
window.getLimit(router, 'integral-mall').then(() => {
......
src/router/index.js
......@@ -19,6 +19,8 @@ import editDeliver from '../views/setting/editDeliver';
import orderDetail from '../views/order/orderDetail';
import recordList from '../views/setting/recordList';
import convenSet from '../views/setting/convenSet';
import ruleList from '../views/goods/ruleList/ruleList';
import ruleInfo from '../views/goods/ruleList/info';
Vue.use(VueClipboard);
/**
......@@ -101,6 +103,30 @@ const router = new Router({
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',
name: 'giftExchange',
component: giftExchange,
......
src/views/activities/flashSale/detail.vue
......@@ -1305,12 +1305,7 @@ export default {
.disabled {
pointer-events: none;
}
.section {
background: #fff;
margin: 24px;
padding: 24px;
margin-bottom: 80px;
}
.w-300 {
width: 300px;
}
......
src/views/activities/flashSale/list.vue
......@@ -256,26 +256,11 @@ export default {
};
</script>
<style scoped>
.section {
background: #fff;
margin: 24px;
padding: 24px;
}
.m-r-10 {
margin-right: 10px;
}
.w-280 {
width: 280px;
}
.w-300 {
width: 300px;
}
.w-140 {
width: 140px;
}
.w-160 {
width: 160px;
}
.gift-info img {
width: 75px;
height: 75px;
......
src/views/goods/coupon/coupon.vue
......@@ -907,11 +907,7 @@ export default {
};
</script>
<style scoped>
.section {
background: #fff;
margin: 24px;
padding: 24px;
}
.m-r-10 {
margin-right: 10px;
}
......
src/views/goods/coupon/info.vue
......@@ -1697,11 +1697,8 @@ export default {
width: 100px;
}
.section {
background: #fff;
margin: 24px;
padding-bottom: 24px;
margin-bottom: 80px;
/* padding: 24px; */
padding:0 0 24px 0;
margin-bottom:80px;
}
.section-content h3 {
......
src/views/goods/gift/gift.vue
......@@ -70,6 +70,18 @@
</div>
<div class="search-content-item" style="height:32px;">
<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"
placeholder="礼品分类"
class="w-140"
......@@ -309,8 +321,7 @@
</template>
</el-table-column>
<el-table-column
fixed="right"
prop="shelf "
prop="shelf"
label="状态"
min-width="110px"
>
......@@ -318,6 +329,12 @@
{{ scope.row.shelf ? (scope.row.shelf == 1 ? '已下架' : scope.row.shelf == 2 ? '已上架' : '待上架') : '--' }}
</template>
</el-table-column>
<el-table-column
fixed="right"
prop="ruleTitle"
label="上架规则"
min-width="110px"
/>
<el-table-column fixed="right" label="操作" min-width="220px">
<template slot-scope="scope">
<div>
......@@ -331,7 +348,7 @@
</el-button>
<el-button
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"
@click="deleteList(scope.row, 2)"
>
......@@ -547,6 +564,7 @@ export default {
stockDialog: false,
enterpriseId: '',
specialOrder: false,
ruleRelationFlag: '',
};
},
created () {
......@@ -659,6 +677,7 @@ export default {
stockStatus: this.stockStatus ? this.stockStatus : -1,
goodsType: this.goodsType, // 商品类型
showSelfFlag: this.showSelfStatus ? 1 : 0,
ruleRelationFlag: this.ruleRelationFlag,
};
this.loading = true;
request.post('/api-integral-mall/page-gift', qs.stringify(params)).then(res => {
......@@ -1073,11 +1092,7 @@ export default {
};
</script>
<style scoped>
.section {
background: #fff;
margin: 24px;
padding: 24px;
}
.w-300 {
width: 300px;
}
......
src/views/goods/gift/info.vue
......@@ -2734,10 +2734,8 @@ export default {
width: 100px;
}
.section {
background: #fff;
margin: 24px;
padding-bottom: 24px;
margin-bottom: 80px;
padding:0 0 24px 0;
margin-bottom:80px;
}
.section-content h3 {
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/soldStatistics/statistics.vue
......@@ -16,10 +16,8 @@
</div>
<div class="section">
<div style="margin-bottom:22px">
<div class="infoTips">
<div class="infoTipsTitle">
<i class="el-icon-info" style="color:#1890FF" /> 温馨提示
</div>
<div class="infoTips" style="width:auto;">
<i class="el-icon-info infoTipsIcon" />
<div class="infoTipsContent">
<p>1.使用该功能请在常规设置中关闭“无库存自动下架”的设置项；</p>
<p>2.若礼品增加库存后将清空之前的统计数；</p>
......@@ -233,11 +231,7 @@ export default {
};
</script>
<style scoped>
.section {
background: #fff;
margin: 24px;
padding: 24px;
}
.w-280 {
width: 280px;
}
......@@ -268,20 +262,5 @@ export default {
color: #909399;
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>
src/views/order/couponExchange.vue
......@@ -651,11 +651,7 @@ export default {
}
}
}
.section {
background: #fff;
margin: 24px;
padding: 24px;
}
.goods-list-content {
margin: 0 25px 25px 25px;
padding: 22px 24px 24px 24px;
......
src/views/order/giftExchange.vue
......@@ -1149,11 +1149,6 @@ export default {
}
</style>
<style scoped>
.section {
background: #fff;
margin: 24px;
padding: 24px;
}
.goods-list-content {
margin: 0 25px 25px 25px;
......
src/views/order/refundList.vue
......@@ -562,11 +562,7 @@ export default {
};
</script>
<style scoped>
.section {
background: #fff;
margin: 24px;
padding: 24px;
}
.m-r-10 {
margin-right: 10px;
}
......
src/views/setting/convenSet.vue
......@@ -206,11 +206,7 @@ export default {
.mall-section-container {
padding-bottom: 58px;
}
.section {
background: #fff;
margin: 24px;
padding: 24px;
}
.icon-type-title {
display: flex;
align-items: center;
......
src/views/setting/deliverSet.vue
......@@ -510,7 +510,7 @@ export default {
.section {
background: #fff;
margin: 24px;
/* padding: 24px; */
padding: 0;
}
.header-top {
/* margin: 15px 0 22px 0; */
......
src/views/setting/editDeliver.vue
......@@ -29,12 +29,10 @@
<div class="section-content">
<h3>自提点信息</h3>
<el-form-item label="自提点类型" required>
<template>
<el-radio v-model="form.shopType" :label="0">
从门店中选择
</el-radio>
<!-- <el-radio v-model="radio" label="1">手动新增自提点</el-radio> -->
</template>
<el-radio v-model="form.shopType" :label="0">
从门店中选择
</el-radio>
<!-- <el-radio v-model="radio" label="1">手动新增自提点</el-radio> -->
</el-form-item>
<el-form-item
label="选择门店"
......@@ -114,45 +112,43 @@
</el-form-item>
<div v-if="form.dateType === 1">
<el-form-item label="现货提货配置" required>
<template>
<div class="radio-item">
<el-radio v-model="form.radio" :label="1">
门店有货可提情况，下单当天
</el-radio>
<el-form-item style="display:inline-block;margin-left:0px" prop="timeHours">
<el-input
type="text"
v-model="form.timeHours"
style="width:120px;"
size="mini"
/>
</el-form-item>
<span>小时</span>
<el-form-item style="display:inline-block;margin-left:0px" prop="timeMinuter">
<el-input
type="text"
v-model="form.timeMinuter"
style="width:120px;"
size="mini"
/>
</el-form-item>
<span>分钟后，买家可提货</span>
</div>
<div class="radio-item">
<el-radio v-model="form.radio" :label="2">
门店有货可提情况，下单
</el-radio>
<el-form-item style="display:inline-block;margin-left:0px" prop="timeDay">
<el-input
type="text"
v-model="form.timeDay"
style="width:120px;"
size="mini"
/>
</el-form-item>
<span>天后，买家可提货</span>
</div>
</template>
<div class="radio-item">
<el-radio v-model="form.radio" :label="1">
门店有货可提情况，下单当天
</el-radio>
<el-form-item style="display:inline-block;margin-left:0px" prop="timeHours">
<el-input
type="text"
v-model="form.timeHours"
style="width:120px;"
size="mini"
/>
</el-form-item>
<span>小时</span>
<el-form-item style="display:inline-block;margin-left:0px" prop="timeMinuter">
<el-input
type="text"
v-model="form.timeMinuter"
style="width:120px;"
size="mini"
/>
</el-form-item>
<span>分钟后，买家可提货</span>
</div>
<div class="radio-item">
<el-radio v-model="form.radio" :label="2">
门店有货可提情况，下单
</el-radio>
<el-form-item style="display:inline-block;margin-left:0px" prop="timeDay">
<el-input
type="text"
v-model="form.timeDay"
style="width:120px;"
size="mini"
/>
</el-form-item>
<span>天后，买家可提货</span>
</div>
</el-form-item>
<el-form-item v-if="$store.state.product.erpGoodsFlag" label="商户调货配置" prop="transferDelayDay">
门店调货情况，下单<el-input
......@@ -203,18 +199,16 @@
</el-form-item>
</div>
<el-form-item label="超期订单处理" required>
<template>
<div>
<el-radio v-model="form.overTimeType" :label="1">
超期后，订单自动完成，不退款
</el-radio>
</div>
<div>
<el-radio v-model="form.overTimeType" :label="2">
超期后，订单自动维权，自动向买家退款
</el-radio>
</div>
</template>
<div>
<el-radio v-model="form.overTimeType" :label="1">
超期后，订单自动完成，不退款
</el-radio>
</div>
<div>
<el-radio v-model="form.overTimeType" :label="2">
超期后，订单自动维权，自动向买家退款
</el-radio>
</div>
</el-form-item>
<el-form-item label="买家自提时段" required />
<div style="margin-top:-45px;">
......@@ -836,7 +830,7 @@ export default {
.section {
background: #fff;
margin: 24px;
padding-bottom: 24px;
padding: 0 0 24px 0;
}
.section-content h3 {
height: 55px;
......
src/views/setting/recordList.vue
......@@ -178,11 +178,7 @@ export default {
.w-280 {
width: 280px;
}
.section {
background: #fff;
margin: 24px;
padding: 24px;
}
.header-top {
/* margin: 15px 0 22px 0; */
}
......
static/css/common.css
......@@ -218,10 +218,8 @@ input:focus {
.pagination{
float:right;
}
.w-260{
width:260px;
}
.user-header-pop {
.user-header-pop {
min-width: 95px;
}
.el-popover.user-header-pop {
......@@ -261,6 +259,11 @@ input:focus {
.mall-content-title h3 i:hover{
color:#909399;
}
.section {
background: #fff;
margin: 24px;
padding: 24px;
}
/*编辑按钮*/
.el-icon-edit{
......@@ -346,21 +349,6 @@ input[type="number"] {
-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{
color: #909399;
font-size: 14px;
......@@ -374,4 +362,65 @@ input[type="number"] {
fill: currentColor;
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