Commit fa6e7c38 authored by zhangchenchen's avatar zhangchenchen

Merge branch 'feature/20251104-feature' into dev

parents 726e7253 044754d8
...@@ -330,8 +330,8 @@ ...@@ -330,8 +330,8 @@
> >
</image> </image>
<view class="ipcontext"> <view class="ipcontext">
<view class="ipcontext-desc">{{ erqiPeizhi.ipTitle1 || '' }}</view> <view class="ipcontext-desc">{{ erqiPeizhi.ipDesc1 || '' }}</view>
<view class="ipcontext-title">{{ erqiPeizhi.ipDesc1 || '' }}</view> <view class="ipcontext-title">{{ erqiPeizhi.ipTitle1 || '' }}</view>
</view> </view>
</view> </view>
</store-product> </store-product>
...@@ -1452,7 +1452,7 @@ export default { ...@@ -1452,7 +1452,7 @@ export default {
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: flex-start; justify-content: flex-start;
font-size: 24rpx; font-size: 20rpx;
text-align: center; text-align: center;
.ipcontext-desc, .ipcontext-desc,
.ipcontext-title { .ipcontext-title {
...@@ -1514,17 +1514,18 @@ export default { ...@@ -1514,17 +1514,18 @@ export default {
height: 172rpx; height: 172rpx;
width: 322rpx; width: 322rpx;
display: flex; display: flex;
flex-direction: row-reverse; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
.ipcontext { .ipcontext {
width: 160rpx; // width: 210rpx;
flex: 1;
} }
} }
image { image {
width: 162rpx; width: 162 * 0.75rpx;
height: 172rpx; height: 172 * 0.75rpx;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment