|
|
@@ -328,10 +328,11 @@
|
|
328
|
328
|
})
|
|
329
|
329
|
}
|
|
330
|
330
|
|
|
331
|
|
- function handleShowMerchant(merId : string) {
|
|
|
331
|
+ function handleShowMerchant(merId : string,merName:string) {
|
|
332
|
332
|
uni.navigateTo({
|
|
333
|
|
- url: `/subPages/pages/store/home/index?id=${merId}`
|
|
|
333
|
+ url: `/subPages/pages/quick-fuc/store?id=${merId}&title=${merName}`
|
|
334
|
334
|
})
|
|
|
335
|
+
|
|
335
|
336
|
}
|
|
336
|
337
|
|
|
337
|
338
|
function handleShowShopCart() {
|
|
|
@@ -622,7 +623,7 @@
|
|
622
|
623
|
function handleShowCustomer() {
|
|
623
|
624
|
return uni.openCustomerServiceChat({
|
|
624
|
625
|
extInfo: {
|
|
625
|
|
- url: 'https://work.weixin.qq.com/kfid/kfc8bd3f11a28aa81db'
|
|
|
626
|
+ url: 'https://work.weixin.qq.com/kfid/kfcb5641d3744471601'
|
|
626
|
627
|
},
|
|
627
|
628
|
corpId: 'wwaeb55681929a37ae',
|
|
628
|
629
|
success: (res => {
|
|
|
@@ -884,7 +885,7 @@
|
|
884
|
885
|
</FCell>
|
|
885
|
886
|
|
|
886
|
887
|
<!-- 店铺信息 -->
|
|
887
|
|
- <div @tap="handleShowMerchant(detail.mer_id)" class="flex gap-3 p-3 bg-white">
|
|
|
888
|
+ <div @tap="handleShowMerchant(detail.mer_id,detail.merchant.mer_name )" class="flex gap-3 p-3 bg-white">
|
|
888
|
889
|
<div v-if="detail && detail.merchant" class=" h-12 w-12">
|
|
889
|
890
|
<image :src="detail.merchant.mer_avatar" mode="aspectFit" class="img_full"></image>
|
|
890
|
891
|
</div>
|
|
|
@@ -1045,40 +1046,37 @@
|
|
1045
|
1046
|
<div class="fixed bottom-0 w-screen pb-safe bg-white" v-if="detail">
|
|
1046
|
1047
|
<div class="flex flex-row justify-between py-2 ">
|
|
1047
|
1048
|
<div class=" flex justify-around">
|
|
1048
|
|
- <div @tap="handleShowMerchant(detail.mer_id)" class="flex flex-col justify-center items-center pl-4">
|
|
|
1049
|
+ <div @tap="handleShowMerchant(detail.mer_id,detail.merchant.mer_name)" class="flex flex-col justify-center items-center pl-4">
|
|
1049
|
1050
|
<!-- <div class="i-tabler-building-store"></div>-->
|
|
1050
|
1051
|
<image :src="shangpinxiangqing_dianpu" mode="widthFix" class="w-6 h-6"></image>
|
|
1051
|
1052
|
<div class="text-[11px]">店铺</div>
|
|
1052
|
1053
|
</div>
|
|
1053
|
1054
|
|
|
1054
|
|
- <div @tap="handleShowCustomer" class="flex flex-col justify-center items-center pl-4">
|
|
|
1055
|
+ <div @tap="handleShowCustomer" class="flex flex-col justify-center items-center pl-6">
|
|
1055
|
1056
|
<!-- <div class="i-tabler-headset"></div>-->
|
|
1056
|
1057
|
<image :src="shangpinxiangqing_kefu" mode="widthFix" class="w-6 h-6"></image>
|
|
1057
|
1058
|
|
|
1058
|
1059
|
<div class="text-[11px]">客服</div>
|
|
1059
|
1060
|
</div>
|
|
1060
|
|
- <div @tap="handleShowShopCart" class="flex flex-col justify-center items-center pl-4 relative">
|
|
|
1061
|
+ <!-- <div @tap="handleShowShopCart" class="flex flex-col justify-center items-center pl-4 relative">
|
|
1061
|
1062
|
<div class="bg-primary rounded-full w-3 h-3 text-[9px] text-white justify-center items-center absolute top--1 right--1 text-center"
|
|
1062
|
1063
|
v-if="state.cartCount">
|
|
1063
|
1064
|
{{ state.cartCount }}
|
|
1064
|
1065
|
</div>
|
|
1065
|
1066
|
<image :src="shangpinxiangqing_gouwuche" mode="widthFix" class="w-6 h-6"></image>
|
|
1066
|
|
-
|
|
1067
|
|
- <!-- <div class="i-tabler-shopping-cart"></div>-->
|
|
1068
|
1067
|
<div class="text-[11px]">购物车</div>
|
|
1069
|
|
- </div>
|
|
|
1068
|
+ </div> -->
|
|
1070
|
1069
|
</div>
|
|
1071
|
1070
|
<div class="flex flex-row text-sm text-white gap-2 pr-3" v-if="detail.seckill_s == 0">
|
|
1072
|
|
- <div @tap="handleAddCart" v-if="!is148Merchant"
|
|
|
1071
|
+ <!-- <div @tap="handleAddCart" v-if="!is148Merchant"
|
|
1073
|
1072
|
class="bg-[#FFA319] rounded-full w-25 flex justify-center items-center h-9">
|
|
1074
|
1073
|
加入购物车
|
|
1075
|
|
- </div>
|
|
1076
|
|
- <div class="bg-[#F94032] rounded-full w-25 flex justify-center items-center h-9">
|
|
|
1074
|
+ </div> -->
|
|
|
1075
|
+ <div class="bg-[#F94032] rounded-full w-62 flex justify-center items-center h-9">
|
|
1077
|
1076
|
<div v-if="is148Merchant" @click="handleOrderConfirm('3')">立即兑换</div>
|
|
1078
|
1077
|
<div v-else @click="handleOrderConfirm('1')">立即购买</div>
|
|
1079
|
1078
|
</div>
|
|
1080
|
1079
|
</div>
|
|
1081
|
|
-
|
|
1082
|
1080
|
<div class="flex flex-row text-sm text-white gap-2 px-4" v-if="detail.seckill_s == 2">
|
|
1083
|
1081
|
<div class="bg-[#F94032] rounded-full w-52 flex justify-center items-center h-9">
|
|
1084
|
1082
|
<div @click="notStarted">立即抢购</div>
|