Merge branch 'biz-mobile-react-cloud/master'

# Conflicts:
#	package.json
#	src/pages/merchant/components/product-row.vue
#	src/sheep/api/shop.ts
#	src/sheep/utils/request.ts

.env

@@ -26,8 +26,8 @@ VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地
 # VITE_APP_DEV_SERVICE =http://123.156.228.134:48080/app-api
 # VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/app-api
 VITE_APP_DEV_SERVICE = http://192.168.101.29:9999 # 邓-本地
-#VITE_APP_DEV_SERVICE = http://127.0.0.1:9999
-# VITE_APP_DEV_SERVICE = http://123.156.230.15:8089/api
+#VITE_APP_DEV_SERVICE = http://pjcloud.center.takin.cc # 张
+# VITE_APP_DEV_SERVICE = http://123.156.230.15:8089/api # 线上
 # VITE_APP_DEV_SERVICE = http://localhost:9999
 # ******************** end 开发环境 end ********************
 

src/pages/merchant/index.vue

@@ -1,33 +1,23 @@
 <script setup lang="ts">
-import { ref, reactive } from "vue";
-import { onLoad, onShow } from "@dcloudio/uni-app";
+import { ref, reactive } from "vue"
+import { onLoad, onShow } from "@dcloudio/uni-app"
 
 import { hooks } from "@@/index"
 import { foodApi } from "@@/api"
 
-const data = {
-
-}
+const data = {}
 const state = reactive<any>({
-    pa: {
-        status: 1,
-    },
-})
-
-onLoad(() => {
-
-});
-onShow(() => {
-
+	pa: {
+		status: 1,
+	},
 })
 
+onLoad(() => {})
+onShow(() => {})
 </script>
 
-
 <template>
-    <crud-layout title="订单详情" bg="/static/page/blue-bg.png">
-
-    </crud-layout>
+	<crud-layout title="订单详情" bg="/static/page/blue-bg.png"> </crud-layout>
 </template>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped></style>

src/pages/shop/components/product-car.vue

@@ -14,10 +14,12 @@
 			:key="v.id"
 			:productId="v.productId"
 			:merchantId="v.merchantId"
-			:picUrl="v.productPic"
+			:picUrl="filePath(v.productPic)"
 			:productName="v.productName"
 			:productCount="v.productCount"
 			:productPrice="v.productPrice"
+			:spec="v.spec"
+			:unit="v.unit"
 			@add="(v) => emit('add', v)"
 			@remove="(v) => emit('remove', v)"
 		/>
@@ -31,6 +33,7 @@
 </template>
 
 <script setup lang="ts">
+import { filePath } from "@/sheep/utils/file"
 import ProductRow from "./product-row.vue"
 import ProductTotal from "./product-total.vue"
 

src/pages/shop/components/product-row.vue

@@ -9,6 +9,7 @@
 		<image class="size-140rpx rounded-12rpx" :src="props.picUrl" mode="aspectFill" />
 		<view class="flex-1 m-l-20rpx">
 			<view class="sub-text-28 show-line">{{ props.productName }}</view>
+			<view class="sub-text-24 show-line">规格：{{ "" + props.spec + props.unit }}</view>
 			<view class="m-t-10rpx flex-row items-center">
 				<!-- <view class="second-text-32 color-red!"> ¥{{ hooks.useMoney(props.price) }} </view> -->
 				<!-- <view class="m-l-20rpx second-text-24 line-through"> ¥{{ hooks.useMoney(props.marketPrice) }} </view> -->
@@ -61,6 +62,8 @@ export type Props = {
 	productPrice?: number
 	salesCount?: number
 	stock?: number
+	spec?: string
+	unit?: string
 	onClickAddToCar?: () => void
 }
 const props = withDefaults(defineProps<Props>(), {
@@ -73,6 +76,8 @@ const props = withDefaults(defineProps<Props>(), {
 	productPrice: 0,
 	salesCount: 0,
 	stock: 0,
+	spec: "",
+	unit: "",
 })
 
 const handleClickAddToCar = () => {

src/pages/shop/detail.vue

@@ -3,8 +3,8 @@
 		<tm-sticky>
 			<!-- start 轮播 start -->
 			<z-swiper>
-				<z-swiper-item v-for="(v, i) in state.detail.picUrl?.split(',')" :key="i">
-					<image class="w-100vw h-400rpx" :src="filePath(state.detail?.swiperPic)" mode="aspectFill" />
+				<z-swiper-item v-for="(v, i) in state.detail.swiperPic?.split(',')" :key="i">
+					<image class="w-100vw h-400rpx" :src="filePath(v)" mode="aspectFill" />
 				</z-swiper-item>
 			</z-swiper>
 			<!-- end 轮播 end -->
@@ -185,6 +185,8 @@ const getPorduct = async () => {
 		// productName: target.name,
 		merchantId: state.merchantId,
 		categoryId: target.id,
+		current: 1,
+		size: 9999,
 	})
 	state.goodsList = data.records
 	// state.goodsList.forEach((i) => {

src/sheep/utils/request.ts

@@ -120,6 +120,12 @@ http.interceptors.response.use(
 				icon: "none",
 			})
 		}
+		if (response.data.code === 1) {
+			const tokenKey = constant.storageConstant.TOKEN
+			uni.removeStorageSync(tokenKey)
+			uni.showToast({ title: "登录已过期，请重新登录", icon: "none" })
+			router.jump("/pages/test/login")
+		}
 		const tokenKey = constant.storageConstant.TOKEN
 		const tokenStorage = uni.getStorageSync(tokenKey)
 		if (!isEmpty(tokenStorage) && response.config.url != "/sys/auth/refresh-token") {