diff --git a/common/enum.js b/common/enum.js
index 925075e..2471af5 100644
--- a/common/enum.js
+++ b/common/enum.js
@@ -131,6 +131,34 @@ const baoguanList = [
{ title: '退税报关', val: baoguanEnum.tuishui },
]
+const packTypeEnum = {
+ zhixiang: 1,
+ muxiang: 2,
+ zhenzhi: 3,
+ other: 4
+}
+
+const packTypeList = [
+ { title: '纸箱', val: packTypeEnum.zhixiang },
+ { title: '木箱', val: packTypeEnum.muxiang },
+ { title: '针织袋', val: packTypeEnum.zhenzhi },
+ { title: '其他', val: packTypeEnum.other },
+]
+
+const kuaidiTypeEnum = {
+ shunfeng: 1,
+ debang: 2,
+ yunda: 3,
+ other: 4
+}
+
+const kuaidiTypeList = [
+ { title: '顺丰', val: kuaidiTypeEnum.shunfeng },
+ { title: '德邦', val: kuaidiTypeEnum.debang },
+ { title: '韵达', val: kuaidiTypeEnum.yunda },
+ { title: '其他', val: kuaidiTypeEnum.other },
+]
+
export {
ordStaEnum,
ordStatusList,
@@ -150,4 +178,8 @@ export {
qingguanList,
baoguanEnum,
baoguanList,
+ packTypeEnum,
+ packTypeList,
+ kuaidiTypeEnum,
+ kuaidiTypeList,
}
\ No newline at end of file
diff --git a/components/buns-goodsize-sheet/buns-goodsize-sheet.vue b/components/buns-goodsize-sheet/buns-goodsize-sheet.vue
index 4ae0d78..d9e9555 100644
--- a/components/buns-goodsize-sheet/buns-goodsize-sheet.vue
+++ b/components/buns-goodsize-sheet/buns-goodsize-sheet.vue
@@ -30,31 +30,46 @@
-
+
+
+ cm
+
+
-
+
+
+ cm
+
+
-
+
+
+ cm
+
+
-
-
+
+
+ m³
+
+
diff --git a/components/tpx-input/tpx-input.vue b/components/tpx-input/tpx-input.vue
index c412909..4f7c7f6 100644
--- a/components/tpx-input/tpx-input.vue
+++ b/components/tpx-input/tpx-input.vue
@@ -1,7 +1,7 @@
@@ -19,6 +19,16 @@
return ''
}
},
+ customStyle:{
+ default () {
+ return ''
+ }
+ },
+ placeholderStyle:{
+ default () {
+ return ''
+ }
+ },
},
data() {
},
diff --git a/components/tpx-upload/tpx-upload.vue b/components/tpx-upload/tpx-upload.vue
index ca03060..ccd1df4 100644
--- a/components/tpx-upload/tpx-upload.vue
+++ b/components/tpx-upload/tpx-upload.vue
@@ -1,6 +1,6 @@
-
+
@@ -18,7 +18,7 @@
-
+
@@ -224,6 +224,7 @@
\ No newline at end of file
diff --git a/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
index 8d255fb..7ee3592 100644
--- a/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
+++ b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
@@ -154,7 +154,7 @@
};