diff --git a/dist/dev/mp-weixin/INDEX/me/method.js b/dist/dev/mp-weixin/INDEX/me/method.js index a7f06f9..6227d95 100644 --- a/dist/dev/mp-weixin/INDEX/me/method.js +++ b/dist/dev/mp-weixin/INDEX/me/method.js @@ -43,9 +43,11 @@ const method = { }, handleLogout() { common_libraries_apiLoading.getApiLoading(gen_Apis.Apis.Login.Auth.Logout, {}).then((res) => { + var _a; auth.data = { user: void 0, - selected_house: void 0 + selected_house: void 0, + config: ((_a = auth == null ? void 0 : auth.data) == null ? void 0 : _a.config) || {} }; common_libraries_naviHelper.showToastBack("退出成功！", 1, true); console.log(res); diff --git a/dist/dev/mp-weixin/ME/work_order_home/index.js b/dist/dev/mp-weixin/ME/work_order_home/index.js index bf23be5..5f241d5 100644 --- a/dist/dev/mp-weixin/ME/work_order_home/index.js +++ b/dist/dev/mp-weixin/ME/work_order_home/index.js @@ -1,14 +1,16 @@ "use strict"; const common_vendor = require("../../common/vendor.js"); if (!Array) { + const _easycom_hs_button2 = common_vendor.resolveComponent("hs-button"); const _easycom_uni_icons2 = common_vendor.resolveComponent("uni-icons"); const _easycom_hs_popup2 = common_vendor.resolveComponent("hs-popup"); - (_easycom_uni_icons2 + _easycom_hs_popup2)(); + (_easycom_hs_button2 + _easycom_uni_icons2 + _easycom_hs_popup2)(); } +const _easycom_hs_button = () => "../../components/hs-button/hs-button.js"; const _easycom_uni_icons = () => "../../uni_modules/uni-icons/components/uni-icons/uni-icons.js"; const _easycom_hs_popup = () => "../../components/hs-popup/hs-popup.js"; if (!Math) { - (_easycom_uni_icons + _easycom_hs_popup)(); + (_easycom_hs_button + _easycom_uni_icons + _easycom_hs_popup)(); } const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ __name: "index", @@ -76,37 +78,42 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ return (_ctx, _cache) => { return { a: common_vendor.o(handleSubmissionRecord), - b: common_vendor.f(list, (i, index, i0) => { + b: common_vendor.p({ + size: "md", + type: "primary", + label: "我的提报记录" + }), + c: common_vendor.f(list, (i, index, i0) => { return { a: i.icon, b: common_vendor.t(i.label), c: common_vendor.t(i.des), - d: "af3492ce-0-" + i0, + d: "af3492ce-1-" + i0, e: `item_${index}`, f: common_vendor.o(($event) => handleToPage(i), `item_${index}`) }; }), - c: common_vendor.p({ + d: common_vendor.p({ type: "right", color: "#999", size: "16" }), - d: common_vendor.f(typeList, (i, index, i0) => { + e: common_vendor.f(typeList, (i, index, i0) => { return { a: i.icon, b: common_vendor.t(i.label), - c: "af3492ce-2-" + i0 + ",af3492ce-1", + c: "af3492ce-3-" + i0 + ",af3492ce-2", d: `item_${index}`, e: common_vendor.o(($event) => handleSelectType(i), `item_${index}`) }; }), - e: common_vendor.p({ + f: common_vendor.p({ type: "right", color: "#999", size: "16" }), - f: common_vendor.o(handleClose), - g: common_vendor.p({ + g: common_vendor.o(handleClose), + h: common_vendor.p({ show: showPopup.value, mode: "bottom", closeable: true, diff --git a/dist/dev/mp-weixin/ME/work_order_home/index.json b/dist/dev/mp-weixin/ME/work_order_home/index.json index 4bf9a5f..3e8a421 100644 --- a/dist/dev/mp-weixin/ME/work_order_home/index.json +++ b/dist/dev/mp-weixin/ME/work_order_home/index.json @@ -1,6 +1,7 @@ { "navigationBarTitleText": "工单提报", "usingComponents": { + "hs-button": "../../components/hs-button/hs-button", "uni-icons": "../../uni_modules/uni-icons/components/uni-icons/uni-icons", "hs-popup": "../../components/hs-popup/hs-popup" } diff --git a/dist/dev/mp-weixin/ME/work_order_home/index.wxml b/dist/dev/mp-weixin/ME/work_order_home/index.wxml index 53b0c53..9e16f98 100644 --- a/dist/dev/mp-weixin/ME/work_order_home/index.wxml +++ b/dist/dev/mp-weixin/ME/work_order_home/index.wxml @@ -1 +1 @@ - 工单提报中心 我的提报记录 {{i.b}}{{i.c}} 点击联系及时沟通 选择报修区域 {{i.b}} \ No newline at end of file + 工单提报中心 {{i.b}}{{i.c}} 点击联系及时沟通 选择报修区域 {{i.b}} \ No newline at end of file diff --git a/dist/dev/mp-weixin/ME/work_order_home/index.wxss b/dist/dev/mp-weixin/ME/work_order_home/index.wxss index 2192159..85615b4 100644 --- a/dist/dev/mp-weixin/ME/work_order_home/index.wxss +++ b/dist/dev/mp-weixin/ME/work_order_home/index.wxss @@ -17,15 +17,8 @@ page { color: #333; } .work_order_header_left .work_btn { - color: #fff; padding-top: 40rpx; } -.work_order_header_left .work_btn text { - background-color: #1677ff; - font-size: 30rpx; - padding: 18rpx 25rpx; - border-radius: 100rpx; -} .work_order_header_right { width: 60%; } diff --git a/dist/dev/mp-weixin/common/libraries/getPageConfig.js b/dist/dev/mp-weixin/common/libraries/getPageConfig.js new file mode 100644 index 0000000..d181382 --- /dev/null +++ b/dist/dev/mp-weixin/common/libraries/getPageConfig.js @@ -0,0 +1,37 @@ +"use strict"; +const common_store_useWeAppAuthStore = require("../store/useWeAppAuthStore.js"); +const auth = common_store_useWeAppAuthStore.useWeAppAuthStore(); +function getStyleBgInfo() { + var _a, _b, _c; + let style = (_c = (_b = (_a = auth == null ? void 0 : auth.data) == null ? void 0 : _a.config) == null ? void 0 : _b.companyConfig) == null ? void 0 : _c.config_value; + let color = style == null ? void 0 : style.color; + return { + backgroundColor: color || "#0082fa", + color: "#fff" + }; +} +function getStyleColorInfo() { + var _a, _b, _c; + let style = (_c = (_b = (_a = auth == null ? void 0 : auth.data) == null ? void 0 : _a.config) == null ? void 0 : _b.companyConfig) == null ? void 0 : _c.config_value; + let color = style == null ? void 0 : style.color; + return { + color: color || "#0082fa" + }; +} +function getStyleColorValueInfo() { + var _a, _b, _c; + let style = (_c = (_b = (_a = auth == null ? void 0 : auth.data) == null ? void 0 : _a.config) == null ? void 0 : _b.companyConfig) == null ? void 0 : _c.config_value; + let color = style == null ? void 0 : style.color; + return color || "#0082fa"; +} +function getStyleBgGradientInfo() { + var _a, _b, _c; + let style = (_c = (_b = (_a = auth == null ? void 0 : auth.data) == null ? void 0 : _a.config) == null ? void 0 : _b.companyConfig) == null ? void 0 : _c.config_value; + return { + background: style == null ? void 0 : style.pageColor + }; +} +exports.getStyleBgGradientInfo = getStyleBgGradientInfo; +exports.getStyleBgInfo = getStyleBgInfo; +exports.getStyleColorInfo = getStyleColorInfo; +exports.getStyleColorValueInfo = getStyleColorValueInfo; diff --git a/dist/dev/mp-weixin/common/store/useWeAppAuthStore.js b/dist/dev/mp-weixin/common/store/useWeAppAuthStore.js index 2ed44e0..a064e7d 100644 --- a/dist/dev/mp-weixin/common/store/useWeAppAuthStore.js +++ b/dist/dev/mp-weixin/common/store/useWeAppAuthStore.js @@ -55,9 +55,10 @@ const useWeAppAuthStore = common_vendor.defineStore("we_app_auth", () => { }; function me(fun) { common_libraries_apiLoading.getApiLoading(gen_Apis.Apis.Login.Auth.Me, {}).then((res) => { - var _a; + var _a, _b; data.value.user = res.data.user; - data.value.selected_house = (_a = res.data) == null ? void 0 : _a.selected_house; + data.value.config = (_a = res.data) == null ? void 0 : _a.config; + data.value.selected_house = (_b = res.data) == null ? void 0 : _b.selected_house; console.log("me", res.data); loading.value = false; hasError.value = false; diff --git a/dist/dev/mp-weixin/common/vendor.js b/dist/dev/mp-weixin/common/vendor.js index 354b3be..aa8d32d 100644 --- a/dist/dev/mp-weixin/common/vendor.js +++ b/dist/dev/mp-weixin/common/vendor.js @@ -13050,7 +13050,7 @@ Lexer.prototype.endTag = function() { this.i++; } }; -const props$k = defineMixin({ +const props$i = defineMixin({ props: { // 键盘的类型，number-数字键盘，card-身份证键盘，car-车牌号键盘 mode: { @@ -13348,7 +13348,7 @@ const icons = { "uicon-zh": "", "uicon-en": "" }; -const props$j = defineMixin({ +const props$h = defineMixin({ props: { // 图标类名 name: { @@ -13437,7 +13437,7 @@ const props$j = defineMixin({ } } }); -const props$i = defineMixin({ +const props$g = defineMixin({ props: { // 头像图片路径(不能为相对路径) src: { @@ -13515,7 +13515,7 @@ const props$i = defineMixin({ } } }); -const props$h = defineMixin({ +const props$f = defineMixin({ props: { // 是否虚线 dashed: { @@ -13559,7 +13559,7 @@ const props$h = defineMixin({ } } }); -const props$g = defineMixin({ +const props$e = defineMixin({ props: { // 标题 title: { @@ -13588,7 +13588,7 @@ const props$g = defineMixin({ } } }); -const props$f = defineMixin({ +const props$d = defineMixin({ props: { // 排列方向 direction: { @@ -13627,7 +13627,7 @@ const props$f = defineMixin({ } } }); -const props$e = defineMixin({ +const props$c = defineMixin({ props: { // 是否显示组件 show: { @@ -13686,159 +13686,6 @@ const props$e = defineMixin({ } } }); -const props$d = defineMixin({ - props: { - // checkbox的名称 - name: { - type: [String, Number, Boolean], - default: () => defProps.checkbox.name - }, - // 形状，square为方形，circle为圆型 - shape: { - type: String, - default: () => defProps.checkbox.shape - }, - // 整体的大小 - size: { - type: [String, Number], - default: () => defProps.checkbox.size - }, - // 是否默认选中 - checked: { - type: Boolean, - default: () => defProps.checkbox.checked - }, - // 是否禁用 - disabled: { - type: [String, Boolean], - default: () => defProps.checkbox.disabled - }, - // 选中状态下的颜色，如设置此值，将会覆盖parent的activeColor值 - activeColor: { - type: String, - default: () => defProps.checkbox.activeColor - }, - // 未选中的颜色 - inactiveColor: { - type: String, - default: () => defProps.checkbox.inactiveColor - }, - // 图标的大小，单位px - iconSize: { - type: [String, Number], - default: () => defProps.checkbox.iconSize - }, - // 图标颜色 - iconColor: { - type: String, - default: () => defProps.checkbox.iconColor - }, - // label提示文字，因为nvue下，直接slot进来的文字，由于特殊的结构，无法修改样式 - label: { - type: [String, Number], - default: () => defProps.checkbox.label - }, - // label的字体大小，px单位 - labelSize: { - type: [String, Number], - default: () => defProps.checkbox.labelSize - }, - // label的颜色 - labelColor: { - type: String, - default: () => defProps.checkbox.labelColor - }, - // 是否禁止点击提示语选中复选框 - labelDisabled: { - type: [String, Boolean], - default: () => defProps.checkbox.labelDisabled - }, - // 是否独立使用 - usedAlone: { - type: [Boolean], - default: () => false - } - } -}); -const props$c = defineMixin({ - props: { - // 标识符 - name: { - type: String, - default: () => defProps.checkboxGroup.name - }, - // 绑定的值 - modelValue: { - type: Array, - default: () => defProps.checkboxGroup.value - }, - // 形状，circle-圆形，square-方形 - shape: { - type: String, - default: () => defProps.checkboxGroup.shape - }, - // 是否禁用全部checkbox - disabled: { - type: Boolean, - default: () => defProps.checkboxGroup.disabled - }, - // 选中状态下的颜色，如设置此值，将会覆盖parent的activeColor值 - activeColor: { - type: String, - default: () => defProps.checkboxGroup.activeColor - }, - // 未选中的颜色 - inactiveColor: { - type: String, - default: () => defProps.checkboxGroup.inactiveColor - }, - // 整个组件的尺寸，默认px - size: { - type: [String, Number], - default: () => defProps.checkboxGroup.size - }, - // 布局方式，row-横向，column-纵向 - placement: { - type: String, - default: () => defProps.checkboxGroup.placement - }, - // label的字体大小，px单位 - labelSize: { - type: [String, Number], - default: () => defProps.checkboxGroup.labelSize - }, - // label的字体颜色 - labelColor: { - type: [String], - default: () => defProps.checkboxGroup.labelColor - }, - // 是否禁止点击文本操作 - labelDisabled: { - type: Boolean, - default: () => defProps.checkboxGroup.labelDisabled - }, - // 图标颜色 - iconColor: { - type: String, - default: () => defProps.checkboxGroup.iconColor - }, - // 图标的大小，单位px - iconSize: { - type: [String, Number], - default: () => defProps.checkboxGroup.iconSize - }, - // 勾选图标的对齐方式，left-左边，right-右边 - iconPlacement: { - type: String, - default: () => defProps.checkboxGroup.iconPlacement - }, - // 竖向配列时，是否显示下划线 - borderBottom: { - type: Boolean, - default: () => defProps.checkboxGroup.borderBottom - } - } -}); const props$b = defineMixin({ props: { // 键盘的类型，number-数字键盘，card-身份证键盘 @@ -14528,7 +14375,6 @@ exports.defineStore = defineStore; exports.e = e; exports.error = error; exports.f = f; -exports.formValidate = formValidate; exports.getCurrentInstance = getCurrentInstance; exports.getPx = getPx; exports.getWindowInfo = getWindowInfo; @@ -14551,27 +14397,25 @@ exports.onShow = onShow; exports.onUnload = onUnload; exports.openType = openType; exports.p = p; -exports.props = props$k; -exports.props$1 = props$j; -exports.props$10 = props$a; -exports.props$11 = props$9; -exports.props$12 = props$8; -exports.props$13 = props$7; -exports.props$14 = props$6; -exports.props$15 = props$5; -exports.props$16 = props$4; -exports.props$17 = props$3; -exports.props$18 = props$2; -exports.props$19 = props$1; -exports.props$2 = props$i; -exports.props$20 = props; -exports.props$3 = props$h; -exports.props$4 = props$g; -exports.props$5 = props$f; -exports.props$6 = props$e; -exports.props$7 = props$d; -exports.props$8 = props$c; -exports.props$9 = props$b; +exports.props = props$i; +exports.props$1 = props$h; +exports.props$10 = props$8; +exports.props$11 = props$7; +exports.props$12 = props$6; +exports.props$13 = props$5; +exports.props$14 = props$4; +exports.props$15 = props$3; +exports.props$16 = props$2; +exports.props$17 = props$1; +exports.props$18 = props; +exports.props$2 = props$g; +exports.props$3 = props$f; +exports.props$4 = props$e; +exports.props$5 = props$d; +exports.props$6 = props$c; +exports.props$7 = props$b; +exports.props$8 = props$a; +exports.props$9 = props$9; exports.r = r; exports.random = random; exports.randomArray = randomArray; diff --git a/dist/dev/mp-weixin/components/hs-all-page-bg/hs-all-page-bg.js b/dist/dev/mp-weixin/components/hs-all-page-bg/hs-all-page-bg.js new file mode 100644 index 0000000..b06a30e --- /dev/null +++ b/dist/dev/mp-weixin/components/hs-all-page-bg/hs-all-page-bg.js @@ -0,0 +1,20 @@ +"use strict"; +const common_vendor = require("../../common/vendor.js"); +const common_libraries_getPageConfig = require("../../common/libraries/getPageConfig.js"); +require("../../common/store/useWeAppAuthStore.js"); +require("../../gen/Apis.js"); +require("../../common/libraries/request.js"); +require("../../common/store/useWorkStore.js"); +require("../../common/libraries/apiLoading.js"); +const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ + __name: "hs-all-page-bg", + setup(__props) { + return (_ctx, _cache) => { + return { + a: common_vendor.s(common_vendor.unref(common_libraries_getPageConfig.getStyleBgGradientInfo)()) + }; + }; + } +}); +const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-5d820a60"], ["__file", "/Users/zsq/Sources/github/2025property-pay/pay-customer/src/components/hs-all-page-bg/hs-all-page-bg.vue"]]); +wx.createComponent(Component); diff --git a/dist/dev/mp-weixin/components/hs-all-page-bg/hs-all-page-bg.json b/dist/dev/mp-weixin/components/hs-all-page-bg/hs-all-page-bg.json new file mode 100644 index 0000000..e8cfaaf --- /dev/null +++ b/dist/dev/mp-weixin/components/hs-all-page-bg/hs-all-page-bg.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/dist/dev/mp-weixin/components/hs-all-page-bg/hs-all-page-bg.wxml b/dist/dev/mp-weixin/components/hs-all-page-bg/hs-all-page-bg.wxml new file mode 100644 index 0000000..387d0d6 --- /dev/null +++ b/dist/dev/mp-weixin/components/hs-all-page-bg/hs-all-page-bg.wxml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/dist/dev/mp-weixin/components/hs-all-page-bg/hs-all-page-bg.wxss b/dist/dev/mp-weixin/components/hs-all-page-bg/hs-all-page-bg.wxss new file mode 100644 index 0000000..ec24107 --- /dev/null +++ b/dist/dev/mp-weixin/components/hs-all-page-bg/hs-all-page-bg.wxss @@ -0,0 +1,12 @@ +.home_page_bg.data-v-5d820a60 { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 37%; + z-index: 0; + background: linear-gradient(180deg, rgba(208, 229, 255, 0.44) 0%, rgba(255, 255, 255, 0) 100%), + linear-gradient(146deg, #d3d7ff 0%, rgba(255, 255, 255, 0) 100rpx), + linear-gradient(194deg, #dffff3 0%, #f7f7f7 200rpx); + background-repeat: no-repeat; +} \ No newline at end of file diff --git a/dist/dev/mp-weixin/components/hs-button/hs-button.js b/dist/dev/mp-weixin/components/hs-button/hs-button.js index 95bf8cf..e192d07 100644 --- a/dist/dev/mp-weixin/components/hs-button/hs-button.js +++ b/dist/dev/mp-weixin/components/hs-button/hs-button.js @@ -1,5 +1,11 @@ "use strict"; const common_vendor = require("../../common/vendor.js"); +require("../../common/libraries/request.js"); +const common_store_useWeAppAuthStore = require("../../common/store/useWeAppAuthStore.js"); +require("../../common/store/useWorkStore.js"); +const common_libraries_getPageConfig = require("../../common/libraries/getPageConfig.js"); +require("../../gen/Apis.js"); +require("../../common/libraries/apiLoading.js"); if (!Array) { const _easycom_uni_icons2 = common_vendor.resolveComponent("uni-icons"); const _easycom_up_loading_icon2 = common_vendor.resolveComponent("up-loading-icon"); @@ -27,6 +33,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ emits: ["click", "onGetPhoneNumber"], setup(__props, { emit }) { const props = __props; + const auth = common_store_useWeAppAuthStore.useWeAppAuthStore(); const handleClick = () => { emit("click"); }; @@ -36,6 +43,16 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ emit("onGetPhoneNumber", e); } }; + const getStyleInfo = () => { + var _a, _b, _c, _d; + let style = (_c = (_b = (_a = auth == null ? void 0 : auth.data) == null ? void 0 : _a.config) == null ? void 0 : _b.companyConfig) == null ? void 0 : _c.config_value; + (_d = style == null ? void 0 : style.color) == null ? void 0 : _d.metaColor; + return { + ...props.buttonStyle, + ...common_libraries_getPageConfig.getStyleBgInfo(), + color: "#fff" + }; + }; return (_ctx, _cache) => { return common_vendor.e({ a: props == null ? void 0 : props.icon @@ -55,7 +72,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ } : {}, { e: common_vendor.t((props == null ? void 0 : props.loading_label) || (props == null ? void 0 : props.label) || "我是按钮"), f: common_vendor.n((props == null ? void 0 : props.loading) || (props == null ? void 0 : props.icon) ? "btn_text" : ""), - g: common_vendor.s(props.buttonStyle), + g: common_vendor.s(getStyleInfo()), h: (props == null ? void 0 : props.openType) || "", i: common_vendor.n(`nchl_button ${props == null ? void 0 : props.type}_button ${(props == null ? void 0 : props.size) || "sm"}_size`), j: common_vendor.o(handleClick), diff --git a/dist/dev/mp-weixin/components/hs-popup-custom/hs-popup-custom.wxml b/dist/dev/mp-weixin/components/hs-popup-custom/hs-popup-custom.wxml index 8612796..43f5205 100644 --- a/dist/dev/mp-weixin/components/hs-popup-custom/hs-popup-custom.wxml +++ b/dist/dev/mp-weixin/components/hs-popup-custom/hs-popup-custom.wxml @@ -1 +1 @@ -{{a}} \ No newline at end of file +{{a}} \ No newline at end of file diff --git a/dist/dev/mp-weixin/components/hs-popup-custom/hs-popup-custom.wxss b/dist/dev/mp-weixin/components/hs-popup-custom/hs-popup-custom.wxss index 51f9449..26bce63 100644 --- a/dist/dev/mp-weixin/components/hs-popup-custom/hs-popup-custom.wxss +++ b/dist/dev/mp-weixin/components/hs-popup-custom/hs-popup-custom.wxss @@ -2,7 +2,7 @@ padding-bottom: calc(env(safe-area-inset-bottom) + 48px) !important; } .bind_house_popup_content.data-v-3deba21b { - background: linear-gradient(180deg, #d9e7ff 0%, #fdfeff 26%, #ffffff 47%); + background-color: #fff; width: 618rpx; padding: 0 0 20rpx 0; border-radius: 40rpx; diff --git a/dist/dev/mp-weixin/components/hs-popup-switch-house/hs-popup-switch-house.js b/dist/dev/mp-weixin/components/hs-popup-switch-house/hs-popup-switch-house.js index f1fa6d2..5afb99b 100644 --- a/dist/dev/mp-weixin/components/hs-popup-switch-house/hs-popup-switch-house.js +++ b/dist/dev/mp-weixin/components/hs-popup-switch-house/hs-popup-switch-house.js @@ -1,5 +1,6 @@ "use strict"; const common_vendor = require("../../common/vendor.js"); +const common_libraries_getPageConfig = require("../../common/libraries/getPageConfig.js"); const common_libraries_userUserLogin = require("../../common/libraries/userUserLogin.js"); const common_libraries_naviHelper = require("../../common/libraries/naviHelper.js"); const common_libraries_apiLoading = require("../../common/libraries/apiLoading.js"); @@ -94,7 +95,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ f: common_vendor.p({ type: "checkbox-filled", size: "20", - color: "#2A7EFB" + color: common_vendor.unref(common_libraries_getPageConfig.getStyleColorValueInfo)() }) } : { g: "22fbb487-3-" + i0 + ",22fbb487-0", diff --git a/dist/dev/mp-weixin/components/hs-popup-switch-house/hs-popup-switch-house.wxss b/dist/dev/mp-weixin/components/hs-popup-switch-house/hs-popup-switch-house.wxss index a12eaa2..655d3ee 100644 --- a/dist/dev/mp-weixin/components/hs-popup-switch-house/hs-popup-switch-house.wxss +++ b/dist/dev/mp-weixin/components/hs-popup-switch-house/hs-popup-switch-house.wxss @@ -1,5 +1,5 @@ .popup_content.data-v-22fbb487 { - background: linear-gradient(180deg, rgba(208, 229, 255, 0.44) 0%, rgba(255, 255, 255, 0) 56%), linear-gradient(159deg, #d3d7ff 0%, rgba(255, 255, 255, 0) 35%), linear-gradient(193deg, #dffff3 -4%, #f7f7f7 37%); + background-color: #f8f8f8; min-height: 500rpx; padding-bottom: 30rpx; border-top-left-radius: 30rpx; diff --git a/dist/dev/mp-weixin/components/hs-private-policy/hs-private-policy.js b/dist/dev/mp-weixin/components/hs-private-policy/hs-private-policy.js index 937e373..da99b1a 100644 --- a/dist/dev/mp-weixin/components/hs-private-policy/hs-private-policy.js +++ b/dist/dev/mp-weixin/components/hs-private-policy/hs-private-policy.js @@ -1,15 +1,11 @@ "use strict"; const common_vendor = require("../../common/vendor.js"); -if (!Array) { - const _easycom_u_checkbox2 = common_vendor.resolveComponent("u-checkbox"); - const _easycom_u_checkbox_group2 = common_vendor.resolveComponent("u-checkbox-group"); - (_easycom_u_checkbox2 + _easycom_u_checkbox_group2)(); -} -const _easycom_u_checkbox = () => "../../node-modules/uview-plus/components/u-checkbox/u-checkbox.js"; -const _easycom_u_checkbox_group = () => "../../node-modules/uview-plus/components/u-checkbox-group/u-checkbox-group.js"; -if (!Math) { - (_easycom_u_checkbox + _easycom_u_checkbox_group)(); -} +const common_libraries_getPageConfig = require("../../common/libraries/getPageConfig.js"); +require("../../common/store/useWeAppAuthStore.js"); +require("../../gen/Apis.js"); +require("../../common/libraries/request.js"); +require("../../common/store/useWorkStore.js"); +require("../../common/libraries/apiLoading.js"); const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ __name: "hs-private-policy", props: { @@ -34,6 +30,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ setup(__props, { emit }) { const props = __props; const isAgree = common_vendor.ref([]); + const checked = common_vendor.ref(false); if (props.isAgree) { isAgree.value = ["isAgree"]; } else { @@ -53,37 +50,27 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ emit("clickPolicy"); }; const handleAgreePrivatePolicy = () => { - var _a; if (props.isDisabled) { emit("clickCheckbox"); - isAgree.value = []; emit("update:isAgree", false); return; } - let checkbox = false; - if ((_a = isAgree.value) == null ? void 0 : _a.length) { - isAgree.value = []; - checkbox = false; + console.log(isAgree.value, "isAgree.value"); + if (checked.value) { + checked.value = false; } else { - isAgree.value = ["isAgree"]; - checkbox = true; + checked.value = true; } - emit("update:isAgree", checkbox); + emit("update:isAgree", checked.value); }; return (_ctx, _cache) => { return { - a: common_vendor.p({ - shape: "circle", - activeColor: props == null ? void 0 : props.activeColor, - name: "isAgree" - }), - b: common_vendor.o(handleAgreePrivatePolicy), - c: common_vendor.p({ - modelValue: isAgree.value - }), - d: common_vendor.o(handleAgreePrivatePolicy), - e: common_vendor.t(props.policyName), - f: common_vendor.o(onPolicy) + a: checked.value, + b: common_vendor.unref(common_libraries_getPageConfig.getStyleColorValueInfo)(), + c: common_vendor.o(handleAgreePrivatePolicy), + d: common_vendor.t(props.policyName), + e: common_vendor.o(onPolicy), + f: common_vendor.s(common_vendor.unref(common_libraries_getPageConfig.getStyleColorInfo)()) }; }; } diff --git a/dist/dev/mp-weixin/components/hs-private-policy/hs-private-policy.json b/dist/dev/mp-weixin/components/hs-private-policy/hs-private-policy.json index 18482ba..e8cfaaf 100644 --- a/dist/dev/mp-weixin/components/hs-private-policy/hs-private-policy.json +++ b/dist/dev/mp-weixin/components/hs-private-policy/hs-private-policy.json @@ -1,7 +1,4 @@ { "component": true, - "usingComponents": { - "u-checkbox": "../../node-modules/uview-plus/components/u-checkbox/u-checkbox", - "u-checkbox-group": "../../node-modules/uview-plus/components/u-checkbox-group/u-checkbox-group" - } + "usingComponents": {} } \ No newline at end of file diff --git a/dist/dev/mp-weixin/components/hs-private-policy/hs-private-policy.wxml b/dist/dev/mp-weixin/components/hs-private-policy/hs-private-policy.wxml index 7ff446a..d1e6888 100644 --- a/dist/dev/mp-weixin/components/hs-private-policy/hs-private-policy.wxml +++ b/dist/dev/mp-weixin/components/hs-private-policy/hs-private-policy.wxml @@ -1 +1 @@ -我已阅读并同意{{e}} \ No newline at end of file +{{d}} \ No newline at end of file diff --git a/dist/dev/mp-weixin/components/hs-private-policy/hs-private-policy.wxss b/dist/dev/mp-weixin/components/hs-private-policy/hs-private-policy.wxss index b8a9c1a..d6f4caf 100644 --- a/dist/dev/mp-weixin/components/hs-private-policy/hs-private-policy.wxss +++ b/dist/dev/mp-weixin/components/hs-private-policy/hs-private-policy.wxss @@ -5,6 +5,8 @@ } .privatePolicy .scal-box.data-v-48e3a8c0 { transform: scale(0.9); +} +.privatePolicy .scal-box .radio.data-v-48e3a8c0 { display: flex; align-items: center; } diff --git a/dist/dev/mp-weixin/components/hs-radio/hs-radio.js b/dist/dev/mp-weixin/components/hs-radio/hs-radio.js index 74d2de4..87c2146 100644 --- a/dist/dev/mp-weixin/components/hs-radio/hs-radio.js +++ b/dist/dev/mp-weixin/components/hs-radio/hs-radio.js @@ -1,5 +1,11 @@ "use strict"; const common_vendor = require("../../common/vendor.js"); +const common_libraries_getPageConfig = require("../../common/libraries/getPageConfig.js"); +require("../../common/store/useWeAppAuthStore.js"); +require("../../gen/Apis.js"); +require("../../common/libraries/request.js"); +require("../../common/store/useWorkStore.js"); +require("../../common/libraries/apiLoading.js"); const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ __name: "hs-radio", props: [ @@ -15,6 +21,12 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ setup(__props, { emit }) { const props = __props; const selectValue = common_vendor.ref(""); + const getStyleInfo = () => { + return { + ...props.selectStyle, + ...common_libraries_getPageConfig.getStyleBgInfo() + }; + }; const getEnums = () => { let list = Object.entries(props == null ? void 0 : props.Enums).map( ([_key, value]) => ({ @@ -53,8 +65,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ return { a: common_vendor.t(i == null ? void 0 : i.text), b: `item_${index}`, - c: common_vendor.n(`item item_${props == null ? void 0 : props.size} ${(i == null ? void 0 : i.value) === (props == null ? void 0 : props.valueModel) || (i == null ? void 0 : i.value) === selectValue.value ? "active" : ""} ${((_a = props == null ? void 0 : props.disableds) == null ? void 0 : _a.includes(i == null ? void 0 : i.value)) ? "disabled" : ""}`), - d: common_vendor.s((i == null ? void 0 : i.value) === (props == null ? void 0 : props.valueModel) || (i == null ? void 0 : i.value) === selectValue.value ? props == null ? void 0 : props.selectStyle : ""), + c: common_vendor.n(`item item_${props == null ? void 0 : props.size} ${((_a = props == null ? void 0 : props.disableds) == null ? void 0 : _a.includes(i == null ? void 0 : i.value)) ? "disabled" : ""}`), + d: common_vendor.s((i == null ? void 0 : i.value) === (props == null ? void 0 : props.valueModel) || (i == null ? void 0 : i.value) === selectValue.value ? getStyleInfo() : ""), e: common_vendor.o(($event) => onClick(i), `item_${index}`) }; }), diff --git a/dist/dev/mp-weixin/components/hs-tabs/hs-tabs.js b/dist/dev/mp-weixin/components/hs-tabs/hs-tabs.js index 5882014..cecfbd9 100644 --- a/dist/dev/mp-weixin/components/hs-tabs/hs-tabs.js +++ b/dist/dev/mp-weixin/components/hs-tabs/hs-tabs.js @@ -1,5 +1,11 @@ "use strict"; const common_vendor = require("../../common/vendor.js"); +const common_libraries_getPageConfig = require("../../common/libraries/getPageConfig.js"); +require("../../common/store/useWeAppAuthStore.js"); +require("../../gen/Apis.js"); +require("../../common/libraries/request.js"); +require("../../common/store/useWorkStore.js"); +require("../../common/libraries/apiLoading.js"); const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ __name: "hs-tabs", props: ["current", "list", "no_space_between"], @@ -19,12 +25,13 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ d: common_vendor.o(($event) => handleClick(index, i), `item_${index}`) }; }), - b: common_vendor.s((props == null ? void 0 : props.no_space_between) ? { + b: common_vendor.s(common_vendor.unref(common_libraries_getPageConfig.getStyleBgInfo)()), + c: common_vendor.s((props == null ? void 0 : props.no_space_between) ? { "margin-left": "30rpx" } : { flex: 1 }), - c: common_vendor.s((props == null ? void 0 : props.no_space_between) ? "" : { + d: common_vendor.s((props == null ? void 0 : props.no_space_between) ? "" : { "justify-content": "space-between" }) }; diff --git a/dist/dev/mp-weixin/components/hs-tabs/hs-tabs.wxml b/dist/dev/mp-weixin/components/hs-tabs/hs-tabs.wxml index fdfbe79..63dd83e 100644 --- a/dist/dev/mp-weixin/components/hs-tabs/hs-tabs.wxml +++ b/dist/dev/mp-weixin/components/hs-tabs/hs-tabs.wxml @@ -1 +1 @@ -{{i.a}} \ No newline at end of file +{{i.a}} \ No newline at end of file diff --git a/dist/dev/mp-weixin/node-modules/uview-plus/components/u-badge/u-badge.js b/dist/dev/mp-weixin/node-modules/uview-plus/components/u-badge/u-badge.js index 334d780..458a066 100644 --- a/dist/dev/mp-weixin/node-modules/uview-plus/components/u-badge/u-badge.js +++ b/dist/dev/mp-weixin/node-modules/uview-plus/components/u-badge/u-badge.js @@ -2,7 +2,7 @@ const common_vendor = require("../../../../common/vendor.js"); const _sfc_main = { name: "u-badge", - mixins: [common_vendor.mpMixin, common_vendor.props$19, common_vendor.mixin], + mixins: [common_vendor.mpMixin, common_vendor.props$17, common_vendor.mixin], computed: { // 是否将badge中心与父组件右上角重合 boxStyle() { diff --git a/dist/dev/mp-weixin/node-modules/uview-plus/components/u-car-keyboard/u-car-keyboard.js b/dist/dev/mp-weixin/node-modules/uview-plus/components/u-car-keyboard/u-car-keyboard.js index 979a8e9..ba7d7b4 100644 --- a/dist/dev/mp-weixin/node-modules/uview-plus/components/u-car-keyboard/u-car-keyboard.js +++ b/dist/dev/mp-weixin/node-modules/uview-plus/components/u-car-keyboard/u-car-keyboard.js @@ -2,7 +2,7 @@ const common_vendor = require("../../../../common/vendor.js"); const _sfc_main = { name: "u-car-keyboard", - mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$10], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$8], data() { return { // 车牌输入时，abc=true为输入车牌号码，bac=false为输入省份中文简称 diff --git a/dist/dev/mp-weixin/node-modules/uview-plus/components/u-line/u-line.js b/dist/dev/mp-weixin/node-modules/uview-plus/components/u-line/u-line.js index 9161c66..b47975a 100644 --- a/dist/dev/mp-weixin/node-modules/uview-plus/components/u-line/u-line.js +++ b/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$14], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$12], computed: { lineStyle() { const style = {}; diff --git a/dist/dev/mp-weixin/node-modules/uview-plus/components/u-link/u-link.js b/dist/dev/mp-weixin/node-modules/uview-plus/components/u-link/u-link.js index 49b4b1a..081dd7e 100644 --- a/dist/dev/mp-weixin/node-modules/uview-plus/components/u-link/u-link.js +++ b/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$20], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$18], computed: { linkStyle() { const style = { diff --git a/dist/dev/mp-weixin/node-modules/uview-plus/components/u-number-keyboard/u-number-keyboard.js b/dist/dev/mp-weixin/node-modules/uview-plus/components/u-number-keyboard/u-number-keyboard.js index d7d130e..652844a 100644 --- a/dist/dev/mp-weixin/node-modules/uview-plus/components/u-number-keyboard/u-number-keyboard.js +++ b/dist/dev/mp-weixin/node-modules/uview-plus/components/u-number-keyboard/u-number-keyboard.js @@ -2,7 +2,7 @@ const common_vendor = require("../../../../common/vendor.js"); const _sfc_main = { name: "u-number-keyboard", - mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$9], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$7], data() { return { backspace: "backspace", diff --git a/dist/dev/mp-weixin/node-modules/uview-plus/components/u-overlay/u-overlay.js b/dist/dev/mp-weixin/node-modules/uview-plus/components/u-overlay/u-overlay.js index 6a51da4..c62331f 100644 --- a/dist/dev/mp-weixin/node-modules/uview-plus/components/u-overlay/u-overlay.js +++ b/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$15], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$13], computed: { overlayStyle() { const style = { diff --git a/dist/dev/mp-weixin/node-modules/uview-plus/components/u-popup/u-popup.js b/dist/dev/mp-weixin/node-modules/uview-plus/components/u-popup/u-popup.js index 4501f9c..d3cfda3 100644 --- a/dist/dev/mp-weixin/node-modules/uview-plus/components/u-popup/u-popup.js +++ b/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$11], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$9], data() { return { overlayDuration: this.duration + 50 diff --git a/dist/dev/mp-weixin/node-modules/uview-plus/components/u-safe-bottom/u-safe-bottom.js b/dist/dev/mp-weixin/node-modules/uview-plus/components/u-safe-bottom/u-safe-bottom.js index ac1668d..baa78f4 100644 --- a/dist/dev/mp-weixin/node-modules/uview-plus/components/u-safe-bottom/u-safe-bottom.js +++ b/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$17], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$15], data() { return { safeAreaBottomHeight: 0, diff --git a/dist/dev/mp-weixin/node-modules/uview-plus/components/u-status-bar/u-status-bar.js b/dist/dev/mp-weixin/node-modules/uview-plus/components/u-status-bar/u-status-bar.js index 253c96f..60f7009 100644 --- a/dist/dev/mp-weixin/node-modules/uview-plus/components/u-status-bar/u-status-bar.js +++ b/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$16], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$14], data() { return { isH5: true diff --git a/dist/dev/mp-weixin/node-modules/uview-plus/components/u-tabs/u-tabs.js b/dist/dev/mp-weixin/node-modules/uview-plus/components/u-tabs/u-tabs.js index ba9dc25..5423862 100644 --- a/dist/dev/mp-weixin/node-modules/uview-plus/components/u-tabs/u-tabs.js +++ b/dist/dev/mp-weixin/node-modules/uview-plus/components/u-tabs/u-tabs.js @@ -2,7 +2,7 @@ const common_vendor = require("../../../../common/vendor.js"); const _sfc_main = { name: "u-tabs", - mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$12], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.props$10], data() { return { firstTime: true, diff --git a/dist/dev/mp-weixin/node-modules/uview-plus/components/u-text/u-text.js b/dist/dev/mp-weixin/node-modules/uview-plus/components/u-text/u-text.js index 21403cb..3e1b236 100644 --- a/dist/dev/mp-weixin/node-modules/uview-plus/components/u-text/u-text.js +++ b/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: "up-text", - mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.value, common_vendor.buttonMixin, common_vendor.openType, common_vendor.props$13], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.value, common_vendor.buttonMixin, common_vendor.openType, common_vendor.props$11], emits: ["click"], computed: { wrapStyle() { diff --git a/dist/dev/mp-weixin/node-modules/uview-plus/components/u-transition/u-transition.js b/dist/dev/mp-weixin/node-modules/uview-plus/components/u-transition/u-transition.js index acc8cd4..c32002f 100644 --- a/dist/dev/mp-weixin/node-modules/uview-plus/components/u-transition/u-transition.js +++ b/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.transitionMixin, common_vendor.props$18], + mixins: [common_vendor.mpMixin, common_vendor.mixin, common_vendor.transitionMixin, common_vendor.props$16], watch: { show: { handler(newVal) { diff --git a/dist/dev/mp-weixin/pages/index/components/AiInput.js b/dist/dev/mp-weixin/pages/index/components/AiInput.js index 8bdd193..f6e9d72 100644 --- a/dist/dev/mp-weixin/pages/index/components/AiInput.js +++ b/dist/dev/mp-weixin/pages/index/components/AiInput.js @@ -1,6 +1,12 @@ "use strict"; const common_vendor = require("../../../common/vendor.js"); const common_libraries_naviHelper = require("../../../common/libraries/naviHelper.js"); +const common_libraries_getPageConfig = require("../../../common/libraries/getPageConfig.js"); +require("../../../common/store/useWeAppAuthStore.js"); +require("../../../gen/Apis.js"); +require("../../../common/libraries/request.js"); +require("../../../common/store/useWorkStore.js"); +require("../../../common/libraries/apiLoading.js"); if (!Array) { const _easycom_uni_icons2 = common_vendor.resolveComponent("uni-icons"); _easycom_uni_icons2(); @@ -17,11 +23,12 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ }; return (_ctx, _cache) => { return { - a: common_vendor.o(handleInputChange), - b: common_vendor.p({ + a: common_vendor.s(common_vendor.unref(common_libraries_getPageConfig.getStyleColorInfo)()), + b: common_vendor.o(handleInputChange), + c: common_vendor.p({ type: "arrow-right", size: "20", - color: "#2A7EFB" + color: common_vendor.unref(common_libraries_getPageConfig.getStyleColorValueInfo)() }) }; }; diff --git a/dist/dev/mp-weixin/pages/index/components/AiInput.wxml b/dist/dev/mp-weixin/pages/index/components/AiInput.wxml index 6cf4ab7..1a7a437 100644 --- a/dist/dev/mp-weixin/pages/index/components/AiInput.wxml +++ b/dist/dev/mp-weixin/pages/index/components/AiInput.wxml @@ -1 +1 @@ -HI，遇到什么问题了，可以问我哦～ 房屋缴费 工单查询 房屋绑定 钱包 \ No newline at end of file +HI，遇到什么问题了，可以问我哦～ 房屋缴费 工单查询 房屋绑定 钱包 \ No newline at end of file diff --git a/dist/dev/mp-weixin/pages/index/components/ModalServer.wxss b/dist/dev/mp-weixin/pages/index/components/ModalServer.wxss index f0102ae..f25a8f8 100644 --- a/dist/dev/mp-weixin/pages/index/components/ModalServer.wxss +++ b/dist/dev/mp-weixin/pages/index/components/ModalServer.wxss @@ -10,7 +10,7 @@ } .popup_custom_content .bind_house_popup_footer .bind_house_popup_footer_later.data-v-2231cc67 { text-align: center; - color: #3c5b86; + color: #000; font-size: 28rpx; padding: 30rpx 0; } diff --git a/dist/dev/mp-weixin/pages/index/components/Tabs.js b/dist/dev/mp-weixin/pages/index/components/Tabs.js index ef570d4..72ba812 100644 --- a/dist/dev/mp-weixin/pages/index/components/Tabs.js +++ b/dist/dev/mp-weixin/pages/index/components/Tabs.js @@ -5,6 +5,7 @@ const gen_Apis = require("../../../gen/Apis.js"); require("../../../common/libraries/request.js"); const common_store_useWeAppAuthStore = require("../../../common/store/useWeAppAuthStore.js"); require("../../../common/store/useWorkStore.js"); +const common_libraries_getPageConfig = require("../../../common/libraries/getPageConfig.js"); if (!Array) { const _easycom_cc_scroll_loading2 = common_vendor.resolveComponent("cc-scroll-loading"); _easycom_cc_scroll_loading2(); @@ -67,10 +68,12 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ return common_vendor.e({ a: common_vendor.t(i == null ? void 0 : i.label), b: index === current.value - }, index === current.value ? {} : {}, { - c: `tab_${index}`, - d: common_vendor.n(`tab_item ${index === current.value ? "tab_active" : ""}`), - e: common_vendor.o(($event) => handleTabClick(index), `tab_${index}`) + }, index === current.value ? { + c: common_vendor.s(common_vendor.unref(common_libraries_getPageConfig.getStyleBgInfo)()) + } : {}, { + d: `tab_${index}`, + e: common_vendor.n(`tab_item ${index === current.value ? "tab_active" : ""}`), + f: common_vendor.o(($event) => handleTabClick(index), `tab_${index}`) }); }), b: current.value === 0 diff --git a/dist/dev/mp-weixin/pages/index/components/Tabs.wxml b/dist/dev/mp-weixin/pages/index/components/Tabs.wxml index f36c6d8..a3fea99 100644 --- a/dist/dev/mp-weixin/pages/index/components/Tabs.wxml +++ b/dist/dev/mp-weixin/pages/index/components/Tabs.wxml @@ -1 +1 @@ -{{i.a}} \ No newline at end of file +{{i.a}} \ No newline at end of file diff --git a/dist/dev/mp-weixin/pages/index/index.js b/dist/dev/mp-weixin/pages/index/index.js index 8924dfa..6619081 100644 --- a/dist/dev/mp-weixin/pages/index/index.js +++ b/dist/dev/mp-weixin/pages/index/index.js @@ -8,8 +8,13 @@ const common_libraries_userUserLogin = require("../../common/libraries/userUserL const pages_index_method = require("./method.js"); require("../../gen/Apis.js"); require("../../common/libraries/apiLoading.js"); +if (!Array) { + const _easycom_hs_all_page_bg2 = common_vendor.resolveComponent("hs-all-page-bg"); + _easycom_hs_all_page_bg2(); +} +const _easycom_hs_all_page_bg = () => "../../components/hs-all-page-bg/hs-all-page-bg.js"; if (!Math) { - (MyPageHeadTitle + MyPageBanner + MyClassification + MyNewsList + MyAiInput + MyTabs + MyModalServer + MyOfficialAccount)(); + (_easycom_hs_all_page_bg + MyPageHeadTitle + MyPageBanner + MyClassification + MyNewsList + MyAiInput + MyTabs + MyModalServer + MyOfficialAccount)(); } const MyNewsList = () => "./components/NewsList.js"; const MyPageHeadTitle = () => "./components/PageHeadTitle.js"; @@ -58,10 +63,7 @@ const _sfc_defineComponent = /* @__PURE__ */ common_vendor.defineComponent({ }; }); return (_ctx, _cache) => { - var _a, _b, _c; - return { - a: common_vendor.s(`background:${(_c = (_b = (_a = common_vendor.unref(pages_index_model.useModel)) == null ? void 0 : _a.pageConfig) == null ? void 0 : _b.value) == null ? void 0 : _c.pageColor}`) - }; + return {}; }; } }); diff --git a/dist/dev/mp-weixin/pages/index/index.json b/dist/dev/mp-weixin/pages/index/index.json index 5b8868d..6236ae9 100644 --- a/dist/dev/mp-weixin/pages/index/index.json +++ b/dist/dev/mp-weixin/pages/index/index.json @@ -2,6 +2,7 @@ "navigationBarTitleText": "首页", "navigationStyle": "custom", "usingComponents": { + "hs-all-page-bg": "../../components/hs-all-page-bg/hs-all-page-bg", "my-news-list": "./components/NewsList", "my-page-head-title": "./components/PageHeadTitle", "my-page-banner": "./components/PageBanner", diff --git a/dist/dev/mp-weixin/pages/index/index.wxml b/dist/dev/mp-weixin/pages/index/index.wxml index 9045f21..256ece7 100644 --- a/dist/dev/mp-weixin/pages/index/index.wxml +++ b/dist/dev/mp-weixin/pages/index/index.wxml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/dist/dev/mp-weixin/pages/index/index.wxss b/dist/dev/mp-weixin/pages/index/index.wxss index 8282dd8..afca355 100644 --- a/dist/dev/mp-weixin/pages/index/index.wxss +++ b/dist/dev/mp-weixin/pages/index/index.wxss @@ -1,16 +1,6 @@ page { background-color: #f8f8f8; } -.home_page_bg { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 37%; - z-index: 0; - background: linear-gradient(180deg, rgba(208, 229, 255, 0.44) 0%, rgba(255, 255, 255, 0) 100%), linear-gradient(146deg, #d3d7ff 0%, rgba(255, 255, 255, 0) 100rpx), linear-gradient(194deg, #dffff3 0%, #f7f7f7 200rpx); - background-repeat: no-repeat; -} .home_page_content { position: relative; z-index: 10; diff --git a/dist/dev/mp-weixin/pages/login.js b/dist/dev/mp-weixin/pages/login.js index 858edac..754c4d0 100644 --- a/dist/dev/mp-weixin/pages/login.js +++ b/dist/dev/mp-weixin/pages/login.js @@ -6,16 +6,18 @@ require("../common/store/useWorkStore.js"); require("../gen/Apis.js"); require("../common/libraries/apiLoading.js"); if (!Array) { + const _easycom_hs_all_page_bg2 = common_vendor.resolveComponent("hs-all-page-bg"); const _easycom_uni_icons2 = common_vendor.resolveComponent("uni-icons"); const _easycom_hs_button2 = common_vendor.resolveComponent("hs-button"); const _easycom_hs_private_policy2 = common_vendor.resolveComponent("hs-private-policy"); - (_easycom_uni_icons2 + _easycom_hs_button2 + _easycom_hs_private_policy2)(); + (_easycom_hs_all_page_bg2 + _easycom_uni_icons2 + _easycom_hs_button2 + _easycom_hs_private_policy2)(); } +const _easycom_hs_all_page_bg = () => "../components/hs-all-page-bg/hs-all-page-bg.js"; const _easycom_uni_icons = () => "../uni_modules/uni-icons/components/uni-icons/uni-icons.js"; const _easycom_hs_button = () => "../components/hs-button/hs-button.js"; const _easycom_hs_private_policy = () => "../components/hs-private-policy/hs-private-policy.js"; if (!Math) { - (_easycom_uni_icons + _easycom_hs_button + _easycom_hs_private_policy)(); + (_easycom_hs_all_page_bg + _easycom_uni_icons + _easycom_hs_button + _easycom_hs_private_policy)(); } const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ __name: "login", diff --git a/dist/dev/mp-weixin/pages/login.json b/dist/dev/mp-weixin/pages/login.json index fb745d8..4d77c22 100644 --- a/dist/dev/mp-weixin/pages/login.json +++ b/dist/dev/mp-weixin/pages/login.json @@ -2,6 +2,7 @@ "navigationBarTitleText": "登录/注册", "navigationStyle": "custom", "usingComponents": { + "hs-all-page-bg": "../components/hs-all-page-bg/hs-all-page-bg", "uni-icons": "../uni_modules/uni-icons/components/uni-icons/uni-icons", "hs-button": "../components/hs-button/hs-button", "hs-private-policy": "../components/hs-private-policy/hs-private-policy" diff --git a/dist/dev/mp-weixin/pages/login.wxml b/dist/dev/mp-weixin/pages/login.wxml index e4c5f50..cbb10a8 100644 --- a/dist/dev/mp-weixin/pages/login.wxml +++ b/dist/dev/mp-weixin/pages/login.wxml @@ -1 +1 @@ - 欢迎登录邻里壹站 \ No newline at end of file + \ No newline at end of file diff --git a/dist/dev/mp-weixin/pages/login.wxss b/dist/dev/mp-weixin/pages/login.wxss index 01e9e9c..22f4df8 100644 --- a/dist/dev/mp-weixin/pages/login.wxss +++ b/dist/dev/mp-weixin/pages/login.wxss @@ -2,6 +2,10 @@ background: linear-gradient(180deg, rgba(208, 229, 255, 0.44) 0%, rgba(255, 255, 255, 0) 100%), linear-gradient(146deg, #d3d7ff 0%, rgba(255, 255, 255, 0) 400rpx), linear-gradient(194deg, #dffff3 0%, #ffffff 600rpx); padding-top: 350rpx; } +.login_content_box { + position: relative; + z-index: 10; +} .login_header_back_btn { position: fixed; top: 0; diff --git a/dist/dev/mp-weixin/pages/me/index.js b/dist/dev/mp-weixin/pages/me/index.js index 9707327..801db67 100644 --- a/dist/dev/mp-weixin/pages/me/index.js +++ b/dist/dev/mp-weixin/pages/me/index.js @@ -8,8 +8,13 @@ const pages_me_method = require("./method.js"); const common_libraries_userUserLogin = require("../../common/libraries/userUserLogin.js"); require("../../gen/Apis.js"); require("../../common/libraries/apiLoading.js"); +if (!Array) { + const _easycom_hs_all_page_bg2 = common_vendor.resolveComponent("hs-all-page-bg"); + _easycom_hs_all_page_bg2(); +} +const _easycom_hs_all_page_bg = () => "../../components/hs-all-page-bg/hs-all-page-bg.js"; if (!Math) { - (MyHeader + MyAreaFunctional + MyToBeDone)(); + (_easycom_hs_all_page_bg + MyHeader + MyAreaFunctional + MyToBeDone)(); } const MyHeader = () => "./components/header.js"; const MyAreaFunctional = () => "./components/AreaFunctional.js"; diff --git a/dist/dev/mp-weixin/pages/me/index.json b/dist/dev/mp-weixin/pages/me/index.json index 32a1e8b..34004bb 100644 --- a/dist/dev/mp-weixin/pages/me/index.json +++ b/dist/dev/mp-weixin/pages/me/index.json @@ -2,6 +2,7 @@ "navigationBarTitleText": "个人中心", "navigationStyle": "custom", "usingComponents": { + "hs-all-page-bg": "../../components/hs-all-page-bg/hs-all-page-bg", "my-header": "./components/header", "my-area-functional": "./components/AreaFunctional", "my-to-be-done": "./components/ToBeDone" diff --git a/dist/dev/mp-weixin/pages/me/index.wxml b/dist/dev/mp-weixin/pages/me/index.wxml index 85b6e1e..811a54c 100644 --- a/dist/dev/mp-weixin/pages/me/index.wxml +++ b/dist/dev/mp-weixin/pages/me/index.wxml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/dist/dev/mp-weixin/pages/me/index.wxss b/dist/dev/mp-weixin/pages/me/index.wxss index 3544457..f9f9e98 100644 --- a/dist/dev/mp-weixin/pages/me/index.wxss +++ b/dist/dev/mp-weixin/pages/me/index.wxss @@ -5,6 +5,10 @@ page { background: linear-gradient(180deg, rgba(208, 229, 255, 0.44) 0%, rgba(255, 255, 255, 0) 450rpx), linear-gradient(146deg, #d3d7ff 0%, rgba(255, 255, 255, 0) 300rpx), linear-gradient(194deg, #dffff3 0%, #f7f7f7 450rpx); background-repeat: no-repeat; } +.me_page_content { + position: relative; + z-index: 10; +} button:after { border: none !important; } \ No newline at end of file diff --git a/src/INDEX/me/method.ts b/src/INDEX/me/method.ts index 6671b61..ef19666 100644 --- a/src/INDEX/me/method.ts +++ b/src/INDEX/me/method.ts @@ -39,7 +39,8 @@ export default { getApiLoading(Apis.Login.Auth.Logout, {}).then(res => { auth.data = { user: undefined, - selected_house: undefined + selected_house: undefined, + config: auth?.data?.config || {} } showToastBack('退出成功！', 1, true) console.log(res) diff --git a/src/ME/work_order_home/index.vue b/src/ME/work_order_home/index.vue index 7173b9f..fc9713c 100644 --- a/src/ME/work_order_home/index.vue +++ b/src/ME/work_order_home/index.vue @@ -3,8 +3,13 @@ 工单提报中心 - - 我的提报记录 + + diff --git a/src/ME/work_order_home/style.scss b/src/ME/work_order_home/style.scss index 5e34e71..acc7ce9 100644 --- a/src/ME/work_order_home/style.scss +++ b/src/ME/work_order_home/style.scss @@ -16,14 +16,7 @@ page { color: #333; } .work_btn { - color: #fff; padding-top: 40rpx; - text { - background-color: #1677ff; - font-size: 30rpx; - padding: 18rpx 25rpx; - border-radius: 100rpx; - } } } &_right { diff --git a/src/common/libraries/getPageConfig.ts b/src/common/libraries/getPageConfig.ts new file mode 100644 index 0000000..8a896f9 --- /dev/null +++ b/src/common/libraries/getPageConfig.ts @@ -0,0 +1,33 @@ +import { useWeAppAuthStore } from '../store/useWeAppAuthStore' + +const auth = useWeAppAuthStore() +export function getStyleBgInfo() { + let style: any = auth?.data?.config?.companyConfig?.config_value + let color = style?.color + return { + backgroundColor: color || '#0082fa', + color: '#fff' + } +} + +export function getStyleColorInfo() { + let style: any = auth?.data?.config?.companyConfig?.config_value + let color = style?.color + return { + color: color || '#0082fa' + } +} + +export function getStyleColorValueInfo() { + let style: any = auth?.data?.config?.companyConfig?.config_value + let color = style?.color + return color || '#0082fa' +} + +export function getStyleBgGradientInfo() { + //获取渐变色 + let style: any = auth?.data?.config?.companyConfig?.config_value + return { + background: style?.pageColor + } +} diff --git a/src/common/store/useWeAppAuthStore.ts b/src/common/store/useWeAppAuthStore.ts index c486876..7e13dbd 100644 --- a/src/common/store/useWeAppAuthStore.ts +++ b/src/common/store/useWeAppAuthStore.ts @@ -85,6 +85,7 @@ export const useWeAppAuthStore = defineStore('we_app_auth', () => { function me(fun?: () => void) { getApiLoading(Apis.Login.Auth.Me, {}).then(res => { data.value.user = res.data.user + data.value.config = res.data?.config data.value.selected_house = res.data?.selected_house console.log('me', res.data) loading.value = false diff --git a/src/components/hs-all-page-bg/hs-all-page-bg.vue b/src/components/hs-all-page-bg/hs-all-page-bg.vue new file mode 100644 index 0000000..5512f37 --- /dev/null +++ b/src/components/hs-all-page-bg/hs-all-page-bg.vue @@ -0,0 +1,21 @@ + + + diff --git a/src/components/hs-button/hs-button.vue b/src/components/hs-button/hs-button.vue index 42c99d5..07239d4 100644 --- a/src/components/hs-button/hs-button.vue +++ b/src/components/hs-button/hs-button.vue @@ -1,6 +1,6 @@