修复我的页面积分列表换行问题

common/api/apiPrve.js

@@ -0,0 +1,3 @@
+export const urlAccount = '/account'
+export const urlProduct = '/product'
+export const urlOrder = '/order'

common/api/product/product.js

@@ -1,8 +1,7 @@
 // 引入 request 文件
 import request from '@/common/api/request.js'
-const urlAccount = '/account'
+
-const urlProduct = '/product'
+import {urlAccount,urlProduct,urlOrder} from '@/common/api/apiPrve.js'
-const urlOrder = '/order'
 
 //获取商品列表数据
 export const APIproductqueryProduct = (data) => {
@@ -47,3 +46,12 @@ export const APIminiAppskuinfo = (data) => {
 		data: data
 	})
 }
+
+//获取相关推荐商品
+export const productRelated = (data) => {
+	return request({
+		url: urlProduct + '/user/product/related/'+data.id,
+		method: 'get',
+		data: data
+	})
+}

common/api/request.js

@@ -7,33 +7,7 @@ export default async (params) => {
 	let token = uni.cache.get("token") || "";
 	const shopId = uni.cache.get("shopId") * 1;
 	const userInfo = uni.cache.get("userInfo") || {};
-	// #ifdef H5
+
-	token = "1b5e8baf0cc1492a858a208f113d0971";
-	uni.cache.set('userInfo', {
-		"acQrcodeValidTime": "2026-01-13 13:35:59",
-		"alipayOpenId": "",
-		"birthDay": "",
-		"createTime": "2024-03-13 10:56:40",
-		"distributionAmount": 0,
-		"headImg": "https://thirdwx.qlogo.cn/mmopen/vi_32/POgEwh4mIHO4nibH0KlMECNjjGxQUq24ZEaGT4poC6icRiccVGKSyXwibcPq4BWmiaIGuG1icwxaQX6grC9VemZoJ8rg/132",
-		"id": "36689",
-		"idCard": "",
-		"isAc": 0,
-		"lastLoginTime": "2025-12-24 11:24:12",
-		"nickName": "微信用户",
-		"password": "",
-		"payPwd": "e10adc3949ba59abbe56e057f20f883e",
-		"phone": "",
-		"realName": "",
-		"sex": null,
-		"status": 1,
-		"updateTime": "2025-12-24 11:22:47",
-		"usePayPwd": 0,
-		"wechatAcOpenId": "",
-		"wechatAcQrcode": "http://weixin.qq.com/q/029s5JtP1xfmJ1g_HDxFco",
-		"wechatOpenId": "or1l86yipGvwyfPhrKIAcQuSfAV8"
-	})
-	// #endif
 	let header = {
 		version: uni.conf.version,
 		type: uni.getSystemInfoSync().platform,
@@ -60,7 +34,10 @@ export default async (params) => {
 			mask: true,
 		});
 	}
