From 2b2afbb814aedef323b45ea0fc081e638043a939 Mon Sep 17 00:00:00 2001
From: chen <2659004835@qq.com>
Date: Fri, 5 Aug 2022 11:05:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E5=8F=96=E8=AF=BE=E7=A8=8B=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=88=86=E7=B1=BB=E6=8E=A5=E5=8F=A3=E3=80=81=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E3=80=81=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/list.vue                |  4 +-
 jsFile/requst.js                   |  2 +-
 pages/tabbar/course/course.vue     | 80 ++++++++++++++++++++++++------
 pages/tabbar/shop/shop.vue         | 23 +++++++--
 pagesB/shop-detail/shop-detail.vue | 25 ++++++++--
 5 files changed, 107 insertions(+), 27 deletions(-)

diff --git a/components/list.vue b/components/list.vue
index 0a19fae..5ba9eec 100644
--- a/components/list.vue
+++ b/components/list.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="disjbac fw">
-		<view @tap="goDetail(item.id)" class="radius8 bacf pad12 boxshow1 width48_6 mar-s20 flexs" v-for="(item,index) in list" :key="index">
-			<image :src="item.cover" style="height: 226rpx;" mode="aspectFill" class="width100" lazy-load></image>
+		<view @tap="goDetail(item.id)" class="radius8 bacf pad12 boxshow1 width48_6 mar-s20 flexs " v-for="(item,index) in list" :key="index">
+			<image :src="item.cover" style="height: 226rpx;" mode="aspectFill" class="width100 animated fadeIn" lazy-load></image>
 			<view class="fon24 pad-zy8 disjb fc" style="color: #262626;">
 				<view class="clips2 mar-sx10" style="height: 64rpx;">{{item.name}}</view>
 				<view class="disjbac ae pad-x10">
