Merge branch 'develop' of https://git.xiaopay.net/lizhishu/xzf_uniapp-wechat-web into develop

src/pages/StudentPayment/PayOrderDetails/PayOrderDetails.vue

@@ -23,7 +23,8 @@
 					{{ChargeProDetail.chargeName||""}}
 				</view>
 				<view class="title2">
-					{{ChargeProDetail.descInfo||""}}
+					<van-notice-bar :scrollable="ChargeProDetail.descInfo.length>20?true:false" background="#ffffff" color="#333333" style="padding: 0;"
+						:text="ChargeProDetail.descInfo||''" />
 				</view>
 				<van-divider />
 				<view class="botto">
@@ -182,7 +183,7 @@
 					if (Amount) {
 						return (Amount / 100).toFixed(2)
 					} else {
-						return ""
+						return "0.00"
 					}
 				}
 			},

src/pages/StudentPayment/PayProject/PayProject.vue

@@ -19,7 +19,7 @@
 							</view>
 							<view class="listitem center">
 								<text class="describe">
-									{{item.descInfo}}
+									{{item.descInfo||""}}
 								</text>
 							</view>
 							<view class="listitem botto" style="align-items: baseline;">
@@ -276,6 +276,7 @@
 					line-height: 36rpx;
 					padding-top: 38rpx;
 					padding-left: 32rpx;
+					overflow-y: auto;
 				}
 			}