From 7b0aa96d86c879024722ad9f4c2b744283f447a9 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Wed, 30 Jun 2021 15:38:15 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=20?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AB=8B=E5=8D=B3=E4=BB=98=E6=AC=BE=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                     |   6 +
 pages/order/confirm-atonce.vue | 234 +++++++++++++++++++++++++++++++++
 pages/order/index.vue          |   2 +-
 pages/order/unpay-details.vue  |  13 +-
 4 files changed, 253 insertions(+), 2 deletions(-)
 create mode 100644 pages/order/confirm-atonce.vue

diff --git a/pages.json b/pages.json
index 95b3b1d..0b7d089 100644
--- a/pages.json
+++ b/pages.json
@@ -48,6 +48,12 @@
 				"navigationBarTitleText": "确认订单"
 			}
 		},
+		{
+			"path": "pages/order/confirm-atonce",
+			"style": {
+				"navigationBarTitleText": "立即付款"
+			}
+		},
 		{
 			"path": "pages/order/pay-success",
 			"style": {
diff --git a/pages/order/confirm-atonce.vue b/pages/order/confirm-atonce.vue
new file mode 100644
index 0000000..a4bdfc1
--- /dev/null
+++ b/pages/order/confirm-atonce.vue
@@ -0,0 +1,234 @@
+<template>
+	<view>
+		<!-- 商品信息 -->
+		<block v-if="isRight(orderDetails)">
+			<view class="bg-white padding-tb-sm">
+				<skeleton :loading="skeletonLoading" :row="2" :showAvatar="false" :showTitle="true">
+			
+					<view class="flex justify-between align-start padding-top-sm padding-lr">
+						<image :src="orderDetails.goods.cover" mode="aspectFill" style="width: 240rpx; height: 240rpx;border-radius: 10rpx;"></image>
+						<view class="flex-sub padding-left-sm">
+							<view class="bref-box margin-top-xs lf-font-32 lf-font-bold" style="height: 88rpx;line-height: 44rpx;color: #222;">
+								{{orderDetails.goods.name}}
+							</view>
+							<view class="flex justify-between align-center text-center">
+								<text class="block margin-top-sm text-gray lf-font-28" style="margin-top: 20rpx;line-height: 40rpx;">数量</text>
+								<view class="flex align-center margin-top-sm">
+									<text class="lf-iconfont lf-icon-jianhao lf-font-40" style="color: #999;"></text>
+									<input type="number" v-model="num" :disabled="true" class="text-center margin-lr-sm radius text-black lf-font-32" style="width: 60rpx; height: 50rpx;background-color: #f1f1f1;color: #222;" />
+									<text class="lf-iconfont lf-icon-jiahao lf-font-40" style="color: #999;"></text>
+								</view>
+							</view>
+							
+							<view class="flex justify-between margin-top-sm">
+								<lf-price :price="orderDetails.goods.specs[0].selling_price" /> 
+								
+								
+								<!-- <view class="text-red text-price lf-font-42 lf-font-bold" style="margin-top: 12rpx;">
+									{{Number(orderDetails.goods.specs[0].selling_price || 0)}}
+								</view> -->
+							</view>
+						</view>
+					</view>
+			
+				</skeleton>
+			</view>
+			
+			<self-line/>
+			<skeleton :loading="skeletonLoading" :row="1" :showAvatar="false" :showTitle="true">
+				<view class="bg-white">
+					<view class="cu-bar padding-lr">
+						<text class="text-gray lf-font-32">优惠</text>
+						<text class="lf-font-32 text-black1">暂无优惠</text>
+					</view>
+				</view>
+			</skeleton>
+			<self-line/>
+			
+			<skeleton :loading="skeletonLoading" :row="13" :showAvatar="false" :showTitle="true">
+				<view class="btn-bottom">
+					<view class="padding-lr padding-tb-sm bg-white flex justify-between align-center shadow">
+						<view class="flex align-center">
+							<text class="lf-font-28 text-gray">应付款：</text>
+							
+							<lf-price :price="total(num, orderDetails.goods.specs[0].selling_price)" /> 
+							<!-- <view class="text-red text-price lf-font-42 lf-font-bold">
+								{{ total(num, orderDetails.goods.specs[0].selling_price) }}
+							</view> -->
+						</view>
+						<button class="cu-btn block bg-orange round shadow" @tap="submit">
+							<text class="lf-font-32 text-white" v-if="type == 1">立即付款</text>
+							<text class="lf-font-32 text-white" v-else>下单付款</text>
+						</button>
+					</view>
+				</view>
+			</skeleton>
+		</block>
+		
+	</view>
+</template>
+
+<script>
+	import bigc from '@/common/bigc.js';
+	
+	export default {
+		data() {
+			return {
+				num: 1,
+				skeletonLoading: true,
+				checkbox: [{
+					value: 'A',
+					checked: true
+				}],
+				goods_id: 1,
+				goods_specs_id: 1,
+				orderDetails: {},
+				ifchoose: true,
+				ifCheck: true,
+				type: 0,
+				order_id: 0,
+				ifDo: 1,
+				ifPay: true
+			}
+		},
+		computed: {
+			total(){
+				return function(num, price){
+					let big_num = new bigc(Number(num));
+					big_num = big_num.times(Number(price));
+					return big_num.round(2, 0).toString();
+				}
+			},
+			isRight(){
+				return function(val){
+					return this.$shared.isRight(val);
+				}
+			}
+		},
+		onLoad(e) {
+			this.type = e.type;
+			this.goods_id = e.goods_id;
+			this.order_id = e.order_id;
+			this.goods_specs_id = e.goods_specs_id
+			this.num = e.order_number
+			if(this.goods_id && this.goods_specs_id) {
+				this.getConfirmOrder()
+				
+				this.submit()
+			}
+		},
+		methods: {
+			getConfirmOrder() {
+				this.$http(this.API.API_COFIRMORDER_DETAILS, {goods_id: this.goods_id,goods_specs_id: this.goods_specs_id}).then(res => {
+					this.orderDetails = res.data
+					this.skeletonLoading = false
+				})
+			},
+			reduce() {
+				if (this.num === 1) return
+				this.num--
+			},
+			add() {
+				this.num++
+			},
+			CheckboxChange(e) {
+				if(e.detail.value != '') {
+					this.ifchoose = true
+				}else {
+					this.ifchoose = false
+				}
+			},
+			// 点击复制
+			copy(text) {
+				uni.setClipboardData({
+					data: text
+				});
+			},
+			submit(){
+				if(!this.ifPay) return;
+				this.ifPay = false;
+				if(this.type == 1){
+					this.pay();
+					return;
+				}
+				this.$http(this.API.API_PRPAID, {
+					goods_id: this.goods_id,
+					goods_specs_id: this.goods_specs_id,
+					number: this.num,
+				}).then(res => {
+					this.order_id = res.data.order_id
+					uni.requestPayment({
+						orderInfo: res.data.order_num,
+						timeStamp: res.data.timeStamp,
+						nonceStr: res.data.nonceStr,
+						package: res.data.package,
+						signType: res.data.signType,
+						paySign: res.data.paySign,
+						success: (res) => {
+							this.ifPay = true
+							this.$url('/pages/order/pay-success?ifSuccess=1&order_id='+this.order_id,{type: 'redirect'})
+						},
+						fail: (err) => {
+							this.ifPay = true
+							this.$url('/pages/order/pay-success?ifSuccess=2&order_id='+this.order_id,{type: 'redirect'})
+						},
+					})
+					
+				}).catch(err => {
+					this.ifPay = true
+					if(err.code == 9997) {
+						uni.showModal({
+							title: '提示',
+							content: '是否同意前往手机授权？',
+							success: e => {
+								if (!e.confirm) return;
+								this.$routerGo('/pages/login/index?type=phone')
+							}
+						});
+					}
+				});
+			},
+			pay(){
+				console.log("this.order_id", this.order_id)
+				this.$http(this.API.API_PAYMENT_DIRECT, {order_id: this.order_id}).then(res => {
+					this.order_id = res.data.order_id
+					uni.requestPayment({
+						orderInfo: res.data.order_num,
+						timeStamp: res.data.timeStamp,
+						nonceStr: res.data.nonceStr,
+						package: res.data.package,
+						signType: res.data.signType,
+						paySign: res.data.paySign,
+						success: (res) => {
+							this.$url('/pages/order/pay-success?ifSuccess=1&order_id='+this.order_id,{type: 'redirect'})
+						},
+						fail: (err) => {
+							this.$url('/pages/order/pay-success?ifSuccess=2&order_id='+this.order_id,{type: 'redirect'})
+						},
+					})
+				})
+			},
+			//下拉刷新
+			downCallback() {
+				this.getConfirmOrder()
+			},
+		},
+		onShow() {
+			if(this.ifDo > 1) {
+				this.getConfirmOrder()
+			}
+			this.ifDo++
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.bref-box {
+		text-overflow: -o-ellipsis-lastline;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+	}
+</style>
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 0731de0..77b6c7f 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -19,7 +19,7 @@
 						</view>
 						<view class="lf-row-between price" style="padding-right: 6rpx;">
 							<lf-price :price="item.selling_price" style="margin-top: 10rpx;" />
-							<button  v-if="item.state==1"  @tap.stop="$routerGo('/pages/order/confirm-order?type=1&goods_id='+item.goods_id+'&goods_specs_id='+item.goods_specs_id +'&order_id='+ item.id)">立即付款</button>
+							<button  v-if="item.state==1"  @tap.stop="$routerGo('/pages/order/confirm-atonce?type=1&goods_id='+item.goods_id+'&goods_specs_id='+item.goods_specs_id +'&order_id='+ item.id+'&order_number='+item.number)">立即付款</button>
 							<button  v-if="item.state==2" class="cu-btn bg-green round margin-left-sm" @tap.stop="$routerGo('/pages/order/order-details?order_id='+item.id)">立即使用</button>
 							<button  v-if="item.state==4" class="cu-btn1 border round margin-left-sm">等待审核</button>
 						</view>
diff --git a/pages/order/unpay-details.vue b/pages/order/unpay-details.vue
index 14e8331..e90c73d 100644
--- a/pages/order/unpay-details.vue
+++ b/pages/order/unpay-details.vue
@@ -17,8 +17,9 @@
 							<view class="flex justify-between" style="margin-top: 28rpx;">
 								<lf-price :price="orderDetails.selling_price" /> 
 								<view>
+									<button v-if="orderDetails.state == 1" class="cu-btn line-orange text-orange round margin-left-sm lf-font-28" @tap.stop="$routerGo('/pages/order/confirm-atonce?type=1&goods_id='+orderDetails.goods_id+'&goods_specs_id='+orderDetails.goods_specs_id +'&order_id='+ orderDetails.id+'&order_number='+orderDetails.number)">立即付款</button>
 									<button v-if="orderDetails.state == 2" class="cu-btn line-orange text-orange round margin-left-sm lf-font-28" @tap="$routerGo('/pages/order/apply-refund?order_id='+orderDetails.id)">申请退款</button>
-									<button v-if="orderDetails.state == 5" class="cu-btn line-gray bg-white border round margin-left-sm lf-font-28">{{orderDetails.state_text.text}}</button>
+									<button v-if="orderDetails.state == 5 ||  orderDetails.state == 7" class="cu-btn line-gray bg-white border round margin-left-sm lf-font-28">{{orderDetails.state_text.text}}</button>
 								</view>
 							</view>
 						</view>
@@ -60,6 +61,16 @@
 					</view>
 				</view>
 				<self-line/>
+				
+				
+				<view class="padding-lr padding-tb-sm bg-white flex justify-between align-center solid-top1 btn-bottom">
+					<view class="flex align-center">
+						<lf-price :price="orderDetails.amount" /> 
+					</view>
+					<view class="lf-font-32 text-black1">
+						{{orderDetails.state_text.text}}
+					</view>
+				</view>
 			</skeleton>
 		</block>
 	</view>