diff --git a/pages.json b/pages.json index b616fe5..0a82c41 100644 --- a/pages.json +++ b/pages.json @@ -66,7 +66,7 @@ "path": "service/applyRelic" }, { - "path": "service/tell" + "path": "service/tellList" }, { "path": "service/experience" diff --git a/pages/index/index.vue b/pages/index/index.vue index 192482e..61ca03f 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -80,12 +80,12 @@ { icon : '/static/image/home/g3.png', title : '遗产讲述', - path : '/pages_order/service/tell?type=0', + path : '/pages_order/service/tellList?type=0', }, { icon : '/static/image/home/g4.png', title : '达人同游', - path : '/pages_order/service/tell?type=1', + path : '/pages_order/service/tellList?type=1', }, { icon : '/static/image/home/g5.png', diff --git a/pages_order/components/list/cardList.vue b/pages_order/components/list/cardList.vue index c7f5a24..80b77a9 100644 --- a/pages_order/components/list/cardList.vue +++ b/pages_order/components/list/cardList.vue @@ -12,8 +12,8 @@ 提前一周预约 - - 御窑厂、刘家弄、观音阁、陶瓷博物馆御窑博物馆... + + 御窑厂、刘家弄、观音阁、观音阁观音阁观音阁陶瓷博物馆御窑博物馆...陶瓷博物馆御窑博物馆陶瓷博物馆御窑博物馆陶瓷博物馆御窑博物馆 @@ -56,6 +56,7 @@ image { height: 100%; width: 100%; + border-radius: 20rpx; } } @@ -79,6 +80,16 @@ color: #FBAF35; border-radius: 20rpx; } + + .tips{ + font-size: 24rpx; + color: #999; + overflow: hidden; + text-overflow: ellipsis; + display:-webkit-box; //作为弹性伸缩盒子模型显示。 + -webkit-box-orient:vertical; //设置伸缩盒子的子元素排列方式--从上到下垂直排列 + -webkit-line-clamp:2; //显示的行 + } .card-content-bottom { display: flex; @@ -90,8 +101,9 @@ color: #FFFDF6; background-color: #C83741; margin-right: 4%; - padding: 8rpx 20rpx; + padding: 12rpx 30rpx; border-radius: 40rpx; + font-size: 24rpx; } } diff --git a/pages_order/components/product/submitUnitSelect.vue b/pages_order/components/product/submitUnitSelect.vue index cc32f99..0480d1e 100644 --- a/pages_order/components/product/submitUnitSelect.vue +++ b/pages_order/components/product/submitUnitSelect.vue @@ -82,7 +82,8 @@ @@ -104,29 +105,6 @@ data() { return { unitIndex : 0, - addressList: [ - { - id : 1, - name : 'xx', - phone : '1305xxxx802', - address : '广东省广州市越秀区', - addressDetail : '城南故事C3栋2802', - }, - { - id : 2, - name : 'xx', - phone : '1305xxxx802', - address : '广东省广州市越秀区', - addressDetail : '城南故事C3栋2802', - }, - { - id : 3, - name : 'xx', - phone : '1305xxxx802', - address : '广东省广州市越秀区', - addressDetail : '城南故事C3栋2802', - }, - ], address : { name : '请选择联系人', addressDetail : '', @@ -146,11 +124,6 @@ }, // 打开选择地址 openAddress(){ - if (!this.addressList.length) { - return uni.navigateTo({ - url: '/pages_order/mine/address' - }) - } this.$refs.addressPopup.open('bottom') }, // 选择地址 diff --git a/pages_order/product/productDetail.vue b/pages_order/product/productDetail.vue index 97ca64a..f3c5301 100644 --- a/pages_order/product/productDetail.vue +++ b/pages_order/product/productDetail.vue @@ -36,28 +36,22 @@ - + - + - - - - - 商品详情 + 详情 diff --git a/pages_order/service/tell.vue b/pages_order/service/tellList.vue similarity index 100% rename from pages_order/service/tell.vue rename to pages_order/service/tellList.vue