Skip to content

C
company_app
提交 b768d9b4 作者: 毛细亚
操作

Merge branch '1.1' into 1.2

上级 d6a6ddb5 e63b1b00
正在显示 包含 151 行增加 和 82 行删除
src/App.vue
...@@ -57,25 +57,25 @@ export default { ...@@ -57,25 +57,25 @@ export default {
return { return {
menuList: [ menuList: [
{ {
label: '客户信息', label: '客户资料',
path: '/userInfo' path: '/userInfo'
}, },
{ // {
label: '角色信息', // label: '角色信息',
path: '/roleInfo' // path: '/roleInfo'
}, // },
{ // {
label: '订单信息', // label: '订单信息',
path: '/orderList' // path: '/orderList'
}, // },
{ {
label: '快捷回复', label: '快捷回复',
path: '/quickReply' path: '/quickReply'
}, },
{ // {
label: '违规记录', // label: '违规记录',
path: '/violationRecord' // path: '/violationRecord'
}, // },
{ {
label: '礼包记录', label: '礼包记录',
path: '/giftRecord' path: '/giftRecord'
......
src/router/index.js
...@@ -29,16 +29,18 @@ const routes = [ ...@@ -29,16 +29,18 @@ const routes = [
name: 'userInfo', name: 'userInfo',
component: userInfo component: userInfo
}, },
{ // 已经将角色信息集成到userInfo中，注释掉单独的路由
path: '/roleInfo', // {
name: 'roleInfo', // path: '/roleInfo',
component: roleInfo // name: 'roleInfo',
}, // component: roleInfo
{ // },
path: '/violationRecord', // 已经将违规记录集成到userInfo中，注释掉单独的路由
name: 'violationRecord', // {
component: violationRecord // path: '/violationRecord',
}, // name: 'violationRecord',
// component: violationRecord
// },
{ {
path: '/quickReply', path: '/quickReply',
name: 'quickReply', name: 'quickReply',
...@@ -59,11 +61,12 @@ const routes = [ ...@@ -59,11 +61,12 @@ const routes = [
name: 'addressBook', name: 'addressBook',
component: addressBook component: addressBook
}, },
{ // 已经将订单列表集成到userInfo中，注释掉单独的路由
path: '/orderList', // {
name: 'orderList', // path: '/orderList',
component: orderList // name: 'orderList',
}, // component: orderList
// },
{ {
path: '/taskRecord', path: '/taskRecord',
name: 'taskRecord', name: 'taskRecord',
......
src/views/components/order/refundLog.vue
<template> <template>
<div class="detailsRefund columnFlex"> <div class="detailsRefund columnFlex">
<div class="content refundContent"> <div class="content refundContent">
<div class="filterList"> <div class="filter-container">
<div class="rowFlex columnCenter"> <el-form class="filter-form" label-position="top" label-width="auto">
<span class="label">订单号:</span> <el-form-item label="订单号:">
<el-input <el-input
v-model="requestData.order_id" v-model="requestData.order_id"
placeholder="请输入订单号" placeholder="请输入订单号"
...@@ -12,16 +12,17 @@ ...@@ -12,16 +12,17 @@
class="searchInput" class="searchInput"
@change="searchInput" @change="searchInput"
></el-input> ></el-input>
</div> </el-form-item>
<div class="rowFlex columnCenter">
<span class="label">角色名称:</span> <el-form-item label="角色名称:">
<searchSelect class="searchInput" placeholder="请输入角色名称" @result="selectResult" /> <searchSelect class="searchInput" style="width: 100%;" placeholder="请输入角色名称" @result="selectResult" />
</div> </el-form-item>
<div class="rowFlex columnCenter ">
<span class="label">审批状态:</span> <el-form-item label="审批状态:">
<el-select <el-select
v-model="requestData.refund_status" v-model="requestData.refund_status"
clearable clearable
style="width: 100%;"
class="searchInput" class="searchInput"
placeholder="请选择退款状态" placeholder="请选择退款状态"
@change="payTypeResult" @change="payTypeResult"
...@@ -29,12 +30,13 @@ ...@@ -29,12 +30,13 @@
<el-option v-for="item in refundStatus" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in refundStatus" :key="item.value" :label="item.label" :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
</div> </el-form-item>
<div class="rowFlex columnCenter ">
<span class="label">审批状态:</span> <el-form-item label="审批状态:">
<el-select <el-select
v-model="requestData.approval_status" v-model="requestData.approval_status"
clearable clearable
style="width: 100%;"
class="searchInput" class="searchInput"
placeholder="请选择审批状态" placeholder="请选择审批状态"
@change="payTypeResult" @change="payTypeResult"
...@@ -42,7 +44,8 @@ ...@@ -42,7 +44,8 @@
<el-option v-for="item in approvalList" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in approvalList" :key="item.value" :label="item.label" :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
</div> </el-form-item>
</el-form>
</div> </div>
<!-- 订单列表 --> <!-- 订单列表 -->
<div <div
...@@ -626,18 +629,6 @@ ...@@ -626,18 +629,6 @@
} }
} }
} }
.filterList {
margin-bottom: 10px;
.label{
min-width: 60px;
}
.searchInput{
width: 100%;
margin-bottom: 10px;
}
}
.detailsRefundScroll { .detailsRefundScroll {
width: 100%; width: 100%;
height: calc(100% - 250px); height: calc(100% - 250px);
...@@ -646,7 +637,6 @@ ...@@ -646,7 +637,6 @@
padding-right: 10px; padding-right: 10px;
border-radius: 5px; border-radius: 5px;
} }
.orderDetails { .orderDetails {
width: 100%; width: 100%;
height: auto; height: auto;
......
src/views/orderList.vue
<template> <template>
<div class="order-info-list columnFlex"> <div class="order-info-list columnFlex">
<div class="content"> <div class="content">
<div class="tabSelect rowFlex"> <el-tabs v-model="activeTypeStr" @tab-click="handleTabClick" class="order-tabs">
<div v-for="(item, index) in orderTypeList" :key="index" class="rowFlex allCenter flex1"> <el-tab-pane v-for="(item, index) in orderTypeList"
<span class="tabSelectItem" :class="activeType == item.type ? 'tabSelectItemActive' : ''" @click="handleClick(item)"> {{ item.label }}</span> :key="index"
</div> :label="item.label"
</div> :name="String(item.value)">
</el-tab-pane>
</el-tabs>
<!-- 订单的一些信息 --> <!-- 订单的一些信息 -->
<div v-show="activeType!==3"> <div v-show="activeType!==3">
<div class="orderMoney rowFlex flexWarp"> <div class="orderMoney rowFlex flexWarp">
...@@ -179,15 +181,16 @@ ...@@ -179,15 +181,16 @@
return { return {
sanjiaoxing, sanjiaoxing,
loading: false, loading: false,
activeType: 2, activeType: 4,
activeTypeStr: '4',
dateDetailsValue: [], dateDetailsValue: [],
isloadMore: true, isloadMore: true,
collapseValue: ['1'], collapseValue: ['1'],
orderTypeList: [ orderTypeList: [
{ label: '全部订单', type: '' }, { label: '全部订单', value: 4 },
{ label: '已支付', type: 2 }, { label: '已支付', value: 2 },
{ label: '未支付', type: 1 }, { label: '未支付', value: 1 },
{ label: '退款记录', type: 3 } { label: '退款记录', value: 3 }
], ],
orderList: [], orderList: [],
payList: [], payList: [],
...@@ -225,6 +228,12 @@ ...@@ -225,6 +228,12 @@
...mapState('user', ['userInfo']) ...mapState('user', ['userInfo'])
}, },
watch: { watch: {
activeTypeStr(newVal) {
this.activeType = parseInt(newVal);
},
activeType(newVal) {
this.activeTypeStr = String(newVal);
},
accountSelect(newVal, oldVal) { accountSelect(newVal, oldVal) {
if (newVal && newVal !== '' && this.activeType !== 3) { if (newVal && newVal !== '' && this.activeType !== 3) {
this.pageInfo = { this.pageInfo = {
...@@ -359,8 +368,11 @@ ...@@ -359,8 +368,11 @@
// } // }
// }) // })
// }, // },
handleClick(item) { handleTabClick(tab) {
this.activeType = item.type console.log('Tab clicked:', tab.name, typeof tab.name);
// 确保activeTypeStr与tab.name同步
this.activeTypeStr = tab.name;
if (this.activeType !== 3) { if (this.activeType !== 3) {
this.isloadMore = true this.isloadMore = true
this.pageInfo = { this.pageInfo = {
...@@ -369,7 +381,7 @@ ...@@ -369,7 +381,7 @@
total: 0 total: 0
} }
this.orderList = [] this.orderList = []
this.requestOrderList('msg') this.requestOrderList()
} }
}, },
handleChange(val) { handleChange(val) {
...@@ -463,17 +475,16 @@ ...@@ -463,17 +475,16 @@
overflow-x: hidden; overflow-x: hidden;
.tabSelect { .tabSelect {
width: 100%; width: 100%;
height: 60px; height: 32px;
border-bottom: 1px solid #ebeef5; border-bottom: 1px solid #ebeef5;
cursor: pointer; cursor: pointer;
.tabSelectItem { .tabSelectItem {
font-size: 16px; font-size: 14px;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
padding-top: 10px;
cursor: pointer; cursor: pointer;
line-height: 40px; line-height: 32px;
} }
.tabSelectItemActive { .tabSelectItemActive {
color: #409EFF; color: #409EFF;
...@@ -688,13 +699,28 @@ ...@@ -688,13 +699,28 @@
} }
} }
} }
}
.order-tabs {
margin-bottom: 15px;
::v-deep .el-tabs__header {
margin-bottom: 15px;
}
::v-deep .el-tabs__item { ::v-deep .el-tabs__item {
line-height: 26px; height: 40px;
font-size: 16px; line-height: 40px;
font-size: 14px;
&.is-active {
color: #3491FA;
font-weight: 500; font-weight: 500;
} }
}
/* 已移除局部 el-collapse 样式，使用全局样式 */ ::v-deep .el-tabs__active-bar {
background-color: #3491FA;
}
} }
</style> </style>
\ No newline at end of file
src/views/userInfo/userInfo.vue
<template> <template>
<div class="userInfo-content"> <div class="userInfo-content">
<el-tabs v-model="activeTab" class="user-tabs">
<el-tab-pane label="客户信息" name="info">
<Info :chatUserDetails="chatUserInfo"/> <Info :chatUserDetails="chatUserInfo"/>
</el-tab-pane>
<el-tab-pane label="角色信息" name="role">
<roleInfo v-if="activeTab === 'role'" />
</el-tab-pane>
<el-tab-pane label="订单信息" name="order">
<orderList v-if="activeTab === 'order'" />
</el-tab-pane>
<el-tab-pane label="违规记录" name="violation">
<violationRecord v-if="activeTab === 'violation'" />
</el-tab-pane>
</el-tabs>
</div> </div>
</template> </template>
<script> <script>
import Info from './components/Info.vue' import Info from './components/Info.vue'
import { mapState,mapMutations } from 'vuex' import roleInfo from '@/views/roleInfo.vue'
import orderList from '@/views/orderList.vue'
import violationRecord from '@/views/ViolationRecord.vue'
import { mapState, mapMutations } from 'vuex'
export default { export default {
name: 'UserInfo', name: 'UserInfo',
components:{ components: {
Info, Info,
roleInfo,
orderList,
violationRecord
}, },
mounted() { mounted() {
}, },
data() { data() {
return { return {
activeTab: 'info'
} }
}, },
computed:{ computed: {
...mapState('game',['chatUserInfo']), ...mapState('game', ['chatUserInfo']),
}, },
created(){ created() {
// 初始化 vuex 中的值 // 初始化 vuex 中的值
}, },
methods:{ methods: {
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.userInfo-content{ .userInfo-content {
width: 100%; width: 100%;
height: 100%; height: 100%;
background: #fff; background: #fff;
font-size: 14px; font-size: 14px;
.user-tabs {
width: 100%;
::v-deep .el-tabs__header {
margin-bottom: 15px;
padding: 0 10px;
}
::v-deep .el-tabs__nav-wrap::after {
height: 1px;
}
::v-deep .el-tabs__item {
height: 40px;
line-height: 40px;
font-size: 14px;
}
::v-deep .el-tabs__active-bar {
height: 2px;
}
::v-deep .el-tabs__content {
height: calc(100% - 55px);
overflow-y: auto;
}
}
} }
</style> </style>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论