Merge branch 'new-ddh-app' of...

Merge branch 'new-ddh-app' of ssh://gitlab.jqtianxia.cn:2222/zhanhai/uni-app-ddh-shop into new-ddh-app

config/api.js

@@ -38,7 +38,7 @@ let env = process.env.VUE_APP_BASE_NODE_ENV
  */
 
 // #ifdef APP-PLUS
-env = "development";
+env = "prod";
 // #endif
 
 const api = {

pages.json

@@ -244,10 +244,5 @@
     "app-plus": {
       "bounce": "none"
     }
-  },
-  "uniIdRouter": {
-    "loginPage": "pages/login/login",
-    "needLogin": ["pages/my/index"],
-    "resToLogin": true
   }
 }

pages/my/index.vue

@@ -189,8 +189,36 @@ 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) {