Commit 69848cf5 authored by Damon's avatar Damon

chore: merge dev-1.5.0

parents 87e76966 85c30197
...@@ -3023,6 +3023,8 @@ ...@@ -3023,6 +3023,8 @@
"terser-webpack-plugin": "^2.3.6", "terser-webpack-plugin": "^2.3.6",
"thread-loader": "^2.1.3", "thread-loader": "^2.1.3",
"url-loader": "^2.2.0", "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", "vue-style-loader": "^4.1.2",
"webpack": "^4.0.0", "webpack": "^4.0.0",
"webpack-bundle-analyzer": "^3.8.0", "webpack-bundle-analyzer": "^3.8.0",
...@@ -3037,14 +3039,6 @@ ...@@ -3037,14 +3039,6 @@
"integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=", "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
"dev": true "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": { "cacache": {
"version": "13.0.1", "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", "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 @@ ...@@ -3071,28 +3065,6 @@
"unique-filename": "^1.1.1" "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": { "css-loader": {
"version": "3.6.0", "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", "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 @@ ...@@ -3187,15 +3159,11 @@
"slash": "^2.0.0" "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": { "hash-sum": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/hash-sum/download/hash-sum-2.0.0.tgz", "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": { "human-signals": {
"version": "1.1.1", "version": "1.1.1",
...@@ -3355,14 +3323,6 @@ ...@@ -3355,14 +3323,6 @@
"minipass": "^3.1.1" "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": { "terser-webpack-plugin": {
"version": "2.3.8", "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", "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 @@ ...@@ -3381,24 +3341,23 @@
} }
}, },
"vue-loader": { "vue-loader": {
"version": "16.3.0", "version": "15.9.8",
"resolved": "https://repo.huaweicloud.com/repository/npm/vue-loader/-/vue-loader-16.3.0.tgz", "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.8.tgz",
"integrity": "sha512-UDgni/tUVSdwHuQo+vuBmEgamWx88SuSlEb5fgdvHrlJSPB9qMBRF6W7bfPWSqDns425Gt1wxAUif+f+h/rWjg==", "integrity": "sha512-GwSkxPrihfLR69/dSV3+5CdMQ0D+jXg8Ma1S4nQXKJAznYFX14vHdc/NetQc34Dw+rBbIJyP7JOuVb9Fhprvog==",
"dev": true,
"requires": { "requires": {
"chalk": "^4.1.0", "@vue/component-compiler-utils": "^3.1.0",
"hash-sum": "^2.0.0", "hash-sum": "^1.0.2",
"loader-utils": "^2.0.0" "loader-utils": "^1.1.0",
"vue-hot-reload-api": "^2.3.0",
"vue-style-loader": "^4.1.0"
}, },
"dependencies": { "dependencies": {
"loader-utils": { "hash-sum": {
"version": "2.0.0", "version": "1.0.2",
"resolved": "https://repo.huaweicloud.com/repository/npm/loader-utils/-/loader-utils-2.0.0.tgz", "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=",
"requires": { "dev": true
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
} }
} }
} }
...@@ -16421,6 +16380,94 @@ ...@@ -16421,6 +16380,94 @@
"vue-style-loader": "^4.1.0" "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": { "vue-style-loader": {
"version": "4.1.3", "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", "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",
......
...@@ -4,6 +4,8 @@ import { AnalysysAgent } from "@/utils/analysys_paas.js"; ...@@ -4,6 +4,8 @@ import { AnalysysAgent } from "@/utils/analysys_paas.js";
import util from "@/utils/util.js"; import util from "@/utils/util.js";
import login from "@/utils/login.js"; import login from "@/utils/login.js";
import upload from '@/components/upload/task.js' import upload from '@/components/upload/task.js'
import { ERROR } from "@/common/log.js"
export default { export default {
globalData: { globalData: {
// 开发环境 // 开发环境
...@@ -74,8 +76,6 @@ export default { ...@@ -74,8 +76,6 @@ export default {
this.getSystemInfo(); this.getSystemInfo();
// 系统自动登录::每次运行小程序重新获取用户信息 // 系统自动登录::每次运行小程序重新获取用户信息
await this.autoLogin(); await this.autoLogin();
//this.deleteTempImg()
}, },
onShow: function () { onShow: function () {
// 应用启动,或从后台进入前台显示 // 应用启动,或从后台进入前台显示
...@@ -85,6 +85,9 @@ export default { ...@@ -85,6 +85,9 @@ export default {
}, },
onHide: function () { onHide: function () {
// 应用从前台进入后台 // 应用从前台进入后台
// if (this.uploadTask.length > 0) {
// ERROR('onUnload', {task: this.uploadTask.length, mobile: this.vuex_user.mobile})
// }
}, },
watch: { watch: {
uploadTask: function(newValue, oldValue) { uploadTask: function(newValue, oldValue) {
...@@ -92,18 +95,6 @@ export default { ...@@ -92,18 +95,6 @@ export default {
} }
}, },
methods: { methods: {
// 处理已上传完成的图片
deleteTempImg() {
const result = uni.getStorageSync('delImg')
if (result.length > 0) {
for (let i of result) {
uni.removeSavedFile({
filePath: i
})
}
uni.setStorageSync('delImg', [])
}
},
getSystemInfo() { getSystemInfo() {
try { try {
let a = this.$u.sys(); let a = this.$u.sys();
......
...@@ -14,11 +14,22 @@ let orderApiFun = function(vm){ ...@@ -14,11 +14,22 @@ let orderApiFun = function(vm){
* 工单数量查询接口 * 工单数量查询接口
*/ */
let listOrderCount = async (params = {}) => await vm.$u.get(prefix + vm.vuex_token + '/wokerOrder/queryOrdersCount/V2', params); 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 + vm.vuex_token + '/wokerOrder/countOrderByTimeRange', params);
/**
* 根据订单id数组获取订单列表
*/
let listOrderByIds = async (string) => await vm.$u.get('/wxh-worker-rest/rest/order/revision/listOrderByIds' + string);
/** /**
* 工单列表接口 * 工单列表接口
*/ */
let listOrder = async (params = {}) => await vm.$u.get('/wxh-worker-rest/rest/order/revision/' + vm.vuex_token + '/list', 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);
/** /**
* 获取师傅的预约日历 * 获取师傅的预约日历
...@@ -172,6 +183,8 @@ let orderApiFun = function(vm){ ...@@ -172,6 +183,8 @@ let orderApiFun = function(vm){
let listStatementDetails = async (params = {}) => await vm.$u.get(settle + vm.vuex_token + '/queryStatementByPayableNo', params); let listStatementDetails = async (params = {}) => await vm.$u.get(settle + vm.vuex_token + '/queryStatementByPayableNo', params);
// 获取我的钱包-支付单一览 // 获取我的钱包-支付单一览
let payableRecord = async (params = {}) => await vm.$u.post(settle + vm.vuex_token + '/payable/v2/queryPayableRecord', params, formType); let payableRecord = async (params = {}) => await vm.$u.post(settle + vm.vuex_token + '/payable/v2/queryPayableRecord', params, formType);
// 获取我的钱包-支付单一览版本3
let listPayableRecordByPayTime = async (params = {}) => await vm.$u.post(settle + vm.vuex_token + '/payable/listPayableRecordByPayTime', params, formType);
// 获取我的钱包-师傅提现 // 获取我的钱包-师傅提现
let workerApplyPay = async () => await vm.$u.get(prefix + vm.vuex_token + '/applypay/batch/workerApplyPay'); let workerApplyPay = async () => await vm.$u.get(prefix + vm.vuex_token + '/applypay/batch/workerApplyPay');
// 是否有特殊登录权限 // 是否有特殊登录权限
...@@ -200,10 +213,16 @@ let orderApiFun = function(vm){ ...@@ -200,10 +213,16 @@ let orderApiFun = function(vm){
let cancelParts = async (partOrderId) => await vm.$u.put(prefix + 'parts/' + vm.vuex_token + '/orders/'+ partOrderId +'/cancel',{}, formType); 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 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 = { const orderApi = {
listByRecommendOrder, listByRecommendOrder,
listOrderCount, listOrderCount,
manageOrderCount,
listOrderByIds,
listOrder, listOrder,
manageOrderList,
workerCalendar, workerCalendar,
workerAppointment, workerAppointment,
maintainWorkerCheckin, maintainWorkerCheckin,
...@@ -237,6 +256,7 @@ let orderApiFun = function(vm){ ...@@ -237,6 +256,7 @@ let orderApiFun = function(vm){
getAssets, getAssets,
listStatement, listStatement,
payableRecord, payableRecord,
listPayableRecordByPayTime,
listStatementDetails, listStatementDetails,
workerApplyPay, workerApplyPay,
allowLogin, allowLogin,
...@@ -252,7 +272,8 @@ let orderApiFun = function(vm){ ...@@ -252,7 +272,8 @@ let orderApiFun = function(vm){
getOrderPartsSum, getOrderPartsSum,
receiveParts, receiveParts,
cancelParts, cancelParts,
workerDealWithError workerDealWithError,
association
} }
return orderApi return orderApi
} }
......
...@@ -51,7 +51,7 @@ const install = (Vue, vm) => { ...@@ -51,7 +51,7 @@ const install = (Vue, vm) => {
config.header['Authorization'] = token config.header['Authorization'] = token
} }
// config.header.token = vm.vuex_token || 'RTOKENe56f873b5823477fa2e15572f8fa7eb3a5fb6f7b'; config.header['token'] = token;
config.header['x-requested-with'] = 'xmlhttprequest'; config.header['x-requested-with'] = 'xmlhttprequest';
return config; return config;
} }
...@@ -76,6 +76,9 @@ const install = (Vue, vm) => { ...@@ -76,6 +76,9 @@ const install = (Vue, vm) => {
function getMsg(res){ function getMsg(res){
const result = res.data || res const result = res.data || res
let msg = result.message || result.errMsg || res.message || res.errMsg let msg = result.message || result.errMsg || res.message || res.errMsg
if (msg.indexOf('request:fail') !== -1) {
msg = '当前网络较差,请重试'
}
if(res.code == 200 || res.status == true || msg) { if(res.code == 200 || res.status == true || msg) {
return msg return msg
} }
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
@click.stop="prviewImage(item, index)" @click.stop="prviewImage(item, index)"
fade fade
lazy-load lazy-load
></u-image> ><view slot="error" style="font-size: 24rpx;">上传中</view></u-image>
<view <view
class="icon-del-box" class="icon-del-box"
v-if="!disabled" v-if="!disabled"
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</view> </view>
<view class="right-view"> <view class="right-view">
<view :class="['settlement-status-view', settlementTypeClass]">{{data.payableRecordStatusText}}</view> <view :class="['settlement-status-view', settlementTypeClass]">{{data.payableRecordStatusText}}</view>
<view class="settlement-amount-view">¥{{data.settlementAmount}}</view> <view class="settlement-amount-view">¥{{ data.paidAmount || 0}}</view>
</view> </view>
</view> </view>
<view class="line-view"></view> <view class="line-view"></view>
...@@ -24,11 +24,11 @@ ...@@ -24,11 +24,11 @@
type: Object, type: Object,
default () { default () {
return { return {
paymentTime: new Date().getTime(),
payableRecordStatusText: '提现',
payableRecordNumber: 'EE999777',
payableRecordId: '', payableRecordId: '',
settlementAmount: 9899 paidTime: new Date().getTime(),
payableRecordStatusText: '提现',
payableRecordNumber: '',
paidAmount: 0
} }
}, },
} }
...@@ -56,13 +56,13 @@ ...@@ -56,13 +56,13 @@
timeText() { timeText() {
let now = this.moment().startOf('day').unix() let now = this.moment().startOf('day').unix()
let yesterday = this.moment(now*1000).subtract(1, 'days').unix() let yesterday = this.moment(now*1000).subtract(1, 'days').unix()
let date = this.moment(this.data.updateDatetime).startOf('day').unix() let date = this.moment(this.data.paidTime).startOf('day').unix()
if(date == now) { if(date == now) {
return '今天' return '今天'
} else if(date == yesterday) { } else if(date == yesterday) {
return '昨天' return '昨天'
} else { } else {
return this.$u.timeFormat(this.data.updateDatetime, 'mm.dd') return this.$u.timeFormat(this.data.paidTime, 'mm.dd')
} }
} }
}, },
...@@ -113,11 +113,12 @@ ...@@ -113,11 +113,12 @@
border: 2rpx solid #FF930D; border: 2rpx solid #FF930D;
font-size: 20rpx; font-size: 20rpx;
color: #FF930D; color: #FF930D;
width: 80rpx; min-width: 80rpx;
height: 40rpx; height: 40rpx;
text-align: center; text-align: center;
padding-top: 4rpx;
margin-right: 10rpx; margin-right: 10rpx;
line-height: 40rpx;
padding: 0 10rpx;
&.settlement-type-y { &.settlement-type-y {
border: 2rpx solid #FF930D; border: 2rpx solid #FF930D;
......
...@@ -130,10 +130,11 @@ ...@@ -130,10 +130,11 @@
border: 2rpx solid #FF930D; border: 2rpx solid #FF930D;
font-size: 20rpx; font-size: 20rpx;
color: #FF930D; color: #FF930D;
width: 80rpx; min-width: 80rpx;
height: 40rpx; height: 40rpx;
text-align: center; text-align: center;
padding-top: 4rpx; line-height: 40rpx;
padding: 0 10rpx;
&.statement-type-y { &.statement-type-y {
border: 2rpx solid #FF930D; border: 2rpx solid #FF930D;
......
<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> <template>
<view class="order-view" @click="handleClickCell"> <view
<view class="order-top-view"> :class="['order-view', { simple: isSimple }]"
@click="handleClickCell"
:hover-class="isSimple ? 'u-hover-class' : ''"
>
<view v-if="!isSimple" class="order-top-view">
<view class="left-view"> <view class="left-view">
<view :class="['tag-view', { active: active }]"> <view :class="['tag-view', { active: active }]">
{{ orderData.orderServiceType }} {{ orderData.orderServiceType }}
...@@ -10,7 +14,14 @@ ...@@ -10,7 +14,14 @@
<view class="right-view">{{ orderData.orderBusinessTypeText }}</view> <view class="right-view">{{ orderData.orderBusinessTypeText }}</view>
</view> </view>
<view class="content-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"> <view class="info-title">
<text>{{ item.name + ':' }}</text> <text>{{ item.name + ':' }}</text>
</view> </view>
...@@ -18,7 +29,13 @@ ...@@ -18,7 +29,13 @@
<text @longpress="handleLongpress(key, orderData[key])">{{ <text @longpress="handleLongpress(key, orderData[key])">{{
orderData[key] orderData[key]
}}</text> }}</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> </view>
<view class="address-view"> <view class="address-view">
...@@ -35,20 +52,20 @@ ...@@ -35,20 +52,20 @@
</view> </view>
</view> </view>
</view> </view>
<template v-if="!isSimple">
<view class="line-view"></view> <view class="line-view"></view>
<view class="reason-view" v-if="showReason"> <view class="reason-view" v-if="showReason">
<view class="reason-title"><text>未通过原因:</text></view> <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">{{ <text v-for="(item, index) in orderData.auditResults" :key="index">{{
item item
}}</text> }}</text>
</view </view>
>
</view> </view>
<view class="bottom-view"> <view class="bottom-view">
<view> <view>
...@@ -82,6 +99,7 @@ ...@@ -82,6 +99,7 @@
{{ orderText }} {{ orderText }}
</u-button> </u-button>
</view> </view>
</template>
</view> </view>
</template> </template>
...@@ -130,6 +148,11 @@ export default { ...@@ -130,6 +148,11 @@ export default {
return [116.3896, 39.91917] // 纬度,经度 return [116.3896, 39.91917] // 纬度,经度
}, },
}, },
// simple: 只显示订单号、联系人/电话、地址,点击cell相当于点击订单列表的按钮; normal: 显示全部信息
model: {
type: String,
default: 'normal',
},
}, },
data() { data() {
return { return {
...@@ -142,6 +165,9 @@ export default { ...@@ -142,6 +165,9 @@ export default {
// 按钮文字 // 按钮文字
return this.typeTexts[this.orderType] return this.typeTexts[this.orderType]
}, },
isSimple() {
return this.model == 'simple'
},
buttonStyle() { buttonStyle() {
// 按钮样式 // 按钮样式
/** orderType /** orderType
...@@ -181,7 +207,17 @@ export default { ...@@ -181,7 +207,17 @@ export default {
return [4, 5, 6].indexOf(this.orderType) != -1 return [4, 5, 6].indexOf(this.orderType) != -1
}, },
infoTexts() { 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: '工单编号' }, orderNumber: { name: '工单编号' },
partnerCompanyName: { name: '合作厂商' }, partnerCompanyName: { name: '合作厂商' },
contactName: { name: '客户信息', content: 'contactPhone' }, contactName: { name: '客户信息', content: 'contactPhone' },
...@@ -257,6 +293,7 @@ export default { ...@@ -257,6 +293,7 @@ export default {
}, },
showDistance() { showDistance() {
return ( return (
!this.isSimple &&
this.orderType == 0 && this.orderType == 0 &&
this.location.length >= 2 && this.location.length >= 2 &&
(this.orderData.contactAddressLatitud || (this.orderData.contactAddressLatitud ||
...@@ -280,6 +317,34 @@ export default { ...@@ -280,6 +317,34 @@ export default {
finish: 6, //已完工 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)
: []
return auditResults.concat(partAuditResults)
},
orderDistance() { orderDistance() {
return this.distance( return this.distance(
this.orderData.contactAddressLatitud, this.orderData.contactAddressLatitud,
...@@ -304,11 +369,14 @@ export default { ...@@ -304,11 +369,14 @@ export default {
待预约 orderStatus == 31 and appointmentDatetime == null 工单状态等于30并且预约时间为空 待预约 orderStatus == 31 and appointmentDatetime == null 工单状态等于30并且预约时间为空
待签到 orderStatus == 31 and appointmentDatetime is not null 工单状态等于30并且预约时间不为空 待签到 orderStatus == 31 and appointmentDatetime is not null 工单状态等于30并且预约时间不为空
待完工 orderStatus >31 and orderStatus < 80 工单状态大于31 小于80 待完工 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 ==86 工单状态 等于86
已完工 orderStatus in(80,81,89,110) 工单状态 等于80 or 81 or 89 or 110 已完工 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) { if (this.orderData.orderStatus < 31) {
return 0 return 0
} else if (this.orderData.orderStatus == 31) { } else if (this.orderData.orderStatus == 31) {
...@@ -338,8 +406,6 @@ export default { ...@@ -338,8 +406,6 @@ export default {
} else { } else {
return 0 return 0
} }
} else {
return this.types[this.type]
} }
}, },
}, },
...@@ -366,26 +432,60 @@ export default { ...@@ -366,26 +432,60 @@ export default {
if ([3, 4, 5, 6].indexOf(this.orderType) != -1) { if ([3, 4, 5, 6].indexOf(this.orderType) != -1) {
func = 'action' func = 'action'
} }
this.orderData.auditResults = this.auditResults
this.$emit( this.$emit(
func, func,
this.orderData, this.orderData,
this.type, this.realType,
this.showCountTime ? 'show' : '' this.showCountTime ? 'show' : '',
this.auditResults
) )
this.otherAction()
}, },
handleClickCell() { handleClickCell() {
if (this.isSimple) {
this.handleClick()
return
}
var func = 'click' var func = 'click'
this.handleExceptions() this.handleExceptions()
if (this.isException) { if (this.isException) {
// 异常单点cell算点按钮 // 异常单点cell算点按钮
func = 'action' func = 'action'
} }
this.orderData.auditResults = this.auditResults
this.$emit( this.$emit(
func, func,
this.orderData, this.orderData,
this.type, this.realType,
this.showCountTime ? 'show' : '' this.showCountTime ? 'show' : '',
this.auditResults
) )
this.otherAction()
},
// 如果是异常单告诉后台
// 更新最近5条查看记录
otherAction() {
this.exceptionRecord()
this.storeOparation()
},
exceptionRecord() {
// 如果是异常单告诉后台
if (this.realType == 'exception') {
this.$u.api.workerDealWithError(this.orderData.orderId).then(() => {})
}
},
storeOparation() {
// 更新最近5条查看记录
if (!this.isSimple) {
var array = (this.vuex_last_five_orders || []).filter((id) => {
// 如果记录中有该工单,删除
return id != this.orderData.orderId
})
array.unshift(this.orderData.orderId)
this.$u.vuex('vuex_last_five_orders', array.slice(0, 5))
}
}, },
handleChange(timestamp) { handleChange(timestamp) {
if (this.timeout) this.$refs['order-count-down'].seconds += 2 if (this.timeout) this.$refs['order-count-down'].seconds += 2
...@@ -464,12 +564,19 @@ export default { ...@@ -464,12 +564,19 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.order-view { .order-view {
width: 100%; // width: 100%;
background-color: #ffffff; background-color: #ffffff;
border-radius: 12rpx; border-radius: 12rpx;
padding: 30rpx; padding: 30rpx;
margin-bottom: 20rpx; 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 { .order-top-view {
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -522,15 +629,28 @@ export default { ...@@ -522,15 +629,28 @@ export default {
margin-top: 18rpx; margin-top: 18rpx;
margin-bottom: 18rpx; margin-bottom: 18rpx;
display: flex; 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 { .info-title {
flex-shrink: 0; flex-shrink: 0;
align-items: center;
} }
.info-content { .info-content {
word-break: break-all; word-break: break-all;
} }
} }
}
.address-view { .address-view {
display: flex; display: flex;
......
<template> <template>
<!-- 申请物料按钮 --> <!-- 申请配件按钮 -->
<view class="apply-button"> <view class="apply-button" v-show="show">
<u-button :custom-style="customStyle" shape="circle" @click.stop="handleClick" type="primary"> <u-button
<u-icon class="apply-icon" name="plus"></u-icon> :custom-style="customStyle"
<text class="apply-text" v-if="showText">申请物料</text> 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> </u-button>
</view> </view>
</template> </template>
<script> <script>
export default { export default {
props: { props: {
type: { // 按钮宽'collapse': '80rpx', 'expand': '220rpx' type: {
// 按钮宽'collapse': '80rpx', 'expand': '220rpx'
type: String, 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: { computed: {
typeWidth() { typeWidth() {
return { return {
'collapse': '80rpx', collapse: '80rpx',
'expand': '220rpx' 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() { showText() {
...@@ -28,26 +79,50 @@ ...@@ -28,26 +79,50 @@
}, },
customStyle() { customStyle() {
return { return {
'height': '80rpx', height: '80rpx',
'width': this.typeWidth[this.type], width: this.typeWidth[this.type],
opacity: this.typeOpacity[this.type],
} }
},
},
data() {
return {
clicked: 0, // 0 不活跃;>1 活跃中
} }
}, },
created() { created() {
setTimeout(()=> { setTimeout(() => {
this.$emit('update:type', 'collapse') this.$emit('update:type', 'collapse')
}, 3000) }, 3000)
}, },
watch: {
show(val) {
if (val) {
this.clicked += 1
setTimeout(() => {
// 三秒不点击,算失去活跃
this.clicked = Math.max(0, this.clicked - 1)
}, 3000)
}
},
},
methods: { methods: {
handleClick() { handleClick() {
if (this.clickedHidden) {
this.$emit('update:show', false)
}
this.$emit('click') this.$emit('click')
}, },
} },
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.apply-button { .apply-button {
.button-view {
display: flex;
justify-content: flex-end;
align-items: center;
.apply-icon { .apply-icon {
font-size: 36rpx; font-size: 36rpx;
} }
...@@ -55,5 +130,10 @@ ...@@ -55,5 +130,10 @@
font-size: 32rpx; font-size: 32rpx;
padding-left: 10rpx; padding-left: 10rpx;
} }
.image-icon {
width: 30rpx;
height: 34rpx;
}
} }
}
</style> </style>
...@@ -79,7 +79,8 @@ ...@@ -79,7 +79,8 @@
console.log('success'); console.log('success');
} }
}) })
} },
handleClick(){}
} }
} }
</script> </script>
......
<template>
<view class="upload-progress">
<view :class="['u-flex', 'suspension', {'error': uploadStatus === 3}]" @click="openpRrogress">
<view class="progress" v-if="taskCount > 0">{{ uploadPercentage }}%</view>
<view class="upload-img" v-if="taskCount === 0">
<image class="icon" :src="icon"></image>
</view>
</view>
<u-popup
v-model="open"
border-radius="12"
mode="center"
:animation="false"
@close="closePopup"
width="690rpx">
<view class="slot-content">
<view class="upload-title">
<text class='status-txt'>图片上传进度</text>
</view>
<view v-if="taskCount > 0">
<view class="progress-circle">
<u-loading class="loading" v-if="!progressStatus" mode="circle"></u-loading>
<u-circle-progress v-if="progressStatus" :width="320" :border-width="20" inactive-color="#F4F5F7" :active-color="progressColor" :percent="uploadPercentage">
<view :class="['u-progress-content', {'error': uploadStatus === 3}]"> {{ uploadPercentage }}%</view>
</u-circle-progress>
</view>
<view class="u-flex upload-data">
<view class="u-flex">
<view class="title">需上传</view>
<view class="pending">{{ taskCount }}</view>
</view>
<view class="u-flex">
<view class="title">已上传</view>
<view class="resolve">{{ uploadSuccess }}</view>
</view>
<view class="u-flex">
<view class="title">状态</view>
<view :class="['status', {'error': uploadStatus === 3}]">{{ uploadStatusName }}</view>
</view>
</view>
<view class="upload-bottom" v-if="uploadStatus === 3">
<view class="button confirm" @click="$u.throttle(retry, 500)">重试</view>
</view>
</view>
<view class="u-flex default" v-if="taskCount === 0">
<view><image class="default-img" :src="defaultImg"></image></view>
<view class="text">当前暂无上传图片</view>
</view>
</view>
</u-popup>
</view>
</template>
<script>
/**
* upload-progress 图片上传进度
*/
import upload from '@/components/upload/task.js'
export default {
name:"upload-progress",
data() {
return {
open: false,
progressStatus: false
}
},
computed: {
icon() {
return process.uniEnv.qn_base_url + 'upload-photo.png'
},
defaultImg() {
return process.uniEnv.qn_base_url + 'upload-default.png'
},
taskCount() {
return this.uploadTotal
},
uploadStatusName() {
let status
switch (this.uploadStatus) {
case 1:
status = '等待上传'
break;
case 2:
status = '上传中'
break;
case 3:
status = '上传中断'
break;
}
return status
},
progressColor() {
return this.uploadStatus === 3 ? '#FA5A49' : '#2272FF'
},
uploadPercentage() {
const num = this.uploadSuccess
const total = this.uploadTotal
return total > 0 ? Math.floor(Math.round(num / total * 10000) / 100.00) : 0
}
},
watch: {
uploadStatus(newValue) {
this.progressStatus = false
this.$nextTick(() => {
this.progressStatus = true
})
}
},
methods: {
closePopup() {
this.progressStatus = false
},
openpRrogress() {
this.open = true
this.progressStatus = false
setTimeout(() => {
this.progressStatus = true
}, 300)
},
retry() {
if(this.uploadStatus !== 2) upload.uploadImageTask(this)
}
}
}
</script>
<style lang="scss">
.upload-progress {
width: 100%;
height: 100%;
.suspension {
position: fixed;
right: 5%;
bottom: 20%;
width: 80rpx;
height: 80rpx;
border-radius: 50%;
background: #2272FF;
z-index: 999;
&.error {
background: #FA5A49;
}
.progress {
font-size: 24rpx;
color: #fff;
width: 100%;
text-align: center;
}
.upload-img {
width: 100%;
text-align: center;
padding-top: 8rpx;
.icon {
width: 36rpx;
height: 32rpx;
}
}
}
.slot-content {
padding: 40rpx 30rpx 30rpx 30rpx;
.upload-title {
margin: 20rpx 0 50rpx 0;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
.status-txt {
height: 46rpx;
font-size: 40rpx;
font-weight: bold;
color: #333;
line-height: 46rpx;
}
}
.progress-circle {
width: 100%;
height: 320rpx;
text-align: center;
.loading {
line-height: 320rpx;
}
.u-progress-content {
color: #2272FF;
font-size: 60rpx;
&.error {
color: #FA5A49;
}
}
}
.upload-data {
margin: 50rpx 0 30rpx 0;
.u-flex {
flex-flow: column;
font-size: 48rpx;
width: 210rpx;
height: 120rpx;
.title {
color: #666;
font-size: 28rpx;
padding-bottom: 20rpx;
}
.pending {
color: #333;
}
.resolve {
color: #2272FF;
}
.status {
color: #2272FF;
font-size: 36rpx;
&.error {
color: #FA5A49;
}
}
}
}
.upload-bottom {
display: flex;
justify-content: center;
align-items: center;
.button {
text-align: center;
height: 104rpx;
width: 300rpx;
border-radius: 52rpx;
font-size: 32rpx;
font-weight: 600;
line-height: 104rpx;
}
.confirm {
margin: 36rpx 30rpx 52rpx 15rpx;
background: #2272FF;
color: #FFFFFF;
}
}
.default {
flex-flow: column;
margin: 150rpx 0;
.default-img {
width: 360rpx;
height: 240rpx;
}
.text {
color: #666;
font-size: 28rpx;
margin-top: 50rpx;
}
}
}
}
</style>
...@@ -69,14 +69,14 @@ export default { ...@@ -69,14 +69,14 @@ export default {
...order ...order
} }
}) })
// for (let i = 0; i < files.length; i++) {
// const path = files[i]
// const row = await this.saveFiles(path)
// lists.push(row)
// }
const data = JSON.parse(JSON.stringify(this.uploadTask)) const data = JSON.parse(JSON.stringify(this.uploadTask))
const saveLists = data.concat(lists) const saveLists = data.concat(lists)
this.$u.vuex('uploadTask', saveLists) this.$u.vuex('uploadTask', saveLists)
const newTotal = this.uploadTotal + lists.length
this.$u.vuex('uploadTotal', newTotal)
//this.$u.vuex('uploadSuccess', 0)
return lists return lists
}, },
/** /**
......
...@@ -19,10 +19,13 @@ export default { ...@@ -19,10 +19,13 @@ export default {
* 执行任务队列 * 执行任务队列
*/ */
async uploadImageTask(that) { async uploadImageTask(that) {
if (that.uploadStatus === 2) return
that.$u.vuex('uploadStatus', 2)
const uploadTask = JSON.parse(JSON.stringify(that.uploadTask)).reverse() const uploadTask = JSON.parse(JSON.stringify(that.uploadTask)).reverse()
const networkType = await getNetworkType() const networkType = await getNetworkType()
const options = { const options = {
files: uploadTask, // 必填 临时文件路径 格式: [{path: "图片地址"}] files: uploadTask.slice(0,5), // 必填 临时文件路径 格式: [{path: "图片地址"}]
load: false, //(默认 true 说明:本接口是否提示加载动画) load: false, //(默认 true 说明:本接口是否提示加载动画)
onEachUpdate: res => { onEachUpdate: res => {
console.log("上传成功返回:",res); console.log("上传成功返回:",res);
...@@ -41,10 +44,12 @@ export default { ...@@ -41,10 +44,12 @@ export default {
} }
uploader.qnFileUpload(options).then(res => { uploader.qnFileUpload(options).then(res => {
const newSuccess = that.uploadSuccess + res.length
that.$u.vuex('uploadSuccess', newSuccess)
this.refreshTask(that, res) this.refreshTask(that, res)
}).catch(err => { }).catch(err => {
console.log("err", err) console.log("err", err)
that.$u.vuex('uploadStatus', 3)
err.mobile = that.vuex_user.mobile err.mobile = that.vuex_user.mobile
if(!err.key) err.files = uploadTask if(!err.key) err.files = uploadTask
if(!err.orderNumber) err.orderNumber = uploadTask[0].orderNumber if(!err.orderNumber) err.orderNumber = uploadTask[0].orderNumber
...@@ -54,6 +59,7 @@ export default { ...@@ -54,6 +59,7 @@ export default {
if (err.errMsg && (err.errMsg.indexOf('fail file not found') !== -1 || err.errMsg.indexOf('file doesn') !== -1)) { // 在任务中删除不存在的图片 if (err.errMsg && (err.errMsg.indexOf('fail file not found') !== -1 || err.errMsg.indexOf('file doesn') !== -1)) { // 在任务中删除不存在的图片
const newTask = uploadTask.filter(v => v.key !== err.key) const newTask = uploadTask.filter(v => v.key !== err.key)
that.$u.vuex('uploadTask', newTask) that.$u.vuex('uploadTask', newTask)
this.resetProgress(that)
} }
}) })
}, },
...@@ -66,7 +72,16 @@ export default { ...@@ -66,7 +72,16 @@ export default {
} }
}) })
// uni.setStorageSync('delImg', delImg) // 已上传完的图片,会在启动系统的时候做一次清理 that.$u.vuex('uploadStatus', 1)
that.$u.vuex('uploadTask', newTask) that.$u.vuex('uploadTask', newTask)
this.resetProgress(that)
},
// 重置任务状态
resetProgress(that) {
if (that.uploadTask.length === 0) { // 上传完本地所有照片
that.$u.vuex('uploadSuccess', 0)
that.$u.vuex('uploadTotal', 0)
that.$u.vuex('uploadStatus', 1)
}
} }
} }
...@@ -162,6 +162,46 @@ ...@@ -162,6 +162,46 @@
"disableScroll": true "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", "path": "wallet/index",
"style": { "style": {
......
This diff is collapsed.
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
<u-navbar :is-back="false" :background="{ background: 'transparent' }" :border-bottom="false"> <u-navbar :is-back="false" :background="{ background: 'transparent' }" :border-bottom="false">
<text class="title-view">我的</text> <text class="title-view">我的</text>
</u-navbar> </u-navbar>
<view class="mine-content">
<view class="header-view"> <view class="header-view">
<view class="header-left-view"> <view class="header-left-view">
<view class="head-image"> <view class="head-image">
...@@ -26,10 +25,12 @@ ...@@ -26,10 +25,12 @@
<view v-if="isSuperuser" class="super-button"><u-button@click="handleSuperButton">切换用户</u-button></view> <view v-if="isSuperuser" class="super-button"><u-button@click="handleSuperButton">切换用户</u-button></view>
</view> </view>
</view> </view>
<view class="mine-content">
<view class="ware-house-view"> <view class="ware-house-view">
<view class="ware-house-title">仓配功能</view> <view class="ware-house-title">仓配功能</view>
<view class="ware-house-content"> <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"> <view class="ware-house-image">
<image :src="item.icon" :style="item.imageStyle"></image> <image :src="item.icon" :style="item.imageStyle"></image>
</view> </view>
...@@ -57,7 +58,6 @@ ...@@ -57,7 +58,6 @@
</template> </template>
<script> <script>
import util from '@/utils/util.js'
import login from "@/utils/login.js"; import login from "@/utils/login.js";
const app = getApp(); const app = getApp();
export default { export default {
...@@ -87,6 +87,12 @@ ...@@ -87,6 +87,12 @@
items() { items() {
return [ return [
[{ [{
pathName: 'order/index',
title: '订单管理',
value: '',
icon: 'dingdanguanli.png',
imageStyle: 'width:34rpx;height:32rpx'
},{
pathName: 'wallet/index', pathName: 'wallet/index',
title: '我的钱包', title: '我的钱包',
value: '', value: '',
...@@ -94,26 +100,21 @@ ...@@ -94,26 +100,21 @@
imageStyle: 'width:34rpx;height:32rpx' imageStyle: 'width:34rpx;height:32rpx'
}, },
{ {
pathName: 'deposit/index', pathName: 'info/index',
title: '配件押金', title: '我的资料',
value: '', value: '',
icon: 'yajin.png', icon: 'wodeziliao.png',
imageStyle: 'width:32rpx;height:32rpx' imageStyle: 'width:32rpx;height:32rpx'
}, },
{ {
pathName: 'contract/index', pathName: 'history/index',
title: '我的合同', title: '浏览记录',
value: '', value: '',
icon: 'hetong.png', icon: 'liulanjilu.png',
imageStyle: 'width:34rpx;height:32rpx' imageStyle: 'width:34rpx;height:32rpx'
}, },
{ ],
pathName: 'cert/index', [
title: '我的证件',
value: '',
icon: 'zhengjian.png',
imageStyle: 'width:36rpx;height:28rpx'
}],[
{ {
pathName: 'address/index', pathName: 'address/index',
title: '收货地址', title: '收货地址',
...@@ -121,13 +122,6 @@ ...@@ -121,13 +122,6 @@
icon: 'wddizhi.png', icon: 'wddizhi.png',
imageStyle: 'width:32rpx;height:32rpx' imageStyle: 'width:32rpx;height:32rpx'
}, },
// {
// pathName: 'warehouse',
// title: '我的仓库',
// value: '',
// icon: 'cangku.png',
// imageStyle: 'width:36rpx;height:32rpx'
// },
{ {
pathName: 'customer/index', pathName: 'customer/index',
title: '联系客服', title: '联系客服',
...@@ -148,7 +142,7 @@ ...@@ -148,7 +142,7 @@
}, },
{ {
pathName: 'warehouse/spare', pathName: 'warehouse/spare',
title: '物料库', title: '备件库',
value: '', value: '',
icon: process.uniEnv.qn_base_url + 'wodebeijian.png', icon: process.uniEnv.qn_base_url + 'wodebeijian.png',
imageStyle: 'width:60rpx;height:54rpx' imageStyle: 'width:60rpx;height:54rpx'
...@@ -183,6 +177,12 @@ ...@@ -183,6 +177,12 @@
}, },
shezhiImage() { shezhiImage() {
return process.uniEnv.qn_base_url + 'shezhi.png' 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() { isSuperuser() {
return this.vuex_superuser return this.vuex_superuser
...@@ -264,9 +264,9 @@ ...@@ -264,9 +264,9 @@
.mine-view { .mine-view {
position: relative; position: relative;
height: 100vh; height: 100vh;
overflow: auto; display: flex;
background-color: #F4F5F7; background-color: #F4F5F7;
flex-direction: column;
.header-image { .header-image {
position: absolute; position: absolute;
width: 100%; width: 100%;
...@@ -279,19 +279,18 @@ ...@@ -279,19 +279,18 @@
font-size: 40rpx; font-size: 40rpx;
padding-left: 30rpx; padding-left: 30rpx;
} }
.mine-content {
position: relative;
padding: 26rpx 30rpx 30rpx 20rpx;
.header-view { .header-view {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
justify-content: space-between; justify-content: space-between;
margin-bottom: 60rpx; // margin-bottom: 60rpx;
padding: 26rpx 30rpx 60rpx 30rpx;
.header-left-view { .header-left-view {
display: flex; display: flex;
align-items: center; align-items: center;
.head-image { .head-image {
z-index: 1;
width: 120rpx; width: 120rpx;
height: 120rpx; height: 120rpx;
background-color: #FFFFFF; background-color: #FFFFFF;
...@@ -338,6 +337,7 @@ ...@@ -338,6 +337,7 @@
} }
} }
.header-right-view { .header-right-view {
z-index: 1;
.setting-view { .setting-view {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
...@@ -358,6 +358,14 @@ ...@@ -358,6 +358,14 @@
} }
} }
} }
.mine-content {
height: 100%;
overflow: auto;
position: relative;
padding-bottom: 30rpx;
margin: 0rpx 30rpx;
border-radius: 12rpx;
.ware-house-view { .ware-house-view {
background-color: #FFFFFF; background-color: #FFFFFF;
border-radius: 12rpx; border-radius: 12rpx;
...@@ -389,13 +397,10 @@ ...@@ -389,13 +397,10 @@
align-items: center; align-items: center;
} }
} }
} }
} }
.list-view { .list-view {
.group-view { .group-view {
margin-top: 20rpx; margin-top: 20rpx;
background-color: #FFFFFF; background-color: #FFFFFF;
...@@ -419,10 +424,8 @@ ...@@ -419,10 +424,8 @@
margin: 30rpx; margin: 30rpx;
} }
} }
} }
} }
} }
.logout { .logout {
padding: 20rpx; padding: 20rpx;
......
This diff is collapsed.
...@@ -128,11 +128,6 @@ ...@@ -128,11 +128,6 @@
this.isRuZhu = false; this.isRuZhu = false;
}); });
}, },
onUnload() {
uni.switchTab({
url: '/pages/index/mine'
});
},
methods: { methods: {
isUpload(typeBool) { isUpload(typeBool) {
return typeBool ? '已上传' : '未上传' return typeBool ? '已上传' : '未上传'
......
<template> <template>
<view class="contract"> <view class="contract">
<u-navbar <u-navbar
back-icon-color="#333333"
background="#FFFFFF"
title="我的合同" title="我的合同"
b:is-back="false" titleColor="#333333"
:background="background"
:border-bottom="false" :border-bottom="false"
title-bold
></u-navbar> ></u-navbar>
<view class="content"> <view class="content">
<view v-if="res.length > 0"> <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="loading-view" v-if="!loaded">
<u-loading mode="flower"></u-loading>
</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>
</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,
orderList: [],
}
},
computed: {
title() {
return this.noneHistory ? '浏览记录' : ' '
},
noneHistory() {
return this.orderList.length <= 0 && this.loaded
},
idList() {
return this.vuex_last_five_orders.filter((id) => id) || []
},
chakanjiluImage() {
return process.uniEnv.qn_base_url + 'chakanjilu-y.png'
},
customStyle() {
return 'background-color: #F4F5F7'
},
},
onLoad() {
getApp().trackPage('浏览记录')
this.listOrderByIds()
},
methods: {
listOrderByIds() {
this.$u.api
.listOrderByIds(
this.$u.queryParams({ ids: this.idList }, true, 'repeat')
)
.then((res) => {
this.loaded = true
if (res.code == 200) {
this.orderList = res.data
} else {
console.log(res.message, '获取订单详情失败!')
}
})
},
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) {
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;
.none-view {
margin-top: 140rpx;
}
.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;
}
}
}
.loading-view {
width: 100%;
background-color: transparent;
display: flex;
align-items: center;
justify-content: center;
top: 50%;
left: 0;
position: fixed;
}
.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: currentClicks[current][item.type] },
]"
>{{ info[item.key] || 0 }}</view
>
<view
>{{ item.label
}}<u-icon
class="arrow-icon"
name="arrow-right"
color="#cccccc"
></u-icon
></view>
</view>
</view>
</view>
<view>
<u-toast ref="uToast" />
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
info: {},
offset: [0, 0],
current: 0,
currentClicks: [],
}
},
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))
date = new Date()
var weekDays = [6, 0, 1, 2, 3, 4, 5]
var week = this.$u.timeFormat(
date.setDate(date.getDate() - weekDays[date.getDay()])
)
date = new Date()
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]
},
clicks() {
return { take: false, checkin: false, finish: false }
},
},
onLoad() {
this.currentClicks = this.clicks
},
onShow() {
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]
this.currentClicks = [
{ ...this.clicks },
{ ...this.clicks },
{ ...this.clicks },
{ ...this.clicks },
]
this.currentClicks[this.current][item.type] = true
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;
}
}
.arrow-icon {
margin-left: 4rpx;
}
}
}
}
}
}
</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
@scrolltolower="reachBottom"
scroll-anchoring
enable-back-to-top
refresher-background="#F4F5F7"
>
<view class="loading-view" v-if="!loaded">
<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"
: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,
title: '',
orderType: '',
timeParam: {},
}
},
computed: {
noMore() {
return this.orderList.length == 0 && this.loaded
},
noOrderCustomStyle() {
return 'margin-top: 100rpx;background-color: #F4F5F7'
},
sortType() {
return {
take: 'acceptOrderDateTime',
checkin: 'checkInDateTime',
finish: 'orderFinishDatetime',
}
},
currentSorTtype() {
return this.sortType[this.orderType]
},
},
onLoad(e) {
getApp().trackPage('订单首页')
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,
}
this.$u.api.manageOrderList(param).then((res) => {
if (res.code == 200) {
if (this.pageNumber == 1) {
this.orderList = []
}
if (res.data.list) {
this.orderList.push(...res.data.list)
this.orderList.sort((x, y) => {
return (x[this.currentSorTtype] || 0) <
(y[this.currentSorTtype] || 0)
? 1
: -1
})
this.loadStatus =
res.data.total > this.orderList.length &&
res.data.list.length == this.pageSize
? 'loadmore'
: 'nomore'
}
} else {
console.log(res.message, '获取订单数量失败!')
}
this.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 +
'&maintainStep=' +
item.maintainStep +
'&orderStatus=' +
item.orderStatus +
'&brandId=' +
item.lianbaoBrandId +
'&auditResults=' +
(item.auditResults ? Object.keys(item.auditResults).join() : ''),
})
},
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,
})
},
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;
left: 0;
margin-top: 300rpx;
position: absolute;
}
}
}
</style>
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
{ {
pathName: 'about', pathName: 'about',
title: '当前版本', title: '当前版本',
value: process.uniEnv.version, value: process.uniEnv.version_number,
icon: process.uniEnv.qn_base_url + 'version.png', icon: process.uniEnv.qn_base_url + 'version.png',
imageStyle: 'width:32rpx;height:32rpx' imageStyle: 'width:32rpx;height:32rpx'
} }
......
...@@ -13,10 +13,13 @@ ...@@ -13,10 +13,13 @@
</view> </view>
</picker> </picker>
</view> </view>
<view class="head-bottom-view"> <view class="head-bottom-view u-flex u-row-between">
<view class="head-amount-view"> <view class="head-amount-view">
<view><text>已结算金额(元)</text></view> <view><text>已结算金额(元)</text></view>
<view class="head-amount-text"><text>{{info.totalAmount}}</text></view> <view class="head-amount-text"><text>{{info.totalAmount || 0}}</text></view>
<!-- <view class="head-amount-view">
<view><text>待结算金额(元)</text></view>
<view class="head-amount-text"><text>{{info.waitPaidAmount || 0}}</text></view> -->
</view> </view>
</view> </view>
</view> </view>
...@@ -46,7 +49,7 @@ ...@@ -46,7 +49,7 @@
let now = new Date(new Date().toLocaleDateString()).getTime(); let now = new Date(new Date().toLocaleDateString()).getTime();
import util from '@/utils/util.js' import util from '@/utils/util.js'
import Settlement from "@/components/mine/settlement.vue" import Settlement from "@/components/mine/settlement.vue"
const baseinfo = {totalAmount: 0, payableRecordExtendDtos: []} const baseinfo = {totalAmount: 0, waitPaidAmount: 0, payableRecordExtendDtos: []}
export default { export default {
components: { components: {
Settlement Settlement
...@@ -58,7 +61,7 @@ ...@@ -58,7 +61,7 @@
date: '', date: '',
params: { params: {
payableRecordStatus: null, payableRecordStatus: null,
starDate: null, startDate: null,
endDate: null, endDate: null,
}, },
} }
...@@ -88,9 +91,9 @@ ...@@ -88,9 +91,9 @@
self.loading = true self.loading = true
let startTime = self.moment(self.date).format('YYYY-MM-DD') let startTime = self.moment(self.date).format('YYYY-MM-DD')
let endTime = self.moment(self.date).endOf('month').format('YYYY-MM-DD') let endTime = self.moment(self.date).endOf('month').format('YYYY-MM-DD')
self.params.starDate = startTime self.params.startDate = startTime
self.params.endDate = endTime self.params.endDate = endTime
let res = await self.$u.api.payableRecord(self.params) let res = await self.$u.api.listPayableRecordByPayTime(self.params)
self.loading = false self.loading = false
if(res && res.code == 200) { if(res && res.code == 200) {
self.info = res.data && res.data[self.date] || baseinfo self.info = res.data && res.data[self.date] || baseinfo
......
...@@ -318,7 +318,7 @@ ...@@ -318,7 +318,7 @@
.fixed-button { .fixed-button {
position: fixed; position: fixed;
right: 20rpx; right: 10rpx;
bottom: 64rpx; bottom: 64rpx;
} }
......
...@@ -63,7 +63,9 @@ ...@@ -63,7 +63,9 @@
:prop="item.fieldsName" :prop="item.fieldsName"
:border-bottom="false" :border-bottom="false"
v-show=" v-show="
((item.fieldsName != 'actualPaid' && item.fieldsName != 'eSerialNum') || show200) && ((item.fieldsName != 'actualPaid' &&
item.fieldsName != 'eSerialNum') ||
show200) &&
((readOnly && ((readOnly &&
!$u.test.isEmpty(form[item.fieldsName])) || !$u.test.isEmpty(form[item.fieldsName])) ||
!readOnly) !readOnly)
...@@ -315,6 +317,7 @@ ...@@ -315,6 +317,7 @@
:cancel-btn="true" :cancel-btn="true"
@click="uploadSelect" @click="uploadSelect"
></u-action-sheet> ></u-action-sheet>
<upload-progress />
</view> </view>
</template> </template>
<script> <script>
...@@ -598,6 +601,22 @@ export default { ...@@ -598,6 +601,22 @@ export default {
this.form.paymentMethodsType && this.form.paymentMethodsType != '03' this.form.paymentMethodsType && this.form.paymentMethodsType != '03'
) )
}, },
// 从订单管理和浏览记录进来,不跳转到订单列表,而是后退到订单管理和浏览记录
completeBack() {
let pages = getCurrentPages()
var i = 0
for (var item of pages) {
if (
['/pages/mine/history/index', '/pages/mine/order/index'].indexOf(
item.$page?.fullPath.split('?')[0]
) != -1
) {
return pages.length - i - 1
}
i++
}
return 0
},
}, },
methods: { methods: {
getCompleteData() { getCompleteData() {
...@@ -872,10 +891,17 @@ export default { ...@@ -872,10 +891,17 @@ export default {
async appointment() { async appointment() {
const save = await this.nextStepSaveData() const save = await this.nextStepSaveData()
if (save) { if (save) {
if (this.completeBack) {
// 从订单管理和浏览记录进来
uni.navigateBack({
delta: this.completeBack,
})
} else {
uni.reLaunch({ uni.reLaunch({
url: '/pages/index/order?type=0', url: '/pages/index/order?type=waitAppointment',
}) })
} }
}
}, },
// 下一步动作 // 下一步动作
async nextAction() { async nextAction() {
...@@ -1008,9 +1034,16 @@ export default { ...@@ -1008,9 +1034,16 @@ export default {
title: '提交成功', title: '提交成功',
type: 'success', type: 'success',
callback: () => { callback: () => {
if (this.completeBack) {
// 从订单管理和浏览记录进来
uni.navigateBack({
delta: this.completeBack,
})
} else {
uni.reLaunch({ uni.reLaunch({
url: '/pages/index/order?type=3', url: '/pages/index/order?type=audit',
}) })
}
}, },
}) })
} else { } else {
...@@ -1029,9 +1062,16 @@ export default { ...@@ -1029,9 +1062,16 @@ export default {
title: '提交成功', title: '提交成功',
type: 'success', type: 'success',
callback: () => { callback: () => {
if (this.completeBack) {
// 从订单管理和浏览记录进来
uni.navigateBack({
delta: this.completeBack,
})
} else {
uni.reLaunch({ uni.reLaunch({
url: '/pages/index/order?type=3', url: '/pages/index/order?type=audit',
}) })
}
}, },
}) })
} else { } else {
...@@ -1102,10 +1142,14 @@ export default { ...@@ -1102,10 +1142,14 @@ export default {
if (innerItem.fieldsName === 'paymentMethodsType') { 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' 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' eSerialNum.required = data.value != '03'
} }
......
...@@ -548,11 +548,7 @@ export default { ...@@ -548,11 +548,7 @@ export default {
loadOrderDetail() { loadOrderDetail() {
// 获取工单详情 // 获取工单详情
let self = this let self = this
let timestamp = new Date().getTime() self.$u.api.orderDetail({}, self.orderId).then((res) => {
var data = {
orderId: self.orderId,
}
self.$u.api.orderDetail(data, self.orderId).then((res) => {
if (res.code == 200) { if (res.code == 200) {
self.order = res.data self.order = res.data
this.setOrderType() this.setOrderType()
......
...@@ -16,18 +16,49 @@ ...@@ -16,18 +16,49 @@
:action-style="{ :action-style="{
'font-size': '32rpx', 'font-size': '32rpx',
'font-weight': 500, 'font-weight': 500,
'color': '#2272FF' color: '#2272FF',
}" }"
:focus="true" :focus="true"
@change="keywordChange"
@focus="onfocus"
@blur="loseFocus"
@search="searchOrder" @search="searchOrder"
@custom="searchOrder" @custom="searchOrder"
></u-search> ></u-search>
</view> </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-if="orderList && orderList.length > 0" class="order-row">
<view v-for="(item, index) in orderList" :key="item.orderId"> <view v-for="item in orderList" :key="item.orderId">
<OrderCell :orderData="item" :orderType="orderType" :location="dataValue" <OrderCell
@click="handleClick" @action="handleClickCellButton"> </OrderCell> :orderData="item"
:orderType="orderType"
:location="dataValue"
@click="handleClick"
@action="handleClickCellButton"
>
</OrderCell>
</view> </view>
<u-loadmore :status="loadStatus" bgColor="#F4F5F7"></u-loadmore> <u-loadmore :status="loadStatus" bgColor="#F4F5F7"></u-loadmore>
</view> </view>
...@@ -35,118 +66,192 @@ ...@@ -35,118 +66,192 @@
<u-image width="374" height="256" :src="searchEmpty"> <u-image width="374" height="256" :src="searchEmpty">
<u-loading slot="loading"></u-loading> <u-loading slot="loading"></u-loading>
</u-image> </u-image>
<text class="empty-message"> <text class="empty-message"> 当前暂无搜索结果 </text>
当前暂无搜索结果
</text>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import OrderCell from "@/components/order/index.vue"; import OrderCell from "@/components/order/index.vue";
export default { export default {
components: { components: {
OrderCell OrderCell,
}, },
data() { data() {
return { return {
search: { search: {
type: '', type: "",
keyword: '', keyword: "",
pageSize: 10, pageSize: 10,
pageNumber: 0, pageNumber: 0,
orderStatusRangeType: '', orderStatusRangeType: "",
}, },
orderList: [], orderList: [],
associationList: [],
loaded: false, loaded: false,
focused: true,
total: 10, total: 10,
loadStaus: 'loadmore', loadStaus: "loadmore",
style: {
// 字符串的形式
span: "color: red",
},
}; };
}, },
onLoad() { onLoad() {
getApp().trackPage('订单搜索页') getApp().trackPage("订单搜索页");
// this.searchOrder() // this.searchOrder()
}, },
onReachBottom() { onReachBottom() {
let len = this.orderList && this.orderList.length || 0 let len = (this.orderList && this.orderList.length) || 0;
if(!this.loaded || len >= this.total) return; if (!this.loaded || len >= this.total) return;
this.loadStaus = 'loading'; this.loadStaus = "loading";
this.search.pageNumber = ++ this.search.pageNumber; this.search.pageNumber = ++this.search.pageNumber;
this.getOrderList('onReachBottom') this.getOrderList("onReachBottom");
}, },
computed: { computed: {
searchEmpty() { searchEmpty() {
return process.uniEnv.qn_base_url + 'SearchEmpty.png' return process.uniEnv.qn_base_url + "SearchEmpty.png";
},
showAssociation() {
return this.focused && this.search.keyword && !this.$u.test.isEmpty(this.associationList);
},
showOrderCell() {
return !this.focused;
}, },
}, },
methods: { methods: {
searchOrder(index) { searchOrder(index) {
this.search.pageNumber = 1 this.search.pageNumber = 1;
this.loadStaus = 'loading'; this.loadStaus = "loading";
if(this.search.keyword) { if (this.search.keyword) {
getApp().track('search_order', {keyword: this.search.keyword}); getApp().track("search_order", { keyword: this.search.keyword });
this.getOrderList() this.getOrderList();
this.focused = false;
}
},
// 高亮文本
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() {
}, },
// 页面数据 // 页面数据
getOrderList(event) { getOrderList(event) {
let self = this; let self = this;
if(!self.search.keyword) { if (!self.search.keyword) {
return false return false;
} }
// 状态处理 // 状态处理
self.loaded = false self.loaded = false;
self.$u.api.listOrder(self.search).then((res) => { self.$u.api.listOrder(self.search).then((res) => {
if (res.code == 200) { if (res.code == 200) {
if (res.data) { if (res.data) {
let list = res.data.list || [] let list = res.data.list || [];
self.total = res.data.total || 0 self.total = res.data.total || 0;
if(event == 'onReachBottom') { if (event == "onReachBottom") {
self.orderList.push(...list) self.orderList.push(...list);
} else { } 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 { } else {
self.$u.toast('请求失败'); self.$u.toast("请求失败");
} }
self.loaded = true self.loaded = true;
}); });
}, },
handleClickCellButton(item) { handleClickCellButton(item) {
// 去完工 // 去完工
uni.navigateTo({ uni.navigateTo({
url: 'pages/order/complete?orderId='+item.orderId url:
+ "&categoryId=" + item.categoryId "pages/order/complete?orderId=" +
+ "&orderServiceType=" + item.orderServiceType item.orderId +
+ "&inGuaranteePeriod=" + item.inGuaranteePeriod "&categoryId=" +
+ "&partnerCompanyId=" + item.partnerCompanyId item.categoryId +
+ "&auditResultsId=" + (item.auditResults?Object.keys(item.auditResults)[Object.keys(item.auditResults).length - 1]:'') "&orderServiceType=" +
+ "&maintainStep=" + item.maintainStep item.orderServiceType +
}) "&inGuaranteePeriod=" +
}, item.inGuaranteePeriod +
handleClick(item, type, showCountTime) { // type:类型,showCountTime:是否显示倒计时。详情页面情况太多,提前传值可以避免页面晃动 "&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类型 //type类型
// 'waitAccept': 待接单、待抢单;'waitAppointment': 待预约;'waitCheckIn': 待签到;'waitFinish': 待完工;'audit': 审核中;'exception': 异常单;'finish': 已完工;'other': 工单结算信息 // 'waitAccept': 待接单、待抢单;'waitAppointment': 待预约;'waitCheckIn': 待签到;'waitFinish': 待完工;'audit': 审核中;'exception': 异常单;'finish': 已完工;'other': 工单结算信息
uni.navigateTo({ 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> </script>
<style lang="scss"> <style lang="scss">
.search-wrap { .search-wrap {
display: flex;
flex-direction: column;
height: 100vh;
.top-item { .top-item {
position: sticky; position: sticky;
padding: 20rpx 0; padding: 20rpx 0;
top: 0rpx; top: 0rpx;
background-color: #F4F5F7; background-color: #f4f5f7;
z-index: 2; z-index: 2;
/deep/ .u-search .u-content { /deep/ .u-search .u-content {
padding: 0 20rpx 0 40rpx; padding: 0 20rpx 0 40rpx;
...@@ -158,7 +263,7 @@ ...@@ -158,7 +263,7 @@
font-size: 36rpx !important; font-size: 36rpx !important;
} }
/deep/ .u-search .u-close-wrap .u-iconfont { /deep/ .u-search .u-close-wrap .u-iconfont {
color: #CCCCCC; color: #cccccc;
} }
} }
...@@ -179,7 +284,20 @@ ...@@ -179,7 +284,20 @@
line-height: 28rpx; line-height: 28rpx;
} }
} }
}
.association-wrap {
height: 100%;
padding-bottom: 44rpx;
overflow: auto;
.association-cell {
display: flex;
padding: 26rpx 32rpx;
font-size: 28rpx;
line-height: 54rpx;
color: #606266;
background: #ffffff;
}
} }
} }
</style> </style>
...@@ -23,8 +23,10 @@ ...@@ -23,8 +23,10 @@
<!-- <text class="rightContent u-m-t-14 u-m-l-30 u-p-b-30">{{item.describe}}</text> --> <!-- <text class="rightContent u-m-t-14 u-m-l-30 u-p-b-30">{{item.describe}}</text> -->
</view> </view>
<view class="rightImageView" v-if="item.orderImages && item.orderImages.length > 0"> <view class="rightImageView" v-if="item.orderImages && item.orderImages.length > 0">
<image class="rightImage" v-for="(image, index) in item.orderImages" :src="image" <u-image class="rightImage" v-for="(image, index) in item.orderImages" :src="image + '?imageView2/1/w/100/h/100/q/75'"
:key="index" @click.stop="handleClickImage(item, index)" mode="aspectFill"></image> :key="index" @tap.stop="handleClickImage(item, index)" width="116" height="116">
<view slot="error" style="font-size: 24rpx;">上传中</view>
</u-image>
</view> </view>
</view> </view>
</template> </template>
...@@ -419,8 +421,8 @@ ...@@ -419,8 +421,8 @@
.rightImage { .rightImage {
background-color: #F3F3F3; background-color: #F3F3F3;
width: 116rpx; /* width: 116rpx;
height: 116rpx; height: 116rpx; */
margin: 0rpx 12rpx 12rpx 0rpx; margin: 0rpx 12rpx 12rpx 0rpx;
} }
......
...@@ -183,10 +183,10 @@ uploader.requestError = function(e) { ...@@ -183,10 +183,10 @@ uploader.requestError = function(e) {
if (e.statusCode === 0) { if (e.statusCode === 0) {
throw e; throw e;
} else { } else {
uni.showToast({ // uni.showToast({
title: "当前网络信号较差,请耐心等待或尝试切换网络环境", // title: "当前网络信号较差,请耐心等待或尝试切换网络环境",
icon: "none" // icon: "none"
}); // });
} }
} }
export default uploader; export default uploader;
...@@ -12,7 +12,7 @@ try { ...@@ -12,7 +12,7 @@ try {
} }
// 需要永久存储,且下次APP启动需要取出的,在state中的变量名 // 需要永久存储,且下次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', 'uploadTotal', 'uploadSuccess', 'vuex_superuser'];
// 保存变量到本地存储中 // 保存变量到本地存储中
const saveLifeData = function(key, value) { const saveLifeData = function(key, value) {
...@@ -34,6 +34,7 @@ const store = new Vuex.Store({ ...@@ -34,6 +34,7 @@ const store = new Vuex.Store({
vuex_token: lifeData.vuex_token ? lifeData.vuex_token : '', vuex_token: lifeData.vuex_token ? lifeData.vuex_token : '',
vuex_cache: lifeData.vuex_cache ? lifeData.vuex_cache : {}, vuex_cache: lifeData.vuex_cache ? lifeData.vuex_cache : {},
vuex_superuser: lifeData.vuex_superuser || false, 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_version: '1.0.1',
vuex_config: {}, vuex_config: {},
// 入驻信息 // 入驻信息
...@@ -42,7 +43,13 @@ const store = new Vuex.Store({ ...@@ -42,7 +43,13 @@ const store = new Vuex.Store({
// 授权用户信息 // 授权用户信息
vuex_auth_user: {}, vuex_auth_user: {},
// 上传队列 // 上传队列
uploadTask: lifeData.uploadTask ? lifeData.uploadTask : [] uploadTask: lifeData.uploadTask ? lifeData.uploadTask : [],
// 上传状态 1 未开始 2 上传中 3 上传中断
uploadStatus: 1,
// 上传总数量
uploadTotal: lifeData.uploadTotal ? lifeData.uploadTotal : 0,
// 已上传数量
uploadSuccess: lifeData.uploadSuccess ? lifeData.uploadSuccess : 0,
}, },
mutations: { mutations: {
$uStore(state, payload) { $uStore(state, payload) {
......
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