zhangdan 4 years ago
parent
commit
883ae82e03
3 changed files with 13 additions and 12 deletions
  1. 2 1
      App.vue
  2. 9 9
      pages/index/index.vue
  3. 2 2
      pages/userCenter/index.vue

+ 2 - 1
App.vue

@@ -41,7 +41,8 @@
 
 <style lang="scss">
 	@import "uview-ui/index.scss";
-	@import "/static/iconfont-weapp-icon.css";
+	// @import "/static/iconfont-weapp-icon.css";
+	@import "/static/iconfont/iconfont.css";
 	/*每个页面公共css */
 	page {
 		min-height: 100%;

+ 9 - 9
pages/index/index.vue

@@ -11,7 +11,7 @@
 			<!-- 接单信息 -->
 			<view class="bottom-new-notice" v-if="orderStatusText">
 				<view class="notice-content">
-					<view class="notice-content-item"><span class="t-icon t-icon-home_icon_bells"></span><span class="item-title">最新通知</span></view>
+					<view class="notice-content-item"><u-icon class="icon" name="home_icon_bells" custom-prefix="custom-icon" size="38" color="#333"></u-icon></span><span class="item-title">最新通知</span></view>
 					<view class="notice-content-item">骑手<span>{{orderStatusText ? orderStatusText :''}},</span>请耐心等待</view>
 					<view class="notice-content-item">{{orderTime ? orderTime :''}}</view>
 				</view>
@@ -28,29 +28,29 @@
 			<view class="bottom-statistics">
 				<view class="statistics-rubbishType">
 					<view class="statistics-box" v-if="rubbishPaperList.length">
-						<view class="rubbishType-type"><span class="t-icon t-icon-home_icon_paper" style="display: inline-block;margin-right:10upx;"></span>{{rubbishPaperName ? rubbishPaperName :''}}</view>
+						<view class="rubbishType-type"><u-icon class="icon" name="home_icon_paper" custom-prefix="custom-icon" size="36" color="#333"></u-icon><span style="display:in;ine-block; margin-left:10upx">{{rubbishPaperName ? rubbishPaperName :''}}</span></view>
 						<view v-for="item in rubbishPaperList" class="rubbishType-item">
-							<span>{{item.name ? item.name+':' :''}}</span><span>{{item.customerPrice ? (item.customerPrice).toFixed(2)/1 :0}} 元/kg</span>
+							<span>{{item.name ? item.name :''}}</span><span>{{item.customerPrice ? ':'+(item.customerPrice).toFixed(2)/1+'元/kg' :''}} </span>
 						</view>
 					</view>
 					<view class="statistics-box" v-if="rubbishYWList.length">
-						<view class="rubbishType-type"><span class="t-icon t-icon-home_icon_clothing" style="display: inline-block;margin-right:10upx;"></span>{{rubbishYWName ? rubbishYWName :''}}</view>
+						<view class="rubbishType-type"><u-icon class="icon" name="home_icon_clothing" custom-prefix="custom-icon" size="36" color="#333"></u-icon><span style="display:in;ine-block; margin-left:10upx">{{rubbishYWName ? rubbishYWName :''}}</span></view>
 						<view v-for="item in rubbishYWList" class="rubbishType-item">
-							<view>{{item.name ? item.name+':' :''}}{{item.customerPrice ? (item.customerPrice).toFixed(2)/1 :0}} 元/kg</view>
+							<span>{{item.name ? item.name :''}}</span><span>{{item.customerPrice ? ':'+(item.customerPrice).toFixed(2)/1+'元/kg' :''}} </span>
 						</view>
 					</view>
 				</view>
 				<view class="statistics-rubbishType">
 					<view class="statistics-box" v-if="rubbishSLList.length">
-						<view class="rubbishType-type"><span class="t-icon t-icon-home_icon_plastic" style="display: inline-block;margin-right:10upx;"></span>{{rubbishSLName ? rubbishSLName :''}}</view>
+						<view class="rubbishType-type"><u-icon class="icon" name="home_icon_plastic" custom-prefix="custom-icon" size="36" color="#333"></u-icon><span style="display:in;ine-block; margin-left:10upx">{{rubbishSLName ? rubbishSLName :''}}</span></view>
 						<view v-for="item in rubbishSLList" class="rubbishType-item">
-							<view>{{item.name ? item.name+':' :''}}{{item.customerPrice ? (item.customerPrice).toFixed(2)/1 :0}} 元/kg</view>
+							<span>{{item.name ? item.name :''}}</span><span>{{item.customerPrice ? ':'+(item.customerPrice).toFixed(2)/1+'元/kg' :''}} </span>
 						</view>
 					</view>
 					<view class="statistics-box" v-if="rubbishJSList.length">
-						<view class="rubbishType-type"><span class="t-icon t-icon-home_icon_metal" style="display: inline-block;margin-right:10upx;"></span>{{rubbishJSName ? rubbishJSName :''}}</view>
+						<view class="rubbishType-type"><u-icon class="icon" name="home_icon_metal" custom-prefix="custom-icon" size="36" color="#333"></u-icon><span style="display:in;ine-block; margin-left:10upx">{{rubbishJSName ? rubbishJSName :''}}</span></view>
 						<view v-for="item in rubbishJSList" class="rubbishType-item">
-							<view>{{item.name ? item.name+':' :''}}{{item.customerPrice ? (item.customerPrice).toFixed(2)/1 :0}} 元/kg</view>
+							<span>{{item.name ? item.name :''}}</span><span>{{item.customerPrice ? ':'+(item.customerPrice).toFixed(2)/1+'元/kg' :''}} </span>
 						</view>
 					</view>
 				</view>

+ 2 - 2
pages/userCenter/index.vue

@@ -21,7 +21,7 @@
 		<view class="list-container">
 			<view @click="checkUpdate" class="list-item flex align_center justify_between">
 				<view class="flex align_center">
-					<u-icon class="icon" name="personal_icon_version" custom-prefix="custom-icon" size="48" color="#333333"></u-icon>
+					<u-icon class="icon" name="personal_icon_version" custom-prefix="custom-icon" size="48" color="#333"></u-icon>
 					<text>版本检查</text>
 				</view>
 				<view>
@@ -31,7 +31,7 @@
 			</view>
 			<view v-if="hasLogin" @click="quitSys" class="list-item flex align_center justify_between">
 				<view class="flex align_center">
-					<u-icon class="icon" name="icon_out" custom-prefix="custom-icon" size="48" color="#333333"></u-icon>
+					<u-icon class="icon" name="icon_out" custom-prefix="custom-icon" size="48" color="#333"></u-icon>
 					<text>退出登录</text>
 				</view>
 				<u-icon name="arrow-right" color="#9DA8B5" size="32"></u-icon>