暂存code

2025-05-07 09:54:33 +08:00
parent 78270eeda0
commit 007b002b81
403 changed files with 14507 additions and 6320 deletions
@@ -1,9 +1,17 @@
 <template>
-	<view class="mine_order_info_warp">
+	<view 
+		class="mine_order_info_warp" 
+		:style="{
+			'height': 'calc(100vh - '+height+')'
+		}"
+	>
+		<up-loading-page :loading="listLoading"></up-loading-page>
 		<view class="order_info_header">
 			<up-image src="/static/common/left_b.png" width="20" height="19" bgColor="#f1f6ff00" @click="jumpLeft"></up-image>
 			<view class="header_status">
-				<up-image src="/static/common/order_status_1.png" width="20" height="19" bgColor="#f1f6ff00"></up-image>
+				<view style="margin-top: 10rpx;">
+					<up-image src="/static/common/order_status_1.png" width="20" height="19" bgColor="#f1f6ff00"></up-image>
+				</view>
 				<text class="msg">{{getValue(ORDER_STATUS,orderInfo.status)}}</text>
 			</view>
 		</view>
@@ -13,41 +21,41 @@
 				<view style="">
 					<text style="font-size: 28rpx;font-weight: bold;">需付款：</text>
 					<text style="font-size: 28rpx;">￥</text>
-					<text style="font-size: 36rpx;font-weight: bold;">234</text>
-					<text style="font-size: 28rpx;">.00</text>
-					<text style="font-size: 20rpx;font-weight: bold;margin-left: 20rpx;">剩余</text>
-					<text style="font-size: 28rpx;font-weight: bold;margin-left: 10rpx;">29:32:20</text>
-					<text style="font-size: 20rpx;font-weight: bold;">&nbsp;订单自动取消</text>
+					<text style="font-size: 36rpx;font-weight: bold;">{{orderInfo.sumAmount}}</text>
+					<!-- <text style="font-size: 28rpx;">.00</text> -->
+					<text style="font-size: 20rpx;font-weight: bold;margin-left: 20rpx;">订单</text>
+					<text style="font-size: 28rpx;font-weight: bold;margin-left: 10rpx;">{{formatDate1(orderInfo.expireTime)}}</text>
+					<text style="font-size: 20rpx;font-weight: bold;">&nbsp;自动取消</text>
 				</view>
-				<view class="payment_but">
+				<!-- <view class="payment_but">
 					<view class="but">去支付</view>
-				</view>
+				</view> -->
 			</view>
 			<view class="content_cancel" v-if="orderInfo.status === ORDER_TYPE.CANCELED">取消原因：超时未支付</view>
 			<!-- 地址 -->
 			<view class="steps_warp">
 				<!-- 物流单号 -->
-				<view class="address_info" v-if="[ORDER_TYPE.NOT_RECEIVE].includes(orderInfo.status)">
+				<view class="address_info">
 					<view class="address_data_warp">
 						<up-image src="/static/common/waybill.png" width="20" height="20" bgColor="#f1f6ff00"></up-image>
-						<view class="address_info_name">运单号：</view>
-						<view class="address_info_mobile" style="margin-right: 20rpx;">{{orderInfo.waybillNumber}}</view>
-						<up-image src="/static/common/copy.png" width="14" height="14" bgColor="#f1f6ff00" @click="copyData(orderInfo.waybillNumber)"></up-image>
+						<view class="address_info_name">订单编号：</view>
+						<view class="address_info_mobile" style="margin-right: 20rpx;">{{orderInfo.orderNum}}</view>
+						<up-image src="/static/common/copy.png" width="14" height="14" bgColor="#f1f6ff00" @click="copyData(orderInfo.orderNum)"></up-image>
 					</view>
 				</view>
