From d19771b182e032f6eb46f06ff16abac27ad9a5a0 Mon Sep 17 00:00:00 2001 From: ghusermoon <2673031505@qq.com> Date: Wed, 12 Aug 2020 10:10:59 +0800 Subject: [PATCH 1/2] show price 8.12 --- components/mine/order-item/index.vue | 3 +++ pageB/coupon/index.vue | 3 ++- pageC/cart/index.vue | 32 +++++----------------------- pageC/classify/goods.vue | 13 ++++++++--- pageE/mine/ImageTextCollection.vue | 4 ++-- pageE/order/Details.vue | 24 +++++++++++++++++++-- pages/index/index.vue | 6 +++--- 7 files changed, 47 insertions(+), 38 deletions(-) diff --git a/components/mine/order-item/index.vue b/components/mine/order-item/index.vue index dbf6e0f..93ea2cf 100644 --- a/components/mine/order-item/index.vue +++ b/components/mine/order-item/index.vue @@ -79,6 +79,9 @@ export default { case 9: state = '拼团中'; break; + case 10: + state = '已取消'; + break; default: break; } diff --git a/pageB/coupon/index.vue b/pageB/coupon/index.vue index 224ecae..169f5e9 100644 --- a/pageB/coupon/index.vue +++ b/pageB/coupon/index.vue @@ -62,10 +62,11 @@ z-index: 3; color: #EBB36E; position: absolute; - font-size: 98rpx; + font-size: 92rpx; font-weight: bold; top: 200rpx; left: 50%; + font-family: PingFang SC; transform: translate(-68%, 0); } .coupon-image { diff --git a/pageC/cart/index.vue b/pageC/cart/index.vue index 6e49827..35f328c 100644 --- a/pageC/cart/index.vue +++ b/pageC/cart/index.vue @@ -326,10 +326,13 @@ export default { font-weight: 500; color: rgba(255,49,49,1); } - .u-numberbox { + /deep/ .u-numberbox { border: 1rpx solid rgba(217,215,215,1); border-radius:4px; - /deep/ .u-number-input { + .u-icon-minus, .u-icon-plus { + width: 38rpx; + } + .u-number-input { margin: 0; color: #333 !important; border: 1rpx #D9D7D7 solid { @@ -338,31 +341,6 @@ export default { } } } - // .num { - // display: flex; - // width: 118rpx; - // height: 39rpx; - // border: 1rpx solid rgba(217,215,215,1); - // border-radius:4px; - // .reduce, .increase { - // flex: 1; - // font-size: 11rpx; - // color: #FF780F; - // line-height: 39rpx; - // text-align: center; - // } - // .value { - // flex: 1; - // font-size: 22rpx; - // color:rgba(51,51,51,1); - // line-height: 39rpx; - // text-align: center; - // border: 1rpx #D9D7D7 solid { - // top: 0px; - // bottom: 0px; - // } - // } - // } } } } diff --git a/pageC/classify/goods.vue b/pageC/classify/goods.vue index 7a6821d..c10af42 100644 --- a/pageC/classify/goods.vue +++ b/pageC/classify/goods.vue @@ -16,7 +16,8 @@ {{ goods.goods_name }} - {{ goods.goods_advword }} + {{ goods.goods_advword }} + ￥{{ goods.goods_price }} @@ -176,15 +177,21 @@ export default { } .right { width: 418rpx; + height: 200rpx; + display: flex; + flex-direction: column; + justify-content: space-around; .name { font-size: 30rpx; color: rgba(51,51,51,1); - margin-bottom: 20rpx; } .briefing { font-size: 28rpx; color: rgba(102,102,102,1); - line-height: 42rpx; + } + .price { + font-size: 26rpx; + color: rgba(255,49,49,1); } } } diff --git a/pageE/mine/ImageTextCollection.vue b/pageE/mine/ImageTextCollection.vue index 20ad85e..632ed7d 100644 --- a/pageE/mine/ImageTextCollection.vue +++ b/pageE/mine/ImageTextCollection.vue @@ -3,7 +3,7 @@ - + @@ -219,7 +219,7 @@ export default { .backes{ position: absolute; top: 0; - background: rgba(0,0,0,0.6); + // background: rgba(0,0,0,0.6); width: 100%; height: 100%; color: #fff; diff --git a/pageE/order/Details.vue b/pageE/order/Details.vue index 12015bf..d1155ef 100644 --- a/pageE/order/Details.vue +++ b/pageE/order/Details.vue @@ -20,12 +20,12 @@ - + {{ orderInfo.extend_store.store_name }} - + @@ -118,6 +118,10 @@ export default { text: '拼团中', image: '../static/mine/37.png', }, + '9': { + text: '已取消', + image: '../static/mine/33.png', + }, }, orderInfo: {}, oid: '', @@ -166,11 +170,27 @@ export default { case 9: state = '8'; break; + case 10: + state = '9'; + break; default: break; } this.orderstate = state; }, + viewStoreDetails(id) { + this.$u.route('pageC/merchant/index', { + id: id + }); + }, + viewGoodsDetails(id) { + this.$u.route({ + url: 'pageB/sdetails/index', + params: { + id: id, + } + }) + }, setSpikeTime(time) { // console.log(time); this.timer = setInterval(() => { diff --git a/pages/index/index.vue b/pages/index/index.vue index 257bdca..6008a3d 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -270,9 +270,9 @@ this.articleList = []; } this.getArticlelist(); - if (this.hasLogin) { - this.isNewmembervoucher(); - } + // if (this.hasLogin) { + // this.isNewmembervoucher(); + // } }, onLoad(){ this.getSwiper(); From d8d3434988814adc5df7bfeff34ddeee3e01e8fe Mon Sep 17 00:00:00 2001 From: ghusermoon <2673031505@qq.com> Date: Wed, 12 Aug 2020 10:16:14 +0800 Subject: [PATCH 2/2] show price 8.12 --- pageB/search/searchGoods.vue | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pageB/search/searchGoods.vue b/pageB/search/searchGoods.vue index b20a417..2248dec 100644 --- a/pageB/search/searchGoods.vue +++ b/pageB/search/searchGoods.vue @@ -16,7 +16,8 @@ {{ goods.goods_name }} - {{ goods.goods_advword }} + {{ goods.goods_advword }} + ￥{{ goods.goods_price }} @@ -198,15 +199,21 @@ export default { } .right { width: 418rpx; + height: 200rpx; + display: flex; + flex-direction: column; + justify-content: space-around; .name { font-size: 30rpx; color: rgba(51,51,51,1); - margin-bottom: 20rpx; } .briefing { font-size: 28rpx; color: rgba(102,102,102,1); - line-height: 42rpx; + } + .price { + font-size: 26rpx; + color: rgba(255,49,49,1); } } }