diff --git a/jsFile/requst.js b/jsFile/requst.js
index d1cef74..1f4a8eb 100644
--- a/jsFile/requst.js
+++ b/jsFile/requst.js
@@ -12,7 +12,7 @@ const refreshTokenPage = () => {
 		provider: 'weixin',
 		success: (result)=> {
 			uni.request({
-				url: `${getApp().globalData.hostapi}user/login`,
+				url: `${getApp().globalData.hostapi}/api/user/login`,
 				method: 'post',
 				data: {code:result.code},
 				success: res => {
diff --git a/pages/tabbar/course/course.vue b/pages/tabbar/course/course.vue
index 7da44b0..479bd48 100644
--- a/pages/tabbar/course/course.vue
+++ b/pages/tabbar/course/course.vue
@@ -5,19 +5,19 @@
 				<view class="posi-sticky" :style="{top:newtop+'px'}">
 					<view class="pad-sx26 pad-zy20" style="border-bottom: 2rpx solid #fcede8;">
 						<view class="radius40 pad-sx2 disjbac pad-zy20" style="background-color: #fff6f5;border: 2rpx solid #ece6e6;">
-							<input type="text" class="fon24 width100 pad-sx6" placeholder="关键字搜索" placeholder-style="color:#aaa4a3">
-							<image class="flexs" src="/static/tabbar/icon-search.png" mode="" style="width: 28rpx;height: 28rpx;" lazy-load></image>
+							<input v-model="keyword" @confirm="getCourseList" type="text" class="fon24 width100 pad-sx6" placeholder="关键字搜索" placeholder-style="color:#aaa4a3">
+							<view class="disjcac pad-sx6 pad-zy10" @tap="getCourseList">
+								<image class="flexs" src="/static/tabbar/icon-search.png" mode="" style="width: 28rpx;height: 28rpx;" lazy-load></image>
+							</view>
 						</view>
 					</view>
 					<swiper-tab id="tab" :list="dataList" v-model="current" @changeEv="clickTab" :itemColor="'#e42417'" :lineColor="'#e42417'"></swiper-tab>
 				</view>
 				<view class="pad-zy20">
-					<list @goDetail="goDetail"></list>
-					<list @goDetail="goDetail"></list>
-					<list @goDetail="goDetail"></list>
-					<list @goDetail="goDetail"></list>
-					<list @goDetail="goDetail"></list>
-					<pitera textStr="上滑加载更多/到底了~~" textColor="#b0aaa9" paddingStr="40rpx 0 20rpx 0"></pitera>
+					<list ref="refcourse" @goDetail="goDetail"></list>
+					<view class="" v-if="noMore">
+						<pitera textStr="上滑加载更多/到底了~~" textColor="#b0aaa9" paddingStr="40rpx 0 20rpx 0"></pitera>
+					</view>
 				</view>
 			</view>
 		</status-container>
@@ -39,21 +39,71 @@
 				newtop:uni.getSystemInfoSync().statusBarHeight + 42,
 				// newtop:uni.getSystemInfoSync().statusBarHeight + (140 / 750 * uni.getSystemInfoSync().windowWidth),
 				current:0,
-				dataList:[
-					{title:'课堂讲解'},
-					{title:'武德教育'},
-					{title:'爱国主义教育'},
-					{title:'示范动作讲解'},
-				],
+				dataList:[],//分类列表
+				classId:'',//分类id
+				keyword:'',//关键字
+				page:1,
+				size:10,
+				total:0,
+				noMore:false,//是否没有更多
 			}
 		},
 		onLoad() {
-			
+			// 调用获取分类列表
+			this.getCourseCate();
+		},
+		onReachBottom() {
+			if(this.total!=this.$refs.refcourse.list.length){
+				this.page++;
+				// 调用获取商品产品列表
+				this.getCourseList();
+			}
 		},
 		methods: {
 			// tab点击事件
 			clickTab(index){
 				this.current = index;
+				this.page = 1;
+				this.noMore = false;
+				// 设置分类id
+				this.classId = this.dataList[index].id;
+				// 调用获取商品产品列表
+				this.getCourseList();
+			},
+			// 获取分类列表
+			getCourseCate(){
+				this.$requst.get('/api/spu/category',{type:'course'}).then(res=>{
+					// 设置分类列表
+					this.dataList = res.data;
+					// 如果分类列表不为空
+					if(this.dataList.length){
+						// 设置分类id
+						this.classId = this.dataList[0].id;
+						// 调用获取商品产品列表
+						this.getCourseList();
+					}
+				})
+			},
+			// 获取商品产品列表
+			getCourseList(){
+				let params = {
+					category_id:this.classId,
+					page:this.page,
+					size:this.size,
+					keyword:this.keyword
+				}
+				this.$requst.post('/api/spu/course',params).then(res=>{
+					if(res.code==0){
+						// 设置总数
+						this.total = res.data.total;
+						if(this.page==1){this.$refs.refcourse.list=[];}
+						// 设置产品列表
+						this.$refs.refcourse.list = [...this.$refs.refcourse.list,...res.data.list];
+						if(this.total==this.$refs.refcourse.list.length && this.page!=1){
+							this.noMore = true;
+						}
+					}
+				})
 			},
 			// 去课程详情
 			goDetail(id){
diff --git a/pages/tabbar/shop/shop.vue b/pages/tabbar/shop/shop.vue
index 8506386..12ac7de 100644
--- a/pages/tabbar/shop/shop.vue
+++ b/pages/tabbar/shop/shop.vue
@@ -7,7 +7,9 @@
 				</view>
 				<view class="pad-zy20">
 					<list ref="refproduct" @goDetail="goDetail"></list>
-					<pitera textStr="上滑加载更多/到底了~~" textColor="#b0aaa9" paddingStr="40rpx 0 20rpx 0"></pitera>
+					<view class="" v-if="noMore">
+						<pitera textStr="上滑加载更多/到底了~~" textColor="#b0aaa9" paddingStr="40rpx 0 20rpx 0"></pitera>
+					</view>
 				</view>
 			</view>
 		</status-container>
@@ -36,26 +38,36 @@
 				dataList:[],//分类列表
 				classId:'',//分类id
 				page:1,
-				size:20,
+				size:10,
 				total:0,
+				noMore:false,//是否没有更多
 			}
 		},
 		onLoad() {
 			// 调用获取分类列表
 			this.getHomeCate();
 		},
+		onReachBottom() {
+			if(this.total!=this.$refs.refproduct.list.length){
+				this.page++;
+				// 调用获取商品产品列表
+				this.getProductList();
+			}
+		},
 		methods: {
 			// tab点击事件
 			clickTab(index){
 				this.current = index;
+				this.page = 1;
+				this.noMore = false;
 				// 设置分类id
 				this.classId = this.dataList[index].id;
 				// 调用获取商品产品列表
 				this.getProductList();
 			},
-			// 获取首页分类
+			// 获取分类列表
 			getHomeCate(){
-				this.$requst.get('/api/spu/category').then(res=>{
+				this.$requst.get('/api/spu/category',{type:'normal',need_all:1}).then(res=>{
 					// 设置分类列表
 					this.dataList = res.data;
 					// 如果分类列表不为空
@@ -81,6 +93,9 @@
 						if(this.page==1){this.$refs.refproduct.list=[];}
 						// 设置产品列表
 						this.$refs.refproduct.list = [...this.$refs.refproduct.list,...res.data.list];
+						if(this.total==this.$refs.refproduct.list.length && this.page!=1){
+							this.noMore = true;
+						}
 					}
 				})
 			},
diff --git a/pagesB/shop-detail/shop-detail.vue b/pagesB/shop-detail/shop-detail.vue
index f4a81bb..acd96ba 100644
--- a/pagesB/shop-detail/shop-detail.vue
+++ b/pagesB/shop-detail/shop-detail.vue
@@ -5,10 +5,10 @@
 				<view class="bacf boxshowb">
 					<swiper-pu newBottom="20rpx" newHeight="520rpx"></swiper-pu>
 					<view class="pad-zy30 pad-sx24">
-						<view class="fon26 col26">武，止戈为武；术，思通造化、随通而 行为术基础动作教学</view>
+						<view class="fon26 col26">{{shopInfo.name}}</view>
 						<view class="col-e42417 dis ae fon24 mar-s20">
-							<view class="bold">￥199.00</view>
-							<view class="tline-through fon20 col-969696 mar-z10">￥220.00</view>
+							<view class="bold">￥{{shopInfo.price}}</view>
+							<view class="tline-through fon20 col-969696 mar-z10">￥{{shopInfo.original_price}}</view>
 						</view>
 					</view>
 				</view>
@@ -47,6 +47,8 @@
 		data() {
 			return {
 				richText:'',
+				shopId:'',//产品id
+				shopInfo:'',//产品详情
 			}
 		},
 		onShow() {
@@ -57,10 +59,23 @@
 			// 关闭banner图自动轮播
 			this.$store.commit('setAutoplay',false);
 		},
-		onLoad() {
-			
+		onLoad(op) {
+			this.shopId = op.id;
+			// 调用产品详情
+			this.getDetail();
 		},
 		methods: {
+			// 获取产品详情
+			getDetail(){
+				this.$requst.post('/api/spu/detail',{id:this.shopId}).then(res=>{
+					if(res.code==0){
+						// 设置产品详情
+						this.shopInfo = res.data.detail;
+						// 富文本
+						this.richText = this.$toolAll.tools.escape2Html(this.shopInfo.content);
+					}
+				})
+			},
 			// 前往确认订单页
 			goConfirmOrder(){
 				uni.navigateTo({