测试优化~

common/css/common.scss

@@ -279,7 +279,7 @@ button::after{
 	color: #FFFFFF;
 	text-align: center;
 	background: $btn-confirm;
-	border-radius: 14rpx;
+	border-radius: 44rpx;
 }
 // 小红点
 .uni-badge--small {

components/cm-custom/custom-p.vue

@@ -45,7 +45,7 @@
 		data() {
 			return{
 				headerType:'',
-				clickPath:'/pages/search/search-instrument', 
+				clickPath:'/pages/search/search', 
 				haveBack: true, // 是否有返回按钮，true 有 false 没有 若从分享页进入则为 false
 			    statusBarHeight: 0, // 状态栏高度
 			    navbarHeight: 0, // 顶部导航栏高度,

components/cm-module/cm-seller/home.vue

@@ -34,7 +34,7 @@
 			</view>
 		</view>
 		<!-- 侧边 -->
-		<scroll-top v-if="isScrollTop"></scroll-top>
+		<scroll-top :isScrollTop="isScrollTop"></scroll-top>
 	</view>
 </template>
 

components/cm-module/homeIndex/hotProduct.vue

@@ -1,11 +1,11 @@
 <template name="hotProduct">
 	<view>
 		<view class="container clearfix">
-			<view class="title">推荐专区</view>
+			<view class="title-header">推荐专区</view>
 			<view class="recommend-list">
 				<swiper class="tui-banner-swiper" :autoplay="false" :interval="5000" :duration="500" :circular="true" @change="swiperChange">
 					<swiper-item v-for="(product,index) in hotProductList" :key="index">
-						<view class="floor-item" v-for="(item, idx) in product" :key="idx" @click.stop="navToDetailPage(item.id)">
+						<view class="floor-item clearfix" v-for="(item, idx) in product" :key="idx" @click.stop="navToDetailPage(item.id)">
 							<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>
 							<image class="item-icon-type" :src="iconNew" mode="" v-if="item.actType === 2"></image>
 							<image class="item-icon-type" :src="iconHot" mode="" v-if="item.actType === 1"></image>
@@ -13,88 +13,78 @@
 								<view class="title tui-skeleton-rect">
 									<text class="mclap">{{item.name}}</text>
 								</view>
-								<view class="" v-if="hasLogin">
-									<template v-if="userIdentity === 4">
-										<view class="title-none" v-if="item.priceFlag === 1">
-											<text class="p big">￥未公开价格</text>
-										</view>
-										<view class="title-none"  v-if="item.priceFlag === 2">
-											<text class="p big">￥价格仅会员可见</text>
-										</view>
-										<view class="price tui-skeleton-rect" v-if="item.priceFlag === 0" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
-											<text class="p sm">￥</text>
-											<text class="p big">{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price ) | NumFormat}}</text>
-											<template v-if="item.actStatus===1">
-												<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-													{{item.promotions.name}}<text v-if="hasLogin && item.priceFlag != 1">:￥{{item.price | NumFormat}}</text>
-												</view>
-												<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
-											</template>
-											<template v-if="item.actStatus ===0  &&  item.ladderPriceFlag===1">
-												<view class="floor-tags">阶梯价格</view>	
-											</template>
-										</view>
-									</template>
+								<view class="floor-item-act">
 									<template v-if="userIdentity === 3">
+										<template v-if="item.actStatus===1">
+											<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
+												{{item.promotions.name}}
+												<text v-if="hasLogin && item.priceFlag != 1">:￥{{item.price | NumFormat}}</text>
+											</view>
+											<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
+										</template>
+										<template v-if="item.actStatus ===0  &&  item.ladderPriceFlag===1">
+											<view class="floor-tags">阶梯价格</view>	
+										</template>
+									</template>	
+									<template v-else>
+										<template v-if="item.actStatus===1">
+											<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
+												{{item.promotions.name}}
+												<text v-if="hasLogin && item.priceFlag != 1">:￥{{item.price | NumFormat}}</text>
+											</view>
+											<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
+										</template>
+										<template v-if="item.actStatus ===0  &&  item.ladderPriceFlag===1">
+											<view class="floor-tags">阶梯价格</view>	
+										</template>
+									</template>
+								</view>	
+								<view v-if="hasLogin">
+									<template v-if="userIdentity == 3">
 										<template v-if="item.supplierId == shopId">
-											<view class="title-none" v-if="item.priceFlag === 1">
+											<view class="title-none" v-if="item.priceFlag === '1'">
 												<text class="p big">￥未公开价格</text>
 											</view>
 											<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.promotions) ? 'none' : ''">
 												<text class="p sm">￥</text>
 												<text class="p big">{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price ) | NumFormat}}</text>
