commit -m 测试优化

components/cm-module/orderDetails/orderButton.vue

@@ -142,10 +142,9 @@
 				font-size:$font-size-26;
 				color: #666666;
 				text-align: center;
-				border-radius: 6rpx;
 				float: right;
 				border: 2rpx solid #999999;
-				border-radius: 32rpx;
+				border-radius: 34rpx;
 				&.btn-payment{
 					line-height: 38rpx;
 					font-size: 24rpx;

components/cm-module/orderDetails/orderListButton.vue

@@ -136,9 +136,8 @@
 				font-size:$font-size-26;
 				color: #999999;
 				text-align: center;
-				border-radius:6rpx;
 				float: right;
-				border-radius: 32rpx;
+				border-radius: 34rpx;
 				border: 2rpx solid #999999;
 				&.btn-payment{
 					line-height: 38rpx;

components/cm-module/orderDetails/sellerDetaileButton.vue

@@ -168,7 +168,7 @@
 				font-size:$font-size-26;
 				color: #FFFFFF;
 				text-align: center;
-				border-radius: 32rpx;
+				border-radius: 34rpx;
 				float: right;
 			}
 			.btn-color{

components/cm-module/orderDetails/sellerOrderButton.vue

@@ -134,7 +134,7 @@
 				font-size:$font-size-26;
 				color: #FFFFFF;
 				text-align: center;
-				border-radius:32rpx;
+				border-radius:34rpx;
 				// float: right; 
 				display: inline-block;
 			}

components/cm-module/orderDetails/supplierDetaileButton.vue

@@ -116,7 +116,7 @@
 			font-size:$font-size-26;
 			color: #FFFFFF;
 			text-align: center;
-			border-radius: 32rpx;
+			border-radius: 34rpx;
 			float: right;
 		}
 		.btn-color{

components/cm-module/orderDetails/supplierListButton.vue

@@ -121,7 +121,7 @@
 			font-size:$font-size-26;
 			color: #FFFFFF;
 			text-align: center;
-			border-radius: 32rpx;
+			border-radius: 34rpx;
 			float: right;
 			margin-right: 0;
 		}

pages.json

