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) {

unpackage/dist/build/app-plus/app-service.js

@@ -275,4 +275,4 @@ function t(e,t,n){var a={ss:t?"\u0441\u0435\u043a\u0443\u043d\u0434\u0430_\u0441
 //! moment.js locale configuration
 var t=e.defineLocale("en-gb",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},dayOfMonthOrdinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(e){var t=e%10,n=1===~~(e%100/10)?"th":1===t?"st":2===t?"nd":3===t?"rd":"th";return e+n},week:{dow:1,doy:4}});return t}))},fda3:function(e,t,n){var a,s,i,r=n("3b2d");(function(o,u){"object"===r(t)&&"undefined"!==typeof e?u(n("45aa")):(s=[n("45aa")],a=u,i="function"===typeof a?a.apply(t,s):a,void 0===i||(e.exports=i))})(0,(function(e){"use strict";
 //! moment.js locale configuration
-var t=e.defineLocale("en-il",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},dayOfMonthOrdinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(e){var t=e%10,n=1===~~(e%100/10)?"th":1===t?"st":2===t?"nd":3===t?"rd":"th";return e+n}});return t}))},ff14:function(e,t,n){"use strict";n.r(t);var a=n("0e4e"),s=n("a93b");for(var i in s)["default"].indexOf(i)<0&&function(e){n.d(t,e,(function(){return s[e]}))}(i);var r=n("828b"),o=Object(r["a"])(s["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],void 0);t["default"]=o.exports}},[["1860","app-config"]]]);
\ No newline at end of file
+var t=e.defineLocale("en-il",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},dayOfMonthOrdinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(e){var t=e%10,n=1===~~(e%100/10)?"th":1===t?"st":2===t?"nd":3===t?"rd":"th";return e+n}});return t}))},ff14:function(e,t,n){"use strict";n.r(t);var a=n("0e4e"),s=n("a93b");for(var i in s)["default"].indexOf(i)<0&&function(e){n.d(t,e,(function(){return s[e]}))}(i);var r=n("828b"),o=Object(r["a"])(s["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],void 0);t["default"]=o.exports}},[["1860","app-config"]]]);