Commit 06923184 authored by 杨硕's avatar 杨硕

修改首页

parents 4abf8815 a3e12871
...@@ -152,39 +152,39 @@ ...@@ -152,39 +152,39 @@
} }
,{ ,{
"path" : "pages/order/express", "path" : "pages/order/express",
"style" : "style" :
{ {
"navigationBarTitleText": "物流信息", "navigationBarTitleText": "物流信息",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }
,{ ,{
"path" : "pages/order/payment/callback", "path" : "pages/order/payment/callback",
"style" : "style" :
{ {
"navigationBarTitleText": "支付结果", "navigationBarTitleText": "支付结果",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }
,{ ,{
"path" : "pages/menu/index", "path" : "pages/menu/index",
"style" : "style" :
{ {
"navigationBarTitleText":"分类", "navigationBarTitleText":"分类",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }
,{ ,{
"path" : "pages/menu/list", "path" : "pages/menu/list",
"style" : "style" :
{ {
"navigationBarTitleText": "商品列表", "navigationBarTitleText": "商品列表",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }
], ],
"subPackages": [ "subPackages": [
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
"pages": [ "pages": [
{ {
"path" : "index", "path" : "index",
"style" : "style" :
{ {
"navigationBarTitleText": "选择商圈" "navigationBarTitleText": "选择商圈"
} }
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
] ]
} }
], ],
"globalStyle": { "globalStyle": {
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarTitleText": "邻家小铺", "navigationBarTitleText": "邻家小铺",
......
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
stock_num: 20, // 商品总库存 stock_num: 20, // 商品总库存
collection_id: 0, // 无规格商品 skuId 取 collection_id,否则取所选 sku 组合对应的 id collection_id: 0, // 无规格商品 skuId 取 collection_id,否则取所选 sku 组合对应的 id
none_sku: false, // 是否无规格商品 none_sku: false, // 是否无规格商品
hide_stock: false, // 是否隐藏剩余库存 hide_stock: false, // 是否隐藏剩余库存
sel: {} sel: {}
}, },
count: 1, count: 1,
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
this.sku = {}; this.sku = {};
sku.tree = skuTree; sku.tree = skuTree;
this.sku = sku; this.sku = sku;
let skuSelItem; let skuSelItem;
for (const i in list) { for (const i in list) {
const item = list[i]; const item = list[i];
......
...@@ -464,7 +464,7 @@ ...@@ -464,7 +464,7 @@
.content { .content {
flex: 1; flex: 1;
.title { .title {
font-size: 28rpx; font-size: 28rpx;
line-height: 50rpx; line-height: 50rpx;
......
...@@ -30,6 +30,27 @@ ...@@ -30,6 +30,27 @@
<view class="gl-price">{{formatPrice(item.price)}}</view> <view class="gl-price">{{formatPrice(item.price)}}</view>
</view> </view>
</view> </view>
<view>
<u-tabs :list="navList" :is-scroll="false" :current="activeNav" @change="changeNav"></u-tabs>
<u-row gutter="16">
<u-col style="padding:0px;" v-for="(topic,index) in topicList" :key="index" :span="(index+3)%3===0?6:3">
<u-image width="100%" height="180rpx" :src="topic.img" @click="toTopic(topic.id)"></u-image>
</u-col>
</u-row>
<view>
<view class="gl-title">热门推荐</view>
<view class="gl-body">
<u-row v-for="(item,index) in hotList" :key="index">
<u-col :span="4" class="gl-img">
<u-image width="170rpx" height="170rpx" :src="item.img" @click="toDetail(item.id)"></u-image>
</u-col>
<u-col :span="8" @click="toDetail(item.id)">
<view class="gl-name">{{item.name}}</view>
<view class="gl-descript">{{item.descript}}</view>
<view class="gl-price">{{formatPrice(item.price)}}</view>
</u-col>
</u-row>
</view> </view>
</view> </view>
...@@ -224,4 +245,4 @@ ...@@ -224,4 +245,4 @@
justify-content: center; justify-content: center;
margin-left: 20rpx; margin-left: 20rpx;
} }
</style> </style>
\ No newline at end of file
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<u-icon name="arrow-right" color="#969799" size="28"></u-icon> <u-icon name="arrow-right" color="#969799" size="28"></u-icon>
</view> --> </view> -->
</view> </view>
<view class="card"> <view class="card">
<u-grid :border="false" col="4" @click="click"> <u-grid :border="false" col="4" @click="click">
<u-grid-item v-for="(baseListItem,baseListIndex) in baseList2" :key="baseListIndex"> <u-grid-item v-for="(baseListItem,baseListIndex) in baseList2" :key="baseListIndex">
...@@ -318,11 +318,11 @@ ...@@ -318,11 +318,11 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding: 34rpx; padding: 34rpx;
.order-title { .order-title {
font-size: 34rpx; font-size: 34rpx;
} }
.order-more { .order-more {
font-size: 28rpx; font-size: 28rpx;
} }
...@@ -331,5 +331,5 @@ ...@@ -331,5 +331,5 @@
/deep/.u-grid-item-box { /deep/.u-grid-item-box {
padding: 0px !important; padding: 0px !important;
} }
</style> </style>
\ No newline at end of file
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
type: Boolean, type: Boolean,
default: true default: true
}, },
// 图片的裁剪模式 // 图片的裁剪模式
imgMode: { imgMode: {
type: String, type: String,
default: 'aspectFill' default: 'aspectFill'
...@@ -232,7 +232,7 @@ ...@@ -232,7 +232,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../../libs/css/style.components.scss"; @import "../../libs/css/style.components.scss";
.u-swiper-wrap { .u-swiper-wrap {
position: relative; position: relative;
overflow: hidden; overflow: hidden;
......
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