From 46ab572a50c54b0e65a50545b531f072690c0013 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Fri, 20 Oct 2023 11:54:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=8B=E6=9C=BA=E7=AB=AF?=
=?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
compoment/tiplist/tiplist.vue | 19 +-
config/host.js | 4 +-
manifest.json | 4 +-
pages/user/user.vue | 2 +-
.../CustomerOrdersDetails.vue | 12 +-
pagesHome/pages/CustomerSign/CustomerSign.vue | 91 +++++---
.../pages/SelfPScanList/SelfPScanList.vue | 2 +-
.../SelfPickupDetails/SelfPickupDetails.vue | 7 +
pagesHome/pages/SetPrice/SetPrice.vue | 185 +++++++++-------
pagesHome/pages/pickingScan/pickingScan.vue | 11 +-
.../CustomerOrdersDetails.css | 2 +-
unpackage/dist/dev/app-plus/app-service.js | 202 +++++++++++-------
unpackage/dist/dev/app-plus/manifest.json | 10 +-
13 files changed, 338 insertions(+), 213 deletions(-)
diff --git a/compoment/tiplist/tiplist.vue b/compoment/tiplist/tiplist.vue
index d431c23..bf0db6d 100644
--- a/compoment/tiplist/tiplist.vue
+++ b/compoment/tiplist/tiplist.vue
@@ -34,12 +34,12 @@
:class="{'tpstitl': true,'start': ImagesRequiredFields.find(val => val.key === item.dictKey), 'showTitle': ImagesRequiredFields.find(val => val.key === item.dictKey) && item.imgList.length < 3}">
{{item.dictValue}}
- 预览模版
+ 预览模版
-
-
+
+
@@ -169,8 +169,8 @@
-
- 
+
+ ![]()
@@ -203,6 +203,8 @@
ImagesRequiredFields: [],
inpList: [],
showPreviewPicture: false,
+ // 预览图片地址
+ previewPictureUrl: '/static/changku.png',
// 盘点复选框
checkSectionList: [],
// 上架
@@ -276,7 +278,9 @@
break;
}
}
- function remove(index, i) {
+ function remove(index : number, i : number, type : string) {
+ // 是否为提交修改, 记录修改的类型
+ if (details.isChange && !details.changeImageList.includes(type)) details.changeImageList.push(type)
details.imglist[index].imgList.splice(i, 1)
}
function updateimg(type : string, index : number) {
@@ -344,7 +348,8 @@
- function handleShowImage() {
+ function handleShowImage(imgUrl = '/static/changku.png') {
+ details.previewPictureUrl = imgUrl
details.showPreviewPicture = !details.showPreviewPicture
}
diff --git a/config/host.js b/config/host.js
index 1597c9e..8c73905 100644
--- a/config/host.js
+++ b/config/host.js
@@ -10,9 +10,9 @@
// zhy
// const devhost = 'http://192.168.10.48:8888/'
// tjj
-const devhost = 'http://192.168.10.29:13000/'
+// const devhost = 'http://192.168.10.29:13000/'
// cyz
-// const devhost = 'http://192.168.10.75:8777/'
+const devhost = 'http://192.168.10.75:8777/'
// 正式
// const devhost = 'http://h5uapi.huitongys.com/'
// cg
diff --git a/manifest.json b/manifest.json
index 514effb..72acf75 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "货无忧",
"appid" : "__UNI__EB22F37",
"description" : "",
- "versionName" : "1.0.11",
- "versionCode" : 1011,
+ "versionName" : "1.0.13",
+ "versionCode" : 1013,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages/user/user.vue b/pages/user/user.vue
index a9f1bb2..eced263 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -173,7 +173,7 @@
// 获取版本信息
// let version = await utils.getversion()
let version = {
- version: '1.0.11',
+ version: '1.0.13',
pkName: 'com.hwy.pda'
}
console.log("version 版本>>>>", version)
diff --git a/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue b/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue
index c0f56bd..aeb6e4c 100644
--- a/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue
+++ b/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue
@@ -223,12 +223,12 @@
response = await signforinventory(data)
}
details.datalist = response.data.records || []
- if (loadingNub.value != 0 && details.isscan) {
- console.log(loadingNub.value + '件')
- setTimeout(() => {
- utils.ttsspke(loadingNub.value + '件')
- }, 1000)
- }
+ // if (loadingNub.value != 0 && details.isscan) {
+ // console.log(loadingNub.value + '件')
+ // setTimeout(() => {
+ // utils.ttsspke(loadingNub.value + '件')
+ // }, 1000)
+ // }
}
function checktype(e) {
if (e == '') {
diff --git a/pagesHome/pages/CustomerSign/CustomerSign.vue b/pagesHome/pages/CustomerSign/CustomerSign.vue
index f28aff8..b70d80f 100644
--- a/pagesHome/pages/CustomerSign/CustomerSign.vue
+++ b/pagesHome/pages/CustomerSign/CustomerSign.vue
@@ -98,6 +98,7 @@
onUnload
} from '@dcloudio/uni-app'
import { computed, reactive, ref, toRefs } from "vue";
+ import utils from '@/utils/utils.js';
let details = reactive({
items: {} as any,
id: '',
@@ -197,7 +198,7 @@
let imglis = [], rearks = ''
if (res.code == 200) {
// 有照片或有备注时, 为修改提交状态
- if (res.data.deliverySignPictures || res.data.driverRemarks) {
+ if (Object.keys(res.data.deliverySignPictures).length !== 0 || res.data.driverRemarks) {
// 提交状态改为修改
details.isChange = true
imglis = res.data.deliverySignPictures
@@ -229,6 +230,7 @@
changeImageList: details.changeImageList,
ImagesRequiredFields: details.ImagesRequiredFields,
success: async (detail) => {
+ console.log('detail :>> ', detail);
let data = {
deliveryId: details.id,
reservationId: item.id,
@@ -239,33 +241,50 @@
let res : any = null
// 是否符合提交条件
let isSubmit = true
+ console.log('details.ImagesRequiredFields :>> ', details.ImagesRequiredFields);
// 是否为修改提交
if (details.isChange) {
- console.log('details.imgList :>> ', details.imgList);
- const filterMap = details.imgList.filter(item => details.changeImageList.includes(item.dictKey))
+ const filterMap = detail.imglist.filter(item => details.changeImageList.includes(item.dictKey))
filterMap.forEach(item => {
data.map[item.dictKey] = item.imgList
- console.log('object :>> ', details.ImagesRequiredFields.find(val => val === item.dictKey) && item.imgList.length < 3);
- if (!details.ImagesRequiredFields.find(val => val === item.dictKey) && item.imgList.length < 3) isSubmit = false;
+ console.log(1)
+ if (details.ImagesRequiredFields.find(val => val.key === item.dictKey) && item.imgList.length < 3) isSubmit = false;
else isSubmit = true
})
- console.log('data :>> ', data);
- console.log('isSubmit :>> ', isSubmit);
- if (!isSubmit) return
+ if (!isSubmit) {
+ uni.showToast({
+ title: '请根据要求上传照片',
+ icon: 'none'
+ })
+ utils.ttsspke('必传照片不足')
+ return
+ }
res = await signforUpdatePicture(data)
} else {
- details.imgList.forEach(item => {
+ console.log('details.imgList :>> ', details.imgList);
+ detail.imglist.forEach(item => {
data.map[item.dictKey] = item.imgList
- if (!details.ImagesRequiredFields.find(val => val === item.dictKey) && item.imgList.length < 3) isSubmit = false
+ console.log(2)
+ console.log('item.imgList :>> ', item.imgList);
+ if (details.ImagesRequiredFields.find(val => val.key === item.dictKey) && item.imgList.length < 3) isSubmit = false
else isSubmit = true
})
- console.log('details.isChange :>> ', details.isChange);
- console.log('isSubmit :>> ', isSubmit);
- if (!isSubmit) return
+ if (!isSubmit) {
+ uni.showToast({
+ title: '请根据要求上传照片',
+ icon: 'none'
+ })
+ utils.ttsspke('必传照片不足')
+ return
+ }
res = await signforsignforack(data)
}
if (res.code == 200) {
initpage()
+ uni.showToast({
+ title: res.msg,
+ icon: 'none'
+ })
}
tiplists.value.setdetails({ isshow: false })
},
@@ -317,29 +336,43 @@
geocode: true,
isHighAccuracy: true,
success: async function (res) {
- console.log(JSON.stringify(res));
- // let addr=res.address
- // console.log(`${addr.province}${addr.city}${addr.district}${addr.street}${addr.streetNum}`);
- console.log('当前位置的经度：' + res.longitude);
- console.log('当前位置的纬度：' + res.latitude);
- let data = {
- deliveryId: details.id,
- reservationId: item.id,
- positioning: res.longitude + ',' + res.latitude,
- positioningAdr: ''
- }
- let response = await signforpositioning(data)
- console.log(response);
- if (response.code == 200) {
- initpage()
+ try {
+ uni.showLoading({
+ title: '打卡中',
+ mask: true
+ })
+ console.log(JSON.stringify(res));
+ // let addr=res.address
+ // console.log(`${addr.province}${addr.city}${addr.district}${addr.street}${addr.streetNum}`);
+ console.log('当前位置的经度：' + res.longitude);
+ console.log('当前位置的纬度：' + res.latitude);
+ let data = {
+ deliveryId: details.id,
+ reservationId: item.id,
+ positioning: res.longitude + ',' + res.latitude,
+ positioningAdr: ''
+ }
+ let response = await signforpositioning(data)
+ console.log(response);
+ if (response.code == 200) {
+ initpage()
+ }
+
+ } catch (err) {
+ console.log('err :>> ', err);
+ //TODO handle the exception
+ } finally {
+ uni.hideLoading()
}
+
},
fail: (err) => {
uni.showToast({
- title: err.errMsg,
+ title: '定位失败',
icon: 'none'
})
console.log(err);
+ uni.hideLoading()
}
});
}
diff --git a/pagesHome/pages/SelfPScanList/SelfPScanList.vue b/pagesHome/pages/SelfPScanList/SelfPScanList.vue
index b1341c9..747d677 100644
--- a/pagesHome/pages/SelfPScanList/SelfPScanList.vue
+++ b/pagesHome/pages/SelfPScanList/SelfPScanList.vue
@@ -95,7 +95,7 @@
运单号：{{item.waybillNumber}}
- 产品名称：{{item.firsts}}
+ 产品名称：{{item.descriptionGoods}}
预计签收件数：{{item.reservationQuantity}}
diff --git a/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue b/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue
index f1a5a40..3e3f780 100644
--- a/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue
+++ b/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue
@@ -273,6 +273,13 @@
if (res.code == 200) {
details.isscan = true
initpage()
+
+ } else if (res.code === 3001) {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none'
+ })
+ utils.ttsspke(res.audio)
}
}
async function initpage() {
diff --git a/pagesHome/pages/SetPrice/SetPrice.vue b/pagesHome/pages/SetPrice/SetPrice.vue
index 43a1762..4595aa0 100644
--- a/pagesHome/pages/SetPrice/SetPrice.vue
+++ b/pagesHome/pages/SetPrice/SetPrice.vue
@@ -1,8 +1,6 @@
-
+
@@ -36,7 +34,9 @@
{{details.priceType[Number(item.addvalueId)-1].typename}}
- {{item.floolNum?item.floolNum+' 楼':item.distance&&item.addvalueId=='2'?item.distance+' km':item.distance+' m'}}
+
+ {{item.floolNum?item.floolNum+' 楼':item.distance&&item.addvalueId=='2'?item.distance+' km':item.distance+' m'}}
+
{{item.fee||'0'}}元
@@ -47,7 +47,8 @@
货物名称：{{ite.materialName}}
- 订单号：{{ite.orderCode}}
+ 订单号：{{ite.orderCode}}
+
包条码：{{ite.orderPackageCode}}
@@ -67,61 +68,69 @@
onLoad,
onShow,
onHide,
- onUnload
+ onUnload,
+ onPullDownRefresh
} from '@dcloudio/uni-app'
import { reactive } from "vue";
- let details=reactive({
- reservationId:'',
- items:{} as any,
- priceType:[
- {typename:'上楼',type:1},
- {typename:'超区',type:2},
- {typename:'平移',type:3},
- {typename:'搬运',type:4},
- {typename:'分拣入户',type:5},
- {typename:'专车',type:6},
+ let details = reactive({
+ reservationId: '',
+ items: {} as any,
+ priceType: [
+ { typename: '上楼', type: 1 },
+ { typename: '超区', type: 2 },
+ { typename: '平移', type: 3 },
+ { typename: '搬运', type: 4 },
+ { typename: '分拣入户', type: 5 },
+ { typename: '专车', type: 6 },
],
- priceList:[]
+ priceList: []
})
- onLoad((op)=>{
- details.reservationId=op.reservationId
- details.items=JSON.parse(op.item)
-
+ onLoad((op) => {
+ details.reservationId = op.reservationId
+ details.items = JSON.parse(op.item)
+
})
- onShow(()=>{
+ onShow(() => {
init()
})
- function goorderdetail(item){
- uni.navigateTo({
- url:'/pagesHome/pages/orderDetails/orderDetails?orderCode='+item.orderCode
- })
- }
- async function init(){
- let data={
- reservationId:details.items.id
+
+ onPullDownRefresh(() => {
+ setTimeout(() => {
+ uni.stopPullDownRefresh()
+ }, 1000)
+ })
+
+ function goorderdetail(item) {
+ uni.navigateTo({
+ url: '/pagesHome/pages/orderDetails/orderDetails?orderCode=' + item.orderCode
+ })
+ }
+ async function init() {
+ let data = {
+ reservationId: details.items.id
}
- let res=await addvalueaddvalueInfo(data)
- details.priceList=res.data
+ let res = await addvalueaddvalueInfo(data)
+ details.priceList = res.data
}
- function goValueaddedServicePage(item:any){
+ function goValueaddedServicePage(item : any) {
uni.navigateTo({
- url:'/pagesHome/pages/createAddServe/createAddServe?reservationId='
- +details.items.id
- +'&deliveryId='+details.reservationId
- +'&editId='+item.addvalueDetailId
- +'&addvalueType='+item.addvalueId
+ url: '/pagesHome/pages/createAddServe/createAddServe?reservationId='
+ + details.items.id
+ + '&deliveryId=' + details.reservationId
+ + '&editId=' + item.addvalueDetailId
+ + '&addvalueType=' + item.addvalueId
})
}
- function goaddserve(){
+ function goaddserve() {
uni.navigateTo({
- url:'/pagesHome/pages/createAddServe/createAddServe?reservationId='+details.items.id
- +'&deliveryId='+details.reservationId
+ url: '/pagesHome/pages/createAddServe/createAddServe?reservationId=' + details.items.id
+ + '&deliveryId=' + details.reservationId
})
}
+
\ No newline at end of file
diff --git a/pagesHome/pages/pickingScan/pickingScan.vue b/pagesHome/pages/pickingScan/pickingScan.vue
index 5dd4c4d..bf370de 100644
--- a/pagesHome/pages/pickingScan/pickingScan.vue
+++ b/pagesHome/pages/pickingScan/pickingScan.vue
@@ -97,7 +97,8 @@
onLoad,
onShow,
onHide,
- onUnload
+ onUnload,
+ onPullDownRefresh
} from '@dcloudio/uni-app'
import { distributionStockuppageList } from '@/api/user.js'
import { pageData } from '@/interfaces/pagesHome/pickingScan'
@@ -141,6 +142,14 @@
utils.ttsspke('请选择拣货任务')
// initpage()
})
+ // 下拉刷新
+ onPullDownRefresh(() => {
+ init()
+
+ setTimeout(() => {
+ uni.stopPullDownRefresh()
+ }, 1000)
+ })
function init() {
details.currentPage = 1
details.dataList = []
diff --git a/unpackage/dist/build/app-plus/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.css b/unpackage/dist/build/app-plus/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.css
index 7880015..22d6d74 100644
--- a/unpackage/dist/build/app-plus/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.css
+++ b/unpackage/dist/build/app-plus/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.css
@@ -1 +1 @@
-.u-status-bar[data-v-31491727]{width:100%}uni-view[data-v-5c79ae5e],uni-scroll-view[data-v-5c79ae5e],uni-swiper-item[data-v-5c79ae5e]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}@font-face{font-family:uicon-iconfont;src:url(https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf) format("truetype")}.u-icon[data-v-5c79ae5e]{display:flex;align-items:center}.u-icon--left[data-v-5c79ae5e]{flex-direction:row-reverse;align-items:center}.u-icon--right[data-v-5c79ae5e]{flex-direction:row;align-items:center}.u-icon--top[data-v-5c79ae5e]{flex-direction:column-reverse;justify-content:center}.u-icon--bottom[data-v-5c79ae5e]{flex-direction:column;justify-content:center}.u-icon__icon[data-v-5c79ae5e]{font-family:uicon-iconfont;position:relative;display:flex;flex-direction:row;align-items:center}.u-icon__icon--primary[data-v-5c79ae5e]{color:#3c9cff}.u-icon__icon--success[data-v-5c79ae5e]{color:#5ac725}.u-icon__icon--error[data-v-5c79ae5e]{color:#f56c6c}.u-icon__icon--warning[data-v-5c79ae5e]{color:#f9ae3d}.u-icon__icon--info[data-v-5c79ae5e]{color:#909399}.u-icon__img[data-v-5c79ae5e]{height:auto;will-change:transform}.u-icon__label[data-v-5c79ae5e]{line-height:1}uni-view[data-v-917ffc31],uni-scroll-view[data-v-917ffc31],uni-swiper-item[data-v-917ffc31]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-navbar--fixed[data-v-917ffc31]{position:fixed;left:0;right:0;top:0;z-index:11}.u-navbar__content[data-v-917ffc31]{display:flex;flex-direction:row;align-items:center;height:44px;background-color:#9acafc;position:relative;justify-content:center}.u-navbar__content__left[data-v-917ffc31],.u-navbar__content__right[data-v-917ffc31]{padding:0 13px;position:absolute;top:0;bottom:0;display:flex;flex-direction:row;align-items:center}.u-navbar__content__left[data-v-917ffc31]{left:0}.u-navbar__content__left--hover[data-v-917ffc31]{opacity:.7}.u-navbar__content__left__text[data-v-917ffc31]{font-size:15px;margin-left:3px}.u-navbar__content__title[data-v-917ffc31]{text-align:center;font-size:16px;color:#303133}.u-navbar__content__right[data-v-917ffc31]{right:0}.u-navbar__content__right__text[data-v-917ffc31]{font-size:15px;margin-left:3px}.select_wrap[data-v-e7df7516]{width:7.5rem;height:2rem;box-sizing:border-box;display:inline-block;position:relative}.select_wrap .select_input[data-v-e7df7516]{-webkit-appearance:none;background-color:#f5f5f6;background-image:none;border-radius:.3125rem;border:.03125rem solid #EEEEEE;color:#092c4d;font-size:inherit;display:flex;align-items:center;outline:none;padding:0 .3125rem;height:2rem;box-sizing:border-box;transition:border-color .2s cubic-bezier(.645,.045,.355,1);width:100%}.select_wrap .select_input .input_info[data-v-e7df7516]{font-size:.875rem;width:100%;height:100%;margin-left:.3125rem}.select_wrap .select_input .input_info .text_tips[data-v-e7df7516]{height:100%;color:#092c4d;font-size:.875rem}.select_wrap .select_input .icon_arrow[data-v-e7df7516]{position:absolute;width:1.5625rem;height:2rem;right:0;top:0;text-align:center;color:#c0c4cc;cursor:pointer;display:flex;justify-content:center;align-items:center;z-index:999}.select_wrap .select_input .icon_arrow .arrow[data-v-e7df7516]{width:.5625rem;height:.5625rem;background-color:transparent;border-color:#c0c4cc;border-style:solid;border-width:.03125rem .03125rem 0 0;transition:all .3s;box-sizing:border-box}.select_wrap .select_input .icon_arrow .arrow_down[data-v-e7df7516]{transform:rotate(-45deg);margin-top:.15625rem}.select_wrap .select_input .icon_arrow .arrow_up[data-v-e7df7516]{transform:rotate(135deg);margin-top:-.15625rem}.select_wrap .select_input .icon_arrow .arrow-clear[data-v-e7df7516]{width:.84375rem;height:.84375rem;border:.03125rem solid #c0c4cc;color:#c0c4cc;border-radius:50%;display:flex;justify-content:center;align-items:center;font-size:.8125rem}.select_wrap .select_input .icon_arrow .arrow-clear>uni-image[data-v-e7df7516]{width:.65625rem;height:.65625rem}.select_wrap .select_input_select[data-v-e7df7516]{border-color:rgba(211,131,42,.5)}.select_modal_con[data-v-e7df7516]{width:100%;transform-origin:center top;z-index:2062;position:absolute;top:1.25rem;left:0;border:.03125rem solid #e4e7ed;border-radius:.125rem;background-color:#fff;box-shadow:0 .0625rem .375rem rgba(0,0,0,.1);box-sizing:border-box;margin-top:1.25rem}.select_modal_con .cons_arrow[data-v-e7df7516]{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid;top:-.1875rem;left:10%;margin-right:.09375rem;border-top-width:0;border-bottom-color:#ebeef5}.select_modal_con .cons_arrow[data-v-e7df7516]:after{content:" ";border-width:.1875rem;position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid;margin-left:-.1875rem;border-top-width:0;border-bottom-color:#fff}.select_modal[data-v-e7df7516]{overflow:scroll}.select_modal .select_content[data-v-e7df7516]{list-style:none;padding:.375rem 0;margin:0;box-sizing:border-box}.select_modal .select_content .select_content_li[data-v-e7df7516]{font-size:.875rem;padding:.25rem .5625rem;position:relative;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color:#606266;display:flex;align-items:center;justify-content:flex-start;box-sizing:border-box;cursor:pointer}.select_modal .select_content .select_content_li.selected[data-v-e7df7516]{color:rgba(211,131,42,.565);font-weight:700;background-color:#f5f7fa}.select_modal .select_content .select_content_li[data-v-e7df7516]:hover{background-color:#f5f7fa}.xialaxz{display:flex;flex-direction:column}.xialaxz>uni-view{display:flex;align-items:flex-start;justify-content:space-between;border-top:.03125rem solid #00000010;padding:.625rem 0;box-sizing:border-box;font-size:.875rem;color:#092c4d}.xialaxz>uni-view>uni-view{word-wrap:break-word;word-break:break-all;margin-right:.3125rem}.xialaxz>uni-view>uni-view:nth-last-child(1){margin-right:0}.butlur{width:6.25rem!important;height:2rem!important;background:#D3832A;border-radius:.25rem;display:flex;align-items:center;justify-content:center;font-size:1rem;font-weight:400;color:#fff}.tabtip{display:flex;align-items:center;justify-content:space-between}.tabtip>uni-view{width:50%;display:flex;align-items:center;justify-content:center;background-color:#fff;font-size:1rem;font-weight:400;color:#90a0af}.tabtip>uni-view>uni-view{height:2.5rem;border-bottom:.25rem solid #ffffff;display:flex;align-items:center;justify-content:center}.tabtip .xz{color:#d3832a;border-bottom:.25rem solid #D3832A}.hdtp{padding:1.0625rem 1rem;box-sizing:border-box;background-color:#fff;display:flex;flex-direction:column;align-items:center}.hdtp>uni-view{width:100%;display:flex;align-items:center;justify-content:space-between;font-size:.875rem;font-weight:400;color:#092c4d;margin-bottom:.75rem}.hdtp>uni-view:nth-last-child(1){margin-bottom:0}.hdtp>uni-view>uni-view{width:50%}.scve{width:100%;height:50vh;margin-top:.625rem}.scve .mabx{display:flex;flex-direction:column;align-items:center}.scve .mabx>.itec{width:21.4375rem;background:#FFFFFF;border-radius:.25rem;padding:1.125rem .75rem;box-sizing:border-box;position:relative;margin-bottom:.625rem}.scve .mabx>.itec:nth-last-child(1){margin-bottom:0}.scve .mabx>.itec>.contenbx1{display:flex;align-items:center;justify-content:space-between;font-size:.875rem;color:#092c4d;margin-bottom:.625rem}.scve .mabx>.itec>.contenbx1:nth-last-child(1){margin-bottom:0}.scve .mabx>.itec>.contenbx1>uni-view{flex:1}.scve .mabx>.itec .tip{position:absolute;right:0;top:0;width:3rem;height:1.5rem;border-radius:0 .25rem;display:flex;align-items:center;justify-content:center;font-size:.75rem}.scve .mabx>.itec .tp1{background-color:rgba(0,134,241,.125);color:#0086f1}.scve .mabx>.itec .tp2{background-color:rgba(248,84,75,.125);color:#f8544b}.scve .mabx>.itec .tp3{background-color:rgba(250,140,22,.125);color:#fa8c16}.scinp{display:flex;align-items:center;justify-content:space-between;padding:.375rem 1rem;box-sizing:border-box;background-color:#fff}.scinp>uni-view:nth-of-type(1){font-size:.875rem;font-weight:400;color:#092c4d}.scinp .inputs{width:8.625rem;height:2rem;background:#F5F5F6;border-radius:.25rem;opacity:1;border:.0625rem solid #EEEEEE;padding:.3125rem;box-sizing:border-box;font-size:.75rem;font-weight:400;color:#afb4ba}.scinp .inputs>uni-input{flex:1;font-size:.75rem;color:#092c4d}.scinp .btscan{width:4rem;height:2rem;background:#D3832A;border-radius:.25rem;display:flex;align-items:center;justify-content:center;font-size:1rem;font-weight:400;color:#fff}.hdtpnum{display:flex;align-items:center;justify-content:space-around;background-color:#fff;padding:.875rem 0;border-bottom:.09375rem solid #EEEEEE}.hdtpnum>uni-view{display:flex;align-items:center;flex-direction:column;font-size:.875rem;font-weight:400;color:#092c4d}.hdtpnum>uni-view:nth-of-type(1)>uni-view:nth-of-type(2){color:#092c4d}.hdtpnum>uni-view:nth-of-type(2)>uni-view:nth-of-type(2){color:#0086f1}.hdtpnum>uni-view:nth-of-type(3)>uni-view:nth-of-type(2){color:#3ad8bc}.hdtpnum>uni-view:nth-of-type(4)>uni-view:nth-of-type(2){color:#fa8c16}.hdtpnum>uni-view>uni-view:nth-of-type(2){font-size:1.125rem;font-weight:400;color:#092c4d;margin-top:.625rem}
+.u-status-bar[data-v-31491727]{width:100%}uni-view[data-v-5c79ae5e],uni-scroll-view[data-v-5c79ae5e],uni-swiper-item[data-v-5c79ae5e]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}@font-face{font-family:uicon-iconfont;src:url(https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf) format("truetype")}.u-icon[data-v-5c79ae5e]{display:flex;align-items:center}.u-icon--left[data-v-5c79ae5e]{flex-direction:row-reverse;align-items:center}.u-icon--right[data-v-5c79ae5e]{flex-direction:row;align-items:center}.u-icon--top[data-v-5c79ae5e]{flex-direction:column-reverse;justify-content:center}.u-icon--bottom[data-v-5c79ae5e]{flex-direction:column;justify-content:center}.u-icon__icon[data-v-5c79ae5e]{font-family:uicon-iconfont;position:relative;display:flex;flex-direction:row;align-items:center}.u-icon__icon--primary[data-v-5c79ae5e]{color:#3c9cff}.u-icon__icon--success[data-v-5c79ae5e]{color:#5ac725}.u-icon__icon--error[data-v-5c79ae5e]{color:#f56c6c}.u-icon__icon--warning[data-v-5c79ae5e]{color:#f9ae3d}.u-icon__icon--info[data-v-5c79ae5e]{color:#909399}.u-icon__img[data-v-5c79ae5e]{height:auto;will-change:transform}.u-icon__label[data-v-5c79ae5e]{line-height:1}uni-view[data-v-917ffc31],uni-scroll-view[data-v-917ffc31],uni-swiper-item[data-v-917ffc31]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-navbar--fixed[data-v-917ffc31]{position:fixed;left:0;right:0;top:0;z-index:11}.u-navbar__content[data-v-917ffc31]{display:flex;flex-direction:row;align-items:center;height:44px;background-color:#9acafc;position:relative;justify-content:center}.u-navbar__content__left[data-v-917ffc31],.u-navbar__content__right[data-v-917ffc31]{padding:0 13px;position:absolute;top:0;bottom:0;display:flex;flex-direction:row;align-items:center}.u-navbar__content__left[data-v-917ffc31]{left:0}.u-navbar__content__left--hover[data-v-917ffc31]{opacity:.7}.u-navbar__content__left__text[data-v-917ffc31]{font-size:15px;margin-left:3px}.u-navbar__content__title[data-v-917ffc31]{text-align:center;font-size:16px;color:#303133}.u-navbar__content__right[data-v-917ffc31]{right:0}.u-navbar__content__right__text[data-v-917ffc31]{font-size:15px;margin-left:3px}.select_wrap[data-v-e7df7516]{width:7.5rem;height:2rem;box-sizing:border-box;display:inline-block;position:relative}.select_wrap .select_input[data-v-e7df7516]{-webkit-appearance:none;background-color:#f5f5f6;background-image:none;border-radius:.3125rem;border:.03125rem solid #EEEEEE;color:#092c4d;font-size:inherit;display:flex;align-items:center;outline:none;padding:0 .3125rem;height:2rem;box-sizing:border-box;transition:border-color .2s cubic-bezier(.645,.045,.355,1);width:100%}.select_wrap .select_input .input_info[data-v-e7df7516]{font-size:.875rem;width:100%;height:100%;margin-left:.3125rem}.select_wrap .select_input .input_info .text_tips[data-v-e7df7516]{height:100%;color:#092c4d;font-size:.875rem}.select_wrap .select_input .icon_arrow[data-v-e7df7516]{position:absolute;width:1.5625rem;height:2rem;right:0;top:0;text-align:center;color:#c0c4cc;cursor:pointer;display:flex;justify-content:center;align-items:center;z-index:999}.select_wrap .select_input .icon_arrow .arrow[data-v-e7df7516]{width:.5625rem;height:.5625rem;background-color:transparent;border-color:#c0c4cc;border-style:solid;border-width:.03125rem .03125rem 0 0;transition:all .3s;box-sizing:border-box}.select_wrap .select_input .icon_arrow .arrow_down[data-v-e7df7516]{transform:rotate(-45deg);margin-top:.15625rem}.select_wrap .select_input .icon_arrow .arrow_up[data-v-e7df7516]{transform:rotate(135deg);margin-top:-.15625rem}.select_wrap .select_input .icon_arrow .arrow-clear[data-v-e7df7516]{width:.84375rem;height:.84375rem;border:.03125rem solid #c0c4cc;color:#c0c4cc;border-radius:50%;display:flex;justify-content:center;align-items:center;font-size:.8125rem}.select_wrap .select_input .icon_arrow .arrow-clear>uni-image[data-v-e7df7516]{width:.65625rem;height:.65625rem}.select_wrap .select_input_select[data-v-e7df7516]{border-color:rgba(211,131,42,.5)}.select_modal_con[data-v-e7df7516]{width:100%;transform-origin:center top;z-index:2062;position:absolute;top:1.25rem;left:0;border:.03125rem solid #e4e7ed;border-radius:.125rem;background-color:#fff;box-shadow:0 .0625rem .375rem rgba(0,0,0,.1);box-sizing:border-box;margin-top:1.25rem}.select_modal_con .cons_arrow[data-v-e7df7516]{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid;top:-.1875rem;left:10%;margin-right:.09375rem;border-top-width:0;border-bottom-color:#ebeef5}.select_modal_con .cons_arrow[data-v-e7df7516]:after{content:" ";border-width:.1875rem;position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid;margin-left:-.1875rem;border-top-width:0;border-bottom-color:#fff}.select_modal[data-v-e7df7516]{overflow:scroll}.select_modal .select_content[data-v-e7df7516]{list-style:none;padding:.375rem 0;margin:0;box-sizing:border-box}.select_modal .select_content .select_content_li[data-v-e7df7516]{font-size:.875rem;padding:.25rem .5625rem;position:relative;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color:#606266;display:flex;align-items:center;justify-content:flex-start;box-sizing:border-box;cursor:pointer}.select_modal .select_content .select_content_li.selected[data-v-e7df7516]{color:rgba(211,131,42,.565);font-weight:700;background-color:#f5f7fa}.select_modal .select_content .select_content_li[data-v-e7df7516]:hover{background-color:#f5f7fa}.xialaxz{display:flex;flex-direction:column}.xialaxz>uni-view{display:flex;align-items:flex-start;justify-content:space-between;border-top:.03125rem solid #00000010;padding:.625rem 0;box-sizing:border-box;font-size:.875rem;color:#092c4d}.xialaxz>uni-view>uni-view{word-wrap:break-word;word-break:break-all;margin-right:.3125rem}.xialaxz>uni-view>uni-view:nth-last-child(1){margin-right:0}.butlur{width:6.25rem!important;height:2rem!important;background:#D3832A;border-radius:.25rem;display:flex;align-items:center;justify-content:center;font-size:1rem;font-weight:400;color:#fff}.tabtip{display:flex;align-items:center;justify-content:space-between}.tabtip>uni-view{width:50%;display:flex;align-items:center;justify-content:center;background-color:#fff;font-size:1rem;font-weight:400;color:#90a0af}.tabtip>uni-view>uni-view{height:2.5rem;border-bottom:.25rem solid #ffffff;display:flex;align-items:center;justify-content:center}.tabtip .xz{color:#d3832a;border-bottom:.25rem solid #D3832A}.hdtp{padding:1.0625rem 1rem;box-sizing:border-box;background-color:#fff;display:flex;flex-direction:column;align-items:center}.hdtp>uni-view{width:100%;display:flex;align-items:center;justify-content:space-between;font-size:.875rem;font-weight:400;color:#092c4d;margin-bottom:.75rem}.hdtp>uni-view:nth-last-child(1){margin-bottom:0}.hdtp>uni-view>uni-view{width:50%}.scve{width:100%;height:50vh;margin-top:.625rem}.scve .mabx{display:flex;flex-direction:column;align-items:center}.scve .mabx>.itec{width:21.4375rem;background:#FFFFFF;border-radius:.25rem;padding:1.125rem .75rem;box-sizing:border-box;position:relative;margin-bottom:.625rem;overflow:hidden}.scve .mabx>.itec:nth-last-child(1){margin-bottom:0}.scve .mabx>.itec>.contenbx1{display:flex;align-items:center;justify-content:space-between;font-size:.875rem;color:#092c4d;margin-bottom:.625rem}.scve .mabx>.itec>.contenbx1:nth-last-child(1){margin-bottom:0}.scve .mabx>.itec>.contenbx1>uni-view{flex:1}.scve .mabx>.itec .tip{position:absolute;right:0;top:0;width:3rem;height:1.5rem;border-radius:0 .25rem;display:flex;align-items:center;justify-content:center;font-size:.75rem}.scve .mabx>.itec .tp1{background-color:rgba(0,134,241,.125);color:#0086f1}.scve .mabx>.itec .tp2{background-color:rgba(248,84,75,.125);color:#f8544b}.scve .mabx>.itec .tp3{background-color:rgba(250,140,22,.125);color:#fa8c16}.scinp{display:flex;align-items:center;justify-content:space-between;padding:.375rem 1rem;box-sizing:border-box;background-color:#fff}.scinp>uni-view:nth-of-type(1){font-size:.875rem;font-weight:400;color:#092c4d}.scinp .inputs{width:8.625rem;height:2rem;background:#F5F5F6;border-radius:.25rem;opacity:1;border:.0625rem solid #EEEEEE;padding:.3125rem;box-sizing:border-box;font-size:.75rem;font-weight:400;color:#afb4ba}.scinp .inputs>uni-input{flex:1;font-size:.75rem;color:#092c4d}.scinp .btscan{width:4rem;height:2rem;background:#D3832A;border-radius:.25rem;display:flex;align-items:center;justify-content:center;font-size:1rem;font-weight:400;color:#fff}.hdtpnum{display:flex;align-items:center;justify-content:space-around;background-color:#fff;padding:.875rem 0;border-bottom:.09375rem solid #EEEEEE}.hdtpnum>uni-view{display:flex;align-items:center;flex-direction:column;font-size:.875rem;font-weight:400;color:#092c4d}.hdtpnum>uni-view:nth-of-type(1)>uni-view:nth-of-type(2){color:#092c4d}.hdtpnum>uni-view:nth-of-type(2)>uni-view:nth-of-type(2){color:#0086f1}.hdtpnum>uni-view:nth-of-type(3)>uni-view:nth-of-type(2){color:#3ad8bc}.hdtpnum>uni-view:nth-of-type(4)>uni-view:nth-of-type(2){color:#fa8c16}.hdtpnum>uni-view>uni-view:nth-of-type(2){font-size:1.125rem;font-weight:400;color:#092c4d;margin-top:.625rem}.abnormalStyleContainer{top:-.625rem;left:-.625rem;position:absolute;padding:.3125rem;border:.03125rem solid #f8544b;border-radius:50%}.abnormalStyle{font-size:.875rem;height:2.5rem;width:2.5rem;display:flex;align-items:center;text-align:center;color:#f8544b;padding:.3125rem;border-radius:50%;border:.03125rem solid #f8544b;opacity:.6}
diff --git a/unpackage/dist/dev/app-plus/app-service.js b/unpackage/dist/dev/app-plus/app-service.js
index 75e365f..25fa685 100644
--- a/unpackage/dist/dev/app-plus/app-service.js
+++ b/unpackage/dist/dev/app-plus/app-service.js
@@ -4016,7 +4016,7 @@ if (uni.restoreGlobal) {
};
};
const base64 = new Base64();
- const devhost = "http://192.168.10.29:13000/";
+ const devhost = "http://192.168.10.75:8777/";
const imghost = "";
const host = devhost;
const APPKEY = "h5u:h5u_secret";
@@ -7680,7 +7680,7 @@ This will fail in production if not fixed.`);
}
async function updateApp() {
let version2 = {
- version: "1.0.11",
+ version: "1.0.13",
pkName: "com.hwy.pda"
};
formatAppLog("log", "at pages/user/user.vue:179", "version 版本>>>>", version2);
@@ -9678,7 +9678,7 @@ This will fail in production if not fixed.`);
details.show = !details.show;
}
function onConfirm(e) {
- formatAppLog("log", "at pagesHome/pages/pickingScan/pickingScan.vue:123", e);
+ formatAppLog("log", "at pagesHome/pages/pickingScan/pickingScan.vue:124", e);
date2.value[0] = e.startDate;
date2.value[1] = e.endDate;
details.datatime = date2.value[0] + " 至 " + date2.value[1];
@@ -9697,6 +9697,12 @@ This will fail in production if not fixed.`);
date2.value[1] = uni.$u.timeFormat((/* @__PURE__ */ new Date()).valueOf(), "yyyy-mm-dd");
utils.ttsspke("请选择拣货任务");
});
+ onPullDownRefresh(() => {
+ init();
+ setTimeout(() => {
+ uni.stopPullDownRefresh();
+ }, 1e3);
+ });
function init() {
details.currentPage = 1;
details.dataList = [];
@@ -12930,7 +12936,7 @@ This will fail in production if not fixed.`);
vue.createElementVNode("view", null, [
vue.createElementVNode("text", { style: { "color": "#90A0AF" } }, "产品名称："),
vue.createTextVNode(
- vue.toDisplayString(item.firsts),
+ vue.toDisplayString(item.descriptionGoods),
1
/* TEXT */
)
@@ -13862,10 +13868,16 @@ This will fail in production if not fixed.`);
if (res.code == 200) {
details.isscan = true;
initpage();
+ } else if (res.code === 3001) {
+ uni.showToast({
+ title: res.msg,
+ icon: "none"
+ });
+ utils2.ttsspke(res.audio);
}
}
async function initpage() {
- formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:279", "获取数据");
+ formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:286", "获取数据");
if (details.orderType == 1) {
let data = {
orderStatus: details.orderStatus,
@@ -13896,7 +13908,7 @@ This will fail in production if not fixed.`);
billLadingId: details.billLadingId
};
const response = await billLadingzeroBillData(data);
- formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:311", "response :>> ", response);
+ formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:318", "response :>> ", response);
const { code: code2 } = response;
if (code2 === 200) {
details.dataList = response.data || [];
@@ -13915,7 +13927,7 @@ This will fail in production if not fixed.`);
if (item.value == e) {
details.schanvalue = item.label;
details.orderStatus = item.value;
- formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:330", details.schanvalue);
+ formatAppLog("log", "at pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue:337", details.schanvalue);
}
});
}
@@ -14848,12 +14860,6 @@ This will fail in production if not fixed.`);
response = await signforinventory(data);
}
details.datalist = response.data.records || [];
- if (loadingNub.value != 0 && details.isscan) {
- formatAppLog("log", "at pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue:227", loadingNub.value + "件");
- setTimeout(() => {
- utils2.ttsspke(loadingNub.value + "件");
- }, 1e3);
- }
}
function checktype(e) {
if (e == "") {
@@ -15678,7 +15684,7 @@ This will fail in production if not fixed.`);
});
async function getconfig() {
let res = await dictbizdictionary({ code: "photo_type" });
- formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:142", "res1>>>>", res);
+ formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:143", "res1>>>>", res);
const { code: code2, data } = res;
if (code2 === 200) {
details.imgList = data.map((value) => {
@@ -15688,7 +15694,7 @@ This will fail in production if not fixed.`);
imgList: []
};
});
- formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:152", "details.imgList :>> ", details.imgList);
+ formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:153", "details.imgList :>> ", details.imgList);
}
}
function gosetorice(item) {
@@ -15726,10 +15732,10 @@ This will fail in production if not fixed.`);
reservationId: item.id
};
let res = await signforprices(data);
- formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:196", "res>>>>>", res);
+ formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:197", "res>>>>>", res);
let imglis = [], rearks = "";
if (res.code == 200) {
- if (res.data.deliverySignPictures || res.data.driverRemarks) {
+ if (Object.keys(res.data.deliverySignPictures).length !== 0 || res.data.driverRemarks) {
details.isChange = true;
imglis = res.data.deliverySignPictures;
details.imgList.forEach((item2, index2) => {
@@ -15737,7 +15743,7 @@ This will fail in production if not fixed.`);
return;
details.imgList[index2].imgList = imglis[item2.dictKey];
});
- formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:208", "details.imgList :>> ", details.imgList);
+ formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:209", "details.imgList :>> ", details.imgList);
} else {
details.isChange = false;
}
@@ -15745,7 +15751,7 @@ This will fail in production if not fixed.`);
rearks = res.data.driverRemarks;
}
}
- formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:218", "tiplists :>> ", tiplists.value);
+ formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:219", "tiplists :>> ", tiplists.value);
tiplists.value.setdetails({
isshow: true,
tipstate: 3,
@@ -15758,6 +15764,7 @@ This will fail in production if not fixed.`);
changeImageList: details.changeImageList,
ImagesRequiredFields: details.ImagesRequiredFields,
success: async (detail) => {
+ formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:233", "detail :>> ", detail);
let data2 = {
deliveryId: details.id,
reservationId: item.id,
@@ -15766,38 +15773,53 @@ This will fail in production if not fixed.`);
};
let res2 = null;
let isSubmit = true;
+ formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:244", "details.ImagesRequiredFields :>> ", details.ImagesRequiredFields);
if (details.isChange) {
- formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:244", "details.imgList :>> ", details.imgList);
- const filterMap = details.imgList.filter((item2) => details.changeImageList.includes(item2.dictKey));
+ const filterMap = detail.imglist.filter((item2) => details.changeImageList.includes(item2.dictKey));
filterMap.forEach((item2) => {
data2.map[item2.dictKey] = item2.imgList;
- formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:248", "object :>> ", details.ImagesRequiredFields.find((val) => val === item2.dictKey) && item2.imgList.length < 3);
- if (!details.ImagesRequiredFields.find((val) => val === item2.dictKey) && item2.imgList.length < 3)
+ formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:250", 1);
+ if (details.ImagesRequiredFields.find((val) => val.key === item2.dictKey) && item2.imgList.length < 3)
isSubmit = false;
else
isSubmit = true;
});
- formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:252", "data :>> ", data2);
- formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:253", "isSubmit :>> ", isSubmit);
- if (!isSubmit)
+ if (!isSubmit) {
+ uni.showToast({
+ title: "请根据要求上传照片",
+ icon: "none"
+ });
+ utils.ttsspke("必传照片不足");
return;
+ }
res2 = await signforUpdatePicture(data2);
} else {
- details.imgList.forEach((item2) => {
+ formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:264", "details.imgList :>> ", details.imgList);
+ detail.imglist.forEach((item2) => {
data2.map[item2.dictKey] = item2.imgList;
- if (!details.ImagesRequiredFields.find((val) => val === item2.dictKey) && item2.imgList.length < 3)
+ formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:267", 2);
+ formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:268", "item.imgList :>> ", item2.imgList);
+ if (details.ImagesRequiredFields.find((val) => val.key === item2.dictKey) && item2.imgList.length < 3)
isSubmit = false;
else
isSubmit = true;
});
- formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:262", "details.isChange :>> ", details.isChange);
- formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:263", "isSubmit :>> ", isSubmit);
- if (!isSubmit)
+ if (!isSubmit) {
+ uni.showToast({
+ title: "请根据要求上传照片",
+ icon: "none"
+ });
+ utils.ttsspke("必传照片不足");
return;
+ }
res2 = await signforsignforack(data2);
}
if (res2.code == 200) {
initpage();
+ uni.showToast({
+ title: res2.msg,
+ icon: "none"
+ });
}
tiplists.value.setdetails({ isshow: false });
},
@@ -15826,7 +15848,7 @@ This will fail in production if not fixed.`);
driverRemarks: detail.inputtext
};
let res = await signforoneclick(data);
- formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:298", res);
+ formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:317", res);
if (res.code == 200) {
initpage();
}
@@ -15841,33 +15863,44 @@ This will fail in production if not fixed.`);
});
}
function getLocation(item) {
- formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:314", "getLocation-------");
+ formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:333", "getLocation-------");
uni.getLocation({
type: "wgs84",
geocode: true,
isHighAccuracy: true,
success: async function(res) {
- formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:320", JSON.stringify(res));
- formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:323", "当前位置的经度：" + res.longitude);
- formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:324", "当前位置的纬度：" + res.latitude);
- let data = {
- deliveryId: details.id,
- reservationId: item.id,
- positioning: res.longitude + "," + res.latitude,
- positioningAdr: ""
- };
- let response = await signforpositioning(data);
- formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:332", response);
- if (response.code == 200) {
- initpage();
+ try {
+ uni.showLoading({
+ title: "打卡中",
+ mask: true
+ });
+ formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:344", JSON.stringify(res));
+ formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:347", "当前位置的经度：" + res.longitude);
+ formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:348", "当前位置的纬度：" + res.latitude);
+ let data = {
+ deliveryId: details.id,
+ reservationId: item.id,
+ positioning: res.longitude + "," + res.latitude,
+ positioningAdr: ""
+ };
+ let response = await signforpositioning(data);
+ formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:356", response);
+ if (response.code == 200) {
+ initpage();
+ }
+ } catch (err) {
+ formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:362", "err :>> ", err);
+ } finally {
+ uni.hideLoading();
}
},
fail: (err) => {
uni.showToast({
- title: err.errMsg,
+ title: "定位失败",
icon: "none"
});
- formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:342", err);
+ formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:374", err);
+ uni.hideLoading();
}
});
}
@@ -25967,6 +26000,11 @@ This will fail in production if not fixed.`);
onShow(() => {
init();
});
+ onPullDownRefresh(() => {
+ setTimeout(() => {
+ uni.stopPullDownRefresh();
+ }, 1e3);
+ });
function goorderdetail(item) {
uni.navigateTo({
url: "/pagesHome/pages/orderDetails/orderDetails?orderCode=" + item.orderCode
@@ -37779,6 +37817,8 @@ This will fail in production if not fixed.`);
ImagesRequiredFields: [],
inpList: [],
showPreviewPicture: false,
+ // 预览图片地址
+ previewPictureUrl: "/static/changku.png",
// 盘点复选框
checkSectionList: [],
// 上架
@@ -37848,7 +37888,9 @@ This will fail in production if not fixed.`);
break;
}
}
- function remove(index2, i) {
+ function remove(index2, i, type) {
+ if (details.isChange && !details.changeImageList.includes(type))
+ details.changeImageList.push(type);
details.imglist[index2].imgList.splice(i, 1);
}
function updateimg(type, index2) {
@@ -37857,12 +37899,12 @@ This will fail in production if not fixed.`);
uni.chooseImage({
count: details.maximglength,
success: async (chooseImageRes) => {
- formatAppLog("log", "at compoment/tiplist/tiplist.vue:288", "chooseImageRes >>>>>>>>", chooseImageRes);
+ formatAppLog("log", "at compoment/tiplist/tiplist.vue:292", "chooseImageRes >>>>>>>>", chooseImageRes);
const tempFilePaths = chooseImageRes.tempFilePaths;
tempFilePaths.map(async (item) => {
- formatAppLog("log", "at compoment/tiplist/tiplist.vue:292", 1232131231);
+ formatAppLog("log", "at compoment/tiplist/tiplist.vue:296", 1232131231);
let url2 = await api.upfile(item);
- formatAppLog("log", "at compoment/tiplist/tiplist.vue:294", "url :>> ", url2);
+ formatAppLog("log", "at compoment/tiplist/tiplist.vue:298", "url :>> ", url2);
details.imglist[index2].imgList.push({ urlRoute: url2.link, type, name: url2.originalName });
});
}
@@ -37899,7 +37941,8 @@ This will fail in production if not fixed.`);
val.value = 0;
});
}
- function handleShowImage() {
+ function handleShowImage(imgUrl = "/static/changku.png") {
+ details.previewPictureUrl = imgUrl;
details.showPreviewPicture = !details.showPreviewPicture;
}
let isInputN = null;
@@ -37908,7 +37951,7 @@ This will fail in production if not fixed.`);
clearTimeout(isInputN);
isInputN = setTimeout(() => {
const maxNum = details.list[0].value - details.checkSectionList.reduce((curr, val) => curr + parseInt(val.value), 0) + parseInt(item.value);
- formatAppLog("log", "at compoment/tiplist/tiplist.vue:359", "maxNum :>> ", maxNum);
+ formatAppLog("log", "at compoment/tiplist/tiplist.vue:364", "maxNum :>> ", maxNum);
item.value = parseInt(item.value);
if (item.value <= 0 || isNaN(item.value))
item.value = 0;
@@ -37931,8 +37974,8 @@ This will fail in production if not fixed.`);
}
function handleshowMarket() {
details.showMarketList = !details.showMarketList;
- formatAppLog("log", "at compoment/tiplist/tiplist.vue:381", "123 :>> ", 123);
- formatAppLog("log", "at compoment/tiplist/tiplist.vue:382", "details.showMarketList :>> ", details.showMarketList);
+ formatAppLog("log", "at compoment/tiplist/tiplist.vue:386", "123 :>> ", 123);
+ formatAppLog("log", "at compoment/tiplist/tiplist.vue:387", "details.showMarketList :>> ", details.showMarketList);
}
let _atn = null;
function searchStock() {
@@ -37940,7 +37983,7 @@ This will fail in production if not fixed.`);
clearTimeout(_atn);
_atn = setTimeout(async () => {
const res = await postqueryfindMaterialList({ materialCode: details.upform.stock.materialName });
- formatAppLog("log", "at compoment/tiplist/tiplist.vue:390", "res :>> ", res);
+ formatAppLog("log", "at compoment/tiplist/tiplist.vue:395", "res :>> ", res);
const { code: code2 } = res;
if (code2 === 200)
details.materialName = res.data;
@@ -37961,11 +38004,11 @@ This will fail in production if not fixed.`);
vue.unref(isshow) ? (vue.openBlock(), vue.createElementBlock("view", {
key: 0,
class: "maboxbg",
- onClick: _cache[14] || (_cache[14] = ($event) => checkbox(0))
+ onClick: _cache[15] || (_cache[15] = ($event) => checkbox(0))
}, [
vue.createElementVNode("view", {
class: "modtips",
- onClick: _cache[13] || (_cache[13] = vue.withModifiers(() => {
+ onClick: _cache[14] || (_cache[14] = vue.withModifiers(() => {
}, ["stop", "prevent"]))
}, [
vue.createElementVNode(
@@ -38057,7 +38100,7 @@ This will fail in production if not fixed.`);
/* TEXT, CLASS */
),
vue.createElementVNode("text", {
- onClick: handleShowImage,
+ onClick: _cache[1] || (_cache[1] = ($event) => handleShowImage()),
class: "showImageBtn"
}, "预览模版")
]),
@@ -38068,10 +38111,11 @@ This will fail in production if not fixed.`);
vue.renderList(item.imgList, (value, i) => {
return vue.openBlock(), vue.createElementBlock("view", null, [
vue.createElementVNode("image", {
- src: value.urlRoute
- }, null, 8, ["src"]),
+ src: value.urlRoute,
+ onClick: ($event) => handleShowImage(value.urlRoute)
+ }, null, 8, ["src", "onClick"]),
vue.createElementVNode("image", {
- onClick: ($event) => remove(index2, i),
+ onClick: ($event) => remove(index2, i, item.dictKey),
src: _imports_0
}, null, 8, ["onClick"])
]);
@@ -38094,7 +38138,7 @@ This will fail in production if not fixed.`);
]),
vue.createElementVNode("view", { class: "inputbx" }, [
vue.withDirectives(vue.createElementVNode("input", {
- "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => vue.isRef(inputtext) ? inputtext.value = $event : null),
+ "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => vue.isRef(inputtext) ? inputtext.value = $event : null),
placeholder: vue.unref(placeholder)
}, null, 8, ["placeholder"]), [
[vue.vModelText, vue.unref(inputtext)]
@@ -38185,7 +38229,7 @@ This will fail in production if not fixed.`);
vue.withDirectives(vue.createElementVNode(
"input",
{
- "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => vue.unref(details).upform.article.contractNumber = $event),
+ "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => vue.unref(details).upform.article.contractNumber = $event),
placeholder: "请输入合同号"
},
null,
@@ -38199,7 +38243,7 @@ This will fail in production if not fixed.`);
vue.withDirectives(vue.createElementVNode(
"input",
{
- "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => vue.unref(details).upform.article.orderPackageCode = $event),
+ "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => vue.unref(details).upform.article.orderPackageCode = $event),
placeholder: "请输入或扫描包条码"
},
null,
@@ -38222,7 +38266,7 @@ This will fail in production if not fixed.`);
vue.withDirectives(vue.createElementVNode(
"input",
{
- "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => vue.unref(details).upform.article.contractNumber = $event),
+ "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => vue.unref(details).upform.article.contractNumber = $event),
placeholder: "请输入合同号"
},
null,
@@ -38236,7 +38280,7 @@ This will fail in production if not fixed.`);
vue.withDirectives(vue.createElementVNode(
"input",
{
- "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => vue.unref(details).upform.article.orderPackageCode = $event),
+ "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => vue.unref(details).upform.article.orderPackageCode = $event),
placeholder: "请输入或扫描包条码"
},
null,
@@ -38259,7 +38303,7 @@ This will fail in production if not fixed.`);
vue.withDirectives(vue.createElementVNode(
"input",
{
- "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => vue.unref(details).upform.stock.orderCode = $event),
+ "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => vue.unref(details).upform.stock.orderCode = $event),
placeholder: "请输入合同号"
},
null,
@@ -38273,7 +38317,7 @@ This will fail in production if not fixed.`);
vue.withDirectives(vue.createElementVNode(
"input",
{
- "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => vue.unref(details).upform.stock.incomingBatch = $event),
+ "onUpdate:modelValue": _cache[8] || (_cache[8] = ($event) => vue.unref(details).upform.stock.incomingBatch = $event),
placeholder: "请输入批次号"
},
null,
@@ -38287,7 +38331,7 @@ This will fail in production if not fixed.`);
vue.withDirectives(vue.createElementVNode(
"input",
{
- "onUpdate:modelValue": _cache[8] || (_cache[8] = ($event) => vue.unref(details).upform.stock.materialName = $event),
+ "onUpdate:modelValue": _cache[9] || (_cache[9] = ($event) => vue.unref(details).upform.stock.materialName = $event),
onInput: searchStock,
placeholder: "请输入物料编码或物料名称"
},
@@ -38319,7 +38363,7 @@ This will fail in production if not fixed.`);
vue.withDirectives(vue.createElementVNode(
"input",
{
- "onUpdate:modelValue": _cache[9] || (_cache[9] = ($event) => vue.unref(details).upform.stock.marketName = $event),
+ "onUpdate:modelValue": _cache[10] || (_cache[10] = ($event) => vue.unref(details).upform.stock.marketName = $event),
placeholder: "请选择商城",
disabled: "true"
},
@@ -38357,7 +38401,7 @@ This will fail in production if not fixed.`);
vue.withDirectives(vue.createElementVNode(
"input",
{
- "onUpdate:modelValue": _cache[10] || (_cache[10] = ($event) => vue.unref(details).upform.stock.stockNum = $event),
+ "onUpdate:modelValue": _cache[11] || (_cache[11] = ($event) => vue.unref(details).upform.stock.stockNum = $event),
placeholder: "请输入在库数量"
},
null,
@@ -38448,7 +38492,7 @@ This will fail in production if not fixed.`);
"view",
{
key: 0,
- onClick: _cache[11] || (_cache[11] = ($event) => checkbox(1)),
+ onClick: _cache[12] || (_cache[12] = ($event) => checkbox(1)),
class: "cancel"
},
vue.toDisplayString(vue.unref(cancelTxt) || "取消"),
@@ -38458,7 +38502,7 @@ This will fail in production if not fixed.`);
vue.createElementVNode(
"view",
{
- onClick: _cache[12] || (_cache[12] = ($event) => checkbox(2)),
+ onClick: _cache[13] || (_cache[13] = ($event) => checkbox(2)),
class: "confirm"
},
vue.toDisplayString(vue.unref(confirmTxt) || "确认"),
@@ -38472,14 +38516,14 @@ This will fail in production if not fixed.`);
vue.unref(showPreviewPicture) ? (vue.openBlock(), vue.createElementBlock("view", {
key: 1,
class: "previewPicture-container",
- onClick: vue.withModifiers(handleShowImage, ["stop"])
+ onClick: _cache[16] || (_cache[16] = vue.withModifiers(($event) => handleShowImage(), ["stop"]))
}, [
vue.createElementVNode("img", {
- src: "/static/changku.png",
+ src: vue.unref(details).previewPictureUrl,
class: "previewPicture",
alt: ""
- })
- ], 8, ["onClick"])) : vue.createCommentVNode("v-if", true)
+ }, null, 8, ["src"])
+ ])) : vue.createCommentVNode("v-if", true)
],
64
/* STABLE_FRAGMENT */
diff --git a/unpackage/dist/dev/app-plus/manifest.json b/unpackage/dist/dev/app-plus/manifest.json
index 3a75368..2d76d13 100644
--- a/unpackage/dist/dev/app-plus/manifest.json
+++ b/unpackage/dist/dev/app-plus/manifest.json
@@ -7,8 +7,8 @@
"id": "__UNI__EB22F37",
"name": "货无忧",
"version": {
- "name": "1.0.11",
- "code": 1011
+ "name": "1.0.13",
+ "code": 1013
},
"description": "",
"developer": {
@@ -220,12 +220,6 @@
"selectedIconPath": "/static/TabberIcon/icon2check.png",
"text": "任务"
},
- {
- "pagePath": "pages/news/news",
- "iconPath": "/static/TabberIcon/icon4.png",
- "selectedIconPath": "/static/TabberIcon/icon4check.png",
- "text": "消息"
- },
{
"pagePath": "pages/user/user",
"iconPath": "/static/TabberIcon/icon5.png",