Merge branch 'v_req_2.1' into uat

src/pages.json

@@ -317,6 +317,14 @@
 			}
 
 		},  {
+			"path": "pages/OpenAccountAgreementBOCOM/OpenAccountAgreementBOCOM",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		},{
 			"path": "pages/UserAgreement/UserAgreement",
 			"style": {
 				"navigationStyle": "custom",

src/pages/ApplyConsumption/Home/Home.vue

@@ -354,6 +354,7 @@
 	page {
 		width: 100%;
 		background: #F1F1F3;
+		line-height: 1.6;
 	}
 
 	.CampusConsumption {

src/pages/ApplyConsumption/businessRecord/mixin/login.js

@@ -98,10 +98,10 @@ export default {
 				if (v['mealType'] == "夜夜宵") {
 					v['mealTypePng'] = "xzf/h5/yeye.png"
 				}
-				if (parseInt(jsonData['totalAmount']) === 0) {
+				if (parseInt(jsonData['totalAmount'] * 100) === 0) {
 					v['perc'] = 0
 				} else {
-					v['perc'] = parseFloat(v.dealAmount / jsonData['totalAmount'])
+					v['perc'] = parseFloat(v.dealAmount / parseInt(jsonData['totalAmount'] * 100)) * 100
 				}
 				v['dealAmount'] = (v['dealAmount'] / 100).toFixed(2)
 				return v

src/pages/BankModule/Recharge/Recharge.vue

@@ -418,7 +418,7 @@
                 >
               </view>
             </view>
-            <view class="changeCard" @click="ChangeBankPay">我要换卡支付</view>
+            <view class="changeCard" @click="ChangeBankPay" v-if="typeCode != 'BOCOM'">我要换卡支付</view>
           </view>
         </view>
         <!-- 银行卡列表

src/pages/SchoolReport/SchoolReport.vue

@@ -107,7 +107,7 @@
 								<view class="school-report-context-card-one-context-txt">
 									本{{['月','周'][reportTypeIndex]}}就餐<text
 										class="txt-important">{{consumerDetailCalculateObj.cateringNumber}}</text>次，未就餐<text
-										class="txt-important">{{consumerDetailCalculateObj.notCateringNumber}}</text>次。食堂总消费<text
+										class="txt-important">{{consumerDetailCalculateObj.notCateringNumber}}</text>次。早午晚餐消费<text
 										class="txt-important">{{consumerDetailCalculateObj.canteenData}}</text>元，生活费总花费<text
 										class="txt-important">{{consumerDetailCalculateObj.totalData}}</text>元
 								</view>
@@ -257,7 +257,7 @@
 						<view class="school-report-context-card-eight-conclusion">
 							<view v-if="consumerDetailCalculateObj.totalData>0"
 								class="school-report-context-card-eight-conclusion-item">
-								<text>本{{['月','周'][reportTypeIndex]}}食堂<text
+								<text>本{{['月','周'][reportTypeIndex]}}早午晚餐<text
 										class="txt-important">{{consumerDetailCalculateObj.canteenData}}</text>元，总消费<text
 										class="txt-important">{{consumerDetailCalculateObj.totalData}}</text>元</text>
 							</view>
@@ -936,7 +936,8 @@
 				:style="{height:[860,845,891][tabIndex-1]+'rpx',top:[1426,1099,pubTalkNoopenHeight][tabIndex-1]+'rpx'}">
 				<view class="no-open-solution" @tap="equityPay">
 					<view class="no-open-solution-txt">
-						<text>最低{{memberInfo.leastAmount}}元/天开通，查看完整{{['消费','出入校','公话'][tabIndex-1]}}报告</text>
+						<!-- <text>最低{{memberInfo.leastAmount}}元/天开通，查看完整{{['消费','出入校','公话'][tabIndex-1]}}报告</text> -->
+					    <text>开通消费服务，查看完整消费报告</text>
 					</view>
 					<view class="no-open-solution-item">
 					</view>