样式修改

components/components/organ.vue

@@ -8,7 +8,7 @@
 					</ad-swipers>
 				</view>
 				<!-- 城市 -->
-				<router-link  class="m-l-16 flex  row-center" to="/bundle_b/pages/city/city">
+				<router-link  class="m-l-16 flex  row-center city" to="/bundle_b/pages/city/city">
 					<text class="m-r-6">{{ cityInfo.name || '选择' }}</text>
 					<u-icon name="arrow-down" size="24" color="#FFFFFF"></u-icon>
 					<!-- <image class="icon-md m-l-30" src="/static/images/icon_news.png">
@@ -29,12 +29,13 @@
 										<view class="lighter line-2">
 											<view>{{ item.intro }}</view>
 										</view>
+										<view class="flex row-between m-t-20 price">
+											<view class="xs muted">区域: <text style="color: red;">{{item.address}}</text></view>
+										</view>
 									</view>
 									<u-image width="240rpx" height="180rpx" class="img m-l-20" :src="item.image" />
 								</view>
-								<view class="flex row-between m-t-20">
+								
-									<view class="xs muted">区域: <b style="color: red;">{{item.address}}</b></view>
-								</view>
 								<view class="flex row-between m-t-20">
 									<view class="flex">
 										<image class="icon-sm" src="/static/images/icon_see.png"></image>
@@ -247,4 +248,21 @@
 			background-color: rgba(256, 256, 256, .4);
 		}
 	}
+	.col-top {
+		position: relative;
+		.price {
+				position: absolute;
+				bottom:10rpx;
+			}
+	}
+	
+	.city {
+		    position: absolute;
+		    top: 20rpx;
+		    z-index: 999;
+		    color: #fff;
+			padding: 10rpx 15rpx;
+			background: rgba(0,0,0,.3);
+			border-radius: 10rpx;
+	}
 </style>

components/components/team.vue

@@ -8,7 +8,7 @@
 					</ad-swipers>
 				</view>
 				<!-- 城市 -->
-				<router-link  class="m-l-16 flex  row-center" to="/bundle_b/pages/city/city">
+				<router-link  class="m-l-16 flex  row-center city" to="/bundle_b/pages/city/city">
 					<text class="m-r-6">{{ cityInfo.name || '选择' }}</text>
 					<u-icon name="arrow-down" size="24" color="#FFFFFF"></u-icon>
 					<!-- <image class="icon-md m-l-30" src="/static/images/icon_news.png">
@@ -29,12 +29,13 @@
 										<view class="lighter line-2">
 											<view>{{ item.intro }}</view>
 										</view>
+										<view class="flex row-between m-t-20 price">
+											<view class="xs muted">区域: <text style="color: red;">{{item.address}}</text></view>
+										</view>
 									</view>
 									<u-image width="240rpx" height="180rpx" class="img m-l-20" :src="item.image" />
 								</view>
-								<view class="flex row-between m-t-20">
+								
-									<view class="xs muted">区域: <b style="color: red;">{{item.address}}</b></view>
-								</view>
 								<view class="flex row-between m-t-20">
 									<view class="flex">
 										<image class="icon-sm" src="/static/images/icon_see.png"></image>
@@ -243,4 +244,21 @@
 			background-color: rgba(256, 256, 256, .4);
 		}
 	}
+	.col-top {
+		position: relative;
+		.price {
+				position: absolute;
+				bottom:10rpx;
+			}
+	}
+	
+	.city {
+		    position: absolute;
+		    top: 20rpx;
+		    z-index: 999;
+		    color: #fff;
+			padding: 10rpx 15rpx;
+			background: rgba(0,0,0,.3);
+			border-radius: 10rpx;
+	}
 </style>

components/components/xuqiu.vue

@@ -69,6 +69,7 @@
             },
             // 切换标签导航
             changeTabs(event) {
+
                 this.current = event;
             },
             // 初始化获取话题
@@ -97,5 +98,6 @@
             height: calc(100vh - 92px - var(--window-bottom));
             overflow: hidden;
         }
+		
     }
 </style>

components/tabs/tabs.vue

