diff --git a/components/buns-country-sheet/buns-country-sheet.vue b/components/buns-country-sheet/buns-country-sheet.vue new file mode 100644 index 0000000..f95fa26 --- /dev/null +++ b/components/buns-country-sheet/buns-country-sheet.vue @@ -0,0 +1,39 @@ + + + + + \ No newline at end of file diff --git a/components/tpx-dialog/tpx-dialog.vue b/components/tpx-dialog/tpx-dialog.vue new file mode 100644 index 0000000..267767e --- /dev/null +++ b/components/tpx-dialog/tpx-dialog.vue @@ -0,0 +1,173 @@ + + + + + \ No newline at end of file diff --git a/components/tpx-scroll-view/tpx-scroll-view.vue b/components/tpx-scroll-view/tpx-scroll-view.vue new file mode 100644 index 0000000..8f29ddf --- /dev/null +++ b/components/tpx-scroll-view/tpx-scroll-view.vue @@ -0,0 +1,53 @@ + + + + + \ No newline at end of file diff --git a/components/tpx-search/tpx-search.vue b/components/tpx-search/tpx-search.vue index 19b698e..9075116 100644 --- a/components/tpx-search/tpx-search.vue +++ b/components/tpx-search/tpx-search.vue @@ -43,7 +43,7 @@ }, height: { default () { - return 50 + return 38 } }, value: { diff --git a/components/tpx-tabs/tpx-tabs.vue b/components/tpx-tabs/tpx-tabs.vue index d5a29c9..5634ab2 100644 --- a/components/tpx-tabs/tpx-tabs.vue +++ b/components/tpx-tabs/tpx-tabs.vue @@ -59,7 +59,7 @@ padding: 0 0 30rpx 0; margin-right: 30rpx; position: relative; - font-size: 28rpx; + font-size: 30rpx; color: #FFF; opacity: 0.8; .stai-text { diff --git a/pages/address/list.vue b/pages/address/list.vue index b4eec93..aeb2d9d 100644 --- a/pages/address/list.vue +++ b/pages/address/list.vue @@ -45,11 +45,11 @@ 默认地址 - + - - + + diff --git a/pages/post/post.vue b/pages/post/post.vue index bc16921..9efa902 100644 --- a/pages/post/post.vue +++ b/pages/post/post.vue @@ -68,7 +68,7 @@ - + @@ -225,6 +225,7 @@ + diff --git a/pages/tabBar/search/search.vue b/pages/tabBar/search/search.vue index 22daf35..14d5576 100644 --- a/pages/tabBar/search/search.vue +++ b/pages/tabBar/search/search.vue @@ -19,7 +19,7 @@ - + {{hasExtSchParam?'已':''}}筛选 @@ -161,7 +161,16 @@ }, computed: { hasExtSchParam() { - return Object.values(this.tmpSearchParam).filter(v=> !!v).length > 0 + let hasExt = false + const searchParam = this.searchParam + if( + (searchParam.postStatus && searchParam.postStatus.length > 0) + || (searchParam.payType && searchParam.payType.length > 0) + || (searchParam.date || (searchParam.dateType && searchParam.dateType != dateTypeEnum.custom) ) + ) { + hasExt = true + } + return hasExt }, }, data() { @@ -177,7 +186,8 @@ }, ordList: [ - {},{},{},{},{},{},{},{} + {} + // ,{},{},{},{},{},{},{} ], showLoadMore: false, loadedAll: false @@ -208,7 +218,7 @@ this.tmpSearchParam = { postStatus: [], // 快递状态 payType: [], // 支付类型 - dateType: [], // 日期类型 + dateType: '', // 日期类型 date: '' // 日期 } }, diff --git a/pages/tabBar/sending/sending.vue b/pages/tabBar/sending/sending.vue index 8883718..feba411 100644 --- a/pages/tabBar/sending/sending.vue +++ b/pages/tabBar/sending/sending.vue @@ -47,7 +47,7 @@ - 去登录 + 去登录 diff --git a/static/test.txt b/static/test.txt index 2abd080..a0f202d 100644 --- a/static/test.txt +++ b/static/test.txt @@ -1 +1 @@ -http://705301687.qrcode.n.yunjie.com.cn/bos/qrcode/705301687/6016388900687/12963318687/onecode/getcode?codeId=127974&bosId=4021899060687 \ No newline at end of file +http://2212.qrcode.n.yunjie.com.cn/bos/qrcode/705301687/6016388900687/12963318687/onecode/getcode?codeId=127974&bosId=4021899060687 \ No newline at end of file