首次加载

刘淇
1 parent 20f33942
Showing 7 changed files with 21 additions and 28 deletions
config/app.js
pages.json
pages/index.vue
pages/work/daily/maintain/subList.vue
pages/work/daily/maintain/water.vue
pages/work/daily/reporting.vue
subPackages/treePage/addTree.vue
 // 开发者环境：开|关
-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 = &#39;1.0.6&#39;
 // 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
 {
 	"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": {
@@ -61,7 +61,7 @@
 			</view>
 		</view>
 		<tui-white-space :height="30"></tui-white-space>
-		<tui-modal :show="showModal" @click="handleModal" @cancel="hideModal" content="发现新版本，是否升级到最新版本？"></tui-modal>
+<!--		<tui-modal :show="showModal" @click="handleModal" @cancel="hideModal" content="发现新版本，是否升级到最新版本？"></tui-modal>-->
 	</view>
 </template>
@@ -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)
 <template>
 	<view class="container">
-		<tui-list-cell :hover="false" v-for="(item, index) in dataList">
+		<tui-list-cell :hover="false" v-for="(item, index) in dataList"  :auto="false">
 			<view class="fs-flex__between">
 				<view>{{item.planNo}}（{{item.currentPlanNum}}）</view>
 				<view>完成比例 <tui-text :text="item.totalFinishPercent" type="danger"></tui-text>%</view>
@@ -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
 					})
@@ -357,9 +357,6 @@ export default {
 					return
 				}
 				this.isLoading = true
-
-
-
 				apiCaseAdd({data:{...this.formData}}).then(res => {
 					uni.$tui.toast('提交成功')
           uni.navigateBack()
@@ -193,7 +193,7 @@
     <view style="height: 60px;width: 100%"></view>
     <view class="tui-btn__box">
-      <tui-button bold @click="submit">提交</tui-button>
+      <tui-button bold @click="submit" :loading="loadingFlag">提交</tui-button>
     </view>
     <tui-picker :show="show" :pickerData="treeOwnershipData" textField="dictLabel" valueField="dictValue"
                 @hide="pickerHide" @change="pickerChange">
@@ -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)