From 33a416d40750d2e54beeb627f3031f1fdbd1a71c Mon Sep 17 00:00:00 2001
From: 1154079537 <1154079537@qq.com>
Date: Fri, 14 Jun 2024 16:31:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue        | 24 ++++++++++++++++++++++
 pages/my/my.vue              | 40 +++++++++++++++++++++++++++++++++++-
 pagesOrder/settle/settle.vue |  3 +--
 3 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 9ad8bc1..5ae1303 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,3 +1,12 @@
+<style lang="scss">
+	.share-btn {
+		display: flex;
+		align-items: center;
+		position: fixed;
+		width: 120rpx;
+		z-index: 20;
+	}
+</style>
 <template>
 	<view class="content">
 		<up-navbar placeholder style="z-index: 10080;">
@@ -13,6 +22,11 @@
 				</view>
 			</template>
 		</up-navbar>
+
+		<view class="share-btn" :style="{height:btns.height + 'px',top:btns.top + 'px',left:(btns.left - 70) + 'px'}">
+			<up-button type="success" icon="share" openType="share" plain text="分享" size="mini" />
+		</view>
+
 		<view class="navbar">
 			<view style="width: 400rpx;">
 				<up-search placeholder="请输入商品" @search="searchKeyword" @clear="searchKeyword" v-model="keyword"
@@ -510,6 +524,14 @@
 		})
 	}
 
+	// 胶囊布局
+	const btns = ref({
+		height: 0,
+		top: 0,
+		bottom: 0,
+		left: 0
+	})
+
 	onLoad(async (opt) => {
 		// 店铺id
 		if (opt.id) {
@@ -528,6 +550,8 @@
 
 		getgoodClassList(0);
 		getGoodList();
+
+		btns.value = uni.getMenuButtonBoundingClientRect();
 	})
 
 	onShow(() => {
diff --git a/pages/my/my.vue b/pages/my/my.vue
index d539d02..5dcaec2 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -1,3 +1,26 @@
+<style lang="scss">
+	.rest {
+		display: flex;
+		justify-content: space-around;
+		margin: 20rpx;
+
+		.rest-item {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+
+			.rest-item-num {
+				font-size: 30rpx;
+				margin-bottom: 16rpx;
+			}
+
+			.rest-item-txt {
+				font-size: 28rpx;
+			}
+		}
+	}
+</style>
 <template>
 	<view>
 		<up-navbar title="我的" :autoBack="true" bgColor="transparent" :fixed="true">
@@ -15,6 +38,22 @@
 				</view>
 			</view>
 		</view>
+
+		<view class="rest">
+			<view class="rest-item">
+				<view class="rest-item-num">123123</view>
+				<view class="rest-item-txt">余额</view>
+			</view>
+			<view class="rest-item">
+				<view class="rest-item-num">123123</view>
+				<view class="rest-item-txt">采购款</view>
+			</view>
+			<view class="rest-item">
+				<view class="rest-item-num">123123</view>
+				<view class="rest-item-txt">待返还金额</view>
+			</view>
+		</view>
+
 		<view class="gift">
 			<view style="font-weight: bold;">
 				供销经营礼包
@@ -22,7 +61,6 @@
 			<view class='gift-buy' @click="navgo('/pages/gift/index')">
 				立即购买
 			</view>
-
 		</view>
 		<view class="order-info-box">
 			<view class="order-info">
diff --git a/pagesOrder/settle/settle.vue b/pagesOrder/settle/settle.vue
index f75a124..ad517c7 100644
--- a/pagesOrder/settle/settle.vue
+++ b/pagesOrder/settle/settle.vue
@@ -316,6 +316,7 @@
 		if (!isAddress.value && orderInfo.value.shipping_type == 1) return toastAddressShow.value = true;
 		createOrder();
 	}
+
 	// 订单相关
 	const cartList = ref([]);
 	const orderInfo = ref({});
@@ -345,9 +346,7 @@
 			reservation_time: reservation_time.value,
 			shipping_type: orderInfo.value.shipping_type,
 			mark: formData.value.remark
-
 		}).then(res => {
-			console.log(res);
 			if (pay_type.value == 3) {
 				if (res.code == 1) {
 					uni.showToast({