diff --git a/config.js b/config.js index d141ff0..1955c64 100644 --- a/config.js +++ b/config.js @@ -1,7 +1,7 @@ // 应用全局配置 module.exports = { // baseUrl: process.env.UNI_PLATFORM === 'mp-weixin'?"http://122.51.109.52:8088":(process.env.NODE_ENV === "production" ? "/api" : "http://localhost:8088"), - baseUrl: process.env.NODE_ENV === "production"?"https://api.xiaoces.com/api":"http://localhost:8088", + baseUrl: process.env.NODE_ENV === "production"?"https://api.xiaoces.com/api":"http://172.14.24.107:8088", // 应用信息 appInfo: { // 应用名称 diff --git a/pages/home/addAgri.vue b/pages/home/addAgri.vue index 78702bf..515f09d 100644 --- a/pages/home/addAgri.vue +++ b/pages/home/addAgri.vue @@ -3,11 +3,20 @@ - {{ `【- 实时温湿度】别名设置` }} + {{ `添加大棚` }} - 别名设置: - + 大棚名称: + + + 设备imei: + + + + + @@ -15,6 +24,9 @@ + + + @@ -62,11 +78,11 @@ export default { display: flex; align-items: center; margin-bottom: 35rpx; - font-size: 26rpx; + font-size: 28rpx; margin-left: 20rpx; } .modal-label { - width: 160rpx; + width: 140rpx; color: #666; } .modal-current { @@ -78,7 +94,7 @@ export default { border: 1px solid #eee; border-radius: 8rpx; padding: 0 15rpx; - font-size: 26rpx; + font-size: 28rpx; width: 80rpx; } .modal-unit { @@ -94,7 +110,7 @@ export default { flex: 1; height: 70rpx; border-radius: 8rpx; - font-size: 26rpx; + font-size: 28rpx; } .modal-btn.cancel { background: #f5f5f5; diff --git a/pages/index.vue b/pages/index.vue index b9ac3a4..2796c7f 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -390,7 +390,7 @@ page { .item-tags { display: flex; - gap: 12rpx; + gap: 10rpx; flex-wrap: wrap; /* 新增:标签过多时换行,避免溢出 */ margin: 14rpx 0; } @@ -496,10 +496,18 @@ page { } /deep/ .uni-select { border: 0; - height: 78rpx; + // #ifndef MP-WEIXIN + height: 70rpx !important; + // #endif + // #ifdef MP-WEIXIN + margin-top: 20rpx !important; + height: 66rpx !important; + // #endif border-radius: 10rpx 0 0 10rpx !important; } - +/deep/ .uni-section { + background: transparent !important; +} /* 强制隐藏搜索图标容器 */ /deep/ .uni-searchbar__box-icon-search { display: none !important; diff --git a/uni_modules/yt-scanCode/changelog.md b/uni_modules/yt-scanCode/changelog.md new file mode 100644 index 0000000..581419a --- /dev/null +++ b/uni_modules/yt-scanCode/changelog.md @@ -0,0 +1,6 @@ +## 1.0.2(2023-12-12) +修改说明文档 +## 1.0.1(2023-12-12) +添加扫码功能 +## 1.0.0(2023-12-12) +初始化项目 diff --git a/uni_modules/yt-scanCode/components/yt-scanCode/yt-scanCode.vue b/uni_modules/yt-scanCode/components/yt-scanCode/yt-scanCode.vue new file mode 100644 index 0000000..05d651e --- /dev/null +++ b/uni_modules/yt-scanCode/components/yt-scanCode/yt-scanCode.vue @@ -0,0 +1,52 @@ + + + + + \ No newline at end of file diff --git a/uni_modules/yt-scanCode/package.json b/uni_modules/yt-scanCode/package.json new file mode 100644 index 0000000..1ef5ff2 --- /dev/null +++ b/uni_modules/yt-scanCode/package.json @@ -0,0 +1,86 @@ +{ + "id": "yt-scanCode", + "displayName": "App条形码插件(支持app,小程序,不支持h5)", + "version": "1.0.2", + "description": "yt-scanCode支持多码、相册、闪光灯、焦距缩放、提示音、震动等等。为了方便初学者快速使用。", + "keywords": [ + "扫码", + "多码", + "条形码", + "app扫码", + "简单易用" +], + "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": "y", + "app-uvue": "u" + }, + "H5-mobile": { + "Safari": "u", + "Android Browser": "u", + "微信浏览器(Android)": "u", + "QQ浏览器(Android)": "n" + }, + "H5-pc": { + "Chrome": "n", + "IE": "n", + "Edge": "n", + "Firefox": "n", + "Safari": "n" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y", + "钉钉": "y", + "快手": "y", + "飞书": "y", + "京东": "y" + }, + "快应用": { + "华为": "y", + "联盟": "y" + } + } + } + } +} \ No newline at end of file diff --git a/uni_modules/yt-scanCode/readme.md b/uni_modules/yt-scanCode/readme.md new file mode 100644 index 0000000..1cfa0af --- /dev/null +++ b/uni_modules/yt-scanCode/readme.md @@ -0,0 +1,56 @@ +# uniApp 简单的扫码功能封装 + + + +## 用法 + +在 template 中: + +```vue + + + + + + +``` + + +## 属性说明 + +| 属性 | 是否必填 | 值类型 | 默认值 | 说明 | +| --------- | -------- | -----: | --: | :------------:| +| btnName | 否 | String |扫码 | 按钮名称 | + +| `QQ交流群(906392632)` | + +|

| +| QQ群号:906392632 | + +## 温馨提示 + +* 文件上传 +0. 如说明表达还不够清楚,不清楚怎么使用可加入群聊一起交流 +1. 若能帮到你还请点亮5颗小星星以作鼓励哈~ +2. 若能帮到你还请点亮5颗小星星以作鼓励哈~ +3. 若能帮到你还请点亮5颗小星星以作鼓励哈~ \ No newline at end of file