Merge branch 'master' of https://gitea.zianxin.com/zax/biz-mobile-react-cloud

src/pages/tabbar/canteenAnalyse.vue

@@ -1,21 +1,13 @@
 <template>
 	<crud-layout title="喜好分析" bg="/static/page/blue-bg.png">
-		<z-paging
-			ref="pageRef"
-			height="100%"
-			:fixed="false"
-			safe-area-inset-bottom
-			:loading-more-enabled="true"
-			:show-scrollbar="false"
-			@query="query"
-			:auto-clean-list-when-reload="false"
-			:auto-scroll-to-top-when-reload="false"
-			hide-empty-view
-		>
+		<z-paging ref="pageRef" height="100%" :fixed="false" safe-area-inset-bottom :loading-more-enabled="true"
+			:show-scrollbar="false" @query="query" :auto-clean-list-when-reload="false"
+			:auto-scroll-to-top-when-reload="false" hide-empty-view>
 			<tm-sheet :margin="[0, 20]">
 				<view class="prefix_title mb-15rpx">菜品分类购买数量占比图</view>
 				<view class="w-full h-600rpx">
-					<qiun-data-charts type="pie" :opts="pieChartOpts" :chartData="pieChartData" tooltipFormat="canteenPieTooltip" />
+					<qiun-data-charts type="pie" :opts="pieChartOpts" :chartData="pieChartData"
+						tooltipFormat="canteenPieTooltip" />
 				</view>
 			</tm-sheet>
 
@@ -30,40 +22,37 @@
 			<tm-sheet :margin="[0, 20]">
 				<view class="prefix_title mb-15rpx">个人菜品喜好排行</view>
 				<view v-if="productLikeTopList.length > 0" class="rounded-16rpx bg-white overflow-hidden card">
-					<view class="bg-gradient-to-r from-blue-100 to-blue-100 px-20rpx py-16rpx flex items-center border-b border-gray-100">
+					<view
+						class="bg-gradient-to-r from-blue-100 to-blue-100 px-20rpx py-16rpx flex items-center border-b border-gray-100">
 						<view class="w-80rpx text-center text-24rpx font-bold text-gray-600">排名</view>
 						<view class="flex-1 px-16rpx text-24rpx font-bold text-gray-600">菜品名称</view>
 						<view class="w-120rpx text-center text-24rpx font-bold text-gray-600">分类</view>
 						<view class="w-160rpx text-center text-24rpx font-bold text-gray-600">购买数量</view>
 					</view>
 
-					<view
-						v-for="(item, index) in productLikeTopList"
-						:key="item.productId"
+					<view v-for="(item, index) in productLikeTopList" :key="item.productId"
 						class="flex items-center px-20rpx py-16rpx border-b border-gray-50 hover:bg-gray-50 transition-colors"
 						:class="{
 							'bg-gradient-to-r from-yellow-50 to-orange-50': index === 0,
 							'bg-gradient-to-r from-gray-50 to-gray-100': index === 1,
 							'bg-gradient-to-r from-orange-50 to-red-50': index === 2,
-						}"
-					>
+						}">
 						<view class="w-80rpx flex justify-center items-center">
-							<view
-								v-if="index < 3"
+							<view v-if="index < 3"
 								class="w-40rpx h-40rpx rounded-1 flex items-center justify-center text-20rpx font-bold text-white"
 								:class="{
 									'bg-gradient-to-r from-yellow-400 to-yellow-500': index === 0,
 									'bg-gradient-to-r from-gray-400 to-gray-500': index === 1,
 									'bg-gradient-to-r from-orange-400 to-orange-500': index === 2,
-								}"
-							>
+								}">
 								{{ index + 1 }}
 							</view>
 							<view v-else class="text-24rpx font-medium text-gray-500">{{ index + 1 }}</view>
 						</view>
 
 						<view class="flex-1 px-16rpx">
-							<view class="text-26rpx font-medium text-gray-800 truncate">{{ item.productName || "未知菜品" }}</view>
+							<view class="text-26rpx font-medium text-gray-800 truncate">{{ item.productName || "未知菜品" }}
+							</view>
 						</view>
 
 						<view class="w-120rpx text-center">
@@ -71,7 +60,9 @@
 						</view>
 
 						<view class="w-160rpx text-center">
-							<view class="px-12rpx py-6rpx bg-blue-100 text-blue-600 text-22rpx rounded-1 whitespace-nowrap">{{ item.payCount }}次</view>
+							<view
+								class="px-12rpx py-6rpx bg-blue-100 text-blue-600 text-22rpx rounded-1 whitespace-nowrap">
+								{{ item.payCount }}次</view>
 						</view>
 					</view>
 				</view>

src/sheep/api/total.ts

@@ -20,7 +20,7 @@ export default {
 			data,
 		}),
 	/**
-	 * 个人菜品喜好排行
+	 *
 	 */
 	productLikeTop: (data: any): any =>
 		request({