修改部分样式,分离seller端config文件,配置部分冗余数据,删除部分没用的图片

This commit is contained in:
lemon橪
2021-09-03 14:58:03 +08:00
parent a6052bcd9d
commit 43349a51d1
38 changed files with 256 additions and 398 deletions

View File

@@ -250,22 +250,4 @@ export default {
};
</script>
<style lang="scss" scoped>
.article {
font-size: 16px;
font-weight: 400;
margin: 12px 0;
}
.href-text {
font-size: 12px;
}
.operation {
margin-bottom: 2vh;
}
.select-count {
font-weight: 600;
color: #40a9ff;
}
</style>

View File

@@ -1,22 +1,24 @@
<template>
<div class="foot">
<Row type="flex" justify="space-around" class="help">
<a class="item" href="https://pickmall.cn/" target="_blank">帮助</a>
<a class="item" href="https://pickmall.cn/" target="_blank">隐私</a>
<a class="item" href="https://pickmall.cn/" target="_blank">条款</a>
<a class="item" :href="config.website" target="_blank">帮助</a>
<a class="item" :href="config.website" target="_blank">隐私</a>
<a class="item" :href="config.website" target="_blank">条款</a>
</Row>
<Row type="flex" justify="center" class="copyright">
Copyright © {{year}} - Present
<a href="https://pickmall.cn/" target="_blank" style="margin:0 5px;">lili-shop</a>
<a :href="config.website" target="_blank" style="margin:0 5px;">{{config.title}}</a>
</Row>
</div>
</template>
<script>
import config from '@/config/index'
export default {
name: "footer",
data() {
return {
config,
year: new Date().getFullYear(), // 年
};
},

View File

@@ -1,7 +1,7 @@
<template>
<div>
<Row class="header">
<img class="logo" src="../../assets/logo.png" >
<img class="logo" src="@/assets/logo.png" >
</Row>
</div>
</template>

View File

@@ -1,13 +1,3 @@
.lock-screen-back {
border-radius: 50%;
z-index: -1;
box-shadow: 0 0 0 0 #667aa6 inset;
position: fixed;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
transition: all 3s;
}
.main {
position: absolute;
@@ -277,9 +267,6 @@
}
}
.taglist-moving-animation-move {
transition: transform 0.3s;
}
.logo-con {
width: 100%;
@@ -313,14 +300,6 @@
background: #fff;
}
.nav-item {
font-size: 14px;
}
.main-nav-menu {
bottom: 10px;
position: relative;
}
.loading-position {
position: absolute;

View File

@@ -35,7 +35,7 @@
:fetch="exportOrder"
name="待发货订单.xls"
>
<Button type="success">导出待发货订单</Button>
<Button >导出待发货订单</Button>
</download-excel>
</div>
<Table :loading="loading" border :columns="columns" :data="data" ref="table"></Table>

View File

@@ -27,8 +27,9 @@
</Row>
<Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" @on-selection-change="changeSelect">
<template slot-scope="{ row }" slot="action">
<Button v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'" type="info" size="small" :style="{'marginRight': row.promotionStatus !== 'CLOSE'?'5px':'0'}" @click="edit(row)">编辑</Button>
<Button v-if="row.promotionStatus !== 'CLOSE'" type="error" size="small" @click="remove(row)">下架</Button>
<Button v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'" type="info" size="small" @click="see(row)">编辑</Button>
<Button v-else type="default" size="small" @click="see(row,'only')">查看</Button>
<Button v-if="row.promotionStatus !== 'END'" type="error" size="small" :style="{'marginLeft':'5px'}" @click="remove(row)">下架</Button>
</template>
</Table>
<Row type="flex" justify="end" class="mt_10">
@@ -255,9 +256,12 @@ export default {
this.loading = false;
},
// 跳转编辑优惠券页面
edit(v) {
this.$router.push({ name: "add-coupon", query: { id: v.id } });
see(v,only) {
let data
only ? data = { onlyView : true,id: v.id } : data = { id: v.id }
this.$router.push({ name: "add-coupon", query:data});
},
// 开启优惠券
open(v) {
this.$Modal.confirm({

View File

@@ -6,63 +6,63 @@
<h4>基本信息</h4>
<div class="form-item-view">
<FormItem label="活动名称" prop="promotionName">
<Input type="text" v-model="form.promotionName" placeholder="活动名称" clearable style="width: 260px" />
<Input :disabled="disabled" type="text" v-model="form.promotionName" placeholder="活动名称" clearable style="width: 260px" />
</FormItem>
<FormItem label="优惠券名称" prop="couponName">
<Input type="text" v-model="form.couponName" placeholder="优惠券名称" clearable style="width: 260px" />
<Input :disabled="disabled" type="text" v-model="form.couponName" placeholder="优惠券名称" clearable style="width: 260px" />
</FormItem>
<FormItem label="优惠券类型" prop="couponType">
<Select v-model="form.couponType" style="width: 260px">
<Select :disabled="disabled" v-model="form.couponType" style="width: 260px">
<Option value="DISCOUNT">打折</Option>
<Option value="PRICE">减免现金</Option>
</Select>
</FormItem>
<FormItem label="折扣" prop="discount" v-if="form.couponType == 'DISCOUNT'">
<Input type="number" v-model="form.couponDiscount" placeholder="折扣" clearable style="width: 260px" />
<Input :disabled="disabled" type="number" v-model="form.couponDiscount" placeholder="折扣" clearable style="width: 260px" />
<span class="describe">请输入0-10之间数字可以输入一位小数</span>
</FormItem>
<FormItem label="面额" prop="price" v-if="form.couponType == 'PRICE'">
<Input type="text" v-model="form.price" placeholder="面额" clearable style="width: 260px" />
<Input :disabled="disabled" type="text" v-model="form.price" placeholder="面额" clearable style="width: 260px" />
</FormItem>
<FormItem label="活动类型" prop="getType">
<Select v-model="form.getType" style="width: 260px">
<Select :disabled="disabled" v-model="form.getType" style="width: 260px">
<Option value="FREE">免费领取</Option>
<Option value="ACTIVITY">活动赠送</Option>
</Select>
</FormItem>
<FormItem label="发放数量" v-if="form.getType == 'FREE'" prop="publishNum">
<Input v-model="form.publishNum" placeholder="发放数量" style="width: 260px" />
<Input :disabled="disabled" v-model="form.publishNum" placeholder="发放数量" style="width: 260px" />
<span class="tips ml_10">如果发放数量为0时,则代表不限制发放数量</span>
</FormItem>
</div>
<h4>使用限制</h4>
<div class="form-item-view">
<FormItem label="消费门槛" prop="consumeThreshold">
<Input type="text" v-model="form.consumeThreshold" placeholder="消费门槛" clearable style="width: 260px" />
<Input :disabled="disabled" type="text" v-model="form.consumeThreshold" placeholder="消费门槛" clearable style="width: 260px" />
</FormItem>
<FormItem label="领取限制" v-if="form.getType == 'FREE'" prop="couponLimitNum">
<Input v-model="form.couponLimitNum" placeholder="领取限制" clearable style="width: 260px" />
<Input :disabled="disabled" v-model="form.couponLimitNum" placeholder="领取限制" clearable style="width: 260px" />
<span class="tips ml_10">如果领取限制为0时,则代表不限制领取数量</span>
</FormItem>
<FormItem label="有效期" prop="rangeTime">
<DatePicker type="datetimerange" v-model="form.rangeTime" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择" :options="options" style="width: 260px">
<DatePicker :disabled="disabled" type="datetimerange" v-model="form.rangeTime" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择" :options="options" style="width: 260px">
</DatePicker>
</FormItem>
<FormItem label="使用范围" prop="scopeType">
<RadioGroup type="button" button-style="solid" v-model="form.scopeType">
<Radio label="ALL">全品类</Radio>
<Radio label="PORTION_GOODS">指定商品</Radio>
<Radio label="PORTION_GOODS_CATEGORY">部分商品分类</Radio>
<RadioGroup type="button" button-style="solid" v-model="form.scopeType">
<Radio :disabled="disabled" label="ALL">全品类</Radio>
<Radio :disabled="disabled" label="PORTION_GOODS">指定商品</Radio>
<Radio :disabled="disabled" label="PORTION_GOODS_CATEGORY">部分商品分类</Radio>
</RadioGroup>
</FormItem>
<FormItem style="width: 100%" v-if="form.scopeType == 'PORTION_GOODS'">
<div style="display: flex; margin-bottom: 10px">
<Button type="primary" @click="openSkuList">选择商品</Button>
<Button type="error" ghost style="margin-left: 10px" @click="delSelectGoods">批量删除</Button>
<Button :disabled="disabled" type="primary" @click="openSkuList">选择商品</Button>
<Button :disabled="disabled" type="error" ghost style="margin-left: 10px" @click="delSelectGoods">批量删除</Button>
</div>
<Table class="mt_10" border :columns="columns" :data="form.promotionGoodsList" @on-selection-change="changeSelect">
<Table class="mt_10" :disabled="disabled" border :columns="columns" :data="form.promotionGoodsList" @on-selection-change="changeSelect">
<template slot-scope="{ row }" slot="QRCode">
<img :src="row.QRCode || '../../../assets/lili.png'" width="50px" height="50px" alt="" />
</template>
@@ -70,16 +70,16 @@
</FormItem>
<FormItem v-if="form.scopeType == 'PORTION_GOODS_CATEGORY'">
<Cascader @on-change="getGoodsCategory" :data="goodsCategoryList" style="width:300px;" v-model="form.scopeIdGoods"></Cascader>
<Cascader :disabled="disabled" @on-change="getGoodsCategory" :data="goodsCategoryList" style="width:300px;" v-model="form.scopeIdGoods"></Cascader>
</FormItem>
<FormItem label="范围描述" prop="description">
<Input v-model="form.description" type="textarea" :rows="4" maxlength="50" show-word-limit clearable style="width: 260px" />
<Input :disabled="disabled" v-model="form.description" type="textarea" :rows="4" maxlength="50" show-word-limit clearable style="width: 260px" />
</FormItem>
<div>
<Button type="text" @click="$router.push({ name: 'coupon' })">返回</Button>
<Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
<Button :disabled="disabled" type="text" @click="$router.push({ name: 'coupon' })">返回</Button>
<Button :disabled="disabled" type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
</div>
</div>
</div>
@@ -125,6 +125,7 @@ export default {
return {
modalType: 0, // 判断是新增还是编辑优惠券 0 新增 1 编辑
disabled: this.$route.query.onlyView,
form: {
/** 店铺承担比例 */
sellerCommission: 0,