From 52f8614e9ad3fbd395a68e036bed6043e1870098 Mon Sep 17 00:00:00 2001
From: ltlzx <942659938@qq.com>
Date: Sat, 9 Jul 2022 17:02:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E3=80=81=E6=88=91=E7=9A=84=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=83=A8=E5=88=86=E5=86=85=E5=AE=B9=E3=80=81=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E5=AE=9D=E6=94=AF=E4=BB=98=E3=80=81=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=87=E6=8D=A2=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                  |  11 +-
 pages/account/address.vue      |  24 ++++-
 pages/account/myOrders.vue     | 186 +++++++++++++++++++++++++++------
 pages/order/confirmation.vue   |  82 ++++++++++++---
 pages/productDetails/index.vue |   9 +-
 5 files changed, 257 insertions(+), 55 deletions(-)

diff --git a/manifest.json b/manifest.json
index 356c60b..1af6c0b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -17,7 +17,9 @@
             "delay" : 0
         },
         /* 模块配置 */
-        "modules" : {},
+        "modules" : {
+            "Payment" : {}
+        },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
@@ -44,7 +46,12 @@
             "ios" : {},
             /* SDK配置 */
             "sdkConfigs" : {
-                "ad" : {}
+                "ad" : {},
+                "payment" : {
+                    "alipay" : {
+                        "__platform__" : [ "ios", "android" ]
+                    }
+                }
             }
         }
     },
diff --git a/pages/account/address.vue b/pages/account/address.vue
index 4f4662f..4404aa0 100644
--- a/pages/account/address.vue
+++ b/pages/account/address.vue
@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view class="address_item" v-for="(item,index) in list" :key="index">
+		<view class="address_item" v-for="(item,index) in list" :key="index" @click="selectAddress(item)">
 			<view class="address_info">
 				<view class="address_info_title">
 					<view class="info_title_span">{{item.consignee}}</view>
@@ -11,17 +11,17 @@
 						<view>{{item.sign_building}} </view>
 						<text>{{item.country_name}} {{item.province_name}} {{item.city_name}} {{item.address}} {{item.mobile}}</text>
 					</view>
-					<image src="../../static/img/update.png" mode="" @click="updateAddress(item)"></image>
+					<image src="../../static/img/update.png" mode="" @click.stop="updateAddress(item)"></image>
 				</view>
 			</view>
 			
 			<view class="address_default">
 				<view class="address_default_left">
 					<image src="../../static/img/select4.png" mode="" v-if="item.default_address_id==item.address_id"></image>
-					<image src="../../static/img/select2.png" mode="" v-else @click="setDefault(item.address_id)"></image>
+					<image src="../../static/img/select2.png" mode="" v-else @click.stop="setDefault(item.address_id)"></image>
 					<text>Default address</text>
 				</view>
-				<text @click="deleteAddress(item.address_id)">Delete</text>
+				<text @click.stop="deleteAddress(item.address_id)">Delete</text>
 			</view>
 			
 		</view>
