diff --git a/pages/order/components/contact/index.wxss b/pages/order/components/contact/index.wxss index 46f557f..ea4b77c 100644 --- a/pages/order/components/contact/index.wxss +++ b/pages/order/components/contact/index.wxss @@ -277,6 +277,11 @@ font-size: 29rpx; color: #000000; flex-shrink: 0; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + padding: 0 10rpx; + box-sizing: border-box; } .input-box { background: white; diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js index 48ffd9a..fbb75cc 100644 --- a/pages/order/scene/index.js +++ b/pages/order/scene/index.js @@ -69,7 +69,7 @@ Page({ time: app.globalData.product.time || {}, showYhq:app.globalData.listName?false:true }) - console.log('-------',this.data.showYhq,this.data.time); + console.log('-------',this.data.product,this.data.time); // debugger console.log('-------',app.globalData.product.sku.sku_model.is_need_idcard); console.log('---是否实名----',app.globalData.product.sku.sku_model.is_authentication); @@ -90,7 +90,11 @@ Page({ this.setData({ productNum: app.globalData.product.num == null ? 1 : app.globalData.product.num }) - } + } + + if (app.globalData.product && app.globalData.product.sku && app.globalData.product.sku.display_tags) { + app.globalData.product.sku.display_tags_str = app.globalData.product.sku.display_tags.split(",").splice(0, 2).join(" | "); + } this.setData({ product: app.globalData.product, singlePrice: app.globalData.product.date?app.globalData.product.date.price :(this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price) diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml index bf3bd5d..06a8275 100644 --- a/pages/order/scene/index.wxml +++ b/pages/order/scene/index.wxml @@ -47,8 +47,8 @@ - - {{item}}| + + {{product.sku.display_tags_str}}| 预订须知 > diff --git a/project.private.config.json b/project.private.config.json index be8ee63..ed33811 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -7,16 +7,9 @@ "miniprogram": { "list": [ { - "name": "pages/info/sceneProductInfo/index", - "pathName": "pages/info/sceneProductInfo/index", - "query": "id=54182", - "launchMode": "default", - "scene": null - }, - { - "name": "pages/pbService/web/index", - "pathName": "pages/pbService/web/index", - "query": "weburl=https%3A%2F%2Fm.cloud.sz-trip.com%2Fwangzhe", + "name": "pages/info/postProductInfo/index", + "pathName": "pages/info/postProductInfo/index", + "query": "id=457634", "launchMode": "default", "scene": null }, @@ -28,82 +21,12 @@ "scene": null }, { - "name": "subPackages/index/index", + "name": "活动首页", "pathName": "subPackages/indexGQ/index", "query": "", "launchMode": "default", "scene": null }, - { - "name": "subPackages/feiyiNew/CGCIndex/index", - "pathName": "subPackages/feiyiNew/index", - "query": "", - "launchMode": "default", - "scene": null - }, - { - "name": "subPackages/index/index", - "pathName": "subPackages/indexGQ/index", - "query": "", - "launchMode": "default", - "scene": null - }, - { - "name": "subPackages/password/setting/setting", - "pathName": "subPackages/password/setting/setting", - "query": "type=edit", - "launchMode": "default", - "scene": null - }, - { - "name": "pages/pbService/sceneComfort/index", - "pathName": "pages/pbService/sceneComfort/index", - "query": "", - "launchMode": "default", - "scene": null - }, - { - "name": "pages/user/order/movieOrderInfo/index", - "pathName": "pages/activity/year2020/index", - "query": "", - "launchMode": "default", - "scene": null - }, - { - "name": "subPackageCheckPoint/pages/index/index", - "pathName": "subPackageCheckPoint/pages/index/index", - "query": "", - "launchMode": "default", - "scene": null - }, - { - "name": "pages/pbService/web/index", - "pathName": "pages/pbService/web/index", - "query": "weburl=https://m.cloud.sz-trip.com/nightMooring", - "launchMode": "default", - "scene": null - }, - { - "name": "pages/info/postProductInfo/index", - "pathName": "pages/info/postProductInfo/index", - "query": "id=437254&ZTPoint=yjksSpecial", - "launchMode": "default", - "scene": null - }, - { - "name": "首页", - "pathName": "subPackages/indexGQ/index", - "query": "", - "launchMode": "default", - "scene": null - }, - { - "name": "pages/pbService/web/index", - "pathName": "pages/pbService/web/index", - "query": "https%3A%2F%2Fm.cloud.sz-trip.com%2FpetYou2024%3FcnylCode%3D123456", - "launchMode": "default", - "scene": null - }, { "name": "pages/pbService/web/index", "pathName": "pages/pbService/web/index", @@ -124,38 +47,6 @@ "query": "", "launchMode": "default", "scene": null - }, - { - "name": "景点购物车5447", - "pathName": "pages/info/sceneProductInfoNew/index", - "query": "id=5447", - "scene": null - }, - { - "name": "pages/group/info/index", - "pathName": "pages/group/info/index", - "query": "team_id=32&id=26", - "scene": null - }, - { - "name": "pages/list/haoxing/index", - "pathName": "pages/list/haoxing/index", - "query": "", - "scene": null - }, - { - "name": "", - "pathName": "pages/order/payresult/index", - "query": "", - "launchMode": "default", - "scene": null - }, - { - "name": "", - "pathName": "pages/order/comment/index", - "query": "id=82342309051435565877", - "launchMode": "default", - "scene": null } ] }