Merge branch '2025鹅状元数学' of https://gogs.mtavip.com/wangguoyu/uniProject into 2025鹅状元数学

pages/chanpinXuanze/components/shuxueList.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="sx-card-list" v-if="list.length">
     <template  v-for="{chanpin,value:item} in list">
-<!--      <cp1 v-if="chanpin == 'tujiemuti'" :item="item" :key="item.chanpinId"></cp1>-->
+     <cp1 v-if="chanpin == 'tujiemuti'" :item="item" :key="item.chanpinId"></cp1>
 <!--      <cp2 v-if="chanpin == 'tujiemuti333'" :item="item" :key="item.chanpinId"></cp2>-->
     </template>
 

pages/chanpinXuanze/components/yingyuList.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="sx-card-list" v-if="list.length">
     <template  v-for="{chanpin,value:item} in list" :item="item">
-<!--      <cp1 v-if="chanpin == 'xxx'" :item="item" :key="item.chanpinId" class="sx-card-box"></cp1>-->
+     <cardVue v-if="chanpin == 'xxx'" :item="item" :key="item.chanpinId" class="sx-card-box"></cardVue>
     </template>
 
 	</view>

pages/chanpinXuanze/components/yuwenList.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="sx-card-list" v-if="list.length">
     <template  v-for="{chanpin,value:item} in list" :item="item">
-      <cp1 v-if="chanpin == 'xxx'" :item="item" :key="item.chanpinId" class="sx-card-box"></cp1>
+      <cardVue v-if="chanpin == 'xxx'" :item="item" :key="item.chanpinId" class="sx-card-box"></cardVue>
     </template>
   </view>
   <view class="ezy-no-sj" v-else>

pages/chanpinneirong/index.vue

@@ -91,6 +91,16 @@
 			getBanbenInfo() {
 				banbenImpinfo({}).then(res => {
 					if (res.code == 0) {
+						console.log('res',res)
+						if (res.data.chanpinId == 0) {
+							toast('请先进行选课！')
+							uni.switchTab({
+								url: '/pages/chanpinXuanze/index'
+							})
+							return;
+						}
+						
+						
 						this.chanpinId = res.data.chanpinId
 						this.switchGetNeiRongInfo(res.data)
 					} else {