From 7885f117b4c3e9aabb48309cb7fe2420bd404680 Mon Sep 17 00:00:00 2001
From: ltlzx <942659938@qq.com>
Date: Mon, 11 Jul 2022 05:41:11 -0400
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=88=91=E7=9A=84=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=88=A0=E9=99=A4=E3=80=81=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E3=80=81=E6=B6=88=E6=81=AF=E3=80=81=E7=BA=A2=E5=8C=85?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E3=80=81=E4=BC=98=E5=8C=96=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E5=8A=9F=E8=83=BD=E3=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/request.js                 |  2 +
 pages/account/index.vue        |  5 ++-
 pages/account/message.vue      | 15 +++++++-
 pages/account/myOrders.vue     | 44 +++++++++++++++-------
 pages/index/pickUpCentre.vue   | 17 ++++++++-
 pages/login/verifyEmail.vue    |  6 +--
 pages/order/details.vue        | 67 +++++++++++++++++++++++-----------
 pages/productDetails/index.vue | 16 ++++++--
 8 files changed, 126 insertions(+), 46 deletions(-)

diff --git a/api/request.js b/api/request.js
index 26b6a69..4cd3440 100644
--- a/api/request.js
+++ b/api/request.js
@@ -59,6 +59,7 @@ const httpRequest = (params) => {
 		uni.request({
 			...httpOptions,
 			success: res => {
+				// console.info(res)
 				uni.hideLoading();
 				// 进行解密
 				res.data=JSON.parse(decryptDes(res.data,'6780f04cf2e211ec86a8005056c00008'))
@@ -79,6 +80,7 @@ const httpRequest = (params) => {
 				resolve(res.data);
 			},
 			fail: err => {
+				
 				uni.hideLoading();
 				reject(err);
 			}
diff --git a/pages/account/index.vue b/pages/account/index.vue
index c698cc9..ca79d5f 100644
--- a/pages/account/index.vue
+++ b/pages/account/index.vue
@@ -143,7 +143,10 @@
 		},
 		onShow() {
 			this.user_info=uni.getStorageSync('user_info')
-			this.getUserInfo()
+			if(this.user_info){
+				this.getUserInfo()
+			}
+			
 		}
 	}
 </script>
diff --git a/pages/account/message.vue b/pages/account/message.vue
index de03360..d110539 100644
--- a/pages/account/message.vue
+++ b/pages/account/message.vue
@@ -35,16 +35,29 @@
 
 
 <script>
+	import {defaultRequest} from '../../api/index.js'
 	export default {
 		data() {
 			return {
-				
+				list:[]
 			}
 		},
 		methods:{
+			getList(){
+				let data={_action:'getfavourableactivities'}
+				defaultRequest(data).then(res=>{
+					console.info(res)
+					if(res.error==0){
+						this.list=res.data
+					}
+				})
+			},
 			back(){
 				uni.navigateBack()
 			}
+		},
+		onLoad() {
+			this.getList()
 		}
 	}
 </script>
diff --git a/pages/account/myOrders.vue b/pages/account/myOrders.vue
index 167d092..02348d6 100644
--- a/pages/account/myOrders.vue
+++ b/pages/account/myOrders.vue
@@ -9,7 +9,7 @@
 			<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 && item.order_status_code==0">
+				<view class="order" v-if="item.pay_status_code==0 && item.order_status_code==0" @click="goDetails(3,item.order_id)">
 					<view class="order_title">
 						<text>Waiting for payment</text>
 						<view class="order_title_right">
@@ -35,14 +35,14 @@
 							<text>Reward 10 points</text>
 						</view>
 						<view class="order_button">
-							<button class="cancel" @click="cancelorder(item.order_id)">CANCEL ORDER</button>
-							<button class="pay" @click="payNow(item.order_id)">PAY NOW</button>
+							<button class="cancel" @click.stop="openTips(item.order_id,0)">CANCEL ORDER</button>
+							<button class="pay" @click.stop="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" v-if="item.order_status_code==2" @click="goDetails(1,item.order_id)">
 					<view class="order_title">
 						<text>cancelled</text>
 						<view class="order_title_right">
@@ -64,7 +64,7 @@
 						</view>
 						<view class="good_price">total:US${{item.order_amount}}</view>
 						<view class="order_button">
-							<button class="cancel">DELETE ORDER</button>
+							<button class="cancel" @click.stop="openTips(item.order_id,1)">DELETE ORDER</button>
 						</view>
 					</view>
 				</view>
@@ -348,9 +348,7 @@
 			</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-dialog type="error" cancelText="Close" :confirmText="tipsBut" title="Tips" :content="tipsInfo" @confirm="dialogConfirm" ></uni-popup-dialog>
 		</uni-popup>
 	</view>
 </template>
@@ -375,14 +373,19 @@
 				cancelQuery:{
 					_action:'cancelorder',
 					order_id:''
-				}
+				},
+				// 弹出提示框的状态 0：取消订单 1、删除订单
+				tipsType:0,
+				tipsInfo:'',
+				tipsBut:''
 			}
 		},
 		methods:{
+			
 			// 订单详情
-			goDetails(index){
+			goDetails(index,id){
 				uni.navigateTo({
-					url:'../order/details?details_index='+index
+					url:'../order/details?details_index='+index+'&id='+id
 				})
 			},
 			// 选择支付方式
@@ -420,14 +423,27 @@
 				this.payQuery.order_id=id
 				this.isPay=true
 			},
-			// 取消订单
-			cancelorder(id){
+			// 淡出提示
+			openTips(id,type){
+				this.tipsType=type
+				if(type==0){
+					this.tipsInfo='Are you sure you want to cancel this order? This order will be regarded as invalid after cancellation'
+					this.tipsBut='CancelOrder'
+				}else{
+					this.tipsInfo='Are you sure you want to delete this order?'
+					this.tipsBut='DeleteOrder'
+				}
 				this.cancelQuery.order_id=id
 				this.$refs.alertDialog.open()
 				
 			},
-			// 提示框点击确操作
+			// 提示框点击确操作 取消订单、删除订单
 			dialogConfirm(){
+				if(this.tipsType==0){
+					this.cancelQuery._action='cancelorder'
+				}else{
+					this.cancelQuery._action='deleteorder'
+				}
 				defaultRequest2(this.cancelQuery).then(res=>{
 					console.info(res)
 					if(res.error==0){
diff --git a/pages/index/pickUpCentre.vue b/pages/index/pickUpCentre.vue
index 758bf62..bbf1df2 100644
--- a/pages/index/pickUpCentre.vue
+++ b/pages/index/pickUpCentre.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<uni-nav-bar  left-icon="left"   title="Pick up centre" color="#000000"  @clickLeft="back" @clickRight="goPage" :border="false">
+		<uni-nav-bar  left-icon="left"   title="Pick up centre" color="#000000"  @clickLeft="back"  :border="false">
 			<block slot="right">
 				<view class="head_coupons">
 					<image src="../../static/img/coupons.png" mode=""></image>
@@ -31,16 +31,29 @@
 </template>
 
 <script>
+	import {defaultRequest} from '../../api/index.js'
 	export default {
 		data() {
 			return {
-				
+				list:[]
 			}
 		},
 		methods:{
+			getList(){
+				let data={_action:'getbonuslist'}
+				defaultRequest(data).then(res=>{
+					console.info(res)
+					if(res.error==0){
+						this.list=res.data
+					}
+				})
+			},
 			back(){
 				uni.navigateBack()
 			},
+		},
+		onLoad() {
+			this.getList()
 		}
 	}
 </script>
diff --git a/pages/login/verifyEmail.vue b/pages/login/verifyEmail.vue
index d7244db..8cb5c44 100644
--- a/pages/login/verifyEmail.vue
+++ b/pages/login/verifyEmail.vue
@@ -17,7 +17,7 @@
 			<view class="verify_popup_title">Send!</view>
 			<view class="verify_popup_msg">we send a new verification code to {{query.username}}</view>
 			<view class="verify_popup_btn">
-				<button>OKAY</button>
+				<button @click="isShow=false">OKAY</button>
 			</view>
 		</view>
 	</view>
@@ -37,7 +37,7 @@
 				query:{
 					_action:'sendresetcode',
 					username:'',
-					password:'',
+					// password:'',
 				}
 			}
 		},
@@ -73,7 +73,7 @@
 			console.info(e)
 			this.type=e.type
 			if(e.type!=0){
-				this.query.password=e.password
+				// this.query.password=e.password
 				this.query.username=e.email
 			}else{
 				
diff --git a/pages/order/details.vue b/pages/order/details.vue
index 95c6a97..9e90ea3 100644
--- a/pages/order/details.vue
+++ b/pages/order/details.vue
@@ -65,12 +65,12 @@
 			<view class="address_left">
 				<view class="address_title">
 					<image src="../../static/img/address.png" mode=""></image>
-					<view class="address_title_name">Nathanael</view>
-					<text>5838590290</text>
+					<view class="address_title_name">{{goodsDate.consignee}}</view>
+					<text>{{goodsDate.mobile}}</text>
 				</view>
 				<view class="address_content">
-					<text>B Oakdale Mall</text>
-					<view >Johnson City NEW YORKUnitedStates13790-1294</view>
+					<text>{{goodsDate.sign_building}}</text>
+					<view >{{goodsDate.address_detail}}</view>
 				</view>
 			</view>
 			<image src="../../static/img/right.png" class="address_more"></image>
@@ -78,20 +78,22 @@
 		</view>
 		
 		<view class="order_popup_commodity">
-			<view class="good_info" v-for="(item,index) in 3 " :key="index">
+			<view class="good_info" v-for="(item,index) in goods_list " :key="index">
 				<view class="good_info_left ">
-					<view class="good_info_image" v-for="(item,index) in 1" :key="index"></view>
+					<view class="good_info_image" >
+						<image :src="item.goods_thumb" mode=""></image>
+					</view>
 					<view class="left_info">
-						<view class="info_name">Adidas Yeezy Boost 350 V2  DazzlingBlue Black GY7164 Men's</view>
+						<view class="info_name">{{item.goods_name}}</view>
 						<view class="left_info_bottom">
 							<view class="info_lable">
-								<text>Multicolor;41</text>
+								<text>{{item.goods_attr |goodsAttr}}</text>
 								<image src="/static/img/bottom.png" mode=""></image>
 							</view>
-							<text>x1</text>
+							<text>x{{item.goods_number}}</text>
 						</view>
 						<view class="info_price">
-							<text>US$314.00</text>
+							<text>US${{item.subtotal}}</text>
 							<button v-if="details_index!=3 && details_index!=1">RREFUND</button>
 						</view>
 					</view>
@@ -107,23 +109,23 @@
 					Subtotal
 					<text :class="details_index==4?'summary_item_text1':'summary_item_text'">（Tax included）</text>
 				</view>
-				<view class="summary_item_right">US$12.5</view>
+				<view class="summary_item_right">US${{goodsDate.goods_amount}}</view>
 			</view>
 			<view class="summary_item">
 				<view>Shipping</view>
-				<view class="summary_item_right">US$12.5</view>
+				<view class="summary_item_right">US${{goodsDate.shipping_fee}}</view>
 			</view>
 			<view class="summary_item">
 				<view>Coupon</view>
-				<view class="summary_item_right1">-US$12.5</view>
+				<view class="summary_item_right1">-US${{goodsDate.discount}}</view>
 			</view>
 			<view class="summary_item">
 				<view>Order total</view>
-				<view>US$12.5</view>
+				<view>US${{goodsDate.order_amount}}</view>
 			</view>
 			<view class="summary_tips" v-if="details_index==3">
 				<image src="../../static/img/gantan1.png" mode=""></image>
-				<text>Reward 10 points</text>
+				<text>Reward {{goodsDate.integral}} points</text>
 			</view>
 		</view>
 		
@@ -132,17 +134,17 @@
 			<view class="summary_item">
 				<view>Order id</view>
 				<view class="summary_item_right">
-					<text>2013461121212</text>
+					<text>{{goodsDate.order_sn}}</text>
 					<button>copy</button>
 				</view>
 			</view>
 			<view class="summary_item">
 				<view>Shipping</view>
-				<view class="summary_item_right">standard shipping</view>
+				<view class="summary_item_right">{{goodsDate.shipping_name}}</view>
 			</view>
 			<view class="summary_item">
-				<view>Coupon</view>
-				<view class="summary_item_right">21/04/2022 15:42:31</view>
+				<view>Order Time</view>
+				<view class="summary_item_right">{{goodsDate.formated_add_time}}</view>
 			</view>
 			<view class="summary_item" v-if="details_index!=3">
 				<view>Payment time</view>
@@ -175,19 +177,42 @@
 </template>
 
 <script>
+	import {defaultRequest2} from '../../api/index.js'
 	export default {
 		data() {
 			return {
 				// 0、代发货 1、已取消 2、已完成 3、待支付 4、运输中
-				details_index:4
+				details_index:4,
+				query:{
+					_action:'getorder',
+					order_id:'',
+					order_sn:''
+				},
+				goodsDate:{},
+				goods_list:[]
 			}
 		},
 		methods:{
-			
+			getDate(){
+				defaultRequest2(this.query).then(res=>{
+					console.info(res)
+					if(res.error==0){
+						this.goodsDate=res.data
+						this.goods_list=res.goods_list
+					}
+				})
+			}
 		},
 		onLoad(e){
 			console.info(e)
 			this.details_index=e.details_index
+			this.query.order_id=e.id
+			this.getDate()
+		},
+		filters:{
+			goodsAttr(e){
+				return e.replace(/\s\n/g,';');
+			}
 		}
 	}
 </script>
diff --git a/pages/productDetails/index.vue b/pages/productDetails/index.vue
index 8b7a1e7..6340cda 100644
--- a/pages/productDetails/index.vue
+++ b/pages/productDetails/index.vue
@@ -400,10 +400,18 @@
 				defaultRequest2(this.cartQuery).then(res=>{
 					console.info(res)
 					if(res.error==0){
-						uni.showToast({
-							title:'Successfully added',
-							icon:'none'
-						})
+						if(res.data[0].success){
+							uni.showToast({
+								title:'Successfully added',
+								icon:'none'
+							})
+						}else{
+							uni.showToast({
+								title:res.data[0].message,
+								icon:'none'
+							})
+						}
+						
 					}
 				})
 			},