From 17677a8517d9365f7a2fb9a100cef9ea2b17b5eb Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Mon, 3 Jun 2024 15:44:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/common.js | 34 +- src/api/site/aptitude.js | 10 + src/pages.json | 6 +- src/subPackages/login/login/index.vue | 2 +- src/subPackages/order/details/index.vue | 3 +- src/subPackages/site/aptitude/index.vue | 90 +++++ .../site/details/components/info.vue | 60 ++- src/subPackages/site/details/index.vue | 7 +- src/uni_modules/h-watermark/changelog.md | 13 + .../components/h-watermark/h-watermark.vue | 363 ++++++++++++++++++ src/uni_modules/h-watermark/package.json | 85 ++++ src/uni_modules/h-watermark/readme.md | 102 +++++ src/uni_modules/tts/index.vue | 0 vue.config.js | 2 +- 14 files changed, 727 insertions(+), 50 deletions(-) create mode 100644 src/api/site/aptitude.js create mode 100644 src/subPackages/site/aptitude/index.vue create mode 100644 src/uni_modules/h-watermark/changelog.md create mode 100644 src/uni_modules/h-watermark/components/h-watermark/h-watermark.vue create mode 100644 src/uni_modules/h-watermark/package.json create mode 100644 src/uni_modules/h-watermark/readme.md create mode 100644 src/uni_modules/tts/index.vue diff --git a/src/api/common.js b/src/api/common.js index 70e4f45..6b2124c 100644 --- a/src/api/common.js +++ b/src/api/common.js @@ -1,33 +1,3 @@ -import request from 'utils/request'; +import request from "utils/request"; -export default { - getById(params) { - return request({ - url: '/guest-site/saasSiteInfo/getById', - method: 'post', - data: params, - }); - }, - // 金额换算升数 - getPayDisInfo(params) { - return request({ - url: '/guest-site/mobileOrderApi/getPayDisInfo', - method: 'post', - data: params, - }); - }, - createCOrder(params) { - return request({ - url: '/guest-site/mobileOrderApi/createCOrder', - method: 'post', - data: params, - }); - }, - wxPay(params) { - return request({ - url: '/guest-finance/yiBaoPay/wxPay', - method: 'post', - data: params, - }); - }, -}; +export default {}; diff --git a/src/api/site/aptitude.js b/src/api/site/aptitude.js new file mode 100644 index 0000000..0e07381 --- /dev/null +++ b/src/api/site/aptitude.js @@ -0,0 +1,10 @@ +import request from "utils/request"; + +export default { + getSiteCertificateBySiteId(siteId) { + return request({ + url: `/guest-site/saasSiteCertificate/getSiteCertificateBySiteId/${siteId}`, + method: "get", + }); + }, +}; diff --git a/src/pages.json b/src/pages.json index c5f970e..4ee59a2 100644 --- a/src/pages.json +++ b/src/pages.json @@ -16,7 +16,11 @@ }, { "root": "subPackages/site", - "pages": [{ "path": "details/index" }, { "path": "search/index" }] + "pages": [ + { "path": "details/index" }, + { "path": "search/index" }, + { "path": "aptitude/index" } + ] }, { "root": "subPackages/order", diff --git a/src/subPackages/login/login/index.vue b/src/subPackages/login/login/index.vue index dde4e0e..88dd15b 100644 --- a/src/subPackages/login/login/index.vue +++ b/src/subPackages/login/login/index.vue @@ -389,7 +389,7 @@ export default { .agreement { position: fixed; left: 0; - bottom: env(safe-area-inset-bottom); + bottom: calc(env(safe-area-inset-bottom) + 60rpx); width: 100%; font-size: 22rpx; color: #b6b6b6; diff --git a/src/subPackages/order/details/index.vue b/src/subPackages/order/details/index.vue index f5063f8..ff1e7bb 100644 --- a/src/subPackages/order/details/index.vue +++ b/src/subPackages/order/details/index.vue @@ -1,7 +1,7 @@ + + diff --git a/src/uni_modules/h-watermark/package.json b/src/uni_modules/h-watermark/package.json new file mode 100644 index 0000000..ccad0d8 --- /dev/null +++ b/src/uni_modules/h-watermark/package.json @@ -0,0 +1,85 @@ +{ + "id": "h-watermark", + "displayName": "h-watermark 水印组件", + "version": "1.0.5", + "description": "水印组件,可自定义旋转弧度、父级容器、自定义水印标题(显影、文字、字号、颜色、透明度等)、自定义水印联系电话(显影、文字、字号、颜色、透明度等)、自定义软件名称(显影、文字、字号、颜色、透明度等)", + "keywords": [ + "h-watermark", + "水印", + "自定义", + "vue", + "放大缩小" + ], + "repository": "", + "engines": { + "HBuilderX": "^3.1.0" + }, + "dcloudext": { + "type": "component-vue", + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "插件不采集任何数据", + "permissions": "无" + }, + "npmurl": "" + }, + "uni_modules": { + "dependencies": [], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "Vue": { + "vue2": "y", + "vue3": "u" + }, + "App": { + "app-vue": "y", + "app-nvue": "u" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "u", + "阿里": "u", + "百度": "u", + "字节跳动": "u", + "QQ": "u", + "钉钉": "u", + "快手": "u", + "飞书": "u", + "京东": "u" + }, + "快应用": { + "华为": "u", + "联盟": "u" + } + } + } + } +} \ No newline at end of file diff --git a/src/uni_modules/h-watermark/readme.md b/src/uni_modules/h-watermark/readme.md new file mode 100644 index 0000000..73f0142 --- /dev/null +++ b/src/uni_modules/h-watermark/readme.md @@ -0,0 +1,102 @@ +## 水印组件 + +> **组件名:h-watermark** + +### 安装方式 + +本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范,`HBuilderX 2.5.5`起,只需将本组件导入项目,在页面`template`中即可直接使用,无需在页面中`import`和注册`components`。 + +### 基本用法 + +在 ``template`` 中使用组件 + +```vue + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +// 写在父级容器中 + + + + + + + + + + +``` + +## API + +### Props + +| 属性名 | 类型 | 默认值 | 说明 | +| :-------: | :-----: | :-----: | :-----------------------: | +| title | String | 水印组件 | 标题文字 | +| titleShow | Boolean | true | 是否显示标题文字 | +| titleSize | Number | 16 | 标题文字字号 | +| titleColor | String | #f15723 | 标题文字颜色 | +| titleLucency | Number | 0.2 | 标题文字透明度 | +| mobile | String | 18761665823 | 联系电话 | +| mobileShow | Boolean | true | 是否显示联系电话 | +| mobileSize | Number | 10 | 联系电话字号 | +| mobileColor | String | #f15723 | 联系电话颜色 | +| mobileLucency | Number | 0.2 | 联系电话透明度 | +| appName | String | 组件 | 软件名称 | +| appNameShow | Boolean | true | 是否显示软件名称 | +| appNameSize | Number | 10 | 软件名称字号 | +| appNameColor | String | #f15723 | 软件名称颜色 | +| appNameLucency| Number | 0.2 | 软件名称透明度 | +| rotate | Number | -45 | 旋转弧度 | +| position | String | fixed | 布局方式(绝对布局-相对布局) | +| scale | Number | 1 | 放大缩小 | +| column | Number | 15 | 水印列数 | \ No newline at end of file diff --git a/src/uni_modules/tts/index.vue b/src/uni_modules/tts/index.vue new file mode 100644 index 0000000..e69de29 diff --git a/vue.config.js b/vue.config.js index e78d1d3..5be13d5 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,6 +1,6 @@ const path = require("path"); function resolve(dir) { - return path.join(__dirname, dir); // __dirname是当前目录的绝对路径 + return path.join(__dirname, dir); } module.exports = {