Skip to content

XDJK
XDJK
Commit e67a3ba6 by liuquan
Options

合并分支 'liuquan' 到 'XDJK-master' 

Liuquan

查看合并请求 !5
parents b8623474 285a4fa8
Showing with 1525 additions and 129 deletions
app.json
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
"pages/dati03/dati03", "pages/dati03/dati03",
"pages/dati04/dati04", "pages/dati04/dati04",
"pages/info/info", "pages/info/info",
"pages/info1/info1" "pages/info1/info1",
"pages/dati05/dati05"
], ],
"subpackages": [ "subpackages": [
{ {
...@@ -39,7 +40,8 @@ ...@@ -39,7 +40,8 @@
"logistics/logistics", "logistics/logistics",
"patientList/patientList", "patientList/patientList",
"chattingRecords/chattingRecords", "chattingRecords/chattingRecords",
"beBeingService/beBeingService" "beBeingService/beBeingService",
"productOrderInfo/productOrderInfo"
] ]
}, },
{ {
......
components/login/login.js
...@@ -50,6 +50,7 @@ Component({ ...@@ -50,6 +50,7 @@ Component({
if (e.detail.userInfo) { if (e.detail.userInfo) {
wx.showLoading({ wx.showLoading({
title: '正在登录', title: '正在登录',
mask:true,
}) })
app.getUserInfo(function (cb) { app.getUserInfo(function (cb) {
if (!Util.isEmpty(cb)) { if (!Util.isEmpty(cb)) {
......
packageA/buyService/buyService.js
...@@ -179,7 +179,9 @@ Page({ ...@@ -179,7 +179,9 @@ Page({
}, },
//知情同意书 //知情同意书
zqtys: function (e) { zqtys: function (e) {
wx.showLoading(); wx.showLoading({
mask:true,
});
wx.navigateTo({ wx.navigateTo({
url: '/packageA/consent/consent' url: '/packageA/consent/consent'
}) })
...@@ -195,7 +197,7 @@ Page({ ...@@ -195,7 +197,7 @@ Page({
}, },
//更换用户 //更换用户
changeUser: function () { changeUser: function () {
wx.showLoading(); wx.showLoading({mask:true,});
if (this.data.ServicePay_datas.counsel == 20) { if (this.data.ServicePay_datas.counsel == 20) {
wx.navigateTo({ wx.navigateTo({
url: '/packageA/selectUser/selectUser?type=1' url: '/packageA/selectUser/selectUser?type=1'
......
packageA/drugOrder/drugOrder.js
const Service = require('../../utils/service.js'); const Service = require('../../utils/service.js');
const { const { debouce } = require('../../utils/util.js'); //防抖函数
debouce
} = require('../../utils/util.js'); //防抖函数
const Util = require('../../utils/util.js'); const Util = require('../../utils/util.js');
Page({ Page({
...@@ -93,7 +91,7 @@ Page({ ...@@ -93,7 +91,7 @@ Page({
var that = this var that = this
var data = { var data = {
page: page, page: page,
// unionid:'oHhp80XTpjf-JKvU94VEztv3aLhc', // unionid:'oHhp80QCN2WjClijvSyhkEFQcUwY',
unionid: wx.getStorageSync('data').unionid, unionid: wx.getStorageSync('data').unionid,
status: status status: status
}; };
...@@ -188,7 +186,7 @@ Page({ ...@@ -188,7 +186,7 @@ Page({
wx.navigateTo({ wx.navigateTo({
url: '/packageA/addsite/addsite?item=' + JSON.stringify(e.currentTarget.dataset.address) + '&ordernumber=' + e.currentTarget.dataset.ordernumber + '&type=1', url: '/packageA/addsite/addsite?item=' + JSON.stringify(e.currentTarget.dataset.address) + '&ordernumber=' + e.currentTarget.dataset.ordernumber + '&type=1',
}) })
}else{ } else {
wx.showToast({ wx.showToast({
title: res.msg, title: res.msg,
icon: 'success', icon: 'success',
......
packageA/drugOrder/drugOrder.wxml
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<block> <block>
<view class="num flex"> <view class="num flex">
<text>订单编号：{{item.ordernumber}}</text> <text>订单编号：{{item.ordernumber}}</text>
<!-- <text wx-if="{{item.status==1}}">已退款</text> -->
<text wx-if="{{item.status==1}}">待付款</text> <text wx-if="{{item.status==1}}">待付款</text>
<text wx-if="{{item.status==2}}">待发货</text> <text wx-if="{{item.status==2}}">待发货</text>
<text wx-if="{{item.status==3}}">待收货</text> <text wx-if="{{item.status==3}}">待收货</text>
...@@ -50,14 +51,27 @@ ...@@ -50,14 +51,27 @@
<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}}" wx:if="{{item.status==1 || item.status==4 || item.status==5||item.status==7}}">删除订单</view> <view class="delebtn" bindtap="deleBtn" data-ordernumber="{{item.ordernumber}}"
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}}" data-address="{{item.address}}">修改地址</view> <view class="ckwl" wx:if="{{item.status==2}}" bindtap="editAddress" data-ordernumber="{{item.ordernumber}}"
<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-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> data-address="{{item.address}}">修改地址</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-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==2}}" bindtap="goLogistics"
<view class="ljzf" wx:if="{{item.status==3}}" bindtap="confirmReceipt" data-num="{{item.ordernumber}}">确认收货</view> data-img="{{item.prescription[0].picture}}" data-id="{{item.id}}" data-status="{{item.status}}"
<view class="ljzf" wx:if="{{item.status==2||item.status==3 || item.status==4}}" bindtap="goOrderDetail" data-id="{{item.id}}">订单详情</view> data-src="/packageA/logistics/logistics" data-num="{{item.express_order_new}}" data-com="{{item.com}}"
<view class="ljzf" wx:if="{{item.status==1}}" bindtap="goPay" data-id="{{item.yfid}}" data-isquick="{{item.modular}}">立即支付</view> 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-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="ljzf" wx:if="{{item.status==3}}" bindtap="confirmReceipt" data-num="{{item.ordernumber}}">确认收货
</view>
<view class="ljzf" wx:if="{{item.status==2||item.status==3 || item.status==4}}" bindtap="goOrderDetail"
data-id="{{item.id}}">订单详情</view>
<view class="ljzf" wx:if="{{item.status==1}}" bindtap="goPay" data-id="{{item.yfid}}"
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>
</view> </view>
......
packageA/drugOrderDetail/drugOrderDetail.wxml
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
<view class="issue-title row" bindtap="issue" data-index="1">1.关于发货时间以及物流配送<text <view class="issue-title row" bindtap="issue" data-index="1">1.关于发货时间以及物流配送<text
class="{{index==1?'cuIcon-fold':'cuIcon-unfold'}} lg text-gray"></text></view> class="{{index==1?'cuIcon-fold':'cuIcon-unfold'}} lg text-gray"></text></view>
<view class="{{index==1?'issue-content':'hide'}}"> <view class="{{index==1?'issue-content':'hide'}}">
<view>①药品当天16点前支付药费，当天即可发货，下午16点后支付一般在第二天发货；</view> <view>①药品当天16点前支付药费，当天即可发货，下午19点后支付一般在第二天发货；</view>
<view>②快递采用顺丰配送， 1-3天即可到达。具体派送时间，请自行留意或联系派件员;</view> <view>②快递采用顺丰配送， 1-3天即可到达。具体派送时间，请自行留意或联系派件员;</view>
<view>③您可以在“小懂健康”公众号【我的医生-药品订单】或 “小懂健康”小程序【我的-药品订单】查询物流信息；</view> <view>③您可以在“小懂健康”公众号【我的医生-药品订单】或 “小懂健康”小程序【我的-药品订单】查询物流信息；</view>
<view>④请确保预留的联系方式通话畅通，以免因派送失败耽误用药。</view> <view>④请确保预留的联系方式通话畅通，以免因派送失败耽误用药。</view>
......
packageA/drugOrderInfo/drugOrderInfo.js
...@@ -92,7 +92,7 @@ Page({ ...@@ -92,7 +92,7 @@ Page({
}, },
// 处方笺 // 处方笺
getPrescribe: function (id, patient_unionid) { getPrescribe: function (id, patient_unionid) {
wx.showLoading(); wx.showLoading({mask:true});
let that = this let that = this
if (that.data.paySuccess) { if (that.data.paySuccess) {
wx.hideLoading(); wx.hideLoading();
...@@ -137,7 +137,7 @@ Page({ ...@@ -137,7 +137,7 @@ Page({
}, },
// 快速开药 // 快速开药
getQuick: function (quickid, patient_unionid) { getQuick: function (quickid, patient_unionid) {
wx.showLoading(); wx.showLoading({mask:true});
var that = this var that = this
if (that.data.paySuccess) { if (that.data.paySuccess) {
wx.hideLoading(); wx.hideLoading();
...@@ -227,7 +227,7 @@ Page({ ...@@ -227,7 +227,7 @@ Page({
* @param {Object} e 事件绑定值 * @param {Object} e 事件绑定值
*/ */
myDetails: function (e) { myDetails: function (e) {
wx.showLoading(); wx.showLoading({mask:true});
var that = this; var that = this;
if (wx.getStorageSync('data').unionid == undefined) { if (wx.getStorageSync('data').unionid == undefined) {
that.login.showLogin(); that.login.showLogin();
...@@ -267,7 +267,7 @@ Page({ ...@@ -267,7 +267,7 @@ Page({
* 知情同意书 * 知情同意书
*/ */
goConsent: function () { goConsent: function () {
wx.showLoading() wx.showLoading({mask:true})
wx.navigateTo({ wx.navigateTo({
url: '/packageA/consent/consent' url: '/packageA/consent/consent'
}) })
...@@ -277,7 +277,7 @@ Page({ ...@@ -277,7 +277,7 @@ Page({
* 同意知情同意书 * 同意知情同意书
*/ */
agree: function () { agree: function () {
wx.showLoading(); wx.showLoading({mask:true});
var that = this; var that = this;
var agree = that.data.agree ? false : true; var agree = that.data.agree ? false : true;
that.setData({ that.setData({
...@@ -289,7 +289,7 @@ Page({ ...@@ -289,7 +289,7 @@ Page({
*选择地址 *选择地址
*/ */
gosite() { gosite() {
wx.showLoading() wx.showLoading({mask:true})
wx.navigateTo({ wx.navigateTo({
url: '/packageA/site/site', url: '/packageA/site/site',
}) })
......
packageA/drugOrderInfo/drugOrderInfo.wxml
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<view class="sf-top"> <view class="sf-top">
<view class="sf-title"> <view class="sf-title">
<image class="sf-img" src="/images/sf.png"></image> <image class="sf-img" src="/images/sf.png"></image>
<text class="size-0 ml-15">顺丰配送 16:00前下单当日发货。平台承诺100%正品，假一罚十。</text> <text class="size-0 ml-15">顺丰配送 19:00前下单当日发货。平台承诺100%正品，假一罚十。</text>
</view> </view>
</view> </view>
</view> </view>
......
packageA/editPatientInfo/editPatientInfo.js
...@@ -276,6 +276,16 @@ Page({ ...@@ -276,6 +276,16 @@ Page({
showCancel: false, showCancel: false,
}) })
return; return;
}else if (that.data.phone== '') {
wx.showModal({
title: '提示',
content: '请填写手机号',
showCancel: false,
})
that.setData({
sava: true
})
return;
} else if (that.data.phone != '' && that.data.phone.length != 11) { } else if (that.data.phone != '' && that.data.phone.length != 11) {
wx.showModal({ wx.showModal({
title: '提示', title: '提示',
......
packageA/editPatientInfo/editPatientInfo.wxml
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<view class="flex-xm4"> <view class="flex-xm4">
<view class="tname">手机号</view> <view class="tname">手机号</view>
<view class="phoneinput"> <view class="phoneinput">
<input type="number" placeholder="选填" value="{{phone}}" bindinput='bindPhone' maxlength="11"></input> <input type="number" placeholder="必填" value="{{phone}}" bindinput='bindPhone' maxlength="11"></input>
<view wx:if="{{!phoneYes}}" class="line"></view> <view wx:if="{{!phoneYes}}" class="line"></view>
<button wx:if='{{!phoneYes}}' class="wxhq" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">微信获取</button> <button wx:if='{{!phoneYes}}' class="wxhq" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">微信获取</button>
<button wx:if="{{time==0&&phoneYes}}" class="getcode" bindtap="getPhoneCode">获取验证码</button> <button wx:if="{{time==0&&phoneYes}}" class="getcode" bindtap="getPhoneCode">获取验证码</button>
......
packageA/editUser/editUser.js
...@@ -280,6 +280,16 @@ Page({ ...@@ -280,6 +280,16 @@ Page({
showCancel: false, showCancel: false,
}) })
return; return;
} else if (that.data.phone == "") {
wx.showModal({
title: '提示',
content: '请填写手机号',
showCancel: false,
})
that.setData({
sava: true
})
return;
} else if (that.data.phone != '' && that.data.phone.length != 11) { } else if (that.data.phone != '' && that.data.phone.length != 11) {
wx.showModal({ wx.showModal({
title: '提示', title: '提示',
......
packageA/editUser/editUser.wxml
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<view class="flex-xm4"> <view class="flex-xm4">
<view class="tname">手机号</view> <view class="tname">手机号</view>
<view class="phoneinput"> <view class="phoneinput">
<input type="number" placeholder="选填" value="{{phone}}" bindinput='bindPhone' maxlength="11"></input> <input type="number" placeholder="必填" value="{{phone}}" bindinput='bindPhone' maxlength="11"></input>
<view wx:if="{{!phoneYes}}" class="line"></view> <view wx:if="{{!phoneYes}}" class="line"></view>
<button wx:if='{{!phoneYes}}' class="wxhq" open-type="getPhoneNumber" <button wx:if='{{!phoneYes}}' class="wxhq" open-type="getPhoneNumber"
bindgetphonenumber="getPhoneNumber">微信获取</button> bindgetphonenumber="getPhoneNumber">微信获取</button>
......
packageA/productOrderInfo/productOrderInfo.json 0 → 100644
{
"navigationBarTitleText": "确认订单",
"usingComponents": {
"modal": "/components/modal/modal",
"login": "/components/login/login",
"answer":"/components/answer/answer"
}
}
\ No newline at end of file
packageA/productOrderInfo/productOrderInfo.wxml 0 → 100644
<view class="wrap">
<view class="header" bindtap="gosite" wx:if='{{receiveAddress==""}}'>
<view class="dz">请选择收货地址</view>
<image src="/images/arrow@2x.png"></image>
</view>
<view class="header" bindtap="gosite" wx:else>
<view class="dz">
<view class="po-re">
<text class="uname">收货人：</text>
<text class="usname">{{receiveAddress.name}}</text>
<view>{{tel}}</view>
</view>
<view class="site-dz">
<text class="shouhdz">收货地址：</text>
<text class="site">{{receiveAddress.take_over}}{{receiveAddress.detail_address}}</text>
</view>
</view>
<image src="/images/arrow@2x.png"></image>
</view>
<image class="fengexian" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAu4AAAAGCAYAAACclRsMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTM4IDc5LjE1OTgyNCwgMjAxNi8wOS8xNC0wMTowOTowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjM5NDEyRTJFMzBBNTExRTc4NkZEOEFCRjFBNDU5NTE4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjM5NDEyRTJGMzBBNTExRTc4NkZEOEFCRjFBNDU5NTE4Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6Mzk0MTJFMkMzMEE1MTFFNzg2RkQ4QUJGMUE0NTk1MTgiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6Mzk0MTJFMkQzMEE1MTFFNzg2RkQ4QUJGMUE0NTk1MTgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4gFPAsAAACi0lEQVR42uyaWytEURiG97hAOeR061CIO5G/gZSEUE7JIYr8CMKNHKJBIZSSH+AvkJTIhcNfQGbc8K5mJ5q99l4z3/j2NvOtem9m1to91ve9b2vtEYqchz8t87EH9f/8IHIedZpXAl1AldbfjzgmNYrKGgPJ9b1vDTde6xXrJVThO6tzjX+OUpu1nIF1FxrQfamp+68pNmsVA+sh1EPogWKblaNfD6BeQg9wsu5DfYQekByQHJAckByQHEjDHNDU3Xe/a2qclF+yEph7B40bzAtB20xmcGTSFM53rgSGYt1hMuktNJYC1nIm1kniM7aYzHsPjRKfEWbq1/sU9ECY0VtUVskByQHJAckByYHMyYGg+j0pv5ge3CNQN/RqcPOagNoYNsiRyWUEhsvgdj0FtTKxdkFvhNv1NNTCwPoOdbqxGrxhUeHZwcD6Ye/rC6EHFGt7IFi9e2CCiTXq5S2DHpAckByQHJAckBxIwxzQ1N13v2tqnLS3TQ/us1bsdb5XAZugJYtnxDG5FM53rgRMqlgXmFhnoCuCSZuheUbWa0JQNzD2wJwV+wk22R5Qf8wyY79eEHpAsS4GwVsGPSA5IDkgOSA5IDmQhjmgqbvvftfUmORtk4P7KbRmMK8AOoKyGTbIkUlTON+5EhiF0DET6wm0TmQ9YmTdIKzPs1lzGVjPoBXC+nwr9j9yOUysq4T1BYyspylglRyQHJAckByQHMiMHPDd75pDO9nbXgf3R2jI8OalNrKWYYMcmVxGYLgMbteKtYaJdcSV1ft2vQlVM7A+QMNuEwzesKhAqmdgfYYGoU/CM1TQ1/0T1nUm1icvbxn0gOSA5IDkgOSA5EAa5oCm7kH1O9nbXwIMALoZYR4r6iuTAAAAAElFTkSuQmCC"></image>
<view class="sf">
<view class="sf-top">
<view class="sf-title">
<image class="sf-img" src="/images/sf.png"></image>
<text class="size-0 ml-15">顺丰配送 19:00前下单当日发货。平台承诺100%正品，假一罚十。</text>
</view>
</view>
</view>
<view class="hzxx" wx:if="{{ishow}}" bindtap='myDetails' data-src="/packageA/selectUser/selectUser">
<text>患者信息</text>
<view class="hz-info">
<text>{{item==""||item==null?'请补充患者信息':item.name}}</text>
<image class="more" src="/images/more.png"></image>
</view>
</view>
<view class="line" wx:if='{{list.prescription.length>0}}'>
<text>推荐产品</text>
</view>
<block wx:for="{{list.prescription}}" wx:key="index">
<view class="list">
<view class="list-item">
<view class="image">
<image src="{{item.picture}}"></image>
</view>
<view class="item-name">
<view class="name">{{item.name}}</view>
<view class="firm">{{item.firm}}</view>
<view class="norms">{{item.norms}}</view>
<view class="pirce">
<text>￥</text>
<text>{{item.drugPrice}}</text>
</view>
</view>
<view class="number">x {{item.num}}</view>
</view>
</view>
</block>
<view wx:if='{{list.healthcare.length>0}}' class="line">
<text>医生推荐</text>
</view>
<block wx:for="{{list.healthcare}}" wx:key="index" wx:for-index="index">
<view class="list">
<checkbox data-index="{{index}}" checked="{{item.checked}}" bindtap="updataRadio" color='#1384ff' />
<view class="list-item1">
<view class="image">
<image src="{{item.picture}}"></image>
</view>
<view class="item-name">
<view class="name" style="width:395rpx;">{{item.name}}</view>
<view class="firm" style="width:395rpx;">{{item.firm}}</view>
<view class="norms" style="width:395rpx;">{{item.norms}}</view>
<view class="pirce">
<text>￥</text>
<text>{{item.price}}</text>
</view>
</view>
<view class="number">x {{item.num}}</view>
</view>
</view>
</block>
<!-- 订单编号 -->
<view class="order-list">
<!-- <view class="order-num">
<text>下单时间</text>
<text style="font-size:28rpx;">{{list.create_time}}</text>
</view> -->
<view class="order-num">
<text>商品价格</text>
<view>
<text style="color:#EC5B68; font-size: 28rpx;">¥ </text>
<text style="color:#EC5B68;font-weight: 700;font-size: 28rpx;">{{list.drug_money}}</text>
</view>
</view>
<view class="order-num">
<text>服务诊金</text>
<view>
<text style="color:#999999;font-size: 28rpx;">¥ </text>
<text style="color:#999999;font-size: 28rpx;">{{list.zj}}</text>
</view>
</view>
<view class="order-num">
<text>顺丰运费</text>
<view>
<text style=" color:#999999; font-size: 28rpx;">¥ </text>
<text class="fonw-400" style="font-size: 28rpx;">{{list.freight}}</text>
</view>
</view>
<!-- <view class="order-num">
<text>纸质发票</text>
<radio-group class="radio-group" bindchange="radioChange">
<label class="radio" wx:for="{{items}}" wx:key="key">
<radio value="{{item.value}}" checked="{{item.value==0?true : false}}" color='#1384ff' />{{item.name}}
</label>
</radio-group>
</view> -->
<view class="tys" bindtap="agree">
<view wx:if='{{!agree}}' class="unselected">
</view>
<view wx:if='{{agree}}' class="selected">
<image src="/images/on2x.png"></image>
</view>
<text class="tys-text">我已阅读并接受</text>
<text class="zqtys" catchtap="goConsent">《知情同意书》</text>
</view>
<view class="tsy">根据药品实际仓储位置，您的订单可能分开发货</view>
<view class="tsy">遇到任何问题请拨打客服电话：<text bindtap='dial' data-tel='4001199218' style="color:#2684ff;">4001199218</text></view>
<view class="user-logo">
<image src="/images/xdjklogo.png"></image>
</view>
<view wx:if="{{iPhoneX}}" class="height"></view>
</view>
<!-- 微信支付 -->
<view class="three-wrap" style="height:{{iPhoneX?160:100}}rpx;">
<view class="flex-zf">
<view class="jg">
<text>合计:</text>
<text class="text">¥ </text>
<text>{{list.money}}</text>
</view>
<view wx:if='{{!agree||!isBtnAsh}}' class="qzf1">立即支付</view>
<view wx:if='{{agree&&isBtnAsh}}' class="qzf" bindtap="applyPay">立即支付</view>
</view>
</view>
<!-- <view class="btn" bindtap="applyPay">微信支付</view> -->
</view>
<view class="cu-modal {{errshow?'show':''}} shade" bindtap='hideModal' catchtouchmove="true">
<view class='cu-dialog' catchtap style="width:650rpx;border-radius: 20rpx !important;">
<view class='modal-top'>
<view class='modal-title'>{{errmsg}}</view>
</view>
<view class='modal-body' style="margin:0">
<block wx:for="{{errList}}" wx:key='key'>
<view class="list1">
<view class="list-item" style="padding-top:0;">
<view class="image">
<image src="{{item.picture}}"></image>
</view>
<view class="item-name">
<view class="name">{{item.name}}</view>
<!-- <view class="firm">{{item.firm}}</view> -->
<view class="norms">{{item.norms}}</view>
<view class="err_msg">
{{item.msg}}
</view>
</view>
<!-- <view class="number">x {{item.num}}</view> -->
</view>
</view>
</block>
</view>
<view class='modal-footer'>
<text class='sure width-100' catchtap='hideModal'>返回</text>
</view>
</view>
</view>
<login id='login' showClose='{{showClose}}' bind:refreshEvent="_refreshEvent">
</login>
<answer id='answer'></answer>
\ No newline at end of file
packageA/productOrderInfo/productOrderInfo.wxss 0 → 100644
@import '/components/modal/modal.wxss';
@import '/components/cu-modal.wxss';
page {
width: 750rpx;
padding-bottom: env(safe-area-inset-bottom);
background: rgb(242, 242, 242)
}
checkbox {
padding-top: 90rpx;
transform: scale(.8);
}
radio {
transform: scale(.7);
color: #1384ff;
}
.radio {
font-size: 28rpx;
}
/*checkbox未选中时样式 */
checkbox .wx-checkbox-input {
/* 自定义样式.... */
border-radius: 50%;
}
/* 选中后的 背景样式 （红色背景 无边框 可根据UI需求自己修改） */
checkbox .wx-checkbox-input.wx-checkbox-input-checked {
/* border: none; */
border-radius: 50%;
background-color: #2684ff;
}
/* 选中后的 对勾样式 （白色对勾 可根据UI需求自己修改） */
checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
font-size: 36rpx;
color: #fff;
}
.wrap {
position: absolute;
width: 100%;
top: 0;
left: 0;
background: #fff;
}
.header {
display: flex;
align-items: center;
height: 140rpx;
padding: 0 30rpx;
}
.header image:first-child {
width: 22rpx;
height: 28rpx;
}
.dz {
margin-left: 16rpx;
font-weight: 700;
font-size: 34rpx;
letter-spacing: 2rpx;
}
.po-re {
position: relative;
}
.po-re view {
position: absolute;
right: 0;
top: 0;
font-size: 26rpx;
color: #000;
font-weight: 400;
margin-top: 7rpx;
}
.site {
display: block;
width: 479rpx;
color: #000;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
word-break: break-all;
font-size: 26rpx;
font-weight: 400;
}
.sf {
margin-top: 30rpx;
padding: 0 30rpx 25rpx 30rpx;
font-size: 28rpx;
border-bottom: 1rpx solid #F5F8FB;
}
.sf-top {
display: flex;
justify-content: space-between;
}
.sf-title {
display: flex;
flex-direction: row;
/* align-items: center; */
}
.ml-15 {
font-size: 28rpx;
margin-left: 15rpx;
}
.size-0 {
color: #777;
max-width: 638rpx;
}
.size-1 {
color: #569efc;
}
.sf-img {
margin-top: 8rpx;
width: 32rpx;
height: 32rpx;
}
.tel-img {
width: 38rpx;
height: 38rpx;
}
.hzxx {
display: flex;
justify-content: space-between;
padding: 35rpx 30rpx;
font-size: 34rpx;
}
.line {
border-top: 20rpx solid rgb(242, 242, 242);
border-bottom: 1rpx solid rgb(242, 242, 242);
padding: 30rpx 0;
}
.line text {
margin-left: 30rpx;
font-size: 30rpx;
color: #666;
}
.hz-info {
display: flex;
align-items: center;
}
.hz-info text {
margin-right: 15rpx;
font-size: 30rpx;
color: #999999;
width: 400rpx;
text-align: right;
}
.more {
width: 15rpx;
height: 25rpx;
}
.shouhdz {
font-size: 26rpx;
color: #666666;
font-weight: 400;
width: 145rpx;
display: inline-block;
}
.site-dz {
display: flex;
align-items: center;
margin-top: 15rpx;
}
.user {
padding-top: 10rpx;
}
.uname {
width: 145rpx;
font-size: 26rpx;
font-weight: 400;
color: #666666;
display: inline-block;
}
.usname {
font-size: 26rpx;
font-weight: 400;
color: #000;
}
.uphone {
font-size: 26rpx;
color: #666666;
padding-left: 32rpx;
}
.header image:last-child {
width: 10rpx;
height: 20rpx;
position: absolute;
right: 0;
margin-right: 30rpx;
}
.list {
padding: 0 30rpx;
display: flex;
flex-direction: row;
}
.list1{
padding: 0;
display: flex;
flex-direction: row;
}
.list-item,
.list-item1 {
display: flex;
width: 100%;
border-bottom: 2rpx solid #F5F8FB;
padding-bottom: 42rpx;
padding-top: 42rpx;
}
.list-item2
{
display: flex;
width: 100%;
}
.br{
margin: 30rpx;
background-color:#F5F8FB;
height: 2rpx;
width: 530rpx;
}
.list-item image,
.list-item1 image {
width: 155rpx;
height: 155rpx;
}
.list-item1 {
margin-left: 20rpx;
width: 630rpx;
}
.image {
padding: 2.5rpx;
border: 1rpx solid rgb(241, 241, 241);
}
.item-name {
display: flex;
flex-direction: column;
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;
}
.errname{
width: 400rpx;
font-size: 24rpx;
color: #333333;
font-weight: 400;
text-align: left;
overflow: hidden;
/*超出部分隐藏*/
white-space: nowrap;
/*不换行*/
text-overflow: ellipsis;
/*超出部分文字以...显示*/
}
.firm {
font-size: 24rpx;
color: #666666;
overflow: hidden;
/*超出部分隐藏*/
white-space: nowrap;
/*不换行*/
text-overflow: ellipsis;
/*超出部分文字以...显示*/
}
.norms {
font-size: 24rpx;
color: #666666;
overflow: hidden;
/*超出部分隐藏*/
white-space: nowrap;
/*不换行*/
text-overflow: ellipsis;
/*超出部分文字以...显示*/
}
.pirce {
color: #EC5B68;
}
.err_msg{
color: #EC5B68;
font-weight: 700;
}
.pirce text:first-child {
font-size: 24rpx;
}
.pirce text:last-child {
font-size: 32rpx;
font-weight: 700;
}
.number {
display: flex;
margin-top: 5rpx;
font-size: 28rpx;
}
.errnumber{
display: flex;
margin-top: 5rpx;
font-size: 20rpx;
}
.order-list {
border-top: 20rpx solid rgb(242, 242, 242);
}
.order-num {
display: flex;
justify-content: space-between;
border-bottom: 2rpx solid #F5F8FB;
padding: 35rpx 30rpx;
font-size: 34rpx;
}
.orders-num {
display: flex;
justify-content: space-between;
padding: 35rpx 30rpx;
font-size: 34rpx;
}
.order-num text:first-child {
color: #000;
}
.fonw-400 {
font-weight: 400;
}
.order-num text:last-child {
color: #999999;
}
.red {
color: #EC5B68;
}
.btn {
width: 690rpx;
height: 90rpx;
background: #2684FF;
line-height: 90rpx;
text-align: center;
color: #fff;
font-size: 32rpx;
margin-bottom: 30rpx;
margin-left: 30rpx;
letter-spacing: 2rpx;
border-radius: 4rpx;
position: absolute;
bottom: 30rpx;
}
.three-wrap {
width: 100%;
background: #fff;
z-index: 1000;
position: fixed;
bottom: 0;
left: 0;
}
.tys {
font-size: 26rpx;
line-height: 42rpx;
padding: 30rpx 0 20rpx 30rpx;
flex-direction: row;
/* background: rgb(242, 242, 242); */
}
.tsy {
font-size: 26rpx;
line-height: 42rpx;
padding-left: 30rpx;
/* padding-bottom: 150rpx; */
flex-direction: row;
/* background: rgb(242, 242, 242); */
color: rgb(177, 177, 177);
}
.unselected {
border-radius: 50%;
height: 30rpx;
width: 30rpx;
border: 1rpx solid #ccc;
margin: 5rpx;
margin-right: 10rpx;
display: block;
float: left;
/* 自定义样式.... */
}
.selected image {
border-radius: 50%;
height: 32rpx;
width: 32rpx;
margin: 5rpx;
margin-right: 10rpx;
display: block;
float: left;
/* 自定义样式.... */
}
.tys-text {
color: #999;
font-size: 26rpx;
}
.zqtys {
color: #2684FF;
z-index: 100;
}
.flex-zf {
display: flex;
justify-content: space-between;
border-top: 1rpx solid #F5F8FB;
}
.jg {
width: 50%;
height: 100rpx;
line-height: 100rpx;
font-size: 28rpx;
padding-left: 30rpx;
color: #999;
}
.text {
margin-left: 20rpx;
color: #EC5B68;
}
.jg text:last-child {
color: #EC5B68;
font-weight: 700;
font-size: 36rpx;
}
.qzf {
width: 50%;
height: 100rpx;
background: #2684ff;
color: #fff;
line-height: 100rpx;
text-align: center;
font-size: 34rpx;
font-weight: 700;
}
.qzf1 {
width: 50%;
height: 100rpx;
background: #ccc;
color: #fff;
line-height: 100rpx;
text-align: center;
font-size: 34rpx;
font-weight: 700;
}
.height {
width: 100%;
height: 50rpx;
background: rgb(242, 242, 242);
}
.fengexian {
width: 100%;
height: 6rpx;
display: block;
border-bottom: 20rpx solid rgb(242, 242, 242);
}
/* 登录 */
/* 登录 */
.login-wrap {
width: 100%;
height: 100%;
position: fixed;
z-index: 9999;
background: rgba(0, 0, 0, .4);
bottom: 0;
}
.cu-modal {
width: 100%;
background: #fff;
position: absolute;
border-radius: 15rpx 15rpx 0 0;
bottom: 0;
left: 0;
z-index: 10000;
text-align: center;
height: 540rpx;
}
.login-content {
width: 100%;
height: 480rpx;
background: #ffffff;
position: absolute;
bottom: 0;
left: 0;
text-align: center;
}
.login-close {
position: absolute;
right: 15rpx;
top: 15rpx;
width: 40rpx;
height: 40rpx;
padding: 10rpx;
font-size: 40rpx;
color: #000000;
font-weight: 800;
}
.login-title {
font-size: 50rpx;
font-weight: bold;
color: #000000;
letter-spacing: 2rpx;
margin-top: 84rpx;
margin-bottom: 50rpx;
}
.login-text {
width: 620rpx;
font-size: 32rpx;
margin: 0 auto;
font-weight: 400;
text-align: left;
color: #555;
line-height: 46rpx;
letter-spacing: 2rpx;
}
.login-btn {
width: 620rpx;
height: 88rpx;
line-height: 88rpx;
background: #2684ff;
border-radius: 10rpx;
margin: 0 auto;
margin-top: 50rpx;
}
.cu-dialog {
min-height: 480rpx;
border-radius: 10rpx 10rpx 0 0 !important;
}
.user-logo {
display: flex;
justify-content: center;
width: 100%;
padding-bottom: 220rpx;
margin-top: 100rpx;
}
.user-logo image {
width: 650rpx;
height: 104rpx;
}
.err-title{
font-size: 32rpx;
font-weight: 700;
text-align: center;
color: #333333;
margin-bottom: 50rpx;
}
.err-image{
height: 120rpx!important;
width: 120rpx!important;
}
.err-btn{
margin:0rpx auto;
margin-top: 30rpx;
width: 510rpx;
height: 66rpx;
line-height: 66rpx;
background-color: #2684ff;
font-size: 26rpx;
border-radius: 33rpx;
}
/* 弹框 */
.shade {
display: block;
position: fixed;
top: 0;
bottom: 0;
left: 0;
right: 0;
height: 100%;
background: rgba(0, 0, 0, 0.3);
z-index: 1001;
}
.modal-title{
font-size: 32rpx;
font-weight: bold;
}
\ No newline at end of file
packageA/recipeDetails/recipeDetails.wxml
...@@ -155,12 +155,12 @@ ...@@ -155,12 +155,12 @@
</view> </view>
<view class="yishi"> <view class="yishi">
<text>审核：</text> <text>审核：</text>
<text>栾文娟</text> <text>欧兆智</text>
</view> </view>
<view class="yishi"> <!-- <view class="yishi">
<text>复审：</text> <text>复审：</text>
<text>傅美来</text> <text>傅美来</text>
</view> </view> -->
<image class="img" src="/images/zhang.png"></image> <image class="img" src="/images/zhang.png"></image>
</view> </view>
<view class="specialTips"> <view class="specialTips">
......
packageA/selectUser/selectUser.js
...@@ -132,7 +132,10 @@ Page({ ...@@ -132,7 +132,10 @@ Page({
}); });
}, },
next:Util.debouce(function (e){ next:Util.debouce(function (e){
wx.showLoading(); wx.showLoading({
mask:true,
title:'加载中'
});
var that = this; var that = this;
if (Util.isEmpty(that.data.item)) { if (Util.isEmpty(that.data.item)) {
wx.showModal({ wx.showModal({
......
packageA/serviceDetails/serviceDetails.js
...@@ -53,7 +53,7 @@ Page({ ...@@ -53,7 +53,7 @@ Page({
}, 1000, true), }, 1000, true),
//重新购买 //重新购买
repurchase: function () { repurchase: function () {
wx.showLoading(); wx.showLoading({mask:true});
var op_openid = ''; var op_openid = '';
var data = {}; var data = {};
data.unionid = this.data.info.consultant_unionid; data.unionid = this.data.info.consultant_unionid;
......
packageA/site/site.js
...@@ -18,7 +18,7 @@ Page({ ...@@ -18,7 +18,7 @@ Page({
}, },
goback(e){ goback(e){
wx.showLoading(); wx.showLoading({mask:true});
console.log(e) console.log(e)
var data={ var data={
addressId:e.currentTarget.dataset.item.id, addressId:e.currentTarget.dataset.item.id,
...@@ -32,7 +32,7 @@ Page({ ...@@ -32,7 +32,7 @@ Page({
wx.hideLoading(); wx.hideLoading();
}, },
addsite(e){ addsite(e){
wx.showLoading(); wx.showLoading({mask:true});
let item = JSON.stringify(e.currentTarget.dataset.item); let item = JSON.stringify(e.currentTarget.dataset.item);
if (e.currentTarget.dataset.num == 0){ if (e.currentTarget.dataset.num == 0){
wx.navigateTo({ wx.navigateTo({
......
packageB/enterEmial/enterEmial.js
...@@ -51,6 +51,7 @@ Page({ ...@@ -51,6 +51,7 @@ Page({
data.g_id = this.data.gid; data.g_id = this.data.gid;
wx.showLoading({ wx.showLoading({
title: '正在提交', title: '正在提交',
mask:true
}) })
data.email = this.data.email; data.email = this.data.email;
if (this.data.gid.length < 1 || this.data.email.length < 1){ if (this.data.gid.length < 1 || this.data.email.length < 1){
......
packageB/invoiceDetail/invoiceDetail.js
...@@ -21,6 +21,7 @@ Page({ ...@@ -21,6 +21,7 @@ Page({
onLoad: function (options) { onLoad: function (options) {
wx.showLoading({ wx.showLoading({
title: '加载中', title: '加载中',
mask:true
}) })
let that = this; let that = this;
let gid = options.gid; let gid = options.gid;
...@@ -109,8 +110,9 @@ Page({ ...@@ -109,8 +110,9 @@ Page({
/* 查看发票 */ /* 查看发票 */
vieTicket() { vieTicket() {
let that = this; let that = this;
wx: wx.showLoading({ wx.showLoading({
title: '加载中', title: '加载中',
mask:true
}) })
let gid = this.data.gid; let gid = this.data.gid;
Service.seeInvoice(gid).then((res)=>{ Service.seeInvoice(gid).then((res)=>{
......
packageB/invoiceInfo/invoiceInfo.js
...@@ -68,6 +68,7 @@ Page({ ...@@ -68,6 +68,7 @@ Page({
let gid = that.data.gid let gid = that.data.gid
wx.showLoading({ wx.showLoading({
title: '正在提交', title: '正在提交',
mask:true
}) })
Service.sendEmail(gid).then(()=>{ Service.sendEmail(gid).then(()=>{
wx.navigateTo({ wx.navigateTo({
......
packageB/myReport/myReport.js
...@@ -61,6 +61,7 @@ Page({ ...@@ -61,6 +61,7 @@ Page({
*/ */
getScale(e) { getScale(e) {
let that = this; let that = this;
wx.removeStorageSync('roomService');
if (this.data.repeatClick) { if (this.data.repeatClick) {
this.setData({ this.setData({
repeatClick: false repeatClick: false
...@@ -190,7 +191,7 @@ Page({ ...@@ -190,7 +191,7 @@ Page({
let that = this; let that = this;
var json = []; var json = [];
for (let j in e) { for (let j in e) {
if (e[j].measure_id_z != '') { if (!Util.isEmpty(e[j].measure_id_z)) {
var len = e[j].measure_id_z.split(',').length; var len = e[j].measure_id_z.split(',').length;
e[j].time01 = Util.timeMethod(e[j].time); e[j].time01 = Util.timeMethod(e[j].time);
e[j].lb_num = len; e[j].lb_num = len;
......
pages/chatNews/chatNews.js
...@@ -33,7 +33,7 @@ Page({ ...@@ -33,7 +33,7 @@ Page({
}).then((res) => { }).then((res) => {
if (Util.isEmpty(res.unionid)) { if (Util.isEmpty(res.unionid)) {
that.login.showLogin(); that.login.showLogin();
console.log(1) // console.log(1)
that.setData({ that.setData({
showview: true, showview: true,
}) })
...@@ -115,7 +115,7 @@ Page({ ...@@ -115,7 +115,7 @@ Page({
}, },
//菜单栏红点提示 //菜单栏红点提示
resultNot(openid) { resultNot(openid) {
console.log("resultNot") // console.log("resultNot")
//未做量表提醒 //未做量表提醒
var data = { var data = {
openid: openid openid: openid
...@@ -131,20 +131,20 @@ Page({ ...@@ -131,20 +131,20 @@ Page({
}) })
} }
}).catch(error => { }).catch(error => {
console.error("菜单栏红点提示", error) // console.error("菜单栏红点提示", error)
}) })
}, },
//获取im会话列表 //获取im会话列表
sessionList: function () { sessionList: function () {
let that = this; let that = this;
console.log("Tim.data.sessionList", Tim.data.sessionList) // console.log("Tim.data.sessionList", Tim.data.sessionList)
that.data.sessionList = Tim.data.sessionList.filter(item => { that.data.sessionList = Tim.data.sessionList.filter(item => {
return item.type == "GROUP" return item.type == "GROUP"
}); });
Tim.tim.getGroupList().then(function (imResponse) { Tim.tim.getGroupList().then(function (imResponse) {
console.log("群组列表", imResponse.data.groupList); // 群组列表 // console.log("群组列表", imResponse.data.groupList); // 群组列表
}).catch(function (imError) { }).catch(function (imError) {
console.warn('getGroupList error:', imError); // 获取群组列表失败的相关信息 // console.warn('getGroupList error:', imError); // 获取群组列表失败的相关信息
}); });
//取消在Tim.js监听的会话列表避免重复监听 //取消在Tim.js监听的会话列表避免重复监听
// Tim.tim.off(TIM.EVENT.CONVERSATION_LIST_UPDATED, Tim.onConversationListUpdated); // Tim.tim.off(TIM.EVENT.CONVERSATION_LIST_UPDATED, Tim.onConversationListUpdated);
...@@ -158,7 +158,7 @@ Page({ ...@@ -158,7 +158,7 @@ Page({
*/ */
onConversationListUpdated: function (event) { onConversationListUpdated: function (event) {
let that = this; let that = this;
console.log("%c收到会话列表更新通知", "color:#2684ff", event) // console.log("%c收到会话列表更新通知", "color:#2684ff", event)
that.data.sessionList = event.data.filter(item => { that.data.sessionList = event.data.filter(item => {
return item.type == "GROUP" return item.type == "GROUP"
}); });
...@@ -172,7 +172,7 @@ Page({ ...@@ -172,7 +172,7 @@ Page({
//去聊天页面 //去聊天页面
goChat: Util.debouce(function (e) { goChat: Util.debouce(function (e) {
// console.log(e); // console.log(e);
wx.showLoading(); wx.showLoading({mask:true});
let item = e.currentTarget.dataset.item; let item = e.currentTarget.dataset.item;
var datas = {}; var datas = {};
var user = wx.getStorageSync('user'); var user = wx.getStorageSync('user');
......
pages/dati/dati.js
...@@ -261,6 +261,7 @@ Page({ ...@@ -261,6 +261,7 @@ Page({
console.log("次数") console.log("次数")
wx.showLoading({ wx.showLoading({
title: '正在上传', title: '正在上传',
mask:true
}) })
var startTime = wx.getStorageSync('startTime'); var startTime = wx.getStorageSync('startTime');
var timeArr = wx.getStorageSync('timeArr'); var timeArr = wx.getStorageSync('timeArr');
...@@ -402,8 +403,21 @@ Page({ ...@@ -402,8 +403,21 @@ Page({
}) })
} }
} else if (res == 0) { } else if (res == 0) {
wx.removeStorageSync('tplbDetail') wx.removeStorageSync('tplbDetail');
wx.removeStorageSync('weiLb') wx.removeStorageSync('weiLb');
let roomService =wx.getStorageSync('roomService');
//判断是否从IM跳入
if(roomService){
wx.reLaunch({
url: `/packageA/chat/chat?t_unionid=${roomService.t_unionid}&groupID=${roomService.groupID}&orderId=${roomService.orderId}`,
success: function() {
that.setData({
flag: true
})
wx.removeStorageSync('roomService');
}
})
}else{
wx.reLaunch({ wx.reLaunch({
url: '/pages/my/my', url: '/pages/my/my',
success: function() { success: function() {
...@@ -414,6 +428,7 @@ Page({ ...@@ -414,6 +428,7 @@ Page({
} }
}) })
} }
}
}) })
}, },
fail(e) { fail(e) {
......
pages/dati03/dati03.js
...@@ -230,6 +230,7 @@ Page({ ...@@ -230,6 +230,7 @@ Page({
}, 5000) }, 5000)
wx.showLoading({ wx.showLoading({
title: '上传中...', title: '上传中...',
mask:true
}) })
wx.request({ wx.request({
method: 'POST', method: 'POST',
...@@ -320,6 +321,19 @@ Page({ ...@@ -320,6 +321,19 @@ Page({
} else if (res == 0) { } else if (res == 0) {
wx.removeStorageSync('tplbDetail') wx.removeStorageSync('tplbDetail')
wx.removeStorageSync('weiLb') wx.removeStorageSync('weiLb')
let roomService =wx.getStorageSync('roomService');
//判断是否从IM跳入
if (roomService) {
wx.reLaunch({
url: `/packageA/chat/chat?t_unionid=${roomService.t_unionid}&groupID=${roomService.groupID}&orderId=${roomService.orderId}`,
success: function () {
that.setData({
flag: true
})
wx.removeStorageSync('roomService');
}
})
} else {
wx.reLaunch({ wx.reLaunch({
url: '/pages/my/my', url: '/pages/my/my',
success: function () { success: function () {
...@@ -330,6 +344,7 @@ Page({ ...@@ -330,6 +344,7 @@ Page({
} }
}) })
} }
}
}) })
}, },
fail(e) { fail(e) {
......
pages/dati04/dati04.js
...@@ -91,11 +91,11 @@ Page({ ...@@ -91,11 +91,11 @@ Page({
}) })
} else { } else {
console.log("loadData",2); console.log("loadData", 2);
this.loadData(); this.loadData();
} }
} else { } else {
console.log("loadData",1); console.log("loadData", 1);
this.loadData(); this.loadData();
} }
} }
...@@ -419,7 +419,7 @@ Page({ ...@@ -419,7 +419,7 @@ Page({
wx.setStorageSync("timeArr", arr); wx.setStorageSync("timeArr", arr);
} }
}, },
tijiao:Util.debouce(function () { tijiao: Util.debouce(function () {
let that = this; let that = this;
this.setData({ this.setData({
sc: false sc: false
...@@ -488,6 +488,7 @@ Page({ ...@@ -488,6 +488,7 @@ Page({
// }, 7000) // }, 7000)
wx.showLoading({ wx.showLoading({
title: '上传中...', title: '上传中...',
mask:true
}) })
wx.request({ wx.request({
method: 'POST', method: 'POST',
...@@ -612,6 +613,19 @@ Page({ ...@@ -612,6 +613,19 @@ Page({
setTimeout(function () { setTimeout(function () {
wx.removeStorageSync('tplbDetail') wx.removeStorageSync('tplbDetail')
wx.removeStorageSync('weiLb') wx.removeStorageSync('weiLb')
let roomService =wx.getStorageSync('roomService');
//判断是否从IM跳入
if (roomService) {
wx.reLaunch({
url: `/packageA/chat/chat?t_unionid=${roomService.t_unionid}&groupID=${roomService.groupID}&orderId=${roomService.orderId}`,
success: function () {
that.setData({
flag: true
})
wx.removeStorageSync('roomService');
}
})
} else {
wx.reLaunch({ wx.reLaunch({
url: '/pages/my/my', url: '/pages/my/my',
success: function () { success: function () {
...@@ -621,6 +635,7 @@ Page({ ...@@ -621,6 +635,7 @@ Page({
wx.removeStorageSync('lb_descript') wx.removeStorageSync('lb_descript')
} }
}) })
}
}, 2000) }, 2000)
} }
}) })
...@@ -631,7 +646,7 @@ Page({ ...@@ -631,7 +646,7 @@ Page({
complete: function (e) {} complete: function (e) {}
}) })
} }
},1000,true), }, 1000, true),
onReady: function () { onReady: function () {
let that = this; let that = this;
// setTimeout(function () { // setTimeout(function () {
......
pages/dati05/dati05.json 0 → 100644
{
"enablePullDownRefresh": false
}
\ No newline at end of file
pages/dati05/dati05.wxml 0 → 100644
<view class="warp" style="height:{{winH}}px;">
<view class="con">
<text class='con-first'>{{lifeName[item.type - 1]}}</text>
<text style='margin-top: 10rpx;'>{{item.con}}({{eName}})</text>
</view>
<block wx:for="{{item.answer}}" wx:for-item="itemName" wx:for-index="index1" wx:key="*this">
<block wx:if='{{true}}'>
<view class=" answer {{active == index1?'s-active':''}}" bindtap='selectData' data-index="{{index1}}"
data-answer="{{itemName}}" data-score="{{item.score[index1]}}" data-record="{{current}}" data-btnflag='0'>
<text>{{itemName}}</text>
</view>
</block>
</block>
</view>
<block wx:if='{{true}}'>
<view class="btn {{current<all-1?'show':'hid'}}">
<view class="menuebtn1 {{current>0?'menuebtn-active':''}}" bindtap='prev'>上一题</view>
</view>
<view class="btn {{all==current+1?'show':'hid'}}">
<view class="menuebtn {{current>0?'menuebtn-active':''}}" bindtap='prev'>上一题</view>
<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>
</view>
</block>
<view class='all-item'>
<text>{{current+1}}/{{all}}</text>
</view>
\ No newline at end of file
pages/dati05/dati05.wxss 0 → 100644
page {
background-image: url(https://static.xiaodongai.com/xiaodong_yiyuan/kongtian/Uploads/Picture/uid2/member/20180129/5a6ee68692cd8.png);
background-size: 36rpx 36rpx;
}
.line_top {
background: #cecece;
}
.warp {
width: 690rpx;
margin: 29rpx auto;
/* height: 500rpx; */
border: 0.5px solid #e3e3e3;
/* border-bottom: *//* border-radius: 18rpx; */
background: #fff;
overflow: hidden;
}
.con {
padding: 40rpx 30rpx;
border-bottom: 0.5px solid #e3e3e3;
}
/* .con text:nth-child(1){
color: #2684ff;
display: block;
font-family: "PingFang-SC-Medium";
font-size: 28rpx;
letter-spacing: 5rpx;
} */
.con text {
color: #179259;
display: block;
/* margin-top: 30rpx; */
font-family: "PingFang-SC-Bold";
font-size: 36rpx;
letter-spacing: 5rpx;
font-weight: bold;
}
.answer {
min-height: 30rpx;
width: 630rpx;
border-bottom: 0.5px solid #e3e3e3;
padding: 30rpx 30rpx;
font-family: "PingFang-SC-Bold";
font-size: 32rpx;
color: #666;
font-weight: bold;
display: table;
}
.shehui{
width: 345rpx;
/* border-left: 0.5px solid #e3e3e3; */
/* box-sizing: border-box; */
float: left;
}
.answer1 {
min-height: 30rpx;
width: 285rpx;
border-bottom: 0.5px solid #e3e3e3;
padding: 30rpx 30rpx;
font-family: "PingFang-SC-Bold";
font-size: 32rpx;
color: #666;
font-weight: bold;
display: table;
text-align: center;
/* border-left: 0.5px solid #e3e3e3; */
/* box-sizing: border-box; */
float: left;
}
.warp .answer:last-child {
/* border-bottom: none; */
}
.answer text {
vertical-align: middle;
display: table-cell;
}
.answer1 text {
vertical-align: middle;
display: table-cell;
}
.s-active {
background: #179259;
color: #fff;
}
.btn {
height: 88rpx;
width: 690rpx;
/* margin: 30rpx auto; *//* margin-top: 30rpx; */
position: fixed;
left: 50%;
margin-left: -345rpx;
bottom: 80rpx;
}
.menuebtn {
width: 325rpx;
/* width: 295rpx; */
height: 88rpx;
line-height: 88rpx;
text-align: center;
float: left;
background: #eaeaea;
border: 1px solid #e3e3e3;
/* border-radius: 18rpx; */
box-sizing: border-box;
font-family: "PingFang-SC-Medium";
font-size: 34rpx;
color: #999;
/* opacity: 0.9; */
}
.menuebtn1 {
height: 88rpx;
width: 690rpx;
line-height: 88rpx;
text-align: center;
background: #eaeaea;
border: 1px solid #e3e3e3;
box-sizing: border-box;
font-family: "PingFang-SC-Medium";
font-size: 34rpx;
color: #999;
}
.menuebtn-active {
background: #2684ff;
color: #fff;
border: none;
opacity: 1;
}
.all-item {
position: fixed;
bottom: 20rpx;
width: 100%;
text-align: center;
font-size: 30rpx;
color: #333;
}
.pizibao {
width: 582rpx;
height: 90rpx;
margin: 300rpx auto;
}
.p_time {
width: 220rpx;
height: 88rpx;
float: left;
}
.p_time input {
display: block;
width: 150rpx;
height: 88rpx;
text-align: center;
font-size: 34rpx;
float: left;
border: 0.5px solid #cecece;
border-radius: 8rpx;
outline: none;
}
.p_time text {
display: block;
font-size: 30rpx;
height: 88rpx;
width: 30rpx;
margin-left: 20rpx;
float: left;
line-height: 88rpx;
color: #666;
}
.p_btn {
height: 88rpx;
width: 120rpx;
text-align: center;
line-height: 88rpx;
float: left;
margin-left: 20rpx;
background: #2684ff;
color: #fff;
border-radius: 8rpx;
font-size: 30rpx;
}
.con .con-first{
/* text-align: center; */
font-size: 28rpx;
color: #666;
/* line-height: 46rpx; */
}
.con-title{
text-align: right;
}
\ No newline at end of file
pages/docuterInfo/docuterInfo.js
...@@ -207,7 +207,7 @@ Page({ ...@@ -207,7 +207,7 @@ Page({
}) })
}, },
goIntro() { goIntro() {
wx.showLoading(); wx.showLoading({mask:true});
var that = this; var that = this;
wx.navigateTo({ wx.navigateTo({
url: '/pages/doctorIntro/doctorIntro?t_unionid=' + that.data.t_unionid + '&t_unitid=' + that.data.t_unitid + '&t_openid=' + that.data.t_openid, url: '/pages/doctorIntro/doctorIntro?t_unionid=' + that.data.t_unionid + '&t_unitid=' + that.data.t_unitid + '&t_openid=' + that.data.t_openid,
......
pages/index/index.js
...@@ -75,7 +75,7 @@ Page({ ...@@ -75,7 +75,7 @@ Page({
}, },
///特色门诊 ///特色门诊
site: function (e) { site: function (e) {
wx.showLoading() wx.showLoading({mask:true})
var that = this var that = this
if (e.currentTarget.dataset.door) { if (e.currentTarget.dataset.door) {
that.nav('door', e.currentTarget.dataset.door) that.nav('door', e.currentTarget.dataset.door)
...@@ -104,7 +104,7 @@ Page({ ...@@ -104,7 +104,7 @@ Page({
}, },
//医生详情 //医生详情
doctorInfo: function (e) { doctorInfo: function (e) {
wx.showLoading() wx.showLoading({mask:true})
//医生详情页 //医生详情页
wx.navigateTo({ wx.navigateTo({
url: '/pages/docuterInfo/docuterInfo?t_unionid=' + e.currentTarget.dataset.unionid + '&t_unitid=' + e.currentTarget.dataset.unitid + '&t_openid=' + e.currentTarget.dataset.openid, url: '/pages/docuterInfo/docuterInfo?t_unionid=' + e.currentTarget.dataset.unionid + '&t_unitid=' + e.currentTarget.dataset.unitid + '&t_openid=' + e.currentTarget.dataset.openid,
......
pages/info/info.js
...@@ -265,16 +265,15 @@ Page({ ...@@ -265,16 +265,15 @@ Page({
inquiry: '', //1二维码，2聊天页面心理体检 inquiry: '', //1二维码，2聊天页面心理体检
inquiry_id: '', //心理体检量表ID inquiry_id: '', //心理体检量表ID
viewrice: true, //判断是否显示量表价格 viewrice: true, //判断是否显示量表价格
dropDown:8,//多少条显示展开折叠数 dropDown: 8, //多少条显示展开折叠数
animDropDown:{},//动效 animDropDown: {}, //动效
}, },
onLoad: function (options) { onLoad: function (options) {
var that = this; var that = this;
console.log('options',options);
/** otype=1 第一次未答完题进行第二题 || 从报告列表跳转 else 扫码过来 */ /** otype=1 第一次未答完题进行第二题 || 从报告列表跳转 else 扫码过来 */
that.data.otype = options.otype ? options.otype : -1; that.data.otype = options.otype ? options.otype : -1;
if (options.otype == 1) { if (options.otype == 1) {
wx.setStorageSync('qrcode_id', options.g_id); wx.setStorageSync('qrcode_id', options.g_id ? options.g_id : 0);
} else if (options.otype != 0) { } else if (options.otype != 0) {
var scene = decodeURIComponent(options.scene) var scene = decodeURIComponent(options.scene)
wx.setStorageSync('qrcode_id', scene) wx.setStorageSync('qrcode_id', scene)
...@@ -292,7 +291,8 @@ Page({ ...@@ -292,7 +291,8 @@ Page({
}); });
wx.showLoading({ wx.showLoading({
title: '正在加载', title: '正在加载',
}) mask:true
});
}, },
onShow: function () { onShow: function () {
let that = this; let that = this;
...@@ -348,11 +348,16 @@ Page({ ...@@ -348,11 +348,16 @@ Page({
} }
wx.setStorageSync('user', res) wx.setStorageSync('user', res)
if (otype == 1) { if (otype == 1) {
var info = wx.getStorageSync('weiLb'); //不需要支付的量表
let info = wx.getStorageSync('weiLb');
that.loadItem(info); that.loadItem(info);
} else { } else {
var scene = decodeURIComponent(that.data.scene) //需要支付的量表 inquiry:2 im开具的量表 :1 二维码扫码
let scene = that.data.inquiry == 2 ? decodeURIComponent(that.data.inquiry_id) : decodeURIComponent(that.data.scene);
wx.setStorageSync('qrcode_id', scene) wx.setStorageSync('qrcode_id', scene)
if (that.data.inquiry == 2)
that.loadIMScene(scene); // 加载二维码场景
else
that.loadScene(scene); // 加载二维码场景 that.loadScene(scene); // 加载二维码场景
} }
that.loadData(); // 获取个人信息 that.loadData(); // 获取个人信息
...@@ -421,6 +426,7 @@ Page({ ...@@ -421,6 +426,7 @@ Page({
*/ */
loadScene(scene) { loadScene(scene) {
let that = this; let that = this;
wx.removeStorageSync('roomService');
var user = wx.getStorageSync('user'); var user = wx.getStorageSync('user');
var data = { var data = {
z_openid: user.openid, z_openid: user.openid,
...@@ -464,7 +470,7 @@ Page({ ...@@ -464,7 +470,7 @@ Page({
up_money: res.money, up_money: res.money,
uo_price: res.price uo_price: res.price
}) })
} else if (res.unitid == '4725' || res.unitid == '5') { } else if (res.unitid == '4725') {
wx.hideLoading() wx.hideLoading()
that.setData({ that.setData({
show: 2, show: 2,
...@@ -489,14 +495,13 @@ Page({ ...@@ -489,14 +495,13 @@ Page({
}) })
} }
wx.setStorageSync('weiLb', res) wx.setStorageSync('weiLb', res)
// 是否有未做完的题 res.characters_id 为null 时表示没有扫码后未做的量表 // 是否有未做完的题 res.characters_id 为null 时表示没有扫码后未做的量表;
// res.record_id = res.characters_id ?res.characters_id:-1; // res.record_id = res.characters_id ?res.characters_id:-1;
if (res.characters_id) { if (res.characters_id) {
res.record_id = res.characters_id res.record_id = res.characters_id
} else { } else {
res.record_id = -1; res.record_id = -1;
} }
if (Number(res.type) == 3) { if (Number(res.type) == 3) {
// 二维码已失效 // 二维码已失效
Util.alert('您扫的二维码已经失效!', function () { Util.alert('您扫的二维码已经失效!', function () {
...@@ -538,7 +543,6 @@ Page({ ...@@ -538,7 +543,6 @@ Page({
title: '支付检测费' //修改title title: '支付检测费' //修改title
}) })
wx.setStorageSync('payInfo', json) wx.setStorageSync('payInfo', json)
} else { // 不需要免费、体验金 } else { // 不需要免费、体验金
var user = wx.getStorageSync('user'); var user = wx.getStorageSync('user');
var data1 = {}; var data1 = {};
...@@ -572,6 +576,82 @@ Page({ ...@@ -572,6 +576,82 @@ Page({
} }
}) })
}, },
/**加载IM量表场景 */
loadIMScene(scene) {
let that = this;
var user = wx.getStorageSync('user');
var data = {
z_openid: user.openid,
g_id: scene
};
//加载二维码
Service.loadIMScene(data).then((res) => {
let data = res.data;
that.setData({
t_openid: data.t_openid,
t_unionid: data.t_unionid,
viewrice: false, //不显示单个量表价格
})
/**
* 0 需要支付
* 1 已支付
* -1 已做完
*/
switch (res.code) {
case 0:
//0 需要支付
wx.hideLoading()
that.setData({
show: 0,
marketstatus: data.marketstatus,
showLoading: true,
// zhifu
measure_name: data.measure_name,
up_money: data.money,
uo_price: data.price
})
wx.setStorageSync('weiLb', data)
let json = {
res: data,
e: scene,
otype: 0
}
// that.upPayBtn(json);
that.setData({
payModal: true
})
wx.setNavigationBarTitle({
title: '支付检测费' //修改title
})
wx.setStorageSync('payInfo', json)
break;
case 1:
// 1 已支付
wx.hideLoading()
that.setData({
show: 0,
marketstatus: data.marketstatus,
showLoading: true,
// zhifu
measure_name: data.measure_name,
up_money: data.money,
uo_price: data.price
})
wx.setStorageSync('weiLb', data)
that.loadItem(data, scene);
break;
case -1:
// -1 已做完
wx.hideLoading()
Util.alert(res.msg, function () {
wx.switchTab({
url: '/pages/index/index',
})
});
return;
}
})
},
getUnitid: function (e) { getUnitid: function (e) {
let that = this let that = this
var allData = wx.getStorageSync('data'); var allData = wx.getStorageSync('data');
...@@ -592,11 +672,11 @@ Page({ ...@@ -592,11 +672,11 @@ Page({
* 量表数量超过dropdown数量显示'展开'/'收起' * 量表数量超过dropdown数量显示'展开'/'收起'
* @param {*} e * @param {*} e
*/ */
dropdown(e){ dropdown(e) {
console.log(e.currentTarget.dataset.dropdown); console.log(e.currentTarget.dataset.dropdown);
let dropDown= e.currentTarget.dataset.dropdown; let dropDown = e.currentTarget.dataset.dropdown;
this.setData({ this.setData({
dropDown:dropDown dropDown: dropDown
}) })
// //点击弹出 // //点击弹出
// if (dropDown==8) { // if (dropDown==8) {
...@@ -624,7 +704,7 @@ Page({ ...@@ -624,7 +704,7 @@ Page({
upPayBtn: Util.debouce(function () { upPayBtn: Util.debouce(function () {
var payInfo = wx.getStorageSync('payInfo') var payInfo = wx.getStorageSync('payInfo')
wx.showLoading({ wx.showLoading({
title: '', mask:true
}) })
var that = this; var that = this;
if (that.data.btnFlag) { if (that.data.btnFlag) {
...@@ -788,7 +868,6 @@ Page({ ...@@ -788,7 +868,6 @@ Page({
time: e.time, time: e.time,
} }
that.payCsX(_json) that.payCsX(_json)
} else { } else {
Util.alert('支付失败', function () { Util.alert('支付失败', function () {
wx.reLaunch({ wx.reLaunch({
...@@ -818,7 +897,7 @@ Page({ ...@@ -818,7 +897,7 @@ Page({
data.gold = e.money; data.gold = e.money;
// data.gold = 0.01; // data.gold = 0.01;
data.g_id = g_id; data.g_id = g_id;
data.type = '1'; //量表1 服务2 药方3 data.type = that.data.inquiry == 1 ? '1' : '4'; //量表1 服务2 药方3 im检测4
// 添加参数 // 添加参数
var url = Api.HOST + 'wechatIteration.php?s=Home/payrecord'; var url = Api.HOST + 'wechatIteration.php?s=Home/payrecord';
Api.fetchPost(url, data, (err, res) => { Api.fetchPost(url, data, (err, res) => {
...@@ -1003,7 +1082,7 @@ Page({ ...@@ -1003,7 +1082,7 @@ Page({
marketstatus: 4, marketstatus: 4,
showLoading: true showLoading: true
}) })
} else if (weiLb.unitid == '4725' || weiLb.unitid == '5') { } else if (weiLb.unitid == '4725') {
this.setData({ this.setData({
show: 2, show: 2,
marketstatus: 4, marketstatus: 4,
...@@ -1168,6 +1247,7 @@ Page({ ...@@ -1168,6 +1247,7 @@ Page({
}, 5000) }, 5000)
wx.showLoading({ wx.showLoading({
title: '请稍后', title: '请稍后',
mask:true
}) })
// 改变按钮状态 // 改变按钮状态
this.setData({ this.setData({
...@@ -1184,6 +1264,7 @@ Page({ ...@@ -1184,6 +1264,7 @@ Page({
clearTimeout(timer1) clearTimeout(timer1)
// 个人信息提交成功 返回ret== 1 // 个人信息提交成功 返回ret== 1
if (res.code == 1) { if (res.code == 1) {
console.log("that.data.lb_id",that.data.lb_id)
// otype = 0 从首页进入需要支付 现在已移除 // otype = 0 从首页进入需要支付 现在已移除
// otype = 1 从报告页面进入 不需要支付 // otype = 1 从报告页面进入 不需要支付
// otype 不存在 = -1 扫码进入 // otype 不存在 = -1 扫码进入
...@@ -1203,7 +1284,7 @@ Page({ ...@@ -1203,7 +1284,7 @@ Page({
}, 500) }, 500)
} }
}) })
} else if (that.data.lb_tz == '3') { } else if (Number(that.data.lb_id) == 60) {
// 瑞文 // 瑞文
wx.navigateTo({ wx.navigateTo({
url: '/pages/dati03/dati03', url: '/pages/dati03/dati03',
...@@ -1216,6 +1297,19 @@ Page({ ...@@ -1216,6 +1297,19 @@ Page({
}, 500) }, 500)
} }
}) })
} else if (Number(that.data.lb_id) == 145) {
// 生活事件量表
wx.navigateTo({
url: '/pages/dati05/dati05',
success: function () {
wx.hideLoading()
setTimeout(function () {
that.setData({
payInfo: true
})
}, 500)
}
})
} else { } else {
// 进入普通的答题页面 // 进入普通的答题页面
if (that.data.monitor == 1) { if (that.data.monitor == 1) {
...@@ -1802,6 +1896,7 @@ Page({ ...@@ -1802,6 +1896,7 @@ Page({
var urlt = Api.HOST + 'appIteration.php?s=Home/stinfo'; var urlt = Api.HOST + 'appIteration.php?s=Home/stinfo';
wx.showLoading({ wx.showLoading({
title: '正在上传', title: '正在上传',
mask:true
}) })
var uploadData = setTimeout(function () { var uploadData = setTimeout(function () {
wx.hideLoading() wx.hideLoading()
...@@ -1923,6 +2018,7 @@ Page({ ...@@ -1923,6 +2018,7 @@ Page({
var urlt = Api.HOST + 'appIteration.php?s=Home/stinfo'; var urlt = Api.HOST + 'appIteration.php?s=Home/stinfo';
wx.showLoading({ wx.showLoading({
title: '正在上传', title: '正在上传',
mask:true
}) })
var uploadData = setTimeout(function () { var uploadData = setTimeout(function () {
wx.hideLoading() wx.hideLoading()
......
pages/info1/info1.js
...@@ -45,6 +45,7 @@ Page({ ...@@ -45,6 +45,7 @@ Page({
var loadPhoto = setTimeout(function(){ var loadPhoto = setTimeout(function(){
wx.showLoading({ wx.showLoading({
title: '加载中...', title: '加载中...',
mask:true
}) })
},1000) },1000)
// 咨询师的openID 和时间 // 咨询师的openID 和时间
...@@ -234,6 +235,7 @@ Page({ ...@@ -234,6 +235,7 @@ Page({
}, 5000) }, 5000)
wx.showLoading({ wx.showLoading({
title: '请稍后', title: '请稍后',
mask:true
}) })
this.setData({ payInfo: false }) this.setData({ payInfo: false })
Api.fetchPost(urlt, data, (err, res) => { Api.fetchPost(urlt, data, (err, res) => {
...@@ -249,6 +251,16 @@ Page({ ...@@ -249,6 +251,16 @@ Page({
}, 500) }, 500)
} }
}) })
} else if (that.data.lb_tz == '145') {
// 生活事件量表
wx.navigateTo({
url: '/pages/dati05/dati05?tplb=1',
success: function(){
setTimeout(function(){
that.setData({payInfo:true})
},500)
}
})
} else if (that.data.lb_tz == '0') { } else if (that.data.lb_tz == '0') {
wx.navigateTo({ wx.navigateTo({
url: '/pages/dati04/dati04?tplb=1', url: '/pages/dati04/dati04?tplb=1',
......
pages/prescription/order/order.js
...@@ -475,6 +475,14 @@ Page({ ...@@ -475,6 +475,14 @@ Page({
} }
}) })
}, },
/**
*
*/
hideModal() {
this.setData({
errshow: false,
})
},
//登陆后组件回调方法刷新当前页面 //登陆后组件回调方法刷新当前页面
_refreshEvent() { _refreshEvent() {
console.log("刷新"); console.log("刷新");
......
pages/prescription/order/order.wxml
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<view class="sf-top"> <view class="sf-top">
<view class="sf-title"> <view class="sf-title">
<image class="sf-img" src="/images/sf.png"></image> <image class="sf-img" src="/images/sf.png"></image>
<text class="size-0 ml-15">顺丰配送 16:00前下单当日发货。平台承诺100%正品，假一罚十。</text> <text class="size-0 ml-15">顺丰配送 19:00前下单当日发货。平台承诺100%正品，假一罚十。</text>
</view> </view>
</view> </view>
</view> </view>
......
pages/search/search.js
...@@ -167,8 +167,8 @@ Page({ ...@@ -167,8 +167,8 @@ Page({
//搜素确认 //搜素确认
search (page) { search (page) {
let that = this let that = this
wx.showLoading({ that.setData({
title: '加载中', showview: false
}) })
let data = {} let data = {}
data.page = page // 页数 data.page = page // 页数
...@@ -198,7 +198,6 @@ Page({ ...@@ -198,7 +198,6 @@ Page({
showview: true showview: true
}) })
} }
wx.hideLoading({})
}) })
}, },
//头部筛选 add by lq datetime 2020-4-21 //头部筛选 add by lq datetime 2020-4-21
...@@ -501,7 +500,7 @@ Page({ ...@@ -501,7 +500,7 @@ Page({
}, },
//详情 //详情
doctorInfo: function (e) { doctorInfo: function (e) {
wx.showLoading(); wx.showLoading({mask:true});
wx.navigateTo({ wx.navigateTo({
url: '/pages/docuterInfo/docuterInfo?t_unionid=' + e.currentTarget.dataset.unionid + '&t_unitid=' + e.currentTarget.dataset.unitid + '&t_openid=' + e.currentTarget.dataset.openid, url: '/pages/docuterInfo/docuterInfo?t_unionid=' + e.currentTarget.dataset.unionid + '&t_unitid=' + e.currentTarget.dataset.unitid + '&t_openid=' + e.currentTarget.dataset.openid,
}) })
......
project.config.json
...@@ -34,8 +34,7 @@ ...@@ -34,8 +34,7 @@
"userConfirmedBundleSwitch": false, "userConfirmedBundleSwitch": false,
"packNpmManually": false, "packNpmManually": false,
"packNpmRelationList": [], "packNpmRelationList": [],
"minifyWXSS": true, "minifyWXSS": true
"skeletonGenerateFilesWithoutConfirm": true
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.12.2", "libVersion": "2.12.2",
...@@ -125,6 +124,12 @@ ...@@ -125,6 +124,12 @@
"pathName": "packageA/logistics/logistics", "pathName": "packageA/logistics/logistics",
"query": "id=978&num=SF1334982552976&tel=17801017172&ordernumber=20210106215421&img=https://www.xiaodongai.com/xiaodongai/ceshi/Uploads/Drug/2020-04-11/5e916ffe83129.jpg&status=3&address={\"id\":7343,\"openid\":\"oYQX40BtoLUP4sbDt8iKxO-CcQ74\",\"unionid\":\"oHhp80YULOSNxEltQNTTkRqjzNrI\",\"name\":\"小孔5\",\"phone\":\"17801017172\",\"take_over\":\"北京市北京市通州区\",\"detail_address\":\"北京市北京市通州区小懂科技\",\"create_time\":\"1610531672\",\"update_time\":null,\"status\":0,\"is_default\":0,\"province\":\"北京市\",\"city\":\"北京市\",\"area\":\"通州区\"}&com=", "query": "id=978&num=SF1334982552976&tel=17801017172&ordernumber=20210106215421&img=https://www.xiaodongai.com/xiaodongai/ceshi/Uploads/Drug/2020-04-11/5e916ffe83129.jpg&status=3&address={\"id\":7343,\"openid\":\"oYQX40BtoLUP4sbDt8iKxO-CcQ74\",\"unionid\":\"oHhp80YULOSNxEltQNTTkRqjzNrI\",\"name\":\"小孔5\",\"phone\":\"17801017172\",\"take_over\":\"北京市北京市通州区\",\"detail_address\":\"北京市北京市通州区小懂科技\",\"create_time\":\"1610531672\",\"update_time\":null,\"status\":0,\"is_default\":0,\"province\":\"北京市\",\"city\":\"北京市\",\"area\":\"通州区\"}&com=",
"scene": 1014 "scene": 1014
},
{
"name": "packageA/productOrderInfo/productOrderInfo",
"pathName": "packageA/productOrderInfo/productOrderInfo",
"query": "scene=33610",
"scene": null
} }
] ]
} }
......
utils/api.js
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
var HOST_xinli = 'https://www.xiaodongai.com/xiaodongai/xinli'; var HOST_xinli = 'https://www.xiaodongai.com/xiaodongai/xinli';
// var HOST_xinli = 'https://www.xiaodongai.com/xiaodongai/xinli_ceshi_copy'; // var HOST_xinli = 'https://www.xiaodongai.com/xiaodongai/xinli_ceshi_copy';
var HOST_xinli_lb = 'https://static.xiaodongai.com/'; var HOST_xinli_lb = 'https://static.xiaodongai.com/';
// const HOST= "https://test-wechat.xiaodongai.com/";
var HOST = 'https://www.xiaodongai.com/xiaodongai/kongtian/'; var HOST = 'https://www.xiaodongai.com/xiaodongai/kongtian/';
// var HOST = 'https://www.xiaodongai.com/xiaodongai/ceshi/';//测试库 // var HOST = 'https://www.xiaodongai.com/xiaodongai/ceshi/';//测试库
var HOST_P = "http://static.xiaodongai.com/xiaodongai/"; var HOST_P = "http://static.xiaodongai.com/xiaodongai/";
......
utils/config.js
'use strict'; 'use strict';
var HOST_xinli = 'https://www.xiaodongai.com/xiaodongai/xinli'; const HOST_xinli = 'https://www.xiaodongai.com/xiaodongai/xinli';
// var HOST_xinli = 'https://www.xiaodongai.com/xiaodongai/xinli_ceshi_copy'; // var HOST_xinli = 'https://www.xiaodongai.com/xiaodongai/xinli_ceshi_copy';
var HOST_xinli_lb = 'https://static.xiaodongai.com/'; const HOST_xinli_lb = 'https://static.xiaodongai.com/';
var HOST_P = "https://static.xiaodongai.com/xiaodongai/"; const HOST_P = "https://static.xiaodongai.com/xiaodongai/";
var HOST_P_K = "https://static.xiaodongai.com/xiaodongai/kongtian/"; const HOST_P_K = "https://static.xiaodongai.com/xiaodongai/kongtian/";
var HOST = 'https://www.xiaodongai.com/xiaodongai/kongtian/';
// const HOST= "https://test-wechat.xiaodongai.com/";
const HOST = 'https://www.xiaodongai.com/xiaodongai/kongtian/';
// var HOST = 'https://www.xiaodongai.com/xiaodongai/ceshi/';//测试库 // var 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/';//本地
var HOST_info = 'https://vivshi.com/xiaodongai/kongtian/'; // 弃用 const HOST_info = 'https://vivshi.com/xiaodongai/kongtian/'; // 弃用
var HOST_yiyuan="https://www.xiaodongai.com/xiaodong_yiyuan/xd_admin/public/index.php/apitest/";//互联网医院测试 const HOST_yiyuan="https://www.xiaodongai.com/xiaodong_yiyuan/xd_admin/public/index.php/apitest/";//互联网医院测试
// var HOST_yiyuan="https://www.xiaodongai.com/xiaodong_yiyuan/xd_admin/public/index.php/api/";//互联网医院正式 // var HOST_yiyuan="https://www.xiaodongai.com/xiaodong_yiyuan/xd_admin/public/index.php/api/";//互联网医院正式
const url = { const url = {
getUserSig: HOST + 'wechatIm.php?s=/Im/wechat_get_sign', //获取usersig以及userID getUserSig: HOST + 'wechatIm.php?s=/Im/wechat_get_sign', //获取usersig以及userID
...@@ -36,6 +38,7 @@ const url = { ...@@ -36,6 +38,7 @@ const url = {
acceptFollowUp:HOST+ "wechatIteration.php?s=/Inquisition/jieshou",//接受预约 acceptFollowUp:HOST+ "wechatIteration.php?s=/Inquisition/jieshou",//接受预约
getPayStatus:HOST+"wechatIteration.php?s=/Prescription/drug_order_list_payresult",//获取药方支付状态 getPayStatus: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",//获取当前量表是否已答
/**end */ /**end */
/**服务设置 begin*/ /**服务设置 begin*/
myServerList:HOST+"wechatIteration.php?s=/InquiryUser/inquiryImList",//我的服务记录 myServerList:HOST+"wechatIteration.php?s=/InquiryUser/inquiryImList",//我的服务记录
...@@ -71,14 +74,15 @@ const url = { ...@@ -71,14 +74,15 @@ const url = {
drogOrderDetail:HOST + "wechatIteration.php?s=/Drugorder/prescription_order_detail",//药品订单详情 drogOrderDetail:HOST + "wechatIteration.php?s=/Drugorder/prescription_order_detail",//药品订单详情
/**end */ /**end */
/**公共 begin*/ /**公共 begin*/
isReport: HOST + "wechatIteration.php?s=/Inquisition/check_istype", //检测是否允许查看报告 isReport:HOST + "wechatIteration.php?s=/Inquisition/check_istype", //检测是否允许查看报告
forcedUpdate: HOST + 'wechatIteration.php?s=/Public/wechatVer', //强制更新 forcedUpdate:HOST + 'wechatIteration.php?s=/Public/wechatVer', //强制更新
getWxUserPhone: HOST + "wechatIteration.php?s=/InquiryUser/getUserPhone", //微信授权获取用户手机号 getWxUserPhone:HOST + "wechatIteration.php?s=/InquiryUser/getUserPhone", //微信授权获取用户手机号
getCode: HOST + "wechatIteration.php?s=/Home/getCode", //获取验证码 getCode:HOST + "wechatIteration.php?s=/Home/getCode", //获取验证码
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量表支付场景
getTestInfo:HOST+"wechatIteration.php?s=/InquiryUser/findInquiry",//获取检测信息 getTestInfo:HOST+"wechatIteration.php?s=/InquiryUser/findInquiry",//获取检测信息
/**end */ /**end */
/**用户购买问诊信息 begin*/ /**用户购买问诊信息 begin*/
...@@ -113,7 +117,7 @@ const url = { ...@@ -113,7 +117,7 @@ const url = {
screenDoctor: HOST + "wechatIteration.php?s=/personal/screenDoctor", //查询医生数据 screenDoctor: HOST + "wechatIteration.php?s=/personal/screenDoctor", //查询医生数据
/**end */ /**end */
getChatDoctor: HOST + "wechatIteration.php?s=/Inquisition/aptitude", getChatDoctor: HOST + "wechatIteration.php?s=/Inquisition/aptitude",
getDealDetails: HOST + "wechatIteration.php?s=/Inquisition/patient_details", getDealDetails: HOST + "wechatIteration.php?s=/Inquisition/patient_details",//支付记录
getReportList: HOST + "wechatIteration.php?s=/Home/testresult", getReportList: HOST + "wechatIteration.php?s=/Home/testresult",
goSetTel: HOST + "wechatIteration.php?s=/Index/getPhone", goSetTel: HOST + "wechatIteration.php?s=/Index/getPhone",
getServiceList: HOST + "wechatIteration.php?s=/InquiryUser/chat_inquiry",//服务记录集合 getServiceList: HOST + "wechatIteration.php?s=/InquiryUser/chat_inquiry",//服务记录集合
......
utils/lifeEvent.js 0 → 100644
let lifeEventName = [
'事件发生时间',
'该事件发生次数为',
'该事件持续时间为',
'性质',
'精神影响程度',
'影响持续时间',
];
let lifeArr = {
happenTimeArr: {
title: '事件发生时间',
name: ['未发生', '一年前', '一年内', '长期性'],
score: [0, 0, 1, 2]
},
happenNumArr: {
name: ['1次', '2次', '3次', '4次'],
score: [1, 2, 3, 4],
title:'该事件发生次数为'
},
continusTimeArr : {
name: ['半年之内', '半年以上'],
score: [1, 2],
title: '该事件持续时间为'
},
natureArr: {
name: ['好事', '坏事'],
score: [1, 2],
title: '性质'
},
spiritDegreeArr: {
name: ['无影响', '轻度', '中度', '重度', '极重'],
score: [0, 1, 2, 3, 4],
title:'精神影响程度'
},
impactConTimeArr: {
name: ['三月内', '半年内', '一年内', '一年以上'],
score: [1, 2, 3, 4],
title:'影响持续时间'
}
}
let lifeName = [
'第一部分(家庭有关问题)',
'第二部分(工作学习中的问题)',
'第三部分(社交与其他问题)'
]
module.exports = {
lifeEventName: lifeEventName,
lifeName: lifeName,
lifeArr: lifeArr
}
\ No newline at end of file
utils/service.js
...@@ -450,6 +450,10 @@ function loadScene(param) { ...@@ -450,6 +450,10 @@ function loadScene(param) {
var loadSceneUrl = config.url.loadScene; var loadSceneUrl = config.url.loadScene;
return wxRequest.postRequest(loadSceneUrl, param); return wxRequest.postRequest(loadSceneUrl, param);
} }
function loadIMScene(param) {
var loadIMSceneUrl = config.url.loadIMScene;
return wxRequest.postRequest(loadIMSceneUrl, param);
}
/** /**
* 用户购买服务状态 * 用户购买服务状态
*/ */
...@@ -596,6 +600,14 @@ function drogOrderDetail(param) { ...@@ -596,6 +600,14 @@ function drogOrderDetail(param) {
var drogOrderDetailUrl = config.url.drogOrderDetail; var drogOrderDetailUrl = config.url.drogOrderDetail;
return wxRequest.postRequest(drogOrderDetailUrl, param); return wxRequest.postRequest(drogOrderDetailUrl, param);
} }
/**
* 是否答题
* @param {*} param
*/
function getIsAnswer(param){
var getIsAnswerUrl = config.url.getIsAnswer;
return wxRequest.postRequest(getIsAnswerUrl, param);
}
function getBusStopListPromise(sid, stopType) { function getBusStopListPromise(sid, stopType) {
var getStopListUrl = config.url.getBusStopList; var getStopListUrl = config.url.getBusStopList;
...@@ -666,6 +678,7 @@ module.exports = { ...@@ -666,6 +678,7 @@ module.exports = {
delFriend: delFriend, //删除好友 delFriend: delFriend, //删除好友
appAddFriend: appAddFriend, //app.js添加好友 appAddFriend: appAddFriend, //app.js添加好友
loadScene: loadScene, //加载量表二维码场景 loadScene: loadScene, //加载量表二维码场景
loadIMScene:loadIMScene,//加载IM量表支付场景
seeBuyStaus: seeBuyStaus, //用户购买服务状态 seeBuyStaus: seeBuyStaus, //用户购买服务状态
endInquiry: endInquiry, //同意结束服务 endInquiry: endInquiry, //同意结束服务
refuseInquiry: refuseInquiry, //拒绝结束服务 refuseInquiry: refuseInquiry, //拒绝结束服务
...@@ -692,4 +705,5 @@ module.exports = { ...@@ -692,4 +705,5 @@ module.exports = {
logisticsInfo: logisticsInfo, //物流信息 logisticsInfo: logisticsInfo, //物流信息
firendAfterRoom: firendAfterRoom, //成功加好友之后选择身份信息进入群聊房间 firendAfterRoom: firendAfterRoom, //成功加好友之后选择身份信息进入群聊房间
drogOrderDetail: drogOrderDetail, //药品订单详情 drogOrderDetail: drogOrderDetail, //药品订单详情
getIsAnswer:getIsAnswer,//是否答题
} }
\ No newline at end of file
utils/tim.js
...@@ -117,6 +117,7 @@ function KICKED_OUT(event){ ...@@ -117,6 +117,7 @@ function KICKED_OUT(event){
if (res.confirm) { if (res.confirm) {
wx.showLoading({ wx.showLoading({
title: '正在登录', title: '正在登录',
mask:true
}) })
getApp().getUserInfo(function (cb) { getApp().getUserInfo(function (cb) {
if (!Util.isEmpty(cb)) { if (!Util.isEmpty(cb)) {
......
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