前端页面bug修复

imcs-bt-fe/imcs-bt-fe/uni-mall/pages/device/device.vue

@@ -3,9 +3,9 @@
 		<view class="device-list">
 			<navigator :url="'../device/deviceDetail?id='+item.id" class="item" v-for="(item, index) in deviceList"
 				:key="index">
-				<view class="img-bg">
-					<image :src="item.imgUrl" background-size="cover" v-if="item.imgUrl"></image>
-					<image :src="item.pic" background-size="cover" v-if="item.pic"></image>
+				<view>
+					<image class="img-bg" :src="item.imgUrl" background-size="cover" v-if="item.imgUrl"></image>
+					<image class="img-bg" :src="item.pic" background-size="cover" v-if="item.pic"></image>
 				</view>
 				<view class="txt-box">
 					<view class="line">
@@ -99,8 +99,7 @@
 	}
 	.device-list .item {
 		display: block;
-		width: 750rpx;
-		height: 416rpx;
+		height: 456rpx;
 		position: relative;
 		margin-bottom: 4rpx;
 	}
@@ -110,8 +109,8 @@
 		left: 0;
 		top: 0;
 		z-index: 0;
-		width: 750rpx;
-		height: 417rpx;
+		width: 100%;
+		height: 380rpx;
 		overflow: hidden;
 	}
 
@@ -126,7 +125,7 @@
 		top: 0;
 		display: table;
 		z-index: 0;
-		width: 750rpx;
+		width: 100%;
 		height: 417rpx;
 	}
 
@@ -151,7 +150,7 @@
 	}
 	.device-list .status {
 		position: absolute;
-		right: 10%;
+		right: 8%;
 		top: 40%;
 		vertical-align: middle;
 		text-align: center;		
@@ -176,7 +175,7 @@
 	   color: #000;
 	   font-size: 30rpx;
 	   position: absolute;
-	   left: 40%;
+	   left: 45%;
 	   bottom: 0; 
 	}
 </style>

imcs-bt-fe/imcs-bt-fe/uni-mall/pages/ucenter/index/index.vue

@@ -56,7 +56,7 @@
 					<text class="txt">帮助中心</text>
 				</navigator>
 			</view>
-			<view class="item item-bottom">
+			<view class="item item-bottom" v-show="false">
 				<navigator url="/pages/ucenter/feedback/feedback" class="a">
 					<text class="icon feedback"></text>
 					<text class="txt">意见反馈</text>

imcs-bt-fe/imcs-bt-fe/uni-mall/pages/ucenter/order/order.vue

@@ -105,7 +105,7 @@
 				array: [{
 					id: "",
 					name: '全部'
-				},{id:"0", name: '未支付'},{id:"1", name: '已支付'},{id:"2", name:'已取消'},{id:"3", name:'生产完成'},{id:"4", name: '异常'},{id:"5", name: '转入退款'},{id:"6", name: '其它'}],
+				},{id:"0", name: '未支付'},{id:"1", name: '已支付'},{id:"2", name:'已取消'},{id:"3", name:'生产完成'},{id:"4", name: '异常'},{id:"5", name: '转入退款'},{id:"6", name: '取杯完成'}],
 				orderList: [
 					/*{
 					name: '美式咖啡',