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

src/pages/tabbar/canteen.vue

@@ -37,6 +37,7 @@ const toDetail = async (v: any) => {
 </script>
 
 <template>
+	1
 	<crud-layout bg="/static/page/blue-bg.png">
 		<z-paging
 			ref="pageRef"

src/pages/tabbar/individualOrder.vue

@@ -128,9 +128,9 @@
 							<view class="flex flex-col items-end justify-center m-t-5rpx">
 								<view class="second-text-22">{{ hooks.useEnum("hardwareRefundStatusEnum", state.curOrder.refundStatus) }}</view>
 								<view class="flex">
-									<view v-if="state.curOrder.carList?.length" class="m-t-4rpx m-r-10rpx second-text-26"
-										>共 {{ state.curOrder.carList.length }} 件</view
-									>
+									<view v-if="state.curOrder.carList?.length" class="m-t-4rpx m-r-10rpx second-text-26">
+										共 {{ state.curOrder.carList.length }} 件
+									</view>
 									<view class="main-text-30 color-red!">¥ {{ hooks.useMoney(state.curOrder.totalPrice) }}</view>
 								</view>
 							</view>

src/pages/tabbar/shop.vue

@@ -23,7 +23,7 @@ onLoad(() => {
 	app._initTabbar()
 })
 onShow(() => {
-	pageRef.value && pageRef.value.reload(false)
+	// pageRef.value && pageRef.value.reload(false)
 })
 
 const toDetail = async (v: any) => {
@@ -35,6 +35,7 @@ const toDetail = async (v: any) => {
 </script>
 
 <template>
+	1
 	<crud-layout bg="/static/page/blue-bg.png">
 		<z-paging
 			ref="pageRef"