From 74be0be2bc8e69d830e337a758b3d8804e9b1f12 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Thu, 24 Jun 2021 10:29:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=94=80=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                       |  1 +
 colorui/main.css              |  2 +-
 pages/order/index.vue         |  2 +-
 pages/order/order-details.vue | 28 +++++++++++++++++++++-------
 pages/order/order-item.vue    |  6 +++---
 5 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/App.vue b/App.vue
index 2f48e54..2160245 100644
--- a/App.vue
+++ b/App.vue
@@ -29,6 +29,7 @@
 				}).catch(err => {
 					uni.login({
 						complete: result => {
+							console.log(result)
 							if(result.errMsg == 'login:ok'){
 								let code = result.code;
 								uni.setStorageSync('login_token', code);
diff --git a/colorui/main.css b/colorui/main.css
index 66ed83f..e07381f 100644
--- a/colorui/main.css
+++ b/colorui/main.css
@@ -3494,7 +3494,7 @@ scroll-view.cu-steps .cu-item {
 }
 
 .bg-green {
-	background-color: #39b54a;
+	background-color: #10CB3B;
 	color: #ffffff;
 }
 
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 207e1cb..aed5e3b 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -29,7 +29,7 @@
 					name: '待付款',
 					type: 'unpaid'
 				}, {
-					name: '已付款',
+					name: '待使用',
 					type: 'paid'
 				},
 				{
diff --git a/pages/order/order-details.vue b/pages/order/order-details.vue
index 1a6e086..53feccc 100644
--- a/pages/order/order-details.vue
+++ b/pages/order/order-details.vue
@@ -67,13 +67,15 @@
 					<self-line/>
 					<view class="bg-white flex flex-direction justify-around align-center text-center padding-tb">
 						<view>
-							<image src="../../static/tu.png" mode="widthFix" style="height: 150px;width: 150px;"></image>
+							<tki-qrcode ref="qrcode" @result="qrR" :val="checkArea" :size="140" unit="px" background="#fff" foreground="#000"
+							 pdground="#000" :onval="true" :loadMake="true" />
+							 <!-- :icon="require('@/static/images/system/user-default.jpg')" -->
 						</view>
 						<view class="flex justify-around align-center text-center margin-top-sm">
-							<view>
+							<view @tap="refreshCode()">
 								<image class="margin-right" src="@/static/images/system/refresh.png" mode="widthFix" style="width: 20px;height: 20px;"></image>
 							</view>
-							<view class="text-lg">SP738644872</view>
+							<view class="text-lg">{{checkArea}}</view>
 							<view class="text-orange text-sm margin-left" @tap="copy('SP738644872')">复制</view>
 						</view>
 						<view class="margin-top-sm text-green text-sm">
@@ -84,11 +86,11 @@
 						<view class="flex align-center">
 							<text class="text-gray text-sm">已付款：</text>
 							<view class="text-lg text-price text-red">
-								<amount :value="Number(19.90 || 0)" :is-round-up="false" :precision="2" :duration="800" transition></amount>
+								<amount :value="Number(orderDetails.amount || 0)" :is-round-up="false" :precision="2" :duration="800" transition></amount>
 							</view>
 						</view>
 						<view>
-							已付款
+							{{orderDetails.state_text.text}}
 						</view>
 					</view>
 				</view>
@@ -98,16 +100,21 @@
 </template>
 
 <script>
+	import tkiQrcode from "tki-qrcode" // 二维码生成器
 	import MescrollMixin from "@/components/mescroll-uni/mescroll-mixins.js";
 	export default {
 		mixins: [MescrollMixin], // 使用mixin
+		components: {
+			tkiQrcode
+		},
 		data() {
 			return {
 				base64Img: '',	//
 				skeletonLoading: true,
 				loading: false,
 				orderId:1,
-				orderDetails: {}
+				orderDetails: {},
+				checkArea: '0'
 			}
 		},
 		computed: {
@@ -122,12 +129,19 @@
 			}
 		},
 		methods: {
+			refreshCode() {
+				this.getOrderDetails()
+			},
+			//二维码回调
+			qrR(data) {
+				this.base64Img = data;
+			},
 			getOrderDetails() {
 				this.$http(this.API.API_ORDER_DETAILS, {order_id: this.orderId}).then(res => {
 					if(res.code == 0) {
 						this.orderDetails = res.data
+						this.checkArea = res.data.confirm_code
 						this.skeletonLoading = false
-						console.log(this.orderDetails)
 					}
 					
 				}).catch(err => {
diff --git a/pages/order/order-item.vue b/pages/order/order-item.vue
index a0d47da..f357a1d 100644
--- a/pages/order/order-item.vue
+++ b/pages/order/order-item.vue
@@ -23,9 +23,9 @@
 										<amount :value="Number(item.selling_price || 0)" :is-round-up="false" :precision="2" :duration="800" transition></amount>
 									</view>
 									<view>
-										<button v-if="item.state==1" class="cu-btn line-orange round margin-left-sm"  @tap.stop="$routerGo('/pages/order/confirm-order?goods_id='+item.goods_id+'&goods_specs_id='+item.goods_specs_id)">立即付款</button>
-										<button v-if="item.state==2" class="cu-btn line-red round margin-left-sm" @tap="$routerGo('/pages/shop/returngoods?id=1')">我要退货</button>
-										<button v-if="item.state==2" class="cu-btn line-black round margin-left-sm" @tap="orderClick(item,'modalShowConfirm')">确认收货</button>
+										<button v-if="item.state==1" class="cu-btn bg-orange round margin-left-sm"  @tap.stop="$routerGo('/pages/order/confirm-order?goods_id='+item.goods_id+'&goods_specs_id='+item.goods_specs_id)">立即付款</button>
+										<button v-if="item.state==2" class="cu-btn bg-green round margin-left-sm" @tap="$routerGo('/pages/order/order-details?orderid='+item.id)">立即使用</button>
+										<!-- <button v-if="item.state==2" class="cu-btn line-black round margin-left-sm" @tap="orderClick(item,'modalShowConfirm')">确认收货</button> -->
 									</view>
 								</view>
 							</view>