#3 fox

Merged
Fox merged 2 commits from fox into master 2 weeks ago
  1. +1
    -3
      api/model/sharing.js
  2. +1
    -1
      pages/index/record.vue
  3. +1
    -0
      pages_order/components/popupUnlock.vue
  4. +1
    -1
      pages_order/mine/team.vue
  5. +2
    -2
      pages_order/record/videoSharing.vue
  6. +3
    -2
      pages_order/sharing/article.vue
  7. +2
    -2
      pages_order/sharing/group.vue
  8. +2
    -1
      pages_order/sharing/personal.vue
  9. +13
    -2
      pages_order/sharing/video.vue

+ 1
- 3
api/model/sharing.js View File

@ -100,6 +100,7 @@ const api = {
url: '/fen/checkShare', url: '/fen/checkShare',
method: 'POST', method: 'POST',
auth: true, auth: true,
showLoading : true,
}, },
/** /**
* 校验视频转发是否达标 * 校验视频转发是否达标
@ -108,7 +109,6 @@ const api = {
url: '/fen/checkVideoShare', url: '/fen/checkVideoShare',
method: 'POST', method: 'POST',
auth: true, auth: true,
limit : 500,
showLoading : true, showLoading : true,
}, },
/** /**
@ -118,7 +118,6 @@ const api = {
url: '/fen/checkGroupShare', url: '/fen/checkGroupShare',
method: 'POST', method: 'POST',
auth: true, auth: true,
limit : 500,
showLoading : true, showLoading : true,
}, },
/** /**
@ -128,7 +127,6 @@ const api = {
url: '/fen/checkArticleShare', url: '/fen/checkArticleShare',
method: 'POST', method: 'POST',
auth: true, auth: true,
limit : 500,
showLoading : true, showLoading : true,
}, },
} }


+ 1
- 1
pages/index/record.vue View File

@ -140,7 +140,7 @@
2: '../../static/image/record/fail.png', // 2: '../../static/image/record/fail.png', //
}, },
// todo // todo
sliderBgUrl: 'https://thumbnail0.baidupcs.com/thumbnail/5128034cfj9ac619ca072da4706a6c90?fid=3983569511-250528-294545550145327&time=1742536800&rt=sh&sign=FDTAER-DCb740ccc5511e5e8fedcff06b081203-iqtAvQatpPXXyCeN8GEAHhPMHEM%3D&expires=8h&chkv=0&chkbd=0&chkpc=&dp-logid=8764190582084176609&dp-callid=0&file_type=0&size=c850_u580&quality=100&vuk=-&ft=video',
sliderBgUrl: '',
mixinsListApi : 'getSharePage', mixinsListApi : 'getSharePage',
} }
}, },


+ 1
- 0
pages_order/components/popupUnlock.vue View File

@ -37,6 +37,7 @@
this.$refs.popup.open(); this.$refs.popup.open();
}, },
close() { close() {
console.log('--close popup')
this.$refs.popup.close(); this.$refs.popup.close();
}, },
}, },


+ 1
- 1
pages_order/mine/team.vue View File

@ -127,7 +127,7 @@
state: 0, state: 0,
}, },
// todo // todo
sliderBgUrl: 'https://thumbnail0.baidupcs.com/thumbnail/5128034cfj9ac619ca072da4706a6c90?fid=3983569511-250528-294545550145327&time=1742536800&rt=sh&sign=FDTAER-DCb740ccc5511e5e8fedcff06b081203-iqtAvQatpPXXyCeN8GEAHhPMHEM%3D&expires=8h&chkv=0&chkbd=0&chkpc=&dp-logid=8764190582084176609&dp-callid=0&file_type=0&size=c850_u580&quality=100&vuk=-&ft=video',
sliderBgUrl: '',
mixinsListApi : 'getUserInfoVipList', mixinsListApi : 'getUserInfoVipList',
} }
}, },


+ 2
- 2
pages_order/record/videoSharing.vue View File

@ -36,8 +36,8 @@
<view class="upload upload-video"> <view class="upload upload-video">
<uv-form-item labelWidth="0" prop="vio"> <uv-form-item labelWidth="0" prop="vio">
<formUpload v-model="form.vio" accept="video"> <formUpload v-model="form.vio" accept="video">
<template v-slot="{ value }">
<video v-if="value"
<template v-slot>
<video v-if="form.vio"
:src="form.vio" :src="form.vio"
style="width: 344rpx; height: 344rpx;" style="width: 344rpx; height: 344rpx;"
radius="14rpx" radius="14rpx"


+ 3
- 2
pages_order/sharing/article.vue View File

@ -100,8 +100,8 @@
query: `id=${this.id}&state=3&shareId=${this.userInfo.id}`, query: `id=${this.id}&state=3&shareId=${this.userInfo.id}`,
} }
// todo: get times and check is unlocked
this.refreshLockStatus() this.refreshLockStatus()
this.closePopup()
return o return o
}, },
@ -144,9 +144,10 @@
const result = await this.fetchCheckShare() const result = await this.fetchCheckShare()
const { title, open } = result const { title, open } = result
this.$refs.popupUnlock.close();
if (open) { if (open) {
this.isLocked = false this.isLocked = false
this.$refs.popupUnlock.close();
this.$refs.popupQrCode.open() this.$refs.popupQrCode.open()
return return
} }


+ 2
- 2
pages_order/sharing/group.vue View File

@ -93,7 +93,6 @@
query: `id=${this.id}&state=2&shareId=${this.userInfo.id}`, query: `id=${this.id}&state=2&shareId=${this.userInfo.id}`,
} }
// todo: get times and check is unlocked
this.refreshLockStatus() this.refreshLockStatus()
return o return o
@ -117,9 +116,10 @@
const result = await this.fetchCheckShare() const result = await this.fetchCheckShare()
const { title, open } = result const { title, open } = result
this.$refs.popupUnlock.close();
if (open) { if (open) {
this.isLocked = false this.isLocked = false
this.$refs.popupUnlock.close();
return return
} }


+ 2
- 1
pages_order/sharing/personal.vue View File

@ -111,9 +111,10 @@
const result = await this.fetchCheckShare() const result = await this.fetchCheckShare()
const { title, open } = result const { title, open } = result
this.$refs.popupUnlock.close();
if (open) { if (open) {
this.isLocked = false this.isLocked = false
this.$refs.popupUnlock.close();
return return
} }


+ 13
- 2
pages_order/sharing/video.vue View File

@ -102,7 +102,6 @@
query: `id=${this.id}&state=1&shareId=${this.userInfo.id}`, query: `id=${this.id}&state=1&shareId=${this.userInfo.id}`,
} }
// todo: get times and check is unlocked
this.refreshLockStatus() this.refreshLockStatus()
return o return o
@ -128,12 +127,19 @@
} }
}, },
async refreshLockStatus() { async refreshLockStatus() {
try {
console.log('--refreshLockStatus')
const result = await this.fetchCheckShare() const result = await this.fetchCheckShare()
const { title, open } = result const { title, open } = result
console.log('--open', open)
this.$refs.popupUnlock.close();
console.log('--close')
if (open) { if (open) {
this.isLocked = false this.isLocked = false
this.$refs.popupUnlock.close();
this.$refs.popupQrCode.open() this.$refs.popupQrCode.open()
return return
} }
@ -142,6 +148,11 @@
title, title,
icon: 'none' icon: 'none'
}) })
} catch (err) {
console.log('--err', err)
}
}, },
async onPlay() { async onPlay() {
if (!this.isLocked) { if (!this.isLocked) {


Loading…
Cancel
Save