bug修复

src/modules/home/components/SignForm.vue

@@ -169,7 +169,7 @@ export default {
       params.users_info.forEach(item => {
         if (item.company) {
           this.$store.state.allSettings.company_map.forEach(it => {
-            if ((item.company = it.company_name)) {
+            if (item.company === it.company_name) {
               item.company_id = it.id
             } else {
               item.company_id = ''
@@ -179,7 +179,6 @@ export default {
       })
 
       let flag = false
-
       params.users_info.forEach(item => {
         if (item.check_in_time && item.check_out_time) {
           if (item.check_in_time >= item.check_out_time) {
@@ -198,9 +197,12 @@ export default {
             if (this.checkedPay) {
               this.stepList.splice(this.data.num, 1)
               if (this.stepList[this.stepList.length - 1].num === this.data.num) {
+                console.log('000')
                 // 完成步骤跳转
                 this.$router.push({ path: '/' })
               } else {
+                console.log('111')
+
                 this.$emit('next', res.data)
               }
             } else {

src/modules/home/views/OrderConfirm.vue

@@ -9,7 +9,6 @@
             <div class="main_content_list_card" v-for="(item, index) in stepOrderInfo" :key="index">
               <div class="card_header">
                 <van-checkbox :name="item" :disabled="item.pay_record.pay_status === '1'"></van-checkbox>
-                <!-- <span class="card_header_title">{{ JSON.parse($route.query.detailListName) }}</span> -->
                 <div class="card_con">
                   <p>{{ item.name }} {{ item.mobile }}</p>
                 </div>
@@ -31,9 +30,7 @@
         </div>
       </div>
       <div class="main_footer">
-        <van-checkbox v-model="isAll" @click="checkAll" :disabled="!!getPayLength.length" class="checkAll"
-          >全选</van-checkbox
-        >
+        <van-checkbox v-model="isAll" @click="checkAll" class="checkAll">全选</van-checkbox>
         <div class="main_footer_total">
           <div class="main_footer_total_top"></div>
           <div class="main_footer_total_top">
@@ -105,7 +102,7 @@ export default {
     }
   },
   mounted() {
-    this.stepOrderInfo = this.data.payData.list
+    this.stepOrderInfo = this.data.payData.list.filter(item => item.pay_record.pay_status !== '1')
   },
   methods: {
     getTotalTotalCompanyPrice() {
@@ -130,7 +127,7 @@ export default {
       return `<span style="font-size:0.34rem;">${splitPrice[0]}</span>.<span style="font-size:0.2rem;">${splitPrice[1]}</span>`
     },
     checkItem() {
-      if (this.selctOrderData.length === this.stepOrderInfo.filter(item => item.pay_record.pay_status !== '1').length) {
+      if (this.selctOrderData.length === this.stepOrderInfo.length) {
         this.isAll = true
       } else {
         this.isAll = false
@@ -143,9 +140,12 @@ export default {
       this.$refs.checkboxGroup.toggleAll(this.isAll)
     },
     onSubmit() {
+      console.log('000')
+
       this.getPayDetail()
     },
     getPayDetail() {
+      console.log(this.stepOrderInfo.length, '111')
       if (this.stepOrderInfo.length) {
         this.stepOrderInfo.forEach((item, index) => {
           if (item.pay_record.pay_status === '1') {
@@ -161,6 +161,7 @@ export default {
         join_rand: this.data.payData.join_rand
       }
       getPayInfo(params).then(res => {
+        console.log(this.data, 'this.data')
         if (res.code === 0) {
           this.payDetail = Object.assign({ qrData: res.data }, this.data)
           this.payDetail.order_id = res.data.order_id

src/modules/home/views/PayDetail.vue

@@ -107,13 +107,15 @@ export default {
       getPayStatus(params).then(res => {
         if (res.code === 0) {
           this.status = res.data.status
+          console.log(this.status, 'this.status')
           if (res.data.status === 1) {
             clearInterval(this.time)
             if (this.data.jump_url) {
               window.location.href = this.data.jump_url
               return false
+            } else {
+              this.getActivityDetail()
             }
-            this.getActivityDetail()
           }
         }
       })
@@ -137,7 +139,12 @@ export default {
     clearInterval(this.time)
   },
   mounted() {
-    this.getActivityDetail()
+    console.log(this.stepList.length, this.stepList, '111')
+    console.log(this.data.num, this.data, '222')
+
+    if (this.status === 1) {
+      this.getActivityDetail()
+    }
     clearInterval(this.time)
     this.time = setInterval(() => {
       this.getPayStatus()

src/utils/axios.js

@@ -50,7 +50,7 @@ httpRequest.interceptors.request.use(
 httpRequest.interceptors.response.use(
   function (response) {
     const { data } = response
-    if (data.code && data.code !== 100) {
+    if (data.code && data.code === 100) {
       // 未登录
       if (data.code === 4001) {
         window.location.href = `${import.meta.env.VITE_LOGIN_URL}?rd=${encodeURIComponent(window.location.href)}`

vite.config.js

@@ -15,8 +15,8 @@ export default defineConfig({
     },
     proxy: {
       '/api/register': {
-        // target: 'http://localhost-activity-frontend.ezijing.com',
-        target: 'https://activity-frontend-api.ezijing.com',
+        target: 'http://localhost-activity-frontend.ezijing.com',
+        // target: 'https://activity-frontend-api.ezijing.com',
         changeOrigin: true,
         rewrite: path => path.replace(/^\/api\/register/, '')
       },