格式统一

pages/combination/distributionCombiChoose/distributionCombiChoose.vue

@@ -364,7 +364,6 @@ export default {
 		  }
       this.scenicList=[]
 		  this.$request('/scenic/groupGood/findGroupGoodProductList', data).then(res => {
-		    uni.hideLoading()
 		    if (res.code == '00') {
           let merchantList=res.data.merchantList||[]
           merchantList.forEach(item=>{
@@ -414,8 +413,6 @@ export default {
 		        icon: 'none'
 		      })
 		    }
-		  }).catch(err => {
-		    uni.hideLoading()
 		  })
     },
     //---初始化详情

pages/scenic/combinationProduct/combinationProduct.vue

@@ -501,61 +501,53 @@ export default {
         latitude,
         longitude
       }
-      uni.showLoading({
-        title: '加载中'
-      })
-      this.$request('/scenic/groupGood/getGroupProducts', data)
-        .then(res => {
-          uni.hideLoading()
-          if (res.code == '00') {
-            this.scenicList = res.data.merchantList || []
-            this.groupId = res.data.groupId || ''
-            this.groupChannelId = res.data.groupChannelId || ''
-            this.scenicList.forEach((item, index) => {
-              //获取当前景区图片,把当前景区放在第一位
-              if (item.id == this.merchantId) {
-                this.imgList = item.imgList
-                this.scenicList.splice(index, 1)
-                this.scenicList.unshift(item)
-                item.productListCopy = item.productList
-              } else {
-                item.productListCopy = item.productList.slice(0, 2)
-              }
-              //预订时间为当天时，当前时间大于最早预订时间显示未开售，当前时间大于最晚预订时间显示已售罄
-              let times = new Date().Format('hh:mm:ss')
-              let timeNumber = parseInt(this.$commonjs.changeTime(times)) //将当前时间转化为数字
-              item.productList.forEach(item2 => {
-                item2.timeNumber1 = parseInt(this.$commonjs.changeTime(item2.earlyBookTime))
-                item2.timeNumber2 = parseInt(this.$commonjs.changeTime(item2.bookTime))
-                if (item2.aheadBookDays == 0) {
-                  if (item2.status == 2) {
+      this.$request('/scenic/groupGood/getGroupProducts', data).then(res => {
+        if (res.code == '00') {
+          this.scenicList = res.data.merchantList || []
+          this.groupId = res.data.groupId || ''
+          this.groupChannelId = res.data.groupChannelId || ''
+          this.scenicList.forEach((item, index) => {
+            //获取当前景区图片,把当前景区放在第一位
+            if (item.id == this.merchantId) {
+              this.imgList = item.imgList
+              this.scenicList.splice(index, 1)
+              this.scenicList.unshift(item)
+              item.productListCopy = item.productList
+            } else {
+              item.productListCopy = item.productList.slice(0, 2)
+            }
+            //预订时间为当天时，当前时间大于最早预订时间显示未开售，当前时间大于最晚预订时间显示已售罄
+            let times = new Date().Format('hh:mm:ss')
+            let timeNumber = parseInt(this.$commonjs.changeTime(times)) //将当前时间转化为数字
+            item.productList.forEach(item2 => {
+              item2.timeNumber1 = parseInt(this.$commonjs.changeTime(item2.earlyBookTime))
+              item2.timeNumber2 = parseInt(this.$commonjs.changeTime(item2.bookTime))
+              if (item2.aheadBookDays == 0) {
+                if (item2.status == 2) {
+                  item2.statusName = '已售罄'
+                } else {
+                  if (timeNumber < item2.timeNumber1) {
+                    item2.status = 2
+                    item2.statusName = '未开售'
+                  }
+                  if (timeNumber > item2.timeNumber2) {
+                    item2.status = 2
                     item2.statusName = '已售罄'
-                  } else {
-                    if (timeNumber < item2.timeNumber1) {
-                      item2.status = 2
-                      item2.statusName = '未开售'
-                    }
-                    if (timeNumber > item2.timeNumber2) {
-                      item2.status = 2
-                      item2.statusName = '已售罄'
-                    }
                   }
                 }
-              })
-            })
-            this.$nextTick(() => {
-              this.countSwiper()
-            })
-          } else {
-            uni.showToast({
-              title: res.message,
-              icon: 'none'
+              }
             })
-          }
-        })
-        .catch(err => {
-          uni.hideLoading()
-        })
+          })
+          this.$nextTick(() => {
+            this.countSwiper()
+          })
+        } else {
+          uni.showToast({
+            title: res.message,
+            icon: 'none'
+          })
+        }
+      })
     },
     //---跳转填写订单页面
     goFillorder() {