优化

sleep/pages/log/iot/index.vue

@@ -48,23 +48,23 @@
           </view>
         </view>
 
-        <view class="cu-item">
-          <view class="content">
-            <text>激活时间</text>
-          </view>
-          <view class="action">
-            <text class="text-lg">{{ iotLinkFrom.activeTime }}</text>
-          </view>
-        </view>
+<!--        <view class="cu-item">-->
+<!--          <view class="content">-->
+<!--            <text>激活时间</text>-->
+<!--          </view>-->
+<!--          <view class="action">-->
+<!--            <text class="text-lg">{{ iotLinkFrom.activeTime }}</text>-->
+<!--          </view>-->
+<!--        </view>-->
 
-        <view class="cu-item">
-          <view class="content">
-            <text>生效时间</text>
-          </view>
-          <view class="action">
-            <text class="text-lg">{{ iotLinkFrom.effectiveTime }}</text>
-          </view>
-        </view>
+<!--        <view class="cu-item">-->
+<!--          <view class="content">-->
+<!--            <text>生效时间</text>-->
+<!--          </view>-->
+<!--          <view class="action">-->
+<!--            <text class="text-lg">{{ iotLinkFrom.effectiveTime }}</text>-->
+<!--          </view>-->
+<!--        </view>-->
 
         <view class="cu-item">
           <view class="content">
@@ -75,59 +75,59 @@
           </view>
         </view>
 
-        <view class="cu-item">
-          <view class="content">
-            <text>总流量</text>
-          </view>
-          <view class="action">
-            <text class="text-lg">{{ iotLinkFrom.totalFlow }}MB</text>
-          </view>
-        </view>
+<!--        <view class="cu-item">-->
+<!--          <view class="content">-->
+<!--            <text>总流量</text>-->
+<!--          </view>-->
+<!--          <view class="action">-->
+<!--            <text class="text-lg">{{ iotLinkFrom.totalFlow }}MB</text>-->
+<!--          </view>-->
+<!--        </view>-->
 
-        <view class="cu-item">
-          <view class="content">
-            <text>已使用流量</text>
-          </view>
-          <view class="action">
-            <text class="text-lg">{{ iotLinkFrom.usedFlow }}MB</text>
-          </view>
-        </view>
+<!--        <view class="cu-item">-->
+<!--          <view class="content">-->
+<!--            <text>已使用流量</text>-->
+<!--          </view>-->
+<!--          <view class="action">-->
+<!--            <text class="text-lg">{{ iotLinkFrom.usedFlow }}MB</text>-->
+<!--          </view>-->
+<!--        </view>-->
 
-        <view class="cu-item">
-          <view class="content">
-            <text>剩余流量</text>
-          </view>
-          <view class="action">
-            <text class="text-lg">{{ iotLinkFrom.leftFlow }}MB</text>
-          </view>
-        </view>
+<!--        <view class="cu-item">-->
+<!--          <view class="content">-->
+<!--            <text>剩余流量</text>-->
+<!--          </view>-->
+<!--          <view class="action">-->
+<!--            <text class="text-lg">{{ iotLinkFrom.leftFlow }}MB</text>-->
+<!--          </view>-->
+<!--        </view>-->
 
-        <view v-if="iotLinkFrom.totalVoice">
-          <view class="cu-item">
-            <view class="content">
-              <text>总语音量</text>
-            </view>
-            <view class="action">
-              <text class="text-lg">{{ iotLinkFrom.totalVoice }}分钟</text>
-            </view>
-          </view>
-          <view class="cu-item">
-            <view class="content">
-              <text>使用语音量</text>
-            </view>
-            <view class="action">
-              <text class="text-lg">{{ iotLinkFrom.usedVoice }}分钟</text>
-            </view>
-          </view>
-          <view class="cu-item">
-            <view class="content">
-              <text>剩余语音量</text>
-            </view>
-            <view class="action">
-              <text class="text-lg">{{ iotLinkFrom.residualVoice }}分钟</text>
-            </view>
-          </view>
-        </view>
+<!--        <view v-if="iotLinkFrom.totalVoice">-->
+<!--          <view class="cu-item">-->
+<!--            <view class="content">-->
+<!--              <text>总语音量</text>-->
+<!--            </view>-->
+<!--            <view class="action">-->
+<!--              <text class="text-lg">{{ iotLinkFrom.totalVoice }}分钟</text>-->
+<!--            </view>-->
+<!--          </view>-->
+<!--          <view class="cu-item">-->
+<!--            <view class="content">-->
+<!--              <text>使用语音量</text>-->
+<!--            </view>-->
+<!--            <view class="action">-->
+<!--              <text class="text-lg">{{ iotLinkFrom.usedVoice }}分钟</text>-->
+<!--            </view>-->
+<!--          </view>-->
+<!--          <view class="cu-item">-->
+<!--            <view class="content">-->
+<!--              <text>剩余语音量</text>-->
+<!--            </view>-->
+<!--            <view class="action">-->
+<!--              <text class="text-lg">{{ iotLinkFrom.residualVoice }}分钟</text>-->
+<!--            </view>-->
+<!--          </view>-->
+<!--        </view>-->
       </view>
 
 