-												<template v-if="item.actStatus===1">
-													<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-														{{item.promotions.name}}<text v-if="hasLogin && item.priceFlag != 1">:￥{{item.price | NumFormat}} {{ shopId }}{{item.supplierId }}</text>
-													</view>
-													<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
-												</template>
-												<template v-if="item.actStatus ===0  &&  item.ladderPriceFlag===1">
-													<view class="floor-tags">阶梯价格</view>	
-												</template>
 											</view>
 										</template>	
 										<template v-else>
 											<view class="no-price">
 												<view class="p-stars">
 													<text class="p-no">￥</text>
-													<uni-grader :grade="Number(item.priceGrade)"></uni-grader>
+													<uni-grader :grade="Number(item.priceGrade)" :margin="14"></uni-grader>
 												</view>
 											</view>	
 										</template>
 									</template>
+									<template v-if="userIdentity ===4">
+										<view class="title-none" v-if="item.priceFlag === '1'">
+											<text class="p big">￥未公开价格</text>
+										</view>
+										<view class="title-none"  v-if="item.priceFlag === '2'">
+											<text class="p big">￥价格仅会员可见</text>
+										</view>
+										<view class="price tui-skeleton-rect" v-if="item.priceFlag === '0'" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
+											<text class="p sm">￥</text>
+											<text class="p big">{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price ) | NumFormat}}</text>
+										</view>
+									</template>
 									<template v-else>
-										<view class="title-none" v-if="item.priceFlag === 1">
+										<view class="title-none" v-if="item.priceFlag === '1'">
 											<text class="p big">￥未公开价格</text>
 										</view>
 										<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.promotions) ? 'none' : ''">
 											<text class="p sm">￥</text>
 											<text class="p big">{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price ) | NumFormat}}</text>
-											<template v-if="item.actStatus === 1">
-												<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-													{{item.promotions.name}}<text v-if="hasLogin && item.priceFlag != 1">:￥{{item.price | NumFormat}}</text>
-												</view>
-												<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
-											</template>
-											<template v-if="item.actStatus === 0  &&  item.ladderPriceFlag===1">
-												<view class="floor-tags">阶梯价格</view>	
-											</template>
 										</view>
 									</template>
 								</view>
 								<view v-else class="no-price">
 									<view class="p-stars">
 										<text class="p-no">￥</text>
-										<uni-grader :grade="Number(item.priceGrade)"></uni-grader>
-										<template v-if="item.actStatus==1">
-											<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-												{{item.promotions.name}}<text v-if="hasLogin && item.priceFlag != 1">:￥{{item.price | NumFormat}}</text>
-											</view>
-											<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
-										</template>
-										<template v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">
-											<view class="floor-tags">阶梯价格</view>	
-										</template>
+										<uni-grader :grade="Number(item.priceGrade)" :margin="14"></uni-grader>
 									</view>
 								</view>	
 							</view>
