Merge branch 'master' of http://1.95.212.35:13000/root/leromro-mini

pages/classify.vue

@@ -10,8 +10,8 @@
 			</up-tabs>
 			<view class="list">
 				<List :data="data" v-if="data.length > 0" />
-				<view v-else class="empty-null">
-					<img src="/static/empty/订单为空.png" alt="">
+				<view v-else>
+					 <NoneView value="您还没有相关订单"/>
 				</view>
 			</view>
 		</view>
@@ -42,6 +42,7 @@
 		onShow
 	} from '@dcloudio/uni-app';
 	import OrderList from '@/pages/common/classify/orderlist.vue'
+	import NoneView from '@/components/NoneView/index.vue'
 	import {
 		userMainOrderList,
 		systemDictdaTalist

pages/mine.vue

@@ -2,8 +2,7 @@
 	<view class="mine-container">
 
 		<view class="mine-header">
-			<img :src="userInfo.avatar" alt="" style="width: 136rpx;height: 136rpx;">
-
+			<up-image width="136rpx" height="136rpx"  :show-loading="true" :src="userInfo.avatar" ></up-image>
 			<view class="header-info">
 				<text class="info-name">{{ userInfo.nickName }}</text>
 				<text class="info-id">ID: {{ data.volunteerId }}</text>

store/modules/user.ts

@@ -71,7 +71,7 @@ const user: Module<UserState, UserState> = {
       return new Promise((resolve, reject) => {
         getInfo().then((res: any) => {
           const user = res.user
-          const avatar = (user == null || user.avatar == "" || user.avatar == null) ? "/static/serverImg/mine/user.png" : baseUrl + user.avatar
+          const avatar = (user == null || user.avatar == "" || user.avatar == null) ? "/static/serverImg/mine/user.png" :  user.avatar
           const username = (user == null || user.userName == "" || user.userName == null) ? "" : user.userName
           if (res.roles && res.roles.length > 0) {
             commit('SET_ROLES', res.roles)