1004749546@qq.com 4 years ago
parent
commit
c366f3870c

+ 3 - 3
App.vue

@@ -1,6 +1,6 @@
 <script>
 <script>
-	// const uat_domain = 'https://rider.test.sxzxyj.net' // 预发布
-	const uat_domain = 'http://192.168.16.148:8309' // 本地
+	const uat_domain = 'https://rider.test.sxzxyj.net' // 预发布
+	// const uat_domain = 'http://192.168.16.148:8309' // 本地
 	const pro_domain = 'https://gather.zyucgj.cn' // 生产
 	const pro_domain = 'https://gather.zyucgj.cn' // 生产
 	const uat_URL = uat_domain+'/gc-rider/' // 预发布
 	const uat_URL = uat_domain+'/gc-rider/' // 预发布
 	const pro_URL = pro_domain+'/gc-rider/'  // 生产
 	const pro_URL = pro_domain+'/gc-rider/'  // 生产
@@ -41,7 +41,7 @@
 
 
 <style lang="scss">
 <style lang="scss">
 	@import "uview-ui/index.scss";
 	@import "uview-ui/index.scss";
-	@import "/static/iconfont/iconfont-weapp-icon.css";
+	@import "/static/iconfont/iconfont.css";
 	/*每个页面公共css */
 	/*每个页面公共css */
 	page {
 	page {
 		min-height: 100%;
 		min-height: 100%;

+ 12 - 11
pages/index/index.vue

@@ -45,10 +45,10 @@
 						<view class="flex_1 bold ellipsis-one">{{item.contactName}}</view>
 						<view class="flex_1 bold ellipsis-one">{{item.contactName}}</view>
 						<view @click="intoWaitOrderDetail(item)" class="do-btn">去处理</view>
 						<view @click="intoWaitOrderDetail(item)" class="do-btn">去处理</view>
 					</view>
 					</view>
-					 <view @click="openLocation(item)" class="greey-font flex align_center justify_between">
+					 <view class="greey-font flex align_center justify_between">
 						 <view class="dizhi ellipsis-one">{{item.contactAddress}}</view>
 						 <view class="dizhi ellipsis-one">{{item.contactAddress}}</view>
-						 <view class="flex align_center">
-							 <view class="t-icon t-icon-icon_coordinate location-icon"></view>
+						 <view @click.stop="openLocation(item)" class="flex align_center">
+							 <u-icon class="icon" name="icon_coordinate1" custom-prefix="custom-icon" size="20" color="#999999"></u-icon>
 							 <text>{{item.distance}}KM</text>
 							 <text>{{item.distance}}KM</text>
 						 </view>
 						 </view>
 					 </view>
 					 </view>
@@ -60,8 +60,9 @@
 					 </view>
 					 </view>
 				</view>
 				</view>
 			</view>
 			</view>
+			
 			<view class="nodata" v-if="listdata.length==0 && status!='loading'">
 			<view class="nodata" v-if="listdata.length==0 && status!='loading'">
-				<u-empty :text="noDataText" mode="list"></u-empty>
+				<u-empty src="/static/def_result.png" :text="noDataText" icon-size="260" ></u-empty>
 			</view>
 			</view>
 			<view class="loadmore">
 			<view class="loadmore">
 				<u-loadmore v-if="status=='loading'" :status="status" />
 				<u-loadmore v-if="status=='loading'" :status="status" />
@@ -221,13 +222,9 @@
 			},
 			},
 			// 打开回收价格页面
 			// 打开回收价格页面
 			openPrice(){
 			openPrice(){
-				if(this.hasLogin){
-					uni.navigateTo({
-						url: '/pages/recoveryPrice/index'
-					})
-				} else {
-					this.loginModal()
-				}
+				uni.navigateTo({
+					url: '/pages/recoveryPrice/index'
+				})
 			},
 			},
 			// 进入待处理订单详情
 			// 进入待处理订单详情
 			intoWaitOrderDetail(item){
 			intoWaitOrderDetail(item){
@@ -358,6 +355,9 @@
 				padding: 24rpx;
 				padding: 24rpx;
 				font-size: 36rpx;
 				font-size: 36rpx;
 			}
 			}
+			.nodata{
+				padding-top: 100rpx;
+			}
 		}
 		}
 		.list-item {
 		.list-item {
 			display: flex;
 			display: flex;
@@ -436,6 +436,7 @@
 				border: 1px solid #FF6824;
 				border: 1px solid #FF6824;
 				color: #FF6824;
 				color: #FF6824;
 			}
 			}
