Skip to content

S
self-support
Commit 3178e1cd authored by Facius's avatar Facius
Browse files
Options

feat:1.4.6需求变动

parent 456c71ce
Hide whitespace changes
Inline Side-by-side
Showing with 359 additions and 37 deletions
src/pages.json
View file @ 3178e1cd
......@@ -182,6 +182,26 @@
"navigationBarBackgroundColor": "#F4F5F7"
}
},
{
"path": "history/index",
"style": {
"navigationBarTitleText": "浏览记录",
"enablePullDownRefresh": false,
"disableScroll": true,
"navigationStyle": "custom",
"navigationBarBackgroundColor": "#F4F5F7"
}
},
{
"path": "info/index",
"style": {
"navigationBarTitleText": "我的资料",
"enablePullDownRefresh": false,
"disableScroll": true,
"navigationStyle": "custom",
"navigationBarBackgroundColor": "#F4F5F7"
}
},
{
"path": "wallet/index",
"style": {
......
src/pages/index/index.vue
View file @ 3178e1cd
......@@ -107,7 +107,7 @@
</view>
</scroll-view>
<!-- 悬浮按钮 -->
<EusingList />
<!-- <EusingList /> -->
</view>
</TabBarPage>
</template>
......@@ -117,14 +117,14 @@ import TabBarPage from '@/components/tabBarList/index.vue'
import NoOrder from '@/components/order/noOrder.vue'
const app = getApp()
import OrderCell from '@/components/order/index.vue'
import EusingList from '@/components/order/eusingList.vue'
// import EusingList from '@/components/order/eusingList.vue'
export default {
components: {
OrderCell,
TabBarPage,
NoOrder,
EusingList,
// EusingList,
},
data() {
return {
......
src/pages/index/mine.vue
View file @ 3178e1cd
......@@ -58,7 +58,6 @@
</template>
<script>
import util from '@/utils/util.js'
import login from "@/utils/login.js";
const app = getApp();
export default {
......@@ -101,26 +100,42 @@
imageStyle: 'width:34rpx;height:32rpx'
},
{
pathName: 'deposit/index',
title: '配件押金',
pathName: 'info/index',
title: '我的资料',
value: '',
icon: 'yajin.png',
icon: 'wodeziliao.png',
imageStyle: 'width:32rpx;height:32rpx'
},
{
pathName: 'contract/index',
title: '我的合同',
pathName: 'history/index',
title: '浏览记录',
value: '',
icon: 'hetong.png',
icon: 'liulanjilu.png',
imageStyle: 'width:34rpx;height:32rpx'
},
{
pathName: 'cert/index',
title: '我的证件',
value: '',
icon: 'zhengjian.png',
imageStyle: 'width:36rpx;height:28rpx'
}],[
// {
// pathName: 'deposit/index',
// title: '配件押金',
// value: '',
// icon: 'yajin.png',
// imageStyle: 'width:32rpx;height:32rpx'
// },
// {
// pathName: 'contract/index',
// title: '我的合同',
// value: '',
// icon: 'hetong.png',
// imageStyle: 'width:34rpx;height:32rpx'
// },
// {
// pathName: 'cert/index',
// title: '我的证件',
// value: '',
// icon: 'zhengjian.png',
// imageStyle: 'width:36rpx;height:28rpx'
// }
],
[
{
pathName: 'address/index',
title: '收货地址',
......@@ -190,6 +205,12 @@
},
shezhiImage() {
return process.uniEnv.qn_base_url + 'shezhi.png'
},
liulanjilumage() {
return process.uniEnv.qn_base_url + 'liulanjilu.png'
},
wodeziliaoImage() {
return process.uniEnv.qn_base_url + 'wodeziliao.png'
},
isSuperuser() {
return this.vuex_superuser
......@@ -404,13 +425,10 @@
align-items: center;
}
}
}
}
.list-view {
.group-view {
margin-top: 20rpx;
background-color: #FFFFFF;
......@@ -434,11 +452,8 @@
margin: 30rpx;
}
}
}
}
}
.logout {
padding: 20rpx;
......
src/pages/index/order.vue
View file @ 3178e1cd
......@@ -92,7 +92,7 @@
</scroll-view>
</view>
<!-- 悬浮按钮 -->
<EusingList type="collapse" />
<!-- <EusingList type="collapse" /> -->
</TabBarPage>
</template>
......@@ -100,14 +100,14 @@
import TabBarPage from '@/components/tabBarList/index.vue'
import OrderCell from '@/components/order/index.vue'
import NoOrder from '@/components/order/noOrder.vue'
import EusingList from '@/components/order/eusingList.vue'
// import EusingList from '@/components/order/eusingList.vue'
export default {
components: {
TabBarPage,
OrderCell,
NoOrder,
EusingList,
// EusingList,
},
data() {
return {
......
src/pages/mine/cert/index.vue
View file @ 3178e1cd
......@@ -128,11 +128,6 @@
this.isRuZhu = false;
});
},
onUnload() {
uni.switchTab({
url: '/pages/index/mine'
});
},
methods: {
isUpload(typeBool) {
return typeBool ? '已上传' : '未上传'
......
src/pages/mine/contract/index.vue
View file @ 3178e1cd
<template>
<view class="contract">
<u-navbar
title="我的合同"
b:is-back="false"
:background="background"
:border-bottom="false"
></u-navbar>
<u-navbar
back-icon-color="#333333"
background="#FFFFFF"
title="我的合同"
titleColor="#333333"
:border-bottom="false"
title-bold
></u-navbar>
<view class="content">
<view v-if="res.length > 0">
<text class="title">合同清单</text>
......
src/pages/mine/history/index.vue 0 → 100644
View file @ 3178e1cd
<template>
<view class="history-view">
<u-navbar
back-icon-color="#333333"
background="#FFFFFF"
:title="title"
titleColor="#333333"
:border-bottom="false"
title-bold
></u-navbar>
<view class="none-view" v-if="noneHistory">
<NoOrder
text="当前暂无浏览记录"
:customStyle="customStyle"
imageName="zhangdan.png"
/>
</view>
<template v-else>
<view class="head-view">
<image
:src="chakanjiluImage"
class="back-image"
mode="widthFix"
></image>
<view class="head-info">
<view>最近查看记录</view>
<view class="head-message">最近查看或操作过的5条订单</view>
</view>
</view>
<view class="content-view">
<view v-for="item in orderList" :key="item.orderId">
<OrderCell
:orderData="item"
:location="[]"
model="simple"
@click="handleClickCell"
@action="handleClickButton"
>
</OrderCell>
</view>
<view class="bottom-tip">
<u-loadmore
:status="nomore"
font-size="26"
color="#999999"
></u-loadmore>
</view>
</view>
</template>
</view>
</template>
<script>
import OrderCell from '@/components/order/index.vue'
import NoOrder from '@/components/order/noOrder.vue'
export default {
components: {
OrderCell,
NoOrder,
},
props: {
visible: {
type: Boolean,
default: false,
},
},
data() {
return {
loaded: false,
}
},
computed: {
title() {
return this.noneHistory ? '浏览记录' : ' '
},
noneHistory() {
return this.orderList.length <= 0
},
orderList() {
return this.vuex_last_five_orders.filter((item) => item) || []
},
chakanjiluImage() {
return process.uniEnv.qn_base_url + 'chakanjilu-y.png'
},
customStyle() {
return 'background-color: #F4F5F7'
},
},
onLoad() {
getApp().trackPage('浏览记录')
},
methods: {
handleClickCell(item, type, showCountTime) {
// type:类型，showCountTime：是否显示倒计时。详情页面情况太多，提前传值可以避免页面晃动
//type类型
// 'waitAccept': 待接单、待抢单;'waitAppointment': 待预约;'waitCheckIn': 待签到;'waitFinish': 待完工;'audit': 审核中;'exception': 异常单;'finish': 已完工;'other': 工单结算信息
uni.navigateTo({
url:
'pages/order/detail?id=' +
item.orderId +
'&type=' +
type +
'&showCountTime=' +
showCountTime,
})
},
handleClickButton(item, type, showCountTime) {
uni.navigateTo({
url:
'pages/order/complete?orderId=' +
item.orderId +
'&categoryId=' +
item.categoryId +
'&orderServiceType=' +
item.orderServiceType +
'&inGuaranteePeriod=' +
item.inGuaranteePeriod +
'&partnerCompanyId=' +
item.partnerCompanyId +
'&maintainStep=' +
item.maintainStep +
'&orderStatus=' +
item.orderStatus +
'&brandId=' +
item.lianbaoBrandId +
'&auditResults=' +
(item.auditResults ? Object.keys(item.auditResults).join() : ''),
})
},
},
}
</script>
<style lang="scss" scoped>
.history-view {
display: flex;
flex-direction: column;
height: 100vh;
.head-view {
display: relative;
.back-image {
position: absolute;
top: 0;
left: 0;
width: 100%;
z-index: -1;
}
.head-info {
padding: 0 30rpx 20rpx 30rpx;
font-size: 48rpx;
font-weight: bold;
color: #333333;
.head-message {
font-size: 32rpx;
color: #2272ff;
font-weight: 400;
margin-top: 14rpx;
}
}
}
.none-view {
margin-top: 160rpx;
}
.content-view {
height: 100%;
overflow: auto;
.bottom-tip {
margin-bottom: 44rpx;
margin-top: 30rpx;
}
}
}
</style>
src/pages/mine/info/index.vue 0 → 100644
View file @ 3178e1cd
<template>
<view class="info-view">
<u-navbar
back-icon-color="#333333"
background="#FFFFFF"
title="我的资料"
titleColor="#333333"
:border-bottom="false"
title-bold
></u-navbar>
<view class="list-view">
<view v-for="(group, ind) in items" :key="ind" class="group-view">
<u-cell-group :border="false">
<view v-for="(item, index) in group" :key="index">
<u-cell-item
:value="item.value"
@click="handleClick(item.pathName)"
>
<image
slot="icon"
:src="item.icon"
:style="item.imageStyle"
></image>
<view slot="title" class="item-title">{{ item.title }}</view>
<view slot="value" class="item-value">{{ value }}</view>
</u-cell-item>
</view>
</u-cell-group>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {}
},
computed: {
items() {
return [
[
{
pathName: 'deposit/index',
title: '配件押金',
value: '',
icon: process.uniEnv.qn_base_url + 'yajin.png',
imageStyle: 'width:32rpx;height:32rpx',
},
{
pathName: 'contract/index',
title: '我的合同',
value: '',
icon: process.uniEnv.qn_base_url + 'hetong.png',
imageStyle: 'width:34rpx;height:32rpx',
},
{
pathName: 'cert/index',
title: '我的证件',
value: '',
icon: process.uniEnv.qn_base_url + 'zhengjian.png',
imageStyle: 'width:36rpx;height:28rpx',
},
],
]
},
},
onLoad() {
getApp().trackPage('我的资料')
},
methods: {
handleClick(path) {
this.$u.route({
url: 'pages/mine/' + path,
})
},
},
}
</script>
<style lang="scss" scoped>
.info-view {
position: relative;
height: 100vh;
display: flex;
background-color: #f4f5f7;
flex-direction: column;
.list-view {
height: 100%;
overflow: auto;
.group-view {
margin-top: 20rpx;
background-color: #ffffff;
border-radius: 12rpx;
overflow: hidden;
.item-title {
font-size: 32rpx;
color: #333333;
margin-left: 16rpx;
line-height: 32rpx;
}
.item-value {
font-size: 26rpx;
color: #999999;
}
.line-view {
height: 2rpx;
background-color: #f4f5f7;
margin: 30rpx;
}
}
}
}
</style>
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