diff --git a/pages/index/index.vue b/pages/index/index.vue index c3711e8..c550c8a 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -3,11 +3,11 @@ - + @@ -68,7 +68,7 @@ - {{item.title || item.name}} + {{item.title || item.goods.title}} {{item.author}} @@ -237,7 +237,7 @@ item.src = this.showImg(item.image); break; default: - item.src = this.showImg(item.image); + item.src = this.showImg(item.goods.image); } if (index % 2 === columnIndex) { @@ -267,14 +267,12 @@ }) }else { this.Post({ - type_id: this.hotType[this.hotIndex].id, + tag_id: 51, offset: this.hotList.length, - limit: this.limit - },'/api/Article/getArticleByType').then(res => { - if(res) { - if(res.data.length < this.limit) this.isLoading = true - this.hotList = this.hotList.concat(res.data) - } + limit: this.limit, + },'/api/tag/getGoodsByTagId').then(res => { + if(res.data.length < this.limit) this.isLoading = true + this.hotList = this.hotList.concat(res.data) }) } }, @@ -288,7 +286,9 @@ // 视频 this.gotoVideo(item) }else { - + uni.navigateTo({ + url: '/subPackages/techan/detail?id=' + item.goods_id + }) } } } diff --git a/pages/login/login.vue b/pages/login/login.vue index 4201eb9..1de3eb8 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -98,14 +98,6 @@ export default { uni.getUserInfo({ withCredentials: true, success: (res) => { - this.Post({ - mobile: '18639595995', - captcha: '123456' - }, '/api/user/mobilelogin').then(res=>{ - this.$store.commit('changeUserInfo', res.data.userinfo); - this.navigateBasedOnPath(); - }) - return this.Post({ code: loginRes.code, userInfo: res.userInfo, diff --git a/subPackages/order/trades.vue b/subPackages/order/trades.vue index 6482771..99f850c 100644 --- a/subPackages/order/trades.vue +++ b/subPackages/order/trades.vue @@ -200,7 +200,7 @@ }, '/api/order/confirmPost' ).then(res => { - if (res.code == 1) { + if (res.code == 200) { list[index].order_child.map(item => { item.status = 'WAIT_COMMENT'; }); @@ -219,8 +219,6 @@ }, // 关闭订单 closeOrder(id, index) { - console.log(id); - console.log(index); let that = this; uni.showModal({ title: '提示', @@ -232,7 +230,7 @@ }, '/api/order/closeOrder' ).then(res => { - if (res.code == 1) { + if (res.code == 200) { uni.showToast({ title: '关闭成功', icon: 'success' @@ -259,7 +257,7 @@ }, '/api/order/delOrder' ).then(res => { - if (res.code == 1) { + if (res.code == 200) { uni.showToast({ title: '删除成功', icon: 'success' @@ -275,7 +273,6 @@ }, // 申请退款 refund(id, index) { - console.log(id); let that = this; uni.showModal({ title: '提示', @@ -287,7 +284,7 @@ }, '/api/order/applyRefund' ).then(res => { - if (res.code == 1) { + if (res.code == 200) { uni.showToast({ title: '申请成功', icon: 'success'