admin/coupon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/renjianbo0118/coupon

Browse Source 
 Conflicts:
	pages/peizhen/peizhendetail.wxml
This commit is contained in:
renjianbo
2023-05-27 19:13:19 +08:00
parent 33cd30d53e f8b392122a
commit 7883c121bc
4 changed files with 93 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pages/my/my.wxml
View File

@@ -2,13 +2,11 @@
title="个人中心"
left-text=""
right-text=""
left-arrow
bind:click-left="onClickLeft"
bind:click-right="onClickRight"
style=" position: fixed;left: 0;top: 0;width: 100%;z-index: 2;"
/>
<view style="margin-top: {{height}}px;">
<view wx:if="{{uidFlag}}">
<view class="content">
@@ -42,7 +40,7 @@
</view>
</view> -->
<view class="substance" bindtap="tuiguang">
<!-- <view class="substance" bindtap="tuiguang">
<view style="display:flex">
<image src="/pages/image/Bargain.png" style="width:34rpx;height:34rpx;"></image>
<view class="price">我的推广</view>
@@ -50,7 +48,7 @@
<view>
<image src="/pages/image/right1.png" style="width:15rpx;height:28rpx"></image>
</view>
</view>
</view> -->
</view>
<view class="content" wx:else>

4
pages/orderdetail/orderdetail.wxml
View File

@@ -69,9 +69,9 @@
<image src="{{item.userbAvatar}}" style="width:94rpx;height:94rpx;border-radius:50% ;margin-right:23rpx;">
</image>
<view>
<view style="color: #333;font-size: 28rpx;font-family: PingFang SC;font-weight: bold;">{{item.usercName}}</view>
<view style="color: #333;font-size: 28rpx;font-family: PingFang SC;font-weight: bold;">{{item.userbName}}</view>
<view style="color: #ABABAB;font-size: 24rpx;font-family: PingFang SC;font-weight: 400;width:532rpx;border-right:1rpx solid #e5e5e5">
地址：{{item.hospitalAddress}}</view>
地址：{{item.hospitalAddress+item.hospitalName}}</view>
</view>
<image style="width:26rpx;height:26rpx;padding:35rpx 0 0 20rpx" src="/pages/image/phone.png" bindtap="callphone"></image>
</view>

148
pages/peizhen/peizhendetail.js
View File

