commit -m 商品详情

components/cm-custom/custom-p.vue

@@ -6,8 +6,8 @@
 			  <text v-if='haveBack' @click="_goBack" class="iconfont icon-fanhui"></text>
 			  <text v-else  @click="_goHome" class="iconfont icon-shouye"></text>
 	  	</view>
-		<view class="navbar-text" :style="{height:navbarBtn.height+'px;',fontSize:fontSizeSetting+'px;'}">
-	    	<view class="gosearch-btn" :style="{paddingLeft:navbarBtn.height+'px;',top:5+'px;',left:(navbarBtn.right+navbarBtn.height+20)+'px;',borderRadius:navbarBtn.height/2+'px;',width:200+'px;',lineHeight:navbarBtn.height+'px;'}">
+		<view class="navbar-text" :style="{top:navbarBtn.top + statusBarHeight+'px;',height:navbarBtn.height+'px;',fontSize:fontSizeSetting+'px;'}">
+	    	<view class="gosearch-btn" :style="{paddingLeft:navbarBtn.height+'px;',left:(navbarBtn.height+30)+'px;',borderRadius:navbarBtn.height/2+'px;',width:(375-navbarBtn.width-(navbarBtn.width/2)-15)+'px;',lineHeight:navbarBtn.height+'px;'}">
 				<text class="iconfont icon-sousuo":style="{width:navbarBtn.height+'px;',height:navbarBtn.height+'px;',lineHeight:navbarBtn.height+'px;'}"></text>
 				<view class="input" @click="this.$api.navigateTo(clickPath)">搜索项目仪器</view>
 			</view>
@@ -45,7 +45,7 @@
 		data() {
 			return{
 				headerType:'',
-				clickPath:'/pages/search/search-instrument',
+				clickPath:'/pages/search/search-instrument', 
 				haveBack: true, // 是否有返回按钮，true 有 false 没有 若从分享页进入则为 false
 			    statusBarHeight: 0, // 状态栏高度
 			    navbarHeight: 0, // 顶部导航栏高度,
@@ -84,6 +84,7 @@
 			      // 屏幕宽度 - 胶囊right
 			      right: this.systeminfo.screenWidth - headerPosi.right
 			}
+			console.log(btnPosi)
 			let haveBack;
 			if (getCurrentPages().length === 1) { // 当只有一个页面时
 			     haveBack = false;
@@ -136,7 +137,7 @@
 	.navbar-text {
 		 color: #000000;
 		 font-weight: 500;
-		 position: relative;
+		 position: fixed;
 	}
 	.gosearch-btn{
 		height: 100%;
@@ -146,7 +147,8 @@
 		position: relative;
 		box-sizing: border-box;
 		position:absolute ;
-		border: 1px solid rgba(0, 0, 0, 0.1);
+		top: 0;
+		border: 0.5px solid rgba(0, 0, 0, 0.1);
 		.icon-sousuo{
 			height: 100%;
 			text-align: center;
@@ -172,7 +174,7 @@
 		 border-radius: 50%;
 		 text-align: center;
 		 background: rgba(255,255,255,0.6);
-		 border: 1px solid rgba(0,0,0, 0.1);
+		 border: 0.5px solid rgba(0,0,0, 0.1);
 		 box-sizing: border-box;
 		 z-index: 9999;
 	}

components/cm-module/headerNavbar/header-poduct.vue

@@ -6,8 +6,8 @@
 			  <text v-if='haveBack' @click="_goBack" class="iconfont icon-fanhui"></text>
 			  <text v-else  @click="_goHome" class="iconfont icon-shouye"></text>
 	  	</view>
-		<view class="navbar-text" :style="{height:navbarBtn.height+'px;',fontSize:fontSizeSetting+'px;'}">
-	    	<view class="gosearch-btn" :style="{paddingLeft:navbarBtn.height+'px;',top:5+'px;',left:(navbarBtn.right+navbarBtn.height+20)+'px;',borderRadius:navbarBtn.height/2+'px;',width:200+'px;',lineHeight:navbarBtn.height+'px;'}">
+		<view class="navbar-text" :style="{top:navbarBtn.top + statusBarHeight+'px;',height:navbarBtn.height+'px;',fontSize:fontSizeSetting+'px;'}">
+	    	<view class="gosearch-btn" :style="{paddingLeft:navbarBtn.height+'px;',left:(navbarBtn.height+30)+'px;',borderRadius:navbarBtn.height/2+'px;',width:(375-navbarBtn.width-(navbarBtn.width/2)-15)+'px;',lineHeight:navbarBtn.height+'px;'}">
 				<text class="iconfont icon-sousuo":style="{width:navbarBtn.height+'px;',height:navbarBtn.height+'px;',lineHeight:navbarBtn.height+'px;'}"></text>
 				<view class="input" @click="this.$api.navigateTo(clickPath)">搜索采美商品</view>
 			</view>
@@ -84,6 +84,7 @@
 			      // 屏幕宽度 - 胶囊right
 			      right: this.systeminfo.screenWidth - headerPosi.right
 			}
+			console.log(btnPosi)
 			let haveBack;
 			if (getCurrentPages().length === 1) { // 当只有一个页面时
 			     haveBack = false;
@@ -136,7 +137,7 @@
 	.navbar-text {
 		 color: #000000;
 		 font-weight: 500;
-		 position: relative;
+		 position: fixed;
 	}
 	.gosearch-btn{
 		height: 100%;
@@ -146,7 +147,8 @@
 		position: relative;
 		box-sizing: border-box;
 		position:absolute ;
-		border: 1px solid rgba(0, 0, 0, 0.1);
+		top: 0;
+		border: 0.5px solid rgba(0, 0, 0, 0.1);
 		.icon-sousuo{
 			height: 100%;
 			text-align: center;
@@ -172,7 +174,7 @@
 		 border-radius: 50%;
 		 text-align: center;
 		 background: rgba(255,255,255,0.6);
-		 border: 1px solid rgba(0,0,0, 0.1);
+		 border: 0.5px solid rgba(0,0,0, 0.1);
 		 box-sizing: border-box;
 		 z-index: 9999;
 	}

pages/search/search.vue

@@ -171,7 +171,9 @@
 		onLoad(option) {
 			this.isFocus = true
 			if(option.keyWord){
-				
+				this.listQuery.keyword = option.keyWord
+				this.setSearchHistoryAdd()
+				this.getListFromServer()
 			}
 			this.initGetSerachRecord()			
 		},

supplier/pages/user/my-shop.vue

@@ -468,7 +468,7 @@
 			background-color: #F7F7F7;
 			box-sizing: border-box;
 			.icon-sousuo{
-				width: 60rpx;
+				width: 80rpx;
 				height: 66rpx;
 				display: block;
 				float: left;
@@ -478,10 +478,9 @@
 				font-size: 36rpx;
 			}
 			.input{
-				width: 600rpx;
+				width: 580rpx;
 				height: 66rpx;
 				box-sizing: border-box;
-				padding: 0 20rpx;
 				color: #666666;
 				overflow: hidden;
 				font-size: $font-size-24;