Эх сурвалжийг харах

Merge branch 'dev/v1.1.69_zsy' of jianyu/jy-mobile into feature/v1.1.69

zhangsiya 1 жил өмнө
parent
commit
30a314ed4f

+ 12 - 7
src/views/push/PushSetting.vue

@@ -83,7 +83,7 @@
                   <span v-if="editResultTime[item.param].ratemode !== 1 && editResultTime[item.param].ratemode !== 2">09:00</span>
                 </span>
                 <span v-else>
-                  <span>每日上午、下午各推送一次</span>
+                  <span>{{item.a_times ? item.a_times[0] : '每日上午、下午各推送一次'}}</span>
                 </span>
               </div>
               <div @click="editTimeEvent(item)" class="push-time-right">
@@ -469,8 +469,10 @@ export default {
       } else {
         this.$delete(param, 'times')
       }
-      this.setPushSetApi(param, () => {
-        this.getPushSetApi()
+      this.setPushSetApi(param, (back) => {
+        if(back === 'success') {
+          this.getPushSetApi()
+        }
       })
     },
     setTimeSlotConfirm () {
@@ -502,6 +504,7 @@ export default {
                   v.i_nomsgtip = !!data[v.param].i_nomsgtip
                 }
                 v.i_ratemode = data[v.param].i_ratemode
+                v.a_times = data[v.param].a_times
                 if (data[v.param].i_ratemode === 2) {
                   if (data[v.param].a_times) {
                     this.editResultTime[v.param].selectTimeSlot = this.pointChange(data[v.param].a_times)
@@ -608,14 +611,14 @@ export default {
           this.$toast(params.pushValue === 1 || params.interested === 1 ? '已开启' : '已关闭')
         }
         try {
-          callback()
+          callback('success')
         } catch (e) {
 
         }
       } else {
         this.$toast(msg)
         try {
-          callback()
+          callback('fail')
         } catch (e) {
 
         }
@@ -726,8 +729,10 @@ export default {
         pushValue: val ? 1 : 0
       }
       this.$set(this.pushFunction[index], 'i_nomsgtip', val ? 1 : 0)
-      this.setPushSetApi(params, () => { // 修改失败回调
-        this_.$set(this_.pushFunction[index], 'i_nomsgtip', !val ? 1 : 0)
+      this.setPushSetApi(params, (back) => { // 修改失败回调
+        if(back === 'fail') {
+          this_.$set(this_.pushFunction[index], 'i_nomsgtip', !val ? 1 : 0)
+        }
       })
     },
     PopupBox () {