+			
 		}
 		}
 	}
 	}
 </style>
 </style>

+ 36 - 27
pages/order/hisOrderDetail.vue

@@ -5,8 +5,13 @@
 			<!-- 订单状态 -->
 			<!-- 订单状态 -->
 			<view class="order-status">
 			<view class="order-status">
 				<view class="status-title flex align_center justify_center">
 				<view class="status-title flex align_center justify_center">
-					<view class="t-icon icon t-icon-icon_complete"></view>
-				{{orderInfo.orderStatusDictValue || '--'}}
+					<u-icon v-if="orderInfo.orderStatusDictValue=='已完成'" class="icon" name="prescription_order_icon_success" 
+					custom-prefix="custom-icon" size="48" color="#333333"></u-icon>
+					<u-icon v-if="orderInfo.orderStatus=='CANCEL'" class="icon" name="prescription_order_icon_cancel"
+					custom-prefix="custom-icon" size="48" color="#333333"></u-icon>
+					<!-- <view  class="t-icon icon t-icon-icon_complete"></view> -->
+					<view  class="t-icon icon t-icon-prescription_order_icon_cancel"></view>
+					{{orderInfo.orderStatusDictValue || '--'}}
 				</view>
 				</view>
 				<view class="status-care">
 				<view class="status-care">
 					预约时间:{{orderInfo.reserveTime}}
 					预约时间:{{orderInfo.reserveTime}}
@@ -22,7 +27,7 @@
 				<view class="time flex align_center justify_between">
 				<view class="time flex align_center justify_between">
 					<text>{{orderInfo.contactName}}</text>
 					<text>{{orderInfo.contactName}}</text>
 					<view class="flex align_center">
 					<view class="flex align_center">
-						<view class="t-icon phone t-icon-icon_phone"></view>
+						<u-icon class="phone" name="icon_phone" custom-prefix="custom-icon" size="28" color="#999999"></u-icon>
 						<text>{{orderInfo.contactMobile}}</text>
 						<text>{{orderInfo.contactMobile}}</text>
 					</view>
 					</view>
 				</view>
 				</view>
@@ -40,9 +45,6 @@
 			</view>
 			</view>
 			<!-- 订单信息 -->
 			<!-- 订单信息 -->
 			<view class="item-info">
 			<view class="item-info">
-				<!-- <view class="item flex justify_between">
-					<text class="item-title">订单信息</text>
-				</view> -->
 				<view class="item flex justify_between">
 				<view class="item flex justify_between">
 					<text>订单编号</text>
 					<text>订单编号</text>
 					<text>{{orderInfo.orderReserveNo||'--'}}</text>
 					<text>{{orderInfo.orderReserveNo||'--'}}</text>
@@ -51,13 +53,17 @@
 					<text>下单时间</text>
 					<text>下单时间</text>
 					<text>{{orderInfo.createDate}}</text>
 					<text>{{orderInfo.createDate}}</text>
 				</view>
 				</view>
-				<view class="item flex justify_between">
+				<view v-if="orderInfo.orderStatus!='CANCEL'" class="item flex justify_between">
 					<text>服务时间</text>
 					<text>服务时间</text>
-					<text>{{orderInfo.finishDate}}</text>
+					<text>{{orderInfo.finishDate || '--'}}</text>
+				</view>
+				<view v-if="orderInfo.orderStatus=='CANCEL'" class="item flex justify_between">
+					<text>取消原因</text>
+					<text>{{orderInfo.cancelReason || '--'}}</text>
 				</view>
 				</view>
 			</view>
 			</view>
 			<!-- 回收品类明细 -->
 			<!-- 回收品类明细 -->
-			<view class="item-info">
+			<view v-if="typeData.length" class="item-info">
 				<view class="item-title flex justify_between">
 				<view class="item-title flex justify_between">
 					<text>回收品类明细</text>
 					<text>回收品类明细</text>
 				</view>
 				</view>
@@ -75,7 +81,7 @@
 			<view class="item-info">
 			<view class="item-info">
 				<view class="item flex justify_between">
 				<view class="item flex justify_between">
 					<text>应付金额</text>
 					<text>应付金额</text>
-					<text>{{orderInfo.originaAmount}} 元</text>
+					<text>{{orderInfo.originaAmount||0}} 元</text>
 				</view>
 				</view>
 				<view class="item flex justify_between">
 				<view class="item flex justify_between">
 					<text>支付方式</text>
 					<text>支付方式</text>
