Skip to content

XDJK
XDJK
Commit c69eb57f by liuquan
Options

no message

parent 4ca8ec2b
Showing with 91 additions and 73 deletions
packageA/chat/chat.js
......@@ -356,7 +356,7 @@ Page({
},
/**切换语音显示 */
record() {
let that = this;
let that = this;
that.setData({
isRecord: !that.data.isRecord,
reportShow: true
......@@ -875,7 +875,9 @@ Page({
* 聊天记录
*/
chatLog: Util.debouce(function () {
wx.showLoading({mask:true,});
wx.showLoading({
mask: true,
});
wx.navigateTo({
url: '/packageA/chattingRecords/chattingRecords?id=' + this.data.orderId + '&doctorimage=' + this.data.doctorimage,
})
......@@ -1094,7 +1096,7 @@ Page({
if (type == 'InitiateEndService' || type == 'NeverEndService' || type == 'EndOfService' || type == 'reminder' || type == 'reminder2' || type == 'followUp' || type == 'UserInfo' || type == 'LaunchVideo' || type == 'closeVideo' || type == 'hangUpVideo' || type == 'groupTips') {
item.payload.description = item.payload.data.content;
item.payload.data = item.payload.data.type;
} else if (type == 'Prescription' || type == 'UserDrug' || type == 'Checkup' || type == 'report'||type=='RecommendedProducts') {
} else if (type == 'Prescription' || type == 'UserDrug' || type == 'Checkup' || type == 'report' || type == 'RecommendedProducts') {
item.payload.description = JSON.parse(item.payload.data.content);
item.payload.data = item.payload.data.type;
}
......@@ -1220,7 +1222,7 @@ Page({
to: that.data.groupID,
conversationType: TIM.TYPES.CONV_GROUP,
payload: {
file: res//文件对象
file: res //文件对象
},
//临时图片路径
path: res.tempFilePaths[0],
......@@ -1445,10 +1447,10 @@ Page({
data: JSON.stringify({
type: 'report',
content: JSON.stringify({
id, //量表id
id, //量表id
res_id, //量表id
lbname, //量表名称
time, //量表时间
time, //量表时间
is_type //量表是否允许查看
})
}),
......@@ -1482,7 +1484,9 @@ Page({
* 查看报告
*/
lookReport: Util.debouce(function (e) {
wx.showLoading({mask:true});
wx.showLoading({
mask: true
});
let that = this;
let src = e.currentTarget.dataset.src;
let is_type = e.currentTarget.dataset.istype;
......@@ -1509,52 +1513,59 @@ Page({
}, 1000, true),
/**心理体检 */
getCheckup: Util.debouce(function (e) {
wx.showLoading({mask:true});
wx.showLoading({
mask: true
});
let that = this;
let data = {}
let code=1;
let code = 1;
data.inquiry_id = e.currentTarget.dataset.id;
let status= e.currentTarget.dataset.status?e.currentTarget.dataset.status:1;
Service.getIsAnswer({inquiryid:data.inquiry_id,groupID: that.data.groupID}).then((res)=>{
if(res.code==0){
code=res.code;
let status = e.currentTarget.dataset.status ? e.currentTarget.dataset.status : 1;
Service.getIsAnswer({
inquiryid: data.inquiry_id,
groupID: that.data.groupID
}).then((res) => {
if (res.code == 0) {
code = res.code;
that.setData({
errorToptips: res.msg
})
}else{
/**
* @todo 修改im发生量表收费
*/
let url;
let roomService={
t_unionid: that.data.t_unionid,
groupID: that.data.groupID,
orderId:that.data.orderId
}
wx.setStorageSync('roomService', roomService);
if (status == 0) {
url=`/pages/info/info?inquiry=2&inquiry_id=${e.currentTarget.dataset.id}`;
wx.reLaunch({
url: url,
})
} else {
url= `/pages/info/info?otype=1&inquiry=2&inquiry_id=${e.currentTarget.dataset.id}`;
Service.getTestInfo(data).then((res) => {
if (res.code == 1) {
var data = {
t_openid: res.data.openid,
g_time: res.data.time,
marketstatus: res.data.marketstatus,
unitid: res.data.unitid,
}
wx.setStorageSync('weiLb', data);
console.log("info", data)
} else {
/**
* @todo 修改im发生量表收费
*/
let url;
let roomService = {
t_unionid: that.data.t_unionid,
groupID: that.data.groupID,
orderId: that.data.orderId
}
wx.setStorageSync('roomService', roomService);
if (status == 0) {
url = `/pages/info/info?inquiry=2&inquiry_id=${e.currentTarget.dataset.id}`;
wx.reLaunch({
url: url,
})
} else {
url = `/pages/info/info?otype=1&inquiry=2&inquiry_id=${e.currentTarget.dataset.id}`;
Service.getTestInfo(data).then((res) => {
if (res.code == 1) {
var data = {
t_openid: res.data.openid, //医生openid
z_openid: wx.getStorageSync('data').openid, //患者openid
g_time: res.data.time, //时间
unitid: res.data.unitid, //医生id
marketstatus: res.data.marketstatus, //身份id
}
//未作量表信息
wx.setStorageSync('weiLb', data);
console.log("info", data)
}
})
wx.navigateTo({
url: url,
})
}
})
wx.navigateTo({
url: url,
})
}
}
})
wx.hideLoading();
......@@ -1615,7 +1626,9 @@ Page({
* @param {} e
*/
viewRecipe: Util.debouce(function (e) {
wx.showLoading({mask:true});
wx.showLoading({
mask: true
});
let item = e.currentTarget.dataset.item;
console.log("item", item)
wx.navigateTo({
......@@ -1636,7 +1649,9 @@ Page({
* payid 支付ID
*/
buyDrug: Util.debouce(function (e) {
wx.showLoading({mask:true});
wx.showLoading({
mask: true
});
let that = this;
let item = e.currentTarget.dataset.item;
// isQuick 开药方式 0-正常开药，1-二维码，2-快速开药
......@@ -1665,7 +1680,7 @@ Page({
}
})
}, 1000, true),
/**
/**
* 购买产品 buyProduct()
* isQuick 开药方式0-正常开药，1-二维码，2-快速开药
* name 姓名
......@@ -1679,8 +1694,8 @@ Page({
*/
buyProduct: Util.debouce(function (e) {
wx.showLoading({
title:'加载中',
mask:true
title: '加载中',
mask: true
});
let that = this;
let item = e.currentTarget.dataset.item;
......@@ -1699,12 +1714,12 @@ Page({
wx.hideLoading();
} else if (res.code == -1) {
wx.navigateTo({
url: '/packageA/productOrderInfo/productOrderInfo?scene=' + id + '&isQuick=' + item.isQuick + '&orderId=' + this.data.orderId + '&groupID=' + that.data.groupID,
success: function() {
url: '/packageA/productOrderInfo/productOrderInfo?scene=' + id + '&isQuick=' + item.isQuick + '&orderId=' + this.data.orderId + '&groupID=' + that.data.groupID,
success: function () {
wx.hideLoading();
}
})
} else {
wx.hideLoading();
that.setData({
......
packageA/chat/chat.wxss
......@@ -556,7 +556,6 @@
}
.re_con .baogao {
font-size: 34rpx;
color: #333;
line-height: 50rpx;
......
packageA/drugOrder/drugOrder.js
const Service = require('../../utils/service.js');
const {
debouce
} = require('../../utils/util.js'); //防抖函数
const { debouce} = require('../../utils/util.js'); //防抖函数
const Util = require('../../utils/util.js');
Page({
......@@ -137,8 +135,8 @@ Page({
})
}, 2000)
} else {
// newList = res.data;
newList = newList.concat(res.data);
newList = res.data;
// newList = newList.concat(res.data);
}
wx.stopPullDownRefresh()
......
packageA/drugOrderInfo/drugOrderInfo.wxss
......@@ -298,6 +298,11 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
font-size: 32rpx;
color: #333333;
font-weight: 600;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.errname {
......
packageA/productOrderInfo/productOrderInfo.wxss
......@@ -272,18 +272,17 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
justify-content: space-between;
padding-left: 18rpx;
width: 455rpx;
overflow: hidden;
/*超出部分隐藏*/
white-space: nowrap;
/*不换行*/
text-overflow: ellipsis;
/*超出部分文字以...显示*/
}
.name {
font-size: 32rpx;
color: #333333;
font-weight: 600;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.errname{
width: 400rpx;
......@@ -303,7 +302,7 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
color: #666666;
overflow: hidden;
/*超出部分隐藏*/
white-space: nowrap;
white-space: 2;
/*不换行*/
text-overflow: ellipsis;
/*超出部分文字以...显示*/
......
packageB/myReport/myReport.js
......@@ -19,7 +19,6 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
......@@ -119,9 +118,11 @@ Page({
Service.isReport(data).then((res) => {
// 查看列表权限
if (res.data == '1') {
//可查看
that.setData({
hidden: true
})
//跳转webview报告页
wx.navigateTo({
url: '/packageB/webview/webview?id=' + item.res_id + '&lbname=' + item.measure_name + '&share=0&t_openid=' + 0,
success: function () {
......@@ -180,7 +181,6 @@ Page({
isShow: true,
})
}
})
},
/**
......
pages/dati04/dati04.js
......@@ -63,7 +63,7 @@ Page({
if (otype && otype == 11) {
} else {
console.log(yanzhengid, lb_descript.desc.record_id)
console.log('asasasas',yanzhengid, lb_descript.desc.record_id)
if (lb_descript.desc.record_id == -1) {
this.loadData();
} else if (yanzhengid == lb_descript.desc.record_id) {
......
pages/index/index.wxss
......@@ -58,12 +58,13 @@ view{
font-size: 30rpx;
font-weight: bolder;
color: #000;
line-height: 0.8;
line-height: 1;
letter-spacing: 2rpx;
}
.nav text:last-child{
font-weight: 300;
font-size: 24rpx;
height: 24rpx;
letter-spacing: 1rpx;
color: #3b3b3b;
}
......
pages/my/my.wxss
......@@ -54,7 +54,7 @@ page {
height: 48rpx;
}
.server-text {
height: 24rpx;
height: 28rpx;
font-size: 28rpx;
font-weight: 300;
text-align: left;
......@@ -66,7 +66,7 @@ page {
height: 52rpx;
font-size: 50rpx;
color: #333;
font-weight: 700;
font-weight: bold;
line-height: 54rpx;
position: absolute;
top: 95rpx;
......
utils/service.js
......@@ -50,6 +50,7 @@ function getUserData(openid) {
let getUserDataUrl = config.url.getUserData;
let data = {};
data.openid = openid;
// data.openid='oYQX40Gk7bjWc8YncaXwFyNOC2ww'
return wxRequest.postRequest(getUserDataUrl, 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