theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'zmr' of http://git.luyuan.tk/luyuan/deming into xbx

Browse Source
This commit was merged in pull request #121.
This commit is contained in:
luyuan
2020-08-06 10:45:03 +08:00
parent 7a7b126fe3 1313a90d5e
commit 9872770472
16 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pages/mine/index.vue
View File

@@ -46,7 +46,7 @@
<view class="title">
<view class="title-text">我的订单</view>
<view class="more" @click="toOtherPage('/order/Index')">
<view>查看全部订单</view>
<view class="title-text">查看全部订单</view>
<image src="/static/image/mine/21.png"></image>
</view>
</view>
@@ -355,7 +355,7 @@ export default {
}
.tool {
@include common-mine(
$content-padding-top: 8rpx,
$content-padding-top: 24rpx,
$content-padding-bottom: 25rpx,
$image-height: 71rpx,
$image-width: 71rpx
@@ -368,7 +368,7 @@ export default {
}
.more-tool {
@include common-mine(
$content-padding-top: 8rpx,
$content-padding-top: 24rpx,
$content-padding-bottom: 48rpx,
$image-height: 71rpx,
$image-width: 71rpx

4
pages/shop/index.vue
View File

@@ -276,7 +276,7 @@
}
.chengnuo {
padding: 30rpx;
padding:20rpx 30rpx;
background-color: #ffffff;
display: flex;
justify-content: space-between;
@@ -302,7 +302,7 @@
.fenlei {
display: flex;
flex-wrap: wrap;
padding: 30rpx;
padding: 10rpx 30rpx;
margin-bottom: 20rpx;
background-color: #ffffff;
}