diff --git a/common/enum.js b/common/enum.js index 8dcd48b..9f6c2ad 100644 --- a/common/enum.js +++ b/common/enum.js @@ -1,4 +1,4 @@ -import getCdnUrl from "./getCdnUrl.js" +import getCdnUrl, { getCdnRoot } from "./getCdnUrl.js" import { authCodeEnum } from "./authCode" const dateTypeEnum = { @@ -74,6 +74,18 @@ const dealBtnMap = { } +const audioTypeEnum = { + confirmation: getCdnRoot('tone/confirmation.mp3'), + correct: getCdnRoot('tone/correct.mp3'), + dotexist: getCdnRoot('tone/dotexist.mp3'), + networkError: getCdnRoot('tone/network-error.mp3'), + orderException: getCdnRoot('tone/order-exception.mp3'), + printCancel: getCdnRoot('tone/print-cancel.mp3'), + printFail: getCdnRoot('tone/print-fail.mp3'), + printSuccess: getCdnRoot('tone/print-success.mp3'), + repetitive: getCdnRoot('tone/repetitive.mp3'), +} + export { addressNameCodeMap, dateRangeList, @@ -82,4 +94,5 @@ export { dateTypeEnum, dateTypeList, authCodeEnum, + audioTypeEnum, } \ No newline at end of file diff --git a/common/getCdnUrl.js b/common/getCdnUrl.js index f5b6140..c03ff71 100644 --- a/common/getCdnUrl.js +++ b/common/getCdnUrl.js @@ -1,3 +1,7 @@ export default (path)=> { return `/static/images/${path}` +} + +export const getCdnRoot = (path)=> { + return `/static/${path}` } \ No newline at end of file diff --git a/common/scanUtil.js b/common/scanUtil.js index b1879f7..5bbd935 100644 --- a/common/scanUtil.js +++ b/common/scanUtil.js @@ -1,5 +1,6 @@ import dayjs from "dayjs" -import { showToast } from "@/common/untool" +import { showToast, playAudio } from "@/common/untool" +import { audioTypeEnum } from "@/common/enum" export const scanTypeEnum = { lanShou: 10, // 揽收 @@ -35,8 +36,20 @@ export const ansScanResponse = ({ res, title })=> { let bl = false if(result == "success") { bl = true + playAudio(audioTypeEnum.correct) title && showToast(`${title}成功`) } else { + switch (resItem?.message){ + case '重复扫描': + playAudio(audioTypeEnum.repetitive) + break; + case '运单号不存在': + playAudio(audioTypeEnum.dotexist) + break; + default: + playAudio(audioTypeEnum.networkError) + break; + } showToast(resItem?.message || `${title}失败`) } return { diff --git a/common/untool.js b/common/untool.js index 4c78adc..eab3c69 100644 --- a/common/untool.js +++ b/common/untool.js @@ -266,6 +266,17 @@ const reloadCurrentPage = (_thisPage)=> { }); } +const playAudio = (src)=> { + const innerAudioContext = uni.createInnerAudioContext(); + innerAudioContext.autoplay = true; + innerAudioContext.src = src + innerAudioContext.onPlay(() => { + console.log('开始播放==='); + }); + innerAudioContext.onError((res) => { + console.log("playAudio onError ======", res); + }); +} export { reLaunch, @@ -288,4 +299,5 @@ export { promiseTimeout, setNavigationBarTitle, reloadCurrentPage, + playAudio } diff --git a/components/buns-post-edit-templates/bpe-cost-tmp.vue b/components/buns-post-edit-templates/bpe-cost-tmp.vue index bd51deb..b1538e6 100644 --- a/components/buns-post-edit-templates/bpe-cost-tmp.vue +++ b/components/buns-post-edit-templates/bpe-cost-tmp.vue @@ -89,7 +89,7 @@ - diff --git a/components/buns-post-edit-templates/bpe-coststatic-tmp.vue b/components/buns-post-edit-templates/bpe-coststatic-tmp.vue index c5ac822..49aaf29 100644 --- a/components/buns-post-edit-templates/bpe-coststatic-tmp.vue +++ b/components/buns-post-edit-templates/bpe-coststatic-tmp.vue @@ -64,7 +64,7 @@ 费用备注 - {{modelInfo.feeRemaker || '-'}} + {{modelInfo.feeRemark || '-'}} diff --git a/pages/deliveryDeal/signedScanning.vue b/pages/deliveryDeal/signedScanning.vue index 7e65e2e..f0c2f92 100644 --- a/pages/deliveryDeal/signedScanning.vue +++ b/pages/deliveryDeal/signedScanning.vue @@ -23,6 +23,12 @@ + + + + + + @@ -51,6 +57,7 @@ import dayjs from "dayjs" import * as apiService from "@/common/api" import { scanTypeEnum, getScanParams, ansScanResponse } from "@/common/scanUtil" + import { checkParams } from "@/common/validate" export default { components:{ BpeGoodphotoTmp }, @@ -72,8 +79,14 @@ signMan: "", picUrl: '', remark: "", - scanDate: "" + dispatchOrSendManCode: "" }, + submitValidConfig: { + signMan: { required: true, requiredMsg: '签收人不能为空' }, + // dispatchOrSendManCode: { required: true, requiredMsg: '请选择派件员' }, + billCode: { required: true, requiredMsg: '运单号不能为空' }, + }, + paiRes: { list: [] }, } }, onShareAppMessage() { @@ -88,7 +101,7 @@ }, methods: { - + getRSDStaffList: apiService.getRSDStaffList, initData() { this.submitParam.billCode = this.queryOption.billCode || this.queryOption.orderSn }, @@ -96,6 +109,7 @@ }), async handleSubmit() { + await checkParams(this.submitParam, this.submitValidConfig) this.submitParam.picUrl = this.submitParam.picUrl?.join?.(",") || '' let scnParam = getScanParams(scanTypeEnum.qianShou, { ...this.submitParam }) let res = await apiService.scanRecord({...scnParam, _loading: true}) diff --git a/pages/post/model.js b/pages/post/model.js index 4f9401a..7a9c51a 100644 --- a/pages/post/model.js +++ b/pages/post/model.js @@ -67,7 +67,7 @@ export const getOrderModels = () => { blOverLong: undefined, blOverWeight: undefined, overWeightNumber: undefined, - feeRemaker: undefined, // 付款方式-其他-备注 + feeRemark: undefined, // 付款方式-其他-备注 realValue: undefined, blDispFd: undefined, transferCode: undefined, diff --git a/static/tone/confirmation.mp3 b/static/tone/confirmation.mp3 new file mode 100644 index 0000000..c83c9c8 Binary files /dev/null and b/static/tone/confirmation.mp3 differ diff --git a/static/tone/correct.mp3 b/static/tone/correct.mp3 new file mode 100644 index 0000000..6991e22 Binary files /dev/null and b/static/tone/correct.mp3 differ diff --git a/static/tone/dotexist.mp3 b/static/tone/dotexist.mp3 new file mode 100644 index 0000000..bb6c6a2 Binary files /dev/null and b/static/tone/dotexist.mp3 differ diff --git a/static/tone/network-error.mp3 b/static/tone/network-error.mp3 new file mode 100644 index 0000000..db263ac Binary files /dev/null and b/static/tone/network-error.mp3 differ diff --git a/static/tone/order-exception.mp3 b/static/tone/order-exception.mp3 new file mode 100644 index 0000000..65a323a Binary files /dev/null and b/static/tone/order-exception.mp3 differ diff --git a/static/tone/print-cancel.mp3 b/static/tone/print-cancel.mp3 new file mode 100644 index 0000000..da2e19d Binary files /dev/null and b/static/tone/print-cancel.mp3 differ diff --git a/static/tone/print-fail.mp3 b/static/tone/print-fail.mp3 new file mode 100644 index 0000000..e8f6ec2 Binary files /dev/null and b/static/tone/print-fail.mp3 differ diff --git a/static/tone/print-success.mp3 b/static/tone/print-success.mp3 new file mode 100644 index 0000000..51c7be7 Binary files /dev/null and b/static/tone/print-success.mp3 differ diff --git a/static/tone/repetitive.mp3 b/static/tone/repetitive.mp3 new file mode 100644 index 0000000..21a36da Binary files /dev/null and b/static/tone/repetitive.mp3 differ