guo 3 年之前
父节点
当前提交
017a09907a
共有 4 个文件被更改,包括 65 次插入28 次删除
  1. 24 6
      pages/me/aboutMe.vue
  2. 2 2
      pages/me/me.vue
  3. 21 11
      pages/module/orderShop.vue
  4. 18 9
      pages/shop/shopList.vue

+ 24 - 6
pages/me/aboutMe.vue

@@ -11,15 +11,32 @@
 				couContent: '',
 			}
 		},
-		onLoad(opt) {
-			
-			if (opt.couContent) {
-				this.couContent = opt.couContent.replace(/\<p/gi, '<p style="display: inline-block"');
-			}
+		onLoad() {
+			this.getDetailData()
 		},
 		methods: {
 
-			
+			getDetailData() {
+				console.log('谢雨');
+				uni.showLoading({
+					title: '加载中'
+				})
+				let url = 'worldKeepCar/keepCarMy/queryTAbouts',
+					params = {
+						type:1
+					}
+				this.$http(url, params, 'GET').then(res => {
+					uni.hideLoading();
+
+
+					if (res.data.contents) {
+						this.couContent = res.data.contents.replace(/\<p/gi, '<p style="display: inline-block"');
+					}
+
+
+
+				})
+			},
 		}
 
 	}
@@ -31,4 +48,5 @@
 		min-height: 100vh;
 
 	}
+	
 </style>

+ 2 - 2
pages/me/me.vue

@@ -147,7 +147,7 @@
 			</view>
 			<view class="grayline"></view>
 			
-			<view class="rowBox" @click="gonavigateTo('aboutMe?couContent='+numList.aboutus.contents)">
+			<view class="rowBox" @click="gonavigateTo('aboutMe')">
 				<view class="leftView">
 					<image src="../../static/img/icon_guanyu.png" mode="" class="liftIcon"></image>
 					<view class="rowTitle">关于我们</view>
@@ -218,7 +218,7 @@
 				})
 			},
 			gonavigateTo(url) {
-				console.log('url',url);
+				
 				uni.navigateTo({
 					url: url
 				})

+ 21 - 11
pages/module/orderShop.vue

@@ -15,7 +15,7 @@
 					</view>
 					<view class="brandsBg">
 						<span class="shopScore1" v-if="item.shopScore">{{item.shopScore}}</span>
-						<span class="shopScore2" v-if="item.shopScore">分</span>
+						<span class="shopScore11" v-if="item.shopScore">分</span>
 						<span class="shopScore2" v-if="!item.shopScore">暂无评分</span>
 						<view class="brands" v-if="item.brands" v-for="(barnd,index2) in item.brands.split(',')">{{barnd}}</view>
 					</view>
@@ -228,15 +228,25 @@
 		text-overflow: ellipsis;
 	}
 
-	.shopScore1 {
-		font-size: 36rpx;
-		color: #FF4F00;
+	.shopScore1 {
+		font-size: 36rpx;
+		font-weight: bold;
+		color: #FF4F00;
+		height: 50rpx;
+		line-height: 50rpx;
+	}
+	.shopScore11{
+		font-size: 22rpx;
+		color: #FF4F00;
+		margin-right: 14rpx;
+		
 	}
 
-	.shopScore2 {
-		font-size: 22rpx;
-		color: #FF4F00;
-		margin-right: 14rpx;
+	.shopScore2 {
+		font-size: 22rpx;
+		color: #666666;
+		margin-right: 14rpx;
+		padding: 8rpx 0;
 	}
 
 	.shopScore3 {
@@ -253,9 +263,9 @@
 	.brands {
 		border-radius: 4rpx;
 		padding: 0 5rpx;
-		color: #FF5800;
+		color: #CF9B6D;
 		height: 28rpx;
-		border: 1px solid #FF5800;
+		border: 1px solid #CF9B6D;
 		margin-right: 5rpx;
 		font-size: 20rpx;
 		line-height: 28rpx;
@@ -265,7 +275,7 @@
 	.timeBg {
 		display: flex;
 		align-items: center;
-		padding-top: 10rpx;
+		
 	}
 	
 	.shopTime {

+ 18 - 9
pages/shop/shopList.vue

@@ -64,7 +64,7 @@
 
 						<view class="brandsBg">
 							<span class="shopScore1" v-if="item.shopScore">{{item.shopScore}}</span>
-							<span class="shopScore2" v-if="item.shopScore">分</span>
+							<span class="shopScore11" v-if="item.shopScore">分</span>
 							<span class="shopScore2" v-if="!item.shopScore">暂无评分</span>
 							<view class="brands" v-if="item.brands" v-for="(barnd,index2) in item.brands.split(',')">
 								{{barnd}}</view>
@@ -524,9 +524,9 @@
 	.brands {
 		border-radius: 4rpx;
 		padding: 0 5rpx;
-		color: #FF5800;
+		color: #CF9B6D;
 		height: 28rpx;
-		border: 1px solid #FF5800;
+		border: 1px solid #CF9B6D;
 		margin-right: 5rpx;
 		font-size: 20rpx;
 		line-height: 28rpx;
@@ -536,7 +536,7 @@
 	.timeBg {
 		display: flex;
 		align-items: center;
-		padding-top: 10rpx;
+		
 	}
 
 	.shopTime {
@@ -601,14 +601,23 @@
 	}
 
 	.shopScore1 {
-		font-size: 36rpx;
-		color: #FF4F00;
+		font-size: 36rpx;
+		font-weight: bold;
+		color: #FF4F00;
+		height: 50rpx;
+		line-height: 50rpx;
+	}
+	.shopScore11{
+		font-size: 22rpx;
+		color: #FF4F00;
+		margin-right: 14rpx;
+		
 	}
-
 	.shopScore2 {
 		font-size: 22rpx;
-		color: #FF4F00;
-		margin-right: 14rpx;
+		color: #666666;
+		margin-right: 14rpx;
+		padding: 8rpx 0;
 	}
 
 	.shopScore3 {