no message

src/packageWorkorder/pages/infoCollect/form.vue

@@ -276,18 +276,6 @@ export default {
         if (!this.address) {
           this.address = `${this.orderDetail.province}${this.orderDetail.city}${this.orderDetail.area}${this.orderDetail.street}`
         }
-        // uni.hideLoading()
-        // return this.$modal({
-        //   content: '请开启位置信息权限后，重新获取位置信息',
-        //   confirmText: '获取位置'
-        // }).then(async() => {
-        //   const lo = await this.$getAddress();
-        //   this.address = lo.address || '';
-        //   if(!this.address) {
-        //     this.address = `${this.orderDetail.province}${this.orderDetail.city}${this.orderDetail.area}${this.orderDetail.street}`;
-        //     // this.$tips('获取定位失败，请开启位置信息权限');
-        //   }
-        // }).catch(() => {})
       }
 
       uni.chooseImage({
@@ -310,6 +298,7 @@ export default {
             })
         },
         fail: err => {
+          uni.hideLoading()
           console.log(err)
         }
       })
@@ -324,18 +313,6 @@ export default {
         if (!this.address) {
           this.address = `${this.orderDetail.province}${this.orderDetail.city}${this.orderDetail.area}${this.orderDetail.street}`
         }
-        uni.hideLoading()
-        // return this.$modal({
-        //   content: '请开启位置信息权限后，重新获取位置信息',
-        //   confirmText: '获取位置'
-        // }).then(async() => {
-        //   const lo = await this.$getAddress();
-        //   this.address = lo.address || '';
-        //   if(!this.address) {
-        //     this.address = `${this.orderDetail.province}${this.orderDetail.city}${this.orderDetail.area}${this.orderDetail.street}`;
-        //     // this.$tips('获取定位失败，请开启位置信息权限');
-        //   }
-        // }).catch(() => {})
       }
 
       uni.chooseImage({
@@ -358,6 +335,7 @@ export default {
             })
         },
         fail: err => {
+          uni.hideLoading()
           console.log(err)
         }
       })

src/packageWorkorder/pages/processFeedback.vue

@@ -323,13 +323,13 @@ export default {
 
     // 去收费
     toCharge() {
-      if (this.orderDetail.orderType == 'M') {
+      if (this.orderDetail.orderType == 'INSTALL') {
         this.$navToPage({
           url: `/packageMaterial/pages/sale/index?type=${this.orderDetail.orderType == 'INSTALL' ? 'M' : 'P'}&oid=${
             this.id
           }`
         })
-      } else if (this.orderDetail.orderType == 'P') {
+      } else {
         this.$navToPage({
           url: `/packageMaterial/pages/newSale/index?type=${this.orderDetail.orderType == 'INSTALL' ? 'M' : 'P'}&oid=${
             this.id