@@ -43,10 +43,18 @@
 		data() {
 			return {
 				list:[],
-				address_id:''
+				address_id:'',
+				type:0
 			}
 		},
 		methods:{
+			//确认订单选择地址
+			selectAddress(item){
+				if(this.type==1){
+					uni.$emit('query' , {consignee : item,type:'address'});
+					uni.navigateBack()
+				}
+			},
 			// 修改地址
 			updateAddress(item){
 				uni.navigateTo({
@@ -93,7 +101,13 @@
 		},
 		onShow() {
 			this.getList()
+		},
+		onLoad(e) {
+			if(e.type==1){
+				this.type=1
+			}
 		}
+		
 	}
 </script>
 <style>
diff --git a/pages/account/myOrders.vue b/pages/account/myOrders.vue
index 5d1f07b..167d092 100644
--- a/pages/account/myOrders.vue
+++ b/pages/account/myOrders.vue
@@ -8,7 +8,8 @@
 		<view class="body">
 			<template v-if="isList==true && scroll_active==0">
 			<view class="" v-for="(item,idnex) in orderList" :key="item.order_id">
-				<view class="order" v-if="item.pay_status_code==0">
+				<!-- 待支付订单 -->
+				<view class="order" v-if="item.pay_status_code==0 && item.order_status_code==0">
 					<view class="order_title">
 						<text>Waiting for payment</text>
 						<view class="order_title_right">
@@ -34,11 +35,41 @@
 							<text>Reward 10 points</text>
 						</view>
 						<view class="order_button">
-							<button class="cancel">CANCEL ORDER</button>
-							<button class="pay">PAY NOW</button>
+							<button class="cancel" @click="cancelorder(item.order_id)">CANCEL ORDER</button>
+							<button class="pay" @click="payNow(item.order_id)">PAY NOW</button>
+						</view>
+					</view>
+				</view>
+				
+				<!-- 已取消订单 -->
+				<view class="order" v-if="item.order_status_code==2" @click="goDetails(1)">
+					<view class="order_title">
+						<text>cancelled</text>
+						<view class="order_title_right">
+							<text>order#{{item.order_sn}}</text>
+							<image src="../../static/img/right.png" mode=""></image>
+						</view>
+					</view>
+					<view class="order_content">
+						<view class="good_info">
+							<view class="good_info_left">
+								<view class="good_info_image" v-for="(item1,index1) in item.order_goods" :key="index1">
+									<image :src="item.goods_img" mode=""></image>
+								</view>
+							</view>
+							<view class="good_info_right">
+								<text>{{item.order_goods.length}} ltems</text>
+								<image src="../../static/img/right.png" mode=""></image>
+							</view>
+						</view>
+						<view class="good_price">total:US${{item.order_amount}}</view>
+						<view class="order_button">
+							<button class="cancel">DELETE ORDER</button>
 						</view>
 					</view>
 				</view>
+				
+				
 			</view>
 				
 				
@@ -151,32 +182,6 @@
 					</view>
 				</view>
 				
-				<navigator url="/pages/order/details?details_index=1">
-					<view class="order">
-						<view class="order_title">
-							<text>cancelled</text>
-							<view class="order_title_right">
-								<text>order#20245512141212</text>
-								<image src="../../static/img/right.png" mode=""></image>
-							</view>
-						</view>
-						<view class="order_content">
-							<view class="good_info">
-								<view class="good_info_left">
-									<view class="good_info_image" v-for="(item,index) in 4" :key="index"></view>
-								</view>
-								<view class="good_info_right">
-									<text>4 ltems</text>
-									<image src="../../static/img/right.png" mode=""></image>
-								</view>
-							</view>
-							<view class="good_price">total:US$12.5</view>
-							<view class="order_button">
-								<button class="cancel">DELETE ORDER</button>
-							</view>
-						</view>
-					</view>
-				</navigator>
 			</template>
 			<template v-if="isList==true && scroll_active==2">
 				<navigator url="/pages/order/details?details_index=0">
@@ -296,8 +301,57 @@
 				</view>
 			</template>
 		</view>
-		
-		
+		<view class="mask" v-show="isPay" @click="isShow=false"></view>
+		<view class="order_popup" v-show="isPay">
+			<view class="order_popup_title">
+				<text>
+					Payment Method
+				</text>
+				<image src="../../static/img/close1.png" mode="" @click="isPay=false"></image>
+			</view>
+			<view class="order_popup_pay" >
+				<view class="pay_item" @click="selectPay(0)">
+					<image src="../../static/img/select1.png" mode="" class="pay_item_select" v-if="pay_index==0"></image>
+					<image src="../../static/img/select2.png" mode="" class="pay_item_select" v-else></image>
+					<view class="pay_item_right">
+						<image src="../../static/img/pay_pal.png" mode=""></image>
+						<text>Pay Pal</text>
+					</view>
+				</view>
+				<view class="pay_item" @click="selectPay(1)">
+					<image src="../../static/img/select1.png" mode="" class="pay_item_select" v-if="pay_index==1"></image>
+					<image src="../../static/img/select2.png" mode="" class="pay_item_select" v-else></image>
+					<view class="pay_item_right">
+						<image src="../../static/img/card.png" mode=""></image>
+						<text>Credit/Debit Card</text>
+					</view>
+				</view>
+				<view class="pay_item" @click="selectPay(2)">
+					<image src="../../static/img/select1.png" mode="" class="pay_item_select" v-if="pay_index==2"></image>
+					<image src="../../static/img/select2.png" mode="" class="pay_item_select" v-else></image>
+					<view class="pay_item_right">
+						<image src="../../static/img/GPay.png" mode=""></image>
+						<text>Google Pay</text>
+					</view>
+				</view>
+				<view class="pay_item" @click="selectPay(3)">
+					<image src="../../static/img/select1.png" mode="" class="pay_item_select" v-if="pay_index==3"></image>
+					<image src="../../static/img/select2.png" mode="" class="pay_item_select" v-else></image>
+					<view class="pay_item_right">
+						<image src="../../static/img/APay.png" mode=""></image>
+						<text>Apple pay</text>
+					</view>
+				</view>
+				<!-- <navigator url="/pages/order/paySuccess"> -->
+					<button @click="getPayDate">PAY NOW</button>
+				<!-- </navigator> -->
+			</view>
+		</view>
+		<uni-popup ref="alertDialog" type="dialog">
+			<uni-popup-dialog type="error" cancelText="Close" confirmText="CancelOrder" title="Tips" 
+			content="Are you sure you want to cancel this order? This order will be regarded as invalid after cancellation" 
+			@confirm="dialogConfirm" ></uni-popup-dialog>
+		</uni-popup>
 	</view>
 </template>
 
@@ -309,10 +363,78 @@
 				scrollList:[{text:'All'},{text:'Unpaid'},{text:'Processing'},{text:'Shipped'},{text:'Returns'},{text:'Completed'},{text:'Closed'}],
 				scroll_active:0,
 				isList:true,
-				orderList:[]
+				orderList:[],
+				isPay:false,
+				payQuery:{
+					_action:'payorder',
+					order_id:'',
+					order_type:'GOODSBUY',
+					payment_method:'alipay.native'
+				},
+				pay_index:0,
+				cancelQuery:{
+					_action:'cancelorder',
+					order_id:''
+				}
 			}
 		},
 		methods:{
+			// 订单详情
+			goDetails(index){
+				uni.navigateTo({
+					url:'../order/details?details_index='+index
+				})
+			},
+			// 选择支付方式
+			selectPay(index){
+				this.pay_index=index
+			},
+			// 获取调用支付信息数据
+			getPayDate(){
+				defaultRequest2(this.payQuery).then(res=>{
+					console.info(res)
+					if(res.error==0){
+						//订单对象，从服务器获取
+						if(res.data.need_pay_amount==0) return
+						uni.requestPayment({
+						    provider: 'alipay',
+						    orderInfo: res.data.prepay_data.order_info, //支付宝订单数据
+						    success: function (res) {
+						        console.log('success:' + JSON.stringify(res));
+										uni.redirectTo({
+											url: 'paySuccess?order_id='+this.payQuery.order_id
+										});
+						    },
+						    fail: function (err) {
+						        console.log('fail:' + JSON.stringify(err));
+										uni.showToast({
+											title:'Payment failed',
+											icon:'none'
+										})
+						    }
+						});
+					}
+				})
+			},
+			payNow(id){
+				this.payQuery.order_id=id
+				this.isPay=true
+			},
+			// 取消订单
+			cancelorder(id){
+				this.cancelQuery.order_id=id
+				this.$refs.alertDialog.open()
+				
+			},
+			// 提示框点击确操作
+			dialogConfirm(){
+				defaultRequest2(this.cancelQuery).then(res=>{
+					console.info(res)
+					if(res.error==0){
+						this.getList()
+					}
+				})
+			},
 			getList(){
 				let data={_action:'getuserorders',page_index:1,page_size:10,payingstatus:'',status:''}
 				defaultRequest2(data).then(res=>{
diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index 5725c76..12de67f 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view class="address">
+		<view class="address" @click="goAddress">
 			<view class="address_left">
 				<view class="address_title">
 					<image src="../../static/img/address.png" mode=""></image>
@@ -29,8 +29,9 @@
 			</view>
 		</view>
 		
-		<view class="method">
+		<view class="method" v-if="shipping_list">
 			<view class="method_title">Shipping Method</view>
+			
 			<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>
@@ -142,29 +143,33 @@
 			</view>
 			
 			<view class="order_popup_pay" v-show="popup_index==2">
-				<view class="pay_item">
-					<image src="../../static/img/select1.png" mode="" class="pay_item_select"></image>
+				<view class="pay_item" @click="selectPay(0)">
+					<image src="../../static/img/select1.png" mode="" class="pay_item_select" v-if="pay_index==0"></image>
+					<image src="../../static/img/select2.png" mode="" class="pay_item_select" v-else></image>
 					<view class="pay_item_right">
 						<image src="../../static/img/pay_pal.png" mode=""></image>
 						<text>Pay Pal</text>
 					</view>
 				</view>
-				<view class="pay_item">
-					<image src="../../static/img/select2.png" mode="" class="pay_item_select"></image>
+				<view class="pay_item" @click="selectPay(1)">
+					<image src="../../static/img/select1.png" mode="" class="pay_item_select" v-if="pay_index==1"></image>
+					<image src="../../static/img/select2.png" mode="" class="pay_item_select" v-else></image>
 					<view class="pay_item_right">
 						<image src="../../static/img/card.png" mode=""></image>
 						<text>Credit/Debit Card</text>
 					</view>
 				</view>
-				<view class="pay_item">
-					<image src="../../static/img/select2.png" mode="" class="pay_item_select"></image>
+				<view class="pay_item" @click="selectPay(2)">
+					<image src="../../static/img/select1.png" mode="" class="pay_item_select" v-if="pay_index==2"></image>
+					<image src="../../static/img/select2.png" mode="" class="pay_item_select" v-else></image>
 					<view class="pay_item_right">
 						<image src="../../static/img/GPay.png" mode=""></image>
 						<text>Google Pay</text>
 					</view>
 				</view>
-				<view class="pay_item">
-					<image src="../../static/img/select2.png" mode="" class="pay_item_select"></image>
+				<view class="pay_item" @click="selectPay(3)">
+					<image src="../../static/img/select1.png" mode="" class="pay_item_select" v-if="pay_index==3"></image>
+					<image src="../../static/img/select2.png" mode="" class="pay_item_select" v-else></image>
 					<view class="pay_item_right">
 						<image src="../../static/img/APay.png" mode=""></image>
 						<text>Apple pay</text>
@@ -211,10 +216,52 @@
 				shipping_list:[],
 				bonus_list:[],
 				total:{},
-				order:{}
+				order:{},
+				// 支付方式: 0、支付宝 1、银行卡、信用卡 2、谷歌支付 4、苹果支付
+				pay_index:0
 			}
 		},
 		methods:{
+			
+			// 获取调用支付信息数据
+			getPayDate(id){
+				let data={_action:'payorder',order_id:id,order_type:'GOODSBUY',payment_method:'alipay.native'}
+				defaultRequest2(data).then(res=>{
+					console.info(res)
+					if(res.error==0){
+						//订单对象，从服务器获取
+						if(res.data.need_pay_amount==0) return
+						uni.requestPayment({
+						    provider: 'alipay',
+						    orderInfo: res.data.prepay_data.order_info, //支付宝订单数据
+						    success: function (res) {
+						        console.log('success:' + JSON.stringify(res));
+										uni.redirectTo({
+											url: 'paySuccess?order_id='+id
+										});
+						    },
+						    fail: function (err) {
+						        console.log('fail:' + JSON.stringify(err));
+										uni.showToast({
+											title:'Payment failed',
+											icon:'none'
+										})
+										uni.navigateBack()
+						    }
+						});
+					}
+				})
+				
+			},
+			// 选择支付方式
+			selectPay(index){
+				this.pay_index=index
+			},
+			goAddress(){
+				uni.navigateTo({
+					url:'../account/address?type=1'
+				})
+			},
 			// 提交订单
 			submitorder(){
 				let data={
@@ -229,6 +276,7 @@
 				defaultRequest3(data).then(res=>{
 					console.info(res)
 					if(res.error==0){
+						this.getPayDate(res.data.order.order_id)
 					}
 				})
 			},
@@ -244,7 +292,7 @@
 				})
 			},
 			getList(){
-				defaultRequest2(this.query).then(res=>{
+				defaultRequest3(this.query).then(res=>{
 					console.info(res)
 					if(res.error==0){
 						this.orderDate=res.data
@@ -292,6 +340,16 @@
 			this.query=JSON.parse(e.query)
 			this.getList()
 		},
+		onShow() {
+			uni.$once('query' ,(query)=>{
+				console.info(query)
+				if(query.type=='address'){
+					this.query.consignee=query.consignee
+					this.query.is_new=0
+					this.getList()
+				}
+			});
+		},
 		filters:{
 			goodsAttr(e){
 				return e.replace(/\s\n/g,';');
diff --git a/pages/productDetails/index.vue b/pages/productDetails/index.vue
index 5bc6655..8b7a1e7 100644
--- a/pages/productDetails/index.vue
+++ b/pages/productDetails/index.vue
@@ -656,7 +656,7 @@
 		flex-wrap: wrap;
 		.select_size_item{
 			background-color: #F8F8F8;
-			width: 121.33rpx;
+			min-width: 121.33rpx;
 			height: 54.67rpx;
 			display: flex;
 			align-items: center;
@@ -667,10 +667,11 @@
 			margin-right: 18.67rpx;
 			border: 1px solid #F8F8F8;
 			padding: 0 10rpx;
+			margin-bottom: 16.67rpx;
 			
-			&:nth-child(-n+2){
-				margin-bottom: 16.67rpx;
-			}
+			// &:nth-child(-n+2){
+			// 	margin-bottom: 16.67rpx;
+			// }
 		}
 	}
 	.addCard{