From fc777ef92d71985104966b370e7c6ab79392643b Mon Sep 17 00:00:00 2001
From: white <1293616053@qq.com>
Date: Fri, 27 Sep 2024 16:14:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/cankao/cankao.vue | 14 +-
components/echarts-data/echarts-data.vue | 15 +-
hybrid/html/ai.html | 9 +-
pages/index/index.vue | 35 ++
uni_modules/x-skeleton/changelog.md | 11 +
.../x-skeleton/x-skeleton-configs.js | 147 ++++++++
.../components/x-skeleton/x-skeleton.vue | 324 ++++++++++++++++++
uni_modules/x-skeleton/package.json | 84 +++++
uni_modules/x-skeleton/readme.md | 93 +++++
9 files changed, 719 insertions(+), 13 deletions(-)
create mode 100644 uni_modules/x-skeleton/changelog.md
create mode 100644 uni_modules/x-skeleton/components/x-skeleton/x-skeleton-configs.js
create mode 100644 uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue
create mode 100644 uni_modules/x-skeleton/package.json
create mode 100644 uni_modules/x-skeleton/readme.md
diff --git a/components/cankao/cankao.vue b/components/cankao/cankao.vue
index 68d8ca0..5473540 100644
--- a/components/cankao/cankao.vue
+++ b/components/cankao/cankao.vue
@@ -149,13 +149,13 @@
.xnz{
width: 8rpx;
height: 20rpx;
- background-color: #fff;
- border-left: 1rpx solid black;
- border-right: 1rpx solid black;
- position: absolute;
- right: 50rpx;
- top: 19rpx;
- transform: rotate(15deg);
+ // background-color: #fff;
+ // border-left: 1rpx solid black;
+ // border-right: 1rpx solid black;
+ // position: absolute;
+ // right: 50rpx;
+ // top: 19rpx;
+ // transform: rotate(15deg);
}
.zzt-body{
height: 10rpx;
diff --git a/components/echarts-data/echarts-data.vue b/components/echarts-data/echarts-data.vue
index f766081..4600859 100644
--- a/components/echarts-data/echarts-data.vue
+++ b/components/echarts-data/echarts-data.vue
@@ -17,7 +17,9 @@
-
+
+
+
@@ -179,7 +181,7 @@ import { mapGetters } from "vuex";
name:'血脂概况',
tb_head:[
'',
- '范围',
+ '单日测量范围',
'平均值'
],
data:[
@@ -248,7 +250,7 @@ import { mapGetters } from "vuex";
0.00,
-0.04
],
- max:1.5
+ max:3
},
{
name:'低密度脂蛋白',
@@ -1142,4 +1144,11 @@ import { mapGetters } from "vuex";
width: 80%;
padding: 0rpx 20rpx;
}
+
+.charts {
+ margin: 0rpx 100rpx;
+ border: 1rpx solid gray;
+ border-radius: 20px;
+ padding: 20px 0px;
+}
\ No newline at end of file
diff --git a/hybrid/html/ai.html b/hybrid/html/ai.html
index 195dbc1..acaa603 100755
--- a/hybrid/html/ai.html
+++ b/hybrid/html/ai.html
@@ -39,7 +39,7 @@
@@ -246,6 +246,7 @@
// 文本输入框
+ const statusTxt = document.querySelector('#status-txt');
const voiceTxt = document.querySelector('#voice-txt');
// 防止多次请求
@@ -280,8 +281,8 @@
onTextChange: function (text) {
// 监听识别结果的变化
- console.log(text, '监听')
voiceTxt.value = text;
+ statusTxt.value = '正在听…';
// 3秒钟内没有说话,就自动关闭
if (text) {
@@ -471,6 +472,8 @@
isCallbackExecuted = true;
return
}
+
+ statusTxt.value = '';
}, 3000);
}
}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 9c645c6..7eba577 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,5 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -83,6 +96,17 @@
pageData: {
type: ''
+ },
+
+ loading: true,
+ customConfigs: {
+ padding: '30rpx', //内边距
+ gridRows: 2, //行数
+ gridColumns: 1, //列数
+ headShow: true, //head是否展示
+ headWidth: '100%', //head宽度,支持百分比
+ headHeight: '100vh', //head高度
+ headBorderRadius: '12rpx', //head圆角,支持百分比
}
}
},
@@ -161,6 +185,7 @@
this.dataListsNew.bloodLiquidAll.type = 'bloodLiquidAll';
this.urlLink = `/hybrid/html/ai.html?data=${JSON.stringify(this.dataListsNew)}&user=${JSON.stringify(this.getUserInfo)}&token=${store.getters['api/getApiToken']}&deviceId=${this.getActiceDevice.device_id}`;
+ this.loading = false;
}
);
@@ -240,6 +265,16 @@
\ No newline at end of file
diff --git a/uni_modules/x-skeleton/package.json b/uni_modules/x-skeleton/package.json
new file mode 100644
index 0000000..7912e90
--- /dev/null
+++ b/uni_modules/x-skeleton/package.json
@@ -0,0 +1,84 @@
+{
+ "id": "x-skeleton",
+ "displayName": "skeleton骨架屏(可任意配置-易用-灵活-动画)",
+ "version": "1.0.4",
+ "description": "x-skeleton骨架屏可随意配置内容,扩展性强,简单易用,内含常用的骨架类型",
+ "keywords": [
+ "skeleton",
+ "骨架屏",
+ "加载效果",
+ "vue",
+ "微信小程序"
+],
+ "repository": "",
+"engines": {
+ },
+ "dcloudext": {
+ "type": "component-vue",
+ "sale": {
+ "regular": {
+ "price": "0.00"
+ },
+ "sourcecode": {
+ "price": "0.00"
+ }
+ },
+ "contact": {
+ "qq": ""
+ },
+ "declaration": {
+ "ads": "无",
+ "data": "插件不采集任何数据",
+ "permissions": "无"
+ },
+ "npmurl": ""
+ },
+ "uni_modules": {
+ "dependencies": [],
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "y",
+ "aliyun": "y"
+ },
+ "client": {
+ "Vue": {
+ "vue2": "y",
+ "vue3": "u"
+ },
+ "App": {
+ "app-vue": "u",
+ "app-nvue": "u"
+ },
+ "H5-mobile": {
+ "Safari": "u",
+ "Android Browser": "u",
+ "微信浏览器(Android)": "u",
+ "QQ浏览器(Android)": "u"
+ },
+ "H5-pc": {
+ "Chrome": "y",
+ "IE": "y",
+ "Edge": "y",
+ "Firefox": "y",
+ "Safari": "u"
+ },
+ "小程序": {
+ "微信": "y",
+ "阿里": "u",
+ "百度": "u",
+ "字节跳动": "u",
+ "QQ": "u",
+ "钉钉": "u",
+ "快手": "u",
+ "飞书": "u",
+ "京东": "u"
+ },
+ "快应用": {
+ "华为": "u",
+ "联盟": "u"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/x-skeleton/readme.md b/uni_modules/x-skeleton/readme.md
new file mode 100644
index 0000000..74726ab
--- /dev/null
+++ b/uni_modules/x-skeleton/readme.md
@@ -0,0 +1,93 @@
+# x-skeleton
+
+# 功能介绍
+- 支持 H5、微信小程序,其他端未测试过
+- 使用简单、灵活,高度自定义
+- 加载时支持动画
+- 消失时加了动画,不再生硬切换页面
+- 支持绝大部分常用场景:
+1、轮播图
+2、个人信息
+3、段落
+4、菜单
+5、列表
+6、瀑布流
+7、自定义...
+
+# 属性说明
+
+| 参数 | 说明 | 类型 | 默认值 | 可选值 |
+| ------- | --------------------------------------------------- | ------- | ------ | --- |
+| type | 骨架类型,为空时是完全自定义 | String | - |banner轮播图、info个人信息、text段落、menu菜单、list列表、waterfall瀑布流|
+| loading | 是否显示骨架占位图,设置为false将会展示子组件内容 | Boolean | true |true、false|
+| animate | 是否开启动画效果 | Boolean | true |true、false|
+| animateTime | 动画效果持续时间,单位秒 | Number \| String | 1.8 |-|
+| fadeOut | 是否开启淡出动画 | Boolean | true |true、false|
+| fadeOutTime | 淡出效果持续时间,单位秒 | Number \| String | 0.5 |-|
+| bgColor | 骨架的背景色 | String | #EAEDF5 |-|
+| highlightBgColor | 骨架的动画高亮背景色 | String | #F9FAFF |-|
+| configs | 自定义配置,具体看下方 | Object | {} |-|
+
+## configs参数说明
+
+| 参数 | 说明 | 类型 |
+| ------- | --------------------------------------------------- | ------- |
+| padding | 骨架内边距,同 css 的 padding | String |
+| gridRows | 行数 | Number |
+| gridColumns | 列数 | Number |
+| gridRowsGap | 行间隔 | String |
+| gridColumnsGap | 竖间距 | String |
+| itemDirection | head与text之间的排列方向(row、column) | String |
+| itemGap | head与text之间的间隔 | String |
+| itemAlign | head与text之间的纵轴对齐方式,同 flex 的align-items(center、flex-start、flex-end等) | String |
+| headShow | head是否展示 | Boolean |
+| headWidth | head宽度,支持百分比 | String |
+| headHeight | head高度 | String |
+| headBorderRadius | head圆角,支持百分比 | String |
+| textShow | text是否展示 | Boolean |
+| textRows | text的行数 | Number |
+| textRowsGap | text间距 | String |
+| textWidth | text的宽度,可以为百分比,数值,带单位字符串等,可通过数组传入指定每个段落行的宽度 | String \| Array \| Number |
+| textHeight | text的高度,可以为数值,带单位字符串等,可通过数组传入指定每个段落行的高度 | String \| Array \| Number |
+| textBorderRadius | text的圆角,支持百分比 | String |
+
+大部分情况下,直接指定相应的 type 已经够用了,如果大家想进行样式的微调、完全自定义可通过设置 configs 来实现。
+
+简单解释一下这些参数(右边有结构布局图示):
+
+布局总共分成 4 块,分别是 grid、item、head、text。
+
+1、grid:包含 item,指定每一行有多少个 item,每一列有多少个 item
+
+2、item:包含 head、text,可设置他们之间的排列方式、间距
+
+3、head:一个 item 只有一个 head,可设置宽高、圆角
+
+4、text:一个 item 可以有多行 text,可分别设置宽高、圆角、间距
+
+
+
+# 使用示例
+
+```html
+
+ 我是轮播图
+
+```
+
+```js
+export default {
+ data() {
+ return {
+ loading: true,
+ }
+ },
+ onLoad() {
+ setTimeout(() => {
+ this.loading = false;
+ }, 2000);
+ },
+}
+```
+
+更多用法请下载查看示例代码,有问题可以留言
\ No newline at end of file