-
+	// #ifdef H5
+	uni.cache.set('token', '1b5e8baf0cc1492a858a208f113d0971')
+	uni.cache.set('userInfo',{"acQrcodeValidTime":"2026-01-13 13:35:59","alipayOpenId":"","birthDay":"2025-12-25","createTime":"2024-03-13 10:56:40","distributionAmount":0,"headImg":"https://thirdwx.qlogo.cn/mmopen/vi_32/POgEwh4mIHO4nibH0KlMECNjjGxQUq24ZEaGT4poC6icRiccVGKSyXwibcPq4BWmiaIGuG1icwxaQX6grC9VemZoJ8rg/132","id":"36689","idCard":"","isAc":0,"lastLoginTime":"2025-12-26 10:01:12","nickName":"微信用户","password":"","payPwd":"e10adc3949ba59abbe56e057f20f883e","phone":"18049104914","realName":"","sex":1,"status":1,"updateTime":"2025-12-26 09:59:31","usePayPwd":0,"wechatAcOpenId":"","wechatAcQrcode":"http://weixin.qq.com/q/029s5JtP1xfmJ1g_HDxFco","wechatOpenId":"or1l86yipGvwyfPhrKIAcQuSfAV8"})
+	// #endif
 	return new Promise((resolve, reject) => {
 		const timeoutDuration = params.timeout || 10000; // 可以通过 params 传入超时时间，默认 10 秒
 		uni.request({

common/config.js

@@ -1,17 +1,19 @@
 // const debug = process.env.NODE_ENV == 'development' ? true : false;
-const debug = false; // false线上 true本地
+// const debug = false; // false线上 true本地
+const debug = true; // false线上 true本地
 let baseUrl = ''
 let baseUrlwws = ''
 
 
 
+
 const version = "100";
 const autoRemoveCache = {
 	count: 100000,
 	size: 100000,
 };
 
-function init(){
+function init() {
 	if (debug) {
 		baseUrl = 'http://192.168.1.42'
 		baseUrlwws = "ws://192.168.1.42:2348";
@@ -22,7 +24,7 @@ function init(){
 	// #ifdef H5
 
 	if (debug) {
-		baseUrl = "/api";
+		baseUrl = "/testApi";
 		baseUrlwws = "http://192.168.1.42:2348";
 	} else {
 		baseUrl = "/prodApi";
@@ -47,7 +49,7 @@ export const changeEnv = (env) => {
 		let baseUrl = "http://192.168.1.42"
 		let baseUrlwws = "ws://192.168.1.42:2348"
 		// #ifdef H5
-		baseUrl = "/api"
+		baseUrl = "/testApi"
 		baseUrlwws = "http://192.168.1.42:2348"
 		// #endif
 		uni.conf = {

components/goods-price.vue

@@ -1,6 +1,6 @@
 <template>
-	<block v-if="limitDiscount && limitDiscount.id" class="limit-price">
+	<block v-if="limitDiscount && limitDiscount.id" >
-		<text>
+		<text class="limit-price">
 			{{ returnPrice() }}
 		</text>
 	</block>

distribution/income-details/index.vue

@@ -45,7 +45,7 @@
       </view>
     </view>
     <view>
-      <view
+      <!-- <view
         class="u-p-t-16 u-p-b-20 u-flex u-p-l-28 u-p-r-28"
         style="align-items: baseline; justify-content: flex-end"
       >
@@ -53,9 +53,9 @@
         <text class="font-16 color-333 font-700" >
           {{ totalIncome }}</text
         >
-      </view>
+      </view> -->
 
-      <view class="list">
+      <view class="list u-m-t-32">
         <view v-for="(item, index) in state.records" :key="index" class="item">
           <view class="u-flex justify-between">
             <view>

lib/goods.ts

@@ -566,7 +566,7 @@ export function calcSingleGoodsRealPrice(
 	>
 ) : number {
 	const { isMember, memberDiscountRate, limitTimeDiscount: activity } = config;
-
+	console.log('isMember',isMember);
 	//如果是增菜价格为0
 	if (goods.is_gift || goods.isGift) {
 		return 0;

package.json

@@ -7,7 +7,7 @@
     "lodash": "^4.17.21",
     "pinia": "^2.3.1",
     "pinia-plugin-unistorage": "^0.1.2",
-    "ysk-utils": "^1.0.81"
+    "ysk-utils": "^1.0.83"
   },
   "devDependencies": {
     "unplugin-auto-import": "^0.16.7"

pages/index/indexs.vue

@@ -2,11 +2,9 @@
 	<view class="content min-page bg-f7">
 		<view class="contentbox">
 			<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-item class="swiper-item" v-for="(item, index) in JSON.parse(shopExtend[0].value)"
+					<swiper-item class="swiper-item" v-for="(item, index) in JSON.parse(shopExtend[0].value)" :key="index">
-						:key="index">
 						<image class="swiper-bg" :src="item"></image>
 					</swiper-item>
 				</swiper>
@@ -29,7 +27,6 @@
 				<image :src="imgs.code" class="code"></image>
 			</view>
 		</view>
-
 		<view class="new-menus-box">
 			<view class="new-menus layout2" v-if="allConfig.takeout">
 				<view class="diner" @click="scanCodehandle(0)">
@@ -60,7 +57,6 @@
 
 				<view class="u-font-28 color-999">一键分享，快速拼单</view>
 			</view>
-
 		</view>
 
 		<view class="points" @click="toIntegralMall">
@@ -122,28 +118,15 @@
 </template>
 
 <script setup>
-	import attractPopup from '@/components/attract-popup.vue';
+import attractPopup from '@/components/attract-popup.vue';
-	import {
+import { homeData } from '@/common/api/market/index.js';
-		homeData
+import { getMemberConfig, getRechargeConfig } from '@/common/api/index/index.js';
-	} from '@/common/api/market/index.js';
+import { ref, reactive, defineProps, defineEmits, onMounted } from 'vue';
-	import {
+import { isJsonArrayString } from '@/utils/util.js';
-		getMemberConfig,
-		getRechargeConfig
-	} from '@/common/api/index/index.js';
-	import {
-		ref,
-		reactive,
-		defineProps,
-		defineEmits,
-		onMounted
-	} from 'vue';
-	import {
-		isJsonArrayString
-	} from '@/utils/util.js';
 
-	const attractPopupRef = ref(null);
+const attractPopupRef = ref(null);
 
-	const imgs = {
+const imgs = {
 	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',
 	vip: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/cfc3bf5ba12747c6ada4d5a388aceca3.png',
@@ -155,79 +138,75 @@
 	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',
 	taocan: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/4/1eb9aa9b865b47b39ab9d7ac404601a9.png'
-	};
+};
-	// 定义接收的属性
+// 定义接收的属性
-	const props = defineProps({
+const props = defineProps({
 	shopExtend: {
 		type: Array,
 		default: []
 	}
-	});
+});
 
-	function toGroupBuying() {
+function toGroupBuying() {
 	uni.navigateTo({
 		url: '/groupBuying/index/index'
-		})
+	});
-	}
+}
 
-	function toFenxiao() {
+function toFenxiao() {
 	uni.navigateTo({
 		url: '/distribution/shop-detail/index?shopId=' + uni.cache.get('shopId')
 	});
-	}
+}
 
-	function toIntegralMall() {
+function toIntegralMall() {
 	uni.navigateTo({
 		url: '/scoreShop/index/index?shopId=' + uni.cache.get('shopId')
 	});
-	}
+}
 
-	import {
+import { productStore } from '@/stores/user.js';
-		productStore
+import { onShow } from '@dcloudio/uni-app';
-	} from '@/stores/user.js';
-	import {
-		onShow
-	} from '@dcloudio/uni-app';
 
-	// 显示弹窗
+// 显示弹窗
-	const popupShow = ref(false);
+const popupShow = ref(false);
-	const scanCodehandle = (i) => {
+const scanCodehandle = (i) => {
 	popupShow.value = true;
-	};
+};
 
-	// 预点单
+// 预点单
-	function beforehandOrderHandle() {
+function beforehandOrderHandle() {
 	popupShow.value = false;
 	uni.cache.set('dinersNum', 1);
 	uni.cache.set('tableCode', shopUserInfo.id);
 	uni.navigateTo({
 		url: '/pages/product/index?type=beforehand'
 	});
-	}
+}
 
-	// 扫码点餐
+// 扫码点餐
-	async function scanOrderHandle() {
+async function scanOrderHandle() {
 	popupShow.value = false;
 	const store = productStore();
 	await store.scanCodeactions();
-	}
+}
 
-	function toTaocan() {
+function toTaocan() {
 	uni.navigateTo({
 		url: '/userPackage/index/index'
-		})
+	});
-	}
+}
 
-	const memberindex = (url) => {
+const memberindex = (url) => {
 	uni.pro.navigateTo(url, {
 		shopId: uni.cache.get('shopId'),
 		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) {
 		const shopId = uni.cache.get('shopId');
 		if (!shopUserInfo.isVip) {
@@ -245,9 +224,9 @@
 			icon: 'none'
 		});
 	}
-	}
+}
 
-	function toCharge() {
+function toCharge() {
 	if (isCharge.value) {
 		const shopId = uni.cache.get('shopId');
 		uni.navigateTo({
@@ -259,8 +238,8 @@
 			icon: 'none'
 		});
 	}
-	}
+}
-	const getQueryString = (url, name) => {
+const getQueryString = (url, name) => {
 	//解码
 	var reg = new RegExp('(^|&|/?)' + name + '=([^&|/?]*)(&|/?|$)', 'i');
 	var r = url.substr(1).match(reg);
@@ -268,12 +247,12 @@
 		return r[2];
 	}
 	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 {
 		const res1 = await getMemberConfig({
 			shopId: uni.cache.get('shopId')
@@ -287,43 +266,43 @@
 	} catch (error) {
 		console.log(error);
 	}
-	}
+}
 
-	const allConfig = reactive({
+const allConfig = reactive({
 	takeout: 0,
 	group: 0,
 	pointsMall: 0,
 	distribution: 0,
 	couponNum: 0,
 	pointNum: 0
-	});
+});
 
-	function getHomeData() {
+function getHomeData() {
 	homeData().then((res) => {
 		Object.assign(allConfig, res);
-			imgs.defaultAvatar = res.userAvatar ? res.userAvatar : imgs.defaultAvatar
+		imgs.defaultAvatar = res.userAvatar ? res.userAvatar : imgs.defaultAvatar;
 	});
-	}
+}
-	onMounted(() => {
+onMounted(() => {
 	updateData();
-	});
+});
 
-	function updateData() {
+function updateData() {
 	Object.assign(shopUserInfo, uni.cache.get('shopUserInfo') || {});
 	getVipConfig();
 	getHomeData();
-	}
+}
-	defineExpose({
+defineExpose({
 	updateData
-	});
+});
 </script>
 
 <style scoped lang="scss">
-	page {
+page {
 	background: #f6f8fa;
-	}
+}
 
-	.swiper {
+.swiper {
 	width: 100%;
 	height: 100%;
 
@@ -336,9 +315,9 @@
 			height: 100%;
 		}
 	}
-	}
+}
 
-	.content {
+.content {
 	.contentbox {
 		position: relative;
 		width: 100%;
@@ -426,9 +405,9 @@
 			}
 		}
 	}
-	}
+}
 
-	.popup-content {
+.popup-content {
 	width: 90vw;
 	background-color: #fff;
 	border-radius: 8px;
@@ -467,9 +446,9 @@
 			width: 248upx;
 		}
 	}
-	}
+}
 
-	.menus {
+.menus {
 	display: flex;
 	padding: 32rpx 40rpx;
 	margin-top: 150rpx;
@@ -483,9 +462,9 @@
 		box-shadow: 0rpx 6rpx 12rpx 2rpx rgba(0, 0, 0, 0.16);
 		flex: 1;
 	}
-	}
+}
 
-	.userInfo {
+.userInfo {
 	display: flex;
 	padding: 22rpx 24rpx;
 	margin: 0 4rpx;
@@ -510,9 +489,9 @@
 		width: 33px;
 		height: 33px;
 	}
-	}
+}
 
-	.new-menus-box {
+.new-menus-box {
 	margin: 0 16rpx 0 16rpx;
 
 	.new-menus {
@@ -544,7 +523,8 @@
 				background: #ededed;
 			}
 
-				.takeout {}
+			.takeout {
+			}
 		}
 
 		&.layout1 {
@@ -569,9 +549,9 @@
 			}
 		}
 	}
-	}
+}
 
-	.groupBuying {
+.groupBuying {
 	padding: 16rpx 38rpx;
 	border-top: 2rpx solid #ededed;
 	background-color: #fff;
@@ -583,21 +563,21 @@
 		width: 40px;
 		height: 40px;
 	}
-	}
+}
 
-	.title {
+.title {
 	color: #333333;
 	font-size: 36rpx;
 	font-weight: 700;
-	}
+}
 
-	.desc {
+.desc {
 	margin-top: 16rpx;
 	font-size: 28rpx;
 	color: #999;
-	}
+}
 
-	.points {
+.points {
 	margin-top: 10px;
 	background-color: #fff;
 	padding: 16rpx 68rpx;
@@ -610,16 +590,16 @@
 		width: 98px;
 		height: 98px;
 	}
-	}
+}
 