-				<view class="address_info_right" v-if="[ORDER_TYPE.NOT_RECEIVE].includes(orderInfo.status)">&nbsp;</view>
+				<view class="address_info_right">&nbsp;</view>
 				<!-- 收货地址 -->
 				<view class="address_warp">
 					<view class="address_info">
 						<view class="address_data_warp">
 							<up-image src="/static/common/address.png" width="20" height="20" bgColor="#f1f6ff00"></up-image>
 							<view class="address_info_name">{{orderInfo.name}}</view>
-							<view class="address_info_mobile">{{orderInfo.mobile}}</view>
+							<view class="address_info_mobile">{{orderInfo.phone}}</view>
 						</view>
-						<view class="address_but">修改地址</view>
+						<!-- <view class="address_but">修改地址</view> -->
 					</view>
 					<view class="address_content">
-						{{orderInfo.address}}
+						{{assembleAddress(orderInfo).names}} {{orderInfo.address}}
 					</view>
 				</view>
 			</view>
@@ -56,161 +64,293 @@
 			<view class="order_comm order_product_warp">
 				<!-- 头部 -->
 				<view class="order_product_header">
-					<up-image :src="orderInfo.product.url" width="22" height="22" bgColor="#f1f6ff00"></up-image>
-					<view class="order_product_title">{{orderInfo.product.name}}</view>
+					<up-image :src="orderInfo.shopLogo" width="22" height="22" bgColor="#f1f6ff00" shape="circle"></up-image>
+					<view class="order_product_title">{{orderInfo.shopName}}</view>
 				</view>
 				<!-- 产品详情 -->
 				<view class="order_item_content">
-					<view v-for="pItem in orderInfo.product.productList" :key="pItem.id" class="content_item">
-						<up-image :src="pItem.url" width="80" height="80" bgColor="#f1f6ff00"></up-image>
-						<view class="content_info">
-							<view class="content_info_title">{{pItem.title}}</view>
-							<view class="content_info_tag">{{pItem.tag.join(" ")}}</view>
-							<view>
-								<text class="content_info_description" v-for="dItem in pItem.description" :key="dItem">
-									{{dItem}}
-								</text>
+					<view v-for="pItem in orderInfo.items" :key="pItem.id" >
+						<view class="content_item">
+							<up-image :src="pItem.mainGraph" width="80" height="80" bgColor="#f1f6ff00"></up-image>
+							<view class="content_info">
+								<view class="content_info_title">{{pItem.title}}</view>
+								<view class="content_info_tag">{{pItem.goodsSpece}}</view>
+								<view>
+									<text class="content_info_description" v-for="dItem in pItem.description" :key="dItem">
+										{{dItem}}
+									</text>
+								</view>
+							</view>
+							<view class="content_right">
+								<view class="content_right_total">￥{{pItem.goodsAmount}}</view>
+								<view class="content_right_quantity">x{{pItem.buyNum}}</view>
 							</view>
 						</view>
-						<view class="content_right">
-							<view class="content_right_total">￥{{pItem.total}}</view>
-							<view class="content_right_quantity">x{{pItem.quantity}}</view>
+						<view class="content_other_item">
+							<view class="data_item data_item_yd" v-if="pItem.expressNo">
+								<view class="item_title">运单号：</view>
+								<view class="item_value">
+									<view>{{pItem.expressNo}} </view>
+									<view style="margin-left:10rpx;">
+										<up-image src="/static/common/copy.png" width="14" height="14" bgColor="#f1f6ff00" @click="copyData(pItem.expressNo)"></up-image>
+									</view>
+								</view>
+							</view>
 						</view>
 					</view>
 				</view>
+			
 			</view>
 			
 			<!-- 金额等数据汇总 -->
 			<view class="order_comm order_data_warp">
 				<view class="data_item">
 					<view class="item_title">商品总价</view>
-					<view class="item_value">￥3599.00</view>
+					<view class="item_value">￥{{orderInfo.sumAmount}}</view>
 				</view>
 				<view class="data_item">
 					<view class="item_title">快递运费</view>
 					<view class="item_value">￥0.00</view>
 				</view>
 				<view class="data_item">
