api/park.js

@@ -17,6 +17,4 @@ export const apiArr = {
   tempParkingOrderQuery: '/api/v2/wechat/smart-parking/temp-parking/trade_query', // 临时车缴费订单交易查询
   
   parkList: '/api/v2/wechat/smart-parking/parking/list', // 停车场列表
-
-  deleteCar: '/api/v2/wechat/smart-parking/car/del', // 删除车辆
 }

packages/park/index/index.vue

@@ -73,15 +73,18 @@ export default {
         success: (res) => {
           if (res.confirm) {
             const params = {
-              car_id: item.id
+              user_id: uni.getStorageSync('userId'),
+              car_id: item.car_id
             }
             request(apiArr.deleteCar, "POST", params).then((res) => {
+              if (res.code == 200) {
                 uni.showToast({
                   title: '删除成功',
                   icon: 'success',
                   duration: 2000
                 });
                 this.getCarList();
+              }
             })
           }
         }

packages/shop/goods/index.css

@@ -333,15 +333,6 @@ image {
     display: flex;
 }
 
-.shadowBox1Item_btn{
-    width: 150rpx;
-    height: 170rpx;
-	opacity:0;
-    position: absolute;
-    left: 100rpx;
-    top: 40rpx;
-}
-
 .shadowBox1Item {
     flex: 1;
     display: flex;

packages/shop/goods/index.vue

@@ -203,7 +203,6 @@
 		<!-- 分享 -->
 		<view class="shadow" @click.stop="changeShadow" v-if="boxshadow1">
 			<view class="shadowBox1">
-				<button class="shadowBox1Item_btn" open-type="share" bindtap="onShareButtonClick"/>
 				<view class="shadowBox1Item" @click="shareFriend">
 					<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_WX.png"
 						mode="aspectFill"></image>
@@ -222,18 +221,15 @@
 				<view class="shadowBox_img">
 					<view class="boxshadow_tit">今日商品推荐</view>
 					<view class="boxshadow_img">
-						<image v-if="currentGG && currentGG.commodity_pic && currentGG.commodity_pic.length > 0"
+						<image
-							:src="picUrl + currentGG.commodity_pic[0]">
-						</image>
-						<image v-else
 							src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_share_img.png">
 						</image>
 					</view>
 					<view class="line"></view>
 					<view class="shadowBoxInfo">
-						<image class="shadowboxInfo_left" :src="qrcodePath || 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/qrcode_placeholder.png'" mode="aspectFill"></image>
+						<view class="shadowboxInfo_left">二维码</view>
 						<view class="shadowboxInfo_right">
-							<view class="shadowboxInfo_right_1">{{ currentGG && currentGG.goods_name ? currentGG.goods_name : '' }}</view>
+							<view class="shadowboxInfo_right_1">正鲜生</view>
 							<view class="shadowboxInfo_right_2">
 								长按识别小程序 <br />
 								数量有限马上抢购
@@ -241,7 +237,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="shadowBox_btn" @click.stop="saveImg(picUrl + currentGG.commodity_pic[0])">保存海报</view>
+				<view class="shadowBox_btn" @click.stop="saveImg">保存海报</view>
 			</view>
 		</view>
 
@@ -348,8 +344,6 @@ export default {
 			changeImg: "",
 			changeName: "",
 			changePrice: "",
-				selectedGoods: null, // 保存传入的商品规格信息
-				qrcodePath: null, // 存储当前页面的二维码路径
 		};
 	},
 	methods: {
@@ -396,11 +390,11 @@ export default {
 			this.boxshadow2 = true;
 		},
 		// 保存海报
-		saveImg(picUrl) {
+		saveImg() {
 			this.boxshadow2 = false;
 			// 微信小程序保存图片
 			uni.downloadFile({
-				url: picUrl,
+				url: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_share_img.png",
 				success: (res) => {
 					if (res.statusCode === 200) {
 						uni.saveImageToPhotosAlbum({
@@ -460,21 +454,10 @@ export default {
 				}
 				this.info = res;
 				console.log("this.info", this.info.commodity_goods_info_list);
-				
+				// {{info.commodity_goods_info_list[currentGGIndex].cart_count.count}}
-				// 检查是否有传入的选中商品信息，如果有则设置为默认选中
+				this.currentGG = res.commodity_goods_info_list[0];
-				let selectedIndex = 0;
-				if (this.selectedGoods) {
-					for (let i = 0; i < res.commodity_goods_info_list.length; i++) {
-						if (res.commodity_goods_info_list[i].id === this.selectedGoods.id) {
-							selectedIndex = i;
-							break;
-						}
-					}
-				}
-				
-				this.currentGG = res.commodity_goods_info_list[selectedIndex];
 				console.log("this.currentGG", this.currentGG);
-				this.currentGGIndex = selectedIndex;
+				this.currentGGIndex = 0;
 
 				this.changeImg = picUrl + this.currentGG.commodity_pic[0]
 				this.changeName = this.currentGG.goods_alias
@@ -497,6 +480,7 @@ export default {
 
 		// 切换规格
 		changeGG(item, index) {
+			console.log("🚀 ~ changeGG ~ item:", item);
 			this.currentGG = item;
 			this.currentGGIndex = index;
 			if (this.currentGG.cart_count) {
@@ -638,15 +622,15 @@ export default {
 				}));
 			});
 		}
-	},onLoad(options) {
+	},
+	onLoad(options) {
+		console.log(JSON.parse(decodeURIComponent(options.item)));
 		const itemObj = JSON.parse(decodeURIComponent(options.item));
 		const meun = menuButtonInfo();
 		this.top = meun.top;
 		this.localHeight = meun.height;
 
-
+		this.id = itemObj.id;
-		this.id = itemObj.commodity_id ? itemObj.commodity_id : itemObj.id;
-		this.selectedGoods = itemObj; // 保存传入的完整商品信息
 	},
 	onReachBottom() { },
 	onShow() {

packages/shop/index/index.vue

@@ -135,14 +135,14 @@
                     </view>
                   </view>
 
-                  <view class="gg" @click="chooseGG(item,items)" v-if="
+                  <view class="gg" @click="chooseGG(items)" v-if="
                     items.commodity_goods_info_list.length > 1 && !items.isShow
                   ">
                     选择规格
                     <u-icon name="arrow-down" size="26rpx" color="#FF370B"></u-icon>
                   </view>
 
-                  <view class="gg" @click="chooseGG(item,items)" v-if="
+                  <view class="gg" @click="chooseGG(items)" v-if="
                     items.commodity_goods_info_list.length > 1 && items.isShow
                   ">
                     收起
@@ -152,7 +152,7 @@
               </view>
 
               <view class="GGList" v-if="items.isShow">
-                <view class="GGItem" v-for="ite in items.commodity_goods_info_list" :key="ite.id" @click="goods(ite,items)">
+                <view class="GGItem" v-for="ite in items.commodity_goods_info_list" :key="ite.id" @click="goods(items)">
                   <view class="GGItem_Image">
                     <view class="tag tag-img" v-if="ite.is_same_day">当日达</view>
                     <image :src="picUrl + ite.commodity_pic" mode="aspectFill"></image>
@@ -338,14 +338,11 @@ export default {
       this.topShow = !this.topShow;
     },
     // 选择商品规格
-    chooseGG(item,targetItems) {
+    chooseGG(targetItems) {
-      // 根据两个参数的id判断点击的数据
+      // 遍历tagList找到目标对象（排除"全部"选项，从索引1开始）
-      if (item && targetItems && item.id) {
       for (let i = 1; i < this.tagList.length; i++) {
         const tagItem = this.tagList[i];
-          // 先根据item.id找到对应的tagItem
+        const infoIndex = tagItem.commodity_info_list.findIndex(item => item.id === targetItems.id);
-          if (tagItem.id === item.id) {
-            const infoIndex = tagItem.commodity_info_list.findIndex(infoItem => infoItem.id === targetItems.id);
         if (infoIndex > -1) {
           // 直接修改数据源中的对象，确保响应式
           const currentItem = tagItem.commodity_info_list[infoIndex];
@@ -354,16 +351,15 @@ export default {
           break;
         }
       }
-        }
-      }
     },
     //搜索页
     searchPage() {
       NavgateTo("../search/index");
     },
     //商品详情页
-    goods(ite,items) {
+    goods(e) {
-      NavgateTo(`../goods/index?item=${JSON.stringify(ite)}`);
+      NavgateTo(`../goods/index?item=${JSON.stringify(e)}`);
+      // NavgateTo("../goods/index");
     },
 
     // 购物车