Commit 5c0bea3f authored by jyx's avatar jyx

快手小程序

parent 9cf7f819
...@@ -18,10 +18,10 @@ function gotoBookSearchPage(searchType = ENUM_SEARCH_TYPE.WAREHOUSE, keyword) { ...@@ -18,10 +18,10 @@ function gotoBookSearchPage(searchType = ENUM_SEARCH_TYPE.WAREHOUSE, keyword) {
// 文章详情 // 文章详情
function gotoBookContentPage(bookId, shortis) { function gotoBookContentPage(bookId, shortis) {
if (shortis && shortis == 0) { if (shortis && shortis == 0) {
gotoShortBookContentPage(bookId) gotoShortBookContentPage(bookId)
} else { } else {
gotoLongBookContentPage(bookId) gotoLongBookContentPage(bookId)
} }
} }
...@@ -29,7 +29,7 @@ function gotoBookContentPage(bookId, shortis) { ...@@ -29,7 +29,7 @@ function gotoBookContentPage(bookId, shortis) {
function gotoShortBookContentPage(bookId) { function gotoShortBookContentPage(bookId) {
// 短篇小说 // 短篇小说
uni.navigateTo({ uni.navigateTo({
url: `/page-subs/sub_A/book-content/book-content`, url: `/page-subs/sub_A/book-content/book-content?bookId=` + bookId,
success: (res) => { success: (res) => {
res.eventChannel.emit("openBookContentPage", { res.eventChannel.emit("openBookContentPage", {
bookId bookId
...@@ -41,7 +41,7 @@ function gotoShortBookContentPage(bookId) { ...@@ -41,7 +41,7 @@ function gotoShortBookContentPage(bookId) {
// 长篇文章详情 // 长篇文章详情
function gotoLongBookContentPage(bookId) { function gotoLongBookContentPage(bookId) {
uni.navigateTo({ uni.navigateTo({
url: `/page-subs/sub_A/book-long-content/book-long-content`, url: `/page-subs/sub_A/book-long-content/book-long-content?bookId=` + bookId,
success: (res) => { success: (res) => {
res.eventChannel.emit("openBookContentPage", { res.eventChannel.emit("openBookContentPage", {
bookId bookId
......
...@@ -18,7 +18,7 @@ import { ...@@ -18,7 +18,7 @@ import {
} from "../utils/util.js"; } from "../utils/util.js";
import { import {
PAKEAGE_NAME, PAKEAGE_NAME,
VERSION_CODE VERSION_CODE
} from "../../utils/utils.js"; } from "../../utils/utils.js";
import { import {
...@@ -114,7 +114,9 @@ function refreshUserInfo() { ...@@ -114,7 +114,9 @@ function refreshUserInfo() {
id: userData.idcode, id: userData.idcode,
memberExpirationDate: userData.expireTime memberExpirationDate: userData.expireTime
}) })
saveNickname(userData.nickname); if (userData.nickname) {
saveNickname(userData.nickname);
}
saveUserInfo(user); // 存储用户数据 saveUserInfo(user); // 存储用户数据
postNotification(KEY_NOTIFICATION_LOGIN_SUCCESS); // 通知登录成功 postNotification(KEY_NOTIFICATION_LOGIN_SUCCESS); // 通知登录成功
} }
...@@ -149,7 +151,7 @@ function postPhone(data, callback) { ...@@ -149,7 +151,7 @@ function postPhone(data, callback) {
function requestToken(data, callback) { function requestToken(data, callback) {
let url = `${config["BASE_URL"]}/user/ttLogin`; let url = `${config["BASE_URL"]}/user/ttLogin`;
let header = { let header = {
pkgName: PAKEAGE_NAME, pkgName: PAKEAGE_NAME,
version: VERSION_CODE, version: VERSION_CODE,
token: `` token: ``
} }
...@@ -183,7 +185,7 @@ function requestUserInfo(callback) { ...@@ -183,7 +185,7 @@ function requestUserInfo(callback) {
Object.assign(header, { Object.assign(header, {
token: readToken(), token: readToken(),
pkgName: PAKEAGE_NAME, pkgName: PAKEAGE_NAME,
version: VERSION_CODE, version: VERSION_CODE,
proChannel: uniChannel proChannel: uniChannel
}) })
......
...@@ -103,8 +103,6 @@ ...@@ -103,8 +103,6 @@
} }
}) })
} else if (this.listType == 2) { } else if (this.listType == 2) {
console.log('DDDDDDDD')
getRecommendV1('newbook', 8, (success, data) => { getRecommendV1('newbook', 8, (success, data) => {
if (success) { if (success) {
this.changeData(data) this.changeData(data)
......
...@@ -4,15 +4,15 @@ ...@@ -4,15 +4,15 @@
<view class="dialog-container"> <view class="dialog-container">
<view class="dialog-content"> <view class="dialog-content">
<text style="font-size: 42rpx; color: #6C6A6A;"> <text style="font-size: 42rpx; color: #6C6A6A;">
{{vipBean.topTitle}} {{vipBean2.topTitle}}
</text> </text>
<view style="display: flex;flex-direction: row;margin-top: 30rpx;"> <view style="display: flex;flex-direction: row;margin-top: 30rpx;">
<view style="font-size: 42rpx;color: #333232;margin-top: 18rpx;"></view> <view style="font-size: 42rpx;color: #333232;margin-top: 18rpx;"></view>
<view style="font-size: 60rpx;color: #F32E2E;font-weight: 777;">{{vipBean.firstPayPrice}}</view> <view style="font-size: 60rpx;color: #F32E2E;font-weight: 777;">{{vipBean2.firstPayPrice}}</view>
<view style="font-size: 42rpx;color: #333232;margin-top: 18rpx;"></view> <view style="font-size: 42rpx;color: #333232;margin-top: 18rpx;"></view>
</view> </view>
<text style="margin-top: 30rpx; font-size: 38rpx; color: #F32E2E"> <text style="margin-top: 30rpx; font-size: 38rpx; color: #F32E2E">
{{vipBean.remarks}} {{vipBean2.remarks}}
</text> </text>
<image @click="handlePay" <image @click="handlePay"
...@@ -53,7 +53,8 @@ ...@@ -53,7 +53,8 @@
}, },
data() { data() {
return { return {
os: 'android' os: 'android',
vipBean2: {}
}; };
}, },
watch: { watch: {
...@@ -67,6 +68,9 @@ ...@@ -67,6 +68,9 @@
} }
}, },
methods: { methods: {
onLoad(options) {
this.vipBean2 = this.vipBean
},
showdialog() { showdialog() {
this.$refs.vipback.open(); this.$refs.vipback.open();
console.log('vipback-', this.vipBean); console.log('vipback-', this.vipBean);
......
<template> <template>
<view> <c-list ref='list' flag='warehouse' method="POST" :height="height" url='/book/articleList/' :param="requestParam"
<c-list ref='list' flag='warehouse' method="POST" :height="height" url='/book/articleList/' @change='changeData'>
:param="requestParam" @change='changeData'> <book-list-item v-for='(item, index) in dataList' :key='index' :item='item' :showClose='false'
<book-list-item v-for='(item, index) in dataList' :key='index' :item='item' :showClose='false' @tapItem='tapItem($event, index)' @close='tapClose($event, index)'>
@tapItem='tapItem($event, index)' @close='tapClose($event, index)'> </book-list-item>
</book-list-item> </c-list>
</c-list>
</view>
</template> </template>
<script> <script>
...@@ -49,8 +47,7 @@ ...@@ -49,8 +47,7 @@
}, },
watch: {}, watch: {},
methods: { methods: {
initRefresh() { initRefresh() {
console.log('YYYYYYY')
if (isEmpty(this.dataList)) { if (isEmpty(this.dataList)) {
this.refreshList(); this.refreshList();
} }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<CategoryBar id='category' :range='categorys' :current='currentIndex' @change='changeCategory' <CategoryBar id='category' :range='categorys' :current='currentIndex' @change='changeCategory'
@ready='readyCategory'></CategoryBar> @ready='readyCategory'></CategoryBar>
<view :style="[listStyle]" v-if='showEmpty'> <view :style="[listStyle]" v-if='showEmpty'>
<c-empty emptyTitle="暂无数据"></c-empty> <c-empty emptyTitle="正在加载中~"></c-empty>
</view> </view>
<view :style="[listStyle]" v-else> <view :style="[listStyle]" v-else>
<swiper :style="[listStyle]" :indicator-dots="false" :autoplay="false" :current="currentIndex" <swiper :style="[listStyle]" :indicator-dots="false" :autoplay="false" :current="currentIndex"
...@@ -13,14 +13,12 @@ ...@@ -13,14 +13,12 @@
</swiper-item> </swiper-item>
</swiper> </swiper>
</view> </view>
<view style="height: 20rpx;"></view>
</scroll-view> </scroll-view>
</template> </template>
<script> <script>
import CategoryBar from "./components/category-bar.vue"; import CategoryBar from "./components/category-bar.vue";
import WarehouseList from "./components/warehouse-list.vue"; import WarehouseList from "./components/warehouse-list.vue";
import CEmpty from "@/components/c-empty/c-empty.vue";
import SystemInfoMixin from "../../common/mixins/system-info-mixin.js"; import SystemInfoMixin from "../../common/mixins/system-info-mixin.js";
import Category from "./models/Category.js"; import Category from "./models/Category.js";
import { import {
...@@ -39,8 +37,7 @@ ...@@ -39,8 +37,7 @@
mixins: [SystemInfoMixin], mixins: [SystemInfoMixin],
components: { components: {
CategoryBar, CategoryBar,
WarehouseList, WarehouseList
CEmpty
}, },
data() { data() {
return { return {
...@@ -49,9 +46,8 @@ ...@@ -49,9 +46,8 @@
currentIndex: 0, currentIndex: 0,
}; };
}, },
onLoad(options) {}, onLoad(options) {
onReady() {
this.getCategoryData()
}, },
computed: { computed: {
showEmpty: function() { showEmpty: function() {
...@@ -59,7 +55,7 @@ ...@@ -59,7 +55,7 @@
}, },
listStyle: function() { listStyle: function() {
return { return {
height: `${this.listHeight}px`, height: `${this.listHeight}px`
} }
}, },
categroyChange: function() { categroyChange: function() {
...@@ -76,36 +72,20 @@ ...@@ -76,36 +72,20 @@
watch: { watch: {
categroyChange: { categroyChange: {
handler: function(n, o) { handler: function(n, o) {
// if (this.$refs[`bookList${n.currentIndex}`]) { setTimeout(() => {
// this.$refs[`bookList${n.currentIndex}`][0].initRefresh(); this.$refs[`bookList${n.currentIndex}`][0].initRefresh();
// } }, 500)
this.$nextTick(() => {
let ref = this.$refs.bookList;
if (ref) {
console.log('TTTTTTT')
ref[n.currentIndex].initRefresh();
}
})
}, },
deep: true deep: true
} }
}, },
methods: { methods: {
show() { show() {
// if (this.$refs[`bookList${this.currentIndex}`][0].isEmpty()) { this.getCategoryData();
// this.$refs[`bookList${this.currentIndex}`][0].initRefresh(); },
// } hide() {
this.$nextTick(() => {
let ref = this.$refs.bookList;
if (ref) {
console.log('TTTTTTT')
ref[n.currentIndex].initRefresh();
}
})
}, },
hide() {},
readyCategory() { readyCategory() {
setTimeout(() => { setTimeout(() => {
this.initHeight() this.initHeight()
...@@ -114,7 +94,7 @@ ...@@ -114,7 +94,7 @@
getCategoryData() { getCategoryData() {
getCategorys((success, data) => { getCategorys((success, data) => {
if (success) { if (success) {
var result = data.records ? data.records.map(item => { let result = data.records ? data.records.map(item => {
return new Category(item) return new Category(item)
}).sort((a, b) => { }).sort((a, b) => {
return a.sort - b.sort return a.sort - b.sort
...@@ -123,23 +103,20 @@ ...@@ -123,23 +103,20 @@
name: "全部", name: "全部",
id: "" id: ""
})) }))
console.log('KKKKKKKKKKKKKKK', result)
this.categorys = result; this.categorys = result;
console.log('KKKKKKKKKKKKKKK', this.categorys)
} }
}) })
}, },
initHeight() { initHeight() {
const query = uni.createSelectorQuery().in(this); const query = uni.createSelectorQuery().in(this);
query.select("#navi").boundingClientRect();
query.select("#search").boundingClientRect();
query.select("#category").boundingClientRect(); query.select("#category").boundingClientRect();
query.exec((res) => { query.exec((res) => {
let result = 0; var result = 0;
res.forEach(item => { res.forEach(item => {
if (item) { if (item) {
result = result + item.height; if (item.height) {
result = result + item.height;
}
} }
}) })
this.listHeight = this.windowHeight - result - (this.windowHeight * 0.1); this.listHeight = this.windowHeight - result - (this.windowHeight * 0.1);
......
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
} }
}, this) }, this)
// this.refreshBookData(this.bookId) this.refreshBookData(this.bookId)
}, },
onShow() { onShow() {
refreshUserInfo(); refreshUserInfo();
......
...@@ -301,8 +301,7 @@ ...@@ -301,8 +301,7 @@
position: relative; position: relative;
.row { .row {
margin: 8rpx 15rpx; margin: 8rpx 15rpx 0 15rpx;
marign-bottom: 0;
} }
.row:last-child { .row:last-child {
......
...@@ -186,8 +186,7 @@ ...@@ -186,8 +186,7 @@
position: relative; position: relative;
.row { .row {
margin: 8rpx 15rpx; margin: 8rpx 15rpx 0 15rpx;
marign-bottom: 0;
} }
.row:last-child { .row:last-child {
......
...@@ -267,8 +267,7 @@ ...@@ -267,8 +267,7 @@
position: relative; position: relative;
.row { .row {
margin: 8rpx 15rpx; margin: 8rpx 15rpx 0 15rpx;
marign-bottom: 0;
} }
.row:last-child { .row:last-child {
......
...@@ -272,8 +272,7 @@ ...@@ -272,8 +272,7 @@
position: relative; position: relative;
.row { .row {
margin: 8rpx 15rpx; margin: 8rpx 15rpx 0 15rpx;
marign-bottom: 0;
} }
.row:last-child { .row:last-child {
......
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
position: relative; position: relative;
.row { .row {
margin: 8rpx 15rpx; margin: 8rpx 15rpx 0 15rpx;
marign-bottom: 0; marign-bottom: 0;
} }
......
...@@ -267,8 +267,7 @@ ...@@ -267,8 +267,7 @@
position: relative; position: relative;
.row { .row {
margin: 8rpx 15rpx; margin: 8rpx 15rpx 0 15rpx;
marign-bottom: 0;
} }
.row:last-child { .row:last-child {
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
<uni-easyinput v-model="searchKeyword" placeholder="请输入书名或者作者名" :focus='focus' confirmType="search" <uni-easyinput v-model="searchKeyword" placeholder="请输入书名或者作者名" :focus='focus' confirmType="search"
trim="all" :inputBorder="true" @clear="clearInput" @change="changeInput" trim="all" :inputBorder="true" @clear="clearInput" @change="changeInput"
@confirm="changeInput"></uni-easyinput> @confirm="changeInput"></uni-easyinput>
</view> </view>
<view class="button-box item" @click="tapSearch"> <view class="button-box item" @click="tapSearch">
<view class="title"> <view class="title">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment