diff --git a/components/CaseBox/CaseBox.vue b/components/CaseBox/CaseBox.vue index bc85828..e428a83 100644 --- a/components/CaseBox/CaseBox.vue +++ b/components/CaseBox/CaseBox.vue @@ -15,9 +15,9 @@ - - - + + + @@ -214,7 +214,7 @@ onMounted(() => { } .cardbox-bttom { width: 90%; - height: 10%; + height: 12%; overflow: hidden; display: flex; justify-content: space-between; diff --git a/components/CaseList/CaseList.vue b/components/CaseList/CaseList.vue index 3318869..44fd0f5 100644 --- a/components/CaseList/CaseList.vue +++ b/components/CaseList/CaseList.vue @@ -149,7 +149,7 @@ height: 100%; display: flexbox; flex-flow: column; - background-color: #e2e2e2; + background-color: #F7F8FA; } .list-itme{ width: 98%; diff --git a/components/VideoView/VideoView.vue b/components/VideoView/VideoView.vue index cb140ed..9566d51 100644 --- a/components/VideoView/VideoView.vue +++ b/components/VideoView/VideoView.vue @@ -6,16 +6,12 @@
{{ Videos.titleName }}
- {{ info.createTime }}
- - -
@@ -24,13 +20,14 @@
- +
+ {{ isExpanded ? '收起' : '展开描述' }} +
+ + \ No newline at end of file + diff --git a/unpackage/dist/dev/mp-weixin/common/vendor.js b/unpackage/dist/dev/mp-weixin/common/vendor.js index 3c56f5d..1571420 100644 --- a/unpackage/dist/dev/mp-weixin/common/vendor.js +++ b/unpackage/dist/dev/mp-weixin/common/vendor.js @@ -10158,6 +10158,138 @@ const createHook = (lifecycle) => (hook, target = getCurrentInstance()) => { }; const onShow = /* @__PURE__ */ createHook(ON_SHOW); const onLoad = /* @__PURE__ */ createHook(ON_LOAD); +const props$n = { + props: { + // 搜索框形状,round-圆形,square-方形 + shape: { + type: String, + default: () => defProps.search.shape + }, + // 搜索框背景色,默认值#f2f2f2 + bgColor: { + type: String, + default: () => defProps.search.bgColor + }, + // 占位提示文字 + placeholder: { + type: String, + default: () => defProps.search.placeholder + }, + // 是否启用清除控件 + clearabled: { + type: Boolean, + default: () => defProps.search.clearabled + }, + // 是否自动聚焦 + focus: { + type: Boolean, + default: () => defProps.search.focus + }, + // 是否在搜索框右侧显示取消按钮 + showAction: { + type: Boolean, + default: () => defProps.search.showAction + }, + // 右边控件的样式 + actionStyle: { + type: Object, + default: () => defProps.search.actionStyle + }, + // 取消按钮文字 + actionText: { + type: String, + default: () => defProps.search.actionText + }, + // 输入框内容对齐方式,可选值为 left|center|right + inputAlign: { + type: String, + default: () => defProps.search.inputAlign + }, + // input输入框的样式,可以定义文字颜色,大小等,对象形式 + inputStyle: { + type: Object, + default: () => defProps.search.inputStyle + }, + // 是否启用输入框 + disabled: { + type: Boolean, + default: () => defProps.search.disabled + }, + // 边框颜色 + borderColor: { + type: String, + default: () => defProps.search.borderColor + }, + // 搜索图标的颜色,默认同输入框字体颜色 + searchIconColor: { + type: String, + default: () => defProps.search.searchIconColor + }, + // 输入框字体颜色 + color: { + type: String, + default: () => defProps.search.color + }, + // placeholder的颜色 + placeholderColor: { + type: String, + default: () => defProps.search.placeholderColor + }, + // 左边输入框的图标,可以为uView图标名称或图片路径 + searchIcon: { + type: String, + default: () => defProps.search.searchIcon + }, + searchIconSize: { + type: [Number, String], + default: () => defProps.search.searchIconSize + }, + // 组件与其他上下左右元素之间的距离,带单位的字符串形式,如"30px"、"30px 20px"等写法 + margin: { + type: String, + default: () => defProps.search.margin + }, + // 开启showAction时,是否在input获取焦点时才显示 + animation: { + type: Boolean, + default: () => defProps.search.animation + }, + // 输入框的初始化内容 + modelValue: { + type: String, + default: () => defProps.search.value + }, + value: { + type: String, + default: () => defProps.search.value + }, + // 输入框最大能输入的长度,-1为不限制长度(来自uniapp文档) + maxlength: { + type: [String, Number], + default: () => defProps.search.maxlength + }, + // 搜索框高度,单位px + height: { + type: [String, Number], + default: () => defProps.search.height + }, + // 搜索框左侧文本 + label: { + type: [String, Number, null], + default: () => defProps.search.label + }, + // 键盘弹起时,是否自动上推页面 + adjustPosition: { + type: Boolean, + default: () => true + }, + // 键盘收起时,是否自动失去焦点 + autoBlur: { + type: Boolean, + default: () => false + } + } +}; const props$m = { props: { // 列表数组,元素可为字符串,如为对象可通过keyName指定目标属性名 @@ -12200,29 +12332,30 @@ exports.onMounted = onMounted; exports.onShow = onShow; exports.openType = openType; exports.p = p; -exports.props = props$m; -exports.props$1 = props$l; -exports.props$10 = props$c; -exports.props$11 = props$b; -exports.props$12 = props$a; -exports.props$13 = props$9; -exports.props$14 = props$8; -exports.props$15 = props$7; -exports.props$16 = props$6; -exports.props$17 = props$5; -exports.props$18 = props$4; -exports.props$19 = props$3; -exports.props$2 = props$k; -exports.props$20 = props$2; -exports.props$21 = props$1; -exports.props$22 = props; -exports.props$3 = props$j; -exports.props$4 = props$i; -exports.props$5 = props$h; -exports.props$6 = props$g; -exports.props$7 = props$f; -exports.props$8 = props$e; -exports.props$9 = props$d; +exports.props = props$n; +exports.props$1 = props$m; +exports.props$10 = props$d; +exports.props$11 = props$c; +exports.props$12 = props$b; +exports.props$13 = props$a; +exports.props$14 = props$9; +exports.props$15 = props$8; +exports.props$16 = props$7; +exports.props$17 = props$6; +exports.props$18 = props$5; +exports.props$19 = props$4; +exports.props$2 = props$l; +exports.props$20 = props$3; +exports.props$21 = props$2; +exports.props$22 = props$1; +exports.props$23 = props; +exports.props$3 = props$k; +exports.props$4 = props$j; +exports.props$5 = props$i; +exports.props$6 = props$h; +exports.props$7 = props$g; +exports.props$8 = props$f; +exports.props$9 = props$e; exports.random = random; exports.reactive = reactive; exports.ref = ref; diff --git a/unpackage/dist/dev/mp-weixin/components/CaseBox/CaseBox.js b/unpackage/dist/dev/mp-weixin/components/CaseBox/CaseBox.js index 99a21a4..369ea41 100644 --- a/unpackage/dist/dev/mp-weixin/components/CaseBox/CaseBox.js +++ b/unpackage/dist/dev/mp-weixin/components/CaseBox/CaseBox.js @@ -180,7 +180,7 @@ const _sfc_main = { j: common_vendor.o(toLike), k: common_vendor.p({ name: "heart", - color: "#ff0004", + color: "#000", size: "28" }) }, { @@ -189,14 +189,14 @@ const _sfc_main = { m: common_vendor.o(toCollection), n: common_vendor.p({ name: "star-fill", - color: "#ff0004", + color: "#ffe623", size: "28" }) } : { o: common_vendor.o(toCollection), p: common_vendor.p({ name: "star", - color: "#ff0004", + color: "#000", size: "28" }) }); diff --git a/unpackage/dist/dev/mp-weixin/components/CaseBox/CaseBox.wxss b/unpackage/dist/dev/mp-weixin/components/CaseBox/CaseBox.wxss index 54ebb0c..efdae6a 100644 --- a/unpackage/dist/dev/mp-weixin/components/CaseBox/CaseBox.wxss +++ b/unpackage/dist/dev/mp-weixin/components/CaseBox/CaseBox.wxss @@ -65,7 +65,7 @@ } .cardbox-bttom.data-v-13ba89b0 { width: 90%; - height: 10%; + height: 12%; overflow: hidden; display: flex; justify-content: space-between; diff --git a/unpackage/dist/dev/mp-weixin/components/CaseList/CaseList.wxss b/unpackage/dist/dev/mp-weixin/components/CaseList/CaseList.wxss index ec16cc1..1c61e77 100644 --- a/unpackage/dist/dev/mp-weixin/components/CaseList/CaseList.wxss +++ b/unpackage/dist/dev/mp-weixin/components/CaseList/CaseList.wxss @@ -28,7 +28,7 @@ height: 100%; display: flexbox; flex-flow: column; - background-color: #e2e2e2; + background-color: #F7F8FA; } .list-itme { width: 98%; diff --git a/unpackage/dist/dev/mp-weixin/components/VideoView/VideoView.js b/unpackage/dist/dev/mp-weixin/components/VideoView/VideoView.js index 87e438f..d158328 100644 --- a/unpackage/dist/dev/mp-weixin/components/VideoView/VideoView.js +++ b/unpackage/dist/dev/mp-weixin/components/VideoView/VideoView.js @@ -124,7 +124,7 @@ const _sfc_main = { }, { o: info.description, p: isExpanded.value ? 1 : "", - q: common_vendor.t(isExpanded.value ? "收起" : "展开"), + q: common_vendor.t(isExpanded.value ? "收起" : "展开描述"), r: common_vendor.o(toggleExpand) }); }; diff --git a/unpackage/dist/dev/mp-weixin/components/VideoView/VideoView.wxml b/unpackage/dist/dev/mp-weixin/components/VideoView/VideoView.wxml index 1eb8856..bbe94f0 100644 --- a/unpackage/dist/dev/mp-weixin/components/VideoView/VideoView.wxml +++ b/unpackage/dist/dev/mp-weixin/components/VideoView/VideoView.wxml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/components/VideoView/VideoView.wxss b/unpackage/dist/dev/mp-weixin/components/VideoView/VideoView.wxss index 6bc9958..51d5df4 100644 --- a/unpackage/dist/dev/mp-weixin/components/VideoView/VideoView.wxss +++ b/unpackage/dist/dev/mp-weixin/components/VideoView/VideoView.wxss @@ -44,6 +44,7 @@ .container .video-box .video.data-v-3ffa2b55 { width: 100%; border-bottom: 1px solid rgba(0, 0, 0, 0.1); + border-radius: 10px 10px 0 0; } .container .video-box .info-bar.data-v-3ffa2b55 { display: flex; @@ -86,11 +87,11 @@ } .container .video-box .description-bar .description.data-v-3ffa2b55 { overflow: hidden; - max-height: 100px; + max-height: 0; transition: max-height 0.3s ease-in-out; } .container .video-box .description-bar .description.expanded.data-v-3ffa2b55 { - max-height: none; + max-height: 200px; } .container .video-box .description-bar .description rich-text.data-v-3ffa2b55 { display: block; @@ -100,15 +101,17 @@ } .container .video-box .description-bar .expand-button.data-v-3ffa2b55 { margin-top: 10px; - background: none; - border: none; color: #ff0004; cursor: pointer; font-size: 14px; - padding: 0; - outline: none; + display: flex; + align-items: center; transition: color 0.3s ease-in-out; } .container .video-box .description-bar .expand-button.data-v-3ffa2b55:hover { color: #cc0003; +} +.container .video-box .description-bar .expand-button .expand-text.data-v-3ffa2b55 { + font-size: 14px; + margin-left: 5px; } \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-avatar/u-avatar.js b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-avatar/u-avatar.js index 2ff51d8..9034649 100644 --- a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-avatar/u-avatar.js +++ b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-avatar/u-avatar.js @@ -3,7 +3,7 @@ const common_vendor = require("../../../../common/vendor.js"); const base64Avatar = "data:image/jpg;base64,/9j/4QAYRXhpZgAASUkqAAgAAAAAAAAAAAAAAP/sABFEdWNreQABAAQAAAA8AAD/4QMraHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLwA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/PiA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJBZG9iZSBYTVAgQ29yZSA1LjMtYzAxMSA2Ni4xNDU2NjEsIDIwMTIvMDIvMDYtMTQ6NTY6MjcgICAgICAgICI+IDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+IDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjREMEQwRkY0RjgwNDExRUE5OTY2RDgxODY3NkJFODMxIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjREMEQwRkY1RjgwNDExRUE5OTY2RDgxODY3NkJFODMxIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NEQwRDBGRjJGODA0MTFFQTk5NjZEODE4Njc2QkU4MzEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NEQwRDBGRjNGODA0MTFFQTk5NjZEODE4Njc2QkU4MzEiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7/7gAOQWRvYmUAZMAAAAAB/9sAhAAGBAQEBQQGBQUGCQYFBgkLCAYG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"; const _sfc_main = { name: "u-avatar", - mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$5], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$6], data() { return { // 如果配置randomBgColor参数为true,在图标或者文字的模式下,会随机从中取出一个颜色值当做背景色 diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-button/u-button.js b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-button/u-button.js index 1554b69..1621205 100644 --- a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-button/u-button.js +++ b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-button/u-button.js @@ -2,7 +2,7 @@ const common_vendor = require("../../../../common/vendor.js"); const _sfc_main = { name: "u-button", - mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.button, common_vendor.openType, common_vendor.props$10], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.button, common_vendor.openType, common_vendor.props$11], data() { return {}; }, diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-cell/u-cell.js b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-cell/u-cell.js index 832a52a..d2189b5 100644 --- a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-cell/u-cell.js +++ b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-cell/u-cell.js @@ -5,7 +5,7 @@ const _sfc_main = { data() { return {}; }, - mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$6], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$7], computed: { titleTextStyle() { return common_vendor.addStyle(this.titleStyle); diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-grid-item/u-grid-item.js b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-grid-item/u-grid-item.js index 59cf56f..c993867 100644 --- a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-grid-item/u-grid-item.js +++ b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-grid-item/u-grid-item.js @@ -2,7 +2,7 @@ const common_vendor = require("../../../../common/vendor.js"); const _sfc_main = { name: "u-grid-item", - mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$1], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$2], data() { return { parentData: { diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-grid/u-grid.js b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-grid/u-grid.js index b9a4638..27ef522 100644 --- a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-grid/u-grid.js +++ b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-grid/u-grid.js @@ -2,7 +2,7 @@ const common_vendor = require("../../../../common/vendor.js"); const _sfc_main = { name: "u-grid", - mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$2], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$3], data() { return { index: 0, diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-icon/u-icon.js b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-icon/u-icon.js index 921690e..ef874c7 100644 --- a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-icon/u-icon.js +++ b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-icon/u-icon.js @@ -6,7 +6,7 @@ const _sfc_main = { return {}; }, emits: ["click"], - mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$14], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$15], computed: { uClasses() { let classes = []; diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-input/u-input.js b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-input/u-input.js index 67d048d..d1cde61 100644 --- a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-input/u-input.js +++ b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-input/u-input.js @@ -2,7 +2,7 @@ const common_vendor = require("../../../../common/vendor.js"); const _sfc_main = { name: "u-input", - mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$9], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$10], data() { return { // 清除操作 diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-line/u-line.js b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-line/u-line.js index d5732a0..a54994b 100644 --- a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-line/u-line.js +++ b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-line/u-line.js @@ -2,7 +2,7 @@ const common_vendor = require("../../../../common/vendor.js"); const _sfc_main = { name: "u-line", - mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$22], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$23], computed: { lineStyle() { const style = {}; diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-link/u-link.js b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-link/u-link.js index 713f8a5..96dfdde 100644 --- a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-link/u-link.js +++ b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-link/u-link.js @@ -2,7 +2,7 @@ const common_vendor = require("../../../../common/vendor.js"); const _sfc_main = { name: "u-link", - mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$17], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$18], computed: { linkStyle() { const style = { diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-list-item/u-list-item.js b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-list-item/u-list-item.js index a2c271e..ef845e2 100644 --- a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-list-item/u-list-item.js +++ b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-list-item/u-list-item.js @@ -2,7 +2,7 @@ const common_vendor = require("../../../../common/vendor.js"); const _sfc_main = { name: "u-list-item", - mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$7], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$8], data() { return { // 节点信息 diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-list/u-list.js b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-list/u-list.js index 4350185..48632a7 100644 --- a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-list/u-list.js +++ b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-list/u-list.js @@ -2,7 +2,7 @@ const common_vendor = require("../../../../common/vendor.js"); const _sfc_main = { name: "u-list", - mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$8], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$9], watch: { scrollIntoView(n) { this.scrollIntoViewById(n); diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-loading-icon/u-loading-icon.js b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-loading-icon/u-loading-icon.js index 027de27..51edbad 100644 --- a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-loading-icon/u-loading-icon.js +++ b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-loading-icon/u-loading-icon.js @@ -2,7 +2,7 @@ const common_vendor = require("../../../../common/vendor.js"); const _sfc_main = { name: "u-loading-icon", - mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$15], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$16], data() { return { // Array.form可以通过一个伪数组对象创建指定长度的数组 diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-loadmore/u-loadmore.js b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-loadmore/u-loadmore.js deleted file mode 100644 index 92f2a94..0000000 --- a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-loadmore/u-loadmore.js +++ /dev/null @@ -1,99 +0,0 @@ -"use strict"; -const common_vendor = require("../../../../common/vendor.js"); -const _sfc_main = { - name: "u-loadmore", - mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$18], - data() { - return { - // 粗点 - dotText: "●" - }; - }, - computed: { - // 加载的文字显示的样式 - loadTextStyle() { - return { - color: this.color, - fontSize: common_vendor.addUnit(this.fontSize), - lineHeight: common_vendor.addUnit(this.fontSize), - backgroundColor: this.bgColor - }; - }, - // 显示的提示文字 - showText() { - let text = ""; - if (this.status == "loadmore") - text = this.loadmoreText; - else if (this.status == "loading") - text = this.loadingText; - else if (this.status == "nomore" && this.isDot) - text = this.dotText; - else - text = this.nomoreText; - return text; - } - }, - emits: ["loadmore"], - methods: { - addStyle: common_vendor.addStyle, - addUnit: common_vendor.addUnit, - loadMore() { - if (this.status == "loadmore") - this.$emit("loadmore"); - } - } -}; -if (!Array) { - const _easycom_u_line2 = common_vendor.resolveComponent("u-line"); - const _easycom_u_loading_icon2 = common_vendor.resolveComponent("u-loading-icon"); - (_easycom_u_line2 + _easycom_u_loading_icon2)(); -} -const _easycom_u_line = () => "../u-line/u-line.js"; -const _easycom_u_loading_icon = () => "../u-loading-icon/u-loading-icon.js"; -if (!Math) { - (_easycom_u_line + _easycom_u_loading_icon)(); -} -function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) { - return common_vendor.e({ - a: _ctx.line - }, _ctx.line ? { - b: common_vendor.p({ - length: "140rpx", - color: _ctx.lineColor, - hairline: false, - dashed: _ctx.dashed - }) - } : {}, { - c: _ctx.status === "loading" && _ctx.icon - }, _ctx.status === "loading" && _ctx.icon ? { - d: common_vendor.p({ - color: _ctx.iconColor, - size: _ctx.iconSize, - mode: _ctx.loadingIcon - }) - } : {}, { - e: common_vendor.t($options.showText), - f: common_vendor.s($options.loadTextStyle), - g: common_vendor.n(_ctx.status == "nomore" && _ctx.isDot == true ? "u-loadmore__content__dot-text" : "u-loadmore__content__text"), - h: common_vendor.o((...args) => $options.loadMore && $options.loadMore(...args)), - i: common_vendor.n(_ctx.status == "loadmore" || _ctx.status == "nomore" ? "u-more" : ""), - j: _ctx.line - }, _ctx.line ? { - k: common_vendor.p({ - length: "140rpx", - color: _ctx.lineColor, - hairline: false, - dashed: _ctx.dashed - }) - } : {}, { - l: common_vendor.s($options.addStyle(_ctx.customStyle)), - m: common_vendor.s({ - backgroundColor: _ctx.bgColor, - marginBottom: $options.addUnit(_ctx.marginBottom), - marginTop: $options.addUnit(_ctx.marginTop), - height: $options.addUnit(_ctx.height) - }) - }); -} -const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-5817e4cf"], ["__file", "D:/uniapp1/gree_leran/node_modules/uview-plus/components/u-loadmore/u-loadmore.vue"]]); -wx.createComponent(Component); diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-loadmore/u-loadmore.json b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-loadmore/u-loadmore.json deleted file mode 100644 index 8a324fe..0000000 --- a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-loadmore/u-loadmore.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "component": true, - "usingComponents": { - "u-line": "../u-line/u-line", - "u-loading-icon": "../u-loading-icon/u-loading-icon" - } -} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-loadmore/u-loadmore.wxml b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-loadmore/u-loadmore.wxml deleted file mode 100644 index 9cc3c81..0000000 --- a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-loadmore/u-loadmore.wxml +++ /dev/null @@ -1 +0,0 @@ -{{e}} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-loadmore/u-loadmore.wxss b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-loadmore/u-loadmore.wxss deleted file mode 100644 index 36dcc5f..0000000 --- a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-loadmore/u-loadmore.wxss +++ /dev/null @@ -1,66 +0,0 @@ -/** - * 这里是uni-app内置的常用样式变量 - * - * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量 - * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App - * - */ -/** - * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能 - * - * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件 - */ -/* 颜色变量 */ -/* 行为相关颜色 */ -/* 文字基本颜色 */ -/* 背景颜色 */ -/* 边框颜色 */ -/* 尺寸变量 */ -/* 文字尺寸 */ -/* 图片尺寸 */ -/* Border Radius */ -/* 水平间距 */ -/* 垂直间距 */ -/* 透明度 */ -/* 文章场景相关 */ -.u-empty.data-v-5817e4cf, -.u-empty__wrap.data-v-5817e4cf, -.u-tabs.data-v-5817e4cf, -.u-tabs__wrapper.data-v-5817e4cf, -.u-tabs__wrapper__scroll-view-wrapper.data-v-5817e4cf, -.u-tabs__wrapper__scroll-view.data-v-5817e4cf, -.u-tabs__wrapper__nav.data-v-5817e4cf, -.u-tabs__wrapper__nav__line.data-v-5817e4cf { - display: flex; - flex-direction: column; - flex-shrink: 0; - flex-grow: 0; - flex-basis: auto; - align-items: stretch; - align-content: flex-start; -} -.u-loadmore.data-v-5817e4cf { - display: flex; - flex-direction: row; - align-items: center; - justify-content: center; - flex: 1; -} -.u-loadmore__content.data-v-5817e4cf { - margin: 0 15px; - display: flex; - flex-direction: row; - align-items: center; - justify-content: center; -} -.u-loadmore__content__icon-wrap.data-v-5817e4cf { - margin-right: 8px; -} -.u-loadmore__content__text.data-v-5817e4cf { - font-size: 14px; - color: #606266; -} -.u-loadmore__content__dot-text.data-v-5817e4cf { - font-size: 15px; - color: #909193; -} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-notify/u-notify.js b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-notify/u-notify.js index b2a0f6f..6bd40ef 100644 --- a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-notify/u-notify.js +++ b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-notify/u-notify.js @@ -2,7 +2,7 @@ const common_vendor = require("../../../../common/vendor.js"); const _sfc_main = { name: "u-notify", - mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$12], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$13], data() { return { // 是否展示组件 diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-overlay/u-overlay.js b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-overlay/u-overlay.js index 7e7b013..933ea43 100644 --- a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-overlay/u-overlay.js +++ b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-overlay/u-overlay.js @@ -2,7 +2,7 @@ const common_vendor = require("../../../../common/vendor.js"); const _sfc_main = { name: "u-overlay", - mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$18], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$19], computed: { overlayStyle() { const style = { diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-popup/u-popup.js b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-popup/u-popup.js index 465956b..37cb230 100644 --- a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-popup/u-popup.js +++ b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-popup/u-popup.js @@ -2,7 +2,7 @@ const common_vendor = require("../../../../common/vendor.js"); const _sfc_main = { name: "u-popup", - mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$4], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$5], data() { return { overlayDuration: this.duration + 50 diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-safe-bottom/u-safe-bottom.js b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-safe-bottom/u-safe-bottom.js index b3815ae..9e51967 100644 --- a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-safe-bottom/u-safe-bottom.js +++ b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-safe-bottom/u-safe-bottom.js @@ -2,7 +2,7 @@ const common_vendor = require("../../../../common/vendor.js"); const _sfc_main = { name: "u-safe-bottom", - mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$20], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$21], data() { return { safeAreaBottomHeight: 0, diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-search/u-search.js b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-search/u-search.js new file mode 100644 index 0000000..854d9e9 --- /dev/null +++ b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-search/u-search.js @@ -0,0 +1,161 @@ +"use strict"; +const common_vendor = require("../../../../common/vendor.js"); +const _sfc_main = { + name: "u-search", + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props], + data() { + return { + keyword: "", + showClear: false, + // 是否显示右边的清除图标 + show: false, + // 标记input当前状态是否处于聚焦中,如果是,才会显示右侧的清除控件 + focused: this.focus + // 绑定输入框的值 + // inputValue: this.value + }; + }, + watch: { + keyword(nVal) { + this.$emit("update:modelValue", nVal); + this.$emit("change", nVal); + }, + modelValue: { + immediate: true, + handler(nVal) { + this.keyword = nVal; + } + } + }, + computed: { + showActionBtn() { + return !this.animation && this.showAction; + } + }, + emits: ["clear", "search", "custom", "focus", "blur", "click", "clickIcon", "update:modelValue", "change"], + methods: { + addStyle: common_vendor.addStyle, + addUnit: common_vendor.addUnit, + // 目前HX2.6.9 v-model双向绑定无效,故监听input事件获取输入框内容的变化 + inputChange(e) { + this.keyword = e.detail.value; + }, + // 清空输入 + // 也可以作为用户通过this.$refs形式调用清空输入框内容 + clear() { + this.keyword = ""; + this.$nextTick(() => { + this.$emit("clear"); + }); + }, + // 确定搜索 + search(e) { + this.$emit("search", e.detail.value); + try { + common_vendor.index.hideKeyboard(); + } catch (e2) { + } + }, + // 点击右边自定义按钮的事件 + custom() { + this.$emit("custom", this.keyword); + try { + common_vendor.index.hideKeyboard(); + } catch (e) { + } + }, + // 获取焦点 + getFocus() { + this.focused = true; + if (this.animation && this.showAction) + this.show = true; + this.$emit("focus", this.keyword); + }, + // 失去焦点 + blur() { + setTimeout(() => { + this.focused = false; + }, 100); + this.show = false; + this.$emit("blur", this.keyword); + }, + // 点击搜索框,只有disabled=true时才发出事件,因为禁止了输入,意味着是想跳转真正的搜索页 + clickHandler() { + if (this.disabled) + this.$emit("click"); + }, + // 点击左边图标 + clickIcon(e) { + this.$emit("clickIcon", this.keyword); + try { + common_vendor.index.hideKeyboard(); + } catch (e2) { + } + } + } +}; +if (!Array) { + const _easycom_u_icon2 = common_vendor.resolveComponent("u-icon"); + _easycom_u_icon2(); +} +const _easycom_u_icon = () => "../u-icon/u-icon.js"; +if (!Math) { + _easycom_u_icon(); +} +function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) { + return common_vendor.e({ + a: _ctx.$slots.label || _ctx.label !== null + }, _ctx.$slots.label || _ctx.label !== null ? { + b: common_vendor.t(_ctx.label) + } : {}, { + c: common_vendor.o($options.clickIcon), + d: common_vendor.p({ + size: _ctx.searchIconSize, + name: _ctx.searchIcon, + color: _ctx.searchIconColor ? _ctx.searchIconColor : _ctx.color + }), + e: common_vendor.o((...args) => $options.blur && $options.blur(...args)), + f: $data.keyword, + g: common_vendor.o((...args) => $options.search && $options.search(...args)), + h: common_vendor.o((...args) => $options.inputChange && $options.inputChange(...args)), + i: _ctx.disabled, + j: common_vendor.o((...args) => $options.getFocus && $options.getFocus(...args)), + k: _ctx.focus, + l: _ctx.maxlength, + m: _ctx.adjustPosition, + n: _ctx.autoBlur, + o: _ctx.placeholder, + p: `color: ${_ctx.placeholderColor}`, + q: common_vendor.s({ + textAlign: _ctx.inputAlign, + color: _ctx.color, + backgroundColor: _ctx.bgColor, + height: $options.addUnit(_ctx.height) + }), + r: common_vendor.s(_ctx.inputStyle), + s: $data.keyword && _ctx.clearabled && $data.focused + }, $data.keyword && _ctx.clearabled && $data.focused ? { + t: common_vendor.p({ + name: "close", + size: "11", + color: "#ffffff", + customStyle: "line-height: 12px" + }), + v: common_vendor.o((...args) => $options.clear && $options.clear(...args)) + } : {}, { + w: _ctx.bgColor, + x: _ctx.shape == "round" ? "100px" : "4px", + y: _ctx.borderColor, + z: common_vendor.t(_ctx.actionText), + A: common_vendor.s(_ctx.actionStyle), + B: common_vendor.n(($options.showActionBtn || $data.show) && "u-search__action--active"), + C: common_vendor.o((...args) => $options.custom && $options.custom(...args)), + D: common_vendor.o((...args) => $options.clickHandler && $options.clickHandler(...args)), + E: common_vendor.s({ + margin: _ctx.margin + }), + F: common_vendor.s($options.addStyle(_ctx.customStyle)) + }); +} +const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-ed789780"], ["__file", "D:/uniapp1/gree_leran/node_modules/uview-plus/components/u-search/u-search.vue"]]); +wx.createComponent(Component); diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-search/u-search.json b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-search/u-search.json new file mode 100644 index 0000000..fcde44c --- /dev/null +++ b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-search/u-search.json @@ -0,0 +1,6 @@ +{ + "component": true, + "usingComponents": { + "u-icon": "../u-icon/u-icon" + } +} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-search/u-search.wxml b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-search/u-search.wxml new file mode 100644 index 0000000..7e970c0 --- /dev/null +++ b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-search/u-search.wxml @@ -0,0 +1 @@ +{{z}} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-search/u-search.wxss b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-search/u-search.wxss new file mode 100644 index 0000000..f900d1f --- /dev/null +++ b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-search/u-search.wxss @@ -0,0 +1,107 @@ +/** + * 这里是uni-app内置的常用样式变量 + * + * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量 + * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App + * + */ +/** + * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能 + * + * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件 + */ +/* 颜色变量 */ +/* 行为相关颜色 */ +/* 文字基本颜色 */ +/* 背景颜色 */ +/* 边框颜色 */ +/* 尺寸变量 */ +/* 文字尺寸 */ +/* 图片尺寸 */ +/* Border Radius */ +/* 水平间距 */ +/* 垂直间距 */ +/* 透明度 */ +/* 文章场景相关 */ +.u-empty.data-v-ed789780, +.u-empty__wrap.data-v-ed789780, +.u-tabs.data-v-ed789780, +.u-tabs__wrapper.data-v-ed789780, +.u-tabs__wrapper__scroll-view-wrapper.data-v-ed789780, +.u-tabs__wrapper__scroll-view.data-v-ed789780, +.u-tabs__wrapper__nav.data-v-ed789780, +.u-tabs__wrapper__nav__line.data-v-ed789780 { + display: flex; + flex-direction: column; + flex-shrink: 0; + flex-grow: 0; + flex-basis: auto; + align-items: stretch; + align-content: flex-start; +} +.u-search.data-v-ed789780 { + display: flex; + flex-direction: row; + align-items: center; + flex: 1; +} +.u-search__content.data-v-ed789780 { + display: flex; + flex-direction: row; + align-items: center; + padding: 0 10px; + flex: 1; + justify-content: space-between; + border-width: 1px; + border-color: transparent; + border-style: solid; + overflow: hidden; +} +.u-search__content__icon.data-v-ed789780 { + display: flex; + flex-direction: row; + align-items: center; +} +.u-search__content__label.data-v-ed789780 { + color: #303133; + font-size: 14px; + margin: 0 4px; +} +.u-search__content__close.data-v-ed789780 { + width: 20px; + height: 20px; + border-top-left-radius: 100px; + border-top-right-radius: 100px; + border-bottom-left-radius: 100px; + border-bottom-right-radius: 100px; + background-color: #C6C7CB; + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + transform: scale(0.82); +} +.u-search__content__input.data-v-ed789780 { + flex: 1; + font-size: 14px; + line-height: 1; + margin: 0 5px; + color: #303133; +} +.u-search__content__input--placeholder.data-v-ed789780 { + color: #909193; +} +.u-search__action.data-v-ed789780 { + font-size: 14px; + color: #303133; + width: 0; + overflow: hidden; + transition-property: width; + transition-duration: 0.3s; + white-space: nowrap; + text-align: center; +} +.u-search__action--active.data-v-ed789780 { + width: 40px; + margin-left: 5px; +} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-status-bar/u-status-bar.js b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-status-bar/u-status-bar.js index 00579be..f74a242 100644 --- a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-status-bar/u-status-bar.js +++ b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-status-bar/u-status-bar.js @@ -2,7 +2,7 @@ const common_vendor = require("../../../../common/vendor.js"); const _sfc_main = { name: "u-status-bar", - mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$19], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$20], data() { return {}; }, diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-subsection/u-subsection.js b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-subsection/u-subsection.js index 705e474..da1adf5 100644 --- a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-subsection/u-subsection.js +++ b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-subsection/u-subsection.js @@ -2,7 +2,7 @@ const common_vendor = require("../../../../common/vendor.js"); const _sfc_main = { name: "u-subsection", - mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$13], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$14], data() { return { // 组件尺寸 diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-swiper-indicator/u-swiper-indicator.js b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-swiper-indicator/u-swiper-indicator.js index 8949654..bb8f09a 100644 --- a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-swiper-indicator/u-swiper-indicator.js +++ b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-swiper-indicator/u-swiper-indicator.js @@ -2,7 +2,7 @@ const common_vendor = require("../../../../common/vendor.js"); const _sfc_main = { name: "u-swiper-indicator", - mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$16], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$17], data() { return { lineWidth: 22 diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-swiper/u-swiper.js b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-swiper/u-swiper.js index 78195e3..c5d12e7 100644 --- a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-swiper/u-swiper.js +++ b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-swiper/u-swiper.js @@ -2,7 +2,7 @@ const common_vendor = require("../../../../common/vendor.js"); const _sfc_main = { name: "u-swiper", - mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$1], data() { return { currentIndex: 0 diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-text/u-text.js b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-text/u-text.js index 789df69..d5c7d20 100644 --- a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-text/u-text.js +++ b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-text/u-text.js @@ -2,7 +2,7 @@ const common_vendor = require("../../../../common/vendor.js"); const _sfc_main = { name: "u--text", - mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.value, common_vendor.button, common_vendor.openType, common_vendor.props$3], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.value, common_vendor.button, common_vendor.openType, common_vendor.props$4], emits: ["click"], computed: { valueStyle() { diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-transition/u-transition.js b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-transition/u-transition.js index 0210e90..e056b71 100644 --- a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-transition/u-transition.js +++ b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-transition/u-transition.js @@ -33,7 +33,7 @@ const _sfc_main = { } }, // 将mixin挂在到组件中,实际上为一个vue格式对象。 - mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.transition, common_vendor.props$21], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.transition, common_vendor.props$22], watch: { show: { handler(newVal) { diff --git a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-upload/u-upload.js b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-upload/u-upload.js index 9f8c1c2..624af49 100644 --- a/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-upload/u-upload.js +++ b/unpackage/dist/dev/mp-weixin/node-modules/uview-plus/components/u-upload/u-upload.js @@ -2,7 +2,7 @@ const common_vendor = require("../../../../common/vendor.js"); const _sfc_main = { name: "u-upload", - mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.mixinUp, common_vendor.props$11], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.mixinUp, common_vendor.props$12], data() { return { lists: [], diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.js b/unpackage/dist/dev/mp-weixin/pages/index/index.js index 0dc748d..5a24caa 100644 --- a/unpackage/dist/dev/mp-weixin/pages/index/index.js +++ b/unpackage/dist/dev/mp-weixin/pages/index/index.js @@ -1,14 +1,16 @@ "use strict"; const common_vendor = require("../../common/vendor.js"); if (!Array) { + const _easycom_up_search2 = common_vendor.resolveComponent("up-search"); const _easycom_up_swiper2 = common_vendor.resolveComponent("up-swiper"); const _easycom_up_grid_item2 = common_vendor.resolveComponent("up-grid-item"); const _easycom_up_grid2 = common_vendor.resolveComponent("up-grid"); const _easycom_up_text2 = common_vendor.resolveComponent("up-text"); const _easycom_CaseList2 = common_vendor.resolveComponent("CaseList"); const _easycom_MenTab2 = common_vendor.resolveComponent("MenTab"); - (_easycom_up_swiper2 + _easycom_up_grid_item2 + _easycom_up_grid2 + _easycom_up_text2 + _easycom_CaseList2 + _easycom_MenTab2)(); + (_easycom_up_search2 + _easycom_up_swiper2 + _easycom_up_grid_item2 + _easycom_up_grid2 + _easycom_up_text2 + _easycom_CaseList2 + _easycom_MenTab2)(); } +const _easycom_up_search = () => "../../node-modules/uview-plus/components/u-search/u-search.js"; const _easycom_up_swiper = () => "../../node-modules/uview-plus/components/u-swiper/u-swiper.js"; const _easycom_up_grid_item = () => "../../node-modules/uview-plus/components/u-grid-item/u-grid-item.js"; const _easycom_up_grid = () => "../../node-modules/uview-plus/components/u-grid/u-grid.js"; @@ -16,7 +18,7 @@ const _easycom_up_text = () => "../../node-modules/uview-plus/components/u-text/ const _easycom_CaseList = () => "../../components/CaseList/CaseList.js"; const _easycom_MenTab = () => "../../components/MenTab/MenTab.js"; if (!Math) { - (_easycom_up_swiper + _easycom_up_grid_item + _easycom_up_grid + _easycom_up_text + _easycom_CaseList + _easycom_MenTab)(); + (_easycom_up_search + _easycom_up_swiper + _easycom_up_grid_item + _easycom_up_grid + _easycom_up_text + _easycom_CaseList + _easycom_MenTab)(); } const _sfc_main = { __name: "index", @@ -70,30 +72,37 @@ const _sfc_main = { } return (_ctx, _cache) => { return { - a: common_vendor.p({ + a: common_vendor.o(($event) => _ctx.keyword = $event), + b: common_vendor.p({ + placeholder: "日照香炉生紫烟", + clearabled: true, + animation: "false", + modelValue: _ctx.keyword + }), + c: common_vendor.p({ height: "150", list: swipe }), - b: common_vendor.f(baseList.value, (baseListItem, baseListIndex, i0) => { + d: common_vendor.f(baseList.value, (baseListItem, baseListIndex, i0) => { return { a: baseListItem.src, b: common_vendor.t(baseListItem.title), c: baseListIndex, d: common_vendor.o(($event) => NavicatToBaseItems(baseListItem), baseListIndex), - e: "adbc9592-2-" + i0 + ",adbc9592-1" + e: "adbc9592-3-" + i0 + ",adbc9592-2" }; }), - c: common_vendor.p({ + e: common_vendor.p({ border: false, col: "4" }), - d: common_vendor.p({ + f: common_vendor.p({ margin: "1em", type: "primary", text: "新闻" }), - e: common_vendor.o(toTop), - f: common_vendor.sr(caseList, "adbc9592-4", { + g: common_vendor.o(toTop), + h: common_vendor.sr(caseList, "adbc9592-5", { "k": "caseList" }) }; diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.json b/unpackage/dist/dev/mp-weixin/pages/index/index.json index c175023..ec84ce8 100644 --- a/unpackage/dist/dev/mp-weixin/pages/index/index.json +++ b/unpackage/dist/dev/mp-weixin/pages/index/index.json @@ -1,6 +1,7 @@ { "navigationStyle": "custom", "usingComponents": { + "up-search": "../../node-modules/uview-plus/components/u-search/u-search", "up-swiper": "../../node-modules/uview-plus/components/u-swiper/u-swiper", "up-grid-item": "../../node-modules/uview-plus/components/u-grid-item/u-grid-item", "up-grid": "../../node-modules/uview-plus/components/u-grid/u-grid", diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.wxml b/unpackage/dist/dev/mp-weixin/pages/index/index.wxml index 06a2767..767cf75 100644 --- a/unpackage/dist/dev/mp-weixin/pages/index/index.wxml +++ b/unpackage/dist/dev/mp-weixin/pages/index/index.wxml @@ -1 +1 @@ - 学习平台 {{baseListItem.b}} \ No newline at end of file + 学习平台 {{baseListItem.b}} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.wxss b/unpackage/dist/dev/mp-weixin/pages/index/index.wxss index 51944ed..fddece8 100644 --- a/unpackage/dist/dev/mp-weixin/pages/index/index.wxss +++ b/unpackage/dist/dev/mp-weixin/pages/index/index.wxss @@ -46,16 +46,14 @@ top: 25rpx; } .newlist { - display: flex; - flex-flow: column; + overflow-y: hidden; } .newList-t { - position: -webkit-sticky; - position: sticky; - top: 60rpx; - height: 60rpx; + height: 70rpx; + padding: 10rpx; background-color: #fff; z-index: 2; + margin: 20rpx auto; } .content { height: 100vh; diff --git a/unpackage/dist/dev/mp-weixin/pages/newsInfo/newsInfo.js b/unpackage/dist/dev/mp-weixin/pages/newsInfo/newsInfo.js index 4824063..d94f6ba 100644 --- a/unpackage/dist/dev/mp-weixin/pages/newsInfo/newsInfo.js +++ b/unpackage/dist/dev/mp-weixin/pages/newsInfo/newsInfo.js @@ -27,11 +27,8 @@ const _sfc_main = { __name: "newsInfo", setup(__props) { const id = common_vendor.ref(null); - common_vendor.ref(""); - common_vendor.ref("path/to/avatar"); const inputVisible = common_vendor.ref(false); const inputContent = common_vendor.ref(""); - common_vendor.ref("40px"); const info = common_vendor.reactive({ caseId: null, title: null, @@ -51,7 +48,6 @@ const _sfc_main = { const getInfo = async (id2) => { let res = await apis_cast.getCastInfo(id2); if (res.code == 200) { - console.log("详细数据", res.data); return res; } return null; @@ -76,12 +72,9 @@ const _sfc_main = { }; const showInputBox = () => { inputVisible.value = true; - common_vendor.index.nextTick(() => { - }); }; const submitComment = async () => { - console.log("提交评论", currParentCommentId.value, currReplyUseId.value); - let res = await apis_comments.addComments({ + await apis_comments.addComments({ relatedPostId: info.caseId, commentContent: inputContent.value, parentCommentId: currParentCommentId.value, @@ -89,7 +82,6 @@ const _sfc_main = { }); currParentCommentId.value = null; currReplyUseId.value = null; - console.log("保存评论", res); inputContent.value = ""; getData(id.value); }; @@ -99,7 +91,6 @@ const _sfc_main = { let list = await apis_comments.getCommentsByRelatedPostId(id.value); let image = await apis_user.getImageById(com.userId); list = list.data; - console.log("接口", com, list); commentList.value = list; info.iamge = image.msg; info.caseId = com.caseId; @@ -114,30 +105,15 @@ const _sfc_main = { }; const clickLike = () => { info.isLike = !info.isLike; - let bo = "0"; - if (info.isLike) { - bo = "1"; - } - apis_likes.addLike({ - contentType: 0, - contentId: info.caseId, - extField1: bo - }); + let bo = info.isLike ? "1" : "0"; + apis_likes.addLike({ contentType: 0, contentId: info.caseId, extField1: bo }); }; const clickCollection = () => { info.isCollection = !info.isCollection; - let bo = "0"; - if (info.isCollection) { - bo = "1"; - } - apis_collections.addCollections({ - contentType: 0, - contentId: info.caseId, - extField1: bo - }); + let bo = info.isCollection ? "1" : "0"; + apis_collections.addCollections({ contentType: 0, contentId: info.caseId, extField1: bo }); }; common_vendor.onLoad((e) => { - console.log("进入", e); id.value = e.id; getData(); }); @@ -148,12 +124,12 @@ const _sfc_main = { size: "70" }), b: common_vendor.p({ - text: "作者名", + text: info.name, size: "33rpx", bold: true }), c: common_vendor.p({ - text: "发布于-" + info.createTime + text: "发布于 " + info.createTime }), d: common_vendor.p({ text: info.title, @@ -173,7 +149,7 @@ const _sfc_main = { return { a: common_vendor.o(addComment, item.id), b: item.id, - c: "5ecea49e-6-" + i0, + c: "7d230679-6-" + i0, d: common_vendor.p({ data: item }) @@ -216,10 +192,10 @@ const _sfc_main = { size: "28" }) }, { - w: common_vendor.o(($event) => addComment()) + w: common_vendor.o(addComment) }); }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__file", "D:/uniapp1/gree_leran/pages/newsInfo/newsInfo.vue"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-7d230679"], ["__file", "D:/uniapp1/gree_leran/pages/newsInfo/newsInfo.vue"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/newsInfo/newsInfo.wxml b/unpackage/dist/dev/mp-weixin/pages/newsInfo/newsInfo.wxml index 8ba0a15..f2986f8 100644 --- a/unpackage/dist/dev/mp-weixin/pages/newsInfo/newsInfo.wxml +++ b/unpackage/dist/dev/mp-weixin/pages/newsInfo/newsInfo.wxml @@ -1 +1 @@ - 评论留言 评论 \ No newline at end of file +Image评论留言评论 \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/newsInfo/newsInfo.wxss b/unpackage/dist/dev/mp-weixin/pages/newsInfo/newsInfo.wxss index c3e0f2b..4ed2e85 100644 --- a/unpackage/dist/dev/mp-weixin/pages/newsInfo/newsInfo.wxss +++ b/unpackage/dist/dev/mp-weixin/pages/newsInfo/newsInfo.wxss @@ -23,87 +23,98 @@ /* 垂直间距 */ /* 透明度 */ /* 文章场景相关 */ -.case-info { - width: 97%; +.case-info-box.data-v-7d230679 { + padding: 20rpx; + min-height: 90vh; + background-color: #F5F5F5; +} +.case-info.data-v-7d230679 { + width: 100%; box-sizing: border-box; padding: 20rpx; margin: 10rpx auto; - border-radius: 10rpx; - background-color: #fff; + border-radius: 20rpx; + background-color: #ffffff; + box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1); } -.case-info .user-info { +.user-info.data-v-7d230679 { display: flex; - align-items: end; + align-items: center; } -.case-info .user-info .user-data { - margin-top: 40rpx; - height: 30%; +.user-info .user-info-box.data-v-7d230679 { margin-left: 20rpx; } -.case-info .user-info .user-name { - margin-left: 20rpx; - display: flex; - flex-flow: column; +.user-info .user-info-box .user-name.data-v-7d230679 { + margin-bottom: 5rpx; } -.case-info .title-info { +.user-info .user-info-box .user-data.data-v-7d230679 { + font-size: 30rpx; + color: #888888; +} +.title-info.data-v-7d230679 { margin-top: 20rpx; } -.case-info .body-info { - margin-top: 40rpx; +.title-info .title-info-main.data-v-7d230679 { + margin-bottom: 10rpx; } -.comment-titls { +.title-info .title-info-fu.data-v-7d230679 { + color: #8f8f8f; + font-size: 35rpx; +} +.body-info.data-v-7d230679 { + margin-top: 20rpx; +} +.body-info .info-image.data-v-7d230679 { + width: 100%; + border-radius: 10rpx; + margin-top: 10rpx; +} +.comment-info.data-v-7d230679 { + margin-top: 30rpx; +} +.comment-info .comment-title.data-v-7d230679 { font-size: 37rpx; - height: 50rpx; - display: flex; - justify-content: left; - align-items: center; - width: 95%; - margin: 20rpx auto; - background-color: #A8E6CF; + font-weight: bold; + color: #333333; + margin-bottom: 10rpx; } -.input-di { +.comment-info .comment-list.data-v-7d230679 { + background-color: #ffffff; + border-radius: 10rpx; + padding: 10rpx; + box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0.1); +} +.input-di.data-v-7d230679 { display: flex; position: fixed; justify-content: space-between; align-items: center; bottom: 0; + left: 0; height: 10vh; width: 100%; background-color: #A8E6CF; border-radius: 20rpx 20rpx 10rpx 10rpx; } -.di { +.di.data-v-7d230679 { height: 10vh; width: 100%; } -.input-di-ico { +.input-di-ico.data-v-7d230679 { display: flex; justify-content: center; align-items: center; width: 30%; } -.input-di-button { +.input-di-button.data-v-7d230679 { display: flex; justify-content: center; align-items: center; height: 50%; width: 30%; - margin-right: 20rpx; background-color: #000; color: #fff; border-radius: 40rpx; -} -.album { - display: flex; - flex-direction: row; - align-items: flex-start; -} -.album__avatar { - background-color: #f3f4f6; - padding: 5px; - border-radius: 3px; -} -.album__content { - margin-left: 10px; - flex: 1; + margin: auto; + margin-right: 60rpx; } \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/project.private.config.json b/unpackage/dist/dev/mp-weixin/project.private.config.json index 700c93f..94d6f2f 100644 --- a/unpackage/dist/dev/mp-weixin/project.private.config.json +++ b/unpackage/dist/dev/mp-weixin/project.private.config.json @@ -2,7 +2,6 @@ "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", "projectname": "gree_leran", "setting": { - "compileHotReLoad": true, - "urlCheck": true + "compileHotReLoad": true } } \ No newline at end of file