Showing
1 changed file
with
19 additions
and
25 deletions
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | * @Author: hookehuyr hookehuyr@gmail.com | 2 | * @Author: hookehuyr hookehuyr@gmail.com |
| 3 | * @Date: 2022-05-26 23:52:36 | 3 | * @Date: 2022-05-26 23:52:36 |
| 4 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 4 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 5 | - * @LastEditTime: 2024-07-29 17:10:25 | 5 | + * @LastEditTime: 2024-08-02 22:58:05 |
| 6 | * @FilePath: /data-table/src/App.vue | 6 | * @FilePath: /data-table/src/App.vue |
| 7 | * @Description: | 7 | * @Description: |
| 8 | --> | 8 | --> |
| ... | @@ -151,22 +151,6 @@ onMounted(async () => { | ... | @@ -151,22 +151,6 @@ onMounted(async () => { |
| 151 | }); | 151 | }); |
| 152 | } | 152 | } |
| 153 | } else { | 153 | } else { |
| 154 | - // 判断跳转页面 | ||
| 155 | - if (form_setting.sjsj_enable === 0 && !form_setting.sjsj_enable) { | ||
| 156 | - // 表单已结束 - | ||
| 157 | - $router.push("/stop?status=disable"); | ||
| 158 | - } | ||
| 159 | - // 开启后有开始和结束时间,不在时间范围的显示表单还未开始或者已经结束 | ||
| 160 | - if (form_setting.sjsj_is_time_range && form_setting.sjsj_is_time_range) { | ||
| 161 | - // 未开始 | ||
| 162 | - if (form_setting.server_time < form_setting.sjsj_begin_time) { | ||
| 163 | - $router.push("/stop?status=apply"); | ||
| 164 | - } | ||
| 165 | - // 已结束 | ||
| 166 | - if (form_setting.server_time > form_setting.sjsj_end_time) { | ||
| 167 | - $router.push("/stop?status=finish"); | ||
| 168 | - } | ||
| 169 | - } | ||
| 170 | // 启用微信增强,非预览模式 | 154 | // 启用微信增强,非预览模式 |
| 171 | if (form_setting.wxzq_enable && no_preview_model) { | 155 | if (form_setting.wxzq_enable && no_preview_model) { |
| 172 | const wxJs = await wxJsAPI({ form_code: code, url: raw_url }); | 156 | const wxJs = await wxJsAPI({ form_code: code, url: raw_url }); |
| ... | @@ -179,6 +163,24 @@ onMounted(async () => { | ... | @@ -179,6 +163,24 @@ onMounted(async () => { |
| 179 | console.warn(err); | 163 | console.warn(err); |
| 180 | }); | 164 | }); |
| 181 | } | 165 | } |
| 166 | + // 判断跳转页面 | ||
| 167 | + if (!form_setting.is_back_user) { // 用户未登录 | ||
| 168 | + // 开启后有开始和结束时间,不在时间范围的显示表单还未开始或者已经结束 | ||
| 169 | + if (form_setting.sjsj_is_time_range && form_setting.sjsj_is_time_range) { | ||
| 170 | + // 未开始 | ||
| 171 | + if (form_setting.server_time < form_setting.sjsj_begin_time) { | ||
| 172 | + $router.push("/stop?status=apply"); | ||
| 173 | + } | ||
| 174 | + // 已结束 | ||
| 175 | + if (form_setting.server_time > form_setting.sjsj_end_time) { | ||
| 176 | + $router.push("/stop?status=finish"); | ||
| 177 | + } | ||
| 178 | + } | ||
| 179 | + if (form_setting.sjsj_enable === 0 && !form_setting.sjsj_enable) { | ||
| 180 | + // 表单已结束 | ||
| 181 | + $router.push("/stop?status=disable"); | ||
| 182 | + } | ||
| 183 | + } | ||
| 182 | // 当数据量达到限额时,该表单将不能继续提交数据。 | 184 | // 当数据量达到限额时,该表单将不能继续提交数据。 |
| 183 | if (form_setting.sjsj_max_count_error) { | 185 | if (form_setting.sjsj_max_count_error) { |
| 184 | showDialog({ | 186 | showDialog({ |
| ... | @@ -199,14 +201,6 @@ onMounted(async () => { | ... | @@ -199,14 +201,6 @@ onMounted(async () => { |
| 199 | }); | 201 | }); |
| 200 | } | 202 | } |
| 201 | } | 203 | } |
| 202 | - // // 唯一设备码 | ||
| 203 | - // const fpPromise = fp3.load(); | ||
| 204 | - // fpPromise | ||
| 205 | - // .then(fp => fp.get()) | ||
| 206 | - // .then(result => { | ||
| 207 | - // const visitorId = result.visitorId | ||
| 208 | - // console.log(visitorId) | ||
| 209 | - // }) | ||
| 210 | if (is_wx.value) { | 204 | if (is_wx.value) { |
| 211 | document.getElementById('app').style.maxWidth = '100vw'; | 205 | document.getElementById('app').style.maxWidth = '100vw'; |
| 212 | } | 206 | } | ... | ... |
-
Please register or login to post a comment