@@ -135,24 +141,27 @@
 						this.orderInfo.reserveTime = moment(this.orderInfo.confirmDate).format('YYYY-MM-DD') + this.orderInfo.reserveTimeTypeDictValue
 						this.orderInfo.reserveTime = moment(this.orderInfo.confirmDate).format('YYYY-MM-DD') + this.orderInfo.reserveTimeTypeDictValue
 						let data = this.$refs.rubbishType.getDataList()
 						let data = this.$refs.rubbishType.getDataList()
 						// 重组类型数据
 						// 重组类型数据
-						data.map(k =>{
-							let arr = this.orderInfo.orderReserveItemEntityList.filter(item=>{
-								return item.rubbishType == k.code
-							})
-							console.log(arr,'dddd')
-							if(arr.length) {
-								let p = {
-									typeCode: k.code,
-									name: k.dispName,
-									typeList: arr
+						if(this.orderInfo.orderReserveItemEntityList) {
+							data.map(k =>{
+								let arr = this.orderInfo.orderReserveItemEntityList.filter(item=>{
+									return item.rubbishType == k.code
+								})
+								console.log(arr,'dddd')
+								if(arr.length) {
+									let p = {
+										typeCode: k.code,
+										name: k.dispName,
+										typeList: arr
+									}
+									this.typeData.push(p)
+									console.log(p,this.typeData,'pppppp')
 								}
 								}
-								this.typeData.push(p)
-								console.log(p,this.typeData,'pppppp')
-							}
-						})
-						this.typeData.map(item=>{
-							this.typeNames = (this.typeNames ? (this.typeNames + ','):'') + item.name
-						})
+							})
+							this.typeData.map(item=>{
+								this.typeNames = (this.typeNames ? (this.typeNames + ','):'') + item.name
+							})
+						}
+						
 					} 
 					} 
 					uni.hideLoading()
 					uni.hideLoading()
 				})
 				})

+ 10 - 6
pages/order/historyOrder.vue

@@ -19,15 +19,16 @@
 					</view>
 					</view>
 					<view class="cont-bot flex align_center justify_between">
 					<view class="cont-bot flex align_center justify_between">
 						<view class="flex align_center">
 						<view class="flex align_center">
-							<view class="t-icon phone t-icon-icon_phone"></view>
+							<u-icon class="phone" name="icon_phone" custom-prefix="custom-icon" size="28" color="#999999"></u-icon>
 							<text>{{item.contactMobile}}</text>
 							<text>{{item.contactMobile}}</text>
 						</view>
 						</view>
 						<text>{{item.payTypeDictValue||'--'}}</text>
 						<text>{{item.payTypeDictValue||'--'}}</text>
 					</view>
 					</view>
 				</view>
 				</view>
 			</view>
 			</view>
-			<u-empty style="padding-top: 10vh;height: auto;" src="/static/img/def_result.png" :text="noDataText" img-width="252" img-height="176" v-if="list.length==0 && status!='loading'"
-			 mode="list"></u-empty>
+			<view class="nodata" v-if="list.length==0 && status!='loading'">
+				<u-empty src="/static/def_result.png" :text="noDataText" icon-size="260" ></u-empty>
+			</view>
 			<view v-if="index==current" style="padding: 20upx;">
 			<view v-if="index==current" style="padding: 20upx;">
 				<u-loadmore v-if="total>pageSize || status=='loading'" :status="status" />
 				<u-loadmore v-if="total>pageSize || status=='loading'" :status="status" />
 			</view>
 			</view>
@@ -122,9 +123,9 @@
 			// 总计查询
 			// 总计查询
 			getTotalData() {
 			getTotalData() {
 				historyOrderTotal({}).then(res=>{
 				historyOrderTotal({}).then(res=>{
-					if(res.status == 200) {
-						this.totalWeight = res.data.totalAllWeight/1000
-						this.totalMoney = res.data.originalAllAmount
+					if(res.status == 200 && res.data) {
+						this.totalWeight = res.data.totalAllWeight/1000 || 0
+						this.totalMoney = res.data.originalAllAmount || 0
 					} 
 					} 
 				})
 				})
 			},
 			},
@@ -208,5 +209,8 @@
 				}
 				}
 			}
 			}
 		}
 		}
+		.nodata{
+			padding-top: 30vh;
+		}
 	}
 	}
 </style>
 </style>

+ 11 - 5
pages/order/waitOrderDetail.vue

