347617796@qq.com 4 سال پیش
والد
کامیت
2f5c3899c3
3فایلهای تغییر یافته به همراه13 افزوده شده و 38 حذف شده
  1. 3 0
      pages/index/hoteldetail.vue
  2. 4 5
      pages/myOrder/index.vue
  3. 6 33
      pages/myOrder/paymoment.vue

+ 3 - 0
pages/index/hoteldetail.vue

@@ -258,4 +258,7 @@ export default {
 	margin: 6rpx 0 25rpx 4%;
 	padding: 4upx 0;
 }
+.fontcenter{
+	margin: 10rpx 0;
+}
 </style>

+ 4 - 5
pages/myOrder/index.vue

@@ -24,12 +24,10 @@
 				<view v-for="(item, index) in order_list" :key="index" class="cart-list">
 					<view class="topTip" @click="goStore(item.store_id)">
 						<view>
-							<image
-								v-if="item.store_avatar"
+							<image v-if="item.store_avatar"
 								:src="pictureUrl + '/uploads/home/store/' + item.store_id + '/' + item.store_avatar"
-								style="border-radius: 50%;
-				   width: 50upx;height: 50upx;vertical-align: middle;"
-							></image>
+								style="border-radius: 50%; width: 50upx;height: 50upx;vertical-align: middle;">
+							</image>
 							<span style="padding-left: 16upx;">{{ item.store_name }}</span>
 						</view>
 						<view style="color: #D9332E;font-size: 24upx;">{{ item.status }}</view>
@@ -286,6 +284,7 @@ export default {
 					}
 					this.firstloading = 1;
 					this.order_list = this.order_list.concat(res.data.data.order_list);
+					console.log(this.order_list);
 				}
 			});
 		},

+ 6 - 33
pages/myOrder/paymoment.vue

@@ -12,7 +12,7 @@
 		     </van-cell>
 		   </van-cell-group>
 		 </van-radio-group>
-		 <view class="payMoney" @click="payMoney" v-if="radio ==  1">支付(圈币{{prices*ratio_points}})</view>
+		 <view class="payMoney" @click="payMoney" v-if="radio ==  1">支付(圈币{{parseFloat}})</view>
 		 <view class="payMoney" @click="payMoney"  v-if="radio == 0">支付(¥{{prices}})</view>
 		 <Dialog  :orderCancel="orderCancel"
 		     :titles="titles"
@@ -47,26 +47,11 @@
 			}
 		},
 		onLoad(e) {
-			console.log(e);
-			console.log("支付");
 			this.prices = e.prices;
 			this.order_id = e.order_id;
 			this.store_id = e.store_id;
 			this.getuserInfo();
 			this.isform = e.isform;
-			//this.ratio_points = e.ratio_points;
-			// this.isform = e.isform;  // 1 dingdanfukuanguolai
-			// if(this.ratio_points > 0) {
-			// 	this.list = [
-			// 		{title:'微信支付'},
-			// 		{title:'圈币支付'}
-			// 	];
-			// }else {
-			// 	this.list = [
-			// 		{title:'微信支付'}
-					
-			// 	];
-			// }
 		},
 		methods: {
 			//获取用户信息
@@ -125,10 +110,6 @@
 			},
 			payMoney() {
 				if(this.radio == 0) {
-					// 微信支付
-					 // uni.showLoading({
-					 // 	title: '支付中'  
-					 // });
 					this.request({
 						url:'/v1/payment/pay',
 						method: 'post',
@@ -174,21 +155,13 @@
 					this.titles = "圈币支付";
 					this.values = "使用圈币支付"+this.prices*this.ratio_points;
 					this.orderCancel = true;
-					// 圈币支付
-					// this.request({
-					// 	url:'/v1/payment/pay',
-					// 	method:'POST',
-					// 	data: {
-					// 		pay_code: 'point',
-					// 		order_id: this.order_id
-					// 	},
-					// 	success: (res) => {
-					// 		console.log(res);
-							
-					// 	}
-					// })
 				}
 			}
+		},
+		computed:{
+			parseFloat(){
+				return parseInt(this.prices*this.ratio_points)
+			}
 		}
 	}
 </script>