[完善] 将所有页面换成和ui一致的图标

[完善] 所有页面检查跳转逻辑
[修改] 多个页面UI样式
[新增] 退款详情页面UI
[新增] 阿里字体图标库

App.vue

@@ -121,6 +121,7 @@
 	@import '@/common/styles/common.css';
 	@import '@/common/styles/main.css';
 	@import "@/common/styles/icon.css";
+	@import "@/common/styles/iconfont.css";
 	
 	//底部按钮
 	.btn-bottom {

common/styles/iconfont.css

@@ -0,0 +1,42 @@
+@font-face {
+  font-family: "lf-iconfont"; /* Project id 2651793 */
+  src: url('//at.alicdn.com/t/font_2651793_erp3vwlpk0v.woff2?t=1625725821604') format('woff2'),
+       url('//at.alicdn.com/t/font_2651793_erp3vwlpk0v.woff?t=1625725821604') format('woff'),
+       url('//at.alicdn.com/t/font_2651793_erp3vwlpk0v.ttf?t=1625725821604') format('truetype');
+}
+
+.lf-iconfont {
+  font-family: "lf-iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.lf-icon-xiangyou:before {
+  content: "\e6d8";
+}
+
+.lf-icon-dui:before {
+  content: "\e64d";
+}
+
+.lf-icon-jia:before {
+  content: "\e606";
+}
+
+.lf-icon-dui1:before {
+  content: "\e609";
+}
+
+.lf-icon-weixin:before {
+  content: "\e61c";
+}
+
+.lf-icon-cuowu:before {
+  content: "\e60c";
+}
+
+.lf-icon-tongzhi:before {
+  content: "\e60d";
+}

common/styles/theme.css

@@ -19,8 +19,8 @@ checkbox .uni-checkbox-input {
 radio .uni-radio-input.uni-radio-input-checked,
 checkbox .uni-checkbox-input.uni-checkbox-input-checked {
 	/* border-radius: 50%; */
-	border: 1px solid #FE9903 !important;
-	background: #FE9903 !important;
+	border: 1px solid #1998FE !important;
+	background: #1998FE !important;
 	color: #FFFFFF !important;
 }
 
@@ -45,8 +45,8 @@ checkbox .wx-checkbox-input {
 radio .wx-radio-input.wx-radio-input-checked,
 checkbox .wx-checkbox-input.wx-checkbox-input-checked {
 	border-radius: 50%;
-	border: 1px solid #FE9903 !important;
-	background: #FE9903 !important;
+	border: 1px solid #1998FE !important;
+	background: #1998FE !important;
 	color: #FFFFFF !important;
 }
 
@@ -61,11 +61,11 @@ radio:not([disabled]) .wx-radio-input:hover checkbox:not([disabled]) .wx-checkbo
 /* #endif */
 
 .lf-color-primary {
-	color: #FE9903 !important;
+	color: #1998FE !important;
 }
 
 .lf-bg-primary {
-	background: #FE9903 !important;
+	background: #1998FE !important;
 }
 
 .lf-color-secondary {

components/lf-waterfall/lf-waterfall.vue

@@ -3,7 +3,7 @@
 		<u-waterfall v-model="list">
 			<template v-slot:left="{leftList}">
 				<view class="list-warter" v-for="(item, index) in leftList" :key="index" @click="onClick">
-					<u-lazy-load threshold="-450" :image="item.image" :index="index">
+					<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.image" :index="index">
 						<view class="list-label">已售8777</view>
 					</u-lazy-load>
 					<view class="lf-p-20">
@@ -11,7 +11,8 @@
 							{{item.title}}
 						</view>
 						<view class="list-price">
-							<text>{{item.price}}元</text>
+							<!-- <text>{{item.price}}元</text> -->
+							<lf-price :price="item.price"></lf-price>
 							<text class="lf-m-l-20 lf-font-24 lf-color-666 lf-line-through">¥399.00</text>
 						</view>
 					</view>
@@ -19,7 +20,7 @@
 			</template>
 			<template v-slot:right="{rightList}">
 				<view class="list-warter" v-for="(item, index) in rightList" :key="index" @click="onClick">
-					<u-lazy-load threshold="-450" :image="item.image" :index="index">
+					<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.image" :index="index">
 						<view class="list-label">已售8777</view>
 					</u-lazy-load>
 					<view class="lf-p-20">
@@ -27,7 +28,8 @@
 							{{item.title}}
 						</view>
 						<view class="list-price">
-							<text>{{item.price}}元</text>
+							<!-- <text>{{item.price}}元</text> -->
+							<lf-price :price="item.price"></lf-price>
 							<text class="lf-m-l-20 lf-font-24 lf-color-666 lf-line-through">¥399.00</text>
 						</view>
 					</view>
@@ -139,6 +141,8 @@
 		font-size: 30rpx;
 		color: $u-type-error;
 		margin-top: 5px;
+		display: flex;
+		align-items: center;
 	}
 	// ====
 </style>

pages.json

@@ -32,7 +32,8 @@
 		{
 			"path": "pages/discover/discover",
 			"style": {
-				"navigationBarTitleText": "发现"
+				"navigationBarTitleText": "发现",
+				"navigationBarBackgroundColor": "#FFFFFF"
 			}
 		},
 		{
@@ -53,6 +54,12 @@
 				"navigationBarTitleText": "申请退款"
 			}
 		},
+		{
+			"path": "pages/order/refund_detail",
+			"style": {
+				"navigationBarTitleText": "退款详情"
+			}
+		},
 		{
 			"path": "pages/order/unpay_details",
 			"style": {
@@ -62,7 +69,8 @@
 		{
 			"path": "pages/order/order",
 			"style": {
-				"navigationBarTitleText": "我的订单"
+				"navigationBarTitleText": "我的订单",
+				"disableScroll": true
 			}
 		},
 		{
@@ -88,7 +96,8 @@
 			"path": "pages/recommList/index",
 			"style": {
 				"navigationBarTitleText": "推荐",
-				"disableScroll": true
+				"disableScroll": true,
+				"navigationBarBackgroundColor": "#FFFFFF"
 			}
 		},
 		{
@@ -132,12 +141,12 @@
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "海南旅游",
-		"navigationBarBackgroundColor": "#F8F8F8",
+		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#F8F8F8"
 	},
 	"tabBar": {
 	    "color": "#333333",
-	    "selectedColor": "#FE9903",
+	    "selectedColor": "#1998FE",
 	    "borderStyle": "black",
 	    "backgroundColor": "#ffffff",
 	    "list": [{
@@ -147,13 +156,13 @@
 	        "text": "首页" 
 	    },{
 	        "pagePath": "pages/discover/discover",
-	        "iconPath": "static/tabbar/order.png",
-	        "selectedIconPath": "static/tabbar/order-active.png",
+	        "iconPath": "static/tabbar/find.png",
+	        "selectedIconPath": "static/tabbar/find-active.png",
 	        "text": "发现"
 	    },{
 	        "pagePath": "pages/recommList/index",
-	        "iconPath": "static/tabbar/order.png",
-	        "selectedIconPath": "static/tabbar/order-active.png",
+	        "iconPath": "static/tabbar/recomm.png",
+	        "selectedIconPath": "static/tabbar/recomm-active.png",
 	        "text": "推荐"
 	    },{
 	        "pagePath": "pages/user/user",

pages/channel/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<!-- 我的频道，已选的 -->
-		<view class="title">
+		<view class="title lf-font-bold">
 			<text>我的频道</text>
 		</view>
 		<view class="lf-flex-wrap lf-p-l-5">
@@ -9,12 +9,12 @@
 				v-for="(item, key, index) in select_list" :key="index" 
 				@click="cancelItem(key)">
 				<text>{{ key }}</text>
-				<u-icon name="lock-fill" class="remove-icon"></u-icon>
+				<text class="lf-iconfont lf-icon-cuowu remove-icon"></text>
 			</view>
 		</view>
 		<!-- 机票酒店 -->
 		<view class="title lf-m-t-40">
-			<u-icon name="lock-fill"></u-icon>
+			<image src="../../static/images/plane_ticket.png" class="icon-img"></image>
 			<text class="lf-m-l-10">机票酒店</text>
 		</view>
 		<view class="lf-flex-wrap lf-p-l-5 select-box">
@@ -25,7 +25,7 @@
 		</view>
 		<!-- 旅游度假 -->
 		<view class="title lf-m-t-40">
-			<u-icon name="lock-fill"></u-icon>
+			<image src="../../static/images/travel.png" class="icon-img"></image>
 			<text class="lf-m-l-10">旅游度假</text>
 		</view>
 		<view class="lf-flex-wrap lf-p-l-5 select-box">
@@ -36,7 +36,7 @@
 		</view>
 		<!-- 接送服务 -->
 		<view class="title lf-m-t-40">
-			<u-icon name="lock-fill"></u-icon>
+			<image src="../../static/images/jieson.png" class="icon-img"></image>
 			<text class="lf-m-l-10">接送服务</text>
 		</view>
 		<view class="lf-flex-wrap lf-p-l-5 select-box">
@@ -47,7 +47,7 @@
 		</view>
 		<!-- 其他精选 -->
 		<view class="title lf-m-t-40">
-			<u-icon name="lock-fill"></u-icon>
+			<image src="../../static/images/other.png" class="icon-img"></image>
 			<text class="lf-m-l-10">其他精选</text>
 		</view>
 		<view class="lf-flex-wrap lf-p-l-5 select-box">
@@ -56,6 +56,17 @@
 				v-if="!item.checked" @click="activaItem(item, index, 'other_list')">{{ item.name }}
 			</view>
 		</view>
+		<!-- 攻略社区 -->
+		<view class="title lf-m-t-40">
+			<image src="../../static/images/strategy.png" class="icon-img"></image>
+			<text class="lf-m-l-10">攻略社区</text>
+		</view>
+		<view class="lf-flex-wrap lf-p-l-5 select-box">
+			<view class="select-item" hover-class="lf-opacity" 
+				v-for="(item, index) in strategy_list" :key="index" 
+				v-if="!item.checked" @click="activaItem(item, index, 'strategy_list')">{{ item.name }}
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -140,6 +151,16 @@
 					name: '旅盟',
 					checked: false
 				}], // 其他精选
+				strategy_list: [{
+					name: '旅游攻略',
+					checked: false
+				},{
+					name: '玩法指南',
+					checked: false
+				},{
+					name: '有问必答',
+					checked: false
+				}]
 			}
 		},
 		onLoad(){
@@ -182,7 +203,8 @@
 		color: #222222;
 		font-size: 32rpx;
 		margin-bottom: 20rpx;
-		font-weight: bold;
+		display: flex;
+		align-items: center;
 	}
 	.select-item{
 		width: 170rpx;
@@ -208,9 +230,10 @@
 		// padding: 0 10rpx;
 		.remove-icon{
 			position: absolute;
-			right: 2rpx;
-			top: 2rpx;
+			right: 0rpx;
+			top: -28rpx;
 			color: #FF0000;
+			font-size: 26rpx;
 		}
 	}
 	.lf-p-l-5{
@@ -223,4 +246,8 @@
 	// 	height: max-content;
 	// 	border-radius: 5rpx;
 	// }
+	.icon-img{
+		width: 41rpx;
+		height: 40rpx;
+	}
 </style>

pages/collect/index.vue

@@ -9,8 +9,8 @@
 					
 					<view class="lf-row-between lf-m-t-20">
 						<lf-price price="3599.00"></lf-price>
-						<view class="collect-btn" :class="{'cancel': index == 1}">
-							<u-icon name="lock-fill"></u-icon>
+						<view class="lf-row-center collect-btn" :class="{'cancel': index == 1}">
+							<text class="lf-iconfont lf-icon-dui1 lf-m-r-1" v-if="index != 1"></text>
 							<text>{{ index == 1 ? '收藏' : '已收藏' }}</text>
 						</view>
 					</view>
@@ -141,8 +141,8 @@
 		height: 63rpx;
 		border-radius: 32rpx;
 		border: 2rpx solid #1998FE;
-		text-align: center;
-		line-height: 63rpx;
+		// text-align: center;
+		// line-height: 63rpx;
 		color: #1998FE;
 		font-size: 24rpx;
 	}

pages/goodsDetail/index.vue

@@ -58,13 +58,13 @@
 				<view class="lf-row-between fixed-bottom">
 					<view class="lf-flex lf-p-t-10 lf-p-b-10">
 						<view class="lf-flex-column lf-row-center icon-item" @click="$url('/pages/index/index', {type: 'switch'})">
-							<image class="icon-img" src="../../static/center/home.png"></image>
+							<image class="icon-img" src="../../static/tabbar/home.png"></image>
 							<view class="lf-m-t-1">首页</view>
 						</view>
-						<view class="lf-flex-column lf-row-center icon-item" @click="$url('/pages/contactService/index')">
+						<button class="lf-flex-column lf-row-center icon-item" open-type="contact">
 							<image class="icon-img" src="../../static/center/service.png"></image>
 							<view class="lf-m-t-1">客服</view>
-						</view>
+						</button>
 						<view class="lf-flex-column lf-row-center icon-item" @click="switchCollect">
 							<image class="icon-img" src="../../static/center/collect-active.png" v-if="is_collect"></image>
 							<image class="icon-img" src="../../static/center/collect.png" v-else></image>
@@ -200,7 +200,7 @@
 			toAddOrder(){
 				let goods_id = this.goods_detail.id;
 				let goods_specs_id = this.goods_detail.specs[0].id
-				this.$url('/pages/order/confirm-order?goods_id='+ goods_id +'&goods_specs_id='+ goods_specs_id);
+				this.$url('/pages/order/confirm_order?goods_id='+ goods_id +'&goods_specs_id='+ goods_specs_id);
 			},
 			// 预览图片
 			lookImg(index){
@@ -368,6 +368,7 @@
 			margin-right: 10rpx;
 			padding: 0;
 			width: 88rpx;
+			position: relative;
 			&:first-child{
 				padding-left: 0;
 			}

pages/index/index.vue

@@ -12,7 +12,7 @@
 			<!-- 消息模块 -->
 			<view class="lf-row-between lf-m-b-34 message-box">
 				<view class="lf-flex">
-					<u-icon name="lock-fill lf-text-vertical"></u-icon>
+					<text class="lf-iconfont lf-icon-tongzhi lf-text-vertical"></text>
 					<view class="lf-m-l-12 lf-line-1" style="max-width: 510rpx;">国庆优惠大促，快来看看吧！</view>
 				</view>
 				<view class="message-btn" hover-class="lf-opacity" @click="$url('/pages/notice/article')">详情</view>
@@ -22,13 +22,13 @@
 				<view class="lf-font-36 lf-font-bold lf-color-333">添加频道</view>
 				<view class="lf-flex lf-color-555" @click="$url('/pages/channel/index')">
 					<view class="lf-m-r-10">编辑</view>
-					<u-icon name="lock-fill lf-text-vertical"></u-icon>
+					<view class="lf-iconfont lf-icon-xiangyou lf-text-vertical"></view>
 				</view>
 			</view>
 			<view class="lf-flex-wrap">
 				<view class="channel-item" v-for="(item, index) in 7" @click="$url('/pages/goodsList/index')">
 					<image src="../../static/logo.png" class="channel-mask" mode="aspectFill"></image>
-					<view class="lf-row-center channe-text">冲浪</view>
+					<view class="lf-row-center channe-text lf-font-bold">冲浪</view>
 					<!-- <view>
 						<u-icon name="lock-fill lf-text-vertical"></u-icon>
 					</view> -->
@@ -45,7 +45,7 @@
 				<view class="lf-font-36 lf-font-bold lf-color-333">人气爆款</view>
 				<view class="lf-flex lf-color-555" @click="$url('/pages/activityList/index')">
 					<view class="lf-m-r-10">更多</view>
-					<u-icon name="lock-fill lf-text-vertical"></u-icon>
+					<view class="lf-iconfont lf-icon-xiangyou lf-text-vertical"></view>
 				</view>
 			</view>
 			<view class="recomm lf-m-t-20 lf-m-b-30">
@@ -53,8 +53,9 @@
 					<view class="max-recomm-img" @click="$url('/pages/activityList/index')">
 						<image src="../../static/logo.png" class="lf-w-100 lf-h-100"></image>
 						<view class="recomm-title">
-							<view class="lf-line-2">土耳其双人游飞机往返酒店五星级各大热门景点豪华双人游纯江湖救急</view>
-							<view class="lf-font-42 lf-font-bold lf-m-t-10" style="color: #FF0000;">￥3999.00</view>
+							<view class="lf-line-2 lf-m-b-10">土耳其双人游飞机往返酒店五星级各大热门景点豪华双人游纯江湖救急</view>
+							<lf-price price="3999.00"></lf-price>
+							<!-- <view class="lf-font-42 lf-font-bold lf-m-t-10" style="color: #FF0000;">￥3999.00</view> -->
 						</view>
 					</view>
 					<view>
@@ -96,9 +97,12 @@
 		<!-- 商品列表-瀑布流 -->
 		<view style="padding: 0 20rpx;">
 			<lf-waterfall :list="recomm_list"></lf-waterfall>
-			<u-loadmore v-if="recomm_list.length" status="已加载全部数据~" @loadmore="addRandomData"></u-loadmore>
+			<!-- <u-loadmore v-if="recomm_list.length" status="已加载全部数据~" @loadmore="addRandomData"></u-loadmore> -->
+			<view class="loading-more">
+				<text :class="{'loading-more-text': loading_class}" v-if="recomm_list.length">{{ loading_text }}</text>
 				<lf-nocontent v-else></lf-nocontent>
 			</view>
+		</view>
 		<!-- 回到顶部 -->
 		<u-back-top :scroll-top="pageScrollTop" :custom-style="{background: 'rgba(51, 51 51, 0.3)'}"></u-back-top>
 	</view>
@@ -117,26 +121,9 @@
 			return {
 				banner_current: 0,
 				recomm_list: [],
-				tab_list: [{
-					name: '推荐',
-					list: []
-				},{
-					name: '酒店',
-					list: []
-				},{
-					name: '推荐',
-					list: []
-				},{
-					name: '酒店',
-					list: []
-				},{
-					name: '推荐',
-					list: []
-				},{
-					name: '酒店',
-					list: []
-				}],
 				current: 0,
+				loading_class: false,
+				loading_text: '已加载全部数据~',
 				list: [
 				 {
 				  price: 35,
@@ -326,12 +313,14 @@
 		.recomm-img{
 			width: 222rpx;
 			height: 222rpx;
-			border-radius: 10rpx;
+			border-radius: 5rpx;
 		}
 		.max-recomm-img{
 			width: 455rpx;
 			height: 455rpx;
 			position: relative;
+			border-radius: 5rpx;
+			overflow: hidden;
 			.recomm-title{
 				// height: 142rpx;
 				height: max-content;
@@ -342,6 +331,7 @@
 				position: absolute;
 				bottom: 0;
 				color: #FFFFFF;
+				border-radius: 0rpx 0rpx 20rpx 20rpx;
 			}
 		}
 	}

pages/message/index.vue

@@ -2,8 +2,8 @@
 	<view>
 		<view class="card" v-for="(item, index) in list" :key="index" @click="$url('/pages/message/detail')">
 			<view class="lf-row-between lf-m-b-20">
-				<view class="lf-color-black">
-					<u-icon name="lock-fill" class="lf-color-price"></u-icon>
+				<view class="lf-color-black lf-flex">
+					<text class="hot"></text>
 					<text class="lf-font-28 lf-m-l-10">收到一条新消息</text>
 				</view>
 				<view class="lf-color-gray lf-font-22">2021-7-6 23:34:53 </view>
@@ -59,6 +59,14 @@
 		padding: 20rpx;
 		border-radius: 20rpx;
 		box-sizing: border-box;
+		.hot{
+			display: inline-block;
+			margin-right: 10rpx;
+			width: 15rpx;
+			height: 15rpx;
+			border-radius: 50rpx;
+			background-color: #FF0000;
+		}
 	}
 	.lf-font-22{
 		font-size: 22rpx;

pages/order/apply_refund.vue

@@ -22,16 +22,15 @@
 			</view>
 		</view>
 		<self-line/>
-		<view class="bg-white">
-			<view class="cu-bar padding-lr">
+		<view class="bg-white padding-lr">
+			<view class="cu-bar lf-border-bottom">
 				<text class="lf-color-555 lf-font-28">可退金额</text>
 				<text class="text-price lf-font-36 lf-color-price">549.00</text>
 			</view>
-			
-			<view class="cu-bar padding-lr solid-bottom flex justify-between align-center text-center">
+			<view class="cu-bar flex justify-between align-center text-center">
 				<text class="lf-color-555 lf-font-28">订单编号</text>
 				<view>
-					<text class="margin-right lf-font-28 text-black1">2368492461046128742764</text>
+					<text class="lf-font-28 text-black1">2368492461046128742764</text>
 					<!-- <text class="text-orange lf-font-28" @click="copy(2368492461046128742764)">复制</text> -->
 				</view>
 			</view>
@@ -39,9 +38,9 @@
 		
 		<self-line/>
 		<view class="bg-white lf-m-b-6">
-			<view class="lf-p-t-30 lf-p-l-32 lf-p-b-36">
+			<view class="lf-p-t-30 lf-p-l-32 lf-p-r-32 lf-p-b-36">
 				<view class="lf-font-28 lf-color-black">退款说明</view>
-				<input type="text" value="" placeholder="请输入退款说明" class="solid-bottom lf-m-t-30" />
+				<input type="text" value="" placeholder="请输入退款说明" class="lf-m-t-30 lf-border-bottom" />
 			</view>
 		</view>
 		
@@ -50,7 +49,8 @@
 				<view style="width: 212rpx;height: 212rpx;border-radius: 10rpx;" class="bg-img" v-for="(item,index) in img_list" :key="index" @tap="showImg(index)" :data-url="img_list[index]">
 				 <image :src="img_list[index]" mode="aspectFill"></image>
 					<view class="cu-tag bg-red" @tap.stop="DelImg(index)" :data-index="index">
-						<text class='cuIcon-close'></text>
+						<!-- <text class='cuIcon-close'></text> -->
+						<text class="lf-iconfont lf-icon-cuowu lf-font-40 lf-color-price"></text>
 					</view>
 				</view>
 				<view style="width: 212rpx;height: 212rpx;border-radius: 10rpx;" class="solids" @tap="ChooseImage" v-if="img_list.length<3">

pages/order/confirm_order.vue

@@ -36,21 +36,20 @@
 			</view>
 			<view class="cu-bar padding-lr">
 				<text class="lf-color-555 lf-font-28">联系方式</text>
-				<input type="text" class="lf-color-999 lf-font-28 lf-text-right"  placeholder="请输入联系电话" />
+				<input type="text" class="lf-color-999 lf-font-28 lf-text-right" placeholder="请输入联系电话" maxlength="11" />
 			</view>
 		</view>
 		<self-line/>
 		<view class="bg-white">
 			<view class="lf-p-t-30 lf-p-l-32 lf-p-b-36">
-				<view class="lf-font-28 lf-color-555">退款说明</view>
+				<view class="lf-font-28 lf-color-555">支付方式</view>
 			</view>
 			
 			<view class="lf-p-r-32 lf-p-l-32">
 				<button class="cu-btn bg-white margin-self border-green" @tap="$url('/pages/order/order-details?order_id='+order_id,{type: 'launch'})">
-					<u-icon name="weixin-fill" class="text-green lf-font-44 lf-m-r-23"></u-icon>
+					<text class="lf-iconfont lf-icon-weixin text-green lf-font-44 lf-m-r-23"></text>
 					<text class="lf-font-32 text-green">微信支付</text>
-					
-					<u-icon name="checkmark-circle" class="lf-font-44" style="position: absolute;right: 22rpx;"></u-icon>
+					<text class="lf-iconfont lf-icon-dui lf-font-44 lf-color-primary" style="position: absolute;right: 22rpx;"></text>
 				</button>
 			</view>
 			

pages/order/order.vue

@@ -2,7 +2,7 @@
 	<view>
 		<!-- tab标签 -->
 		<view class="lf-p-r-32 lf-p-l-32">
-			<u-tabs :list="tab_list" bg-color="#F6F6F6" :is-scroll="true" :current="current" @change="change"></u-tabs>
+			<u-tabs :list="tab_list" bg-color="#F6F6F6" :is-scroll="false" :current="current" @change="change"></u-tabs>
 		</view>
 		<swiper :style="{height: 'calc('+ windowHeight +'px - 110rpx)', width: '750rpx'}" :current="current"
 			@change="swiperChange">
@@ -45,7 +45,7 @@
 					<view class="loading-more">
 						<text v-if="tab.list.length"
 							:class="{'loading-more-text': tab.loadingClass}">{{ tab.loadingText }}</text>
-						<my-nocontent v-else></my-nocontent>
+						<lf-nocontent v-else></lf-nocontent>
 					</view>
 					<!-- 回到顶部 -->
 					<u-back-top :scroll-top="pageScrollTop" :custom-style="{background: 'rgba(51, 51 51, 0.3)'}">

pages/order/order_details.vue

@@ -59,7 +59,7 @@
 			<view>
 				<self-line />
 				<view class="bg-white flex flex-direction justify-around align-center text-center padding-tb"
-					style="padding-bottom: 116rpx;">
+					style="padding-bottom: 140rpx;">
 					<view>
 						<tki-qrcode ref="qrcode" @result="qrR" :val="checkArea" :size="115" unit="px" background="#fff"
 							foreground="#000" pdground="#000" :onval="true" :loadMake="true" />
@@ -69,12 +69,16 @@
 						{{checkArea}} 
 						<text v-if="false" style="position: relative;left: 172rpx;top: -36rpx;display: inherit;" class="lf-color-blue lf-font-28" @tap="copy(checkArea)">复制</text></view>
 					</view>
-					<view style="margin-top: 10rpx;" v-if="false">
-						<view class="lf-color-green lf-font-28">
-							待使用
-							<text class="lf-iconfont lf-icon-shuaxin1 lf-font-40"
+					<view class="lf-m-t-32" v-if="false">
+						<view class="lf-color-green lf-font-28 lf-flex">
+							<text>待使用</text>
+							<!-- <text class="lf-iconfont lf-icon-shuaxin1 lf-font-40"
 								style="color: #999;position: relative;left: 84rpx;top: -42rpx;display: inherit;"
-								@tap="refreshCode()"></text>
+								@tap="refreshCode()"></text> -->
+							<image src="../../static/center/refresh.png" 
+								style="color: #999;position: relative;left: 28rpx;top: 0rpx;display: inherit; width: 30rpx;height: 30rpx;"
+								@tap="refreshCode()">
+							</image>
 						</view>
 					</view>
 					<view style="margin-top: 44rpx;" v-else>
@@ -122,16 +126,6 @@
 				checkArea: 'USI782936437829'
 			}
 		},
-		computed: {
-			total() {
-				return this.num * this.price
-			},
-			isRight() {
-				return function(val) {
-					return this.$shared.isRight(val);
-				}
-			}
-		},
 		onLoad(e) {
 			this.order_id = e.order_id
 			if (this.order_id) {

pages/order/refund_detail.vue

@@ -0,0 +1,241 @@
+<template>
+	<view>
+		<view class="lf-bg-white lf-p-t-30 lf-p-b-30 lf-p-l-32 lf-p-r-32">
+			<view class="lf-row-between">
+				<image src="../../static/logo.png" mode="aspectFill" style="width: 240rpx; height: 240rpx;border-radius: 20rpx;"></image>
+				<view class="flex-sub padding-left-sm">
+					<view class="bref-box lf-font-32 lf-color-333 lf-line-2" style="height: 88rpx;line-height: 44rpx;">
+						南澳站·潮玩旅游胜地 身处亚热带风情/玩转南澳
+					</view>
+					<view class="flex lf-m-t-25 align-center text-center">
+						<text class="block lf-color-gray lf-font-24" style="line-height: 40rpx;">数量</text>
+						<text class="lf-m-l-10 lf-color-gray lf-font-24">x 1</text>
+					</view>
+					
+					<view class="flex align-center text-center lf-m-t-25">
+						<lf-price :price="599.00" /> 
+						<view class="lf-m-l-20 lf-line-through lf-color-gray">
+							599.00
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<self-line/>
+		<view class="bg-white padding-lr">
+			<view class="cu-bar lf-border-bottom">
+				<text class="lf-color-555 lf-font-28">可退金额</text>
+				<text class="text-price lf-font-36 lf-color-price">549.00</text>
+			</view>
+			<view class="cu-bar flex justify-between align-center text-center">
+				<text class="lf-color-555 lf-font-28">订单编号</text>
+				<view>
+					<text class="lf-font-28 text-black1">2368492461046128742764</text>
+					<!-- <text class="text-orange lf-font-28" @click="copy(2368492461046128742764)">复制</text> -->
+				</view>
+			</view>
+		</view>
+		
+		<self-line/>
+		<view class="bg-white lf-m-b-6">
+			<view class="lf-p-t-30 lf-p-l-32 lf-p-r-32 lf-p-b-36">
+				<view class="lf-font-28 lf-color-black lf-m-b-20 lf-font-bold">退款说明</view>
+				<view>南澳站·潮玩旅游胜地 身处亚热带风情/玩转南澳南澳站·潮玩旅游胜地 身处亚热带风情/玩转南澳南澳站·潮玩旅游胜地 身处亚热带风情/玩转南澳</view>
+			</view>
+		</view>
+		
+		<view class="cu-form-group solid-bottom" style="padding-bottom: 20rpx;" v-if="img_list.length != 0">
+			<view class="grid col-4 grid-square flex-sub">
+				<view style="width: 212rpx;height: 212rpx;border-radius: 10rpx;" class="bg-img" v-for="(item,index) of img_list" :key="index">
+					<image :src="item.path" @tap="showImg(index)" style="width: 216rpx;height: 216rpx;" mode="aspectFill"></image>
+				</view>
+			</view>
+		</view>
+		<!-- 修饰专用 -->
+		<view style="height: 120rpx; width: 100%;"></view>
+		<view class="btn-bottom solid-top1">
+			<view class="padding-lr lf-p-t-10 lf-p-b-10  bg-white flex justify-between align-center shadow">
+				<view class="flex align-center">
+					<text class="lf-font-24 lf-font-555">实付款：</text>
+					<lf-price :price="549.00" /> 
+				</view>
+				
+				<button class="btn" @tap="submit">
+					<text class="lf-font-32 text-white">等待审核</text>
+				</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				hostImg: '',
+				img_list: [{path: 'https://t7.baidu.com/it/u=2168645659,3174029352&fm=193&f=GIF'}], // 反馈问题图片
+			}
+		},
+		methods: {
+			checkImgInfo(tempFilePath, suc){
+				uni.getImageInfo({
+					src: tempFilePath,
+					success (res) {
+						let type = res.type;
+						console.log('checkImgInfo...', type);
+						if(type == 'png' || type == 'jpeg' || type == 'jpg'){
+							suc && suc(true);
+						} else {
+							suc && suc(false);
+						}
+					},
+					fail(err) {
+						suc && suc(false);
+					}
+				})
+			},
+			// 选择图片
+			ChooseImage(e) {
+				let that = this;
+				uni.chooseImage({
+					count: 1,
+					sizeType: ['original'], // 可以指定是原图original还是压缩图compressed ，默认二者都有
+					sourceType: ['album', 'camera'], // album 从相册选图，camera 使用相机，默认二者都有
+					success: res => {
+						that.hostImg = res.tempFilePaths[0];
+						let tempFile = res.tempFiles.shift();
+						let tempFilePath = res.tempFilePaths.shift();
+						that.checkImgInfo(tempFilePath, (res) => {
+							// 过滤不是图片不是png、jpeg 格式
+							if(res){
+								if(tempFile.size > 10000000){
+									uni.showModal({
+										title: '',
+										content: '您选择的图片过大：'+ (tempFile.size / 1024000).toFixed(2) +"M，请点击确定重新上传",
+										success: res2 => {
+											if(res2.confirm){
+												uni.chooseImage({
+													count: 1,
+													sizeType: ['compressed'],
+													sourceType: ['album', 'camera'],
+													success: (res3) => {
+														let tempFilePath = res3.tempFilePaths.shift();
+														that.is_wx_reduce = true;
+														that.img_list.push(tempFilePath);
+													}
+												})
+											}
+										}
+									})
+								} else{
+									that.img_list.push(tempFilePath);
+								}
+							} else {
+								uni.showModal({
+									title: '',
+									content: '选择的图片须为jpg、jpeg或png格式',
+									showCancel: false,
+									confirmColor: '#1697EE'
+								})
+							}
+						});
+					}
+				});
+			},
+			
+			// 上传图片到服务器
+			upload(url){
+				let that = this;
+				let uploads = [];
+				// 商品banner图上传
+				if (that.img_list.length > 0) {
+					for (let i = 0; i < that.img_list.length; i++) {
+						let upload_img = new Promise((resolve, reject) => {
+							that.uploadFile(that.img_list[i], (res) => {
+								resolve(res);
+							}, (err) => {
+								reject(err);
+							});	
+						})
+						uploads.push(upload_img);
+					}
+				}
+				if(uploads.length == 0) {
+					that.realSubmitInfo([]);
+					return
+				}
+				Promise.all(uploads).then((result) => {
+					console.log('图片上传...', result)
+					let img_url_list = [];
+					if(result.length > 0){
+						img_url_list = JSON.stringify(result);
+					}
+					if(img_url_list) {
+						that.realSubmitInfo(img_url_list);
+					}
+					
+					
+				}).catch(err => {
+					console.log(err)
+					that.is_publish = false; // 恢复提交按钮
+					uni.showModal({
+						title: '',
+						content: '图片上传失败，请重新提交',
+						confirmColor: '#1697EE'
+					})
+				})
+			},
+			// 预览图片
+			showImg(index) {
+				this.$u.throttle(() => {
+					let goods_banner = this.img_list || [];
+					let banners = goods_banner.map(item => item);
+					uni.previewImage({
+						urls: banners,
+						current: index
+					})
+				}, 200);
+			},
+			
+			// 删除图片
+			DelImg(index) {
+				uni.showModal({
+					title: '提示',
+					content: '即将取消上传这张图片，请确认？',
+					success: e => {
+						if (!e.confirm) return;
+						this.img_list.splice(index, 1);
+					}
+				});
+			},
+			// 点击复制
+			copy(text) {
+				uni.setClipboardData({
+					data: text
+				});
+			},
+		}
+	}
+</script>
+
+<style>
+	.btn{
+		margin: 0;
+		padding: 0;
+		width: 212rpx;
+		height: 82rpx;
+		background-color: #777777;
+		color: #FFFFFF;
+		line-height: 80rpx;
+		font-size: 32rpx;
+		border-radius: 41rpx;
+	}
+	.bref-box {
+		text-overflow: -o-ellipsis-lastline;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+	}
+</style>

pages/order/unpay_details.vue

@@ -82,16 +82,6 @@
 				checkArea: 'USI782936437829'
 			}
 		},
-		computed: {
-			total() {
-				return this.num * this.price
-			},
-			isRight() {
-				return function(val) {
-					return this.$shared.isRight(val);
-				}
-			}
-		},
 		onLoad(e) {
 			this.order_id = e.order_id
 			if (this.order_id) {

pages/payState/paystate.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view v-if="ifpaySuccess==1" class="lf-flex lf-flex-column lf-row-round" style="margin-top: 100px;">
 			<view>
-				<image src="@/static/images/empty.png" mode="widthFix" style="height: 100px;width: 100px;"></image>
+				<image src="@/static/center/pay-success.png" mode="widthFix" style="height: 100px;width: 100px;"></image>
 			</view>
 			<view class="lf-m-t-40 lf-font-bold lf-color-black lf-font-42 lf-color-blue">订单支付成功</view>
 			<view class="lf-color-666 lf-m-t-20 lf-font-28">
@@ -11,7 +11,7 @@
 		</view>
 		<view v-else class="lf-flex lf-flex-column lf-row-round" style="margin-top: 100px;">
 			<view>
-				<image src="@/static/images/empty.png" mode="widthFix" style="height: 100px;width: 100px;"></image>
+				<image src="@/static/center/pay-fail.png" mode="widthFix" style="height: 100px;width: 100px;"></image>
 			</view>
 			<view class="lf-m-t-40 lf-font-bold lf-color-black lf-font-42 lf-color-333">订单支付失败</view>
 			<view class="lf-color-666 lf-m-t-20 lf-font-28">
@@ -20,7 +20,7 @@
 		</view>
 		<view class="margin-top flex flex-direction justify-around">
 			<view class="lf-p-r-32 lf-p-l-32">
-				<button class="cu-btn margin-self" @tap="$url('/pages/order/order-details?order_id='+order_id,{type: 'launch'})">
+				<button class="cu-btn margin-self" @tap="$url('/pages/order/order_details?order_id='+order_id,{type: 'launch'})">
 					<text class="lf-font-32 lf-color-white">查看订单</text>
 				</button>
 			</view>

pages/user/user.vue

@@ -1,67 +1,68 @@
 <template>
 	<view>
-		<view class="flex-direction bg-blue justify-between align-center text-center lf-p-t-30 lf-p-b-30" style="height: 340rpx;">
+		<view class="flex-direction justify-between align-center text-center lf-p-t-30 lf-p-b-30" style="height: 340rpx;position: relative;">
 			<view>
-				<image src="../../static/logo.png" mode="aspectFill" style="width: 200rpx;height: 200rpx;border-radius: 50%;" @click="lookImg('')"></image>
+				<image src="../../static/logo.png" mode="aspectFill" style="width: 200rpx;height: 200rpx;border-radius: 50%;border: 2rpx solid #FFFFFF;" @click="lookImg('')"></image>
 			</view>
 			<view class="lf-font-36 align-center text-center text-white lf-m-t-30">
 				小小的小可爱
 			</view>
+			<image class="bg-img" src="https://picsum.photos/seed/picsum/375/340"></image>
 		</view>
 		<view class="list">
 			<view class="lf-row-between list-item" hover-class="lf-opacity" @click="$url('/pages/order/order')">
 				<view class="lf-row-center">
-					<image class="icon-img" src="../../static/logo.png"></image>
+					<image class="icon-img" src="../../static/center/order.png"></image>
 					<text class="lf-text-vertical lf-m-l-20 lf-font-28 lf-color-black">我的订单</text>
 				</view>
 				<view>
-					<u-icon name="arrow-right" color="#777" size="28"></u-icon>
+					<text class="lf-iconfont lf-icon-xiangyou lf-text-vertical"></text>
 				</view>
 			</view>
 			<view class="lf-row-between list-item" hover-class="lf-opacity" @click="$url('/pages/message/index')">
 				<view class="lf-row-center">
-					<image class="icon-img" src="../../static/logo.png"></image>
+					<image class="icon-img" src="../../static/center/message.png"></image>
 					<text class="lf-text-vertical lf-m-l-16 lf-font-28 lf-color-black">消息中心</text>
 				</view>
 				<view>
-					<u-icon name="arrow-right" color="#777" size="28"></u-icon>
+					<text class="lf-iconfont lf-icon-xiangyou lf-text-vertical"></text>
 				</view>
 			</view>
 			<view class="lf-row-between list-item" hover-class="lf-opacity">
 				<view class="lf-row-center">
-					<image class="icon-img" src="../../static/logo.png"></image>
+					<image class="icon-img" src="../../static/center/feedback.png"></image>
 					<text class="lf-text-vertical lf-m-l-16 lf-font-28 lf-color-black">意见反馈</text>
 				</view>
 				<view>
-					<u-icon name="arrow-right" color="#777" size="28"></u-icon>
+					<text class="lf-iconfont lf-icon-xiangyou lf-text-vertical"></text>
 				</view>
 				<button class="feedback-btn" open-type="feedback"></button>
 			</view>
 			<view class="lf-row-between list-item" hover-class="lf-opacity" @click="$url('/pages/collect/index')">
 				<view class="lf-row-center">
-					<image class="icon-img" src="../../static/logo.png"></image>
+					<image class="icon-img" src="../../static/center/collect.png"></image>
 					<text class="lf-text-vertical lf-m-l-16 lf-font-28 lf-color-black">我的收藏</text>
 				</view>
 				<view>
-					<u-icon name="arrow-right" color="#777" size="28"></u-icon>
+					<text class="lf-iconfont lf-icon-xiangyou lf-text-vertical"></text>
 				</view>
 			</view>
 			<view class="lf-row-between list-item" hover-class="lf-opacity" @click="$url('/pages/about/index')">
 				<view class="lf-row-center">
-					<image class="icon-img" src="../../static/logo.png"></image>
+					<image class="icon-img" src="../../static/center/about.png"></image>
 					<text class="lf-text-vertical lf-m-l-16 lf-font-28 lf-color-black">关于我们</text>
 				</view>
 				<view>
-					<u-icon name="arrow-right" color="#777" size="28"></u-icon>
+					<text class="lf-iconfont lf-icon-xiangyou lf-text-vertical"></text>
 				</view>
 			</view>
 			<view class="lf-row-between list-item" hover-class="lf-opacity">
 				<view class="lf-row-center">
-					<image class="icon-img" src="../../static/logo.png"></image>
+					<image class="icon-img" src="../../static/center/service.png"></image>
 					<text class="lf-text-vertical lf-m-l-16 lf-font-28 lf-color-black">联系客服</text>
 				</view>
 				<view>
-					<u-icon name="arrow-right" color="#777" size="28"></u-icon>
+					<text class="lf-iconfont lf-icon-xiangyou lf-text-vertical"></text>
 				</view>
 				<button class="feedback-btn" open-type="contact"></button>
 			</view>
@@ -77,6 +78,10 @@
 			</view> -->
 			<lf-title-line title="为你推荐"></lf-title-line>
 			<lf-waterfall :list="list"></lf-waterfall>
+			<view class="loading-more">
+				<text :class="{'loading-more-text': loading_class}" v-if="list.length">{{ loading_text }}</text>
+				<lf-nocontent v-else></lf-nocontent>
+			</view>
 		</view>
 		<!-- 回到顶部 -->
 		<u-back-top :scroll-top="pageScrollTop" :custom-style="{background: 'rgba(51, 51 51, 0.3)'}"></u-back-top>
@@ -92,6 +97,8 @@
 		},
 		data() {
 			return {
+				loading_class: false,
+				loading_text: '已加载全部数据~',
 				list: [
 				     {
 				      price: 35,
@@ -242,4 +249,12 @@
 			border-bottom: none;
 		}
 	}
+	.bg-img{
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		top: 0;
+		left: 0;
+		z-index: -1;
+	}
 </style>

uview-ui/components/u-lazy-load/u-lazy-load.vue

@@ -1,15 +1,15 @@
 <template>
 	<view class="u-wrap" :style="{
 			  opacity: Number(opacity),
-			  borderRadius: borderRadius + 'rpx',
+			  borderRadius: borderRadius,
 			  // 因为time值需要改变,所以不直接用duration值(不能改变父组件prop传过来的值)
 			  transition: `opacity ${time / 1000}s ease-in-out`
 		   }"
 	 :class="'u-lazy-item-' + elIndex">
 		<view :class="'u-lazy-item-' + elIndex">
-			<image :style="{borderRadius: borderRadius + 'rpx', height: imgHeight}" v-if="!isError" class="u-lazy-item"
+			<image :style="{borderRadius: borderRadius, height: imgHeight}" v-if="!isError" class="u-lazy-item"
 			 :src="isShow ? image : loadingImg" :mode="imgMode" @load="imgLoaded" @error="loadError" @tap="clickImg"></image>
-			<image :style="{borderRadius: borderRadius + 'rpx', height: imgHeight}" class="u-lazy-item error" v-else :src="errorImg"
+			<image :style="{borderRadius: borderRadius, height: imgHeight}" class="u-lazy-item error" v-else :src="errorImg"
 			 :mode="imgMode" @load="errorImgLoaded" @tap="clickImg"></image>
 		</view>
 		<slot></slot>
@@ -87,8 +87,8 @@
 			},
 			// 圆角值
 			borderRadius: {
-				type: [Number, String],
-				default: 0
+				type: String,
+				default: 'initial'
 			},
 			// 图片高度，单位rpx
 			height: {