@@ -314,6 +314,7 @@
                 query.exec(
                     function(res) {
                         this.tabQueryInfo = res;
+						//console.log(res)
                         // 初始化滚动条和移动bar的位置
                         this.scrollByIndex();
                     }.bind(this)
@@ -322,7 +323,11 @@
             // 滚动scroll-view，让活动的tab处于屏幕的中间位置
             scrollByIndex() {
                 // 当前活动tab的布局信息，有tab菜单的width和left(为元素左边界到父元素左边界的距离)等信息
+				console.log('tabInfo')
+				console.log(this.currentIndex)
+				console.log(this.tabQueryInfo)
                 let tabInfo = this.tabQueryInfo[this.currentIndex];
+				
                 if (!tabInfo) return;
                 // 活动tab的宽度
                 let tabWidth = tabInfo.width;

pages.json

@@ -29,13 +29,14 @@
 		},
 		{
 			"path": "pages/shop_street/shop_street",
-			"name": "shop_street",
+			"name": "shop",
 			"meta": {
 				"auth": false,
 				"keepScroll": true
 			},
 			"style": {
 				"navigationBarTitleText": "商铺街"
+			
 			}
 		},
 		{
@@ -47,7 +48,9 @@
 			},
 			"style": {
 				"navigationBarTitleText": "服务大厅"
+	
 			}
+			
 		},
 		{
 			"path": "pages/community/organ_team_details",
@@ -230,6 +233,7 @@
 			},
 			"style": {
 				"navigationBarTitleText": "资料库"
+		
 			}
 		}
 	],
