diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..cf04042 --- /dev/null +++ b/.npmrc @@ -0,0 +1,2 @@ +shamefully-hoist=true +strict-peer-dependencies=false diff --git a/src/config.js b/src/config.js index 95a0d70..e7b0a12 100644 --- a/src/config.js +++ b/src/config.js @@ -1,6 +1,6 @@ // 应用全局配置 const config = { - baseUrl: 'https://qdintc.com//prod-api', + baseUrl: 'https://www.qdintc.com/prod-api', // baseUrl: 'http://localhost:8080', //cloud后台网关地址 // baseUrl: 'http://192.168.10.3:8080', @@ -11,7 +11,7 @@ const config = { // 应用版本 version: "1.1.0", // 应用logo - logo: "/static/logo.jpg", + logo: "/static/logo.png", // 官方网站 site_url: "https://www.qdintc.com", // 政策协议 diff --git a/src/directive/common/copyText.js b/src/directive/common/copyText.js index 7063df8..e07902c 100644 --- a/src/directive/common/copyText.js +++ b/src/directive/common/copyText.js @@ -22,6 +22,7 @@ export default { } function copyTextToClipboard(input, { target = document.body } = {}) { + // #ifdef H5 const element = document.createElement('textarea'); const previouslyFocusedElement = document.activeElement; @@ -63,4 +64,18 @@ function copyTextToClipboard(input, { target = document.body } = {}) { } return isSuccess; + // #endif + + // #ifndef H5 + // 使用 uni-app 的剪贴板 API + uni.setClipboardData({ + data: input, + success: function () { + return true; + }, + fail: function () { + return false; + } + }); + // #endif } diff --git a/src/manifest.json b/src/manifest.json index c10545e..4dc4a3f 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -52,9 +52,14 @@ "mp-weixin" : { "appid" : "", "setting" : { - "urlCheck" : false + "urlCheck" : false, + "es6" : true, + "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "optimization" : { + "subPackages" : true + } }, "mp-alipay" : { "usingComponents" : true diff --git a/src/pages/assets/completionTickets.png b/src/pages/assets/completionTickets.png deleted file mode 100644 index a6f34bf..0000000 Binary files a/src/pages/assets/completionTickets.png and /dev/null differ diff --git a/src/pages/assets/completionTime.png b/src/pages/assets/completionTime.png deleted file mode 100644 index 8a1114f..0000000 Binary files a/src/pages/assets/completionTime.png and /dev/null differ diff --git a/src/pages/assets/four.png b/src/pages/assets/four.png deleted file mode 100644 index a12edd7..0000000 Binary files a/src/pages/assets/four.png and /dev/null differ diff --git a/src/pages/assets/one.png b/src/pages/assets/one.png deleted file mode 100644 index 78d2c2b..0000000 Binary files a/src/pages/assets/one.png and /dev/null differ diff --git a/src/pages/assets/positiveRating.png b/src/pages/assets/positiveRating.png deleted file mode 100644 index f4103ec..0000000 Binary files a/src/pages/assets/positiveRating.png and /dev/null differ diff --git a/src/pages/assets/three.png b/src/pages/assets/three.png deleted file mode 100644 index d1e8225..0000000 Binary files a/src/pages/assets/three.png and /dev/null differ diff --git a/src/pages/assets/ticketSum.png b/src/pages/assets/ticketSum.png deleted file mode 100644 index fc1246c..0000000 Binary files a/src/pages/assets/ticketSum.png and /dev/null differ diff --git a/src/pages/assets/two.png b/src/pages/assets/two.png deleted file mode 100644 index 0f474ce..0000000 Binary files a/src/pages/assets/two.png and /dev/null differ diff --git a/src/pages/common/agreement/index.vue b/src/pages/common/agreement/index.vue new file mode 100644 index 0000000..745ce11 --- /dev/null +++ b/src/pages/common/agreement/index.vue @@ -0,0 +1,135 @@ + + + + + diff --git a/src/pages/common/privacy/index.vue b/src/pages/common/privacy/index.vue new file mode 100644 index 0000000..3626013 --- /dev/null +++ b/src/pages/common/privacy/index.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/src/pages/health/activity/addEdit.vue b/src/pages/health/activity/addEdit.vue index b0df681..54ddf47 100644 --- a/src/pages/health/activity/addEdit.vue +++ b/src/pages/health/activity/addEdit.vue @@ -1,11 +1,5 @@ - + - + - + - + diff --git a/src/pages/health/activity/list.vue b/src/pages/health/activity/list.vue index 078f86b..41c2922 100644 --- a/src/pages/health/activity/list.vue +++ b/src/pages/health/activity/list.vue @@ -2,8 +2,17 @@ - + @@ -249,17 +258,43 @@ page { position: relative; z-index: 100; box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05); + gap: 24rpx; .search-input { background: rgba(102, 126, 234, 0.08); color: #333333; flex: 1; - margin-right: 16rpx; + margin-right: 0; border-radius: 24rpx; border: 2rpx solid rgba(102, 126, 234, 0.3); height: 66rpx !important; display: flex; align-items: center; + + /* H5端placeholder样式 */ + :deep(input::placeholder) { + color: #909399 !important; + font-size: 14px !important; + } + + :deep(input::-webkit-input-placeholder) { + color: #909399 !important; + font-size: 14px !important; + } + + :deep(input::-moz-placeholder) { + color: #909399 !important; + font-size: 14px !important; + } + + /* 输入文字颜色 */ + :deep(.u-input__content__field-wrapper__field) { + color: #333333 !important; + } + + :deep(input) { + color: #333333 !important; + } } .add-btn { diff --git a/src/pages/health/doctorRecord/addEdit.vue b/src/pages/health/doctorRecord/addEdit.vue index 1b6a8aa..e7a4fd2 100644 --- a/src/pages/health/doctorRecord/addEdit.vue +++ b/src/pages/health/doctorRecord/addEdit.vue @@ -1,11 +1,5 @@ - + - + - + - + diff --git a/src/pages/health/doctorRecord/list.vue b/src/pages/health/doctorRecord/list.vue index 9a7cc67..a7cd0ed 100644 --- a/src/pages/health/doctorRecord/list.vue +++ b/src/pages/health/doctorRecord/list.vue @@ -3,18 +3,50 @@ - - + + + + + + 新增 - - + + + + + + 筛选 @@ -445,7 +477,7 @@ page { display: flex; justify-content: space-between; align-items: center; - gap: 16rpx; + gap: 10rpx; &:first-child { padding-bottom: 8rpx; @@ -455,15 +487,54 @@ page { padding-top: 8rpx; } + .search-input-wrapper { + flex: 1; + display: flex; + align-items: center; + position: relative; + + .search-icon { + position: absolute; + right: 20rpx; + z-index: 10; + cursor: pointer; + } + } + .search-input { background: rgba(102, 126, 234, 0.08); color: #333333; - flex: 1; + width: 100%; border-radius: 24rpx; border: 2rpx solid rgba(102, 126, 234, 0.3); height: 66rpx !important; display: flex; align-items: center; + + /* H5端placeholder样式 */ + :deep(input::placeholder) { + color: #909399 !important; + font-size: 14px !important; + } + + :deep(input::-webkit-input-placeholder) { + color: #909399 !important; + font-size: 14px !important; + } + + :deep(input::-moz-placeholder) { + color: #909399 !important; + font-size: 14px !important; + } + + /* 输入文字颜色 */ + :deep(.u-input__content__field-wrapper__field) { + color: #333333 !important; + } + + :deep(input) { + color: #333333 !important; + } } .filter-btn, diff --git a/src/pages/health/healthRecord/addEdit.vue b/src/pages/health/healthRecord/addEdit.vue index a69d71d..2505284 100644 --- a/src/pages/health/healthRecord/addEdit.vue +++ b/src/pages/health/healthRecord/addEdit.vue @@ -1,11 +1,5 @@