Merge branch 'develop' into uat

src/pages.json

@@ -312,7 +312,7 @@
 			"path": "pages/UserAgreement/UserAgreement",
 			"style": {
 				"navigationStyle": "custom",
-				"navigationBarTitleText": "消费用户协议",
+				"navigationBarTitleText": "用户服务协议",
 				"enablePullDownRefresh": false
 			}
 

src/pages/SchoolReport/SchoolReport.vue

@@ -2620,9 +2620,9 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
 						return
 					}
 					this.mealPalData = data.obj || [];
-					this.mealPalArr = this.mealPalData.map(v => v.mealpalname.slice(0, 1) +
-						'**');
-					this.mealPalStr = this.mealPalArr.join('、');
+					this.mealPalArr = this.mealPalData.length?this.mealPalData.map(v => v.mealpalname.slice(0, 1) +
+						'**'):[];
+					this.mealPalStr = this.mealPalArr.length?this.mealPalArr.join('、'):'';
 				} catch (e) {
 					//TODO handle the exception
 					console.log(e);
@@ -2638,7 +2638,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
 				var breakfastArr = this.mealtimeTrendsData.filter(e => e.mealtype == mealtype);
 				var breakfastAbnormalArr = [];
 				var breakfastAbnormalStr = '';
-				if (breakfastArr && breakfastArr[0].cateringList) {
+				if (breakfastArr.length && breakfastArr[0].cateringList) {
 					breakfastAbnormalArr = breakfastArr[0].cateringList.filter(e => e.repastType == 2 || e.repastType == 3)
 						.map(e => e.repasttime.slice(8, 9) ? e.repasttime.slice(8) : e.repasttime.slice(8, 9))
 					if (breakfastAbnormalArr.length > 1) {
@@ -2676,16 +2676,16 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
 					if (data.obj) {
 						this.mealtimeTrendsData = data.obj
 					}
-					if (data.obj && data.obj.filter(e => e.mealtype == 1) && data.obj.filter(e => e.mealtype == 1)[0]
-						.cateringList) {
+					if (data.obj && data.obj.filter(e => e.mealtype == 1).length && data.obj.filter(e => e.mealtype ==
+							1)[0].cateringList) {
 						this.mealtypeArr.push(1)
 					}
-					if (data.obj && data.obj.filter(e => e.mealtype == 2 && data.obj.filter(e => e.mealtype == 2)[0]
-							.cateringList)) {
+					if (data.obj && data.obj.filter(e => e.mealtype == 2).length && data.obj.filter(e => e.mealtype == 2)[0]
+							.cateringList) {
 						this.mealtypeArr.push(2)
 					}
-					if (data.obj && data.obj.filter(e => e.mealtype == 3 && data.obj.filter(e => e.mealtype == 3)[0]
-							.cateringList)) {
+					if (data.obj && data.obj.filter(e => e.mealtype == 3).length && data.obj.filter(e => e.mealtype == 3)[0]
+							.cateringList) {
 						this.mealtypeArr.push(3)
 					}
 				} catch (e) {

src/pages/StudentPayment/PayProgress/PayProgress.vue

@@ -64,7 +64,7 @@
 					</view>
 					<!-- 没有数据 -->
 					<view class="noData" v-else>
-						<image style="width: 301rpx;height: 258rpx;" :src="ImgUrl+'StudentPayment/NoRecord.png'"
+						<image style="width: 474rpx;height: 235rpx;" :src="ImgUrl+'xzf/noData-06.png'"
 							mode='widthFix'></image>
 						<view>暂无数据</view>
 					</view>
@@ -99,9 +99,8 @@
 					</view>
 					<!-- 没有数据 -->
 					<view class="noData" v-else>
-						<image style="width: 290rpx;height: 242rpx;" :src="ImgUrl+'StudentPayment/development.png'"
+						<image style="width: 474rpx;height: 235rpx;" :src="ImgUrl+'xzf/noData-06.png'"
 							mode='widthFix'></image>
-						<view>程序员正在玩命加载</view>
 						<view class="bottomtxt">暂无数据</view>
 					</view>
 				</view>

src/pages/StudentPayment/PayProject/PayProject.vue

@@ -30,9 +30,9 @@
 					</view>
 					<!-- 没有数据 -->
 					<view class="noData" v-else>
-						<image style="width: 301rpx;height: 258rpx;" :src="ImgUrl+'StudentPayment/NoRecord.png'"
+						<image style="width: 474rpx;height: 235rpx;" :src="ImgUrl+'xzf/noData-06.png'"
 							mode='widthFix'></image>
-						<view>暂无收费项目</view>
+						<view>暂无数据</view>
 					</view>
 				</view>
 			</van-tab>
@@ -73,10 +73,9 @@
 					</view>
 					<!-- 没有数据 -->
 					<view class="noData" v-else>
-						<image style="width: 290rpx;height: 242rpx;" :src="ImgUrl+'StudentPayment/development.png'"
+						<image style="width: 474rpx;height: 235rpx;" :src="ImgUrl+'xzf/noData-06.png'"
 							mode='widthFix'></image>
-						<view>正在玩命加载</view>
-						<view class="bottomtxt">暂无历交费项目</view>
+						<view class="bottomtxt">暂无数据</view>
 					</view>
 				</view>
 			</van-tab>