优化小程序，司机上传图片交互优化

2c2c2c
1 parent 243edd37
Showing 9 changed files with 250 additions and 21 deletions
garbage-removal/.env.dev
garbage-removal/.env.local
garbage-removal/dist.zip
garbage-removal/src/pages/home-info/clean/index.vue
garbage-removal/src/pages/order-info/order-disposal/scan-detail/index.vue
garbage-removal/src/pages/order-info/order-driver/detail/index.vue
garbage-removal/src/pages/order-info/order-driver/upload/index.vue
garbage-removal/vite.config.js
install.sh
-VITE_BASE_URL=http://192.168.31.218:8080/workflow
+VITE_BASE_URL=http://127.0.0.1:8080/workflow
-VITE_STOMP_URL=http://192.168.31.218:8080/ws
+VITE_STOMP_URL=http://127.0.0.1:8080/ws
-VITE_BASE_URL=http://192.168.31.218:8080/workflow
+VITE_BASE_URL=http://192.169.1.97:8080/workflow
 VITE_BASE_FILE_UPLOAD_PREFIX=/order/upload
-VITE_STOMP_URL=http://192.168.31.218:8080/ws
+VITE_STOMP_URL=http://192.169.1.97:8080/ws
@@ -408,7 +408,14 @@
 	const afterRead = async (event) => {
 		// 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
 		let lists = [].concat(event.file);
+		if(fileList.value[0].label=="预览"){
+			fileList.value = [];
+		}
+
+		console.log("1",fileList.value);
+		let fileListLen = fileList.value.length;
+
 		lists.map((item) => {
 			fileList.value.push({
 				...item,
@@ -416,7 +423,9 @@
 				message: '上传中',
 			});
 		});
-		let fileListLen = fileList.value.length--;
+
+		
+		
 		// 将blob转为file对象的方法
 		function blobToFile(blob, fileName) {
 			return new File([blob], fileName, {
@@ -448,10 +457,12 @@
 		}
-		fileList.value = fileList.value.filter(item => {
-			deletable.value = true
-			return !item.label
-		})
+		// console.log("2",fileList.value);
+		// fileList.value = fileList.value.filter(item => {
+		// 	deletable.value = true
+		// 	return !item.label
+		// })
+		console.log("3",fileList.value);
 	};
@@ -179,11 +179,6 @@
 		console.log(val);
 	}
 	const handlerSubmit = async () => {
-		if (typeof(location.value.latitude) === 'undefined') {
-			console.log('定位获取失败', );
-			uni.$u.toast("需要位置权限才能提交");
-			return;
-		}
 		// 校验参数
 		let params = {
 			...details.value,
@@ -231,6 +226,13 @@
 		if (!validateImage(params.fillImageList)) {
 			return false;
 		}
+
+		if (typeof(location.value.latitude) === 'undefined') {
+			console.log('定位获取失败', );
+			uni.$u.toast("需要位置权限才能提交");
+			return;
+		}
+
 		return true;
 	}
@@ -385,7 +385,21 @@ const createQrCodeValid = (val) =&gt; {
  */
 const handleUploadImage = (orderId, putType) => {
 	const data = dataGram.value;
-	uni.$u.route(`pages/order-info/order-driver/upload/index?orderId=${orderId}&carPlate=${data.garHandlerCarCode}&driver=${store.userInfo.userName}`)
+  uni.showActionSheet({
+    itemList: ['上传装车图片', '上传卸车图片'],
+    success: function (res) {
+      console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
+      if(res.tapIndex === 0){
+        uni.$u.route(`pages/order-info/order-driver/upload/index?orderId=${orderId}&carPlate=${data.garHandlerCarCode}&driver=${store.userInfo.userName}&putType=putOnImages`)
+      }else{
+        uni.$u.route(`pages/order-info/order-driver/upload/index?orderId=${orderId}&carPlate=${data.garHandlerCarCode}&driver=${store.userInfo.userName}&putType=putDownImages`)
+      }
+    },
+    fail: function (res) {
+      console.log(res.errMsg);
+    }
+  });
+	// uni.$u.route(`pages/order-info/order-driver/upload/index?orderId=${orderId}&carPlate=${data.garHandlerCarCode}&driver=${store.userInfo.userName}`)
 }
 /**
 <template>
 	<view class="upload-image-box">
-		<view class="upload-image-box-choose">
+		<!-- <view class="upload-image-box-choose">
 			<text class="upload-image-box-choose-txt">请选着上传图片类型：</text>
 			<view class="upload-image-box-choose-type">
 				<u-radio-group v-model="putType" @change="groupChange" placement="row">
@@ -10,7 +10,7 @@
 					</u-radio>
 				</u-radio-group>
 			</view>
-		</view>
+		</view> -->
 		<view class="upload-image-box-bottom">
 			<text class="upload-image-box-bottom-txt">{{ putType }}（最多上传10张）</text>
 			<view class="upload-image-box-button-container">
@@ -58,6 +58,10 @@
 		name: "卸车图片"
 	}])
 	const location = ref({});
+
+	const isUpload = ref(false);
+
+
 	// 删除图片
 	const deletePic = (event) => {
 		fileList.value.splice(event.index, 1);
@@ -215,8 +219,8 @@
 		orderId.value = options.orderId;
 		carPlate.value = options.carPlate;
 		driver.value = options.driver;
-		// putType.value = options.putType === "putOnImages" ? "装车图片" : "卸车图片";
-
+		console.log(options.putType);
+		putType.value = options.putType === "putOnImages" ? "装车图片" : "卸车图片";
 	})
 </script>
@@ -8,7 +8,7 @@ export default defineConfig({
   plugins: [
     uni(),
 	//本地环境开启https
-	// basicSsl()
+	basicSsl()
   ],
    resolve: {
     alias: {
@@ -19,6 +19,6 @@ export default defineConfig({
    server: {
      port: 9000,
 	 //本地环境开启https
-	 // https: true
+	 https: true
    }
 })
+#!/bin/bash
+
+# Color definitions
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+CYAN='\033[0;36m'
+NC='\033[0m' # No Color
+
+# Logo
+print_logo() {
+    echo -e "${CYAN}"
+    cat << "EOF"
+   ██████╗██╗   ██╗██████╗ ███████╗ ██████╗ ██████╗      ██████╗ ██████╗  ██████╗   
+  ██╔════╝██║   ██║██╔══██╗██╔════╝██╔═══██╗██╔══██╗     ██╔══██╗██╔══██╗██╔═══██╗  
+  ██║     ██║   ██║██████╔╝███████╗██║   ██║██████╔╝     ██████╔╝██████╔╝██║   ██║  
+  ██║     ██║   ██║██╔══██╗╚════██║██║   ██║██╔══██╗     ██╔═══╝ ██╔══██╗██║   ██║  
+  ╚██████╗╚██████╔╝██║  ██║███████║╚██████╔╝██║  ██║     ██║     ██║  ██║╚██████╔╝  
+   ╚═════╝ ╚═════╝ ╚═╝  ╚═╝╚══════╝ ╚═════╝ ╚═╝  ╚═╝     ╚═╝     ╚═╝  ╚═╝ ╚═════╝  
+EOF
+    echo -e "${NC}"
+}
+
+# Get download folder path
+get_downloads_dir() {
+    if [[ "$(uname)" == "Darwin" ]]; then
+        echo "$HOME/Downloads"
+    else
+        if [ -f "$HOME/.config/user-dirs.dirs" ]; then
+            . "$HOME/.config/user-dirs.dirs"
+            echo "${XDG_DOWNLOAD_DIR:-$HOME/Downloads}"
+        else
+            echo "$HOME/Downloads"
+        fi
+    fi
+}
+
+# Get latest version
+get_latest_version() {
+    echo -e "${CYAN}ℹ️ Checking latest version...${NC}"
+    latest_release=$(curl -s https://api.github.com/repos/yeongpin/cursor-free-vip/releases/latest) || {
+        echo -e "${RED}❌ Cannot get latest version information${NC}"
+        exit 1
+    }
+    
+    VERSION=$(echo "$latest_release" | grep -o '"tag_name": ".*"' | cut -d'"' -f4 | tr -d 'v')
+    if [ -z "$VERSION" ]; then
+        echo -e "${RED}❌ Failed to parse version from GitHub API response:\n${latest_release}"
+        exit 1
+    fi
+
+    echo -e "${GREEN}✅ Found latest version: ${VERSION}${NC}"
+}
+
+# Detect system type and architecture
+detect_os() {
+    if [[ "$(uname)" == "Darwin" ]]; then
+        # Detect macOS architecture
+        ARCH=$(uname -m)
+        if [[ "$ARCH" == "arm64" ]]; then
+            OS="mac_arm64"
+            echo -e "${CYAN}ℹ️ Detected macOS ARM64 architecture${NC}"
+        else
+            OS="mac_intel"
+            echo -e "${CYAN}ℹ️ Detected macOS Intel architecture${NC}"
+        fi
+    elif [[ "$(uname)" == "Linux" ]]; then
+        # Detect Linux architecture
+        ARCH=$(uname -m)
+        if [[ "$ARCH" == "aarch64" || "$ARCH" == "arm64" ]]; then
+            OS="linux_arm64"
+            echo -e "${CYAN}ℹ️ Detected Linux ARM64 architecture${NC}"
+        else
+            OS="linux_x64"
+            echo -e "${CYAN}ℹ️ Detected Linux x64 architecture${NC}"
+        fi
+    else
+        # Assume Windows
+        OS="windows"
+        echo -e "${CYAN}ℹ️ Detected Windows system${NC}"
+    fi
+}
+
+# Install and download
+install_cursor_free_vip() {
+    local downloads_dir=$(get_downloads_dir)
+    local binary_name="CursorFreeVIP_${VERSION}_${OS}"
+    local binary_path="${downloads_dir}/${binary_name}"
+    local download_url="https://github.com/yeongpin/cursor-free-vip/releases/download/v${VERSION}/${binary_name}"
+    
+    # Check if file already exists
+    if [ -f "${binary_path}" ]; then
+        echo -e "${GREEN}✅ Found existing installation file${NC}"
+        echo -e "${CYAN}ℹ️ Location: ${binary_path}${NC}"
+        
+        # Check if running as root
+        if [ "$EUID" -ne 0 ]; then
+            echo -e "${YELLOW}⚠️ Requesting administrator privileges...${NC}"
+            if command -v sudo >/dev/null 2>&1; then
+                echo -e "${CYAN}ℹ️ Starting program with sudo...${NC}"
+                sudo chmod +x "${binary_path}"
+                sudo "${binary_path}"
+            else
+                echo -e "${YELLOW}⚠️ sudo not found, trying to run normally...${NC}"
+                chmod +x "${binary_path}"
+                "${binary_path}"
+            fi
+        else
+            # Already running as root
+            echo -e "${CYAN}ℹ️ Already running as root, starting program...${NC}"
+            chmod +x "${binary_path}"
+            "${binary_path}"
+        fi
+        return
+    fi
+    
+    echo -e "${CYAN}ℹ️ No existing installation file found, starting download...${NC}"
+    echo -e "${CYAN}ℹ️ Downloading to ${downloads_dir}...${NC}"
+    echo -e "${CYAN}ℹ️ Download link: ${download_url}${NC}"
+    
+    # Check if file exists
+    if curl --output /dev/null --silent --head --fail "$download_url"; then
+        echo -e "${GREEN}✅ File exists, starting download...${NC}"
+    else
+        echo -e "${RED}❌ Download link does not exist: ${download_url}${NC}"
+        echo -e "${YELLOW}⚠️ Trying without architecture...${NC}"
+        
+        # Try without architecture
+        if [[ "$OS" == "mac_arm64" || "$OS" == "mac_intel" ]]; then
+            OS="mac"
+            binary_name="CursorFreeVIP_${VERSION}_${OS}"
+            download_url="https://github.com/yeongpin/cursor-free-vip/releases/download/v${VERSION}/${binary_name}"
+            echo -e "${CYAN}ℹ️ New download link: ${download_url}${NC}"
+            
+            if ! curl --output /dev/null --silent --head --fail "$download_url"; then
+                echo -e "${RED}❌ New download link does not exist${NC}"
+                exit 1
+            fi
+        elif [[ "$OS" == "linux_x64" || "$OS" == "linux_arm64" ]]; then
+            OS="linux"
+            binary_name="CursorFreeVIP_${VERSION}_${OS}"
+            download_url="https://github.com/yeongpin/cursor-free-vip/releases/download/v${VERSION}/${binary_name}"
+            echo -e "${CYAN}ℹ️ New download link: ${download_url}${NC}"
+            
+            if ! curl --output /dev/null --silent --head --fail "$download_url"; then
+                echo -e "${RED}❌ New download link does not exist${NC}"
+                exit 1
+            fi
+        else
+            exit 1
+        fi
+    fi
+    
+    # Download file
+    if ! curl -L -o "${binary_path}" "$download_url"; then
+        echo -e "${RED}❌ Download failed${NC}"
+        exit 1
+    fi
+    
+    # Check downloaded file size
+    local file_size=$(stat -f%z "${binary_path}" 2>/dev/null || stat -c%s "${binary_path}" 2>/dev/null)
+    echo -e "${CYAN}ℹ️ Downloaded file size: ${file_size} bytes${NC}"
+    
+    # If file is too small, it might be an error message
+    if [ "$file_size" -lt 1000 ]; then
+        echo -e "${YELLOW}⚠️ Warning: Downloaded file is too small, possibly not a valid executable file${NC}"
+        echo -e "${YELLOW}⚠️ File content:${NC}"
+        cat "${binary_path}"
+        echo ""
+        echo -e "${RED}❌ Download failed, please check version and operating system${NC}"
+        exit 1
+    fi
+    
+    echo -e "${CYAN}ℹ️ Setting executable permissions...${NC}"
+    if chmod +x "${binary_path}"; then
+        echo -e "${GREEN}✅ Installation completed!${NC}"
+        echo -e "${CYAN}ℹ️ Program downloaded to: ${binary_path}${NC}"
+        echo -e "${CYAN}ℹ️ Starting program...${NC}"
+        
+        # Run program directly
+        "${binary_path}"
+    else
+        echo -e "${RED}❌ Installation failed${NC}"
+        exit 1
+    fi
+}
+
+# Main program
+main() {
+    print_logo
+    get_latest_version
+    detect_os
+    install_cursor_free_vip
+}
+
+# Run main program
+main