From 0dfa3d8d59a2713fccc31057bc144789fd675f0d Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Fri, 10 Jan 2025 15:51:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=A2=9E=E5=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/shop/components/product-car.vue |  92 +--
 src/pages/shop/components/product-row.vue | 129 +++--
 src/pages/shop/components/product-sku.vue | 339 +++++------
 src/pages/shop/detail.vue                 | 655 +++++++++++-----------
 src/static/icon/service_5.png             | Bin 6650 -> 1491 bytes
 5 files changed, 642 insertions(+), 573 deletions(-)

diff --git a/src/pages/shop/components/product-car.vue b/src/pages/shop/components/product-car.vue
index 1f949eb..281a37e 100644
--- a/src/pages/shop/components/product-car.vue
+++ b/src/pages/shop/components/product-car.vue
@@ -1,58 +1,66 @@
 <template>
-  <tm-drawer z-index="100" v-model:show="props.modelValue" showFooter title="购物车" position="bottom" size="60%" @close="doClose">
-    <product-row
-      v-for="(v, i) in props.carList"
-      mode="car"
-      :key="v.id"
-      v-model="v.productCount"
-      :pic="v.productPic"
-      :count="v.productCount"
-      :name="v.name"
-      :price="v.productPrice"
-      :marketPrice="v.marketPrice"
-      :salesCount="v.salesCount"
-      :stock="v.stock"
-      @add="() => emit('add', v)"
-      @remove="emit('remove', v)"
-    />
+	<tm-drawer
+		z-index="100"
+		bgColor="#F0F6FB"
+		v-model:show="props.modelValue"
+		showFooter
+		title="购物车"
+		position="bottom"
+		size="60%"
+		@close="doClose"
+	>
+		<product-row
+			mode="car"
+			v-for="v in carList"
+			:key="v.id"
+			:id="v.id"
+			:productId="v.productId"
+			:merchantId="v.merchantId"
+			:picUrl="v.productPic"
+			:productName="v.productName"
+			:productCount="v.productCount"
+			:productPrice="v.productPrice"
+			@add="(v) => emit('add', v)"
+			@remove="(v) => emit('remove', v)"
+		/>
 
-    <template #footer>
-      <view class="car z-200 p-x-30rpx p-y-30rpx bg-white" :style="{ marginBottom: getHeight() }">
-        <product-total :totPrice="props.totPrice" :totCount="props.totCount" @doPay="doPay" />
-      </view>
-    </template>
-  </tm-drawer>
+		<template #footer>
+			<view class="car z-200 p-x-30rpx p-y-30rpx bg-white" :style="{ marginBottom: getHeight() }">
+				<product-total :totPrice="props.totPrice" :totCount="props.totCount" @doPay="doPay" />
+			</view>
+		</template>
+	</tm-drawer>
 </template>
 
 <script setup lang="ts">
-import ProductRow from "./product-row.vue";
-import ProductTotal from "./product-total.vue";
+import ProductRow from "./product-row.vue"
+import ProductTotal from "./product-total.vue"
 
-const emit = defineEmits(["update:modelValue", "doPay", "add", "remove"]);
+const emit = defineEmits(["update:modelValue", "doPay", "add", "remove"])
 
 export type Props = {
-  modelValue: any;
-  carList: any;
-  totPrice: number;
-  totCount: number;
-};
+	modelValue: any
+	carList: any
+	totPrice: number
+	totCount: number
+}
 const props = withDefaults(defineProps<Props>(), {
-  modelValue: false,
-  carList: [],
-  totPrice: 0,
-  totCount: 0,
-});
+	modelValue: false,
+	carList: [],
+	totPrice: 0,
+	totCount: 0,
+})
 
 const doClose = () => {
-  emit("update:modelValue", false);
-};
+	emit("update:modelValue", false)
+}
 
 const doPay = () => {
-  emit("doPay");
-};
+	emit("doPay")
+}
 
 const getHeight = () => {
-  const { bottom } = uni.getSystemInfoSync().safeAreaInsets!;
-  return `-${bottom + 16}px`;
-};
+	const { bottom } = uni.getSystemInfoSync().safeAreaInsets!
+	return `-${bottom + 16}px`
+}
 </script>
diff --git a/src/pages/shop/components/product-row.vue b/src/pages/shop/components/product-row.vue
index c5c981f..9ef02db 100644
--- a/src/pages/shop/components/product-row.vue
+++ b/src/pages/shop/components/product-row.vue
@@ -1,55 +1,94 @@
 <template>
-  <view
-    class="flex-row items-start card p-x-15rpx p-y-25rpx m-b-20rpx"
-    @tap="props.id && router.jump('/pages/shop/product-detail', { id: props.id })"
-  >
-    <image class="size-140rpx rounded-12rpx" :src="filePath(props.picUrl)" mode="aspectFill" />
-    <view class="flex-1 m-l-20rpx">
-      <view class="sub-text-28 show-line">{{ props.productName }}</view>
-      <view class="m-t-10rpx flex-row items-center">
-        <!-- <view class="second-text-32 color-red!"> ¥{{ hooks.useMoney(props.price) }} </view> -->
-        <!-- <view class="m-l-20rpx second-text-24 line-through"> ¥{{ hooks.useMoney(props.marketPrice) }} </view> -->
-      </view>
-      <view class="flex-row items-center">
-        <view class="second-text-24">{{ hooks.useFormatNum("库存", "", props.stock) }}</view>
-        <view class="w-1px h-20rpx m-x-5rpx bg-#999" />
-        <view class="second-text-24">{{ hooks.useFormatNum("销量", "", props.salesCount) }}</view>
-      </view>
-      <view
-        class="second-text-24 w-200rpx py-1 border-1px border-solid border-#0094ff bg-#0094ff c-white! border-rd-8 text-center mt-3 float-right"
-        @tap.stop="handleClickAddToCar({ ...props })"
-      >
-        加入购物车
-      </view>
-    </view>
-  </view>
+	<view
+		class="flex-row items-start card p-x-15rpx p-y-25rpx m-b-20rpx"
+		@tap="props.productId && router.jump('/pages/shop/product-detail', { id: props.productId })"
+	>
+		<image class="size-140rpx rounded-12rpx" :src="props.picUrl" mode="aspectFill" />
+		<view class="flex-1 m-l-20rpx">
+			<view class="sub-text-28 show-line">{{ props.productName }}</view>
+			<view class="m-t-10rpx flex-row items-center">
+				<!-- <view class="second-text-32 color-red!"> ¥{{ hooks.useMoney(props.price) }} </view> -->
+				<!-- <view class="m-l-20rpx second-text-24 line-through"> ¥{{ hooks.useMoney(props.marketPrice) }} </view> -->
+			</view>
+			<view v-if="props.mode == 'car'" class="flex-row justify-between items-center">
+				<view class="m-t-10rpx second-text-32 c-red!"> ￥{{ (Number(productPrice) / 100).toFixed(2) }} </view>
+				<view class="m-t-10rpx second-text-28">x{{ productCount }}</view>
+			</view>
+			<view v-if="mode === 'default'" class="flex-row items-center">
+				<view class="second-text-24">{{ hooks.useFormatNum("库存", "", props.stock) }}</view>
+				<view class="w-1px h-20rpx m-x-5rpx bg-#999" />
+				<view class="second-text-24">{{ hooks.useFormatNum("销量", "", props.salesCount) }}</view>
+			</view>
+			<view
+				v-if="mode === 'default'"
+				class="second-text-24 w-200rpx py-1 border-1px border-solid border-#0094ff bg-#0094ff c-white! border-rd-8 text-center mt-3 float-right"
+				@tap.stop="handleClickAddToCar"
+			>
+				加入购物车
+			</view>
+
+			<view v-if="mode === 'car'" class="flex-row items-center justify-end m-t-20rpx">
+				<view
+					class="flex-row-center size-40rpx rounded-full border-1px border-solid border-color-#0094ff"
+					@tap.stop="remove"
+				>
+					<view class="iconfont icon-a--" />
+				</view>
+				<view class="sub-text-28 m-x-20rpx">{{ productCount }}</view>
+				<view class="flex-row-center size-40rpx rounded-full bg-#0094ff" @tap.stop="add">
+					<view class="font-size-40rpx color-white iconfont icon-a-" />
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script setup lang="ts">
-import { hooks, router } from "@@/index";
-import { filePath } from "@@/utils/file";
+import { hooks, router } from "@@/index"
 
