Merge pull request 'gdpao' (#312) from gyh into master

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

manifest.json

@@ -16,6 +16,11 @@
             "autoclose" : true,
             "delay" : 0
         },
+        "safearea": { //安全区域配置，仅iOS平台生效
+            "bottom": { // 底部安全区域配置
+                "offset": "none" // 底部安全区域偏移，"none"表示不空出安全区域，"auto"自动计算空出安全区域，默认值为"none"
+            }
+        },
         /* 模块配置 */
         "modules" : {
             "OAuth" : {},

pageB/video/video.nvue

@@ -500,7 +500,6 @@
     
     .container {
         position: relative;
-        background-color: #FF0000 !important;
     }
 
     /* 关闭 */

pages/mine/index.vue

@@ -100,9 +100,10 @@
 						<image src="/static/image/mine/16.png"></image>
 						<view>使用帮助</view>
 					</view>
-					<view @click="toOtherPage('/more/Complaints')">
+					<view class="badge-box" @click="toOtherPage('/more/Complaints')">
 						<image src="/static/image/mine/15.png"></image>
 						<view>投诉意见</view>
+                        <u-badge size="mini" :count="userInfo.feedback_show" :offset="offset" type="error"></u-badge>
 					</view>
 					<!-- <view></view> -->
 				</view>
@@ -163,7 +164,8 @@ export default {
 					link: '/order/Index?current=7',
 					number: '',
 				},
-			]
+			],
+            offset: [-10,6]
         };
 	},
 	filters: {
@@ -466,6 +468,9 @@ export default {
 					margin-right: 36rpx;
 				}
 			}
+            .badge-box {
+                position: relative;
+            }
 		}
 	}
 }