提交

pages/index/index.vue

@@ -3,11 +3,11 @@
 		<!-- 头部banner -->
 		<view class="top-box">
 			<!-- 搜索 -->
-			<view class="search-box">
+			<!-- <view class="search-box">
 				<image src="https://static.ticket.sz-trip.com/cgc/images/index/search.png" mode=""></image>
 				<span>|</span>
 				搜一搜您想要的
-			</view>
+			</view> -->
 			
 			<swiper class="top-banner" :circular="true" :interval="6000"
 				:duration="800" :indicator-dots="false" :autoplay="true" v-if="topBanner">
@@ -68,7 +68,7 @@
 						<image src="https://static.ticket.sz-trip.com/cgc/images/index/plays.png" mode="widthFix" class="play-img" v-if="hotIndex" lazy-load="true"></image>
 					</view>
 					<view class="hot-content">
-						<view class="title text-overflowRows">{{item.title || item.name}}</view>
+						<view class="title text-overflowRows">{{item.title || item.goods.title}}</view>
 						<view class="subtitle" v-if="hotIndex">
 							<image src="https://static.ticket.sz-trip.com/tongli/images/index/user.png" mode="aspectFill"></image>
 							{{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
+						limit: this.limit,
-					},'/api/Article/getArticleByType').then(res => {
+					},'/api/tag/getGoodsByTagId').then(res => {
-						if(res) {
+						if(res.data.length < this.limit) this.isLoading = true
-							if(res.data.length < this.limit) this.isLoading = true
+						this.hotList = this.hotList.concat(res.data)
-							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
+					})
 				}
 			}
 		}

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,

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'