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

楼层装修接口多次调用，发票管理状态错误，售后详情打开多个会为空

master
mabo 2021-07-27 18:13:45 +08:00
parent 5fb6986a18
commit 877ccc059e
15 changed files with 84 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,11 +31,16 @@
<p>配送方式：{{order.deliveryMethodValue}}</p>
<p>配送状态：{{order.deliverStatusValue}}</p>
</div>
<div class="order-card" v-if="order.order.receipt">
<div class="order-card">
<h3>发票信息</h3>
<p>发票抬头：{{order.order.receiptVO.receiptTitle}}</p>
<p>发票内容：{{order.order.receiptVO.receiptContent}}</p>
<p v-if="order.order.receiptVO.taxpayerId">纳税人识别号：{{order.order.receiptVO.taxpayerId}}</p>
<template v-if="order.order.receipt">
<p>发票抬头：{{order.order.receiptVO.receiptTitle}}</p>
<p>发票内容：{{order.order.receiptVO.receiptContent}}</p>
<p v-if="order.order.receiptVO.taxpayerId">纳税人识别号：{{order.order.receiptVO.taxpayerId}}</p>
</template>
<div v-else style="color:#999;margin-left:5px">
未开发票
</div>
</div>
<!-- 订单商品 -->
<div class="goods">
@ -155,6 +160,7 @@ export default {
p {
color: #999;
margin: 3px;
margin-left: 5px;
}
h3 {
font-weight: normal;

39
manager/src/views/goods/goods-review/index.vue
View File

@ -12,8 +12,6 @@
<Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10">
<!-- 页面展示 -->
<template slot="shopDisableSlot" slot-scope="scope">
<div>
</div>
<i-switch size="large" true-value="OPEN" false-value="CLOSE" v-model="scope.row.status"
@on-change="changeSwitch(scope.row)">
<span slot="open">展示</span>
@ -50,13 +48,19 @@
<div class="div-height"> 店铺名称：{{ infoData.storeName }}</div>
<div class="div-height"> 订单号：{{ infoData.orderNo }}</div>
</div>
<div class="border-b">
<List>
<ListItem>
<ListItemMeta :avatar="infoData.memberProfile" :title="infoData.memberName"
:description="infoData.content"/>
</ListItem>
<div class="score-content">
<span>物流评分：{{infoData.deliveryScore}}</span>
<span>服务评分：{{infoData.serviceScore}}</span>
<span>描述评分：{{infoData.descriptionScore}}</span>
</div>
<div class="" v-if="infoData.haveImage">
评价图
<div style="margin-left: 40px">
@ -82,7 +86,6 @@
<img style="width: 100px;height: 110px" v-for="(img,index) in infoData.replyImage.split(',')" :key="index"
:src="img" alt=""/>
</template>
</div>
</div>
</div>
@ -142,14 +145,28 @@ export default {
} else {
return h("Tag", {props: {color: "red",},}, "差评");
}
}
},
{
title: "物流评分",
key: "deliveryScore",
render: (h, params) => {
return h('div',params.row.deliveryScore || 5 + '星')
},
},
{
title: "评价内容",
key: "content",
align: "left",
minWidth: 200,
tooltip: true,
title: "服务评分",
key: "deliveryScore",
render: (h, params) => {
return h('div',params.row.serviceScore || 5 + '星')
},
},
{
title: "描述评分",
key: "deliveryScore",
render: (h, params) => {
return h('div',params.row.descriptionScore || 5 + '星')
},
},
{
title: "评价时间",
@ -348,4 +365,8 @@ label {
.div-height{
line-height: 25px;
}
.score-content {
margin: 5px 0;
span{margin-right: 20px;}
}
</style>

2
manager/src/views/lili-floor-renovation/modelForm.vue
View File

@ -125,7 +125,7 @@
></liliDialog>
<!-- 选择图片 -->
<Modal width="1200px" v-model="picModelFlag" footer-hide>
<ossManage @callback="callbackSelected" ref="ossManage" />
<ossManage @callback="callbackSelected" :isComponent="true" ref="ossManage" />
</Modal>
</div>
</template>

2
manager/src/views/lili-floor-renovation/modelFormItem.vue
View File

@ -130,7 +130,7 @@
></liliDialog>
<!-- 选择图片 -->
<Modal width="1200px" v-model="picModelFlag" footer-hide>
<ossManage @callback="callbackSelected" ref="ossManage" />
<ossManage @callback="callbackSelected" :isComponent="true" ref="ossManage" />
</Modal>
</div>
</template>

2
manager/src/views/lili-floor-renovation/modelList/carousel.vue
View File

@ -113,7 +113,7 @@
></liliDialog>
<!-- 选择图片 -->
<Modal width="1200px" v-model="picModelFlag" footer-hide>
<ossManage @callback="callbackSelected" ref="ossManage" />
<ossManage @callback="callbackSelected" :isComponent="true" ref="ossManage" />
</Modal>
</div>
</template>

2
manager/src/views/lili-floor-renovation/modelList/firstPageAdvert.vue
View File

@ -58,7 +58,7 @@
></liliDialog>
<!-- 选择图片 -->
<Modal width="1200px" v-model="picModelFlag" footer-hide>
<ossManage @callback="callbackSelected" ref="ossManage" />
<ossManage @callback="callbackSelected" :isComponent="true" ref="ossManage" />
</Modal>
</div>
</template>

2
manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue
View File

@ -134,7 +134,7 @@
></liliDialog>
<!-- 选择图片 -->
<Modal width="1200px" v-model="picModelFlag" footer-hide>
<ossManage @callback="callbackSelected" ref="ossManage" />
<ossManage @callback="callbackSelected" :isComponent="true" ref="ossManage" />
</Modal>
</div>
</template>

2
manager/src/views/lili-floor-renovation/modelList/recommend.vue
View File

@ -200,7 +200,7 @@
></liliDialog>
<!-- 选择图片 -->
<Modal width="1200px" v-model="picModelFlag" footer-hide>
<ossManage @callback="callbackSelected" ref="ossManage" />
<ossManage @callback="callbackSelected" :isComponent="true" ref="ossManage" />
</Modal>
</div>
</template>

1
manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
View File

@ -45,7 +45,6 @@ export default {
// 监听路由变化
$route: {
handler: function (val, oldVal) {
console.log(val);
if (val.meta.firstRouterName && val.meta.firstRouterName !== this.currNav) {
this.selectNav(val.meta.firstRouterName)
}

2
manager/src/views/page/article-manage/hotWords.vue
View File

@ -13,7 +13,7 @@
</Row>
<div class="card-list">
<Card v-for="words in data" class="card-item" onclick="">
<Card v-for="words in data" class="card-item" :key="words" onclick="">
<p><a href="#" slot="extra" @click.prevent="add(words)">{{ words }}</a></p>
</Card>
</div>

21
manager/src/views/seller/bill/accountStatementBill.vue
View File

@ -14,7 +14,7 @@
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
</Form>
</Row>
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
<Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10" @on-selection-change="changeSelect">
</Table>
<Row type="flex" justify="end" class="mt_10">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
@ -140,44 +140,44 @@ export default {
};
},
methods: {
// 初始化数据
init() {
this.getDataList();
},
// 分页 改变页码
changePage(v) {
this.searchForm.pageNumber = v;
this.getDataList();
this.clearSelectAll();
},
// 分页 改变页数
changePageSize(v) {
this.searchForm.pageNumber = 1
this.searchForm.pageSize = v;
this.getDataList();
},
// 搜索
handleSearch() {
this.searchForm.pageNumber = 1;
this.searchForm.pageSize = 10;
this.getDataList();
},
changeSort(e) {
this.searchForm.sort = e.key;
this.searchForm.order = e.order;
if (e.order === "normal") {
this.searchForm.order = "";
}
this.getDataList();
},
// 清除选中状态
clearSelectAll() {
this.$refs.table.selectAll(false);
},
// 选中回调
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;
@ -200,6 +200,7 @@ export default {
this.total = this.data.length;
this.loading = false;
},
// 详情
detail(v) {
let id = v.id;
this.$router.push({

22
manager/src/views/sys/menu-manage/menuManage.vue
View File

@ -97,17 +97,6 @@
<FormItem
label="路由名称"
prop="name"
v-if="form.level == 0"
class="block-tool"
>
<Tooltip placement="right" content="路由name，需英文唯一，跳转页面用">
<Input v-model="form.name"/>
</Tooltip>
</FormItem>
<FormItem
label="路由名称"
prop="name"
v-if="form.level != 0"
class="block-tool"
>
<Tooltip placement="right" content="路由name，需英文唯一，跳转页面用" transfer>
@ -201,17 +190,6 @@
<FormItem
label="路由名称"
prop="name"
v-if="formAdd.level == 0"
class="block-tool"
>
<Tooltip placement="right" content="路由name，需英文唯一，跳转页面用">
<Input v-model="formAdd.name"/>
</Tooltip>
</FormItem>
<FormItem
label="路由名称"
prop="name"
v-if="formAdd.level != 0"
class="block-tool"
>
<Tooltip placement="right" content="路由name，需英文唯一，跳转页面用">

24
manager/src/views/sys/oss-manage/ossManage.vue
View File

@ -26,9 +26,7 @@
style="width: 200px"
/>
</Form-item>
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn"
>搜索
</Button>
<Form-item label="上传时间">
<DatePicker
v-model="selectDate"
@ -40,7 +38,9 @@
style="width: 200px"
></DatePicker>
</Form-item>
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn"
>搜索
</Button>
</Form>
</Row>
<div class="oss-operation padding-row">
@ -273,6 +273,12 @@ import config from "@/config";
var dp;
export default {
name: "oss-manage",
props:{
isComponent:{
default: false,
type:Boolean
}
},
data() {
return {
config, // api地址
@ -551,6 +557,11 @@ export default {
pageSizeOpts: [5, 10, 20], // 页码展示项
};
},
watch:{
selectImage(val) {
if (val) this.init()
}
},
methods: {
/**
* 选择
@ -811,11 +822,14 @@ export default {
},
},
mounted() {
this.init();
if(!this.isComponent) { // 是组件的话，初始化不调用接口
this.init();
}
this.baseUrl =
process.env.NODE_ENV === "development"
? this.config.api_dev.common
: this.config.api_prod.common;
},
};
</script>

4
seller/src/views/order/after-order/reurnGoodsOrderDetail.vue
View File

@ -507,7 +507,7 @@ export default {
},
// 返回售后状态中文描述
filterStatus(status) {
let label = "";
let label = '';
for (let i = 0; i < this.afterSaleStatus.length; i++) {
const obj = this.afterSaleStatus[i];
if (obj.status === status) {
@ -518,7 +518,7 @@ export default {
return label;
},
},
activated() {
mounted() {
this.sn = this.$route.query.sn;
this.getDetail();
},

10
seller/src/views/order/receiptManager/receipt.vue
View File

@ -14,8 +14,8 @@
</Form-item>
<Form-item label="状态" prop="receiptStatus">
<Select v-model="searchForm.receiptStatus" placeholder="请选择" clearable style="width: 200px">
<Option value="0">未开票</Option>
<Option value="1">已开票</Option>
<Option :value="0">未开票</Option>
<Option :value="1">已开票</Option>
</Select>
</Form-item>
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
@ -50,7 +50,7 @@ export default {
pageSize: 10, // 页面大小
sort: "createTime", // 默认排序字段
order: "desc", // 默认排序方式
receiptStatus: "", // 起始时间
receiptStatus: "", // 发票状态
},
columns: [
{
@ -110,13 +110,13 @@ export default {
width: 100,
tooltip: true,
render: (h, params) => {
if (params.row.receiptStatus == 0) {
if (params.row.receiptStatus === 0) {
return h("div", [
h("tag", { props: { color: "volcano" } }, "未开票"),
]);
} else {
return h("div", [
h("tag", { props: { color: "green" } }, "未开票"),
h("tag", { props: { color: "green" } }, "已开票"),
]);
}
},