feat: 新增跳转

guzijian
1 parent 1249937f
Showing 7 changed files with 81 additions and 22 deletions
garbage-removal/.hbuilderx/launch.json
garbage-removal/src/manifest.json
garbage-removal/src/pages/home/address/addSite.vue
garbage-removal/src/pages/home/clean/index.vue
garbage-removal/src/pages/order/detail/index.vue
garbage-removal/src/pages/wode/index.vue
garbage-removal/vite.config.js
+{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version": "0.0",
+    "configurations": [{
+     	"default" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"type" : "uniCloud"
+     }
+    ]
+}
@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "lazyCodeLoading": "requiredComponents",
+        "lazyCodeLoading" : "requiredComponents",
         "appid" : "wxc3f60667dc9d6cea",
         "setting" : {
             "urlCheck" : false
@@ -58,13 +58,15 @@
         "usingComponents" : true
     },
     "h5" : {
-        "router": {
-            "mode": "history"
+        "router" : {
+            "mode" : "history"
         },
         "sdkConfigs" : {
             "maps" : {
-                "qqmap" : {
-                    "key" : "LNFBZ-YRSW3-HMU3T-RZP6V-XCWV5-EKFWP"
+                "amap" : {
+                    "key" : "b1824190654be63b3111c33127a120ca",
+                    "securityJsCode" : "63ff81bc91c64d3f044d7788bfa8e693",
+                    "serviceHost" : ""
                 }
             }
         }
@@ -78,8 +80,8 @@
     "mp-toutiao" : {
         "usingComponents" : true
     },
-    "uniStatistics": {
-        "enable": false
+    "uniStatistics" : {
+        "enable" : false
     },
     "vueVersion" : "3"
 }
@@ -11,10 +11,11 @@
 					</view>
 				</u-form-item>
 				<u-form-item :required="true" label="详细地址" prop="addressDetail" borderBottom>
-					<view class="wrap-from-container-address-details" style="display: flex;">
-						<u--input border="none" type="text" v-model="addressInfo.addressDetail" placeholder-class="line"
-							placeholder="请填写详细地址"></u--input>
-						<u-icon name="map" size="40" @click="chooseAddressDetail"></u-icon>
+					<view @click.stop="chooseAddressDetail" class="wrap-from-container-address-details" style="display: flex;"
+						hover-class="click-box">
+						<u--input border="none" readonly type="text" style="pointer-events:none" v-model="addressInfo.addressDetail"
+							placeholder-class="line" placeholder="请先选着地址，在输入补充"></u--input>
+						<u-icon name="map" size="40"></u-icon>
 					</view>
 				</u-form-item>
 				<u-form-item :required="true" label="联系人" prop="contactPerson" borderBottom>
@@ -159,13 +160,19 @@ const submit = () =&gt; {
 		uni.$u.toast('请填写正确信息！')
 	})
 }
+
 /**
  * 打开地图选择地址
  */
 const chooseAddressDetail = () => {
+	let coordinate = 'gcj02';
 	uni.chooseLocation({
+		type: coordinate,
 		success: function (res) {
 			addressInfo.addressDetail = res.address + res.name;
+			addressInfo.garLongitude = res.longitude
+			addressInfo.garLatitude = res.latitude
+			addressInfo.garCoordinate = coordinate
 		}
 	});
 }
@@ -183,6 +190,8 @@ onLoad((options) =&gt; {
 		addressInfo.defaultFlag = addressObj.garUserDefault == 1 ? true : false;
 		addressInfo.addressDetail = addressObj.garRemark;
 		addressInfo.garAddressId = addressObj.garAddressId
+		addressInfo.garLongitude = addressObj.garLongitude
+		addressInfo.garLatitude = addressObj.garLatitude
 		addFlag.value = false;
 	}
 })
@@ -193,6 +202,8 @@ const reset = () =&gt; {
 	addressInfo.defaultFlag = false
 	addressInfo.addressDetail = ''
 	addressInfo.garAddressId = ''
+	addressInfo.garLongitude = ''
+	addressInfo.garLatitude = ''
 	addFlag.value = true
 }
 </script>
@@ -25,7 +25,7 @@
               </view>
               <view class="company-clean-container-car-popup-content-box-item-number" hover-class="hoverClickStyle">
                 <u-number-box :min="0" :max="9999" integer buttonSize="46" :inputWidth="100"
