zhuce
/
lilishop-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

issues上bug修改

master
mabo 2021-07-01 16:02:12 +08:00
parent f7167912e7
commit 6887b6c624
8 changed files with 90 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
buyer/src/App.vue
View File

@ -31,7 +31,6 @@ export default {
</script>
<style lang="scss">
#app{
height: 100%;
@include background_color($light_background_color);
}
</style>

5
buyer/src/components/goodsDetail/ShowGoods.vue
View File

@ -111,7 +111,7 @@
<span class="inventory"> 库存{{skuDetail.quantity}}</span>
</div>
</div>
<div class="item-select" v-if="skuDetail.goodsType !== 'VIRTUAL_GOODS' || skuDetail.weight === 0">
<div class="item-select" v-if="skuDetail.goodsType !== 'VIRTUAL_GOODS' && skuDetail.weight !== 0">
<div class="item-select-title">
<p>重量</p>
</div>
@ -267,7 +267,6 @@ export default {
},
formatSku (list) {
// 格式化数据
console.log(list);
let arr = [{}];
list.forEach((item, index) => {
@ -304,7 +303,7 @@ export default {
});
arr.shift();
this.formatList = arr;
console.log(this.formatList);
let cur = list.filter((i) => i.skuId === this.$route.query.skuId)[0];
if (cur) {
cur.specValues.filter((i) => i.specName !== 'images')

2
buyer/src/components/indexDecorate/modelForm.vue
View File

@ -27,7 +27,7 @@ export default {
.model-content {
width: 1200px;
margin: 0 auto;
background: #fff;
// background: #fff;
min-height: 1200px;
}
</style>

17
buyer/src/components/indexDecorate/modelFormItem.vue
View File

@ -123,22 +123,7 @@ export default {
.model-item {
position: relative;
margin-bottom: 20px;
&:hover {
.del-btn {
display: block;
}
}
}
.del-btn {
width: 100px;
height: 100px;
display: none;
position: absolute;
right: -100px;
top: 0;
&:hover {
display: block;
}
background-color: #fff;
}
/** 热门广告 */

1
buyer/src/components/indexDecorate/modelList/carousel.vue
View File

@ -94,6 +94,7 @@ export default {
width: 1200px;
height: 340px;
overflow: hidden;
margin-top: -20px;
}
/* 导航主体 */

42
buyer/src/pages/Merchant.vue
View File

@ -18,10 +18,16 @@
</div>
</div>
<div class="store-category">
<ul>
<li @click="searchByCate({id:'', labelName: '店铺推荐'})">首页</li>
<li v-for="(cate, index) in cateList" :key="index" @click="searchByCate(cate)">
{{cate.labelName}}
<ul class="cate-list">
<li class="cate-item" @click="searchByCate({id:'', labelName: '店铺推荐'})">首页</li>
<li class="cate-item" v-for="(cate, index) in cateList" :key="index" >
<Dropdown v-if="cate.children.length">
<div @click.self="searchByCate(cate)">{{cate.labelName}} <Icon type="ios-arrow-down"></Icon></div>
<DropdownMenu slot="list">
<DropdownItem @click.native="searchByCate(sec)" :name="sec.id" v-for="sec in cate.children" :key="sec.id">{{sec.labelName}}</DropdownItem>
</DropdownMenu>
</Dropdown>
<span v-else @click.self="searchByCate(cate)">{{cate.labelName}}</span>
</li>
</ul>
</div>
@ -97,13 +103,6 @@ export default {
this.getGoodsList()
},
mounted () {
if (this.Cookies.getItem('userInfo')) {
isCollection('STORE', this.soterMsg.storeId).then(res => {
if (res.success && res.result) {
this.storeCollected = true;
}
})
}
},
methods: {
getStoreMsg () { // 店铺信息
@ -111,6 +110,13 @@ export default {
if (res.success) {
this.storeMsg = res.result
document.title = this.storeMsg.storeName
if (this.Cookies.getItem('userInfo')) {
isCollection('STORE', this.storeMsg.storeId).then(res => {
if (res.success && res.result) {
this.storeCollected = true;
}
})
}
}
})
},
@ -222,15 +228,17 @@ export default {
.store-category {
background-color: #005aa0;
color: #fff;
ul{
.cate-list{
width: 1200px;
margin: 0 auto 10px;
padding: 3px 0;
display: flex;
li {
margin: 0 auto ;
clear: left;
height: 30px;
line-height: 30px;
.cate-item {
margin-right: 25px;
float: left;
}
li:hover{
.cate-item:hover{
cursor: pointer;
}
}

15
buyer/src/pages/home/orderCenter/OrderDetail.vue
View File

@ -1,9 +1,10 @@
<template>
<div class="order-detail" v-if="order.order">
<card _Title="订单详情" :_Size="16"></card>
<p class="verificationCode" v-if="order.order.verificationCode">核验码：<span>{{order.order.verificationCode}}</span></p>
<div class="order-card">
<p class="global_color fontsize_18">{{ order.orderStatusValue }} <span class="verificationCode" v-if="order.order.verificationCode">核验码：{{order.order.verificationCode}}</span></p>
<p class="global_color">订单号：{{ order.order.sn }}</p>
<p class="global_color fontsize_18">{{ order.orderStatusValue }}</p>
<p>订单号：{{ order.order.sn }}</p>
<div style="color:#999;" class="operation-time">操作时间：{{order.order.updateTime}}</div>
<Steps class="progress" :current="progressList.length" direction="vertical">
<Step
@ -25,7 +26,7 @@
<p>支付方式：{{order.paymentMethodValue}}</p>
<p>付款状态：{{order.payStatusValue}}</p>
</div>
<div class="order-card">
<div class="order-card" v-if="!order.order.verificationCode">
<h3>配送信息</h3>
<p>配送方式：{{order.deliveryMethodValue}}</p>
<p>配送状态：{{order.deliverStatusValue}}</p>
@ -235,10 +236,14 @@ table {
}
}
.verificationCode {
font-size: 16px;
margin-left: 240px;
font-size: 20px;
margin-bottom: 20px;
color: rgb(65, 63, 63);
font-weight: bold;
text-align: center;
span{
color: $theme_color;
}
}
/** 订单进度条 */
.progress {

67
seller/src/views/order/order/orderList.vue
View File

@ -30,8 +30,20 @@
<Button type="primary" class="export" @click="expressOrderDeliver">
批量发货
</Button>
<!-- <download-excel
style="display:inline-block;"
:data="data"
:fields="excelColumns"
:fetch="exportOrder"
name="待发货订单.xls"
>
<Button type="success">
导出待发货订单
</Button>
</download-excel> -->
</div>
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"></Table>
<Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
show-total show-elevator show-sizer></Page>
@ -43,8 +55,12 @@
<script>
import * as API_Order from "@/api/order";
import { verificationCode } from "@/api/order";
import JsonExcel from "vue-json-excel";
export default {
name: "orderList",
components: {
"download-excel": JsonExcel,
},
data() {
return {
orderCode: "",
@ -74,8 +90,6 @@ export default {
// 表单验证规则
formValidate: {},
submitLoading: false, // 添加或编辑提交状态
selectList: [], // 多选数据
selectCount: 0, // 多选计数
columns: [
{
title: "订单号",
@ -178,6 +192,13 @@ export default {
],
data: [], // 表单数据
total: 0, // 表单数据总数
excelColumns: { // 导出excel的参数
'编号': 'index',
'订单号': 'sn',
'收货人': 'memberName',
'收货人联系电话': 'memberName',
'收货地址': 'memberName',
}
};
},
methods: {
@ -202,22 +223,27 @@ export default {
path: "/export-order-deliver",
});
},
// 初始化数据
init() {
this.getDataList();
},
// 改变页码
changePage(v) {
this.searchForm.pageNumber = v;
this.getDataList();
},
// 改变页数
changePageSize(v) {
this.searchForm.pageSize = v;
this.getDataList();
},
// 搜索订单
handleSearch() {
this.searchForm.pageNumber = 1;
this.searchForm.pageSize = 10;
this.getDataList();
},
// 重置
handleReset() {
this.searchForm = {};
this.searchForm.pageNumber = 1;
@ -228,25 +254,14 @@ export default {
// 重新加载数据
this.getDataList();
},
changeSort(e) {
this.searchForm.sort = e.key;
this.searchForm.order = e.order;
if (e.order === "normal") {
this.searchForm.order = "";
}
this.getDataList();
},
changeSelect(e) {
this.selectList = e;
this.selectCount = e.length;
},
// 起始时间处理
selectDateRange(v) {
if (v) {
this.searchForm.startDate = v[0];
this.searchForm.endDate = v[1];
}
},
// 获取表格数据
getDataList() {
this.loading = true;
API_Order.getOrderList(this.searchForm).then((res) => {
@ -257,7 +272,25 @@ export default {
}
});
},
// 导出的待发货订单数据
async exportOrder () {
const params = {
// 搜索框初始化对象
pageNumber: 1, // 当前页数
pageSize: 10, // 页面大小
sort: "", // 默认排序字段
order: "", // 默认排序方式
startDate: "", // 起始时间
endDate: "", // 终止时间
orderSn: "",
buyerName: "",
orderStatus: "UNDELIVERED",
orderType: "NORMAL",
}
const res = await API_Order.getOrderList(params)
return res.result.records
},
// 查看订单详情
detail(v) {
let sn = v.sn;
this.$router.push({