commit -m 订单

common/css/iconfont.scss

@@ -1,9 +1,9 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4053045 */
-  src: url('//at.alicdn.com/t/c/font_4053045_x0f8a4dqiha.woff2?t=1684058283095') format('woff2'),
-       url('//at.alicdn.com/t/c/font_4053045_x0f8a4dqiha.woff?t=1684058283095') format('woff'),
-       url('//at.alicdn.com/t/c/font_4053045_x0f8a4dqiha.ttf?t=1684058283095') format('truetype'),
-       url('//at.alicdn.com/t/c/font_4053045_x0f8a4dqiha.svg?t=1684058283095#iconfont') format('svg');
+  src: url('//at.alicdn.com/t/c/font_4053045_ne05dr0bqd8.woff2?t=1684465163145') format('woff2'),
+       url('//at.alicdn.com/t/c/font_4053045_ne05dr0bqd8.woff?t=1684465163145') format('woff'),
+       url('//at.alicdn.com/t/c/font_4053045_ne05dr0bqd8.ttf?t=1684465163145') format('truetype'),
+       url('//at.alicdn.com/t/c/font_4053045_ne05dr0bqd8.svg?t=1684465163145#iconfont') format('svg');
 }
 
 .iconfont {
@@ -14,6 +14,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-genghuan:before {
+  content: "\e61a";
+}
+
+.icon-shouhuodizhi1:before {
+  content: "\e61c";
+}
+
 .icon-wancheng:before {
   content: "\e734";
 }

components/cm-module/cm-cart-temp/cm-unit-popup.vue

@@ -336,7 +336,7 @@ export default {
 					.iconfont {
 						font-size: $font-size-24;
 						padding: 0 18rpx;
-						color: #999999;
+						color: #333333;
 						text-align: center;
 						line-height: 48rpx;
 						font-weight: bold;

components/cm-module/cm-cart-temp/index.vue

@@ -1179,7 +1179,7 @@ page {
 					.iconfont {
 						font-size: $font-size-24;
 						padding: 0 18rpx;
-						color: #999999;
+						color: #333333;
 						text-align: center;
 						line-height: 48rpx;
 						font-weight: bold;

components/cm-module/productDetails/cm-unit-popup.vue

@@ -24,14 +24,11 @@
 							:key="index"
 							:class="skuIndex === index ? 'active' : ''"
 						>
-							{{ sku.unit }} <text class="tips" v-if="sku.stock === 0">缺货</text>
+							{{ sku.unit }} 
 						</view>
 					</view>
 				</view>
 				<view class="sku-unit-nunbox">
-					<view class="sku-unit-nunbox" v-if="skuProduct.step === 2">
-						<view class="text">*该商品只能以起订量的整数倍购买</view>
-					</view>
 					<view class="sku-unit-nunbox-t">
 						<view class="sku-unit-nunbox-text">购买数量:</view>
 						<view class="sku-unit-nunbox-num">
@@ -39,7 +36,7 @@
 								<view
 									class="iconfont icon-jianhao"
 									@click="changeCountSub"
-									:class="[isQuantity == true ? 'disabled' : '']"
+									:class="[isQuantity ? 'disabled' : '']"
 								></view>
 								<input
 									class="btn-input"
@@ -195,25 +192,16 @@ export default {
 				this.isStock = true
 				return
 			}
-			if (this.skuProduct.step == 2) {
-				this.productCount += this.handleMinNumber
-			} else {
-				this.productCount++
-			}
+			this.productCount++
 		},
 		//popup弹窗数量减按钮
 		changeCountSub() {
 			if (this.productCount <= this.handleMinNumber) {
 				this.productCount = this.handleMinNumber
 				this.isQuantity = true
-				this.$util.msg(`该商品最小起订量为${this.handleMinNumber}`, 2000)
 				return
 			} else {
-				if (this.skuProduct.step == 2) {
-					this.productCount -= this.handleMinNumber
-				} else {
-					this.productCount--
-				}
+				this.productCount--
 				this.isQuantity = false
 			}
 		},
@@ -421,7 +409,7 @@ export default {
 					.iconfont {
 						font-size: $font-size-24;
 						padding: 0 18rpx;
-						color: #D5D5D5;
+						color: #333333;
 						text-align: center;
 						line-height: 48rpx;
 						font-weight: bold;

mixins/appMixins.js

@@ -11,8 +11,8 @@ const appMixins = {
             },
             modelMap : { // 苹果系统
                 'iPhone X': true,
-                'iPhone 11':true,
                 'iPhone 11 Pro Max':true,
+                'iPhone 11<iPhone12,1>':true,
                 'iPhone 12<iPhone13,2>':true,
                 'iPhone 13<iPhone14,5>':true,
             }

pages.json

@@ -106,6 +106,13 @@
 						"navigationStyle": "custom"
 					}
 				},
+				{
+				    "path": "login-auth",
+				    "style": {
+				        "navigationBarTitleText": "登录成功",
+				        "enablePullDownRefresh": false
+				    }
+				}, 
 				{
 					"path": "register-unid",
 					"style": {

pages/goods/components/cm-unit-popup.vue

@@ -7,7 +7,7 @@
 					<view class="tui-sku-title">
 						<view class="tui-sku-image"> <image :src="skuProduct.mainImage" mode=""></image> </view>
 						<view class="tui-sku-price">
-							<cmUnitPrice :skuProduct="skuProduct" :productCoupon="productCoupon"></cmUnitPrice>
+							<cmUnitPrice :skuProduct="skuProduct" />
 						</view>
 					</view>
 					<view class="tui-sku-unit">
@@ -21,14 +21,10 @@
 								:class="skuIndex === index ? 'active' : ''"
 							>
 								{{ sku.unit }} 
-								<!-- <text class="tips" v-if="sku.stock === 0">缺货</text> -->
 							</view>
 						</view>
 					</view>
 					<view class="sku-unit-nunbox">
-<!-- 						<view class="sku-unit-nunbox" v-if="skuProduct.step === 2">
-							<view class="text">*该商品只能以起订量的整数倍购买</view>
-						</view> -->
 						<view class="sku-unit-nunbox-t">
 							<view class="sku-unit-nunbox-text">购买数量:</view>
 							<view class="sku-unit-nunbox-num">
@@ -54,13 +50,9 @@
 							</view>
 						</view>
 					</view>
-					<view class="sku-unit-ladel" v-if="isShowLadder" @click.stop="showLaddePopup">
-						此规格商品存在阶梯价格，点击查看 >>>
-					</view>
 				</view>
 				<view
 					class="tui-right-flex tui-popup-btn"
-					v-if="isShowButton"
 					:style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }"
 				>
 					<view class="tui-flex-1" v-if="type === 1">
@@ -92,8 +84,6 @@
 				</view>
 			</view>
 		</tui-bottom-popup>
-		<!-- 阶梯价弹窗 -->
-		<cmLadderPopup v-if="laddePopupShow" :show="laddePopupShow" :list="ladderPriceList"></cmLadderPopup>
 	</view>
 </template>
 
@@ -101,21 +91,16 @@
 import { mapState, mapMutations } from 'vuex'
 import uniGrader from '@/components/uni-grade/uni-grade.vue'
 import cmUnitPrice from './cm-unit-price.vue'
-import cmLadderPopup from '@/components/cm-module/productDetails/cm-ladder-popup.vue'
 export default {
 	name: 'cm-unit-popup',
 	components: {
 		uniGrader,
 		cmUnitPrice,
-		cmLadderPopup
 	},
 	props: {
 		skuProduct: {
 			type: Object
 		},
-		productCoupon: {
-			type: Array
-		},
 		goodsData: {
 			type: Object
 		},
@@ -138,7 +123,6 @@ export default {
 			ladderPriceList: [],
 			isStock: false, //
 			isQuantity: false,
-			isShowButton: false,
 			skuList: [],
 			handleStock: 0, // 规格库存
 			handleMinNumber: 1, // 规格起订量
@@ -155,20 +139,10 @@ export default {
 	},
 	methods: {
 		async initData(data) {
-			const userInfo = await this.$api.getStorage()
-			if (userInfo.userIdentity == 1 || userInfo.userIdentity == 3) {
-				this.isShowButton = false
-			} else {
-				this.isShowButton = true
-			}
 			this.skuList = this.skuProduct.organizeSkus
 			this.productCount = this.skuList[0].minBuyNumber
 			this.handleMinNumber = this.skuList[0].minBuyNumber
 			this.handleStock = this.skuList[0].stock
-			// if (this.skuList[0].ladderPriceList) {
-			// 	this.isShowLadder = true
-			// 	this.ladderPriceList = this.skuList[0].ladderPriceList
-			// }
 		},
 		//popup弹窗数量增加按钮
 		changeCountAdd() {
@@ -176,27 +150,16 @@ export default {
 				this.isStock = true
 				return
 			}
-			if (this.skuProduct.step == 2) {
-				this.productCount += this.handleMinNumber
-			} else {
-				this.productCount++
-			}
-			this.totalLadderPrice()
+			this.productCount++
 		},
 		//popup弹窗数量减按钮
 		changeCountSub() {
 			if (this.productCount <= this.handleMinNumber) {
 				this.productCount = this.handleMinNumber
 				this.isQuantity = true
-				this.$util.msg(`该商品最小起订量为${this.handleMinNumber}`, 2000)
 				return
 			} else {
-				if (this.skuProduct.step == 2) {
-					this.productCount -= this.handleMinNumber
-				} else {
-					this.productCount--
-				}
-				this.totalLadderPrice()
+				this.productCount--
 				this.isQuantity = false
 			}
 		},
@@ -205,27 +168,12 @@ export default {
 			if (!this.$api.isNumber(_value)) {
 				this.productCount = this.handleMinNumber
 			} else if (_value < this.handleMinNumber) {
-				this.$util.msg(`该商品最小起订量为${this.handleMinNumber}`, 2000)
-				this.productCount = this.handleMinNumber
-			} else if (_value % this.handleMinNumber != 0) {
-				this.$util.msg('购买量必须为起订量的整数倍', 2000)
 				this.productCount = this.handleMinNumber
 			} else if (_value > this.handleStock) {
 				this.productCount = this.handleStock
 			} else {
 				this.productCount = e.detail.value
 			}
-			this.totalLadderPrice()
-		},
-		totalLadderPrice() {
-			//单独处理活动价格和阶梯价格
-			if (this.ladderPriceList.length > 0) {
-				this.ladderPriceList.forEach((ladder, index) => {
-					if (this.productCount >= ladder.buyNum) {
-						this.$parent.skuProduct.price = ladder.buyPrice
-					}
-				})
-			}
 		},
 		handleConfirm(type) {
 			if (this.hasLogin) {
@@ -235,22 +183,21 @@ export default {
 				this.$emit('buyConfirm', { type: type, productCount: this.productCount })
 				this.$parent.popupShow3 = false
 			} else {
-				this.$api.navigateTo('/pages/login/login')
+				this.handleNavLogin()
 			}
 		},
+		handleNavLogin(){
+		    //未登录跳转
+		    const pages = getCurrentPages()
+		    const page = pages[pages.length - 1]
+		    uni.setStorageSync('LOGIN_REDIRECT_URL', page.$page.fullPath)
+		    this.$api.redirectTo('/pages/login/login')
+		},
 		handleBtnConfirm() {
 			//确定加入购物车或立即购买
 			if (this.isBtnDisable || this.goodsData.disabled) {
 				return
 			}
-			if (process.env.NODE_ENV != 'development') {
-				// 友盟埋点商品详情确认购买商品点击事件
-				this.$uma.trackEvent('Um_Event_ProductShoppingConfirm', {
-					Um_Key_PageName: '商品购买确认',
-					Um_Key_SourcePage: '商品详情',
-					Um_Key_ProductID: `${this.skuProduct.productId}`
-				})
-			}
 			this.$emit('buyConfirm', { type: this.btnType, productCount: this.productCount })
 			this.$parent.popupShow3 = false
 		},
@@ -391,7 +338,7 @@ export default {
 					.iconfont {
 						font-size: $font-size-24;
 						padding: 0 18rpx;
-						color: #D5D5D5;
+						color: #333333;
 						text-align: center;
 						line-height: 48rpx;
 						font-weight: bold;

pages/goods/mixins/proMixins.js

@@ -21,7 +21,7 @@ const proMixins = {
 		    if (this.hasLogin) {
 		        this.$api.navigateTo('/pages/goods/cart')
 		    } else {
-		        this.$api.navigateTo('/pages/login/login?type=1')
+		      this.handleNavLogin()
 		    }
         },
         btnGetConfirm(type) {
@@ -31,15 +31,20 @@ const proMixins = {
 		        this.popupShow3 = true
 		        this.unitPopupType = 1
 		    } else {
-		        this.$api.navigateTo('/pages/login/login?type=1')
+                this.handleNavLogin()
 		    }
         },
+        handleNavLogin(){
+            //未登录跳转
+            const pages = getCurrentPages()
+            const page = pages[pages.length - 1]
+            uni.setStorageSync('LOGIN_REDIRECT_URL', page.$page.fullPath)
+            this.$api.redirectTo('/pages/login/login')
+        },
         handleSkuClick(sku) {  //sku修改选择
             console.log(sku)
             this.addParams.skuId = sku.skuId
-            this.skuProduct.originalPrice = sku.originalPrice
-            this.skuProduct.price = sku.price
-            this.skuProduct.svipPriceTag = sku.svipPriceTag
+            this.skuProduct = {...this.skuProduct ,...sku}
         },
         handleBuyConfirm(data) {
             // 监听确定选择规格

pages/goods/product.vue

@@ -170,19 +170,18 @@
 			</view>
 		</template>
 		<!-- 商品参数 -->
-		<cm-prams-popup v-if="popupShow0" :popupShow="popupShow0" :product="product"></cm-prams-popup>
+		<cm-prams-popup v-if="popupShow0" :popupShow="popupShow0" :product="product" />
 		<!-- 选择规格弹窗 -->
 		<cm-unit-popup
 			v-if="popupShow3"
 			:popupShow="popupShow3"
 			:skuProduct="skuProduct"
-			:productCoupon="productCoupon"
 			:type="unitPopupType"
 			:btnType="btnType"
 			:goodsData="goodsData"
 			@buyConfirm="handleBuyConfirm"
 			@skuClick="handleSkuClick"
-		></cm-unit-popup>
+		/>
 		<!-- 弹窗提示 -->
 		<tui-modal
 			:show="modal"
@@ -335,8 +334,8 @@ export default {
 				}
 				this.html = this.adaptRichTextImg(this.product)
 				//处理商品图片列表
-				this.product.imageList.forEach(item => {
-					this.productImage.push(item.image)
+				this.productImage = this.product.imageList.map(item => {
+					return item.image
 				})
 				//处理下架商品和售罄商品
 				if (this.product.validFlag == 2) {
@@ -443,24 +442,6 @@ export default {
 			console.log(e.detail.path)
 			console.log(e.detail.query)
 		},
-		buyProductCart() {
-			//底部购物车按钮点击
-			if (this.hasLogin) {
-				this.$api.navigateTo('/pages/goods/cart')
-			} else {
-				this.$api.navigateTo('/pages/login/login?type=1')
-			}
-		},
-		btnGetConfirm(type) {
-			//加入购物车&&立即购买点击
-			if (this.hasLogin) {
-				this.btnType = type
-				this.popupShow3 = true
-				this.unitPopupType = 1
-			} else {
-				this.$api.navigateTo('/pages/login/login?type=1')
-			}
-		},
 		setHeaderBtnPosi() {
 			// 获得胶囊按钮位置信息
 			let headerBtnPosi = uni.getMenuButtonBoundingClientRect()
@@ -1627,7 +1608,7 @@ page {
 					.iconfont {
 						font-size: $font-size-24;
 						padding: 0 18rpx;
-						color: #999999;
+						color: #333333;
 						text-align: center;
 						line-height: 48rpx;
 						font-weight: bold;

pages/login/login-auth.vue

@@ -0,0 +1,24 @@
+<template>
+    <view></view>
+</template>
+
+<script>
+export default {
+    onLoad() {
+        this.$toast('登录成功')
+        const url = uni.getStorageSync('LOGIN_REDIRECT_URL')
+        if (url) {
+            if (url.indexOf('tabBar') > -1) {
+                uni.switchTab({ url })
+            } else {
+                uni.redirectTo({ url })
+            }
+        } else {
+            uni.switchTab({ url: '/pages/tabBar/user/user' })
+        }
+    },
+    beforeDestroy() {
+        uni.removeStorageSync('LOGIN_REDIRECT_URL')
+    }
+}
+</script>

pages/login/login.vue

@@ -233,7 +233,17 @@ export default {
 				uni.setStorageSync('token', data.data.token)
 				this.$store.commit('updateStatus', data.data)
 				this.login(data.data)
-				this.$api.switchTabTo('/pages/tabBar/user/user')
+				// 登录成功处理
+				const url = uni.getStorageSync('LOGIN_REDIRECT_URL')
+				if (url) {
+				    if (url.indexOf('tabBar') > -1) {
+				        uni.switchTabTo(url)
+				    } else {
+						this.$api.redirectTo(url)
+				    }
+				} else {
+				   this.$api.switchTabTo('/pages/tabBar/user/user')
+				}
 			} else {
 				this.$util.msg(data.msg, 2000)
 			}

pages/user/collection/collection.vue

@@ -654,7 +654,7 @@ page {
 			.iconfont {
 				font-size: $font-size-24;
 				padding: 0 18rpx;
-				color: #999999;
+				color: #333333;
 				text-align: center;
 				line-height: 48rpx;
 				font-weight: bold;

pages/user/order/components/choiceAddress.vue

@@ -13,7 +13,7 @@
 		 			</view>
 		 			<view class="address">
 						<view class="address-icon">
-							<text class="iconfont icon-shouhuodizhi"></text>
+							<text class="iconfont icon-shouhuodizhi1"></text>
 						</view>
 						<view class="address-text">
 							{{addressData.province !== undefined ? addressData.province : ''}}
@@ -112,7 +112,7 @@
 			background: #fff;
 		}
 		
-		.icon-shouhuodizhi {
+		.icon-shouhuodizhi1 {
 			flex-shrink: 0;
 			display: flex;
 			align-items: center;

pages/user/order/components/details/orderButton.vue

@@ -5,14 +5,14 @@
 			<!-- <view class="btn btn-payment" v-if="order.affirmPaymentFlag == 10" @click.stop="btnConfirm('payment',order)">确认打款<text>供应商</text></view> -->
 			<!-- <view class="btn btn-confirm" v-if="btnState.isConfirmation" @click.stop="btnConfirm('confirmation',order)">确认订单</view> -->
 			<view class="btn btn-pay" v-if="btnState.isPay" @click.stop="btnConfirm('pay',order)">付款</view>
-			<view class="btn btn-cancel" v-if="btnState.isUpload" @click.stop="btnConfirm('upload',order)">上传凭证</view>
+			<view class="btn btn-cancel" v-if="order.checkFlag === 1" @click.stop="btnConfirm('upload',order)">上传凭证</view>
 			<view class="btn btn-share" @click.stop="onShareCode">
 				<view class="tips" v-if="shareCode">分享码：{{shareCode}}</view>
 				分享订单
 			</view>
 			<view class="btn btn-cancel" v-if="btnState.isCancel" @click.stop="btnConfirm('cancel',order)">取消订单</view>
 			<!-- <view class="btn btn-delete" v-if="btnState.isDelete" @click.stop="btnConfirm('delete',order)">删除订单</view> -->
-			<view class="btn btn-query" v-if="btnState.isQuery && order.secondHandOrderFlag!=1" @click.stop="btnConfirm('query',order)">查看物流</view>
+			<view class="btn btn-query" v-if="btnState.isQuery" @click.stop="btnConfirm('query',order)">查看物流</view>
 			<view class="btn btn-firm" v-if="btnState.isConfirm" @click.stop="btnConfirm('confirm',order)">
 				确认收货
 			</view>
@@ -50,11 +50,11 @@
 				mapStateArr:[
 					{label:'isQuery',val:[4,5,12,13,33,22,23,32,77],status: true},
 					{label:'isDelete',val:[6],status: true},
-					{label:'isCancel',val:[0,111,333],status: true},
+					{label:'isCancel',val:[0,111],status: true},
 					{label:'isConfirm',val:[33],status: true},
 					{label:'isConfirmation',val:[0],status: true},
-					{label:'isPay',val:[11,12,13,21,22,23,111,333],status: true},
-					{label:'isUpload',val:[11,12,13,21,22,23,111,333],status: true},
+					{label:'isPay',val:[11,12,13,21,22,23,111],status: true},
+					{label:'isUpload',val:[11,12,13,21,22,23,111],status: true},
 				]
 			}
 		},

pages/user/order/components/details/orderListButton.vue

@@ -3,12 +3,12 @@
 		<!-- 底部按钮 -->
 		<view class="button-content">
 			<view class="btn btn-pay" v-if="btnState.isPay" @click.stop="btnConfirm('pay',order)">付款</view>
-			<view class="btn btn-cancel" v-if="btnState.isUpload" @click.stop="btnConfirm('upload',order)">上传凭证</view>
+			<view class="btn btn-cancel" v-if="order.checkFlag === 1" @click.stop="btnConfirm('upload',order)">上传凭证</view>
 			<!-- <view class="btn btn-confirm" v-if="btnState.isConfirmation" @click.stop="btnConfirm('confirmation',order)">确认订单</view> -->
 			<view class="btn btn-share"  @click.stop="onShareCode(order.orderId)">分享订单</view>
 			<view class="btn btn-cancel" v-if="btnState.isCancel" @click.stop="btnConfirm('cancel',order)">取消订单</view>
 			<!-- <view class="btn btn-delete" v-if="btnState.isDelete" @click.stop="btnConfirm('delete',order)">删除订单</view> -->
-			<view class="btn btn-query" v-if="btnState.isQuery && order.secondHandOrderFlag!=1" @click.stop="btnConfirm('query',order)">查看物流</view>
+			<view class="btn btn-query" v-if="btnState.isQuery" @click.stop="btnConfirm('query',order)">查看物流</view>
 			<view class="btn btn-firm" v-if="btnState.isConfirm" @click.stop="btnConfirm('confirm',order)">
 				确认收货
 			</view>
@@ -35,11 +35,11 @@
 				mapStateArr:[
 					{label:'isQuery',val:[4,5,12,13,33,22,23,32,77],status: true},
 					{label:'isDelete',val:[6],status: true},
-					{label:'isCancel',val:[0,111,333],status: true},
+					{label:'isCancel',val:[0,111],status: true},
 					{label:'isConfirm',val:[33],status: true},
 					{label:'isConfirmation',val:[0],status: true},
-					{label:'isPay',val:[11,12,13,21,22,23,111,333],status: true},
-					{label:'isUpload',val:[11,12,13,21,22,23,111,333],status: true},
+					{label:'isPay',val:[11,12,13,21,22,23,111],status: true},
+					{label:'isUpload',val:[11,12,13,21,22,23,111],status: true},
 				]
 			}
 		},

pages/user/order/components/freight.vue

@@ -137,7 +137,7 @@ export default {
 					this.totalFreight = '￥' + (this.coldChain+data.postage).toFixed(2)
 				} else {
 					this.freightText = data.postageFlag === 0 ? '包邮' : '到付'
-					this.totalFreight = this.freightText
+					this.totalFreight =  '￥' + this.coldChain.toFixed(2)
 				}
 			}
 		}
@@ -192,6 +192,7 @@ export default {
 				float: right;
 				display: flex;
 				align-items: center;
+				font-size: $font-size-28;
 				.checkbox-box {
 					display: flex;
 					width: 60rpx;

pages/user/order/order-list.vue

@@ -203,10 +203,10 @@ export default {
 			},
 			orderTabBar: [
 				{ state: 0, text: '全部订单', orderList: [] },
-				{ state: 1, text: '待付款', orderList: [] },
-				{ state: 2, text: '待发货', orderList: [] },
-				{ state: 3, text: '已发货', orderList: [] },
-				{ state: 4, text: '退货/款', orderList: [] }
+				{ state: 2, text: '待付款', orderList: [] },
+				{ state: 3, text: '待发货', orderList: [] },
+				{ state: 4, text: '已发货', orderList: [] },
+				{ state: 5, text: '退货/款', orderList: [] }
 			],
 			currentTab: 0, //预设当前项的值
 			scrollLeft: 0, //tab标题的滚动条位置
@@ -257,7 +257,9 @@ export default {
 		if (e.type === 'detele') {
 			this.isDelete = true
 		}
-		this.currentTab = e.state
+		const evStateMap = { 2:1, 3:2, 4:3, 5:4 }
+		this.currentTab = evStateMap[e.state]
+		console.log('currentTab',this.currentTab)
 		this.isOnloadFlag = true
 		this.getHeaderTopHeight() //设置自定义导航高度
 		this.initStorage()
@@ -277,14 +279,14 @@ export default {
 		},
 		// 滚动切换标签样式
 		onChange: function(e) {
-			let index = e.target.current || e.detail.current
+			let tabIndex = e.target.current || e.detail.current
 			if (this.isClickChange) {
-				this.currentTab = index
+				this.currentTab = tabIndex
 				this.isClickChange = false
 				return
 			}
 			this.isClickChange = false
-			this.currentTab = index
+			this.currentTab = tabIndex
 			this.checkCor()
 			this.pageNum = 1
 			this.pullUpOn = true //切换时隐藏
@@ -324,7 +326,7 @@ export default {
 				return
 			}
 			try{
-				this.listQuery.orderState = index
+				this.listQuery.orderState = this.orderTabBar[index].state
 				const res = await this.OrderService.QueryOrderList(this.listQuery)
 				const data = res.data
 				const orderList = data.list.filter(item => {
@@ -360,7 +362,7 @@ export default {
 			//上拉加载
 			try{
 				this.listQuery.pageNum += 1
-				this.listQuery.orderState = index
+				this.listQuery.orderState = this.orderTabBar[index].state
 				const res = await this.OrderService.QueryOrderList(this.listQuery)
 				const data = res.data
 				const orderItem = this.orderTabBar[index]