Merge pull request 'gdpaoup' (#54) from gyh into master

Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/54

components/order-item/index.vue

@@ -19,6 +19,7 @@
 			<view class="info">
 				<view class="num">共{{info.count_number}}件商品</view>
 				<view class="price">实付<span>￥{{info.order_amount}}</span></view>
+                <view class="time">{{ info.payment_time.slice(5,16) }}</view>
 			</view>
 		</view>
 	</view>
@@ -48,14 +49,14 @@ export default {
 	height: 220rpx;
 	background: rgba(255,255,255,1);
 	border-radius: 10rpx;
-	padding: 30rpx;
+	padding: 20rpx 10rpx;
 	display: flex; 
 	align-items: center;
 	> image {
 		width: 160rpx;
 		height: 160rpx;
 		flex-shrink: 0;
-		margin-right: 25rpx;
+		margin-right: 20rpx;
 	}
 	.goods {
 		display: flex;
@@ -82,9 +83,10 @@ export default {
 			margin-bottom: 30rpx;
 		}
 		.info {
-			width: 100%;
+			width: 470rpx;
 			display: flex;
 			align-items: center;
+            justify-content: space-between;
 			font-size: 26rpx;
 			color: rgba(102,102,102,1);
 			.price {
@@ -94,6 +96,9 @@ export default {
 				}
 			}
 		}
+        .time {
+            font-size: 20rpx;
+        }
 	}
 }
 </style>

components/order-item/testlist.vue

@@ -16,6 +16,7 @@
 			<view class="info">
 				<view class="num">共{{info.goods_try_num}}件商品</view>
 				<view class="price">实付<span>￥{{info.price}}</span></view>
+                <!-- <view class="time">{{ info.payment_time.slice(5,16) }}</view> -->
 			</view>
 		</view>
 	</view>

pages/index/details.vue

@@ -185,9 +185,6 @@ export default {
 		};
 	},
 	onLoad(option) {
-        let pages = getCurrentPages();
-        let prePage = pages[pages.length - 2];
-        console.log(prePage);
 		this.type = option.type;
 		console.log(this.type)
 		this.orderid = option.id;
@@ -273,11 +270,18 @@ export default {
 		//
 		confirm() {
 			this.showRefunds = false;
+            if (!this.refundid) {
+                this.$refs.uToast.show({
+                	title: "请选择商品",
+                	type: "warning"
+                });
+                return;
+            }
 			if (this.cur == 0) {
 				// 确定退款
 				this.$u.api.refund({
 					refund_id: this.refundid,
-					seller_state: 2,
+					seller_state: 3,
 					seller_message: ""
 				}).then(res => {
 					if (res.errCode != 0) {
@@ -290,18 +294,21 @@ export default {
 							title: res.message,
 							type: 'success'
 						});
+                        let pages = getCurrentPages();
+                        let prePage = pages[pages.length - 2];
+                        console.log(prePage.$vm);
+                        prePage.$vm.del_id = this.orderid;
 						uni.navigateBack({
 							delta: 1
 						});
-						console.log(res);
 					}
 				});
 			} else {
 				// 不进行退款
 				this.$u.api.refund({
 					refund_id: this.refundid,
-					seller_state:3,
-					seller_message:""
+					seller_state: 2,
+					seller_message: ""
 				}).then(res => {
 					if (res.errCode != 0) {
 						this.$refs.uToast.show({

pages/index/index.vue

@@ -135,6 +135,7 @@ export default {
 			carlist: [], //可投诉订单列表
 			reportinfo: null, //投诉信息
 			reportcontent: '', //投诉内容
+            del_id: 0, // 删除id
 		};
 	},
 	onLoad() {
@@ -152,7 +153,7 @@ export default {
 	},
 	onShow() {
 		this.publishstate = false;
-		this.tabsChange(this.current)
+		this.tabsChange(this.current);
 	},
 	onReachBottom() {
 		this.num++;