@@ -142,6 +132,7 @@
 		},
 		filters: {
			NumFormat:function(text) {//处理金额
				return Number(text).toFixed(2);
			},
		},
 		created(){
+			console.log(this.userIdentity)
 			this.initData(this.list)
 		},
 		computed: {
@@ -188,7 +179,7 @@
 		width: 100%;
 		height: auto;
 		box-sizing: border-box;
-		.title{
+		.title-header{
 			width: 100%;
 			height: 80rpx;
 			line-height: 80rpx;
@@ -201,7 +192,7 @@
 		}
 		.recommend-list{
 			width: 100%;
-			height: 1100rpx;
+			height: 1140rpx;
 			position: relative;
 			padding-bottom: 20rpx;
 			.tui-banner-swiper {
@@ -209,7 +200,7 @@
 				margin: 0 auto;
 				background: #F7F7F7;
 				padding: 0 24rpx 0 24rpx;
-				height: 1080rpx;
+				height: 1140rpx;
 				overflow: hidden;
 				transform: translateY(0);
 				.floor-item{
@@ -251,24 +242,22 @@
 					.floor-item-act{
 						display: block;
 						width: 100%;
-						height: 68rpx;
+						height: 32rpx;
 						text-align: center;
 						box-sizing: border-box;
-						padding: 16rpx 0;
-						margin-top: 8rpx;
 					}
 					.floor-tags{
-						height: 36rpx;
+						height: 28rpx;
 						border-radius: 6rpx;
 						background-color: #FFFFFF;
-						line-height: 36rpx;
+						line-height: 28rpx;
 						color: $color-system;
 						text-align: center;
 						display: inline-block;
 						padding:0 16rpx;
 						font-size: $font-size-20;
-						margin-left: 15rpx;
 						border: 1px solid #E15616;
+						float: left;
 					}
 					.title-none{
 						font-size: $font-size-26;
@@ -292,6 +281,7 @@
 						width: 100%;
 						height: 72rpx;
 						display: flex;
+						line-height: 36rpx;
 						flex-direction: column;
 						margin-bottom: 15rpx;
 						padding: 0;
@@ -324,7 +314,7 @@
 					}
 					.price{
 						color: #FF2A2A;
-						line-height:70rpx;
+						line-height:54rpx;
 						&.none{
 							text-decoration: line-through;
 							color: #999999;

components/cm-module/homeIndex/pagesProduct.vue

@@ -65,6 +65,7 @@
 					 const typeMap = {
 					 	1:`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}&title=${floor.title}`,
 					 	2:`/pages/goods/instrument-details?id=${floor.linkParam.id}`,
+						4:`/h5/pages/activity/activity?id=${floor.linkParam.id}`,
 					 	5:`/pages/goods/product?id=${floor.linkParam.id}`,
 					 	7:`/supplier/pages/user/my-shop?shopId=${floor.linkParam.id}`,
 					 	8:`/h5/pages/activity/activity-list`,

components/cm-module/homeIndex/specialProduct.vue

@@ -67,6 +67,7 @@
 					 const typeMap = {
 					 	1:`/pages/goods/goods-instrument?linkId=${floor.linkParam.id}&title=${floor.title}`,
 					 	2:`/pages/goods/instrument-details?id=${floor.linkParam.id}`,
+						4:`/h5/pages/activity/activity?id=${floor.linkParam.id}`,
 					 	5:`/pages/goods/product?id=${floor.linkParam.id}`,
 					 	7:`/supplier/pages/user/my-shop?shopId=${floor.linkParam.id}`,
 					 	8:`/h5/pages/activity/activity-list`,

components/cm-module/modelAlert/errorAlert.vue

@@ -113,7 +113,7 @@
 						font-size: $font-size-28;
 						text-align: center;
 						color: #FFFFFF;
-						border-radius: 10rpx;
+						border-radius: 35rpx;
 						padding: 0;
 						background: $btn-confirm;
 					}

components/cm-module/modelAlert/order-alert.vue

@@ -139,7 +139,7 @@
 				background: $btn-confirm;
 				line-height: 88rpx;
 				text-align: center;
-				border-radius: 14rpx;
+				border-radius: 44rpx;
 				color: #FFFFFF;
 				margin-top: 20rpx;
 			}

components/cm-module/modelAlert/upgradeAlert.vue

@@ -135,7 +135,7 @@
 					font-size: $font-size-28;
 					text-align: center;
 					color: #FFFFFF;
-					border-radius: 14rpx;
+					border-radius: 44rpx;
 					padding: 0;
 				}
 				.btn-none{

components/cm-module/orderDetails/orderButton.vue

@@ -157,6 +157,9 @@
 						line-height: 15rpx;
 					}
 				}
+				&.btn-share{
+					position: relative;
+				}
 			}
 			.btn-color{
 				background: $btn-confirm;
@@ -217,8 +220,7 @@
 					width: 160rpx;
 					height: 34rpx;
 					padding: 10rpx 10rpx;
-					background:linear-gradient(45deg,rgba(0,0,0,1) 0%,rgba(87,87,87,1) 100%);
-					box-shadow:0px 2px 4px 0px rgba(0,0,0,0.2);
+					background:#E15616;
 					border-radius: 8rpx;
 					position: absolute;
 					color: #FFFFFF;
@@ -231,10 +233,10 @@
 						content: "";
 						width: 25rpx;
 						height: 25rpx;
-						background:linear-gradient(45deg,rgba(0,0,0,1) 0%,rgba(87,87,87,1) 100%);
+						background:#E15616;
 						position: absolute;
 						bottom: -8rpx;
-						right: 30rpx;
+						left: 30rpx;
 						z-index: -1;
 						transform:rotate(45deg);
 					}

components/cm-module/orderDetails/sellerOrderButton.vue

@@ -174,8 +174,7 @@
 					width: 160rpx;
 					height: 34rpx;
 					padding: 10rpx 10rpx;
-					background:linear-gradient(45deg,rgba(0,0,0,1) 0%,rgba(87,87,87,1) 100%);
-					box-shadow:0px 2px 4px 0px rgba(0,0,0,0.2);
+					background:#E15616;
 					border-radius: 8rpx;
 					position: absolute;
 					color: #FFFFFF;
@@ -188,10 +187,10 @@
 						content: "";
 						width: 25rpx;
 						height: 25rpx;
-						background:linear-gradient(45deg,rgba(0,0,0,1) 0%,rgba(87,87,87,1) 100%);
+						background:#E15616;
 						position: absolute;
 						bottom: -8rpx;
-						right: 30rpx;
+						left: 30rpx;
 						z-index: -1;
 						transform:rotate(45deg);
 					}

components/cm-module/productDetails/cm-price.vue

@@ -389,7 +389,7 @@
 			text-align: center;
 			color: #FFFFFF;
 			font-size: $font-size-28;
-			border-radius: 14rpx;
+			border-radius: 44rpx;
 		}
 	}
 </style>

components/cm-module/scrollTop/scrollTop.vue

@@ -9,7 +9,7 @@
 				</button>	
 				<!-- #endif -->
 			</view>
-			<view class="icon top" @click="onPageScrollTop">
+			<view class="icon top" @click="onPageScrollTop" :class="isScrollTop ? 'show' : 'none'">
 				<text class="iconfont icon-zhiding"></text>
 			</view>
 		</view>
@@ -20,7 +20,10 @@
 	export default{
 		name:'scrollTop',
 		props:{
-			
+			isScrollTop:{
+				type:Boolean,
+				default:false
+			}
 		},
 		data() {
 			return{
@@ -53,7 +56,7 @@
 		height: 200rpx;
 		position: fixed;
 		right: 20rpx;
-		bottom: 20%;
+		bottom: 12%;
 		.icon{
 			width: 80rpx;
 			height: 80rpx;
@@ -77,6 +80,12 @@
 			}
 			&.top{
 				background-color: rgba(0,0,0,0.4);
+				&.show{
+					opacity: 1;
+				}
+				&.none{
+					opacity: 0;
+				}
 			}
 			.iconfont{
 				font-size: $font-size-44;

components/cm-module/supplier/home.vue

@@ -34,7 +34,7 @@
 			</view>
 		</view>
 		<!-- 侧边 -->
-		<scroll-top v-if="isScrollTop"></scroll-top>
+		<scroll-top :isScrollTop="isScrollTop"></scroll-top>
 	</view>
 </template>
 

h5/pages/activity/activity-list.vue

@@ -107,9 +107,14 @@
 			if(this.hasNextPage){
 				this.loadding = true
 				this.pullUpOn = true
-				this.GetPromotionsrListBottomData()
+				this.GetPromotionsrList()
 			}	
 		},
+		onPullDownRefresh() {//下拉刷新
+			this.listQuery.pageNum = 1
+			this.queryProductPromotionList()
+			uni.stopPullDownRefresh()
+		},
 		onShow() {
 			this.GetPromotionsrList()
 		}

h5/pages/activity/activity.vue

@@ -2,7 +2,7 @@
 	<view class="activity">
 	   <web-view :webview-styles="webviewStyles" :src="activityPath"></web-view>
 	   <!-- 侧边 -->
-	   <scroll-top v-if="isScrollTop"></scroll-top>
+	   <scroll-top :isScrollTop="isScrollTop"></scroll-top>
 	</view>
 </template>
 

pages/goods/cart.vue

@@ -1171,19 +1171,21 @@
 						display: flex;
 						justify-content: center;
 						align-items: center;
+						border: 2rpx solid #ffe6dc;
 						.iconfont{
 							font-size: $font-size-24;
 							padding:0 20rpx;
-							color: $text-color;
+							color: #999999;
 							text-align: center;
 							line-height: 48rpx;
 							font-weight: bold;
+							background: #fef6f3;
 						}
 						.btn-input{
 							width: 62rpx;
 							height: 48rpx;
 							line-height: 48rpx;
-							background: #F8F8F8;
+							background: #fff;
 							border-radius: 4rpx;
 							text-align: center;
 							font-size: $font-size-24;
@@ -1257,8 +1259,8 @@
 					line-height: 50rpx;
 					border-radius: 30rpx;
 					background:#FFFFFF;
-					border: 1px solid #C9C9C9;
-					color: #999999;
+					// border: 1px solid #C9C9C9;
+					// color: #999999;
 					margin-top: 15rpx;
 				}
 			}
@@ -1307,7 +1309,7 @@
 					}
 				}
 				.pros-marks{
-					width: 750rpx;
+					width: 730rpx;
 					height: 250rpx;
 					z-index: 90;
 					background: rgba(0,0,0,.05);
@@ -1402,6 +1404,8 @@
 			height: 100%;
 			padding:0 24rpx;
 			float: left;
+			box-sizing: border-box;
+			float: left;
 			.foot-check{
 				width: 100rpx;
 				float: left;
@@ -1417,7 +1421,7 @@
 				}
 			}
 			.sum{
-				width: 380rpx;
+				width: 360rpx;
 				height: 110rpx;
 				float: right;
 				box-sizing: border-box;
@@ -1469,24 +1473,27 @@
 			}
 		}
 		.footer-ri{
-			width: 180rpx;
+			width: 230rpx;
 			height: 100%;
-			background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
 			float: right;
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
 			z-index: 999;
+			box-sizing: border-box;
+			padding: 13rpx 15rpx;
 			&.none{
 				display: none;
 			}
 			.btn{
 				width: 200rpx;
 				height: 100%;
+				background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
 				font-size: $font-size-28;
-				line-height: 110rpx;
+				line-height: 84rpx;
 				color: #FFFFFF;
 				display: flex;
+				border-radius: 42rpx;
 				justify-content: center;
 				align-items: center;
 			}

pages/goods/goods-active.vue

@@ -172,6 +172,11 @@
 				this.getOnReachBottomData()
 			}	
 		},
