Skip to content

I
integral-mall
Commit 4dc31e07 by 陈羽
Options

update: style

parent 4d133872
Showing with 106 additions and 99 deletions
src/views/order/couponExchange.vue
......@@ -36,8 +36,7 @@
<!-- <el-input v-model.trim="searchValue" style="width:260px;" placeholder="请输入会员/卡券/订单进行搜索" prefix-icon="el-icon-search" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)"> </el-input> -->
</div>
<div class="search-item">
<span>优惠券创建人</span
><el-autocomplete prefix-icon="el-icon-search" class="inline-input" :value="creatorName" :select-when-unmatched="true" @change.native="changeAuto" @select="selectCreator" :fetch-suggestions="querySearch" placeholder="请输入创建人" :trigger-on-focus="false">
<el-autocomplete prefix-icon="el-icon-search" class="inline-input" :value="creatorName" :select-when-unmatched="true" @change.native="changeAuto" @select="selectCreator" :fetch-suggestions="querySearch" placeholder="请输入优惠券创建人" :trigger-on-focus="false">
<template slot-scope="{ item }">{{ item.creatorName }}</template>
</el-autocomplete>
</div>
......@@ -55,7 +54,7 @@
<div class="goods-list-content" v-loading="loading">
<el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange">
<!-- <el-table-column type="selection" width="40"> </el-table-column> -->
<el-table-column label="礼品信息" width="405px">
<el-table-column label="礼品信息" min-width="350px">
<template slot-scope="scope">
<div class="gift-info">
<!-- <img v-if="scope.row.cardType === 2" src="../../../static/img/dui.png" alt="" /> -->
......@@ -73,20 +72,23 @@
<img v-if="scope.row.cardType === 1 && !scope.row.giftMainPic" src="../../../static/img/quan03.png" alt="" />
<div class="info-name">
<p class="pro-ellipsis">{{ scope.row.giftName }}</p>
<p style="font-size:13px;color:#909399" v-if="scope.row.proReferId.indexOf(',') === -1">卡券编号：{{ scope.row.proReferId }}</p>
<el-tooltip :content="scope.row.proReferId" placement="top" v-if="scope.row.proReferId.indexOf(',') === -1">
<p style="font-size:13px;color:#909399;overflow: hidden;text-overflow:ellipsis;white-space: nowrap;">卡券编号：{{ scope.row.proReferId }}</p>
</el-tooltip>
<p style="font-size:13px;color:#909399" v-if="scope.row.proReferId.indexOf(',') === -1"><span v-if="scope.row.status === 2">已领取</span><span v-if="scope.row.status <= 1">未领取</span> / <span v-if="scope.row.useStatus === 5">已使用</span><span v-if="scope.row.useStatus === 0">未使用</span><span v-if="scope.row.useStatus === 7">已销毁</span></p>
</div>
</div>
</template>
</el-table-column>
<el-table-column prop="createTime" label="下单时间" sortable="custom">
<el-table-column prop="createTime" label="下单时间" min-width="120px" sortable="custom">
<template slot-scope="scope">
<p style="line-height:18px">{{ scope.row.createTime ? getTime(scope.row.createTime) : '--' }}</p>
<p style="line-height:18px" class="gray-color">{{ scope.row.createTime ? getSeconds(scope.row.createTime) : '--' }}</p>
</template>
</el-table-column>
<el-table-column prop="creatorName" label="优惠券创建人"></el-table-column>
<el-table-column prop="definedCode" label="订单编号" width="170px">
<el-table-column prop="creatorName" label="优惠券创建人" min-width="130px"></el-table-column>
<el-table-column prop="definedCode" label="订单编号" min-width="170px">
<template slot-scope="scope">
<el-dropdown @visible-change="i => getOrderInfo(i, scope.row.integralMallProExchangeId)" trigger="click" class="drop-list">
<span class="el-dropdown-link"> {{ scope.row.definedCode }}<i class="iconfont icon-icon-"></i> </span>
......@@ -104,12 +106,12 @@
</el-dropdown>
</template>
</el-table-column>
<el-table-column label="会员" width="150px">
<el-table-column label="会员" min-width="150px">
<template slot-scope="scope">
<memberInfo :memberObj="scope.row" :requestProject="requestProject" :placement="placement"></memberInfo>
</template>
</el-table-column>
<el-table-column prop="complete" label="交易状态" width="170px">
<el-table-column prop="complete" label="交易状态" min-width="170px">
<template slot-scope="scope">
<p style="line-height:18px">
<span v-if="scope.row.status <= 0">交易关闭</span>
......@@ -121,7 +123,7 @@
</p>
</template>
</el-table-column>
<el-table-column prop="saleNum" label="实付金额">
<el-table-column prop="saleNum" label="实付金额" min-width="120px">
<template slot-scope="scope">
<p style="line-height:18px">积分：{{ scope.row.unitCostIntegral }}</p>
<p style="line-height:18px">现金：￥{{ scope.row.payCost }}</p>
......
src/views/order/giftExchange.vue
......@@ -15,51 +15,45 @@
<el-tabs v-model="orderStatus" class="bread-content" @tab-click="handleClick">
<div style="height:24px;background:#f0f2f5;"></div>
<div>
<div class="operate-top" :style="collapseActive ? 'height:90px;' : ''">
<div class="search-item">
<el-input placeholder="请输入关键词搜索" v-model.trim="searchValue" style="width:280px;" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)">
<el-select v-model="searchType" slot="prepend" placeholder="请选择" style="width:100px;">
<el-option label="订单编号" :value="1"></el-option>
<el-option label="商品名称" :value="2"></el-option>
<el-option label="会员名" :value="3"></el-option>
<el-option label="会员卡号" :value="4"></el-option>
<el-option label="收件人手机号" :value="5"></el-option>
<el-option label="快递单号" :value="6"></el-option>
<div class="operate-top">
<div class="left">
<div class="search-content-item">
<el-input placeholder="请输入关键词搜索" v-model.trim="searchValue" style="width:280px;" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)">
<el-select v-model="searchType" slot="prepend" placeholder="请选择" style="width:100px;">
<el-option label="订单编号" :value="1"></el-option>
<el-option label="商品名称" :value="2"></el-option>
<el-option label="会员名" :value="3"></el-option>
<el-option label="会员卡号" :value="4"></el-option>
<el-option label="收件人手机号" :value="5"></el-option>
<el-option label="快递单号" :value="6"></el-option>
</el-select>
</el-input>
<!-- <el-input style="width:240px;" v-model.trim="searchValue" placeholder="请输入会员/商品/订单搜索" prefix-icon="el-icon-search" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)"> </el-input> -->
</div>
<div class="search-content-item">
<el-autocomplete prefix-icon="el-icon-search" class="inline-input" :value="creatorName" :select-when-unmatched="true" @select="selectCreator" @change.native="changeAuto" :fetch-suggestions="querySearch" placeholder="请输入礼品创建人" :trigger-on-focus="false">
<template slot-scope="{ item }">{{ item.creatorName }}</template>
</el-autocomplete>
</div>
<div class="search-content-item">
<el-select v-model="changeType" placeholder="配送方式" clearable @change="getListCurr" style="width:120px;">
<el-option label="物流发货" :value="2"></el-option>
<el-option label="在线发货（虚拟商品）" :value="3"></el-option>
<el-option label="门店自提" :value="4"></el-option>
<el-option label="文本券码" :value="5"></el-option>
</el-select>
</el-input>
<!-- <el-input style="width:240px;" v-model.trim="searchValue" placeholder="请输入会员/商品/订单搜索" prefix-icon="el-icon-search" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)"> </el-input> -->
</div>
<div class="search-content-item date-input">
<el-input v-model.trim="dateValue" @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)">
<el-select v-model="searchDateType" slot="prepend" placeholder="请选择" style="width:140px;" @change="getListCurr">
<el-option label="下单时间" :value="1"></el-option>
<el-option label="交易完成时间" :value="2"></el-option>
</el-select>
<el-date-picker slot="append" class="date-picker" @change="changeTime" v-model="dateValue" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width:370px;"></el-date-picker>
</el-input>
</div>
</div>
<el-collapse v-model="collapseActive" style="border:none;" accordion @change="collapseActiveChange">
<el-collapse-item title="一致性 Consistency" name="1">
<template slot="title">
<span :style="collapseActive ? 'color:#1890ff' : ''">高级搜索<i :style="{ marginLeft: '8px', color: collapseActive ? '#1890ff' : '#303133' }" :class="collapseActive ? 'el-icon-arrow-down' : 'el-icon-arrow-up'"></i></span>
</template>
<div class="search-item-wrap">
<div class="search-item date-input">
<el-input v-model.trim="dateValue" @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)">
<el-select v-model="searchDateType" slot="prepend" placeholder="请选择" style="width:140px;" @change="getListCurr">
<el-option label="下单时间" :value="1"></el-option>
<el-option label="交易完成时间" :value="2"></el-option>
</el-select>
<el-date-picker slot="append" class="date-picker" @change="changeTime" v-model="dateValue" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width:370px;"></el-date-picker>
</el-input>
</div>
<div class="search-item">
<el-select v-model="changeType" placeholder="配送方式" clearable @change="getListCurr" style="width:120px;">
<el-option label="物流发货" :value="2"></el-option>
<el-option label="在线发货（虚拟商品）" :value="3"></el-option>
<el-option label="门店自提" :value="4"></el-option>
<el-option label="文本券码" :value="5"></el-option>
</el-select>
</div>
<div class="search-item">
<el-autocomplete prefix-icon="el-icon-search" class="inline-input" :value="creatorName" :select-when-unmatched="true" @select="selectCreator" @change.native="changeAuto" :fetch-suggestions="querySearch" placeholder="请输入创建人" :trigger-on-focus="false">
<template slot-scope="{ item }">{{ item.creatorName }}</template>
</el-autocomplete>
</div>
</div>
</el-collapse-item>
</el-collapse>
<div class="top-right-btn">
<el-button type="primary" @click="betachDeliver">批量发货</el-button>
<el-button plain @click="exportExcel"><i class="iconfont icon-icon_yunxiazai" style="margin-right:5px"></i>导出订单</el-button>
......@@ -138,7 +132,7 @@
<!-- <p style="line-height:18px" v-else-if="scope.row.refundStatus === -1">--</p> -->
</template>
</el-table-column>
<el-table-column prop="creatorName" label="礼品创建人"></el-table-column>
<el-table-column prop="creatorName" label="礼品创建人" width="120px"></el-table-column>
<el-table-column prop="complete" label="交易状态" width="170px">
<template slot-scope="scope">
<p style="line-height:18px">
......@@ -887,49 +881,21 @@ export default {
</script>
<style lang="less" scoped>
.operate-top {
position: relative;
background: #fff;
height: 32px;
display: flex;
justify-content: space-between;
height: 74px;
margin: 0 24px;
padding: 24px 24px 0;
background: #fff;
margin: 0 25px;
padding: 25px 25px 0 25px;
transition: height 0.3s;
.top-right-btn {
position: absolute;
top: 25px;
right: 25px;
}
.el-collapse {
display: inline-block;
width: 180px;
height: 32px;
margin-left: -4px;
overflow: visible;
.el-collapse-item {
overflow: visible;
}
/deep/.el-collapse-item__header {
height: 32px;
line-height: 32px;
border: none;
.el-collapse-item__arrow {
display: none;
}
}
/deep/.el-collapse-item__wrap {
position: relative;
left: -288px;
top: 25px;
min-width: 1102px;
height: 33px;
border: none;
.el-collapse-item__content {
line-height: 32px;
}
}
.left {
width: 732px;
height: 74px;
display: flex;
gap: 8px;
flex-wrap: wrap;
}
}
/deep/.search-item.date-input > .el-input-group {
/deep/.search-content-item.date-input > .el-input-group {
& > .el-input__inner {
display: none !important;
}
......
src/views/setting/convenSet.vue
......@@ -20,6 +20,10 @@
<el-option label="品牌卡" :value="1"></el-option>
</el-select>
</el-form-item> -->
<h2 class="icon-type-title">
<div class="mark"></div>
礼品设置
</h2>
<el-form-item prop="openAutoShelf" label="礼品无库存自动下架">
<el-switch v-model="form.openAutoShelf"></el-switch>
</el-form-item>
......@@ -29,6 +33,10 @@
<el-checkbox label="2">协管门店</el-checkbox>
</el-checkbox-group>
</el-form-item>
<h2 class="icon-type-title" style="margin-top:40px">
<div class="mark"></div>
订单设置
</h2>
<el-form-item prop="autoConfirmReceipt" label="自动确认收货">
<el-switch v-model="form.autoConfirmReceipt" :active-value="1" :inactive-value="0" @change="form.autoConfirmReceiptDay = null"> </el-switch>
</el-form-item>
......@@ -39,9 +47,11 @@
<el-option label="30天后" :value="30"> </el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleSubmit('form')" :loading="btnLoading">确定</el-button>
</el-form-item>
<div class="confim-btn" :style="{ width: fixedWidth + 'px' }">
<el-form-item class="fix-btn">
<el-button type="primary" @click="handleSubmit('form')" :loading="btnLoading">确定</el-button>
</el-form-item>
</div>
</el-form>
</div>
</div>
......@@ -68,7 +78,8 @@ export default {
openAutoShelf: [{ required: true, message: '请设置无库存自动下架', trigger: 'change' }],
showStoreType: [{ required: true, message: '请至少勾选一个门店类型', trigger: 'change' }]
},
btnLoading: false
btnLoading: false,
fixedWidth: document.documentElement.clientWidth - 200
};
},
created() {
......@@ -124,4 +135,33 @@ export default {
margin: 24px;
padding: 24px;
}
.icon-type-title {
display: flex;
align-items: center;
height: 20px;
color: #303133;
font-size: 16px;
font-weight: 700;
margin-bottom: 20px;
}
.icon-type-title .mark {
width: 3px;
height: 14px;
margin-right: 8px;
background-color: #1890ff;
}
.confim-btn {
height: 32px;
padding: 12px 0;
position: fixed;
bottom: 0px;
left: 200px;
background: #fff;
z-index: 2;
text-align: center;
border-top: 1px solid #dcdfe6;
}
.fix-btn {
margin-left: -100px;
}
</style>
src/views/setting/editDeliver.vue
......@@ -140,7 +140,6 @@
import request from '../../service/request.js';
import getInputVal from '../../utils/common.js';
// import stockModal from '../../../components/getSkuList';
import { confirmInfo } from '../../utils/user.js';
export default {
data() {
......
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