1

common/config.js

@@ -3,7 +3,7 @@ module.exports = {
 	// baseUrl:"https://employadmin.hhlm1688.com"
 	// baseUrl:"http://h5.xzaiyp.top", //测试环境
 	// baseUrl:"http://youyi-test.natapp1.cc",
-	// baseUrl:"http://127.0.0.1:8003",
+	// baseUrl:"http://127.0.0.1:8002",
 	baseUrl:"https://admin.zhixuanlietou.com",
 	
 	// http://youyi-test.natapp1.cc

pages_subpack/job-order-detail/index.vue

@@ -285,9 +285,27 @@
 			this.type = options.type || ''
 		},
         onShow(){
-            this.onOrderDetail()
+            this.checkOrderStatus()
         },
-		methods: {
+		methods: {			
+			// 检查订单状态并获取订单详情
+			checkOrderStatus() {
+				let that = this
+				let params = {
+					orderId: that.orderId
+				}
+				orderDetail(params).then(response => {
+					that.obj = response.result
+					// 如果是求职者且orderStatusSeek没有值，跳转到保险页面
+					if (that.type && that.obj && !that.obj.orderStatusSeek && that.obj.status > 0) {
+						uni.navigateTo({
+							url: "/pages_subpack/payment/index?id=" + that.orderId
+						})
+					}
+				}).catch(error => {
+
+				})
+			},
 			onOrderDetail() {
 				let that = this
 				let params = {
@@ -330,7 +348,14 @@
 							title: '确认成功',
 							icon: 'none'
 						})
+
 						this.onOrderDetail()
+                        
+                        if (that.type && that.obj && !that.obj.orderStatusSeek && that.obj.status > 0) {
+                            uni.navigateTo({
+                                url: "/pages_subpack/payment/index?id=" + that.orderId
+                            })
+                        }
 					}
 				})
 			},

pages_subpack/order-detail/index.vue

@@ -30,7 +30,6 @@
 					</view>
 				</template>
 			</view>
-
 		</view>
 
 		<!-- 先试用后支付 -->
@@ -202,7 +201,25 @@
 			this.orderId = options.orderId
 		},
 		onShow() {
-			this.onOrderDetail()
+			this.checkOrderStatus()
+		},
+		// 检查订单状态并获取订单详情
+		checkOrderStatus() {
+			let that = this
+			let params = {
+				orderId: that.orderId
+			}
+			orderDetail(params).then(response => {
+				that.obj = response.result
+				// 如果是求职者且orderStatusSeek没有值，跳转到保险页面
+				if (that.obj && !that.obj.orderStatusSeek && that.obj.status > 0) {
+					uni.navigateTo({
+						url: "/pages_subpack/payment/index?id=" + that.orderId
+					})
+				}
+			}).catch(error => {
+
+			})
 		},
 		methods: {
 			onOrderDetail() {

pages_subpack/pay/index.vue

@@ -31,7 +31,7 @@
 			</view>
 			<!-- 新增保险费明细，仅 type==1 时显示 -->
 			<template v-if="detail.type == 1">
-                <view  class="se-flex se-flex-h-sb se-pt-20">
+                <!-- <view  class="se-flex se-flex-h-sb se-pt-20">
                     <view class="se-flex se-flex-h-fs">
                         <u-checkbox v-model="insuranceChecked" @change="onInsuranceChange" activeColor="#ff7a31" shape="circle" size="16"></u-checkbox>
                         <image class="se-w-30 se-h-40 se-ml-10" src="@/static/image/46524.png" mode=""></image>
@@ -40,7 +40,7 @@
                     <view>
                         <text class="se-c-orange se-fs-32 se-ml-20">￥{{ insuranceChecked ? detail.premium : 0 }}</text>
                     </view>
-                </view>
+                </view> -->
                 <view class="se-flex se-flex-h-sb se-pt-20" 
                 v-if="detail.employSeek">
                     <view class="se-flex se-flex-h-fs">

pages_subpack/payment/index.vue

@@ -33,14 +33,6 @@
 					￥{{items.premium}}元
 				</view>
 			</view>
-			<view class="se-mt-20 se-px-30">
-				<u-checkbox-group v-model="insuranceChecked">
-					<u-checkbox name="true" activeColor="#ff7a31" label-size="14" shape="circle">
-						<text class="se-fs-28 se-c-black">购买保险</text>
-						<text class="se-fs-24 se-c-text-third se-ml-10" v-if="items.premium">(￥{{items.premium}}元)</text>
-					</u-checkbox>
-				</u-checkbox-group>
-			</view>
 		</view>
 		<view class="se-mt-10 se-py-30 se-px-30 se-bs se-bgc-white se-br-20">
 			<u-radio-group 
@@ -163,6 +155,9 @@
 			checkboxChange(n) {
 				console.log('change', n);
 			},
+			insuranceCheckboxChange(n) {
+				console.log('insurance change', n);
+			},
 			getOrderDetail(){
 				orderDetail({orderId:this.id}).then(response=>{
 					console.info('orderDetail',response)
@@ -231,9 +226,10 @@
 				})
 			},
 			onDetail(){
-				uni.redirectTo({
-					url:"/pages_subpack/order-detail/index?orderId="+this.id
-				})
+				// uni.redirectTo({
+				// 	url:"/pages_subpack/order-detail/index?orderId="+this.id
+				// })
+                uni.navigateBack(-1)
 			}
 		}
 	}

pages_subpack/work-detail/index.vue

@@ -157,8 +157,11 @@
                     console.log("下单成功");
                     // 根据订单状态决定是否跳转到支付页面
                     if (response.result) {
+                        // uni.navigateTo({
+                        //     url:"/pages_subpack/payment/index?id="+response.result.id
+                        // })
                         uni.navigateTo({
-                            url:"/pages_subpack/payment/index?id="+response.result.id
+                            url:"/pages_subpack/order-detail/index?orderId="+error.result.id
                         })
                     } else {
                         // 状态不为0时不跳转，可以显示提示信息
@@ -175,15 +178,15 @@
                         // 根据订单状态决定跳转
                         if (error.result.status == 0) {
                             setTimeout(()=>{
-                                if(error.result.orderStatusSeek == 'Y'){
+                                // if(error.result.orderStatusSeek == 'Y'){
                                     uni.navigateTo({ 
                                         url:"/pages_subpack/order-detail/index?orderId="+error.result.id
                                     })
-                                }else{
-                                    uni.navigateTo({ 
-                                        url:"/pages_subpack/payment/index?id="+error.result.id
-                                    })
-                                }
+                                // }else{
+                                    // uni.navigateTo({ 
+                                    //     url:"/pages_subpack/payment/index?id="+error.result.id
+                                    // })
+                                // }
                             }, 800);
                         } else {
                             // 显示错误信息