diff --git a/common/untool.js b/common/untool.js
index 544d9fe..e842817 100644
--- a/common/untool.js
+++ b/common/untool.js
@@ -66,7 +66,10 @@ const scanCode = ()=> {
return new Promise((resolve, reject)=> {
uni.scanCode({
onlyFromCamera: false,
- success: resolve,
+ success: (res) =>{
+ console.log("scanCode res========", res)
+ resolve(res.result)
+ },
fail: reject
})
})
diff --git a/components/wuli-scan-code/index.vue b/components/tpx-physics-scan/tpx-physics-scan.vue
similarity index 69%
rename from components/wuli-scan-code/index.vue
rename to components/tpx-physics-scan/tpx-physics-scan.vue
index d82c3e7..586e03c 100644
--- a/components/wuli-scan-code/index.vue
+++ b/components/tpx-physics-scan/tpx-physics-scan.vue
@@ -1,16 +1,11 @@
-
- 日志======
- {{index + 1}}: {{v}}
-
+
+
+
\ No newline at end of file
diff --git a/pages/post/freightCalculate.vue b/pages/post/freightCalculate.vue
index 50f5d86..c13cf0a 100644
--- a/pages/post/freightCalculate.vue
+++ b/pages/post/freightCalculate.vue
@@ -3,60 +3,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -68,7 +29,29 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -81,7 +64,40 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
import getCdnUrl from "@/common/getCdnUrl"
- import { sendTypeEnum, sendTypeList } from "@/common/enum"
+ import { sendTypeEnum, sendTypeList, qingguanList, baoguanList, } from "@/common/enum"
import { goto } from "@/common/untool"
export default {
props: {
@@ -173,7 +189,7 @@
},
data() {
return {
- ...(JSON.parse(JSON.stringify({ sendTypeEnum, sendTypeList }))),
+ ...(JSON.parse(JSON.stringify({ sendTypeEnum, sendTypeList, qingguanList, baoguanList }))),
proList: [
{val: 1 },{ val: 2 }
],
diff --git a/pages/post/post.vue b/pages/post/post.vue
index 7993f96..c0f0f7b 100644
--- a/pages/post/post.vue
+++ b/pages/post/post.vue
@@ -2,14 +2,35 @@
-
-
-
-
+
+
+
+ 运单号
+
+
+
+
+
+
+
+
+
+
+
+ 选择客户
+
+
+
+
+
+ 确定
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 下单
-
+
+ 提交订单
@@ -291,6 +289,7 @@
show: false,
},
submitParam: {
+ yundanhao: '',
stockRoomId: '',
countryId: '',
wayId: '',