From ba2a601505743a4f3a1eed1614a844588ca02f47 Mon Sep 17 00:00:00 2001 From: lq Date: Wed, 27 Aug 2025 08:07:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E8=A7=A3=E5=86=B3oss=E7=AD=BE=E5=90=8D?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=A5=BF=E8=8D=AF=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/js/index.js | 1 + manifest.json | 3 ++- pages/login/index.vue | 3 ++- pages/my/prescriptionDetail.vue | 18 +++++++++++------- subPackages/sub_pharmacist/myrecord-detail.vue | 16 ++++++++++------ .../sub_workbench/workbench_recipe/index.vue | 8 ++++---- 6 files changed, 30 insertions(+), 19 deletions(-) diff --git a/common/js/index.js b/common/js/index.js index 6a0edf5..d7b01c8 100644 --- a/common/js/index.js +++ b/common/js/index.js @@ -2,6 +2,7 @@ import Request from './request.js'; import errorCode from './errorCode.js'; import {Base64} from "js-base64"; let baseUrl = 'https://app.xiaokang88.com/service/v1/'; // 域名 +// let baseUrl = 'http://127.0.0.1:18000/service/v1/'; // 域名 // let baseUrl = 'http://www.xk888.com/service/v1/'; // 域名 export const config = { baseUrl: baseUrl diff --git a/manifest.json b/manifest.json index f360ed0..1c1c04a 100644 --- a/manifest.json +++ b/manifest.json @@ -76,5 +76,6 @@ "uniStatistics" : { "enable" : false }, - "vueVersion" : "2" + "vueVersion" : "2", + "sassImplementationName": "node-sass" } diff --git a/pages/login/index.vue b/pages/login/index.vue index 8258978..5939634 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -140,7 +140,8 @@ loginOrRe(data).then(res => { if (res.errcode != -1) { - this.$toast(res.data[0]) + this.$toast('登录成功') + // this.$toast(res.data[0]) uni.setStorageSync('token', res.data['token']) // console.log(res); uni.setStorageSync('identity', res.data['ServiceUser']['role']) diff --git a/pages/my/prescriptionDetail.vue b/pages/my/prescriptionDetail.vue index d1379a8..b49384c 100644 --- a/pages/my/prescriptionDetail.vue +++ b/pages/my/prescriptionDetail.vue @@ -155,25 +155,25 @@ 医师 - - + + 审核药师 - + 发药人 - + 核对人 - + 调配人 - + @@ -215,7 +215,7 @@ 7: '已初审' }, // status:flase, - status: true, + // status: true, // status: "", // 处方状态 status: "", // 处方状态 id: "", @@ -260,6 +260,10 @@ }, 1500) }) }, + checkImageUrl(url) { + // 如果url包含http，则返回url，反之加上 data:image/jpeg;base64, + return url.includes('http') ? url : 'data:image/jpeg;base64,' + url + }, // 数量 getnum(obj) { let list = obj diff --git a/subPackages/sub_pharmacist/myrecord-detail.vue b/subPackages/sub_pharmacist/myrecord-detail.vue index f5552c1..ffb8d84 100644 --- a/subPackages/sub_pharmacist/myrecord-detail.vue +++ b/subPackages/sub_pharmacist/myrecord-detail.vue @@ -155,25 +155,25 @@ 医师 - - + + 审核药师 - + 发药人 - + 核对人 - + 调配人 - + @@ -295,6 +295,10 @@ this.is_reject = true; this.isshow = true }, + checkImageUrl(url) { + // 如果url包含http，则返回url，反之加上 data:image/jpeg;base64, + return url.includes('http') ? url : 'data:image/jpeg;base64,' + url + }, confirm() { getPassed({ prescription_no: this.prescription_no, diff --git a/subPackages/sub_workbench/workbench_recipe/index.vue b/subPackages/sub_workbench/workbench_recipe/index.vue index 9dbff41..dc30d84 100644 --- a/subPackages/sub_workbench/workbench_recipe/index.vue +++ b/subPackages/sub_workbench/workbench_recipe/index.vue @@ -463,7 +463,7 @@ // }, // ], tabs: [{ - name: '西（中成）药' + name: '西药' }, { name: '中药饮片' @@ -471,9 +471,9 @@ { name: '产品服务包' }, - { - name: '保健食品' - }, + // { + // name: '保健食品' + // }, ], tabsActive: 0, tabsBtnStyle: {