-					<view class="item_title">平台优惠<text class="copy_order_coupon">优惠券</text></view>
-					<view class="item_value">-￥10.00</view>
+					<view class="item_title">平台优惠<text class="copy_order_coupon" v-if="orderInfo.coupon">优惠券</text></view>
+					<view class="item_value">-￥0.00</view>
 				</view>
 				<view class="data_item">
 					<view class="item_title">应付款</view>
-					<view class="item_value pay_amount">￥3589.00</view>
+					<view class="item_value pay_amount">￥{{orderInfo.sumAmount}}</view>
 				</view>
 				<view class="order_data_but"></view>
-				<view class="data_item">
-					<view class="item_title">订单编号</view>
-					<view class="item_value">2324124232424 <text class="copy_order_number" @click="copyData('2324124232424')">复制</text></view>
-				</view>
+				
 				<view class="data_item">
 					<view class="item_title">买家留言</view>
-					<view class="item_value">快点发货~</view>
+					<view class="item_value">{{orderInfo.remark}}</view>
 				</view>
 				<view class="data_item">
 					<view class="item_title">配送方式</view>
 					<view class="item_value">普通快递</view>
 				</view>
-				<view class="data_item">
+				<!-- <view class="data_item">
 					<view class="item_title">支付方式</view>
 					<view class="item_value">微信支付</view>
-				</view>
+				</view> -->
 				<view class="data_item">
 					<view class="item_title">下单时间</view>
-					<view class="item_value">2024-10-12 20:18:25</view>
+					<view class="item_value">{{formatDate(orderInfo.ctdate)}}</view>
+				</view>
+			</view>
+			
+			<!-- 支付方式 -->
+			<view class="order_way_warp" @click="wayShow = true;" v-if="orderInfo.status === ORDER_TYPE.UNPAID">
+				<view>支付方式</view>
+				<view class="order_way_right">
+					{{getValue(wayOption,wayForm.payway)}}
+					<up-image src="/static/common/right.png" width="20" height="20" bgColor="#f1f6ff00"></up-image>
 				</view>
 			</view>
 		</view>
-		<view class="collect_operate order_but_warp">
-			<view class="operate_comm operate_but_1"  v-if="orderInfo.status === ORDER_TYPE.UNSHIPPED">取消订单</view>
+		<view 
+			class="collect_operate order_but_warp" 
+			v-if="[ORDER_TYPE.UNPAID,ORDER_TYPE.NOT_RECEIVE].includes(orderInfo.status)"
+		>
+			<!-- <view class="operate_comm operate_but_1"  v-if="orderInfo.status === ORDER_TYPE.UNSHIPPED">取消订单</view> -->
 			<view class="operate_comm operate_but_2" v-if="orderInfo.status === ORDER_TYPE.UNPAID" @click="goPay">去付款</view>
-			<view class="operate_comm operate_but_1" v-if="orderInfo.status === ORDER_TYPE.COMPLETED">申请退款</view>
-			<view class="operate_comm operate_but_2" v-if="orderInfo.status === ORDER_TYPE.NOT_RECEIVE">确认收货</view>
-			<view class="operate_comm operate_but_3" v-if="orderInfo.status === ORDER_TYPE.UNSHIPPED">提醒发货</view>
-			<view class="operate_comm operate_but_1" v-if="orderInfo.status === ORDER_TYPE.COMPLETED">申请售后</view>
-			<view class="operate_comm operate_but_1" v-if="orderInfo.status === ORDER_TYPE.AFTER_SALE">查看售后</view>
-			<view class="operate_comm operate_but_1" v-if="[ORDER_TYPE.COMPLETED].includes(orderInfo.status)">删除记录</view>
-			<view class="operate_comm operate_but_3" v-if="[ORDER_TYPE.COMPLETED,ORDER_TYPE.CANCELED].includes(orderInfo.status)">再次购买</view>
+			<!-- <view class="operate_comm operate_but_1" v-if="orderInfo.status === ORDER_TYPE.COMPLETED">申请退款</view> -->
+			<view class="operate_comm operate_but_2" v-if="orderInfo.status === ORDER_TYPE.NOT_RECEIVE" @click="confirmReceiptOk(orderInfo)">确认收货</view>
+			<!-- <view class="operate_comm operate_but_3" v-if="orderInfo.status === ORDER_TYPE.UNSHIPPED">提醒发货</view> -->
+			<!-- <view class="operate_comm operate_but_1" v-if="orderInfo.status === ORDER_TYPE.COMPLETED">申请售后</view> -->
+			<!-- <view class="operate_comm operate_but_1" v-if="orderInfo.status === ORDER_TYPE.AFTER_SALE">查看售后</view> -->
+			<!-- <view class="operate_comm operate_but_1" v-if="[ORDER_TYPE.COMPLETED].includes(orderInfo.status)">删除记录</view> -->
+			<!-- <view class="operate_comm operate_but_3" v-if="[ORDER_TYPE.COMPLETED,ORDER_TYPE.CANCELED].includes(orderInfo.status)">再次购买</view> -->
 		</view>
