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

src/pages/tabbar/order.vue

@@ -57,7 +57,6 @@ const pageHook = hooks.usePage(
 )
 const query = (page: number, pagesize: number) => {
 	const isLogin = hooks.useStaticCheckLogin()
-	console.log(isLogin, "isLogin")
 
 	if (!isLogin) return
 	pageHook.startPage(page, pagesize, false, state.pa)
@@ -129,7 +128,7 @@ const doRefund = (v: any) => {
 					</view>
 				</view>
 				<view class="flex items-center ml-[120rpx]">
-					<scroll-view v-if="v.orderStatus == 5 && v.orderType == 2" scroll-x class="flex-row-center whitespace-nowrap">
+					<scroll-view v-if="['5', '20'].includes(v.orderStatus) && v.orderType == 2" scroll-x class="flex-row-center whitespace-nowrap">
 						<view class="flex-row items-center">
 							<view class="inline-flex! flex-col items-center m-r-20rpx" v-for="(pV, pI) in v.carList" :key="pI">
 								<image class="w-60rpx h-60rpx rounded-8rpx" :src="filePath(pV.productPic)" mode="aspectFill" />
@@ -137,7 +136,10 @@ const doRefund = (v: any) => {
 							</view>
 						</view>
 					</scroll-view>
-					<view v-if="v.carList?.length && v.orderStatus == 5 && v.orderType == 2" class="w-200rpx m-x-10rpx second-text-26">
+					<view
+						v-if="v.carList?.length && ['5', '20'].includes(v.orderStatus) && v.orderType == 2"
+						class="w-200rpx m-x-10rpx second-text-26"
+					>
 						共 {{ v.carList.length }} 件
 					</view>
 					<view v-if="['5', '10'].includes(v.orderStatus)" class="w-500rpx flex-row items-center justify-end">

src/sheep/api/merchant.ts

@@ -28,4 +28,16 @@ export default {
 				showLoading: false,
 			},
 		}),
+	/**
+	 * 店铺分类查询
+	 */
+	selectCatgory: (params: any) =>
+		request({
+			url: "/wallet/mch-catgory/app/select",
+			method: "GET",
+			params,
+			custom: {
+				showLoading: false,
+			},
+		}),
 }