-	.taocan {
+.taocan {
 	.img {
 		width: 117px;
 		height: 117px;
 	}
-	}
+}
 
-	.bottom_menus {
+.bottom_menus {
 	display: flex;
 	gap: 14rpx;
 	margin-top: 10px;
@@ -649,5 +629,5 @@
 			white-space: nowrap;
 		}
 	}
-	}
+}
 </style>

pages/order/components/order-item.vue

@@ -7,13 +7,20 @@
           <view class="limitDiscount" v-if="showLimitDiscount(item)"
             >限时折扣</view
           >
-
           <up-image
             width="76"
             height="76"
             radius="6"
             :src="item.productImg"
-            v-if="item.productId != -999"
+            v-if="item.isTemporary != 1&&item.is_temporary!=1"
+          ></up-image>
+		  <up-image
+		  v-else-if="(item.isTemporary||item.is_temporary) &&(item.product_name=='签子'||item.productName=='签子')"
+		    width="76"
+		    height="76"
+		    radius="6"
+		    src="https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/5/b97054debd83486ab7ad8e20ca6a360a.png"
+		    mode="heightFix"
 		  ></up-image>
           <up-image
             width="76"
@@ -25,7 +32,7 @@
           ></up-image>
         </view>
         <view class="info">
-          <text class="productName">{{ item.productName }}</text>
+          <text class="productName">{{ item.productName||item.product_name }}</text>
           <text class="productSkuName" v-if="item.skuName">{{
             item.skuName
           }}</text>
@@ -55,18 +62,22 @@
         <view class="price">
           <view class="priceAmount">
             ¥
+			
             <goodsPrice
+			v-if="!item.is_temporary&&!item.isTemporary"
               :cart="item"
               :limitDiscount="limitDiscount"
               :shopUserInfo="shopUserInfo"
               :shopInfo="shopInfo"
               idKey="product_id"
             ></goodsPrice>
+			<text v-else>{{item.discount_sale_amount}}</text>
             <view class="old-price" v-if="showLimitDiscount(item)"
               >¥{{ item.salePrice }}</view
             >
           </view>
-          <view class="num">x{{ item.num }}</view>
+          <view class="num" v-if="!item.is_temporary&&!item.isTemporary">x{{ item.num }}</view>
+          <view class="num" v-else>x{{ item.number }}</view>
         </view>
       </view>
     </view>

pages/order/components/orderInfo.vue

@@ -40,10 +40,20 @@
           :nowCarts="nowCarts"
           :limitDiscount="cartStore.limitTimeDiscount"
         ></orderItemVue> -->
-				<orderItemVue :useVipPrice="useVipPrice" v-if="cartStore.allGoods.length" :nowCarts="cartStore.allGoods"
+				<orderItemVue :useVipPrice="useVipPrice" v-if="nowCarts" :nowCarts="nowCarts"
 					:shopInfo="cartStore.shopInfo" :shopUserInfo="cartStore.shopUserInfo"
 					:limitDiscount="cartStore.limitTimeDiscount"></orderItemVue>
 				
+				<view class="u-flex u-row-center u-m-t-16 u-font-28" v-if="cartStore.allGoods.length>4">
+					<view class="u-flex u-col-baseline" @click="showAllGoods=!showAllGoods">
+						<text>{{showAllGoods?'收起':'展开'}}</text>
+						<view class="guodu u-m-l-10 u-m-t-2" :class="{rotate:!showAllGoods}">
+							<up-icon name="arrow-down" size="14"></up-icon>
+						</view>
+					</view>
+				
+				</view>	
+
 				<template v-if="listinfo.id&&listinfo.status=='done'">
 					<view class="cell-item" v-if="is_type != 0">
 						<view class="label">打包费</view>
@@ -329,6 +339,8 @@
 		BigNumber
 	} from "bignumber.js";
 	
+	
+	const showAllGoods=ref(false)
 	let hasCouponCanUse = ref(false);
 
 	const usePoints = ref(false);
@@ -852,6 +864,16 @@
 		await getConsumeDiscount();
 		getDiscountActivity();
 	});
+	
+	const nowCarts=computed(()=>{
+		if(cartStore.allGoods.length<=0){
+			return []
+		}
+		if(showAllGoods.value){
+			return cartStore.allGoods
+		}
+		return cartStore.allGoods.slice(0,4)
+	})
 </script>
 
 <style lang="scss" scoped>
@@ -1587,4 +1609,11 @@
 			}
 		}
 	}
+	.guodu{
+		transition:all .3s linear; 
+		padding-top: 2rpx;
+	}
+	.rotate{
+		transform: rotate(-90deg);
+	}
 </style>

pages/order/components/orderInfoAfter.vue

@@ -70,7 +70,10 @@
 						<view class="item" v-for="item in value" :key="item.id">
 							<view class="cover">
 								<up-image width="76" height="76" radius="16" :src="item.productImg"
-									v-if="item.productId!=-999"></up-image>
+									v-if="!item.isTemporary"></up-image>
+								<u-image width="56" height="56" radius="10"
+									v-else-if="item.isTemporary &&item.productName=='签子'"
+									src="https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/5/b97054debd83486ab7ad8e20ca6a360a.png"></u-image>
 								<up-image width="76" height="76" radius="16"
 									:src="'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/table.png'"
 									mode="heightFix" v-else></up-image>

pages/order/index.vue

@@ -62,8 +62,14 @@
 						<view class="shop-info">
 							<view class="shop-item">
 								<view class="cover" v-for="(item1,index1) in item.goods" :key="index1">
-									<u-image width="56" height="56" radius="10" :src='item1.productImg'
+									
-										v-if="item1.productId!=-999"></u-image>
+									<u-image width="56" height="56" radius="10" :src="item1.productImg"
+										v-if="!item1.isTemporary"></u-image>
+										
+									<u-image width="56" height="56" radius="10"
+										v-else-if="item1.isTemporary &&item1.productName=='签子'"
+										src="https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/5/b97054debd83486ab7ad8e20ca6a360a.png"
+									></u-image>
 									<u-image width="112" height="112" radius="20"
 										:src="'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/table.png'"
 										mode="heightFix" v-else></u-image>
@@ -130,32 +136,37 @@
 	import {
 		useNavbarStore
 	} from '@/stores/navbarStore';
-	import {APIshopUserInfo} from '@/common/api/member.js'
+	import {
+		APIshopUserInfo
+	} from '@/common/api/member.js'
 	const store = useNavbarStore();
 
