|
|
@@ -2,7 +2,8 @@
|
|
|
<view class="orderDet" style="padding-bottom: 200upx;" v-if="XCXIsSelect !='否'">
|
|
|
<view class="padding-sm">
|
|
|
<view class="bg u--fillet-skeleton" style="border-radius:24rpx;position: relative;">
|
|
|
- <image style="width: 100%;height: 30rpx;position: absolute;left: 0;bottom: -10rpx;" src="@/static/img/line.png" mode=""></image>
|
|
|
+ <image style="width: 100%;height: 30rpx;position: absolute;left: 0;bottom: -10rpx;"
|
|
|
+ src="@/static/img/line.png" mode=""></image>
|
|
|
<view class="flex align-center padding" @click="getAddressList()">
|
|
|
<view class="u-flex-1 margin-left-xs">
|
|
|
<view v-if="!detailaddress">请选择地址</view>
|
|
|
@@ -49,11 +50,14 @@
|
|
|
|
|
|
</view>
|
|
|
</view>
|
|
|
-
|
|
|
- <view class="flex justify-between" style="padding: 20rpx 0;border-top: 1rpx solid #F0F0F0;margin-top: 24rpx;">
|
|
|
- <view style="font-weight: bold;font-size: 40rpx;color: #FF6E98;x">
|
|
|
- <text v-if="hyCheck != '否'"><text style="font-size: 28rpx;"> 会员价:￥</text>{{artificerlist.memberPrice}}</text>
|
|
|
- <text class=" text-xl text-bold" style="font-size: 24rpx;color: #AAAAAA;text-decoration: line-through;font-weight: 400;">原价￥{{artificerlist.price}}</text>
|
|
|
+
|
|
|
+ <view class="flex justify-between"
|
|
|
+ style="padding: 20rpx 0;border-top: 1rpx solid #F0F0F0;margin-top: 24rpx;">
|
|
|
+ <view style="font-weight: bold;font-size: 40rpx;color: #FF6E98;x">
|
|
|
+ <text v-if="hyCheck != '否'"><text style="font-size: 28rpx;">
|
|
|
+ 会员价:￥</text>{{artificerlist.memberPrice}}</text>
|
|
|
+ <text class=" text-xl text-bold"
|
|
|
+ style="font-size: 24rpx;color: #AAAAAA;text-decoration: line-through;font-weight: 400;">原价￥{{artificerlist.price}}</text>
|
|
|
</view>
|
|
|
<!-- <view>￥{{price}}</view> -->
|
|
|
<view>
|
|
|
@@ -144,22 +148,28 @@
|
|
|
<navigator url="/my/setting/about?id=391&name=下单协议" open-type="navigate">《下单协议》</navigator>
|
|
|
</view>
|
|
|
</view> -->
|
|
|
- <view class="text-white flex justify-between cu-bar foot bg" style="padding: 16rpx 32rpx;box-shadow: 0rpx -6rpx 12rpx 2rpx rgba(0,0,0,0.09);border-radius: 32rpx 32rpx 0rpx 0rpx;" v-if="cxSel">
|
|
|
+ <view class="text-white flex justify-between cu-bar foot bg"
|
|
|
+ style="padding: 16rpx 32rpx;box-shadow: 0rpx -6rpx 12rpx 2rpx rgba(0,0,0,0.09);border-radius: 32rpx 32rpx 0rpx 0rpx;"
|
|
|
+ v-if="cxSel">
|
|
|
<view style="color: #999999;">
|
|
|
- 合计：<text style="color: #FF6E98;font-size: 40rpx;font-weight: bold;">￥{{price + cheFei}}</text>
|
|
|
+ 合计：<text style="color: #FF6E98;font-size: 40rpx;font-weight: bold;">￥{{(price + cheFei).toFixed(2)}}</text>
|
|
|
</view>
|
|
|
<view class="">
|
|
|
<u-button :custom-style="customStyle" @click="openpay()" shape="circle" :hair-line="false">确认预约
|
|
|
</u-button>
|
|
|
</view>
|
|
|
</view>
|
|
|
+ <!-- <view class="">
|
|
|
+ {{dataRes}}
|
|
|
+ </view> -->
|
|
|
|
|
|
<u-skeleton :loading="loading" :animation="true" elColor='#FFFFFF' bgColor='#FFFFFF'></u-skeleton>
|
|
|
|
|
|
<u-popup v-model="isTrue" mode="bottom">
|
|
|
<view>
|
|
|
<scroll-view scroll-y="true">
|
|
|
- <its-calendar :sta_num="0" :end_num="24" :int_num="msTimeDate" :msTimeList="msTimeList" @getTime="TimeData">
|
|
|
+ <its-calendar :sta_num="0" :end_num="24" :int_num="msTimeDate" :msTimeList="msTimeList"
|
|
|
+ @getTime="TimeData">
|
|
|
</its-calendar>
|
|
|
</scroll-view>
|
|
|
</view>
|
|
|
@@ -292,7 +302,7 @@
|
|
|
loading: true, // 是否显示骨架屏组件
|
|
|
customStyle: {
|
|
|
width: '214rpx',
|
|
|
- height:'100rpx',
|
|
|
+ height: '100rpx',
|
|
|
color: '#FFFFFF',
|
|
|
background: "#FF6E98",
|
|
|
border: '60rpx'
|
|
|
@@ -303,8 +313,8 @@
|
|
|
background: '#F6F6F6',
|
|
|
padding: '20rpx 0 0 0',
|
|
|
borderRadius: '16rpx',
|
|
|
- marginTop:'28rpx',
|
|
|
- padding:'24rpx'
|
|
|
+ marginTop: '28rpx',
|
|
|
+ padding: '24rpx'
|
|
|
},
|
|
|
value: '',
|
|
|
remark: '',
|
|
|
@@ -347,7 +357,8 @@
|
|
|
tripNum: '',
|
|
|
xuMoney: '',
|
|
|
tripPrice: '',
|
|
|
- artificerMoney: 0
|
|
|
+ artificerMoney: 0,
|
|
|
+ dataRes:null,
|
|
|
}
|
|
|
},
|
|
|
onLoad(option) {
|
|
|
@@ -409,19 +420,19 @@
|
|
|
|
|
|
// #ifdef H5
|
|
|
this.openLists = [{
|
|
|
- image: '../../../static/images/icon_weixin.png',
|
|
|
- text: '微信支付',
|
|
|
- id: 2
|
|
|
- },
|
|
|
- // {
|
|
|
- // image: '../../../static/images/zhifubao.png',
|
|
|
- // text: '支付宝支付',
|
|
|
- // id: 3
|
|
|
- // }, {
|
|
|
- // image: '../../../static/images/lingqian.png',
|
|
|
- // text: '零钱支付',
|
|
|
- // id: 1
|
|
|
- // },
|
|
|
+ image: '../../../static/images/icon_weixin.png',
|
|
|
+ text: '微信支付',
|
|
|
+ id: 2
|
|
|
+ },
|
|
|
+ // {
|
|
|
+ // image: '../../../static/images/zhifubao.png',
|
|
|
+ // text: '支付宝支付',
|
|
|
+ // id: 3
|
|
|
+ // }, {
|
|
|
+ // image: '../../../static/images/lingqian.png',
|
|
|
+ // text: '零钱支付',
|
|
|
+ // id: 1
|
|
|
+ // },
|
|
|
],
|
|
|
this.openWay = 2;
|
|
|
// #endif
|
|
|
@@ -484,6 +495,7 @@
|
|
|
getChuXing() {
|
|
|
this.$Request.getT('/app/artificer/selectTaxiMoney?artificerId=' + this.artificerId + '&latitude=' + this
|
|
|
.latitude + '&longitude=' + this.longitude).then(res => {
|
|
|
+ // this.dataRes = res
|
|
|
if (res.code == 0) {
|
|
|
this.cheFei = res.data.taxiMoney ? res.data.taxiMoney : 0;
|
|
|
// this.price = parseInt(this.price)+parseInt(this.cheFei).toFixed(2)
|
|
|
@@ -499,6 +511,7 @@
|
|
|
duration: 2000,
|
|
|
icon: 'none'
|
|
|
});
|
|
|
+
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
@@ -679,8 +692,8 @@
|
|
|
},
|
|
|
openpay() {
|
|
|
console.log(5555555);
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
if (!this.startTime) {
|
|
|
uni.showToast({
|
|
|
title: '请选择预约时间',
|
|
|
@@ -941,7 +954,7 @@
|
|
|
// uni.switchTab({
|
|
|
// url: "/pages/order/index"
|
|
|
// });
|
|
|
-
|
|
|
+
|
|
|
let data = {
|
|
|
ordersId: res.data.ordersId,
|
|
|
// type: 4
|
|
|
@@ -957,9 +970,9 @@
|
|
|
// window.location = rea.data.mweb_url + url
|
|
|
// window.location = callBack+'pages/order/index'
|
|
|
uni.switchTab({
|
|
|
- url: "/pages/order/index"
|
|
|
+ url: "/pages/order/index"
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
} else {
|
|
|
uni.showToast({
|
|
|
title: rea.msg,
|
|
|
@@ -1131,15 +1144,15 @@
|
|
|
.bg {
|
|
|
background-color: #FFFFFF;
|
|
|
}
|
|
|
- .orderDet{
|
|
|
+
|
|
|
+ .orderDet {}
|
|
|
+
|
|
|
+ .orderDet ::v-deep .u-icon-plus {
|
|
|
+ background: #FF6E98 !important;
|
|
|
+ width: 40rpx;
|
|
|
+ height: 40rpx;
|
|
|
+ font-size: 30rpx !important;
|
|
|
}
|
|
|
-
|
|
|
- .orderDet ::v-deep .u-icon-plus{
|
|
|
- background: #FF6E98!important;
|
|
|
- width: 40rpx;
|
|
|
- height: 40rpx;
|
|
|
- font-size: 30rpx!important;
|
|
|
- }
|
|
|
|
|
|
.box {
|
|
|
border: 1px solid #2FB57A;
|
|
|
@@ -1224,4 +1237,4 @@
|
|
|
line-height: 55rpx;
|
|
|
font-size: 24rpx;
|
|
|
}
|
|
|
-</style>
|
|
|
+</style>
|
