report

pages-report/reportList.vue

@@ -247,6 +247,7 @@ page{
       .tips {
         color: #666666;
         margin-bottom: 10rpx;
+        min-height: 38rpx;
       }
       .time {
         color: #666666;

pages-report/specialColumn/detail.vue

@@ -40,7 +40,7 @@
             </block>
             
         </view>
-        <view class="contact-box" v-if="!info.auth_ok&&!info.permission_check.mobile" @click="handleContact">联系我们</view>
+        <view class="contact-box" v-if="info&&!info.auth_ok&&!info.permission_check.mobile" @click="handleContact">联系我们</view>
 
         <!-- 音频弹窗 -->
         <audioBox v-if="showAudioPop"></audioBox>

pages.json

@@ -11,7 +11,8 @@
 		{
 			"path": "pages/buy/buy",
 			"style": {
-				"navigationBarTitleText": "已购"
+				"navigationBarTitleText": "已购",
+				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -178,10 +179,7 @@
 				},
 				//报告详情
 				{
-					"path": "reportDetail",
-					"style":{
-						"enablePullDownRefresh": true
-					}
+					"path": "reportDetail"
 				},
 				// 章节详情
 				{
@@ -200,18 +198,18 @@
 		"color": "#1F243A",
 		"selectedColor": "#E3B377",
 		"list": [
-			{
-				"pagePath": "pages/buy/buy",
-				"text": "已购",
-				"iconPath": "./static/tabbar/buy.png",
-				"selectedIconPath": "./static/tabbar/buy-s.png"
-			},
 			{
 				"pagePath": "pages/report/report",
 				"text": "报告",
 				"iconPath": "./static/tabbar/report.png",
 				"selectedIconPath": "./static/tabbar/report-s.png"
 			},
+			{
+				"pagePath": "pages/buy/buy",
+				"text": "已购",
+				"iconPath": "./static/tabbar/buy.png",
+				"selectedIconPath": "./static/tabbar/buy-s.png"
+			},
 			{
 				"pagePath": "pages/chart/chart",
 				"text": "图库",

pages/buy/buy.vue

@@ -46,6 +46,12 @@ export default {
   onShow() {
     this.getList()
   },
+  onPullDownRefresh() {
+    this.getList()
+    setTimeout(() => {
+      uni.stopPullDownRefresh()
+    }, 1500);
+  },
   methods: {
     async getList(){
       const res=await apiBuyList()

pages/report/report.vue

@@ -29,7 +29,11 @@
       </view>
     </view>
     </view>
-    <view class="list-wrap">
+    <view class="report-empty-box" v-if="finished&&list.length==0">
+      <image :src="globalImgUrls.chartEmpty" mode="widthFix" />
+      <view>暂无数据</view>
+    </view>
+    <view class="list-wrap" v-else>
       <view class="list-item" v-for="item in list" :key="item.date">
         <view class="time">{{item.date}}</view>
         <view class="content-list">
@@ -104,6 +108,18 @@ export default {
     this.initNavBar()
     this.getTopAuthList()
   },
+  onShow() {
+    uni.getSystemInfo({
+			success: function (res) {
+				if (res.windowWidth > 700) {
+					console.log('跳转启动页判断进入pc');
+					uni.reLaunch({
+						url: "/pages/pc",
+					});
+				}
+			},
+		})
+  },
   onPullDownRefresh() {
     this.getTopAuthList()
     setTimeout(() => {
@@ -206,7 +222,8 @@ export default {
             this.list=[...this.list,...arr]
             this.dateArr=[...this.dateArr,...temTimearr]
           }
-        }else{
+        }
+        if(res.data.paging.is_end){
           this.finished=true
         }
       }
@@ -234,7 +251,10 @@ export default {
     // 拨打电话
     handleCallPhone(tel){
       uni.makePhoneCall({
-        phoneNumber: tel
+        phoneNumber: tel,
+        success:()=>{
+          this.authData.show=false
+        }
       });
     }
   }