From c8112a37974692227a7d8e951ff3e9f80e82c633 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=AE=B6=E5=8D=8E?= <3599164049@qq.com>
Date: Fri, 9 Jun 2023 15:24:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E5=94=AE=E5=A2=9E=E5=8A=A0=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/api.js                                      |   4 +-
 src/manifest.json                                  |   2 +-
 .../store_card_select/store_card_select.vue        |   6 +-
 .../retail/pages/confirm_goods/confirm_goods.vue   | 112 +++++++++++++++++++--
 .../retail/pages/confirm_order/confirm_order.vue   |   6 +-
 5 files changed, 115 insertions(+), 15 deletions(-)

diff --git a/src/js/api.js b/src/js/api.js
index daecf1c..555181e 100644
--- a/src/js/api.js
+++ b/src/js/api.js
@@ -1,5 +1,5 @@
-// export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`;  //  测试
-export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`;  //  正式 
+export const ORIGIN = `https://testmanager.ouxuanzhineng.cn`;  //  测试
+// export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`;  //  正式 
 // export const ORIGIN = `http://192.168.1.135:9090`;  //  20210927 测试 
 
 
diff --git a/src/manifest.json b/src/manifest.json
index f4c24c3..01fc516 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -55,7 +55,7 @@
     /* 快应用特有相关 */
     "mp-weixin" : {
         /* 微信小程序特有相关 */
-        "appid" : "wxf1294b279ad1b845",
+        "appid" : "wx7106e84614cf0060",
         "setting" : {
             "urlCheck" : false,
             "minified" : true
diff --git a/src/subpackage/retail/components/store_card_select/store_card_select.vue b/src/subpackage/retail/components/store_card_select/store_card_select.vue
index 19cf516..ccabf2f 100644
--- a/src/subpackage/retail/components/store_card_select/store_card_select.vue
+++ b/src/subpackage/retail/components/store_card_select/store_card_select.vue
@@ -9,7 +9,7 @@
 			<view class="win-card">
 				<view class="win-card-search">
 					<image v-if="searchCardValue?false:true" mode="aspectFit" src="/static/images/icon/retail/search.png"></image>
-					<input v-model="searchCardValue" @confirm="searchCardList" placeholder="请输入微信昵称/手机号码/储值卡号搜索" placeholder-style="win-card-search-input-placeholder">
+					<input v-model="searchCardValue" @change="searchCardList" placeholder="请输入微信昵称/手机号码/储值卡号搜索" placeholder-style="win-card-search-input-placeholder">
 				</view>
 				<view class="win-card-list">
 					<view class="win-card-list-item" v-for="(item, index) in cardList" :key="index" @click="onCardClick(item)" :style="{borderColor:item.mark===choosePath?'#009874':'#979797'}">
@@ -61,7 +61,9 @@
 			// 获取储值卡列表
 			searchCardList() {
 				if (!this.searchCardValue) {
-					util.showNone("请输入微信昵称/手机号码/储值卡号搜索");
+					this.cardList = [];
+					this.curCardChoose = null;
+					// util.showNone("请输入微信昵称/手机号码/储值卡号搜索");
 					return;
 				}
 				
diff --git a/src/subpackage/retail/pages/confirm_goods/confirm_goods.vue b/src/subpackage/retail/pages/confirm_goods/confirm_goods.vue
index 9168d30..0824ced 100644
--- a/src/subpackage/retail/pages/confirm_goods/confirm_goods.vue
+++ b/src/subpackage/retail/pages/confirm_goods/confirm_goods.vue
@@ -28,6 +28,19 @@
 						</view>
 					</view>
 				</view>
+				<view class="content-price">
+					<view>商品合计金额：<text>￥</text><text>{{ totalPrice }}</text></view>
+				</view>
+				<view class="content-mark">
+					<view>
+						<text>收取金额</text>
+						<input v-model="realPrice" type="digit" @change="onRealPriceChange" />元
+					</view>
+					<view>
+						<text>备注</text>
+						<textarea v-model="mark" auto-height />
+					</view>
+				</view>
 			</scroll-view>
 		</view>
 		
@@ -35,7 +48,7 @@
 			<view>
 				<view class="cg-footer-price">
 					<view>实付款：</view>
-					<view><text>￥</text>{{ totalPrice }}</view>
+					<view><text>￥</text>{{ realPrice }}</view>
 				</view>
 				
 				<view class="cg-footer-btn">
@@ -61,6 +74,8 @@
 				cartListScroll: false,				// 购物车列表是否能滚动
 				cartListFinalHeight: "0rpx",	// 最终显示的列表高度
 				cartListFinalPaddingBottom: "0rpx",	// 根据是否是异形屏来设置
+				realPrice: 0,
+				mark: ''
 			}
 		},
 		onLoad(option) {
@@ -68,15 +83,25 @@
 			this.curStore = data.curStore;
 			this.cartListFinal = data.cartListFinal;
 			this.totalPrice = data.totalPrice;
+			this.realPrice = data.totalPrice;
 
 			this.fixMainHeight();		// 适配主内容高度
 			util.showLoad();
 			setTimeout(util.hideLoad, 500);
 		},
 		methods: {
+			onRealPriceChange() {
+				let price = parseFloat(this.realPrice || this.totalPrice);
+				this.realPrice = `${price}` != "NaN" ? price.toFixed(2) : this.totalPrice;
+			},
 			// 提交订单
 			cartConfirm() {
-				let data = { cartListFinal: this.cartListFinal, curStore: this.curStore, totalPrice: this.totalPrice };
+				let data = { 
+					cartListFinal: this.cartListFinal, 
+					curStore: this.curStore, 
+					totalPrice: this.realPrice, 
+					mark: this.mark
+				};
 				uni.navigateTo({
 					url: `/subpackage/retail/pages/confirm_order/confirm_order?data=${encodeURIComponent(JSON.stringify(data))}`
 				});
@@ -92,18 +117,19 @@
 						// 看看当前滚动框是否超出这个高度
 						let query = uni.createSelectorQuery().select(".cg-footer");
 						query.boundingClientRect(data => {
-							sumHeight = sumHeight - data.height - uni.upx2px(100);	// 可用高度减去footer 再减去顶部标题项
+							sumHeight = sumHeight - data.height - uni.upx2px(100);	// 可用高度减去footer 再减去顶部标题项100
 							let contentHeight = sumHeight;
 							
 							query = uni.createSelectorQuery().select(".main-list");
 							query.boundingClientRect(data => {
 								let itemSize = data.height;
 								let limitCount = Math.floor(contentHeight / itemSize);
-								let height = _this.cartListFinal.length >= limitCount ? contentHeight : _this.cartListFinal.length * itemSize;
+								let height = _this.cartListFinal.length >= limitCount ? contentHeight : _this.cartListFinal.length * itemSize + 120;	// 120商品合计金额
+								height = contentHeight;
 								_this.cartListFinalHeight = `${tools.px2rpx(height)}rpx`;
 								
-								// 可以滚动，并且设置safeArea,大于等于44的为iphoneX及以上
 								if (height >= contentHeight) {
+								// 可以滚动，并且设置safeArea,大于等于44的为iphoneX及以上
 									_this.cartListScroll = true;
 									_this.cartListFinalPaddingBottom = `${res.safeArea.top >= 44 ? tools.px2rpx(res.safeArea.top) : 0}rpx`;
 								}
@@ -163,13 +189,83 @@
 				flex-direction: column;
 				justify-content: center;
 				align-items: flex-start;
-				padding: 0 24rpx;
-				background-color: white;
+				// padding: 0 24rpx;
+				// background-color: white;
 				
+				.content-mark {
+					width: 100%;
+					margin-top: 20rpx;
+					background-color: white;
+					padding: 0 24rpx;
+					@include centerFlex(flex-start);
+					flex-direction: column;
+					
+					>view {
+						@include centerFlex(flex-start);
+						&:first-child {
+							width: 100%;
+							// height: 130rpx;
+							padding: 20rpx 0rpx;
+							>input {
+								width: 458rpx;
+								border-radius: 10rpx;
+								padding: 24rpx 20rpx;
+								margin: 0rpx 20rpx;
+								background-color: #F2F2F7;
+								font-size: 32rpx;
+							}
+						}
+						&:nth-child(2) {
+							align-items: flex-start;
+							width: 100%;
+							border-top: 1px solid rgba(216, 216, 216, 0.3);
+							padding: 20rpx 0rpx;
+							>textarea {
+								width: 448rpx;
+								min-height: 164rpx;
+								border-radius: 10rpx;
+								padding: 24rpx 20rpx;
+								margin: 0rpx 20rpx;
+								background-color: #F2F2F7;
+								font-size: 32rpx;
+							}
+						}
+						>text {
+							width: 140rpx;
+							text-align: left;
+							font-size: 32rpx;
+						}
+					}
+				}
+				.content-price {
+					width: 100%;
+					// height: 120rpx;
+					background-color: white;
+					padding: 0rpx 24rpx;
+					@include centerFlex(center);
+					>view {
+						width: 100%;
+						height: 100%;
+						text-align: right;
+						padding: 30rpx 0rpx;
+						border-top: 1px solid rgba(216, 216, 216, 0.3);
+						font-size: 28rpx;
+						>text {
+							color: $orange;
+							&:first-child {
+								font-size: 28rpx;
+							}
+							&:nth-child(2) {
+								font-size: 40rpx;
+							}
+						}
+					}
+				}
 				.main-list {
 					display: flex;
 					flex-direction: row;
-					padding: 23rpx 0;
+					padding: 23rpx 24rpx;
+					background-color: white;
 					
 					.item-left {
 						width: 140rpx;
diff --git a/src/subpackage/retail/pages/confirm_order/confirm_order.vue b/src/subpackage/retail/pages/confirm_order/confirm_order.vue
index c94d62a..d350b06 100644
--- a/src/subpackage/retail/pages/confirm_order/confirm_order.vue
+++ b/src/subpackage/retail/pages/confirm_order/confirm_order.vue
@@ -77,7 +77,8 @@
 				curChoose: {},
 				
 				storeCardSelectShow: false,
-				curStoreInfo: {}
+				curStoreInfo: {},
+				mark: ''
 			}
 		},
 		onLoad(option) {
@@ -85,6 +86,7 @@
 			this.curStore = data.curStore;
 			this.cartListFinal = data.cartListFinal;
 			this.totalPrice = data.totalPrice;
+			this.mark = data.mark;
 			
 			this.fixMainHeight();		// 适配主内容高度
 			this.createPayWayList();	// 创建支付方式列表
@@ -135,7 +137,7 @@
 						amount: parseFloat(_this.totalPrice), pay_type: info.type,
 						other_pay_type: info.inputValue, 
 						card_no: info.cardNo,
-						mark: ''
+						mark: this.mark
 					},
 					isDefaultGet: false,
 					failMsg: '出库失败！'