-const emit = defineEmits(["onClickAddToCar"]);
+const emit = defineEmits(["onClickAddToCar", "add", "remove"])
 
 export type Props = {
-  id: string;
-  merchantId: string;
-  picUrl: string;
-  productName: string;
-  salesCount: number;
-  stock: number;
-  onClickAddToCar?: () => void;
-};
+	mode?: "default" | "car"
+	productId: string
+	merchantId: string
+	picUrl: string
+	productName: string
+	productCount?: number
+	productPrice?: number
+	salesCount?: number
+	stock?: number
+	onClickAddToCar?: () => void
+}
 const props = withDefaults(defineProps<Props>(), {
-  id: "",
-  merchantId: "",
-  picUrl: "",
-  productName: "",
-  salesCount: 0,
-  stock: 0,
-});
+	mode: "default",
+	productId: "",
+	merchantId: "",
+	picUrl: "",
+	productName: "",
+	productCount: 0,
+	productPrice: 0,
+	salesCount: 0,
+	stock: 0,
+})
 
-const handleClickAddToCar = (productData: any) => {
-  emit("onClickAddToCar", productData);
-};
+const handleClickAddToCar = () => {
+	if (props.productId) {
+		emit("onClickAddToCar", { ...props })
+	}
+}
+
+const add = () => {
+	if (props.productCount + 1 >= 99) {
+		return
+	}
+	emit("add", { productId: props.productId, productCount: props.productCount + 1 })
+}
+
+const remove = () => {
+	if (props.productCount - 1 < 0) {
+		return
+	}
+	emit("remove", { productId: props.productId, productCount: props.productCount - 1 })
+}
 </script>
diff --git a/src/pages/shop/components/product-sku.vue b/src/pages/shop/components/product-sku.vue
index 5f2ce63..db6885d 100644
--- a/src/pages/shop/components/product-sku.vue
+++ b/src/pages/shop/components/product-sku.vue
@@ -1,105 +1,118 @@
 <template>
-  <tm-drawer z-index="100" v-model:show="props.modelValue" showFooter title="加入购物车" position="bottom" size="60%" @close="doClose">
-    <view class="px-20rpx">
-      <scroll-view scroll-y="true" class="max-h-7xl" @touchmove.stop>
-        <!-- 商品信息 -->
-        <view class="m-3 flex-row">
-          <image class="w-120rpx h-120rpx" :src="filePath(productData.picUrl)" mode="aspectFill" />
-          <view class="w-100% ml-3 flex flex-col justify-between">
-            <view class="sub-text-30 font-600! ws-nowrap text-ellipsis overflow-hidden">{{ productData.productName }}</view>
-            <view class="flex justify-between items-center">
-              <view class="flex-col justify-between items-left">
-                <view class="text-30 line-through">售价￥{{ curRetailPrice }}</view>
-                <view class="c-red text-34">促销价￥{{ curPromotionPrice }}</view>
-              </view>
-              <view class="flex-col justify-between items-left">
-                <view class="sub-text-28">库存{{ productData.stock }}</view>
-                <view class="sub-text-28">已售{{ productData.salesCount }}</view>
-              </view>
-            </view>
-          </view>
-        </view>
+	<tm-drawer
+		z-index="100"
+		v-model:show="props.modelValue"
+		showFooter
+		title="加入购物车"
+		position="bottom"
+		size="60%"
+		@close="doClose"
+	>
+		<view class="px-20rpx">
+			<scroll-view scroll-y="true" class="max-h-7xl" @touchmove.stop>
+				<!-- 商品信息 -->
+				<view class="m-3 flex-row">
+					<image class="w-120rpx h-120rpx" :src="filePath(state.goodsDetail.picUrl)" mode="aspectFill" />
+					<view class="w-100% ml-3 flex flex-col justify-between">
+						<view class="sub-text-30 font-600! ws-nowrap text-ellipsis overflow-hidden">
+							{{ state.goodsDetail.productName }}
+						</view>
+						<view class="flex justify-between items-center">
+							<view class="flex-col justify-between items-left">
+								<view class="sub-text-26 line-through">售价￥{{ retailPrice }}</view>
+								<view class="sub-text-32 c-red!">促销价￥{{ promotionPrice }}</view>
+							</view>
+							<view class="flex-col justify-between items-left">
+								<view class="sub-text-28">库存{{ state.goodsDetail.stock }}</view>
+								<view class="sub-text-28">已售{{ state.goodsDetail.salesCount }}</view>
+							</view>
+						</view>
+					</view>
+				</view>
 