-                  v-model="garCarInfoList[item.garOrderCarType].garOrderCarNumber"></u-number-box>
+                  v-model="garCarInfoList[item.garOrderCarType].garOrderCarNumber" :disabledInput="true"></u-number-box>
               </view>
             </view>
  
@@ -172,7 +172,10 @@ const userAddress = ref({
   garUserContactName: "",
   garUserContactTel: "",
   garRemark: "",
-  garUserAddress: ""
+  garUserAddress: "",
+  garCoordinate: "",
+  garLongitude: "",
+  garLatitude: "",
 })
 // 车辆信息
 const garCarInfoList = ref({})
@@ -204,10 +207,14 @@ const garCarTransportInfo = computed(() =&gt; {
 // 车辆数量
 const garCarNumberCount = computed(() => {
   let count = 0;
-  for (const key in garCarInfoList.value) {
-    const element = garCarInfoList.value[key];
-    count += element.garOrderCarNumber;
+  if (garCarInfoList.value) {
+    for (const key in garCarInfoList.value) {
+      const element = garCarInfoList.value[key];
+      count = typeof element.garOrderCarNumber === 'number' ? count + element.garOrderCarNumber : count;
+      console.log(element.garOrderCarNumber instanceof Number);
+    }
   }
+  console.log(count);
   return count;
 })
 const garbageTypeList = ref([["装修垃圾", "建筑垃圾"]])
@@ -245,7 +252,6 @@ const handlePopupClick = (val) =&gt; {
  * 初始化信息
  */
 onLoad((options) => {
-
   companyObj.value = JSON.parse(options.companyObj);
   tel.value = options.tel;
   userAddress.value = JSON.parse(options.userAddress);
@@ -392,6 +398,9 @@ const handleOderSure = () =&gt; {
    * 图片列表
    */
     imageUrls: fileList.value.map(item => item.url),
+    garLongitude: userAddress.value.garLongitude,
+    garLatitude: userAddress.value.garLatitude,
+    garCoordinate: userAddress.value.garCoordinate,
   }
   if (!validateParams(params)) {
     return;
@@ -29,9 +29,10 @@
           <view class="order-detail-container-header-card-uicon"></view>
           派单信息
         </view>
-        <view class="order-detail-container-header-item">
+        <view class="order-detail-container-header-item"
+          @click.stop="handlerJumpOtherApp(dataGram.garLatitude, dataGram.garLongitude, dataGram.garCoordinate)">
           <text class="order-detail-container-header-title">派单地点：</text>
-          <view class="order-detail-container-header-content">
+          <view class="order-detail-container-header-content" style="text-decoration: underline">
             {{ dataGram.garOrderAddress + dataGram.garOrderAddressDetails }}
           </view>
         </view>
@@ -340,6 +341,7 @@ const selectClick = (index) =&gt; {
 const handleOrderDetail = (orderId) => {
   queryOrderDetail(orderId).then(res => {
     dataGram.value = res.data.data;
+    console.log(res.data.data);
     currentImages.value = res.data.data.currentImages.map(item => {
       return { url: import.meta.env.VITE_BASE_URL + item };
     });
@@ -359,6 +361,26 @@ const handleContactClick = (val) =&gt; {
   }).catch(err => { });
 }
  
+const handlerJumpOtherApp = (latitude, longitude, garCoordinate) => {
+  console.log(latitude, longitude);
+  // 给出提示确定要跳转吗
+  uni.showModal({
+    title: '提示',
+    content: '是否跳转到app定位进行导航？',
+    success: function (res) {
+      if (res.confirm) {
+        uni.openLocation({
+          latitude: latitude,
+          longitude: longitude,
+          success: function () {
+            console.log('success');
+          }
+        });
+      }
+    }
+  })
+}
+
 /**
  * 取消派单
  * @param {*} orderId
@@ -534,7 +556,6 @@ onLoad((options) =&gt; {
 })
  
 onShow(() => {
-
   try {
     if (isOnloadIn.value) {
       handleOrderDetail(orderId.value)
@@ -61,7 +61,7 @@ const handleAddressManager = () =&gt; {
 const handleLoginOut = () => {
   uni.showModal({
     title: '提示',
-    content: '确定要退出码',
+    content: '确定要退出吗？',
     success: function (res) {
       if (res.confirm) {
         loginOut().then(res => {
@@ -12,5 +12,5 @@ export default defineConfig({
       "@": resolve(__dirname, "src"), // 设置@指向src
       "@components": resolve(__dirname, "src/components"), // 设置@components指向src/components
     },
-  },
+  }
 })