瀏覽代碼

回归优化

zhengjinyi 5 年之前
父節點
當前提交
0a90ed6863
共有 5 個文件被更改,包括 34 次插入20 次删除
  1. 2 2
      common/config/config.js
  2. 1 1
      components/cm-module/cm-seller/home.vue
  3. 25 13
      pages/search/search.vue
  4. 1 1
      pages/tabBar/home/home.vue
  5. 5 3
      pages/tabBar/user/user.vue

+ 2 - 2
common/config/config.js

@@ -4,8 +4,8 @@ if(process.env.NODE_ENV === 'development'){
 	// URL_CONFIG = 'http://192.168.1.24:8008'	 //俊俊联调地址
 	// URL_CONFIG = 'http://192.168.1.22:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.1.26:8008'	 //超超联调地址
-    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
-	// URL_CONFIG = 'https://spi.caimei365.com'
+    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+	URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境
     URL_CONFIG = 'https://spi.caimei365.com'

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

@@ -510,7 +510,7 @@
 				color: $text-color;
 				background: #FFFFFF;
 				line-height: 36rpx;
-				border-radius: 10rpx;
+				border-radius: 20rpx;
 				margin-bottom: 20rpx;
 				float: left;
 				&:nth-child(2n){

+ 25 - 13
pages/search/search.vue

@@ -32,19 +32,30 @@
 							<view>商品编码:{{item.productCode}}</view>
 						</view>
 						<view class="list-details-price">
-							<view v-if="!hasLogin" class="list-login-now">
-								<text class="p-no">价格:</text>
-								<uni-stars :stars="parseInt(item.price1Grade)" :font-size='36' :width-info="180"></uni-stars>
-							</view>
-							<view class="list-price" v-else>
-								<view class="price-larger" v-if="item.price1TextFlag == '1'">
-									<text class="txt">该未公开价格</text>
+							<view v-if="hasLogin"class="list-price">
+								<view v-if="userIdentity == 1">
+									<text>¥<text class="price-larger">{{item.retailPrice?item.retailPrice.toFixed(2):'0.00'}}</text></text>
+								</view>	
+								<view v-if="userIdentity == 4">
+									<view class="price-larger" v-if="item.price1TextFlag == '1'">
+										<text class="txt">未公开价格</text>
+									</view>
+									<view class="price-larger" v-if="item.price1TextFlag == '2'">
+										<text class="txt">价格仅会员可见</text>
+										<text class="btn" @click.stop="this.$api.navigateTo(`/pages/login/apply?clubStatus=${clubStatus}`)">去升级</text>
+									</view>
+									<text v-if="item.price1TextFlag == '0'">¥<text class="price-larger">{{item.retailPrice?item.retailPrice.toFixed(2):'0.00'}}</text></text>
 								</view>
-								<view class="price-larger" v-if="item.price1TextFlag == '2'">
-									<text class="txt">价格仅会员可见</text>
-									<text class="btn" @click.stop="this.$api.navigateTo(`/pages/login/apply?clubStatus=${clubStatus}`)">去升级</text>
+								<view v-if="userIdentity == 2">
+									<view class="price-larger" v-if="item.price1TextFlag == '1'">
+										<text class="txt">未公开价格</text>
+									</view>
+									<text v-else>¥<text class="price-larger">{{item.retailPrice?item.retailPrice.toFixed(2):'0.00'}}</text></text>
 								</view>
-								<text v-if="item.price1TextFlag == '0'">¥<text class="price-larger">{{item.retailPrice?item.retailPrice.toFixed(2):'0.00'}}</text></text>
+							</view>	
+							<view  class="list-login-now"  v-else>
+								<text class="p-no">价格:</text>
+								<uni-stars :stars="parseInt(item.price1Grade)" :font-size='36' :width-info="180"></uni-stars>
 							</view>
 						</view>
 					</view>
@@ -61,7 +72,6 @@
 		</view>
 		<!-- 透明模态层 -->
 		<modal-layer v-if='isModallayer'></modal-layer>
-	
 	</view>
 </template>
 
@@ -83,7 +93,8 @@
 			return {
 				userID:'',
 				themeClass: 'block',
-				searchInputVal:'',							//搜索关键词
+				searchInputVal:'',	//搜索关键词
+				userIdentity:'',						
 				isShowClose:false,							//是否显示清空输入框图标
 				isSearchHistory:false,						//是都显示搜索历史
 				serachRecordList:[],						//历史搜索记录
@@ -113,6 +124,7 @@
 			initGetSerachRecord(){
 				this.$api.getStorage().then((resolve) =>{
 					this.userID = resolve.userID ? resolve.userID : '';
+					this.userIdentity = resolve.userIdentity
 				    querySearchHistory({userId:this.userID}).then(response =>{
 						if(response.code == 0){
 							this.serachRecordList = response.data

+ 1 - 1
pages/tabBar/home/home.vue

@@ -558,7 +558,7 @@
 				color: $text-color;
 				background: #FFFFFF;
 				line-height: 36rpx;
-				border-radius: 10rpx;
+				border-radius: 20rpx;
 				margin-bottom: 20rpx;
 				float: left;
 				&:nth-child(2n){

+ 5 - 3
pages/tabBar/user/user.vue

@@ -5,7 +5,8 @@
 			<view class="header" :style="{height:(CustomBar+90)-StatusBar+'px',paddingTop:CustomBar+'px',background:'url('+ bgImgUrl +')',backgroundSize:'cover'}">
 				<view class="header-main" v-if="hasLogin">
 					<view class="header-text">
-						<view class="user-item"><text class="u-h1">{{name}}</text>
+						<view class="user-item">
+							<text class="u-h1">{{name}}</text>
 							<text class="u-viptips" v-if="userIdentity == 2">{{userType}}</text>
 							<text class="u-tips" v-if="userIdentity == 4">{{userType}}</text>
 						</view>
@@ -407,8 +408,9 @@
 					margin-top: 17rpx;
 				}
 				.u-h1{
+					width: 400rpx;
 					float: left;
-					font-size: $font-size-36;
+					font-size: $font-size-34;
 					color: #FFFFFF;
 					text-align: left;
 					-o-text-overflow: ellipsis;
@@ -456,7 +458,7 @@
 				}
 				.u-h1{
 					float: left;
-					font-size: $font-size-36;
+					font-size: $font-size-34;
 					color: #FFFFFF;
 					text-align: left;
 					-o-text-overflow: ellipsis;