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: {