+		onPullDownRefresh() {//下拉刷新
+			this.pageNum = 1
+			this.queryProductPromotionList()
+			uni.stopPullDownRefresh()
+		},
 		onShow() {
 			
 		}

pages/goods/goods-instrument.vue

@@ -30,7 +30,7 @@
 			</view>
 		</template>
 		<!-- 侧边 -->
-		<scroll-top v-if="isScrollTop"></scroll-top>
+		<scroll-top :isScrollTop="isScrollTop"></scroll-top>
 	</view>
 </template>
 

pages/goods/goods-secondary.vue

@@ -73,7 +73,7 @@
 			</template>
 		</view>
 		<!-- 侧边 -->
-		<scroll-top v-if="isScrollTop"></scroll-top>
+		<scroll-top :isScrollTop="isScrollTop"></scroll-top>
 	</view>
 </template>
 <script>

pages/goods/instrument-details.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="product" :style="{paddingBottom: userIdentity == 1 || userIdentity == 3 ? '0rpx' :'188rpx'}">
+	<view class="product">
 		<custom-p   v-if="isHeaderPoduct"
 					:systeminfo='systeminfo' 
 					:navbar-data='nvabarData' 
@@ -97,7 +97,7 @@
 				</view>	
 			</tui-bottom-popup>	
 			<!-- 侧边 -->
