Răsfoiți Sursa

修改样式及跳转

yangg 2 luni în urmă
părinte
comite
39ef1821ae

+ 1 - 1
common/config.js

@@ -1,7 +1,7 @@
 // API base URL configuration
 // API base URL configuration
 //线上 https://minlong.raycos.com.cn
 //线上 https://minlong.raycos.com.cn
 //测试 http://192.168.66.187:8083
 //测试 http://192.168.66.187:8083
-export const apiBaseUrl = 'https://minlong.raycos.com.cn';
+export const apiBaseUrl = 'http://192.168.66.187:8083';
 
 
 // You can add other global configuration settings here
 // You can add other global configuration settings here
 export const appVersion = '1.0.0';
 export const appVersion = '1.0.0';

+ 7 - 0
pages.json

@@ -72,6 +72,13 @@
 				"navigationBarTitleText" : ""
 				"navigationBarTitleText" : ""
 				
 				
 			}
 			}
+		},
+		{
+			"path" : "pages/preview/preview",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
 		}
 		}
 	],
 	],
 	"globalStyle": {
 	"globalStyle": {

+ 12 - 6
pages/camera/camera.vue

@@ -547,33 +547,39 @@
 					
 					
 					// 构建提交数据
 					// 构建提交数据
 					let answerContent = '';
 					let answerContent = '';
+					let answerOptions = [];
 					
 					
 					if (this.currentAnswer.questionType === 0) {
 					if (this.currentAnswer.questionType === 0) {
 						// 开放题直接使用文本答案
 						// 开放题直接使用文本答案
 						answerContent = this.currentAnswer.answer;
 						answerContent = this.currentAnswer.answer;
+						answerOptions = []; // 开放题没有选项
 					} else if (this.currentAnswer.questionType === 1 || this.currentAnswer.questionType === 3) {
 					} else if (this.currentAnswer.questionType === 1 || this.currentAnswer.questionType === 3) {
 						// 单选题或看图答题,获取选项ID而不是索引
 						// 单选题或看图答题,获取选项ID而不是索引
 						const selectedIndex = this.currentAnswer.answer;
 						const selectedIndex = this.currentAnswer.answer;
 						const selectedOption = this.currentQuestion.options[selectedIndex];
 						const selectedOption = this.currentQuestion.options[selectedIndex];
-						console.log('selectedOption',selectedOption);
+						console.log('selectedOption', selectedOption);
 						// 使用选项的ID或其他唯一标识符
 						// 使用选项的ID或其他唯一标识符
-						answerContent = selectedOption.id ? selectedOption.id.toString() : selectedIndex.toString();
+						const optionId = selectedOption.id ? selectedOption.id : selectedIndex;
+						answerContent = optionId.toString();
+						answerOptions = [optionId]; // 单选题,将选项ID放入数组
 					} else if (this.currentAnswer.questionType === 2) {
 					} else if (this.currentAnswer.questionType === 2) {
-						// 多选题,将选项ID数组转为逗号分隔的字符串
+						// 多选题,将选项ID数组转为数组格式
 						const selectedIndices = this.currentAnswer.answer;
 						const selectedIndices = this.currentAnswer.answer;
 						const selectedOptionIds = selectedIndices.map(index => {
 						const selectedOptionIds = selectedIndices.map(index => {
 							const option = this.currentQuestion.options[index];
 							const option = this.currentQuestion.options[index];
 							// 使用选项的ID或其他唯一标识符
 							// 使用选项的ID或其他唯一标识符
 							return option.id ? option.id : index;
 							return option.id ? option.id : index;
 						});
 						});
-						answerContent = selectedOptionIds.join(',');
+						answerContent = selectedOptionIds.join(','); // 保持原有的逗号分隔字符串格式
+						answerOptions = selectedOptionIds; // 多选题,直接使用选项ID数组
 					}
 					}
 					
 					
 					const submitData = {
 					const submitData = {
 						job_id: JSON.parse(uni.getStorageSync('selectedJob')).id,
 						job_id: JSON.parse(uni.getStorageSync('selectedJob')).id,
 						applicant_id: JSON.parse(uni.getStorageSync('userInfo')).id,
 						applicant_id: JSON.parse(uni.getStorageSync('userInfo')).id,
-						question_id: this.currentAnswer.questionId,
-						answer_content: answerContent,
+						job_position_question_id: this.currentAnswer.questionId,
+						// answer_content: answerContent,
+						answer_options: answerOptions, // 使用数组格式
 						answer_duration: this.currentAnswer.answerDuration || 0,
 						answer_duration: this.currentAnswer.answerDuration || 0,
 						tenant_id: 1
 						tenant_id: 1
 					};
 					};

+ 1 - 1
pages/identity-verify/identity-verify.vue

@@ -1509,7 +1509,7 @@ export default {
       
       
       // 显示简短的上传状态提示
       // 显示简短的上传状态提示
       uni.showToast({
       uni.showToast({
-        title: '视频已加入上传队列',
+        title: '已完成回答',
         icon: 'none',
         icon: 'none',
         duration: 1500
         duration: 1500
       });
       });

+ 1 - 1
pages/interview-notice/interview-notice.vue

@@ -94,7 +94,7 @@ export default {
       }
       }
       
       
       uni.navigateTo({
       uni.navigateTo({
-        url: '/pages/face-photo/face-photo',
+        url: '/pages/preview/preview',///pages/face-photo/face-photo
         fail: (err) => {
         fail: (err) => {
           console.error('页面跳转失败:', err);
           console.error('页面跳转失败:', err);
           uni.showToast({
           uni.showToast({

+ 1 - 1
pages/interview-question/interview-question.vue

@@ -1495,7 +1495,7 @@ export default {
       
       
       // 显示简短的上传状态提示
       // 显示简短的上传状态提示
       uni.showToast({
       uni.showToast({
-        title: '视频已加入上传队列',
+        title: '已完成回答',
         icon: 'none',
         icon: 'none',
         duration: 1500
         duration: 1500
       });
       });

+ 122 - 0
pages/preview/preview.vue

@@ -0,0 +1,122 @@
+<template>
+	<view class="preview-container">
+		<!-- 标题 -->
+		<view class="title">
+			<text>下面我们将拍摄证件照片</text>
+		</view>
+		<!-- 拍照提示信息 -->
+		<view class="guide-text">
+			<text>请您在白色的背景前拍照</text>
+		</view>
+		<!-- 拍照指引图示 -->
+		<view class="guide-image">
+			<image src="http://121.36.251.245:9000/minlong/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20250421103107.png" mode="aspectFit"></image>
+		</view>
+		
+		<!-- 拍照要求列表 -->
+		<view class="requirements-list">
+			<view class="requirement-item">
+				<text>· 请摘掉耳饰、发饰、项链等影响拍摄效果的饰品</text>
+			</view>
+			<view class="requirement-item">
+				<text>· 请勿化妆、头发不要遮挡耳朵、眉毛</text>
+			</view>
+			<view class="requirement-item">
+				<text>· 拍照时,请您露出锁骨或衣领</text>
+			</view>
+			<view class="requirement-item">
+				<text>· 在光线充足的环境下拍摄</text>
+			</view>
+		</view>
+		
+		<!-- 开始拍摄按钮 -->
+		<view class="action-button">
+			<button @click="startCapture">开始拍摄</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				// 可以添加需要的数据
+			}
+		},
+		methods: {
+			// 开始拍摄方法
+			startCapture() {
+				// 跳转到拍照页面
+				uni.navigateTo({
+					url: '/pages/face-photo/face-photo'
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+	.preview-container {
+		display: flex;
+		flex-direction: column;
+		padding: 30rpx;
+		height: 90vh;
+		margin-left: 5%;
+		background-color: #ffffff;
+	}
+
+	.title {
+		font-size: 40rpx;
+		font-weight: bold;
+		color: #333;
+		margin-bottom: 40rpx;
+		
+		text-align: left;
+	}
+
+	.guide-image {
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		margin-bottom: 30rpx;
+	}
+
+	.guide-image image {
+		width: 570rpx;
+		height: 660rpx;
+	}
+
+	.guide-text {
+		font-size: 32rpx;
+		color: #2a3bab;
+		margin-bottom: 40rpx;
+		text-align: left;
+	}
+
+	.requirements-list {
+		width: 90%;
+		margin-bottom: 60rpx;
+	}
+
+	.requirement-item {
+		font-size: 28rpx;
+		color: #999;
+		margin-bottom: 20rpx;
+		line-height: 1.5;
+	}
+
+	.action-button {
+		width: 90%;
+		margin-top: auto;
+		margin-bottom: 40rpx;
+	}
+
+	.action-button button {
+		background-color: #0039b3;
+		color: white;
+		border-radius: 50rpx;
+		font-size: 32rpx;
+		height: 90rpx;
+		line-height: 90rpx;
+	}
+</style>

+ 1 - 0
unpackage/dist/dev/mp-weixin/app.js

@@ -14,6 +14,7 @@ if (!Math) {
   "./pages/interview/interview.js";
   "./pages/interview/interview.js";
   "./pages/ResumeEvaluation/ResumeEvaluation.js";
   "./pages/ResumeEvaluation/ResumeEvaluation.js";
   "./pages/interview-question/interview-question.js";
   "./pages/interview-question/interview-question.js";
+  "./pages/preview/preview.js";
 }
 }
 const _sfc_main = {
 const _sfc_main = {
   onLaunch: function() {
   onLaunch: function() {

+ 2 - 1
unpackage/dist/dev/mp-weixin/app.json

@@ -10,7 +10,8 @@
     "pages/my/my",
     "pages/my/my",
     "pages/interview/interview",
     "pages/interview/interview",
     "pages/ResumeEvaluation/ResumeEvaluation",
     "pages/ResumeEvaluation/ResumeEvaluation",
-    "pages/interview-question/interview-question"
+    "pages/interview-question/interview-question",
+    "pages/preview/preview"
   ],
   ],
   "window": {
   "window": {
     "navigationBarTextStyle": "black",
     "navigationBarTextStyle": "black",

+ 1 - 1
unpackage/dist/dev/mp-weixin/common/config.js

@@ -1,3 +1,3 @@
 "use strict";
 "use strict";
-const apiBaseUrl = "https://minlong.raycos.com.cn";
+const apiBaseUrl = "http://192.168.66.187:8083";
 exports.apiBaseUrl = apiBaseUrl;
 exports.apiBaseUrl = apiBaseUrl;

+ 10 - 3
unpackage/dist/dev/mp-weixin/pages/camera/camera.js

@@ -320,13 +320,17 @@ const _sfc_main = {
           title: "正在提交答案..."
           title: "正在提交答案..."
         });
         });
         let answerContent = "";
         let answerContent = "";
+        let answerOptions = [];
         if (this.currentAnswer.questionType === 0) {
         if (this.currentAnswer.questionType === 0) {
           answerContent = this.currentAnswer.answer;
           answerContent = this.currentAnswer.answer;
+          answerOptions = [];
         } else if (this.currentAnswer.questionType === 1 || this.currentAnswer.questionType === 3) {
         } else if (this.currentAnswer.questionType === 1 || this.currentAnswer.questionType === 3) {
           const selectedIndex = this.currentAnswer.answer;
           const selectedIndex = this.currentAnswer.answer;
           const selectedOption = this.currentQuestion.options[selectedIndex];
           const selectedOption = this.currentQuestion.options[selectedIndex];
           console.log("selectedOption", selectedOption);
           console.log("selectedOption", selectedOption);
-          answerContent = selectedOption.id ? selectedOption.id.toString() : selectedIndex.toString();
+          const optionId = selectedOption.id ? selectedOption.id : selectedIndex;
+          answerContent = optionId.toString();
+          answerOptions = [optionId];
         } else if (this.currentAnswer.questionType === 2) {
         } else if (this.currentAnswer.questionType === 2) {
           const selectedIndices = this.currentAnswer.answer;
           const selectedIndices = this.currentAnswer.answer;
           const selectedOptionIds = selectedIndices.map((index) => {
           const selectedOptionIds = selectedIndices.map((index) => {
@@ -334,12 +338,15 @@ const _sfc_main = {
             return option.id ? option.id : index;
             return option.id ? option.id : index;
           });
           });
           answerContent = selectedOptionIds.join(",");
           answerContent = selectedOptionIds.join(",");
+          answerOptions = selectedOptionIds;
         }
         }
         const submitData = {
         const submitData = {
           job_id: JSON.parse(common_vendor.index.getStorageSync("selectedJob")).id,
           job_id: JSON.parse(common_vendor.index.getStorageSync("selectedJob")).id,
           applicant_id: JSON.parse(common_vendor.index.getStorageSync("userInfo")).id,
           applicant_id: JSON.parse(common_vendor.index.getStorageSync("userInfo")).id,
-          question_id: this.currentAnswer.questionId,
-          answer_content: answerContent,
+          job_position_question_id: this.currentAnswer.questionId,
+          // answer_content: answerContent,
+          answer_options: answerOptions,
+          // 使用数组格式
           answer_duration: this.currentAnswer.answerDuration || 0,
           answer_duration: this.currentAnswer.answerDuration || 0,
           tenant_id: 1
           tenant_id: 1
         };
         };

+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/identity-verify/identity-verify.js

@@ -1060,7 +1060,7 @@ const _sfc_main = {
       this.uploadProgress[uploadTask.id] = 0;
       this.uploadProgress[uploadTask.id] = 0;
       this.uploadStatus[uploadTask.id] = "pending";
       this.uploadStatus[uploadTask.id] = "pending";
       common_vendor.index.showToast({
       common_vendor.index.showToast({
-        title: "视频已加入上传队列",
+        title: "已完成回答",
         icon: "none",
         icon: "none",
         duration: 1500
         duration: 1500
       });
       });

+ 2 - 1
unpackage/dist/dev/mp-weixin/pages/interview-notice/interview-notice.js

@@ -19,7 +19,8 @@ const _sfc_main = {
         return;
         return;
       }
       }
       common_vendor.index.navigateTo({
       common_vendor.index.navigateTo({
-        url: "/pages/face-photo/face-photo",
+        url: "/pages/preview/preview",
+        ///pages/face-photo/face-photo
         fail: (err) => {
         fail: (err) => {
           console.error("页面跳转失败:", err);
           console.error("页面跳转失败:", err);
           common_vendor.index.showToast({
           common_vendor.index.showToast({

+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/interview-question/interview-question.js

@@ -1038,7 +1038,7 @@ const _sfc_main = {
       this.uploadProgress[uploadTask.id] = 0;
       this.uploadProgress[uploadTask.id] = 0;
       this.uploadStatus[uploadTask.id] = "pending";
       this.uploadStatus[uploadTask.id] = "pending";
       common_vendor.index.showToast({
       common_vendor.index.showToast({
-        title: "视频已加入上传队列",
+        title: "已完成回答",
         icon: "none",
         icon: "none",
         duration: 1500
         duration: 1500
       });
       });

+ 24 - 0
unpackage/dist/dev/mp-weixin/pages/preview/preview.js

@@ -0,0 +1,24 @@
+"use strict";
+const common_vendor = require("../../common/vendor.js");
+const _sfc_main = {
+  data() {
+    return {
+      // 可以添加需要的数据
+    };
+  },
+  methods: {
+    // 开始拍摄方法
+    startCapture() {
+      common_vendor.index.navigateTo({
+        url: "/pages/face-photo/face-photo"
+      });
+    }
+  }
+};
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return {
+    a: common_vendor.o((...args) => $options.startCapture && $options.startCapture(...args))
+  };
+}
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
+wx.createPage(MiniProgramPage);

+ 4 - 0
unpackage/dist/dev/mp-weixin/pages/preview/preview.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "",
+  "usingComponents": {}
+}

+ 1 - 0
unpackage/dist/dev/mp-weixin/pages/preview/preview.wxml

@@ -0,0 +1 @@
+<view class="preview-container"><view class="title"><text>下面我们将拍摄证件照片</text></view><view class="guide-text"><text>请您在白色的背景前拍照</text></view><view class="guide-image"><image src="http://121.36.251.245:9000/minlong/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20250421103107.png" mode="aspectFit"></image></view><view class="requirements-list"><view class="requirement-item"><text>· 请摘掉耳饰、发饰、项链等影响拍摄效果的饰品</text></view><view class="requirement-item"><text>· 请勿化妆、头发不要遮挡耳朵、眉毛</text></view><view class="requirement-item"><text>· 拍照时,请您露出锁骨或衣领</text></view><view class="requirement-item"><text>· 在光线充足的环境下拍摄</text></view></view><view class="action-button"><button bindtap="{{a}}">开始拍摄</button></view></view>

+ 56 - 0
unpackage/dist/dev/mp-weixin/pages/preview/preview.wxss

@@ -0,0 +1,56 @@
+
+.preview-container {
+		display: flex;
+		flex-direction: column;
+		padding: 30rpx;
+		height: 90vh;
+		margin-left: 5%;
+		background-color: #ffffff;
+}
+.title {
+		font-size: 40rpx;
+		font-weight: bold;
+		color: #333;
+		margin-bottom: 40rpx;
+		
+		text-align: left;
+}
+.guide-image {
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		margin-bottom: 30rpx;
+}
+.guide-image image {
+		width: 570rpx;
+		height: 660rpx;
+}
+.guide-text {
+		font-size: 32rpx;
+		color: #2a3bab;
+		margin-bottom: 40rpx;
+		text-align: left;
+}
+.requirements-list {
+		width: 90%;
+		margin-bottom: 60rpx;
+}
+.requirement-item {
+		font-size: 28rpx;
+		color: #999;
+		margin-bottom: 20rpx;
+		line-height: 1.5;
+}
+.action-button {
+		width: 90%;
+		margin-top: auto;
+		margin-bottom: 40rpx;
+}
+.action-button button {
+		background-color: #0039b3;
+		color: white;
+		border-radius: 50rpx;
+		font-size: 32rpx;
+		height: 90rpx;
+		line-height: 90rpx;
+}

+ 1 - 1
unpackage/dist/dev/mp-weixin/project.config.json

@@ -8,7 +8,7 @@
     "urlCheck": false,
     "urlCheck": false,
     "es6": true,
     "es6": true,
     "postcss": false,
     "postcss": false,
-    "minified": true,
+    "minified": false,
     "newFeature": true,
     "newFeature": true,
     "bigPackageSizeSupport": true,
     "bigPackageSizeSupport": true,
     "babelSetting": {
     "babelSetting": {