Commit 671b5d343e27f36da9f468ef520ccdb7b6fc2d3b
1 parent
b24803cf
调整页面在微信模拟器下的样式
Showing
14 changed files
with
265 additions
and
136 deletions
yudao-ui-app/app.scss
yudao-ui-app/components/custom-text-price/custom-text-price.vue
| 1 | 1 | <template> |
| 2 | - <view class="u-text-price-wrap"> | |
| 2 | + <view> | |
| 3 | 3 | <text v-for="(item, index) in textArray" :key="index" :style="{ 'font-size': (index === 1 ? integerSize : size) + 'px', 'color': color }"> |
| 4 | 4 | {{ item }} |
| 5 | 5 | </text> |
| ... | ... | @@ -8,7 +8,7 @@ |
| 8 | 8 | |
| 9 | 9 | <script> |
| 10 | 10 | /** |
| 11 | - * 此组件存在只为简单的显示特定样式的(人名币)价格数字 | |
| 11 | + * 此组件简单的显示特定样式的(人名币)价格数字 | |
| 12 | 12 | */ |
| 13 | 13 | export default { |
| 14 | 14 | name: 'custom-text-price', |
| ... | ... | @@ -51,4 +51,4 @@ export default { |
| 51 | 51 | } |
| 52 | 52 | } |
| 53 | 53 | </script> |
| 54 | -<style></style> | |
| 54 | +<style scoped></style> | ... | ... |
yudao-ui-app/pages.json
| ... | ... | @@ -53,7 +53,31 @@ |
| 53 | 53 | "style": { |
| 54 | 54 | "navigationBarTitleText": "商品详情" |
| 55 | 55 | } |
| 56 | - } | |
| 56 | + }, | |
| 57 | + { | |
| 58 | + "path": "pages/address/list", | |
| 59 | + "style": { | |
| 60 | + "navigationBarTitleText": "收货列表" | |
| 61 | + } | |
| 62 | + }, | |
| 63 | + { | |
| 64 | + "path": "pages/search/search", | |
| 65 | + "style": { | |
| 66 | + "navigationBarTitleText": "商品搜索" | |
| 67 | + } | |
| 68 | + }, | |
| 69 | + { | |
| 70 | + "path": "pages/address/add", | |
| 71 | + "style": { | |
| 72 | + "navigationBarTitleText": "新增地址" | |
| 73 | + } | |
| 74 | + }, | |
| 75 | + { | |
| 76 | + "path": "pages/address/edit", | |
| 77 | + "style": { | |
| 78 | + "navigationBarTitleText": "修改地址" | |
| 79 | + } | |
| 80 | + } | |
| 57 | 81 | ], |
| 58 | 82 | "tabBar": { |
| 59 | 83 | "selectedColor": "#333333", |
| ... | ... | @@ -86,8 +110,7 @@ |
| 86 | 110 | ] |
| 87 | 111 | }, |
| 88 | 112 | "globalStyle": { |
| 89 | - "navigationStyle": "custom",//取消默认导航栏 | |
| 90 | - "navigationBarTextStyle": "white", | |
| 113 | + "navigationBarTextStyle": "black", | |
| 91 | 114 | "navigationBarTitleText": "yudao-ui-app", |
| 92 | 115 | "navigationBarBackgroundColor": "#F8F8F8", |
| 93 | 116 | "backgroundColor": "#FFFFFF" | ... | ... |
yudao-ui-app/pages/address/add.vue
0 → 100644
yudao-ui-app/pages/address/edit.vue
0 → 100644
yudao-ui-app/pages/address/list.vue
0 → 100644
yudao-ui-app/pages/cart/cart.vue
| 1 | 1 | <template> |
| 2 | - <view class="container"> </view> | |
| 2 | + <view class="container"> | |
| 3 | + <view class="cart-empty"> | |
| 4 | + <u-empty mode="car" width="500rpx" height="500rpx" icon="/static/images/empty/cart.png"></u-empty> | |
| 5 | + </view> | |
| 6 | + | |
| 7 | + <view class="login-tips-box"> | |
| 8 | + <view class="login-tips"> | |
| 9 | + <navigator url="/pages/login/login" open-type="navigate" hover-class="none"> | |
| 10 | + <text class="login-link">登录</text> | |
| 11 | + </navigator> | |
| 12 | + <text>查看购物车</text> | |
| 13 | + </view> | |
| 14 | + </view> | |
| 15 | + </view> | |
| 3 | 16 | </template> |
| 4 | 17 | |
| 5 | 18 | <script> |
| ... | ... | @@ -14,4 +27,21 @@ export default { |
| 14 | 27 | } |
| 15 | 28 | </script> |
| 16 | 29 | |
| 17 | -<style lang="scss" scoped></style> | |
| 30 | +<style lang="scss" scoped> | |
| 31 | +.cart-empty { | |
| 32 | + padding-top: 100rpx; | |
| 33 | +} | |
| 34 | + | |
| 35 | +.login-tips-box { | |
| 36 | + padding-top: 100rpx; | |
| 37 | + .login-tips { | |
| 38 | + @include flex-center; | |
| 39 | + color: #939393; | |
| 40 | + font-size: 28rpx; | |
| 41 | + letter-spacing: 5rpx; | |
| 42 | + } | |
| 43 | + .login-link { | |
| 44 | + color: $u-primary; | |
| 45 | + } | |
| 46 | +} | |
| 47 | +</style> | ... | ... |
yudao-ui-app/pages/category/category.vue
| ... | ... | @@ -5,25 +5,23 @@ |
| 5 | 5 | </view> |
| 6 | 6 | <view class="category-box"> |
| 7 | 7 | <view class="box-left"> |
| 8 | - <u-list @scrolltolower="scrolltolower"> | |
| 9 | - <u-list-item class="category-item" v-for="(item, index) in categoryList" :key="item.id"> | |
| 8 | + <view> | |
| 9 | + <view class="category-item" v-for="(item, index) in categoryList" :key="item.id"> | |
| 10 | 10 | <view class="item-title" :class="{ active: currentIndex === index }" @click="handleCategoryClick(index)"> |
| 11 | 11 | <text>{{ item.name }}</text> |
| 12 | 12 | </view> |
| 13 | - </u-list-item> | |
| 14 | - </u-list> | |
| 13 | + </view> | |
| 14 | + </view> | |
| 15 | 15 | </view> |
| 16 | 16 | <view class="box-right"> |
| 17 | - <view class="category-image"> | |
| 18 | - <u--image :showLoading="true" :src="categoryList[currentIndex].image" width="530rpx" height="160rpx" @click="click"></u--image> | |
| 19 | - </view> | |
| 17 | + <image class="category-image" :showLoading="true" :src="categoryList[currentIndex].image" width="530rpx" height="160rpx" @click="click"></image> | |
| 20 | 18 | <view class="sub-category-box" v-for="(item, index) in categoryList[currentIndex].children" :key="item.id"> |
| 21 | 19 | <view class="sub-category-header"> |
| 22 | 20 | <view class="title">{{ item.title }}</view> |
| 23 | 21 | <view class="more">查看更多</view> |
| 24 | 22 | </view> |
| 25 | 23 | <u-grid class="sub-category-grid" col="3"> |
| 26 | - <u-grid-item v-for="(subItem, index) in item.category" :key="subItem.id"> | |
| 24 | + <u-grid-item v-for="(subItem, subIndex) in item.category" :key="subItem.id"> | |
| 27 | 25 | <view class="sub-category-item"> |
| 28 | 26 | <u-icon name="photo" :size="80"></u-icon> |
| 29 | 27 | <text class="sub-category-title">{{ subItem.title }}</text> |
| ... | ... | @@ -48,7 +46,7 @@ export default { |
| 48 | 46 | for (let i = 0; i < 10; i++) { |
| 49 | 47 | this.categoryList.push({ |
| 50 | 48 | id: i, |
| 51 | - image: '', | |
| 49 | + image: 'https://cdn.uviewui.com/uview/swiper/swiper1.png', | |
| 52 | 50 | name: '商品分类' + i, |
| 53 | 51 | children: [ |
| 54 | 52 | { |
| ... | ... | @@ -111,10 +109,6 @@ export default { |
| 111 | 109 | </script> |
| 112 | 110 | |
| 113 | 111 | <style lang="scss" scoped> |
| 114 | -.container { | |
| 115 | - height: calc(100vh - 50px); | |
| 116 | - overflow: hidden; | |
| 117 | -} | |
| 118 | 112 | |
| 119 | 113 | .search-wrap { |
| 120 | 114 | background: $custom-bg-color; |
| ... | ... | @@ -124,7 +118,7 @@ export default { |
| 124 | 118 | .category-box { |
| 125 | 119 | display: flex; |
| 126 | 120 | .box-left { |
| 127 | - width: 180rpx; | |
| 121 | + width: 200rpx; | |
| 128 | 122 | padding-top: 20rpx; |
| 129 | 123 | border-right: $custom-border-style; |
| 130 | 124 | .category-item { |
| ... | ... | @@ -132,7 +126,7 @@ export default { |
| 132 | 126 | padding: 20rpx 0; |
| 133 | 127 | .item-title { |
| 134 | 128 | padding-left: 30rpx; |
| 135 | - font-size: 30rpx; | |
| 129 | + font-size: 28rpx; | |
| 136 | 130 | &.active { |
| 137 | 131 | border-left: 6rpx solid $u-primary; |
| 138 | 132 | font-weight: 700; |
| ... | ... | @@ -141,15 +135,17 @@ export default { |
| 141 | 135 | } |
| 142 | 136 | } |
| 143 | 137 | .box-right { |
| 144 | - width: 570rpx; | |
| 138 | + flex: 1; | |
| 145 | 139 | .category-image { |
| 140 | + width: 510rpx; | |
| 141 | + height: 160rpx; | |
| 146 | 142 | padding: 20rpx; |
| 147 | 143 | } |
| 148 | 144 | |
| 149 | 145 | .sub-category-box { |
| 150 | 146 | .sub-category-header { |
| 151 | 147 | @include flex-space-between; |
| 152 | - padding: 20rpx; | |
| 148 | + padding: 30rpx 20rpx; | |
| 153 | 149 | |
| 154 | 150 | .title { |
| 155 | 151 | font-size: 28rpx; |
| ... | ... | @@ -168,13 +164,6 @@ export default { |
| 168 | 164 | @include flex-center(column); |
| 169 | 165 | background: #fff; |
| 170 | 166 | |
| 171 | - .sub-category-image { | |
| 172 | - border-radius: 10rpx; | |
| 173 | - /deep/ * { | |
| 174 | - border-radius: 10rpx; | |
| 175 | - } | |
| 176 | - } | |
| 177 | - | |
| 178 | 167 | .sub-category-title { |
| 179 | 168 | margin: 15rpx 0; |
| 180 | 169 | font-size: 24rpx; | ... | ... |
yudao-ui-app/pages/index/index.vue
| ... | ... | @@ -37,22 +37,20 @@ |
| 37 | 37 | <text class="bloc-title">每日上新</text> |
| 38 | 38 | <text class="see-more">查看更多</text> |
| 39 | 39 | </view> |
| 40 | - <u-grid class="prod-grid" :border="false" col="3"> | |
| 41 | - <u-grid-item class="prod-item-box" v-for="(item, index) in productList" :key="item.id"> | |
| 42 | - <view class="prod-item" @click="handleProdItemClick(item.id)"> | |
| 43 | - <u--image class="prod-image" width="230rpx" height="230rpx" :src="item.image"></u--image> | |
| 44 | - <view class="item-info"> | |
| 45 | - <view class="info-text"> | |
| 46 | - <u--text :lines="2" size="14px" color="#333333" :text="item.title"></u--text> | |
| 47 | - </view> | |
| 48 | - <view class="price-and-cart"> | |
| 49 | - <custom-text-price color="red" size="12" intSize="18" :price="item.price"></custom-text-price> | |
| 50 | - <u-icon name="shopping-cart" color="#2979ff" size="28"></u-icon> | |
| 51 | - </view> | |
| 40 | + <view class="prod-grid"> | |
| 41 | + <view class="prod-item" v-for="(item, index) in productList" :key="item.id" @click="handleProdItemClick(item.id)"> | |
| 42 | + <image class="prod-image" :src="item.image"></image> | |
| 43 | + <view class="item-info"> | |
| 44 | + <view class="info-text"> | |
| 45 | + <u--text :lines="2" size="14px" color="#333333" :text="item.title"></u--text> | |
| 46 | + </view> | |
| 47 | + <view class="price-and-cart"> | |
| 48 | + <custom-text-price color="red" size="12" intSize="18" :price="item.price"></custom-text-price> | |
| 49 | + <u-icon name="shopping-cart" color="#2979ff" size="28"></u-icon> | |
| 52 | 50 | </view> |
| 53 | 51 | </view> |
| 54 | - </u-grid-item> | |
| 55 | - </u-grid> | |
| 52 | + </view> | |
| 53 | + </view> | |
| 56 | 54 | </view> |
| 57 | 55 | </view> |
| 58 | 56 | |
| ... | ... | @@ -62,23 +60,21 @@ |
| 62 | 60 | <text class="bloc-title">商品热卖</text> |
| 63 | 61 | <text class="more">更多 ></text> |
| 64 | 62 | </view> |
| 65 | - <u-grid class="prod-grid" :border="false" col="2"> | |
| 66 | - <u-grid-item class="prod-item-box" v-for="(item, index) in productList" :key="item.id"> | |
| 67 | - <view class="prod-item" @click="handleProdItemClick(item.id)"> | |
| 68 | - <u--image class="prod-image" width="345rpx" height="345rpx" :src="item.image"></u--image> | |
| 69 | - <view class="item-info"> | |
| 70 | - <view class="info-text"> | |
| 71 | - <u--text :lines="1" size="14px" color="#333333" :text="item.title"></u--text> | |
| 72 | - <u--text :lines="1" size="12px" color="#939393" :text="item.desc"></u--text> | |
| 73 | - </view> | |
| 74 | - <view class="price-and-cart"> | |
| 75 | - <custom-text-price color="red" size="12" intSize="18" :price="item.price"></custom-text-price> | |
| 76 | - <u-icon name="shopping-cart" color="#2979ff" size="28"></u-icon> | |
| 77 | - </view> | |
| 63 | + <view class="prod-grid half"> | |
| 64 | + <view class="prod-item" v-for="(item, index) in productList" :key="item.id" @click="handleProdItemClick(item.id)"> | |
| 65 | + <image class="prod-image" :src="item.image"></image> | |
| 66 | + <view class="item-info"> | |
| 67 | + <view class="info-text"> | |
| 68 | + <u--text :lines="1" size="14px" color="#333333" :text="item.title"></u--text> | |
| 69 | + <u--text :lines="1" size="12px" color="#939393" :text="item.desc"></u--text> | |
| 70 | + </view> | |
| 71 | + <view class="price-and-cart"> | |
| 72 | + <custom-text-price color="red" size="12" intSize="18" :price="item.price"></custom-text-price> | |
| 73 | + <u-icon name="shopping-cart" color="#2979ff" size="28"></u-icon> | |
| 78 | 74 | </view> |
| 79 | 75 | </view> |
| 80 | - </u-grid-item> | |
| 81 | - </u-grid> | |
| 76 | + </view> | |
| 77 | + </view> | |
| 82 | 78 | </view> |
| 83 | 79 | </view> |
| 84 | 80 | |
| ... | ... | @@ -89,31 +85,26 @@ |
| 89 | 85 | <text></text> |
| 90 | 86 | </view> |
| 91 | 87 | |
| 92 | - <u-list class="prod-list" @scrolltolower="scrolltolower"> | |
| 93 | - <u-list-item v-for="(item, index) in productList" :key="item.id"> | |
| 94 | - <view class="prod-item" @click="handleProdItemClick(item.id)"> | |
| 95 | - <u--image class="prod-image" width="210rpx" height="210rpx" :src="item.image"></u--image> | |
| 96 | - <view class="item-info"> | |
| 97 | - <view class="info-text"> | |
| 98 | - <u--text :lines="1" size="14px" color="#333333" :text="item.title"></u--text> | |
| 99 | - <u-gap height="2px"></u-gap> | |
| 100 | - <u--text class="info-desc" :lines="2" size="12px" color="#939393" :text="item.desc"></u--text> | |
| 101 | - </view> | |
| 102 | - <view class="price-and-cart"> | |
| 103 | - <custom-text-price color="red" size="12" intSize="18" :price="item.price"></custom-text-price> | |
| 104 | - <u-icon name="shopping-cart" color="#2979ff" size="28"></u-icon> | |
| 105 | - </view> | |
| 88 | + <view class="prod-list" v-for="(item, index) in productList" :key="item.id"> | |
| 89 | + <view class="prod-item" @click="handleProdItemClick(item.id)"> | |
| 90 | + <image class="prod-image" :src="item.image"></image> | |
| 91 | + <view class="item-info"> | |
| 92 | + <view class="info-text"> | |
| 93 | + <u--text :lines="1" size="14px" color="#333333" :text="item.title"></u--text> | |
| 94 | + <u-gap height="2px"></u-gap> | |
| 95 | + <u--text class="info-desc" :lines="2" size="12px" color="#939393" :text="item.desc"></u--text> | |
| 96 | + </view> | |
| 97 | + <view class="price-and-cart"> | |
| 98 | + <custom-text-price color="red" size="12" intSize="18" :price="item.price"></custom-text-price> | |
| 99 | + <u-icon name="shopping-cart" color="#2979ff" size="28"></u-icon> | |
| 106 | 100 | </view> |
| 107 | 101 | </view> |
| 108 | - </u-list-item> | |
| 109 | - </u-list> | |
| 102 | + </view> | |
| 103 | + </view> | |
| 110 | 104 | </view> |
| 111 | 105 | </view> |
| 112 | - <u-gap height="5px"></u-gap> | |
| 113 | 106 | <!--加载更多--> |
| 114 | - <u-loadmore fontSize="32rpx" :status="status" :loading-text="loadingText" :loadmore-text="loadmoreText" :nomore-text="nomoreText" /> | |
| 115 | - | |
| 116 | - <u-gap height="10px"></u-gap> | |
| 107 | + <u-loadmore fontSize="28rpx" :status="status" :loading-text="loadingText" :loadmore-text="loadmoreText" :nomore-text="nomoreText" /> | |
| 117 | 108 | </view> |
| 118 | 109 | </template> |
| 119 | 110 | |
| ... | ... | @@ -201,7 +192,7 @@ export default { |
| 201 | 192 | }) |
| 202 | 193 | }, |
| 203 | 194 | handleSearchClick(e) { |
| 204 | - console.log('监听点击准备跳转页面') | |
| 195 | + uni.$u.route('/pages/search/search') | |
| 205 | 196 | }, |
| 206 | 197 | handleSwiperClick(index) { |
| 207 | 198 | console.log('点击了图片索引值:', index) |
| ... | ... | @@ -264,7 +255,7 @@ export default { |
| 264 | 255 | margin-top: -160px; |
| 265 | 256 | .bloc-header { |
| 266 | 257 | @include flex-space-between; |
| 267 | - padding: 10rpx 30rpx; | |
| 258 | + padding: 10rpx 20rpx; | |
| 268 | 259 | |
| 269 | 260 | .bloc-title { |
| 270 | 261 | color: $custom-bg-color; |
| ... | ... | @@ -299,25 +290,40 @@ export default { |
| 299 | 290 | .prod-grid { |
| 300 | 291 | width: 730rpx; |
| 301 | 292 | margin: 0 auto; |
| 302 | - .prod-item-box { | |
| 303 | - padding: 10rpx; | |
| 293 | + @include flex; | |
| 294 | + flex-wrap: wrap; | |
| 295 | + justify-content: left; | |
| 296 | + | |
| 297 | + &.half { | |
| 304 | 298 | .prod-item { |
| 305 | - background: #fff; | |
| 306 | - border-radius: 10rpx; | |
| 307 | - box-shadow: -1rpx 1rpx 2rpx #afd3f5, 1rpx 1rpx 0rpx #afd3f5; | |
| 308 | - justify-content: left; | |
| 309 | - /deep/ * { | |
| 310 | - border-radius: 10rpx 10rpx 0 0; | |
| 299 | + width: 346rpx; | |
| 300 | + margin: 10rpx; | |
| 301 | + .prod-image { | |
| 302 | + width: 346rpx; | |
| 303 | + height: 346rpx; | |
| 304 | + } | |
| 305 | + } | |
| 306 | + } | |
| 307 | + | |
| 308 | + .prod-item { | |
| 309 | + width: 224rpx; | |
| 310 | + margin: 10rpx; | |
| 311 | + background: #ffffff; | |
| 312 | + border-radius: 10rpx; | |
| 313 | + box-shadow: -1rpx 1rpx 2rpx #afd3f5, 1rpx 1rpx 0rpx #afd3f5; | |
| 314 | + .prod-image { | |
| 315 | + width: 224rpx; | |
| 316 | + height: 224rpx; | |
| 317 | + border-radius: 10rpx 10rpx 0 0; | |
| 318 | + } | |
| 319 | + .item-info { | |
| 320 | + padding: 15rpx; | |
| 321 | + .info-text { | |
| 322 | + height: 70rpx; | |
| 323 | + padding-bottom: 10rpx; | |
| 311 | 324 | } |
| 312 | - .item-info { | |
| 313 | - padding: 15rpx; | |
| 314 | - .info-text { | |
| 315 | - height: 70rpx; | |
| 316 | - padding-bottom: 10rpx; | |
| 317 | - } | |
| 318 | - .price-and-cart { | |
| 319 | - @include flex-space-between; | |
| 320 | - } | |
| 325 | + .price-and-cart { | |
| 326 | + @include flex-space-between; | |
| 321 | 327 | } |
| 322 | 328 | } |
| 323 | 329 | } |
| ... | ... | @@ -325,24 +331,21 @@ export default { |
| 325 | 331 | } |
| 326 | 332 | |
| 327 | 333 | .prod-list { |
| 328 | - height: auto !important; | |
| 329 | 334 | |
| 330 | 335 | .prod-item { |
| 331 | - padding: 20rpx; | |
| 332 | - background: #fff; | |
| 336 | + background: #ffffff; | |
| 333 | 337 | @include flex-space-between; |
| 334 | 338 | border-bottom: $custom-border-style; |
| 335 | - | |
| 339 | + padding: 20rpx; | |
| 336 | 340 | .prod-image { |
| 341 | + width: 200rpx; | |
| 342 | + height: 200rpx; | |
| 337 | 343 | border-radius: 10rpx; |
| 338 | - /deep/ * { | |
| 339 | - border-radius: 10rpx; | |
| 340 | - } | |
| 341 | 344 | } |
| 342 | 345 | |
| 343 | 346 | .item-info { |
| 344 | - width: 450rpx; | |
| 345 | - padding: 20rpx 30rpx 0 30rpx; | |
| 347 | + flex: 1; | |
| 348 | + padding: 20rpx 20rpx 0; | |
| 346 | 349 | .info-text { |
| 347 | 350 | height: 100rpx; |
| 348 | 351 | padding-bottom: 10rpx; | ... | ... |
yudao-ui-app/pages/login/login.vue
| ... | ... | @@ -14,7 +14,7 @@ |
| 14 | 14 | <u-gap height="40"></u-gap> |
| 15 | 15 | |
| 16 | 16 | <!-- 登录表单 --> |
| 17 | - <u--form class="unp-form" labelPosition="left" :model="formData" :rules="rules" ref="form"> | |
| 17 | + <u--form labelPosition="left" :model="formData" :rules="rules" ref="form"> | |
| 18 | 18 | <u-form-item label="手机号" prop="mobile" labelWidth="60" borderBottom ref="item-mobile"> |
| 19 | 19 | <u-input type="number" maxlength="11" v-model="formData.mobile" clearable placeholder="请填写手机号" border="none"></u-input> |
| 20 | 20 | </u-form-item> |
| ... | ... | @@ -36,10 +36,12 @@ |
| 36 | 36 | <u-code ref="uCode" @change="codeChange" seconds="60" @start="codeDisabled = true" @end="codeDisabled = false"></u-code> |
| 37 | 37 | </u-form-item> |
| 38 | 38 | |
| 39 | - <u-button type="primary" text="登录" customStyle="margin-top: 50px" @click="handleSubmit"></u-button> | |
| 39 | + <view class="btn-group"> | |
| 40 | + <u-button type="primary" text="登录" customStyle="margin-top: 50px" @click="handleSubmit"></u-button> | |
| 40 | 41 | |
| 41 | - <u-gap height="20"></u-gap> | |
| 42 | - <u-button type="info" text="返回" @click="navigateBack()"></u-button> | |
| 42 | + <u-gap height="20"></u-gap> | |
| 43 | + <u-button type="info" text="返回" @click="navigateBack()"></u-button> | |
| 44 | + </view> | |
| 43 | 45 | </u--form> |
| 44 | 46 | </view> |
| 45 | 47 | </view> |
| ... | ... | @@ -193,11 +195,13 @@ export default { |
| 193 | 195 | .mode-section { |
| 194 | 196 | width: 560rpx; |
| 195 | 197 | } |
| 196 | - .unp-form { | |
| 198 | + .btn-group { | |
| 197 | 199 | width: 560rpx; |
| 198 | 200 | } |
| 199 | 201 | } |
| 200 | 202 | |
| 203 | + | |
| 204 | + | |
| 201 | 205 | .lk-group { |
| 202 | 206 | height: 40rpx; |
| 203 | 207 | margin-top: 40rpx; | ... | ... |
yudao-ui-app/pages/product/product.vue
| ... | ... | @@ -144,7 +144,7 @@ |
| 144 | 144 | <view class="evan-type-item" :class="{ active: currentEvanIndex === index }" v-for="(item, index) in evanTypeList" :key="item.id" @click="handleEvanTypeClick(index)"> {{ item.name }}({{ item.count }}) </view> |
| 145 | 145 | </view> |
| 146 | 146 | <view class="comment-empty" v-if="true"> |
| 147 | - <u-empty mode="comment" icon="/static/images/empty/comment.png"></u-empty> | |
| 147 | + <u-empty mode="comment" width="350rpx" height="350rpx" icon="/static/images/empty/comment.png"></u-empty> | |
| 148 | 148 | </view> |
| 149 | 149 | <view v-else class="comment-list" style="min-height: 50px"> </view> |
| 150 | 150 | </view> |
| ... | ... | @@ -169,7 +169,7 @@ |
| 169 | 169 | <u-button type="warning" shape="circle" size="small" text="加入购物车"></u-button> |
| 170 | 170 | </view> |
| 171 | 171 | <view class="btn-item-main"> |
| 172 | - <u-button type="error" shape="circle" size="small" text="立即购买"></u-button> | |
| 172 | + <u-button type="error" color="#ea322b" shape="circle" size="small" text="立即购买"></u-button> | |
| 173 | 173 | </view> |
| 174 | 174 | </view> |
| 175 | 175 | </view> |
| ... | ... | @@ -355,23 +355,23 @@ export default { |
| 355 | 355 | height: 70rpx; |
| 356 | 356 | .row-left { |
| 357 | 357 | width: 70rpx; |
| 358 | - font-size: 22rpx; | |
| 358 | + font-size: 24rpx; | |
| 359 | 359 | color: #939393; |
| 360 | 360 | } |
| 361 | 361 | |
| 362 | 362 | .row-right { |
| 363 | 363 | @include flex-space-between; |
| 364 | - width: 620rpx; | |
| 364 | + flex: 1; | |
| 365 | 365 | |
| 366 | 366 | .row-content { |
| 367 | - width: 590rpx; | |
| 367 | + flex: 1; | |
| 368 | 368 | |
| 369 | 369 | .delivery-box { |
| 370 | 370 | @include flex-left; |
| 371 | 371 | .delivery-item { |
| 372 | 372 | margin-right: 20rpx; |
| 373 | 373 | @include flex-left; |
| 374 | - font-size: 14rpx; | |
| 374 | + font-size: 22rpx; | |
| 375 | 375 | .delivery-name { |
| 376 | 376 | margin-left: 5rpx; |
| 377 | 377 | } |
| ... | ... | @@ -382,7 +382,7 @@ export default { |
| 382 | 382 | @include flex-left; |
| 383 | 383 | .prom-item { |
| 384 | 384 | @include flex-left; |
| 385 | - font-size: 12rpx; | |
| 385 | + font-size: 22rpx; | |
| 386 | 386 | .prom-title { |
| 387 | 387 | padding: 1rpx 10rpx; |
| 388 | 388 | border: 1rpx solid red; |
| ... | ... | @@ -402,7 +402,7 @@ export default { |
| 402 | 402 | @include flex-left; |
| 403 | 403 | .coupon-item { |
| 404 | 404 | @include flex-left; |
| 405 | - font-size: 12rpx; | |
| 405 | + font-size: 22rpx; | |
| 406 | 406 | .coupon-desc { |
| 407 | 407 | padding: 2rpx 15rpx; |
| 408 | 408 | margin-right: 15rpx; |
| ... | ... | @@ -422,7 +422,7 @@ export default { |
| 422 | 422 | @include flex-space-between; |
| 423 | 423 | .sku-item { |
| 424 | 424 | @include flex-left; |
| 425 | - font-size: 12rpx; | |
| 425 | + font-size: 22rpx; | |
| 426 | 426 | .sku-desc { |
| 427 | 427 | margin-left: 15rpx; |
| 428 | 428 | font-weight: 700; |
| ... | ... | @@ -547,7 +547,7 @@ export default { |
| 547 | 547 | border-radius: 8rpx; |
| 548 | 548 | padding: 7rpx 12rpx; |
| 549 | 549 | background: #f3f3f3; |
| 550 | - font-size: 12rpx; | |
| 550 | + font-size: 22rpx; | |
| 551 | 551 | text-align: center; |
| 552 | 552 | &.active { |
| 553 | 553 | background: #ffffff; |
| ... | ... | @@ -559,6 +559,7 @@ export default { |
| 559 | 559 | } |
| 560 | 560 | |
| 561 | 561 | .comment-empty { |
| 562 | + | |
| 562 | 563 | } |
| 563 | 564 | } |
| 564 | 565 | } |
| ... | ... | @@ -579,7 +580,7 @@ export default { |
| 579 | 580 | width: 80rpx; |
| 580 | 581 | @include flex-center(column); |
| 581 | 582 | .btn-text { |
| 582 | - font-size: 12rpx; | |
| 583 | + font-size: 18rpx; | |
| 583 | 584 | color: #666666; |
| 584 | 585 | } |
| 585 | 586 | } | ... | ... |
yudao-ui-app/pages/search/search.vue
0 → 100644
yudao-ui-app/pages/user/user.vue
| 1 | 1 | <template> |
| 2 | 2 | <view class="container"> |
| 3 | 3 | <view class="user-header"> |
| 4 | - <view class="user-info" @click="handleUserInfoClick"> | |
| 4 | + <view class="user-info" @click="loginOrJump('/pages/profile/profile')"> | |
| 5 | 5 | <u-avatar size="80" :src="avatar"></u-avatar> |
| 6 | 6 | <text class="nick-name">{{ nickName }}</text> |
| 7 | 7 | </view> |
| ... | ... | @@ -45,10 +45,13 @@ |
| 45 | 45 | <u-cell class="fun-item" :border="false" icon="gift" title="分销中心" isLink></u-cell> |
| 46 | 46 | <u-cell class="fun-item" :border="false" icon="tags" title="领券中心" isLink></u-cell> |
| 47 | 47 | <u-cell class="fun-item" :border="false" icon="coupon" title="我的优惠券" isLink></u-cell> |
| 48 | - <u-cell class="fun-item" :border="false" icon="map" title="收获地址" isLink></u-cell> | |
| 48 | + <u-cell class="fun-item" :border="false" icon="map" title="收货地址" @click="loginOrJump('/pages/address/list')" isLink></u-cell> | |
| 49 | 49 | </u-cell-group> |
| 50 | 50 | |
| 51 | - <u-button class="logout-btn" type="error" color="#ea322b" text="确定"></u-button> | |
| 51 | + <view class="logout-btn"> | |
| 52 | + <u-button type="error" color="#ea322b" text="确定"></u-button> | |
| 53 | + </view> | |
| 54 | + | |
| 52 | 55 | </view> |
| 53 | 56 | </template> |
| 54 | 57 | |
| ... | ... | @@ -65,20 +68,20 @@ export default { |
| 65 | 68 | { icon: 'integral', title: '已完成' } |
| 66 | 69 | ], |
| 67 | 70 | statList: [ |
| 68 | - { value: '2', title: '我的收藏' }, | |
| 69 | - { value: '3', title: '我的消息' }, | |
| 70 | - { value: '3', title: '我的足迹' } | |
| 71 | + { value: '0', title: '我的收藏' }, | |
| 72 | + { value: '0', title: '我的消息' }, | |
| 73 | + { value: '0', title: '我的足迹' } | |
| 71 | 74 | ] |
| 72 | 75 | } |
| 73 | 76 | }, |
| 74 | 77 | onLoad() {}, |
| 75 | 78 | methods: { |
| 76 | - handleUserInfoClick() { | |
| 79 | + loginOrJump(pageUrl){ | |
| 77 | 80 | // TODO 判断是否已经登录逻辑 |
| 78 | 81 | if (!uni.getStorageSync('token')) { |
| 79 | 82 | uni.$u.route('/pages/login/login') |
| 80 | 83 | } else { |
| 81 | - uni.$u.route('/pages/profile/profile') | |
| 84 | + uni.$u.route(pageUrl) | |
| 82 | 85 | } |
| 83 | 86 | } |
| 84 | 87 | } |
| ... | ... | @@ -145,7 +148,7 @@ export default { |
| 145 | 148 | } |
| 146 | 149 | |
| 147 | 150 | .logout-btn { |
| 148 | - margin-top: 60rpx; | |
| 149 | - width: 300rpx; | |
| 151 | + margin: 60rpx auto 0; | |
| 152 | + width: 400rpx; | |
| 150 | 153 | } |
| 151 | 154 | </style> | ... | ... |