Signed-off-by: 李妹妹 <1639016684@qq.com>

pages/shopping/cart.vue

@@ -85,8 +85,11 @@
 			}	
 		},
 		onLoad() {
-			this.getCarts();
+			
  
+		},
+		onShow(){
+			this.getCarts();
 		},
 		onReachBottom() {
 			this.$refs.product.getGoodsProducts();

pages_company/shareLive.vue

@@ -1,6 +1,15 @@
 <template>
 	<view>
-		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption"
+		<!-- 搜索框 -->
+		<view class="top-fixed">
+		<view class="search-cont">
+			<view class="inner">
+				<image class="icon-search" src="https://jnlzjk-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/search.png" mode=""></image>
+				<input type="text" @confirm="goSearch"   :value="searchKey" placeholder="输入直播间名称" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
+			</view>
+		</view>
+		</view>
+		<mescroll-body top="108rpx" ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption"
 			:up="upOption">
 			<view class="live-list">
 				<view v-for="(item,index) in dataList" :key="index" class="item">
@@ -54,7 +63,7 @@
 				userinfo: {},
 				currentShareItem: null,
 				currentItem: null, // 添加当前项存储
-				// searchKey: "",
+				searchKey: "",
 				mescroll: null,
 				// 上拉加载的配置
 				upOption: {
@@ -250,10 +259,10 @@
 				console.log("设置后的currentShareItem:", this.currentShareItem);
 			},
 
-			// goSearch(e) {
-			// 	this.searchKey = e.detail.value;
-			// 	this.mescroll.resetUpScroll()
-			// },
+			goSearch(e) {
+				this.searchKey = e.detail.value;
+				this.mescroll.resetUpScroll()
+			},
 			mescrollInit(mescroll) {
 				this.mescroll = mescroll;
 			},
@@ -268,6 +277,7 @@
 				var data = {
 					pageNum: page.num,
 					pageSize: page.size,
+					liveName:this.searchKey
 				};
 				liveShareList( data).then(res => {
 					if (res.code == 200) {
@@ -301,6 +311,13 @@
 </script>
 
 <style lang="scss">
+	.top-fixed{
+		width: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 10;
+	}
 	.search-cont {
 		padding: 16rpx 30rpx;
 		background-color: #FFFFFF;

pages_course/living.vue

@@ -6293,7 +6293,7 @@
 						margin-right: 24rpx;
 						display: flex;
 						align-items: center;
-
+                        color:#000;
 						.search-icon {
 							width: 24rpx;
 							margin-right: 16rpx;

pages_shopping/live/paymentOrder.vue

@@ -55,7 +55,7 @@
 					<text class="text">{{ formattedDate}} </text>
 				</view>
 				<view class="item">
-					<text class="label">订单金额</text>
+					<text class="label">实付金额</text>
 					<text class="text"
 						v-if="order!=null">{{order ? (Number(order.payPrice) || 0).toFixed(2) : "0.00"}}</text>
 				</view>
@@ -134,6 +134,7 @@
 				try {
 					const decoded = decodeURIComponent(options.orderList);
 					this.order = JSON.parse(decoded) || {}; // 默认空对象
+					console.log(this.order,'---')
 				} catch (e) {
 					console.error('参数解析失败:', e);
 					this.order = {}; // 显式赋默认值

pages_shopping/live/storeOrderDetail.vue

@@ -156,7 +156,7 @@
 						<!-- 已优惠、小计 -->
 						<view class="sub-total">
 							<view class="discount">
-								订单金额：￥{{order.totalPrice}}
+								商品金额：￥{{order.totalPrice}}
 							</view>
 						</view>
 					</view>
@@ -180,35 +180,35 @@
 							<!-- <text class="text" v-if="order.payType==2">物流代收</text> -->
 						</view>
 						<view class="item">
-							<text class="label">订单金额</text>
+							<text class="label">商品金额</text>
 							<text class="text" v-if="order.totalPrice!=null">¥{{order.totalPrice.toFixed(2)}}</text>
 						</view>
 
 						<view class="item">
 							<text class="label">运费</text>
-							<text class="text" v-if="order.payPostage!=null">¥{{order.payPostage.toFixed(2)}}</text>
+							<text class="text" v-if="order.payDelivery!=null">¥{{order.payDelivery.toFixed(2)}}</text>
 						</view>
 						<!-- <view class="item">
 							<text class="label">服务费</text>
 							<text class="text" v-if="order.serviceFee!=null">¥{{order.serviceFee.toFixed(2)}}</text>
 						</view> -->
-						<!-- <view class="item">
+						<view class="item">
 							<text class="label">优惠金额</text>
-							<text class="text" v-if="order.couponPrice!=null">-¥{{order.couponPrice.toFixed(2)}}</text>
-						</view> -->
+							<text class="text" v-if="order.discountMoney!=null">-¥{{order.discountMoney.toFixed(2)}}</text>
+						</view>
 						<view class="item">
 							<text class="label">应付金额</text>
 							<text class="text" v-if="order.totalPrice!=null">¥{{order.totalPrice.toFixed(2)}}</text>
 						</view>
 						<view class="item">
 							<text class="label">支付金额</text>
-							<text class="text" v-if="order.payMoney!=null">¥{{order.payMoney.toFixed(2)}}</text>
+							<text class="text" v-if="order.payPrice!=null">¥{{order.payPrice.toFixed(2)}}</text>
 						</view>
 						<!-- <view class="item">
 							<text class="label">代收金额</text>
 							<text class="text" v-if="order.payDelivery!=null">¥{{order.payDelivery.toFixed(2)}}</text>
 						</view> -->
-						<view class="item">
+						<view class="item" v-if="order.payTime!=null">
 							<text class="label">支付时间</text>
 							<text class="text" v-if="order.payTime!=null">{{order.payTime}}</text>
 						</view>

pages_user/user/storeOrderDetail.vue

@@ -158,7 +158,7 @@
 						<!-- 已优惠、小计 -->
 						<view class="sub-total">
 							<view class="discount">
-								订单金额：￥{{order.payPrice}}
+								商品金额：￥{{order.payPrice}}
 							</view>
 							<!-- <text class="label">实付金额：</text>
 							<view class="price">
@@ -187,7 +187,7 @@
 							<!-- <text class="text" v-if="order.payType==2">物流代收</text> -->
 						</view>
 						<view   class="item">
-							<text class="label">订单金额</text>
+							<text class="label">商品金额</text>
 							<text class="text" v-if="order.totalPrice!=null">¥{{order.totalPrice.toFixed(2)}}</text>
 						</view>
 						<view   class="item">
@@ -203,10 +203,14 @@
 							<text class="label">支付金额</text>
 							<text class="text" v-if="order.payMoney!=null">¥{{order.payMoney.toFixed(2)}}</text>
 						</view>
-						<view   class="item">
+						<view class="item">
+							<text class="label">运费</text>
+							<text class="text" v-if="order.payPostage!=null">¥{{order.payPostage.toFixed(2)}}</text>
+						</view>
+						<!-- <view   class="item">
 							<text class="label">代收金额</text>
 							<text class="text" v-if="order.payDelivery!=null">¥{{order.payDelivery.toFixed(2)}}</text>
-						</view>
+						</view> -->
 						<view  class="item">
 							<text class="label">支付时间</text>
 							<text class="text" v-if="order.payTime!=null">{{order.payTime}}</text>