Просмотр исходного кода

Merge branch 'develop' of http://git.chelingzhu.com/chelingzhu-web/zxyj-mini-html into develop

lilei 4 лет назад
Родитель
Сommit
e80f3f919d
3 измененных файлов с 16 добавлено и 7 удалено
  1. 5 2
      pages/order/order.vue
  2. 5 2
      pages/order/orderDetail.vue
  3. 6 3
      pages/toOrder/index.vue

+ 5 - 2
pages/order/order.vue

@@ -102,7 +102,8 @@
 			<view class="slot-content">
 				<view>确认支付</view>
 				<view class="text-cont">
-					<text class="num-big">{{totalPrice}}</text>乐豆
+					<text class="num-big">{{totalPrice}}</text>
+					<u-image mode="scaleToFill" width="40rpx" height="40rpx" src="/static/ledou.png"></u-image>
 				</view>
 				<view class="footer">
 					<input v-model="password" maxlength="30" 
@@ -567,7 +568,9 @@
 			.text-cont{
 				width: 100%;
 				padding: 60upx 0;
-				text-align: center;
+				display: flex;
+				align-items: center;
+				justify-content: center;
 				.num-big{
 					font-size: 40upx;
 					color: red;

+ 5 - 2
pages/order/orderDetail.vue

@@ -97,7 +97,8 @@
 			<view class="slot-content">
 				<view>确认支付</view>
 				<view class="text-cont">
-					<text class="num-big">{{totalPrice}}</text>乐豆
+					<text class="num-big">{{totalPrice}}</text>
+					<u-image mode="scaleToFill" width="40rpx" height="40rpx" src="/static/ledou.png"></u-image>
 				</view>
 				<view class="footer">
 					<input v-model="password" 
@@ -384,7 +385,9 @@
 			.text-cont{
 				width: 100%;
 				padding: 60upx 0;
-				text-align: center;
+				display: flex;
+				align-items: center;
+				justify-content: center;
 				.num-big{
 					font-size: 40upx;
 					color: red;

+ 6 - 3
pages/toOrder/index.vue

@@ -81,7 +81,8 @@
 			<view class="slot-content">
 				<view>确认支付</view>
 				<view class="text-cont">
-					<text class="num-big">{{totalPrice}}</text>乐豆
+					<text class="num-big">{{totalPrice}}</text>
+					<u-image mode="scaleToFill" width="40rpx" height="40rpx" src="/static/ledou.png"></u-image>
 				</view>
 				<view class="footer">
 					<input v-model="password" 
@@ -192,7 +193,7 @@
 				this.showInputPsw = false
 				this.password = ''
 				// 跳转到订单列表
-				uni.navigateTo({
+				uni.redirectTo({
 					url:"/pages/order/order"
 				})
 			},
@@ -445,7 +446,9 @@ page{
 		.text-cont{
 			width: 100%;
 			padding: 60upx 0;
-			text-align: center;
+			display: flex;
+			align-items: center;
+			justify-content: center;
 			.num-big{
 				font-size: 40upx;
 				color: red;