diff --git a/components/common/shopHeader.vue b/components/common/shopHeader.vue new file mode 100644 index 0000000..1d65039 --- /dev/null +++ b/components/common/shopHeader.vue @@ -0,0 +1,150 @@ + + + + + diff --git a/components/shop/ping-item.vue b/components/shop/ping-item.vue index 69aadb7..2fbffd5 100644 --- a/components/shop/ping-item.vue +++ b/components/shop/ping-item.vue @@ -1,70 +1,89 @@ +.ping-item { + width: 332rpx; + background: #fff; + border-radius: 12rpx; + overflow: hidden; + margin-bottom: 0; /* 瀑布流父层控制间距,这里清零 */ +} + +.top-img { + width: 332rpx; + display: block; + border-radius: 12rpx 12rpx 0 0; +} + +.shop-bottom-panel { + padding: 12rpx 16rpx 16rpx; +} + +.title { + line-height: 40rpx; + max-width: 300rpx; +} + +.price-line { + margin-top: 10rpx; +} + +.sold { + color: #999; +} + +/* 通用工具类(如已全局引入可删除) */ +.text-overflow { + display: block; + width: 100%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +.text-30 { font-size: 30rpx; } +.text-28 { font-size: 28rpx; } +.text-24 { font-size: 24rpx; } +.text-zu { color: #333; } +.text-zi { color: #7A35F6; } +.text-bold { font-weight: bold; } +.flex-r-lr { + display: flex; + justify-content: space-between; + align-items: center; +} + \ No newline at end of file diff --git a/components/shop/you-item.vue b/components/shop/you-item.vue index 4e4dec7..60e669d 100644 --- a/components/shop/you-item.vue +++ b/components/shop/you-item.vue @@ -4,24 +4,18 @@ + + + + + {{obj.title}} - - - - - - - 原价 - ¥{{obj.adPrice}} - - - - 到手 - ¥{{obj.price}} - - + + ¥{{obj.price}} + 专区立省{{ Number(obj.adPrice) - Number(obj.price) }}元 + @@ -54,10 +48,10 @@ flex-direction: row; align-items: center; justify-content: space-between; - padding: 12rpx; + padding: 20rpx; box-sizing: border-box; background-color: #fff; - border-radius: 12rpx; + border-radius: 16rpx; .shop-left-view{ min-width:216rpx; min-height:216rpx; @@ -65,8 +59,9 @@ align-items: center; justify-content: center; image{ - width:216rpx; - height:216rpx; + width:220rpx; + height:220rpx; + border-radius: 8rpx; } } .shop-right-view{ @@ -75,30 +70,37 @@ min-height:216rpx; margin-left:24rpx; flex-direction: column; - justify-content: space-between; + justify-content: space-around; + .shop-top-img{ + width: 100%; + display: flex; + align-items: center; + justify-content: flex-start; + image{ + width: 100%; + height: 100%; + } + } .right-top-view{ width:100%; display: flex; } - .right-bottom-view{ - width:100%; + .shop-price{ + background: linear-gradient( 270deg, #F0E7FE 0%, rgba(240,231,254,0) 100%); + width: 100%; + height: 80rpx; display: flex; - flex-direction: row; justify-content: space-between; - align-items: flex-end; - .right-bottom-panel{ - width:284rpx; - height:104rpx; - min-height:104rpx; - display: flex; - flex-direction: column; - justify-content: space-between; - align-items: center; - padding: 12rpx; - box-sizing: border-box; - background-color: #F0E7FE; - border-radius: 8rpx; + align-items: center; + .price-left{ + font-weight: bold; + font-size: 28rpx; + color: #7934F6; + } + .price-center{ + font-size: 20rpx; + color: #7934F6; } } } diff --git a/pages/rwa_package/shop copy/fen-shop.vue b/pages/rwa_package/shop copy/fen-shop.vue new file mode 100644 index 0000000..0f84e25 --- /dev/null +++ b/pages/rwa_package/shop copy/fen-shop.vue @@ -0,0 +1,170 @@ + + + + + diff --git a/pages/rwa_package/shop copy/sort-shop.vue b/pages/rwa_package/shop copy/sort-shop.vue new file mode 100644 index 0000000..d65aa5a --- /dev/null +++ b/pages/rwa_package/shop copy/sort-shop.vue @@ -0,0 +1,116 @@ + + + + + diff --git a/pages/rwa_package/shop copy/you-shop.vue b/pages/rwa_package/shop copy/you-shop.vue new file mode 100644 index 0000000..52b2a1f --- /dev/null +++ b/pages/rwa_package/shop copy/you-shop.vue @@ -0,0 +1,173 @@ + + + + + diff --git a/pages/rwa_package/shop/you-shop.vue b/pages/rwa_package/shop/you-shop.vue index 52b2a1f..7b76098 100644 --- a/pages/rwa_package/shop/you-shop.vue +++ b/pages/rwa_package/shop/you-shop.vue @@ -1,173 +1,350 @@ diff --git a/pages/supply_chain/supply_chain.vue b/pages/supply_chain/supply_chain.vue index b4d5b18..7949217 100644 --- a/pages/supply_chain/supply_chain.vue +++ b/pages/supply_chain/supply_chain.vue @@ -26,9 +26,16 @@ - - + + + + + + + + + + + + @@ -49,6 +77,7 @@ diff --git a/static/home/qiang.png b/static/home/qiang.png new file mode 100644 index 0000000..93f14a2 Binary files /dev/null and b/static/home/qiang.png differ diff --git a/static/home/shop-go.png b/static/home/shop-go.png new file mode 100644 index 0000000..875ff8d Binary files /dev/null and b/static/home/shop-go.png differ diff --git a/static/home/shop-intro.png b/static/home/shop-intro.png new file mode 100644 index 0000000..7b15118 Binary files /dev/null and b/static/home/shop-intro.png differ diff --git a/static/home/shop-search.png b/static/home/shop-search.png new file mode 100644 index 0000000..231fc34 Binary files /dev/null and b/static/home/shop-search.png differ diff --git a/static/home/shop-title.png b/static/home/shop-title.png new file mode 100644 index 0000000..2580445 Binary files /dev/null and b/static/home/shop-title.png differ diff --git a/static/home/tg.png b/static/home/tg.png new file mode 100644 index 0000000..f1e440d Binary files /dev/null and b/static/home/tg.png differ diff --git a/static/home/xs.png b/static/home/xs.png new file mode 100644 index 0000000..7eb89a7 Binary files /dev/null and b/static/home/xs.png differ diff --git a/static/home/xyx.png b/static/home/xyx.png new file mode 100644 index 0000000..2021f3c Binary files /dev/null and b/static/home/xyx.png differ diff --git a/utils/config.js b/utils/config.js index e329e05..7caec2d 100644 --- a/utils/config.js +++ b/utils/config.js @@ -1,4 +1,3 @@ - // export const BASE_URL="https://frontend.jdns360.com/api"; // 正式环境 // export const BASE_URL="http://cl55un59859.vicp.fun:24346"; // 测试环境