1

pages/admin/Jiazheng/common/share.vue

@@ -1,4 +1,5 @@
 <template>
+<<<<<<< Updated upstream
  <button @click="showShareMenu" type="default" class="phone-white-btn bz-tel-btn fx-btn-box">分享</button>
  <!-- 答题卡 -->
  <uni-popup ref="downPopupRef" background-color="#fff" :animation="false" :is-mask-click="true" :mask-click="false">
@@ -14,6 +15,9 @@
 		</view>
  	</view>
  </uni-popup>
+=======
+ <button @click="showShareMenu" type="default" class="phone-white-btn bz-tel-btn">分享</button>
+>>>>>>> Stashed changes
 </template>
 
 <script>