Merge remote-tracking branch 'origin/2025鹅状元数学' into 2025鹅状元数学

pages/chanpinMy/duihuanma.vue

@@ -70,30 +70,14 @@
 			if (res.data.icon) {
 				myInfoData.icon = res.data.icon;
 			} else {
-				getUserImg(res.data.growthType)
+				getUserImg()
 			}
 		})
 	}
 
 	// 获取用户头像
-	function getUserImg(data) {
-		switch (data) {
-			case 0:
-				myInfoData.icon = 'static/images/my/head-img0.png'
-				break;
-			case 1:
-				myInfoData.icon = 'static/images/my/head-img1.png'
-				break;
-			case 2:
-				myInfoData.icon = 'static/images/my/head-img2.png'
-				break;
-			case 3:
-				myInfoData.icon = 'static/images/my/head-img3.png'
-				break;
-			default:
-				myInfoData.icon = 'static/images/my/head-unlogin-img.png'
-				break;
-		}
+	function getUserImg() {
+    myInfoData.icon = 'static/images/my/head-img1.png'
 	}
 
 

pages/chanpinXuanze/index.vue

@@ -133,5 +133,6 @@
 
 	onLoad(() => {
 		uni.hideTabBar()
+    getShuxueList()
 	})
 </script>

pages/chanpinneirong/chanpin1.vue

@@ -53,7 +53,7 @@
 							<view>{{ jieItem.jieName }}</view>
 							<view>{{ jieItem.jieIntro }}</view>
 						</view>
-						<view v-if="jieItem.lock" class="xx-item-lock-btn">锁</view>
+						<view v-if="jieItem.lock" class="xx-item-lock-btn"></view>
 						<view v-else class="xx-item-btn"></view>
 					</ezyActiveVue>
 				</view>
@@ -110,7 +110,7 @@
 				chanpinId: '',
 				dengjiId: '',
 				curProcess: '',
-				existData: true,
+				existData: false,
 				isShow: false,
 
 				stickyHeight: 0, // 吸顶栏高度（px）
@@ -188,6 +188,8 @@
 					// this.$nextTick(() => {
 					// 	this.updateTitlePositions();
 					// });
+				}else{
+					 this.existData = false;
 				}
 			},