样式调整

components/xi-waterfall/xi-waterfall.vue

@@ -4,16 +4,16 @@
 			<!-- 第一列 -->
 			<view class="w_two" id="columnFirst">
 				<view class="pu_item" @tap="goToDetail(item)" v-for="(item, index) in columnFirst" :key="index">
-					<image :src="item.logo" mode="aspectFill" class="pul_img"></image>
-					<view class="desc_pb">{{ item.title }}</view>
+					<image :src="item.logo" mode="scaleToFill" class="pul_img"></image>
+					<view class="desc_pb" :class="item.type == 2932?'desc_pb_title':''">{{ item.title }}</view>
 					<view class="desc_pb desc_price" v-if="item.type == 2932">¥{{ item.jointime }}</view>
 				</view>
 			</view>
 			<!-- 第二列 -->
 			<view class="w_two" id="columnSecond">
 				<view class="pu_item" @tap="goToDetail(item)" v-for="(item, index) in columnSecond" :key="index">
-					<image :src="item.logo" mode="aspectFill" class="pul_img"></image>
-					<view class="desc_pb">{{ item.title }}</view>
+					<image :src="item.logo" mode="scaleToFill" class="pul_img"></image>
+					<view class="desc_pb" :class="item.type == 2932?'desc_pb_title':''">{{ item.title }}</view>
 					<view class="desc_pb desc_price" v-if="item.type == 2932">¥{{ item.jointime }}</view>
 				</view>
 			</view>
@@ -147,13 +147,15 @@ export default {
 .container .column .item image {
 	width: 100%;
 }
-.desc_pb {
+.desc_pb_title {
 	padding: 0 20rpx;
 	border-radius: 0 0 15rpx 15rpx;
 	font-size: 30rpx;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
+	 overflow: hidden;
+	    -webkit-line-clamp: 2;
+	    text-overflow: ellipsis;
+	    display: -webkit-box;
+	    -webkit-box-orient: vertical;
 }
 .desc_price {
 	color: crimson;

pages/index/index.vue

@@ -355,23 +355,23 @@ export default {
 		//
 		getWeather: function (region) {
 			let this_ = this
-			var myAmapFun = new amap.AMapWX({ key: 'e2ee6a41e07306db2214f0edfa86f73a' });
-			myAmapFun.getWeather({
-				success: function (data) {
-					//成功回调
-					this_.showWeather = true
-					console.log(data, 'success')
-					this_.city = data.city.data,
-					this_.time = data.liveData.reporttime,
-					this_.weather = data.weather.data + ' ' + data.temperature.data + '°C' + ' ' + data.winddirection.data + ' ' + data.windpower.data,
-					this_.$forceUpdate()
-				},
-				fail: function (info) {
-					//失败回调
-					this_.showWeather = false
-					console.log(info, 'fail');
-				}
-			});
+			// var myAmapFun = new amap.AMapWX({ key: 'e2ee6a41e07306db2214f0edfa86f73a' });
+			// myAmapFun.getWeather({
+			// 	success: function (data) {
+			// 		//成功回调
+			// 		this_.showWeather = true
+			// 		console.log(data, 'success')
+			// 		this_.city = data.city.data,
+			// 		this_.time = data.liveData.reporttime,
+			// 		this_.weather = data.weather.data + ' ' + data.temperature.data + '°C' + ' ' + data.winddirection.data + ' ' + data.windpower.data,
+			// 		this_.$forceUpdate()
+			// 	},
+			// 	fail: function (info) {
+			// 		//失败回调
+			// 		this_.showWeather = false
+			// 		console.log(info, 'fail');
+			// 	}
+			// });
 			// var data = {
 			//   region: region
 			// };
@@ -393,6 +393,23 @@ export default {
 			//     this.weatherImgUrl = '../../../static/images/whe_cloudy.png';
 			//   }
 			// });
+			
+			uni.request({
+				 url: `https://restapi.amap.com/v3/weather/weatherInfo?city=131100&key=7d0d358762ba1af430645a7592f75789`,
+				 method: 'get',
+				 success(res) {
+					this_.showWeather = true
+					const datas = res.data.lives[0]
+					console.log(datas, 'success')
+					this_.city = datas.city,
+					this_.time = datas.reporttime,
+					this_.weather = datas.weather+ ' ' + datas.temperature_float + '°C' + ' ' + datas.winddirection + '风 ' + datas.windpower+'级',
+					this_.$forceUpdate()
+				 },
+				 fail(err) {
+				 	console.log(err)
+				 }
+			})
 		},
 		changeSwiper(e) {
 			this.swiperCurrent = e.detail.current;
@@ -780,4 +797,12 @@ export default {
 		
 		
 	}
+	.we-item{
+		font-size: 26rpx;
+		color: #737373;
+	}
+	.we-item:first-child{
+		font-size: 30rpx;
+		color: #424242;
+	}
 </style>

pages/personcenter/personcenter.vue

@@ -83,7 +83,7 @@ export default {
 			url: '',
 			username: '',
 			headimgurl: '',
-			nickname: '点击授权',
+			nickname: '',
 			nicknames: '点击授权',
 			isUpdate: true,
 			isLogin: false,

pages/traffic/outTraffic.vue

@@ -53,6 +53,7 @@ export default {
 <style>
 .v-traffic-img {
 	width: 100%;
+	display: block;
 	margin-bottom: -10rpx;
 }
 .dh-box {
@@ -67,4 +68,7 @@ export default {
 	padding: 5rpx 10rpx;
 	color: #c30000;
 }
+.v-traffic-box{
+	font-size: 0;
+}
 </style>

static/ancss/an.css

@@ -184,7 +184,7 @@ s首页菜单
 .an_t_2{ font-size: 28rpx; }
 .at_size_1{ width:80rpx; height: 80rpx;}
 .at_t{font-size: 30rpx; padding-top:5rpx}
-.at_t image{ border-radius: 15rpx; padding: 10rpx 0;}
+/* .at_t image{ border-radius: 15rpx; padding: 10rpx 0;} */
 .an_t_1_img{ position: absolute;height: 40rpx; width: 270rpx; left: 0; top:0;z-index: 8;}
 .an_t_1_text{display: inline-block;color: #fdd89e; height: 40rpx; line-height: 40rpx; text-align: center; width: 20rp.x;  position: relative;z-index: 9;}
 .anx_scl_1{white-space: nowrap;}

sunPackIndex/feiyi/feiyidetail/feiyidetail.vue

@@ -2,7 +2,7 @@
 	<view class="">
 		<swiper :autoplay="autoplay" class="lh-swiper" :duration="duration" :indicator-dots="indicatorDots" :interval="interval">
 			<swiper-item v-for="(item, index) in pic_list" :key="index">
-				<image class="slide-image" height="187" :src="item" width="375"></image>
+				<image class="slide-image" mode="scaleToFill" :src="item" width="375"></image>
 			</swiper-item>
 		</swiper>
 		<view class="box_dg">
@@ -130,7 +130,7 @@ export default {
 <style scoped lang="scss">
 .lh-swiper {
 	width: 100%;
-	height: 425rpx;
+	height: 825rpx;
 	position: relative;
 }
 .lh-swiper .slide-image {
@@ -153,4 +153,5 @@ export default {
 .box_dg{
 	padding-top: 20rpx;
 }
+
 </style>

uni_modules/mp-html/components/mp-html/mp-html.vue

@@ -489,7 +489,9 @@ export default {
   overflow-y: hidden;
   -webkit-overflow-scrolling: touch;
 }
-
+img{
+	display: block;
+}
 /* 长按复制 */
 ._select {
   user-select: text;