1.解决冲突

operatingCompany/pages/shop/shopIndex/editcomplete.vue

@@ -17,11 +17,9 @@
 			</view>
 			<view class="topCont">
 				<view class="topContBtn" @click="goHome">回到首页</view>
-<<<<<<< .mine
-				<view class="topContBtn" @click="goDetail">查看详情</view>
-=======
+
 				<view class="topContBtn" @click="godetail">查看详情</view>
->>>>>>> .theirs
+
 			</view>
 		</view>
 		

operatingCompany/pages/shop/shopIndex/reviewsContent.vue

@@ -74,9 +74,11 @@
 						icon:'none',
 					    duration: 2000,
 					});
-					uni.navigateBack({
-						
-					})
+					setTimeout(function() {
+					    uni.navigateBack({
+					    	
+					    })
+					}, 2000); 
 				})
 			}