-			<scroll-top v-if="isScrollTop"></scroll-top>
+			<scroll-top :isScrollTop="isScrollTop"></scroll-top>
 		</view>
 	</view>
 </template>

pages/goods/product.vue

@@ -148,6 +148,10 @@
 								<view class="content-td">品牌</view>
 								<view class="content-th">{{product.brandName == null? '其他' : product.brandName}}</view>
 							</view>
+							<view class="content-tr">
+								<view class="content-td">分类</view>
+								<view class="content-th">{{product.typeName == null? '暂无' : product.typeName}}</view>
+							</view>
 							<view class="content-tr">
 								<view class="content-td">包装规格</view> 
 								<view class="content-th">{{product.unit}}</view>
@@ -246,7 +250,7 @@
 					</view>
 				</view>
 				<!-- 侧边 -->
-				<scroll-top v-if="isScrollTop"></scroll-top>
+				<scroll-top :isScrollTop="isScrollTop"></scroll-top>
 			</view>
 		</template>
 	</view>
@@ -827,11 +831,20 @@
 					color: #999999;
 					font-size: $font-size-24;
 					box-sizing: border-box;
+					display: block;
+					background: transparent;
+					border-radius: 0;
+					border: 0;
+					margin: 0;
 					padding: 8rpx 0;
+					z-index: 990;
 					.icon-fenxiang1{
 						font-size: $font-size-34;
 					}
 				}
+				.tui-share-btn::after {
+					border: 0;
+				}
 			}
 			.wrap-main-text{
 				line-height: 56rpx;
@@ -1078,7 +1091,7 @@
 		.none-text{
 			text-align: center;
 			font-size: $font-size-28;
-			color: #999999;
+			color: #fea785;
 			line-height: 40rpx;
 		}
 	}
@@ -1357,7 +1370,7 @@
 				width: 200rpx;
 				line-height: 84rpx;
 				text-align: center;
-				font-size: $font-size-28;
+				font-size: $font-size-26;
 				color: #FFFFFF;
 			}
 			.btn-cart{
@@ -1557,7 +1570,7 @@
 					justify-content: center;
 					background: $btn-confirm;
 					font-size: $font-size-28;
-					border-radius: 14rpx;
+					border-radius: 44rpx;
 				}
 			}
 		}

pages/search/search-second.vue

@@ -3,7 +3,7 @@
 		<view class="search-main">
 			<view class="gosearch-btn">
 				<text class="iconfont icon-sousuo"></text>
-				<input class="input" maxlength="20" type="text" value="" confirm-type="search" @input="onShowClose" @focus="onFocus"  @confirm="subMitSearch()" placeholder="请输入关键词" v-model.trim="name"/>
+				<input class="input" maxlength="20" type="text" value="" confirm-type="search" @input="onShowClose" @focus="onFocus"  @confirm="subMitSearch()" placeholder="请输入搜索关键字" v-model.trim="name"/>
 				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click.stop="delInputText()"></text>
 			</view>
 		</view>

pages/search/search.vue

@@ -15,7 +15,7 @@
 			</view>
 			<view class="gosearch-btn">
 				<text class="iconfont icon-sousuo"></text>
-				<input class="input" maxlength="20" :focus="isFocus" type="text" value="" confirm-type="search" @focus="onFocus" @input="onShowClose" @confirm="subMitSearch()" placeholder="请输入关键词" v-model.trim="listQuery.keyword"/>
+				<input class="input" maxlength="20" :focus="isFocus" type="text" value="" confirm-type="search" @focus="onFocus" @input="onShowClose" @confirm="subMitSearch()" placeholder="请输入搜索关键字" v-model.trim="listQuery.keyword"/>
 				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click.stop="delInputText()"></text>
 			</view>
 			<view class="search-btn" @click="subMitSearch()">搜索</view>
