Compare commits
No commits in common. "944f9da0edc2f083f252c0a958d2f34de18356da" and "9377e4e869452b23cca47baf31f11cbb89cd42b0" have entirely different histories.
944f9da0ed
...
9377e4e869
|
|
@ -6,7 +6,8 @@ const config = {
|
|||
// host: 'h5api',
|
||||
// #endif
|
||||
// #ifndef H5
|
||||
host: 'http://91f.xyz:8080',
|
||||
// host: 'http://91f.xyz:8080',
|
||||
host: 'http://chi9fe.natappfree.cc',
|
||||
// #endif
|
||||
// 支付方式配置
|
||||
payType: {
|
||||
|
|
|
|||
|
|
@ -223,12 +223,11 @@ const util = {
|
|||
if (res.data.code == 401) {
|
||||
// 登出
|
||||
util.logout(() => {
|
||||
util.alert(res.data.msg)
|
||||
util.alert('请先登录')
|
||||
reject(res.data)
|
||||
|
||||
uni.redirectTo({
|
||||
url: '/pages/login/loginPhone',
|
||||
})
|
||||
// uni.reLaunch({
|
||||
// url: '/login/login',
|
||||
// })
|
||||
})
|
||||
}
|
||||
// 嵌套式回调
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
"name" : "九亿",
|
||||
"appid" : "__UNI__08B31BC",
|
||||
"description" : "",
|
||||
"versionName" : "1.0.9",
|
||||
"versionCode" : 1009,
|
||||
"versionName" : "1.0.8",
|
||||
"versionCode" : 1008,
|
||||
"transformPx" : false,
|
||||
/* 5+App特有相关 */
|
||||
"app-plus" : {
|
||||
|
|
|
|||
|
|
@ -747,13 +747,6 @@
|
|||
"navigationBarTitleText" : "账号解冻"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/mine/setting/privacySetting",
|
||||
"style" :
|
||||
{
|
||||
"navigationBarTitleText" : "隐私设置"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/mine/setting/updateAccount",
|
||||
"style": {
|
||||
|
|
@ -773,7 +766,6 @@
|
|||
}
|
||||
}
|
||||
],
|
||||
|
||||
"subPackages": [
|
||||
{
|
||||
"root": "TUIKit",
|
||||
|
|
|
|||
|
|
@ -96,12 +96,12 @@
|
|||
data: [],
|
||||
pageNum: 1,
|
||||
total: 0,
|
||||
pageSize: 20,
|
||||
pageSize: 10,
|
||||
})
|
||||
// 关注的视频列表
|
||||
const attList = reactive({
|
||||
data: [],
|
||||
pageSize: 20,
|
||||
pageSize: 10,
|
||||
pageNum: 1,
|
||||
total: 0,
|
||||
timer: null,
|
||||
|
|
@ -224,12 +224,9 @@
|
|||
})
|
||||
|
||||
onHide(() => {
|
||||
// console.log('onHide', tabIndex.value, current, proxy.$refs)
|
||||
const videoRefList = proxy.$refs[`videoRef${tabIndex.value}`]
|
||||
// 暂停视频
|
||||
if (videoRefList) {
|
||||
// videoRefList[videoRefList.length - 2].pause()
|
||||
videoRefList[current[tabIndex.value]].pause()
|
||||
if (proxy.$refs[`videoRef${tabIndex.value}`]) {
|
||||
proxy.$refs[`videoRef${tabIndex.value}`][current[tabIndex.value]].pause()
|
||||
}
|
||||
})
|
||||
|
||||
|
|
@ -356,7 +353,7 @@
|
|||
//
|
||||
task: 0,
|
||||
}
|
||||
// console.log('browseLog data', data)
|
||||
console.log('browseLog data', data)
|
||||
//
|
||||
api.video.browseLog({
|
||||
data,
|
||||
|
|
@ -366,7 +363,7 @@
|
|||
const result = rs.data
|
||||
// 现在的有效读秒
|
||||
const taskValue = task.value
|
||||
// console.log('browseLog result', rs, taskValue)
|
||||
console.log('browseLog result', rs, taskValue)
|
||||
|
||||
// 如果不是第一次统计
|
||||
if (taskValue.viewingDuration != 0) {
|
||||
|
|
@ -455,7 +452,6 @@
|
|||
dom.scrollToElement(element, {
|
||||
animated: true
|
||||
})
|
||||
console.log('current', current[tab_index])
|
||||
|
||||
// 如果视频切换
|
||||
if (current[tab_index] != currentLast[tab_index]) {
|
||||
|
|
@ -807,6 +803,7 @@
|
|||
<cell class="cell" :style="[{height: viewSize.height + 'px'}]" :ref="`cellRef` + index"
|
||||
v-for="(secItem,secIndex) in item.listData()" :key="secItem.id" @click.stop>
|
||||
<!-- <template v-if="current[tabIndex] < secIndex + 2 && current[tabIndex] > secIndex - 2"> -->
|
||||
|
||||
<!-- 视频 -->
|
||||
<indexVideo :ref="'videoRef' + index" :tabIndex="index" :current="current[tabIndex]"
|
||||
:width="viewSize.width" :height="viewSize.height" :item="secItem" :index="secIndex"
|
||||
|
|
|
|||
|
|
@ -1,77 +0,0 @@
|
|||
<script setup>
|
||||
// 隐私设置
|
||||
import {
|
||||
ref,
|
||||
computed,
|
||||
} from 'vue'
|
||||
import {
|
||||
useStore
|
||||
} from 'vuex'
|
||||
import {
|
||||
onLoad,
|
||||
onUnload
|
||||
} from '@dcloudio/uni-app'
|
||||
// 工具库
|
||||
import util from '@/common/js/util.js'
|
||||
// api
|
||||
import api from '@/api/index.js'
|
||||
// 推荐
|
||||
const recommend = ref(false)
|
||||
|
||||
onLoad(() => {
|
||||
// 个性化推荐
|
||||
let recommendStore = uni.getStorageSync('recommendStore')
|
||||
if (recommendStore) recommend.value = recommendStore
|
||||
})
|
||||
|
||||
onUnload(() => {
|
||||
uni.setStorageSync('recommendStore', recommend.value)
|
||||
})
|
||||
|
||||
/**
|
||||
* 修改推荐
|
||||
* @param {Object} event 默认事件
|
||||
*/
|
||||
function handleRecommend(event) {
|
||||
recommend.value = event.detail.value
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<view class="app">
|
||||
<view class="area">
|
||||
<view class="line">
|
||||
<view class="rows">
|
||||
<view class="">个性化推荐管理</view>
|
||||
<switch :checked="recommend" color="rgb(0,122,255)" style="transform:scale(0.7)"
|
||||
@change="handleRecommend" />
|
||||
</view>
|
||||
|
||||
<view class="notice mt10 c999 f28">
|
||||
<text>特别说明: 关闭个性化推荐后，您仍会收到通用内容推荐，但可能与您的兴趣关联性较低。
|
||||
我们严格遵循《个人信息保护法》，不会将您的个人信息用于未声明的其他用途。</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<style lang="scss">
|
||||
//
|
||||
.area {
|
||||
margin: 30rpx;
|
||||
padding: 0 30rpx;
|
||||
color: #333;
|
||||
font-size: 30rpx;
|
||||
background-color: #fff;
|
||||
border-radius: 20rpx;
|
||||
|
||||
.line {
|
||||
padding: 20rpx 10rpx;
|
||||
}
|
||||
|
||||
.line+.line {
|
||||
border-top: 1px solid #eeeeee;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
@ -234,11 +234,6 @@ function logOff() {
|
|||
</view>
|
||||
</picker>
|
||||
</view>
|
||||
|
||||
<view class="line rows" @click="link('/pages/mine/setting/privacySetting')">
|
||||
<view class="">隐私设置</view>
|
||||
<uni-icons type="right" />
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@
|
|||
form.commission = detail.commission
|
||||
// 商品详情
|
||||
if (detail.infoRichText) {
|
||||
form.infoRichText = decodeURIComponent(escape(atob(detail.infoRichText)))
|
||||
form.infoRichText = JSON.parse(detail.infoRichText)
|
||||
// 富文本编辑器初始化
|
||||
proxy.$refs.editorAreaRef.init(form.infoRichText)
|
||||
}
|
||||
|
|
@ -231,8 +231,10 @@
|
|||
// 轮播图
|
||||
data.sliderImage = data.sliderImage.join(',')
|
||||
// 商品详情
|
||||
if (data.infoRichText) data.infoRichText = btoa(unescape(encodeURIComponent(data.infoRichText)))
|
||||
|
||||
// if (data.infoRichText) data.infoRichText = Buffer.from(data.infoRichText, 'utf8').toString('base64');
|
||||
// if (data.infoRichText) data.infoRichText = JSON.stringify(data.infoRichText)
|
||||
console.log(btoa, data.infoRichText)
|
||||
return
|
||||
//
|
||||
api.shop.saveProduct({
|
||||
data,
|
||||
|
|
|
|||
|
|
@ -94,9 +94,8 @@
|
|||
if (rs.code == 200) {
|
||||
//
|
||||
const result = rs.data
|
||||
// 商品详情
|
||||
if (result.infoRichText) {
|
||||
result.infoRichText = decodeURIComponent(escape(atob(result.infoRichText)))
|
||||
result.infoRichText = JSON.parse(result.infoRichText)
|
||||
result.infoRichText = util.imgReplace(result.infoRichText)
|
||||
}
|
||||
Object.assign(detail, {}, result)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@ import {
|
|||
} from 'vite';
|
||||
import uni from '@dcloudio/vite-plugin-uni';
|
||||
|
||||
let target = 'http://91f.xyz:8080'
|
||||
// let target = 'http://91f.xyz:8080'
|
||||
let target = 'http://chi9fe.natappfree.cc'
|
||||
|
||||
export default defineConfig({
|
||||
plugins: [uni()],
|
||||
|
|
|
|||
Loading…
Reference in New Issue