From ca34793579268bf2308ada87f8f5d1d40f74b7ce Mon Sep 17 00:00:00 2001 From: haomingming Date: Tue, 16 May 2023 14:06:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pages/login/index.js | 6 ++++++ Pages/login/index.wxml | 13 ++++++++----- Pages/login/index.wxss | 4 +++- Pages/mobile_login/index.js | 6 ++++++ Pages/mobile_login/index.wxml | 15 +++++++++------ Pages/mobile_login/index.wxss | 3 +++ Pages/yishi/case/index.wxss | 2 +- Pages/yishi/cashrecord/index.wxss | 1 + Pages/yishi/identity/index.wxml | 10 +++++----- Pages/yishi/identity/index.wxss | 2 +- Pages/yishi/kuaisusetup/index.wxml | 2 +- Pages/yishi/kuaisusetup/index.wxss | 4 ++-- Pages/yishi/my/index.wxml | 10 +++++----- Pages/yishi/myprofile/index.wxss | 2 +- Pages/yishi/onlinechufang/index.wxml | 4 ++-- Pages/yishi/onlinechufang/index.wxss | 2 +- Pages/yishi/onlinesetup/index.wxml | 2 +- Pages/yishi/onlinesetup/index.wxss | 2 +- Pages/yishi/practicing/index.wxss | 2 +- Pages/yishi/wenzhen_v2/wenzhen.js | 6 +++--- Pages/yishi/wenzhen_v3/wenzhen.js | 6 +++--- Pages/yishi/yizhensetup/index.wxml | 2 +- Pages/yishi/yizhensetup/index.wxss | 2 +- Pages/yishi/zhiye_identity/index.wxss | 3 ++- .../MessageElements/TextMessage/index.wxss | 4 ++-- app.js | 11 ++++++----- commpents/myprofile/index.wxss | 4 ++-- commpents/textarea-cell/index.wxss | 3 ++- commpents/upload-cell/index.wxss | 3 ++- .../tdesign-miniprogram/cell/cell.wxss | 2 +- utils/network/api.js | 6 ++++++ utils/network/config.js | 9 ++++++--- utils/network/request.js | 4 ++-- 33 files changed, 97 insertions(+), 60 deletions(-) diff --git a/Pages/login/index.js b/Pages/login/index.js index 13f8462..bb3c5ed 100644 --- a/Pages/login/index.js +++ b/Pages/login/index.js @@ -24,6 +24,12 @@ Page({ checked: event.detail, }); }, + changeCheck(){ + let checked = this.data.checked + this.setData({ + checked: !checked + }) + }, _navback() { wx.navigateBack() }, diff --git a/Pages/login/index.wxml b/Pages/login/index.wxml index 06d5806..6c59b17 100644 --- a/Pages/login/index.wxml +++ b/Pages/login/index.wxml @@ -24,11 +24,14 @@ bindtap="getPhoneNumber" color="#09BB07" custom-style="font-size: 36rpx;" type="primary" round block>微信授权手机号登录 - - 我已阅读并同意协议 - 《肝胆相照用户注册及服务协议》 - 《隐私协议》 - 《劳务协议》 + + + + 我已阅读并同意协议 + 《肝胆相照用户注册及服务协议》 + 《隐私协议》 + 《劳务协议》 + diff --git a/Pages/login/index.wxss b/Pages/login/index.wxss index 3a3756a..c8166dc 100644 --- a/Pages/login/index.wxss +++ b/Pages/login/index.wxss @@ -75,5 +75,7 @@ color: #333333; margin-bottom: 60rpx; } - +.van-checkbox { + padding-top: 6rpx !important; +} diff --git a/Pages/mobile_login/index.js b/Pages/mobile_login/index.js index 412cf1d..53f1ed0 100644 --- a/Pages/mobile_login/index.js +++ b/Pages/mobile_login/index.js @@ -29,6 +29,12 @@ Page({ checked: event.detail, }); }, + changeCheck(){ + let checked = this.data.checked + this.setData({ + checked: !checked + }) + }, phone_change(e){ let phone = e.detail.value; this.setData({ diff --git a/Pages/mobile_login/index.wxml b/Pages/mobile_login/index.wxml index 0e2b427..2b15655 100644 --- a/Pages/mobile_login/index.wxml +++ b/Pages/mobile_login/index.wxml @@ -27,12 +27,15 @@ 登录 - - 我已阅读并同意协议 - 《肝胆相照用户注册及服务协议》 - 《隐私协议》 - 《劳务协议》 - + + + + 我已阅读并同意协议 + 《肝胆相照用户注册及服务协议》 + 《隐私协议》 + 《劳务协议》 + + \ No newline at end of file diff --git a/Pages/mobile_login/index.wxss b/Pages/mobile_login/index.wxss index 5f9ba0d..162f63f 100644 --- a/Pages/mobile_login/index.wxss +++ b/Pages/mobile_login/index.wxss @@ -50,4 +50,7 @@ border-bottom-width: 1px; border-bottom-style: solid; border-bottom-color: rgb(235, 237, 240); +} +.van-checkbox { + padding-top: 6rpx !important; } \ No newline at end of file diff --git a/Pages/yishi/case/index.wxss b/Pages/yishi/case/index.wxss index 44931d5..3c28708 100644 --- a/Pages/yishi/case/index.wxss +++ b/Pages/yishi/case/index.wxss @@ -6,7 +6,7 @@ page{ padding: 0 4vw; } .main_title{ - font-size: 30rpx; + font-size: 16px; color: #000000; margin: 30rpx 0; } diff --git a/Pages/yishi/cashrecord/index.wxss b/Pages/yishi/cashrecord/index.wxss index 5f863aa..cd48aeb 100644 --- a/Pages/yishi/cashrecord/index.wxss +++ b/Pages/yishi/cashrecord/index.wxss @@ -93,6 +93,7 @@ page{ justify-content: flex-end; margin-right: 20rpx; color: #666; + font-size: 32rpx; } .t-picker__confirm{ color: #3CC7C0 !important; diff --git a/Pages/yishi/identity/index.wxml b/Pages/yishi/identity/index.wxml index e75409e..880bb2b 100644 --- a/Pages/yishi/identity/index.wxml +++ b/Pages/yishi/identity/index.wxml @@ -22,15 +22,14 @@ 真实姓名 * @@ -42,7 +41,8 @@ placeholder-style="font-size:28rpx; color: #C5C8CB;" input-align="right" clearable - custom-style="font-size:30rpx;" + size="large" + custom-style="font-size:16px;" disabled="{{next_btn_disabled}}" > 身份证号 * diff --git a/Pages/yishi/identity/index.wxss b/Pages/yishi/identity/index.wxss index 4062958..add0acc 100644 --- a/Pages/yishi/identity/index.wxss +++ b/Pages/yishi/identity/index.wxss @@ -71,7 +71,7 @@ letter-spacing: 2rpx; } .t-cell__title-text{ - font-size: 32rpx !important; + font-size: 16px !important; } .t-input__wrap--suffix-icon{ padding-left: var(--td-spacer-1, 8rpx) !important; diff --git a/Pages/yishi/kuaisusetup/index.wxml b/Pages/yishi/kuaisusetup/index.wxml index f616403..6eb075e 100644 --- a/Pages/yishi/kuaisusetup/index.wxml +++ b/Pages/yishi/kuaisusetup/index.wxml @@ -24,7 +24,7 @@ 价格设置 - 问诊单价（元） + 问诊单价 元 diff --git a/Pages/yishi/kuaisusetup/index.wxss b/Pages/yishi/kuaisusetup/index.wxss index 83437f4..968391c 100644 --- a/Pages/yishi/kuaisusetup/index.wxss +++ b/Pages/yishi/kuaisusetup/index.wxss @@ -38,7 +38,7 @@ page{ } .switch_box_item_name{ flex: 1; - font-size: 32rpx; + font-size: 16px; } .switch_box_item_btn{ flex: 1; @@ -80,7 +80,7 @@ page{ } .price_steup_box_top_title, .price_steup_box_bottom_title{ flex: 1; - font-size: 32rpx; + font-size: 16px; color: #333; } .price_steup_box_top::after{ diff --git a/Pages/yishi/my/index.wxml b/Pages/yishi/my/index.wxml index 119ec21..2b15b8f 100644 --- a/Pages/yishi/my/index.wxml +++ b/Pages/yishi/my/index.wxml @@ -48,10 +48,10 @@ - - - - - + + + + + \ No newline at end of file diff --git a/Pages/yishi/myprofile/index.wxss b/Pages/yishi/myprofile/index.wxss index 4ad7c06..dc3ba9f 100644 --- a/Pages/yishi/myprofile/index.wxss +++ b/Pages/yishi/myprofile/index.wxss @@ -1,5 +1,5 @@ .t-cell__note,.t-class-note,.note{ - font-size: 30rpx !important; + font-size: 16px !important; } .t-tabs__item--active{ color: #49B9AD !important; diff --git a/Pages/yishi/onlinechufang/index.wxml b/Pages/yishi/onlinechufang/index.wxml index 30858f6..649fa42 100644 --- a/Pages/yishi/onlinechufang/index.wxml +++ b/Pages/yishi/onlinechufang/index.wxml @@ -63,7 +63,7 @@
医嘱 - + @@ -241,7 +241,7 @@ custom-style="height: calc(100vh - {{height*2 + 20}}px);" bind:close="onZhenduanClose" > - 诊断 + 诊断 - + {{info.inquiry_price}}元 diff --git a/Pages/yishi/onlinesetup/index.wxss b/Pages/yishi/onlinesetup/index.wxss index bb62421..826b82a 100644 --- a/Pages/yishi/onlinesetup/index.wxss +++ b/Pages/yishi/onlinesetup/index.wxss @@ -39,7 +39,7 @@ page{ } .switch_box_item_name{ flex: 1; - font-size: 32rpx; + font-size: 16px; } .switch_box_item_btn{ flex: 1; diff --git a/Pages/yishi/practicing/index.wxss b/Pages/yishi/practicing/index.wxss index 6ab4ed9..306c8df 100644 --- a/Pages/yishi/practicing/index.wxss +++ b/Pages/yishi/practicing/index.wxss @@ -14,7 +14,7 @@ } .imgbox_title{ padding: 20rpx; - font-size: 30rpx; + font-size: 20px; } .imgbox_item{ position: relative; diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js index f292d24..d247dc7 100644 --- a/Pages/yishi/wenzhen_v2/wenzhen.js +++ b/Pages/yishi/wenzhen_v2/wenzhen.js @@ -55,9 +55,9 @@ Page({ // console.log("onNetworkStatusChange from wenzhen: ") // console.log(res.isConnected) // console.log(res.networkType) - wx.showToast({ - title: '网络类型'+res.networkType, - }) + // wx.showToast({ + // title: '网络类型'+res.networkType, + // }) }) }, diff --git a/Pages/yishi/wenzhen_v3/wenzhen.js b/Pages/yishi/wenzhen_v3/wenzhen.js index e87db45..126379e 100644 --- a/Pages/yishi/wenzhen_v3/wenzhen.js +++ b/Pages/yishi/wenzhen_v3/wenzhen.js @@ -55,9 +55,9 @@ Page({ console.log("onNetworkStatusChange from wenzhen: ") console.log(res.isConnected) console.log(res.networkType) - wx.showToast({ - title: '网络类型'+res.networkType, - }) + // wx.showToast({ + // title: '网络类型'+res.networkType, + // }) }) }, diff --git a/Pages/yishi/yizhensetup/index.wxml b/Pages/yishi/yizhensetup/index.wxml index b8acba0..ac224f8 100644 --- a/Pages/yishi/yizhensetup/index.wxml +++ b/Pages/yishi/yizhensetup/index.wxml @@ -34,7 +34,7 @@ diff --git a/Pages/yishi/yizhensetup/index.wxss b/Pages/yishi/yizhensetup/index.wxss index 8bfbb3a..5c845f9 100644 --- a/Pages/yishi/yizhensetup/index.wxss +++ b/Pages/yishi/yizhensetup/index.wxss @@ -38,7 +38,7 @@ page{ } .switch_box_item_name{ flex: 1; - font-size: 32rpx; + font-size: 16px; } .switch_box_item_btn{ flex: 1; diff --git a/Pages/yishi/zhiye_identity/index.wxss b/Pages/yishi/zhiye_identity/index.wxss index a433484..07fd1d8 100644 --- a/Pages/yishi/zhiye_identity/index.wxss +++ b/Pages/yishi/zhiye_identity/index.wxss @@ -27,7 +27,8 @@ margin: 0 auto; } .sign_title{ - font-size: 30rpx; + font-size: 16px; + color: #323233; } .sign_note{ margin: 20rpx 0; diff --git a/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxss b/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxss index b22385d..6695cd5 100644 --- a/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxss +++ b/TUIKit/components/TUIChat/components/MessageElements/TextMessage/index.wxss @@ -54,7 +54,7 @@ /*justify-content: flex-start;*/ flex-wrap: wrap; outline: none; - font-size: 28rpx; + font-size: 34rpx; color: #333333; position: relative; max-width: 60vw; @@ -65,7 +65,7 @@ color: #000000; letter-spacing: 0; line-height: 40rpx; - font-size: 28rpx; + /* font-size: 28rpx; */ word-wrap: break-word; word-break: break-all; } diff --git a/app.js b/app.js index cf33578..bd4f5f8 100644 --- a/app.js +++ b/app.js @@ -53,9 +53,9 @@ App({ // console.log("onNetworkStatusChange: ") // console.log(res.isConnected) // console.log(res.networkType) - wx.showToast({ - title: '网络类型'+res.networkType, - }) + // wx.showToast({ + // title: '网络类型'+res.networkType, + // }) }) wx.onNetworkWeakChange(function(res){ @@ -100,6 +100,7 @@ App({ wx.$chat_userID = this.globalData.config.userID; wx.$chat_SDKAppID = this.globalData.config.SDKAPPID; wx.$chat_userSig = userSig; + wx.$TUIKitTIM = TIM; console.log("TIM: ", wx.$TUIKitTIM) wx.$TUIKit.registerPlugin({ 'tim-upload-plugin': TIMUploadPlugin }); @@ -272,8 +273,8 @@ App({ jiesuan_dialog_show: false, config: { userID: "", - SDKAPPID: 1400796919, // Your SDKAppID - SECRETKEY: "a5bcd8c583181cf004e9d91a47687d719d4b5d2a10ce33fbee95d587889447d8", // Your secretKey + SDKAPPID: api.getIMappId(), // Your SDKAppID + SECRETKEY: api.getIMsecretkey(), // Your secretKey EXPIRETIME: 604800, }, app_inter: [] diff --git a/commpents/myprofile/index.wxss b/commpents/myprofile/index.wxss index 90d9957..20ae616 100644 --- a/commpents/myprofile/index.wxss +++ b/commpents/myprofile/index.wxss @@ -36,8 +36,8 @@ } .title{ - font-size: 32rpx; - color: #1C2023; + font-size: 16px; + color: #000000E6; } .right{ display: flex; diff --git a/commpents/textarea-cell/index.wxss b/commpents/textarea-cell/index.wxss index e21d928..e7c0253 100644 --- a/commpents/textarea-cell/index.wxss +++ b/commpents/textarea-cell/index.wxss @@ -42,7 +42,8 @@ left: 32rpx; } .textarea-cell-name{ - font-size: 30rpx; + font-size: 16px; + color: #000000E6; } .error_box{ position: relative; diff --git a/commpents/upload-cell/index.wxss b/commpents/upload-cell/index.wxss index bc772ad..ac55a8b 100644 --- a/commpents/upload-cell/index.wxss +++ b/commpents/upload-cell/index.wxss @@ -70,5 +70,6 @@ font-weight: 600; } .upload-cell-name{ - font-size: 30rpx; + font-size: 16px; + color: #000000E6; } \ No newline at end of file diff --git a/miniprogram_npm/tdesign-miniprogram/cell/cell.wxss b/miniprogram_npm/tdesign-miniprogram/cell/cell.wxss index b4e5ea5..47962de 100644 --- a/miniprogram_npm/tdesign-miniprogram/cell/cell.wxss +++ b/miniprogram_npm/tdesign-miniprogram/cell/cell.wxss @@ -79,7 +79,7 @@ } .t-cell__title-text { display: flex; - font-size: 32rpx; + font-size: 16px; font-weight: 400; } .t-cell__left, diff --git a/utils/network/api.js b/utils/network/api.js index ddd68b4..a209594 100644 --- a/utils/network/api.js +++ b/utils/network/api.js @@ -4,6 +4,12 @@ class API extends HTTP { getStaticHost(){ return `${this.staticHost}`; } + getIMappId(){ + return `${this.IMappId}`; + } + getIMsecretkey(){ + return `${this.IMsecretkey}`; + } //获取oss签名数据 getOssSign(params) { return this.request({ diff --git a/utils/network/config.js b/utils/network/config.js index 145061d..443937f 100644 --- a/utils/network/config.js +++ b/utils/network/config.js @@ -2,18 +2,21 @@ export const dev = { baseUrl: "https://dev.hospital.applets.igandanyiyuan.com", staticHost: "https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com",//静态资源host - appId: 'wxbdb4d63f81d98228' //此处为appId + IMappId: '1400798221', //此处为IM appId + IMsecretkey: 'fc45ab469ca632a700166973d87b3a6f56a855cb92d7cffb54e4d37135c097da' //此处为IM secretkey } // 测试环境url export const test = { baseUrl: "https://dev.hospital.applets.igandanyiyuan.com", staticHost: "https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com",//静态资源host - appId: 'wxbdb4d63f81d98228' //此处为appId + IMappId: '1400798221', //此处为此处为IM appId + IMsecretkey: 'fc45ab469ca632a700166973d87b3a6f56a855cb92d7cffb54e4d37135c097da' //此处为IM secretkey } // 线上环境url export const prod = { baseUrl: 'https://prod.hospital.applets.igandanyiyuan.com', staticHost: "https://oss.prod.applets.igandanyiyuan.com",//静态资源host - appId: 'wxbdb4d63f81d98228' //此处为appId + IMappId: '1400796919', //此处为此处为IM appId + IMsecretkey: 'a5bcd8c583181cf004e9d91a47687d719d4b5d2a10ce33fbee95d587889447d8' //此处为IM secretkey } diff --git a/utils/network/request.js b/utils/network/request.js index 8aaf6c3..06d49db 100644 --- a/utils/network/request.js +++ b/utils/network/request.js @@ -3,7 +3,8 @@ class HTTP { constructor() { this.baseUrl = env.baseUrl, this.staticHost = env.staticHost, - this.appId = env.appId + this.IMappId = env.IMappId, + this.IMsecretkey = env.IMsecretkey } request({ @@ -27,7 +28,6 @@ class HTTP { data: data, header: { 'content-type': contentType, - 'appId': this.appId, 'Authorization': "Bearer " + wx.getStorageSync('AUTH_TOKEN_'+usertype) }, success: (res) => {