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

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") {