Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_cp/dv_cp_wechat_app into dev

src/apps/AppHandSnapshot/Content.vue

@@ -136,7 +136,11 @@ export default {
           uni.$emit('updateDeatil')
           uni.$emit('getListInit')
           setTimeout(() => {
-            uni.navigateBack()
+            if(this.status == 1) {
+              uni.navigateBack({delta: 2})
+            }else {
+              uni.navigateBack()
+            }
           },600)
         }
       })

src/apps/AppHandSnapshot/Detail.vue

@@ -114,7 +114,7 @@
         <div class="doIt" @click="doItShow = true">我来受理</div>
       </div>
 
-      <div class="endDoIt" v-if="data.eventStatus == 1" @click="toContent(3)">前往办理</div>
+      <div class="endDoIt" v-if="data.eventStatus == 1 && data.rightType == 0" @click="toContent(3)">前往办理</div>
     </div>
 
     <u-modal v-model="doItShow" :mask-close-able="true" z-index="99" content="确定受理该事件?" :show-cancel-button="true" @confirm="doThings"></u-modal>