Skip to content

XDJK
XDJK
Commit e46d9100 by liuquan
Options

合并分支 'feature.logistics.v3.2.3.20210421.liuquan' 到 'test' 

Feature.logistics.v3.2.3.20210421.liuquan

查看合并请求 !10
parents 9e1c5e88 b49ecf46
Showing with 435 additions and 352 deletions
packageA/addsite/addsite.js
...@@ -151,6 +151,9 @@ Page({ ...@@ -151,6 +151,9 @@ Page({
}) })
} }
}, },
addAddress(){},
editAddress(){},
editOrderAddress(){},
name: function (e) { name: function (e) {
e.detail.value e.detail.value
}, },
...@@ -160,39 +163,4 @@ Page({ ...@@ -160,39 +163,4 @@ Page({
take_over: e.detail.value take_over: e.detail.value
}) })
}, },
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
}) })
\ No newline at end of file
packageA/chat/chat.js
...@@ -95,7 +95,6 @@ Page({ ...@@ -95,7 +95,6 @@ Page({
console.log('recorder pause') console.log('recorder pause')
}) })
recorderManager.onError(function (errMsg) { recorderManager.onError(function (errMsg) {
wx.
console.warn('recorder error:', errMsg); console.warn('recorder error:', errMsg);
}); });
recorderManager.onStop((res) => { recorderManager.onStop((res) => {
...@@ -712,6 +711,7 @@ Page({ ...@@ -712,6 +711,7 @@ Page({
} else if (res.code == 1 && res.data.status == "2") { } else if (res.code == 1 && res.data.status == "2") {
that.setData({ that.setData({
payFlag: false, payFlag: false,
payFlag1: false,
end_time: '已结束', end_time: '已结束',
sendBtns: true, sendBtns: true,
status: true, status: true,
...@@ -876,7 +876,9 @@ Page({ ...@@ -876,7 +876,9 @@ Page({
* 聊天记录 * 聊天记录
*/ */
chatLog: Util.debouce(function () { chatLog: Util.debouce(function () {
wx.showLoading({mask:true,}); wx.showLoading({
mask: true,
});
wx.navigateTo({ wx.navigateTo({
url: '/packageA/chattingRecords/chattingRecords?id=' + this.data.orderId + '&doctorimage=' + this.data.doctorimage, url: '/packageA/chattingRecords/chattingRecords?id=' + this.data.orderId + '&doctorimage=' + this.data.doctorimage,
}) })
...@@ -1095,7 +1097,7 @@ Page({ ...@@ -1095,7 +1097,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') { 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.description = item.payload.data.content;
item.payload.data = item.payload.data.type; 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.description = JSON.parse(item.payload.data.content);
item.payload.data = item.payload.data.type; item.payload.data = item.payload.data.type;
} }
...@@ -1221,7 +1223,7 @@ Page({ ...@@ -1221,7 +1223,7 @@ Page({
to: that.data.groupID, to: that.data.groupID,
conversationType: TIM.TYPES.CONV_GROUP, conversationType: TIM.TYPES.CONV_GROUP,
payload: { payload: {
file: res//文件对象 file: res //文件对象
}, },
//临时图片路径 //临时图片路径
path: res.tempFilePaths[0], path: res.tempFilePaths[0],
...@@ -1483,7 +1485,9 @@ Page({ ...@@ -1483,7 +1485,9 @@ Page({
* 查看报告 * 查看报告
*/ */
lookReport: Util.debouce(function (e) { lookReport: Util.debouce(function (e) {
wx.showLoading({mask:true}); wx.showLoading({
mask: true
});
let that = this; let that = this;
let src = e.currentTarget.dataset.src; let src = e.currentTarget.dataset.src;
let is_type = e.currentTarget.dataset.istype; let is_type = e.currentTarget.dataset.istype;
...@@ -1510,44 +1514,51 @@ Page({ ...@@ -1510,44 +1514,51 @@ Page({
}, 1000, true), }, 1000, true),
/**心理体检 */ /**心理体检 */
getCheckup: Util.debouce(function (e) { getCheckup: Util.debouce(function (e) {
wx.showLoading({mask:true}); wx.showLoading({
mask: true
});
let that = this; let that = this;
let data = {} let data = {}
let code=1; let code = 1;
data.inquiry_id = e.currentTarget.dataset.id; data.inquiry_id = e.currentTarget.dataset.id;
let status= e.currentTarget.dataset.status?e.currentTarget.dataset.status:1; let status = e.currentTarget.dataset.status ? e.currentTarget.dataset.status : 1;
Service.getIsAnswer({inquiryid:data.inquiry_id,groupID: that.data.groupID}).then((res)=>{ Service.getIsAnswer({
if(res.code==0){ inquiryid: data.inquiry_id,
code=res.code; groupID: that.data.groupID
}).then((res) => {
if (res.code == 0) {
code = res.code;
that.setData({ that.setData({
errorToptips: res.msg errorToptips: res.msg
}) })
}else{ } else {
/** /**
* @todo 修改im发生量表收费 * @todo 修改im发生量表收费
*/ */
let url; let url;
let roomService={ let roomService = {
t_unionid: that.data.t_unionid, t_unionid: that.data.t_unionid, //医生unionid
groupID: that.data.groupID, groupID: that.data.groupID, //房间号
orderId:that.data.orderId orderId: that.data.orderId //订单号
} }
wx.setStorageSync('roomService', roomService); wx.setStorageSync('roomService', roomService);
if (status == 0) { if (status == 0) {
url=`/pages/info/info?inquiry=2&inquiry_id=${e.currentTarget.dataset.id}`; url = `/pages/info/info?inquiry=2&inquiry_id=${e.currentTarget.dataset.id}`;
wx.reLaunch({ wx.reLaunch({
url: url, url: url,
}) })
} else { } else {
url= `/pages/info/info?otype=1&inquiry=2&inquiry_id=${e.currentTarget.dataset.id}`; url = `/pages/info/info?otype=1&inquiry=2&inquiry_id=${e.currentTarget.dataset.id}`;
Service.getTestInfo(data).then((res) => { Service.getTestInfo(data).then((res) => {
if (res.code == 1) { if (res.code == 1) {
var data = { var data = {
t_openid: res.data.openid, t_openid: res.data.openid, //医生openid
g_time: res.data.time, z_openid: wx.getStorageSync('data').openid, //患者openid
marketstatus: res.data.marketstatus, g_time: res.data.time, //时间
unitid: res.data.unitid, unitid: res.data.unitid, //医生id
marketstatus: res.data.marketstatus, //身份id
} }
//未作量表信息
wx.setStorageSync('weiLb', data); wx.setStorageSync('weiLb', data);
console.log("info", data) console.log("info", data)
} }
...@@ -1616,7 +1627,9 @@ Page({ ...@@ -1616,7 +1627,9 @@ Page({
* @param {} e * @param {} e
*/ */
viewRecipe: Util.debouce(function (e) { viewRecipe: Util.debouce(function (e) {
wx.showLoading({mask:true}); wx.showLoading({
mask: true
});
let item = e.currentTarget.dataset.item; let item = e.currentTarget.dataset.item;
console.log("item", item) console.log("item", item)
wx.navigateTo({ wx.navigateTo({
...@@ -1637,7 +1650,9 @@ Page({ ...@@ -1637,7 +1650,9 @@ Page({
* payid 支付ID * payid 支付ID
*/ */
buyDrug: Util.debouce(function (e) { buyDrug: Util.debouce(function (e) {
wx.showLoading({mask:true}); wx.showLoading({
mask: true
});
let that = this; let that = this;
let item = e.currentTarget.dataset.item; let item = e.currentTarget.dataset.item;
// isQuick 开药方式 0-正常开药，1-二维码，2-快速开药 // isQuick 开药方式 0-正常开药，1-二维码，2-快速开药
...@@ -1680,8 +1695,8 @@ Page({ ...@@ -1680,8 +1695,8 @@ Page({
*/ */
buyProduct: Util.debouce(function (e) { buyProduct: Util.debouce(function (e) {
wx.showLoading({ wx.showLoading({
title:'加载中', title: '加载中',
mask:true mask: true
}); });
let that = this; let that = this;
let item = e.currentTarget.dataset.item; let item = e.currentTarget.dataset.item;
...@@ -1701,7 +1716,7 @@ Page({ ...@@ -1701,7 +1716,7 @@ Page({
} else if (res.code == -1) { } else if (res.code == -1) {
wx.navigateTo({ wx.navigateTo({
url: '/packageA/productOrderInfo/productOrderInfo?scene=' + id + '&isQuick=' + item.isQuick + '&orderId=' + this.data.orderId + '&groupID=' + that.data.groupID, url: '/packageA/productOrderInfo/productOrderInfo?scene=' + id + '&isQuick=' + item.isQuick + '&orderId=' + this.data.orderId + '&groupID=' + that.data.groupID,
success: function() { success: function () {
wx.hideLoading(); wx.hideLoading();
} }
}) })
......
packageA/chat/chat.wxss
...@@ -556,7 +556,6 @@ ...@@ -556,7 +556,6 @@
} }
.re_con .baogao { .re_con .baogao {
font-size: 34rpx; font-size: 34rpx;
color: #333; color: #333;
line-height: 50rpx; line-height: 50rpx;
......
packageA/drugOrder/drugOrder.js
...@@ -83,12 +83,18 @@ Page({ ...@@ -83,12 +83,18 @@ Page({
}; };
Service.delBuyDrug(data).then((res) => { Service.delBuyDrug(data).then((res) => {
if (res.code == 1) { if (res.code == 1) {
let index = e.currentTarget.dataset.index;
let list = Util.deepClone(that.data.list);
list.splice(index, 1);
that.setData({
list: list
})
wx.showToast({ wx.showToast({
title: '删除成功', title: '删除成功',
icon: 'success', icon: 'success',
mask: true mask: true
}) })
that.getList(1, that.data.nav) // that.getList(1, that.data.nav)
} }
}).catch((Error) => { }).catch((Error) => {
console.warn('error:', Error); // 获取会话资料失败的相关信息 console.warn('error:', Error); // 获取会话资料失败的相关信息
...@@ -137,11 +143,9 @@ Page({ ...@@ -137,11 +143,9 @@ Page({
}) })
}, 2000) }, 2000)
} else { } else {
// newList = res.data; newList = res.data;
newList = newList.concat(res.data);
} }
wx.stopPullDownRefresh() wx.stopPullDownRefresh();
if (newList.length > 0) { if (newList.length > 0) {
that.setData({ that.setData({
list: newList, list: newList,
...@@ -158,7 +162,7 @@ Page({ ...@@ -158,7 +162,7 @@ Page({
wx.hideLoading(); wx.hideLoading();
} }
}).catch(function (Error) { }).catch(function (Error) {
console.warn('error:', Error); // 获取会话资料失败的相关信息 console.warn('error:', Error); //
}); });
}, },
//选择topTab页 //选择topTab页
...@@ -205,13 +209,6 @@ Page({ ...@@ -205,13 +209,6 @@ Page({
} }
}) })
}, 1000, true), }, 1000, true),
// 查看物流-待发货
// goLogistics1: function (e) {
// console.log(1,e.currentTarget.dataset.id)
// wx.navigateTo({
// url: e.currentTarget.dataset.src +'?img=' + e.currentTarget.dataset.img + '&status=' + e.currentTarget.dataset.status + '&num=' + e.currentTarget.dataset.num + '&tel=' + e.currentTarget.dataset.tel + '&ordernumber=' + e.currentTarget.dataset.ordernumber+'&com='+e.currentTarget.dataset.com +'&address='+JSON.stringify(e.currentTarget.dataset.address),
// })
// },
/** /**
* 修改地址-待发货2 * 修改地址-待发货2
*/ */
...@@ -220,8 +217,21 @@ Page({ ...@@ -220,8 +217,21 @@ Page({
ordernumber: e.currentTarget.dataset.ordernumber ordernumber: e.currentTarget.dataset.ordernumber
}).then((res) => { }).then((res) => {
if (res.code == 1) { if (res.code == 1) {
return Service.getOrdersAddress({
ordernumber: e.currentTarget.dataset.ordernumber
});
} else {
wx.showToast({
title: res.msg,
icon: 'success',
mask: true
})
return Service.breakPromise();
}
}).then((res) => {
if (res.code == 200) {
wx.navigateTo({ wx.navigateTo({
url: '/packageA/addsite/addsite?item=' + JSON.stringify(e.currentTarget.dataset.address) + '&ordernumber=' + e.currentTarget.dataset.ordernumber, url: '/packageA/addsite/addsite?item=' + JSON.stringify(res.data) + '&ordernumber=' + e.currentTarget.dataset.ordernumber,
}) })
} else { } else {
wx.showToast({ wx.showToast({
...@@ -230,6 +240,13 @@ Page({ ...@@ -230,6 +240,13 @@ Page({
mask: true mask: true
}) })
} }
}).catch(err => {
wx.showToast({
title: err,
icon: 'none',
mask: true
})
}) })
}, 1000, true), }, 1000, true),
/** /**
...@@ -243,7 +260,7 @@ Page({ ...@@ -243,7 +260,7 @@ Page({
//查看物流-待收货+已完成 //查看物流-待收货+已完成
goLogistics: debouce(function (e) { goLogistics: debouce(function (e) {
wx.navigateTo({ wx.navigateTo({
url: e.currentTarget.dataset.src + "?num=" + e.currentTarget.dataset.num + '&tel=' + e.currentTarget.dataset.tel + '&ordernumber=' + e.currentTarget.dataset.ordernumber + '&img=' + e.currentTarget.dataset.img + '&status=' + e.currentTarget.dataset.status + '&com=' + e.currentTarget.dataset.com + '&address=' + JSON.stringify(e.currentTarget.dataset.address), url: e.currentTarget.dataset.src + "?num=" + e.currentTarget.dataset.num + '&ordernumber=' + e.currentTarget.dataset.ordernumber + '&img=' + e.currentTarget.dataset.img + '&status=' + e.currentTarget.dataset.status + '&com=' + e.currentTarget.dataset.com,
}) })
}, 1000, true), }, 1000, true),
/** /**
......
packageA/drugOrder/drugOrder.wxml
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<template is="noRecord" data="{{...noRecord}}" /> <template is="noRecord" data="{{...noRecord}}" />
</view> </view>
<view wx:else> <view wx:else>
<block wx:for="{{list}}" wx:key="key"> <block wx:for="{{list}}" wx:for-index="index" wx:key="key">
<!-- 药品 --> <!-- 药品 -->
<view class="dingdan"> <view class="dingdan">
<block> <block>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<text wx-if="{{item.status==5}}">订单过期</text> <text wx-if="{{item.status==5}}">订单过期</text>
<text wx-if="{{item.status==7}}">订单作废</text> <text wx-if="{{item.status==7}}">订单作废</text>
</view> </view>
<block wx:for="{{item.prescription}}" wx:key="index" wx:for-item="itemName"> <block wx:for="{{item.prescription}}" wx:key="key" wx:for-item="itemName">
<view class="list "> <view class="list ">
<view class="list-item {{index+1<item.prescription.length?'list-line':''}}"> <view class="list-item {{index+1<item.prescription.length?'list-line':''}}">
<view class="bor"> <view class="bor">
...@@ -52,20 +52,18 @@ ...@@ -52,20 +52,18 @@
<text>（含运费￥{{item.freight}}）</text> <text>（含运费￥{{item.freight}}）</text>
</view> </view>
<view class="dele flex"> <view class="dele flex">
<view class="delebtn" bindtap="deleBtn" data-ordernumber="{{item.ordernumber}}" <view class="delebtn" bindtap="deleBtn" data-ordernumber="{{item.ordernumber}}" data-index="{{index}}"
wx:if="{{item.status==1 || item.status==4 || item.status==5||item.status==7}}">删除订单</view> wx:if="{{item.status==1 || item.status==4 || item.status==5||item.status==7}}">删除订单</view>
<view class="btns flex"> <view class="btns flex">
<view class="ckwl" wx:if="{{item.status==2}}" bindtap="editAddress" data-ordernumber="{{item.ordernumber}}" <!-- <view class="ckwl" wx:if="{{item.status==2}}" bindtap="editAddress" data-ordernumber="{{item.ordernumber}}"
data-address="{{item.address}}">修改地址</view> data-address="{{item.address}}">修改地址</view> -->
<view class="ckwl" wx:if="{{item.status==2}}" bindtap="goLogistics" <!-- <view class="ckwl" wx:if="{{item.status==2}}" bindtap="goLogistics"
data-img="{{item.prescription[0].picture}}" data-id="{{item.id}}" data-status="{{item.status}}" data-img="{{item.prescription[0].picture}}" data-id="{{item.id}}" data-status="{{item.status}}"
data-src="/packageA/logistics/logistics" data-num="{{item.express_order_new}}" data-com="{{item.com}}" data-src="/packageA/logistics/logistics" data-num="{{item.express_order_new}}" data-com="{{item.com}}"
data-address="{{item.address}}" data-tel="{{item.address.phone}}" data-ordernumber="{{item.ordernumber}}"> data-address="{{item.address}}" data-tel="{{item.address.phone}}" data-ordernumber="{{item.ordernumber}}">
查看物流</view> 查看物流</view> -->
<view class="ckwl" wx:if="{{item.status==3 || item.status==4}}" bindtap="goLogistics" <view class="ckwl" wx:if="{{item.status==2||item.status==3 || item.status==4}}" bindtap="goLogistics"
data-status="{{item.status}}" data-img="{{item.prescription[0].picture}}" data-img="{{item.prescription[0].picture}}" data-status="{{item.status}}" data-src="/packageA/logistics/logistics" data-num="{{item.express_order_new}}" data-com="{{item.com}}" data-ordernumber="{{item.ordernumber}}">
data-src="/packageA/logistics/logistics" data-num="{{item.express_order_new}}" data-com="{{item.com}}"
data-address="{{item.address}}" data-tel="{{item.address.phone}}" data-ordernumber="{{item.ordernumber}}">
查看物流</view> 查看物流</view>
<view class="ljzf" wx:if="{{item.status==3}}" bindtap="confirmReceipt" data-num="{{item.ordernumber}}">确认收货 <view class="ljzf" wx:if="{{item.status==3}}" bindtap="confirmReceipt" data-num="{{item.ordernumber}}">确认收货
</view> </view>
......
packageA/drugOrderDetail/drugOrderDetail.js
...@@ -38,9 +38,16 @@ Page({ ...@@ -38,9 +38,16 @@ Page({
} }
/**药品订单详情 drogOrderDetail()*/ /**药品订单详情 drogOrderDetail()*/
Service.drogOrderDetail(param).then((res)=>{ Service.drogOrderDetail(param).then((res)=>{
console.log("res",res) if(res.code==1){
that.setData({
item:res.data,
list:res.data.drug_arr,
})
}
return Service.getOrdersAddress({ordernumber:res.data.ordernumber});
}).then(res=>{
let address={ let address={
id:res.data.address, id:res.data.id,
openid:wx.getStorageSync('data').openid, openid:wx.getStorageSync('data').openid,
unionid:wx.getStorageSync('data').unionid, unionid:wx.getStorageSync('data').unionid,
detail_address:res.data.detail_address, detail_address:res.data.detail_address,
...@@ -51,10 +58,8 @@ Page({ ...@@ -51,10 +58,8 @@ Page({
area:res.data.area, area:res.data.area,
city:res.data.city, city:res.data.city,
} }
if(res.code==1){ if(res.code==200){
that.setData({ that.setData({
item:res.data,
list:res.data.drug_arr,
address:address address:address
}) })
} }
...@@ -99,7 +104,7 @@ Page({ ...@@ -99,7 +104,7 @@ Page({
}, },
/**复制 */ /**复制 */
copy(e) { copy(e) {
let copy = e.currentTarget.dataset.c; let copy = String(e.currentTarget.dataset.c);
wx.setClipboardData({ wx.setClipboardData({
data: copy, data: copy,
success: function (res) { success: function (res) {
...@@ -167,7 +172,7 @@ editAddress:Util.debouce(function (e) { ...@@ -167,7 +172,7 @@ editAddress:Util.debouce(function (e) {
//查看物流-待收货+已完成 //查看物流-待收货+已完成
goLogistics: Util.debouce(function (e) { goLogistics: Util.debouce(function (e) {
wx.navigateTo({ wx.navigateTo({
url: e.currentTarget.dataset.src + "?num=" + e.currentTarget.dataset.num + '&tel=' + e.currentTarget.dataset.tel + '&ordernumber=' + e.currentTarget.dataset.ordernumber + '&img=' + e.currentTarget.dataset.img + '&status=' + e.currentTarget.dataset.status+'&com='+e.currentTarget.dataset.com+'&address='+JSON.stringify(e.currentTarget.dataset.address), url: e.currentTarget.dataset.src + "?num=" + e.currentTarget.dataset.num + '&ordernumber=' + e.currentTarget.dataset.ordernumber + '&img=' + e.currentTarget.dataset.img + '&status=' + e.currentTarget.dataset.status+'&com='+e.currentTarget.dataset.com,
}) })
},1000,true), },1000,true),
}) })
\ No newline at end of file
packageA/drugOrderDetail/drugOrderDetail.wxml
...@@ -7,62 +7,22 @@ ...@@ -7,62 +7,22 @@
</view> </view>
<view class="top-text">预计1-3天送达，偏远地区除外</view> <view class="top-text">预计1-3天送达，偏远地区除外</view>
</view> </view>
<view class="logistics" wx:if="{{item.status==2}}"> <view class="logistics">
<view class="logistics-title" wx:if="{{item.status==2}}">等待发货</view>
<view class="logistics-title">等待发货</view> <view class="logistics-title" wx:if="{{item.status==3}}">已发货</view>
<view class="logistics-title" wx:if="{{item.status==4}}">已签收</view>
<view class="logistics-text"> <view class="logistics-text">
<view class="addressInfo"> <view class="addressInfo">
<view class="address-icon"> <view class="address-icon">
<text class="cuIcon-location"></text> <text class="cuIcon-location"></text>
</view> </view>
<view> <view>
<view class=""><text class="address_name">{{item.name}}</text><text <view class=""><text class="address_name">{{address.name}}</text><text
class="address_call">{{item.phone}}</text></view> class="address_call">{{address.phone}}</text></view>
<view class="address_text">{{item.take_over+item.detail_address}}</view> <view class="address_text">{{address.take_over+address.detail_address}}</view>
</view> </view>
</view> </view>
</view> </view>
<!-- <view>
<text class="cuIcon-right lg text-gray logistics-right"></text>
</view> -->
</view>
<view class="logistics" wx:if="{{item.status==3}}">
<view class="logistics-title">已发货</view>
<view class="logistics-text">
<view class="addressInfo">
<view class="address-icon">
<text class="cuIcon-location"></text>
</view>
<view>
<view class=""><text class="address_name">{{item.name}}</text><text
class="address_call">{{item.phone}}</text></view>
<view class="address_text">{{item.take_over+item.detail_address}}</view>
</view>
</view>
</view>
<!-- <view>
<text class="cuIcon-right lg text-gray logistics-right"></text>
</view> -->
</view>
<view class="logistics" wx:if="{{item.status==4}}">
<view class="logistics-title">已签收</view>
<view class="logistics-text">
<view class="addressInfo">
<view class="address-icon">
<text class="cuIcon-location"></text>
</view>
<view>
<view class=""><text class="address_name">{{item.name}}</text><text
class="address_call">{{item.phone}}</text></view>
<view class="address_text">{{item.take_over+item.detail_address}}</view>
</view>
</view>
</view>
<!-- <view> <!-- <view>
<text class="cuIcon-right lg text-gray logistics-right"></text> <text class="cuIcon-right lg text-gray logistics-right"></text>
</view> --> </view> -->
...@@ -163,10 +123,9 @@ ...@@ -163,10 +123,9 @@
<view class="bottom row"> <view class="bottom row">
<!-- <view>查看医生推荐</view> --> <!-- <view>查看医生推荐</view> -->
<view bindtap="viewRecipe" data-item="{{item}}">查看处方</view> <view bindtap="viewRecipe" data-item="{{item}}">查看处方</view>
<view wx:if="{{item.status==2}}" bindtap="editAddress" data-ordernumber="{{item.ordernumber}}" <!-- <view wx:if="{{item.status==2}}" bindtap="editAddress" data-ordernumber="{{item.ordernumber}}"
data-address="{{address}}">修改地址</view> data-address="{{address}}">修改地址</view> -->
<view bindtap="goLogistics" data-status="{{item.status}}" data-img="{{item.drug_arr[0].picture}}" <view bindtap="goLogistics" data-status="{{item.status}}" data-img="{{item.drug_arr[0].picture}}"
data-src="/packageA/logistics/logistics" data-num="{{item.express_order}}" data-com="{{item.com}}" data-src="/packageA/logistics/logistics" data-ordernumber="{{item.ordernumber}}">查看物流
data-address="{{address}}" data-tel="{{item.phone}}" data-ordernumber="{{item.ordernumber}}">查看物流
</view> </view>
</view> </view>
\ No newline at end of file
packageA/drugOrderInfo/drugOrderInfo.wxss
...@@ -298,6 +298,11 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before { ...@@ -298,6 +298,11 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
font-size: 32rpx; font-size: 32rpx;
color: #333333; color: #333333;
font-weight: 600; font-weight: 600;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
} }
.errname { .errname {
......
packageA/logistics/logistics.js
...@@ -15,10 +15,11 @@ Page({ ...@@ -15,10 +15,11 @@ Page({
time2: '', time2: '',
time3: '', time3: '',
img: '', img: '',
status: '', status: '',//物流状态
sforderid:'',//物流单号
logistics: false, logistics: false,
mobileTail: '', mobileTail: '',
xdorderid: '' ordernumber: '' //订单单号
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
...@@ -27,40 +28,97 @@ Page({ ...@@ -27,40 +28,97 @@ Page({
let that = this let that = this
that.setData({ that.setData({
img: options.img, img: options.img,
status: options.status, ordernumber: options.ordernumber,
address: JSON.parse(options.address)
}) })
if (options.tel) { this.getLogisticsInfo(options.ordernumber);
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 获取最新的订单收货地址
*/
getLogisticsInfo(ordernumber) {
let that = this;
Service.getOrdersAddress({
ordernumber
}).then(res => {
console.log("res", res)
if (res.code == 200) {
console.log("res.data", res.data)
that.setData({ that.setData({
mobileTail: options.tel.substring(options.tel.length - 4), address: res.data,
mobileTail: res.data.phone.substring(res.data.phone.length - 4),
})
this.getLogisticsNumber(ordernumber);
} else {
wx.showToast({
title: res.msg,
icon: 'success',
mask: true
}) })
} }
console.log("options",options) }).catch(err => {
var list = options.num.split(',') wx.showToast({
var comlist = options.com.split(',') title: err,
icon: 'success',
mask: true
})
})
},
/**
* 通过订单单号获取物流单号
*/
getLogisticsNumber(ordernumber) {
let that = this;
Service.getLogisticsNumber({
ordernumber
}).then(res => {
console.log("res.data", res)
if (res.code == 200) {
if (res.data) {
that.setData({
status:res.data.status,
sforderid:res.data.sf_waybillno
})
} else {
that.setData({ that.setData({
xdorderid: options.ordernumber, status:0,
list: list,
orderid: list[0],
comlist: comlist,
com: util.isEmpty(comlist[0]) ? 'shunfeng' : comlist[0]
}) })
}
that.getWl() that.getWl()
// that.setData({
// address: res.data,
// mobileTail: res.data.phone.substring(res.data.phone.length - 4),
// })
} else {
wx.showToast({
title: res.msg,
icon: 'success',
mask: true
})
}
}).catch(err => {
console.err("getLogisticsNumber", err)
wx.showToast({
title: err,
// icon: 'success',
mask: true
})
})
}, },
/** /**
* 生命周期函数--监听页面显示 * 获取物流路由
*/ */
onShow: function () {
},
getWl: function () { getWl: function () {
var that = this let that = this
var data = {} let data = {}
data.orderid = that.data.orderid; data.orderid = that.data.sforderid;
data.mobileTail = that.data.mobileTail; data.mobileTail = that.data.mobileTail;
data.xdorderid = that.data.xdorderid; data.xdorderid = that.data.ordernumber;
data.com = that.data.com;
data.phone = that.data.mobileTail; data.phone = that.data.mobileTail;
Service.logisticsInfo(data).then((res) => { Service.logisticsInfo(data).then((res) => {
if (res.data) { if (res.data) {
...@@ -75,18 +133,19 @@ Page({ ...@@ -75,18 +133,19 @@ Page({
} }
}) })
}, },
getSf: function (e) { /**
var _this = this * 复制单号
_this.setData({ * @param {*} e
orderid: e.currentTarget.dataset.num */
})
_this.getWl()
},
getNum: function (e) { getNum: function (e) {
wx.setClipboardData({ wx.setClipboardData({
data: this.data.orderid, data: this.data.sforderid,
success: function (res) { success: function (res) {
wx.showToast({
title: '复制成功',
icon: 'success',
mask: true
})
} }
}) })
}, },
......
packageA/logistics/logistics.wxml
<!--packageA/logistics/logistics.wxml--> <!--packageA/logistics/logistics.wxml-->
<answer id='answer'></answer> <answer id='answer'></answer>
<view class="pre" wx:if="{{orderid!='null' && list.length>1}}">
<view space='ensp'>因货品存放于不同仓库，您的订单拆分为{{list.length}}个包裹发货，运单号为:
<text bindtap="getSf" data-num="{{item}}" wx:for="{{list}}" wx:key="index">{{item}}{{list.length>index+1?'、':''}}</text>{{list.length>index+1?'':'，'}}
点击单号可查看物流状态。</view>
</view>
<view class="header"> <view class="header">
<view class="title"> <view class="title">
<view class="img"> <view class="img">
<image src="{{img}}"></image> <image src="{{img}}"></image>
</view> </view>
<view class="marl"> <view class="marl">
<view class="dfh mt" wx:if="{{status==2}}">待发货</view> <view class="dfh mt" wx:if="{{status==0}}">待发货</view>
<view class="dfh" wx:if="{{status==3}}">待收货</view> <view class="dfh" wx:if="{{status==1}}">待收货</view>
<view class="dfh" wx:if="{{status==4}}">已完成</view> <view class="dfh" wx:if="{{status==2}}">已完成</view>
<view class="dh" wx:if="{{orderid!='null' && orderid}}"> <view class="dfh" wx:if="{{status==3}}">已取消</view>
<text wx:if="{{com=='shunfeng'}}">顺丰速运</text> <view class="dfh" wx:if="{{status==4}}">已拒收</view>
<text wx:if="{{com=='jd'}}">京东物流</text> <view class="dfh" wx:if="{{status==5}}">派件异常</view>
<text wx:if="{{com=='yuantong'}}">圆通速递</text> <view class="dfh" wx:if="{{status==6}}">运输中</view>
<text wx:if="{{com=='shentong'}}">申通快递</text> <view class="dh" wx:if="{{sforderid}}">
<text wx:if="{{com=='zhongtong'}}">中通快递</text> <text >顺丰速运</text>
<text wx:if="{{com=='yundakuaiyun'}}">韵达快运</text> ：{{sforderid}}
：{{orderid}} <view class="btn" bindtap="getNum" wx:if="{{sforderid}}">复制</view>
<view class="btn" bindtap="getNum" wx:if="{{orderid!='null' && orderid}}">复制</view>
</view> </view>
<view class="mt" wx:if="{{orderid!='null' && orderid}}"> <view class="mt" wx:if="{{orderid!='null' && orderid}}">
<!-- <text class="wuliuzx">物流咨询：</text> <!-- <text class="wuliuzx">物流咨询：</text>
<text class="wuliutel" bindtap="ddh">95338</text> --> <text class="wuliutel" bindtap="ddh">95338</text> -->
</view> </view>
<view class="mt" wx:if="{{status==2}}"> <view class="mt" wx:if="{{status==0}}">
<text class="wuliuzx02">暂无运单信息</text> <text class="wuliuzx02">暂无运单信息</text>
</view> </view>
</view> </view>
...@@ -54,7 +48,7 @@ ...@@ -54,7 +48,7 @@
</view> </view>
</view> </view>
</block> </block>
<view class="list" wx:if="{{orderid!='null' && orderid}}"> <view class="list" wx:if="{{orderid}}">
<image src="{{arr==''?'/images/yfh.png':'/images/yfh2.png'}}"></image> <image src="{{arr==''?'/images/yfh.png':'/images/yfh2.png'}}"></image>
<view class="list-zi"> <view class="list-zi">
<view class="ztsize" style="font-size:32rpx;">已发货</view> <view class="ztsize" style="font-size:32rpx;">已发货</view>
......
packageA/logistics/logistics.wxss
...@@ -134,7 +134,7 @@ text{ ...@@ -134,7 +134,7 @@ text{
.steps .list:first-child .list-zi::before{ .steps .list:first-child .list-zi::before{
position: absolute; position: absolute;
z-index: 100; z-index: 100;
left: 0; left:4rpx ;
top: 0; top: 0;
margin-top: 30rpx; margin-top: 30rpx;
content: ""; content: "";
......
packageA/productOrder/productOrder.js
...@@ -83,13 +83,19 @@ Page({ ...@@ -83,13 +83,19 @@ Page({
ordernumber: e.currentTarget.dataset.ordernumber ordernumber: e.currentTarget.dataset.ordernumber
}; };
Service.delBuyDrug(data).then((res) => { Service.delBuyDrug(data).then((res) => {
if (res.code == 1) { if (res.code == 200) {
let index=e.currentTarget.dataset.index;
let list=Util.deepClone(that.data.list);
list.splice(index,1);
that.setData({
list:list
})
wx.showToast({ wx.showToast({
title: '删除成功', title: '删除成功',
icon: 'success', icon: 'success',
mask: true mask: true
}) })
that.getList(1, that.data.nav) // that.getList(1, that.data.nav)
} }
}).catch((Error) => { }).catch((Error) => {
console.warn('error:', Error); // 获取会话资料失败的相关信息 console.warn('error:', Error); // 获取会话资料失败的相关信息
...@@ -104,7 +110,7 @@ Page({ ...@@ -104,7 +110,7 @@ Page({
that.data.requestStatus = true; that.data.requestStatus = true;
var data = { var data = {
page: page, page: page,
// unionid:'oHhp80QCN2WjClijvSyhkEFQcUwY', // unionid:'oHhp80TKmeamBXcKWKjwM-NBrZ94',
unionid: wx.getStorageSync('data').unionid, unionid: wx.getStorageSync('data').unionid,
status: status status: status
}; };
...@@ -207,13 +213,6 @@ Page({ ...@@ -207,13 +213,6 @@ Page({
} }
}) })
}, 1000, true), }, 1000, true),
// 查看物流-待发货
// goLogistics1: function (e) {
// console.log(1,e.currentTarget.dataset.id)
// wx.navigateTo({
// url: e.currentTarget.dataset.src +'?img=' + e.currentTarget.dataset.img + '&status=' + e.currentTarget.dataset.status + '&num=' + e.currentTarget.dataset.num + '&tel=' + e.currentTarget.dataset.tel + '&ordernumber=' + e.currentTarget.dataset.ordernumber+'&com='+e.currentTarget.dataset.com +'&address='+JSON.stringify(e.currentTarget.dataset.address),
// })
// },
/** /**
* 修改地址-待发货2 * 修改地址-待发货2
*/ */
...@@ -245,7 +244,7 @@ Page({ ...@@ -245,7 +244,7 @@ Page({
//查看物流-待收货+已完成 //查看物流-待收货+已完成
goLogistics: debouce(function (e) { goLogistics: debouce(function (e) {
wx.navigateTo({ wx.navigateTo({
url: e.currentTarget.dataset.src + "?num=" + e.currentTarget.dataset.num + '&tel=' + e.currentTarget.dataset.tel + '&ordernumber=' + e.currentTarget.dataset.ordernumber + '&img=' + e.currentTarget.dataset.img + '&status=' + e.currentTarget.dataset.status + '&com=' + e.currentTarget.dataset.com + '&address=' + JSON.stringify(e.currentTarget.dataset.address), url: e.currentTarget.dataset.src + "?num=" + e.currentTarget.dataset.num + '&ordernumber=' + e.currentTarget.dataset.ordernumber + '&img=' + e.currentTarget.dataset.img + '&status=' + e.currentTarget.dataset.status + '&com=' + e.currentTarget.dataset.com,
}) })
}, 1000, true), }, 1000, true),
/** /**
...@@ -253,10 +252,8 @@ Page({ ...@@ -253,10 +252,8 @@ Page({
*/ */
goPay: debouce(function (e) { goPay: debouce(function (e) {
let that = this; let that = this;
let orderClass = e.currentTarget.dataset.class;
console.log("orderClass", orderClass);
let data = { let data = {
prescription: e.currentTarget.dataset.yfid, prescription: e.currentTarget.dataset.prescription,
patient_unionid: wx.getStorageSync('data').unionid, patient_unionid: wx.getStorageSync('data').unionid,
isquick: e.currentTarget.dataset.isquick isquick: e.currentTarget.dataset.isquick
} }
......
packageA/productOrder/productOrder.wxml
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<template is="noRecord" data="{{...noRecord}}" /> <template is="noRecord" data="{{...noRecord}}" />
</view> </view>
<view wx:else> <view wx:else>
<block wx:for="{{list}}" wx:key="key"> <block wx:for="{{list}}" wx:for-index="index" wx:key="key">
<!-- 推荐产品 --> <!-- 推荐产品 -->
<view class="dingdan"> <view class="dingdan">
<block> <block>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<text wx-if="{{item.status==5}}">订单过期</text> <text wx-if="{{item.status==5}}">订单过期</text>
<text wx-if="{{item.status==7}}">订单作废</text> <text wx-if="{{item.status==7}}">订单作废</text>
</view> </view>
<block wx:for="{{item.prescription}}" wx:key="index" wx:for-item="itemName"> <block wx:for="{{item.prescription}}" wx:key="key" wx:for-item="itemName">
<view class="list "> <view class="list ">
<view class="list-item {{index+1<item.prescription.length?'list-line':''}}"> <view class="list-item {{index+1<item.prescription.length?'list-line':''}}">
<view class="bor"> <view class="bor">
...@@ -52,26 +52,20 @@ ...@@ -52,26 +52,20 @@
<text>（含运费￥{{item.freight}}）</text> <text>（含运费￥{{item.freight}}）</text>
</view> </view>
<view class="dele flex"> <view class="dele flex">
<view class="delebtn" bindtap="deleBtn" data-ordernumber="{{item.ordernumber}}" <view class="delebtn" bindtap="deleBtn" data-ordernumber="{{item.ordernumber}}" data-index="{{index}}"
wx:if="{{item.status==1 || item.status==4 ||item.status==7}}">删除订单</view> wx:if="{{item.status==1 || item.status==4 ||item.status==7}}" >删除订单</view>
<view class="btns flex"> <view class="btns flex">
<view class="ckwl" wx:if="{{item.status==2}}" bindtap="editAddress" data-ordernumber="{{item.ordernumber}}" <!-- <view class="ckwl" wx:if="{{item.status==2}}" bindtap="editAddress" data-ordernumber="{{item.ordernumber}}"
data-address="{{item.address}}">修改地址</view> data-address="{{item.address}}">修改地址</view> -->
<view class="ckwl" wx:if="{{item.status==2}}" bindtap="goLogistics" <view class="ckwl" wx:if="{{item.status==2||item.status==3 || item.status==4}}" bindtap="goLogistics"
data-img="{{item.prescription[0].picture}}" data-id="{{item.id}}" data-status="{{item.status}}"
data-src="/packageA/logistics/logistics" data-num="{{item.express_order_new}}" data-com="{{item.com}}"
data-address="{{item.address}}" data-tel="{{item.address.phone}}" data-ordernumber="{{item.ordernumber}}">
查看物流</view>
<view class="ckwl" wx:if="{{item.status==3 || item.status==4}}" bindtap="goLogistics"
data-status="{{item.status}}" data-img="{{item.prescription[0].picture}}" data-status="{{item.status}}" data-img="{{item.prescription[0].picture}}"
data-src="/packageA/logistics/logistics" data-num="{{item.express_order_new}}" data-com="{{item.com}}" data-src="/packageA/logistics/logistics" data-ordernumber="{{item.ordernumber}}">
data-address="{{item.address}}" data-tel="{{item.address.phone}}" data-ordernumber="{{item.ordernumber}}">
查看物流</view> 查看物流</view>
<view class="ljzf" wx:if="{{item.status==3}}" bindtap="confirmReceipt" data-num="{{item.ordernumber}}">确认收货 <view class="ljzf" wx:if="{{item.status==3}}" bindtap="confirmReceipt" data-num="{{item.ordernumber}}">确认收货
</view> </view>
<view class="ljzf" wx:if="{{item.status==2||item.status==3 || item.status==4}}" bindtap="goOrderDetail" <view class="ljzf" wx:if="{{item.status==2||item.status==3 || item.status==4}}" bindtap="goOrderDetail"
data-id="{{item.id}}">订单详情</view> data-id="{{item.id}}">订单详情</view>
<view class="ljzf" wx:if="{{item.status==1}}" bindtap="goPay" data-id="{{item.id}}" data-yfid="{{item.yfid}}" <view class="ljzf" wx:if="{{item.status==1}}" bindtap="goPay" data-id="{{item.modular==0?item.id:item.quickid}}" data-prescription="{{item.modular==0?item.yfid:item.quickid}}"
data-isquick="{{item.modular}}">立即支付</view> data-isquick="{{item.modular}}">立即支付</view>
<view class="ljzf1" wx:if="{{item.status==5}}">订单过期</view> <view class="ljzf1" wx:if="{{item.status==5}}">订单过期</view>
<view class="ljzf1" wx:if="{{item.status==7}}">订单作废</view> <view class="ljzf1" wx:if="{{item.status==7}}">订单作废</view>
......
packageA/productOrderDetail/productOrderDetail.js
...@@ -10,7 +10,6 @@ Page({ ...@@ -10,7 +10,6 @@ Page({
list: ["1"], list: ["1"],
index: 0 index: 0
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
...@@ -38,9 +37,15 @@ Page({ ...@@ -38,9 +37,15 @@ Page({
} }
/**药品订单详情 drogOrderDetail()*/ /**药品订单详情 drogOrderDetail()*/
Service.productOrderDetail(param).then((res)=>{ Service.productOrderDetail(param).then((res)=>{
console.log("res",res) if(res.code==200){
that.setData({
item:res.data,
list:res.data.drug_arr,
})
} return Service.getOrdersAddress({ordernumber:res.data.ordernumber});
}).then(res=>{
let address={ let address={
id:res.data.address, id:res.data.id,
openid:wx.getStorageSync('data').openid, openid:wx.getStorageSync('data').openid,
unionid:wx.getStorageSync('data').unionid, unionid:wx.getStorageSync('data').unionid,
detail_address:res.data.detail_address, detail_address:res.data.detail_address,
...@@ -53,8 +58,6 @@ Page({ ...@@ -53,8 +58,6 @@ Page({
} }
if(res.code==200){ if(res.code==200){
that.setData({ that.setData({
item:res.data,
list:res.data.drug_arr,
address:address address:address
}) })
} }
...@@ -99,13 +102,14 @@ Page({ ...@@ -99,13 +102,14 @@ Page({
}, },
/**复制 */ /**复制 */
copy(e) { copy(e) {
let copy = e.currentTarget.dataset.c; let copy =String(e.currentTarget.dataset.c);
console.log("copy",copy)
wx.setClipboardData({ wx.setClipboardData({
data: copy, data: copy,
success: function (res) { success: function (res) {
console.log("res",res)
wx.getClipboardData({ wx.getClipboardData({
success: function (res) { success: function (res) {
console.log("res",res)
wx.showToast({ wx.showToast({
title: '复制成功', title: '复制成功',
}) })
...@@ -168,7 +172,7 @@ editAddress:Util.debouce(function (e) { ...@@ -168,7 +172,7 @@ editAddress:Util.debouce(function (e) {
//查看物流-待收货+已完成 //查看物流-待收货+已完成
goLogistics: Util.debouce(function (e) { goLogistics: Util.debouce(function (e) {
wx.navigateTo({ wx.navigateTo({
url: e.currentTarget.dataset.src + "?num=" + e.currentTarget.dataset.num + '&tel=' + e.currentTarget.dataset.tel + '&ordernumber=' + e.currentTarget.dataset.ordernumber + '&img=' + e.currentTarget.dataset.img + '&status=' + e.currentTarget.dataset.status+'&com='+e.currentTarget.dataset.com+'&address='+JSON.stringify(e.currentTarget.dataset.address), url: e.currentTarget.dataset.src + "?num=" + e.currentTarget.dataset.num + '&tel=' + e.currentTarget.dataset.tel + '&ordernumber=' + e.currentTarget.dataset.ordernumber + '&img=' + e.currentTarget.dataset.img + '&com='+e.currentTarget.dataset.com,
}) })
},1000,true), },1000,true),
}) })
\ No newline at end of file
packageA/productOrderDetail/productOrderDetail.wxml
...@@ -7,18 +7,18 @@ ...@@ -7,18 +7,18 @@
</view> </view>
<view class="top-text">预计1-3天送达，偏远地区除外</view> <view class="top-text">预计1-3天送达，偏远地区除外</view>
</view> </view>
<view class="logistics" wx:if="{{item.status==2}}"> <view class="logistics" >
<view class="logistics-title" wx:if="{{item.status==2||item.status==1}}">等待发货</view>
<view class="logistics-title">等待发货</view> <view class="logistics-title" wx:if="{{item.status==3}}">已发货</view>
<view class="logistics-text"> <view class="logistics-text">
<view class="addressInfo"> <view class="addressInfo">
<view class="address-icon"> <view class="address-icon">
<text class="cuIcon-location"></text> <text class="cuIcon-location"></text>
</view> </view>
<view> <view>
<view class=""><text class="address_name">{{item.name}}</text><text <view class=""><text class="address_name">{{address.name}}</text><text class="address_call">{{address.phone}}</text>
class="address_call">{{item.phone}}</text></view> </view>
<view class="address_text">{{item.take_over+item.detail_address}}</view> <view class="address_text">{{address.take_over+address.detail_address}}</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -26,8 +26,7 @@ ...@@ -26,8 +26,7 @@
<text class="cuIcon-right lg text-gray logistics-right"></text> <text class="cuIcon-right lg text-gray logistics-right"></text>
</view> --> </view> -->
</view> </view>
<view class="logistics" wx:if="{{item.status==3}}"> <!-- <view class="logistics" wx:if="{{item.status==3}}">
<view class="logistics-title">已发货</view> <view class="logistics-title">已发货</view>
<view class="logistics-text"> <view class="logistics-text">
<view class="addressInfo"> <view class="addressInfo">
...@@ -35,19 +34,14 @@ ...@@ -35,19 +34,14 @@
<text class="cuIcon-location"></text> <text class="cuIcon-location"></text>
</view> </view>
<view> <view>
<view class=""><text class="address_name">{{item.name}}</text><text <view class=""><text class="address_name">{{item.name}}</text><text class="address_call">{{item.phone}}</text>
class="address_call">{{item.phone}}</text></view> </view>
<view class="address_text">{{item.take_over+item.detail_address}}</view> <view class="address_text">{{item.take_over+item.detail_address}}</view>
</view> </view>
</view> </view>
</view> </view>
</view> -->
<!-- <view>
<text class="cuIcon-right lg text-gray logistics-right"></text>
</view> -->
</view>
<view class="logistics" wx:if="{{item.status==4}}"> <view class="logistics" wx:if="{{item.status==4}}">
<view class="logistics-title">已签收</view> <view class="logistics-title">已签收</view>
<view class="logistics-text"> <view class="logistics-text">
<view class="addressInfo"> <view class="addressInfo">
...@@ -55,8 +49,8 @@ ...@@ -55,8 +49,8 @@
<text class="cuIcon-location"></text> <text class="cuIcon-location"></text>
</view> </view>
<view> <view>
<view class=""><text class="address_name">{{item.name}}</text><text <view class=""><text class="address_name">{{item.name}}</text><text class="address_call">{{item.phone}}</text>
class="address_call">{{item.phone}}</text></view> </view>
<view class="address_text">{{item.take_over+item.detail_address}}</view> <view class="address_text">{{item.take_over+item.detail_address}}</view>
</view> </view>
</view> </view>
...@@ -99,7 +93,7 @@ ...@@ -99,7 +93,7 @@
<view class="row order-freight"> <view class="row order-freight">
<view>运费：</view> <view>运费：</view>
<view wx:if="{{item.freight&&item.freight!='0.00'}}">￥ {{item.freight}}</view> <view wx:if="{{item.freight&&item.freight!='0.00'}}">￥ {{item.freight}}</view>
<view wx:else >包邮</view> <view wx:else>包邮</view>
</view> </view>
<view class="actualPay">共{{item.drug_num}}件商品 实付款: <text style="color:#EC5B68;">￥{{item.money}}</text></view> <view class="actualPay">共{{item.drug_num}}件商品 实付款: <text style="color:#EC5B68;">￥{{item.money}}</text></view>
</view> </view>
...@@ -163,10 +157,10 @@ ...@@ -163,10 +157,10 @@
<view class="bottom row"> <view class="bottom row">
<!-- <view>查看医生推荐</view> --> <!-- <view>查看医生推荐</view> -->
<!-- <view bindtap="viewRecipe" data-item="{{item}}">查看处方</view> --> <!-- <view bindtap="viewRecipe" data-item="{{item}}">查看处方</view> -->
<view wx:if="{{item.status==2}}" bindtap="editAddress" data-ordernumber="{{item.ordernumber}}" <!-- <view wx:if="{{item.status==2}}" bindtap="editAddress" data-ordernumber="{{item.ordernumber}}"
data-address="{{address}}">修改地址</view> data-address="{{address}}">修改地址</view> -->
<view bindtap="goLogistics" data-status="{{item.status}}" data-img="{{item.drug_arr[0].picture}}" <view bindtap="goLogistics" data-img="{{item.drug_arr[0].picture}}"
data-src="/packageA/logistics/logistics" data-num="{{item.express_order}}" data-com="{{item.com}}" data-src="/packageA/logistics/logistics"
data-address="{{address}}" data-tel="{{item.phone}}" data-ordernumber="{{item.ordernumber}}">查看物流 data-ordernumber="{{item.ordernumber}}">查看物流
</view> </view>
</view> </view>
\ No newline at end of file
packageA/productOrderInfo/productOrderInfo.wxss
...@@ -272,18 +272,17 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before { ...@@ -272,18 +272,17 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
justify-content: space-between; justify-content: space-between;
padding-left: 18rpx; padding-left: 18rpx;
width: 455rpx; width: 455rpx;
overflow: hidden;
/*超出部分隐藏*/
white-space: nowrap;
/*不换行*/
text-overflow: ellipsis;
/*超出部分文字以...显示*/
} }
.name { .name {
font-size: 32rpx; font-size: 32rpx;
color: #333333; color: #333333;
font-weight: 600; font-weight: 600;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
} }
.errname{ .errname{
width: 400rpx; width: 400rpx;
...@@ -303,7 +302,7 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before { ...@@ -303,7 +302,7 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
color: #666666; color: #666666;
overflow: hidden; overflow: hidden;
/*超出部分隐藏*/ /*超出部分隐藏*/
white-space: nowrap; white-space: 2;
/*不换行*/ /*不换行*/
text-overflow: ellipsis; text-overflow: ellipsis;
/*超出部分文字以...显示*/ /*超出部分文字以...显示*/
......
packageA/serviceDetails/serviceDetails.js
...@@ -17,6 +17,7 @@ Page({ ...@@ -17,6 +17,7 @@ Page({
that.setData({ that.setData({
item: JSON.parse(options.item) item: JSON.parse(options.item)
}) })
// that.getServiceDetail(options.id)
that.getServiceDetail(options.id) that.getServiceDetail(options.id)
}, },
/** /**
......
packageB/myReport/myReport.js
...@@ -19,7 +19,6 @@ Page({ ...@@ -19,7 +19,6 @@ Page({
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
}, },
/** /**
...@@ -46,15 +45,15 @@ Page({ ...@@ -46,15 +45,15 @@ Page({
* 页面相关事件处理函数--监听用户下拉动作 * 页面相关事件处理函数--监听用户下拉动作
*/ */
onPullDownRefresh: function () { onPullDownRefresh: function () {
this.getReportList();
}, },
/** // /**
* 页面上拉触底事件的处理函数 // * 页面上拉触底事件的处理函数
*/ // */
onReachBottom: function () { // onReachBottom: function () {
}, // },
/** /**
* 量表续答 * 量表续答
* @param {*} e * @param {*} e
...@@ -119,9 +118,11 @@ Page({ ...@@ -119,9 +118,11 @@ Page({
Service.isReport(data).then((res) => { Service.isReport(data).then((res) => {
// 查看列表权限 // 查看列表权限
if (res.data == '1') { if (res.data == '1') {
//可查看
that.setData({ that.setData({
hidden: true hidden: true
}) })
//跳转webview报告页
wx.navigateTo({ wx.navigateTo({
url: '/packageB/webview/webview?id=' + item.res_id + '&lbname=' + item.measure_name + '&share=0&t_openid=' + 0, url: '/packageB/webview/webview?id=' + item.res_id + '&lbname=' + item.measure_name + '&share=0&t_openid=' + 0,
success: function () { success: function () {
...@@ -180,7 +181,7 @@ Page({ ...@@ -180,7 +181,7 @@ Page({
isShow: true, isShow: true,
}) })
} }
wx.stopPullDownRefresh();
}) })
}, },
/** /**
......
pages/dati04/dati04.wxml
...@@ -10,17 +10,42 @@ ...@@ -10,17 +10,42 @@
<text wx:else>{{item.con}}</text> <text wx:else>{{item.con}}</text>
</view> </view>
<block wx:for="{{item.answer}}" wx:for-item="itemName" wx:for-index="index1" wx:key="*this"> <block wx:for="{{item.answer}}" wx:for-item="itemName" wx:for-index="index1" wx:key="*this">
<view class=" answer {{active == index1?'s-active':''}}" hidden="{{(pizibao&& current+1==1)||(pizibao&& current+1==3)||(pizibao&& current+1==4) || (pizibao1&& current+1==10) || (pizibao1&& current+1==11)}}" bindtap='selectData' data-index="{{index1}}" <block wx:if="{{!multipleChoice}}">
data-answer="{{itemName}}" data-score="{{item.score[index1]}}" data-record="{{current}}"> <view class=" answer {{active == index1?'s-active':''}}"
hidden="{{(pizibao&& current+1==1)||(pizibao&& current+1==3)||(pizibao&& current+1==4) || (pizibao1&& current+1==10) || (pizibao1&& current+1==11)}}"
bindtap='selectData' data-index="{{index1}}" data-answer="{{itemName}}" data-score="{{item.score[index1]}}"
data-record="{{current}}">
<text>{{itemName}}</text> <text>{{itemName}}</text>
</view> </view>
<!--社会支持评定 --> <!--社会支持评定 -->
<view class="shehui {{((pizibao1&& current+1==10) || (pizibao1&& current+1==11))?'show':'hid'}}"> <view class="shehui {{((pizibao1&& current+1==10) || (pizibao1&& current+1==11))?'show':'hid'}}">
<view class=" answer1 {{active == index1?'s-active':''}} " bindtap='selectData' data-index="{{index1}}" data-answer="{{itemName}}" data-score="{{item.score[index1]}}" data-record="{{current}}" style="border-left:{{index1%2==0?'none':'0.5px solid #e3e3e3'}};"> <view class=" answer1 {{active == index1?'s-active':''}} " bindtap='selectData' data-index="{{index1}}"
data-answer="{{itemName}}" data-score="{{item.score[index1]}}" data-record="{{current}}"
style="border-left:{{index1%2==0?'none':'0.5px solid #e3e3e3'}};">
<text>{{itemName}}</text> <text>{{itemName}}</text>
</view> </view>
</view> </view>
</block> </block>
<!-- 惰性性攻击的动态评价 -->
<block wx:else>
<block wx:if='{{current == 8 || current == 9 || current == 10}}'>
<view class=" answer {{item.check[index1] == 1?'s-active':''}}"
hidden="{{(pizibao&& current+1==1)||(pizibao&& current+1==3)||(pizibao&& current+1==4) ||(pizibao1&& current+1==56)||(pizibao1&& current+1==58)||(pizibao1&& current+1==59)|| (shzcpd&& current+1==10) || (shzcpd&& current+1==11)}}"
data-index="{{index1}}" data-answer="{{itemName}}" data-score="{{item.score[index1]}}"
data-record="{{current}}" bindtap='selectData' data-btnflag='1'>
<text>{{itemName}}</text>
</view>
</block>
<block wx:else>
<view class=" answer {{active == index1?'s-active':''}}"
hidden="{{(pizibao&& current+1==1)||(pizibao&& current+1==3)||(pizibao&& current+1==4) || (pizibao1&& current+1==56)||(pizibao1&& current+1==58)||(pizibao1&& current+1==59)||(shzcpd&& current+1==10) || (shzcpd&& current+1==11)}}"
data-index="{{index1}}" data-answer="{{itemName}}" data-score="{{item.score[index1]}}"
data-record="{{current}}" bindtap='selectData' data-btnflag='0'>
<text>{{itemName}}</text>
</view>
</block>
</block>
</block>
<!--匹兹堡睡眠质量 --> <!--匹兹堡睡眠质量 -->
<view class="pizibao {{(pizibao&& current+1==1)||(pizibao&& current+1==3)||(pizibao&& current+1==4)?'show':'hid'}}"> <view class="pizibao {{(pizibao&& current+1==1)||(pizibao&& current+1==3)||(pizibao&& current+1==4)?'show':'hid'}}">
<block wx:if="{{current+1==1}}"> <block wx:if="{{current+1==1}}">
...@@ -58,15 +83,33 @@ ...@@ -58,15 +83,33 @@
</block> </block>
</view> </view>
</view> </view>
<view class="btn {{current<all-1?'show':'hid'}}"> <block wx:if='{{!multipleChoice}}'>
<view class="btn {{current<all-1?'show':'hid'}}">
<view class="menuebtn1 {{current>0?'menuebtn-active':''}}" bindtap='prev'>上一题</view> <view class="menuebtn1 {{current>0?'menuebtn-active':''}}" bindtap='prev'>上一题</view>
</view> </view>
<view class="btn {{all==current+1?'show':'hid'}}"> <view class="btn {{all==current+1?'show':'hid'}}">
<view class="menuebtn {{current>0?'menuebtn-active':''}}" bindtap='prev'>上一题</view> <view class="menuebtn {{current>0?'menuebtn-active':''}}" bindtap='prev'>上一题</view>
<view class="menuebtn {{disab?'show':'hid'}} " style='margin-left:40rpx;'>提交</view> <view class="menuebtn {{disab?'show':'hid'}} " style='margin-left:40rpx;'>提交</view>
<view class="menuebtn menuebtn-active {{disab?'hid':'show'}} " style='margin-left:40rpx;' wx:if='{{sc}}' bindtap='tijiao'>提交</view> <view class="menuebtn menuebtn-active {{disab?'hid':'show'}} " style='margin-left:40rpx;' wx:if='{{sc}}'
<view class="menuebtn menuebtn-active {{disab?'hid':'show'}} " style='margin-left:40rpx; background: #999;' wx:if='{{!sc}}'>上传中</view> bindtap='tijiao'>提交</view>
</view> <view class="menuebtn menuebtn-active {{disab?'hid':'show'}} " style='margin-left:40rpx; background: #999;'
wx:if='{{!sc}}'>上传中</view>
</view>
</block>
<block wx:else>
<view class="btn {{current<all?'show':'hid'}}">
<view wx:if="{{!canvas}}" class="menuebtn {{current>0?'menuebtn-active':''}}" bindtap='prev'>上一题</view>
<view class="menuebtn" wx:if='{{!nextFalg[current]}}' style='margin-left:40rpx;' data-cur='{{current}}'>
下一题</view>
<view class="menuebtn menuebtn-active" wx:elif='{{nextFalg[current] && current+1 < all }}'
style='margin-left:40rpx;' bindtap='next' data-cur='{{current}}'>下一题</view>
<block wx:else>
<view class="menuebtn {{disab?'show':'hid'}} " style='margin-left:40rpx;'>提交</view>
<view class="menuebtn menuebtn-active {{disab?'hid':'show'}} " style='margin-left:40rpx;' bindtap='tijiao'>提交
</view>
</block>
</view>
</block>
<view class='all-item'> <view class='all-item'>
<text>{{current+1}}/{{all}}</text> <text>{{current+1}}/{{all}}</text>
</view> </view>
\ No newline at end of file
pages/index/index.wxss
...@@ -58,12 +58,13 @@ view{ ...@@ -58,12 +58,13 @@ view{
font-size: 30rpx; font-size: 30rpx;
font-weight: bolder; font-weight: bolder;
color: #000; color: #000;
line-height: 0.8; line-height: 1;
letter-spacing: 2rpx; letter-spacing: 2rpx;
} }
.nav text:last-child{ .nav text:last-child{
font-weight: 300; font-weight: 300;
font-size: 24rpx; font-size: 24rpx;
height: 24rpx;
letter-spacing: 1rpx; letter-spacing: 1rpx;
color: #3b3b3b; color: #3b3b3b;
} }
...@@ -92,7 +93,7 @@ view{ ...@@ -92,7 +93,7 @@ view{
margin-left: 30rpx; margin-left: 30rpx;
margin-top: 37rpx; margin-top: 37rpx;
font-size: 30rpx; font-size: 30rpx;
font-weight: bold; font-weight: 700;
color: #333333; color: #333333;
} }
.block-con{ .block-con{
...@@ -102,7 +103,6 @@ view{ ...@@ -102,7 +103,6 @@ view{
color: #3a3a3a; color: #3a3a3a;
font-weight: 300; font-weight: 300;
opacity: .8; opacity: .8;
font-family: "Bitstream Vera Serif Bold";
} }
.po-ab{ .po-ab{
position: absolute; position: absolute;
......
pages/my/my.js
const Service = require('../../utils/service.js'); const Service = require('../../utils/service.js');
const Util = require('../../utils/util.js'); const Util = require('../../utils/util.js');
Page({ Page({
data: { data: {
userInfo: '', userInfo: '',
reportRedD: false, //报告红点展示 reportRedD: false, //报告红点展示
reportRedNum: 0, //未作报告数量 reportRedNum: 0, //未作报告数量
disabled:true,//防止重复点击 disabled: true, //防止重复点击
version:'3.2.0', version: '3.2.2',
isShow:false, isShow: false,
showClose:true, showClose: true,
}, },
onLoad: function () { onLoad: function () {
wx.setNavigationBarTitle({ wx.setNavigationBarTitle({
...@@ -26,11 +25,11 @@ Page({ ...@@ -26,11 +25,11 @@ Page({
}).then((res) => { }).then((res) => {
wx.setStorageSync('data', res) wx.setStorageSync('data', res)
that.setData({ that.setData({
userInfo:res, userInfo: res,
unionid: res.unionid || '', unionid: res.unionid || '',
nickname: res.nickname || res.name || 0, nickname: res.nickname || res.name || 0,
headimgurl: res.headimgurl || '/images/head-img.png', headimgurl: res.headimgurl || '/images/head-img.png',
isShow:true isShow: true
}) })
// that.resultNot(res.openid) // that.resultNot(res.openid)
}) })
...@@ -94,30 +93,30 @@ Page({ ...@@ -94,30 +93,30 @@ Page({
}) })
}, },
/**跳转页面 */ /**跳转页面 */
goToURL:Util.debouce(function(e){ goToURL: Util.debouce(function (e) {
var that = this; var that = this;
if (that.data.confirm) { if (that.data.confirm) {
return; return;
} }
that.data.confirm = true that.data.confirm = true
var data=wx.getStorageSync('data') var data = wx.getStorageSync('data')
if (Util.isEmpty(data.unionid)) { if (Util.isEmpty(data.unionid)) {
that.login.showLogin(); that.login.showLogin();
} else { } else {
wx.navigateTo({ wx.navigateTo({
url:e.currentTarget.dataset.src, url: e.currentTarget.dataset.src,
}) })
} }
that.data.confirm=false; that.data.confirm = false;
},1000,true), }, 1000, true),
// 我的报告 // 我的报告
myReport:Util.debouce(function() { myReport: Util.debouce(function () {
var that=this; var that = this;
if (that.data.confirm) { if (that.data.confirm) {
return; return;
} }
that.data.confirm = true that.data.confirm = true
var data=wx.getStorageSync('data') var data = wx.getStorageSync('data')
if (Util.isEmpty(data.unionid)) { if (Util.isEmpty(data.unionid)) {
that.login.showLogin(); that.login.showLogin();
} else { } else {
...@@ -125,25 +124,25 @@ myReport:Util.debouce(function() { ...@@ -125,25 +124,25 @@ myReport:Util.debouce(function() {
url: '/packageB/myReport/myReport?type=0', url: '/packageB/myReport/myReport?type=0',
}) })
} }
that.data.confirm=false; that.data.confirm = false;
},1000,true), }, 1000, true),
getUserInfo(){ getUserInfo() {
this.login.showLogin(); this.login.showLogin();
}, },
//客服电话 //客服电话
dial(e) { dial(e) {
let tel = e.currentTarget.dataset.tel; let tel = e.currentTarget.dataset.tel;
wx.makePhoneCall({ wx.makePhoneCall({
phoneNumber: tel, phoneNumber: tel,
}) })
}, },
//设置推送 //设置推送
setPush: function () { setPush: function () {
wx.openSetting() wx.openSetting()
}, },
//登陆后组件回调方法刷新当前页面 //登陆后组件回调方法刷新当前页面
_refreshEvent() { _refreshEvent() {
console.log("刷新"); console.log("刷新");
this.onShow(); this.onShow();
}, },
...@@ -151,9 +150,9 @@ _refreshEvent() { ...@@ -151,9 +150,9 @@ _refreshEvent() {
* 图片加载失败函数 * 图片加载失败函数
* @param {any} e * @param {any} e
*/ */
binderrorimg(){ binderrorimg() {
this.setData({ this.setData({
headimgurl:'/images/head-img.png' headimgurl: '/images/head-img.png'
}) })
}, },
}) })
\ No newline at end of file
pages/my/my.wxss
...@@ -54,7 +54,7 @@ page { ...@@ -54,7 +54,7 @@ page {
height: 48rpx; height: 48rpx;
} }
.server-text { .server-text {
height: 24rpx; height: 28rpx;
font-size: 28rpx; font-size: 28rpx;
font-weight: 300; font-weight: 300;
text-align: left; text-align: left;
...@@ -66,7 +66,7 @@ page { ...@@ -66,7 +66,7 @@ page {
height: 52rpx; height: 52rpx;
font-size: 50rpx; font-size: 50rpx;
color: #333; color: #333;
font-weight: 700; font-weight: bold;
line-height: 54rpx; line-height: 54rpx;
position: absolute; position: absolute;
top: 95rpx; top: 95rpx;
......
project.private.config.json
...@@ -88,6 +88,12 @@ ...@@ -88,6 +88,12 @@
"pathName": "packageA/productOrderDetail/productOrderDetail", "pathName": "packageA/productOrderDetail/productOrderDetail",
"query": "id=111111111114478", "query": "id=111111111114478",
"scene": null "scene": null
},
{
"name": "pages/docuterInfo/docuterInfo",
"pathName": "pages/docuterInfo/docuterInfo",
"query": "t_unitid=18870",
"scene": 1008
} }
] ]
} }
......
utils/config.js
...@@ -11,8 +11,11 @@ const HOST = 'https://www.xiaodongai.com/xiaodongai/kongtian/'; ...@@ -11,8 +11,11 @@ const HOST = 'https://www.xiaodongai.com/xiaodongai/kongtian/';
// const HOST = 'https://www.xiaodongai.com/xiaodongai/ceshi/'; //测试库 // const HOST = 'https://www.xiaodongai.com/xiaodongai/ceshi/'; //测试库
// var HOST = 'http://192.168.0.123:8081/xiaodongai/ceshi/'; //本地 // var HOST = 'http://192.168.0.123:8081/xiaodongai/ceshi/'; //本地
// var HOST = 'http://localhost/xiaodongai/kongtian/'; //本地 // var HOST = 'http://localhost/xiaodongai/kongtian/'; //本地
const patient = "https://online-patient.xiaodongai.com/" //正式新地址 const patient = "https://online-patient.xiaodongai.com/" //推荐产品正式新地址
// const patient = "http://test.patient.xiaodongai.com/" //测试新地址 // const patient = "http://test.patient.xiaodongai.com/" //测试新地址
// const orders = "https://online-cjob.xiaodongai.com/index.php/order/" //订单中心 生产
const orders = "https://online-cjob.xiaodongai.com/index.php/order/" //订单中心 开发
// const orders = "http://120.53.134.66/index.php/api/"
const HOST_info = 'https://vivshi.com/xiaodongai/kongtian/'; // 弃用 const HOST_info = 'https://vivshi.com/xiaodongai/kongtian/'; // 弃用
...@@ -23,21 +26,30 @@ const url = { ...@@ -23,21 +26,30 @@ const url = {
* begin * begin
* 推荐产品 * 推荐产品
*/ */
getNormalProduct :patient+"wechatIteration/Zcprescription/zckyxqs",//正常购买产品 getNormalProduct :patient+"wechatIteration/Zcprescription/zckyxqs", //正常购买产品
getQuickProduct :patient+"wechatIteration/Prescription/kskyxqs",//快速购买产品，扫二维码购买 getQuickProduct :patient+"wechatIteration/Prescription/kskyxqs", //快速购买产品，扫二维码购买
productPay :patient+"wechatIteration/Place_order/place_order",//推荐产品支付 productPay :patient+"wechatIteration/Place_order/place_order", //推荐产品支付
buyProductList :patient+"wechatIteration/order_list/apiOrder",//推荐产品列表 buyProductList :patient+"wechatIteration/order_list/apiOrder", //推荐产品列表
getPayStatusB :patient+"wechatIteration/is_purchase/purchase",//获取产品支付状态 getPayStatusB :patient+"wechatIteration/is_purchase/purchase", //获取产品支付状态
productOrderDetail:patient+"Drugorder/prescription_order_detail", //获取产品订单详情 productOrderDetail:patient+"Drugorder/prescription_order_detail", //获取产品订单详情
/** /**
* end * end
*/ */
/**
* begin
* 订单中心
*/
getOrdersAddress:orders+"order_address/getOneByOrderNumber",//获取订单收货地址
getLogisticsNumber:orders+"order_logistics/getOneByOrderNumber",//获取订单物流编号
/**
* end
*/
getUserSig :HOST + 'wechatIm.php?s=/Im/wechat_get_sign', //获取usersig以及userID getUserSig :HOST + 'wechatIm.php?s=/Im/wechat_get_sign', //获取usersig以及userID
getOpenId :HOST + 'applet.php?s=Applet/getopenid', ///获取openid getOpenId :HOST + 'applet.php?s=Applet/getopenid', ///获取openid
getUserData :HOST + 'wechatIteration.php?s=/Home/index', ///获取用户数据 getUserData :HOST + 'wechatIteration.php?s=/Home/index', ///获取用户数据
addUserInfo :HOST + 'applet.php?s=/Applet/new_user_add', //添加用户 addUserInfo :HOST + 'applet.php?s=/Applet/new_user_add', //添加用户
seeOpenId :HOST+"wechatIteration.php?s=/Inquisition/get_openid",//查询openid seeOpenId :HOST + "wechatIteration.php?s=/Inquisition/get_openid",//查询openid
getRoomUserSig :HOST+"wechatIteration.php?s=/Inquisition/get_room",//获取room的userSig getRoomUserSig :HOST + "wechatIteration.php?s=/Inquisition/get_room",//获取room的userSig
/**IM用户关系 */ /**IM用户关系 */
addFriend :HOST + "wechatIteration.php?s=/Im/add_firends", //添加好友 addFriend :HOST + "wechatIteration.php?s=/Im/add_firends", //添加好友
delFriend :HOST + "wechatIteration.php?s=/Personal/delDoctor", //删除好友 delFriend :HOST + "wechatIteration.php?s=/Personal/delDoctor", //删除好友
...@@ -47,15 +59,15 @@ const url = { ...@@ -47,15 +59,15 @@ const url = {
getFriendList :HOST + "wechatIteration.php?s=/Personal/myDoctor", //获取医生列表 getFriendList :HOST + "wechatIteration.php?s=/Personal/myDoctor", //获取医生列表
getFreeChat :HOST + "wechatIteration.php?s=/InquiryUser/judge_free",//获取免费咨询次数 getFreeChat :HOST + "wechatIteration.php?s=/InquiryUser/judge_free",//获取免费咨询次数
setFreeSend :HOST + "wechatIteration.php?s=/InquiryUser/drug_free_send",//修改免费咨询次数 setFreeSend :HOST + "wechatIteration.php?s=/InquiryUser/drug_free_send",//修改免费咨询次数
getSendReports :HOST+"wechatIteration.php?s=/Inquisition/send_test_result",//获取发送报告列表 getSendReports :HOST + "wechatIteration.php?s=/Inquisition/send_test_result",//获取发送报告列表
get_online :HOST + "wechatIteration.php?s=/Inquisition/get_online",//获取在线状态 get_online :HOST + "wechatIteration.php?s=/Inquisition/get_online",//获取在线状态
acceptFollowUp :HOST+ "wechatIteration.php?s=/Inquisition/jieshou",//接受预约 acceptFollowUp :HOST + "wechatIteration.php?s=/Inquisition/jieshou",//接受预约
getPayStatusA :HOST+"wechatIteration.php?s=/Prescription/drug_order_list_payresult",//获取药方支付状态 getPayStatusA :HOST + "wechatIteration.php?s=/Prescription/drug_order_list_payresult",//获取药方支付状态
getChatMsgLog :HOST+"wechatIteration.php?s=/Im/chat_message_logging",//获取历史记录 getChatMsgLog :HOST + "wechatIteration.php?s=/Im/chat_message_logging",//获取历史记录
getIsAnswer :HOST+"wechatIteration.php?s=home/testing_gauge",//获取当前量表是否已答 getIsAnswer :HOST + "wechatIteration.php?s=home/testing_gauge",//获取当前量表是否已答
/**end */ /**end */
/**服务设置 begin*/ /**服务设置 begin*/
myServerList :HOST+"wechatIteration.php?s=/InquiryUser/inquiryImList",//我的服务记录 myServerList :HOST + "wechatIteration.php?s=/InquiryUser/inquiryImList",//我的服务记录
getDoctorDetail :HOST + "wechatIteration.php?s=/WechatDoctor/doctorDetail", //医生服务详情 getDoctorDetail :HOST + "wechatIteration.php?s=/WechatDoctor/doctorDetail", //医生服务详情
getDoctorInfo :HOST + 'wechatIteration.php?s=/WechatDoctor/doctor', //医生信息 getDoctorInfo :HOST + 'wechatIteration.php?s=/WechatDoctor/doctor', //医生信息
payRecord :HOST + "wechatIteration.php?s=/Home/PayRecord", //支付生成订单 payRecord :HOST + "wechatIteration.php?s=/Home/PayRecord", //支付生成订单
...@@ -64,9 +76,9 @@ const url = { ...@@ -64,9 +76,9 @@ const url = {
isInquiry :HOST + "wechatIteration.php?s=/WechatDoctor/conductService", //判断是否有正在进行中或者未接诊的在线问诊服务 isInquiry :HOST + "wechatIteration.php?s=/WechatDoctor/conductService", //判断是否有正在进行中或者未接诊的在线问诊服务
switchService :HOST + "wechatIteration.php?s=/InquiryUser/switchInquiry", //切换服务 switchService :HOST + "wechatIteration.php?s=/InquiryUser/switchInquiry", //切换服务
serviceDetail :HOST + "wechatIteration.php?s=/Inquisition/inquiry_detail", //服务详情 serviceDetail :HOST + "wechatIteration.php?s=/Inquisition/inquiry_detail", //服务详情
endInquiry :HOST+"wechatIteration.php?s=/InquiryUser/endInquiry", //同意结束服务 endInquiry :HOST + "wechatIteration.php?s=/InquiryUser/endInquiry", //同意结束服务
refuseInquiry :HOST+ "wechatIteration.php?s=/InquiryUser/refuseInquiry",//拒绝提前结束 refuseInquiry :HOST + "wechatIteration.php?s=/InquiryUser/refuseInquiry",//拒绝提前结束
seeBuyStaus :HOST+"wechatIteration.php?s=/InquiryUser/seeStatus",//用户购买服务状态 seeBuyStaus :HOST + "wechatIteration.php?s=/InquiryUser/seeStatus",//用户购买服务状态
/**end */ /**end */
/**药方详情 begin */ /**药方详情 begin */
getPrescription :HOST + "wechatIteration.php?s=/Prescription/detailPrescription", //药方详情 getPrescription :HOST + "wechatIteration.php?s=/Prescription/detailPrescription", //药方详情
...@@ -74,17 +86,17 @@ const url = { ...@@ -74,17 +86,17 @@ const url = {
prescriptionPay :HOST + "wechatIteration.php?s=/Prescription/zfxds", //药品支付 prescriptionPay :HOST + "wechatIteration.php?s=/Prescription/zfxds", //药品支付
addAddress :HOST + "wechatIteration.php?s=/Prescription/address", //新增地址 addAddress :HOST + "wechatIteration.php?s=/Prescription/address", //新增地址
editAddress :HOST + "wechatIteration.php?s=/Prescription/editAddress", //修改地址 editAddress :HOST + "wechatIteration.php?s=/Prescription/editAddress", //修改地址
isEditAddress :HOST+"wechatIteration.php?s=/Prescription/canEditAddress",//判断是否可修改地址 isEditAddress :HOST + "wechatIteration.php?s=/Prescription/canEditAddress",//判断是否可修改地址
// addressList: HOSTTEST + "wechatIteration.php?s=/Prescription/listAddress", //地址列表 // addressList: HOSTTEST + "wechatIteration.php?s=/Prescription/listAddress", //地址列表
addressList :HOST + "wechatIteration.php?s=/Prescription/listAddress", //地址列表 addressList :HOST + "wechatIteration.php?s=/Prescription/listAddress", //地址列表
defaultAddress :HOST + "wechatIteration.php?s=/Prescription/addressDefault", //默认地址 defaultAddress :HOST + "wechatIteration.php?s=/Prescription/addressDefault", //默认地址
getDrugList :HOST + "wechatIteration.php?s=/Prescription/openDrug",//处方列表 getDrugList :HOST + "wechatIteration.php?s=/Prescription/openDrug",//处方列表
getDrugDetail :HOST+"wechatIteration.php?s=/Prescription/myDrugDetail",//处方详情 getDrugDetail :HOST + "wechatIteration.php?s=/Prescription/myDrugDetail",//处方详情
confirmReceipt :HOST+ "wechatIteration.php?s=/Drugorder/confirmReceipt",//确认收货 confirmReceipt :HOST + "wechatIteration.php?s=/Drugorder/confirmReceipt",//确认收货
delBuyDrug :HOST+"wechatIteration.php?s=/Drugorder/drugOrderDel",//删除购药记录 delBuyDrug :HOST + "wechatIteration.php?s=/Drugorder/drugOrderDel",//删除购药记录
getRecipeDetails :HOST+"wechatIteration.php?s=/Prescription/zckyxqs",//正常开药 getRecipeDetails :HOST + "wechatIteration.php?s=/Prescription/zckyxqs",//正常开药
getQuick :HOST+"wechatIteration.php?s=/Prescription/kskyxqs",//快速开药 getQuick :HOST + "wechatIteration.php?s=/Prescription/kskyxqs",//快速开药
paySucceedCallback:HOST+"wechatIteration.php?s=/Prescription/query_order_status",//支付成功回调 paySucceedCallback:HOST + "wechatIteration.php?s=/Prescription/query_order_status",//支付成功回调
logisticsInfo :HOST + "wechatIteration.php?s=/Express/sfRouteService",//物流信息 logisticsInfo :HOST + "wechatIteration.php?s=/Express/sfRouteService",//物流信息
drogOrderDetail :HOST + "wechatIteration.php?s=/Drugorder/prescription_order_detail",//药品订单详情 drogOrderDetail :HOST + "wechatIteration.php?s=/Drugorder/prescription_order_detail",//药品订单详情
/**end */ /**end */
...@@ -96,9 +108,9 @@ const url = { ...@@ -96,9 +108,9 @@ const url = {
checkCard :HOST_yiyuan+'Idcard/checkCard',//验证身份证与姓名 checkCard :HOST_yiyuan+'Idcard/checkCard',//验证身份证与姓名
/**end */ /**end */
/**量表 */ /**量表 */
loadScene :HOST+"wechatIteration.php?s=/Measure/is_price",//判断量表二维码场景 loadScene :HOST + "wechatIteration.php?s=/Measure/is_price",//判断量表二维码场景
loadIMScene :HOST+"wechatIteration.php?s=/Measure/is_price_to",//判断IM量表支付场景 loadIMScene :HOST + "wechatIteration.php?s=/Measure/is_price_to",//判断IM量表支付场景
getTestInfo :HOST+"wechatIteration.php?s=/InquiryUser/findInquiry",//获取检测信息 getTestInfo :HOST + "wechatIteration.php?s=/InquiryUser/findInquiry",//获取检测信息
/**end */ /**end */
/**用户购买问诊信息 begin*/ /**用户购买问诊信息 begin*/
addUserBuyInfo :HOST + "wechatIteration.php?s=/InquiryUser/addUser", //添加用户购买信息 addUserBuyInfo :HOST + "wechatIteration.php?s=/InquiryUser/addUser", //添加用户购买信息
...@@ -155,5 +167,4 @@ module.exports = { ...@@ -155,5 +167,4 @@ module.exports = {
HOST_yiyuan : HOST_yiyuan, HOST_yiyuan : HOST_yiyuan,
HOST_xinli : HOST_xinli, HOST_xinli : HOST_xinli,
HOST_xinli_lb : HOST_xinli_lb, HOST_xinli_lb : HOST_xinli_lb,
} }
\ No newline at end of file
utils/service.js
...@@ -28,7 +28,7 @@ function getUserSig(user) { ...@@ -28,7 +28,7 @@ function getUserSig(user) {
let getUserSigUrl = config.url.getUserSig; let getUserSigUrl = config.url.getUserSig;
let data = { let data = {
"user": user "user": user
// "user": "oHhp80fVWvjJn2EYkB5XxhKnVBOo" // "user": "oHhp80bZb-BpXBeyL9EHX1SSoAfU"
} }
return wxRequest.getRequest(getUserSigUrl, data); return wxRequest.getRequest(getUserSigUrl, data);
}; };
...@@ -50,6 +50,7 @@ function getUserData(openid) { ...@@ -50,6 +50,7 @@ function getUserData(openid) {
let getUserDataUrl = config.url.getUserData; let getUserDataUrl = config.url.getUserData;
let data = {}; let data = {};
data.openid = openid; data.openid = openid;
// data.openid='oYQX40AHxKlrHu_fVDrp4u486tsY'
return wxRequest.postRequest(getUserDataUrl, data); return wxRequest.postRequest(getUserDataUrl, data);
}; };
/** /**
...@@ -642,7 +643,14 @@ function productPay(param) { ...@@ -642,7 +643,14 @@ function productPay(param) {
var productPayUrl = config.url.productPay; var productPayUrl = config.url.productPay;
return wxRequest.postRequest(productPayUrl, param) return wxRequest.postRequest(productPayUrl, param)
} }
function getOrdersAddress(param){
var getOrdersAddressUrl = config.url.getOrdersAddress;
return wxRequest.postRequest(getOrdersAddressUrl, param)
}
function getLogisticsNumber(param){
var getLogisticsNumberUrl=config.url.getLogisticsNumber;
return wxRequest.postRequest(getLogisticsNumberUrl,param)
}
function getBusStopListPromise(sid, stopType) { function getBusStopListPromise(sid, stopType) {
var getStopListUrl = config.url.getBusStopList; var getStopListUrl = config.url.getBusStopList;
var data = { var data = {
...@@ -746,4 +754,6 @@ module.exports = { ...@@ -746,4 +754,6 @@ module.exports = {
getNormalProduct: getNormalProduct, //正常购买推荐产品 getNormalProduct: getNormalProduct, //正常购买推荐产品
getQuickProduct: getQuickProduct, //快速购买推荐产品 getQuickProduct: getQuickProduct, //快速购买推荐产品
productPay: productPay, //推荐产品支付 productPay: productPay, //推荐产品支付
getOrdersAddress:getOrdersAddress,//获取订单收货地址
getLogisticsNumber:getLogisticsNumber,//获取物流单号
} }
\ No newline at end of file
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