@@ -146,30 +146,30 @@
             <text class="text-lg">{{ item.packageName }}</text>
           </view>
         </view>
-        <view class="cu-item">
-          <view class="content">
-            <text class="">套餐总流量</text>
-          </view>
-          <view class="action">
-            <text class="text-lg">{{ item.totalFlow }}MB</text>
-          </view>
-        </view>
-        <view class="cu-item">
-          <view class="content">
-            <text class="">已使用流量</text>
-          </view>
-          <view class="action">
-            <text class="text-lg">{{ item.usedFlow }}MB</text>
-          </view>
-        </view>
-        <view class="cu-item">
-          <view class="content">
-            <text class="">剩余流量</text>
-          </view>
-          <view class="action">
-            <text class="text-lg">{{ item.leftFlow }}MB</text>
-          </view>
-        </view>
+<!--        <view class="cu-item">-->
+<!--          <view class="content">-->
+<!--            <text class="">套餐总流量</text>-->
+<!--          </view>-->
+<!--          <view class="action">-->
+<!--            <text class="text-lg">{{ item.totalFlow }}MB</text>-->
+<!--          </view>-->
+<!--        </view>-->
+<!--        <view class="cu-item">-->
+<!--          <view class="content">-->
+<!--            <text class="">已使用流量</text>-->
+<!--          </view>-->
+<!--          <view class="action">-->
+<!--            <text class="text-lg">{{ item.usedFlow }}MB</text>-->
+<!--          </view>-->
+<!--        </view>-->
+<!--        <view class="cu-item">-->
+<!--          <view class="content">-->
+<!--            <text class="">剩余流量</text>-->
+<!--          </view>-->
+<!--          <view class="action">-->
+<!--            <text class="text-lg">{{ item.leftFlow }}MB</text>-->
+<!--          </view>-->
+<!--        </view>-->
         <view class="cu-item">
           <view class="content">
             <text class="">购买日期</text>

sleep/pages/tabBar/home.vue

@@ -1061,7 +1061,7 @@ export default {
             })
           }
           if (res.warnSwitch) {
-            if (res.warnSwitch.sms_qty < 5 || res.warnSwitch.voice_qty < 5) {
+            if ((res.warnSwitch.sms_qty + res.warnSwitch.voice_qty) < 5) {
               uni.showModal({
                 title: '提示',
                 content: "您的短信、语音剩余额度即将不总，是否前往购买？",

sleep/pages/tabBar/report.vue

@@ -599,12 +599,14 @@
         console.log('change===', e)
         const date = this.selected.find(item=> item.date === e.extraInfo.date)
         if (date) {
+          this.index = 0
           this.params.reportTime = date.report_time
           this.selectDay = e.fulldate
           this.calendarShow = false
           this.getNewSleepReport()
         } else {
           if (this.todayStr === e.fulldate && this.selectYearMonth.month !== e.month) {
+            this.index = 0
             this.params.reportTime = -1
             this.calendarShow = false
             this.getNewSleepReport()

sleep/utils/vue-mixin.js

@@ -218,7 +218,7 @@ const mixin = {
 				}
 			}
 			let data = shopId ? '&shopId=' + shopId : ''
-			let path = '/pages/calorie/list?type=SHOPPING&page=shopping&no=1789' + data
+			let path = '/pages/b2b2c/index?type=SHOPPING&page=shopping&no=1789' + data
 			console.log('path====', path)
 			wx.navigateToMiniProgram({
 				appId: this.userMiniProgramAppId,