|
|
@@ -230,6 +230,7 @@ const params = ref({
|
|
|
page: 1,
|
|
|
limit: 10,
|
|
|
});
|
|
|
+const isFirstLoad = ref(true);
|
|
|
|
|
|
const navBgColor = ref('rgba(255,255,255,0)');
|
|
|
|
|
|
@@ -272,24 +273,38 @@ onLoad(async (options) => {
|
|
|
} else {
|
|
|
merchantId.value = '';
|
|
|
}
|
|
|
+ console.log('onLoad',isFirstLoad.value)
|
|
|
+ if(isFirstLoad.value){
|
|
|
+ await initPageData();
|
|
|
+ isFirstLoad.value = false;
|
|
|
+ }
|
|
|
|
|
|
- await initPageData();
|
|
|
});
|
|
|
onShow(async () => {
|
|
|
+ console.log('onShow',isFirstLoad.value)
|
|
|
const isLogin = appStore.isLogin;
|
|
|
if(isLogin){
|
|
|
rightsStore.getUserBenefits(appStore.userInfo?.userId);
|
|
|
getUserBenefits();
|
|
|
}
|
|
|
- goodScroll.value = true;
|
|
|
- await initPageData();
|
|
|
+
|
|
|
+
|
|
|
uni.setNavigationBarTitle({ title: site_name.value });
|
|
|
+ if(!isFirstLoad.value){
|
|
|
+ await initPageData();
|
|
|
+ }
|
|
|
|
|
|
});
|
|
|
const initPageData = async () => {
|
|
|
try {
|
|
|
loading.value = true;
|
|
|
-
|
|
|
+ goodScroll.value = true;
|
|
|
+ goodsList.value = [];
|
|
|
+ goodType.value = 1;
|
|
|
+ params.value = {
|
|
|
+ page: 1,
|
|
|
+ limit: 10,
|
|
|
+ };
|
|
|
// 并行执行不依赖的数据获取
|
|
|
const promises = [];
|
|
|
|
|
|
@@ -462,9 +477,7 @@ const isNoDataState = computed(() => {
|
|
|
|
|
|
// Product Lists
|
|
|
const getGroomList = async () => {
|
|
|
- console.log('111111111111111')
|
|
|
if (!goodScroll.value) return;
|
|
|
- console.log('=====================++++++')
|
|
|
try {
|
|
|
loading.value = true;
|
|
|
merchantId.value!='' ? params.value.merchantId = merchantId.value:'';
|