Skip to content

XDJK
XDJK
Commit 54956fa4 by liuquan
Options

3.1.13 

U:订单详情缺少服务诊金显示
U:修复chat页面药方支付跳转判断
U:修改地址选择点击区域范围
parent 84fe61a0
Showing with 148 additions and 52 deletions
packageA/addsite/addsite.wxss
...@@ -53,8 +53,8 @@ image{ ...@@ -53,8 +53,8 @@ image{
border-radius: 4rpx; border-radius: 4rpx;
} }
.picker{ .picker{
margin-top: 35rpx; padding-top: 35rpx;
margin-bottom: 35rpx; padding-bottom: 35rpx;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content:space-between; justify-content:space-between;
......
packageA/chat/chat.js
...@@ -1625,7 +1625,7 @@ Page({ ...@@ -1625,7 +1625,7 @@ Page({
url: '/packageA/drugOrderInfo/drugOrderInfo?scene=' + id + '&isQuick=' + item.isQuick + '&orderId=' + this.data.orderId + '&groupID=' + that.data.groupID, url: '/packageA/drugOrderInfo/drugOrderInfo?scene=' + id + '&isQuick=' + item.isQuick + '&orderId=' + this.data.orderId + '&groupID=' + that.data.groupID,
}) })
wx.hideLoading(); wx.hideLoading();
}else if(res.code == 2){ }else{
wx.hideLoading(); wx.hideLoading();
that.setData({ that.setData({
errorToptips: res.msg errorToptips: res.msg
......
packageA/drugOrderInfo/drugOrderInfo.js
...@@ -17,7 +17,17 @@ Page({ ...@@ -17,7 +17,17 @@ Page({
id: '', id: '',
ishow: true, ishow: true,
paySuccess: false, paySuccess: false,
errshow: false errshow: false,
items: [
{
name: '不需要',
value: '0'
},{
name: '需要',
value: '1'
},
],
isInvoice:0
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
...@@ -236,6 +246,15 @@ Page({ ...@@ -236,6 +246,15 @@ Page({
} }
}, },
/** /**
* 是否需要开具纸质发票
* @param {*} e
*/
radioChange: function (e) {
this.setData({
isInvoice: e.detail.value,
})
},
/**
* 调起顺丰电话客服 * 调起顺丰电话客服
*/ */
tel: function () { tel: function () {
...@@ -376,7 +395,8 @@ Page({ ...@@ -376,7 +395,8 @@ Page({
isywlx: that.data.list.isywlx, isywlx: that.data.list.isywlx,
money: that.data.list.money, money: that.data.list.money,
hstr: hstr.toString(), hstr: hstr.toString(),
isgd: 1 isgd: 1,
// rise_need:that.data.isInvoice
} }
Service.prescriptionPay(data).then((res) => { Service.prescriptionPay(data).then((res) => {
console.log('res1', res); console.log('res1', res);
......
packageA/drugOrderInfo/drugOrderInfo.wxml
...@@ -98,19 +98,26 @@ ...@@ -98,19 +98,26 @@
<view class="order-num"> <view class="order-num">
<text>服务诊金</text> <text>服务诊金</text>
<view> <view>
<text style="color:#EC5B68; font-size: 28rpx;">¥ </text> <text style="color:#999999;font-size: 28rpx;">¥ </text>
<text style="color:#EC5B68;font-weight: 700;font-size: 28rpx;">{{list.zj}}</text> <text style="font-size: 28rpx;">{{list.zj}}</text>
</view> </view>
</view> </view>
<view class="order-num"> <view class="order-num">
<text>顺丰运费</text> <text>顺丰运费</text>
<view> <view>
<text style=" color:#999999; font-size: 28rpx;">¥ </text> <text style="color:#999999;font-size: 28rpx;">¥ </text>
<text class="fonw-400" style="font-size: 28rpx;">{{list.freight}}</text> <text class="fonw-400" style="font-size: 28rpx;">{{list.freight}}</text>
</view> </view>
</view> </view>
<!-- <view class="order-num">
<text>纸质发票</text>
<radio-group class="radio-group" bindchange="radioChange">
<label class="radio" wx:for="{{items}}" wx:key="key">
<radio value="{{item.value}}" checked="{{item.value==0?true : false}}" color='#1384ff' />{{item.name}}
</label>
</radio-group>
</view> -->
<view class="tys" bindtap="agree"> <view class="tys" bindtap="agree">
<view wx:if='{{!agree}}' class="unselected"> <view wx:if='{{!agree}}' class="unselected">
</view> </view>
...@@ -156,8 +163,8 @@ ...@@ -156,8 +163,8 @@
</view> </view>
<view class="item-name"> <view class="item-name">
<view class="name">{{item.name}}</view> <view class="name">{{item.name}}</view>
<!-- <view class="firm">{{item.firm}}</view> <!-- <view class="firm">{{item.firm}}</view> -->
<view class="norms">{{item.norms}}</view> --> <view class="norms">{{item.norms}}</view>
<view class="err_msg"> <view class="err_msg">
{{item.msg}} {{item.msg}}
</view> </view>
......
packageA/drugOrderInfo/drugOrderInfo.wxss
@import '/components/modal/modal.wxss'; @import '/components/modal/modal.wxss';
@import '/components/cu-modal.wxss'; @import '/components/cu-modal.wxss';
page { page {
width: 750rpx; width: 750rpx;
padding-bottom: env(safe-area-inset-bottom); padding-bottom: env(safe-area-inset-bottom);
...@@ -11,6 +12,15 @@ checkbox { ...@@ -11,6 +12,15 @@ checkbox {
transform: scale(.8); transform: scale(.8);
} }
radio {
transform: scale(.7);
color: #1384ff;
}
.radio {
font-size: 28rpx;
}
/*checkbox未选中时样式 */ /*checkbox未选中时样式 */
checkbox .wx-checkbox-input { checkbox .wx-checkbox-input {
/* 自定义样式.... */ /* 自定义样式.... */
...@@ -31,6 +41,13 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before { ...@@ -31,6 +41,13 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
color: #fff; color: #fff;
} }
.radio-group {
width: 43%;
display: flex;
flex-direction: row;
justify-content: space-between;
}
.wrap { .wrap {
position: absolute; position: absolute;
width: 100%; width: 100%;
...@@ -102,7 +119,7 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before { ...@@ -102,7 +119,7 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
/* align-items: center; */ /* align-items: center; */
} }
.ml-15 { .ml-15 {
...@@ -218,11 +235,13 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before { ...@@ -218,11 +235,13 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
} }
.list1{
.list1 {
padding: 0; padding: 0;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
} }
.list-item, .list-item,
.list-item1 { .list-item1 {
display: flex; display: flex;
...@@ -231,18 +250,20 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before { ...@@ -231,18 +250,20 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
padding-bottom: 42rpx; padding-bottom: 42rpx;
padding-top: 42rpx; padding-top: 42rpx;
} }
.list-item2
{ .list-item2 {
display: flex; display: flex;
width: 100%; width: 100%;
} }
.br{
margin: 30rpx; .br {
background-color:#F5F8FB; margin: 30rpx;
background-color: #F5F8FB;
height: 2rpx; height: 2rpx;
width: 530rpx; width: 530rpx;
} }
.list-item image, .list-item image,
.list-item1 image { .list-item1 image {
width: 155rpx; width: 155rpx;
...@@ -278,7 +299,8 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before { ...@@ -278,7 +299,8 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
color: #333333; color: #333333;
font-weight: 600; font-weight: 600;
} }
.errname{
.errname {
width: 400rpx; width: 400rpx;
font-size: 24rpx; font-size: 24rpx;
color: #333333; color: #333333;
...@@ -291,6 +313,7 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before { ...@@ -291,6 +313,7 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
text-overflow: ellipsis; text-overflow: ellipsis;
/*超出部分文字以...显示*/ /*超出部分文字以...显示*/
} }
.firm { .firm {
font-size: 24rpx; font-size: 24rpx;
color: #666666; color: #666666;
...@@ -316,11 +339,12 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before { ...@@ -316,11 +339,12 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
.pirce { .pirce {
color: #EC5B68; color: #EC5B68;
} }
.err_msg{
.err_msg {
color: #EC5B68; color: #EC5B68;
margin-bottom:50rpx;
font-weight: 700; font-weight: 700;
} }
.pirce text:first-child { .pirce text:first-child {
font-size: 24rpx; font-size: 24rpx;
} }
...@@ -335,11 +359,13 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before { ...@@ -335,11 +359,13 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
margin-top: 5rpx; margin-top: 5rpx;
font-size: 28rpx; font-size: 28rpx;
} }
.errnumber{
.errnumber {
display: flex; display: flex;
margin-top: 5rpx; margin-top: 5rpx;
font-size: 20rpx; font-size: 20rpx;
} }
.order-list { .order-list {
border-top: 20rpx solid rgb(242, 242, 242); border-top: 20rpx solid rgb(242, 242, 242);
} }
...@@ -606,40 +632,45 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before { ...@@ -606,40 +632,45 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
width: 650rpx; width: 650rpx;
height: 104rpx; height: 104rpx;
} }
.err-title{
font-size: 32rpx; .err-title {
font-weight: 700; font-size: 32rpx;
text-align: center; font-weight: 700;
color: #333333; text-align: center;
margin-bottom: 50rpx; color: #333333;
margin-bottom: 50rpx;
} }
.err-image{
height: 120rpx!important; .err-image {
width: 120rpx!important; height: 120rpx !important;
width: 120rpx !important;
} }
.err-btn{
margin:0rpx auto; .err-btn {
margin: 0rpx auto;
margin-top: 30rpx; margin-top: 30rpx;
width: 510rpx; width: 510rpx;
height: 66rpx; height: 66rpx;
line-height: 66rpx; line-height: 66rpx;
background-color: #2684ff; background-color: #2684ff;
font-size: 26rpx; font-size: 26rpx;
border-radius: 33rpx; border-radius: 33rpx;
} }
/* 弹框 */ /* 弹框 */
.shade { .shade {
display: block; display: block;
position: fixed; position: fixed;
top: 0; top: 0;
bottom: 0; bottom: 0;
left: 0; left: 0;
right: 0; right: 0;
height: 100%; height: 100%;
background: rgba(0, 0, 0, 0.3); background: rgba(0, 0, 0, 0.3);
z-index: 1001; z-index: 1001;
} }
.modal-title{
.modal-title {
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
} }
\ No newline at end of file
pages/prescription/order/order.js
...@@ -17,7 +17,17 @@ Page({ ...@@ -17,7 +17,17 @@ Page({
id: '', id: '',
ishow: true, ishow: true,
paySuccess: false, paySuccess: false,
errshow: false errshow: false,
items: [
{
name: '不需要',
value: '0'
},{
name: '需要',
value: '1'
},
],
isInvoice:0
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
...@@ -215,6 +225,18 @@ Page({ ...@@ -215,6 +225,18 @@ Page({
}) })
} }
}, },
/**
* 是否需要开具纸质发票
* @param {*} e
*/
radioChange: function (e) {
this.setData({
isInvoice: e.detail.value,
})
},
/**
* 拨打电话
*/
tel: function () { tel: function () {
wx.makePhoneCall({ wx.makePhoneCall({
phoneNumber: '95338' phoneNumber: '95338'
...@@ -341,7 +363,8 @@ Page({ ...@@ -341,7 +363,8 @@ Page({
isywlx: that.data.list.isywlx, isywlx: that.data.list.isywlx,
money: that.data.list.money, money: that.data.list.money,
hstr: hstr.toString(), hstr: hstr.toString(),
isgd: 1 isgd: 1,
// rise_need:that.data.isInvoice
} }
Service.prescriptionPay(data).then((res) => { Service.prescriptionPay(data).then((res) => {
console.log('res1', res); console.log('res1', res);
......
pages/prescription/order/order.wxml
...@@ -95,8 +95,8 @@ ...@@ -95,8 +95,8 @@
<view class="order-num"> <view class="order-num">
<text>服务诊金</text> <text>服务诊金</text>
<view> <view>
<text style="color:#EC5B68; font-size: 28rpx;">¥ </text> <text style="color:#999999;font-size: 28rpx;">¥ </text>
<text style="color:#EC5B68;font-weight: 700;font-size: 28rpx;">{{list.zj}}</text> <text style="color:#999999;font-size: 28rpx;">{{list.zj}}</text>
</view> </view>
</view> </view>
...@@ -106,8 +106,15 @@ ...@@ -106,8 +106,15 @@
<text style=" color:#999999; font-size: 28rpx;">¥ </text> <text style=" color:#999999; font-size: 28rpx;">¥ </text>
<text class="fonw-400" style="font-size: 28rpx;">{{list.freight}}</text> <text class="fonw-400" style="font-size: 28rpx;">{{list.freight}}</text>
</view> </view>
</view> </view>
<!-- <view class="order-num">
<text>纸质发票</text>
<radio-group class="radio-group" bindchange="radioChange">
<label class="radio" wx:for="{{items}}" wx:key="key">
<radio value="{{item.value}}" checked="{{item.value==0?true : false}}" color='#1384ff' />{{item.name}}
</label>
</radio-group>
</view> -->
<view class="tys" bindtap="agree"> <view class="tys" bindtap="agree">
<view wx:if='{{!agree}}' class="unselected"> <view wx:if='{{!agree}}' class="unselected">
</view> </view>
...@@ -152,8 +159,8 @@ ...@@ -152,8 +159,8 @@
</view> </view>
<view class="item-name"> <view class="item-name">
<view class="name">{{item.name}}</view> <view class="name">{{item.name}}</view>
<!-- <view class="firm">{{item.firm}}</view> <!-- <view class="firm">{{item.firm}}</view> -->
<view class="norms">{{item.norms}}</view> --> <view class="norms">{{item.norms}}</view>
<view class="err_msg"> <view class="err_msg">
{{item.msg}} {{item.msg}}
</view> </view>
......
pages/prescription/order/order.wxss
...@@ -10,7 +10,14 @@ checkbox { ...@@ -10,7 +10,14 @@ checkbox {
padding-top: 90rpx; padding-top: 90rpx;
transform: scale(.8); transform: scale(.8);
} }
radio {
transform: scale(.7);
color: #1384ff;
}
.radio {
font-size: 28rpx;
}
/*checkbox未选中时样式 */ /*checkbox未选中时样式 */
checkbox .wx-checkbox-input { checkbox .wx-checkbox-input {
/* 自定义样式.... */ /* 自定义样式.... */
...@@ -318,7 +325,6 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before { ...@@ -318,7 +325,6 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
} }
.err_msg{ .err_msg{
color: #EC5B68; color: #EC5B68;
margin-bottom:50rpx;
font-weight: 700; font-weight: 700;
} }
.pirce text:first-child { .pirce text:first-child {
......
utils/service.js
...@@ -27,6 +27,7 @@ function getUserSig(user) { ...@@ -27,6 +27,7 @@ function getUserSig(user) {
var getUserSigUrl = config.url.getUserSig; var getUserSigUrl = config.url.getUserSig;
var data = { var data = {
"user": user "user": user
// "user": "oHhp80fVWvjJn2EYkB5XxhKnVBOo"
} }
return wxRequest.getRequest(getUserSigUrl, data); return wxRequest.getRequest(getUserSigUrl, data);
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment