Merge remote-tracking branch 'origin/dev2.0' into dev2.0

myPages/serviceObjectAllInfo/index.vue

@@ -212,7 +212,7 @@
       <view class="btn">保存</view>
     </view>
 
-    <view v-if="userInfo.id" @click="unbindServiceObject" class="sure-btn">
+    <view v-if="userInfo.id && userInfo.isSelf != 1 " @click="unbindServiceObject" class="sure-btn">
       <view class="btn1">解绑</view>
     </view>
 
@@ -323,6 +323,9 @@ export default {
                 icon: 'none',
                 title: '解绑成功!'
               })
+              uni.navigateBack({
+                delta: 1
+              })
             })
 
           } else if (res.cancel) {