diff --git a/api/model/index.js b/api/model/index.js index 02c7052..3bd6c97 100644 --- a/api/model/index.js +++ b/api/model/index.js @@ -68,6 +68,7 @@ const api = { method: 'GET', auth: true, showLoading: true, + limit : 500, }, // 删除购物车信息 deleteCart: { diff --git a/components/product/productItem.vue b/components/product/productItem.vue index 5ff872e..d075580 100644 --- a/components/product/productItem.vue +++ b/components/product/productItem.vue @@ -100,8 +100,15 @@ - - 购买 + + + 购买 + + + + 加入购物车 + @@ -140,6 +147,20 @@ } }) }, + // 加入购物车 + addCart(item){ + this.$api('addCart', { + shopId : item.id, + num : 1, + }, res => { + if(res.code == 200){ + uni.showToast({ + title: '加入购物车成功', + icon: 'none' + }) + } + }) + }, //根据角色获取对应价格 getPriceByRole(item) { diff --git a/components/user/productList.vue b/components/user/productList.vue index 4863b94..f898d86 100644 --- a/components/user/productList.vue +++ b/components/user/productList.vue @@ -94,7 +94,7 @@ .image { width: 300rpx; - height: 250rpx; + height: 300rpx; border-radius: 20rpx; } diff --git a/doc/4u5qWXI8Upxtb192e8c31f52cb65391097b2b230eb5e.png b/doc/4u5qWXI8Upxtb192e8c31f52cb65391097b2b230eb5e.png new file mode 100644 index 0000000..1bccf11 Binary files /dev/null and b/doc/4u5qWXI8Upxtb192e8c31f52cb65391097b2b230eb5e.png differ diff --git a/doc/gh_887a56a1d81b_1280.jpg b/doc/gh_887a56a1d81b_1280.jpg new file mode 100644 index 0000000..8e81d88 Binary files /dev/null and b/doc/gh_887a56a1d81b_1280.jpg differ diff --git a/doc/logo.png b/doc/logo.png index 0c503a1..f7f9b9c 100644 Binary files a/doc/logo.png and b/doc/logo.png differ diff --git a/pages_order/components/product/submit.vue b/pages_order/components/product/submit.vue index 46dc382..2d94176 100644 --- a/pages_order/components/product/submit.vue +++ b/pages_order/components/product/submit.vue @@ -12,16 +12,27 @@ @@ -66,7 +77,7 @@ left: 0; width: 100vw; background-color: #fff; - height: 100rpx; + height: 120rpx; display: flex; justify-content: center; align-items: center; @@ -83,6 +94,8 @@ flex-direction: column; justify-content: center; margin: 0 20rpx; + flex-shrink: 0; + align-items: center; &::after{ border: 0; } @@ -95,6 +108,16 @@ .title { font-size: 26rpx; color: #666666; + line-height: 40rpx; + } + } + + .give{ + background: rgba($uni-color, 0.1); + padding: 6rpx 20rpx; + border-radius: 15rpx; + .title{ + color: $uni-color; } } diff --git a/pages_order/mine/promotion.vue b/pages_order/mine/promotion.vue index c47b35d..9a35658 100644 --- a/pages_order/mine/promotion.vue +++ b/pages_order/mine/promotion.vue @@ -36,7 +36,8 @@ import index from '../../uni_modules/uv-ui-tools' title: '', baseUrl: 'https://image.hhlm1688.com/', canvas: {}, - imagePath: 'https://image.hhlm1688.com/2025-02-27/2fe7e417-54ad-4911-b9ba-84ac7d48e66d.png', + imagePath: 'https://image.hhlm1688.com/2025-03-06/32fbb8e2-160b-4cbf-9a49-a72de231de20.png', + // imagePath: 'https://image.hhlm1688.com/2025-02-27/2fe7e417-54ad-4911-b9ba-84ac7d48e66d.png', // imagePath: 'https://image.hhlm1688.com/2025-02-26/6539d2fa-558d-47db-9681-ecffec5b6c5d.png', index : 0, } diff --git a/pages_order/product/productDetail.vue b/pages_order/product/productDetail.vue index 9e606b5..39ea245 100644 --- a/pages_order/product/productDetail.vue +++ b/pages_order/product/productDetail.vue @@ -191,6 +191,7 @@