-	async function agignOrder(item){
+	async function agignOrder(item) {
 		await APIshopUserInfo({
-			shopId:item.shopId
+			shopId: item.shopId
-		}).then(shopUserInfo=>{
+		}).then(shopUserInfo => {
-			if(shopUserInfo){
+			if (shopUserInfo) {
 				uni.cache.set("dinersNum", 1);
 				uni.cache.set("tableCode", shopUserInfo.id);
 				uni.cache.set("shopId", item.shopId);
 				uni.navigateTo({
-					url: "/pages/product/index?type=beforehand&order_id="+item.id+'&one_more_order=1',
+					url: "/pages/product/index?type=beforehand&order_id=" + item.id +
+						'&one_more_order=1',
 				});
 			}
 		})
 
 	}
-	function totalGoodsNum(arr){
+
-		if(!arr){
+	function totalGoodsNum(arr) {
+		if (!arr) {
 			return 0
 		}
-		return arr.reduce((prve,cur)=>{
+		return arr.reduce((prve, cur) => {
-			return prve+cur.num
+			return prve + cur.num
-		},0)
+		}, 0)
 	}
+
 	function isRemoveOrder(item) {
 		uni.showModal({
 			title: '提示',
@@ -578,7 +589,8 @@
 	.ml-20 {
 		margin-left: 20rpx;
 	}
-	.take_food_number{
+
+	.take_food_number {
 		padding: 20rpx;
 		background-color: #F8F8F8;
 		margin-left: 36rpx;

pages/product/components/shoppingCartes.vue

@@ -26,17 +26,18 @@
 										<view class="limit-discount" v-if="showLimitDiscount(item)">
 											限时折扣
 										</view>
-										<up-image :src="item.coverImg" width="124rpx" height="124rpx" mode="aspectFill"
+										<up-image v-if="!item.cartListinfo.is_temporary" :src="item.coverImg" width="124rpx" height="124rpx" mode="aspectFill"
+											radius="10"></up-image>
+										<up-image v-else-if="item.cartListinfo.is_temporary&&item.cartListinfo.product_name=='签子'" src="https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/5/b97054debd83486ab7ad8e20ca6a360a.png" width="124rpx" height="124rpx" mode="aspectFill"
+											radius="10"></up-image>	
+										<up-image v-else width="124rpx" height="124rpx" mode="aspectFill"
 											radius="10"></up-image>	
 									</view>
 									<view class="info">
-										<view class="name">
+										<view class="name" v-if=" item.cartListinfo.is_temporary == 1">
-											{{
+											{{item.cartListinfo.product_name||item.cartListinfo.name|| item.name}}
-                        item.cartListinfo.is_temporary == 1
-                          ? "临时菜"
-                          : item.name
-                      }}
 										</view>
+										<view class="name" v-else>{{item.name}}</view>
 										<view class="select-sku-wrap" v-if="item.type == 'sku'">
 											<text v-for="i in item.skuList" :key="i.id">
 												{{ item.cartListinfo.sku_id == i.id ? i.name : "" }}
@@ -206,9 +207,6 @@
 			limitDiscount: props.limitDiscount.id ? props.limitDiscount : null,
 			shopUserInfo: shopUserInfo,
 		});
-		if (goods.name == "纯生纯生纯生") {
-			console.log("returnRealPrice", price);
-		}
 		return price;
 	}
 

pages/product/index.vue

@@ -105,7 +105,7 @@
 											:class="shopInfo.isVip == 0 || shopInfo.isMemberPrice == 0 ? 'lineThrough' : ''">¥</text>
 										<!-- 会员价与价格 -->
 										<text class="price">
-											{{ shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1 ? item.memberPrice || item.salePrice : item.salePrice }}
+											{{ shopUserInfo.isVip == 1 && shopUserInfo.isMemberPrice == 1 ? item.memberPrice || item.salePrice : item.salePrice }}
 										</text>
 										<!-- 单位 -->
 										<text class="unit" v-if="item.unitName">/{{ item.unitName }}</text>
@@ -148,8 +148,10 @@
 										@click.stop="clickspecifications(item, index, index1)">
 										<text class="t no-wrap" v-if="item.groupType == '1'">选择套餐</text>
 										<text class="t" v-else>选规格</text>
+										<!-- <text class="dot num"
+											v-if="item.cartNumber > 0">{{ ifcartNumber(item) < 99 ? ifcartNumber(item) : '99+' }}</text> -->
 										<text class="dot num"
-											v-if="item.cartNumber > 0">{{ ifcartNumber(item) < 99 ? ifcartNumber(item) : '99+' }}</text>
+											v-if="returnGoodsImCartNum(item)">{{ returnGoodsImCartNum(item) < 99 ? returnGoodsImCartNum(item) : '99+' }}</text>
 									</view>
 									<view class="Controls" v-else>
 										<view class="btn" v-if="item.cartNumber != '0'">
@@ -158,7 +160,10 @@
 											<!-- <view class="btnClick"
 												@tap.stop="$u.throttle(() => singleclick(item, '-'), 500)"></view> -->
 										</view>
-										<text class="num">{{ ifcartNumber(item) }}</text>
+										<!-- <text class="num">{{ ifcartNumber(item) }}</text> -->
+										
+										<text class="dot num"
+											v-if="returnGoodsImCartNum(item1)">{{ returnGoodsImCartNum(item1) < 99 ? returnGoodsImCartNum(item1) : '99+' }}</text>
 										<view class="btn">
 											<up-icon name="plus-circle-fill" color="#E9AB7A" size="25"></up-icon>
 											<!-- <view class="btnClick"
@@ -252,7 +257,7 @@
 										<view class="money">
 											<view>￥</view>
 											<text class="money_num" style="margin-right: 10rpx">
-												{{ shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1 ? item1.memberPrice || item1.salePrice : item1.salePrice }}
+												{{ shopUserInfo.isVip == 1 && shopUserInfo.isMemberPrice == 1 ? item1.memberPrice || item1.salePrice : item1.salePrice }}
 											</text>
 											<text v-if="item1.unitName">/{{ item1.unitName }}</text>
 										</view>
@@ -288,8 +293,11 @@
 												@click.stop="clickspecifications(item1, index, index1)">
 												<text class="t no-wrap" v-if="item1.groupType == '1'">选择套餐</text>
 												<text class="t" v-else>选规格</text>
+												<!-- <text class="dot num"
+													v-if="item1.cartNumber > 0">{{ ifcartNumber(item1) < 99 ? ifcartNumber(item1) : '99+' }}</text> -->
+
 												<text class="dot num"
-													v-if="item1.cartNumber > 0">{{ ifcartNumber(item1) < 99 ? ifcartNumber(item1) : '99+' }}</text>
+													v-if="returnGoodsImCartNum(item1)">{{ returnGoodsImCartNum(item1) < 99 ? returnGoodsImCartNum(item1) : '99+' }}</text>
 											</view>
 										</view>
 										<view class="Controls" v-else>
@@ -437,9 +445,39 @@
 							</view>
 						</view>
 					</view>
+
+					<!-- 推荐搭配 -->
+					<view class="u-m-t-48 u-p-30">
+						<view class="font-bold u-font-32 ">推荐搭配</view>
+						<view class="u-flex recommand-goods">
+							<view class=" item" v-for="(item,index) in 6" :key="index">
+								<up-image width="210rpx" height="210rpx" radius="12rpx"></up-image>
+								<view class="info">
+									<view class="u-line-2 name u-m-t-10 u-font-32 font-500">
+										商品名
+									</view>
+
+									<view class="u-flex u-row-between">
+										<view class="font-bold">
+											<text class="u-font-24">￥</text>
+											<text class="u-font-32">40</text>
+										</view>
+										<view class="btn">
+											<up-icon name="plus-circle-fill" color="#E9AB7A" size="25"></up-icon>
+
+										</view>
+									</view>
+
+								</view>
+
+
+							</view>
+						</view>
+
+
+					</view>
 				</scroll-view>
 				<!-- 占位 -->
-				<view style="height: 42rpx;"></view>
 				<view class="shop_bottom">
 					<view class="flex-between">
 						<view class="price price-sku"
@@ -453,7 +491,7 @@
 
 							<text class="num" v-if="false">
 								{{
-									shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1
+									shopUserInfo.isVip == 1 && shopUserInfo.isMemberPrice == 1
 										? specifications.item.result.memberPrice || specifications.item.result.salePrice
 										: specifications.item.result.salePrice
 								}}
@@ -471,7 +509,7 @@
 							</view>
 							<text class="num" v-if="false">
 								{{
-									shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1
+									shopUserInfo.isVip == 1 && shopUserInfo.isMemberPrice == 1
 										? specifications.item.memberPrice || specifications.item.salePrice
 										: specifications.item.salePrice
 								}}
@@ -536,7 +574,17 @@
 		<Loading :isLoading="!useSocket.isConnected" />
 		<ModalList></ModalList>
 		<recommendGoodsModal v-if="isDataLoaded" @onBuyClick="onBuyClick"></recommendGoodsModal>
-		<goodsModal></goodsModal>
+	
+		<view
+		v-for="(item,index) in goodsModalList" :key="index"
+		>
+		<goodsModal :key="index" v-model="item.show" :goods="item.goods" @prveImgs="prveImgs" @close="goodsModalClose(index)"
+		@websocketsendMessage="websocketsendMessage"
+		@modalAdd="modalAdd"
+		:GoodsIDInCartNumMap="GoodsIDInCartNumMap"
+		></goodsModal>
+		</view>
+		
 		<xbSwiperPreview :visable="showPrveImg" :imgs="prveImgsList" @update:visable="updateShowPrveImg">
 		</xbSwiperPreview>
 		<!-- 显示选择人数popup -->
@@ -594,7 +642,8 @@
 		productminiApphotsquery,
 		APIgroupquery,
 		APIminiAppinfo,
-		APIminiAppskuinfo
+		APIminiAppskuinfo,
+		productRelated
 	} from '@/common/api/product/product.js';
 
 	import {
@@ -700,6 +749,9 @@
 	import {
 		useCartStore
 	} from '@/stores/order.js';
+	import {
+		computed, provide
+	} from 'vue';
 	const cartStore = useCartStore();
 	/**
 	 *  store本地存储 end
@@ -710,7 +762,6 @@
 		proxy
 	} = getCurrentInstance();
 
-
 	//点单智能推荐
 	function onBuyClick(item) {
 		let index = -1;
@@ -750,6 +801,7 @@
 	/**
 	 * 通用数据合集 start
 	 */
+
 	// 门店信息
 	const shopInfo = reactive({});
 	Object.assign(shopInfo, uni.cache.get('shopInfo'));
@@ -804,6 +856,35 @@
 
 
 
+
+	// 购物车对应的商品数
+	const GoodsIDInCartNumMap = computed(() => {
+		const map = {}
+		for (let cart of cartStore.carts) {
+			if (map[cart.product_id]) {
+				map[cart.product_id] += cart.number * 1
+			} else {
+				map[cart.product_id] = cart.number * 1
+			}
+
+		}
+		return map
+	})
+
+	/**
+	 * 返回购物车对应的商品数量
+	 */
+	function returnGoodsImCartNum(goods) {
+		if(!goods){
+			return 0
+		}
+		if (GoodsIDInCartNumMap.value.hasOwnProperty(goods.id)) {
+			GoodsIDInCartNumMap.value[goods.id]
+		}
+		return 0
+	}
+
+
 	// 获取商品数据
 	const shopProductList = reactive({
 		hots: [],
@@ -1290,6 +1371,15 @@
 		prveImgs(res.images);
 	}
 	
+	const goodsModalList=ref([])
+	
+	function goodsModalClose(index){
+		goodsModalList.value.splice(index,1)
+	}
+	function modalAdd(item){
+		clickspecifications(item)
+	}
+
 	//获取多规格数据
 	const clickspecifications = async (item, index, indexs, type) => {
 		console.log('clickspecifications', item);
@@ -1305,7 +1395,10 @@
 		// }
 
 		if (item.isSoldStock == 1 || (item.isSaleTime == 0 && !item.isSaleTimeshow)) {
-			return false;
+			return uni.showToast({
+				title:'商品已下架或不在可售时间内',
+				icon:'none'
+			});
 		}
 
 		shopCartNumber.value = 0;
@@ -1350,7 +1443,11 @@
 			.filter(([_, value]) => value.length > 0));
 		// 给默认数量
 		specifications.item.amountcartNumber = 0;
-		showShopsku.value = true;
+		// showShopsku.value = true;
+		goodsModalList.value.push({
+			show:true,
+			goods:specifications.item
+		})
 	};
 	// 判断商品是否在可售时间内
 	const isProductAvailable = async (sellDaysStr, startTimeStr, endTimeStr) => {
@@ -1592,12 +1689,13 @@
 			const goodsSkuList = goods ? goods.skuList : []
 			const findSku = goodsSkuList.find(sku => sku.id == v.sku_id)
 			const memberPrice = findSku ? findSku.memberPrice : 0
+			const is_temporary=v.is_temporary||v.isTemporary
 			const is_time_discount = limitUtils.canUseLimitTimeDiscount({
 					...v,
 					memberPrice
 				}, cartStore.limitTimeDiscount, shopInfo,
 				shopUserInfo.value, 'product_id');
-			if (!goods) {
+			if (!goods&&!is_temporary) {
 				console.log('删除未匹配到的商品', {
 					id: v.id,
 					operate_type: "del",
@@ -3211,7 +3309,6 @@
 		border-radius: 20rpx;
 		background: #fff;
 		box-sizing: border-box;
-		padding-bottom: 200rpx;
 
 		.positionabsolute {
 			position: absolute;
@@ -3246,9 +3343,7 @@
 			border-bottom: 2rpx solid #f0f0f0;
 		}
 
-		.shop_sku_box:last-child {
+
-			padding-bottom: 140rpx;
-		}
 
 		.shop_sku_box {
 			padding: 20rpx;
@@ -3334,9 +3429,6 @@
 			padding: 30rpx 28rpx;
 			background-color: #fff;
 			box-shadow: 0rpx -6rpx 14rpx 2rpx rgba(0, 0, 0, 0.1);
-			position: fixed;
-			left: 0;
-			bottom: 0;
 
 			.price {
 				display: flex;
@@ -3712,4 +3804,31 @@
 		font-size: 12px;
 		margin-left: 20rpx;
 	}
+
+	.recommand-goods {
+		display: flex;
+		flex-wrap: wrap;
+		margin-top: 24rpx;
+
+		.item {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			margin-right: 30rpx;
+			margin-bottom: 30rpx;
+			width: 210rpx;
+
+			&:nth-child(3n) {
+				margin-right: 0;
+			}
+
+			.name {
+				height: 84rpx;
+			}
+
+			.info {
+				width: 100%;
+			}
+		}
+	}
 </style>

pages/user/user.vue

@@ -1,12 +1,16 @@
 <template>
 	<view class="container">
-		<image class="topBack" :src="
+		<image
+			class="topBack"
+			:src="
 				userInfo.shopExtendList
 					? userInfo.shopExtendList[1].value
 						? userInfo.shopExtendList[1].value
 						: 'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/myTopBack.png'
 					: 'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/myTopBack.png'
-      " mode="aspectFill"></image>
+			"
+			mode="aspectFill"
+		></image>
 		<view class="myContent">
 			<view class="my_info flex-between">
 				<view class="my_info_left">
@@ -15,8 +19,7 @@
 						<image class="my_info_left_head" :src="userInfo.headImg" mode="aspectFill"></image>
 					</button>
 					<!-- <view class="name">{{ userInfo.nickName }}</view> -->
-					<input type="nickname" class="name" v-model="userInfo.nickName" placeholder="输入昵称"
+					<input type="nickname" class="name" v-model="userInfo.nickName" placeholder="输入昵称" @blur="onNicknameInput" />
-						@blur="onNicknameInput" />
 					<!-- #endif -->
 					<!-- #ifndef MP-WEIXIN -->
 					<image class="my_info_left_head" :src="userInfo.headImg" mode="aspectFill"></image>
@@ -27,8 +30,7 @@
 					<image class="my_info_right_qr" src="/static/icon/code.png" mode="aspectFill"></image>
 					<view class="msg-view" @click="viewUserMsgList">
 						<view class="msg-icon-wrapper">
-							<image v-if="unreadMsgCount > 0" class="my-msg-icon" src="/static/mine/msg_select.png"
+							<image v-if="unreadMsgCount > 0" class="my-msg-icon" src="/static/mine/msg_select.png" mode="aspectFill"></image>
-								mode="aspectFill"></image>
 							<image v-else class="my-msg-icon" src="/static/mine/msg.png" mode="aspectFill"></image>
 
 							<!-- 角标 -->
@@ -39,7 +41,6 @@
 					</view>
 				</view>
 
-
 				<!-- 		<image class="my_info_right_qr" @click="clickEvent" v-if="userInfo.isVip == 1 && ShopId"
 					:src="'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/my_qRcode.png'" mode="aspectFill">
 				</image>
@@ -55,9 +56,7 @@
 				<view class="amount">
 					<view class="u-flex u-flex-between u-m-t-20">
 						<view class="u-flex">
-							<image style="width: 50rpx; height: 37rpx"
+							<image style="width: 50rpx; height: 37rpx" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/storedValue.png" mode="aspectFill"></image>
-								src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/storedValue.png"
-								mode="aspectFill"></image>
 							<text class="color-333 font-14 u-m-l-20">储值</text>
 						</view>
 						<view class="u-flex color-666" @click="toChargeList">
@@ -67,23 +66,17 @@
 					</view>
 
 					<view class="card-list">
-						<view class="card-list-item" v-for="(item, index) in rechargeList" :key="index"
+						<view class="card-list-item" v-for="(item, index) in rechargeList" :key="index" @click="toCharge(item)">
-							@click="toCharge(item)">
 							<up-image radius="20rpx" width="182rpx" height="182rpx" :src="item.logo"></up-image>
 							<view class="info text-center">
 								<view class="color-333 u-m-t-14">
 									<text class="font-10">¥</text>
-									<text class="font-16 font-700">{{
+									<text class="font-16 font-700">{{ item.amount || '0.00' }}</text>
-                    item.amount || "0.00"
-                  }}</text>
 								</view>
-								<view class="font-12 color-666 u-line-1">{{
+								<view class="font-12 color-666 u-line-1">{{ item.shopName }}</view>
-                  item.shopName
-                }}</view>
 							</view>
 						</view>
-						<view class="u-flex u-flex-column u-flex-center" style="width: 12px" v-if="rechargeList.length"
+						<view class="u-flex u-flex-column u-flex-center" style="width: 12px" v-if="rechargeList.length" @click="toChargeList">
-							@click="toChargeList">
 							<view class="text-center color-333 font-12">查看全部</view>
 						</view>
 					</view>
@@ -91,8 +84,7 @@
 				<view class="vip u-m-t-40">
 					<view class="u-flex u-flex-between u-m-t-20">
 						<view class="u-flex">
-							<image style="width: 50rpx; height: 40rpx" src="/static/icon/vip.png" mode="aspectFill">
+							<image style="width: 50rpx; height: 40rpx" src="/static/icon/vip.png" mode="aspectFill"></image>
-							</image>
 							<text class="color-333 font-14 u-m-l-20">会员</text>
 						</view>
 						<view class="u-flex color-666" @click="tomemberList">
@@ -102,13 +94,10 @@
 					</view>
 
 					<view class="card-list">
-						<view class="card-list-item" v-for="(item, index) in memberList" :key="index"
+						<view class="card-list-item" v-for="(item, index) in memberList" :key="index" @click="tomember(item)">
-							@click="tomember(item)">
 							<up-image radius="20rpx" width="182rpx" height="182rpx" :src="item.logo"></up-image>
 							<view class="info text-center">
-								<view class="font-12 color-666 u-m-t-14 u-line-1">{{
+								<view class="font-12 color-666 u-m-t-14 u-line-1">{{ item.shopName }}</view>
-                  item.shopName
-                }}</view>
 							</view>
 						</view>
 						<view class="u-flex u-flex-column u-flex-center" style="width: 12px" v-if="memberList.length">
@@ -119,9 +108,7 @@
 				<view class="amount">
 					<view class="u-flex u-flex-between u-m-t-20">
 						<view class="u-flex">
-							<image style="width: 50rpx; height: 44rpx"
+							<image style="width: 50rpx; height: 44rpx" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/points.png" mode="aspectFill"></image>
-								src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/points.png" mode="aspectFill">
-							</image>
 							<text class="color-333 font-14 u-m-l-20">积分</text>
 						</view>
 						<view class="u-flex color-666" @click="toCoin()">
@@ -131,22 +118,16 @@
 					</view>
 
 					<view class="card-list">
-						<view class="card-list-item" v-for="(item, index) in coinList" :key="index"
+						<view class="card-list-item" v-for="(item, index) in coinList" :key="index" @click="toCoin(item)">
-							@click="toCoin(item)">
 							<up-image radius="20rpx" width="182rpx" height="182rpx" :src="item.logo"></up-image>
 							<view class="info text-center">
 								<view class="color-333 u-m-t-14">
-									<text class="font-16 font-700">{{
+									<text class="font-16 font-700">{{ item.pointBalance || '0' }}</text>
-                    item.pointBalance || "0"
-                  }}</text>
 								</view>
-								<view class="font-12 color-666 u-line-1">{{
+								<view class="font-12 color-666 u-line-1">{{ item.shopName }}</view>
-                  item.shopName
-                }}</view>
 							</view>
 						</view>
-						<view class="u-flex u-flex-column u-flex-center" style="width: 12px" v-if="coinList.length"
+						<view class="u-flex u-flex-column u-flex-center" style="width: 12px" v-if="coinList.length" @click="toCoin()">
-							@click="toCoin()">
 							<view class="text-center color-333 font-12">查看全部</view>
 						</view>
 					</view>
@@ -154,16 +135,13 @@
 			</view>
 			<view class="my_item my_fun u-m-t-30">
 				<view class="my_fun_list">
-					<view class="my_list_item" v-for="(item, index) in myFunList" :key="index"
+					<view class="my_list_item" v-for="(item, index) in myFunList" :key="index" @click="clickTo(item, index)">
-						@click="clickTo(item, index)">
 						<view class="my_list_item_left">
 							<image class="my_list_item_icon" :src="item.icon" mode="aspectFill"></image>
 							<view class="my_list_item_name">{{ item.name }}</view>
 						</view>
 						<view class="my_list_item_right u-flex">
-							<text v-if="item.type == 'score'" class="font-12">{{
+							<text v-if="item.type == 'score'" class="font-12">{{ userInfo.pointBalance || 0 }}</text>
-                userInfo.pointBalance || 0
-              }}</text>
 							<!-- <text v-else-if="item.type=='my_coupon'" class="font-12 ">{{userInfo.couponNum || 0}}</text> -->
 							<text class="font-12 color-999" v-else>查看</text>
 							<u-icon class="u-m-t-2" name="arrow-right" color="#999999" size="12"></u-icon>
@@ -190,47 +168,58 @@
 </template>
 
 <script setup>
-	import weQrcode from "@/components/wechat-ac-qrcode.vue";
+import weQrcode from '@/components/wechat-ac-qrcode.vue';
-	import devetools from "@/components/devetools.vue";
+import devetools from '@/components/devetools.vue';
 
-	import {
+import { ref, computed, onMounted, reactive, watch } from 'vue';
-		ref,
+import { onLoad, onReady, onShow } from '@dcloudio/uni-app';
-		computed,
+import { productStore, Storelogin } from '@/stores/user.js';
-		onMounted,
+import * as vipApi from '@/common/api/account/vip.js';
-		reactive,
+import * as rechargeApi from '@/common/api/market/recharge.js';
-		watch
+import { pointsShopList } from '@/common/api/market/points.js';
-	} from "vue";
+import { getUnReadCountReq } from '../../common/api/account/message';
-	import {
+import { updateUserInfoReq } from '../../common/api/api';
-		onLoad,
+import { uploadFile } from '@/common/api/upload.js';
-		onReady,
-		onShow
-	} from "@dcloudio/uni-app";
-	import {
-		productStore
-	} from "@/stores/user.js";
-	import * as vipApi from "@/common/api/account/vip.js";
-	import * as rechargeApi from "@/common/api/market/recharge.js";
-	import {
-		pointsShopList
-	} from '@/common/api/market/points.js'
-	import {
-		getUnReadCountReq
-	} from "../../common/api/account/message";
-	import {
-		updateUserInfoReq
-	} from "../../common/api/api";
-	import {
-		uploadFile
-	} from '@/common/api/upload.js';
 
-
+// 打开企业微信客服
-
+const userStore = Storelogin();
-	function qrcodeResult(res) {
+function openContact() {
-		qrcode.value = res;
+	const shopInfo = uni.cache.get('ordershopUserInfo');
+	if (shopInfo.weworkId && shopInfo.weworkUrl) {
+		wx.openCustomerServiceChat({
+			// corpId: 'wwc76ab19fa6df267f',
+			corpId: shopInfo.weworkId,
+			extInfo: {
+				// url: 'https://work.weixin.qq.com/kfid/kfc40ac2dc5e20c2e8e'
+				url: shopInfo.weworkUrl
+			},
+			// 成功回调
+			success: (res) => {
+				console.log('跳转企业微信客服成功', res);
+			},
+			// 失败回调
+			fail: (err) => {
+				console.error('跳转企业微信客服失败', err);
+				uni.showToast({
+					title: '跳转客服失败，请稍后重试',
+					icon: 'none'
+				});
 			}
+		});
+	} else {
+		uni.showToast({
+			title: '未开放',
+			icon: 'none'
+		});
+	}
+}
 
-	const store = productStore();
+function qrcodeResult(res) {
-	const myFunList = ref([
+	qrcode.value = res;
+}
+
+const store = productStore();
+const myFunList = ref([
 	// {
 	// 	name: "积分",
 	// 	type: "score",
@@ -238,14 +227,14 @@
 	// 	url: '/user/score/list'
 	// },
 	{
-			name: "优惠券",
+		name: '优惠券',
-			type: "my_coupon",
+		type: 'my_coupon',
-			icon: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/my_coupon.png",
+		icon: 'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/my_coupon.png'
 	},
 	{
-			name: "分销",
+		name: '分销',
-			type: "fenxiao",
+		type: 'fenxiao',
-			icon: "/static/icon/fenxiao.svg",
+		icon: '/static/icon/fenxiao.svg'
 	},
 	// {
 	//   name: "商家推送",
@@ -269,34 +258,35 @@
 	// 	icon: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/my_member.png"
 	// },
 	// { name: "关于", type: "", icon: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/inRegard.png"},
-	]);
+	{ name: '联系商家', type: 'contact', icon: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/2b0480c32c1844dbae2c09f6a729c6e8.png' }
+]);
 
-	const userInfo = reactive({});
+const userInfo = reactive({});
 
-	const ShopId = ref(uni.cache.get("shopId"));
+const ShopId = ref(uni.cache.get('shopId'));
-	console.log("ShopId", uni.cache.get("shopId"));
+console.log('ShopId', uni.cache.get('shopId'));
 
-	function tomemberList() {
+function tomemberList() {
 	uni.navigateTo({
-			url: "/pages/user/member/list",
+		url: '/pages/user/member/list'
 	});
-	}
+}
 
-	function tomember(item) {
+function tomember(item) {
 	uni.navigateTo({
-			url: "/user/vip/vip?shopId=" + item.shopId,
+		url: '/user/vip/vip?shopId=' + item.shopId
 	});
-	}
+}
 
-	const clickEvent = () => {
+const clickEvent = () => {
 	if (ShopId.value) {
 		if (!userInfo.isVip) {
 			uni.navigateTo({
-					url: "/user/vip/buy-vip?shopId=" + ShopId.value,
+				url: '/user/vip/buy-vip?shopId=' + ShopId.value
 			});
 		} else {
 			uni.navigateTo({
-					url: "/user/vip/vip?shopId=" + ShopId.value,
+				url: '/user/vip/vip?shopId=' + ShopId.value
 			});
 		}
 
@@ -312,115 +302,118 @@
 		// 	})
 		// }
 	} else {
-			uni.pro.navigateTo("member/list", {
+		uni.pro.navigateTo('member/list', {
-				type: "user_payCode",
+			type: 'user_payCode'
 		});
 	}
-	};
+};
 
-	// 我的资产
+// 我的资产
-	const Myassets = () => {
+const Myassets = () => {
-		if (uni.cache.get("shopId")) {
+	if (uni.cache.get('shopId')) {
-			uni.pro.navigateTo("user/member/memberdetails", {
+		uni.pro.navigateTo('user/member/memberdetails', {
-				shopId: uni.cache.get("shopId"),
+			shopId: uni.cache.get('shopId'),
-				type: "index",
+			type: 'index'
 		});
 	} else {
-			uni.pro.navigateTo("user/member/list", {
+		uni.pro.navigateTo('user/member/list', {
-				shopId: uni.cache.get("shopId"),
+			shopId: uni.cache.get('shopId'),
-				type: "index",
+			type: 'index'
 		});
 	}
-	};
+};
 
-	function toCharge(item) {
+function toCharge(item) {
 	uni.navigateTo({
-			url: "/pages/user/member/czzx?shopId=" + item.shopId,
+		url: '/pages/user/member/czzx?shopId=' + item.shopId
 	});
-	}
+}
 
-	function toChargeList() {
+function toChargeList() {
 	uni.navigateTo({
-			url: "/pages/user/member/amount-list",
+		url: '/pages/user/member/amount-list'
 	});
-	}
+}
 
-	const clickTo = (item, index) => {
+const clickTo = (item, index) => {
 	if (item.url) {
 		uni.navigateTo({
-				url: item.url,
+			url: item.url
 		});
 		return;
 	}
 	let shopId = null;
 	switch (item.type) {
-			case "msg":
+		case 'msg':
 			uni.navigateTo({
-					url: "/pageChat/index"
+				url: '/pageChat/index'
 			});
 			break;
-			case "my_order":
+		case 'my_order':
-				uni.pro.switchTab("order/index");
+			uni.pro.switchTab('order/index');
 			break;
-			case "my_member":
+		case 'my_member':
-				uni.pro.navigateTo("user/member/list");
+			uni.pro.navigateTo('user/member/list');
 			break;
-			case "recharge":
+		case 'recharge':
-				if (uni.cache.get("shopId") && uni.cache.get("token")) {
+			if (uni.cache.get('shopId') && uni.cache.get('token')) {
-					uni.pro.navigateTo("member/index", {
+				uni.pro.navigateTo('member/index', {
-						shopId: uni.cache.get("shopId"),
+					shopId: uni.cache.get('shopId'),
-						type: "index",
+					type: 'index'
 				});
 			} else {
-					uni.pro.navigateTo("member/list", {
+				uni.pro.navigateTo('member/list', {
-						type: "user_recharge",
+					type: 'user_recharge'
 				});
 			}
 			break;
-			case "points": //积分
+		case 'points': //积分
-				if (uni.cache.get("shopId") && uni.cache.get("token")) {
+			if (uni.cache.get('shopId') && uni.cache.get('token')) {
-					uni.pro.navigateTo("/pagesPoints/index/index", {
+				uni.pro.navigateTo('/pagesPoints/index/index', {
-						shopId: uni.cache.get("shopId"),
+					shopId: uni.cache.get('shopId'),
-						type: "user",
+					type: 'user'
 				});
 			} else {
-					uni.pro.navigateTo("member/list", {
+				uni.pro.navigateTo('member/list', {
-						type: "user_points",
+					type: 'user_points'
 				});
 			}
 			break;
-			case "my_coupon": //优惠券
+		case 'my_coupon': //优惠券
-				uni.pro.navigateTo("user/coupon", {
+			uni.pro.navigateTo('user/coupon', {
-					shopId: uni.cache.get("shopId") || "",
+				shopId: uni.cache.get('shopId') || ''
 			});
 			break;
-			case "fenxiao": //优惠券
+		case 'fenxiao': //优惠券
 			uni.navigateTo({
-					url: "/distribution/index",
+				url: '/distribution/index'
 			});
 			break;
-			case "myself": //内部页面
+		case 'myself': //内部页面
-				uni.pro.navigateTo("user/myself");
+			uni.pro.navigateTo('user/myself');
 			break;
-			case "scan_applet":
+		case 'scan_applet':
 			uni.navigateToMiniProgram(JSON.parse(item.value));
 			break;
-			case "absolute": //外链url
+		case 'absolute': //外链url
 			uni.navigateTo({
-					url: `/pages/webview/webview?url=${item.menuUrl}`,
+				url: `/pages/webview/webview?url=${item.menuUrl}`
 			});
 			break;
+		case 'contact': // 联系商家
+			openContact();
+			break;
 	}
-	};
+};
 
-	const memberList = ref([]);
+const memberList = ref([]);
-	const rechargeList = ref([]);
+const rechargeList = ref([]);
-	const memberTotal = ref(0);
+const memberTotal = ref(0);
-	const rechargeTotal = ref(0);
+const rechargeTotal = ref(0);
 
-	const coinTotal = ref(0);
+const coinTotal = ref(0);
-	const coinList = ref([]);
+const coinList = ref([]);
-	async function getData() {
+async function getData() {
 	const res = await vipApi.list();
 	memberTotal.value = res.length;
 	memberList.value = res.slice(0, 3);
@@ -430,103 +423,103 @@
 
 	const res3 = await pointsShopList();
 	coinTotal.value = res3.length;
-		coinList.value = res3;
+	coinList.value = res3.slice(0, 3);
-	}
+}
 
-	function toCoin(item) {
+function toCoin(item) {
-		if(item){
+	if (item) {
 		uni.navigateTo({
-				url: "/pages/user/member/billDetails?type=2&shopId="+item.shopId+"&id="+(item.id||''),
+			url: '/pages/user/member/billDetails?type=2&shopId=' + item.shopId + '&id=' + (item.id || '')
 		});
-			return 
+		return;
 	}
 	uni.navigateTo({
-			url: "/user/score/list",
+		url: '/user/score/list'
 	});
-	}
+}
 
-	const unreadMsgCount = ref(0);
+const unreadMsgCount = ref(0);
 
-	const getUnReadMsgCount = async () => {
+const getUnReadMsgCount = async () => {
-		let res = await getUnReadCountReq()
+	let res = await getUnReadCountReq();
 
-		let badge = Number(res)
+	let badge = Number(res);
 	if (badge > 0) {
 		uni.setTabBarBadge({
 			index: 2,
 			text: badge.toString()
-			})
+		});
 	} else {
 		uni.removeTabBarBadge({
 			index: 2
-			})
+		});
 	}
 
-		unreadMsgCount.value = badge
+	unreadMsgCount.value = badge;
-	}
+};
 
-	const viewUserMsgList = () => {
+const viewUserMsgList = () => {
 	uni.navigateTo({
-			url: "/pages/user/message/index"
+		url: '/pages/user/message/index'
-		})
+	});
-	}
+};
 
-	onShow(() => {
+onShow(() => {
-		loadUserInfo()
+	loadUserInfo();
-		console.log("userInfo", userInfo);
+	console.log('userInfo', userInfo);
 	getData();
 
-		getUnReadMsgCount()
+	getUnReadMsgCount();
-	});
+});
 
-	const loadUserInfo = async () => {
+const loadUserInfo = async () => {
 	await store.actionsAPIuser();
-		if (uni.cache.get("shopId")) {
+	if (uni.cache.get('shopId')) {
-			Object.assign(userInfo, uni.cache.get("orderVIP"));
+		Object.assign(userInfo, uni.cache.get('orderVIP'));
 	} else {
 		Object.assign(userInfo, {
-				...uni.cache.get("userInfo"),
+			...uni.cache.get('userInfo'),
-				...uni.cache.get("userInfo").assetsSummary,
+			...uni.cache.get('userInfo').assetsSummary
 		});
 	}
-	}
+};
 
-	const qrcode = ref("");
+const qrcode = ref('');
-	const showQrcode = computed(() => {
+const showQrcode = computed(() => {
-		const followIndex = uni.cache.get("followIndex");
+	const followIndex = uni.cache.get('followIndex');
-		if (followIndex == "mine" && qrcode.value) {
+	if (followIndex == 'mine' && qrcode.value) {
 		return true;
 	}
+});
+
+const onChooseAvatar = async (e) => {
+	const fileRes = await uploadFile(e.detail.avatarUrl);
+	updateUserInfo({
+		headImg: fileRes
 	});
+};
 
-	const onChooseAvatar = async (e) => {
+const onNicknameInput = (e) => {
-		const fileRes = await uploadFile(e.detail.avatarUrl)
 	updateUserInfo({
-			"headImg": fileRes
+		nickName: e.detail.value
-		})
+	});
-	}
+};
 
-	const onNicknameInput = (e) => {
+const updateUserInfo = async (param) => {
-		updateUserInfo({
+	await updateUserInfoReq(param);
-			"nickName": e.detail.value
-		})
-	}
 
-	const updateUserInfo = async (param) => {
+	loadUserInfo();
-		await updateUserInfoReq(param)
+};
-
-		loadUserInfo()
-	}
 </script>
 
 <style scoped lang="scss">
-	.topBack {
+.topBack {
 	width: 100%;
 	height: 400rpx;
 	position: absolute;
-	}
+}
 
-	.myContent {
+.myContent {
 	position: relative;
 	z-index: 1;
 	padding: 298rpx 0 60rpx 0;
@@ -668,9 +661,9 @@
 			}
 		}
 	}
-	}
+}
 
-	.card-list {
+.card-list {
 	display: grid;
 	grid-template-columns: repeat(4, 1fr);
 	column-gap: 40rpx;
@@ -687,21 +680,21 @@
 			overflow: hidden;
 		}
 	}
-	}
+}
 
-	.qrcode {
+.qrcode {
 	padding: 24rpx;
 	margin: 60rpx 32rpx 60rpx 32rpx;
 	border-radius: 18rpx;
 	border: 2rpx solid #d9d9d9;
-	}
+}
 
-	.qrcode-box {
+.qrcode-box {
 	position: fixed;
 	transform: translateX(200vw, 200vh);
-	}
+}
 
-	.right-icons {
+.right-icons {
 	display: flex;
 
 	.my_info_right_qr {
@@ -742,5 +735,5 @@
 			text-align: center;
 		}
 	}
-	}
+}
 </style>

pnpm-lock.yaml

@@ -30,8 +30,8 @@ importers:
         specifier: ^0.1.2
         version: 0.1.2
       ysk-utils:
-        specifier: ^1.0.81
+        specifier: ^1.0.83
-        version: 1.0.81
+        version: 1.0.83
     devDependencies:
       unplugin-auto-import:
         specifier: ^0.16.7
@@ -357,8 +357,8 @@ packages:
   webpack-virtual-modules@0.6.2:
     resolution: {integrity: sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==}
 
-  ysk-utils@1.0.81:
+  ysk-utils@1.0.83:
-    resolution: {integrity: sha512-c6SOfOaw43aDDuyXgEv24Vo561EfFoa1gfGbY+p1EfXHoGPOE6tQLekbWW9bn37KAse0Gdef7VCbdv0Dr6ltaw==}
+    resolution: {integrity: sha512-48KLQJXQtF8nLaaFHR1hAFx/QGS848fg7n37BpZEtwliD+D5ZHQFPOCZNaM68jiwDTWhNg41rHpZzhAUQXe+/Q==}
 
 snapshots:
 
@@ -684,7 +684,7 @@ snapshots:
 
   webpack-virtual-modules@0.6.2: {}
 
-  ysk-utils@1.0.81:
+  ysk-utils@1.0.83:
     dependencies:
       bignumber.js: 9.3.1
       loadsh: 0.0.4

stores/carts.js

@@ -329,7 +329,11 @@ export const useCartsStore = defineStore("cart", () => {
 			.map((v) => {
 			
 				const item = getProductDetails(v);
-				if (!item) {
+				const is_temporary=v.is_temporary||v.isTemporary
+				if(is_temporary){
+					return v
+				}
+				if (!item&&!is_temporary) {
 					socketSendMsg({
 						id: v.id,
 						operate_type: "del",
@@ -499,10 +503,10 @@ export const useCartsStore = defineStore("cart", () => {
 			return false;
 		}
 		const isUse =
-			shopUserInfo.value.isVip && shopUserInfo.value.isMemberPrice && shopInfo.value
+			shopUserInfo.value.isVip && shopUserInfo.value.isMemberPrice ?
-			.isMemberPrice == 1 ?
 			true :
 			false;
+			console.log('useVipPrice',isUse);
 		return isUse;
 	});
 

vite.config.js

@@ -33,11 +33,11 @@ module.exports = defineConfig({
 	],
 	server: {
 		proxy: {
-			'/api': {
+			'/testApi': {
 				// target: 'https://cashier.sxczgkj.com', // 目标服务器地址
 				target: 'http://192.168.1.42/', // 目标服务器地址
 				changeOrigin: true, // 是否更改请求源
-				rewrite: path => path.replace(/^\/api/, '')
+				rewrite: path => path.replace(/^\/testApi/, '')
 			},
 			'/prodApi': {
 				target: 'https://cashier.sxczgkj.com', // 目标服务器地址