From 6d1f074317745789a281d2d9ea41a57de4b63e4d Mon Sep 17 00:00:00 2001
From: lincm <8481569+qiuqiukele@user.noreply.gitee.com>
Date: Tue, 6 Sep 2022 16:45:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/confirmation.vue | 20 ++++++++++++++------
 pages/shippingCart/index.vue | 34 ++++++++++++++++++++++++++++++----
 2 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index a78ad4c..f207304 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -37,7 +37,7 @@
 			
 			<view class="method_item" v-for="(item,index) in shipping_list " :key="index">
 				<view class="method_item_image" @click="cartselectshipping(item.shipping_id)">
-					<image src="../../static/img/select1.png"  style="width: 30rpx;height: 30rpx;" v-if="order.shipping_id==item.shipping_id"></image>
+					<image src="../../static/img/select1.png"  style="width: 30rpx;height: 30rpx;" v-if="orderId==item.shipping_id"></image>
 					<image src="../../static/img/select2.png"  style="width: 30rpx;height: 30rpx;"v-else ></image>
 				</view>
 				
@@ -221,10 +221,13 @@
 				shipping_list:[],
 				bonus_list:[],
 				total:{},
-				order:{},
+				order:{
+				  shipping_id:11
+				},
 				// 支付方式: 0、支付宝 1、银行卡、信用卡 2、谷歌支付 4、苹果支付
 				pay_index:0,
 				tag:0,
+				orderId:0,
 				
 			}
 		},
@@ -236,7 +239,8 @@
 					     
 					if(res.error==0){
 						this.total=res.data.total
-						this.order=res.data.order
+						// this.order=res.data.order
+						this.orderId=res.data.order.shiping_id
 					}
 				})
 			},
@@ -340,6 +344,7 @@
 					postscript:'',
 					bonus:this.order.bonus,
 					surplus:this.order.surplus,
+					// shipping_id:this.orderId,
 					shipping_id:this.order.shipping_id,
 					directshopping:0,
 				}
@@ -358,7 +363,8 @@
 					if(res.error==0){
 						this.tag = 1
 						this.total=res.data.total
-						this.order=res.data.order
+						 this.order=res.data.order
+						this.orderId=res.data.order.shipping_id
 					}
 				})
 			},
@@ -429,10 +435,12 @@
 		onLoad(e) {
 			
 			this.query=JSON.parse(e.query)
-			console.log(this.query,'///')
+			this.orderId = e.orderId
+			console.log(this.orderId,'///')
 			this.getList()
 		},
-		onShow() {
+		onShow(e) {
+			 
 			this.getList()
 			uni.$once('query' ,(query)=>{
 				console.info(query)
diff --git a/pages/shippingCart/index.vue b/pages/shippingCart/index.vue
index 16a6e29..dc04cc5 100644
--- a/pages/shippingCart/index.vue
+++ b/pages/shippingCart/index.vue
@@ -18,7 +18,7 @@
 		<template v-else>
 			<view class="cart_info">
 				<image src="/static/img/Shipped.png" mode=""></image>
-				<view class="cart_title_content">Buy US$32.00 more to enjoy FREE STANDARD SHIPPING!</view>
+				<view class="cart_title_content">Buy US$<text v-if="money==0||money>0">{{ money }}</text>more to enjoy FREE STANDARD SHIPPING!</view>
 				<view class="cart_title_right" @click="gotAdd()">Add</view>
 			</view>
 			<view class="cart">
@@ -203,6 +203,7 @@
 	import {
 		defaultRequest,
 		defaultRequest2,
+		defaultRequest3,
 		defaultRequest4
 	} from '../../api/index.js'
 	export default {
@@ -216,6 +217,7 @@
 					goods_price: 0,
 					goods_count: 0
 				},
+				money:0,
 				// 商品数据
 				goods_list: [],
 				// 全选标识。1-全部选中，2-全部未选，3-部分选中。
@@ -257,7 +259,14 @@
 				Attr_img:'',
 				gotoPay:0,
 				num:1.,
-				str_select:[]
+				str_select:[],
+				query:{
+					_action:'cartcheckout',
+					is_new:0,
+					direct_shopping:0,
+					consignee:''
+				},
+				orderId:0,
 			}
 		},
 		onBackPress(options) {
@@ -347,7 +356,7 @@
 					consignee:''
 				}
 				uni.navigateTo({
-					url: '../order/confirmation?query=' + JSON.stringify(data)
+					url: '../order/confirmation?query=' + JSON.stringify(data) + '&orderId='+this.orderId
 				})
 
 			},
@@ -446,6 +455,7 @@
 				defaultRequest4(data).then(res => {
 					if (res.error == 0) {
 						this.getList()
+						this.getorder()
 					}
 				})
 			},
@@ -607,6 +617,21 @@
 
 			},
 
+  getorder(){
+	  defaultRequest3(this.query,'consignee').then(res =>{
+		  console.log(res)
+		  if(res.error ==0){
+			  console.log(res.data.shipping_list[0].free_money)
+			  this.orderId = res.data.shipping_list[0].shipping_id
+			  if(res.data.shipping_list[0].free_money >this.total.goods_price){
+				  this.money = parseInt(res.data.shipping_list[0].free_money) - parseInt(this.total.goods_price)
+				  console.log(this.money)
+			  }else{
+				  this.money = 0
+			  }
+		  }
+	  })
+  },
 			// 更改购物车规格
 			ChangeAttr(item) {
 				console.log(item)
@@ -735,11 +760,12 @@
 			this.getList()
 			this.getCatList(0)
             this.getAddress()
-
+            this.getorder()
 
 		},
 		onShow() {
 			this.getList()
+			this.getorder()
 
 		},
 		onPullDownRefresh() {