-        <!-- 规格 -->
-        <!-- <view v-for="property in skuData" :key="property.id"> -->
-        <view class="sub-text-32 font-600! my-2">规格</view>
-        <view class="flex flex-wrap">
-          <button
-            class="text-center bg-#F4F4F4 border-rd-8 c-black ml-0 mr-2 mb-2 border-none outline-none sub-text-34"
-            v-for="value in state.goodsInfo?.skuList"
-            :key="value.id"
-            :disabled="value.disabled === true"
-            :style="{ 'background-color': state.selectedSku.id === value.id ? '#0094ff' : '#F4F4F4' }"
-            @click="onSelectSku(value)"
-          >
-            {{ value.spec + value.unit }}
-          </button>
-        </view>
-        <!-- </view> -->
+				<!-- 规格 -->
+				<!-- <view v-for="property in skuData" :key="property.id"> -->
+				<view class="sub-text-32 font-600! my-2">规格</view>
+				<view class="flex flex-wrap">
+					<button
+						class="text-center border-rd-4 c-black ml-0 mr-2 mb-2 border-1 border-solid border-blueGray sub-text-34"
+						v-for="value in state.goodsDetail?.skuList"
+						:key="value.id"
+						:style="{ 'background-color': state.selectedSku.id === value.id ? '#0094ff' : '#F4F4F4' }"
+						@click="onSelectSku(value)"
+					>
+						{{ value.spec + value.unit }}
+					</button>
+				</view>
+				<!-- </view> -->
 
-        <!-- 数量 -->
-        <view class="sub-text-32 font-600! my-2">购买数量</view>
-        <view class="flex-row items-center justify-end m-t-20rpx">
-          <text
-            class="size-40rpx rounded-full flex justify-center items-center font-600! bg-#0094ff"
-            :style="{ backgroundColor: state.count <= 1 ? '#999999' : '#0094ff' }"
-            @click="handleNumRemove()"
-          >
-            -
-          </text>
-          <text class="sub-text-28 m-x-20rpx">{{ String(state.count).padStart(2, "0") }}</text>
-          <text
-            class="size-40rpx rounded-full flex justify-center items-center font-600! bg-#0094ff"
-            :style="{ backgroundColor: state.count >= state.goodsInfo.stock ? '#999999' : '#0094ff' }"
-            @click="handleNumAdd()"
-          >
-            +
-          </text>
-        </view>
-      </scroll-view>
-    </view>
+				<!-- 数量 -->
+				<view class="sub-text-32 font-600! my-2">购买数量</view>
+				<view class="flex-row items-center justify-end m-t-20rpx">
+					<view class="flex-row items-center justify-end m-t-20rpx">
+						<view
+							class="flex-row-center size-40rpx rounded-full border-1px border-solid border-color-#0094ff"
+							@tap.stop="handleNumRemove"
+						>
+							<view class="iconfont icon-a--" />
+						</view>
+						<view class="sub-text-28 m-x-20rpx">{{ String(state.goodsCount).padStart(2, "0") }}</view>
+						<view class="flex-row-center size-40rpx rounded-full bg-#0094ff" @tap.stop="handleNumAdd">
+							<view class="font-size-40rpx color-white iconfont icon-a-" />
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
 
-    <template #footer>
-      <button class="mx-10 border-rd-8 bg-#0094ff" @tap="handleClickAddToCar">加入购物车</button>
-    </template>
-  </tm-drawer>
+		<template #footer>
+			<button class="mx-12 border-rd-8 bg-#0094ff sub-text-30 py-2 c-white!" @tap="handleClickAddToCar">
+				加入购物车
+			</button>
+		</template>
+	</tm-drawer>
 </template>
 
 <script setup lang="ts">
-import { shopApi } from "@/sheep/api";
-import { filePath } from "@/sheep/utils/file";
-import { computed, reactive, ref, watch } from "vue";
+import { shopApi } from "@/sheep/api"
+import { filePath } from "@/sheep/utils/file"
+import { computed, reactive, watch } from "vue"
 
-const emit = defineEmits(["update:modelValue", "onAddToCar"]);
+const emit = defineEmits(["update:modelValue", "onAddToCar"])
 
 export type Props = {
-  modelValue: boolean;
-  productData: any;
-  onAddToCar?: () => void;
-};
+	modelValue: boolean
+	productData: any
+	onAddToCar?: () => void
+}
 const props = withDefaults(defineProps<Props>(), {
-  modelValue: false,
-  productData: {},
-});
+	modelValue: false,
+	productData: {},
+})
 const state = reactive<any>({
-  count: 1,
-  selectedSku: {},
-  goodsInfo: {},
-});
-const curRetailPrice = computed(() => (state.selectedSku.retailPrice ? Number(state.selectedSku.retailPrice) * Number(state.count) : 0));
-const curPromotionPrice = computed(() =>
-  state.selectedSku.promotionPrice ? Number(state.selectedSku.promotionPrice) * Number(state.count) : 0
-);
+	goodsCount: 1,
+	selectedSku: {},
+	goodsDetail: {},
+})
+// 售价
+const retailPrice = computed(() =>
+	state.selectedSku.retailPrice ? Number(state.selectedSku.retailPrice) * Number(state.goodsCount) : 0,
+)
+// 优惠价
+const promotionPrice = computed(() =>
+	state.selectedSku.promotionPrice ? Number(state.selectedSku.promotionPrice) * Number(state.goodsCount) : 0,
+)
 
 watch(
-  () => props.modelValue,
-  async (newValue) => {
-    if (newValue) {
-      const { data } = await shopApi.getSupermarketSpuDetail({ id: props.productData.id });
-      state.goodsInfo = data;
-    }
-  }
-);
+	() => props.modelValue,
+	async (newValue) => {
+		if (newValue) {
+			// 获取商品详情
+			const { data } = await shopApi.getSupermarketSpuDetail({ id: props.productData.productId })
+			state.goodsDetail = data
+		}
+	},
+)
 
 // SKU 列表
 // const skuList = computed(() => {
