diff --git a/api/store.js b/api/store.js index 3945c17..55b0222 100644 --- a/api/store.js +++ b/api/store.js @@ -226,24 +226,13 @@ export function getBrandByName() { login: false }); } -// <<<<<<< HEAD -// /** -// * 添加收藏 -// * -// */ -// export function getUserCollection(data) { -// console.log(9999999966); -// return request.post("/collectEvaluation/add", data, { -// login: true -// }); -// ======= + /** * 添加收藏 * */ export function getUserCollection(data) { return request.post("/collectEvaluation/add",data); -// >>>>>>> sxx } /** * @@ -262,6 +251,15 @@ export function getBrandDetail(id) { }); } +/** + * 品牌馆滚动条信息 + */ +export function getBrandNoticeInfo() { + return request.get("/brandInfo", {}, { + login: false + }); +} + /** * 词条名查询 */ @@ -269,4 +267,22 @@ export function getEntry(data) { return request.get("/entryByName", data, { login: false }); +} + +/** + * 热门榜单 + */ +export function getHotList(data) { + return request.get("/hotList", data, { + login: false + }); +} + +/** + * 热门榜单信息 + */ +export function getHotListData() { + return request.get("/hotListData", {}, { + login: false + }); } \ No newline at end of file diff --git a/components/uni-notice-bar/uni-notice-bar.vue b/components/uni-notice-bar/uni-notice-bar.vue index a429e3d..d006242 100644 --- a/components/uni-notice-bar/uni-notice-bar.vue +++ b/components/uni-notice-bar/uni-notice-bar.vue @@ -17,7 +17,7 @@ {{text}} + :style="{color:color, width:wrapWidth+'px', 'animationDuration': animationDuration, '-webkit-animationDuration': animationDuration ,animationPlayState: webviewHide?'paused':animationPlayState,'-webkit-animationPlayState':webviewHide?'paused':animationPlayState, animationDelay: animationDelay, '-webkit-animationDelay':animationDelay, 'font-size':fontSize}">{{text}} @@ -343,11 +343,11 @@ export default { if (url) { // 通过二维码进来 that.bargainId = url.bargainId - that.bargainUid = url.partake + that.bargainUid = Number(url.partake); } else { // 正常途径进来 that.bargainId = that.$yroute.query.id - that.bargainUid = that.$yroute.query.partake + that.bargainUid = Number(that.$yroute.query.partake); } if (this.bargainUid == 0 || !this.bargainUid) { // url未携带用户uid，填上登录用户uid，跳转 diff --git a/pages/activity/DargainGoodsDetails/index.vue b/pages/activity/DargainGoodsDetails/index.vue index 516f8d1..109b14d 100644 --- a/pages/activity/DargainGoodsDetails/index.vue +++ b/pages/activity/DargainGoodsDetails/index.vue @@ -41,13 +41,16 @@ - - + + - 满{{199}}包邮 + {{tempName}} - - + + + {{item.content}} + + @@ -71,7 +74,7 @@ --> - 商品展示 + @@ -136,10 +139,13 @@ goodsDetail: { minPrice: 0, price: 0, + stock: '', + unitName: '', }, bargainId: 0, bargainUid: 0, imgUrls: [], + tempName: '', styleAllStyle: 'width:30rpx;height:24rpx;background:#F5F6F8;border-radius:8rpx;font-size:20rpx;color:#3A3A3C;line-height:24rpx;', timeTxtStyle: 'font-size:20rpx;color:#F5F6F8;line-height:24rpx;padding:0rpx 4rpx;', entryInfo: {}, @@ -183,6 +189,7 @@ // console.log(this.goodsDetail); this.goodsDetail.description = this.goodsDetail.description.replace(/\ { uni.hideLoading() uni.showToast({ @@ -388,7 +395,10 @@ padding: 18rpx 0rpx; margin: 0rpx 32rpx 20rpx; .safeguard-item { - width: 226rpx; + flex: 1; + // width: 226rpx; + height: 84rpx; + border-right: 2rpx solid #979797; font-size: 20rpx; font-family: SourceHanSansSCVF; font-weight: 600; @@ -398,13 +408,17 @@ .img { width: 46rpx; height: 46rpx; + margin-top: 2rpx; } } - .line { - width: 2rpx; - height: 84rpx; - background-color: #979797; + .safeguard-item:last-child { + border-right: 0; } + // .line { + // width: 2rpx; + // height: 84rpx; + // background-color: #979797; + // } } .tui-operation { diff --git a/pages/activity/GroupDetails/index.vue b/pages/activity/GroupDetails/index.vue index bb1f420..7b7db6e 100644 --- a/pages/activity/GroupDetails/index.vue +++ b/pages/activity/GroupDetails/index.vue @@ -86,13 +86,16 @@ - - + + - 满{{199}}包邮 + {{tempName}} - - + + + {{item.content}} + + @@ -187,7 +190,7 @@ - 商品展示 + @@ -314,6 +317,7 @@ export default { reply: [], replyCount: 0, replyChance: 0, + tempName: '', imgUrls: [], storeInfo: {}, itemNew: {}, @@ -358,7 +362,7 @@ export default { } }, }, - onShow: function() { + onLoad: function() { this.mountedStart() }, methods: { @@ -422,6 +426,7 @@ export default { that.$set(that, 'reply', [res.data.reply]) that.$set(that, 'replyCount', res.data.replyCount) that.$set(that, 'replyChance', res.data.replyChance) + that.$set(that, 'tempName', res.data.tempName); that.posterData.image = that.storeInfo.image if (that.storeInfo.title.length > 30) { that.posterData.title = that.storeInfo.title.substring(0, 30) + '...' @@ -1669,7 +1674,10 @@ export default { padding: 18rpx 0rpx; margin: 0rpx 32rpx 20rpx; .safeguard-item { - width: 226rpx; + flex: 1; + // width: 226rpx; + height: 84rpx; + border-right: 2rpx solid #979797; font-size: 20rpx; font-family: SourceHanSansSCVF; font-weight: 600; @@ -1679,14 +1687,17 @@ export default { .img { width: 46rpx; height: 46rpx; - // background-color: #FFFFFF; + margin-top: 2rpx; } } - .line { - width: 2rpx; - height: 84rpx; - background-color: #979797; + .safeguard-item:last-child { + border-right: 0; } + // .line { + // width: 2rpx; + // height: 84rpx; + // background-color: #979797; + // } } .userEvaluation .title .replyCount { diff --git a/pages/activity/SeckillDetails/index.vue b/pages/activity/SeckillDetails/index.vue index cb2e1cd..758f114 100644 --- a/pages/activity/SeckillDetails/index.vue +++ b/pages/activity/SeckillDetails/index.vue @@ -87,13 +87,16 @@ - - + + - 满{{199}}包邮 + {{tempName}} - - + + + {{item.content}} + + @@ -253,6 +256,7 @@ export default { replyCount: 0, // replyChance: '', reply: [], + tempName: '', cartNum: 1, attrTxt: '请选择', productValue: [], @@ -275,7 +279,7 @@ export default { } } }, - onShow: function() { + onLoad: function() { this.mountedStart() }, methods: { @@ -348,6 +352,7 @@ export default { that.$set(that, 'imgUrls', res.data.storeInfo.sliderImageArr) that.$set(that, 'replyCount', res.data.replyCount) that.$set(that, 'reply', res.data.reply) + that.$set(that, 'tempName', res.data.tempName) that.posterData.image = that.storeInfo.image_base that.updateTitle() if (that.storeInfo.title.length > 30) { @@ -1160,7 +1165,10 @@ export default { padding: 18rpx 0rpx; margin: 0rpx 32rpx 20rpx; .safeguard-item { - width: 226rpx; + flex: 1; + // width: 226rpx; + height: 84rpx; + border-right: 2rpx solid #979797; font-size: 20rpx; font-family: SourceHanSansSCVF; font-weight: 600; @@ -1170,14 +1178,17 @@ export default { .img { width: 46rpx; height: 46rpx; - // background-color: #FFFFFF; + margin-top: 2rpx; } } - .line { - width: 2rpx; - height: 84rpx; - background-color: #979797; + .safeguard-item:last-child { + border-right: 0; } + // .line { + // width: 2rpx; + // height: 84rpx; + // background-color: #979797; + // } } .userEvaluation .title .replyCount { diff --git a/pages/activity/activity/index.vue b/pages/activity/activity/index.vue index ae8ab88..44586a6 100644 --- a/pages/activity/activity/index.vue +++ b/pages/activity/activity/index.vue @@ -1,7 +1,7 @@