@@ -63,7 +63,7 @@
 									<view class="floor-tags">阶梯价格</view>	
 								</view>
 							</template>
-							<view v-if="hasLogin"class="list-price">
+							<view v-if="hasLogin" class="list-price">
 								<template v-if="userIdentity == 1">
 									<text v-if="priceLoading" class="price-larger small">正在获取价格...</text>
 									<text v-else class="price-larger" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
@@ -183,15 +183,25 @@
 		},
 		onLoad(option) {
 			console.log(option)
-			if(option.keyWord){
-				this.listQuery.keyword = option.keyWord
-				this.setSearchHistoryAdd()
-				this.getListFromServer()
-				this.isFocus = false
-			}else{
-				this.isFocus = true
-				this.initGetSerachRecord()
-			}
+			this.$api.getStorage().then((resolve) =>{
+				this.userID = resolve.userID ? resolve.userID : 0;
+				this.shopId = resolve.shopID ? resolve.shopID : 0;
+				this.userIdentity = resolve.userIdentity ? resolve.userIdentity : '';
+				if(this.userIdentity == 1){
+					this.listQuery.identity = 1
+				}else{
+					this.listQuery.identity = 2
+				}
+				if(option.keyWord){
+					this.listQuery.keyword = option.keyWord
+					this.setSearchHistoryAdd()
+					this.getListFromServer()
+					this.isFocus = false
+				}else{
+					this.isFocus = true
+					this.initGetSerachRecord()
+				}
+			})	
 		},
 		filters: {
 			NumFormat:function(text) {//处理金额
@@ -202,22 +212,12 @@
 			...mapState(['hasLogin','userInfo'])
 		},
 		methods:{
-			initGetSerachRecord(){
-				this.$api.getStorage().then((resolve) =>{
-					this.userID = resolve.userID ? resolve.userID : 0;
-					this.shopId = resolve.shopID ? resolve.shopID : 0;
-					this.userIdentity = resolve.userIdentity ? resolve.userIdentity : '';
-					if(this.userIdentity == 1){
-						this.listQuery.identity = 1
-					}else{
-						this.listQuery.identity = 2
+			initGetSerachRecord(){//查询搜索历史记录
+				this.ProductService.GetProductSearchHistory({userId:this.userID}).then(response =>{
+					if(response.code == 0){
+						this.serachRecordList = response.data
 					}
-				    this.ProductService.GetProductSearchHistory({userId:this.userID}).then(response =>{
-						if(response.code == 0){
-							this.serachRecordList = response.data
-						}
-				    })
-				})	
+				})
 			},
 			subMitSearch() {//搜索
 				if (this.listQuery.keyword == '') {

pages/tabBar/cart/cart.vue

@@ -1176,7 +1176,6 @@
 							line-height: 48rpx;
 							font-weight: bold;
 							background: #fef6f3;
-
 						}
 						.btn-input{
 							width: 62rpx;
@@ -1186,7 +1185,6 @@
 							border-radius: 4rpx;
 							text-align: center;
 							font-size: $font-size-24;
-							
 						}
 					}
 					.uni-numbox{
@@ -1307,7 +1305,7 @@
 					}
 				}
 				.pros-marks{
-					width: 750rpx;
					height: 250rpx;
+					width: 730rpx;
					height: 250rpx;
 					z-index: 90;
 					background: rgba(0,0,0,.05);
 					position: absolute;
@@ -1398,10 +1396,11 @@
 		bottom: 0rpx;
 		z-index: 100;
 		.footer-le{
-			width: 472rpx;
+			width: 520rpx;
 			height: 100%;
 			padding:0 24rpx;
 			float: left;
+			box-sizing: border-box;
 			.foot-check{
 				width: 100rpx;
 				float: left;
@@ -1417,7 +1416,7 @@
 				}
 			}
 			.sum{
-				width: 350rpx;
+				width: 360rpx;
 				height: 110rpx;
 				float: right;
 				box-sizing: border-box;
@@ -1469,27 +1468,27 @@
 			}
 		}
 		.footer-ri{
-			width: 210rpx;
-			height: 84rpx;
-			background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
+			width: 230rpx;
+			height: 100%;
 			float: right;
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
 			z-index: 999;
-			margin-right: 20rpx;
-			border-radius: 49rpx;
-			margin-top: 14rpx;
+			box-sizing: border-box;
+			padding: 13rpx 15rpx;
 			&.none{
 				display: none;
 			}
 			.btn{
 				width: 200rpx;
 				height: 100%;
+				background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
 				font-size: $font-size-28;
-				line-height: 110rpx;
+				line-height: 84rpx;
 				color: #FFFFFF;
 				display: flex;
+				border-radius: 42rpx;
 				justify-content: center;
 				align-items: center;
 			}

pages/tabBar/home/home.vue

@@ -152,7 +152,7 @@
 		<!-- 透明模态层 -->
 		<modal-layer v-if='modallayer'></modal-layer>
 		<!-- 侧边 -->
-		<scroll-top v-if="isScrollTop"></scroll-top>
+		<scroll-top :isScrollTop="isScrollTop"></scroll-top>
 	</view>
 </template>
 

pages/tabBar/home/index.vue

@@ -34,7 +34,7 @@
 			</view>
 		</view>
 		<!-- 侧边 -->
-		<scroll-top v-if="isScrollTop"></scroll-top>
+		<scroll-top :isScrollTop="isScrollTop"></scroll-top>
 	</view>
 </template>
 

pages/user/order/create-order.vue

@@ -60,7 +60,9 @@
 					<view class="sum" :class="reducedPrice == 0 ? 'none' : ''">总价:<text class="price">￥{{payAllPrice | NumFormat}}</text></view>
 				</view>
 			</view>
-			<view class="footer-submit" @click.stop="orderSubmitMit">提交订单</view>
+			<view class="footer-submit" @click.stop="orderSubmitMit">
+				<view class="btn">提交订单</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -538,8 +540,18 @@
 			justify-content: center;
 			width: 180rpx;
 			height: 100%;
-			color: #FFFFFF;
-			background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
+			box-sizing: border-box;
+			padding: 15rpx 5rpx;
+			.btn{
+				width: 100%;
+				height: 100%;
+				color: #FFFFFF;
+				background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
+				font-size: $font-size-26;
+				text-align: center;
+				line-height: 80rpx;
+				border-radius: 40rpx;
+			}
 		}
 	}
 

pages/user/order/order-details.vue

@@ -121,6 +121,7 @@
 			}
 		},
 		onLoad(option){
+			console.log(option)
 			this.shareType = option.type;
 			this.orderID = option.orderID
 			if(this.shareType ==='share'){

pages/user/order/order-list.vue

@@ -32,7 +32,7 @@
 										<view class="order-title-tip tui-skeleton-fillet">{{ StateExpFormat(order.status) }}</view>
 									</view>
 								</view>
-								<block v-for="(shop,index) in order.shopOrderList" :key="index">
+								<block v-for="(shop,sindex) in order.shopOrderList" :key="sindex">
 									<view class="goods-title">
 										<view v-if="shop.shopPromotion" class="floor-item-act">
 											<view class="floor-tags">{{shop.shopPromotion.name}}</view>	
@@ -318,6 +318,7 @@
 				}	
 			},
 			detail(id) {//订单详情跳转
+				console.log(id)
 				this.isModalLayer = true;	
 				this.$api.navigateTo(`/pages/user/order/order-details?state=${this.currentTab}&orderID=${id}`)
 			},