@@ -4,7 +4,8 @@
 			<!-- 订单状态 -->
 			<!-- 订单状态 -->
 			<view class="order-status">
 			<view class="order-status">
 				<view class="status-title flex align_center justify_center">
 				<view class="status-title flex align_center justify_center">
-					<view class="t-icon icon t-icon-icon_service"></view>
+					<u-icon class="icon" name="icon_service"
+					custom-prefix="custom-icon" size="48" color="#333333"></u-icon>
 				{{orderInfo.orderStatusDictValue}}
 				{{orderInfo.orderStatusDictValue}}
 				</view>
 				</view>
 				<view class="status-care">
 				<view class="status-care">
@@ -21,9 +22,6 @@
 					<view :class="['item-type', curType == item.code ? 'active' : '']" v-for="(item,index) in typeData" :key="item.id"  @click="getRow(item.code,index)">
 					<view :class="['item-type', curType == item.code ? 'active' : '']" v-for="(item,index) in typeData" :key="item.id"  @click="getRow(item.code,index)">
 						{{item.dispName}}
 						{{item.dispName}}
 					</view>
 					</view>
-					<!-- <view class="item-type">
-						纸质类
-					</view> -->
 				</view>
 				</view>
 				<view class="table">
 				<view class="table">
 					<view>单价(元/kg)</view>
 					<view>单价(元/kg)</view>
@@ -62,7 +60,7 @@
 				<view class="time flex align_center justify_between">
 				<view class="time flex align_center justify_between">
 					<text>{{orderInfo.contactName}}</text>
 					<text>{{orderInfo.contactName}}</text>
 					<view class="flex align_center">
 					<view class="flex align_center">
-						<view class="t-icon phone t-icon-icon_phone"></view>
+						<u-icon class="phone" name="icon_phone" custom-prefix="custom-icon" size="28" color="#999999"></u-icon>
 						<text>{{orderInfo.contactMobile}}</text>
 						<text>{{orderInfo.contactMobile}}</text>
 					</view>
 					</view>
 				</view>
 				</view>
