no message

src/common/utils/common.js

@@ -6,7 +6,7 @@ export const toast = str => {
     if (str.length < 20) {
       uni.showToast({
         title: str,
-        icon: "none",
+        icon: 'none',
         duration: 1500,
         success: () => {
           setTimeout(() => {
@@ -16,24 +16,24 @@ export const toast = str => {
       })
     } else {
       uni.showModal({
-        title: "提示",
+        title: '提示',
         content: String(str),
         showCancel: false,
-        confirmText: "我知道了",
+        confirmText: '我知道了',
         success(res) {
           if (res.confirm) {
-            resolve(res);
+            resolve(res)
           } else {
-            reject();
+            reject()
           }
         }
-      });
+      })
     }
   })
-};
+}
 
 // 成功提示框
-export const successToast = (str) => {
+export const successToast = str => {
   return new Promise((resolve, reject) => {
     uni.showToast({
       title: str || '请求成功',
@@ -41,61 +41,58 @@ export const successToast = (str) => {
       duration: 1500,
       success: () => {
         setTimeout(() => {
-          resolve();
-        }, 1500);
-      },
-    });
-  });
-};
+          resolve()
+        }, 1500)
+      }
+    })
+  })
+}
 
 // loading
 export const showLoading = () => {
   return new Promise((resolve, reject) => {
     uni.showLoading({
       success: () => {
-        resolve();
-      },
-    });
-  });
-};
+        resolve()
+      }
+    })
+  })
+}
 
 // 提示loading
-export const tipLoading = (str) => {
+export const tipLoading = str => {
   return new Promise((resolve, reject) => {
     uni.showLoading({
       title: str,
       success: () => {
-        resolve();
-      },
-    });
-  });
-};
+        resolve()
+      }
+    })
+  })
+}
 
 // 隐藏loading
 export const hideLoading = () => {
   return new Promise((resolve, reject) => {
     uni.hideLoading({
       success: () => {
-        resolve();
-      },
-    });
-  });
-};
+        resolve()
+      }
+    })
+  })
+}
 
 // 模态弹窗
 export const modal = (options = {}) => {
-  if (!options) return;
-  const {
-    title,
-    content,
-    showCancel,
-    cancelText,
-    cancelColor,
-    confirmText,
-    confirmColor,
-  } = Object.assign({}, options.content ? options : {
-    content: options
-  });
+  if (!options) return
+  const { title, content, showCancel, cancelText, cancelColor, confirmText, confirmColor } = Object.assign(
+    {},
+    options.content
+      ? options
+      : {
+          content: options
+        }
+  )
   return new Promise((resolve, reject) => {
     uni.showModal({
       title: title || '提示',
@@ -107,22 +104,24 @@ export const modal = (options = {}) => {
       confirmColor: confirmColor || '#3D8FFD',
       complete(res) {
         if (res.confirm) {
-          resolve(res);
+          resolve(res)
         } else {
-          reject();
+          reject()
         }
-      },
-    });
-  });
-};
+      }
+    })
+  })
+}
 
 // 弹窗提示
-export const tips = (text) => {
+export const tips = text => {
   modal({
     content: text,
-    showCancel: false,
-  }).then(() => {}).catch(() => {})
-};
+    showCancel: false
+  })
+    .then(() => {})
+    .catch(() => {})
+}
 
 /**
  * 跳转页面 navigateTo
@@ -135,16 +134,16 @@ export const navPage = (url, isAuth = 0) => {
   if ((isAuth && store.state.token) || !isAuth) {
     uni.navigateTo({
       url,
-      fail: (err) => {
-        console.log('页面跳转失败', url, err);
-      },
-    });
+      fail: err => {
+        console.log('页面跳转失败', url, err)
+      }
+    })
   } else {
     uni.navigateTo({
-      url: '/pages/login/index',
-    });
+      url: '/pages/login/index'
+    })
   }
-};
+}
 
 /**
  * 跳转页面 redirectTo
@@ -157,16 +156,16 @@ export const redPage = (url, isAuth = 0) => {
   if ((isAuth && store.state.token) || !isAuth) {
     uni.redirectTo({
       url,
-      fail: (err) => {
-        console.log('页面跳转失败', url, err);
-      },
-    });
+      fail: err => {
+        console.log('页面跳转失败', url, err)
+      }
+    })
   } else {
     uni.navigateTo({
-      url: '/pages/login/index',
-    });
+      url: '/pages/login/index'
+    })
   }
-};
+}
 
 /**
  * 返回页面
@@ -175,157 +174,126 @@ export const redPage = (url, isAuth = 0) => {
  * @returns
  */
 export const backPage = (num = 1, time = 0) => {
-  if (!num) return false;
+  if (!num) return false
   setTimeout(() => {
     uni.navigateBack({
-      delta: num,
-    });
-  }, time);
-};
+      delta: num
+    })
+  }, time)
+}
 
 /**
  * 拨打电话
  * @param {String} phone 用户隐私号
  * @param {String} orderId 服务单id，如果需要请求记录接口
  */
