diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json new file mode 100644 index 0000000..582561b --- /dev/null +++ b/.hbuilderx/launch.json @@ -0,0 +1,16 @@ +{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/ + // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数 + "version": "0.0", + "configurations": [{ + "app-plus" : + { + "launchtype" : "local" + }, + "default" : + { + "launchtype" : "local" + }, + "type" : "uniCloud" + } + ] +} diff --git a/src/PagesStatistics/customerRanking.vue b/src/PagesStatistics/customerRanking.vue index d5a6865..5607584 100644 --- a/src/PagesStatistics/customerRanking.vue +++ b/src/PagesStatistics/customerRanking.vue @@ -1,19 +1,19 @@ - + diff --git a/src/pagesApp/components/addShipmentProduct.vue b/src/pagesApp/components/addShipmentProduct.vue index 22b07a0..c5a3615 100644 --- a/src/pagesApp/components/addShipmentProduct.vue +++ b/src/pagesApp/components/addShipmentProduct.vue @@ -22,7 +22,7 @@ v-model="(model1.formData as any)[item.key]" :placeholder="`请输入${item.name}`" > - - diff --git a/src/pagesApp/components/addStockCard.vue b/src/pagesApp/components/addStockCard.vue index 155c4da..812852f 100644 --- a/src/pagesApp/components/addStockCard.vue +++ b/src/pagesApp/components/addStockCard.vue @@ -22,7 +22,7 @@ v-model="(model1.formData as any)[item.key]" :placeholder="`请输入${item.name}`" > - diff --git a/src/pagesApp/components/addSupplier.vue b/src/pagesApp/components/addSupplier.vue index 538a797..9b44515 100644 --- a/src/pagesApp/components/addSupplier.vue +++ b/src/pagesApp/components/addSupplier.vue @@ -22,7 +22,7 @@ v-model="(model1.formData as any)[item.key]" :placeholder="`请输入${item.name}`" > - diff --git a/src/pagesApp/components/addSupplierType.vue b/src/pagesApp/components/addSupplierType.vue index 97872fe..ec358f3 100644 --- a/src/pagesApp/components/addSupplierType.vue +++ b/src/pagesApp/components/addSupplierType.vue @@ -22,7 +22,7 @@ v-model="(model1.formData as any)[item.key]" :placeholder="`请输入${item.name}`" > - diff --git a/src/pagesApp/components/addUser.vue b/src/pagesApp/components/addUser.vue index 5e2ab2a..1852f05 100644 --- a/src/pagesApp/components/addUser.vue +++ b/src/pagesApp/components/addUser.vue @@ -22,7 +22,7 @@ v-model="(model1.formData as any)[item.key]" :placeholder="`请输入${item.name}`" > - - + diff --git a/src/pagesApp/receiveSpl.vue b/src/pagesApp/receiveSpl.vue index 0c71b14..7bd8cf9 100644 --- a/src/pagesApp/receiveSpl.vue +++ b/src/pagesApp/receiveSpl.vue @@ -22,7 +22,7 @@ v-model="(model1.order as any)[item.key]" :placeholder="`请输入${item.name}`" > - - - - + - - + diff --git a/src/pagesLogin/login/index.vue b/src/pagesLogin/login/index.vue index 8f1bddc..d0488ca 100644 --- a/src/pagesLogin/login/index.vue +++ b/src/pagesLogin/login/index.vue @@ -10,7 +10,7 @@ :labelWidth="0" > - - + - - + diff --git a/src/pagesLogin/message/index.vue b/src/pagesLogin/message/index.vue index 4fa438a..72410fb 100644 --- a/src/pagesLogin/message/index.vue +++ b/src/pagesLogin/message/index.vue @@ -14,6 +14,7 @@ + @@ -28,6 +29,23 @@ {{ item.createTime }} + + + + + {{ item.title }} + + + {{ item.content }} + {{ + item.createTime + }} + + + @@ -108,11 +126,17 @@ const handleItem = (item: any) => { }); return; } else { - if (res.data.list[0].scaleStatus === ScaleStatus.ToBePriced && MsgType.ToBePriced === item.msgType) { + if ( + res.data.list[0].scaleStatus === ScaleStatus.ToBePriced && + MsgType.ToBePriced === item.msgType + ) { uni.navigateTo({ url: "/pagesReceive/pricing?scaleStatus=0", // 要跳转到的页面路径 }); - } else if (res.data.list[0].scaleStatus === ScaleStatus.ToBeReview && MsgType.ToBeReview === item.msgType) { + } else if ( + res.data.list[0].scaleStatus === ScaleStatus.ToBeReview && + MsgType.ToBeReview === item.msgType + ) { uni.navigateTo({ url: "/pagesReceive/payReview?scaleStatus=2", // 要跳转到的页面路径 }); @@ -142,12 +166,16 @@ const handleItem = (item: any) => { }); return; } else { - if (res.data.list[0].scaleStatus === ScaleStatus.ToBeShipment && MsgType.ToBeShipment === item.msgType) { + if ( + res.data.list[0].scaleStatus === ScaleStatus.ToBeShipment && + MsgType.ToBeShipment === item.msgType + ) { uni.navigateTo({ url: "/pagesShipment/shipmenting?scaleStatus=0", // 要跳转到的页面路径 }); } else if ( - res.data.list[0].scaleStatus === ScaleStatus.ToBeShipmentReview && MsgType.ToBeShipmentReview === item.msgType + res.data.list[0].scaleStatus === ScaleStatus.ToBeShipmentReview && + MsgType.ToBeShipmentReview === item.msgType ) { uni.navigateTo({ url: "/pagesShipment/shipmentSettlement?scaleStatus=2", // 要跳转到的页面路径 @@ -171,6 +199,13 @@ onMounted(() => { .msg-box { // background: #f8f8f8; width: 100%; + .u-slot-title-content { + padding: 13px 15px; + font-size: 15px; + color: #303133; + border-bottom: 1px solid rgba(0, 0, 0, 0.15); + } + .title { font-size: 28rpx; font-family: Source Han Sans CN; diff --git a/src/pagesLogin/profile/modifyPwd.vue b/src/pagesLogin/profile/modifyPwd.vue index 45c44c1..3e39327 100644 --- a/src/pagesLogin/profile/modifyPwd.vue +++ b/src/pagesLogin/profile/modifyPwd.vue @@ -14,7 +14,7 @@ :key="index" :prop="`userInfo.${item.key}`" > - - + diff --git a/src/pagesReceive/form/pricingForm.vue b/src/pagesReceive/form/pricingForm.vue index d1a444c..d916b88 100644 --- a/src/pagesReceive/form/pricingForm.vue +++ b/src/pagesReceive/form/pricingForm.vue @@ -24,7 +24,7 @@ :placeholder="`请输入${item.name}`" > - - 收货单号：{{ state.order.receiptNumber }} + + 收货单号：{{ state.order.receiptNumber }} + {{ item.name }}： 编辑 @@ -149,11 +154,11 @@ @confirm="handleConfirm" @cancel="isInput = false" > - + > @@ -215,7 +220,7 @@ const state = reactive<{ [attrName: string]: any; }>({ order: { - carNumber: '' + carNumber: "", }, sheetList: [ { @@ -327,10 +332,8 @@ const handleSelect = (key: string, v: any) => { contrlModalParams[key].isShow = false; if (key === "paySelect") { // 修改订单状态 - ReceiveApi.updateOne({ - ...state.order, - scaleStatus: 4, - paymentMethod: v.key, + ReceiveApi.updateOrderIn({ + orderInPos: [{ ...state.order, scaleStatus: 4, paymentMethod: v.key }], }).then((res) => { if (res.code === 200) { uni.showToast({ @@ -369,7 +372,11 @@ const handleUpdateOrder = () => { }; // 重新过皮 const handleReWeight = () => { - ReceiveApi.reTare({ id: state.order.id, userId: state.order.userId, deviceId: state.order.deviceId }).then((res) => { + ReceiveApi.reTare({ + id: state.order.id, + userId: state.order.userId, + deviceId: state.order.deviceId, + }).then((res) => { if (res.code === 200) { uni.redirectTo({ url: "/pagesReceive/pricing?scaleStatus=1", // 要跳转到的页面路径 @@ -387,7 +394,7 @@ onLoad((option) => { ReceiveApi.getDetailById({ id: state.order.id }).then((res) => { if (res.code === 200) { state.order = res.data; - gridList1.map((item:any) => { + gridList1.map((item: any) => { if (item.name === "扣杂" || item.name === "扣点") { if (state.order.buttonType === 0) { item.name = "扣杂"; @@ -398,17 +405,17 @@ onLoad((option) => { item.enName = "points"; item.unit = "%"; } - } + } if (item.name === "货款金额") { if (state.order[item.enName as string]) { item.num = state.order[item.enName as string]; } else { - item.num = state.order['totalPrice']; + item.num = state.order["totalPrice"]; + state.order[item.enName] = state.order["totalPrice"]; } } else { item.num = state.order[item.enName as string]; } - }); } }); diff --git a/src/pagesShipment/form/settlementForm.vue b/src/pagesShipment/form/settlementForm.vue index bff52ac..df07150 100644 --- a/src/pagesShipment/form/settlementForm.vue +++ b/src/pagesShipment/form/settlementForm.vue @@ -24,7 +24,7 @@ v-model="(model1.order as any)[(item.key as any)]" :placeholder="`请输入${item.name}`" > - -