细节修改

api/newFun.js

@@ -178,7 +178,7 @@ export const updateAddress = (param) => {
 }
 //店长 查地址
 export const addressList = (param) => {
-  return request.post('Address/list', param)
+  return request.post('store/getAddressList', param)
 }
 // 店长同意拒绝
 export const audit = (param) => {

pages/news3/addressList.vue

@@ -62,9 +62,9 @@
 							user_id: userInfo.user_id
 						})
 						.then(result => {
-							this.addressData = result.data.list[0]
+							this.addressData = result.data.data[0]
-							that.addIndex = result.data.list[0].address_id
+							that.addIndex = result.data.data[0].address_id
-							that.addList = result.data.list
+							that.addList = result.data.data
 						})
 						.catch(reject)
 				})

pages/news3/shopOrder.vue

@@ -154,7 +154,7 @@
 					<view class="tuiAdderss" v-if="audit_status==10">
 						<text>退货地址:</text>
 						<view class="" @click="goJump('/pages/news3/addressList','',0)"><text
-								:style="{'color': addressData?'#303030':'#EAEAEA'}"></text>
+								:style="{'color': addressData?'#303030':'#ABABAB'}"></text>
 							{{addressData?addressData.name+addressData.phone:'请选择退货地址'}}
 							<u-icon name="arrow-right" color="#979797" size="28"></u-icon>
 						</view>
@@ -166,7 +166,6 @@
 						<u-input v-model="refund_notes" placeholder="请输入您的留言" type="textarea" :auto-height="true" />
 					</view>
 				</view>
-				<!-- :style="{'opacity': refund_image_id?1:0.6 }" -->
 				<view class="submit" @click="submitRefund()">
 					确定
 				</view>