@@ -501,7 +501,7 @@
 				{
 					"path": "pages/activity/activity",
 					"style": {
-						"navigationBarTitleText": "活动名称"
+						"navigationBarTitleText": ""
 					}
 				},
 				{

pages/goods/product.vue

@@ -83,7 +83,7 @@
 						<image class="none-image" :src="productNoneImage" mode=""></image>
 						<view class="none-text">此商品已{{goodsData.disabledText}}，请浏览以下推荐商品~</view>
 					</view>
-					<view class="product-parameter" @click="showPopup">
+					<view class="product-parameter" @click="showPopup" v-if="!goodsData.isNoneDisabled">
 						<text class="title">参数：</text>
 						<text class="name">品牌  起订量  分类...</text>
 						<text class="iconfont icon-xiayibu"></text>
@@ -177,7 +177,7 @@
 					</view>	
 				</tui-bottom-popup>	
 				<!-- 底部按钮 -->
-				<view class="menu" v-if="isShowButton">
+				<view class="menu" v-if="userIdentity != 1 || userIdentity !=3 ">
 					<view class="bottom-btn" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 						<view class="bottom-le">
 							<view class="item-bt" @click="this.$api.switchTabTo('/pages/tabBar/home/index')">
@@ -736,10 +736,7 @@
 			this.$api.getStorage().then((resolve) => {
 				this.userID = resolve.userID ? resolve.userID : '';	
 				this.userIdentity = resolve.userIdentity ? resolve.userIdentity : 3
-				this.shopID =  resolve.shopID ? resolve.shopID : '';	
-				if(this.userIdentity === 1 || this.userIdentity === 3){
-					this.isShowButton = false
-				}
+				this.shopID =  resolve.shopID ? resolve.shopID : '';					
 				if (isPreviewImg) {
 					isPreviewImg = false;
 					return;
@@ -1384,13 +1381,14 @@
 			}
 			.btn-cart.disabled{
 				background-color: #E1E1E1;
+				color: #FFFFFF;
 			}
 			.btn-bay{
 				background:linear-gradient(to right, #f28f31 0%, #e15616 100%);
 				border-radius: 0 42rpx 42rpx 0;
 			}
 			.btn-bay.disabled{
-				background-color: linear-gradient(135deg,rgba(242,143,49,0.5) 0%,rgba(225,86,22,0.5) 100%);;
+				background: linear-gradient(135deg,rgba(242,143,49,0.5) 0%,rgba(225,86,22,0.5) 100%);
 			}
 		}
 	}

pages/search/search.vue

@@ -348,6 +348,7 @@
 			keywordsClick (item) {//关键词搜索与历史搜索
 				this.listQuery.keyword = item;
 				this.isShowClose = true;
+				this.isFocus = false
 				this.subMitSearch();
 			},
 			confirmDetele() {//清空历史记录

pages/user/order/order-list.vue

@@ -174,12 +174,15 @@
 				hanldOrderData:{},
 				modelType:0,
 				nomoreText: '上拉显示更多',
+				isOnloadFlag:false,
 			}
 		},
 		onLoad(e) {
 			let self = this;
+			
 			if(e.type ==='detele'){self.isDelete = true}
 			self.currentTab = e.state
+			self.isOnloadFlag = true
 			self.getHeaderTopHeight()//设置自定义导航高度
 			//  高度自适应
 			uni.getSystemInfo({
@@ -213,7 +216,9 @@
 				this.pullUpOn = true //切换时隐藏
 				this.loadding =  false //切换时隐藏
 				this.nomoreText = ''
-				this.getOrderDatainit(this.currentTab,'tabChange')
+				if(!this.isOnloadFlag){
+					this.getOrderDatainit(this.currentTab,'tabChange')
+				}
 			},
 			// 点击标题切换当前页时改变样式
 			onClickTab: function(e) {
@@ -247,7 +252,10 @@
 				 * @param：pageSize(每页条数)
 				 * @param：organizeID(全局变量组织ID)
 				 */ 
-				setTimeout(()=>{this.skeletonShow = false},1500)
+				setTimeout(()=>{
+					this.skeletonShow = false
+					this.isOnloadFlag = false
+				},1500)
 				let orderItem = this.orderTabBar[index];
 				let state = orderItem.state;
 				if(source === 'tabChange' && orderItem.loaded === true){

seller/pages/cart/buyagain.vue

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

seller/pages/cart/immediately.vue

@@ -366,7 +366,7 @@
 			font-size: 28rpx;
 			color: #fff;
 			line-height: 84rpx;
-			border-radius: 10rpx;
+			border-radius: 42rpx;
 			margin: 20rpx auto
 		}
 	.zuhe-content{

seller/pages/cart/second.vue

@@ -374,7 +374,7 @@
 					align-items: center;
 					justify-content: center;
 					font-size: $font-size-28;
-					border-radius: 14rpx;
+					border-radius: 44rpx;
 					background: $btn-confirm;
 					margin-top: 20rpx;
 				}

seller/pages/club/addoperator.vue

@@ -239,7 +239,7 @@
 		.login-btn{
 			width: 702rpx;
 			height: 88rpx;
-			border-radius: 14rpx;
+			border-radius: 44rpx;
 			font-size: $font-size-28;
 			line-height: 88rpx;
 			color: #FFFFFF;

seller/pages/order/order-details.vue

@@ -199,8 +199,8 @@
 					this.returnedPurchaseFee = resData.order.returnedPurchaseFee
 					this.ableUserMoney = resData.ableUserMoney
 					this.clauseData = resData.clause
-					if(clauseData.name.length>10){
-						clauseData.name = clauseData.name.substr(0,10)+'...'
+					if(this.clauseData.name.length>10){
+						this.clauseData.name = clauseData.name.substr(0,10)+'...'
 					}
 				}).catch(error =>{
 					this.$util.modal('提示','订单查询失败，请稍后重试~','确定','',false,() =>{

services/user.service.js

@@ -53,7 +53,7 @@ export default class UserService {
 	 * @param:userId 用户ID(必传)，
 	 */
 	PersonalInfo (data = {}) {
-		return this.AjaxService.get({ url:'/personalCenter/myCentre', data, isLoading: true })
+		return this.AjaxService.get({ url:'/personalCenter/myCentre', data, isLoading: false })
 	}
 	/* 运营人员管理-列表 */
 	QueryOperatorList (data = {}) {