Merge branch 'main' of http://124.243.245.42:3000/sdz/ks-app-employment-service

pages/job/publishJob.vue

@@ -111,15 +111,13 @@
                 </view>
                 <view class="form-group">
                     <view class="label">工作地点</view>
-                    <view class="location-input-container">
                     <input 
-                            class="input location-input" 
+                        class="input" 
                         placeholder="请输入具体工作地址" 
                         v-model="formData.jobLocation"
                     />
-                        <view class="location-icon-btn" @click="chooseLocation">
+                    <view class="location-text-btn" @click="chooseLocation">
-                            <uni-icons type="location" size="20" color="#333"></uni-icons>
+                        <text class="location-btn-text">获取定位</text>
-                        </view>
                     </view>
                 </view>
                 <view class="form-group">
@@ -594,6 +592,15 @@ const validateForm = () => {
         }
     }
 
+    // 验证定位信息
+    if (!formData.latitude || !formData.longitude) {
+        uni.showToast({
+            title: '请点击"获取定位"按钮获取工作地点位置',
+            icon: 'none'
+        });
+        return false;
+    }
+
     // 薪资验证
     const minSalary = parseFloat(formData.minSalary);
     const maxSalary = parseFloat(formData.maxSalary);
@@ -792,36 +799,28 @@ const validateForm = () => {
         }
     }
     
-    // 工作地点输入容器样式
+    // 工作地点文字按钮样式
-    .location-input-container {
+    .location-text-btn {
-        display: flex;
+        width: 100%;
-        align-items: center;
+        height: 80rpx;
-        position: relative;
+        background: #256BFA;
-        
+        border: none;
-        .location-input {
+        border-radius: 12rpx;
-            flex: 1;
-            padding-right: 100rpx;
-        }
-        
-        .location-icon-btn {
-            position: absolute;
-            right: 0;
-            top: 44%;
-            transform: translateY(-50%);
-            width: 80rpx;
-            height: 60rpx;
         display: flex;
         align-items: center;
         justify-content: center;
-            background: #f0f0f0;
+        margin-top: 20rpx;
-            border: none;
-            border-radius: 12rpx;
         transition: all 0.3s ease;
-            z-index: 99;
+        
+        .location-btn-text {
+            font-size: 28rpx;
+            color: #fff;
+            font-weight: 500;
+        }
         
         &:active {
-                transform: translateY(-50%) scale(0.95);
+            background: #1a5cd9;
-            }
+            transform: scale(0.98);
         }
     }
 }

pages/login/h5-login.vue

@@ -75,29 +75,11 @@
 					<view class="loading-spinner" v-else></view>
 				</view>
 			</button>
-
-			<!-- 其他登录方式 -->
-			<view class="other-login">
-				<view class="divider">
-					<view class="divider-line"></view>
-					<view class="divider-text">其他登录方式</view>
-					<view class="divider-line"></view>
-				</view>
-				
-				<view class="login-options">
-					<view class="login-option" @click="goToIdCardLogin">
-						<view class="option-icon">
-							<uni-icons type="idcard" size="36" color="#4778EC"></uni-icons>
-						</view>
-						<view class="option-text">社保卡登录</view>
-					</view>
-				</view>
-			</view>
 		</view>
 
 		<!-- 底部信息 -->
 		<view class="footer">
-			<view class="footer-text">© 2024 社保就业服务平台</view>
+			<view class="footer-text">新疆喀什智慧就业平台</view>
 		</view>
 	</view>
 </template>
@@ -211,11 +193,11 @@ const handleLogin = async () => {
 				title: '登录成功',
 				icon: 'success'
 			})
-			
+			window.location.assign('http://222.80.110.161:11111/mechine-dual-vue/login')
-			// 跳转到首页
+			// // 跳转到首页
-			uni.reLaunch({
+			// uni.reLaunch({
-				url: '/pages/index/index'
+			// 	url: '/pages/index/index'
-			})
+			// })
 		} else {
 			uni.showToast({
 				title: '登录失败',