diff --git a/main.js b/main.js index 7e97c0b..65ccd5f 100644 --- a/main.js +++ b/main.js @@ -29,7 +29,7 @@ export function createApp() { app.config.globalProperties.$system = plus.os.name; // #endif app.config.globalProperties.$systemInfo = systemInfo - uni.setStorageSync('version', '1.0.4.sp29') + uni.setStorageSync('version', '1.0.5') app.config.globalProperties.$version = uni.getStorageSync('version') app.use(globalMethods); return { diff --git a/pages.json b/pages.json index 0c85b57..e196087 100644 --- a/pages.json +++ b/pages.json @@ -96,10 +96,16 @@ } }, { - "path" : "taobao/add-shopping-order/add-shopping-order", - "style" : - { - "navigationBarTitleText" : "新增淘宝购物订单", + "path": "taobao/add-shopping-order/add-shopping-order", + "style": { + "navigationBarTitleText": "新增淘宝购物订单", + "navigationStyle": "custom" + } + }, + { + "path": "taobao/shangou-order-detail/shangou-order-detail", + "style": { + "navigationBarTitleText": "淘宝闪购订单详情", "navigationStyle": "custom" } } diff --git a/pages/other/train-tickets/fliggy-train-tickets/fliggy-train-tickets.vue b/pages/other/train-tickets/fliggy-train-tickets/fliggy-train-tickets.vue index af0c14f..b0f2d13 100644 --- a/pages/other/train-tickets/fliggy-train-tickets/fliggy-train-tickets.vue +++ b/pages/other/train-tickets/fliggy-train-tickets/fliggy-train-tickets.vue @@ -118,7 +118,9 @@ - {{ computeSeatNo(item.seatNo) }} + + {{ + computeSeatNo(item.seatNo) }} {{ item.carriage }}车厢 {{ item.seatNo }}号 @@ -695,6 +697,9 @@ const showFristAndLastNumber = (str) => { border-radius: 6rpx; width: 66rpx; height: 32rpx; + display: flex; + align-items: center; + justify-content: center; border: solid 1rpx #d3d3d3; } @@ -770,13 +775,10 @@ const showFristAndLastNumber = (str) => { } .font_11 { - font-size: 26rpx; - line-height: 30rpx; color: #979797; - } - - .text_21 { - line-height: 28rpx; + font-size: 12px; + line-height: 32rpx; + height: 32rpx; } } } diff --git a/pages/other/train-tickets/qunar-train-tickets/qunar-train-tickets.vue b/pages/other/train-tickets/qunar-train-tickets/qunar-train-tickets.vue index dcbd282..fa19331 100644 --- a/pages/other/train-tickets/qunar-train-tickets/qunar-train-tickets.vue +++ b/pages/other/train-tickets/qunar-train-tickets/qunar-train-tickets.vue @@ -339,8 +339,8 @@ page { .text-wrapper { border-radius: 25rpx; width: 106rpx; - height: 50rpx; - border: solid 1rpx #28c2dd; + height: 24px; + border: solid 0.5px #28c2dd; .text_6 { color: #28c2dd; diff --git a/pages/shopping/index.vue b/pages/shopping/index.vue index c6cfdfb..f875d63 100644 --- a/pages/shopping/index.vue +++ b/pages/shopping/index.vue @@ -50,8 +50,7 @@ const menuList = ref([ bgColor: ["#FFF0DA", "#FFFFFF"], btnBg: "#FF953C", shadowColor: "#FF953C", - // url: "/pages/shopping/taobao/list-index" - url: "" + url: "/pages/shopping/taobao/list-index" }, { name: "快手", icon: "kuaishou", diff --git a/pages/shopping/jingdong/list-index.vue b/pages/shopping/jingdong/list-index.vue index a52f4da..9e179a5 100644 --- a/pages/shopping/jingdong/list-index.vue +++ b/pages/shopping/jingdong/list-index.vue @@ -110,11 +110,13 @@ + + + diff --git a/pages/shopping/taobao/shopping-order-detail/shopping-order-detail.vue b/pages/shopping/taobao/shopping-order-detail/shopping-order-detail.vue index 0bbba58..21681aa 100644 --- a/pages/shopping/taobao/shopping-order-detail/shopping-order-detail.vue +++ b/pages/shopping/taobao/shopping-order-detail/shopping-order-detail.vue @@ -345,6 +345,14 @@ + + + + + + + +