Showing
1 changed file
with
18 additions
and
24 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,11 +151,20 @@ onMounted(async () => { | ... | @@ -151,11 +151,20 @@ onMounted(async () => { |
| 151 | }); | 151 | }); |
| 152 | } | 152 | } |
| 153 | } else { | 153 | } else { |
| 154 | - // 判断跳转页面 | 154 | + // 启用微信增强,非预览模式 |
| 155 | - if (form_setting.sjsj_enable === 0 && !form_setting.sjsj_enable) { | 155 | + if (form_setting.wxzq_enable && no_preview_model) { |
| 156 | - // 表单已结束 - | 156 | + const wxJs = await wxJsAPI({ form_code: code, url: raw_url }); |
| 157 | - $router.push("/stop?status=disable"); | 157 | + wxJs.data.jsApiList = apiList; |
| 158 | + wx.config(wxJs.data); | ||
| 159 | + wx.ready(() => { | ||
| 160 | + wx.showAllNonBaseMenuItem(); | ||
| 161 | + }); | ||
| 162 | + wx.error((err) => { | ||
| 163 | + console.warn(err); | ||
| 164 | + }); | ||
| 158 | } | 165 | } |
| 166 | + // 判断跳转页面 | ||
| 167 | + if (!form_setting.is_back_user) { // 用户未登录 | ||
| 159 | // 开启后有开始和结束时间,不在时间范围的显示表单还未开始或者已经结束 | 168 | // 开启后有开始和结束时间,不在时间范围的显示表单还未开始或者已经结束 |
| 160 | if (form_setting.sjsj_is_time_range && form_setting.sjsj_is_time_range) { | 169 | if (form_setting.sjsj_is_time_range && form_setting.sjsj_is_time_range) { |
| 161 | // 未开始 | 170 | // 未开始 |
| ... | @@ -167,17 +176,10 @@ onMounted(async () => { | ... | @@ -167,17 +176,10 @@ onMounted(async () => { |
| 167 | $router.push("/stop?status=finish"); | 176 | $router.push("/stop?status=finish"); |
| 168 | } | 177 | } |
| 169 | } | 178 | } |
| 170 | - // 启用微信增强,非预览模式 | 179 | + if (form_setting.sjsj_enable === 0 && !form_setting.sjsj_enable) { |
| 171 | - if (form_setting.wxzq_enable && no_preview_model) { | 180 | + // 表单已结束 |
| 172 | - const wxJs = await wxJsAPI({ form_code: code, url: raw_url }); | 181 | + $router.push("/stop?status=disable"); |
| 173 | - wxJs.data.jsApiList = apiList; | 182 | + } |
| 174 | - wx.config(wxJs.data); | ||
| 175 | - wx.ready(() => { | ||
| 176 | - wx.showAllNonBaseMenuItem(); | ||
| 177 | - }); | ||
| 178 | - wx.error((err) => { | ||
| 179 | - console.warn(err); | ||
| 180 | - }); | ||
| 181 | } | 183 | } |
| 182 | // 当数据量达到限额时,该表单将不能继续提交数据。 | 184 | // 当数据量达到限额时,该表单将不能继续提交数据。 |
| 183 | if (form_setting.sjsj_max_count_error) { | 185 | if (form_setting.sjsj_max_count_error) { |
| ... | @@ -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