Merge branch 'master' of http://121.37.83.100:3000/sooka_edyj/sooka_edyj_minapp

base/httputil.js

@@ -1,7 +1,7 @@
 // let BASE_Server = "http://127.0.0.1:8329"
 
-  //let BASE_Server = "https://192.168.1.100:18080"
-let BASE_Server = "https://sookajs.top:18080"
+  let BASE_Server = "https://192.168.1.100:18080"
+//let BASE_Server = "https://sookajs.top:18080"
 
 
 

pages/details/details.js

@@ -82,8 +82,8 @@ Page({
       type: 'wgs84', //返回可以用于wx.openLocation的经纬度，
       success: function (res) {
         wx.openLocation({ //​使用微信内置地图查看位置。
-          latitude: event.currentTarget.dataset.marker.latitude, //要去的纬度-地址
-          longitude: event.currentTarget.dataset.marker.longitude, //要去的经度-地址
+          latitude: Number(event.currentTarget.dataset.marker.latitude), //要去的纬度-地址
+          longitude:Number( event.currentTarget.dataset.marker.longitude), //要去的经度-地址
           name: event.currentTarget.dataset.marker.name,
           address: event.currentTarget.dataset.marker.address
         })

pages/details/details.wxml

@@ -33,7 +33,7 @@
       </view>
       <view>
         <span>企业编码：</span>
-        <i>{{enterpriseDetails.orgCode}}</i>
+        <i>{{enterpriseDetails.enterpriseCode}}</i>
       </view>
       <view>
         <span>办公地址：</span>

pages/qiyemore/qiyemore.js

@@ -4,7 +4,8 @@ const app = getApp()
 Page({
 
   onLoad() {
-    this.getLocation()
+   // console.log("@@","load")
+    //this.getLocation()
   },
 
   /**
@@ -77,10 +78,9 @@ Page({
         console.log("$$$",res);
        //this.data.form.qrCode=res.result
        this.setData({
-        form: {
-          qrCode: res.result
-        }
+        ['form.qrCode']:  res.result
       })
+    
           
 
         
@@ -103,6 +103,7 @@ Page({
   addEnterprise(e) {
    console.log("###1",this.data.form.qrCode)
     let obj = new Object()
+    obj.enterpriseCode=this.data.form.qrCode
     obj.latitude = this.data.form.latitude
     obj.longitude = this.data.form.longitude
     obj.businessName = this.data.form.businessName
@@ -115,7 +116,7 @@ Page({
     obj.mainPersonPhone = this.data.form.mainPersonPhone
     obj.headSecurity = this.data.form.headSecurity
     obj.headSecurityPhone = this.data.form.headSecurityPhone
-
+console.log("@@@@",obj)
     http.post("/system/AppEnterpriseController/addEnterprise", obj, this.addEnterpriseSuccess)
   },
   addEnterpriseSuccess(e) {
@@ -139,10 +140,10 @@ Page({
       type: 'wgs84', //返回可以用于wx.openLocation的经纬度
       success: function (res) {
         that.setData({
-          form: {
-            longitude: res.longitude,
-            latitude: res.latitude
-          }
+
+          ['form.longitude']:  res.longitude,
+          ['form.latitude']:  res.latitude
+          
         })
       },
     })
@@ -166,7 +167,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
-
+   
   },
 
   /**