Skip to content

Commit

Permalink
默认网站
Browse files Browse the repository at this point in the history
  • Loading branch information
Hunlongyu committed Nov 17, 2020
1 parent 68f0054 commit bcd6161
Show file tree
Hide file tree
Showing 6 changed files with 6,257 additions and 7,589 deletions.
4 changes: 2 additions & 2 deletions pages.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
},
{
"pagePath": "pages/me/me",
"iconPath": "static/images/me2.png",
"selectedIconPath": "static/images/me1.png",
"iconPath": "static/images/me1.png",
"selectedIconPath": "static/images/me2.png",
"text": ""
}
]
Expand Down
46 changes: 26 additions & 20 deletions pages/film/film.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@
:clearabled="true"
@clear="searchClearEvent"
></u-search>
<u-button @click="openSiteSelect" size="medium">网站</u-button>
<u-button @click="openSiteSelect" size="medium">分类</u-button>
</view>
<view class="btns">
<u-button @click="openSiteSelect" size="mini">网站: {{site.name}}</u-button>
<u-button @click="openSiteSelect" size="mini">分类: {{type.name}}</u-button>
</view>
<view class="body">
<u-waterfall v-model="flowList" ref="uWaterfall">
<template v-slot:left="{ leftList }">
Expand Down Expand Up @@ -61,7 +63,8 @@
></u-loadmore>
</view>
<u-back-top :scroll-top="scrollTop" icon="search"></u-back-top>
<u-select v-model="siteShow" :list="siteList" value-name="key" label-name="name" :default-value="[site.id]" @confirm="siteConfirm"></u-select>
<u-select v-model="siteShow" :list="siteList" value-name="key" label-name="name" :default-value="siteDefault" @confirm="siteConfirm"></u-select>
<u-select v-model="typeShow" :list="typeList" value-name="key" label-name="name" @confirm="typeConfirm"></u-select>
<u-top-tips ref="uTips"></u-top-tips>
</view>
</template>
Expand All @@ -72,20 +75,13 @@ export default {
data() {
return {
search: "",
site: {
id: 1,
key: 'ki',
name: 'ok'
},
site: {},
siteShow: false,
siteDefault: [],
siteList: [],
type: {},
typeList: [
{
label: 'lala',
value: 'lala'
}
],
type: {},
typeShow: false,
typeList: [],
flowList: [],
list: [
{
Expand Down Expand Up @@ -183,12 +179,14 @@ export default {
this.flowList.push(item);
}
},
openSiteSelect () {
async openSiteSelect () {
this.siteShow = true
const site = await db.get('site', this.site.key)
this.siteDefault = [site.data.id - 1]
},
async siteConfirm (e) {
console.log(e, 'eeeeeeee')
const db = await db.get
const site = await db.get('site', e[0].value)
this.site = site.data
},
openDetail(item) {
const url = `/pages/detail/detail?site=${this.site}&uuid=${item.id}`;
Expand All @@ -199,8 +197,10 @@ export default {
if (res.flag) {
this.siteList = res.data
}
const setting = await db.getAll('setting')
console.log(setting)
const setting = await db.get('setting', 'config')
const site = await db.get('site', setting.data.site)
this.site = site.data
this.siteDefault = [site.id]
},
getClass() {
// console.log("get class");
Expand Down Expand Up @@ -229,6 +229,12 @@ export default {
.film {
padding: 20rpx 20rpx;
background-color: #f8f8f8;
.btns{
margin-top: 10rpx;
display: flex;
justify-content: space-around;
align-items: center;
}
.body {
.box-warter {
border-radius: 8rpx;
Expand Down
2 changes: 1 addition & 1 deletion unpackage/dist/dev/app-plus/app-config-service.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit bcd6161

Please sign in to comment.