From f826fc1e34477052669149fadf7d2298445fa9fc Mon Sep 17 00:00:00 2001
From: 15093570141 <141405260+17521612761@users.noreply.github.com>
Date: Mon, 14 Oct 2024 17:42:53 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91(uniapp?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6)=EF=BC=9Ascroll-view=20=20=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=8F=B0=E8=AD=A6=E5=91=8A=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coreshop-tabs/coreshop-tabs.vue           |  3 +-
 CoreCms.Net.Uni-App/CoreShop/config/env.js    |  2 +-
 .../core/utils/handle-advertise-detail.ts     |  6 +-
 .../classify-five/classify-five.vue           | 10 ++--
 .../classify-three/classify-three.vue         |  4 +-
 .../components/home-coupon/home-coupon.vue    |  2 +-
 .../components/home-pinTuan/home-pinTuan.vue  |  2 +-
 .../components/home-record/home-record.vue    | 55 +++++++++----------
 .../pages/subpackage/storeMap/storeMap.vue    |  2 +-
 9 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-tabs/coreshop-tabs.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-tabs/coreshop-tabs.vue
index dcfce18b..832525b7 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-tabs/coreshop-tabs.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-tabs/coreshop-tabs.vue
@@ -1,7 +1,8 @@
 <template>
 	<view class="core-tabs-box">
 		<slot name="left"> </slot>
-		<scroll-view :scroll-x="true" class="scroll-view" :scroll-left="state.scrollLeft" :scroll-with-animation="true">
+		<scroll-view :scroll-x="true" class="scroll-view" enable-flex :scroll-left="state.scrollLeft"
+			:scroll-with-animation="true">
 			<view v-for="item, index in props.list" :key="index"
 				:class="['tab-item-box', { 'on': index === state.current }]" @click="hanldeClickTab(item, index)">
 				{{ item[props.keyNname] }}
diff --git a/CoreCms.Net.Uni-App/CoreShop/config/env.js b/CoreCms.Net.Uni-App/CoreShop/config/env.js
index 68e6b857..34c157a9 100644
--- a/CoreCms.Net.Uni-App/CoreShop/config/env.js
+++ b/CoreCms.Net.Uni-App/CoreShop/config/env.js
@@ -1,6 +1,6 @@
 // 不同的环境变量配置
 const development = {
-	requestBaseUrl: 'https://api.test.pro.coreshop.cn',
+	requestBaseUrl: 'https://api.pro.demo.corecms.cn',
 	appid: '',
 }
 
diff --git a/CoreCms.Net.Uni-App/CoreShop/core/utils/handle-advertise-detail.ts b/CoreCms.Net.Uni-App/CoreShop/core/utils/handle-advertise-detail.ts
index 58f3485c..33404873 100644
--- a/CoreCms.Net.Uni-App/CoreShop/core/utils/handle-advertise-detail.ts
+++ b/CoreCms.Net.Uni-App/CoreShop/core/utils/handle-advertise-detail.ts
@@ -2,11 +2,11 @@ import { handleRouteNavigateTo, handleShowToast } from '@/core/utils';
 import { NavLinkEnum } from '@/core/enum';
 import { queryReceiveCoupon } from '@/core/api';
 
