diff --git a/README.md b/README.md index 6efbf87..a17d104 100644 --- a/README.md +++ b/README.md @@ -39,9 +39,9 @@ npm run build:mp-weixin ### ipx 底部适配高度函数 ```css - padding-bottom: 0; - padding-bottom: calc( 0 + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */ - padding-bottom: calc( 0 + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */ + padding-bottom: 0upx; + padding-bottom: calc( 0upx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */ + padding-bottom: calc( 0upx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */ ``` ### [蓝湖](https://lanhuapp.com/web/#/item/project/board?pid=9ab56cc5-0b3b-4a9c-8cd0-0cf57751010a) diff --git a/src/components/order_list/a_header/a_header.vue b/src/components/order_list/a_header/a_header.vue new file mode 100644 index 0000000..ff6efc7 --- /dev/null +++ b/src/components/order_list/a_header/a_header.vue @@ -0,0 +1,35 @@ + + + + + \ No newline at end of file diff --git a/src/components/order_list/a_line/a_line.vue b/src/components/order_list/a_line/a_line.vue new file mode 100644 index 0000000..9a25563 --- /dev/null +++ b/src/components/order_list/a_line/a_line.vue @@ -0,0 +1,55 @@ + + + + + \ No newline at end of file diff --git a/src/components/order_list/curriculum/curriculum.vue b/src/components/order_list/curriculum/curriculum.vue new file mode 100644 index 0000000..b1febde --- /dev/null +++ b/src/components/order_list/curriculum/curriculum.vue @@ -0,0 +1,31 @@ + + + + + \ No newline at end of file diff --git a/src/components/order_list/spectacular_monent/spectacular_monent.vue b/src/components/order_list/spectacular_monent/spectacular_monent.vue new file mode 100644 index 0000000..852bda8 --- /dev/null +++ b/src/components/order_list/spectacular_monent/spectacular_monent.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/components/order_list/value_card/value_card.vue b/src/components/order_list/value_card/value_card.vue new file mode 100644 index 0000000..56c7e96 --- /dev/null +++ b/src/components/order_list/value_card/value_card.vue @@ -0,0 +1,33 @@ + + + + + \ No newline at end of file diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue index 8d7647c..3d0c7ea 100644 --- a/src/pages/order_list/order_list.vue +++ b/src/pages/order_list/order_list.vue @@ -41,13 +41,20 @@ - - - - - - - + + + + + + + + + + + + + + @@ -100,7 +107,10 @@ import membership_order from '../../components/membership_order/membership_order'; import timing_order from '../../components/timing_order/timing_order.vue' import organize_order from '../../components/organize_order/organize_order.vue' - + // 20210910 新增订单模块 + import spectacular_monent from '../../components/order_list/spectacular_monent/spectacular_monent.vue' + import value_card from '../../components/order_list/value_card/value_card.vue' + import util from '../../utils/util'; import { servers } from '../../js/server'; import { API } from '../../js/api'; @@ -115,6 +125,8 @@ 'integral-order': integral_order, 'timing-order': timing_order, 'organize-order': organize_order, + 'spectacular-monent': spectacular_monent, + 'value-card': value_card, }, computed:{ isStoreInfo(){ @@ -428,7 +440,9 @@