diff --git a/config/app.js b/config/app.js
index dfe0acc..ea49652 100644
--- a/config/app.js
+++ b/config/app.js
@@ -1,5 +1,5 @@
// 开发者环境:开|关
-const SWITCH_DEVELOPMENT = true
+const SWITCH_DEVELOPMENT = false
/** S 是否H5端 **/
// #ifdef H5
@@ -20,7 +20,7 @@ const baseURLMap = {
// 生产环境
// production: IS_H5 ? location.origin : 'http://125.35.93.94:8986'
// 生产环境
- production: IS_H5 ? location.origin : 'https://test.jichengshanshui.com.cn:28303'
+ production: IS_H5 ? location.origin : 'https://yuanlin.jichengshanshui.com.cn:8987'
}
@@ -33,6 +33,7 @@ export const version = '1.0.6'
// export const uploadURL = baseURL + '/ylapi/yuanl/common/upload'
export const uploadURL = baseURL + '/ylapi/yuanl/common/upload'
// export const OSSURL = baseURL + '/yuanlin/'
-export const OSSURL = 'https://test.jichengshanshui.com.cn:28310/yuanlin/'
+export const OSSURL = 'https://yuanlin.jichengshanshui.com.cn:8987/yuanlin/'
+// https://img.jichengshanshui.com.cn:28207
// https://yuanlin.jichengshanshui.com.cn:8987/yuanlin/
\ No newline at end of file
diff --git a/pages.json b/pages.json
index bb8c94f..a9c0d19 100644
--- a/pages.json
+++ b/pages.json
@@ -1,20 +1,21 @@
{
"pages": [
{
- "path": "pages/work/index",
+ "path": "pages/index",
"style": {
- "navigationBarTitleText": "工作台",
+ "navigationBarTitleText": "首页",
"navigationStyle": "custom"
}
},
{
- "path": "pages/index",
+ "path": "pages/work/index",
"style": {
- "navigationBarTitleText": "首页",
+ "navigationBarTitleText": "工作台",
"navigationStyle": "custom"
}
},
+
{
"path": "pages/mine/index",
"style": {
diff --git a/pages/index.vue b/pages/index.vue
index e6ce692..d2fd23b 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -61,7 +61,7 @@
-
+
@@ -140,7 +140,7 @@ export default {
},
onLoad() {
this.getUserInfo()
- this.upgradation()
+ // this.upgradation()
this.getSummary(this.summaryDate)
this.getSummaryType(this.summaryType)
this.getStaffSummary(this.staffSummary)
diff --git a/pages/work/daily/maintain/subList.vue b/pages/work/daily/maintain/subList.vue
index 29f82c3..d8bdd22 100644
--- a/pages/work/daily/maintain/subList.vue
+++ b/pages/work/daily/maintain/subList.vue
@@ -1,6 +1,6 @@
-
+
{{item.planNo}}({{item.currentPlanNum}})
完成比例 %
diff --git a/pages/work/daily/maintain/water.vue b/pages/work/daily/maintain/water.vue
index 267afeb..346dc25 100644
--- a/pages/work/daily/maintain/water.vue
+++ b/pages/work/daily/maintain/water.vue
@@ -213,6 +213,7 @@
},
// 提交记录
onSubmit() {
+ if (this.isLoading) return;
this.$refs.form.validate(this.formData, rules).then(res => {
if (!res.isPass) {
uni.$tui.toast(res.errorMsg)
@@ -239,17 +240,7 @@
}
}).then(res => {
uni.$tui.toast('提交成功')
- const pages = getCurrentPages()
- const beforePage = pages[pages.length - 2]
- const planNo = this.formData.maintainNo
- setTimeout(() => {
- uni.navigateBack({
- success() {
- // 刷新页面数据
- beforePage.$vm.getList(planNo)
- }
- })
- }, 1500)
+ uni.navigateBack()
}).finally(() => {
this.isLoading = false
})
diff --git a/pages/work/daily/reporting.vue b/pages/work/daily/reporting.vue
index 626a77e..b5f1d23 100644
--- a/pages/work/daily/reporting.vue
+++ b/pages/work/daily/reporting.vue
@@ -357,9 +357,6 @@ export default {
return
}
this.isLoading = true
-
-
-
apiCaseAdd({data:{...this.formData}}).then(res => {
uni.$tui.toast('提交成功')
uni.navigateBack()
diff --git a/subPackages/treePage/addTree.vue b/subPackages/treePage/addTree.vue
index ef7d7c8..f71066e 100644
--- a/subPackages/treePage/addTree.vue
+++ b/subPackages/treePage/addTree.vue
@@ -193,7 +193,7 @@
- 提交
+ 提交
@@ -276,6 +276,7 @@ export default {
treeOwnershipData: [],
treeLevelData: [], // 级别
show: false,
+ loadingFlag:false,
levelshow: false,
//仅对部分数据进行收集演示
formData: {
@@ -385,6 +386,7 @@ export default {
this.formData.treeleveltext = e.dictLabel
},
submit() {
+ if(this.loadingFlag) return;
// 3. 打印提交时的数据
console.log("提交时treeImgList:", this.formData.treeImgList);
@@ -398,19 +400,20 @@ export default {
if (res.isPass) {
console.log(this.formData)
console.log('校验通过!')
-
+ this.loadingFlag = true
this.formData.maintainunit = this.userInfo.belongCompanyId
// addTree()
addTree({data: {...this.formData}}).then(res => {
console.log(res)
if (res.code == '200') {
uni.showToast({title: "新增成功", icon: "none"});
- // uni.$tui.href(`/subPackages/treePage/treeRecord?roadId=${this.formData.road}`)
- // uni.$tui.href(`/subPackages/treePage/treeFiles`)
+
uni.redirectTo({
url: '/subPackages/treePage/treeFiles' // 目标页面路径
});
}
+ }).finally(() => {
+ this.loadingFlag = false
})
} else {
console.log(res)