Browse Source

样式修改

lilei 4 năm trước cách đây
mục cha
commit
7ce29154c6
2 tập tin đã thay đổi với 28 bổ sung28 xóa
  1. 3 21
      pages/agreement/agreement.vue
  2. 25 7
      pages/userCenter/deliveryRecord.vue

+ 3 - 21
pages/agreement/agreement.vue

@@ -1,9 +1,6 @@
 <template>
 	<view class="content">
 		<view class="page-content">
-			<view class="page-care" v-if="!hideZysx">
-				<u-image width="750rpx" height="1200rpx" mode="aspectFit" src="/static/img/zysx.png"></u-image>
-			</view>
 			<view class="page-care agreement">
 				<view class="title">-乐色管家用户服务协议(声明)-</view>
 				<view class="xy-cons">
@@ -155,9 +152,6 @@
 				</view>
 			</view>
 		</view>
-		<view class="footer" @click="goBack" v-if="!hideZysx">
-			我已阅读并同意无人洗车《注意事项及服务协议》
-		</view>
 	</view>
 </template>
 
@@ -167,26 +161,14 @@
 		},
 		data() {
 			return {
-				hideZysx: false
 			}
 		},
 		onLoad(option) {
-			// 从个人中心打开的
-			if(option.fromPage == 'usercenter'){
-				this.hideZysx = true
-				uni.setNavigationBarTitle({
-					title: "服务协议"
-				})
-			}
+			uni.setNavigationBarTitle({
+				title: "服务协议"
+			})
 		},
 		methods: {
-			// 点击已阅读返回上一页
-			goBack () {
-				// 出发已阅读事件
-				uni.$emit('read',{msg:'read'})
-				uni.navigateBack()
-			}
-			
 		}
 	}
 </script>

+ 25 - 7
pages/userCenter/deliveryRecord.vue

@@ -3,14 +3,20 @@
 		<scroll-view class="scroll-con" scroll-y @scrolltolower="onreachBottom">
 			<!-- 列表数据 -->
 			<view class="cell-item-con">
+				<u-gap height="15"></u-gap>
 				<view class="cell-item" v-for="(item, index) in listdata" :key="index">
-					<text class="cell-item-date">{{item.time}}</text>
+					<text class="cell-item-date">{{item.deliveryTime}}</text>
 					<view class="cell-item-main">
-						<u-image width="150rpx" height="150rpx" :src="item.pic" class="cell-item-pic"></u-image>
+						<u-image width="100rpx" height="100rpx" :src="item.pic" class="cell-item-pic"></u-image>
 						<view class="cell-item-r">
 							<view class="cell-item-head">
-								<view class="cell-item-val"><text class="cell-item-num">{{item.rubbishWeight}}</text>克</view>
-								<u-tag :text="item.goldNum + '乐豆'" mode="light" type="warning" size="mini" class="cell-item-price" />
+								<view class="cell-item-val">
+									<text class="cell-item-num">{{item.rubbishWeight}}</text>克
+							    </view>
+								<view class="cell-item-ledu">
+									<text>+{{item.goldNum}}</text>
+								    <u-image mode="scaleToFill" width="34rpx" height="34rpx" src="/static/ledou.png"></u-image>
+								</view>
 							</view>
 							<text class="cell-item-des">{{item.stationName}}</text>
 						</view>
@@ -102,7 +108,10 @@
 				background-color: #fff;
 				color: #606266;
 				padding: 16rpx 32rpx 22rpx;
-				border-bottom: 1rpx solid #e6e6e6;
+				border-bottom: 1rpx solid #EEEEEE;
+				&:last-child{
+					border:0;
+				}
 				.cell-item-date{
 					display: block;
 					color: #909399;
@@ -123,14 +132,23 @@
 							display: flex;
 							justify-content: space-between;
 							align-items: center;
-							padding: 5rpx 0 15rpx;
 							.cell-item-val{
-								font-size: 32rpx;
+								font-size: 30rpx;
+								font-weight: bold;
 								.cell-item-num{
 									display: inline-block;
 									margin-right: 6rpx;
 								}
 							}
+							.cell-item-ledu{
+								display: flex;
+								justify-content: space-between;
+								align-items: center;
+								text{
+									font-size: 40rpx;
+									color: #01c9b2;
+								}
+							}
 						}
 						.cell-item-des{
 							color: #909399;