From d3a42f0942222efaebd58c2de00ffeba072808df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Tue, 29 Jun 2021 17:06:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=AE=B6=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shopOrder/index.vue         | 68 +++++++------------------------
 pages/shopOrder/order-details.vue |  7 ----
 2 files changed, 14 insertions(+), 61 deletions(-)

diff --git a/pages/shopOrder/index.vue b/pages/shopOrder/index.vue
index aa0fdde..2794eb5 100644
--- a/pages/shopOrder/index.vue
+++ b/pages/shopOrder/index.vue
@@ -1,9 +1,7 @@
 <template>
 	<view>
-		<!-- 当设置tab-width,指定每个tab宽度时,则不使用flex布局,改用水平滑动 -->
 		<view class="padding-lr" style="margin-bottom: 10rpx;margin-top: 20rpx;">
 			<me-tabs v-model="current" :tabs="tab_list" :fixed="true" @change="change"></me-tabs>
-			<!-- <u-tabs :list="tab_list" :is-scroll="true" :show-bar="false" :current="current" @change="change"></u-tabs> -->
 		</view>
 		<view class="com" v-for="(tab, tabIndex) in tab_list" v-if="tabIndex == current" :key="tab.id">
 			<view class="flex-direction justify-around list" v-for="(item, index) in tab.list" :key="item.id" @tap="goDetails(tabIndex,index)">
@@ -19,10 +17,6 @@
 							<text class="bought">x {{item.number}}</text>
 						</view>
 						<view class="lf-row-between price">
-							<!-- <text class="lf-font-bold">
-								<text class="lf-font-24">￥</text>
-								<text class="lf-font-42">{{item.selling_price}}</text>
-							</text> -->
 							<lf-price :price="item.selling_price" style="margin-top: 10rpx;" />
 						</view>
 					</view>
@@ -149,55 +143,21 @@
 					page: tab_item.page,
 					per_page
 				}).then(res => {
-					if (res.code == 0) {
-						console.log(res)
-						if( Object.keys(res.metal_data).length != 0 ) {
-							this.$routerGo('/pages/login/index?type=userinfo')
-						}else {
-							let isPage = res.data.has_more_page;
-							tab_item.isPage = isPage;
-							if (isPage) {
-								tab_item.loadingClass = true;
-								tab_item.loadingText = '正在加载中';
-							} else {
-								tab_item.loadingClass = false;
-								tab_item.loadingText = '没有更多数据啦~';
-							}
-							if (tab_item.page == 1) {
-								tab_item.list = res.data.items;
-							} else {
-								tab_item.list.push(...res.data.items);
-							}
-						}
+					let isPage = res.data.has_more_page;
+					tab_item.isPage = isPage;
+					if (isPage) {
+						tab_item.loadingClass = true;
+						tab_item.loadingText = '正在加载中';
+					} else {
+						tab_item.loadingClass = false;
+						tab_item.loadingText = '没有更多数据啦~';
 					}
-
-				}).catch(err => {
-
-				});
-			},
-			//返回
-			back() {
-				if (this.assetsType === 'all2') {
-					// #ifdef H5
-					window.history.go(-2)
-					// #endif
-
-					// #ifndef H5
-					uni.navigateBack({
-						delta: 2
-					});
-					// #endif
-				} else {
-					// #ifdef H5
-					window.history.go(-1)
-					// #endif
-
-					// #ifndef H5
-					uni.navigateBack({
-						delta: 1
-					});
-					// #endif
-				}
+					if (tab_item.page == 1) {
+						tab_item.list = res.data.items;
+					} else {
+						tab_item.list.push(...res.data.items);
+					}
+				})
 			}
 		},
 	}
diff --git a/pages/shopOrder/order-details.vue b/pages/shopOrder/order-details.vue
index 8f37ff7..8f37561 100644
--- a/pages/shopOrder/order-details.vue
+++ b/pages/shopOrder/order-details.vue
@@ -16,13 +16,6 @@
 							
 							<view class="flex justify-between" style="margin-top: 28rpx;">
 								<lf-price :price="orderDetails.selling_price" /> 
-								<!-- <view class="text-red text-price lf-font-42 lf-font-bold" style="margin-top: 16rpx;">
-									{{Number(orderDetails.selling_price || 0)}}
-								</view> -->
-								<!-- <view>
-									<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>
-								</view> -->
 							</view>
 						</view>
 					</view>