Commit 76ba30f69c0dc2cb3952087a2bc2ec1a983259a7

Authored by 夏洋涛
1 parent b0c415e0
Exists in master

feat:小程序无法访问第三方修改

src/views/Home/Home.vue
... ... @@ -15,7 +15,7 @@
15 15 <p class="phone">{{ phoneDesensitization(userInfo.phone,'*') }}</p>
16 16 </div>
17 17 </div>
18   - <HomeScan></HomeScan>
  18 + <HomeScan v-if="!isWechat"></HomeScan>
19 19 </div>
20 20 </div>
21 21 <HomeOrder></HomeOrder>
... ... @@ -91,6 +91,7 @@ export default {
91 91 showChildList: false,
92 92 showSchool: false,
93 93 schoolNamesChoose: '',
  94 + isWechat:false
94 95 }
95 96 },
96 97  
... ... @@ -104,6 +105,10 @@ export default {
104 105 if (schoolNamesChoose) {
105 106 this.schoolNamesChoose = JSON.parse(schoolNamesChoose)
106 107 }
  108 + let isWechat = localStorage.getItem('isWechat')
  109 + if(isWechat==1){
  110 + this.isWechat = true
  111 + }
107 112 this.centerNo = localStorage.getItem('centerNo')
108 113 this.getUserInfo()
109 114 this.againRZ()
... ...
src/views/Service/ServiceBaseKQ.vue
1 1 <template>
2 2 <div id="serviceKQ">
3   - <div v-show="tabName=='ZZY'">
  3 + <div v-show="tabName == 'ZZY'">
4 4 <div class="container" style="top:0">
5 5 <van-swipe class="service_swipe" :loop="true" :show-indicators="false">
6 6 <!-- <van-swipe-item @click="handleBanner"> -->
7 7 <van-swipe-item>
8   - <img style="width:100vw" src="@/assets/service/banner3.jpg" alt="">
  8 + <img style="width:100vw" src="@/assets/service/banner3.jpg" alt="" />
9 9 </van-swipe-item>
10 10 </van-swipe>
11   - <img class="card_zzy" src="@/assets/service/card_zzy.png" alt="" @click="handleMyCard">
12   - <img class="order_btn" src="@/assets/service/order.png" alt="" @click="handleMyOrder">
  11 + <img class="card_zzy" src="@/assets/service/card_zzy.png" alt="" @click="handleMyCard" />
  12 + <img class="order_btn" src="@/assets/service/order.png" alt="" @click="handleMyOrder" />
13 13 <van-pull-refresh v-model="loading" @refresh="onRefresh('campList')">
14 14 <ServiceListFour :list="campList" :notab="false"></ServiceListFour>
15 15 </van-pull-refresh>
16 16 </div>
17 17 </div>
18   - <div v-show="tabName=='KQ'">
  18 + <div v-show="tabName == 'KQ'">
19 19 <div class="swipeDiv">
20 20 <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white">
21 21 <van-swipe-item>
... ... @@ -33,11 +33,11 @@
33 33 <van-search class="search" v-model="search" shape="round" background="transparent" left-icon="" right-icon="search" placeholder="搜索活动、研学旅行、服务" @search="onSearch" />
34 34 </div> -->
35 35 <div class="redLink" @click="handleRedLink">
36   - <img src="@/assets/keqiao/redlink.png" alt="">
  36 + <img src="@/assets/keqiao/redlink.png" alt="" />
37 37 </div>
38 38 </van-sticky>
39 39 <div class="tabsCard">
40   - <van-tabs v-model="active" sticky offset-top="19.73vw" z-index='100' :ellipsis="false" :before-change="beforeChange" ref="tabs">
  40 + <van-tabs v-model="active" sticky offset-top="19.73vw" z-index="100" :ellipsis="false" :before-change="beforeChange" ref="tabs">
41 41 <van-tab title="革命遗址">
42 42 <van-pull-refresh v-model="loading" @refresh="onRefresh('uniList')">
43 43 <ServiceListThird :list="uniList" :notab="true"></ServiceListThird>
... ... @@ -65,7 +65,6 @@
65 65 </van-tab>
66 66 </van-tabs>
67 67 </div>
68   -
69 68 </div>
70 69 </div>
71 70  
... ... @@ -82,10 +81,8 @@ import ServiceListThird from &#39;@/views/Service/component/ServiceListThird.vue&#39;
82 81 import ServiceListFour from '@/views/Service/component/ServiceListFour.vue'
83 82 import Screen from '@/views/Service/component/Screen.vue'
84 83 export default {
85   - props: [
86   - 'centerNo'
87   - ],
88   - data () {
  84 + props: ['centerNo'],
  85 + data() {
89 86 return {
90 87 search: '',
91 88 defaultHead: require('@/assets/head.png'),
... ... @@ -98,34 +95,34 @@ export default {
98 95 riverList: [],
99 96 tabName: 'KQ',
100 97 campList: [],
101   - loading: false
  98 + loading: false,
102 99 }
103 100 },
104 101 watch: {
105 102 $route: {
106 103 immediate: true,
107   - handler () {
  104 + handler() {
108 105 // 设置tabbar状态
109 106 let showTab = this.$route.query.showTab
110 107 this.tabName = showTab || 'KQ'
111 108 // document.title = showTab == 'ZZY' ? '周周营' : '红色网上游——柯桥研学'
112 109 this.$nextTick(() => {
113   - this.$refs.tabs.resize();
  110 + this.$refs.tabs.resize()
114 111 })
115   - }
116   - }
  112 + },
  113 + },
117 114 },
118   - mounted () {
  115 + mounted() {
119 116 console.log('base mounted')
120 117 // alert('servicebase show')
121 118 this.initService()
122 119 },
123   - activated () {
  120 + activated() {
124 121 console.log('base activated')
125 122 this.initService()
126 123 },
127 124 methods: {
128   - onRefresh (list) {
  125 + onRefresh(list) {
129 126 if (list == 'campList') {
130 127 this.getCampList()
131 128 } else if (list == 'uniList') {
... ... @@ -140,7 +137,7 @@ export default {
140 137 this.getRiverList()
141 138 }
142 139 },
143   - initService () {
  140 + initService() {
144 141 this.getUniList()
145 142 this.getWeekList()
146 143 this.getCityList()
... ... @@ -150,7 +147,7 @@ export default {
150 147 },
151 148  
152 149 // 革命遗址
153   - getUniList () {
  150 + getUniList() {
154 151 this.$toast.loading()
155 152 this.mgop({
156 153 api: 'mgop.sz.hswsy.qxyList', // 必须
... ... @@ -162,37 +159,37 @@ export default {
162 159 // 'isTestUrl': '1'
163 160 },
164 161 data: {
165   - "area": "",
166   - "province": "",
167   - "city": "",
168   - "searchType": "5",
169   - "userId": this.centerNo,
170   - "productTypeId": "BQ0001",
171   - "businessTypeId": "BQ0001",
172   - "channelCode": ""
  162 + area: '',
  163 + province: '',
  164 + city: '',
  165 + searchType: '5',
  166 + userId: this.centerNo,
  167 + productTypeId: 'BQ0001',
  168 + businessTypeId: 'BQ0001',
  169 + channelCode: '',
173 170 },
174   - onSuccess: data => {
  171 + onSuccess: (data) => {
175 172 this.$toast.clear()
176   - let uniList = data.data.data;
  173 + let uniList = data.data.data
177 174 for (let i in uniList) {
178   - uniList[i].course_labels = uniList[i].course_labels?.split(',');
  175 + uniList[i].course_labels = uniList[i].course_labels?.split(',')
179 176 if (uniList[i].startDate) {
180   - uniList[i].week = this.formatWeek(this.Moment(uniList[i].startDate).format('d'));
181   - uniList[i].startDate = this.Moment(uniList[i].startDate).format('YYYY.M.D');
182   - uniList[i].endDate = this.Moment(uniList[i].endDate).format('YYYY.M.D');
  177 + uniList[i].week = this.formatWeek(this.Moment(uniList[i].startDate).format('d'))
  178 + uniList[i].startDate = this.Moment(uniList[i].startDate).format('YYYY.M.D')
  179 + uniList[i].endDate = this.Moment(uniList[i].endDate).format('YYYY.M.D')
183 180 }
184 181 }
185 182 this.loading = false
186 183 this.uniList = uniList
187 184 console.log('革命遗址:', data)
188 185 },
189   - onFail: err => {
  186 + onFail: (err) => {
190 187 console.log('err', err)
191   - }
192   - });
  188 + },
  189 + })
193 190 },
194 191 // 文化传承
195   - getWeekList () {
  192 + getWeekList() {
196 193 this.mgop({
197 194 api: 'mgop.sz.hswsy.qxyList', // 必须
198 195 host: 'https://mapi.zjzwfw.gov.cn/',
... ... @@ -203,36 +200,36 @@ export default {
203 200 // 'isTestUrl': '1'
204 201 },
205 202 data: {
206   - "area": "",
207   - "province": "",
208   - "city": "",
209   - "searchType": "5",
210   - "userId": this.centerNo,
211   - "productTypeId": "BQ0002",
212   - "businessTypeId": "BQ0001",
213   - "channelCode": ""
  203 + area: '',
  204 + province: '',
  205 + city: '',
  206 + searchType: '5',
  207 + userId: this.centerNo,
  208 + productTypeId: 'BQ0002',
  209 + businessTypeId: 'BQ0001',
  210 + channelCode: '',
214 211 },
215   - onSuccess: data => {
216   - let weekList = data.data.data;
  212 + onSuccess: (data) => {
  213 + let weekList = data.data.data
217 214 for (let i in weekList) {
218   - weekList[i].course_labels = weekList[i].course_labels?.split(',');
  215 + weekList[i].course_labels = weekList[i].course_labels?.split(',')
219 216 if (weekList[i].startDate) {
220   - weekList[i].week = this.formatWeek(this.Moment(weekList[i].startDate).format('d'));
221   - weekList[i].startDate = this.Moment(weekList[i].startDate).format('YYYY.M.D');
222   - weekList[i].endDate = this.Moment(weekList[i].endDate).format('YYYY.M.D');
  217 + weekList[i].week = this.formatWeek(this.Moment(weekList[i].startDate).format('d'))
  218 + weekList[i].startDate = this.Moment(weekList[i].startDate).format('YYYY.M.D')
  219 + weekList[i].endDate = this.Moment(weekList[i].endDate).format('YYYY.M.D')
223 220 }
224 221 }
225 222 this.loading = false
226 223 this.weekList = weekList
227 224 console.log('文化传承:', weekList)
228 225 },
229   - onFail: err => {
  226 + onFail: (err) => {
230 227 console.log('err', err)
231   - }
232   - });
  228 + },
  229 + })
233 230 },
234 231 // 红色军旅
235   - getCityList () {
  232 + getCityList() {
236 233 this.mgop({
237 234 api: 'mgop.sz.hswsy.qxyList', // 必须
238 235 host: 'https://mapi.zjzwfw.gov.cn/',
... ... @@ -243,36 +240,36 @@ export default {
243 240 // 'isTestUrl': '1'
244 241 },
245 242 data: {
246   - "area": "",
247   - "province": "",
248   - "city": "",
249   - "searchType": "5",
250   - "userId": this.centerNo,
251   - "productTypeId": "BQ0003",
252   - "businessTypeId": "BQ0001",
253   - "channelCode": ""
  243 + area: '',
  244 + province: '',
  245 + city: '',
  246 + searchType: '5',
  247 + userId: this.centerNo,
  248 + productTypeId: 'BQ0003',
  249 + businessTypeId: 'BQ0001',
  250 + channelCode: '',
254 251 },
255   - onSuccess: data => {
256   - let cityList = data.data.data;
  252 + onSuccess: (data) => {
  253 + let cityList = data.data.data
257 254 for (let i in cityList) {
258   - cityList[i].course_labels = cityList[i].course_labels?.split(',');
  255 + cityList[i].course_labels = cityList[i].course_labels?.split(',')
259 256 if (cityList[i].startDate) {
260   - cityList[i].week = this.formatWeek(this.Moment(cityList[i].startDate).format('d'));
261   - cityList[i].startDate = this.Moment(cityList[i].startDate).format('YYYY.M.D');
262   - cityList[i].endDate = this.Moment(cityList[i].endDate).format('YYYY.M.D');
  257 + cityList[i].week = this.formatWeek(this.Moment(cityList[i].startDate).format('d'))
  258 + cityList[i].startDate = this.Moment(cityList[i].startDate).format('YYYY.M.D')
  259 + cityList[i].endDate = this.Moment(cityList[i].endDate).format('YYYY.M.D')
263 260 }
264 261 }
265 262 this.loading = false
266 263 this.cityList = cityList
267 264 console.log('红色军旅:', cityList)
268 265 },
269   - onFail: err => {
  266 + onFail: (err) => {
270 267 console.log('err', err)
271   - }
272   - });
  268 + },
  269 + })
273 270 },
274 271 // 乡村振新
275   - getSelectList () {
  272 + getSelectList() {
276 273 this.mgop({
277 274 api: 'mgop.sz.hswsy.qxyList', // 必须
278 275 host: 'https://mapi.zjzwfw.gov.cn/',
... ... @@ -283,36 +280,36 @@ export default {
283 280 // 'isTestUrl': '1'
284 281 },
285 282 data: {
286   - "area": "",
287   - "province": "",
288   - "city": "",
289   - "searchType": "5",
290   - "userId": this.centerNo,
291   - "productTypeId": "BQ0004",
292   - "businessTypeId": "BQ0001",
293   - "channelCode": ""
  283 + area: '',
  284 + province: '',
  285 + city: '',
  286 + searchType: '5',
  287 + userId: this.centerNo,
  288 + productTypeId: 'BQ0004',
  289 + businessTypeId: 'BQ0001',
  290 + channelCode: '',
294 291 },
295   - onSuccess: data => {
296   - let selectList = data.data.data;
  292 + onSuccess: (data) => {
  293 + let selectList = data.data.data
297 294 for (let i in selectList) {
298   - selectList[i].course_labels = selectList[i].course_labels?.split(',');
  295 + selectList[i].course_labels = selectList[i].course_labels?.split(',')
299 296 if (selectList[i].startDate) {
300   - selectList[i].week = this.formatWeek(this.Moment(selectList[i].startDate).format('d'));
301   - selectList[i].startDate = this.Moment(selectList[i].startDate).format('YYYY.M.D');
302   - selectList[i].endDate = this.Moment(selectList[i].endDate).format('YYYY.M.D');
  297 + selectList[i].week = this.formatWeek(this.Moment(selectList[i].startDate).format('d'))
  298 + selectList[i].startDate = this.Moment(selectList[i].startDate).format('YYYY.M.D')
  299 + selectList[i].endDate = this.Moment(selectList[i].endDate).format('YYYY.M.D')
303 300 }
304 301 }
305 302 this.loading = false
306 303 this.selectList = selectList
307 304 console.log('乡村振新:', selectList)
308 305 },
309   - onFail: err => {
  306 + onFail: (err) => {
310 307 console.log('err', err)
311   - }
312   - });
  308 + },
  309 + })
313 310 },
314 311 // 大好河山
315   - getRiverList () {
  312 + getRiverList() {
316 313 this.mgop({
317 314 api: 'mgop.sz.hswsy.qxyList', // 必须
318 315 host: 'https://mapi.zjzwfw.gov.cn/',
... ... @@ -323,37 +320,37 @@ export default {
323 320 // 'isTestUrl': '1'
324 321 },
325 322 data: {
326   - "area": "",
327   - "province": "",
328   - "city": "",
329   - "searchType": "5",
330   - "userId": this.centerNo,
331   - "productTypeId": "BQ0005",
332   - "businessTypeId": "BQ0001",
333   - "channelCode": ""
  323 + area: '',
  324 + province: '',
  325 + city: '',
  326 + searchType: '5',
  327 + userId: this.centerNo,
  328 + productTypeId: 'BQ0005',
  329 + businessTypeId: 'BQ0001',
  330 + channelCode: '',
334 331 },
335   - onSuccess: data => {
336   - let riverList = data.data.data;
  332 + onSuccess: (data) => {
  333 + let riverList = data.data.data
337 334 for (let i in riverList) {
338   - riverList[i].course_labels = riverList[i].course_labels?.split(',');
  335 + riverList[i].course_labels = riverList[i].course_labels?.split(',')
339 336 if (riverList[i].startDate) {
340   - riverList[i].week = this.formatWeek(this.Moment(riverList[i].startDate).format('d'));
341   - riverList[i].startDate = this.Moment(riverList[i].startDate).format('YYYY.M.D');
342   - riverList[i].endDate = this.Moment(riverList[i].endDate).format('YYYY.M.D');
  337 + riverList[i].week = this.formatWeek(this.Moment(riverList[i].startDate).format('d'))
  338 + riverList[i].startDate = this.Moment(riverList[i].startDate).format('YYYY.M.D')
  339 + riverList[i].endDate = this.Moment(riverList[i].endDate).format('YYYY.M.D')
343 340 }
344 341 }
345 342 this.loading = false
346 343 this.riverList = riverList
347 344 console.log('大好河山:', riverList)
348 345 },
349   - onFail: err => {
  346 + onFail: (err) => {
350 347 console.log('err', err)
351   - }
352   - });
  348 + },
  349 + })
353 350 },
354 351  
355 352 // 每周一营 6
356   - getCampList () {
  353 + getCampList() {
357 354 this.mgop({
358 355 api: 'mgop.sz.hswsy.qxyList', // 必须
359 356 host: 'https://mapi.zjzwfw.gov.cn/',
... ... @@ -364,63 +361,82 @@ export default {
364 361 // 'isTestUrl': '1'
365 362 },
366 363 data: {
367   - "area": "",
368   - "province": "",
369   - "city": "",
370   - "searchType": "6",
371   - "userId": this.centerNo,
372   - "productTypeId": "ZZY001",
373   - "businessTypeId": "JY0004",
374   - "channelCode": "GZH002"
  364 + area: '',
  365 + province: '',
  366 + city: '',
  367 + searchType: '6',
  368 + userId: this.centerNo,
  369 + productTypeId: 'ZZY001',
  370 + businessTypeId: 'JY0004',
  371 + channelCode: 'GZH002',
375 372 },
376   - onSuccess: data => {
377   - let campList = data.data.data;
  373 + onSuccess: (data) => {
  374 + let campList = data.data.data
378 375 for (let i in campList) {
379   - campList[i].course_labels = campList[i].course_labels?.split(',');
  376 + campList[i].course_labels = campList[i].course_labels?.split(',')
380 377 if (campList[i].startDate) {
381   - campList[i].week = this.formatWeek(this.Moment(campList[i].startDate).format('d'));
382   - campList[i].startDate = this.Moment(campList[i].startDate).format('YYYY.M.D');
383   - campList[i].endDate = this.Moment(campList[i].endDate).format('YYYY.M.D');
  378 + campList[i].week = this.formatWeek(this.Moment(campList[i].startDate).format('d'))
  379 + campList[i].startDate = this.Moment(campList[i].startDate).format('YYYY.M.D')
  380 + campList[i].endDate = this.Moment(campList[i].endDate).format('YYYY.M.D')
384 381 }
385 382 }
386 383 this.loading = false
387 384 this.campList = campList
388 385 console.log('每周一营:', data)
389 386 },
390   - onFail: err => {
  387 + onFail: (err) => {
391 388 console.log('err', err)
392   - }
393   - });
  389 + },
  390 + })
394 391 },
395   - beforeChange (index) {
  392 + beforeChange(index) {
396 393 // if (index != 0 && index != 1 && index != 2) {
397 394 // this.$toast('暂未开放,敬请期待!')
398 395 // return false
399 396 // }
400 397 return true
401 398 },
402   - onSearch () {
  399 + onSearch() {
403 400 this.$toast('暂未开放,敬请期待!')
404 401 },
405 402 // 我的订单
406   - handleMyOrder () {
  403 + handleMyOrder() {
407 404 this.$router.push({ name: 'ServiceOrderXST' })
408 405 },
409 406 // 我的优惠券
410   - handleMyCard () {
  407 + handleMyCard() {
411 408 // this.$toast('暂未开放,敬请期待!');
412 409 this.$router.push({ name: 'CardBoxXST', query: { active: 1 } })
413 410 },
414   - formatWeek (week) {
415   - return week == 1 ? '周一' : week == 2 ? '周二' : week == 3 ? '周三' : week == 4 ? '周四' : week == 5 ? '周五' : week == 6 ? '周六' : week == 0 ? '周日' : '';
  411 + formatWeek(week) {
  412 + return week == 1
  413 + ? '周一'
  414 + : week == 2
  415 + ? '周二'
  416 + : week == 3
  417 + ? '周三'
  418 + : week == 4
  419 + ? '周四'
  420 + : week == 5
  421 + ? '周五'
  422 + : week == 6
  423 + ? '周六'
  424 + : week == 0
  425 + ? '周日'
  426 + : ''
416 427 },
417 428 // 点击轮播
418   - handleBanner () {
  429 + handleBanner() {
419 430 location.href = 'https://mp.weixin.qq.com/s/a4N3xr2nXZ-aG3OEakv-Dg'
420 431 },
421   - handleRedLink () {
422   - location.href = 'https://www.wasee.com/wt/b46pjfuln&ua=WaseeVRAndroid'
423   - }
  432 + handleRedLink() {
  433 + let isWechat = localStorage.getItem('isWechat')
  434 + if (isWechat==1) {
  435 + return
  436 + } else {
  437 + location.href = 'https://www.wasee.com/wt/b46pjfuln&ua=WaseeVRAndroid'
  438 + }
  439 + },
424 440 },
425 441 components: {
426 442 Tabbar4,
... ... @@ -428,8 +444,8 @@ export default {
428 444 Screen,
429 445 ServiceListSecond,
430 446 ServiceListThird,
431   - ServiceListFour
432   - }
  447 + ServiceListFour,
  448 + },
433 449 }
434 450 </script>
435 451 <style lang="scss" scoped>
... ... @@ -538,7 +554,7 @@ export default {
538 554 width: 48px;
539 555 height: 6px;
540 556 // background: #ffffff;
541   - background: #C90000;
  557 + background: #c90000;
542 558 border-radius: 10px 10px 0px 0px;
543 559 }
544 560 .tab_img {
... ... @@ -600,4 +616,4 @@ export default {
600 616 }
601 617 }
602 618 }
603   -</style>
604 619 \ No newline at end of file
  620 +</style>
... ...
src/views/Service/ServiceKQ.vue
... ... @@ -33,6 +33,7 @@ export default {
33 33 } else if (ticketId) {
34 34 // alert('getCenterByTicketId')
35 35 this.getCenterByTicketId(ticketId)
  36 + localStorage.setItem('isWechat',1)
36 37 } else if (centerNo) {
37 38 // alert('有中台编号:' + centerNo)
38 39 this.centerNo = centerNo
... ...