优化

common/common.scss

@@ -94,12 +94,12 @@ button::after{
 		width: 702rpx;
 		height: 88rpx;
 		font-size: $font-size-base;
-		border-radius: 14rpx;
 		line-height: 88rpx;
 		color: #FFFFFF;
 		margin: 0 auto;
 		text-align: center;
 		background: $btn-confirm;
+		border-radius: 0;
 		margin-top: 40rpx;
 	}
 }
@@ -203,6 +203,7 @@ button::after{
 .loading-wrapper {
 	width: 100%;
 	height: 60rpx;
+	padding: 25rpx 0;
 	color: #333;
 	font-size: 24rpx;
 	display: flex;
@@ -265,7 +266,7 @@ button::after{
 	color: #FFFFFF;
 	text-align: center;
 	background: $btn-confirm;
-	border-radius: 14rpx;
+	border-radius: 0;
 }
 // 小红点
 .uni-badge--small {

components/module/headerNavbar/header-back.vue

@@ -56,7 +56,6 @@
 		created() {
 			let statusBarHeight = this.systeminfo.statusBarHeight // 状态栏高度
 			let headerPosi = this.headerBtnPosi // 胶囊位置信息
-			console.log(headerPosi)
 			this.fontSizeSetting = this.systeminfo.fontSizeSetting
 			// console.log(this.systeminfo.platform)
 			// console.log(this.systeminfo.fontSizeSetting)

components/module/orderDetails/orderButton.vue

@@ -55,7 +55,7 @@
 		},
 		methods:{
 			initData(resVal) {
-				// console.log(resVal)
+				console.log(resVal)
 				/**
 				 * @分享按钮统一显示
 				 * @按钮根据状态显示

config/caimeiApi.js

@@ -5,8 +5,8 @@
  */
 // const requestUrl ='http://192.168.1.22:8107'//本地联调地址
 // const requestUrl ='http://192.168.1.24:8107'//俊俊联调地址
-const requestUrl ='https://mall-b.caimei365.com'//测试
-// const requestUrl ='https://mall.caimei365.com'//正式
+// const requestUrl ='https://mall-b.caimei365.com'//测试
+const requestUrl ='https://mall.caimei365.com'//正式
 const caimeiApi = {
 	/**
 	 * @封装公共get数据请求方法无加载动画

pages/search/search-order.vue

@@ -22,7 +22,7 @@
 				</view>
 			</view>
 		</view>
-		<view class=" order-container" v-if="isShowWrapper" :style="{'overflow':(showSkeleton? 'hidden' : 'auto'),'height': (showSkeleton? (scrollHeight-57) + 'px' : 'auto')}">
+		<view class=" order-container" v-if="isShowWrapper" :style="{'overflow' : 'auto','height': (showSkeleton? windowHeight + 'px' : 'auto')}">
 			<scroll-view  class="tui-skeleton" :style="{'height':scrollHeight+'px'}"  @scrolltolower="scrolltolower" scroll-y >
 				<view  :class="{'tui-order-list':scrollTop >= 0}" class="tui-skeleton clearfix">
 					<!-- 空白页 -->
@@ -158,6 +158,7 @@
 				alertType:'',
 				cenceAlertText: '确认取消该订单吗？',
 				nomoreText: '上拉显示更多',
+				scrollHeight:''
 			}
 		},
 		created() {

pages/search/search.vue

@@ -1,14 +1,12 @@
 <template>
 	<view class="search-container">
 		<view class="search-main">
-			<view class="search">
-				<view class="search-input">
-					<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-					<input maxlength="20" focus type="text" value="" confirm-type="search" @focus="onFocus" @input="onShowClose" @confirm="subMitSearch()" placeholder="请输入商品关键词" v-model.trim="searchInputVal"/>
-					<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
-				</view>
-				<view class="search-btn" @click="subMitSearch()">搜索</view>
+			<view class="search-input">
+				<text class="iconfont icon-iconfonticonfontsousuo1"></text>
+				<input maxlength="20" focus type="text" value="" confirm-type="search" @focus="onFocus" @input="onShowClose" @confirm="subMitSearch()" placeholder="请输入商品关键词" v-model.trim="searchInputVal"/>
+				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
 			</view>
+			<view class="search-btn" @click="subMitSearch()">搜索</view>
 		</view>
 		<view class="search-container-history" v-if="!isShowWrapper">
 			<view :class="'s-' + themeClass" v-if="serachRecordList.length>0">
@@ -22,8 +20,8 @@
 			</view>
 		</view>
 		<!-- <go-search :theme="themeClass" @subMitSearch="subMitSearch"></go-search> -->
-		<view v-else class="container commodity-list-wrapper"  :style="{'overflow':(showSkeleton ? 'hidden' : 'auto'),'height':(showSkeleton? (scrollHeight-57) + 'px' : 'auto')}">
-			<scroll-view :style="{'height':scrollHeight+'px'}" @scrolltolower="scrolltolower" scroll-y v-if="!showEmpty">
+		<view v-else class="commodity-list-wrapper"  :style="{'overflow':'auto','height':(commodityList.length>4? windowHeight + 'px' : 'auto')}">
+			<scroll-view :style="{'height':(commodityList.length>4? scrollHeight+'px' : 'auto')}" @scrolltolower="scrolltolower" scroll-y v-if="!showEmpty">
 				<view v-for="(item,index) in commodityList" :key="index" :id="item.id" class="all-type-list-content commodity-list" @click.stop="navToDetailPage(item.id)">
 					<image mode='widthFix' :src="item.mainImage"  class="list-img" alt="list-img"></image>
 					<view class="list-details-info">
@@ -83,7 +81,6 @@
 				isShowWrapper:false,
 				isModallayer:false,
 				windowHeight: '',
-				showSkeleton: true,
 				showEmpty: false,
 				userID: '',
 				loginStatus: true,
@@ -157,11 +154,8 @@
 									this.showEmpty = false;
 									if(loadMore) {
 										this.commodityList = [...this.commodityList,...resList];
-										this.showSkeleton = false;
 									} else {
 										this.commodityList = [...resList];
-										this.showSkeleton = true;
-										console.log(this.showSkeleton)
 									}
 									// 防上拉暴滑
 									this.pullFlag = false;
@@ -267,7 +261,7 @@
 	page{
 		background-color: #F7F7F7 !important;
 	}
-	.search{
+	.search-main{
 		width: 702rpx;
 		height: 80rpx;
 		padding: 12rpx 24rpx;
@@ -453,7 +447,8 @@
 	.commodity-list-wrapper {
 		scroll-view {
 			height: 100%;
-		}
+			overflow: scroll;
+		}	
 		.empty-container-image {
 			margin-top: -300rpx;
 		}

pages/user/order/order-list.vue

@@ -13,7 +13,7 @@
 		<swiper class="tab-content" :current="currentTab" duration="80" @animationfinish="onChange" :style="{height:winHeight+'px'}" >
 			<swiper-item v-for="(tabItem,index) in orderTabBar" :key="index">
 				<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="false" :loadingType="9"></tui-skeleton>
-				<scroll-view scroll-y class="scoll-y tui-skeleton" @scrolltolower="scrolltolower" upper-threshold="40" @scrolltoupper="scrolltoupper">
+				<scroll-view scroll-y class="scoll-y tui-skeleton" @scrolltolower="scrolltolower">
 					<view  :class="{'tui-order-list':scrollTop >= 0}" class="tui-skeleton clearfix">
 						<!-- 空白页 -->
 						<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0" :typeIndex="currentTab" :navbarHeight="navbarHeight"></empty>
@@ -259,7 +259,7 @@
 										this.pullUpOn = false
 										this.nomoreText = '上拉显示更多'
 									}else{
-										if(this.orderData.length < 2){
+										if(orderItem.orderList.length < 2){
 											this.pullUpOn = true
 										}else{
 											this.pullUpOn = false
@@ -307,11 +307,6 @@
 					this.getOnReachBottomData(this.currentTab);
 				}	
 			},
-			scrolltoupper() {
-				this.loadding = false
-				this.pullUpOn = true
-				this.getOrderDatainit(this.currentTab);
-			},
 			detail(id) {//订单详情跳转
 				console.log(id)
 				this.isModalLayer = true;