diff --git a/pages/mine_package/mine_purse/mine_purse.vue b/pages/mine_package/mine_purse/mine_purse.vue index cf4e8af..ad4a616 100644 --- a/pages/mine_package/mine_purse/mine_purse.vue +++ b/pages/mine_package/mine_purse/mine_purse.vue @@ -5,8 +5,8 @@ - + {{ item.name }} @@ -149,6 +149,8 @@ export default { .purse_amount { margin-right: 15rpx; + margin-top: 6rpx; + } .right_soild { diff --git a/pages/mine_package/mine_purse_log/mine_purse_log.vue b/pages/mine_package/mine_purse_log/mine_purse_log.vue index b8ed5a5..5ef11ea 100644 --- a/pages/mine_package/mine_purse_log/mine_purse_log.vue +++ b/pages/mine_package/mine_purse_log/mine_purse_log.vue @@ -465,7 +465,7 @@ export default { .info_center_warp-item-bottom { font-size: 26rpx; color: #999999; - margin-top: 10rpx; + margin-top: 15rpx; } } @@ -477,42 +477,67 @@ export default { .purse_info_item-mine { display: flex; justify-content: space-between; + align-items: center; border: 0; height: 128rpx; margin-bottom: 0; padding: 0; - .purse_data_warp { - display: flex; - flex-direction: column; - justify-content: center; - margin-left: 20rpx; - - .purse_info_name { - font-size: 28rpx; - color: #333333; - font-weight: normal; - } - - .purse_info_value { - font-size: 24rpx; - color: #999999; - } - - - - .purse_info_title { - font-weight: bold; - font-size: 32px; - color: #333333; - text-align: end; - } - } .purse_info_left .ipurse_nfo_right { display: flex; - justify-content: center; + justify-content: space-between; flex-direction: column; + height: 82rpx; + + .purse_data_warp { + display: flex; + flex-direction: column; + justify-content: center; + margin-left: 20rpx; + + .purse_info_name { + font-size: 28rpx; + color: #333333; + font-weight: normal; + } + + .purse_info_value { + font-size: 24rpx; + color: #999999; + } + + + + .purse_info_title { + font-weight: bold; + font-size: 32px; + color: #333333; + text-align: end; + } + } + } + + .purse_info_left { + .purse_info_name { + font-weight: 400; + } + + .purse_info_value { + margin-top: 8rpx; + } + } + + .ipurse_nfo_right { + .purse_info_value { + width: 300rpx; + white-space: nowrap; + /* 禁止换行 */ + overflow: hidden; + /* 隐藏溢出内容 */ + text-overflow: ellipsis; + /* 显示省略号 */ + } } } diff --git a/pages/other_package/nine-grid/nine-grid.vue b/pages/other_package/nine-grid/nine-grid.vue index c02a191..e9fcaa9 100644 --- a/pages/other_package/nine-grid/nine-grid.vue +++ b/pages/other_package/nine-grid/nine-grid.vue @@ -157,7 +157,7 @@ export default { background: linear-gradient(180deg, #FF8876 0%, #FF3D36 17%, #FF4646 85%, #FF8978 100%); border-radius: 24rpx; padding: 50rpx 24rpx; - margin: 50rpx auto 0; + margin: 100rpx auto 0; font-size: 34rpx; color: #FFFAE3; line-height: 54rpx; diff --git a/pages/other_package/productInfo/productInfo.vue b/pages/other_package/productInfo/productInfo.vue index ee8b0ee..1c7c1b4 100644 --- a/pages/other_package/productInfo/productInfo.vue +++ b/pages/other_package/productInfo/productInfo.vue @@ -44,7 +44,7 @@ - + 规格 @@ -112,7 +112,7 @@ 加入购物车 - 立即购买 + 立即购买 @@ -204,7 +204,7 @@ {{ source === "supply_chain" ? '云仓客服' : '平台客服' }} {{ source === "supply_chain" - ? CLOUD_SERVICE_PHONE_NUMBER :CUSTOMER_SERVICE_PHONE_NUMBER}} + ? CLOUD_SERVICE_PHONE_NUMBER : CUSTOMER_SERVICE_PHONE_NUMBER }} @@ -269,13 +269,13 @@ export default { serviceShow: false,// 联系客服弹框 openShow: false, source: null,// 来源:供应链,自营 - ji:0 + ji: 0 } }, onLoad(options) { const id = options.id; const source = options.source; - + if (id && id !== 0) { this.id = id ? parseInt(id, 10) : 0; if (source && source === 'supply_chain') { @@ -385,10 +385,10 @@ export default { }, async checkSpecification(val, type) { const source = this.source; - if(type == 'n' && this.ji == 1){ + if (type == 'n' && this.ji == 1) { type = 'buy'; } - console.log('afsdfsd',source,type) + console.log('afsdfsd', source, type) if (source && source === "supply_chain") { this.openShow = true; return; @@ -498,14 +498,14 @@ export default { }); return; } - + const params = { id: this.id, specsId: selectTempl.id,// 规格ID goodsNum: this.orderInfo.quantity,// 商品数量 } - console.log('selectTempl',selectTempl) - if(this.ji == 1){ + console.log('selectTempl', selectTempl) + if (this.ji == 1) { params['specsId'] = selectTempl; uni.navigateTo({ url: `/pages/order_package/order_submit/order_submit?sed=${JSON.stringify(params)}`, @@ -519,6 +519,7 @@ export default { url: `/pages/order_package/order_submit/order_submit?ids=${resp.data}`, }) } else { + this.specificationShow = false; uni.showToast({ title: '成功加入购物车', icon: 'success', // 可选 success/loading/none @@ -540,9 +541,10 @@ export default {