更新

pages/index/components/enterpriseSide.vue

@@ -267,20 +267,21 @@ export default {
       });
     },
     toMap(){
-      uni.getLocation({
-        type: 'gcj02', //返回可以用于uni.openLocation的经纬度
-        success: function (res) {
-          const latitude = res.latitude;
-          const longitude = res.longitude;
-          uni.openLocation({
-            latitude: this.selectGroup.latitude,
-            longitude: this.selectGroup.longitude,
-            success: function () {
-              console.log('success');
-            }
-          });
+      uni.openLocation({
+        latitude: this.selectGroup.latitude,
+        longitude: this.selectGroup.longitude,
+        success: function () {
+          console.log('success');
         }
       });
+      // uni.getLocation({
+      //   type: 'gcj02', //返回可以用于uni.openLocation的经纬度
+      //   success: function (res) {
+      //     const latitude = res.latitude;
+      //     const longitude = res.longitude;
+      //
+      //   }
+      // });
     },
     getNotice(){
       newNotice().then(res=>{

pages/subPackages/parkActivity/activeApplication.vue

@@ -15,7 +15,7 @@
             <span style="color: #666666;font-size: 28rpx">联系电话：</span>
             <span style="color: #18172A;font-size: 36rpx;font-weight: 600">{{ form.activityPhone }}</span>
           </span>
-        <img src="https://www.idea-co-sf.com/gardenProduct/image/phoneIcon.png" class="phoneIcon">
+        <img src="https://www.idea-co-sf.com/gardenProduct/image/phoneIcon.png" class="phoneIcon" @tap="call">
       </div>
     </div>
     <div class="appSecondBox">
@@ -35,7 +35,7 @@
         <span class="secondBoxTitle">活动地址</span>
         <span class="secondBoxInfo dhInfo">
              <span>{{ form.activityAddress }} - {{ form.activityAddressDetail }}</span>
-             <img src="./image/dhIcon.png" class="dhIcon">
+             <img src="./image/dhIcon.png" class="dhIcon" @tap="getLocal">
            </span>
       </div>
       <div class="secondBoxItem">
@@ -87,10 +87,39 @@ export default {
   },
   onLoad(options) {
     this.activityId = options.activityId
-    this.url = url
+    this.url = options.url
     this.getById()
   },
   methods: {
+    call(){
+      uni.makePhoneCall({
+        phoneNumber: this.form.activityPhone, // 电话号码
+        success: function () {
+          console.log('拨打电话成功');
+        },
+        fail: function () {
+          console.log('拨打电话失败');
+        }
+      });
+    },
+    getLocal(){
+      const _this = this
+      uni.openLocation({
+        latitude: Number(_this.form.latitude),
+        longitude: Number(_this.form.longitude),
+        success: function () {
+          console.log('success');
+        }
+      });
+      // uni.getLocation({
+      //   type: 'gcj02', //返回可以用于uni.openLocation的经纬度
+      //   success: function (res) {
+      //     const latitude = res.latitude;
+      //     const longitude = res.longitude;
+      //
+      //   }
+      // });
+    },
     getById(){
       const data = {
         id : this.activityId,

pages/subPackages/parkActivity/index.vue

@@ -53,6 +53,9 @@ export default {
       this.$refs.avtivitys.getList()
     },
     async getByCodes() {
+      this.tabList = [
+        { label: "全部",value:null },
+      ]
       let data = await getByCodes(JSON.stringify(this.dc_key));
       this.dic_SelectList = this.$common.handleDicList(data);
       this.dic_SelectList.activity_type.forEach(item=>{

pages/utils/constant.js

@@ -1,10 +1,11 @@
 // 系统常量
 // export const BASE_URI = "http://192.168.2.111:9011"; // 正式
-// export const BASE_URI = 'https://www.idea-co-sf.com/gardenProductApi'
+export const BASE_URI = 'https://www.idea-co-sf.com/gardenProductApi'
 // export const BASE_URI = "http://192.168.3.94:9010"; // 老潘本地
 // export const BASE_URI = "http://192.168.2.107:9011"; // 洮洮本地
 // export const BASE_URI = "http://192.168.2.103:9010"; // 老崔本地
-export const BASE_URI = "http://localhost:9011"; // 许峰本地
+// export const BASE_URI = "http://192.168.2.109:9011"; // 许峰本地
+// export const BASE_URI = "http://localhost:9011"; // 许峰本地
 // export const BASE_URI = "http://192.168.2.112:9010"; // 陈凡本地
 
 export default {