提交优化

liujun001
1 parent 1380bd41
Showing 13 changed files with 182 additions and 49 deletions
garbage-removal/src/apis/company.js
garbage-removal/src/components/liu-delivery-time/liu-delivery-time.vue
garbage-removal/src/manifest.json
garbage-removal/src/pages/home-info/address/addSite.vue
garbage-removal/src/pages/home-info/clean/index.vue
garbage-removal/src/pages/wode-info/wode-info-choose/index.vue
garbage-removal/src/static/image/driver.png
garbage-removal/src/static/image/handler.png
garbage-removal/src/static/image/role/company.png
garbage-removal/src/static/image/role/disposal.png
garbage-removal/src/static/image/role/handler.png
garbage-removal/src/static/image/role/user.png
garbage-removal/src/static/image/user.png
@@ -15,7 +15,7 @@ export async function queryDisposalSiteList() {
  */
 export async function queryEnterpriseList(params) {
    return await request.get(
-     `/order/company`,
+     `/order/docking/up/company`,
      {params:params}
   );
 }
@@ -125,39 +125,139 @@ const getFutureDays = () =&gt; {
 const getTimeList = () => {
 	const timeList = [{
+		time: '00:00-01:00',
+		start: '00:00',
+		end: '01:00',
+		timeStr:'22-07'
+	},{
+		time: '01:00-02:00',
+		start: '01:00',
+		end: '02:00',
+		timeStr:'22-07'
+	},{
+		time: '02:00-03:00',
+		start: '02:00',
+		end: '03:00',
+		timeStr:'22-07'
+	},{
+		time: '03:00-04:00',
+		start: '03:00',
+		end: '04:00',
+		timeStr:'22-07'
+	},{
+		time: '04:00-05:00',
+		start: '04:00',
+		end: '05:00',
+		timeStr:'22-07'
+	},{
+		time: '05:00-06:00',
+		start: '05:00',
+		end: '06:00',
+		timeStr:'22-07'
+	},{
+		time: '06:00-07:00',
+		start: '06:00',
+		end: '07:00',
+		timeStr:'22-07'
+	},{
+		time: '07:00-08:00',
+		start: '07:00',
+		end: '08:00',
+		timeStr:'07-08'
+	},{
+		time: '08:00-09:00',
+		start: '08:00',
+		end: '09:00',
+		timeStr:'08-09'
+	},{
 		time: '09:00-10:00',
 		start: '09:00',
-		end: '10:00'
+		end: '10:00',
+		timeStr:'09-10'
 	},
 	{
 		time: '10:00-11:00',
 		start: '10:00',
-		end: '11:00'
+		end: '11:00',
+		timeStr:'10-11'
 	},
 	{
 		time: '11:00-12:00',
 		start: '11:00',
-		end: '12:00'
+		end: '12:00',
+		timeStr:'11-12'
 	},
 	{
 		time: '12:00-13:00',
 		start: '12:00',
-		end: '13:00'
+		end: '13:00',
+		timeStr:'12-13'
 	},
 	{
 		time: '13:00-14:00',
 		start: '13:00',
-		end: '14:00'
+		end: '14:00',
+		timeStr:'13-14'
 	},
 	{
 		time: '14:00-15:00',
 		start: '14:00',
-		end: '15:00'
+		end: '15:00',
+		timeStr:'14-15'
 	},
 	{
 		time: '15:00-16:00',
 		start: '15:00',
-		end: '16:00'
+		end: '16:00',
+		timeStr:'15-16'
+	},
+	{
+		time: '16:00-17:00',
+		start: '16:00',
+		end: '17:00',
+		timeStr:'16-17'
+	},
+	{
+		time: '17:00-18:00',
+		start: '17:00',
+		end: '18:00',
+		timeStr:'17-18'
+	},
+	{
+		time: '18:00-19:00',
+		start: '18:00',
+		end: '19:00',
+		timeStr:'18-19'
+	},
+	{
+		time: '19:00-20:00',
+		start: '19:00',
+		end: '20:00',
+		timeStr:'19-20'
+	},
+	{
+		time: '20:00-21:00',
+		start: '20:00',
+		end: '21:00',
+		timeStr:'20-21'
+	},
+	{
+		time: '21:00-22:00',
+		start: '21:00',
+		end: '22:00',
+		timeStr:'21-22'
+	},
+	{
+		time: '22:00-23:00',
+		start: '22:00',
+		end: '23:00',
+		timeStr:'22-07'
+	},
+	{
+		time: '23:00-24:00',
+		start: '23:00',
+		end: '24:00',
+		timeStr:'22-07'
 	}
 	];
 	return timeList
@@ -50,16 +50,18 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "optimization":{"subPackages":true},
+        "optimization" : {
+            "subPackages" : true
+        },
         "lazyCodeLoading" : "requiredComponents",
-        "requiredPrivateInfos": ["getLocation", "chooseLocation"],
-        "appid" : "wxc3f60667dc9d6cea",
-        "permission":{
-            "scope.userLocation":{
-                    "desc":"你的位置信息将用于小程序位置接口的"
-                }
+        "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ],
+        "appid" : "wx6c12c068d07c46f8",
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "你的位置信息将用于小程序位置接口的"
+            }
         },
-        "libVersion": "latest",
+        "libVersion" : "latest",
         "setting" : {
             "urlCheck" : false
         },
@@ -72,8 +74,8 @@
         "sdkConfigs" : {
             "maps" : {
                 "amap" : {
-                    "key" : "b1824190654be63b3111c33127a120ca",
-                    "securityJsCode" : "63ff81bc91c64d3f044d7788bfa8e693",
+                    "key" : "d459b6535916a23c05ade96744cf5d31",
+                    "securityJsCode" : "22356e0e06fbedc6667519e170f232ae",
                     "serviceHost" : ""
                 }
             }
@@ -167,6 +167,7 @@ const submit = () =&gt; {
 const chooseAddressDetail = () => {
 	console.log('打开地图选择地址');
 	let coordinate = 'gcj02';
+	// #ifdef MP-WEIXIN
 	uni.chooseLocation({
 		type: coordinate,
 		success: function (res) {
@@ -175,7 +176,6 @@ const chooseAddressDetail = () =&gt; {
 				addressInfo.garLongitude = res.longitude
 				addressInfo.garLatitude = res.latitude
 				addressInfo.garCoordinate = coordinate
-				// #ifdef MP-WEIXIN
 				let SecretKey = "DsNi4Hug4POlYLJ8AaloKB6Uob5fvL8l";
 				let key = "HNEBZ-PWHLR-M5AWP-WMRT3-XEOHJ-Y2BHY";
 				let md5Param = `/ws/geocoder/v1/?key=${key}&location=${res.latitude},${res.longitude}`;
@@ -192,13 +192,33 @@ const chooseAddressDetail = () =&gt; {
 						}
 					}
 				});
-				// #endif
+				
 			}
 		},
 		fail: function (res) {
 			console.log(res);
 		}
 	});
+	// #endif
+
+	// #ifdef H5
+	uni.chooseLocation({
+		type: coordinate,
+		latitude:113.081000,
+		longitude:28.246000,
+		success: function (res) {
+			if (res.address) {
+				addressInfo.addressDetail = res.address + res.name;
+				addressInfo.garLongitude = res.longitude
+				addressInfo.garLatitude = res.latitude
+				addressInfo.garCoordinate = coordinate
+			}
+		},
+		fail: function (res) {
+			console.log(res);
+		}
+	});
+	// #endif
 }
 onMounted(() => {
@@ -89,15 +89,6 @@
               </view>
             </view>
-
-          <view class="company-clean-container-car-main-content-type">
-            <view class="company-clean-container-car-main-content-type-price-area">
-              <text style="color: red;">*</text>预估费用:
-            </view>
-            <view style=" width:100%;display:flex; color:#909399; align-items: center;">
-              <u-number-box :min="0" :max="9999999" integer buttonSize="46" :inputWidth="100"  v-model="paramFrom.garEstimatedCost" ></u-number-box>
-            </view>
-          </view>
             <view class="company-clean-container-car-main-content-type">
               <view class="company-clean-container-car-main-content-type-price-area">
@@ -430,6 +421,19 @@ const orderClick = ref(true)
  * 处理下单
  */
 const handleOderSure = async () => {
+  console.log("paramFrom.value.garEstimatedCost=======================>"+paramFrom.value.garEstimatedCost);
+    
+  if(null == paramFrom.value.garEstimatedCost|| "" == paramFrom.value.garEstimatedCost || undefined == paramFrom.value.garEstimatedCost){
+    jumpPrompt("预估费用不能为空");
+    console.log("----------------------->2");
+    
+    return;
+  }
+  if(paramFrom.value.garEstimatedCost<=0){
+    jumpPrompt("预估费用必须大于0");
+    return;
+  }
+
   let garCarInfos = [];
   for (const key in garCarInfoList.value) {
     if(garCarInfoList.value[key]&& garCarInfoList.value[key].garOrderCarNumber && garCarInfoList.value[key].garOrderCarNumber>0){
@@ -452,10 +456,7 @@ const handleOderSure = async () =&gt; {
       }
     }
-    if(paramFrom.value.garEstimatedCost<0){
-      jumpPrompt("预估费用必须大于0");
-      return;
-    }
+  
   let params = {
@@ -588,6 +589,9 @@ const validateParams = (params) =&gt; {
         case "garOrderAgreementTime":
           jumpPrompt('请选择预约时间')
           break;
+        case "garEstimatedCost":
+           jumpPrompt('请输入预估费用')
+           break;
       }
       return false;
@@ -41,14 +41,6 @@
 <script setup>
 import { updateUserInfo } from "@/apis/user.js";
-import driverImage from "@/static/image/driver.png";
-import handleImage from "@/static/image/handler.png";
-import managerImage from "@/static/image/manager.png";
-import companyPngUrl from '@/static/image/role/company.png';
-import disposalPngUrl from '@/static/image/role/disposal.png';
-import handlerPngUrl from '@/static/image/role/handler.png';
-import userPngUrl from '@/static/image/role/user.png';
-import userImage from "@/static/image/user.png";
 import { useMainStore } from '@/stores/index.js';
 import { setRequestToken } from '@/utils/request/request.js';
 import { onLoad } from "@dcloudio/uni-app";
@@ -58,42 +50,42 @@ const store = useMainStore();
 const typeList = ref([{
   label: "用户",
   info: '下单清运',
-  image: userImage,
+  image: "userImage",
   order: 999,
   classStyle: 'choose-type-item-top-back-sky',
   isNow: false,
   isExit: true,
-  imageUrl: userPngUrl
+  imageUrl: "userPngUrl"
 }, {
   label: "运输企业负责人",
   info: '负责订单处理',
   company: '',
-  image: managerImage,
+  image: "managerImage",
   isExit: false,
   classStyle: 'choose-type-item-top-back-sun',
   order: 1,
   isNow: false,
-  imageUrl: companyPngUrl
+  imageUrl: "companyPngUrl"
 }, {
   label: "清运车辆驾驶员",
   info: '负责垃圾清运',
   company: '',
-  image: driverImage,
+  image: "driverImage",
   isExit: false,
   classStyle: 'choose-type-item-top-back-blue',
   order: 2,
   isNow: false,
-  imageUrl: handlerPngUrl
+  imageUrl: "handlerPngUrl"
 }, {
   label: "处置场所负责人",
   info: '负责现场指导',
   company: '',
-  image: handleImage,
+  image: "handleImage",
   isExit: false,
   classStyle: 'choose-type-item-top-back-pink',
   order: 3,
   isNow: false,
-  imageUrl: disposalPngUrl
+  imageUrl: "disposalPngUrl"
 }])
 const unitInfo = ref([])
 const handlerClick = (val) => {
@@ -155,6 +147,10 @@ const submit = (userType) =&gt; {
   })
 }
+
+const combinationImagePath=(url)=>{
+  return import.meta.env.VITE_BASE_URL+"/"+url;
+}
 onLoad((options) => {
   // let loginInfo = JSON.parse(options)
   let loginInfo = JSON.parse(decodeURIComponent(options.ruleVos))
@@ -184,6 +180,17 @@ onLoad((options) =&gt; {
     typeList.value[index].isNow = true
     userType.value = typeList.value[index].label
   }
+  
+  typeList.value[0].imageUrl = combinationImagePath('role/user.png');
+  typeList.value[1].imageUrl = combinationImagePath('role/company.png');
+  typeList.value[2].imageUrl = combinationImagePath('role/company.png');
+  typeList.value[3].imageUrl = combinationImagePath('role/disposal.png');
+
+
+  typeList.value[0].image = combinationImagePath('user.png');
+  typeList.value[1].image = combinationImagePath('manager.png');
+  typeList.value[2].image = combinationImagePath('driver.png');
+  typeList.value[3].image = combinationImagePath('handler.png');
 })
 </script>