@@ -926,7 +930,6 @@
 				"text": "首页"
 			},
 			{
-				// "pagePath": "pages/goods_cate/goods_cate",
 				"pagePath": "pages/shop_street/shop_street",
 				"iconPath": "/static/images/tab_sort.png",
 				"selectedIconPath": "/static/images/tab_sort_s.png",
@@ -936,10 +939,9 @@
 				"pagePath": "pages/community/community",
 				"iconPath": "/static/images/tab-community.png",
 				"selectedIconPath": "/static/images/tab-community_s.png",
-				"text": "任务中心"
+				"text": "服务大厅"
 			},
 			{
-				// "pagePath": "pages/shop_cart/shop_cart",
 				"pagePath": "pages/resource_list/resource_list",
 				"iconPath": "/static/images/tab_shoppingcar.png",
 				"selectedIconPath": "/static/images/tab_shoppingcar_s.png",

pages/community/community.vue

@@ -5,13 +5,13 @@
 			<view class="container">
 			    <follow :active="currentNav" v-show="currentNav===0" @share="handleShare"></follow>
 			    <!-- 找服务 -->
-			    <explore :active="currentNav" v-show="currentNav===1"  ></explore>
+			    <explore :active="currentNav" v-show="currentNav===1"></explore>
 				 <!-- 找需求 -->
-				<xuqiu :active="currentNav" v-show="currentNav===2"  ></xuqiu>
+				<xuqiu :active="currentNav" v-show="currentNav===2"></xuqiu>
 				<!-- 检测机构 -->
-				<organ :active="currentNav" v-show="currentNav===3"   ></organ>
+				<organ :active="currentNav" v-show="currentNav===3"></organ>
 				<!-- 专家服务 -->
-				<team :active="currentNav" v-show="currentNav===4"   ></team>
+				<team :active="currentNav" v-show="currentNav===4"></team>
 			</view>
 		</template>
         <template v-else>

pages/community/organ_team_details.vue

@@ -2,29 +2,37 @@
 <view>
 <view class="news-details">
     <view class="header">
-        <view class="title xxl m-b-20">{{ articleDetail.name }}</view>
+        
 		<product-swiper :imgUrls="swiperList" ></product-swiper>
-        <view class="flex row-between">
+		<view class="title xxl m-t-20">{{ articleDetail.name }}</view>
+        <view class="row-between">
+			<view class="flex" style="justify-content: space-between;">
             <view class="xs lighter">公司名称：{{ articleDetail.company }}</view>
             <view class="flex">
                 <image class="icon-sm" src="/static/images/icon_see.png"></image>
                 <view class="m-l-10 xs muted">{{ articleDetail.visit }}人浏览</view>
             </view>
+			</view>
+			<view class="xs lighter m-t-10">地区：{{ articleDetail.address }}</view>
+			<view class="xs lighter m-t-10">联系方式：{{ articleDetail.contact }}</view>
         </view>
-		<view class="flex row-between">
+		<!-- <view class="row-between">
-		    <view class="xs lighter">地区：{{ articleDetail.address }}</view>
+			
+			
+		   
 	
-		</view>
+		</view> -->
-		<view class="flex row-between">
+		<!-- <view class="flex row-between">
-		    <view class="xs lighter">联系方式：{{ articleDetail.contact }}</view>
+		    
-		</view>
+		</view> -->
     </view>
 	<view class="main">
 	   简介：{{ articleDetail.intro }}
+	   <u-parse  class='m-t-10' :html="article_content" />
 	</view>
-    <view class="main">
+   <!-- <view class="main">
-        <u-parse :html="article_content" />
+        
-    </view>
+    </view> -->
 </view>
 <loading-view v-if="showLoading"></loading-view>
 </view>

pages/index/index.vue

@@ -47,7 +47,7 @@
 				</view>
 			</u-sticky>
 			<view class="tab-con">
-				<view  v-show="active == 0">
+				<view v-show="active == 0">
 					<index-home ref="indexHome" :home-data="homeData" :nav-list="navList" :live-list="liveLists">
 					</index-home>
 					<goods-column ref="mescrollItem" :autoGetData="false"></goods-column>

pages/resource_list/resource_list.vue

@@ -5,7 +5,7 @@
 			
 			<view class="contain">
 				<!-- 城市 -->
-				<router-link  class="m-l-16 flex  row-center" to="/bundle_b/pages/city/city">
+				<router-link  class="m-l-16 flex row-center city" to="/bundle_b/pages/city/city">
 					<text class="m-r-6">{{ cityInfo.name || '选择' }}</text>
 					<u-icon name="arrow-down" size="24" color="#FFFFFF"></u-icon>
 					<!-- <image class="icon-md m-l-30" src="/static/images/icon_news.png">
@@ -29,12 +29,13 @@
 										<view class="lighter line-2">
 											<view>{{ item.intro }}</view>
 										</view>
+										<view class="flex row-between price">
+											<view class="xs muted">价格: <text style="color: red;">{{item.price_str}}</text></view>
+										</view>
 									</view>
 									<u-image width="240rpx" height="180rpx" class="img m-l-20" :src="item.image" />
 								</view>
-								<view class="flex row-between m-t-20">
+								
-									<view class="xs muted">价格: <b style="color: red;">{{item.price_str}}</b></view>
-								</view>
 								<view class="flex row-between m-t-20">
 									<view class="xs muted">发布时间: {{item.create_time}}</view>
 									<view class="flex">
@@ -49,6 +50,7 @@
 			</view>
 
 		</mescroll-body>
+		<tabbar></tabbar>
 	</view>
 </template>
 
@@ -230,4 +232,21 @@
 			background-color: rgba(256, 256, 256, .4);
 		}
 	}
+	.col-top {
+		position: relative;
+		.price {
+				position: absolute;
+				bottom:10rpx;
+			}
+	}
+	
+	.city {
+		    position: absolute;
+		    top: 20rpx;
+		    z-index: 999;
+		    color: #fff;
+			padding: 10rpx 15rpx;
+			background: rgba(0,0,0,.3);
+			border-radius: 10rpx;
+	}
 </style>

pages/shop_street/shop_street.vue

@@ -41,7 +41,7 @@
 				</view>
 			</view> -->
 		</view>
-	
+	<tabbar></tabbar>
 	</view>
 
 </template>

pages/user/user.vue

@@ -433,6 +433,7 @@
 			background-color: #343A48;
 			width: 100%;
 			height: 88rpx;
+			line-height: 46rpx;
 			border-radius: 16rpx 16rpx 0 0;
 			padding: 22rpx 30rpx 0 30rpx;
 			margin-top: 16px;
@@ -442,6 +443,7 @@
 				.small {
 					color: #F8D5A8;
 					font-size: 28rpx;
+					line-height: 46rpx;
 					margin-left: 18rpx;
 				}