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

src/App.vue

@@ -1,4 +1,5 @@
 <script lang="ts">
+import { userApi } from "./sheep/api"
 import isDevEnv from "./sheep/utils/isDevEnv"
 import { getAppInfo } from "@@/utils/getAppInfo"
 
@@ -41,6 +42,14 @@ const tabbar: TabbarItem[] = [
 		launchParam: ["selfMerchant"],
 		auth: ["user"],
 	},
+	// {
+	// 	pagePath: "pages/tabbar/cabinet",
+	// 	text: "智能柜",
+	// 	iconPath: "/static/tabbar/cabinet.png",
+	// 	selectedIconPath: "/static/tabbar/cabinet-select.png",
+	// 	launchParam: ["selfMerchant"],
+	// 	auth: ["user"],
+	// },
 	{
 		pagePath: "pages/tabbar/order",
 		text: "订单",

src/pages.json

@@ -30,6 +30,13 @@
 				"disableScroll": true
 			}
 		},
+		{
+			"path": "pages/tabbar/cabinet",
+			"style": {
+				"navigationBarTitleText": "智能柜",
+				"disableScroll": true
+			}
+		},
 		{
 			"path": "pages/tabbar/order",
 			"style": {
@@ -329,13 +336,6 @@
 						"disableScroll": true
 					}
 				},
-				{
-					"path": "cabinetList",
-					"style": {
-						"navigationBarTitleText": "智能柜列表",
-						"disableScroll": true
-					}
-				},
 				{
 					"path": "cabinetDetail",
 					"style": {
@@ -398,6 +398,12 @@
 				"iconPath": "",
 				"selectedIconPath": ""
 			},
+			{
+				"pagePath": "pages/tabbar/cabinet",
+				"text": "",
+				"iconPath": "",
+				"selectedIconPath": ""
+			},
 			{
 				"pagePath": "pages/tabbar/order",
 				"text": "",
@@ -441,6 +447,12 @@
 			// 	selectedIconPath: "static/tabbar/coopMerchant-select.png",
 			// },
 			// {
+			// 	pagePath: "pages/tabbar/cabinet",
+			// 	text: "智能柜",
+			// 	iconPath: "static/tabbar/coopMerchant.png",
+			// 	selectedIconPath: "static/tabbar/coopMerchant-select.png",
+			// },
+			// {
 			// 	"pagePath": "pages/tabbar/order",
 			// 	"text": "订单",
 			// 	"iconPath": "static/tabbar/order.png",

src/pages/cabinet/putaway.vue

@@ -1,7 +1,15 @@
 <template>
 	<crud-layout mainIsScroll bg="/static/page/blue-bg.png">
-		<tm-sticky>
+		<z-paging
-			<tm-sticky-header>
+			:fixed="false"
+			height="100%"
+			safe-area-inset-bottom
+			:loading-more-enabled="true"
+			:show-scrollbar="false"
+			:auto-clean-list-when-reload="false"
+			:auto-scroll-to-top-when-reload="false"
+		>
+			<template #top>
 				<view class="h-5rpx" />
 				<view class="bg-white rounded-20rpx my-20rpx font-bold">
 					<z-tabs
@@ -24,7 +32,7 @@
 						@change="doorTabsChange"
 					/>
 				</view>
-			</tm-sticky-header>
+			</template>
 
 			<view class="w-full w-full">
 				<view v-for="(item, index) in state.cabinetList" :key="index">
@@ -49,9 +57,7 @@
 					</view>
 				</view>
 			</view>
-
+		</z-paging>
-			<view class="h-30rpx" />
-		</tm-sticky>
 
 		<tm-drawer
 			title=""

src/pages/tabbar/cabinet.vue

@@ -40,6 +40,12 @@
 import { ref } from "vue"
 import { hooks, router } from "@/sheep"
 import { doorApi } from "@/sheep/api"
+import { onLoad } from "@dcloudio/uni-app"
+
+onLoad(() => {
+	const app = getApp()
+	app._initTabbar()
+})
 
 const pageRef = ref<any>(null)
 

src/pages/tabbar/my.vue

@@ -76,7 +76,6 @@ const state = reactive<{
 		// { text: "外来人员就餐", icon: "/static/icon/service_1.png", router: "/pages/apply/foreign-list" },
 		// { text: "跨单位就餐", icon: "/static/icon/service_1.png", router: "/pages/apply/stride-list" },
 		{ text: "人脸管理", icon: "/static/icon/service_5.png", router: "/pages/human-face/list" },
-		{ text: "智能柜列表", icon: "/static/icon/service_5.png", router: "/pages/cabinet/cabinetList" },
 		// { text: "意见反馈", icon: "/static/icon/service_5.png", router: "/pages/integrated/feedback/index" },
 	],
 	appInfo: "",

src/sheep/api/door.ts

@@ -146,7 +146,7 @@ export default {
 		}),
 
 	/**
-	 * app商品类表
+	 * app商品列表
 	 * @param name
 	 * @param skuType
 	 */