+		<!-- 选择支付方式 -->
+		<up-popup v-model:show="wayShow" :round="10" :closeOnClickOverlay="false" :closeable="true" :safeAreaInsetBottom="false">
+			<view class="way_popup_warp">
+				<view class="way_popup_title">支付方式</view>
+				<up-radio-group
+				    v-model="wayForm.payway"
+				    placement="column"
+				  >
+					  <view class="way_item" v-for="item in wayOption" :key="item.type">
+						<view class="way_item_">
+							<!-- <view style="margin-top: 2rpx;"><up-image :src="item.path" width="20" height="20" bgColor="#f1f6ff00"></up-image></view> -->
+							<view class="way_item_val">{{item.name}}<text v-if="item.balance">&nbsp;&nbsp;({{item.balance}})</text></view>
+						</view>
+						<up-radio
+						  :name="item.type"
+						  activeColor="#FF7C41"
+						>
+						</up-radio>
+					  </view>
+				</up-radio-group>
+				<view class="popup_but" @click="wayShow = false;">
+					确认
+				</view>
+			</view>
+		</up-popup>
+		<up-toast ref="uToastRef"></up-toast>
 	</view>
 </template>

 <script>
 	import { ORDER_TYPE,ORDER_STATUS,getValue } from '@/utils/enumUtils.js';
