xiaomeng
/
wszhyWx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: xiaomeng:9e9529b41c57c61fe42c961eae8f6c82085b6858
Branches Tags
xiaomeng:pc-master
xiaomeng:portal
xiaomeng:wx-program
xiaomeng:mini-program
xiaomeng:fix
xiaomeng:master
xiaomeng:wxmaster
xiaomeng:main
xiaomeng:0.0.1
...
compare: xiaomeng:905880c49860ecf060295abd6c719bccd9ad6881
Branches Tags
xiaomeng:pc-master
xiaomeng:portal
xiaomeng:wx-program
xiaomeng:mini-program
xiaomeng:fix
xiaomeng:master
xiaomeng:wxmaster
xiaomeng:main
xiaomeng:0.0.1

6 Commits
9e9529b41c ... 905880c498

Author SHA1 Message Date
liubaixun 905880c498 fix(ignore): add igonre 
add igonre

Signed-off-by: liubaixun <liubaixun@yinxiang.com>
 2023-10-14 14:25:46 +08:00
liubaixun 51d7facc9b fix(merge): merge 
merge

Signed-off-by: liubaixun <liubaixun@yinxiang.com>
 2023-10-14 14:24:10 +08:00
liubaixun fd84eb5608 fix(merge): merge 
merge

Signed-off-by: liubaixun <liubaixun@yinxiang.com>
 2023-10-14 13:48:37 +08:00
liubaixun 16976e3bec fix(rebuid): rebuild 
rebuild

Signed-off-by: liubaixun <liubaixun@yinxiang.com>
 2023-10-14 09:00:38 +08:00
liubaixun 2fe5b28568 fix(build): build 
build

Signed-off-by: liubaixun <liubaixun@yinxiang.com>
 2023-10-14 09:00:02 +08:00
pangdundun 8a491ca518 隐藏5s刷新显示效果 2023-10-14 08:40:50 +08:00
36 changed files with 53 additions and 46 deletions
Show Stats Expand all files Collapse all files

1
.gitignore vendored 100644
View File

@ -0,0 +1 @@
unpackage/dist/

15
pages/fertilizer_machine/fertilizer_machine.vue
View File

@ -232,6 +232,9 @@
}, },
onLoad(option) { onLoad(option) {
this.deviceId = option.id this.deviceId = option.id
uni.showLoading({
title: '加载中...'
})
this.dataInit() this.dataInit()
let that = this let that = this
this.timer_ = setInterval(function() { this.timer_ = setInterval(function() {
@ -243,9 +246,9 @@
clearTimeout(that.timer_) clearTimeout(that.timer_)
}, },
onPullDownRefresh() { onPullDownRefresh() {
// uni.showLoading({ uni.showLoading({
// title: '加载中...' title: '加载中...'
// }) })
this.dataInit(); this.dataInit();
}, },
methods: { methods: {
@ -263,9 +266,9 @@
} }
}, },
dataInit() { dataInit() {
uni.showLoading({ // uni.showLoading({
title: '加载中...' // title: '加载中...'
}) // })
const that = this const that = this
var deviceId = this.deviceId var deviceId = this.deviceId
var data = { var data = {

2
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-avatar/u-avatar.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-button/u-button.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-checkbox/u-checkbox.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-field/u-field.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-form-item/u-form-item.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-form/u-form.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-input/u-input.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-mask/u-mask.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-navbar/u-navbar.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-popup/u-popup.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-toast/u-toast.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/add_irrigation_group/add_irrigation_group.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/change_password/change_password.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/editSite/editSite.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/fertilizer_machine/fertilizer_machine.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/preciseWaterAndFertilizer/preciseWaterAndFertilizer.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/siteAdmin/siteAdmin.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/target_water_fertilizer_PH/target_water_fertilizer_PH.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/timeEnvironment/timeEnvironment.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/timeVideo/timeVideo.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/userCenter/userCenter.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/videoLive/videoLive.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/qiun-data-charts/components/qiun-error/qiun-error.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading1.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading2.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading3.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading4.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/qiun-data-charts/components/qiun-loading/loading5.js.map vendored
View File

File diff suppressed because one or more lines are too long

15
unpackage/dist/dev/mp-weixin/pages/fertilizer_machine/fertilizer_machine.js vendored
View File

@ -419,6 +419,9 @@ var _default = {
watch: {}, watch: {},
onLoad: function onLoad(option) { onLoad: function onLoad(option) {
this.deviceId = option.id; this.deviceId = option.id;
uni.showLoading({
title: '加载中...'
});
this.dataInit(); this.dataInit();
var that = this; var that = this;
this.timer_ = setInterval(function () { this.timer_ = setInterval(function () {
@ -430,9 +433,9 @@ var _default = {
clearTimeout(that.timer_); clearTimeout(that.timer_);
}, },
onPullDownRefresh: function onPullDownRefresh() { onPullDownRefresh: function onPullDownRefresh() {
// uni.showLoading({ uni.showLoading({
// title: '加载中...' title: '加载中...'
// }) });
this.dataInit(); this.dataInit();
}, },
methods: (_methods = { methods: (_methods = {
@ -451,9 +454,9 @@ var _default = {
}, },
dataInit: function dataInit() { dataInit: function dataInit() {
var _this = this; var _this = this;
uni.showLoading({ // uni.showLoading({
title: '加载中...' // title: '加载中...'
}); // })
var that = this; var that = this;
var deviceId = this.deviceId; var deviceId = this.deviceId;
var data = { var data = {

4
unpackage/dist/dev/mp-weixin/project.config.json vendored
View File

@ -8,7 +8,7 @@
"urlCheck": false, "urlCheck": false,
"es6": false, "es6": false,
"postcss": false, "postcss": false,
"minified": true, "minified": false,
"newFeature": true, "newFeature": true,
"bigPackageSizeSupport": true, "bigPackageSizeSupport": true,
"babelSetting": { "babelSetting": {
@ -20,7 +20,7 @@
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "3.1.2", "libVersion": "3.1.2",
"appid": "wx0518521f67048cc8", "appid": "wx05b45a2699f02a2b",
"projectname": "greenhouse-wisdom-applet", "projectname": "greenhouse-wisdom-applet",
"condition": {}, "condition": {},
"editorSetting": { "editorSetting": {