czg_team/cashier_wx
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增新版私域引流

Browse Source
This commit is contained in:
gyq
2025-12-15 16:56:37 +08:00
parent 5007c96116
commit 298cd4775b
6 changed files with 787 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/config.js
View File

@@ -1,5 +1,5 @@
// const debug = process.env.NODE_ENV == 'development' ? true : false; // const debug = process.env.NODE_ENV == 'development' ? true : false;
const debug = false; const debug = true; // false线上 true本地
// #ifdef H5 // #ifdef H5
const proxyApi = "/api"; const proxyApi = "/api";
// #endif // #endif
@@ -24,7 +24,7 @@ const autoRemoveCache = {
count: 100000, count: 100000,
size: 100000, size: 100000,
}; };
uni.conf = { uni.conf = {
debug, debug,
baseUrl, baseUrl,
version, version,
@@ -37,8 +37,8 @@ export const changeEnv = (env) => {
uni.conf = { uni.conf = {
debug: true, debug: true,
baseUrl: "http://192.168.1.42", baseUrl: "http://192.168.1.42",
phpUrl:'http://192.168.1.42:8787/api/', phpUrl: 'http://192.168.1.42:8787/api/',
phpChatWx:'ws://192.168.1.42:2348', phpChatWx: 'ws://192.168.1.42:2348',
version: 100, version: 100,
autoRemoveCache, autoRemoveCache,
baseUrlwws: "ws://192.168.1.42:2348", baseUrlwws: "ws://192.168.1.42:2348",

230
components/attract-popup.vue Normal file
View File

@@ -0,0 +1,230 @@
<!-- 私域引流 -->
<template>
<u-popup :show="show" mode="center" :safeAreaInsetBottom="false">
<view class="new_preview">
<view class="header">{{ shopInfo.shopName }}</view>
<view class="content">
<view class="title">{{ form.title }}</view>
<view class="img_wrap">
<image class="img" :src="form.qrCode"></image>
</view>
<view class="intro">
{{ form.content }}
</view>
<view class="foot">
{{ form.note }}
</view>
</view>
<view class="close" @click="closeHandle">
<u-icon name="close" color="#fff" size="14"></u-icon>
</view>
</view>
</u-popup>
</template>
<script setup>
import dayjs from 'dayjs';
import { ref, onMounted } from 'vue';
import { config } from '@/common/api/market/drainageConfig.js';
import { checkArrayElementsExist } from '@/utils/util.js';
const shopInfo = ref('');
const props = defineProps({
type: {
type: String,
default: 'home' // 调用的位置 home首页 order支付成功后
}
});
const show = ref(false);
const form = ref({});
const drainageHomeKey = 'drainageHome';
function closeHandle() {
switch (props.type) {
case 'home':
// 在首页关闭
switch (form.value.homeType) {
case 'only':
// 仅显示1次
uni.cache.set(drainageHomeKey, {
value: form.value.homeType
});
break;
case 'day':
// 每天显示1次
uni.cache.set(drainageHomeKey, {
value: form.value.homeType,
time: dayjs().format('YYYY-MM-DD')
});
break;
case 'every':
// 每次onload都显示
uni.cache.set(drainageHomeKey, {
value: form.value.homeType
});
break;
default:
break;
}
break;
case 'order':
break;
default:
break;
}
show.value = false;
}
// 显示逻辑
function showHandle() {
switch (props.type) {
case 'home':
// 首页
if (form.value.homeEnable == 0) return;
let drainage = uni.cache.get(drainageHomeKey);
console.log('drainage', drainage);
if (!drainage || form.value.homeType != drainage.value) {
uni.cache.set(drainageHomeKey, '');
show.value = true;
} else {
switch (drainage.value) {
case 'only':
// 存在则证明已经显示过一次，则不在显示
break;
case 'day':
// 判断是不是用一天，同一天不显示，不是同一天则显示
let localDay = drainage.time;
let currentDay = dayjs().format('YYYY-MM-DD');
if (localDay != currentDay) {
show.value = true;
}
break;
case 'every':
// 页面每次onload会触发显示
show.value = true;
break;
default:
break;
}
}
break;
case 'order':
// 订单 只要包含用餐类型就显示
let shopMode = shopInfo.value.eatModel.split(',');
if (checkArrayElementsExist(shopMode, form.value.orderType)) {
show.value = true;
}
break;
default:
break;
}
}
// 获取私域引流配置
async function configAjax() {
try {
const shopId = uni.cache.get('shopId');
const res = await config({ shopId: shopId });
form.value = res;
showHandle();
} catch (error) {
console.log(error);
}
}
defineExpose({
configAjax
});
onMounted(() => {
shopInfo.value = uni.cache.get('shopInfo');
if (props.type == 'home') {
configAjax();
}
});
</script>
<style scoped lang="scss">
.new_preview {
--bg: #3f3b37;
--color: #f6dfc4;
--borderColor: #f6dfc45b;
width: 90vw;
background-color: var(--bg);
border-radius: 4px;
position: relative;
.close {
--size: 70upx;
width: var(--size);
height: var(--size);
border-radius: 50%;
background-color: var(--bg);
display: flex;
align-items: center;
justify-content: center;
position: absolute;
bottom: calc(var(--size) * -1 - 20upx);
left: 50%;
margin-left: calc(var(--size) / 2 * -1);
}
.header {
display: flex;
align-items: center;
justify-content: center;
font-size: 16px;
color: var(--color);
height: 50px;
border-bottom: 1px dashed var(--borderColor);
}
.content {
padding-bottom: 14px;
.title {
font-size: 14px;
color: var(--color);
height: 50px;
display: flex;
align-items: center;
justify-content: center;
}
.img_wrap {
display: flex;
justify-content: center;
.img {
--size: 220px;
width: var(--size);
height: var(--size);
border-radius: 4px;
}
}
.intro {
height: 40px;
font-size: 14px;
color: var(--color);
display: flex;
align-items: center;
justify-content: center;
padding: 0 14px;
}
.foot {
height: 40px;
color: var(--borderColor);
font-size: 14px;
display: flex;
align-items: center;
justify-content: center;
padding: 0 14px;
text-align: center;
}
}
}
</style>

49
components/drainage.vue
View File

@@ -1,40 +1,19 @@
<template> <template>
<view> <view>
<!-- 私域引流 --> <!-- 私域引流 -->
<up-popup <up-popup :show="show" mode="center" round="16rpx" closeOnClickOverlay @close="close" :safeAreaInsetBottom="false">
:show="show"
mode="center"
round="16rpx"
closeOnClickOverlay
@close="close"
:safeAreaInsetBottom="false"
>
<view class="preview-box"> <view class="preview-box">
<view class="u-flex" style="align-items: stretch"> <view class="u-flex" style="align-items: stretch">
<view <view class="u-flex-1 u-p-r-24 u-flex u-flex-col" style="align-items: start; justify-content: space-between">
class="u-flex-1 u-p-r-24 u-flex u-flex-col"
style="align-items: start; justify-content: space-between"
>
<view> <view>
<view class="font-14 font-bold color-333">{{ <view class="font-14 font-bold color-333">{{ drainageConfig.title }}</view>
drainageConfig.title <view class="u-m-t-16 font-12 color-666">{{ drainageConfig.content }}</view>
}}</view>
<view class="u-m-t-16 font-12 color-666">{{
drainageConfig.content
}}</view>
</view> </view>
<view class="color-999 font-12 u-m-t-16">{{ <view class="color-999 font-12 u-m-t-16">{{ drainageConfig.note }}</view>
drainageConfig.note
}}</view>
</view> </view>
<image <image :show-menu-by-longpress="true" :src="drainageConfig.qrCode" style="width: 240rpx; height: 240rpx" mode="aspectFit"></image>
:show-menu-by-longpress="true"
:src="drainageConfig.qrCode"
style="width: 240rpx; height: 240rpx"
mode="aspectFit"
></image>
</view> </view>
<view class="close" @click="close"> <view class="close" @click="close">
@@ -46,26 +25,26 @@
</template> </template>
<script setup> <script setup>
import * as drainageConfigApi from "@/common/api/market/drainageConfig.js"; import * as drainageConfigApi from '@/common/api/market/drainageConfig.js';
import { ref, reactive, computed, watch, onMounted } from "vue"; import { ref, reactive, computed, watch, onMounted } from 'vue';
const showPreview = defineModel({ const showPreview = defineModel({
type: Boolean, type: Boolean,
default: false, default: false
}); });
const show=ref(false); const show = ref(false);
const emit = defineEmits(["close"]); const emit = defineEmits(['close']);
function close() { function close() {
show.value = false; show.value = false;
emit("close"); emit('close');
} }
const drainageConfig = ref({}); const drainageConfig = ref({});
async function getDrainageConfig() { async function getDrainageConfig() {
const shopId = uni.cache.get("shopId"); const shopId = uni.cache.get('shopId');
const drainageConfigRes = await drainageConfigApi.config({ const drainageConfigRes = await drainageConfigApi.config({
shopId: shopId, shopId: shopId
}); });
drainageConfig.value = drainageConfigRes; drainageConfig.value = drainageConfigRes;
if (drainageConfig.value.isEnable) { if (drainageConfig.value.isEnable) {

46
components/order-finish-modal.vue
View File

@@ -3,41 +3,47 @@
<!-- 生成公众号二维码 --> <!-- 生成公众号二维码 -->
<we-qrcode @generate="(e) => qrcodeResult(e)"></we-qrcode> <we-qrcode @generate="(e) => qrcodeResult(e)"></we-qrcode>
<officialAccount <officialAccount followIndex="order" :wechatAcQrcode="wechatAcQrcode" v-if="showOfficialAccount" @close="modelClose($event, 'officialAccount')" />
followIndex="order" <!-- <Drainage v-model="showDrainage" @close="modelClose($event, 'drainage')" /> -->
:wechatAcQrcode="wechatAcQrcode" <attractPopup type="order" ref="attractPopupRef" />
v-if="showOfficialAccount"
@close="modelClose($event, 'officialAccount')"
/>
<Drainage v-model="showDrainage" @close="modelClose($event, 'drainage')" />
</view> </view>
</template> </template>
<script setup> <script setup>
import weQrcode from "@/components/wechat-ac-qrcode.vue"; import weQrcode from '@/components/wechat-ac-qrcode.vue';
import { ref, watch, computed, reactive, toRaw } from "vue"; import attractPopup from '@/components/attract-popup.vue';
import officialAccount from "@/components/official-account.vue"; import { ref, watch, computed, reactive, toRaw } from 'vue';
import Drainage from "@/components/drainage.vue"; import officialAccount from '@/components/official-account.vue';
import Drainage from '@/components/drainage.vue';
const attractPopupRef = ref(null);
const showDrainage = defineModel({ const showDrainage = defineModel({
type: Boolean, type: Boolean,
default: false, default: false
}); });
watch(showDrainage, (newVal, oldVal) => {
console.log('modelValue 变化：', { newVal, oldVal });
if (newVal == true) {
attractPopupRef.value.configAjax();
}
});
const showOfficialAccount = ref(false); const showOfficialAccount = ref(false);
function modelClose(e, type) { function modelClose(e, type) {
console.log("modelClose", type); console.log('modelClose', type);
if (type == "drainage") { if (type == 'drainage') {
showOfficialAccount.value = true; showOfficialAccount.value = true;
return; return;
} }
} }
const wechatAcQrcode = ref(""); const wechatAcQrcode = ref('');
const userinfo = uni.cache.get("userInfo") || {}; const userinfo = uni.cache.get('userInfo') || {};
const codeVal = ref(userinfo.wechatAcQrcode || ""); const codeVal = ref(userinfo.wechatAcQrcode || '');
console.log("codeVal", codeVal.value); console.log('codeVal', codeVal.value);
function qrcodeResult(e) { function qrcodeResult(e) {
wechatAcQrcode.value = e; wechatAcQrcode.value = e;
} }
</script> </script>

262
pages/index/indexs.vue
View File

@@ -2,31 +2,27 @@
<view class="content min-page bg-f7"> <view class="content min-page bg-f7">
<view class="contentbox"> <view class="contentbox">
<template v-if="shopExtend.length"> <template v-if="shopExtend.length">
<image class="bg" :src="shopExtend[0].value" mode="aspectFill" <image class="bg" :src="shopExtend[0].value" mode="aspectFill" v-if="!isJsonArrayString(shopExtend[0].value)"></image>
v-if="!isJsonArrayString(shopExtend[0].value)"></image>
<swiper class="swiper" autoplay circular v-else> <swiper class="swiper" autoplay circular v-else>
<swiper-item class="swiper-item" v-for="item in JSON.parse(shopExtend[0].value)"> <swiper-item class="swiper-item" v-for="(item, index) in JSON.parse(shopExtend[0].value)" :key="index">
<image class="swiper-bg" :src="item"></image> <image class="swiper-bg" :src="item"></image>
</swiper-item> </swiper-item>
</swiper> </swiper>
</template> </template>
</view> </view>
<view class="userInfo u-flex"> <view class="userInfo u-flex">
<up-avatar size="61px" :default-url="imgs.defaultAvatar"></up-avatar> <up-avatar size="61px" :default-url="imgs.defaultAvatar"></up-avatar>
<view class="u-flex-1 u-flex u-row-between u-p-l-16 u-p-r-16"> <view class="u-flex-1 u-flex u-row-between u-p-l-16 u-p-r-16">
<view> <view>
<view class="u-flex"> <view class="u-flex">
<view class="u-font-32 color-333 font-bold u-line-1" style="max-width: 320rpx;">HI，欢迎回来</view> <view class="u-font-32 color-333 font-bold u-line-1" style="max-width: 320rpx">HI，欢迎回来</view>
<view class="vip" v-if="shopUserInfo.isVip">会员身份</view> <view class="vip" v-if="shopUserInfo.isVip">会员身份</view>
</view> </view>
<view class="u-m-t-10 u-font-24 color-666"> <view class="u-m-t-10 u-font-24 color-666">
<text>优惠券：{{allConfig.couponNum}}</text> <text>优惠券：{{ allConfig.couponNum }}</text>
<text class="u-m-l-22">积分：{{allConfig.pointNum}}</text> <text class="u-m-l-22">积分：{{ allConfig.pointNum }}</text>
</view> </view>
</view> </view>
<image :src="imgs.code" class="code"></image> <image :src="imgs.code" class="code"></image>
</view> </view>
@@ -52,8 +48,6 @@
<view class="desc">-自助下单 快人一步-</view> <view class="desc">-自助下单 快人一步-</view>
</view> </view>
<image :src="imgs.big_orderFood" class="big_img"></image> <image :src="imgs.big_orderFood" class="big_img"></image>
</view> </view>
<view class="groupBuying" v-if="allConfig.group"> <view class="groupBuying" v-if="allConfig.group">
@@ -90,10 +84,9 @@
<view class="title">股东共享</view> <view class="title">股东共享</view>
<view class="desc">邀请好友，获得佣金</view> <view class="desc">邀请好友，获得佣金</view>
</view> </view>
</view> </view>
<view style="height: 90px;"></view> <view style="height: 90px"></view>
<u-popup :show="popupShow" :safe-area-inset-bottom="false" mode="center" @close="popupShow = false"> <u-popup :show="popupShow" :safe-area-inset-bottom="false" mode="center" @close="popupShow = false">
<view class="popup-content"> <view class="popup-content">
<view class="header-wrap"> <view class="header-wrap">
@@ -112,28 +105,21 @@
</view> </view>
</view> </view>
</u-popup> </u-popup>
<!-- 私域引流弹窗 -->
<attractPopup type="home" ref="attractPopupRef" />
</view> </view>
</template> </template>
<script setup> <script setup>
import { import attractPopup from '@/components/attract-popup.vue';
homeData import { homeData } from '@/common/api/market/index.js';
} from '@/common/api/market/index.js' import { getMemberConfig, getRechargeConfig } from '@/common/api/index/index.js';
import { import { ref, reactive, defineProps, defineEmits, onMounted } from 'vue';
getMemberConfig, import { isJsonArrayString } from '@/utils/util.js';
getRechargeConfig,
} from "@/common/api/index/index.js"; const attractPopupRef = ref(null);
import {
ref, const imgs = {
reactive,
defineProps,
defineEmits,
onMounted
} from "vue";
import {
isJsonArrayString
} from "@/utils/util.js";
const imgs = {
recharge: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/2f22c0ced494497e8d6f981832b191c9.png', recharge: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/2f22c0ced494497e8d6f981832b191c9.png',
share: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/bcb8d461e96d445ba40256079da775b3.png', share: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/bcb8d461e96d445ba40256079da775b3.png',
vip: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/cfc3bf5ba12747c6ada4d5a388aceca3.png', vip: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/cfc3bf5ba12747c6ada4d5a388aceca3.png',
@@ -144,119 +130,115 @@
points: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/df0758f7b86449f89f882e50226e17c7.png', points: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/df0758f7b86449f89f882e50226e17c7.png',
code: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/044dcaf913054f03a9db7983f048b1e6.png', code: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/044dcaf913054f03a9db7983f048b1e6.png',
defaultAvatar: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/b98d2c7110e847f996e8d7ba4342f0a5.png' defaultAvatar: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/b98d2c7110e847f996e8d7ba4342f0a5.png'
} };
// 定义接收的属性 // 定义接收的属性
const props = defineProps({ const props = defineProps({
shopExtend: { shopExtend: {
type: Array, type: Array,
default: [], default: []
},
});
function toFenxiao() {
uni.navigateTo({
url: "/distribution/shop-detail/index?shopId=" + uni.cache.get("shopId"),
});
} }
});
function toIntegralMall() { function toFenxiao() {
uni.navigateTo({ uni.navigateTo({
url: "/scoreShop/index/index?shopId=" + uni.cache.get("shopId"), url: '/distribution/shop-detail/index?shopId=' + uni.cache.get('shopId')
}); });
} }
import { function toIntegralMall() {
productStore uni.navigateTo({
} from "@/stores/user.js"; url: '/scoreShop/index/index?shopId=' + uni.cache.get('shopId')
import { });
onShow }
} from '@dcloudio/uni-app';
// 显示弹窗 import { productStore } from '@/stores/user.js';
const popupShow = ref(false); import { onShow } from '@dcloudio/uni-app';
const scanCodehandle = (i) => {
// 显示弹窗
const popupShow = ref(false);
const scanCodehandle = (i) => {
popupShow.value = true; popupShow.value = true;
}; };
// 预点单 // 预点单
function beforehandOrderHandle() { function beforehandOrderHandle() {
popupShow.value = false; popupShow.value = false;
uni.cache.set("dinersNum", 1); uni.cache.set('dinersNum', 1);
uni.cache.set("tableCode", shopUserInfo.id); uni.cache.set('tableCode', shopUserInfo.id);
uni.navigateTo({ uni.navigateTo({
url: "/pages/product/index?type=beforehand", url: '/pages/product/index?type=beforehand'
}); });
} }
// 扫码点餐 // 扫码点餐
async function scanOrderHandle() { async function scanOrderHandle() {
popupShow.value = false; popupShow.value = false;
const store = productStore(); const store = productStore();
await store.scanCodeactions(); await store.scanCodeactions();
} }
const memberindex = (url) => { const memberindex = (url) => {
uni.pro.navigateTo(url, { uni.pro.navigateTo(url, {
shopId: uni.cache.get("shopId"), shopId: uni.cache.get('shopId'),
type: "index", type: 'index'
}); });
}; };
const shopUserInfo = reactive({}) const shopUserInfo = reactive({});
Object.assign(shopUserInfo, uni.cache.get("shopUserInfo") || {}) Object.assign(shopUserInfo, uni.cache.get('shopUserInfo') || {});
function tomember() { function tomember() {
if (isMember.value) { if (isMember.value) {
const shopId = uni.cache.get("shopId"); const shopId = uni.cache.get('shopId');
if (!shopUserInfo.isVip) { if (!shopUserInfo.isVip) {
uni.navigateTo({ uni.navigateTo({
url: "/user/vip/buy-vip?shopId=" + shopId, url: '/user/vip/buy-vip?shopId=' + shopId
}); });
return; return;
} }
uni.navigateTo({ uni.navigateTo({
url: "/user/vip/vip?shopId=" + shopId, url: '/user/vip/vip?shopId=' + shopId
}); });
} else { } else {
uni.showToast({ uni.showToast({
title: "暂未开放", title: '暂未开放',
icon: "none", icon: 'none'
}); });
} }
} }
function toCharge() { function toCharge() {
if (isCharge.value) { if (isCharge.value) {
const shopId = uni.cache.get("shopId"); const shopId = uni.cache.get('shopId');
uni.navigateTo({ uni.navigateTo({
url: "/pages/user/member/czzx?shopId=" + shopId, url: '/pages/user/member/czzx?shopId=' + shopId
}); });
} else { } else {
uni.showToast({ uni.showToast({
title: "暂未开放", title: '暂未开放',
icon: "none", icon: 'none'
}); });
} }
} }
const getQueryString = (url, name) => { const getQueryString = (url, name) => {
//解码 //解码
var reg = new RegExp("(^|&|/?)" + name + "=([^&|/?]*)(&|/?|$)", "i"); var reg = new RegExp('(^|&|/?)' + name + '=([^&|/?]*)(&|/?|$)', 'i');
var r = url.substr(1).match(reg); var r = url.substr(1).match(reg);
if (r != null) { if (r != null) {
return r[2]; return r[2];
} }
return null; return null;
}; };
// 获取会员配置 // 获取会员配置
const isMember = ref(0); const isMember = ref(0);
const isCharge = ref(0); const isCharge = ref(0);
async function getVipConfig() { async function getVipConfig() {
try { try {
const res1 = await getMemberConfig({ const res1 = await getMemberConfig({
shopId: uni.cache.get("shopId") shopId: uni.cache.get('shopId')
}); });
const res2 = await getRechargeConfig({ const res2 = await getRechargeConfig({
shopId: uni.cache.get("shopId") shopId: uni.cache.get('shopId')
}); });
isMember.value = +res1.memberConfig.isOpen; isMember.value = +res1.memberConfig.isOpen;
@@ -264,43 +246,42 @@
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }
} }
const allConfig = reactive({
const allConfig = reactive({
takeout: 0, takeout: 0,
group: 0, group: 0,
pointsMall: 0, pointsMall: 0,
distribution: 0, distribution: 0,
couponNum: 0, couponNum: 0,
pointNum: 0 pointNum: 0
}) });
function getHomeData() { function getHomeData() {
homeData().then(res => { homeData().then((res) => {
Object.assign(allConfig, res) Object.assign(allConfig, res);
})
}
onMounted(() => {
updateData()
}); });
}
onMounted(() => {
updateData();
});
function updateData() { function updateData() {
Object.assign(shopUserInfo, uni.cache.get("shopUserInfo") || {}) Object.assign(shopUserInfo, uni.cache.get('shopUserInfo') || {});
getVipConfig(); getVipConfig();
getHomeData() getHomeData();
} }
defineExpose({ defineExpose({
updateData updateData
}); });
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
page { page {
background: #f6f8fa; background: #f6f8fa;
} }
.swiper { .swiper {
width: 100%; width: 100%;
height: 100%; height: 100%;
@@ -313,9 +294,9 @@
height: 100%; height: 100%;
} }
} }
} }
.content { .content {
.contentbox { .contentbox {
position: relative; position: relative;
width: 100%; width: 100%;
@@ -403,9 +384,9 @@
} }
} }
} }
} }
.popup-content { .popup-content {
width: 90vw; width: 90vw;
background-color: #fff; background-color: #fff;
border-radius: 8px; border-radius: 8px;
@@ -444,9 +425,9 @@
width: 248upx; width: 248upx;
} }
} }
} }
.menus { .menus {
display: flex; display: flex;
padding: 32rpx 40rpx; padding: 32rpx 40rpx;
margin-top: 150rpx; margin-top: 150rpx;
@@ -460,20 +441,20 @@
box-shadow: 0rpx 6rpx 12rpx 2rpx rgba(0, 0, 0, 0.16); box-shadow: 0rpx 6rpx 12rpx 2rpx rgba(0, 0, 0, 0.16);
flex: 1; flex: 1;
} }
} }
.userInfo { .userInfo {
display: flex; display: flex;
padding: 22rpx 24rpx; padding: 22rpx 24rpx;
margin: 0 4rpx; margin: 0 4rpx;
align-items: center; align-items: center;
align-self: stretch; align-self: stretch;
border-radius: 24rpx; border-radius: 24rpx;
background: #FFF; background: #fff;
transform: translateY(-36rpx); transform: translateY(-36rpx);
.vip { .vip {
background: #FA720A; background: #fa720a;
font-size: 24rpx; font-size: 24rpx;
color: #ffffff; color: #ffffff;
padding: 6rpx 10rpx; padding: 6rpx 10rpx;
@@ -485,11 +466,9 @@
width: 33px; width: 33px;
height: 33px; height: 33px;
} }
} }
.new-menus-box {
.new-menus-box {
margin: 0 16rpx 34rpx 16rpx; margin: 0 16rpx 34rpx 16rpx;
.new-menus { .new-menus {
@@ -518,10 +497,11 @@
.line { .line {
width: 2rpx; width: 2rpx;
height: 156rpx; height: 156rpx;
background: #EDEDED; background: #ededed;
} }
.takeout {} .takeout {
}
} }
&.layout1 { &.layout1 {
@@ -546,11 +526,11 @@
} }
} }
} }
} }
.groupBuying { .groupBuying {
padding: 16rpx 38rpx; padding: 16rpx 38rpx;
border-top: 2rpx solid #EDEDED; border-top: 2rpx solid #ededed;
background-color: #fff; background-color: #fff;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@@ -560,21 +540,21 @@
width: 40px; width: 40px;
height: 40px; height: 40px;
} }
} }
.title { .title {
color: #333333; color: #333333;
font-size: 36rpx; font-size: 36rpx;
font-weight: 700; font-weight: 700;
} }
.desc { .desc {
margin-top: 16rpx; margin-top: 16rpx;
font-size: 28rpx; font-size: 28rpx;
color: #999; color: #999;
} }
.points { .points {
margin-top: 34rpx; margin-top: 34rpx;
background-color: #fff; background-color: #fff;
padding: 16rpx 68rpx; padding: 16rpx 68rpx;
@@ -587,9 +567,9 @@
width: 98px; width: 98px;
height: 98px; height: 98px;
} }
} }
.bottom_menus { .bottom_menus {
display: flex; display: flex;
gap: 14rpx; gap: 14rpx;
margin-top: 34rpx; margin-top: 34rpx;
@@ -601,7 +581,7 @@
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
border-radius: 18rpx; border-radius: 18rpx;
background: #FFF; background: #fff;
.img { .img {
width: 39px; width: 39px;
@@ -619,5 +599,5 @@
white-space: nowrap; white-space: nowrap;
} }
} }
} }
</style> </style>

20
utils/util.js
View File

@@ -476,3 +476,23 @@ export function includesString(target, searchStr, options = {}) {
// 4. 执行包含判断 // 4. 执行包含判断
return processedTarget.includes(processedSearch); return processedTarget.includes(processedSearch);
} }
/**
* 校验一维基础类型数组A的元素是否存在于数组B（支持部分/全部存在，默认全部存在）
* @param {Array<string|number|boolean>} arrA - 待校验的一维数组
* @param {Array<string|number|boolean>} arrB - 参考的一维数组
* @param {boolean} [partial=false] - 是否校验「部分存在」（true=部分存在，false=全部存在，默认false）
* @returns {boolean} 校验结果
*/
export function checkArrayElementsExist(arrA, arrB, partial = false) {
// 边界处理：空数组特殊逻辑
if (arrA.length === 0) return !partial
// 转Set优化查找性能（一维数组核心优化）
const bSet = new Set(arrB)
// 核心逻辑：partial=true → some（部分存在），partial=false → every（全部存在）
return partial ?
arrA.some(item => bSet.has(item)) :
arrA.every(item => bSet.has(item))
}