Merge pull request '红点' (#188) from xbx into master

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/188

common/api/user.js

@@ -419,6 +419,12 @@ export default {
 					order: order,
 				});
 			},
+			//取消红点
+			dynamicRead({id}) {
+				return vm.$u.post('message/dynamicRead', { 
+					friend_tomid:id
+				});
+			},
         }
     }
 }

pageB/details/index.vue

@@ -82,14 +82,20 @@ export default {
         this.member_id = option.id;
         this.getUserInfo(option.id);
         this.getArticlelist();
+
     },
     methods:{
         // 获取信息
         getUserInfo(id) {
             this.$u.post("MemberExpert/expertInfo",{member_id: id}).then(res => {
-                // console.log(res);
+                console.log(res);
                 this.userInfo = res.data.info;
-                // console.log(this.userInfo);
+                console.log(this.userInfo.is_attention);
+                if(this.userInfo.is_attention == 1){
+                    this.$u.api.dynamicRead({id}).then((res)=>{
+                        console.log(res)
+                    })
+                }
             })
         },
         // 获取列表

pageD/attention/attention.vue

@@ -63,7 +63,7 @@
 						this.attention = res.data.data;
 					}
 					this.status = "loadmore"
-					if(res.data.data.length < 15){
+					if(res.data.data.length < parseInt(res.data.per_page)){
 						this.status = "nomore"
 					}
 				})

pages.json

@@ -504,7 +504,7 @@
 				{
 					"path": "attention/attention",
 					"style": {
-						"navigationBarTitleText": "关注消息",
+						"navigationBarTitleText": "达人消息",
 						"app-plus": {
 							"titleSize": "36px",
 							"titleColor": "#333333",

pages/information/information.vue

@@ -59,7 +59,7 @@
 					{
 						id: 0,
 						url: '../../static/pageD/info(15).png',
-						text: '关注消息'
+						text: '达人消息'
 					},
 
 				],

pages/zhibo/index.nvue

@@ -338,13 +338,21 @@ export default {
       danmulist:[]
     };
   },
+  onBackPress(options) {  
+      uni.setKeepScreenOn({
+        keepScreenOn: false
+      });
+      return false;  
+  },
   onLoad(a) {
   
     this.url = a.url;
     this.id = a.id
     console.log(this.url);
     let that = this;
-   
+    uni.setKeepScreenOn({
+      keepScreenOn: true
+    });
 
     uni.getSystemInfo({
       success(a) {