Skip to content

XDJK
XDJK
Commit 0dbc29c1 by liuquan
Options

no message

parent dde3f637
Showing with 626 additions and 201 deletions
app.json
......@@ -42,7 +42,8 @@
"chattingRecords/chattingRecords",
"beBeingService/beBeingService",
"productOrderInfo/productOrderInfo",
"productOrderDetail/productOrderDetail"
"productOrderDetail/productOrderDetail",
"productOrder/productOrder"
]
},
{
......
packageA/drugOrder/drugOrder.js
......@@ -107,73 +107,7 @@ Page({
unionid: wx.getStorageSync('data').unionid,
status: status
};
let newList = that.data.list;
if (page == 1 || newList.length < that.data.total) {
that.buyProductList(data);
} else {
data.page = data.page - that.data.productPage;
console.log(" data.page", data.page)
that.buyDrugList(data);
}
},
/**
* 推荐产品列表
* @param {*} param
*/
buyProductList(param) {
let that = this;
let newList = that.data.list;
let page = param.page;
Service.buyProductList(param).then(res => {
if (res.data.list.length > 0 && res.data.list.length < 10) {
that.data.productPage = param.page;
}
if (page > 1 && res.data.list.length > 0) {
console.log("newList", res.data.list)
newList = newList.concat(res.data.list);
// for (let i = 0; i < res.data.list.length; i++) {
// newList.push(res.data.list[i])
// }
that.setData({
success: true
})
} else if (page > 1 && res.data.list.length == 0) {
that.setData({
scrollFlag: false,
scrollFlag1: true,
})
setTimeout(function () {
that.setData({
success: true
})
}, 2000)
} else {
// console.log("newList2", res.data.list)
newList = res.data.list;
}
wx.stopPullDownRefresh()
if (newList.length > 5) {
that.setData({
list: newList,
total: res.data.total,
showview: true,
requestStatus: false,
})
wx.hideLoading();
} else {
that.setData({
// list: [],
list: newList,
total: res.data.total,
// showview: true
})
that.buyDrugList(param);
}
}).catch(function (Error) {
console.warn('error:', Error); // 获取会话资料失败的相关信息
});
that.buyDrugList(data);
},
/**
* 药品列表
......@@ -227,16 +161,6 @@ Page({
console.warn('error:', Error); // 获取会话资料失败的相关信息
});
},
// /**
// * 插入排序
// * @param {Array} arr 排序数据
// */
insertionSort(arr) {
let sortArr;
arr.forEach((item, index) => {
})
},
//选择topTab页
nav: function (e) {
let _this = this
......@@ -312,15 +236,9 @@ Page({
* 订单详情-待发货2，已发货3，已完成4
*/
goOrderDetail: debouce(function (e) {
if(e.currentTarget.dataset.class==1){
wx.navigateTo({
url: '/packageA/drugOrderDetail/drugOrderDetail?id=' + e.currentTarget.dataset.id,
})}else if(e.currentTarget.dataset.class==2){
wx.navigateTo({
url: '/packageA/productOrderDetail/productOrderDetail?id=' + e.currentTarget.dataset.id,
})
}
})
}, 1000, true),
//查看物流-待收货+已完成
goLogistics: debouce(function (e) {
......@@ -334,43 +252,25 @@ Page({
goPay: debouce(function (e) {
let that = this;
let orderClass = e.currentTarget.dataset.class;
console.log("orderClass",orderClass);
console.log("orderClass", orderClass);
let data = {
prescription: e.currentTarget.dataset.id,
patient_unionid: wx.getStorageSync('data').unionid,
isquick: e.currentTarget.dataset.isquick
}
if (orderClass == 1) {
Service.getPayStatusA(data).then((res) => {
if (res.code == 1) {
that.onShow();
} else if (res.code == -1) {
wx.navigateTo({
url: '/packageA/drugOrderInfo/drugOrderInfo?scene=' + e.currentTarget.dataset.id + "&isQuick=" + e.currentTarget.dataset.isquick,
})
} else if (res.code == 2) {
wx.showToast({
title: res.msg,
icon: 'none'
})
}
})
} else if (orderClass == 2) {
Service.getPayStatusB(data).then((res) => {
if (res.code == 1) {
that.onShow();
} else if (res.code == -1) {
wx.navigateTo({
url: '/packageA/productOrderInfo/productOrderInfo?scene=' + e.currentTarget.dataset.id + "&isQuick=" + e.currentTarget.dataset.isquick,
})
} else{
wx.showToast({
title: res.msg,
icon: 'none'
})
}
})
}
Service.getPayStatusA(data).then((res) => {
if (res.code == 1) {
that.onShow();
} else if (res.code == -1) {
wx.navigateTo({
url: '/packageA/drugOrderInfo/drugOrderInfo?scene=' + e.currentTarget.dataset.id + "&isQuick=" + e.currentTarget.dataset.isquick,
})
} else if (res.code == 2) {
wx.showToast({
title: res.msg,
icon: 'none'
})
}
})
}, 1000, true),
})
\ No newline at end of file
packageA/drugOrder/drugOrder.json
{
"navigationBarTitleText": "订单列表",
"navigationBarTitleText": "药品订单",
"enablePullDownRefresh": true,
"usingComponents": {
"answer":"/components/answer/answer"
......
packageA/drugOrder/drugOrder.wxml
......@@ -13,73 +13,8 @@
</view>
<view wx:else>
<block wx:for="{{list}}" wx:key="key">
<!-- 推荐产品 -->
<view class="dingdan" wx:if="{{item.class_pay=='2'}}">
<block>
<view class="num flex">
<text>订单编号：{{item.ordernumber}}</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==3}}">待收货</text>
<text wx-if="{{item.status==4}}">已完成</text>
<text wx-if="{{item.status==5}}">订单过期</text>
<text wx-if="{{item.status==7}}">订单作废</text>
</view>
<block wx:for="{{item.prescription}}" wx:key="index" wx:for-item="itemName">
<view class="list ">
<view class="list-item {{index+1<item.prescription.length?'list-line':''}}">
<view class="bor">
<image src="{{itemName.picture}}"></image>
</view>
<view class="xq">
<view class="name web-font">{{itemName.name}}</view>
<view class="dz">{{itemName.firm}}</view>
<view class="dz">{{itemName.norms}}</view>
<view class="jg">
<text>￥</text>
<text>{{itemName.drug_price}}</text>
</view>
</view>
<view class="list-num">x {{itemName.drug_num}}</view>
</view>
</view>
</block>
</block>
<view class="zj flex">
<text>共 {{item.total}} 件商品 实付款: </text>
<text class="red">￥{{item.money}}</text>
<text>（含运费￥{{item.freight}}）</text>
</view>
<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="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="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-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}}" data-class="2">订单详情</view>
<view class="ljzf" wx:if="{{item.status==1}}" bindtap="goPay" data-id="{{item.yfid}}"
data-isquick="{{item.modular}}" data-class="2">立即支付</view>
<view class="ljzf1" wx:if="{{item.status==5}}">订单过期</view>
<view class="ljzf1" wx:if="{{item.status==7}}">订单作废</view>
</view>
</view>
</view>
<!-- 药品 -->
<view class="dingdan" wx:else>
<view class="dingdan">
<block>
<view class="num flex">
<text>订单编号：{{item.ordernumber}}</text>
......@@ -135,9 +70,9 @@
<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}}" data-class="1">订单详情</view>
data-id="{{item.id}}">订单详情</view>
<view class="ljzf" wx:if="{{item.status==1}}" bindtap="goPay" data-id="{{item.yfid}}"
data-isquick="{{item.modular}}" data-class="1">立即支付</view>
data-isquick="{{item.modular}}">立即支付</view>
<view class="ljzf1" wx:if="{{item.status==5}}">订单过期</view>
<view class="ljzf1" wx:if="{{item.status==7}}">订单作废</view>
</view>
......
packageA/productOrder/productOrder.js 0 → 100644
const Service = require('../../utils/service.js');
const {
debouce
} = require('../../utils/util.js'); //防抖函数
const Util = require('../../utils/util.js');
Page({
/**
* 页面的初始数据
*/
data: {
nav: 0,
status: '',
noRecord: {
winH: null,
},
showview: false,
success: true,
list: [],
page: 1,
productPage: 0,
total: 0,
requestStatus: false, //请求状态
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
var that = this
if (!Util.isEmpty(options.status)) {
that.setData({
status: options.status,
nav: options.status
})
}
},
onShow: function () {
var that = this
that.getList(1, that.data.nav)
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
var that = this
//重置
that.data.page = 1;
that.data.productPage = 0;
that.data.total = 0;
wx.showNavigationBarLoading() //在标题栏中显示加载
setTimeout(function () {
that.getList(1, that.data.nav)
wx.hideNavigationBarLoading() //完成停止加载
wx.stopPullDownRefresh() //停止下拉刷新
}, 1500);
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
var that = this
if (that.data.success) {
var page = that.data.page + 1;
that.setData({
scrollFlag: true,
success: false,
page: page
})
that.getList(page, that.data.nav);
}
},
//删除订单
deleBtn: debouce(function (e) {
var that = this
wx.showModal({
content: '是否确认删除订单',
success(res) {
if (res.confirm) {
let data = {
unionid: wx.getStorageSync("data").unionid,
ordernumber: e.currentTarget.dataset.ordernumber
};
Service.delBuyDrug(data).then((res) => {
if (res.code == 1) {
wx.showToast({
title: '删除成功',
icon: 'success',
mask: true
})
that.getList(1, that.data.nav)
}
}).catch((Error) => {
console.warn('error:', Error); // 获取会话资料失败的相关信息
});
}
}
})
}, 1000, true),
//获取列表
getList: function (page, status) {
var that = this
that.data.requestStatus = true;
var data = {
page: page,
// unionid:'oHhp80QCN2WjClijvSyhkEFQcUwY',
unionid: wx.getStorageSync('data').unionid,
status: status
};
that.buyProductList(data);
},
/**
* 推荐产品列表
* @param {*} param
*/
buyProductList(param) {
let that = this;
let newList = that.data.list;
let page = param.page;
Service.buyProductList(param).then(res => {
console.log("list",res)
if (res.data.list.length > 0 && res.data.list.length < 10) {
that.data.productPage = param.page;
}
if (page > 1 && res.data.list.length > 0) {
console.log("newList", res.data.list)
newList = newList.concat(res.data.list);
that.setData({
success: true
})
} else if (page > 1 && res.data.list.length == 0) {
that.setData({
scrollFlag: false,
scrollFlag1: true,
})
setTimeout(function () {
that.setData({
success: true
})
}, 2000)
} else {
newList = res.data.list;
}
wx.stopPullDownRefresh()
if (newList.length > 0) {
that.setData({
list: newList,
showview: true,
requestStatus: false,
})
wx.hideLoading();
} else {
that.setData({
list: [],
showview: true,
requestStatus: false,
})
}
}).catch(function (Error) {
console.warn('error:', Error); // 获取会话资料失败的相关信息
});
},
//选择topTab页
nav: function (e) {
let _this = this
// wx.showLoading({
// title: '加载中',
// mask:true
// })
if (_this.data.requestStatus) {
return;
}
_this.setData({
nav: e.currentTarget.dataset.index,
page: 1,
total: 0,
productPage: 0,
showview: false,
list: []
})
_this.getList(1, e.currentTarget.dataset.index)
},
//确认收货
confirmReceipt: debouce(function (e) {
let that = this
let data = {
unionid: wx.getStorageSync('data').unionid,
ordernumber: e.currentTarget.dataset.num
}
wx.showModal({
content: '确认收货',
success(ress) {
if (ress.confirm) {
Service.confirmReceipt(data).then((res) => {
console.log("confirmReceipt", res)
wx.showToast({
title: res.msg,
})
that.getList(1, 3)
})
} else if (ress.cancel) {
console.log('用户点击取消')
}
}
})
}, 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
*/
editAddress: debouce(function (e) {
Service.isEditAddress({
ordernumber: e.currentTarget.dataset.ordernumber
}).then((res) => {
if (res.code == 1) {
wx.navigateTo({
url: '/packageA/addsite/addsite?item=' + JSON.stringify(e.currentTarget.dataset.address) + '&ordernumber=' + e.currentTarget.dataset.ordernumber + '&type=1',
})
} else {
wx.showToast({
title: res.msg,
icon: 'success',
mask: true
})
}
})
}, 1000, true),
/**
* 订单详情-待发货2，已发货3，已完成4
*/
goOrderDetail: debouce(function (e) {
wx.navigateTo({
url: '/packageA/productOrderDetail/productOrderDetail?id=' + e.currentTarget.dataset.id,
})
}, 1000, true),
//查看物流-待收货+已完成
goLogistics: debouce(function (e) {
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),
})
}, 1000, true),
/**
* 立即支付
*/
goPay: debouce(function (e) {
let that = this;
let orderClass = e.currentTarget.dataset.class;
console.log("orderClass", orderClass);
let data = {
prescription: e.currentTarget.dataset.yfid,
patient_unionid: wx.getStorageSync('data').unionid,
isquick: e.currentTarget.dataset.isquick
}
Service.getPayStatusB(data).then((res) => {
if (res.code == 1) {
that.onShow();
} else if (res.code == -1) {
wx.navigateTo({
url: '/packageA/productOrderInfo/productOrderInfo?scene=' + e.currentTarget.dataset.id + "&isQuick=" + e.currentTarget.dataset.isquick,
})
} else if (res.code == 2) {
wx.showToast({
title: res.msg,
icon: 'none'
})
}
})
}, 1000, true),
})
\ No newline at end of file
packageA/productOrder/productOrder.json 0 → 100644
{
"navigationBarTitleText": "产品订单",
"enablePullDownRefresh": true,
"usingComponents": {
"answer":"/components/answer/answer"
}
}
\ No newline at end of file
packageA/productOrder/productOrder.wxml 0 → 100644
<import src="../../common/common.wxml" />
<answer id='answer'></answer>
<view class="flex navs">
<view bindtap="nav" data-index="0" class="{{nav==0?'active':'size-colo'}}">全部订单</view>
<view bindtap="nav" data-index="1" class="{{nav==1?'active':'size-colo'}}">待付款</view>
<view bindtap="nav" data-index="2" class="{{nav==2?'active':'size-colo'}}">待发货</view>
<view bindtap="nav" data-index="3" class="{{nav==3?'active':'size-colo'}}">待收货</view>
<view bindtap="nav" data-index="4" class="{{nav==4?'active':'size-colo'}}">已完成</view>
</view>
<block wx:if="{{showview}}">
<view wx:if='{{list.length==0}}'>
<template is="noRecord" data="{{...noRecord}}" />
</view>
<view wx:else>
<block wx:for="{{list}}" wx:key="key">
<!-- 推荐产品 -->
<view class="dingdan">
<block>
<view class="num flex">
<text>订单编号：{{item.ordernumber}}</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==3}}">待收货</text>
<text wx-if="{{item.status==4}}">已完成</text>
<text wx-if="{{item.status==5}}">订单过期</text>
<text wx-if="{{item.status==7}}">订单作废</text>
</view>
<block wx:for="{{item.prescription}}" wx:key="index" wx:for-item="itemName">
<view class="list ">
<view class="list-item {{index+1<item.prescription.length?'list-line':''}}">
<view class="bor">
<image src="{{itemName.picture}}"></image>
</view>
<view class="xq">
<view class="name web-font">{{itemName.name}}</view>
<view class="dz">{{itemName.firm}}</view>
<view class="dz">{{itemName.norms}}</view>
<view class="jg">
<text>￥</text>
<text>{{itemName.drug_price}}</text>
</view>
</view>
<view class="list-num">x {{itemName.drug_num}}</view>
</view>
</view>
</block>
</block>
<view class="zj flex">
<text>共 {{item.total}} 件商品 实付款: </text>
<text class="red">￥{{item.money}}</text>
<text>（含运费￥{{item.freight}}）</text>
</view>
<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="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="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-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.id}}" data-yfid="{{item.yfid}}"
data-isquick="{{item.modular}}">立即支付</view>
<view class="ljzf1" wx:if="{{item.status==5}}">订单过期</view>
<view class="ljzf1" wx:if="{{item.status==7}}">订单作废</view>
</view>
</view>
</view>
</block>
<view class="loading_box" wx:if='{{!success}}'>
<view class="loading1" wx:if='{{scrollFlag}}'>
<image src='/images/2.gif'></image>正在加载...
</view>
<view class="loading2" wx:if='{{scrollFlag1&&!scrollFlag}}'>没有更多了</view>
</view>
</view>
</block>
<block wx:else>
<template is="loading" data="{{...loading}}" />
</block>
<view class="hight"></view>
\ No newline at end of file
packageA/productOrder/productOrder.wxss 0 → 100644
@import '../../common/common.wxss';
page{
background: #fff;
}
view{
line-height: 1;
}
text{
line-height: 1;
}
.wrap{
position: absolute;
width: 100%;
height: 100%;
background: #fff;
}
.flex{
display: flex;
}
.navs{
position: sticky;
z-index: 10000;
top: 0;
background: #fff;
padding: 30rpx 50rpx 0 50rpx;
justify-content: space-between;
}
.navs view{
font-size: 28rpx;
font-weight: 400;
}
.size-color{
color: #333;
}
.active{
font-weight: 700;
color: #2684FF;
border-bottom: 4rpx solid #2684FF;
padding-bottom: 29rpx;
}
.num{
border-top: 20rpx solid #F9F9F9;
justify-content: space-between;
padding-left: 30rpx;
padding-right: 30rpx;
padding-top: 39rpx;
padding-bottom: 38rpx;
font-weight: 300;
}
.num text:first-child{
font-weight: 300;
font-size: 26rpx;
color: #666666;
letter-spacing: 1rpx;
}
.num text:last-child{
font-weight: 700;
font-size: 26rpx;
color: #000000;
letter-spacing: 1rpx;
}
.dingdan{
background: #fff;
}
.list{
border-top: 1rpx solid #e7e7e7;
padding-right: 30rpx;
margin-left: 30rpx;
padding-top: 39rpx;
position: relative;
}
.list-item{
display: flex;
padding-bottom: 42rpx;
}
.list-line{
border-bottom: 2rpx solid #F5F8FB;
}
.list image{
width: 159rpx;
height: 159rpx;
}
.bor{
width: 161rpx;
height: 161rpx;
border: 1rpx solid #EBEBEB;
padding: 1rpx;
}
.xq{
margin-left: 20rpx;
width: 400rpx;
}
.name{
font-size: 32rpx;
color: #333;
font-weight: 600;
line-height: 45rpx;
letter-spacing: 1rpx;
}
.dz{
margin-top: 12rpx;
font-size: 24rpx;
color: #666666;
}
.jg{
color: #EC5B68;
margin-top: 15rpx;
}
.jg text:first-child{
font-size: 24rpx;
}
.jg text:last-child{
font-size: 32rpx;
font-weight: 700;
}
.list-num{
font-size: 28rpx;
font-weight: 500;
position: absolute;
right: 0;
top: 0;
margin-right: 30rpx;
margin-top: 10rpx;
}
.zj{
/* margin-top: 32rpx; */
margin-left: 30rpx;
height: 100rpx;
align-items: center;
justify-content: flex-end;
border-top: 1rpx solid #E7E7E7;
border-bottom: 1rpx solid #E7E7E7;
font-weight: 400;
padding-right: 30rpx;
}
.zj{
font-size: 26rpx;
}
.zj>text:first-child{
color: #000000;
}
.zj>text:last-child{
color: #000000;
}
.red{
color: #EC5B68;
}
.dele{
margin-left: 30rpx;
justify-content: flex-end;
align-items: center;
}
.delebtn{
width: 130rpx;
height: 64rpx;
display: flex;
align-items: center;
margin-left: 20rpx;
border-radius: 5rpx;
font-size: 26rpx;
color: #666;
}
.btns{
font-size: 26rpx;
padding: 28rpx 30rpx 28rpx;
justify-content: flex-end;
width: 510rpx;
}
.btns view{
width: 146rpx;
height: 64rpx;
display: flex;
justify-content: center;
align-items: center;
margin-left: 20rpx;
border-radius: 5rpx;
font-size: 26rpx;
}
.ckwl{
color: #000;
border: 1rpx solid #e7e7e7;
}
.ljzf{
color: #fff;
background: #2684FF;
}
.ljzf1{
color: #fff;
background: #ccc;
}
.hight{
width: 100%;
height: 100rpx;
}
\ No newline at end of file
packageA/productOrderDetail/productOrderDetail.js
......@@ -100,6 +100,7 @@ Page({
/**复制 */
copy(e) {
let copy = e.currentTarget.dataset.c;
console.log("copy",copy)
wx.setClipboardData({
data: copy,
success: function (res) {
......
packageA/productOrderDetail/productOrderDetail.wxml
......@@ -92,14 +92,15 @@
<view>订单价格：</view>
<view>￥ {{item.drug_money}}</view>
</view>
<!-- <view class="row order-price">
<view class="row order-price">
<view>服务诊金：</view>
<view>￥ {{item.zj}}</view>
<view>￥ {{item.zj?item.zj:'0.00'}}</view>
</view>
<view class="row order-freight">
<view>运费：</view>
<view>￥ {{item.freight}}</view>
</view> -->
<view wx:if="{{item.freight}}">￥ {{item.freight}}</view>
<view wx:else >包邮</view>
</view>
<view class="actualPay">共{{item.drug_num}}件商品 实付款: <text style="color:#EC5B68;">￥{{item.money}}</text></view>
</view>
<view class="br"></view>
......
packageA/productOrderInfo/productOrderInfo.js
......@@ -55,7 +55,7 @@ Page({
onShow: function () {
wx.showLoading({
title: '加载中',
mask:true
mask: true
})
var that = this
that.login = that.selectComponent("#login");
......@@ -101,7 +101,7 @@ Page({
let data = {};
data.prescription = id;
data.patient_unionid = patient_unionid;
console.log("getNormal",data)
console.log("getNormal", data)
Service.getNormalProduct(data).then((res) => {
console.log("getDetail", res);
if (res.code == 2 || res.code == 3) {
......@@ -173,6 +173,7 @@ Page({
that.isChecked(res.data.healthcare);
}
}
wx.hideLoading();
})
},
......@@ -364,7 +365,7 @@ Page({
// }
// }
let data = {
id:that.data.options.scene,
id: that.data.options.scene,
patient_unionid: that.data.item.unionid,
modular: that.data.list.modular,
lastid: that.data.item.id,
......@@ -393,7 +394,7 @@ Page({
if (res.errMsg && res.errMsg == "requestPayment:ok") {
console.log("requestPayment:ok")
wx.reLaunch({
url: '/packageA/drugOrder/drugOrder'
url: '/packageA/productOrder/productOrder'
})
that.data.paySuccess = true;
return;
......@@ -485,7 +486,7 @@ Page({
}
})
},
/**
/**
*
*/
hideModal() {
......
pages/info/info.js
......@@ -1284,8 +1284,8 @@ Page({
}, 500)
}
})
} else if (Number(that.data.lb_id) == 60) {
// 瑞文
} else if (that.data.lb_tz == '3') {
// 瑞文高级和瑞文推理
wx.navigateTo({
url: '/pages/dati03/dati03',
success: function () {
......
pages/my/my.wxml
......@@ -40,7 +40,11 @@
<image src='../../images/l@2x.png'></image>
</view>
<view class='item' bindtap="goToURL" data-src="/packageA/drugOrder/drugOrder">
<text>订单列表</text>
<text>药品订单</text>
<image src='../../images/l@2x.png'></image>
</view>
<view class='item' bindtap="goToURL" data-src="/packageA/productOrder/productOrder">
<text>产品列表</text>
<image src='../../images/l@2x.png'></image>
</view>
<view class='item' bindtap="goToURL" data-src="/packageA/patientList/patientList">
......
project.private.config.json
......@@ -80,8 +80,8 @@
{
"name": "packageA/productOrderInfo/productOrderInfo",
"pathName": "packageA/productOrderInfo/productOrderInfo",
"query": "scene=15109",
"scene": null
"query": "scene=15152",
"scene": 1011
},
{
"name": "packageA/productOrderDetail/productOrderDetail",
......
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