@@ -143,6 +141,14 @@
 			}
 			}
 		},
 		},
 		methods: {
 		methods: {
+			// 小数点后两位
+			numberToFixed: function (item,key, num) {
+			  let val = item[key]
+			  let ret = numberToFixed(val, num, 999999)
+			  this.$nextTick(() => {
+				item[key] = Number(ret)
+			  })
+			},
 			// 获取订单详情
 			// 获取订单详情
 			getOrderDetail() {
 			getOrderDetail() {
 				uni.showLoading({
 				uni.showLoading({

+ 39 - 46
pages/recoveryPrice/index.vue

@@ -24,11 +24,12 @@
 									<view>{{index==0?item.customerPrice:item.factoryPrice}}元/kg</view>
 									<view>{{index==0?item.customerPrice:item.factoryPrice}}元/kg</view>
 								</view>
 								</view>
 							</view>
 							</view>
-						</view>
-						<u-empty style="padding-top: 10vh;height: auto;" src="/static/img/def_result.png" :text="noDataText" img-width="252" img-height="176" v-if="list.length==0 && status!='loading'"
-						 mode="list"></u-empty>
-						<view v-if="index==current" style="padding: 20upx;">
-							<u-loadmore v-if="total>pageSize || status=='loading'" :status="status" />
+							<view v-if="index==current" style="padding: 20upx;">
+								<u-loadmore v-if="total>pageSize || status=='loading'" :status="status" />
+							</view>
+							<view class="nodata" v-if="list.length==0 && status!='loading'">
+								<u-empty src="/static/def_result.png" :text="noDataText" icon-size="260" ></u-empty>
+							</view>
 						</view>
 						</view>
 					</scroll-view>
 					</scroll-view>
 				</swiper-item>
 				</swiper-item>
@@ -145,54 +146,43 @@
 				this.curType = v
 				this.curType = v
 				this.getRow()
 				this.getRow()
 			},
 			},
-			// scroll-view到底部加载更多
-			// onreachBottom() {
-			// 	this.action = 'onreachBottom'
-			// 	if (this.list.length < this.total) {
-			// 		this.pageNo += 1
-			// 		this.getRow()
-			// 	} else {
-			// 		if(this.list.length) {
-			// 			uni.showToast({
-			// 				title: '已经到底了',
-			// 				icon: 'none'
-			// 			});
-			// 		}
-			// 		this.status = "nomore"
-			// 	}
-			// },
 			// 查询列表
 			// 查询列表
 			getRow() {
 			getRow() {
 				this.status = "loading"
 				this.status = "loading"
 				reservePriceFind({code:this.curType}).then(res => {
 				reservePriceFind({code:this.curType}).then(res => {
 					if (res.status == 200) {
 					if (res.status == 200) {
 						this.list = res.data
 						this.list = res.data
-						// 纸质
-						if(this.curType == 'PAPER'){
-							this.list[0].icon = '/static/price/icon_aper_yellow.png'
-							this.list[1].icon = '/static/price/icon_aper_flower.png'
-							this.list[2].icon = '/static/price/icon_book.png'
-							this.list[3].icon = '/static/price/icon_magazine.png'
-							this.list[4].icon = '/static/price/icon_aper_miscellaneous.png'
-							this.list[5].icon = '/static/price/icon_newspaper.png'
-						}
-						// 衣物
-						if(this.curType == 'CLOTHES'){
-							this.list[0].icon = '/static/price/icon_clothes.png'
-						}
-						// 金属
-						if(this.curType == 'METAL'){
-							this.list[0].icon = '/static/price/icon_iron_thin.png'
-							this.list[1].icon = '/static/price/icon_iron_thick.png'
-							this.list[2].icon = '/static/price/icon_steel.png'
-						}
-						// 塑料类
-						if(this.curType == 'PLASTIC'){
-							this.list[0].icon = '/static/price/icon_frame_white.png'
-							this.list[1].icon = '/static/price/icon_frame_black.png'
-							this.list[2].icon = '/static/price/icon_acrylic.png'
-							this.list[3].icon = '/static/price/icon_bottle.png'
+						if(this.list && this.list.length) {
+							// 纸质
+							if(this.curType == 'PAPER'){
+								this.list[0].icon = '/static/price/icon_aper_yellow.png'
+								this.list[1].icon = '/static/price/icon_aper_flower.png'
+								this.list[2].icon = '/static/price/icon_book.png'
+								this.list[3].icon = '/static/price/icon_magazine.png'
+								this.list[4].icon = '/static/price/icon_aper_miscellaneous.png'
+								this.list[5].icon = '/static/price/icon_newspaper.png'
+							}
+							// 衣物
+							if(this.curType == 'CLOTHES'){
+								this.list[0].icon = '/static/price/icon_clothes.png'
+							}
+							// 金属
+							if(this.curType == 'METAL'){
+								this.list[0].icon = '/static/price/icon_iron_thin.png'
+								this.list[1].icon = '/static/price/icon_iron_thick.png'
+								this.list[2].icon = '/static/price/icon_steel.png'
+							}
+							// 塑料类
+							if(this.curType == 'PLASTIC'){
+								this.list[0].icon = '/static/price/icon_frame_white.png'
+								this.list[1].icon = '/static/price/icon_frame_black.png'
+								this.list[2].icon = '/static/price/icon_acrylic.png'
+								this.list[3].icon = '/static/price/icon_bottle.png'
+							}
+						}else{
+							this.noDataText = '暂无数据'
 						}
 						}
+						
 					} else {
 					} else {
 						this.list = []
 						this.list = []
 						this.total = 0
 						this.total = 0
@@ -304,6 +294,9 @@
 									}
 									}
 								}
 								}
 							}
 							}
+							.nodata{
+								padding-top: 120rpx;
+							}
 						}
 						}
 					}
 					}
 				}
 				}

+ 4 - 5
pages/recoveryTotal/index.vue

@@ -29,7 +29,7 @@
 					<view>{{item.originalAllAmount || 0}}</view>
 					<view>{{item.originalAllAmount || 0}}</view>
 				</view>
 				</view>
 				<view class="nodata" v-if="listdata.length==0 && status!='loading'">
 				<view class="nodata" v-if="listdata.length==0 && status!='loading'">
-					<u-empty :text="noDataText" mode="list"></u-empty>
+					<u-empty src="/static/def_result.png" :text="noDataText" icon-size="260"></u-empty>
 				</view>
 				</view>
 				<view class="loadmore">
 				<view class="loadmore">
 					<u-loadmore v-if="total>pageSize || status=='loading'" :status="status" />
 					<u-loadmore v-if="total>pageSize || status=='loading'" :status="status" />
@@ -215,12 +215,11 @@
 			.item:last-of-type{
 			.item:last-of-type{
 				border-bottom: none;
 				border-bottom: none;
 			}
 			}
+			.nodata{
+				padding-top: 120rpx;
+			}
 		}
 		}
 		.footer{
 		.footer{
-			z-index: 9999;
-			// position: absolute;
-			// bottom: 30upx;
-			// margin: 20upx;
 			width: 95%;
 			width: 95%;
 			height: 80upx;
 			height: 80upx;
 			background-color: #0DC55F;
 			background-color: #0DC55F;

+ 6 - 5
pages/userCenter/index.vue

@@ -19,28 +19,29 @@
 		<view class="list-container">
 		<view class="list-container">
 			<navigator v-if="hasLogin" url="/pages/order/historyOrder" class="list-item flex align_center justify_between">
 			<navigator v-if="hasLogin" url="/pages/order/historyOrder" class="list-item flex align_center justify_between">
 				<view class="flex align_center">
 				<view class="flex align_center">
-					<view class="t-icon icon t-icon-icon_order"></view>
+					<u-icon class="icon" name="icon_order" custom-prefix="custom-icon" size="48" color="#333333"></u-icon>
 					<text>历史订单</text>
 					<text>历史订单</text>
 				</view>
 				</view>
 				<u-icon name="arrow-right" color="#9DA8B5" size="32"></u-icon>
 				<u-icon name="arrow-right" color="#9DA8B5" size="32"></u-icon>
 			</navigator>
 			</navigator>
 			<navigator v-if="hasLogin" url="/pages/recoveryTotal/index" class="list-item flex align_center justify_between">
 			<navigator v-if="hasLogin" url="/pages/recoveryTotal/index" class="list-item flex align_center justify_between">
 				<view class="flex align_center">
 				<view class="flex align_center">
-					<view class="t-icon icon t-icon-icon_statistics"></view>
+					<!-- <view class="t-icon icon t-icon-icon_statistics"></view> -->
+					<u-icon class="icon" name="icon_statistics" custom-prefix="custom-icon" size="48" color="#333333"></u-icon>
 					<text>回收统计</text>
 					<text>回收统计</text>
 				</view>
 				</view>
 				<u-icon name="arrow-right" color="#9DA8B5" size="32"></u-icon>
 				<u-icon name="arrow-right" color="#9DA8B5" size="32"></u-icon>
 			</navigator>
 			</navigator>
 			<navigator v-if="hasLogin" url="/pages/userCenter/changePwd" class="list-item flex align_center justify_between">
 			<navigator v-if="hasLogin" url="/pages/userCenter/changePwd" class="list-item flex align_center justify_between">
 				<view class="flex align_center">
 				<view class="flex align_center">
-					<view class="t-icon icon t-icon-icon_modify"></view>
+					<u-icon class="icon" name="icon_modify" custom-prefix="custom-icon" size="48" color="#333333"></u-icon>
 					<text>修改密码</text>
 					<text>修改密码</text>
 				</view>
 				</view>
 				<u-icon name="arrow-right" color="#9DA8B5" size="32"></u-icon>
 				<u-icon name="arrow-right" color="#9DA8B5" size="32"></u-icon>
 			</navigator>
 			</navigator>
 			<view @click="checkUpdate" class="list-item flex align_center justify_between">
 			<view @click="checkUpdate" class="list-item flex align_center justify_between">
 				<view class="flex align_center">
 				<view class="flex align_center">
-					<u-icon class="icon" name="error-circle" color="#5c655eb0" size="48"></u-icon>
+					<u-icon class="icon" name="personal_icon_version" custom-prefix="custom-icon" size="48" color="#333333"></u-icon>
 					<text>版本检查</text>
 					<text>版本检查</text>
 				</view>
 				</view>
 				<view>
 				<view>
@@ -50,7 +51,7 @@
 			</view>
 			</view>
 			<view v-if="hasLogin" @click="quitSys" class="list-item flex align_center justify_between">
 			<view v-if="hasLogin" @click="quitSys" class="list-item flex align_center justify_between">
 				<view class="flex align_center">
 				<view class="flex align_center">
-					<view class="t-icon icon t-icon-icon_out"></view>
+					<u-icon class="icon" name="icon_out" custom-prefix="custom-icon" size="48" color="#333333"></u-icon>
 					<text>退出登录</text>
 					<text>退出登录</text>
 				</view>
 				</view>
 				<u-icon name="arrow-right" color="#9DA8B5" size="32"></u-icon>
 				<u-icon name="arrow-right" color="#9DA8B5" size="32"></u-icon>

BIN
static/def_result.png


File diff suppressed because it is too large
+ 0 - 21
static/iconfont/iconfont-weapp-icon.css


File diff suppressed because it is too large
+ 3 - 0
static/iconfont/iconfont.css


Some files were not shown because too many files changed in this diff