@@ -133,90 +146,90 @@ watch(
 
 // 选择规格
 function onSelectSku(skuItem: any) {
-  // const index = state.currentPropertyArray.findIndex((item: any) => item.id === skuItem.id);
-  // if (index === -1) {
-  if (state.selectedSku.id === skuItem.id) {
-    state.selectedSku = {};
-  } else {
-    state.selectedSku = skuItem;
-  }
-  // } else {
-  // state.currentPropertyArray.splice(index, 1);
-  // }
+	// const index = state.currentPropertyArray.findIndex((item: any) => item.id === skuItem.id);
+	// if (index === -1) {
+	if (state.selectedSku.id === skuItem.id) {
+		state.selectedSku = {}
+	} else {
+		state.selectedSku = skuItem
+	}
+	// } else {
+	// state.currentPropertyArray.splice(index, 1);
+	// }
 
-  // 清空已选择
-  // let isChecked = true; // 选中 or 取消选中
-  // if (state.currentPropertyArray[propertyId] !== undefined && state.currentPropertyArray[propertyId] === valueId) {
-  // 点击已被选中的，删除并填充 ''
-  // isChecked = false;
-  // state.currentPropertyArray.splice(propertyId, 1, "");
-  // } else {
-  // 选中
-  // state.currentPropertyArray[propertyId] = valueId;
-  // }
-  // 选中的 property 大类
-  // let choosePropertyId: any = [];
-  // state.currentPropertyArray.forEach((currentPropertyId: string) => {
-  //   if (currentPropertyId !== "") {
-  //     // currentPropertyId 为空是反选 填充的
-  //     choosePropertyId.push(currentPropertyId);
-  //   }
-  // });
-  // 当前所选 property 下，所有可以选择的 SKU 们
-  // let newSkuList = getCanUseSkuList();
-  // 判断所有 property 大类是否选择完成
-  // if (choosePropertyId.length === skuData.length && newSkuList.length) {
-  //   newSkuList[0].name = state.selectedSku.goods_num || 1;
-  //   state.selectedSku = newSkuList[0];
-  // } else {
-  //   state.selectedSku = {};
-  // }
-  // if (choosePropertyId.length === skuData.value.length) {
-  //   state.selectedSku = state.currentPropertyArray;
-  // }
-  // 改变 property 禁用状态
-  // changeDisabled(isChecked, propertyId, valueId);
+	// 清空已选择
+	// let isChecked = true; // 选中 or 取消选中
+	// if (state.currentPropertyArray[propertyId] !== undefined && state.currentPropertyArray[propertyId] === valueId) {
+	// 点击已被选中的，删除并填充 ''
+	// isChecked = false;
+	// state.currentPropertyArray.splice(propertyId, 1, "");
+	// } else {
+	// 选中
+	// state.currentPropertyArray[propertyId] = valueId;
+	// }
+	// 选中的 property 大类
+	// let choosePropertyId: any = [];
+	// state.currentPropertyArray.forEach((currentPropertyId: string) => {
+	//   if (currentPropertyId !== "") {
+	//     // currentPropertyId 为空是反选 填充的
+	//     choosePropertyId.push(currentPropertyId);
+	//   }
+	// });
+	// 当前所选 property 下，所有可以选择的 SKU 们
+	// let newSkuList = getCanUseSkuList();
+	// 判断所有 property 大类是否选择完成
+	// if (choosePropertyId.length === skuData.length && newSkuList.length) {
+	//   newSkuList[0].name = state.selectedSku.goods_num || 1;
+	//   state.selectedSku = newSkuList[0];
+	// } else {
+	//   state.selectedSku = {};
+	// }
+	// if (choosePropertyId.length === skuData.value.length) {
+	//   state.selectedSku = state.currentPropertyArray;
+	// }
+	// 改变 property 禁用状态
+	// changeDisabled(isChecked, propertyId, valueId);
 }
 
 const handleNumAdd = () => {
-  if (state.count >= state.goodsInfo.stock) {
-    return;
-  }
-  state.count += 1;
-};
+	if (state.goodsCount >= state.goodsDetail.stock) {
+		return
+	}
+	state.goodsCount += 1
+}
 const handleNumRemove = () => {
-  if (state.count <= 1) {
-    return;
-  }
-  state.count -= 1;
-};
+	if (state.goodsCount <= 1) {
+		return
+	}
+	state.goodsCount -= 1
+}
 
 // 点击加入购物车
 const handleClickAddToCar = () => {
-  if (state.goodsInfo.stock === 0) {
-    uni.showToast({
-      title: "库存不足",
-      icon: "none",
-      duration: 1000,
-    });
-    return;
-  }
-  if (!state.selectedSku.id) {
-    uni.showToast({
-      title: "请选择规格",
-      icon: "none",
-      duration: 1000,
-    });
-    return;
-  }
-  emit("onAddToCar", { ...props.productData, count: state.count, sku: state.selectedSku, goodsPrice: curPromotionPrice.value });
-};
+	if (state.goodsDetail.stock === 0) {
+		uni.showToast({
+			title: "库存不足",
+			icon: "none",
+			duration: 1000,
+		})
+		return
+	}
+	if (!state.selectedSku.id) {
+		uni.showToast({
+			title: "请选择规格",
+			icon: "none",
+			duration: 1000,
+		})
+		return
+	}
+	emit("onAddToCar", { ...state.goodsDetail, productCount: state.goodsCount, productId: state.selectedSku.id })
+}
 
 const doClose = () => {
-  emit("update:modelValue", false);
+	emit("update:modelValue", false)
 
-  state.count = 1;
-  state.selectedSku = {};
-  state.goodsInfo = {};
-};
+	state.goodsCount = 1
+	state.selectedSku = {}
+	state.goodsDetail = {}
+}
 </script>
diff --git a/src/pages/shop/detail.vue b/src/pages/shop/detail.vue
index 5e1750b..5161385 100644
--- a/src/pages/shop/detail.vue
+++ b/src/pages/shop/detail.vue
@@ -1,389 +1,398 @@
 <template>
-  <crud-layout mainIsScroll tabBarType="just-flot-back" bg="/static/page/blue-bg.png">
-    <tm-sticky>
-      <!-- start 轮播 start -->
-      <z-swiper>
-        <z-swiper-item v-for="(v, i) in state.detail.picUrl?.split(',')" :key="i">
-          <image class="w-100vw h-400rpx" :src="filePath(state.detail?.swiperPic)" mode="aspectFill" />
-        </z-swiper-item>
-      </z-swiper>
-      <!-- end 轮播 end -->
+	<crud-layout mainIsScroll tabBarType="just-flot-back" bg="/static/page/blue-bg.png">
+		<tm-sticky>
+			<!-- start 轮播 start -->
+			<z-swiper>
+				<z-swiper-item v-for="(v, i) in state.detail.picUrl?.split(',')" :key="i">
+					<image class="w-100vw h-400rpx" :src="filePath(state.detail?.swiperPic)" mode="aspectFill" />
+				</z-swiper-item>
+			</z-swiper>
+			<!-- end 轮播 end -->
 
