Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-repair-app

# Conflicts:
#	config.js

components/tabBar/tabBar.vue

@@ -161,6 +161,7 @@
             console.log("发出提示音", res);
             // this.getbottom();
             this.dianyidain()
+            this.$emit('socketSuccess')
           })
         }
 

pages-home/home/home.vue

@@ -104,7 +104,7 @@
         </view>
       </view>
     </view>
-    <tabBarVue msg="1"></tabBarVue>
+    <tabBarVue msg="1" @socketSuccess="socketSuccess"></tabBarVue>
   </view>
 </template>
 
@@ -217,6 +217,13 @@ export default {
     }
   },
   methods: {
+
+    socketSuccess(){
+      this.getNoReadNum()
+      this.onRefresherrefresh()
+      console.log('通知并刷新成功')
+    },
+
     gotoMsg(){
       //去消息中心
       uni.navigateTo({

pages/my/myInfo.vue

@@ -53,6 +53,9 @@ import {
   removeTenantId,
   removeToken,removeUserInfo,removeJSONData,removeStrData
 } from '@/utils/auth'
+import {
+  closeMsgSocket,
+} from '@/utils/tebBarSocket'
 const UQRCode = require('uqrcodejs');
 export default {
   components: {
@@ -124,6 +127,10 @@ export default {
           uni.navigateTo({
             url: '/pages/login/login'
           })
+          if(this.$msgSocket){
+            closeMsgSocket(this.$msgSocket)
+          }
+
         }else{
           uni.showToast({
             title: res.msg,

pages/project/project.vue

@@ -88,7 +88,7 @@ export default {
   },
   methods: {
     submit() {
-      if (this.project.name == null || this.project.code == null || this.project.cost == null || this.project.price == null || this.project.spec == null || this.project.unit == null || this.project.manHour == null){
+      if (this.project.name == null||this.project.name == ''){
         uni.showToast({
           title: '请完善信息',
           icon: 'none'