diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json new file mode 100644 index 0000000..582561b --- /dev/null +++ b/.hbuilderx/launch.json @@ -0,0 +1,16 @@ +{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/ + // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数 + "version": "0.0", + "configurations": [{ + "app-plus" : + { + "launchtype" : "local" + }, + "default" : + { + "launchtype" : "local" + }, + "type" : "uniCloud" + } + ] +} diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json deleted file mode 100644 index 010347b..0000000 --- a/node_modules/.package-lock.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "zhhealth", - "version": "1.0.0", - "lockfileVersion": 2, - "requires": true, - "packages": { - "node_modules/moment": { - "version": "2.29.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz", - "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==", - "engines": { - "node": "*" - } - }, - "node_modules/uni-read-pages": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/uni-read-pages/-/uni-read-pages-1.0.5.tgz", - "integrity": "sha512-GkrrZ0LX0vn9R5k6RKEi0Ez3Q3e2vUpjXQ8Z6/K/d28KudI9ajqgt8WEjQFlG5EPm1K6uTArN8LlqmZTEixDUA==", - "hasInstallScript": true - }, - "node_modules/uni-simple-router": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/uni-simple-router/-/uni-simple-router-2.0.7.tgz", - "integrity": "sha512-8FKv5dw7Eoonm0gkO8udprrxzin0fNUI0+AvIphFkFRH5ZmP5ZWJ2pvnWzb2NiiqQSECTSU5VSB7HhvOSwD5eA==" - }, - "node_modules/uview-ui": { - "version": "2.0.29", - "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-2.0.29.tgz", - "integrity": "sha512-d5SttbPcowomrgpL7A1LMKRbemXtyyzpPCy98/+VQR3jfSyyHC9tfj/ZeAOKpqTn1rf9gOj2wc5tda/kVmYX2Q==", - "engines": { - "HBuilderX": "^3.1.0" - } - } - } -} diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity new file mode 100644 index 0000000..0d6dcac --- /dev/null +++ b/node_modules/.yarn-integrity @@ -0,0 +1,22 @@ +{ + "systemParams": "darwin-x64-93", + "modulesFolders": [ + "node_modules" + ], + "flags": [], + "linkedModules": [], + "topLevelPatterns": [ + "moment@^2.29.1", + "uni-read-pages@^1.0.5", + "uni-simple-router@^2.0.7", + "uview-ui@^2.0.27" + ], + "lockfileEntries": { + "moment@^2.29.1": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz", + "uni-read-pages@^1.0.5": "https://registry.npmjs.org/uni-read-pages/-/uni-read-pages-1.0.5.tgz", + "uni-simple-router@^2.0.7": "https://registry.npmjs.org/uni-simple-router/-/uni-simple-router-2.0.7.tgz", + "uview-ui@^2.0.27": "https://registry.npmjs.org/uview-ui/-/uview-ui-2.0.29.tgz" + }, + "files": [], + "artifacts": {} +} \ No newline at end of file diff --git a/pages.json b/pages.json index ed9f082..0c3b10d 100644 --- a/pages.json +++ b/pages.json @@ -268,8 +268,23 @@ "navigationBarTitleText": "搜索", "navigationBarBackgroundColor": "#FFFFFF" } - } - ], + },{ + "path" : "pages/store/shop/shopDetail", + "name": "ShopDetail", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/store/shop/shopList", + "name": "ShopList", + "style": { + "navigationBarTitleText": "更多店铺", + "navigationBarBackgroundColor": "#FFFFFF", + "enablePullDownRefresh": true + } + } + ], "tabBar": { "borderStyle": "white", "selectedColor": "#34CE98", diff --git a/pages/store/goods.vue b/pages/store/goods.vue index 4e9d2f2..fcf976e 100644 --- a/pages/store/goods.vue +++ b/pages/store/goods.vue @@ -21,11 +21,22 @@ ¥{{goods.price.show}} - 销量{{goods.sales}} + 库存量{{goods.sales}} - + + + + + + + 三只松鼠旗舰店 + 商品质量:5.0 服务态度:5.0 + + + 全部商品 723 + + + @@ -34,6 +45,7 @@ + 店铺 @@ -62,7 +74,7 @@ }, methods:{ getGoods(){ - goods(this.$Route.query.id).then(res => { + goods(this.$Route.query.id || 55).then(res => { this.goods = res }) }, @@ -78,7 +90,15 @@ skuId: this.goods.skus[0].sku_id } }) - } + }, + toShop(id){ + this.$Router.push({ + name: 'ShopDetail', + params: { + shopId: id + } + }) + } } } @@ -187,7 +207,70 @@ width: 100%; } } - } + + .shopInfo{ + border-top: solid $padding #f9f9f9; + display: flex; + flex-direction: row; + align-items: center; + justify-content: space-between; + box-sizing: border-box; + width: 100%; + padding:$padding $padding - 10; + border-bottom: solid 10rpx #f9f9f9; + .shopInfo-title-left{ + width: 500rpx; + display: flex; + flex-direction: row; + align-items: center; + justify-content: flex-start; + box-sizing: border-box; + .shop-logo{ + width: 100rpx; + height: 100rpx; + border-radius: 10rpx; + border:solid 1rpx #f9f9f9; + } + .shop-title{ + display: flex; + flex-direction: column; + align-items: flex-start; + justify-content: flex-start; + box-sizing: border-box; + font-size: 26rpx; + margin-left: $margin; + color: #999; + width:370rpx; + .no { + color: $text-price; + padding-left: 4rpx; + } + + .shop-titl{ + font-size: 34rpx; + color: #333; + font-weight: bold; + margin-bottom: 6rpx; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + width: 100%; + } + } + } + .shopInfo-title-right{ + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + box-sizing: border-box; + font-size: 28rpx; + color: #222; + } + + } + + } // 购买 .footer{ position: fixed; @@ -197,9 +280,25 @@ padding: $padding; z-index: 98; background: white; + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + box-sizing: border-box; // linear-gradient(to top, white 86%, rgba(255,255,255,.0)) + .shop{ + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + box-sizing: border-box; + font-size: 24rpx; + color: $text-gray; + } button{ background: $main-color; + margin-left: 60rpx; + flex: 1; color: white; border-radius: $radius-lg; height: 90rpx; diff --git a/pages/store/index.vue b/pages/store/index.vue index e885d59..f9a0d32 100644 --- a/pages/store/index.vue +++ b/pages/store/index.vue @@ -26,7 +26,7 @@ - 上新精选 + 上新精选 | 精品上新新品推荐 @@ -37,6 +37,22 @@ + + + + 推荐店铺 | 您身边的优质体验店 更多> + + + + 吉屋居酒屋吉屋居酒屋吉屋居酒屋 + 距离0.5KM + 前往体验 + + + + + + @@ -47,6 +63,8 @@ + + { + console.log(res); this.banners = res.banners this.goodsArr = res.goods this.newGood = res.news @@ -109,6 +128,7 @@ color: $text-color; font-weight: bold; margin-bottom: -$margin/2; + } } // 商城分类 @@ -157,7 +177,10 @@ font-weight: bold; color: $text-color; line-height: 40rpx; - @extend .nowrap; + width: calc(100% - 80rpx); + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .card-subtitle{ font-size: 20rpx; @@ -169,6 +192,7 @@ width: 80rpx; height: 80rpx; position: absolute; + border-radius: 50%; right: $margin; top: $margin; } @@ -189,6 +213,13 @@ font-size: $title-size-lg; color: $text-color; font-weight: bold; + padding-bottom: 10rpx; + .title-des{ + font-size: 24rpx; + padding-left: 10rpx; + color: $text-gray-m; + font-weight: normal; + } } .news{ margin: $margin/2 -10rpx 0; @@ -228,6 +259,78 @@ } } } + .offline-box{ + .title{ + font-size: $title-size-lg; + color: $text-color; + font-weight: bold; + margin-top: $margin; + margin-left: $margin; + display: flex; + flex-direction: row; + align-items: center; + justify-content: space-between; + box-sizing: border-box; + .more{ + flex: 1; + display: flex; + flex-direction: row; + align-items: center; + justify-content: space-between; + box-sizing: border-box; + padding-right: $padding; + .more-txt{ + font-size: 24rpx; + color: $text-gray; + font-weight: normal; + } + } + } + .card-btn{ + font-size: 20rpx; + color: #fff; + padding: 4rpx 20rpx; + border-radius: 20rpx; + background-color: $text-price; + display: inline-block; + } + // .card-title{ + // font-weight: normal; + // font-size: 28rpx!important; + // } + .card-box { + // &-item{ + // background: #fff !important; + // } + &-item:nth-child(1){ + background: #fef2ae; + } + &-item:nth-child(2){ + background: #c9ead9; + } + &-item:nth-child(3){ + margin-top: $padding - 8; + background: #bde0ff; + } + &-item:nth-child(4){ + margin-top: $padding - 8; + background: #ffd9e1; + } + } + .card-cover{ + width: 100rpx; + height: 100rpx; + position: absolute; + right: $margin; + top: $margin; + } + .title-des{ + font-size: 26rpx; + padding-left: 10rpx; + color: $text-gray-m; + font-weight: normal; + } + } // swiper .swiper{ background: linear-gradient(#FFF, #F3F6FB); diff --git a/pages/store/meals.vue b/pages/store/meals.vue index c1e9f35..f3067bd 100644 --- a/pages/store/meals.vue +++ b/pages/store/meals.vue @@ -34,6 +34,7 @@ methods:{ getMeals(){ meals(this.$Route.query.id, this.categoryId).then(res => { + console.log(res) uni.setNavigationBarTitle({ title: res.meal.subtitle }) diff --git a/pages/store/shop/shopDetail.vue b/pages/store/shop/shopDetail.vue new file mode 100644 index 0000000..9acf571 --- /dev/null +++ b/pages/store/shop/shopDetail.vue @@ -0,0 +1,570 @@ + + + + + diff --git a/pages/store/shop/shopList.vue b/pages/store/shop/shopList.vue new file mode 100644 index 0000000..2338529 --- /dev/null +++ b/pages/store/shop/shopList.vue @@ -0,0 +1,201 @@ + + + + + diff --git a/uni_modules/oct-goods/components/oct-goods/oct-goods.vue b/uni_modules/oct-goods/components/oct-goods/oct-goods.vue index 24e02d6..50bc370 100644 --- a/uni_modules/oct-goods/components/oct-goods/oct-goods.vue +++ b/uni_modules/oct-goods/components/oct-goods/oct-goods.vue @@ -5,7 +5,13 @@ {{item.name}} - {{priceType}}{{item.price.price_min || '0'}} + {{item.shop.name}} + {{item.price.price_min || '0'}} + + DT积分 + 库存量:1222 + + @@ -30,11 +36,13 @@ type: String, required: false, default: "#d4282d" - } + }, + showSalce:{ + type:Boolean, + default:true + } }, - mounted() { - - } + mounted() {} }