git修复
This commit is contained in:
zoujiandong
parent
e597cc7cce
commit
4c267ccbd1
@ -22,6 +22,7 @@ Page({
|
||||
order_inquiry_id:'',
|
||||
messageWarn:'',
|
||||
showJuan:true,
|
||||
refund:{},
|
||||
time: 30 * 60 * 60 * 1000,
|
||||
showCover:true,
|
||||
showExpand:true,
|
||||
@ -446,6 +447,7 @@ handleCreateServiceChatOrder(id){
|
||||
order:data,
|
||||
detection_bar_code:data.detection_bar_code,
|
||||
user_doctor:data.user_doctor,
|
||||
refund:data.order_refund[0],
|
||||
pay_money
|
||||
});
|
||||
|
||||
@ -542,7 +544,9 @@ handelCancelCheckOrder(flag=true){
|
||||
icon:"none"
|
||||
})
|
||||
this.handleServiceDetail();
|
||||
})
|
||||
this.handelServiceEquityDetail(this.data.order_service_id)
|
||||
|
||||
})this.data.
|
||||
},
|
||||
handelCancelPayProduct(flag=true){
|
||||
let id =this.data.order.order_service_no;
|
||||
|
||||
@ -106,41 +106,51 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="row beizhu" wx:if="{{order.cancel_reason}}">
|
||||
<view class="row beizhu" wx:if="{{order.cancel_remarks}}">
|
||||
<view class="namebox">
|
||||
<view class="name"><text>备</text><text>注</text></view>
|
||||
<view class="dot">：</view>
|
||||
</view>
|
||||
<!-- 取消订单原因（1:主动取消 2:客服取消 3:支付超时） -->
|
||||
<view class="desc rightbox" wx:if="{{order.cancel_reason==1}}">主动取消 </view>
|
||||
<view class="desc rightbox">{{order.cancel_remarks}}</view>
|
||||
<!-- <view class="desc rightbox" wx:if="{{order.cancel_reason==1}}">主动取消 </view>
|
||||
<view class="desc rightbox" wx:elif="{{order.cancel_reason==2}}">客服取消</view>
|
||||
<view class="desc rightbox" wx:elif="{{order.cancel_reason==3}}">支付超时</view>
|
||||
<view class="desc rightbox" wx:elif="{{order.cancel_reason==3}}">支付超时</view> -->
|
||||
</view>
|
||||
<!-- 商品订单退款状态（0:无退款 1:申请退款 2:退款中 3:退款成功 4:拒绝退款 5:退款关闭） -->
|
||||
<view class="row" wx:if="{{order.cancel_reason==2}}">
|
||||
<view class="row" wx:if="{{order.order_refund.length>0}}">
|
||||
<view class="namebox">
|
||||
<view class="name">退款进度</view>
|
||||
<view class="dot">：</view>
|
||||
</view>
|
||||
<view class="desc rightbox" wx:if="{{order.detection_refund_status==0}}">
|
||||
<view class="desc rightbox" wx:if="{{refund.refund_status==0}}">
|
||||
无退款
|
||||
</view>
|
||||
<view class="desc rightbox" wx:elif="{{order.detection_refund_status==1}}">
|
||||
<view class="desc rightbox" wx:elif="{{refund.refund_status==1}}">
|
||||
申请退款
|
||||
</view>
|
||||
<view class="desc rightbox" wx:elif="{{order.detection_refund_status==2}}">
|
||||
<view class="desc rightbox" wx:elif="{{refund.refund_status==2}}">
|
||||
退款中
|
||||
</view>
|
||||
<view class="desc rightbox" wx:elif="{{order.detection_refund_status==3}}">
|
||||
<view class="desc rightbox" wx:elif="{{refund.refund_status==3}}">
|
||||
退款成功
|
||||
</view>
|
||||
<view class="desc rightbox" wx:elif="{{order.detection_refund_status==4}}">
|
||||
<view class="desc rightbox" wx:elif="{{refund.refund_status==4}}">
|
||||
拒绝退款
|
||||
</view>
|
||||
<view class="desc rightbox" wx:elif="{{order.detection_refund_status==5}}">
|
||||
<view class="desc rightbox" wx:elif="{{refund.refund_status==5}}">
|
||||
退款关闭
|
||||
</view>
|
||||
</view>
|
||||
<view class="row">
|
||||
<view class="namebox">
|
||||
<view class="name">退款金额</view>
|
||||
<view class="dot">：</view>
|
||||
</view>
|
||||
<view class="desc rightbox" >
|
||||
{{refund.refund_total}}
|
||||
</view>
|
||||
</view>
|
||||
<!-- 检测订单状态(1:待支付 2:待绑定 3:检测中 4:检测完成 5:已取消) -->
|
||||
<view class="dealbox">
|
||||
<view class="cancelbtn" wx:if="{{order.order_service_status==2}}" bind:tap="confirmCancelOrder">取消订单</view>
|
||||
@ -188,7 +198,7 @@
|
||||
<view class="dot">：</view>
|
||||
</view>
|
||||
<view class="desc" wx:if="{{!(equity.order_inquiry.length==0 && equity.product.length==0)}}"><text class="red">{{equity.order_service_package_detail.monthly_frequency==0?'不限':(equity.order_service_package_detail.monthly_frequency-equity.order_service_package.month_inquiry_count)}}次</text>图文</view>
|
||||
<view class="expand" wx:if="{{ equity.order_inquiry.length>0 && (order.order_service_status==3 || order.order_service_status==4 || (order.order_service_status==5 && order.pay_status!=5))}}" bind:tap="toggleExpand">{{showExpand?'收起':'展开'}} <van-icon name="{{showExpand?'arrow-up':'arrow-down'}}" /></view>
|
||||
<view class="expand" wx:if="{{ equity.order_inquiry.length>0 && (order.order_service_status==3 || order.order_service_status==4 || (order.order_service_status==5 && order.pay_status!=5))}}" bind:tap="toggleExpand">{{showExpand?'收起':'展开'}} <van-icon name="{{showExpand?'arrow-down':'arrow-up'}}" /></view>
|
||||
</view>
|
||||
<view class="usebox" wx:for="{{inquriyList}}" wx:key="order_inquiry_id" bind:tap="goInquiry" data-id="{{item.order_inquiry_id}}">
|
||||
<view class="time">问诊时间：{{item.created_at}}</view>
|
||||
@ -212,7 +222,7 @@
|
||||
<view class="dot">：</view>
|
||||
</view>
|
||||
<view class="desc" wx:if="{{!(equity.order_inquiry.length==0 && equity.product.length==0)}}"><text class="red">{{equity.order_service_package_detail.monthly_frequency==0?'不限':(equity.order_service_package_detail.monthly_frequency-equity.order_service_package.month_inquiry_count)}}次</text>图文</view>
|
||||
<view class="expand" wx:if="{{ equity.order_inquiry.length>1 && (order.order_service_status==3 || order.order_service_status==4 || (order.order_service_status==5 && order.pay_status!=5))}}" bind:tap="toggleExpand">{{showExpand?'收起':'展开'}} <van-icon name="{{showExpand?'arrow-up':'arrow-down'}}" /></view>
|
||||
<view class="expand" wx:if="{{ equity.order_inquiry.length>1 && (order.order_service_status==3 || order.order_service_status==4 || (order.order_service_status==5 && order.pay_status!=5))}}" bind:tap="toggleExpand">{{showExpand?'收起':'展开'}} <van-icon name="{{showExpand?'arrow-down':'arrow-up'}}" /></view>
|
||||
</view>
|
||||
|
||||
<view class="usebox" wx:for="{{inquriyList}}" wx:key="order_inquiry_id" bind:tap="goInquiry" data-id="{{item.order_inquiry_id}}">
|
||||
@ -236,7 +246,7 @@
|
||||
<view class="dot">：</view>
|
||||
</view>
|
||||
<view class="desc" wx:if="{{!(equity.order_inquiry.length==0 && equity.order_product.length==0)}}"><text class="red">{{restProduct}}盒</text>肝爽颗粒(步长) </view>
|
||||
<view class="expand" bind:tap="toggleProduct" wx:if="{{productList.length>1 && (order.order_service_status==3 || order.order_service_status==4 || (order.order_service_status==5 && order.pay_status!=5))}}">{{showProduct?'收起':'展开'}} <van-icon name="{{showProduct?'arrow-up':'arrow-down'}}" /></view>
|
||||
<view class="expand" bind:tap="toggleProduct" wx:if="{{productList.length>1 && (order.order_service_status==3 || order.order_service_status==4 || (order.order_service_status==5 && order.pay_status!=5))}}">{{showProduct?'收起':'展开'}} <van-icon name="{{showProduct?'arrow-down':'arrow-up'}}" /></view>
|
||||
</view>
|
||||
<view class="usebox" wx:for="{{productList}}" wx:key="order_product_id" bind:tap="goProduct" data-id="{{item.order_product_id}}">
|
||||
<view class="time">下单时间：{{item.created_at}}</view>
|
||||
@ -255,7 +265,7 @@
|
||||
<view wx:for="{{juanList}}" wx:key="id">{{item.name}}</view>
|
||||
</view>
|
||||
|
||||
<view class="expand" bind:tap="toggleJuan" wx:if="{{juanList.length>0 && (order.order_service_status==3 || order.order_service_status==4 || (order.order_service_status==5 && order.pay_status!=5))}}">{{showJuan?'收起':'展开'}} <van-icon name="{{showJuan?'arrow-up':'arrow-down'}}" /></view>
|
||||
<view class="expand" bind:tap="toggleJuan" wx:if="{{juanList.length>0 && (order.order_service_status==3 || order.order_service_status==4 || (order.order_service_status==5 && order.pay_status!=5))}}">{{showJuan?'收起':'展开'}} <van-icon name="{{showJuan?'arrow-down':'arrow-up'}}" /></view>
|
||||
</view>
|
||||
<view wx:if="{{order.order_service_status!=1 && !(order.order_service_status==5 && order.pay_status==5)}}" wx:for="{{equity.order_service_package_coupo}}" wx:key="coupon_name" bind:tap="goWelfare" class="usebox">
|
||||
<view class="time">{{item.coupon_name}}</view>
|
||||
|
||||
@ -71,10 +71,10 @@ Page({
|
||||
onScroll(event) {
|
||||
wx.createSelectorQuery().select('#scroller')
|
||||
.boundingClientRect((res) => {
|
||||
// console.log(event.detail.scrollTop)
|
||||
//console.log(event.detail.scrollTop)
|
||||
let H=0;
|
||||
if(event.detail.scrollTop>=175){
|
||||
H=0;
|
||||
H=1;
|
||||
}else{
|
||||
H=150
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
<view class="wraper">
|
||||
|
||||
<view class="containexpert" style="height:{{scrollHeight}}px">
|
||||
<view class="containexpert" style="{{'height:'+scrollHeight+'px'}}">
|
||||
<view class="searchbox">
|
||||
<input type="text" placeholder="输入姓名或医院查找医生" disabled="{{true}}" bindtap="goSearch" bindconfirm="getIptvalue"/>
|
||||
<image src="{{img_host+'/ss.png'}}"></image>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user