Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx

pages/mine/index.vue

@@ -54,7 +54,9 @@
 					<view v-for="(item, index) in orderList" :key="index" @click="toOtherPage(item.link)">
 						<image :src="item.img"></image>
 						<view>{{ item.title }}</view>
-						<view class="order-num" v-if="item.number">{{ item.number }}</view>
+						<view class="order-num" v-if="item.number">
+							<text>{{ item.number }}</text>
+						</view>
 					</view>
 					<!-- <view @click="toOtherPage('/order/Index?current=1')">
 						<image src="/static/image/mine/6.png"></image>
@@ -179,7 +181,7 @@ export default {
 				{
 					name: 'wait_evaluation',
 					title: '待评价',
-					img: '/static/image/mine/3.png',
+					img: '/static/image/mine/40.png',
 					link: '/order/Index?current=6',
 					number: '',
 				},
@@ -209,7 +211,7 @@ export default {
 		this.getOrderNumber();
 	},
 	onNavigationBarButtonTap(e) {
-		console.log(e);
+		// console.log(e);
 		if(e.index == 0) this.$u.route('/pageE/setting/Index');
 	},
     methods: {
@@ -237,7 +239,7 @@ export default {
 			})
 		},
 		toOtherPage(url) {
-			console.log(url);
+			// console.log(url);
 			uni.navigateTo({
 				url: '/pageE' + url
 			});
@@ -410,11 +412,15 @@ export default {
 					align-items: center;
 					justify-content: space-between;
 					position: relative;
-					.order-num {
-						z-index: 9;
+					.order-num{
 						position: absolute;
 						top: -12rpx;
-						right: -16rpx;
+						right: -38rpx;
+						width: 50rpx;
+					}
+					.order-num > text {
+						z-index: 9;
+						float: left;
 						border: 1rpx solid #FF7807;
 						height: 24rpx;
 						border-radius: 12rpx;
@@ -441,7 +447,7 @@ export default {
 					@include image-size($image-width: 35rpx, $image-height: 35rpx);
 				}
 				> view:nth-child(5){
-					@include image-size($image-width: 37rpx, $image-height: 37rpx);
+					@include image-size($image-width: 43rpx, $image-height: 35rpx);
 				}
 				> view:nth-child(6){
 					@include image-size($image-width: 33rpx, $image-height: 35rpx);