-export const callPhone = (phone) => {
+export const callPhone = phone => {
   if (!phone)
     return modal({
-        content: '手机号码不存在',
-        showCancel: false,
-      })
+      content: '手机号码不存在',
+      showCancel: false
+    })
       .then(() => {})
-      .catch(() => {});
+      .catch(() => {})
   uni.makePhoneCall({
     phoneNumber: phone,
     success: () => {
       // logCallPhone(orderId);
-    },
-  });
-};
+    }
+  })
+}
 
 /**
  * 复制
  * @param {String} val 复制内容
  */
-export const copy = (val) => {
+export const copy = val => {
   uni.setClipboardData({
     data: val,
     success: () => {
-      successToast('复制成功');
-    },
-  });
-};
+      successToast('复制成功')
+    }
+  })
+}
 
 /**
  * 打开导航
  */
 export const openLocation = (options = {}) => {
-	if (!options) return;
-	const {
-		lat,
-		lng,
-		name,
-		address
-	} = options;
-	uni.openLocation({
-		latitude: Number(lat),
-		longitude: Number(lng),
-		name,
-		address,
-		success: () => {
-			console.log('success');
-		},
-	});
-};
+  if (!options) return
+  const { lat, lng, name, address } = options
+  wx.openLocation({
+    latitude: Number(lat),
+    longitude: Number(lng),
+    name,
+    address,
+    success: () => {
+      console.log('success')
+    }
+  })
+}
 
 // 获取当前定位
-export const getLocation = async function() {
-	return new Promise((resolve, reject) => {
-		uni.getLocation({
-			type: 'gcj02',
-			geocode: true,
-			success: (res) => {
-				resolve(res);
-			},
-			fail: (err) => {
-				console.log('获取当前定位失败', err);
-				uni.authorize({
-					scope: 'scope.userLocation',
-					success: () => {
-						// 允许授权
-						uni.getLocation({
-							type: 'gcj02',
-							geocode: true,
-							success: (res) => {
-								resolve(res);
-							},
-							fail: (err) => {
-								modal({
-									title: '提示',
-									content: '定位失败，请重试',
-									showCancel: false,
-								}).then(() => {});
-							},
-						});
-					},
-					fail: () => {
-						// 拒绝授权
-						modal({
-							title: '提示',
-							content: '定位失败，请重试',
-							showCancel: false,
-							// confirmText: '重新定位',
-						}).then(() => {
-							// getLocation();
-						});
-					},
-				});
-			},
-		});
-	});
-};
+export const getLocation = async function () {
+  return new Promise((resolve, reject) => {
+    wx.getLocation({
+      type: 'gcj02',
+      isHighAccuracy: true,
+      geocode: true,
+      success: res => {
+        resolve(res)
+      },
+      fail: err => {
+        modal({
+          title: '提示',
+          content: '获取当前定位失败',
+          showCancel: false
+        }).then(() => {})
+      }
+    })
+  })
+}
 
 // 获取地址
