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

common/styles/global/components.scss

@@ -317,6 +317,8 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 		width: 625rpx;height: 423rpx;padding: 42rpx 48rpx;
 		background-image: url("@/static/images/common/tip-middle-bj.png");
 	}
+	.tip-content{padding-bottom: 42rpx;}
+	.tip-btn-box{margin: 32rpx 0 0;}
 }
 .tip-big-dialog{
 	.tip-content-box{

common/styles/global/pages.scss

@@ -311,6 +311,7 @@
 .ezy-xbb-page{
 	width: 100%;height: 100vh;display: flex;flex-direction: column;
 	.xbb-list-box{
+		display: flex;flex-direction: column;
 		background-color: #fff;flex: 1;overflow-y: auto;padding-bottom: 32rpx;
 		.xbb-item-box{
 			width: 731rpx;height:273rpx;@include ezy-no-repeat-cover;
@@ -873,7 +874,7 @@
 		.dd-icon{background-image: url("@/static/images/my/dd-icon.png");}
 		.dhm-icon{background-image: url("@/static/images/my/dhm-icon.png");}
 		.dhm-icon{background-image: url("@/static/images/my/dhm-icon.png");}
-		.bdsjh-icon{background-image: url("@/static/images/my/dhm-icon.png");}
+		.bdsjh-icon{background-image: url("@/static/images/my/sjbd-icon.png");}
 	}
 	
 	.kefu-dialog{

components/dialog/tipMiddleDialog.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 tipMiddlePopup = ref(null); // 索引
 	const $emit = defineEmits(['confirm-btn'])

pages/chanpinMy/my.vue

@@ -47,7 +47,7 @@
 
 		<goLogin ref="loginRef" @success="handleSuccess"></goLogin>
 
-    <tipMiddleDialog ref="goLoRef" @confirm-btn="btntxt" :content="tishiTxt"></tipMiddleDialog>
+    <tipMiddleDialog ref="goLoRef" @confirm-btn="btntxt" :content="tishiTxt" qrBtnName="去登录"></tipMiddleDialog>
 
 		<!-- 底部 -->
 		<custom-tab-bar :show="true" :current-index="currentTabIndex" />

pages/chanpinMy/order.vue

@@ -5,7 +5,7 @@
 			<text class="nav-bar-title">订单</text>
 		</view>
 		<view class="ezy-page-body order-body">
-			<scroll-view scroll-y="true" refresher-enabled="true" @scrolltolower="onScrolltolower"
+			<scroll-view v-if="data.list >0" scroll-y="true" refresher-enabled="true" @scrolltolower="onScrolltolower" 
 				class="order-scroll-view" :refresher-triggered="data.loading" :refresher-threshold="50"
 				refresher-background="transparent" @refresherrefresh="onRefresh">
 				<view class="order-card-box" v-for="(item,index) in data.list" :key="index">
@@ -30,6 +30,10 @@
 				<uni-load-more :status="data.state" @click="getMore" :contentText="data.contentText">
 				</uni-load-more>
 			</scroll-view>
+			<view class="ezy-no-sj" v-else>
+				<icon></icon>
+				<text>暂无数据</text>
+			</view>
 			<tip-small-dialog ref="goBindDialogRef" @confirm-btn="goBindPhone" :content="tipContent"></tip-small-dialog>
 			<!-- <view @click="bangdingPhone">绑定手机号</view> -->
 		</view>