diff --git a/src/pages.json b/src/pages.json
index f4051970..2d4f51ea 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1,4 +1,161 @@
{
+<<<<<<< HEAD
+ "pages": [
+ {
+ "path": "pages/index/index",
+ "style": {
+ "navigationBarTitleText": "首页",
+ "app-plus": {
+ "titleNView": false
+ }
+ }
+ },
+ {
+ "path": "pages/courseDetail/index",
+ "style": {
+ "navigationBarTitleText": "课程详情",
+ "app-plus": {
+ "titleNView": false
+ }
+ }
+ },
+ {
+ "path": "pages/study/index",
+ "style": {
+ "navigationBarTitleText": "学习",
+ "app-plus": {
+ "titleNView": false
+ }
+ }
+ },
+ {
+ "path": "pages/intelligentAnswering/index",
+ "style": {
+ "navigationBarTitleText": "智能问答",
+ "app-plus": {
+ "titleNView": false
+ }
+ }
+ },
+ {
+ "path": "pages/scene/index",
+ "style": {
+ "navigationBarTitleText": "场景",
+ "app-plus": {
+ "titleNView": false
+ }
+ }
+ },
+ {
+ "path": "pages/me/index",
+ "style": {
+ "navigationBarTitleText": "我的",
+ "app-plus": {
+ "titleNView": false
+ }
+ }
+ },
+ {
+ "path": "pages/login/login",
+ "style": {
+ "navigationBarTitleText": "登录",
+ "app-plus": {
+ "titleNView": false
+ }
+ }
+ },
+ {
+ "path": "pages/other/web_view",
+ "style": {
+ "navigationBarTitleText": "",
+ "app-plus": {
+ "titleNView": false
+ }
+ }
+ },
+ {
+ "path": "pages/login/ysxy",
+ "style": {
+ "navigationBarTitleText": "",
+ "app-plus": {
+ "titleNView": false
+ }
+ }
+ },
+ {
+ "path": "pages/search/search",
+ "style": {
+ "navigationBarTitleText": "",
+ "app-plus": {
+ "titleNView": false
+ }
+ }
+ },
+ {
+ "path": "pages/course/index",
+ "style": {
+ "navigationBarTitleText": "课程中心",
+ "app-plus": {
+ "titleNView": false
+ }
+ }
+ },
+ {
+ "path": "pages/course/study",
+ "style": {
+ "navigationBarTitleText": "课程学习",
+ "app-plus": {
+ "titleNView": false
+ }
+ }
+ }
+ ],
+ "tabBar": {
+ "list": [
+ {
+ "text": "首页",
+ "pagePath": "pages/index/index"
+ },
+ {
+ "text": "学习",
+ "pagePath": "pages/study/index"
+ },
+ {
+ "text": "场景",
+ "pagePath": "pages/scene/index"
+ },
+ {
+ "text": "我的",
+ "pagePath": "pages/me/index"
+ }
+ ],
+ "color": "#666666",
+ "selectedColor": "#0066FF",
+ "fontSize": "16px",
+ "borderStyle": "white",
+ "borderColor": "#ffffff",
+ "height": "70px",
+ "spacing": "10px",
+ "midButton": {
+ "iconPath": "/static/images/icon/fawn.png",
+ "width": "86px",
+ "height": "86px",
+ "iconWidth": "90px"
+ }
+ },
+ "globalStyle": {
+ "navigationBarTextStyle": "black",
+ "navigationBarTitleText": "AI智能培训",
+ "navigationBarBackgroundColor": "#F8F8F8",
+ "backgroundColor": "#F8F8F8",
+ "navigationStyle": "custom",
+ "app-plus": {
+ "titleView": false,
+ "bounce": "none"
+ }
+ },
+ "uniIdRouter": {}
+=======
"pages": [{
"path": "pages/index/index",
"style": {
@@ -158,4 +315,5 @@
}
},
"uniIdRouter": {}
+>>>>>>> 8af971b2f3c186031f86d692251cf77f91455270
}
\ No newline at end of file
diff --git a/src/pages/courseDetail/comment.vue b/src/pages/courseDetail/comment.vue
index da3de859..73383cba 100644
--- a/src/pages/courseDetail/comment.vue
+++ b/src/pages/courseDetail/comment.vue
@@ -103,7 +103,6 @@
align-items: center;
height: 28rpx;
.time{
-
font-family: ArialMT;
font-size: 23rpx;
color: #666666;
diff --git a/src/pages/courseDetail/index.vue b/src/pages/courseDetail/index.vue
index d9e24b1e..1dfa119b 100644
--- a/src/pages/courseDetail/index.vue
+++ b/src/pages/courseDetail/index.vue
@@ -22,28 +22,34 @@
-
+
-
+
-
+
- 去学习
- 去练习
- 去考试
+
+ 去学习
+ 去练习
+ 去考试
+
+
+ 发布评价
+
+
@@ -62,9 +68,9 @@ import comment from './comment.vue';
const tabList = ref([{ name: '课程介绍' }, { name: '知识点' }, { name: '评价' }]);
const form = ref({});
const crsNum = ref('');
-const tabAct = ref('课程介绍');
+const tabAct = ref(0);
const tabSwitch = (item) => {
- tabAct.value = item.name;
+ tabAct.value = item.index;
};
const getData = async () => {
const { body } = await getCourseDetailApi({ crsNum: crsNum.value });
@@ -151,13 +157,25 @@ onLoad((params) => {
width: 100%;
display: flex;
padding-top: 37rpx;
- justify-content: space-evenly;
+ justify-content: space-around;
background-color: #ffffff;
- :deep(.uv-button) {
- border-radius: 14rpx;
- width: 200rpx;
- height: 92rpx;
+ // background-color: red;
+
+ :deep(.uv-button-wrapper) {
+ flex: 1;
+ &.send_evaluate{
+ margin: 0 60rpx;
+ }
+ &:not(.send_evaluate){
+ margin: 0 30rpx;
+ }
+ .uv-button {
+ border-radius: 14rpx;
+ width: 100%;
+ height: 92rpx;
+ }
}
+
}
.num-item {
display: flex;
diff --git a/src/uni_modules/uv-textarea/changelog.md b/src/uni_modules/uv-textarea/changelog.md
new file mode 100644
index 00000000..63a90948
--- /dev/null
+++ b/src/uni_modules/uv-textarea/changelog.md
@@ -0,0 +1,28 @@
+## 1.0.11(2023-12-26)
+1. 优化confirmType默认值改成return
+## 1.0.10(2023-09-13)
+1. 修复设置autoHeight后出现高度异常的BUG
+## 1.0.9(2023-08-08)
+1. 优化
+## 1.0.8(2023-08-07)
+1. 修复值为null或undefined时显示错误的bug
+## 1.0.7(2023-08-05)
+1. v-model设置为数据时的BUG
+2. 复制过多内容,计数显示错误的BUG
+3. maxlength为-1改成不显示计数
+## 1.0.6(2023-07-30)
+1. 增加confirm-hold参数,参考官方文档
+## 1.0.5(2023-07-25)
+1. 增加textStyle属性,自定义文本样式
+2. 增加countStyle属性,自定义统计数字的样式
+## 1.0.4(2023-07-14)
+1. 修复 设置maxlength为-1时不生效的BUG
+## 1.0.3(2023-07-13)
+1. 修复 uv-textarea设置value属性不生效的BUG
+## 1.0.2(2023-05-16)
+1. 优化组件依赖,修改后无需全局引入,组件导入即可使用
+2. 优化部分功能
+## 1.0.1(2023-05-12)
+1. 修复vue3中双向绑定问题
+## 1.0.0(2023-05-10)
+uv-textarea 文本域
diff --git a/src/uni_modules/uv-textarea/components/uv-textarea/props.js b/src/uni_modules/uv-textarea/components/uv-textarea/props.js
new file mode 100644
index 00000000..b0c78899
--- /dev/null
+++ b/src/uni_modules/uv-textarea/components/uv-textarea/props.js
@@ -0,0 +1,138 @@
+export default {
+ props: {
+ value: {
+ type: [String, Number],
+ default: ''
+ },
+ modelValue: {
+ type: [String, Number],
+ default: ''
+ },
+ // 输入框为空时占位符
+ placeholder: {
+ type: [String, Number],
+ default: ''
+ },
+ // 指定placeholder的样式类,注意页面或组件的style中写了scoped时,需要在类名前写/deep/
+ placeholderClass: {
+ type: String,
+ default: 'textarea-placeholder'
+ },
+ // 指定placeholder的样式
+ placeholderStyle: {
+ type: [String, Object],
+ default: 'color: #c0c4cc'
+ },
+ // 输入框高度
+ height: {
+ type: [String, Number],
+ default: 70
+ },
+ // 设置键盘右下角按钮的文字,仅微信小程序,App-vue和H5有效
+ confirmType: {
+ type: String,
+ default: 'return'
+ },
+ // 是否禁用
+ disabled: {
+ type: Boolean,
+ default: false
+ },
+ // 是否显示统计字数
+ count: {
+ type: Boolean,
+ default: false
+ },
+ // 是否自动获取焦点,nvue不支持,H5取决于浏览器的实现
+ focus: {
+ type: Boolean,
+ default: false
+ },
+ // 是否自动增加高度
+ autoHeight: {
+ type: Boolean,
+ default: false
+ },
+ // 如果textarea是在一个position:fixed的区域,需要显示指定属性fixed为true
+ fixed: {
+ type: Boolean,
+ default: false
+ },
+ // 指定光标与键盘的距离
+ cursorSpacing: {
+ type: Number,
+ default: 0
+ },
+ // 指定focus时的光标位置
+ cursor: {
+ type: [String, Number],
+ default: ''
+ },
+ // 是否显示键盘上方带有”完成“按钮那一栏,
+ showConfirmBar: {
+ type: Boolean,
+ default: true
+ },
+ // 光标起始位置,自动聚焦时有效,需与selection-end搭配使用
+ selectionStart: {
+ type: Number,
+ default: -1
+ },
+ // 光标结束位置,自动聚焦时有效,需与selection-start搭配使用
+ selectionEnd: {
+ type: Number,
+ default: -1
+ },
+ // 键盘弹起时,是否自动上推页面
+ adjustPosition: {
+ type: Boolean,
+ default: true
+ },
+ // 是否去掉 iOS 下的默认内边距,只微信小程序有效
+ disableDefaultPadding: {
+ type: Boolean,
+ default: false
+ },
+ // focus时,点击页面的时候不收起键盘,只微信小程序有效
+ holdKeyboard: {
+ type: Boolean,
+ default: false
+ },
+ // 最大输入长度,设置为 -1 的时候不限制最大长度
+ maxlength: {
+ type: [String, Number],
+ default: 140
+ },
+ // 边框类型,surround-四周边框,bottom-底部边框
+ border: {
+ type: String,
+ default: 'surround'
+ },
+ // 用于处理或者过滤输入框内容的方法
+ formatter: {
+ type: [Function, null],
+ default: null
+ },
+ // 是否忽略组件内对文本合成系统事件的处理
+ ignoreCompositionEvent: {
+ type: Boolean,
+ default: true
+ },
+ // 是否忽略组件内对文本合成系统事件的处理
+ confirmHold: {
+ type: Boolean,
+ default: false
+ },
+ // 文本样式
+ textStyle: {
+ type: [Object, String],
+ default: () => {}
+ },
+ // 统计数字的样式
+ countStyle: {
+ type: [Object, String],
+ default: () => {}
+ },
+ ...uni.$uv?.props?.textarea
+ }
+}
\ No newline at end of file
diff --git a/src/uni_modules/uv-textarea/components/uv-textarea/uv-textarea.vue b/src/uni_modules/uv-textarea/components/uv-textarea/uv-textarea.vue
new file mode 100644
index 00000000..cd047ac3
--- /dev/null
+++ b/src/uni_modules/uv-textarea/components/uv-textarea/uv-textarea.vue
@@ -0,0 +1,238 @@
+
+
+
+ {{ getCount }}/{{ maxlen }}
+
+
+
+
\ No newline at end of file
diff --git a/src/uni_modules/uv-textarea/package.json b/src/uni_modules/uv-textarea/package.json
new file mode 100644
index 00000000..7df2034a
--- /dev/null
+++ b/src/uni_modules/uv-textarea/package.json
@@ -0,0 +1,87 @@
+{
+ "id": "uv-textarea",
+ "displayName": "uv-textarea 文本域 全面兼容vue3+2、app、h5、小程序等多端",
+ "version": "1.0.11",
+ "description": "文本域此组件满足了可能出现的表单信息补充,编辑等实际逻辑的功能,内置了字数校验等。",
+ "keywords": [
+ "uv-textarea",
+ "uvui",
+ "uv-ui",
+ "textarea",
+ "文本域"
+],
+ "repository": "",
+ "engines": {
+ "HBuilderX": "^3.1.0"
+ },
+ "dcloudext": {
+ "type": "component-vue",
+ "sale": {
+ "regular": {
+ "price": "0.00"
+ },
+ "sourcecode": {
+ "price": "0.00"
+ }
+ },
+ "contact": {
+ "qq": ""
+ },
+ "declaration": {
+ "ads": "无",
+ "data": "插件不采集任何数据",
+ "permissions": "无"
+ },
+ "npmurl": ""
+ },
+ "uni_modules": {
+ "dependencies": [
+ "uv-ui-tools"
+ ],
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "y",
+ "aliyun": "y"
+ },
+ "client": {
+ "Vue": {
+ "vue2": "y",
+ "vue3": "y"
+ },
+ "App": {
+ "app-vue": "y",
+ "app-nvue": "y"
+ },
+ "H5-mobile": {
+ "Safari": "y",
+ "Android Browser": "y",
+ "微信浏览器(Android)": "y",
+ "QQ浏览器(Android)": "y"
+ },
+ "H5-pc": {
+ "Chrome": "y",
+ "IE": "y",
+ "Edge": "y",
+ "Firefox": "y",
+ "Safari": "y"
+ },
+ "小程序": {
+ "微信": "y",
+ "阿里": "y",
+ "百度": "y",
+ "字节跳动": "y",
+ "QQ": "y",
+ "钉钉": "u",
+ "快手": "u",
+ "飞书": "u",
+ "京东": "u"
+ },
+ "快应用": {
+ "华为": "u",
+ "联盟": "u"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/uni_modules/uv-textarea/readme.md b/src/uni_modules/uv-textarea/readme.md
new file mode 100644
index 00000000..6a64819d
--- /dev/null
+++ b/src/uni_modules/uv-textarea/readme.md
@@ -0,0 +1,19 @@
+## Textarea 文本域
+
+> **组件名:uv-textarea**
+
+文本域此组件满足了可能出现的表单信息补充,编辑等实际逻辑的功能,内置了字数校验等。
+
+# 查看文档
+
+## [下载完整示例项目](https://ext.dcloud.net.cn/plugin?name=uv-ui) (请不要 下载插件ZIP)
+
+### [更多插件,请关注uv-ui组件库](https://ext.dcloud.net.cn/plugin?name=uv-ui)
+
+
+
+
+
+
+
+#### 如使用过程中有任何问题反馈,或者您对uv-ui有一些好的建议,欢迎加入uv-ui官方交流群:官方QQ群
\ No newline at end of file