diff --git a/pages/cate/cate.vue b/pages/cate/cate.vue index 3dc2361..6576d6f 100644 --- a/pages/cate/cate.vue +++ b/pages/cate/cate.vue @@ -37,7 +37,8 @@ - {{item.is_otc=='0'?'处方药':'非处方药'}} + {{item.is_otc=='0'?'处方药':'非处方药'}} + diff --git a/subPackages/chat/chat.vue b/subPackages/chat/chat.vue index f72a792..059db12 100644 --- a/subPackages/chat/chat.vue +++ b/subPackages/chat/chat.vue @@ -117,6 +117,9 @@ 预约挂号 + + {{ getRegisterStatusText(getParsedContent(msg.message_type, msg.message_content).status) }} + @@ -299,6 +302,9 @@ 预约挂号 + + {{ getRegisterStatusText(getParsedContent(msg.message_type, msg.message_content).status) }} + diff --git a/subPackages/product/product.vue b/subPackages/product/product.vue index 4b0c438..2e2e451 100644 --- a/subPackages/product/product.vue +++ b/subPackages/product/product.vue @@ -27,7 +27,7 @@ {{ item.drug ? item.drug.drug_name : '' }} - + 保健食品 - + {{ productDetail.is_otc === 0 ? 'Rx 处方药' : 'OTC 非处方药' }} diff --git a/utils/utils.js b/utils/utils.js index d0b9d95..62c7394 100644 --- a/utils/utils.js +++ b/utils/utils.js @@ -6,8 +6,8 @@ export function checkDev(key = '') { // 判断某些模块是否开启 switch (key) { case 'dev': - // return false; - return true; + return false; + // return true; case 'open-im': // return false; return true; diff --git a/utils/ws/websocket.js b/utils/ws/websocket.js index b79ec60..caa70cb 100644 --- a/utils/ws/websocket.js +++ b/utils/ws/websocket.js @@ -1,3 +1,5 @@ +import {checkDev} from "@/utils/utils"; + export class WebSocketManager { constructor(url) { this.url = url; @@ -259,5 +261,6 @@ export class WebSocketManager { } // 全局WebSocket实例 -export const webSocketManager = new WebSocketManager('ws://127.0.0.1:12080/ws'); -// export const webSocketManager = new WebSocketManager('wss://api.ws.g.xiaokang88.com/ws'); \ No newline at end of file +// export const webSocketManager = new WebSocketManager('ws://127.0.0.1:12080/ws'); +const wsUrl = checkDev('dev')? 'ws://127.0.0.1:12080/ws':'wss://api.ws.g.xiaokang88.com/ws'; +export const webSocketManager = new WebSocketManager(wsUrl); \ No newline at end of file