-      <tm-sticky-header>
-        <view class="m-x-30rpx">
-          <view class="h-15rpx" />
-          <!-- start 简介 start -->
-          <view flex-row card p-20rpx>
-            <image class="w-160rpx h-160rpx rounded-12rpx" :src="filePath(state.detail.logoPic)" mode="aspectFill" />
-            <view class="flex-1 flex-col m-l-20rpx">
-              <view class="flex-row items-center justify-between">
-                <view class="flex-row-center sub-text-36">
-                  <text>{{ state.detail.name }}</text>
-                </view>
-                <view>
-                  <tm-tag size="s">{{ state.detail.deptName }}</tm-tag>
-                </view>
-              </view>
-              <view class="m-t-10rpx second-text-28">
-                <text>营业时间</text>
-                <text class="m-l-10rpx">
-                  {{ state.detail.jobStartTime }}
-                  ~
-                  {{ state.detail.jobEndTime }}
-                </text>
-              </view>
-              <view class="m-t-10rpx second-text-28">
-                <text>超市地址</text>
-                <text class="m-l-10rpx">{{ state.detail.addressDes }}</text>
-              </view>
-            </view>
-          </view>
-          <!-- end 简介 end -->
-          <view class="h-15rpx" />
-        </view>
-      </tm-sticky-header>
+			<tm-sticky-header>
+				<view class="m-x-30rpx">
+					<view class="h-15rpx" />
+					<!-- start 简介 start -->
+					<view flex-row card p-20rpx>
+						<image class="w-160rpx h-160rpx rounded-12rpx" :src="filePath(state.detail.logoPic)" mode="aspectFill" />
+						<view class="flex-1 flex-col m-l-20rpx">
+							<view class="flex-row items-center justify-between">
+								<view class="flex-row-center sub-text-36">
+									<text>{{ state.detail.name }}</text>
+								</view>
+								<view>
+									<tm-tag size="s">{{ state.detail.deptName }}</tm-tag>
+								</view>
+							</view>
+							<view class="m-t-10rpx second-text-28">
+								<text>营业时间</text>
+								<text class="m-l-10rpx">
+									{{ state.detail.jobStartTime }}
+									~
+									{{ state.detail.jobEndTime }}
+								</text>
+							</view>
+							<view class="m-t-10rpx second-text-28">
+								<text>超市地址</text>
+								<text class="m-l-10rpx">{{ state.detail.addressDes }}</text>
+							</view>
+						</view>
+					</view>
+					<!-- end 简介 end -->
+					<view class="h-15rpx" />
+				</view>
+			</tm-sticky-header>
 
-      <view class="h-15rpx" />
+			<view class="h-15rpx" />
 
-      <!-- start 商品 start -->
-      <view class="flex-row">
-        <scroll-view scroll-y :style="{ height: getHeight() }" class="menu w-200rpx h-full p-l-12rpx p-b-20rpx bg-#f6f6f6">
-          <view
-            class="menu_item flex-row-center"
-            v-for="(v, i) in state.classifyList"
-            :key="v.id"
-            :class="[{ menu_item_active: i == state.currentClassifyIndex }]"
-            @tap="doClassify(i)"
-          >
-            <view class="menu_item_title show-line">
-              {{ v.name }}
-            </view>
-          </view>
-        </scroll-view>
+			<!-- start 商品 start -->
+			<view class="flex-row">
+				<scroll-view
+					scroll-y
+					:style="{ height: getHeight() }"
+					class="menu w-200rpx h-full p-l-12rpx p-b-20rpx bg-#f6f6f6"
+				>
+					<view
+						class="menu_item flex-row-center"
+						v-for="(v, i) in state.classifyList"
+						:key="v.id"
+						:class="[{ menu_item_active: i == state.currentClassifyIndex }]"
+						@tap="doClassify(i)"
+					>
+						<view class="menu_item_title show-line">
+							{{ v.name }}
+						</view>
+					</view>
+				</scroll-view>
 
-        <scroll-view scroll-y :style="{ height: getHeight() }" class="flex-1 p-b-20rpx">
-          <view class="m-x-15rpx">
-            <product-row
-              v-for="goodsItem in state.goodsList"
-              :key="goodsItem.id"
-              :id="goodsItem.id"
-              :merchantId="goodsItem.merchantId"
-              :picUrl="goodsItem.picUrl"
-              :productName="goodsItem.productName"
-              :salesCount="goodsItem.salesCount"
-              :stock="goodsItem.stock"
-              @onClickAddToCar="onClickAddToCar"
-            />
-          </view>
-        </scroll-view>
-      </view>
-    </tm-sticky>
-    <!-- end 商品 end -->
+				<scroll-view scroll-y :style="{ height: getHeight() }" class="flex-1 p-b-20rpx">
+					<view class="m-x-15rpx">
+						<product-row
+							v-for="goodsItem in state.goodsList"
+							:key="goodsItem.id"
+							:productId="goodsItem.id"
+							:merchantId="goodsItem.merchantId"
+							:picUrl="filePath(goodsItem.picUrl)"
+							:productName="goodsItem.productName"
+							:salesCount="goodsItem.salesCount"
+							:stock="goodsItem.stock"
+							@onClickAddToCar="onClickAddToCar"
+						/>
+					</view>
+				</scroll-view>
+			</view>
+		</tm-sticky>
+		<!-- end 商品 end -->
 
-    <template #main-bottom>
-      <view class="car z-200 p-x-30rpx p-y-30rpx bg-white">
-        <product-total :totPrice="cartTotalPrice" :totCount="cartTotalCount" @doContainer="doVisibleCar" @doPay="doPay" />
-      </view>
-    </template>
-  </crud-layout>
+		<template #main-bottom>
+			<view class="car z-200 p-x-30rpx p-y-30rpx bg-white">
+				<product-total
+					:totPrice="state.totPrice"
+					:totCount="state.totCount"
+					@doContainer="doVisibleCar"
+					@doPay="doPay"
+				/>
+			</view>
+		</template>
+	</crud-layout>
 
-  <product-car
-    v-model="showCarDialog"
-    :carList="state.carList"
-    :totPrice="state.totPrice"
-    :totCount="state.totCount"
-    @add="doAdd"
-    @remove="remove"
-    @doPay="doPay"
-  />
-  <!-- 规格与数量弹框 -->
-  <product-sku v-model="showSkuDialog" :productData="curProductData" @onAddToCar="onAddToCar" />
+	<!-- 购物车弹框 -->
+	<product-car
+		v-model="showCarDialog"
+		:carList="state.carList"
+		:totPrice="state.totPrice"
+		:totCount="state.totCount"
+		@add="doAdd"
+		@remove="doRemove"
+		@doPay="doPay"
+	/>
+	<!-- 规格与数量弹框 -->
+	<product-sku v-model="showSkuDialog" :productData="curProductData" @onAddToCar="onAddToCar" />
 </template>
 
 <script setup lang="ts">
-import { reactive, nextTick, ref, computed } from "vue";
-import { onLoad, onShow } from "@dcloudio/uni-app";
-import { isEmpty } from "radash";
-import { hooks, router } from "@@/index";
-import { foodApi, merchantApi, payApi, shopApi } from "@@/api";
-import zSwiper from "@zebra-ui/swiper/components/z-swiper/z-swiper.vue";
-import zSwiperItem from "@zebra-ui/swiper/components/z-swiper-item/z-swiper-item.vue";
-import ProductRow from "./components/product-row.vue";
-import ProductCar from "./components/product-car.vue";
-import ProductTotal from "./components/product-total.vue";
-import ProductSku from "./components/product-sku.vue";
-import { filePath } from "@@/utils/file";
+import { reactive, nextTick, ref, computed } from "vue"
+import { onLoad, onShow } from "@dcloudio/uni-app"
+import { isEmpty } from "radash"
+import { hooks, router } from "@@/index"
+import { foodApi, merchantApi, payApi, shopApi } from "@@/api"
+import zSwiper from "@zebra-ui/swiper/components/z-swiper/z-swiper.vue"
+import zSwiperItem from "@zebra-ui/swiper/components/z-swiper-item/z-swiper-item.vue"
+import ProductRow from "./components/product-row.vue"
+import ProductCar from "./components/product-car.vue"
+import ProductTotal from "./components/product-total.vue"
+import ProductSku from "./components/product-sku.vue"
+import { filePath } from "@@/utils/file"
 
 // 商品详情相关数据
 const state = reactive<any>({
-  merchantId: null,
-  detail: {},
-  classifyList: [],
-  currentClassifyIndex: 0,
-  goodsList: [],
-
-  carList: [],
-});
-const cartTotalCount = computed(() => state.carList.length); // 购物车商品总数
-const cartTotalPrice = computed(() => state.carList.reduce((total, item) => total + item.goodsPrice, 0));
+	merchantId: null,
+	detail: {},
+	classifyList: [],
+	currentClassifyIndex: 0,
+	goodsList: [],
 