@@ -6,26 +6,31 @@ Page({
* 页面的初始数据
*/
data: {
task: {
phone: '',
phonedisplay: false,
placeholder: '请输入联系方式'
},
//普通选择器：（普通数组）
// array: ['请选择医院', '西京医院', '省人民医院', '红会医院'],
objectArray: [{
text: '请选择医院',
value: 10
},
{
text: '第四军医大学西京医院',
value: 2
},
{
text: '陕西省人民医院',
value: 3
},
{
text: '西安市高新医院',
value: 1
},
],
objectIndex: 0, //默认显示位置
text: '请选择医院',
value: 10
},
{
text: '第四军医大学西京医院',
value: 2
},
{
text: '陕西省人民医院',
value: 3
},
{
text: '西安市高新医院',
value: 1
},
],
objectIndex: 0, //默认显示位置
show: true,
height: '',
seckill_start: '请输入开始日期',
@@ -52,16 +57,52 @@ Page({
clock: '',
address: '',
danjia: 0.01, //单位为元
beizhu: ''
beizhu: '',
name: '',
jzphone: ''
},
inputtaskphone(e) {
if (e.detail.value != '') {
if (!(/^1[3456789]\d{9}$/.test(e.detail.value))) {
this.setData({
phonedisplay: true,
placeholder: '',
'task.phone': ''
})
}
}
},
focus() {
this.setData({
phonedisplay: false,
placeholder: '请输入联系方式',
'task.phone': ''
})
},
bindNameInput: function (e) {
this.setData({
name: e.detail.value
})
},
bindPhoneInput: function (e) {
this.setData({
jzphone: e.detail.value
})
},
bindAdressInput: function (e) {
this.setData({
address: e.detail.value
})
},
// 确认支付
confirm_payy: async function () {
wx.showToast({
title: '点击了',
icon: 'none'
});
// wx.showToast({
// title: '点击了',
// icon: 'none'
// });
var that = this;
if (!this.data.is_ok_click) {
that.setData({
@@ -124,6 +165,14 @@ Page({
console.log(event.detail);
},
payment() {
if (this.data.objectIndex == 0) {
wx.showToast({
title: '请输选择医院',
icon: 'none'
});
return
}
if (this.data.seckill_start == "请输入开始日期") {
wx.showToast({
title: '请输入开始日期',
@@ -134,18 +183,18 @@ Page({
var that = this;
wx.request({
url: app.globalData.url + '/system/order/insertOrderPzz',
url: app.globalData.url + '/system/order/insertOrderPz',
data: {
bId: "1", //陪护人员id
cId: wx.getStorageSync('uid'), //患者id
yuguMoney: "1", //金额
yuguMoney: this.data.item.price, //金额
yuliu9: "2", //订单大类1-陪护 2-陪诊
yuliu10: this.data.item.ordertype, //订单类型1-全程陪诊，2-诊前约号3-送取报告4-待办问诊
hospitalId: this.data.objectArray[this.data.objectIndex].value,
startTime: this.data.seckill_start,
yuliu11: "18691577328", //患者电话
yuliu12: "无", //特殊要求
yuliu13: "东泰城市之光", //送达地址
yuliu11: this.data.jzphone, //患者电话
yuliu12: this.data.beizhu, //特殊要求
yuliu13: this.data.address, //送达地址
yuliu14: "610526198701180018" //患者身份证号
},
method: 'POST',
@@ -163,30 +212,6 @@ Page({
wx.navigateTo({
url: '/shopping/pages/paysuccess/paysuccess?' + "order_id=" + that.data.order_id,
});
// console.log('timeStamp==' + res.data.data.timeStamp)
// console.log('nonceStr==' + res.data.data.nonceStr)
// console.log('package==' + res.data.data.package)
// console.log('signType==' + res.data.data.signType)
// console.log('paySign==' + res.data.data.paySign)
// wx.requestPayment({
// timeStamp: res.data.data.timeStamp,
// nonceStr: res.data.data.nonceStr,
// package: res.data.data.package,
// signType: res.data.data.signType,
// paySign: res.data.data.paySign,
// success(res) {
// console.log('支付成功');
// app.console(that.data.order_id + "======要传的order_id")
// wx.navigateTo({
// url: '/shopping/pages/paysuccess/paysuccess?' + "order_id=" + that.data.order_id,
// });
// },
// fail(res) {
// console.log('支付失败');
// }
// })
} else {
wx.showToast({
title: res.data.msg,
@@ -324,24 +349,3 @@ Page({
},
})

24
pages/peizhen/peizhendetail.wxml
View File

@@ -29,13 +29,13 @@
<view class="card_cont" wx:key="key" style="margin-top: 24rpx;">
<view class="title-left">
{{"陪护时间选择"}}
{{"完善信息"}}
</view>
<!--选择器-->
<view class="row-wrap">
<view class="label" style="margin-left: 33rpx;">就诊医院</view>
<view class="xing" style="color: #FF6E6E;">*</view>
<view class="label">就诊医院</view>
<view class="label-right">
<picker bindchange="bindPickerChange2" value="{{objectIndex}}" range="{{objectArray}}" range-key="text">
@@ -48,29 +48,27 @@
<!--end-->
<view class="row-wrap">
<!-- <view class="row-wrap">
<view class="xing" style="color: #FF6E6E;">*</view>
<view class="label">就诊人姓名</view>
<view class="label-right">
<input model:value="{{price}}" name="nickname" class="input" type="text" placeholder="请输入就诊人姓名" />
<input class="input" bindinput="bindNameInput" type="text" placeholder="请输入就诊人姓名" />
</view>
</view>
</view> -->
<view class="row-wrap">
<view class="xing" style="color: #FF6E6E;">*</view>
<view class="label">就诊人电话</view>
<view class="label-right">
<input model:value="{{original_price}}" name="nickname" class="input" type="text" placeholder="请输入就诊人电话" />
<input bindinput="bindPhoneInput" class="input" type="number" placeholder="请输入就诊人电话" />
</view>
</view>
<view class="row-wrap">
<view class="label" style="margin-left: 33rpx;">报告收件地址</view>
<view class="label" style="margin-left: 16rpx;">报告收件地址</view>
<view class="label-right">
<input model:value="{{original_price}}" name="nickname" class="input" type="text" placeholder="请输入收件地址" />
<input bindinput="bindAdressInput" class="input" type="text" placeholder="请输入收件地址" />
</view>
</view>
@@ -81,7 +79,7 @@
<view style="height: 1rpx;background: #ECECEC;"></view>
<view class="row-wrap">
<view class="label" style="margin-left: 33rpx;">服务时间</view>
<view class="label" style="margin-left: 16rpx;">服务时间</view>
<view class="label-right">
<picker mode="date" value="{{date}}" start="2022-01-01" end="2025-12-01" bindchange="bindDateChange">
<view class="picker">
@@ -99,7 +97,7 @@
<view style="height: 1rpx;background: #ECECEC;"></view>
<view class="peisong-way" style="margin-bottom: 30rpx;">
<textarea style="font-size: 26rpx;padding-left: 19rpx;padding-top: 19rpx;" model:value="{{beizhu}}" bindinput="input" placeholder="填写补充说明。" />
<textarea style="width: 620rpx;height: 4em;font-size: 26rpx;padding-left: 19rpx;padding-top: 19rpx;" model:value="{{beizhu}}" bindinput="input" placeholder="填写补充说明。" />
</view>
</view>