Skip to content

X
xzf_uniapp-wechat-web
Commit 0fc1b99a authored by 符伟's avatar 符伟
Browse files
Options

Merge branch 'develop' into uat

parents 9cd7b8d2 eb3c6b7f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 551 additions and 19 deletions
src/pages.json
View file @ 0fc1b99a
...@@ -312,7 +312,7 @@ ...@@ -312,7 +312,7 @@
"path": "pages/UserAgreement/UserAgreement", "path": "pages/UserAgreement/UserAgreement",
"style": { "style": {
"navigationStyle": "custom", "navigationStyle": "custom",
"navigationBarTitleText": "消费用户协议", "navigationBarTitleText": "用户服务协议",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
......
src/pages/BankModule/Recharge/Recharge.vue
View file @ 0fc1b99a
This diff is collapsed.
src/pages/SchoolReport/SchoolReport.vue
View file @ 0fc1b99a
...@@ -2620,9 +2620,9 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -2620,9 +2620,9 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
return return
} }
this.mealPalData = data.obj || []; this.mealPalData = data.obj || [];
this.mealPalArr = this.mealPalData.map(v => v.mealpalname.slice(0, 1) + this.mealPalArr = this.mealPalData.length?this.mealPalData.map(v => v.mealpalname.slice(0, 1) +
'**'); '**'):[];
this.mealPalStr = this.mealPalArr.join('、'); this.mealPalStr = this.mealPalArr.length?this.mealPalArr.join('、'):'';
} catch (e) { } catch (e) {
//TODO handle the exception //TODO handle the exception
console.log(e); console.log(e);
...@@ -2638,7 +2638,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -2638,7 +2638,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
var breakfastArr = this.mealtimeTrendsData.filter(e => e.mealtype == mealtype); var breakfastArr = this.mealtimeTrendsData.filter(e => e.mealtype == mealtype);
var breakfastAbnormalArr = []; var breakfastAbnormalArr = [];
var breakfastAbnormalStr = ''; 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) 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)) .map(e => e.repasttime.slice(8, 9) ? e.repasttime.slice(8) : e.repasttime.slice(8, 9))
if (breakfastAbnormalArr.length > 1) { if (breakfastAbnormalArr.length > 1) {
...@@ -2676,16 +2676,16 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -2676,16 +2676,16 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
if (data.obj) { if (data.obj) {
this.mealtimeTrendsData = data.obj this.mealtimeTrendsData = data.obj
} }
if (data.obj && data.obj.filter(e => e.mealtype == 1) && data.obj.filter(e => e.mealtype == 1)[0] if (data.obj && data.obj.filter(e => e.mealtype == 1).length && data.obj.filter(e => e.mealtype ==
.cateringList) { 1)[0].cateringList) {
this.mealtypeArr.push(1) this.mealtypeArr.push(1)
} }
if (data.obj && data.obj.filter(e => e.mealtype == 2 && data.obj.filter(e => e.mealtype == 2)[0] if (data.obj && data.obj.filter(e => e.mealtype == 2).length && data.obj.filter(e => e.mealtype == 2)[0]
.cateringList)) { .cateringList) {
this.mealtypeArr.push(2) this.mealtypeArr.push(2)
} }
if (data.obj && data.obj.filter(e => e.mealtype == 3 && data.obj.filter(e => e.mealtype == 3)[0] if (data.obj && data.obj.filter(e => e.mealtype == 3).length && data.obj.filter(e => e.mealtype == 3)[0]
.cateringList)) { .cateringList) {
this.mealtypeArr.push(3) this.mealtypeArr.push(3)
} }
} catch (e) { } catch (e) {
......
src/pages/StudentPayment/PayProgress/PayProgress.vue
View file @ 0fc1b99a
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
</view> </view>
<!-- 没有数据 --> <!-- 没有数据 -->
<view class="noData" v-else> <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> mode='widthFix'></image>
<view>暂无数据</view> <view>暂无数据</view>
</view> </view>
...@@ -99,9 +99,8 @@ ...@@ -99,9 +99,8 @@
</view> </view>
<!-- 没有数据 --> <!-- 没有数据 -->
<view class="noData" v-else> <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> mode='widthFix'></image>
<view>程序员正在玩命加载</view>
<view class="bottomtxt">暂无数据</view> <view class="bottomtxt">暂无数据</view>
</view> </view>
</view> </view>
......
src/pages/StudentPayment/PayProject/PayProject.vue
View file @ 0fc1b99a
...@@ -30,9 +30,9 @@ ...@@ -30,9 +30,9 @@
</view> </view>
<!-- 没有数据 --> <!-- 没有数据 -->
<view class="noData" v-else> <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> mode='widthFix'></image>
<view>暂无收费项目</view> <view>暂无数据</view>
</view> </view>
</view> </view>
</van-tab> </van-tab>
...@@ -73,10 +73,9 @@ ...@@ -73,10 +73,9 @@
</view> </view>
<!-- 没有数据 --> <!-- 没有数据 -->
<view class="noData" v-else> <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> mode='widthFix'></image>
<view>正在玩命加载</view> <view class="bottomtxt">暂无数据</view>
<view class="bottomtxt">暂无历交费项目</view>
</view> </view>
</view> </view>
</van-tab> </van-tab>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment