diff --git a/common/custom.scss b/common/custom.scss index 65b0e5c..44f7db7 100644 --- a/common/custom.scss +++ b/common/custom.scss @@ -194,15 +194,34 @@ .font-28 { font-size: 28rpx; } +.font-30 { + font-size: 30rpx; +} +.font-32 { + font-size: 32rpx; +} .clr-sub{ color: #999; } +.clr-prm{ + color: #B12D29;; +} +.font-weight{ + font-weight: 600; +} .radius-10{ border-radius: 10rpx; } .radius-20{ border-radius: 20rpx; } +.com-tag-grey{ + font-size: 26rpx; + background-color: rgb(246, 246, 246); + color: rgb(102, 102, 102); + border-radius: 10rpx; + padding: 12rpx 16rpx; +} page{ // font-size: 22rpx; diff --git a/pages.json b/pages.json index 909c640..59ee330 100644 --- a/pages.json +++ b/pages.json @@ -44,6 +44,18 @@ "navigationBarTitleText": "上门取件" } }, + { + "path": "pages/post/detail", + "style": { + "navigationBarTitleText": "运单详情" + } + }, + { + "path": "pages/post/locus", + "style": { + "navigationBarTitleText": "物流轨迹" + } + }, { "path": "pages/address/list", "style": { diff --git a/pages/bill/list.vue b/pages/bill/list.vue index e7ea24a..3fbc247 100644 --- a/pages/bill/list.vue +++ b/pages/bill/list.vue @@ -79,7 +79,7 @@ T7080123982307 - + {{'未开票'}} @@ -317,11 +317,4 @@ flex: 1; position: relative; } - .kpsat{ - font-size: 26rpx; - background-color: rgb(246, 246, 246); - color: rgb(102, 102, 102); - border-radius: 10rpx; - padding: 12rpx 16rpx; - } \ No newline at end of file diff --git a/pages/post/detail.vue b/pages/post/detail.vue new file mode 100644 index 0000000..24d9431 --- /dev/null +++ b/pages/post/detail.vue @@ -0,0 +1,315 @@ + + + + + + \ No newline at end of file diff --git a/pages/post/locus.vue b/pages/post/locus.vue new file mode 100644 index 0000000..c767e70 --- /dev/null +++ b/pages/post/locus.vue @@ -0,0 +1,181 @@ + + + + + + \ No newline at end of file diff --git a/pages/tabBar/search/search.vue b/pages/tabBar/search/search.vue index bc06fb0..04409bb 100644 --- a/pages/tabBar/search/search.vue +++ b/pages/tabBar/search/search.vue @@ -90,7 +90,7 @@ - + - + 进仓确认 + custom-style="height: 54rpx;margin-left: 12rpx;">进仓确认 再来一单 + custom-style="height: 54rpx;margin-left: 12rpx;">再来一单 取消 @@ -258,6 +258,7 @@ async handleDealItem(item, deal = { type: '1' }) { switch (deal.type){ case 1: // 跳转 + goto(`post/detail?id=${item.id}`) break; case 2: // 复制订单号 setClipboardData('xxxxxxx') diff --git a/static/images/post/call.png b/static/images/post/call.png new file mode 100644 index 0000000..60663a8 Binary files /dev/null and b/static/images/post/call.png differ diff --git a/static/images/post/hwu-check.png b/static/images/post/hwu-check.png new file mode 100644 index 0000000..6ce7483 Binary files /dev/null and b/static/images/post/hwu-check.png differ diff --git a/static/images/post/hwu-un.png b/static/images/post/hwu-un.png new file mode 100644 index 0000000..6c126f6 Binary files /dev/null and b/static/images/post/hwu-un.png differ diff --git a/static/images/post/run.png b/static/images/post/run.png new file mode 100644 index 0000000..26375ad Binary files /dev/null and b/static/images/post/run.png differ