diff --git a/config/request.js b/config/request.js index d57d2ba..aea2d7a 100644 --- a/config/request.js +++ b/config/request.js @@ -5,7 +5,7 @@ */ export default { - // baseURL: 'http://192.168.31.51:10010/', + // baseURL: 'http://192.168.31.217:10010/', baseURL: 'http://124.71.79.122/', headers: { 'Content-Type': 'application/json;charset=UTF-8' diff --git a/other/follow/follow.vue b/other/follow/follow.vue index 4246f1c..3fa52f9 100644 --- a/other/follow/follow.vue +++ b/other/follow/follow.vue @@ -22,7 +22,7 @@ - + {{ item.whetherAttention ? '取消关注' : '关注' }} 我想采购 diff --git a/other/procureDetail/procureDetail.vue b/other/procureDetail/procureDetail.vue index b513e93..c407974 100644 --- a/other/procureDetail/procureDetail.vue +++ b/other/procureDetail/procureDetail.vue @@ -17,7 +17,7 @@ {{ item.prodName}} - ¥{{ item.price }} + {{ item.price ? '¥' + item.price : '面议' }} {{ item.prodCount }}件 diff --git a/other/registeredActivity/registeredActivity.vue b/other/registeredActivity/registeredActivity.vue index 1b21fdf..2e6ff5c 100644 --- a/other/registeredActivity/registeredActivity.vue +++ b/other/registeredActivity/registeredActivity.vue @@ -38,6 +38,7 @@ + diff --git a/other/vouchers/vouchers.vue b/other/vouchers/vouchers.vue index 3e40551..920b0af 100644 --- a/other/vouchers/vouchers.vue +++ b/other/vouchers/vouchers.vue @@ -2,11 +2,11 @@ - + {{ item.competitionName }} @@ -15,6 +15,7 @@ {{ item.status === 1 ? '电子入场券' : '使用' }} + @@ -151,8 +152,8 @@ this.info = result }, // tab切换 - tabChange(tab) { - this.curTab = tab.id + tabChange(id) { + this.curTab = id this.initList() }, // 展示电子券 diff --git a/pages/index/index.vue b/pages/index/index.vue index 28a6104..80e1186 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -3,6 +3,7 @@ + @@ -10,7 +11,7 @@ - + @@ -26,7 +27,7 @@ - + @@ -134,7 +135,6 @@ }, onShow() { // #ifdef MP-WEIXIN - console.log(33, uni.getMenuButtonBoundingClientRect()) this.menuBtnInfo = uni.getMenuButtonBoundingClientRect() // .top + 8 + 'px' // #endif @@ -255,9 +255,9 @@ this.curHot = e.detail.current; }, // 跳转链接 - toLink(item) { - // details 1: 详情,2:链接 - if (item.details === '1') { + toLink(item, type) { + // details 1: 详情,2:链接 (爆款才有详情,banner只有链接) + if (item.details === '1' && !type) { this.$util.to('/other/hotDetail/hotDetail?id=' + item.id) } else { // link 1小程序内链接,2外连接 @@ -355,6 +355,10 @@ /deep/.search-wrap { padding-bottom: 30rpx; background-color: $uni-primary; + .logo { + width: 70rpx; + margin: 0 10rpx 0 10rpx; + } .uni-searchbar { padding: 0 10rpx !important; } diff --git a/pages/login/login.vue b/pages/login/login.vue index 72f13c7..9c441df 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -1,7 +1,7 @@