+	carList: [],
+	totPrice: 0,
+	totCount: 0,
+})
 // 当前点击加入购物车的商品信息
-const curProductData = ref<any>({});
+const curProductData = ref<any>({})
 // sku 弹框开关
-const showSkuDialog = ref<boolean>(false);
+const showSkuDialog = ref<boolean>(false)
 // 购物车弹框开关
-const showCarDialog = ref<boolean>(false);
+const showCarDialog = ref<boolean>(false)
 
 onLoad((options: any) => {
-  if (!isEmpty(options.id)) {
-    state.merchantId = options.id;
-  }
-});
+	if (!isEmpty(options.id)) {
+		state.merchantId = options.id
+	}
+})
 onShow(async () => {
-  await getDetail();
-  await getShopCar();
-  await getClassify();
-});
+	await getDetail()
+	await getShopCar()
+	await getClassify()
+})
 
 const getDetail = async () => {
-  const { data } = await merchantApi.detail({ id: state.merchantId });
-  state.detail = data;
-};
+	const { data } = await merchantApi.detail({ id: state.merchantId })
+	state.detail = data
+}
 
 const getShopCar = async () => {
-  const { data } = await foodApi.getShopCar({ merchantId: state.merchantId, hardType: "SUPERMARKET" });
-  state.carList = data ?? [];
-  state.totPrice = state.carList.map((v) => v.totalPrice).reduce((pre, next) => pre + next, 0);
-  state.totCount = state.carList.map((v) => v.productCount).reduce((pre, next) => pre + next, 0);
-};
+	const { data } = await foodApi.getShopCar({ merchantId: state.merchantId, hardType: "SUPERMARKET" })
+	state.carList = data ?? []
+	console.log("car", data)
+
+	state.totPrice = state.carList.map((v) => Number(v.totalPrice)).reduce((pre, next) => pre + next, 0)
+	state.totCount = state.carList.map((v) => v.productCount).reduce((pre, next) => pre + next, 0)
+}
 
 const getClassify = async () => {
-  if (state.merchantId) {
-    const { data } = await shopApi.getSupermarketSpuCategory({ merchantId: state.merchantId });
-    state.classifyList = [{ id: null, name: "全部" }, ...data];
-    if (!isEmpty(state.classifyList)) {
-      getPorduct();
-    }
-  }
-};
+	if (state.merchantId) {
+		const { data } = await shopApi.getSupermarketSpuCategory({ merchantId: state.merchantId })
+		state.classifyList = [{ id: null, name: "全部" }, ...data]
+		if (!isEmpty(state.classifyList)) {
+			getPorduct()
+		}
+	}
+}
 
 const getPorduct = async () => {
-  const target = state.classifyList[state.currentClassifyIndex];
-  if (isEmpty(target)) return;
-  const { data } = await shopApi.getSupermarketSpuList({
-    // productName: target.name,
-    merchantId: state.merchantId,
-    categoryId: target.id,
-  });
-  state.goodsList = data.records;
-  // state.goodsList.forEach((i) => {
-  //   if (i && i.foodSPURespVOList && i.foodSPURespVOList.length) {
-  //     i.foodSPURespVOList.forEach((j) => {
-  //       j.productCount = 0;
-  //       j.productId = j.id;
-  //     });
-  //   }
-  // });
-  // const goodsList = [...state.goodsList];
-  // if (state.carList && state.carList.length) {
-  //   for (const i of goodsList) {
-  //     if (i && i.foodSPURespVOList && i.foodSPURespVOList.length) {
-  //       for (const j of i.foodSPURespVOList) {
-  //         for (const v of state.carList) {
-  //           if (j.id == v.productId) {
-  //             j.productCount = v.productCount;
-  //           }
-  //         }
-  //       }
-  //     }
-  //   }
-  // }
-  // state.goodsList = goodsList;
-};
-
-const updateShopCar = async () => {
-  if (isEmpty(state.carList)) return;
-  const list = state.carList
-    .filter((v) => v.productCount && v.productCount > 0)
-    .map((v) => {
-      return {
-        productCount: v.productCount,
-        productId: v.productId,
-      };
-    });
-  if (isEmpty(list)) return;
-  const { data, code }: any = await foodApi.updateShopCar({ merchantId: state.detailId, list: list });
-  if (code == 0) await getShopCar();
-};
+	const target = state.classifyList[state.currentClassifyIndex]
+	if (isEmpty(target)) return
+	const { data } = await shopApi.getSupermarketSpuList({
+		// productName: target.name,
+		merchantId: state.merchantId,
+		categoryId: target.id,
+	})
+	state.goodsList = data.records
+	// state.goodsList.forEach((i) => {
+	//   if (i && i.foodSPURespVOList && i.foodSPURespVOList.length) {
+	//     i.foodSPURespVOList.forEach((j) => {
+	//       j.productCount = 0;
+	//       j.productId = j.id;
+	//     });
+	//   }
+	// });
+	// const goodsList = [...state.goodsList];
+	// if (state.carList && state.carList.length) {
+	//   for (const i of goodsList) {
+	//     if (i && i.foodSPURespVOList && i.foodSPURespVOList.length) {
+	//       for (const j of i.foodSPURespVOList) {
+	//         for (const v of state.carList) {
+	//           if (j.id == v.productId) {
+	//             j.productCount = v.productCount;
+	//           }
+	//         }
+	//       }
+	//     }
+	//   }
+	// }
+	// state.goodsList = goodsList;
+}
 
 const doClassify = async (i: any) => {
-  state.currentClassifyIndex = i;
-  await getPorduct();
-};
+	state.currentClassifyIndex = i
+	await getPorduct()
+}
 
 const getHeight = () => {
-  const rpx = 480;
-  return `calc(100vh - ${uni.upx2px(rpx)}px)`;
-};
+	const rpx = 480
+	return `calc(100vh - ${uni.upx2px(rpx)}px)`
+}
 
 // 点击添加到购物车
 const onClickAddToCar = (productData: any) => {
-  showSkuDialog.value = true;
-  curProductData.value = productData;
-};
+	showSkuDialog.value = true
+	curProductData.value = productData
+}
 
 // 加入到购物车时
 const onAddToCar = (cartGoodsInfo: any) => {
-  showSkuDialog.value = false;
-  console.log(cartGoodsInfo);
-  state.carList.push(cartGoodsInfo);
-};
+	console.log("cartGoodsInfo", cartGoodsInfo)
+	chentProductCount(cartGoodsInfo) // 同步购物车中的数据
+	showSkuDialog.value = false
+}
+// 同步购物车中的数据
+const chentProductCount = async (item: any) => {
+	const target = state.carList.find((v) => v.productId == item.productId)
+	const targetIndex = state.carList.findIndex((v) => v.productId == item.productId)
+	if (target) {
+		state.carList[targetIndex].productCount = item.productCount
+		state.carList[targetIndex].productId = item.productId
+		console.log("1", state.carList[targetIndex])
+	} else {
+		state.carList.push(item)
+		console.log("2", item)
+	}
+
+	nextTick(() => updateShopCar()) // 保存购物车数据
+}
+// 保存购物车数据
+const updateShopCar = async () => {
+	console.log("carList", state.carList)
+
+	if (isEmpty(state.carList)) return
+	const list = state.carList
+		.filter((v) => v.productCount && v.productCount > 0)
+		.map((v) => {
+			return {
+				productCount: v.productCount,
+				productId: v.productId,
+			}
+		})
+	// if (isEmpty(list)) return
+	const { data, code }: any = await foodApi.updateShopCar({
+		merchantId: state.merchantId,
+		list,
+		hardType: "SUPERMARKET",
+	})
+	if (code == 0) await getShopCar()
+}
 
 // 显示购物车
 const doVisibleCar = async () => {
-  showCarDialog.value = true;
-};
+	showCarDialog.value = true
+}
+
+const doAdd = async (item: any) => {
+	chentProductCount(item)
+}
+const doRemove = async (item: any) => {
+	chentProductCount(item)
+}
 
 // 点击提交订单
 const doPay = async () => {
-  uni.showModal({
-    title: "提示",
-    content: "是否确定购买",
-    confirmColor: "#0094ff",
-    success: async (res) => {
-      if (!res.confirm) return;
-      submitPay(); // 提交订单
-    },
-  });
-};
+	uni.showModal({
+		title: "提示",
+		content: "是否确定购买",
+		confirmColor: "#0094ff",
+		success: async (res) => {
+			if (!res.confirm) return
+			submitPay() // 提交订单
+		},
+	})
+}
 
 // 提交订单
 const submitPay = async () => {
-  // try {
-  //   if (isEmpty(state.carList)) {
-  //     uni.showToast({ title: "请至少购买一件商品", icon: "none" });
-  //     return;
-  //   }
-  //   uni.showLoading({ title: "支付中...", mask: false });
-  //   const _createtPa = { carParentId: state.carList[0].parentCarId };
-  //   const { data: createData, code: createCode }: any = await payApi.createHardwareOrder(_createtPa);
-  //   if (createCode != 0) throw new Error();
-  //   const _submitPa = { orderId: createData };
-  //   const { data: submitData, code: submitCode }: any = await payApi.submitHardwareOrder(_submitPa);
-  //   if (submitCode != 0) throw new Error();
-  //   uni.hideLoading();
-  //   uni.showToast({ title: "支付成功", icon: "none" });
-  //   router.jump("/pages/tabbar/order");
-  // } catch (error) {
-  //   console.error(error);
-  //   uni.hideLoading();
-  // }
-};
-// ======================================================
-
-const skuState = reactive<any>({
-  productId: null,
-  showSpecDialog: false,
-  skuData: [],
-  totCount: 0,
-});
-
-const chentProductCount = async (item: any) => {
-  const target = state.carList.find((v) => v.productId == item.productId);
-  const targetIndex = state.carList.findIndex((v) => v.productId == item.productId);
-  if (target) {
-    state.carList[targetIndex].productCount = item.productCount;
-  } else {
-    state.carList.push({ ...item, productId: item.id });
-  }
-  nextTick(() => updateShopCar());
-};
-
-const doPhone = () => {
-  if (isEmpty(state.detail.phone)) {
-    uni.showToast({ title: "该店铺没有预留电话", icon: "none" });
-    return;
-  }
-  hooks.useMakePhoneCall(state.detail.phone);
-};
-const doFood = () => {
-  router.jump("/pages/merchant/food", { merchantId: state.detailId });
-};
+	try {
+		if (isEmpty(state.carList)) {
+			uni.showToast({ title: "请至少购买一件商品", icon: "none" })
+			return
+		}
+		uni.showLoading({ title: "支付中...", mask: false })
+		const _createtPa = {
+			carParentId: state.carList[0].parentCarId,
+			hardType: "SUPERMARKET",
+		}
+		const { data: createData, code: createCode }: any = await payApi.createHardwareOrder(_createtPa)
+		if (createCode != 0) throw new Error()
+		uni.hideLoading()
+		uni.showToast({ title: "支付成功", icon: "none" })
+		router.jump("/pages/tabbar/order")
+	} catch (error) {
+		console.error(error)
+		uni.hideLoading()
+	}
+}
 </script>
 
 <style lang="scss" scoped>
 :deep() {
-  .layout_main > scroll-view {
-    padding: 0 !important;
-  }
+	.layout_main > scroll-view {
+		padding: 0 !important;
+	}
 }
 
 .menu {
-  &_item {
-    width: 100%;
-    height: 88rpx;
-    position: relative;
-    transition: all linear 0.2s;
+	&_item {
+		width: 100%;
+		height: 88rpx;
+		position: relative;
+		transition: all linear 0.2s;
 
-    &_title {
-      width: 100%;
-      line-height: 32rpx;
-      font-size: 30rpx;
-      font-weight: 400;
-      color: #333;
-      margin-left: 28rpx;
-      position: relative;
-      z-index: 0;
+		&_title {
+			width: 100%;
+			line-height: 32rpx;
+			font-size: 30rpx;
+			font-weight: 400;
+			color: #333;
+			margin-left: 28rpx;
+			position: relative;
+			z-index: 0;
 
-      &::before {
-        content: "";
-        width: 64rpx;
-        height: 12rpx;
-        background: linear-gradient(90deg, #0094ff, #e9f5fe) !important;
-        position: absolute;
-        left: -64rpx;
-        bottom: 0;
-        z-index: -1;
-        transition: all linear 0.2s;
-      }
-    }
+			&::before {
+				content: "";
+				width: 64rpx;
+				height: 12rpx;
+				background: linear-gradient(90deg, #0094ff, #e9f5fe) !important;
+				position: absolute;
+				left: -64rpx;
+				bottom: 0;
+				z-index: -1;
+				transition: all linear 0.2s;
+			}
+		}
 
-    &.menu_item_active {
-      background-color: #fff;
-      border-radius: 20rpx 0 0 20rpx;
+		&.menu_item_active {
+			background-color: #fff;
+			border-radius: 20rpx 0 0 20rpx;
 
-      &::before {
-        content: "";
-        position: absolute;
-        right: 0;
-        bottom: -20rpx;
-        width: 20rpx;
-        height: 20rpx;
-        background: radial-gradient(circle at 0 100%, transparent 20rpx, #fff 0);
-      }
+			&::before {
+				content: "";
+				position: absolute;
+				right: 0;
+				bottom: -20rpx;
+				width: 20rpx;
+				height: 20rpx;
+				background: radial-gradient(circle at 0 100%, transparent 20rpx, #fff 0);
+			}
 
-      &::after {
-        content: "";
-        position: absolute;
-        top: -20rpx;
-        right: 0;
-        width: 20rpx;
-        height: 20rpx;
-        background: radial-gradient(circle at 0% 0%, transparent 20rpx, #fff 0);
-      }
+			&::after {
+				content: "";
+				position: absolute;
+				top: -20rpx;
+				right: 0;
+				width: 20rpx;
+				height: 20rpx;
+				background: radial-gradient(circle at 0% 0%, transparent 20rpx, #fff 0);
+			}
 
-      .menu_item_title {
-        font-weight: 600;
+			.menu_item_title {
+				font-weight: 600;
 
-        &::before {
-          left: 0;
-        }
-      }
-    }
-  }
+				&::before {
+					left: 0;
+				}
+			}
+		}
+	}
 }
 
 .car {
-  box-shadow: 0 8rpx 40rpx rgba(0, 0, 0, 0.1);
+	box-shadow: 0 8rpx 40rpx rgba(0, 0, 0, 0.1);
 }
 </style>
diff --git a/src/static/icon/service_5.png b/src/static/icon/service_5.png
index c687bbc24139cc686318ede7617c068b9384139d..597d52a73fe7c485043d90b859c0a63fcbdb1cfd 100644
GIT binary patch
literal 1491
zcmV;^1uXiBP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px)jY&j7RA@uhnrm!SRS?I2w=I28pdge|L?P4&NMj+sss$uG6TpZ-V#N>gh;2;?
zhR}xAFBD@C#GnQg1gdCET4F5X0|SCmG^7|vYOJ;e0+k@xVxfRQ-&bZ2Yq#CqbFbaI
z*qx8NbLY(e+%q%(nR5*^5}#`h2@7Wy22TLVz`ejgAX4{S0RJ@u^}t!60+S={ZS1|c
z!T8gkO~cn8iFxKj?FKnOdH~Ki`Dk&N$(t9}8OOUC^#U+B&s=R76gauMQ?^W#g1U9a
z8c%zj03^I(zK=<UQws*gj={FtwMM4f_P+pn^3HeN2+ud+0&x4x9}CKk1<7cb$-@#8
zE&vJnW>F6cSi6vmYhO2>GhC@Mf(v$^>PdR-tt1)=dFB!f3auQA?ggnM;O_p=E8JWA
zY9kyv0hey*EyeVL8Dn5TZ*RSpHaJrcWoMw>wDJfrS!yKYn>&D|I`!U>@YZ}7IS86s
z;Z_iNNmK-USpl04=@-tO2Gd4EbE~)Bt@MomJXr@hyW#I9OAv(upbU6Sr@C=Ij2~uc
zjKim3_1Aj6S7*b-`>bspI}5qHE%lBHfb)`w{HZ1ng*WD^oe?>I1#U{g?;;I1VN)sm
zeo4P*d>>do84~+>>-CL>!F|>5&25mq3r=0s+PfeC<VE@AHnYY;)&vma;{5YFEq5g#
zg`&kUq#s;sf~`Nm-e0xmngxJ1T;`>~3#rgA8mj9cOA>AnWlK7YP5?;?A035~a{XeK
z0G>&KMYjP|)xt}~*4|6dFBlIG3<1erZjs>pszQIvJOS)1gWW&hK>&mLz>>#Rx)sNz
zN_qm23|4*)^7i<5>VE~WV<9BP>vv4@`;5)d*6v%+aR8lSpcb<H9HB4+4lcJoUZOE`
zv&u5Qq*Dx(K}n!TXzD0fF$H2H;b@Kj*B==U`<4X`VEtTpbhs*XYxhIx$pB*@A{<su
zQTcht5vcUj-2E2-(>Fn@pCcsIUedPImAAi#8$N1|CnU=(WN%LuKiZcKLI-prfjsLy
zn_S1n;*J3rn+WeLfbcN=s#0_oeGF$W+wjhYiemtTYJ8pnkrDb;uQ$U}TYVEk8~%E!
zI0is0PfUV>*&rFopDh0rei8QNkT?oJe9D=s=(5mjPm!SAbzCI^C&h69;@lTm&^M~H
zn|0UV*$<p_UD*l>fIXRt{CP_4RY?D^2Lq5DpL{<&{UD6E%Xc=C8Y1LO8XrlgPKf0j
zko=yJrrODO55wudI+l%#f#gJ(Hx9<%15GWR$(t_+r7%f+RGfz&Ps4#KRkYk9y}-+p
z;YuTHJm{Ztxb-aoNc*>Hx}p+4)xfITOfohK3KznFSdc2*9l6;8(#WqY>FB&(n*(V{
z>i6~E!oh02WlI3k4=heq9hql8@M0P)7-yaL?EsU;MYz96P}rz6G+hBKdlKf4v*Vt%
z&S&MYxm4+GO@~qLj?4)*Ds<WxfDr>>`$ENOx_gA=m<aXAEb2HycMO2+)+57V<`|Gp
ztUFSF9rjl$n(mgM0B|?;c6;LPfbj{yW>c>ntISD;%n8sZ3To<M@h5?}XZ@__SY^v$
z_~tk5Gp@0UcCaM@C1XYRU`uFli;p5CxqSN(sIJvJDY2712?oS?>%~OE&^YybV+*V(
zfhxbZV=gt<U`sn%6k;g=Qf!PC%W5EBGjWg=*UW}VHb#p!kE?66XgS;!nvgRM(nhMC
z@ihsH2!roVz=i|*Hz4&xGMm4avauCf+tgh2T!ZD2E3`dc7gLFGFewS-Rd<!kH(+0-
z0;m%KDx7Ipe{U^GtA8}8tRz+1Qe?ay@)sO}GNiAVTt`D)Y=`b8pMVJIYgTu#g!DzX
t8$?fj6PBMExIu*U#~z-!Hxxd%`3EJNPNTR{xi|m-002ovPDHLkV1lRCsuKVJ

literal 6650
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