pages/user/regularPurchase/regularPurchase.vue

@@ -273,7 +273,7 @@
 					align-items: center;
 					justify-content: center;
 					font-size: $font-size-28;
-					border-radius: 14rpx;
+					border-radius: 44rpx;
 					&.buy{
 						background: $btn-confirm;
 					}

second/pages/product/product-details.vue

@@ -131,7 +131,7 @@
 				</view>	
 			</tui-bottom-popup>	
 			<!-- 侧边 -->
-			<scroll-top v-if="isScrollTop"></scroll-top>
+			<scroll-top :isScrollTop="isScrollTop"></scroll-top>
 			</view>
 	</view>
 </template>

seller/pages/order/create-order.vue

@@ -73,7 +73,9 @@
 					<view class="sum" :class="reducedPrice == 0 ? 'none' : ''">总价:<text class="price">￥{{payAllPrice | NumFormat}}</text></view>
 				</view>
 			</view>
-			<view class="footer-submit" @click.stop="orderSubmitMit">提交订单</view>
+			<view class="footer-submit" @click.stop="orderSubmitMit">
+				<view class="btn">提交订单</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -619,8 +621,18 @@
 			justify-content: center;
 			width: 180rpx;
 			height: 100%;
-			color: #FFFFFF;
-			background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
+			box-sizing: border-box;
+			padding: 15rpx 5rpx;
+			.btn{
+				width: 100%;
+				height: 100%;
+				color: #FFFFFF;
+				background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
+				font-size: $font-size-26;
+				text-align: center;
+				line-height: 80rpx;
+				border-radius: 40rpx;
+			}
 		}
 	}
 	.Rebate{

services/order.service.js

@@ -12,7 +12,7 @@ export default class OrderService {
 	}
 	/* 查询订单详情 */
 	QueryOrderDetails (data = {}) {
-		return this.AjaxService.get({ url:'/order/list', data, isLoading: true })
+		return this.AjaxService.get({ url:'/order/detail', data, isLoading: true })
 	}
 	/* 操作取消订单 */
 	CancelOrder (data = {}) {

services/shop.service.js

@@ -44,7 +44,7 @@ export default class ShopService {
 	}
 	/* 小程序供应商我的店铺全部商品 */
 	GetSupplierHomeProductList (data = {}) {
-		return this.AjaxService.get({ url:'/search/query/product/supplier', data, isLoading: true })
+		return this.AjaxService.get({ url:'/search/query/product/supplier', data, isLoading: false })
 	}
 	/* 小程序供应商我的订单 */
 	GetSupplierMyOrderList (data = {}) {

supplier/pages/user/my-shop.vue

@@ -30,7 +30,7 @@
 				</view>
 				<banner :list="bannerImageList"></banner>
 			</view>	
-			<view class="container-section tui-skeleton" v-show="productList.length>0">
+			<view class="container-section tui-skeleton" v-if="!isEmpty">
 				<view class="tab-title">主推商品</view>
 				<view class="section-product clearfix">
 					<view class="floor-item-none"  v-if="isHomeProduct">
@@ -45,13 +45,13 @@
 							</view>
 							<view class="" v-if="hasLogin">
 								<template v-if="userIdentity == 4">
-									<view class="title-none" v-show="item.priceFlag == '1'">
+									<view class="title-none" v-if="item.priceFlag == '1'">
 										<text class="p big">￥未公开价格</text>
 									</view>
-									<view class="title-none" v-show="item.priceFlag == '2'">
+									<view class="title-none" v-if="item.priceFlag == '2'">
 										<text class="p big">￥价格仅会员可见</text>
 									</view>
-									<view class="price tui-skeleton-rect" v-show="item.priceFlag == '0'" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
+									<view class="price tui-skeleton-rect" v-if="item.priceFlag == '0'" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
 										<text class="p sm">￥</text>
 										<text class="p big">{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price ) | NumFormat}}</text>
 										<template v-if="item.actStatus==1">
@@ -65,7 +65,7 @@
 										</template>
 									</view>
 								</template>
-								<template v-if="userIdentity == 3">
+								<template v-else-if="userIdentity == 3">
 									<template v-if="item.supplierId == shopId">
 										<view class="title-none" v-if="item.p_price_flag == '1'">
 											<text class="p big">未公开价格</text>
@@ -132,7 +132,7 @@
 				</view>
 			</view>
 			<view class="container-section tui-skeleton">
-				<view class="tab-title">全部商品</view>
+				<view class="tab-title" v-if="!isEmpty">全部商品</view>
 				<view class="section-product clearfix">
 					<view class="floor-item-none" v-if="isEmpty">
 						<image class="none-image" :src="iconNoneData1" mode=""></image>
@@ -146,13 +146,13 @@
 							</view>
 							<view class="" v-if="hasLogin">
 								<template v-if="userIdentity == 4">
-									<view class="title-none" v-show="item.p_price_flag == '1'">
+									<view class="title-none" v-if="item.p_price_flag == '1'">
 										<text class="p big">￥未公开价格</text>
 									</view>
-									<view class="title-none" v-show="item.p_price_flag == '2'">
+									<view class="title-none" v-if="item.p_price_flag == '2'">
 										<text class="p big">￥价格仅会员可见</text>
 									</view>
-									<view class="price tui-skeleton-rect" v-show="item.p_price_flag == '0'" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
+									<view class="price tui-skeleton-rect" v-if="item.p_price_flag == '0'" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
 										<text class="p sm">￥</text>
 										<text class="p big">{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price ) | NumFormat}}</text>
 										<template v-if="item.actStatus==1">
@@ -166,7 +166,7 @@
 										</template>
 									</view>
 								</template>
-								<template v-if="userIdentity == 3">
+								<template v-else-if="userIdentity == 3">
 									<template v-if="item.supplierId == shopId">
 										<view class="title-none" v-if="item.p_price_flag == '1'">
 											<text class="p big">未公开价格</text>
@@ -225,7 +225,7 @@
 			</view>
 		</template>
 		<!-- 侧边 -->
-		<scroll-top v-if="isScrollTop"></scroll-top>
+		<scroll-top :isScrollTop="isScrollTop"></scroll-top>
 	</view>
 </template>
 
@@ -275,8 +275,9 @@
 			this.listQuery.id = this.supplierId = option.shopId
 			this.$api.getStorage().then((resolve) =>{
 				this.shopId = resolve.shopID ? resolve.shopID : 0
-				this.userID = resolve.userID ? resolve.shopID : 0
+				this.userID = resolve.userID ? resolve.userID : 0
 				this.userIdentity = resolve.userIdentity
+				console.log(this.userIdentity)
 				this.InitShopDataInfo()
 			}).catch( error =>{
 				this.InitShopDataInfo()