From 322aaf3b449afdc4a0fc736ee0ac8d839d9c320e Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Fri, 3 Mar 2023 08:45:56 +0800
Subject: [PATCH] =?UTF-8?q?2023-3-3=20=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=20=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mallplusui-uniapp-app/common/api.js           |    2 +-
 .../components/payments/paymentsByApp.vue     |  507 +++----
 mallplusui-uniapp-app/docs/pyw_app_key.jks    |  Bin 0 -> 2138 bytes
 .../签名密码及第三方登录信息.txt  |   13 +
 mallplusui-uniapp-app/manifest.json           |   10 +-
 mallplusui-uniapp-app/pages/order/order.vue   | 1218 +++++++++--------
 .../pages/order/orderDetail.vue               |   86 +-
 7 files changed, 984 insertions(+), 852 deletions(-)
 create mode 100644 mallplusui-uniapp-app/docs/pyw_app_key.jks
 create mode 100644 mallplusui-uniapp-app/docs/签名密码及第三方登录信息.txt

diff --git a/mallplusui-uniapp-app/common/api.js b/mallplusui-uniapp-app/common/api.js
index c953a5f..fd6e2fa 100644
--- a/mallplusui-uniapp-app/common/api.js
+++ b/mallplusui-uniapp-app/common/api.js
@@ -1,7 +1,7 @@
 import store from '../store/index';
 export default {
 	// qq 237524947 wx15d4269d3210863d
-	// BASEURI: 'http://2xpk7t.natappfree.cc/api/',
+	// BASEURI: 'http://2wsiyd.natappfree.cc/api/',
 	BASEURI: 'http://mall.yyundong.com/portalapi/api/',
 	// BASEURI: 'http://192.168.31.52:8083/api/',
 	ADMINURI: 'http://mall.yyundong.com/adminapi/',
diff --git a/mallplusui-uniapp-app/components/payments/paymentsByApp.vue b/mallplusui-uniapp-app/components/payments/paymentsByApp.vue
index ce53a88..eb36309 100644
--- a/mallplusui-uniapp-app/components/payments/paymentsByApp.vue
+++ b/mallplusui-uniapp-app/components/payments/paymentsByApp.vue
@@ -1,6 +1,7 @@
 <template>
 	<view class="pay-type-list">
-		<view class="type-item b-b" v-for="item in paymentss" :key="item.code" @click="toPayHandler(item.code)" v-if="!(type == 2 && item.code == 'balancepay')">
+		<view class="type-item b-b" v-for="item in paymentss" :key="item.code" @click="toPayHandler(item.code)"
+			v-if="!(type == 2 && item.code == 'balancepay')">
 			<text v-if="item.code == 'wechatpay'" class="icon yticon icon-weixinzhifu"></text>
 			<text v-if="item.code == 'alipay'" class="icon yticon icon-alipay"></text>
 			<text v-if="item.code == 'offline'" class="icon yticon icon-weixinzhifu"></text>
@@ -15,273 +16,287 @@
 </template>
 
 <script>
-import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
-import Api from '@/common/api';
-export default {
-	props: {
-		// 如果是商品订单此参数必须
-		orderId: {
-			type: String,
-			default() {
-				return '';
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+	import Api from '@/common/api';
+	export default {
+		props: {
+			// 如果是商品订单此参数必须
+			orderId: {
+				type: String,
+				default () {
+					return '';
+				}
+			},
+			// 如果是充值订单此参数必须
+			recharge: {
+				type: Number,
+				default () {
+					return 0;
+				}
+			},
+			// 用户id
+			uid: {
+				type: Number,
+				default () {
+					return 0;
+				}
+			},
+			// 订单类型
+			type: {
+				type: Number,
+				default () {
+					return 1;
+				}
 			}
 		},
-		// 如果是充值订单此参数必须
-		recharge: {
-			type: Number,
-			default() {
-				return 0;
-			}
+		data() {
+			return {
+				paymentss: []
+			};
 		},
-		// 用户id
-		uid: {
-			type: Number,
-			default() {
-				return 0;
-			}
+		mounted() {
+			this.getPayment();
 		},
-		// 订单类型
-		type: {
-			type: Number,
-			default() {
-				return 1;
-			}
-		}
-	},
-	data() {
-		return {
-			paymentss: []
-		};
-	},
-	mounted() {
-		this.getPayment();
-	},
-	methods: {
-		// 获取可用支付方式列表
-		async getPayment() {
-			console.log('getPayments');
-			let params = {};
-			this.orderInfo = await Api.apiCall('get', Api.order.paymentlist, params);
-			this.paymentss = this.formatPayments(this.orderInfo);
-		},
-		// 支付方式处理
-		formatPayments(payments) {
-			// 如果是充值订单 过滤余额支付 过滤非线上支付方式
-			if (this.type === 2) {
-				payments = payments.filter(item => item.code !== 'balancepay' || item.is_online === 1);
-			}
+		methods: {
+			// 获取可用支付方式列表
+			async getPayment() {
+				console.log('getPayments');
+				let params = {};
+				this.orderInfo = await Api.apiCall('get', Api.order.paymentlist, params);
+				this.paymentss = this.formatPayments(this.orderInfo);
+			},
+			// 支付方式处理
+			formatPayments(payments) {
+				// 如果是充值订单 过滤余额支付 过滤非线上支付方式
+				if (this.type === 2) {
+					payments = payments.filter(item => item.code !== 'balancepay' || item.is_online === 1);
+				}
 
-			// 设置logo图片
-			payments.forEach(item => {
-				this.$set(item, 'icon', '/static/image/' + item.code + '.png');
-			});
-			return payments;
-		},
-		// 用户点击支付方式处理
-		async toPayHandler(code) {
-			let _this = this;
-			let params = { orderId: this.orderId };
-			let data = {
-				payment_code: code,
-				payment_type: _this.type
-			};
-
-			data['ids'] = this.type == 1 || this.type == 5 || this.type == 6 ? this.orderId : this.uid;
-			if ((this.type == 5 || this.type == 6) && this.recharge) {
-				data['params'] = {
-					trade_type: 'APP',
-					formid: this.orderId
+				// 设置logo图片
+				payments.forEach(item => {
+					this.$set(item, 'icon', '/static/image/' + item.code + '.png');
+				});
+				return payments;
+			},
+			// 用户点击支付方式处理
+			async toPayHandler(code) {
+				let _this = this;
+				let params = {
+					orderId: this.orderId
+				};
+				let data = {
+					payment_code: code,
+					payment_type: _this.type
 				};
-			}
-			switch (code) {
-				case 'alipay':
-					/**
-					 * 支付宝支付需要模拟GET提交数据
-					 */
-					if (_this.type == 1 && _this.orderId) {
-						data['params'] = {
-							trade_type: 'APP'
-						};
-					} else if (_this.type == 2 && _this.recharge) {
-						data['params'] = {
-							trade_type: 'APP',
-							money: _this.recharge
-						};
-					}
 
-					let res = await Api.apiCall('get', Api.order.aliAppPay, params);
-					if (res) {
-						console.log(res);
-						uni.requestPayment({
-							provider: 'alipay',
-							orderInfo: res,
-							success: function(data) {
-								let rawdataResult = JSON.parse(data.rawdata).result;
-								let r = rawdataResult.split(';')[0];
-								let r1 = rawdataResult.split(';')[0].length - 1;
-								let r2 = rawdataResult.split(';')[0].length - 2;
-								let alipayTradeAppPayResponse = JSON.parse(r.substr(0, r1)).alipay_trade_app_pay_response;
-								let out_trade_no = alipayTradeAppPayResponse.out_trade_no;
-								_this.$common.successToShow('支付成功', () => {
-									//_this.redirectHandler(res.data.payment_id)
-									_this.redirectHandler(out_trade_no);
-								});
-							}
-						});
-					} else {
-						_this.$comon.errorToShow(res.msg);
-					}
+				data['ids'] = this.type == 1 || this.type == 5 || this.type == 6 ? this.orderId : this.uid;
+				if ((this.type == 5 || this.type == 6) && this.recharge) {
+					data['params'] = {
+						trade_type: 'APP',
+						formid: this.orderId
+					};
+				}
+				switch (code) {
+					case 'alipay':
+						/**
+						 * 支付宝支付需要模拟GET提交数据
+						 */
+						if (_this.type == 1 && _this.orderId) {
+							data['params'] = {
+								trade_type: 'APP'
+							};
+						} else if (_this.type == 2 && _this.recharge) {
+							data['params'] = {
+								trade_type: 'APP',
+								money: _this.recharge
+							};
+						}
 
-					break;
-				case 'wechatpay':
-					// 微信 H5支付
-					if (_this.type == 1 && _this.orderId) {
-						data['params'] = {
-							trade_type: 'APP'
-						};
-					} else if (_this.type == 2 && _this.recharge) {
-						data['params'] = {
-							trade_type: 'APP',
-							money: _this.recharge
-						};
-					}
+						let res = await Api.apiCall('get', Api.order.aliAppPay, params);
+						console.log("aliAppPay》》》", res);
+						if (res) {
+							console.log(res);
+							uni.requestPayment({
+								provider: 'alipay',
+								orderInfo: res,
+								success: function(data) {
+										console.log("aliAppPay_data》》》", data);
+									let rawdataResult = JSON.parse(data.rawdata).result;
+									let r = rawdataResult.split(';')[0];
+									let r1 = rawdataResult.split(';')[0].length - 1;
+									let r2 = rawdataResult.split(';')[0].length - 2;
+									let alipayTradeAppPayResponse = JSON.parse(r.substr(0, r1))
+										.alipay_trade_app_pay_response;
+									let out_trade_no = alipayTradeAppPayResponse.out_trade_no;
+									_this.$common.successToShow('支付成功', () => {
+										//_this.redirectHandler(res.data.payment_id)
+										_this.redirectHandler(out_trade_no);
+									});
+								}
+							});
+						} else {
+							_this.$comon.errorToShow(res.msg);
+						}
 
-					// 微信app支付
-					let res1 = await Api.apiCall('get', Api.order.appPay, params);
-					debugger
-					console.log(res1)
-					console.log(data)
-					if (res1) {
-						// 调用微信支付
-						uni.requestPayment({
-							provider: 'wxpay',
-							orderInfo: res1,
-							success: function(data) {
-								console.log(res1)
-								console.log(data)
-								_this.$common.successToShow('支付成功', () => {
-									_this.redirectHandler(data);
-								});
-							},
-							fail: function(res) {
-								console.log(JSON.stringify(res));
-							}
-						});
-					} else {
-						_this.$common.errorToShow(res.msg);
-					}
+						break;
+					case 'wechatpay':
+						// 微信 H5支付
+						if (_this.type == 1 && _this.orderId) {
+							data['params'] = {
+								trade_type: 'APP'
+							};
+						} else if (_this.type == 2 && _this.recharge) {
+							data['params'] = {
+								trade_type: 'APP',
+								money: _this.recharge
+							};
+						}
 
-					break;
-				case 'balancepay':
-					/**
-					 *  用户余额支付
-					 *
-					 */
-					let params1 = { orderId: this.orderId };
-					let data1 = await Api.apiCall('post', Api.order.balancePay, params1);
-					console.log(data1);
-					if (data1) {
-						uni.redirectTo({
-							url: '/pages/order/payment/result?order=' + JSON.stringify(data1)
-						});
-					} else {
-						this.$api.msg(data1.data);
-					}
-					break;
-				case 'offline':
-					/**
-					 * 线下支付
-					 */
-					_this.$common.modelShow('线下支付说明', '请联系客服进行线下支付', () => {}, false, '取消', '确定');
-					break;
+						// 微信app支付
+						let res1 = await Api.apiCall('get', Api.order.appPay, params);
+						debugger
+						console.log(res1)
+						console.log(data)
+						if (res1) {
+							// 调用微信支付
+							uni.requestPayment({
+								provider: 'wxpay',
+								orderInfo: res1,
+								success: function(data) {
+									console.log(res1)
+									console.log(data)
+									_this.$common.successToShow('支付成功', () => {
+										_this.redirectHandler(data);
+									});
+								},
+								fail: function(res) {
+									console.log(JSON.stringify(res));
+								}
+							});
+						} else {
+							_this.$common.errorToShow(res.msg);
+						}
+
+						break;
+					case 'balancepay':
+						/**
+						 *  用户余额支付
+						 *
+						 */
+						let params1 = {
+							orderId: this.orderId
+						};
+						let data1 = await Api.apiCall('post', Api.order.balancePay, params1);
+						console.log(data1);
+						if (data1) {
+							uni.redirectTo({
+								url: '/pages/order/payment/result?order=' + JSON.stringify(data1)
+							});
+						} else {
+							this.$api.msg(data1.data);
+						}
+						break;
+					case 'offline':
+						/**
+						 * 线下支付
+						 */
+						_this.$common.modelShow('线下支付说明', '请联系客服进行线下支付', () => {}, false, '取消', '确定');
+						break;
+				}
+			},
+			// 支付成功后跳转操作
+			redirectHandler(paymentId) {
+				this.$common.redirectTo('/pages/order/payment/result?id=' + paymentId);
 			}
-		},
-		// 支付成功后跳转操作
-		redirectHandler(paymentId) {
-			this.$common.redirectTo('/pages/order/payment/result?id=' + paymentId);
 		}
-	}
-};
+	};
 </script>
 <style lang="scss">
-.app {
-	width: 100%;
-}
+	.app {
+		width: 100%;
+	}
+
+	.price-box {
+		background-color: #fff;
+		height: 265upx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		font-size: 28upx;
+		color: #909399;
 
-.price-box {
-	background-color: #fff;
-	height: 265upx;
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-	font-size: 28upx;
-	color: #909399;
+		.price {
+			font-size: 50upx;
+			color: #303133;
+			margin-top: 12upx;
 
-	.price {
-		font-size: 50upx;
-		color: #303133;
-		margin-top: 12upx;
-		&:before {
-			content: '￥';
-			font-size: 40upx;
+			&:before {
+				content: '￥';
+				font-size: 40upx;
+			}
 		}
 	}
-}
 
-.pay-type-list {
-	margin-top: 20upx;
-	background-color: #fff;
-	padding-left: 60upx;
+	.pay-type-list {
+		margin-top: 20upx;
+		background-color: #fff;
+		padding-left: 60upx;
 
-	.type-item {
-		height: 120upx;
-		padding: 20upx 0;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding-right: 60upx;
-		font-size: 30upx;
-		position: relative;
-	}
+		.type-item {
+			height: 120upx;
+			padding: 20upx 0;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding-right: 60upx;
+			font-size: 30upx;
+			position: relative;
+		}
 
-	.icon {
-		width: 100upx;
-		font-size: 52upx;
-	}
-	.icon-erjiye-yucunkuan {
-		color: #fe8e2e;
-	}
-	.icon-weixinzhifu {
-		color: #36cb59;
-	}
-	.icon-alipay {
-		color: #01aaef;
-	}
-	.tit {
-		font-size: $font-lg;
-		color: $font-color-dark;
-		margin-bottom: 4upx;
+		.icon {
+			width: 100upx;
+			font-size: 52upx;
+		}
+
+		.icon-erjiye-yucunkuan {
+			color: #fe8e2e;
+		}
+
+		.icon-weixinzhifu {
+			color: #36cb59;
+		}
+
+		.icon-alipay {
+			color: #01aaef;
+		}
+
+		.tit {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			margin-bottom: 4upx;
+		}
+
+		.con {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			font-size: $font-sm;
+			color: $font-color-light;
+		}
 	}
-	.con {
-		flex: 1;
+
+	.mix-btn {
 		display: flex;
-		flex-direction: column;
-		font-size: $font-sm;
-		color: $font-color-light;
+		align-items: center;
+		justify-content: center;
+		width: 630upx;
+		height: 80upx;
+		margin: 80upx auto 30upx;
+		font-size: $font-lg;
+		color: #fff;
+		background-color: $base-color;
+		border-radius: 10upx;
+		box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
 	}
-}
-.mix-btn {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 630upx;
-	height: 80upx;
-	margin: 80upx auto 30upx;
-	font-size: $font-lg;
-	color: #fff;
-	background-color: $base-color;
-	border-radius: 10upx;
-	box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
-}
 </style>
diff --git a/mallplusui-uniapp-app/docs/pyw_app_key.jks b/mallplusui-uniapp-app/docs/pyw_app_key.jks
new file mode 100644
index 0000000000000000000000000000000000000000..ccd623ec3ad566fe8ea1d9edd665bc781191da47
GIT binary patch
literal 2138
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
JT;8AJ@;CX{#~%Oy

literal 0
HcmV?d00001

diff --git a/mallplusui-uniapp-app/docs/签名密码及第三方登录信息.txt b/mallplusui-uniapp-app/docs/签名密码及第三方登录信息.txt
new file mode 100644
index 0000000..11a0e2f
--- /dev/null
+++ b/mallplusui-uniapp-app/docs/签名密码及第三方登录信息.txt
@@ -0,0 +1,13 @@
+签名密码及第三方登录信息
+
+证书别名：key0
+证书签名的密码：yxt123
+
+QQ登录的
+APP ID：101453048
+APP Key：80382d6bd51922ef10a182f69b84581d
+审核通过
+
+微信
+AppID: wxc46a728ab3aae3c0
+AppSecret: 85f3970bdfba3d7d01fdd82bc370aeec
\ No newline at end of file
diff --git a/mallplusui-uniapp-app/manifest.json b/mallplusui-uniapp-app/manifest.json
index 447d838..4f81052 100644
--- a/mallplusui-uniapp-app/manifest.json
+++ b/mallplusui-uniapp-app/manifest.json
@@ -2,8 +2,8 @@
     "name" : "汇融云链",
     "appid" : "__UNI__FB2C9C4",
     "description" : "",
-    "versionName" : "1.0.0.3",
-    "versionCode" : 1003,
+    "versionName" : "1.0.0.5",
+    "versionCode" : 1005,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,
@@ -63,7 +63,7 @@
             "sdkConfigs" : {
                 "oauth" : {
                     "weixin" : {
-                        "appid" : "wx04b09a8148e4875c",
+                        "appid" : "wxa66597d50184d027",
                         "appsecret" : "3526ec2107c123f59b5c1cb7ff23a252",
                         "UniversalLinks" : ""
                     },
@@ -73,7 +73,7 @@
                 },
                 "payment" : {
                     "weixin" : {
-                        "appid" : "wx04b09a8148e4875c",
+                        "appid" : "wxa66597d50184d027",
                         "UniversalLinks" : "",
                         "__platform__" : [ "android" ]
                     },
@@ -91,7 +91,7 @@
                 "ad" : {},
                 "share" : {
                     "weixin" : {
-                        "appid" : "wx04b09a8148e4875c",
+                        "appid" : "wxa66597d50184d027",
                         "UniversalLinks" : ""
                     },
                     "qq" : {
diff --git a/mallplusui-uniapp-app/pages/order/order.vue b/mallplusui-uniapp-app/pages/order/order.vue
index 2f63e0c..eae35f9 100644
--- a/mallplusui-uniapp-app/pages/order/order.vue
+++ b/mallplusui-uniapp-app/pages/order/order.vue
@@ -1,12 +1,13 @@
 <template>
 	<view class="content">
 		<view class="navbar">
-			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+			<view v-for="(item, index) in navList" :key="index" class="nav-item"
+				:class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
 		</view>
 
 		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
 			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
+				<scroll-view class="list-scroll-content" scroll-y>
 					<!-- 空白页 -->
 					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
 
@@ -15,465 +16,566 @@
 						<view class="i-top b-b">
 							<text class="time" @click="navToDetailPage(item)">{{ item.createTime }}</text>
 							<!-- <text class="state" :style="{ color: item.stateTipColor }" @click="navToDetailPage(item)">{{ item.id }}</text> -->
-							<text class="state" :style="{ color: item.stateTipColor }" @click="navToDetailPage(item)">{{ item.stateTip }}</text>
-							<text v-if="item.status === 12" class="del-btn yticon icon-iconfontshanchu1" @click="deleteOrder(index)"></text>
+							<text class="state" :style="{ color: item.stateTipColor }"
+								@click="navToDetailPage(item)">{{ item.stateTip }}</text>
+							<text v-if="item.status === 12" class="del-btn yticon icon-iconfontshanchu1"
+								@click="deleteOrder(index)"></text>
 						</view>
 
 						<scroll-view v-if="item.orderItemList.length > 1" class="goods-box" scroll-y>
-							<view v-for="(goodsItem, goodsIndex) in item.orderItemList" :key="goodsIndex" class="goods-item">
-								<img class="goods-img" :src="goodsItem.productPic" @click="navToDetailPage(item)" mode="aspectFill" />
+							<view v-for="(goodsItem, goodsIndex) in item.orderItemList" :key="goodsIndex"
+								class="goods-item">
+								<img class="goods-img" :src="goodsItem.productPic" @click="navToDetailPage(item)"
+									mode="aspectFill" />
 							</view>
 						</scroll-view>
-						<view v-if="item.orderItemList.length === 1" class="goods-box-single" v-for="(goodsItem, goodsIndex) in item.orderItemList" :key="goodsIndex">
+						<view v-if="item.orderItemList.length === 1" class="goods-box-single"
+							v-for="(goodsItem, goodsIndex) in item.orderItemList" :key="goodsIndex">
 							<img class="goods-img" :src="goodsItem.productPic" mode="aspectFill" />
 							<view class="right" @click="navToDetailPage(item)">
 								<text class="title clamp">{{ goodsItem.productName }}</text>
-								<text class="attr-box">{{ goodsItem.productAttr }} x {{ goodsItem.productQuantity }}</text>
-								<text class="price">{{ goodsItem.productPrice }}</text><br/>
-							<!-- 	<text class="title clamp" v-if="item.status === 5">{{ item.deliveryCompany }}:{{ item.deliverySn }}</text>
-								<text class="title clamp" v-if="item.status === 3">{{ item.deliveryCompany }}:{{ item.deliverySn }}</text> -->
+								<view class="num_price">
+									<text class="attr-box">x {{ goodsItem.productQuantity }}</text>
+									<text class="price">{{ goodsItem.productPrice }}</text>
+								</view>
+
+
 							</view>
 						</view>
-
-						<view class="price-box">
-							共
-							<text class="num">{{ item.orderItemList.length }}</text>
-							件商品 实付款
-							<text class="price">{{ item.payAmount }}</text>
+						<view style="display: flex;flex-direction: row;margin-right: 13px;margin-bottom: 10px;">
+							<!-- <image v-if="item.status === 5||item.status === 3" style="width: 20px;height: 20px;"
+								src="/static/temp//orderId.png"></image> -->
+							<text style="margin-left: 5px;color: #c1c1c1;font-size: 13px;"
+								v-if="item.status === 5||item.status === 3">{{item.deliveryCompany}}：</text>
+							<text style="margin-left: 5px;color: #c1c1c1;font-size: 13px;"
+								v-if="item.status === 5||item.status === 3">{{ item.deliverySn }}</text>
+							<view class="price-box">
+								共
+								<text class="num">{{ item.orderItemList.length }}</text>
+								件商品 实付款
+								<text class="price">{{ item.payAmount }}</text>
+							</view>
 						</view>
-						<view class="action-box b-t">
+
+						<view class="action-box b-t" v-if="item.status==12||item.status==3">
+							<!-- 	<text class="state" :style="{ color: item.stateTipColor }" v-if="item.orderType == 1">正常订单</text>
 							<text class="state" :style="{ color: item.stateTipColor }" v-if="item.orderType == 6">秒杀订单</text>
 							<text class="state" :style="{ color: item.stateTipColor }" v-else-if="item.orderType == 2">拼团订单</text>
 							<text class="state" :style="{ color: item.stateTipColor }" v-else-if="item.orderType == 3">团购订单</text>
 							<text class="state" :style="{ color: item.stateTipColor }" v-else-if="item.orderType == 4">砍价订单</text>
-							<text class="state" :style="{ color: item.stateTipColor }" v-else-if="item.orderType == 5">积分订单</text>
+							<text class="state" :style="{ color: item.stateTipColor }" v-else-if="item.orderType == 5">积分订单</text> -->
 							<button v-if="item.status == 12" class="action-btn" @click="cancelOrder(item)">取消订单</button>
-							<button v-if="item.status == 12" class="action-btn recom" @click="payOrder(item)">立即支付</button>
+							<button v-if="item.status == 12" class="action-btn recom"
+								@click="payOrder(item)">立即支付</button>
 							<!-- <button v-if="item.status > 2 && item.status < 10" class="action-btn recom" @click="lookLogistics(item.id)">物流追踪</button> -->
-							<button v-if="item.status < 5" class="action-btn recom" @click="applyRefund(item.id)">申请售后</button>
-							<button v-if="item.status == 3" class="action-btn recom" @click="confimDelivery(item)">确认收货</button>
+							<!-- <button v-if="item.status < 5" class="action-btn recom" @click="applyRefund(item.id)">申请售后</button> -->
+							<button v-if="item.status == 3" class="action-btn recom"
+								@click="confimDelivery(item)">确认收货</button>
 							<!-- <button class="action-btn recom" hover-class="btn-hover" v-if="item.status === 4" @click="toEvaluate(item.id)">立即评价</button> -->
 						</view>
 					</view>
-					<uni-load-more :status="loadingType"></uni-load-more>
+
 				</scroll-view>
 			</swiper-item>
 		</swiper>
+		<uni-load-more :status="loadingType"></uni-load-more>
 	</view>
 </template>
 
 <script>
-import { mapState } from 'vuex';
-import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
-import Api from '@/common/api';
-import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
-import empty from '@/components/empty';
-import { formatDate } from '@/common/date';
-export default {
-	components: {
-		mallplusCopyright,
-		uniLoadMore,
-		empty
-	},
-	data() {
-		return {
-			tabCurrentIndex: 0,
-			pageNum: 1,
-			orderList: [],
-			headerPosition: 'fixed',
-			headerTop: '0px',
-			loadingType: 'loading', //加载更多状态
-			navList: [
-				{
-					status: 0,
-					text: '全部',
-					loadingType: 'loading',
-					orderList: []
-				},
-				{
-					status: 12,
-					text: '待付款',
-					loadingType: 'loading',
-					orderList: []
-				},
-				{
-					status: 2,
-					text: '待发货',
-					loadingType: 'loading',
-					orderList: []
-				},
-				{
-					status: 3,
-					text: '已发货',
-					loadingType: 'loading',
-					orderList: []
-				},
-				{
-					status: 5,
-					text: '已完成',
-					loadingType: 'loading',
-					orderList: []
-				}
-			]
-		};
-	},
-
-	onLoad(options) {
-		/**
-		 * 修复app端点击除全部订单外的按钮进入时不加载数据的问题
-		 * 替换onLoad下代码即可
-		 */
-		this.tabCurrentIndex = +options.status;
-
-		this.loadData();
-	},
-	onPageScroll(e) {
-		//兼容iOS端下拉时顶部漂移
-		if (e.scrollTop >= 0) {
-			this.headerPosition = 'fixed';
-		} else {
-			this.headerPosition = 'absolute';
-		}
-	},
-	//下拉刷新
-	onPullDownRefresh() {
-		this.pageNum = 1;
-		this.loadData('refresh');
-	},
-	//加载更多
-	onReachBottom() {
-		this.pageNum = this.pageNum+1;
-		this.loadData('refresh');
-	},
-	computed: {
-		...mapState(['hasLogin', 'userInfo'])
-	},
-	methods: {
-		//详情
-		navToDetailPage(item) {
-			//测试数据没有写id，用title代替
-			let id = item.id;
-			uni.navigateTo({
-				url: `/pages/order/orderDetail?id=${id}`
-			});
+	import {
+		mapState
+	} from 'vuex';
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+	import Api from '@/common/api';
+	import uniLoadMore from '@/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue';
+	import empty from '@/components/empty';
+	import {
+		formatDate
+	} from '@/common/date';
+	export default {
+		components: {
+			mallplusCopyright,
+			uniLoadMore,
+			empty
+		},
+		data() {
+			return {
+				tabCurrentIndex: 0,
+				pageNum: 1,
+				headerPosition: 'fixed',
+				headerTop: '0px',
+				loadingType: 'more', //加载更多状态
+				navList: [{
+						status: 0,
+						text: '全部',
+						loadingType: 'more',
+						orderList: []
+					},
+					{
+						status: 12,
+						text: '待付款',
+						loadingType: 'more',
+						orderList: []
+					},
+					{
+						status: 2,
+						text: '待发货',
+						loadingType: 'more',
+						orderList: []
+					},
+					{
+						status: 3,
+						text: '已发货',
+						loadingType: 'more',
+						orderList: []
+					},
+					{
+						status: 5,
+						text: '已完成',
+						loadingType: 'more',
+						orderList: []
+					}
+				]
+			};
 		},
-		//获取订单列表
-		async loadData(type = 'add', loading) {
-			//这里是将订单挂载到tab列表下
-			let index = this.tabCurrentIndex;
-			let navItem = this.navList[index];
-			console.log(navItem);
-			let status = navItem.status;
-			let url;
-
-			let params = { pageNum: this.pageNum, status: status };
-			let data = await Api.apiCall('get', Api.order.orderList, params);
-			console.log("data:------"+data)
-			let goodsList = data.records;
-			let goodsListJson = JSON.stringify(goodsList)
-			console.log("goodsList:"+goodsListJson)
-			let orderList = goodsList.filter(item => {
-				//添加不同状态下订单的表现形式
-				item = Object.assign(item, this.orderStateExp(item.status));
-				item.createTime = this.dateFormat(item.createTime);
-				//演示数据所以自己进行状态筛选
-				if (status === 0) {
-					//0为全部订单
-					return item;
-				}
-				return item.status === status;
-			});
 
-			if (type === 'refresh') {
-				this.orderList = [];
-			}
-			this.orderList = this.orderList.concat(orderList);
-			console.log("this.orderList.length======:"+this.orderList.length)
-			console.log("data.total======:"+data.total)
-			//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
-			this.loadingType = this.orderList.length >= data.total ? 'nomore' : 'loading';
-			if (type === 'refresh') {
-				if (loading == 1) {
-					uni.hideLoading();
-				} else {
-					uni.stopPullDownRefresh();
-				}
-			}
+		onLoad(options) {
+			/**
+			 * 修复app端点击除全部订单外的按钮进入时不加载数据的问题
+			 * 替换onLoad下代码即可
+			 */
+			this.tabCurrentIndex = +options.status;
 
-			navItem.orderList = [];
-			console.log(orderList)
-			orderList.forEach(item => {
-				console.log("item-----:"+item)
-				navItem.orderList.push(item);
-			});
+			this.loadData();
 		},
-
-		//swiper 切换
-		changeTab(e) {
-			this.tabCurrentIndex = e.target.current;
-			//this.pageNum =  1;
+		onPageScroll(e) {
+			//兼容iOS端下拉时顶部漂移
+			if (e.scrollTop >= 0) {
+				this.headerPosition = 'fixed';
+			} else {
+				this.headerPosition = 'absolute';
+			}
+		},
+		//下拉刷新
+		onPullDownRefresh() {
+			this.pageNum = 1;
 			this.loadData('refresh');
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 2000);
 		},
-		//顶部tab点击
-		tabClick(index) {
+		onShow() {
 			this.pageNum = 1;
 			this.loadData('refresh');
-			this.tabCurrentIndex = index;
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 2000);
 		},
-		//删除订单
-		async deleteOrder(index) {
-			uni.showLoading({
-				title: '请稍后'
-			});
-			setTimeout(() => {
-				this.navList[this.tabCurrentIndex].orderList.splice(index, 1);
-				uni.hideLoading();
-				uni.showToast({
-				    title: '删除成功'
-				});
-			}, 600);
+		//加载更多
+		onReachBottom() {
+			this.pageNum = this.pageNum + 1;
+			this.loadData();
+
 		},
-		async payOrder(item) {
-			let url = '/pages/order/payment/index?order_id=' + item.id + '&type=1';
-			this.$common.navigateTo(url);
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
 		},
-		//取消订单
-		async cancelOrder(item) {
-			let params = { orderId: item.id };
-			let data = await Api.apiCall('post', Api.order.closeOrder, params);
-			console.log(data)
-			if (data) {
-				this.$api.msg(data);
-				this.pageNum = 1;
+		methods: {
+			//详情
+			navToDetailPage(item) {
+				//测试数据没有写id，用title代替
+				let id = item.id;
+				uni.navigateTo({
+					url: `/pages/order/orderDetail?id=${id}`
+				});
+			},
+			//获取订单列表
+			async loadData(type = 'add', loading) {
+				//没有更多直接返回
+				if (type === 'add') {
+					if (this.loadingType === 'nomore') {
+						return;
+					}
+					this.loadingType = 'loading';
+				} else {
+					this.loadingType = 'more';
+				}
+				//这里是将订单挂载到tab列表下
+				let index = this.tabCurrentIndex;
+				let navItem = this.navList[index];
+				console.log(navItem);
+				let status = navItem.status;
+				let url;
+
+				let params = {
+					pageNum: this.pageNum,
+					status: status
+				};
+				console.log("params:------" + JSON.stringify(params))
+				let data = await Api.apiCall('get', Api.order.orderList, params);
+				console.log("data:------" + data)
+				let goodsList = data.records;
+				let goodsListJson = JSON.stringify(goodsList)
+				// console.log("goodsList:" + goodsListJson)
+				let orderList = goodsList.filter(item => {
+					//添加不同状态下订单的表现形式
+					item = Object.assign(item, this.orderStateExp(item.status));
+					item.createTime = this.dateFormat(item.createTime);
+					//演示数据所以自己进行状态筛选
+					if (status === 0) {
+						//0为全部订单
+						return item;
+					}
+					return item.status === status;
+				});
+
+				if (type === 'refresh') {
+					navItem.orderList = [];
+				}
+				navItem.orderList = navItem.orderList.concat(orderList);
+				console.log("data.total======:" + data.total)
+				console.log("length======:" + navItem.orderList.length)
+				//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+				this.loadingType = navItem.orderList.length >= data.total ? 'nomore' : 'more';
+				console.log("type======:" + type)
+				console.log("loadingType======:" + this.loadingType)
+				if (type === 'refresh') {
+					if (loading == 1) {
+						uni.hideLoading();
+					} else {
+						uni.stopPullDownRefresh();
+					}
+				}
+
+			},
+
+			//swiper 切换
+			changeTab(e) {
+				this.tabCurrentIndex = e.target.current;
+				//this.pageNum =  1;
 				this.loadData('refresh');
-				this.tabCurrentIndex = 4;
-			}
-		},
-		//订单确认收货
-		async confimDelivery(item) {
-			let params = { id: item.id };
-			let data = await Api.apiCall('post', Api.order.confimDelivery, params);
-			console.log(data);
-			if (data) {
-				this.$api.msg(data);
+			},
+			//顶部tab点击
+			tabClick(index) {
 				this.pageNum = 1;
 				this.loadData('refresh');
-				this.tabCurrentIndex = 4;
-			}
-		},
-		lookLogistics(orderId) {
-			this.$common.navigateTo('/pages/order/logistics?order_id=' + orderId);
-		},
-
-		// 申请售后
-		applyRefund(orderId) {
-			this.$common.navigateTo('../../pagesA/after_sale/index?order_id=' + orderId);
-		},
-
-		//订单申请退款
-		async applyRefund1(item) {
-			let params = { id: item.id };
-			let data = await Api.apiCall('post', Api.order.applyRefund, params);
-			if (data) {
+				this.tabCurrentIndex = index;
+			},
+			//删除订单
+			async deleteOrder(index) {
+				uni.showLoading({
+					title: '请稍后'
+				});
+				setTimeout(() => {
+					this.navList[this.tabCurrentIndex].orderList.splice(index, 1);
+					uni.hideLoading();
+					uni.showToast({
+						title: '删除成功'
+					});
+				}, 600);
+			},
+			async payOrder(item) {
+				let url = '/pages/order/payment/index?order_id=' + item.id + '&type=1';
+				this.$common.navigateTo(url);
+			},
+			//取消订单
+			async cancelOrder(item) {
+				let params = {
+					orderId: item.id
+				};
+				let data = await Api.apiCall('post', Api.order.closeOrder, params);
+				console.log(data)
+				if (data) {
+					this.$api.msg(data);
+					this.pageNum = 1;
+					this.loadData('refresh');
+					this.tabCurrentIndex = 1;
+				}
+			},
+			//订单确认收货
+			async confimDelivery(item) {
+				let params = {
+					id: item.id
+				};
+				let data = await Api.apiCall('post', Api.order.confimDelivery, params);
 				console.log(data);
-				this.$api.msg(data);
-			}
-			this.pageNum = 1;
-			this.loadData('refresh');
-			this.tabCurrentIndex = 5;
-		},
-		// 去评价
-		toEvaluate(orderId) {
-			this.$common.navigateTo('/pages/order/evaluate?order_id=' + orderId);
-		},
-
-		//订单状态文字和颜色
-		orderStateExp(value) {
-			let stateTip = '',
-				stateTipColor = '#fa436a';
-			if (value === 12) {
-				stateTipColor = '#909399';
-				stateTip = '待付款';
-			}
-			if (value === 1) {
-				stateTipColor = '#909399';
-				stateTip = '支付成功，没有回掉';
-			}
-			if (value === 2) {
-				stateTip = '待发货';
-			} else if (value === 3) {
-				stateTip = '待收货';
-			} else if (value === 4) {
-				stateTip = '待评价';
-			} else if (value === 5) {
-				stateTip = '已完成';
-			} else if (value === 6) {
-				stateTipColor = '#909399';
-				stateTip = '维权中';
-			} else if (value === 7) {
-				stateTip = ' 维权已完成';
-			} else if (value === 8) {
-				stateTip = '待分享';
-			} else if (value === 13) {
-				stateTip = '申请退款';
-			} else if (value === 14) {
-				stateTip = '已退款';
-			} else if (value === 15) {
-				stateTip = '已关闭';
-			} else if (value === 16) {
-				stateTip = '无效订单';
-			} else if (value === 18) {
-				stateTip = '拼团下单';
-			} else {
-				stateTip = '待付款';
-			}
+				if (data) {
+					this.$api.msg(data);
+					this.pageNum = 1;
+					this.loadData('refresh');
+					this.tabCurrentIndex = 4;
+				}
+			},
+			lookLogistics(orderId) {
+				this.$common.navigateTo('/pages/order/logistics?order_id=' + orderId);
+			},
+
+			// 申请售后
+			applyRefund(orderId) {
+				this.$common.navigateTo('../../pagesA/after_sale/index?order_id=' + orderId);
+			},
+
+			//订单申请退款
+			async applyRefund1(item) {
+				let params = {
+					id: item.id
+				};
+				let data = await Api.apiCall('post', Api.order.applyRefund, params);
+				if (data) {
+					console.log(data);
+					this.$api.msg(data);
+				}
+				this.pageNum = 1;
+				this.loadData('refresh');
+				this.tabCurrentIndex = 5;
+			},
+			// 去评价
+			toEvaluate(orderId) {
+				this.$common.navigateTo('/pages/order/evaluate?order_id=' + orderId);
+			},
+
+			//订单状态文字和颜色
+			orderStateExp(value) {
+				let stateTip = '',
+					stateTipColor = '#fa436a';
+				if (value === 1) {
+					stateTipColor = '#909399';
+					stateTip = '支付成功，没有回掉';
+				} else if (value === 2) {
+					stateTip = '待发货';
+				} else if (value === 3) {
+					stateTip = '待收货';
+				} else if (value === 4) {
+					stateTip = '待评价';
+				} else if (value === 5) {
+					stateTip = '已完成';
+				} else if (value === 6) {
+					stateTipColor = '#909399';
+					stateTip = '维权中';
+				} else if (value === 7) {
+					stateTip = ' 维权已完成';
+				} else if (value === 8) {
+					stateTip = '待分享';
+				} else if (value === 12) {
+					stateTipColor = '#909399';
+					stateTip = '待付款';
+				} else if (value === 13) {
+					stateTip = '申请退款';
+				} else if (value === 14) {
+					stateTip = '已退款';
+				} else if (value === 15) {
+					stateTip = '已关闭';
+				} else if (value === 16) {
+					stateTip = '无效订单';
+				} else {
+					stateTip = '待付款';
+				}
 
-			return { stateTip, stateTipColor };
-		},
+				return {
+					stateTip,
+					stateTipColor
+				};
+			},
 
-		dateFormat(time) {
-			if (time == null || time === '') {
-				return 'N/A';
+			dateFormat(time) {
+				if (time == null || time === '') {
+					return 'N/A';
+				}
+				let date = new Date(time);
+				return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
 			}
-			let date = new Date(time);
-			return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-page,
-.content {
-	background: $page-color-base;
-	height: 100%;
-}
-
-.swiper-box {
-	height: calc(100% - 40px);
-}
-.list-scroll-content {
-	height: 100%;
-}
-
-.navbar {
-	display: flex;
-	height: 40px;
-	padding: 0 5px;
-	background: #fff;
-	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
-	position: relative;
-	z-index: 10;
-	.nav-item {
-		flex: 1;
-		display: flex;
-		justify-content: center;
-		align-items: center;
+	page,
+	.content {
+		background: $page-color-base;
+		height: 100%;
+	}
+
+	.swiper-box {
+		height: calc(100% - 40px);
+	}
+
+	.list-scroll-content {
 		height: 100%;
-		font-size: 15px;
-		color: $font-color-dark;
-		position: relative;
-		&.current {
-			color: $base-color;
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 2px solid $base-color;
-			}
-		}
 	}
-}
-
-.uni-swiper-item {
-	height: auto;
-}
-.order-item {
-	display: flex;
-	flex-direction: column;
-	padding-left: 30upx;
-	background: #fff;
-	margin-top: 16upx;
-	.i-top {
+
+	.navbar {
 		display: flex;
-		align-items: center;
-		height: 80upx;
-		padding-right: 30upx;
-		font-size: $font-base;
-		color: $font-color-dark;
+		height: 40px;
+		padding: 0 5px;
+		background: #fff;
+		box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
 		position: relative;
-		.time {
+		z-index: 10;
+
+		.nav-item {
 			flex: 1;
-		}
-		.state {
-			color: $base-color;
-		}
-		.del-btn {
-			padding: 10upx 0 10upx 36upx;
-			font-size: $font-lg;
-			color: $font-color-light;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			font-size: 15px;
+			color: $font-color-dark;
 			position: relative;
-			&:after {
-				content: '';
-				width: 0;
-				height: 30upx;
-				border-left: 1px solid $border-color-dark;
-				position: absolute;
-				left: 20upx;
-				top: 50%;
-				transform: translateY(-50%);
+
+			&.current {
+				color: $base-color;
+
+				&:after {
+					content: '';
+					position: absolute;
+					left: 50%;
+					bottom: 0;
+					transform: translateX(-50%);
+					width: 44px;
+					height: 0;
+					border-bottom: 2px solid $base-color;
+				}
 			}
 		}
 	}
-	/* 多条商品 */
-	.goods-box {
-		height: 160upx;
-		padding: 20upx 0;
-		white-space: nowrap;
-		.goods-item {
-			width: 120upx;
-			height: 120upx;
-			display: inline-block;
-			margin-right: 24upx;
-		}
-		.goods-img {
-			display: block;
-			width: 100%;
-			height: 100%;
-		}
+
+	.uni-swiper-item {
+		height: auto;
 	}
-	/* 单条商品 */
-	.goods-box-single {
+
+	.order-item {
 		display: flex;
-		padding: 20upx 0;
-		.goods-img {
-			display: block;
-			width: 120upx;
-			height: 120upx;
+		flex-direction: column;
+		padding-left: 30upx;
+		background: #fff;
+		margin-top: 16upx;
+
+		.i-top {
+			display: flex;
+			align-items: center;
+			height: 80upx;
+			padding-right: 30upx;
+			font-size: $font-base;
+			color: $font-color-dark;
+			position: relative;
+
+			.time {
+				flex: 1;
+			}
+
+			.state {
+				color: $base-color;
+			}
+
+			.del-btn {
+				padding: 10upx 0 10upx 36upx;
+				font-size: $font-lg;
+				color: $font-color-light;
+				position: relative;
+
+				&:after {
+					content: '';
+					width: 0;
+					height: 30upx;
+					border-left: 1px solid $border-color-dark;
+					position: absolute;
+					left: 20upx;
+					top: 50%;
+					transform: translateY(-50%);
+				}
+			}
 		}
-		.right {
+
+		/* 多条商品 */
+		.goods-box {
+			height: 160upx;
+			padding: 20upx 0;
+			white-space: nowrap;
+
+			.goods-item {
+				width: 120upx;
+				height: 120upx;
+				display: inline-block;
+				margin-right: 24upx;
+			}
+
+			.goods-img {
+				display: block;
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		/* 单条商品 */
+		.goods-box-single {
+			display: flex;
+			padding: 20upx 0;
+
+			.goods-img {
+				display: block;
+				width: 120upx;
+				height: 120upx;
+			}
+
+			.right {
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				padding: 0 30upx 0 24upx;
+				overflow: hidden;
+
+				.title {
+					font-size: $font-base + 2upx;
+					color: $font-color-dark;
+				}
+
+				.num_price {
+					display: flex;
+					flex-direction: row;
+					justify-content: space-between;
+					margin-top: 5px;
+
+					.attr-box {
+						flex: 1;
+						font-size: $font-sm + 2upx;
+						color: $font-color-light;
+						margin: 0 2upx 0 8upx;
+					}
+
+					.price {
+						font-size: $font-base + 2upx;
+						color: $font-color-dark;
+
+						&:before {
+							content: '￥';
+							font-size: $font-sm;
+							margin: 0 2upx 0 8upx;
+						}
+					}
+				}
+
+
+			}
+		}
+
+		.price-box {
 			flex: 1;
 			display: flex;
-			flex-direction: column;
-			padding: 0 30upx 0 24upx;
-			overflow: hidden;
-			.title {
-				font-size: $font-base + 2upx;
+			justify-content: flex-end;
+			align-items: baseline;
+			font-size: $font-sm + 2upx;
+			color: $font-color-light;
+
+			.num {
+				margin: 0 8upx;
 				color: $font-color-dark;
-				line-height: 1;
-			}
-			.attr-box {
-				font-size: $font-sm + 2upx;
-				color: $font-color-light;
-				padding: 10upx 12upx;
 			}
+
 			.price {
-				font-size: $font-base + 2upx;
+				font-size: $font-lg;
 				color: $font-color-dark;
+
 				&:before {
 					content: '￥';
 					font-size: $font-sm;
@@ -481,191 +583,173 @@ page,
 				}
 			}
 		}
-	}
 
-	.price-box {
-		display: flex;
-		justify-content: flex-end;
-		align-items: baseline;
-		padding: 20upx 30upx;
-		font-size: $font-sm + 2upx;
-		color: $font-color-light;
-		.num {
-			margin: 0 8upx;
-			color: $font-color-dark;
+		.action-box {
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+			height: 100upx;
+			position: relative;
+			padding-right: 30upx;
 		}
-		.price {
-			font-size: $font-lg;
+
+		.action-btn {
+			width: 160upx;
+			height: 60upx;
+			margin: 0;
+			margin-left: 24upx;
+			padding: 0;
+			text-align: center;
+			line-height: 60upx;
+			font-size: $font-sm + 2upx;
 			color: $font-color-dark;
-			&:before {
-				content: '￥';
-				font-size: $font-sm;
-				margin: 0 2upx 0 8upx;
+			background: #fff;
+			border-radius: 100px;
+
+			&:after {
+				border-radius: 100px;
+			}
+
+			&.recom {
+				background: #fff9f9;
+				color: $base-color;
+
+				&:after {
+					border-color: #f7bcc8;
+				}
 			}
 		}
 	}
-	.action-box {
+
+	/* load-more */
+	.uni-load-more {
 		display: flex;
-		justify-content: flex-end;
+		flex-direction: row;
+		height: 80upx;
 		align-items: center;
-		height: 100upx;
-		position: relative;
-		padding-right: 30upx;
+		justify-content: center;
 	}
-	.action-btn {
-		width: 160upx;
-		height: 60upx;
-		margin: 0;
-		margin-left: 24upx;
-		padding: 0;
-		text-align: center;
-		line-height: 60upx;
-		font-size: $font-sm + 2upx;
-		color: $font-color-dark;
-		background: #fff;
-		border-radius: 100px;
-		&:after {
-			border-radius: 100px;
-		}
-		&.recom {
-			background: #fff9f9;
-			color: $base-color;
-			&:after {
-				border-color: #f7bcc8;
-			}
-		}
+
+	.uni-load-more__text {
+		font-size: 28upx;
+		color: #999;
 	}
-}
-
-/* load-more */
-.uni-load-more {
-	display: flex;
-	flex-direction: row;
-	height: 80upx;
-	align-items: center;
-	justify-content: center;
-}
-
-.uni-load-more__text {
-	font-size: 28upx;
-	color: #999;
-}
-
-.uni-load-more__img {
-	height: 24px;
-	width: 24px;
-	margin-right: 10px;
-}
-
-.uni-load-more__img > view {
-	position: absolute;
-}
-
-.uni-load-more__img > view view {
-	width: 6px;
-	height: 2px;
-	border-top-left-radius: 1px;
-	border-bottom-left-radius: 1px;
-	background: #999;
-	position: absolute;
-	opacity: 0.2;
-	transform-origin: 50%;
-	animation: load 1.56s ease infinite;
-}
-
-.uni-load-more__img > view view:nth-child(1) {
-	transform: rotate(90deg);
-	top: 2px;
-	left: 9px;
-}
-
-.uni-load-more__img > view view:nth-child(2) {
-	transform: rotate(180deg);
-	top: 11px;
-	right: 0;
-}
-
-.uni-load-more__img > view view:nth-child(3) {
-	transform: rotate(270deg);
-	bottom: 2px;
-	left: 9px;
-}
-
-.uni-load-more__img > view view:nth-child(4) {
-	top: 11px;
-	left: 0;
-}
-
-.load1,
-.load2,
-.load3 {
-	height: 24px;
-	width: 24px;
-}
-
-.load2 {
-	transform: rotate(30deg);
-}
-
-.load3 {
-	transform: rotate(60deg);
-}
-
-.load1 view:nth-child(1) {
-	animation-delay: 0s;
-}
-
-.load2 view:nth-child(1) {
-	animation-delay: 0.13s;
-}
-
-.load3 view:nth-child(1) {
-	animation-delay: 0.26s;
-}
-
-.load1 view:nth-child(2) {
-	animation-delay: 0.39s;
-}
-
-.load2 view:nth-child(2) {
-	animation-delay: 0.52s;
-}
-
-.load3 view:nth-child(2) {
-	animation-delay: 0.65s;
-}
-
-.load1 view:nth-child(3) {
-	animation-delay: 0.78s;
-}
-
-.load2 view:nth-child(3) {
-	animation-delay: 0.91s;
-}
-
-.load3 view:nth-child(3) {
-	animation-delay: 1.04s;
-}
-
-.load1 view:nth-child(4) {
-	animation-delay: 1.17s;
-}
-
-.load2 view:nth-child(4) {
-	animation-delay: 1.3s;
-}
-
-.load3 view:nth-child(4) {
-	animation-delay: 1.43s;
-}
-
-@-webkit-keyframes load {
-	0% {
-		opacity: 1;
+
+	.uni-load-more__img {
+		height: 24px;
+		width: 24px;
+		margin-right: 10px;
+	}
+
+	.uni-load-more__img>view {
+		position: absolute;
 	}
 
-	100% {
+	.uni-load-more__img>view view {
+		width: 6px;
+		height: 2px;
+		border-top-left-radius: 1px;
+		border-bottom-left-radius: 1px;
+		background: #999;
+		position: absolute;
 		opacity: 0.2;
+		transform-origin: 50%;
+		animation: load 1.56s ease infinite;
+	}
+
+	.uni-load-more__img>view view:nth-child(1) {
+		transform: rotate(90deg);
+		top: 2px;
+		left: 9px;
+	}
+
+	.uni-load-more__img>view view:nth-child(2) {
+		transform: rotate(180deg);
+		top: 11px;
+		right: 0;
+	}
+
+	.uni-load-more__img>view view:nth-child(3) {
+		transform: rotate(270deg);
+		bottom: 2px;
+		left: 9px;
+	}
+
+	.uni-load-more__img>view view:nth-child(4) {
+		top: 11px;
+		left: 0;
+	}
+
+	.load1,
+	.load2,
+	.load3 {
+		height: 24px;
+		width: 24px;
+	}
+
+	.load2 {
+		transform: rotate(30deg);
+	}
+
+	.load3 {
+		transform: rotate(60deg);
+	}
+
+	.load1 view:nth-child(1) {
+		animation-delay: 0s;
+	}
+
+	.load2 view:nth-child(1) {
+		animation-delay: 0.13s;
+	}
+
+	.load3 view:nth-child(1) {
+		animation-delay: 0.26s;
+	}
+
+	.load1 view:nth-child(2) {
+		animation-delay: 0.39s;
+	}
+
+	.load2 view:nth-child(2) {
+		animation-delay: 0.52s;
+	}
+
+	.load3 view:nth-child(2) {
+		animation-delay: 0.65s;
+	}
+
+	.load1 view:nth-child(3) {
+		animation-delay: 0.78s;
+	}
+
+	.load2 view:nth-child(3) {
+		animation-delay: 0.91s;
+	}
+
+	.load3 view:nth-child(3) {
+		animation-delay: 1.04s;
+	}
+
+	.load1 view:nth-child(4) {
+		animation-delay: 1.17s;
+	}
+
+	.load2 view:nth-child(4) {
+		animation-delay: 1.3s;
+	}
+
+	.load3 view:nth-child(4) {
+		animation-delay: 1.43s;
+	}
+
+	@-webkit-keyframes load {
+		0% {
+			opacity: 1;
+		}
+
+		100% {
+			opacity: 0.2;
+		}
 	}
-}
 </style>
diff --git a/mallplusui-uniapp-app/pages/order/orderDetail.vue b/mallplusui-uniapp-app/pages/order/orderDetail.vue
index b33fd01..012b097 100644
--- a/mallplusui-uniapp-app/pages/order/orderDetail.vue
+++ b/mallplusui-uniapp-app/pages/order/orderDetail.vue
@@ -5,29 +5,36 @@
 				<scroll-view class="list-scroll-content" scroll-y>
 					<!-- 订单列表 -->
 					<view class="order-item">
+						<view class="i-top b-b">
+							<text class="state" :style="{ color: orderInfo.stateTipColor }">{{orderInfo.orderSn}}</text>
+						</view>
+						
 						<view class="i-top b-b">
 							<text class="time">{{ orderInfo.createTime }}</text>
 							<!-- <text class="state" :style="{ color: orderInfo.stateTipColor }" @click="navToDetailPage(item)">{{ orderInfo.id }}--</text> -->
 							<text class="state"
 								:style="{ color: orderInfo.stateTipColor }">{{ orderInfo.stateTip }}</text>
-							<text v-if="orderInfo.status === 9" class="del-btn yticon icon-iconfontshanchu1"
-								@click="deleteOrder(index)"></text>
-						</view>
-						<view class="i-top b-b">
-							<text class="state" :style="{ color: orderInfo.stateTipColor }">订单商品</text>
 						</view>
-
+						
 						<view v-if="goodsItem.type === 1" class="goods-box-single"
 							v-for="(goodsItem, goodsIndex) in orderInfo.orderItemList" :key="goodsIndex">
 							<img class="goods-img" :src="goodsItem.productPic" mode="aspectFill"></img>
 							<view class="right">
 								<text class="title clamp">{{ goodsItem.productName }}</text>
-								<text class="attr-box">{{ goodsItem.productAttr }} x
-									{{ goodsItem.productQuantity }}</text>
-								<text class="price">{{ goodsItem.productPrice }} </text>
+								<view class="num_price">
+									<text class="attr-box">x {{ goodsItem.productQuantity }}</text>
+									<text class="price">{{ goodsItem.productPrice }}</text>
+								</view>
+								<view  style="display: flex;flex-direction: row;"> 
+								 <text style="color: #c1c1c1;font-size: 13px;"
+								 		v-if="orderInfo.status === 5||orderInfo.status === 3">{{orderInfo.deliveryCompany}}：</text>
+								 <text style="color: #c1c1c1;font-size: 13px;"
+								 	v-if="orderInfo.status === 5||orderInfo.status === 3">{{ orderInfo.deliverySn }}</text>
+								 </view>
+								
 							</view>
 						</view>
-						<view class="i-top b-b">
+						<!-- <view class="i-top b-b">
 							<text class="state" :style="{ color: orderInfo.stateTipColor }">订单赠品</text>
 						</view>
 						<view v-if="goodsItem.type === 2" class="goods-box-single"
@@ -39,38 +46,41 @@
 									{{ goodsItem.productQuantity }}</text>
 								<text class="price">{{ goodsItem.productPrice }} </text>
 							</view>
-						</view>
+						</view> -->
+						<view style="display: flex;flex-direction: column; margin-right: 13px;margin-bottom: 10px;">
+						
 						<view class="price-box">
 							共
 							<text class="num">{{ orderInfo.orderItemList.length }}</text>
 							件商品, 会员折扣
 							<text class="price">{{ orderInfo.vipAmount }}</text>
-							优惠券抵扣
+							, 优惠券抵扣
 							<text class="price">{{ orderInfo.couponAmount }}</text>
 						</view>
 						<view class="price-box">
 							积分抵扣
 							<text class="price">{{ orderInfo.integrationAmount }}</text>
-							,运费
+							, 运费
 							<text class="price">{{ orderInfo.freightAmount }}</text>
-							<view class="yt-list-cell b-b" v-if="groupActivity">
+							<!-- <view class="yt-list-cell b-b" v-if="groupActivity">
 								<text class="cell-tit clamp">活动金额</text>
 								<text class="cell-tip">￥{{ groupActivity.price }}</text>
-							</view>
-							,实付款
+							</view> -->
+							, 实付款
 							<text class="price">{{ orderInfo.payAmount }}</text>
 						</view>
-						<view class="action-box b-t">
+							</view>
+						<view class="action-box b-t" v-if="orderInfo.status==12||orderInfo.status==3">
 							<button v-if="orderInfo.status == 12" class="action-btn"
 								@click="cancelOrder(orderInfo)">取消订单</button>
 							<button v-if="orderInfo.status == 12" class="action-btn recom"
 								@click="payOrder(orderInfo)">立即支付</button>
-							<button v-if="orderInfo.status <7" class="action-btn recom"
-								@click="applyRefund(orderInfo.id)">申请售后</button>
+						<!-- 	<button v-if="orderInfo.status <7" class="action-btn recom"
+								@click="applyRefund(orderInfo.id)">申请售后</button> -->
 							<button v-if="orderInfo.status == 3" class="action-btn recom"
 								@click="confimDelivery(orderInfo)">确认收货</button>
-							<button class='action-btn recom' hover-class="btn-hover" v-if="orderInfo.status === 4"
-								@click="toEvaluate(orderInfo.id)">立即评价</button>
+							<!-- <button class='action-btn recom' hover-class="btn-hover" v-if="orderInfo.status === 4"
+								 @click="toEvaluate(orderInfo.id)">立即评价</button>-->
 						</view>
 					</view>
 				</scroll-view>
@@ -101,7 +111,9 @@
 		data() {
 			return {
 				tabCurrentIndex: 0,
-				orderInfo: [],
+				orderInfo: {
+					orderItemList:[]
+				},
 				navList: [{
 						status: 0,
 						text: '全部',
@@ -143,6 +155,8 @@
 			this.orderInfo = await Api.apiCall('get', Api.order.orderDetail, params);
 			this.orderInfo = Object.assign(this.orderInfo, this.orderStateExp(this.orderInfo.status));
 			this.orderInfo.createTime = this.dateFormat(this.orderInfo.createTime);
+			console.log("data:------" + JSON.stringify(this.orderInfo))
+			console.log("data:------" + this.orderInfo.stateTip)
 		},
 
 		methods: {
@@ -233,15 +247,11 @@
 			orderStateExp(value) {
 				let stateTip = '',
 					stateTipColor = '#fa436a';
-				if (value === 12) {
-					stateTipColor = '#909399';
-					return '待付款';
-				}
+				
 				if (value === 1) {
 					stateTipColor = '#909399';
-					return '支付成功，没有回掉';
-				}
-				if (value === 2) {
+					stateTip= '支付成功，没有回掉';
+				}else if (value === 2) {
 					stateTip = '待发货';
 				} else if (value === 3) {
 					stateTip = '待收货';
@@ -256,6 +266,9 @@
 					stateTip = ' 维权已完成';
 				} else if (value === 8) {
 					stateTip = '待分享';
+				}else if (value === 12) {
+					stateTipColor = '#909399';
+					stateTip= '待付款';
 				} else if (value === 13) {
 					stateTip = '申请退款';
 				} else if (value === 14) {
@@ -426,16 +439,23 @@
 					line-height: 1;
 				}
 
+			.num_price {
+				display: flex;
+				flex-direction: row;
+				justify-content: space-between;
+				margin-top: 5px;
+			
 				.attr-box {
+					flex: 1;
 					font-size: $font-sm + 2upx;
 					color: $font-color-light;
-					padding: 10upx 12upx;
+					margin: 0 2upx 0 8upx;
 				}
-
+			
 				.price {
 					font-size: $font-base + 2upx;
 					color: $font-color-dark;
-
+			
 					&:before {
 						content: '￥';
 						font-size: $font-sm;
@@ -443,13 +463,13 @@
 					}
 				}
 			}
+			}
 		}
 
 		.price-box {
 			display: flex;
 			justify-content: flex-end;
 			align-items: baseline;
-			padding: 20upx 30upx;
 			font-size: $font-sm + 2upx;
 			color: $font-color-light;