-export const handleAdvertiseDetail = (type : number, val : string) => {
+export const handleAdvertiseDetail = (type : number | string, val : string) => {
 	if (!val) {
 		return ''
 	}
-	if (type === NavLinkEnum.urlLink) {  /** url类型的链接 */
+	if (type == NavLinkEnum.urlLink) {  /** url类型的链接 */
 		if (val.includes('http')) {
 			// #ifdef APP-PLUS || APP-PLUS-NVUE || MP
 			handleRouteNavigateTo(`/pages/subpackage/webview/webview?src=${val}`);
@@ -38,7 +38,7 @@ export const handleAdvertiseDetail = (type : number, val : string) => {
 	} else if (type == NavLinkEnum.intelligentForms) {  /** 自定义表单类型的链接 */
 		handleRouteNavigateTo(`/pages/subpackage/form/detail/detail?id=${val}`);
 	} else if (type == NavLinkEnum.shopCategory) {  /** 商品分类类型的链接 */
-		handleRouteNavigateTo(`/pages/subpackage/category/list/list?id=${val}`);
+		handleRouteNavigateTo(`/pages/subpackage/category/category?id=${val}`);
 	} else if (type == NavLinkEnum.wxMiNiProgram) {  /** 小程序类型的链接 */
 		uni.navigateToMiniProgram({
 			appId: val,
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.vue b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.vue
index 10ef68ec..fdf2a36e 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.vue
@@ -3,7 +3,7 @@
 		<!-- 头部大分类 -->
 		<view class="big-classify">
 			<view class="scroll-view-box">
-				<scroll-view class="scroll-view" :scroll-x="true" :scroll-left="state.topScrollLeft"
+				<scroll-view class="scroll-view" enable-flex :scroll-x="true" :scroll-left="state.topScrollLeft"
 					:scroll-with-animation="true">
 					<view :class="['item', { 'on': state.topTabId === item.id }]"
 						v-for="item, index in state.classifyData" :key="index" @click="hanldeChangeTopTab(item, index)">
@@ -24,7 +24,7 @@
 
 		<view class="classify-box" :style="{ height: `${props.height - state.bigClassifyH}px` }">
 			<view class="classify-left">
-				<scroll-view class="scroll-view" :scroll-y="true">
+				<scroll-view class="scroll-view" enable-flex :scroll-y="true">
 					<view :class="['item', { 'on': state.leftTabId === item.id }]"
 						v-for="item, index in state.leftTabList" :key="index" @click="hanldeChangeLeftTab(item)">
 						{{ item.name }}
@@ -39,7 +39,7 @@
 							@hanldeClickTab="hanldeChangeRightTab"></coreshop-tabs>
 					</view>
 				</view>
-				<scroll-view class="scroll-view"
+				<scroll-view class="scroll-view" enable-flex
 					:style="{ 'height': `${props.height - state.bigClassifyH - state.rightTabH}px` }" :scroll-y="true"
 					@scrolltolower="handleScrolltolower">
 					<view class="advert-box radius-15 m-b-20">
@@ -180,9 +180,9 @@
 		showSku: false,
 		goodsDetailData: {},
 	});
-	
+
 	const emits = defineEmits(['handleShowLoginPopup']);
-	
+
 	watch(() => props.data, (newVal : Array<CategoriesType>) => {
 		if (newVal) {
 			state.classifyData = newVal.map((item : CategoriesType) => {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-three/classify-three.vue b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-three/classify-three.vue
index 0d7f738d..23e38f25 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-three/classify-three.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-three/classify-three.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="classify-box" :style="{height: `${height}px`}">
 		<view class="classify-left">
-			<scroll-view class="scroll-view" :scroll-y="true">
+			<scroll-view class="scroll-view" enable-flex :scroll-y="true">
 				<view :class="['item', { 'on': state.leftTabId === item.id }]" v-for="item, index in props.data"
 					:key="index" @click="hanldeChangeLeftTab(item)">
 					{{ item.name }}
@@ -9,7 +9,7 @@
 			</scroll-view>
 		</view>
 		<view class="classify-right">
-			<scroll-view class="scroll-view" :scroll-y="true">
+			<scroll-view class="scroll-view" enable-flex :scroll-y="true">
 				<view class="advert-box radius-15">
 					<coreshop-advert :code="advertPosition.goodsClassifyBanner"></coreshop-advert>
 				</view>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-coupon/home-coupon.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-coupon/home-coupon.vue
index 53a521a1..a8c9f0b1 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-coupon/home-coupon.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-coupon/home-coupon.vue
@@ -6,7 +6,7 @@
 				<coreshop-view-more @hanldeClickViewMore="hanldeClickViewMore"></coreshop-view-more>
 			</view>
 			<view class="coupon-card-box">
-				<scroll-view :scroll-x="true" class="scroll-box">
+				<scroll-view :scroll-x="true" enable-flex class="scroll-box">
 					<view class="card-box" v-for="item, index in props.data?.list?.slice(0, props.data.limit)"
 						:key="index">
 						<image class="coupon-bg" :src="handleStaticResources('/static/images/coupon-bg.jpg')"></image>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-pinTuan/home-pinTuan.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-pinTuan/home-pinTuan.vue
index 7190371a..0f96603f 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-pinTuan/home-pinTuan.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-pinTuan/home-pinTuan.vue
@@ -7,7 +7,7 @@
 				<coreshop-view-more @hanldeClickViewMore="hanldeClickViewMore" color="#fff"
 					:icon="handleStaticResources('/static/images/icon/icon-rigth-fff.png')" />
 			</view>
-			<scroll-view :scroll-x="true" class="m-t-25 pintuan-box">
+			<scroll-view :scroll-x="true" enable-flex class="m-t-25 pintuan-box">
 				<view v-for="item, index in props.data.list" :key="index" class="card-box">
 					<coreshop-goods-card imgWidth="290rpx" imgHeight="290rpx" type="vertical"
 						:goodsData="hanldeCombinationGoodsData(item)" @hanldeClickGoods="hanldeClickGoods">
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-record/home-record.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-record/home-record.vue
index 81c9f1ec..102b5aa8 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-record/home-record.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-record/home-record.vue
@@ -1,17 +1,17 @@
 <template>
-	<view class="record-box" v-if="state.recordObj" :style="{
-        [props.data.style.align]: 0,
-        top: `${props.data.style.top}%`
+	<view class="record-box" v-if="Object.keys(state.recordObj).length > 0" :style="{
+        [props.data?.style?.align || 'left']: 0,
+        top: `${props.data?.style?.top || 20}%`
     }">
-		<image class="img" :src="state.recordObj.avatar"></image>
-		<text class="tit">{{state.recordObj.nickname}}，{{state.recordObj.createTime}}{{state.recordObj.desc}}</text>
+		<image class="img" :src="state.recordObj?.avatar"></image>
+		<text class="tit">{{state.recordObj?.nickname}}，{{state.recordObj?.createTime}}{{state.recordObj?.desc}}</text>
 	</view>
 </template>
 <script setup lang="ts">
-	import { onMounted, reactive } from 'vue';
+	import { reactive ,onMounted } from 'vue';
 	import { queryRecord } from '@/core/api';
 	import type { Response, RecordType } from '@/core/models'
-	import { onHide, onShow } from '@dcloudio/uni-app';
+	import { onHide } from '@dcloudio/uni-app';
 
 	const props = withDefaults(defineProps<{
 		data : any,
@@ -25,34 +25,33 @@
 	}>({
 		recordObj: {},
 		times: "",
+	}) 
+	
+	onMounted(() => {
+		query();
 	})
-
-	// 获取日志
-	const getRecord = async () => {
-		const record : Response<RecordType> = await queryRecord({
-			type: 'home',
-			value: 0,
-		})
-		state.recordObj = record.data;
-	}
+	
+	onHide(() => {
+		clearInterval(state.times);
+	})
+	
 	const query = () => {
 		getRecord();
 		state.times = setInterval(() => {
 			getRecord();
 		}, 3000)
 	}
-
-	onMounted(() => {
-		query();
-	})
-
-	onShow(() => {
-		query();
-	})
-
-	onHide(() => {
-		clearInterval(state.times);
-	})
+	
+	// 获取日志
+	const getRecord = async () => {
+		const record : Response<RecordType> = await queryRecord({
+			type: 'home',
+			value: 0,
+		});
+		if(record.status){
+			state.recordObj = record?.data;
+		};
+	}
 </script>
 <style lang="scss" scoped>
 	@import './home-record.scss';
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/storeMap/storeMap.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/storeMap/storeMap.vue
index 281d6ee7..41dd7b09 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/storeMap/storeMap.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/storeMap/storeMap.vue
@@ -8,7 +8,7 @@
 				</map>
 			</view>
 			<view class="store-box">
-				<scroll-view class="store-list" scroll-y>
+				<scroll-view class="store-list" enable-flex scroll-y>
 					<view class="item-box" v-for="item in state.storeList" :key="item.id">
 						<view class="img-box">
 							<image class="img" :src="item.logoImage"></image>