Skip to content

X
xy-app
提交 1eb10d11 authored 作者: 郭忠轩's avatar 郭忠轩
浏览文件
操作

0427

上级 f79a9355
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 278 行增加 和 105 行删除
.env.production
浏览文件 @ 1eb10d11
VUE_APP_URL = "http://www.aptcm.cn/xyzyy"
\ No newline at end of file
VUE_APP_URL = "http://test23.zhongdianyun.com:8093/xyzyy"
\ No newline at end of file
.env.test
浏览文件 @ 1eb10d11
VUE_APP_URL = "http://182.18.38.36/xyzyy"
\ No newline at end of file
VUE_APP_URL = "http://test23.zhongdianyun.com:8093"
\ No newline at end of file
src/api/typhoid.js
浏览文件 @ 1eb10d11
......@@ -11,7 +11,8 @@ export default {
return realfetch({
url: 'app/dictionary/getdictionaryinfo.do?key=SHLS_DESCRIBE',
method: 'get',
data
params: data
});
},
// 查询列表
......@@ -19,7 +20,7 @@ export default {
return realfetch({
url: '/fg/pushnews/getnewslist.do',
method: 'get',
data
params:data
});
},
......
src/router/index.js
浏览文件 @ 1eb10d11
......@@ -91,6 +91,7 @@ import Login from '@/views/member/Login'
import UpdatePassword from '@/views/member/UpdatePassword'
import Register from '@/views/member/Register'
import UserAgreement from '@/views/member/UserAgreement'
import UserYinsi from '@/views/member/UserYinsi'
// 个人中心
import Setting from '@/views/member/Setting'
......@@ -213,6 +214,7 @@ export default new Router({
{ path: '/forget_password', name: 'UpdatePassword', component: UpdatePassword, meta: { keepAlive: false } },
{ path: '/register', name: 'Register', component: Register, meta: { keepAlive: true } },
{ path: '/user_agreement', name: 'UserAgreement', component: UserAgreement, meta: { keepAlive: false } },
{ path: '/User_yinsi', name: 'UserYinsi', component: UserYinsi, meta: { keepAlive: false } },
// 个人中心
// { path: '/my_update_password', name: 'UpdatePassword', component: UpdatePassword, meta: { keepAlive: false } },
......
src/views/Typhoid/list.vue
浏览文件 @ 1eb10d11
......@@ -29,6 +29,13 @@
<template slot="title"><p class="ellipsis">{{gReplaceAllHtml(l.title)}}</p></template>
</van-cell>
</van-cell-group> -->
<van-list
v-model="is_loading"
:finished="total_num<=list.length"
finished-text="没有更多了"
@load="getPulseList"
:immediate-check='false'
>
<div class="typhlist">
<div
class="typhitem"
......@@ -40,7 +47,7 @@
<p class="newstitle">{{ l.newsTitle }}</p>
</div>
</div>
<div v-if="total_num <= list.length" class="no_more">没有更多了</div>
</van-list>
</van-pull-refresh>
</div>
</template>
......@@ -56,7 +63,7 @@ export default {
rows: 20,
page: 1,
},
total_num: 0,
total_num: 0,
list: [],
is_loading: false,
src_prefix: "",
......@@ -69,7 +76,7 @@ export default {
this.getPulseList();
this.getDes();
// 注册scroll事件并监听
window.addEventListener("scroll", this.scrollHand);
// window.addEventListener("scroll", this.scrollHand);
},
activated() {
this.myReturn(this.onReturn);
......@@ -127,6 +134,7 @@ export default {
}
this.src_prefix = response.path;
this.list = this.list.concat(response.list);
this.search_params.page += 1;
this.$toast.clear();
}
this.switch_flag = true;
......@@ -153,18 +161,31 @@ export default {
</script>
<style scoped rel="stylesheet/scss" lang="scss">
.list3{
display: block;
// padding-top: 90px;
width: 100%;
height: 100%;
}
.van-list{
// height: 85%;
// overflow: scroll;
padding-top: 205px;
}
.originalList {
padding: 47px 0 15px;
padding: 40px 0 0px;
.tabWarps {
padding: 10px 15px;
padding: 0px 15px 10px 15px;
width: 100%;
height: 205px;
background: url("../../../static/img/51miz.png") no-repeat center;
background-size: 100%;
background-clip: content-box;
box-sizing: border-box;
position: relative;
position: fixed;
top:45px;
z-index: 999;
.black {
width: 100%;
height: 80px;
......
src/views/article/List.vue
浏览文件 @ 1eb10d11
......@@ -6,25 +6,32 @@
<template>
<div class="articleList noTabList">
<van-nav-bar class="myBar" title="条文" @click-left="onReturn" left-arrow fixed></van-nav-bar>
<van-pull-refresh v-model="is_loading" @refresh="reset" v-if="list.length>0">
<p class="title">{{articleTitle}}（<span class="colorGreen">{{total_num}}</span>）</p>
<van-cell-group v-if="!fromUrl">
<van-cell v-for="(l, i) in list" :key="i" :to="'/article_info/'+l.articleid+'?size='+getSize">
<template slot="title">
<p :style="getIndent(i)">{{ getSize + i}}. <span v-html="gGetEllipsisStr(l.content, 56)"></span></p>
</template>
</van-cell>
</van-cell-group>
<van-cell-group v-if="fromUrl">
<van-cell v-for="(l, i) in list" :key="i" :to="'/article_info/'+l.articleid+'?fromUrl=1'">
<template slot="title">
<p :style="getIndent(i)">{{ getSize + i}}. <span v-html="gGetEllipsisStr(l.content, 56)"></span></p>
</template>
</van-cell>
</van-cell-group>
<div v-if="total_num<=list.length" class="no_more">没有更多了</div>
<van-pull-refresh v-model="is_loading" @refresh="reset" v-if="list.length>0" class="list3">
<van-list
v-model="is_loading"
:finished="finished"
finished-text="没有更多了"
@load="getArticleList"
:immediate-check='false'
class="medicineList"
>
<p class="title">{{articleTitle}}（<span class="colorGreen">{{total_num}}</span>）</p>
<van-cell-group v-if="!fromUrl">
<van-cell v-for="(l, i) in list" :key="i" :to="'/article_info/'+l.articleid+'?size='+getSize">
<template slot="title">
<p :style="getIndent(i)">{{ i+1}}. <span v-html="gGetEllipsisStr(l.content, 56)"></span></p>
</template>
</van-cell>
</van-cell-group>
<van-cell-group v-if="fromUrl">
<van-cell v-for="(l, i) in list" :key="i" :to="'/article_info/'+l.articleid+'?fromUrl=1'">
<template slot="title">
<p :style="getIndent(i)">{{ i+1}}. <span v-html="gGetEllipsisStr(l.content, 56)"></span></p>
</template>
</van-cell>
</van-cell-group>
</van-list>
</van-pull-refresh>
<div v-if="list.length==0" class="noResult">暂无相关内容</div>
</div>
</template>
......@@ -45,6 +52,7 @@ export default {
fromUrl: '',
is_loading: false,
finished:false
}
},
......@@ -135,7 +143,12 @@ export default {
}
this.list = this.list.concat(response.list[0].list);
this.$toast.clear();
this.search_params.page += 1;
if((this.total_num<= this.list.length) || response.list==''){
this.finished = true
}
}
this.switch_flag = true;
}).catch(() => {
this.is_loading = false;
......@@ -166,7 +179,9 @@ export default {
background: #fff;
font-size: 20px;
}
.medicineList{
padding-top: 44px;
}
.hangingIndent{
text-indent:-24px;
padding-left:24px;
......@@ -174,10 +189,16 @@ export default {
}
.noTabList{
padding: 45px 0 0;
padding: 0px 0 0;
.no_more{
padding-bottom: 15px;
}
}
.list3{
display: block;
// padding-top: 90px;
width: 100%;
height: 100%;
}
</style>
src/views/article/TitleList.vue
浏览文件 @ 1eb10d11
......@@ -15,13 +15,21 @@
</van-row>
</div>
<van-pull-refresh v-model="is_loading" @refresh="reset" v-if="list[0].length>0||list[1].length>0">
<van-list
v-model="is_loading"
:finished="finished"
finished-text="没有更多了"
@load="getArticleTitleList"
:immediate-check='false'
class="medicineList"
>
<van-cell-group>
<van-cell v-if="list[0].length>0" :border="false" class="greenTitle"><template slot="title"><p>伤寒论</p></template></van-cell>
<van-cell v-for="(l, i) in list[0]" :key="i" :title="l.object.title+'（'+l.size+'）'" :to="{path:'/article_list/'+l.object.articletitleid,query: {size: currentSize(0,i)}}" is-link />
<van-cell v-if="list[1].length>0" :border="false" class="greenTitle"><template slot="title"><p>金匮要略</p></template></van-cell>
<van-cell v-for="(l, i) in list[1]" :key="i+1000" :title="l.object.title+'（'+l.size+'）'" :to="{path:'/article_list/'+l.object.articletitleid,query: {size: currentSize(1,i)}}" is-link />
</van-cell-group>
<div class="no_more">没有更多了</div>
</van-list>
</van-pull-refresh>
</div>
</template>
......@@ -34,6 +42,7 @@ export default {
return {
list: [[], []],
is_loading: false,
finished:false
}
},
......@@ -41,7 +50,7 @@ export default {
this.getArticleTitleList();
// 注册scroll事件并监听
window.addEventListener('scroll', this.scrollHand);
// window.addEventListener('scroll', this.scrollHand);
},
activated(){
this.myReturn(this.onReturn);
......@@ -91,6 +100,7 @@ export default {
this.list = response.list;
}
this.is_loading = false;
this.finished = true;
this.$toast.clear();
}).catch(() => {
this.is_loading = false;
......@@ -115,6 +125,9 @@ export default {
<style scoped rel="stylesheet/scss" lang="scss">
.titleList{
padding: 105px 0 15px;
padding: 0px 0 0px;
}
.medicineList{
padding-top: 108px;
}
</style>
src/views/book/List.vue
浏览文件 @ 1eb10d11
......@@ -14,8 +14,17 @@
</div>
</div>
<p class="selectText" v-show="show_selected">{{show_selected}}<van-icon class="close" name="close" @click="reset" /></p>
<van-pull-refresh v-model="is_loading" @refresh="reset2" v-if="list.length>0">
<div class="bgFFF">
<van-pull-refresh v-model="is_loading" @refresh="reset2" v-if="list.length>0" class="list3">
<van-list
v-model="is_loading"
:finished="finished"
finished-text="没有更多了"
@load="getBookList"
:immediate-check='false'
class="medicineList2"
>
<div class="bgFFF">
<router-link class="list clearfix" v-for="(l, i) in list" :key="i" :to="'/book_info/'+l.book.bookid">
<div class="leftImg">
<img v-if="!l.book.bookCover&&type==1" class="img" src="../../../static/img/book01.jpg" alt="">
......@@ -31,8 +40,9 @@
<span class="buy" v-if="l.buy">已购买</span>
<span class="free" v-if="l.book.avgComment">免</span>
</router-link>
</div>
<div v-if="total_num<=list.length" class="no_more">没有更多了</div>
</div>
</van-list>
</van-pull-refresh>
<div v-if="list.length==0&&requested" class="noResult">暂无相关内容</div>
......@@ -52,7 +62,7 @@ export default {
data () {
return {
type: 1,
finished:false,
is_category: false,
category: [],
show_selected: '',
......@@ -78,7 +88,7 @@ export default {
this.getBookList();
// 注册scroll事件并监听
window.addEventListener('scroll', this.scrollHand);
// window.addEventListener('scroll', this.scrollHand);
},
activated(){
this.myReturn(this.onReturn);
......@@ -158,8 +168,13 @@ export default {
}else{
this.list = this.list.concat(response.list);
}
this.$toast.clear();
}
this.search_params.page += 1;
if((this.total_num<= this.list.length) || response.list==''){
this.finished = true
}
this.switch_flag = true;
})
.catch(() => {
......@@ -193,8 +208,10 @@ export default {
<style scoped rel="stylesheet/scss" lang="scss">
.bookList{
padding: 45px 0 15px;
padding: 0px 0 0px;
.medicineList2{
padding-top: 45px;
}
.wapNav{
margin-left: 10px;
}
......@@ -237,4 +254,10 @@ export default {
}
}
}
.list3{
display: block;
// padding-top: 90px;
width: 100%;
height: 100%;
}
</style>
src/views/consilia/List.vue
浏览文件 @ 1eb10d11
......@@ -45,7 +45,7 @@
:immediate-check='false'
class="consiliaList"
>
<router-link class="consilia" v-for="(c, j) in list" :key="j" :to="'/consilia_info/'+c.consiliaid">
<router-link class="consilia" v-for="(c, j) in list[0].list" :key="j" :to="'/consilia_info/'+c.consiliaid">
<van-row>
<van-col span="12" class="title ellipsis bold">{{c.title}}</van-col>
<van-col span="12" class="text-right ellipsis">{{c.name}}<span class="colorGreen" v-if="c.dynasty"> &nbsp;{{c.dynasty}}</span></van-col>
......
src/views/main/UserCenter.vue
浏览文件 @ 1eb10d11
......@@ -39,6 +39,7 @@
<van-cell title="意见反馈" to="/feedback" is-link />
<!-- <van-cell title="分享APP" to="/share" is-link /> -->
<!-- <van-cell v-if="gIsIOS()" title="评分鼓励" to="/home" is-link /> -->
<van-cell title="联系客服" url='tel:13912973232' is-link />
<van-cell v-if="user_info.phone" title="修改密码" @click="onClickLogin('/forget_password')" is-link />
</van-cell-group>
</div>
......@@ -63,6 +64,9 @@
this.$router.push({ path: '/login', query: {fromUrl: val} });
}
},
onClicktel(){
this.$router.push({ path: 'tel:13912973232'})
}
}
}
</script>
......
src/views/medicine/List.vue
浏览文件 @ 1eb10d11
......@@ -4,7 +4,7 @@
-->
<template>
<div class="medicineListWrap" :class="{'selectedTop':show_selected}">
<div class="medicineListWrap">
<div class="van-hairline--bottom myBar van-nav-bar van-nav-bar--fixed">
<div class="van-nav-bar__left" @click="onReturn"><van-icon name="arrow-left" /></div>
<div class="van-ellipsis van-nav-bar__title">伤寒药理</div>
......@@ -46,6 +46,7 @@
@load="getMedicineList"
:immediate-check='false'
class="medicineList"
:style="`padding-top:${show_selected?'139':'90'}`"
>
<router-link class="list clearfix" v-for="(l, i) in list" :key="i" :to="'/medicine_info/'+l.medicineid">
<div class="leftImg">
......@@ -61,7 +62,7 @@
</van-list>
</van-pull-refresh>
<div v-if="list.length==0&&requested" class="noResult">暂无相关内容</div>
</div>
</template>
......@@ -188,6 +189,8 @@ export default {
this.show_selected = '';
this.search_params.codes = null;
this.search_params.page = 1;
this.list=[];
this.finished = false;
this.getMedicineList();
},
......@@ -213,8 +216,7 @@ export default {
this.list = this.list.concat(response.list);
}
this.search_params.page += 1;
if(this.total_num<= this.list.length){
if((this.total_num<= this.list.length) || response.list==''){
this.finished = true
}
this.$toast.clear();
......@@ -251,14 +253,12 @@ export default {
</script>
<style scoped rel="stylesheet/scss" lang="scss">
.van-list{
// height: 85%;
// overflow: scroll;
padding-top: 96px;
}
.medicineListWrap{
padding: 0px 0 0px;
.medicineList{
padding-top: 90px;
}
.categoryWrap{
position: fixed;
top: 44px;
......
src/views/member/Login.vue
浏览文件 @ 1eb10d11
......@@ -23,7 +23,11 @@
<van-field v-model="form.account" type="number" @focus="setHeight" label="手机号" placeholder="输入手机号" />
<van-field v-model="form.code" type="number" @focus="setHeight" label="短信验证" placeholder="输入短信验证码" />
<span class="codeBtn" :class="{'disabledCode': !form.account||code_time}" @click="sendCode">发送验证码<span v-show="code_time">{{code_time}}</span></span>
</van-cell-group>
<div style="padding:10px" @click="agree"><span class="myCheckbox" :class="{'myCheckboxActive':is_check}"></span>
<span class="middle">我已认真阅读并同意<router-link to="/user_agreement" class="colorGreen">《用户注册协议》</router-link>和<router-link to="/User_yinsi" class="colorGreen">《隐私政策》</router-link></span>
</div>
<div class="forget"><span>&nbsp;</span></div>
<div class="btnWrap">
<van-button size="large" type="primary" :loading="loading" :disabled="isNotReady2" @click="handleLogin">登录</van-button>
......@@ -54,7 +58,7 @@ export default {
code_time: 0,
interval: '',
is_height: false,
is_check: false,
loading: false,
form:{},
authService: [],
......@@ -105,6 +109,10 @@ export default {
this.myReturn(this.onReturn);
},
methods: {
agree(){
this.is_check = !this.is_check;
},
onReturn(){
if(this.$route.name==='Login'){
if(this.$route.query.fromUrl){
......@@ -184,6 +192,10 @@ export default {
this.$toast({message: '请输入验证码', duration: 1500});
return;
}
if (!this.is_check) {
this.$toast({message: '请先同意并勾选用户注册协议', duration: 1500});
return;
}
this.loading = true;
let data;
if(this.is_pwd){
......@@ -357,4 +369,31 @@ export default {
}
}
}
.myCheckbox{
display: inline-block;
position: relative;
width: 16px;
height: 16px;
background: #a5a5a5;
border-radius: 16px;
vertical-align: middle;
margin-right: 5px;
&::after{
content: '';
position: absolute;
width: 7px;
height: 4px;
border-left: 1px solid #ffffff;
border-bottom: 1px solid #ffffff;
transform: rotate(-45deg);
top: 5px;
left: 4px;
}
}
.myCheckboxActive{
background: #1f9d59;
}
</style>
src/views/member/MyAudio.vue
浏览文件 @ 1eb10d11
......@@ -10,7 +10,7 @@
</div>
<div v-if="is_play!='n'">
<div class="van-hairline--bottom myBar van-nav-bar van-nav-bar--fixed">
<div class="van-nav-bar__left" @click="onReturn"><i class="van-icon van-icon-arrow van-nav-bar__arrow black"></i></div>
<div class="van-nav-bar__left" @click="onReturn"><i class="van-icon van-icon-arrow-left van-nav-bar__arrow black"></i></div>
<div class="van-ellipsis van-nav-bar__title">音频</div>
<div class="van-nav-bar__right">
<span class="collectionBtn" :class="{'collected': is_collection}" @click="onCollect"></span>
......@@ -45,10 +45,11 @@
<script>
import MemberService from '@/api/member';
import Service from '@/api/other';
import audioPlay from '@/components/AudioPlay'
export default {
components:{
audioPlay: require ('@/components/AudioPlay'),
audioPlay
},
data () {
return {
......
src/views/member/Register.vue
浏览文件 @ 1eb10d11
......@@ -11,7 +11,9 @@
<van-field v-model="form.password" type="password" label="密码" placeholder="密码6-18位" />
<van-field v-model="form.code" type="number" label="短信验证" placeholder="输入短信验证码" />
<span class="codeBtn" :class="{'disabledCode': !this.form.phone||code_time}" @click="sendCode">发送验证码<span v-show="code_time">{{code_time}}</span></span>
<van-cell class="smSize" @click="agree"><span class="myCheckbox" :class="{'myCheckboxActive':is_check}"></span><span class="middle">我已认真阅读并同意<router-link to="/user_agreement" class="colorGreen">《用户注册协议》</router-link></span></van-cell>
<van-cell class="smSize" ><span @click="agree" class="myCheckbox" :class="{'myCheckboxActive':is_check}"></span>
<span class="middle">我已认真阅读并同意<router-link to="/user_agreement" class="colorGreen">《用户注册协议》</router-link>和<router-link to="/User_yinsi" class="colorGreen">《隐私政策》</router-link></span>
</van-cell>
</van-cell-group>
<div class="btnWrap">
<van-button size="large" type="primary" :loading="loading" :disabled="isNotReady" @click="handleRegister">注册</van-button>
......@@ -28,14 +30,14 @@ export default {
return {
loading: false,
form:{phone: '', password: '', code: ''},
is_check: true,
is_check: false,
code_time: 0,
interval: '',
};
},
computed: {
isNotReady() {
if (this.form.phone != "" && this.form.password != "" && this.form.code != "" && this.is_check) {
if (this.form.phone != "" && this.form.password != "" && this.form.code != "") {
return false;
} else {
return true;
......@@ -106,6 +108,10 @@ export default {
this.$toast({message: '请确保密码长度为6-18位', duration: 1500});
return;
}
if (!this.is_check) {
this.$toast({message: '请先同意并勾选用户注册协议', duration: 1500});
return;
}
this.loading = true;
let parmas = {phone:this.form.phone, password: this.gEncryption(this.form.password), code:this.form.code};
MemberService.register(parmas).then(response => {
......
src/views/member/UserYinsi.vue 0 → 100644
浏览文件 @ 1eb10d11
差异被折叠。
src/views/original/List.vue
浏览文件 @ 1eb10d11
......@@ -15,19 +15,28 @@
</van-row>
</div>
<van-pull-refresh v-model="is_loading" @refresh="reset" v-if="list[0].length>0||list[1].length>0" class="list3">
<van-cell-group>
<van-cell v-if="list[0].length>0" :border="false" class="greenTitle"><template slot="title"><p>伤寒论</p></template></van-cell>
<van-cell v-for="(l, i) in list[0]" :key="i" :to="'/original_info/'+l.originalid" is-link>
<template slot="title"><p class="ellipsis">{{gReplaceAllHtml(l.title)}}</p></template>
</van-cell>
<van-cell v-if="list[1].length>0" :border="false" class="greenTitle"><template slot="title"><p>金匮要略</p></template></van-cell>
<van-cell v-for="(l, i) in list[1]" :key="i+1000" :to="'/original_info/'+l.originalid" is-link>
<template slot="title"><p class="ellipsis">{{gReplaceAllHtml(l.title)}}</p></template>
</van-cell>
</van-cell-group>
<van-list
v-model="is_loading"
:finished="finished"
finished-text="没有更多了"
@load="getOriginalList"
:immediate-check='false'
class="medicineList"
>
<van-cell-group>
<van-cell v-if="list[0].length>0" :border="false" class="greenTitle"><template slot="title"><p>伤寒论</p></template></van-cell>
<van-cell v-for="(l, i) in list[0]" :key="i" :to="'/original_info/'+l.originalid" is-link>
<template slot="title"><p class="ellipsis">{{gReplaceAllHtml(l.title)}}</p></template>
</van-cell>
<van-cell v-if="list[1].length>0" :border="false" class="greenTitle"><template slot="title"><p>金匮要略</p></template></van-cell>
<van-cell v-for="(l, i) in list[1]" :key="i+1000" :to="'/original_info/'+l.originalid" is-link>
<template slot="title"><p class="ellipsis">{{gReplaceAllHtml(l.title)}}</p></template>
</van-cell>
</van-cell-group>
</van-list>
</van-pull-refresh>
<div class="no_more">没有更多了</div>
</div>
</template>
......@@ -46,7 +55,7 @@ export default {
this.getOriginalList();
// 注册scroll事件并监听
window.addEventListener('scroll', this.scrollHand);
// window.addEventListener('scroll', this.scrollHand);
},
activated(){
this.myReturn(this.onReturn);
......@@ -83,6 +92,7 @@ export default {
this.list = response.list;
}
this.is_loading = false;
this.finished = true;
this.$toast.clear();
}).catch(() => {
this.is_loading = false;
......@@ -107,10 +117,18 @@ export default {
<style scoped rel="stylesheet/scss" lang="scss">
.originalList{
padding: 105px 0 15px;
padding: px 0 0px;
}
.medicineList{
padding-top: 108px;
}
.no_more{
padding: 15px 0 45px;
}
.list3{
display: block;
// padding-top: 90px;
width: 100%;
height: 100%;
}
</style>
src/views/original/RelatedAudio.vue
浏览文件 @ 1eb10d11
......@@ -16,7 +16,7 @@
</div>
<div v-if="is_play!='n'">
<div class="van-hairline--bottom myBar van-nav-bar van-nav-bar--fixed">
<div class="van-nav-bar__left" @click="onReturn"><i class="van-icon van-icon-arrow van-nav-bar__arrow black"></i></div>
<div class="van-nav-bar__left" @click="onReturn"><i class="van-icon van-icon-arrow-left van-nav-bar__arrow black"></i></div>
<div class="van-ellipsis van-nav-bar__title">相关媒体</div>
<div class="van-nav-bar__right">
<span class="collectionBtn" :class="{'collected': is_collection}" @click="onCollect"></span>
......@@ -53,10 +53,11 @@
import OriginalService from '@/api/original';
import MemberService from '@/api/member';
import Service from '@/api/other';
import audioPlay from '@/components/AudioPlay'
export default {
components:{
audioPlay: require ('@/components/AudioPlay'),
audioPlay
},
data () {
return {
......
src/views/payment/Pay.vue
浏览文件 @ 1eb10d11
......@@ -197,7 +197,7 @@ export default {
if (response.error) {
console.log(orderid);
this.$toast.fail({
message: `支付成功，但订单更新失败，请联系客服 010-84015100，错误信息：${response.error}`,
message: `支付成功，但订单更新失败，请联系客服 13912973232，错误信息：${response.error}`,
duration: 3500,
});
} else {
......
src/views/payment/Recharge.vue
浏览文件 @ 1eb10d11
......@@ -107,7 +107,7 @@
<p>2.充值金额仅用于问道伤寒购买资源使用。</p>
<p>3.充值金额没有使用期限，会一直保存在你的账户内。可以随时使用</p>
<p>4.充值金额不能退回，不能提现</p>
<p>5.充值到账时间可能有延迟。如果交易一小时仍未到账，请记录您的手机号致电问道伤寒客服电话<a class="telHref" href="tel:010-84015100">010-84015100</a>咨询。</p>
<p>5.充值到账时间可能有延迟。如果交易一小时仍未到账，请记录您的手机号致电问道伤寒客服电话<a class="telHref" href="tel:13912973232">13912973232</a>咨询。</p>
</div>
</div>
</template>
......
src/views/question/List.vue
浏览文件 @ 1eb10d11
......@@ -19,30 +19,39 @@
</van-row>
</div>
<van-pull-refresh v-model="is_loading" @refresh="reset" v-if="list.length>0" class="list3">
<van-cell-group v-if="type==3">
<van-cell v-for="(l, i) in list" :key="i" :to="'/question_info/'+l.id" is-link>
<template slot="title"><p class="ellipsis">{{gReplaceAllHtml(l.title)}}</p></template>
</van-cell>
</van-cell-group>
<div v-if="type==2" class="userQuestionlist">
<div class="item clearfix" v-for="(l, i) in list" :key="i">
<router-link :to="'/question_info/'+l.id">
<div class="leftDiv">
<div class="userIcon">
<img v-if="l.faceImg" :src="src_prefix+l.faceImg" alt="" @load="gCenterImg">
<img v-if="!l.faceImg" src="../../../static/img/touxiang.jpg" alt="" @load="gCenterImg">
</div>
<div class="size12">{{l.createTime | calculatingTime}}</div>
</div>
<div class="rightDiv">
<p class="colorGreen">{{l.nickname || l.account}}</p>
<p class="questionTitle ellipsis" v-if="l.content">{{l.title}}</p>
<p class="questionTitle" v-if="!l.content">{{l.title.length>25?l.title.substr(0,20)+'...':l.title}}</p>
<p class="ellipsis">{{l.content}}</p>
</div>
</router-link>
</div>
</div>
<van-list
v-model="is_loading"
:finished="finished"
finished-text="没有更多了"
@load="getQuestionList"
:immediate-check='false'
class="medicineList"
>
<van-cell-group v-if="type==3">
<van-cell v-for="(l, i) in list" :key="i" :to="'/question_info/'+l.id" is-link>
<template slot="title"><p class="ellipsis">{{gReplaceAllHtml(l.title)}}</p></template>
</van-cell>
</van-cell-group>
<div v-if="type==2" class="userQuestionlist">
<div class="item clearfix" v-for="(l, i) in list" :key="i">
<router-link :to="'/question_info/'+l.id">
<div class="leftDiv">
<div class="userIcon">
<img v-if="l.faceImg" :src="src_prefix+l.faceImg" alt="" @load="gCenterImg">
<img v-if="!l.faceImg" src="../../../static/img/touxiang.jpg" alt="" @load="gCenterImg">
</div>
<div class="size12">{{l.createTime | calculatingTime}}</div>
</div>
<div class="rightDiv">
<p class="colorGreen">{{l.nickname || l.account}}</p>
<p class="questionTitle ellipsis" v-if="l.content">{{l.title}}</p>
<p class="questionTitle" v-if="!l.content">{{l.title.length>25?l.title.substr(0,20)+'...':l.title}}</p>
<p class="ellipsis">{{l.content}}</p>
</div>
</router-link>
</div>
</div>
</van-list>
<!-- <div v-if="total_num<=list.length" class="no_more">没有更多了</div> -->
</van-pull-refresh>
<div v-if="list.length==0&&requested" class="noResult">暂无相关内容</div>
......@@ -57,6 +66,7 @@ export default {
return {
type: 3,
switch_flag: false,
finished:false,
search_params: {
rows: 20,
page: 1,
......@@ -74,7 +84,7 @@ export default {
this.getQuestionList();
// 注册scroll事件并监听
window.addEventListener('scroll', this.scrollHand);
// window.addEventListener('scroll', this.scrollHand);
},
methods:{
......@@ -140,6 +150,10 @@ export default {
this.list = this.list.concat(response.list);
}
}
this.search_params.page += 1;
if((this.total_num<= this.list.length) || response.list==''){
this.finished = true
}
this.switch_flag = true;
}).catch(() => {
this.is_loading = false;
......@@ -161,10 +175,19 @@ export default {
<style rel="stylesheet/scss" lang="scss">
.questionList{
padding: 105px 0 75px;
padding: 0px 0 0px;
.medicineList{
padding-top: 105px;
padding-bottom: 45px;
}
.edit{
margin-left: 15px;
}
}
.list3{
display: block;
// padding-top: 90px;
width: 100%;
height: 100%;
}
</style>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论