把unpackage添加到忽略文件

.gitignore

 .DS_Store
 node_modules/
 dist/
+unpackage/
 
 # local env files
 .env.local

pages/my/index.vue

@@ -89,7 +89,7 @@ export default {
 	onShow() {
 		// 显示隐藏tabBar
 		switchShowTabbar()
-		
+
 		this.init();
 		// 埋点
 		this.buryingPoint('app:my_pageView')
@@ -189,36 +189,8 @@ export default {
 			}
 		},
 		goTel() {
-<<<<<<< HEAD
 			this.buryingPoint('app:my_contact_us_click')
 			this.handleCall(APP.serviceCall)
-=======
-			const self=this
-			self.buryingPoint('app:my_contact_us_click')
-			const telPhone=uni.getStorageSync('telPhone')
-			if(telPhone){
-				self.goPhone()
-			}else{
-				uni.showModal({
-					title: '提示',
-				    content: '该“联系我们”功能需要获取您的电话拨号等权限，以便于您通过拨打电话的方式向我们反映问题！',
-					showCancel: false,//没有取消按钮的弹框
-					confirmText: '确定',
-					success: function (res) {
-					    if (res.confirm) {
-					        console.log('用户点击确定');
-							self.goPhone()
-					    } 
-					}
-				})
-			}
-		},
-		goPhone(){
-			uni.setStorageSync('telPhone','1')
-			uni.makePhoneCall({
-				phoneNumber: this.serviceCall //仅为示例
-			});
->>>>>>> 417e5ce95df5f7b259a50d0b83376706082c30ea
 		},
 
 		goItem(item) {