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

!4 PC显示发票信息问题处理，结算页面商品宽度调整，后台发票开具条件增加已发货可以开具发票的按钮 

Merge pull request !4 from chopper711/lifenlong
master
chopper711 2021-10-26 02:40:06 +00:00 committed by Gitee
parent 16d1576c10 f7f836f5fd
commit 0dcee2f2e2
10 changed files with 163 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,10 +38,10 @@
</div>
<div class="order-card">
<h3>发票信息</h3>
<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 v-if="order.receipt">
<p>发票抬头：{{order.receipt.receiptTitle}}</p>
<p>发票内容：{{order.receipt.receiptContent}}</p>
<p v-if="order.receipt.taxpayerId">纳税人识别号：{{order.receipt.taxpayerId}}</p>
</template>
<div v-else style="color:#999;margin-left:5px">
未开发票

11
buyer/src/pages/payment/Pay.vue
View File

@ -5,7 +5,7 @@
<div class="width_1200 logo">
<div>
<router-link to="/"
><img :src="$store.state.logoImg"
><img :src="$store.state.logoImg"
/></router-link>
<div>结算页</div>
</div>
@ -569,6 +569,9 @@ export default {
<style scoped lang="scss">
@import "../../assets/styles/coupon.scss";
.goods-msg{
overflow: hidden;
}
/** logo start */
.logo {
height: 40px;
@ -772,6 +775,7 @@ export default {
}
.goods-list {
width: 1150px;
background-color: #f8f8f8;
margin: 10px 0 20px 0;
@ -800,14 +804,14 @@ export default {
> span:nth-child(1) {
font-size: 12px;
flex: 1;
text-align: left;
>span{
margin-left: 10px;
}
}
> span:last-child {
color: $theme_color;
@ -897,6 +901,7 @@ export default {
/** content end */
/** 底部支付栏 */
.order-footer {
z-index: 20;
height: 50px;
@include background_color($light_white_background_color);
@include title_color($title_color);

2
manager/src/main.js
View File

@ -18,6 +18,7 @@ import util from '@/libs/util'
import * as filters from '@/utils/filters' // global filter
import liliDialog from '@/views/lili-dialog'
import i18nBox from '@/views/lili-components/i18n-translate'
import {md5} from '@/utils/md5.js';
Vue.config.devtools = true;
Vue.config.productionTip = false
@ -35,6 +36,7 @@ Vue.use(ViewUI, {
});
Vue.component('liliDialog',liliDialog)
Vue.component('i18nBox',i18nBox)

41
manager/src/views/home/home.vue
View File

@ -68,7 +68,7 @@
<div class="counts">{{$store.state.notices.refund|| 0}}</div>
<div>待审核售后</div>
</div>
<div class="todo-item" >
<div class="todo-item">
<div class="counts">{{$store.state.notices.distributionCash|| 0}}</div>
<div>待审核分销提现</div>
</div>
@ -197,6 +197,13 @@
<Table stripe :columns="tophotShopsColumns" :data="topHotShopsData"></Table>
</div>
<div>
<!-- 测试数据 -->
<Input v-model="test.a" />
{{test}}
<i18nBox :value="test.a" @language="(val)=>{test.languages = val}"></i18nBox>
<!-- 测试数据 -->
</div>
</div>
</template>
@ -205,11 +212,22 @@ import { homeStatistics, hotGoods, hotShops, getNoticePage } from "@/api/index";
import * as API_Goods from "@/api/goods";
import { Chart } from "@antv/g2";
import * as API_Member from "@/api/member";
// import i18nBox from '@/views/lili-components/i18n-translate'
export default {
name: "home",
// components:{
// i18nBox
// },
data() {
return {
tophotShopsColumns: [ // 表格表头
// 测试数据
test: {
a: "test",
languages:[]
},
// 测试数据结束
tophotShopsColumns: [
// 表格表头
{
type: "index",
width: 100,
@ -275,7 +293,8 @@ export default {
pvChart: "", // 流量统计
orderChart: "", // 订单统计
historyMemberChart: "", // 最近会员流量统计
params: { // 请求参数
params: {
// 请求参数
searchType: "LAST_SEVEN",
},
// 订单传参
@ -475,15 +494,13 @@ export default {
}
},
// 历史在线人数
initHistoryMemberChart(){
initHistoryMemberChart() {
// 默认已经加载 legend-filter 交互
let data = this.chartList;
data.forEach((item) => {
item.title = "历史在线人数";
item.date = item.date.substring(5)
item.date = item.date.substring(5);
});
this.historyMemberChart.data(data);
@ -495,16 +512,14 @@ export default {
this.historyMemberChart
.line()
.position("date*num")
.color("title",['#ffaa71'])
.shape("smooth")
;
.color("title", ["#ffaa71"])
.shape("smooth");
this.historyMemberChart
.point()
.position("date*num")
.color("title",['#ffaa71'])
.shape("circle")
;
.color("title", ["#ffaa71"])
.shape("circle");
this.historyMemberChart.render();
},
// 初始化信息

55
manager/src/views/lili-components/i18n-translate.vue Normal file
View File

@ -0,0 +1,55 @@
<template>
<div>
<Button @click="enable = true">语言设定</Button>
<Modal v-model="enable" draggable sticky scrollable :mask="false" :title="title">
<Tabs closable type="card" @on-tab-remove="handleTabRemove" :value="language[0].title">
<TabPane v-for="(item,index) in language" :key="index" :label="item.title" :name="item.title">
<Input v-model="item.___i18n" />
</TabPane>
</Tabs>
</Modal>
</div>
</template>
<script>
import {language} from "./languages";
export default {
/**
* tabs 循环的语言内容格式 [{'title':'test','value':'val'}]
*/
props: {
value: {
type: null,
default: "",
},
},
watch: {
language: {
handler(val) {
this.$emit("language", { language: [...val], val: this.value });
},
deep: true,
},
},
data() {
return {
language,
tabVal: "",
enable: false, //是否开启modal
title: "转换语言",
};
},
methods: {
// 删除tab标签将没有用的语音进行删除
handleTabRemove(tab) {
this.language = this.language.filter((item) => {
return item.value != tab;
});
},
},
};
</script>
<style lang="scss" scoped>
</style>

1
manager/src/views/lili-components/languages.js Normal file
View File

@ -0,0 +1 @@
export const language = [{ title: "中文",value:1 }, { title: "英文" ,value:2}];

3
seller/src/main.js
View File

@ -18,6 +18,7 @@ import {
} from "@/libs/axios";
import { setStore, getStore, removeStore } from "@/libs/storage";
import i18nBox from '@/views/lili-components/i18n-translate'
import util from "@/libs/util";
@ -34,7 +35,7 @@ Vue.use(VueLazyload, {
});
Vue.use(ViewUI);
Vue.component('i18nBox',i18nBox)
Vue.component("vue-qr", vueQr); //此处将vue-qr添加为全局组件
// 挂载全局使用的方法

55
seller/src/views/lili-components/i18n-translate.vue Normal file
View File

@ -0,0 +1,55 @@
<template>
<div>
<Button @click="enable = true">语言设定</Button>
<Modal v-model="enable" draggable sticky scrollable :mask="false" :title="title">
<Tabs closable type="card" @on-tab-remove="handleTabRemove" :value="language[0].title">
<TabPane v-for="(item,index) in language" :key="index" :label="item.title" :name="item.title">
<Input v-model="item.___i18n" />
</TabPane>
</Tabs>
</Modal>
</div>
</template>
<script>
import {language} from "./languages";
export default {
/**
* tabs 循环的语言内容格式 [{'title':'test','value':'val'}]
*/
props: {
value: {
type: null,
default: "",
},
},
watch: {
language: {
handler(val) {
this.$emit("language", { language: [...val], val: this.value });
},
deep: true,
},
},
data() {
return {
language,
tabVal: "",
enable: false, //是否开启modal
title: "转换语言",
};
},
methods: {
// 删除tab标签将没有用的语音进行删除
handleTabRemove(tab) {
this.language = this.language.filter((item) => {
return item.value != tab;
});
},
},
};
</script>
<style lang="scss" scoped>
</style>

1
seller/src/views/lili-components/languages.js Normal file
View File

@ -0,0 +1 @@
export const language = [{ title: "中文",value:1 }, { title: "英文" ,value:2}];

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

@ -85,7 +85,7 @@ export default {
{
title: "发票内容",
key: "receiptContent",
minWidth: 120,
minWidth: 90,
tooltip: true,
render: (h, params) => {
return h("div", params.row.receiptContent || "暂未填写");
@ -172,10 +172,12 @@ export default {
},
attrs: {
disabled:
params.row.orderStatus == "COMPLETED" &&
params.row.receiptStatus == 0
? false
: true,
!(
(params.row.orderStatus === "COMPLETED"
||params.row.orderStatus === "DELIVERED")
&&
params.row.receiptStatus === 0),
},
style: {
marginRight: "5px",