-export const getAddress = async function() {
-	const location = await getLocation();
-  if(!location) {
-    return tips('获取定位失败，请检查是否开启手机位置信息权限');
+export const getAddress = async function () {
+  const location = await getLocation()
+  if (!location) {
+    return tips('获取定位失败，请检查是否开启手机位置信息权限')
   }
-	return new Promise((resolve, reject) => {
-		uni.request({
-			url: 'https://restapi.amap.com/v3/geocode/regeo',
-			method: 'GET',
-			data: {
-				location: location.longitude + ',' + location.latitude,
-				key: '428a7111e02ea8367a3b34804eaa025b',
-			},
-			success: (res) => {
-				resolve({
-					longitude: location.longitude,
-					latitude: location.latitude,
-					address: res.data.regeocode.formatted_address,
-					province: res.data.regeocode.addressComponent.province,
-					city: res.data.regeocode.addressComponent.city,
-					area: res.data.regeocode.addressComponent.district,
-					street: res.data.regeocode.addressComponent.township,
-				});
-			},
-			fail: function(err) {
-				console.log('地址解析失败' + err);
-			},
-		});
-	});
-};
+  return new Promise((resolve, reject) => {
+    uni.request({
+      url: 'https://restapi.amap.com/v3/geocode/regeo',
+      method: 'GET',
+      data: {
+        location: location.longitude + ',' + location.latitude,
+        key: '428a7111e02ea8367a3b34804eaa025b'
+      },
+      success: res => {
+        resolve({
+          longitude: location.longitude,
+          latitude: location.latitude,
+          address: res.data.regeocode.formatted_address,
+          province: res.data.regeocode.addressComponent.province,
+          city: res.data.regeocode.addressComponent.city,
+          area: res.data.regeocode.addressComponent.district,
+          street: res.data.regeocode.addressComponent.township
+        })
+      },
+      fail: function (err) {
+        console.log('地址解析失败' + err)
+      }
+    })
+  })
+}
 
 // 判断微信环境
 export function isWeixin() {
   if (navigator && navigator.userAgent) {
-    var ua = navigator.userAgent.toLowerCase();
+    var ua = navigator.userAgent.toLowerCase()
     if (ua.indexOf('micromessenger') != -1) {
-      return true;
+      return true
     } else {
-      return false;
+      return false
     }
   } else {
     return false
@@ -335,47 +303,47 @@ export function isWeixin() {
 // 解析地址栏参数
 export function getQueryVariable(variable) {
   // 从?开始获取后面的所有数据
-  var query = window.location.search.substring(1);
+  var query = window.location.search.substring(1)
   // 从字符串&开始分隔成数组split
-  var vars = query.split('&');
+  var vars = query.split('&')
   // 遍历该数组
   for (var i = 0; i < vars.length; i++) {
     // 从等号部分分割成字符
-    var pair = vars[i].split('=');
+    var pair = vars[i].split('=')
     // 如果第一个元素等于 传进来的参的话 就输出第二个元素
     if (pair[0] == variable) {
-      return pair[1];
+      return pair[1]
     }
   }
-  return undefined;
+  return undefined
 }
 
-export const getZero = (num) => {
-	// 个位数前补0
-	if (parseInt(num) < 10) {
-		num = '0' + num;
-	}
-	return num;
-};
+export const getZero = num => {
+  // 个位数前补0
+  if (parseInt(num) < 10) {
+    num = '0' + num
+  }
+  return num
+}
 
 export const getNowDate = () => {
-	const date = new Date();
-	let Y = getZero(date.getFullYear());
-	let M = getZero(date.getMonth() + 1);
-	let D = getZero(date.getDate());
-	return `${Y}-${M}-${D}`;
-};
+  const date = new Date()
+  let Y = getZero(date.getFullYear())
+  let M = getZero(date.getMonth() + 1)
+  let D = getZero(date.getDate())
+  return `${Y}-${M}-${D}`
+}
 
 export const getNowDatetime = () => {
-	const date = new Date();
-	let Y = getZero(date.getFullYear());
-	let M = getZero(date.getMonth() + 1);
-	let D = getZero(date.getDate());
-	let h = getZero(date.getHours());
-	let m = getZero(date.getMinutes());
-	let s = getZero(date.getSeconds());
-	return `${Y}-${M}-${D} ${h}:${m}:${s}`;
-};
+  const date = new Date()
+  let Y = getZero(date.getFullYear())
+  let M = getZero(date.getMonth() + 1)
+  let D = getZero(date.getDate())
+  let h = getZero(date.getHours())
+  let m = getZero(date.getMinutes())
+  let s = getZero(date.getSeconds())
+  return `${Y}-${M}-${D} ${h}:${m}:${s}`
+}
 
 export default {
   toast,
@@ -391,9 +359,9 @@ export default {
   callPhone,
   copy,
   openLocation,
-	getLocation,
-	getAddress,
-	getNowDate,
-	getNowDatetime,
-  getZero,
-};
+  getLocation,
+  getAddress,
+  getNowDate,
+  getNowDatetime,
+  getZero
+}

src/common/utils/util.js

@@ -977,7 +977,9 @@ export const wxConfig = function (configInfo, userInfo) {
             'onMenuShareTimeline',
             'onMenuShareAppMessage',
             'onMenuShareQQ',
-            'chooseInvoiceTitle'
+            'chooseInvoiceTitle',
+            'getLocation',
+            'openLocation'
           ]
         })
         wx.ready(() => {

src/packageAttachment/pages/applicationParts/index.vue

@@ -1,211 +1,304 @@
 <template>
-  <div style="width: 100%; height: 100vh">
-    <div class="searchBox">
-      <input type="text" id="search" placeholder="输入关键字选取地点" autocomplete="off" />
-    </div>
-    <div id="container" class="map" tabindex="0"></div>
-    <div id="footer">
-      <div class="addressBox">
-        <span id="address">{{ address }}</span>
-      </div>
-      <div class="btnOk" id="postMessageAdds" @click="getweizhi">确定</div>
-    </div>
-  </div>
+  <view class="s_page">
+    <!-- <map
+      class="myMap"
+      :latitude="latitude"
+      :longitude="longitude"
+      :markers="markers"
+      style="width: 750rpx; flex: 1"
+      scale="11"
+    ></map> -->
+    <!-- 左上角返回按钮 -->
+    <image
+      @tap.stop="navBack"
+      class="map-back"
+      src="/static/images/map_back.png"
+      mode=""
+      :style="{ top: StatusBar + 'px' }"
+    ></image>
+    <!-- 申请记录按钮 -->
+    <view class="record-application" @tap.stop="toNavigate" :style="{ top: StatusBar + 'px' }">
+      <text class="record-application-text">申请记录</text>
+    </view>
+    <!-- 列表 -->
+    <view class="bottom-con">
+      <zj-page-fill
+        @scrolltolower="loadMore"
+        :scrollAttribute="{
+          'refresher-enabled': false
+        }"
+      >
+        <view class="list_view_lay">
+          <view class="box" v-for="item in websitList" :key="item.websitId">
+            <view class="mb20 flex_abs mt20">
+              <text class="fw600 f32_302">{{ item.websitName }}</text>
+              <text class="f24_999">距离{{ item.distance }}km</text>
+            </view>
+            <view class="flex_abs">
+              <text class="f28_666" style="width: 520rpx">地址：{{ item.address }}</text>
+              <tag
+                style="
+                  width: 150rpx;
+                  height: 50rpx;
+                  background-image: linear-gradient(to bottom right, #7fdaff, #6da7ff);
+                  border-radius: 30rpx;
+                "
+              >
+                <text @tap.stop="toApplicationPartsForm(item)" class="f24_FFF">申请</text>
+              </tag>
+            </view>
+          </view>
+        </view>
+      </zj-page-fill>
+
+      <!-- <list @loadmore="loadMore" loadmoreoffset="20" show-scrollbar>
+        <cell class="item" v-for="item in websitList" :key="item.websitId">
+          <view class="mb20 flex_abs mt20">
+            <text class="fw600 f32_302">{{ item.websitName }}</text>
+            <text class="f24_999">距离{{ item.distance }}km</text>
+          </view>
+          <view class="flex_abs">
+            <text class="f28_666" style="width: 520rpx">地址：{{ item.address }}</text>
+            <tag
+              style="
+                width: 150rpx;
+                height: 50rpx;
+                background-image: linear-gradient(to bottom right, #7fdaff, #6da7ff);
+                border-radius: 30rpx;
+              "
+            >
+              <text @tap.stop="toApplicationPartsForm(item)" class="f24_FFF">申请</text>
+            </tag>
+          </view>
+        </cell>
+      </list> -->
+    </view>
+  </view>
 </template>
 
 <script>
+const sysInfo = uni.getSystemInfoSync()
+import api from '@/common/http/'
+import tag from '@/components/tag.vue'
+import zjPageFill from '@/components/zj-page-container/zj-page-fill.vue'
 export default {
-  components: {},
+  components: {
+    tag,
+    zjPageFill
+  },
   data() {
     return {
-      mapInfo: {
-        latitude: 0,
-        longitude: 0,
-        address: ''
-      },
-      address: ''
+      StatusBar: sysInfo.statusBarHeight,
+      latitude: '',
+      longitude: '',
+      markers: [
+        {
+          id: 'm_1',
+          latitude: 23.183466,
+          longitude: 113.35709,
+          iconPath: '/static/images/order_call.png'
+        }
+      ],
+      websitList: [],
+      page: 1,
+      pageSize: 3,
+      websit_number: ''
     }
   },
-  mounted() {
-    var center = ''
-
-    const map = new AMap.Map('container', {
-      zoom: 17,
-      resizeEnable: true,
-      rotateEnable: true,
-      pitchEnable: true,
-      pitch: 80,
-      rotation: -15,
-      // viewMode: '3D', //开启3D视图,默认为关闭
-      buildingAnimation: true, //楼块出现是否带动画
-      enableHighAccuracy: true, //是否使用高精度定位，默认:true
-      expandZoomRange: true,
-      zooms: [3, 20]
-    })
-
-    //地图开始
-    AMap.plugin('AMap.Geolocation', () => {
-      var geolocation = new AMap.Geolocation({
-        enableHighAccuracy: true, //是否使用高精度定位，默认:true
-        timeout: 10000, //超过10秒后停止定位，默认：无穷大
-        convert: true, //自动偏移坐标，偏移后的坐标为高德坐标，默认：true
-        showButton: true, //显示定位按钮，默认：true
-        showMarker: false, //定位成功后在定位到的位置显示点标记，默认：true
-        showCircle: false, //定位成功后用圆圈表示定位精度范围，默认：true
-        panToLocation: true, //定位成功后将定位到的位置作为地图中心点，默认：true
-        offset: [15, 150], //定位按钮与设置的停靠位置的偏移量，默认：Pixel(10, 20)
-        position: 'LB' //定位按钮停靠位置，默认：'LB'，左下角
-      })
-      map.addControl(geolocation)
-      geolocation.getCurrentPosition((status, result) => {
-        if (status == 'complete') {
-          this.mapInfo.longitude = result.position.lng
-          this.mapInfo.latitude = result.position.lat
-          this.mapInfo.address = result.formattedAddress
-          if (center != '') {
-            map.setCenter(center)
-          } else {
-            map.setCenter([result.position.lng, result.position.lat])
-          }
-          this.address = result.formattedAddress
-        } else {
-          if (center != '') {
-            map.setCenter(center)
-          }
-          console.log('失败原因排查信息:' + result.message)
-        }
-      })
-    })
-
-    AMapUI.loadUI(['misc/PositionPicker'], PositionPicker => {
-      var positionPicker = new PositionPicker({
-        mode: 'dragMap', //dragMap：拖拽地图，dragMarker：拖拽点
-        map: map
-      })
-      positionPicker.on('success', positionResult => {
-        this.mapInfo = {
-          latitude: positionResult.position.lat,
-          longitude: positionResult.position.lng,
-          address: positionResult.regeocode.formattedAddress
-        }
-        this.address = positionResult.address
+  async onLoad() {
+    const getWebsit_number = uni.getStorageSync('userInfo')
+    this.websit_number = getWebsit_number.websit_number
+    await this.getCurrentWebsit()
+    await this.getWebsitList()
+  },
+  methods: {
+    navBack() {
+      uni.navigateBack({
+        delta: 1
       })
-      positionPicker.on('fail', positionResult => {
-        this.address = ''
+    },
+    toNavigate() {
+      this.$navToPage({
+        url: `/packageAttachment/pages/orderOfSales/index`
       })
-      positionPicker.start()
-    })
-
-    AMapUI.loadUI(['misc/PoiPicker'], PoiPicker => {
-      const poiPicker = new PoiPicker({
-        input: 'search'
+    },
+    toApplicationPartsForm(item) {
+      var { websitId, websitName, partsWebsitId } = item
+      this.$navToPage({
+        url: `/packageAttachment/pages/applicationParts/applicationPartsForm?websitId=${websitId}&websitName=${websitName}&partsWebsitId=${partsWebsitId}`
       })
-      //初始化poiPicker
-      poiPicker.on('poiPicked', poiResult => {
-        const item = poiResult.item
-        this.mapInfo = {
-          latitude: item.location.lat,
-          longitude: item.location.lng,
-          address: item.district + ' ' + item.name + ' ' + item.address
-        }
-        map.setCenter([item.location.lng, item.location.lat])
-        document.getElementById('search').value = ''
+    },
+    loadMore() {
+      this.page++
+      this.getWebsitList()
+    },
+    getWebsitList() {
+      let params = {
+        latitude: this.latitude,
+        longitude: this.longitude,
+        pageNo: this.page,
+        pageSize: this.pageSize,
+        websitNumber: this.websit_number
+      }
+      api.post('/app/buy/websit/list', params).then(res => {
+        this.websitList = this.websitList.concat(res.data.records).filter(item => item.partsWebsitId)
+        // if (this.websitList.length != 0) {
+        //   this.markers = this.websitList.map(item => {
+        //     return {
+        //       id: item.websitId,
+        //       latitude: item.latitude,
+        //       longitude: item.longitude,
+        //       width: 28,
+        //       height: 28,
+        //       fontSize: 16,
+        //       iconPath: '',
+        //       callout: {
+        //         content: item.websitName,
+        //         padding: 5,
+        //         display: 'ALWAYS',
+        //         borderRadius: 5,
+        //         color: '#E95505'
+        //       }
+        //     }
+        //   })
+        // }
       })
-    })
-  },
-  methods: {
-    getweizhi() {
-      AMap.plugin(['AMap.Geocoder'], () => {
-        var geocoder = new AMap.Geocoder()
-        geocoder.getAddress([this.mapInfo.longitude, this.mapInfo.latitude], (status, result) => {
-          if (status === 'complete' && result.info === 'OK') {
-            if (result && result.regeocode) {
-              // 具体地址
-              this.mapInfo.address = result.regeocode.formattedAddress
-              // 省
-              this.mapInfo.province = result.regeocode.addressComponent.province
-              // 市
-              this.mapInfo.city = result.regeocode.addressComponent.city
-              if (this.mapInfo.city == '') this.mapInfo.city = this.mapInfo.province
-              // 区
-              this.mapInfo.district = result.regeocode.addressComponent.district
-              console.log(this.mapInfo)
+    },
+    async getCurrentWebsit() {
+      try {
+        const addressInfo = await new Promise((resolve, reject) => {
+          wx.getLocation({
+            type: 'gcj02',
+            isHighAccuracy: true,
+            geocode: true,
+            success: res => {
+              resolve({
+                lat: res.latitude,
+                lng: res.longitude,
+                address: res.address
+              })
+            },
+            fail: err => {
+              reject(err)
             }
-          } else {
-            alert('获取省市区失败，请重新选择地址')
-          }
+          })
         })
-      })
+        console.log(addressInfo)
+        let { lat, lng } = addressInfo
+        this.latitude = lat
+        this.longitude = lng
+      } catch (error) {
+        console.log(error)
+      }
     }
   }
 }
 </script>
 
 <style scoped lang="scss">
-.map {
-  height: 100%;
-  width: 100%;
-  float: left;
+.confirm-btn {
+  background-image: linear-gradient(to bottom right, #7fdaff, #6da7ff);
 }
 
-#right {
-  display: none;
+.map-back {
+  position: absolute;
+  left: 30rpx;
+  width: 60rpx;
+  height: 60rpx;
+  border-radius: 30rpx;
+  overflow: hidden;
+}
+
+.record-application {
+  position: absolute;
+  right: 30rpx;
+  width: auto;
+  height: 60rpx;
+  border-radius: 30rpx;
+  box-sizing: border-box;
+  padding: 0 20rpx;
+  background: #6da7ff;
 }
 
-#footer {
+.record-application-text {
+  font-size: 28rpx;
+  font-weight: 500;
+  text-align: center;
+  color: #ffffff !important;
+  line-height: 60rpx;
+}
+
+.bottom-con {
+  width: 750rpx;
+  padding-top: 25rpx;
+  padding-left: 25rpx;
+  padding-bottom: 30rpx;
+  padding-right: 25rpx;
+  // border-radius: 40rpx;
+  border-top-right-radius: 40rpx;
+  border-top-left-radius: 40rpx;
+  // box-shadow: 0px -10rpx 40rpx 0px rgba(0, 0, 0, 0.05);
   position: fixed;
   bottom: 0;
   left: 0;
-  width: 100%;
-  background: #fff;
-  border-top: 1px solid #cccccc;
-  z-index: 9999;
-  padding: 10px 20px;
-  box-sizing: border-box;
+  background-color: #ffffff;
+  z-index: 100;
+  // overflow:hidden;
+  height: 500rpx;
 }
 
-.addressBox {
-  width: 100%;
-  box-sizing: border-box;
-  position: relative;
-  font-size: 16px;
-  margin: 10px 0 15px;
+.item {
+  background-color: #ffffff;
+  overflow: hidden;
+  border-bottom: 2rpx solid #f7f7f7;
+  padding-bottom: 20rpx;
 }
 
-.btnOk {
-  line-height: 44px;
-  text-align: center;
-  background: #0091ff;
-  font-size: 18px;
-  color: #fff;
-  border-radius: 5px;
+.flex_abs {
+  flex-direction: row;
 }
 
-.searchBox {
+.mask {
   position: fixed;
-  top: 0;
   left: 0;
-  width: 100%;
-  z-index: 9999;
-  height: auto;
-  padding: 10px 20px;
-  box-sizing: border-box;
-  background: rgba(255, 255, 255, 0);
+  top: 0;
+  bottom: 0;
+  right: 0;
+  background-color: rgba(0, 0, 0, 0.3);
+  z-index: 1000;
+  justify-content: center;
+  align-items: center;
 }
 
-#search {
-  width: 100%;
-  height: 38px;
-  border-radius: 20px;
-  border: 1px solid #ccc;
-  outline: none;
-  background: rgba(255, 255, 255, 0.5);
-  padding-left: 10px;
-  box-sizing: border-box;
+.closes {
+  flex-direction: row;
+  justify-content: flex-end;
 }
 
-#container {
-  width: 100%;
-  height: 100%;
+.closes-img {
+  height: 40rpx;
+  width: 40rpx;
+}
+
+.phone-con {
+  width: 540rpx;
+  border-radius: 20rpx;
+  background-color: #ffffff;
+  text-align: center;
+  padding: 10rpx 30rpx 40rpx 30rpx;
+  position: relative;
+
+  .confirm-btn {
+    font-size: 32rpx;
+    color: #ffffff;
+  }
+
+  .iconfont {
+    color: #e5e5e5;
+    position: absolute;
+    right: 30rpx;
+    top: 30rpx;
+    color: #333333;
+  }
 }
 </style>

src/packageAttachment/pages/applicationParts/index__.vue

@@ -1,299 +0,0 @@
-<template>
-  <view class="s_page">
-    <map
-      class="myMap"
-      :latitude="latitude"
-      :longitude="longitude"
-      :markers="markers"
-      style="width: 750rpx; flex: 1"
-      scale="11"
-    ></map>
-    <!-- 左上角返回按钮 -->
-    <image
-      @tap.stop="navBack"
-      class="map-back"
-      src="/static/images/map_back.png"
-      mode=""
-      :style="{ top: StatusBar + 'px' }"
-    ></image>
-    <!-- 申请记录按钮 -->
-    <view class="record-application" @tap.stop="toNavigate" :style="{ top: StatusBar + 'px' }">
-      <text class="record-application-text">申请记录</text>
-    </view>
-    <!-- 列表 -->
-    <view class="bottom-con">
-      <zj-page-fill
-        @scrolltolower="loadMore"
-        :scrollAttribute="{
-          'refresher-enabled': false
-        }"
-      >
-        <view class="list_view_lay">
-          <view class="box" v-for="item in websitList" :key="item.websitId">
-            <view class="mb20 flex_abs mt20">
-              <text class="fw600 f32_302">{{ item.websitName }}</text>
-              <text class="f24_999">距离{{ item.distance }}km</text>
-            </view>
-            <view class="flex_abs">
-              <text class="f28_666" style="width: 520rpx">地址：{{ item.address }}</text>
-              <tag
-                style="
-                  width: 150rpx;
-                  height: 50rpx;
-                  background-image: linear-gradient(to bottom right, #7fdaff, #6da7ff);
-                  border-radius: 30rpx;
-                "
-              >
-                <text @tap.stop="toApplicationPartsForm(item)" class="f24_FFF">申请</text>
-              </tag>
-            </view>
-          </view>
-        </view>
-      </zj-page-fill>
-
-      <!-- <list @loadmore="loadMore" loadmoreoffset="20" show-scrollbar>
-        <cell class="item" v-for="item in websitList" :key="item.websitId">
-          <view class="mb20 flex_abs mt20">
-            <text class="fw600 f32_302">{{ item.websitName }}</text>
-            <text class="f24_999">距离{{ item.distance }}km</text>
-          </view>
-          <view class="flex_abs">
-            <text class="f28_666" style="width: 520rpx">地址：{{ item.address }}</text>
-            <tag
-              style="
-                width: 150rpx;
-                height: 50rpx;
-                background-image: linear-gradient(to bottom right, #7fdaff, #6da7ff);
-                border-radius: 30rpx;
-              "
-            >
-              <text @tap.stop="toApplicationPartsForm(item)" class="f24_FFF">申请</text>
-            </tag>
-          </view>
-        </cell>
-      </list> -->
-    </view>
-  </view>
-</template>
-
-<script>
-const sysInfo = uni.getSystemInfoSync()
-import api from '@/common/http/'
-import tag from '@/components/tag.vue'
-import zjPageFill from '@/components/zj-page-container/zj-page-fill.vue'
-export default {
-  components: {
-    tag,
-    zjPageFill
-  },
-  data() {
-    return {
-      StatusBar: sysInfo.statusBarHeight,
-      latitude: '',
-      longitude: '',
-      markers: [
-        {
-          id: 'm_1',
-          latitude: 23.183466,
-          longitude: 113.35709,
-          iconPath: '/static/images/order_call.png'
-        }
-      ],
-      websitList: [],
-      page: 1,
-      pageSize: 3,
-      websit_number: ''
-    }
-  },
-  async onLoad() {
-    const getWebsit_number = uni.getStorageSync('userInfo')
-    this.websit_number = getWebsit_number.websit_number
-    await this.getCurrentWebsit()
-    await this.getWebsitList()
-  },
-  methods: {
-    navBack() {
-      uni.navigateBack({
-        delta: 1
-      })
-    },
-    toNavigate() {
-      this.$navToPage({
-        url: `/packageAttachment/pages/orderOfSales/index`
-      })
-    },
-    toApplicationPartsForm(item) {
-      var { websitId, websitName, partsWebsitId } = item
-      this.$navToPage({
-        url: `/packageAttachment/pages/applicationParts/applicationPartsForm?websitId=${websitId}&websitName=${websitName}&partsWebsitId=${partsWebsitId}`
-      })
-    },
-    loadMore() {
-      this.page++
-      this.getWebsitList()
-    },
-    getWebsitList() {
-      let params = {
-        latitude: this.latitude,
-        longitude: this.longitude,
-        pageNo: this.page,
-        pageSize: this.pageSize,
-        websitNumber: this.websit_number
-      }
-      api.post('/app/buy/websit/list', params).then(res => {
-        this.websitList = this.websitList.concat(res.data.records).filter(item => item.partsWebsitId)
-        if (this.websitList.length != 0) {
-          this.markers = this.websitList.map(item => {
-            return {
-              id: item.websitId,
-              latitude: item.latitude,
-              longitude: item.longitude,
-              width: 28,
-              height: 28,
-              fontSize: 16,
-              iconPath: '',
-              callout: {
-                content: item.websitName,
-                padding: 5,
-                display: 'ALWAYS',
-                borderRadius: 5,
-                color: '#E95505'
-              }
-            }
-          })
-        }
-      })
-    },
-    async getCurrentWebsit() {
-      const addressInfo = await new Promise((resolve, reject) => {
-        uni.getLocation({
-          type: 'gcj02',
-          geocode: true,
-          success: res => {
-            resolve({
-              lat: res.latitude,
-              lng: res.longitude,
-              address: res.address
-            })
-          },
-          fail: err => {
-            reject(err)
-          }
-        })
-      })
-      console.log(addressInfo)
-      let { lat, lng } = addressInfo
-      this.latitude = lat
-      this.longitude = lng
-    }
-  }
-}
-</script>
-
-<style scoped lang="scss">
-.confirm-btn {
-  background-image: linear-gradient(to bottom right, #7fdaff, #6da7ff);
-}
-
-.map-back {
-  position: absolute;
-  left: 30rpx;
-  width: 60rpx;
-  height: 60rpx;
-  border-radius: 30rpx;
-  overflow: hidden;
-}
-
-.record-application {
-  position: absolute;
-  right: 30rpx;
-  width: auto;
-  height: 60rpx;
-  border-radius: 30rpx;
-  box-sizing: border-box;
-  padding: 0 20rpx;
-  background: #6da7ff;
-}
-
-.record-application-text {
-  font-size: 28rpx;
-  font-weight: 500;
-  text-align: center;
-  color: #ffffff !important;
-  line-height: 60rpx;
-}
-
-.bottom-con {
-  width: 750rpx;
-  padding-top: 25rpx;
-  padding-left: 25rpx;
-  padding-bottom: 30rpx;
-  padding-right: 25rpx;
-  // border-radius: 40rpx;
-  border-top-right-radius: 40rpx;
-  border-top-left-radius: 40rpx;
-  // box-shadow: 0px -10rpx 40rpx 0px rgba(0, 0, 0, 0.05);
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  background-color: #ffffff;
-  z-index: 100;
-  // overflow:hidden;
-  height: 500rpx;
-}
-
-.item {
-  background-color: #ffffff;
-  overflow: hidden;
-  border-bottom: 2rpx solid #f7f7f7;
-  padding-bottom: 20rpx;
-}
-
-.flex_abs {
-  flex-direction: row;
-}
-
-.mask {
-  position: fixed;
-  left: 0;
-  top: 0;
-  bottom: 0;
-  right: 0;
-  background-color: rgba(0, 0, 0, 0.3);
-  z-index: 1000;
-  justify-content: center;
-  align-items: center;
-}
-
-.closes {
-  flex-direction: row;
-  justify-content: flex-end;
-}
-
-.closes-img {
-  height: 40rpx;
-  width: 40rpx;
-}
-
-.phone-con {
-  width: 540rpx;
-  border-radius: 20rpx;
-  background-color: #ffffff;
-  text-align: center;
-  padding: 10rpx 30rpx 40rpx 30rpx;
-  position: relative;
-
-  .confirm-btn {
-    font-size: 32rpx;
-    color: #ffffff;
-  }
-
-  .iconfont {
-    color: #e5e5e5;
-    position: absolute;
-    right: 30rpx;
-    top: 30rpx;
-    color: #333333;
-  }
-}
-</style>

src/packageMaterial/pages/apply/order.vue

@@ -118,7 +118,7 @@ export default {
     // 获取位置
     async getLocation() {
     	return await new Promise((resolve, reject) => {
-    		uni.getLocation({
+    		wx.getLocation({
     			type: 'gcj02',
     			isHighAccuracy: true,
     			geocode: true,

src/packageMaterial/pages/apply/website.vue

@@ -82,7 +82,7 @@ export default {
     // 获取位置
     async getLocation() {
       return await new Promise((resolve, reject) => {
-        uni.getLocation({
+        wx.getLocation({
           type: 'gcj02',
           isHighAccuracy: true,
           geocode: true,