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

components/dialog/tipSmallDialog.vue

@@ -7,8 +7,8 @@
 			<view class="tip-title">{{title}}</view>
 			<view class="tip-content">{{content}}</view>
 			<view class="tip-btn-box">
-				<ezyActiveVue class="ezy-btn-active not-confirm-btn" @aclick="handleClose">取消</ezyActiveVue>
-				<ezyActiveVue class="ezy-btn-active confirm-btn" @aclick="confirmBtn">确认</ezyActiveVue>
+				<ezyActiveVue class="ezy-btn-active not-confirm-btn" @aclick="handleClose">{{qxBtnName}}</ezyActiveVue>
+				<ezyActiveVue class="ezy-btn-active confirm-btn" @aclick="confirmBtn">{{qrBtnName}}</ezyActiveVue>
 			</view>
 		</view>
 	 </view>
@@ -28,6 +28,14 @@
 		require: true,
 	    default: ''
 	  },
+	  qxBtnName: {
+	    type: String,
+	    default: '取消'
+	  },
+	  qrBtnName: {
+	    type: String,
+	    default: '确认'
+	  },
 	});
 	const tipSmallPopup = ref(null); // 索引
 	const $emit = defineEmits(['confirm-btn'])

pages/chanpinneirong/chanpin1.vue

@@ -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;
 				}
 			},