|
@@ -136,7 +136,7 @@
|
|
|
</text>
|
|
</text>
|
|
|
<!-- <view class="txt">券</view> -->
|
|
<!-- <view class="txt">券</view> -->
|
|
|
</view>
|
|
</view>
|
|
|
- <template v-if="item?.merchant?.id && (appStore.userInfo && !appStore.userInfo.merchant)">
|
|
|
|
|
|
|
+ <template v-if="item?.merchant?.id &&(!appStore.userInfo || (appStore.userInfo && !appStore.merchantId))">
|
|
|
<view class="merchantInfo" @click.stop="toMerchant(item.merchant.id)">
|
|
<view class="merchantInfo" @click.stop="toMerchant(item.merchant.id)">
|
|
|
<image class="merchantLogo" :src="item.merchant.merchantLogo" mode="scaleToFill"></image>
|
|
<image class="merchantLogo" :src="item.merchant.merchantLogo" mode="scaleToFill"></image>
|
|
|
<text class="merchantName">{{item.merchant.merchantName}}</text>
|
|
<text class="merchantName">{{item.merchant.merchantName}}</text>
|
|
@@ -194,6 +194,8 @@ import {
|
|
|
} from "@/api/store.js";
|
|
} from "@/api/store.js";
|
|
|
import { timeFormat } from "@/uni_modules/uview-plus";
|
|
import { timeFormat } from "@/uni_modules/uview-plus";
|
|
|
import UniIcons from "../../uni_modules/uni-icons/components/uni-icons/uni-icons.vue";
|
|
import UniIcons from "../../uni_modules/uni-icons/components/uni-icons/uni-icons.vue";
|
|
|
|
|
+import { getSceneInfo } from '@/utils/util.js';
|
|
|
|
|
+import { toLogin } from "@/libs/login.js";
|
|
|
// 获取实时金价
|
|
// 获取实时金价
|
|
|
// 实时价格处理
|
|
// 实时价格处理
|
|
|
const {
|
|
const {
|
|
@@ -255,7 +257,10 @@ const calculatedProducts = computed(() => {
|
|
|
};
|
|
};
|
|
|
});
|
|
});
|
|
|
});
|
|
});
|
|
|
|
|
+onLoad(async (options) => {
|
|
|
|
|
+ const params = await getSceneInfo(options,'index');
|
|
|
|
|
|
|
|
|
|
+});
|
|
|
onShow(() => {
|
|
onShow(() => {
|
|
|
const isLogin = appStore.isLogin;
|
|
const isLogin = appStore.isLogin;
|
|
|
if(isLogin){
|
|
if(isLogin){
|
|
@@ -264,19 +269,23 @@ onShow(() => {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
uni.setNavigationBarTitle({ title: site_name.value });
|
|
uni.setNavigationBarTitle({ title: site_name.value });
|
|
|
|
|
+
|
|
|
if(appStore.merchantId && appStore.merchantId!=''){
|
|
if(appStore.merchantId && appStore.merchantId!=''){
|
|
|
merchantId.value = appStore.merchantId;
|
|
merchantId.value = appStore.merchantId;
|
|
|
|
|
+ if(!isLogin){
|
|
|
|
|
+ toLogin();
|
|
|
|
|
+ }
|
|
|
}else if(appStore?.userInfo?.merchant && appStore?.userInfo?.merchant.id){
|
|
}else if(appStore?.userInfo?.merchant && appStore?.userInfo?.merchant.id){
|
|
|
merchantId.value = appStore.userInfo.merchant.id
|
|
merchantId.value = appStore.userInfo.merchant.id
|
|
|
}else{
|
|
}else{
|
|
|
merchantId.value = '';
|
|
merchantId.value = '';
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
if(merchantId.value && merchantId.value!=''){
|
|
if(merchantId.value && merchantId.value!=''){
|
|
|
|
|
+ console.log('++++++++++++++++')
|
|
|
getSbmerchantInfoFn();
|
|
getSbmerchantInfoFn();
|
|
|
getMerchantBannerListFn()
|
|
getMerchantBannerListFn()
|
|
|
}else{
|
|
}else{
|
|
|
|
|
+ console.log('+++++===============')
|
|
|
getIndexConfig();
|
|
getIndexConfig();
|
|
|
}
|
|
}
|
|
|
getGroomList();
|
|
getGroomList();
|