diff --git a/app.js b/app.js
index 42b8d02..14f4569 100644
--- a/app.js
+++ b/app.js
@@ -15,7 +15,11 @@ App({
encryptedData: '',
iv: '',
code: '',
- url: 'http://chengjie.free.idcfengye.com',
+
+ url: 'http://ruilaizi.gnway.cc',
+ // url: 'https://ruilaizipj.com',
+
+
phone: '',
uid: '',
sessionKey: '',
diff --git a/app.json b/app.json
index 7cfff98..3e6e501 100644
--- a/app.json
+++ b/app.json
@@ -51,8 +51,8 @@
{
"pagePath": "pages/order/order",
"text": "订单",
- "iconPath": "pages/image/order.png",
- "selectedIconPath": "pages/image/order_a.png"
+ "iconPath": "pages/image/dingdan.png",
+ "selectedIconPath": "pages/image/dingdanl.png"
},
{
"pagePath": "pages/my/my",
diff --git a/pages/image/dingdan.png b/pages/image/dingdan.png
new file mode 100644
index 0000000..0f20967
Binary files /dev/null and b/pages/image/dingdan.png differ
diff --git a/pages/image/dingdanl.png b/pages/image/dingdanl.png
new file mode 100644
index 0000000..ae4fae3
Binary files /dev/null and b/pages/image/dingdanl.png differ
diff --git a/pages/image/empty.png b/pages/image/empty.png
new file mode 100644
index 0000000..45acb55
Binary files /dev/null and b/pages/image/empty.png differ
diff --git a/pages/image/home/代办问诊.png b/pages/image/home/代办问诊.png
new file mode 100644
index 0000000..3ad6b5a
Binary files /dev/null and b/pages/image/home/代办问诊.png differ
diff --git a/pages/image/home/全程陪诊.png b/pages/image/home/全程陪诊.png
new file mode 100644
index 0000000..139eecc
Binary files /dev/null and b/pages/image/home/全程陪诊.png differ
diff --git a/pages/index/index.js b/pages/index/index.js
index 3cfb9ce..96183e6 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -1,10 +1,12 @@
-// pages/home/home.js
+//获取应用实例
+var app = getApp();
Page({
/**
* 页面的初始数据00
*/
data: {
+ order_list: [],
bannerdata:[
"home-banner",
"home-banner",
@@ -12,7 +14,7 @@ Page({
],
itemView: [
{
- icon: "诊前约号",
+ icon: "全程陪诊",
title: "全程陪诊",
price:"200",
describe:"服务内容：排队 预约 挂号 缴费 取药 记录医嘱"
@@ -30,9 +32,9 @@ Page({
// describe:"服务内容：协助代理买药"
// },
{
- icon: "取送结果",
+ icon: "代办问诊",
title: "代办问诊",
- price:"50",
+ price:"100",
describe:"服务内容：使用病人或者家属取检查报告化验单向医生问明情况"
},
{
@@ -51,36 +53,28 @@ Page({
hospitalData: [
{
img: "https://bkimg.cdn.bcebos.com/pic/8326cffc1e178a828fa58d64f303738da877e85d?x-bce-process=image/resize,m_lfit,w_536,limit_1",
- name: "西京医院",
+ name: "西安市高新医院",
grade: "三甲",
genre: "综合医院",
skiled: "消化内科、心血管内科",
- address: "西安市高新区长乐西路127号",
+ address: "高新区高新六路",
id: "1"
},{
img: "https://bkimg.cdn.bcebos.com/pic/8326cffc1e178a828fa58d64f303738da877e85d?x-bce-process=image/resize,m_lfit,w_536,limit_1",
- name: "西京医院",
+ name: "第四军医大学西京医院",
grade: "三甲",
genre: "综合医院",
skiled: "消化内科、心血管内科",
- address: "西安市高新区长乐西路127号",
- id: "1"
+ address: "莲湖区康复路",
+ id: "2"
},{
img: "https://bkimg.cdn.bcebos.com/pic/8326cffc1e178a828fa58d64f303738da877e85d?x-bce-process=image/resize,m_lfit,w_536,limit_1",
- name: "西京医院",
+ name: "陕西省人民医院",
grade: "三甲",
genre: "综合医院",
skiled: "消化内科、心血管内科",
- address: "西安市高新区长乐西路127号",
- id: "1"
- },{
- img: "https://bkimg.cdn.bcebos.com/pic/8326cffc1e178a828fa58d64f303738da877e85d?x-bce-process=image/resize,m_lfit,w_536,limit_1",
- name: "西京医院",
- grade: "三甲",
- genre: "综合医院",
- skiled: "消化内科、心血管内科",
- address: "西安市高新区长乐西路127号",
- id: "1"
+ address: "碑林区友谊西路",
+ id: "3"
}
]
},
@@ -113,7 +107,35 @@ Page({
url: '/pages/peihu/peihu',
})
},
+ //获取医院列表
+ getHospitalList: function () {
+ var that = this;
+ wx.request({
+ url: app.globalData.url + '/system/hospital/list',
+ header: app.getRequestHeader(),
+ method: 'GET',
+ data: {
+ },
+ success: (res) => {
+ var resp = res.data;
+ console.log("resp==" +resp)
+ if (res.data.code == 200) {
+ if (this.data.pageNum == 1) {
+ that.setData({
+ order_list: resp.data,
+ pageNum: this.data.pageNum + 1
+ });
+ } else {
+ that.setData({
+ order_list: resp.data,
+
+ });
+ }
+ }
+ }
+ });
+ },
/**
* 医院列表
*/
@@ -128,7 +150,8 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
-
+
+
},
/**
@@ -142,7 +165,7 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow() {
-
+ this.getHospitalList()
},
/**
@@ -156,7 +179,7 @@ Page({
* 生命周期函数--监听页面卸载
*/
onUnload() {
-
+
},
/**
diff --git a/pages/order/order.js b/pages/order/order.js
index f53949e..67dc9eb 100644
--- a/pages/order/order.js
+++ b/pages/order/order.js
@@ -38,8 +38,9 @@ Page({
height: 46 + statusBarHeight,
});
},
- //条目点击---订单状态：-2：已取消 -1：拒绝接单 0：待接单 1：已接单（待支付） 2：已支付（待服务）3：服务中 4：已完成 5申请退款 6退款中 7已退款 8：已结算
+ //条目点击---订单状态：-2：已取消 -1：拒绝接单 0：待接单 1：已接单 2：已支付（待服务）3：服务中 4：已完成 5申请退款 6退款中 7已退款 8：已结算
+
itemclick(e) {
console.log("列表条目的index==" + e.currentTarget.dataset.index)
//去订单详情页
diff --git a/pages/order/order.wxml b/pages/order/order.wxml
index 3f1ac7f..cf5b458 100644
--- a/pages/order/order.wxml
+++ b/pages/order/order.wxml
@@ -7,7 +7,7 @@
-
+
暂无订单
diff --git a/pages/orderdetail/orderdetail.wxml b/pages/orderdetail/orderdetail.wxml
index decfda3..89a9328 100644
--- a/pages/orderdetail/orderdetail.wxml
+++ b/pages/orderdetail/orderdetail.wxml
@@ -100,7 +100,7 @@
手机号码
- {{123456789}}
+ {{item.usercPhonenumber}}
diff --git a/pages/peizhen/peizhendetail.js b/pages/peizhen/peizhendetail.js
index d54cdeb..6ace8e4 100644
--- a/pages/peizhen/peizhendetail.js
+++ b/pages/peizhen/peizhendetail.js
@@ -136,7 +136,7 @@ Page({
wx.request({
url: app.globalData.url + '/system/order/insertOrderPz',
data: {
- bId: "", //陪护人员id
+ bId: "1", //陪护人员id
cId: wx.getStorageSync('uid'), //患者id
yuguMoney: "1", //金额
yuliu9: "2", //订单大类1-陪护 2-陪诊