@@ -442,7 +441,7 @@
 					data
 				} = await newFunApi.audit(params);
 				if (status == 200) {
-					that.$toast(message)
+					this.$toast(message)
 					this.afterSale = false
 					this.pageNum = 1
 					this.goodShopsList = [];

pages/news3/shopOrderDetails.vue

@@ -196,7 +196,7 @@
 				<view class="filterItem c">
 					<view class="tuiAdderss" v-if="audit_status==10">
 						<text>退货地址:</text>
-						<view class="" @click="goJump('/pages/news3/addressList','',0)"><text :style="{'color': addressData?'#303030':'#EAEAEA'}"></text>
+						<view class="" @click="goJump('/pages/news3/addressList','',0)"><text :style="{'color': addressData?'#303030':'#ABABAB'}"></text>
 							{{addressData?addressData.name+addressData.phone:'请选择退货地址'}}
 							<u-icon name="arrow-right" color="#979797" size="28"></u-icon>
 						</view>

pages/order/detail.vue

@@ -456,7 +456,9 @@
 				app.isLoading = true
 				OrderApi.detail(app.orderId)
 					.then(result => {
+						if (result.data.order.delivery_type == 20) {
 							app.onExtractQRCode(result.data.order.order_id)
+						}
 						app.order = result.data.order
 						app.setting = result.data.setting
 						app.isLoading = false
@@ -616,9 +618,11 @@
 	page {
 		height: 100%;
 	}
+
 	::v-deep .qrcode-popup {
 		padding: 44rpx 80rpx !important;
 	}
+
 	.detail {
 		width: 750rpx;
 		padding-bottom: 150rpx;
@@ -1377,6 +1381,7 @@
 				display: flex;
 				justify-content: center;
 				margin-top: 30rpx;
+
 				.codeImg {
 					width: 394rpx;
 					height: 458rpx;
@@ -1428,6 +1433,7 @@
 		font-weight: 500;
 		color: #1E1E1E;
 		padding: 15rpx 0;
+
 		text {
 			font-size: 36rpx;
 		}

pages/order/index.vue

@@ -7,9 +7,18 @@
 			</view>
 		</view>
 		<!-- tab栏 -->
-		<u-tabs :list="tabs" bg-color="#fafafa" :is-scroll="true" height="120" font-size="32" :current="current"
+		<view class="container">
+			<view class="classify-list">
+				<view class="list" v-for="(item,index) in tabs" :class="{'action':current==index}"
+					@click="onChangeTab(item,index)" :key="index">
+					<text>{{item.name}}</text>
+					<text class="line" v-show="current==index"></text>
+				</view>
+			</view>
+		</view>
+	<!-- 	<u-tabs :list="tabs" bg-color="#fafafa" :is-scroll="true" height="120" font-size="32" :current="current"
 			bar-width="56" bar-height="6" active-color="#3B3B3B" :show-bar='true' :duration="0.2"
-			@change="onChangeTab" />
+			@change="onChangeTab" /> -->
 		<!-- 订单列表 -->
 		<view class="order-list">
 			<view class="item" v-for="(item,index) in list" v-if="list.length>0">
@@ -257,6 +266,7 @@
 				app.getOrderList()
 			},
 			changeMenu(index) {
+				let idList = []
 				this.list.forEach(item => {
 					item.menushow = false;
 					idList.push(item.response.data.fileInfo.file_id)
@@ -305,7 +315,7 @@
 			},
 
 			// 切换标签项
-			onChangeTab(index) {
+			onChangeTab(item,index) {
 				const app = this
 				app.list = []
 				// 设置当前选中的标签
@@ -480,7 +490,61 @@
 		background-color: rgb(255, 98, 87) !important;
 	}
 
+	.container {
+		background-color: #fff;
+	}
+
+	.classify-list {
+		white-space: nowrap;
+		width: 100%;
+		height: 100rpx;
+		overflow-x: auto;
+		overflow-y: hidden;
+
+		.list {
+			position: relative;
+			display: inline-block;
+			width: 18%;
+			height: 100%;
+			line-height: 100rpx;
+			text-align: center;
+
+			text {
+				font-size: 28rpx;
+				color: #3B3B3B;
+
+			}
+
+			.line {
+				position: absolute;
+				left: 50%;
+				bottom: 10rpx;
+				// width: 60%;
+				// height: 8rpx;
+				background: linear-gradient(to right, #f8f893, #fe9d00);
+				// border-radius: 10rpx;
+				transform: translate(-50%, 0);
+
+				width: 60upx;
+				height: 8upx;
+				background: #FF6257;
+				border-radius: 29px 29px 29px 29px;
+				opacity: 1;
+			}
+		}
+
+		.action {
+			text {
+				font-size: 32rpx;
+				opacity: 1;
+			}
+		}
+	}
+
 	.order {
+		.order-list{
+			margin-top: 20rpx;
+		}
 		.receive {
 			width: 100%;
 			background: #F8F8F8;
@@ -856,6 +920,7 @@
 				display: flex;
 				justify-content: center;
 				margin-top: 30rpx;
+
 				.codeImg {
 					width: 394rpx;
 					height: 458rpx;

pages/refund/index.vue

@@ -1,11 +1,20 @@
 <template>
 	<view class="container" :style="appThemeStyle">
-    <mescroll-body ref="mescrollRef" :sticky="true" @init="mescrollInit" :down="{ native: true }" @down="downCallback" :up="upOption"
+		<mescroll-body ref="mescrollRef" :sticky="true" @init="mescrollInit" :down="{ native: true }"
-      @up="upCallback">
+			@down="downCallback" :up="upOption" @up="upCallback">
 
 			<!-- tab栏 -->
-      <u-tabs :list="tabs" :is-scroll="false" :current="curTab" :active-color="appTheme.mainBg" :duration="0.2" @change="onChangeTab" />
+			<!-- <u-tabs :list="tabs" :is-scroll="false" :current="curTab" :active-color="appTheme.mainBg" :duration="0.2"
-
+				@change="onChangeTab" /> -->
+	<view class="container">
+			<view class="classify-list">
+				<view class="list" v-for="(item,index) in tabs" :class="{'action':curTab==index}"
+					@click="onChangeTab(index)" :key="index">
+					<text>{{item.name}}</text>
+					<text class="line" v-show="curTab==index"></text>
+				</view>
+			</view>
+		</view>
 			<!-- 退款/售后单 -->
 			<view class="widget-list">
 				<view class="widget-detail" v-if="list.data.length>0" v-for="(item, index) in list.data" :key="index">
@@ -15,7 +24,8 @@
 							<text class="col-m">{{ item.state_text }}</text>
 						</view>
 					</view>
-          <view class="detail-goods row-block dis-flex" @click.stop="handleTargetDetail(item.order_refund_id)">
+					<view class="detail-goods row-block dis-flex"
+						@click.stop="handleTargetDetail(item.order_refund_id)">
 						<view class="goods-image">
 							<image class="image" :src="item.orderGoods.goods_image" mode="aspectFit"></image>
 						</view>
@@ -24,7 +34,8 @@
 								<text class="twoline-hide">{{ item.orderGoods.goods_name }}</text>
 							</view>
 							<view class="goods-props clearfix">
-                <view class="goods-props-item" v-for="(props, idx) in item.orderGoods.goods_props" :key="idx">
+								<view class="goods-props-item" v-for="(props, idx) in item.orderGoods.goods_props"
+									:key="idx">
 									<text>{{ props.value.name }}</text>
 								</view>
 							</view>
@@ -40,7 +51,8 @@
 						</view>
 					</view>
 					<view class="detail-operate row-block dis-flex flex-x-end flex-y-center">
-            <view class="detail-btn btn-detail" @click.stop="handleTargetDetail(item.order_refund_id)">查看详情</view>
+						<view class="detail-btn btn-detail" @click.stop="handleTargetDetail(item.order_refund_id)">查看详情
+						</view>
 					</view>
 				</view>
 				<u-empty text="暂无数据显示哦～" v-else mode="list"></u-empty>
@@ -53,7 +65,10 @@
 
 <script>
 	import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins'
-  import { getEmptyPaginateObj, getMoreListData } from '@/core/app'
+	import {
+		getEmptyPaginateObj,
+		getMoreListData
+	} from '@/core/app'
 	import * as RefundApi from '@/api/refund'
 
 	// 每页记录数量
@@ -83,7 +98,9 @@
 					// 首次自动执行
 					auto: true,
 					// 每页数据的数量; 默认10
-          page: { size: pageSize },
+					page: {
+						size: pageSize
+					},
 					// 数量要大于2条才显示无更多数据
 					noMoreSize: 2,
 					// 空布局
@@ -95,7 +112,11 @@
 				canReset: false,
 			}
 		},
-
+		onUnload() {
+			uni.switchTab({
+				url: '/pages/user/index' // targetTab 为目标 tab 页的路径
+			})
+		},
 		/**
 		 * 生命周期函数--监听页面加载
 		 */
@@ -134,7 +155,12 @@
 			getRefundList(pageNo = 1) {
 				const app = this
 				return new Promise((resolve, reject) => {
-          RefundApi.list({ state: app.getTabValue(), page: pageNo }, { load: false })
+					RefundApi.list({
+							state: app.getTabValue(),
+							page: pageNo
+						}, {
+							load: false
+						})
 						.then(result => {
 							// 合并新数据
 							const newList = result.data.list
@@ -146,6 +172,7 @@
 
 			// 切换标签项
 			onChangeTab(index) {
+				console.log(index)
 				const app = this
 				// 设置当前选中的标签
 				app.curTab = index
@@ -168,7 +195,9 @@
 
 			// 跳转到售后单详情页
 			handleTargetDetail(orderRefundId) {
-        this.$navTo('pages/refund/detail', { orderRefundId })
+				this.$navTo('pages/refund/detail', {
+					orderRefundId
+				})
 			},
 
 		}
@@ -179,6 +208,54 @@
 	::v-deep .u-empty {
 		padding: 100rpx 0;
 	}
+
+	.classify-list {
+		white-space: nowrap;
+		width: 100%;
+		height: 100rpx;
+		overflow-x: auto;
+		overflow-y: hidden;
+
+		.list {
+			position: relative;
+			display: inline-block;
+			width: 50%;
+			height: 100%;
+			line-height: 100rpx;
+			text-align: center;
+
+			text {
+				font-size: 28rpx;
+				color: #3B3B3B;
+
+			}
+
+			.line {
+				position: absolute;
+				left: 50%;
+				bottom: 10rpx;
+				// width: 60%;
+				// height: 8rpx;
+				background: linear-gradient(to right, #f8f893, #fe9d00);
+				// border-radius: 10rpx;
+				transform: translate(-50%, 0);
+
+				width: 60upx;
+				height: 8upx;
+				background: #FF6257;
+				border-radius: 29px 29px 29px 29px;
+				opacity: 1;
+			}
+		}
+
+		.action {
+			text {
+				font-size: 32rpx;
+				opacity: 1;
+			}
+		}
+	}
+
 	.widget-detail {
 		box-sizing: border-box;
 		background: #fff;