修复版本

master
lynn 10 months ago
parent 4019a7fb3c
commit f5cf0235b4

@ -265,14 +265,19 @@
</view>
<!-- 支付二维码 -->
<view class="qrcode-section" v-if="payQrCode">
<view class="qrcode-section" v-if="showPayQrCode">
<view class="qrcode-title">微信支付</view>
<view class="qrcode-wrapper">
<image
:src="payQrCode"
mode="aspectFit"
class="qrcode-image"
></image>
<u-qrcode
canvas-id="pay-qrcode"
:value="payQrCode"
:size="200"
:options="{
margin: 10,
colorDark: '#000000',
colorLight: '#ffffff'
}"
></u-qrcode>
</view>
<view class="qrcode-tip">请使用微信扫码支付</view>
</view>
@ -688,7 +693,7 @@ import { ROOTPATH as baseUrl } from "@/common/config.js";
import {isNull} from "@/common/util.js"
export default {
components: {
serviceArchive,
serviceArchive
},
data() {
return {
@ -805,7 +810,8 @@ export default {
payQrCode: '', //
payTimer: null, //
showPriceEdit: false,
editPrice: ''
editPrice: '',
showPayQrCode: false
};
},
onReady() {
@ -824,6 +830,9 @@ export default {
this.orderId = option.order_id;
this.getDetail();
}
//
this.showPayQrCode = false;
this.payQrCode = '';
},
onUnload() {
//
@ -1010,23 +1019,13 @@ export default {
mask: true
})
//
uni.request({
url: 'https://api.qrserver.com/v1/create-qr-code/',
data: {
data: result.code_url,
size: '400x400'
},
responseType: 'arraybuffer',
success: (res) => {
const base64 = uni.arrayBufferToBase64(res.data)
this.payQrCode = 'data:image/png;base64,' + base64
},
complete: () => {
// loading
uni.hideLoading()
}
})
//
this.payQrCode = result.code_url
this.showPayQrCode = true
// loading
uni.hideLoading()
//
this.startPayCheck()
} catch (err) {
@ -1047,6 +1046,9 @@ export default {
if (res.pay_status === 1) {
clearInterval(this.payTimer)
//
this.showPayQrCode = false
uni.showToast({
title: '支付成功',
icon: 'success'
@ -1744,6 +1746,9 @@ export default {
background: #fff;
padding: 20rpx;
box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.1);
display: flex;
align-items: center;
justify-content: center;
.qrcode-image {
width: 100%;

@ -1,7 +1,7 @@
{
"easycom": {
"^u-qrcode": "@/uni_modules/Sansnn-uQRCode/components/uqrcode/uqrcode.vue",
"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
},
"pages": [{
"path": "pages/index/index",

@ -331,7 +331,11 @@
that.select.page = 1
that.currentTab = 1
that.list = []
that.getOrderList()
if(this.loginRole === 'nurse'){
this.getOrderList()
}else{
this.getStaffOrderList()
}
}, 1500)
})
})
@ -366,7 +370,11 @@
this.showPayCode = false
this.list = []
this.select.page = 1
this.getOrderList()
if(this.loginRole === 'nurse'){
this.getOrderList()
}else{
this.getStaffOrderList()
}
},
//
closeOrder(item){
@ -388,7 +396,11 @@
that.select.page = 1
that.currentTab = 3
that.list = []
that.getOrderList()
if(this.loginRole === 'nurse'){
this.getOrderList()
}else{
this.getStaffOrderList()
}
}, 1500)
})
})
@ -402,7 +414,11 @@
this.select.status = this.statusList[idx].id
this.list = []
this.select.page = 1
this.getOrderList()
if(this.loginRole === 'nurse'){
this.getOrderList()
}else{
this.getStaffOrderList()
}
},
async getOrderList() {
try {
@ -471,7 +487,11 @@
}
this.loadStatus = 'loading'
this.select.page++
this.getOrderList()
if(this.loginRole === 'nurse'){
this.getOrderList()
}else{
this.getStaffOrderList()
}
},
}
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1 +0,0 @@
{"version":3,"sources":["uni-app:///main.js"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page"],"mappings":";;;;;;;;;;;;;AAAA;AAGA;AACA;AAHA;AACAA,EAAE,CAACC,iCAAiC,GAAGC,mBAAmB;AAG1DC,UAAU,CAACC,kBAAI,CAAC,C","file":"package_sub/pages/editOrder/editOrder.js","sourcesContent":["import 'uni-pages';\n// @ts-ignore\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './package_sub/pages/editOrder/editOrder.vue'\ncreatePage(Page)"],"sourceRoot":""}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1 +0,0 @@
{"version":3,"sources":["uni-app:///main.js"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page"],"mappings":";;;;;;;;;;;;;AAAA;AAGA;AACA;AAHA;AACAA,EAAE,CAACC,iCAAiC,GAAGC,mBAAmB;AAG1DC,UAAU,CAACC,cAAI,CAAC,C","file":"pages/nurse/index.js","sourcesContent":["import 'uni-pages';\n// @ts-ignore\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './pages/nurse/index.vue'\ncreatePage(Page)"],"sourceRoot":""}

@ -1 +0,0 @@
{"version":3,"sources":["uni-app:///main.js"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page"],"mappings":";;;;;;;;;;;;;AAAA;AAGA;AACA;AAHA;AACAA,EAAE,CAACC,iCAAiC,GAAGC,mBAAmB;AAG1DC,UAAU,CAACC,cAAI,CAAC,C","file":"pages/staff/index.js","sourcesContent":["import 'uni-pages';\n// @ts-ignore\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './pages/staff/index.vue'\ncreatePage(Page)"],"sourceRoot":""}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -8,6 +8,7 @@
"u-radio-group": "/uview-ui/components/u-radio-group/u-radio-group",
"u-radio": "/uview-ui/components/u-radio/u-radio",
"u-upload": "/uview-ui/components/u-upload/u-upload",
"u-qrcode": "/uni_modules/Sansnn-uQRCode/components/uqrcode/uqrcode",
"u-button": "/uview-ui/components/u-button/u-button",
"u-popup": "/uview-ui/components/u-popup/u-popup",
"u-select": "/uview-ui/components/u-select/u-select",

File diff suppressed because one or more lines are too long

@ -468,6 +468,9 @@
background: #fff;
padding: 20rpx;
box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.1);
display: flex;
align-items: center;
justify-content: center;
}
.qrcode-section .qrcode-wrapper .qrcode-image.data-v-6614d6de {
width: 100%;

File diff suppressed because one or more lines are too long

@ -1,7 +0,0 @@
{
"description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
"projectname": "医康养-护工端",
"setting": {
"compileHotReLoad": true
}
}
Loading…
Cancel
Save