Commit fabe331a authored by Damon's avatar Damon

Merge branch 'test' of git.banshouhui.com:lijundan/self-support into test

parents 38635224 9c6d9ebb
;(function() {
let NODE_ENV = 'prod' // dev:开发环境 | test:测试环境 | prod:生产环境
let NODE_ENV = 'test' // dev:开发环境 | test:测试环境 | prod:生产环境
let ENV_VAR = null
let VERSION_NUMBER = '1.5.0' //版本号
//小程序是否审核通过,参数配置在ucenter库version表,对应版本号的is_audit设置为1,将显示学习视频
......
......@@ -3023,6 +3023,8 @@
"terser-webpack-plugin": "^2.3.6",
"thread-loader": "^2.1.3",
"url-loader": "^2.2.0",
"vue-loader": "^15.9.2",
"vue-loader-v16": "npm:vue-loader@^16.1.0",
"vue-style-loader": "^4.1.2",
"webpack": "^4.0.0",
"webpack-bundle-analyzer": "^3.8.0",
......@@ -3037,14 +3039,6 @@
"integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
"dev": true
},
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://repo.huaweicloud.com/repository/npm/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"requires": {
"color-convert": "^2.0.1"
}
},
"cacache": {
"version": "13.0.1",
"resolved": "https://registry.npm.taobao.org/cacache/download/cacache-13.0.1.tgz?cache=0&sync_timestamp=1616431156987&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-13.0.1.tgz",
......@@ -3071,28 +3065,6 @@
"unique-filename": "^1.1.1"
}
},
"chalk": {
"version": "4.1.1",
"resolved": "https://repo.huaweicloud.com/repository/npm/chalk/-/chalk-4.1.1.tgz",
"integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://repo.huaweicloud.com/repository/npm/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"requires": {
"color-name": "~1.1.4"
}
},
"color-name": {
"version": "1.1.4",
"resolved": "https://repo.huaweicloud.com/repository/npm/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"css-loader": {
"version": "3.6.0",
"resolved": "https://registry.npm.taobao.org/css-loader/download/css-loader-3.6.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcss-loader%2Fdownload%2Fcss-loader-3.6.0.tgz",
......@@ -3187,15 +3159,11 @@
"slash": "^2.0.0"
}
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://repo.huaweicloud.com/repository/npm/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
},
"hash-sum": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/hash-sum/download/hash-sum-2.0.0.tgz",
"integrity": "sha1-gdAbtd6OpKIUrV1urRtSNGCwtFo="
"integrity": "sha1-gdAbtd6OpKIUrV1urRtSNGCwtFo=",
"dev": true
},
"human-signals": {
"version": "1.1.1",
......@@ -3355,14 +3323,6 @@
"minipass": "^3.1.1"
}
},
"supports-color": {
"version": "7.2.0",
"resolved": "https://repo.huaweicloud.com/repository/npm/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"requires": {
"has-flag": "^4.0.0"
}
},
"terser-webpack-plugin": {
"version": "2.3.8",
"resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.3.8.tgz?cache=0&sync_timestamp=1610196021147&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-2.3.8.tgz",
......@@ -3381,24 +3341,23 @@
}
},
"vue-loader": {
"version": "16.3.0",
"resolved": "https://repo.huaweicloud.com/repository/npm/vue-loader/-/vue-loader-16.3.0.tgz",
"integrity": "sha512-UDgni/tUVSdwHuQo+vuBmEgamWx88SuSlEb5fgdvHrlJSPB9qMBRF6W7bfPWSqDns425Gt1wxAUif+f+h/rWjg==",
"version": "15.9.8",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.8.tgz",
"integrity": "sha512-GwSkxPrihfLR69/dSV3+5CdMQ0D+jXg8Ma1S4nQXKJAznYFX14vHdc/NetQc34Dw+rBbIJyP7JOuVb9Fhprvog==",
"dev": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
"@vue/component-compiler-utils": "^3.1.0",
"hash-sum": "^1.0.2",
"loader-utils": "^1.1.0",
"vue-hot-reload-api": "^2.3.0",
"vue-style-loader": "^4.1.0"
},
"dependencies": {
"loader-utils": {
"version": "2.0.0",
"resolved": "https://repo.huaweicloud.com/repository/npm/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
"hash-sum": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
"integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=",
"dev": true
}
}
}
......@@ -16421,6 +16380,94 @@
"vue-style-loader": "^4.1.0"
}
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.5.0",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz",
"integrity": "sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true,
"optional": true
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true,
"optional": true
},
"hash-sum": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
"integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
"dev": true,
"optional": true
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"optional": true,
"requires": {
"has-flag": "^4.0.0"
}
}
}
},
"vue-style-loader": {
"version": "4.1.3",
"resolved": "https://registry.npm.taobao.org/vue-style-loader/download/vue-style-loader-4.1.3.tgz?cache=0&sync_timestamp=1614758652197&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-style-loader%2Fdownload%2Fvue-style-loader-4.1.3.tgz",
......
......@@ -14,11 +14,18 @@ let orderApiFun = function(vm){
* 工单数量查询接口
*/
let listOrderCount = async (params = {}) => await vm.$u.get(prefix + vm.vuex_token + '/wokerOrder/queryOrdersCount/V2', params);
/**
* 订单管理工单数量查询接口
*/
let manageOrderCount = async (params = {}) => await vm.$u.get(prefix + 'wokerOrder/countOrderByTimeRange', params);
/**
* 工单列表接口
*/
let listOrder = async (params = {}) => await vm.$u.get('/wxh-worker-rest/rest/order/revision/' + vm.vuex_token + '/list', params);
/**
* 订单管理工单列表接口
*/
let manageOrderList = async (params = {}) => await vm.$u.get('/wxh-worker-rest/rest/order/revision/listOrderByTimeRange', params);
/**
* 获取师傅的预约日历
......@@ -200,10 +207,15 @@ let orderApiFun = function(vm){
let cancelParts = async (partOrderId) => await vm.$u.put(prefix + 'parts/' + vm.vuex_token + '/orders/'+ partOrderId +'/cancel',{}, formType);
// 点击了异常单去处理
let workerDealWithError = async (orderId, params = {}) => await vm.$u.post( prefix + vm.vuex_token + '/order/' + orderId + '/workerDealWithError', params)
// 工单搜索联想
let association = async (params = {}) => await vm.$u.get('/wxh-worker-rest/rest/order/revision/association', params);
const orderApi = {
listByRecommendOrder,
listOrderCount,
manageOrderCount,
listOrder,
manageOrderList,
workerCalendar,
workerAppointment,
maintainWorkerCheckin,
......@@ -252,7 +264,8 @@ let orderApiFun = function(vm){
getOrderPartsSum,
receiveParts,
cancelParts,
workerDealWithError
workerDealWithError,
association
}
return orderApi
}
......
......@@ -51,7 +51,7 @@ const install = (Vue, vm) => {
config.header['Authorization'] = token
}
// config.header.token = vm.vuex_token || 'RTOKENe56f873b5823477fa2e15572f8fa7eb3a5fb6f7b';
config.header['token'] = token;
config.header['x-requested-with'] = 'xmlhttprequest';
return config;
}
......
<template>
<view class="eusing-view">
<view class="fixed-button">
<ApplyButton
:type.sync="buttonType"
icon="dingdan-button.png"
text="最近查看"
clickedType="hidden"
:show.sync="showApplyButton"
@click="visible = true"
/>
</view>
<FiveOrders
:visible.sync="visible"
@close="showApplyButton = true"
></FiveOrders>
</view>
</template>
<script>
import ApplyButton from '@/components/parts/applyButton.vue'
import FiveOrders from '@/components/order/fiveOrders.vue'
export default {
components: {
ApplyButton,
FiveOrders,
},
props: {
type: {
// 按钮宽'collapse': '80rpx', 'expand': '220rpx'
type: String,
default: 'expand',
},
},
data() {
return {
buttonType: this.type || 'expand', // 申请按钮宽 collapse': '80rpx', 'expand': '220rpx''
showApplyButton: true,
visible: false,
}
},
}
</script>
<style lang="scss" scoped>
.eusing-view {
.fixed-button {
position: fixed;
right: 10rpx;
bottom: 64rpx;
}
}
</style>
<template>
<u-popup
v-model="visible"
mode="center"
safe-area-inset-bottom
width="690rpx"
border-radius="12"
close-icon-color="#333333"
>
<view class="pop-view">
<image :src="chakanjiluImage" class="back-image" mode="widthFix"></image>
<view class="head-view">
<view class="left-view">
<view>最近查看记录</view>
<view class="head-message">最近查看或操作过的5条订单</view>
</view>
<view class="close-button" @click="$u.throttle(handleClose, 500)">
<u-icon name="close"></u-icon>
</view>
</view>
<view class="none-view" v-if="orderList.length <= 0">
<NoOrder text="当前暂无查看记录" />
</view>
<view class="content-view" v-else>
<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>
</view>
</u-popup>
</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 {
// orderList: [],
loaded: false,
}
},
computed: {
orderList() {
return this.vuex_last_five_orders.filter((item) => item) || []
},
chakanjiluImage() {
return process.uniEnv.qn_base_url + 'chakanjilu.png'
},
},
methods: {
// getOrderList() {
// this.loaded = false
// var param = {
// pageNumber: 1,
// pageSize: 5,
// keyword: '',
// type: 'zuijinlianxi',
// }
// this.$u.api.listOrder(param).then((res) => {
// if (res.code == 200) {
// this.orderList = res.data.list || []
// } else {
// console.log(res.message, '获取订单数量失败!')
// }
// this.loaded = true
// })
// },
handleClose() {
this.$emit('update:visible', false)
this.$emit('close')
},
handleClickCell(item, type, showCountTime) {
this.$emit('update:visible', false)
this.$emit('click', 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, auditResults) {
this.$emit('update:visible', false)
this.$emit('click', item, type, showCountTime, auditResults)
// 去完工
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=' +
(auditResults ? auditResults.join() : '') +
'&orderNumber=' +
item.orderNumber,
})
},
},
}
</script>
<style lang="scss" scoped>
.pop-view {
// padding: 30rpx;
max-height: 900rpx;
display: flex;
flex-direction: column;
display: relative;
.back-image {
position: absolute;
top: 0;
left: 0;
width: 100%;
z-index: -1;
}
.head-view {
display: flex;
justify-content: space-between;
align-items: flex-start;
.left-view {
padding: 30rpx 30rpx 20rpx 30rpx;
font-size: 48rpx;
font-weight: bold;
color: #333333;
.head-message {
font-size: 32rpx;
color: #2272ff;
font-weight: 400;
margin-top: 14rpx;
}
}
.close-button {
width: 60rpx;
height: 60rpx;
display: flex;
justify-content: center;
align-items: center;
margin: 14rpx;
}
}
.none-view {
margin-top: 30rpx;
margin-bottom: 50rpx;
}
.content-view {
height: 100%;
overflow: auto;
.bottom-tip {
margin-bottom: 44rpx;
margin-top: 30rpx;
}
}
}
</style>
<template>
<view class="order-view" @click="handleClickCell">
<view class="order-top-view">
<view
:class="['order-view', { simple: isSimple }]"
@click="handleClickCell"
hover-class="u-hover-class"
>
<view v-if="!isSimple" class="order-top-view">
<view class="left-view">
<view :class="['tag-view', { active: active }]">
{{ orderData.orderServiceType }}
......@@ -10,7 +14,14 @@
<view class="right-view">{{ orderData.orderBusinessTypeText }}</view>
</view>
<view class="content-view">
<view class="info-view" v-for="(item, key) in infoTexts" :key="key">
<view
class="info-view"
v-for="(item, key) in infoTexts"
:key="key"
:style="item.style"
>
<view class="info-left-view">
<view v-if="item.symbol" class="symbol-view"> </view>
<view class="info-title">
<text>{{ item.name + ':' }}</text>
</view>
......@@ -18,7 +29,13 @@
<text @longpress="handleLongpress(key, orderData[key])">{{
orderData[key]
}}</text>
<text v-if="item.content">{{ ' / ' + orderData[item.content] }}</text>
<text v-if="item.content">{{
' / ' + orderData[item.content]
}}</text>
</view>
</view>
<view v-if="item.icon">
<u-icon :name="item.icon"></u-icon>
</view>
</view>
<view class="address-view">
......@@ -35,23 +52,22 @@
</view>
</view>
</view>
<template v-if="!isSimple">
<view class="line-view"></view>
<view class="reason-view" v-if="showReason">
<view class="reason-title"><text>未通过原因:</text></view>
<view class="reason-text"
<view class="reason-text">
<text
v-for="(item, index) in orderData.partAuditResults"
:key="index"
>{{ item }}</text
>
<text v-for="(item, index) in orderData.partAuditResults" :key="index">{{
item
}}</text>
<text v-for="(item, index) in orderData.auditResults" :key="index">{{
item
}}</text>
</view
>
</view>
</view>
<view class="bottom-view">
<view>
<view v-if="showCountTime" class="bottom-left-view">
<view :class="['bottom-tag-view', { timeout: timeout }]"
><text>{{ tagText }}</text></view
......@@ -71,7 +87,6 @@
<text>{{ timeTitle }}</text>
<text>{{ timeText }}</text>
</view>
</view>
<u-button
class="right-btn"
@click.stop="handleClick"
......@@ -82,6 +97,7 @@
{{ orderText }}
</u-button>
</view>
</template>
</view>
</template>
......@@ -130,6 +146,11 @@ export default {
return [116.3896, 39.91917] // 纬度,经度
},
},
// simple: 只显示订单号、联系人/电话、地址,点击cell相当于点击订单列表的按钮; normal: 显示全部信息
model: {
type: String,
default: 'normal',
},
},
data() {
return {
......@@ -142,6 +163,9 @@ export default {
// 按钮文字
return this.typeTexts[this.orderType]
},
isSimple() {
return this.model == 'simple'
},
buttonStyle() {
// 按钮样式
/** orderType
......@@ -181,7 +205,17 @@ export default {
return [4, 5, 6].indexOf(this.orderType) != -1
},
infoTexts() {
return {
return this.isSimple
? {
orderNumber: {
symbol: true,
name: '工单编号',
style: 'font-weight: 450;font-size: 28rpx',
icon: 'arrow-right',
},
contactName: { name: '客户信息', content: 'contactPhone' },
}
: {
orderNumber: { name: '工单编号' },
partnerCompanyName: { name: '合作厂商' },
contactName: { name: '客户信息', content: 'contactPhone' },
......@@ -257,6 +291,7 @@ export default {
},
showDistance() {
return (
!this.isSimple &&
this.orderType == 0 &&
this.location.length >= 2 &&
(this.orderData.contactAddressLatitud ||
......@@ -280,6 +315,34 @@ export default {
finish: 6, //已完工
}
},
typeList() {
return [
'waitAccept', // 待接单、
'waitAppointment', // 待预约、
'waitCheckIn', // 待签到、
'waitFinish', // 待完工、
'audit', // 审核中、
'exception', // 异常单、
'finish', //已完工
]
},
realType() {
if (this.type && this.typeList.indexOf(this.type) != -1) {
return this.type
} else {
return this.typeList[this.orderType]
}
},
auditResults() {
let partAuditResults = this.orderData.partAuditResults
? ['orderSpareParts']
: []
let auditResults = this.orderData.auditResults
? Object.keys(this.orderData.auditResults)
: []
auditResults = auditResults.concat(partAuditResults)
},
orderDistance() {
return this.distance(
this.orderData.contactAddressLatitud,
......@@ -304,11 +367,14 @@ export default {
待预约 orderStatus == 31 and appointmentDatetime == null 工单状态等于30并且预约时间为空
待签到 orderStatus == 31 and appointmentDatetime is not null 工单状态等于30并且预约时间不为空
待完工 orderStatus >31 and orderStatus < 80 工单状态大于31 小于80
审核中 orderStatus ==83 or orderStatus == 87 or orderStatus == 88 工单状态 等于85 或者 等于87 或者 等于88
审核中 orderStatus ==83 or orderStatus == 87 or orderStatus == 88 工单状态 等于83 或者 等于85 或者 等于87 或者 等于88
异常 orderStatus ==86 工单状态 等于86
已完工 orderStatus in(80,81,89,110) 工单状态 等于80 or 81 or 89 or 110
*/
if (!this.type) {
if (this.type && this.typeList.indexOf(this.type) != -1) {
return this.types[this.type]
} else {
// 没传或传错type
if (this.orderData.orderStatus < 31) {
return 0
} else if (this.orderData.orderStatus == 31) {
......@@ -338,8 +404,6 @@ export default {
} else {
return 0
}
} else {
return this.types[this.type]
}
},
},
......@@ -369,9 +433,11 @@ export default {
this.$emit(
func,
this.orderData,
this.type,
this.showCountTime ? 'show' : ''
this.realType,
this.showCountTime ? 'show' : '',
this.auditResults
)
this.otherAction()
},
handleClickCell() {
var func = 'click'
......@@ -383,9 +449,35 @@ export default {
this.$emit(
func,
this.orderData,
this.type,
this.showCountTime ? 'show' : ''
this.realType,
this.showCountTime ? 'show' : '',
this.auditResults
)
this.otherAction()
},
// 如果是异常单告诉后台
// 更新最近5条查看记录
otherAction() {
this.exceptionRecord()
this.storeOparation()
},
exceptionRecord() {
// 如果是异常单告诉后台
if (this.realType == 'exception') {
this.$u.api.workerDealWithError(item.orderId).then(() => {})
}
},
storeOparation() {
// 更新最近5条查看记录
if (!this.isSimple) {
var array = (this.vuex_last_five_orders || []).filter((item) => {
// 如果记录中有该工单,删除
return item && item.orderId != this.orderData.orderId
})
array.unshift(this.orderData)
this.$u.vuex('vuex_last_five_orders', array.slice(0, 5))
}
},
handleChange(timestamp) {
if (this.timeout) this.$refs['order-count-down'].seconds += 2
......@@ -464,12 +556,19 @@ export default {
<style lang="scss" scoped>
.order-view {
width: 100%;
// width: 100%;
background-color: #ffffff;
border-radius: 12rpx;
padding: 30rpx;
margin-bottom: 20rpx;
.hover-class {
background-color: #dddddd;
}
&.simple {
margin: 20rpx 30rpx;
padding-top: 12rpx;
box-shadow: 0 0 16rpx rgba(51, 51, 51, 0.1);
}
.order-top-view {
display: flex;
align-items: center;
......@@ -522,15 +621,28 @@ export default {
margin-top: 18rpx;
margin-bottom: 18rpx;
display: flex;
align-items: flex-start;
justify-content: space-between;
align-items: center;
.info-left-view {
display: flex;
justify-content: flex-start;
align-items: center;
.symbol-view {
background-color: #2272ff;
width: 6rpx;
height: 28rpx;
border-radius: 6rpx;
margin-right: 10rpx;
}
.info-title {
flex-shrink: 0;
align-items: center;
}
.info-content {
word-break: break-all;
}
}
}
.address-view {
display: flex;
......
......@@ -3,7 +3,7 @@
<view class="return-cell" @click="handleClick">
<view class="title-view">
<text class="title-text" :style="{'color': titleColor}">{{title}}</text>
<view class="express-view" @click.stop="$u.throttle(handleClickExpress, 500)" v-if="info.express.number">
<view class="express-view" @click.stop="$u.throttle(handleClickExpress, 500)" v-if="info.express.number" hover-class="u-hover-class">
<text>物流单号:</text>
<view class="order-file-right">
<text>{{info.express.number}}</text>
......
<template>
<!-- 申请物料按钮 -->
<view class="apply-button">
<u-button :custom-style="customStyle" shape="circle" @click.stop="handleClick" type="primary">
<u-icon class="apply-icon" name="plus"></u-icon>
<text class="apply-text" v-if="showText">申请物料</text>
<!-- 申请配件按钮 -->
<view class="apply-button" v-show="show">
<u-button
:custom-style="customStyle"
shape="circle"
@click.stop="handleClick"
type="primary"
>
<view class="button-view">
<u-loading mode="flower" :show="loading"></u-loading>
<image
v-if="isImage && !loading"
:src="imageUrl"
class="image-icon"
mode="widthFix"
></image>
<u-icon v-else-if="!loading" class="apply-icon" :name="icon"></u-icon>
<text class="apply-text" v-if="showText">{{ text }}</text>
</view>
</u-button>
</view>
</template>
<script>
export default {
export default {
props: {
type: { // 按钮宽'collapse': '80rpx', 'expand': '220rpx'
type: {
// 按钮宽'collapse': '80rpx', 'expand': '220rpx'
type: String,
default: 'expand'
}
default: 'expand',
},
text: {
type: String,
default: '申请备件',
},
icon: {
type: String,
default: 'plus',
},
show: {
type: Boolean,
default: true,
},
clickedType: {
// normal 点击之后不隐藏; hidden 点击之后隐藏
type: String,
default: 'normal',
},
loading: {
type: Boolean,
default: false,
},
},
computed: {
typeWidth() {
return {
'collapse': '80rpx',
'expand': '220rpx'
collapse: '80rpx',
expand: '220rpx',
}
},
imageUrl() {
return process.uniEnv.qn_base_url + this.icon
},
isImage() {
return /\.(png|jpg|gif|jpeg|webp)$/.test(this.icon)
},
clickedHidden() {
return this.clickedType == 'hidden'
},
typeOpacity() {
return {
collapse: this.clicked == 0 ? '0.6' : '1',
expand: '1',
}
},
showText() {
......@@ -28,26 +79,50 @@
},
customStyle() {
return {
'height': '80rpx',
'width': this.typeWidth[this.type],
height: '80rpx',
width: this.typeWidth[this.type],
opacity: this.typeOpacity[this.type],
}
},
},
data() {
return {
clicked: 0, // 0 不活跃;>1 活跃中
}
},
created() {
setTimeout(()=> {
setTimeout(() => {
this.$emit('update:type', 'collapse')
}, 3000)
},
watch: {
show(val) {
if (val) {
this.clicked += 1
setTimeout(() => {
// 三秒不点击,算失去活跃
this.clicked = Math.max(0, this.clicked - 1)
}, 3000)
}
},
},
methods: {
handleClick() {
if (this.clickedHidden) {
this.$emit('update:show', false)
}
this.$emit('click')
},
}
}
},
}
</script>
<style lang="scss" scoped>
.apply-button {
.apply-button {
.button-view {
display: flex;
justify-content: flex-end;
align-items: center;
.apply-icon {
font-size: 36rpx;
}
......@@ -55,5 +130,10 @@
font-size: 32rpx;
padding-left: 10rpx;
}
.image-icon {
width: 30rpx;
height: 34rpx;
}
}
}
</style>
......@@ -79,7 +79,8 @@
console.log('success');
}
})
}
},
handleClick(){}
}
}
</script>
......
......@@ -162,6 +162,46 @@
"disableScroll": true
}
},
{
"path": "order/index",
"style": {
"navigationBarTitleText": "订单管理",
"enablePullDownRefresh": false,
"disableScroll": true,
"navigationStyle": "custom",
"navigationBarBackgroundColor": "#F4F5F7"
}
},
{
"path": "order/list",
"style": {
"navigationBarTitleText": "订单管理-订单列表",
"enablePullDownRefresh": false,
"disableScroll": true,
"navigationStyle": "custom",
"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": {
......
This diff is collapsed.
......@@ -4,7 +4,6 @@
<u-navbar :is-back="false" :background="{ background: 'transparent' }" :border-bottom="false">
<text class="title-view">我的</text>
</u-navbar>
<view class="mine-content">
<view class="header-view">
<view class="header-left-view">
<view class="head-image">
......@@ -26,10 +25,12 @@
<view v-if="isSuperuser" class="super-button"><u-button@click="handleSuperButton">切换用户</u-button></view>
</view>
</view>
<view class="mine-content">
<view class="ware-house-view">
<view class="ware-house-title">仓配功能</view>
<view class="ware-house-content">
<view v-for="(item, index) in warehouseItems" :key="index" class="ware-house-content-item" @click="handleClick(item.pathName)">
<view v-for="(item, index) in warehouseItems" :key="index" class="ware-house-content-item" @click="handleClick(item.pathName)" hover-class="u-hover-class">
<view class="ware-house-image">
<image :src="item.icon" :style="item.imageStyle"></image>
</view>
......@@ -57,7 +58,6 @@
</template>
<script>
import util from '@/utils/util.js'
import login from "@/utils/login.js";
const app = getApp();
export default {
......@@ -87,6 +87,12 @@
items() {
return [
[{
pathName: 'order/index',
title: '订单管理',
value: '',
icon: 'dingdanguanli.png',
imageStyle: 'width:34rpx;height:32rpx'
},{
pathName: 'wallet/index',
title: '我的钱包',
value: '',
......@@ -94,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: '收货地址',
......@@ -183,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
......@@ -264,9 +292,9 @@
.mine-view {
position: relative;
height: 100vh;
overflow: auto;
display: flex;
background-color: #F4F5F7;
flex-direction: column;
.header-image {
position: absolute;
width: 100%;
......@@ -279,19 +307,18 @@
font-size: 40rpx;
padding-left: 30rpx;
}
.mine-content {
position: relative;
padding: 26rpx 30rpx 30rpx 20rpx;
.header-view {
display: flex;
align-items: flex-start;
justify-content: space-between;
margin-bottom: 60rpx;
// margin-bottom: 60rpx;
padding: 26rpx 30rpx 60rpx 30rpx;
.header-left-view {
display: flex;
align-items: center;
.head-image {
z-index: 1;
width: 120rpx;
height: 120rpx;
background-color: #FFFFFF;
......@@ -338,6 +365,7 @@
}
}
.header-right-view {
z-index: 1;
.setting-view {
display: flex;
justify-content: flex-end;
......@@ -358,6 +386,14 @@
}
}
}
.mine-content {
height: 100%;
overflow: auto;
position: relative;
padding-bottom: 30rpx;
margin: 0rpx 30rpx;
border-radius: 12rpx;
.ware-house-view {
background-color: #FFFFFF;
border-radius: 12rpx;
......@@ -389,13 +425,10 @@
align-items: center;
}
}
}
}
.list-view {
.group-view {
margin-top: 20rpx;
background-color: #FFFFFF;
......@@ -419,10 +452,8 @@
margin: 30rpx;
}
}
}
}
}
.logout {
padding: 20rpx;
......
This diff is collapsed.
......@@ -128,11 +128,6 @@
this.isRuZhu = false;
});
},
onUnload() {
uni.switchTab({
url: '/pages/index/mine'
});
},
methods: {
isUpload(typeBool) {
return typeBool ? '已上传' : '未上传'
......
<template>
<view class="contract">
<u-navbar
back-icon-color="#333333"
background="#FFFFFF"
title="我的合同"
b:is-back="false"
:background="background"
titleColor="#333333"
:border-bottom="false"
title-bold
></u-navbar>
<view class="content">
<view v-if="res.length > 0">
......
<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, auditResults) {
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=' +
(auditResults ? auditResults.join() : '') +
'&orderNumber=' +
item.orderNumber,
})
},
},
}
</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>
<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>
<template>
<view class="order-manage-view">
<u-navbar
back-icon-color="#333333"
background="#FFFFFF"
title="订单管理"
titleColor="#333333"
:border-bottom="false"
title-bold
></u-navbar>
<view class="body-view">
<view class="header-view">
<view class="title-view">工作数据</view>
<view class="time-view">
<u-tabs
height="56"
activeColor="#2272FF"
bg-color="none"
inactive-color="#999"
bar-height="4"
bar-width="44"
:offset="offset"
:list="timeTypeTexts"
:current="current"
@change="change"
:is-scroll="false"
font-size="26"
bold
></u-tabs>
</view>
</view>
<view class="line-view"></view>
<view class="content-view">
<view
v-for="(item, index) in detailLabels"
:key="index"
class="item-view"
>
<view
class="left-view"
@click="handleClick(index)"
hover-class="u-hover-class"
>
<view :class="['count-view', { active: item.type == 'finish' }]">{{
info[item.key] || 0
}}</view>
<view>{{ item.label }}</view>
</view>
</view>
</view>
<view>
<u-toast ref="uToast" />
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
info: {},
offset: [0, 0],
current: 0,
currentTime: 'today',
}
},
computed: {
timeTypeTexts() {
return [
{ name: '今日' },
{ name: '昨日' },
{ name: '本周' },
{ name: '本月' },
]
// return { today: '今日', yesterday: '昨日', week: '本周', month: '本月' }
},
detailLabels() {
return [
{ label: '已接单', type: 'take', key: 'acceptedCount' },
{ label: '已签到', type: 'checkin', key: 'checkedCount' },
{ label: '已提交完工', type: 'finish', key: 'finishedCount' },
]
},
params() {
var date = new Date()
var timestamp = date.getTime()
var today = this.$u.timeFormat(timestamp, 'yyyy-mm-dd')
var yesterday = this.$u.timeFormat(date.setDate(date.getDate() - 1))
var weekDays = [6, 0, 1, 2, 3, 4, 5]
var week = this.$u.timeFormat(
date.setDate(date.getDate() - weekDays[date.getDay()])
)
var month = this.$u.timeFormat(date.setDate(1))
return [
{ start: today, end: today },
{ start: yesterday, end: yesterday },
{ start: week, end: today },
{ start: month, end: today },
]
},
currentParam() {
return this.params[this.current]
},
},
onLoad() {
this.getOrderCount()
},
methods: {
// 获取订单数量
getOrderCount() {
this.$u.api.manageOrderCount(this.currentParam).then((res) => {
if (res.code == 200) {
if (res.data) {
this.info = res.data || {}
}
} else {
console.log(res.message, '获取订单数量失败!')
}
})
},
change(index) {
this.current = index
this.getOrderCount()
},
handleClick(index) {
var item = this.detailLabels[index]
if (this.info[item.key] > 0) {
this.$u.route({
url: 'pages/mine/order/list',
params: {
orderType: item.type,
title: this.timeTypeTexts[this.current].name + '-' + item.label,
...this.currentParam,
},
})
} else {
this.$refs.uToast.show({
title: '暂无数据',
type: 'warning',
})
}
},
},
}
</script>
<style lang="scss" scoped>
.order-manage-view {
.body-view {
background-color: #ffffff;
margin: 20rpx 30rpx;
border-radius: 12rpx;
padding: 20rpx 30rpx;
.header-view {
display: flex;
justify-content: space-between;
.title-view {
font-size: 32rpx;
color: #333333;
font-weight: bold;
display: flex;
align-items: center;
}
.time-view {
width: 300rpx;
}
}
.line-view {
width: 100%;
background-color: #f4f5f7;
height: 2rpx;
margin: 30rpx 0;
}
.content-view {
display: flex;
align-self: center;
justify-content: space-around;
padding: 54rpx 0;
.item-view {
display: flex;
align-items: center;
justify-content: center;
.left-view {
text-align: center;
color: #666666;
font-size: 28rpx;
width: 180rpx;
.count-view {
font-weight: bold;
font-size: 52rpx;
margin-bottom: 20rpx;
color: #333333;
&.active {
color: #2272ff;
}
}
}
}
}
}
}
</style>
<template>
<view class="list-view">
<u-navbar
back-icon-color="#333333"
background="#FFFFFF"
:title="title"
titleColor="#333333"
:border-bottom="false"
title-bold
></u-navbar>
<view class="content-view">
<scroll-view
scroll-y
@scrolltolower="reachBottom"
scroll-anchoring
refresher-enabled="true"
:refresher-triggered="triggered"
:refresher-threshold="100"
:scroll-top="scrollTop"
refresher-background="#F4F5F7"
@refresherrefresh="onRefresh"
@refresherrestore="onRestore"
enable-back-to-top
>
<view class="loading-view" v-if="!loaded && !_freshing">
<u-loading mode="flower"></u-loading>
</view>
<NoOrder
v-else-if="noMore"
imageName="zwdd.png"
:customStyle="noOrderCustomStyle"
/>
<template v-else>
<view v-for="item in orderList" :key="item.orderId">
<OrderCell
:orderData="item"
:type="cellType"
:location="dataValue"
@click="handleClick"
@action="handleClickCellButton"
>
</OrderCell>
</view>
<view
class="load-more-view"
v-show="(pageNumber == 1 && loaded) || pageNumber > 1"
>
<u-loadmore :status="loadStatus" bgColor="#F4F5F7"></u-loadmore>
</view>
</template>
</scroll-view>
</view>
</view>
</template>
<script>
import OrderCell from '@/components/order/index.vue'
import NoOrder from '@/components/order/noOrder.vue'
export default {
components: {
OrderCell,
NoOrder,
},
data() {
return {
pageNumber: 0,
pageSize: 10000, // 因为需要排序,所以暂时去掉分页
orderList: [],
loadStatus: 'loading',
dataValue: [],
loaded: false,
triggered: true,
_freshing: false,
title: '',
orderType: '',
timeParam: {},
}
},
computed: {
cellType() {
return this.orderType == 'finish' ? 'finish' : ''
},
noMore() {
return this.orderList.length == 0 && this.loaded
},
noOrderCustomStyle() {
return 'margin-top: 100rpx;background-color: #F4F5F7'
},
},
onLoad(e) {
getApp().trackPage('订单首页')
this._freshing = false
if (e && e.title) {
this.title = decodeURIComponent(e.title)
}
if (e && e.orderType) {
this.orderType = e.orderType
}
if (e && e.start && e.end) {
this.timeParam = { start: e.start, end: e.end }
}
this.reloadOrderList()
},
methods: {
reachBottom(e) {
if (this.loadStatus != 'loadmore') return
this.loadStatus == 'loading'
this.getOrderList()
},
// 页面数据
getOrderList() {
// 状态处理
this.pageNumber += 1
if (this.pageNumber == 1) {
this.loaded = false
}
var param = {
pageNumber: this.pageNumber,
pageSize: this.pageSize,
keyword: '',
type: this.orderType,
...this.timeParam,
}
var self = this
self.$u.api.manageOrderList(param).then((res) => {
if (res.code == 200) {
if (self.pageNumber == 1) {
self.orderList = []
}
if (res.data.list) {
self.orderList.push(...res.data.list)
self.orderList.sort((x, y) => {
return x.currentOverTime <= y.currentOverTime ? 1 : -1
})
self.loadStatus =
res.data.total > self.orderList.length &&
res.data.list.length == self.pageSize
? 'loadmore'
: 'nomore'
}
} else {
console.log(res.message, '获取订单数量失败!')
}
self.$nextTick(() => {
if (self._freshing) {
self.triggered = false
self._freshing = false
}
})
this.loaded = true
})
},
handleClickCellButton(item, type, showCountTime, auditResults) {
// 去完工
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=' +
(auditResults ? auditResults.join() : '') +
'&orderNumber=' +
item.orderNumber,
})
},
handleClick(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,
})
},
onRefresh() {
if (this._freshing) return
this._freshing = true
this.reloadOrderList()
},
onRestore() {
this.triggered = 'restore' // 需要重置
},
reloadOrderList() {
this.pageNumber = 0
this.loadStatus = 'loading'
this.getOrderList()
},
},
}
</script>
<style lang="scss" scoped>
.list-view {
height: 100vh;
overflow: auto;
display: flex;
flex-direction: column;
.content-view {
height: 100%;
overflow: auto;
padding: 20rpx 30rpx;
.load-more-view {
padding-bottom: 44rpx;
}
.loading-view {
width: 100%;
display: flex;
align-items: center;
justify-content: center;
margin-top: 300rpx;
position: absolute;
}
}
}
</style>
......@@ -29,7 +29,7 @@
{
pathName: 'about',
title: '当前版本',
value: process.uniEnv.version,
value: process.uniEnv.version_number,
icon: process.uniEnv.qn_base_url + 'version.png',
imageStyle: 'width:32rpx;height:32rpx'
}
......
......@@ -318,7 +318,7 @@
.fixed-button {
position: fixed;
right: 20rpx;
right: 10rpx;
bottom: 64rpx;
}
......
......@@ -63,7 +63,9 @@
:prop="item.fieldsName"
:border-bottom="false"
v-show="
((item.fieldsName != 'actualPaid' && item.fieldsName != 'eSerialNum') || show200) &&
((item.fieldsName != 'actualPaid' &&
item.fieldsName != 'eSerialNum') ||
show200) &&
((readOnly &&
!$u.test.isEmpty(form[item.fieldsName])) ||
!readOnly)
......@@ -866,7 +868,7 @@ export default {
const save = await this.nextStepSaveData()
if (save) {
uni.reLaunch({
url: '/pages/index/order?type=0',
url: '/pages/index/order?type=waitAppointment',
})
}
},
......@@ -1002,7 +1004,7 @@ export default {
type: 'success',
callback: () => {
uni.reLaunch({
url: '/pages/index/order?type=3',
url: '/pages/index/order?type=audit',
})
},
})
......@@ -1023,7 +1025,7 @@ export default {
type: 'success',
callback: () => {
uni.reLaunch({
url: '/pages/index/order?type=3',
url: '/pages/index/order?type=audit',
})
},
})
......@@ -1091,10 +1093,14 @@ export default {
if (innerItem.fieldsName === 'paymentMethodsType') {
// 选不需要收款的时候,收款金额修改为非必选
const actualPaid = groupItem.items.find((v) => v.fieldsName === 'actualPaid')
const actualPaid = groupItem.items.find(
(v) => v.fieldsName === 'actualPaid'
)
actualPaid.required = data.value != '03'
const eSerialNum = groupItem.items.find((v) => v.fieldsName === 'eSerialNum')
const eSerialNum = groupItem.items.find(
(v) => v.fieldsName === 'eSerialNum'
)
eSerialNum.required = data.value != '03'
}
......
......@@ -947,7 +947,7 @@ export default {
'&brandId=' +
this.order.lianbaoBrandId +
'&orderNumber=' +
this.order.orderNumber
this.order.orderNumber,
})
},
rejectOrder() {
......
......@@ -16,18 +16,49 @@
:action-style="{
'font-size': '32rpx',
'font-weight': 500,
'color': '#2272FF'
color: '#2272FF',
}"
:focus="true"
@change="keywordChange"
@focus="onfocus"
@blur="loseFocus"
@search="searchOrder"
@custom="searchOrder"
></u-search>
</view>
<view class="content-item">
<view class="association-wrap" v-show="showAssociation">
<view
v-for="(item, index) in associationList"
:key="index"
class="association-cell u-border-top"
@click="handleClick(item, orderType, true)"
>
<view class="u-m-l-40">
<u-parse
:html="item.contactNameHighlight"
:tag-style="style"
></u-parse>
</view>
<view class="u-m-l-10">
<u-parse
:html="item.contactPhoneHighlight"
:tag-style="style"
></u-parse>
</view>
</view>
<view class="u-border-top" />
</view>
<view class="content-item" v-show="showOrderCell">
<view v-if="orderList && orderList.length > 0" class="order-row">
<view v-for="(item, index) in orderList" :key="item.orderId">
<OrderCell :orderData="item" :orderType="orderType" :location="dataValue"
@click="handleClick" @action="handleClickCellButton"> </OrderCell>
<view v-for="item in orderList" :key="item.orderId">
<OrderCell
:orderData="item"
:orderType="orderType"
:location="dataValue"
@click="handleClick"
@action="handleClickCellButton"
>
</OrderCell>
</view>
<u-loadmore :status="loadStatus" bgColor="#F4F5F7"></u-loadmore>
</view>
......@@ -35,109 +66,180 @@
<u-image width="374" height="256" :src="searchEmpty">
<u-loading slot="loading"></u-loading>
</u-image>
<text class="empty-message">
当前暂无搜索结果
</text>
<text class="empty-message"> 当前暂无搜索结果 </text>
</view>
</view>
</view>
</template>
<script>
import OrderCell from "@/components/order/index.vue";
export default {
import OrderCell from "@/components/order/index.vue";
export default {
components: {
OrderCell
OrderCell,
},
data() {
return {
search: {
type: '',
keyword: '',
type: "",
keyword: "",
pageSize: 10,
pageNumber: 0,
orderStatusRangeType: '',
orderStatusRangeType: "",
},
orderList: [],
associationList: [],
loaded: false,
focused: true,
total: 10,
loadStaus: 'loadmore',
loadStaus: "loadmore",
style: {
// 字符串的形式
span: "color: red",
},
};
},
onLoad() {
getApp().trackPage('订单搜索页')
getApp().trackPage("订单搜索页");
// this.searchOrder()
this.associationOrder();
},
onReachBottom() {
let len = this.orderList && this.orderList.length || 0
if(!this.loaded || len >= this.total) return;
this.loadStaus = 'loading';
this.search.pageNumber = ++ this.search.pageNumber;
this.getOrderList('onReachBottom')
let len = (this.orderList && this.orderList.length) || 0;
if (!this.loaded || len >= this.total) return;
this.loadStaus = "loading";
this.search.pageNumber = ++this.search.pageNumber;
this.getOrderList("onReachBottom");
},
computed: {
searchEmpty() {
return process.uniEnv.qn_base_url + 'SearchEmpty.png'
return process.uniEnv.qn_base_url + "SearchEmpty.png";
},
showAssociation() {
return this.focused && !this.$u.test.isEmpty(this.associationList);
},
showOrderCell() {
return !this.focused && this.$u.test.isEmpty(this.associationList);
},
},
methods: {
searchOrder(index) {
this.search.pageNumber = 1
this.loadStaus = 'loading';
if(this.search.keyword) {
getApp().track('search_order', {keyword: this.search.keyword});
this.getOrderList()
this.search.pageNumber = 1;
this.loadStaus = "loading";
if (this.search.keyword) {
getApp().track("search_order", { keyword: this.search.keyword });
this.getOrderList();
}
},
// 高亮文本
highlights() {
const keyword = this.search.keyword;
this.associationList = this.associationList.map((item) => {
for (let key in item) {
if (key === "contactName" || key === "contactPhone") {
let replaceReg = new RegExp(keyword, "g"); // 匹配关键字正则
let replaceString = "<span>" + keyword + "</span>"; // 高亮替换v-html值
item[key + "Highlight"] = item[key].replace(
replaceReg,
replaceString
); // 开始替换
}
}
return item;
});
},
/** 联想工单 */
async associationOrder() {
let res = await this.$u.api.association(this.search);
if (res && res.code == 200) {
this.associationList = res.data;
}
this.highlights();
},
/** 搜索关键字变更 */
keywordChange(value) {
if (this.$u.test.isEmpty(value)) {
this.associationList = [];
} else {
this.associationOrder();
}
},
/** 获得焦点 */
onfocus() {
this.focused = true;
},
/** 失去焦点 */
loseFocus() {
this.focused = false;
},
// 页面数据
getOrderList(event) {
let self = this;
if(!self.search.keyword) {
return false
if (!self.search.keyword) {
return false;
}
// 状态处理
self.loaded = false
self.loaded = false;
self.$u.api.listOrder(self.search).then((res) => {
if (res.code == 200) {
if (res.data) {
let list = res.data.list || []
self.total = res.data.total || 0
if(event == 'onReachBottom') {
self.orderList.push(...list)
let list = res.data.list || [];
self.total = res.data.total || 0;
if (event == "onReachBottom") {
self.orderList.push(...list);
} else {
self.orderList = list
self.orderList = list;
}
self.loadStatus = res.data.total > self.orderList.length ? 'loadmore' : 'nomore'
self.loadStatus =
res.data.total > self.orderList.length ? "loadmore" : "nomore";
}
} else {
self.$u.toast('请求失败');
self.$u.toast("请求失败");
}
self.loaded = true
self.loaded = true;
});
},
handleClickCellButton(item) {
// 去完工
uni.navigateTo({
url: 'pages/order/complete?orderId='+item.orderId
+ "&categoryId=" + item.categoryId
+ "&orderServiceType=" + item.orderServiceType
+ "&inGuaranteePeriod=" + item.inGuaranteePeriod
+ "&partnerCompanyId=" + item.partnerCompanyId
+ "&auditResultsId=" + (item.auditResults?Object.keys(item.auditResults)[Object.keys(item.auditResults).length - 1]:'')
+ "&maintainStep=" + item.maintainStep
})
},
handleClick(item, type, showCountTime) { // type:类型,showCountTime:是否显示倒计时。详情页面情况太多,提前传值可以避免页面晃动
url:
"pages/order/complete?orderId=" +
item.orderId +
"&categoryId=" +
item.categoryId +
"&orderServiceType=" +
item.orderServiceType +
"&inGuaranteePeriod=" +
item.inGuaranteePeriod +
"&partnerCompanyId=" +
item.partnerCompanyId +
"&auditResultsId=" +
(item.auditResults
? Object.keys(item.auditResults)[
Object.keys(item.auditResults).length - 1
]
: "") +
"&maintainStep=" +
item.maintainStep,
});
},
handleClick(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
})
url:
"pages/order/detail?id=" +
item.orderId +
"&type=" +
type +
"&showCountTime=" +
showCountTime,
});
},
},
}
};
</script>
<style lang="scss">
......@@ -146,7 +248,7 @@
position: sticky;
padding: 20rpx 0;
top: 0rpx;
background-color: #F4F5F7;
background-color: #f4f5f7;
z-index: 2;
/deep/ .u-search .u-content {
padding: 0 20rpx 0 40rpx;
......@@ -158,7 +260,7 @@
font-size: 36rpx !important;
}
/deep/ .u-search .u-close-wrap .u-iconfont {
color: #CCCCCC;
color: #cccccc;
}
}
......@@ -179,7 +281,17 @@
line-height: 28rpx;
}
}
}
.association-wrap {
.association-cell {
display: flex;
padding: 26rpx 32rpx;
font-size: 28rpx;
line-height: 54rpx;
color: #606266;
background: #ffffff;
}
}
}
</style>
......@@ -12,7 +12,7 @@ try {
}
// 需要永久存储,且下次APP启动需要取出的,在state中的变量名
let saveStateKeys = ['vuex_user', 'vuex_wx_uid', 'vuex_token', 'vuex_cache', 'uploadTask', 'vuex_superuser'];
let saveStateKeys = ['vuex_user', 'vuex_wx_uid', 'vuex_token', 'vuex_cache', 'uploadTask', 'vuex_superuser', 'vuex_last_five_orders'];
// 保存变量到本地存储中
const saveLifeData = function(key, value) {
......@@ -34,6 +34,7 @@ const store = new Vuex.Store({
vuex_token: lifeData.vuex_token ? lifeData.vuex_token : '',
vuex_cache: lifeData.vuex_cache ? lifeData.vuex_cache : {},
vuex_superuser: lifeData.vuex_superuser || false,
vuex_last_five_orders: lifeData.vuex_last_five_orders ? lifeData.vuex_last_five_orders : [],
vuex_version: '1.0.1',
vuex_config: {},
// 入驻信息
......
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