-	import { copyData } from '@/utils/index.js';
+	import { copyData,assembleAddress,formatDate,formatDate1 } from '@/utils/index.js';
+	import { getDetail,payment,getSupportPay,confirmReceipt } from '@/api/order.js';
+	import { appWxpayFun,zfbPayFun,jumpWayOk,jumpWayError } from '@/utils/payUtils.js'
 		
 	export default {
 		computed: {
 		    ORDER_TYPE() {
-		      return ORDER_TYPE;
+				return ORDER_TYPE;
 		    }, 
 			ORDER_STATUS() {
-		      return ORDER_STATUS;
+				return ORDER_STATUS;
 		    }, 
 			ORDER_STATUS_CSS() {
-		      return ORDER_STATUS_CSS;
-		    }
+				return ORDER_STATUS_CSS;
+		    },
 		},
 		data() {
 			return {
-				type:0,
-				orderInfo:{
-					// status:ORDER_TYPE.UNPAID,// 待付款
-					// status:ORDER_TYPE.CANCELED,// 已取消
-					// status:ORDER_TYPE.UNSHIPPED,// 待发货
-					status:ORDER_TYPE.NOT_RECEIVE,// 待收货
-					// status:ORDER_TYPE.COMPLETED,// 完成
-					// status:ORDER_TYPE.AFTER_SALE,
-					name:"张先生",
-					mobile:"18****2848",
-					address:"河南省郑州市金水区东风路街道北三环索凌路交叉口明明小区1号楼1座",
-					waybillNumber:'SF23423443242',
-					product:{
-						id:1,
-						url:'/static/common/order_defal.png',
-						name:"哈希店铺",
-						status:1,
-						paymentTime:29,// 剩余付款时间，单位：分钟
-						productList:[
-							{
-								id:1,
-								url:'/static/common/product_def.png',
-								title:'美的双开门冰箱大容量多美的双开门冰箱大容量多',
-								description:['双开门','大容量'],
-								tag:['7天无理由退货','退货险'],
-								quantity:1,
-								total:3599,
-							},{
-								id:2,
-								url:'/static/common/product_def.png',
-								title:'美的双开门冰箱大容量多美的双开门冰箱大容量多',
-								description:['双开门','大容量'],
-								tag:['7天无理由退货','退货险'],
-								quantity:1,
-								total:3599,
-							}
-						],
-						productTotal:7599,
-					},
+				id:0,
+				orderInfo:{},
+				listLoading:false,
+				wayForm:{
+					id:0,
+					payway:null,// 支付方式
 				},
-				
+				wayShow:false,
+				wayOption:[],// 支付选项
+				height:'180rpx',
 			}
 		},
 		onLoad(options) {
-			const type = options.type;
-			this.type = type ? parseInt(type,10) : 0;
+			const id = options.id;
+			this.id = id ? parseInt(id,10) : 0;
+			this.getOrderInfo();
+			this.getWayOption();
 		},
 		methods: {
 			getValue,
 			copyData,
+			assembleAddress,
+			formatDate,
+			formatDate1,
 			jumpLeft(){
 				uni.navigateTo({
-					url:"/pages/mine_order/mine_order?type="+this.type,
+					url:"/pages/mine_order/mine_order?type="+this.orderInfo.status,
 				})
 			},
+			async getWayOption(){
+				const result = await getSupportPay();
+				if(result && result.bizcode === 100){
+					this.wayOption = result.data;
+				}
+			},
+			// 查询订单详情
+			async getOrderInfo(){
+				this.listLoading = true;
+				const params={
+					id:this.id,
+				}
+				const result = await getDetail(params);
+				if(result && result.bizcode === 100){
+					const orderInfo = result.data;
+					if([ORDER_TYPE.UNPAID,ORDER_TYPE.NOT_RECEIVE].includes(orderInfo.status)){
+						this.height = '180rpx';
+					}else{
+						this.height = '0rpx';
+					}
+					this.orderInfo = orderInfo;
+				}
+				this.listLoading = false;
+			},
 			// 去支付
-			goPay(){
-				console.log("goPay.....")
+			async goPay(){
+				const payway = this.wayForm.payway;
+				if(!payway || payway === 0){
+					this.$refs.uToastRef.show({
+						type: 'error',
+						message: "请先选择支付方式",
+					});
+					return;
+				}
+				const params={
+					id:this.orderInfo.id,
+					payway,
+				}
+				const resp = await payment(params);
+				// 提交订单成功，就唤起支付
+				if(resp && resp.bizcode === 100){
+					const item = resp.data;
+					if(item.status === 1){
+						jumpWayOk();
+						return;
+					}
+					if(item.wechat && Object.keys(item.wechat).length !==0){
+						this.appWxpay(item.wechat,item.orderId,item.orderNum);
+					}else if(item.alipay && Object.keys(item.alipay).length !==0 && item.alipay){
+						this.zfbPay(item.alipay,item.orderId,item.orderNum);
+					}else{
+						this.$refs.uToastRef.show({
+							type: 'error',
+							message: "订单支付失败",
+						});
+						setTimeout(()=>{
+							jumpWayError()
+						},2000)
+					}
+				}else{
+					this.getOrderInfo();
+				}
+			},
+			// app 微信支付
+			async appWxpay(alipay,orderId,orderNum){
+				try {
+					const result = await appWxpayFun(alipay,orderId,orderNum);
+					console.log('支付成功', result);
+					// 处理支付成功后的逻辑，如更新订单状态等
+				} catch (error) {
+					console.error('支付失败', error);
+					// 处理支付失败后的逻辑，如提示用户等
+				}
+			},
+			// 支付宝支付
+			async zfbPay(alipay,orderId,orderNum){
+				try {
+					const result = await zfbPayFun(alipay,orderId,orderNum);
+					console.log('支付成功', result);
+					// 处理支付成功后的逻辑，如更新订单状态等
+				} catch (error) {
+					console.error('支付失败', error);
+					// 处理支付失败后的逻辑，如提示用户等
+				}
+			},
+			/**
+			 * 确认收货
+			 */
+			confirmReceiptOk(item){
+				const then = this;
+				uni.showModal({
+				    title: '提示',
+				    content: '是否确认收货？',
+				    success: function (res) {
+				        if (res.confirm) {
+				            then.confirmReceiptFun(item);
+				        }
+				    }
+				});
+			},
+			async confirmReceiptFun(item){
+				const params = {
+					id:item.id,
+				}
+				const resp = await confirmReceipt(params);
+				if(resp && resp.bizcode === 100){
+					this.orderList = [];
+					this.form.page = 1;
+					this.loadData();
+				}
 			}
 		}
 	}
@@ -218,7 +358,7 @@

 <style lang="scss" scoped>
 	.mine_order_info_warp{
-		height: calc(100vh - 180rpx);
+		// height: calc(100vh - 180rpx);
 		background-color: $app-bj;
 		position: relative;
 		overflow-y: auto;
@@ -247,7 +387,7 @@
 	.order_info_content{
 		position: absolute;
 		top: 184rpx;
-		width: 100%;
+		width: calc(100% - 40rpx);
 		padding: 0 20rpx;
 		.content_due{
 			display: grid;
@@ -280,13 +420,13 @@
 			background: #FFFFFF;
 			border-radius: 24rpx;
 			padding: 20rpx;
-			width: calc(100% - 80rpx);
+			width: calc(100% - 40rpx);
 			margin-top: 66rpx;
 			.address_info_right{
 				border-left: 1rpx dashed #99999959;
-				height: 26rpx;
+				height: 14rpx;
 				width: 10rpx;
-				margin: 20rpx;
+				margin: 10rpx 20rpx;
 			}
 			.address_warp{
 			}
@@ -329,11 +469,12 @@
 		border-radius: 20rpx;
 		padding: 30rpx;
 		margin-top: 30rpx;
-		width: calc(100% - 96rpx);
+		width: calc(100% - 60rpx);
 	}
 	.order_product_warp{
 		.order_product_header{
 			display: flex;
+			align-items: center;
 		}
 		.order_product_title{
 			font-weight: bold;
@@ -345,19 +486,8 @@
 	
 	.order_data_warp{
 		margin-bottom: 20rpx;
-		.data_item{
-			display: flex;
-			justify-content: space-between;
-			line-height: 60rpx;
-			font-weight: bold;
-			font-size: 24rpx;
-		}
-		.item_title{
-			color: #808080;
-		}
-		.item_value{
-			color: #1A1A1A;
-		}
+		
+		
 		.pay_amount{
 			color: $app-bt-bj;
 		}
@@ -396,4 +526,32 @@
 			height: 34rpx;
 		}
 	}
+	.content_other_item{
+		margin-top: 20rpx;
+	}
+	.data_item{
+		display: flex;
+		justify-content: space-between;
+		line-height: 60rpx;
+		font-weight: bold;
+		font-size: 24rpx;
+	}
+	.item_title{
+		color: #808080;
+	}
+	.item_value{
+		color: #1A1A1A;
+		display: flex;
+	}
+	.order_way_warp{
+		margin-bottom: 60rpx;
+		width: calc(100% - 60rpx);
+	}
+	.content_info_title{
+		width: 370rpx;
+	}
+	.data_item_yd{
+		display: flex;
+		justify-content: left;
+	}
 </style>