Commit a790ae64 authored by Mac's avatar Mac

1

parent cfb96da0
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
"sdkConfigs" : { "sdkConfigs" : {
"share" : { "share" : {
"weixin" : { "weixin" : {
"appid" : "wxacd9f8cc3480d29e", "appid" : "wx38e054ee42b054f4",
"UniversalLinks" : "" "UniversalLinks" : ""
} }
} }
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
"quickapp" : {}, "quickapp" : {},
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin" : { "mp-weixin" : {
"appid" : "wxacd9f8cc3480d29e", "appid" : "wx38e054ee42b054f4",
"setting" : { "setting" : {
"urlCheck" : false, "urlCheck" : false,
"minified" : false "minified" : false
......
...@@ -11,7 +11,12 @@ ...@@ -11,7 +11,12 @@
height: 60px; height: 60px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
position: fixed;
left: 0;
top: 0;
background: #FFF;
z-index: 2;
} }
.mynews .top-box { .mynews .top-box {
...@@ -70,7 +75,7 @@ ...@@ -70,7 +75,7 @@
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
flex-wrap: wrap; flex-wrap: wrap;
} }
...@@ -80,9 +85,9 @@ ...@@ -80,9 +85,9 @@
height: 70px; height: 70px;
border-radius: 4px; border-radius: 4px;
margin-right: 15px; margin-right: 15px;
overflow: hidden; overflow: hidden;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
flex-wrap: wrap; flex-wrap: wrap;
} }
...@@ -106,7 +111,7 @@ ...@@ -106,7 +111,7 @@
.mynews .andiostyle { .mynews .andiostyle {
width: 100%; width: 100%;
height: 30px; height: 27px;
border-radius: 4px; border-radius: 4px;
padding: 0 15px; padding: 0 15px;
display: flex; display: flex;
...@@ -133,7 +138,7 @@ ...@@ -133,7 +138,7 @@
height: calc(100vh-60px); height: calc(100vh-60px);
width: calc(100vw); width: calc(100vw);
overflow: hidden; overflow: hidden;
margin-top: 60px;
"> ">
<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }"> <scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }">
<view class="ftBox" v-for="(x, i) in g" :key="i" @click="goteacher(x)"> <view class="ftBox" v-for="(x, i) in g" :key="i" @click="goteacher(x)">
...@@ -149,13 +154,21 @@ ...@@ -149,13 +154,21 @@
</view> </view>
<view class="inter-r-t wrap" v-if="x.fileType==1"> <view class="inter-r-t wrap" v-if="x.fileType==1">
<view class="inter-r-t-l"> <view class="inter-r-t-l">
<image :src="x.files[0]" v-if="x.files.length==1" mode='aspectFill' style="width: 100%;height: 100%;"></image> <image :src="x.files[0]" v-if="x.files.length==1" mode='aspectFill' style="width: 100%;height: 100%;"></image>
<view v-if="x.files.length==2" v-for="(item, iq) in x.files" :key="iq" :style="{'margin-right':(iq%2 ==0)?'2px':'0',width:'34px','height':'100%'}"> <view v-if="x.files.length==2" v-for="(item, iq) in x.files" :key="iq" :style="{'margin-right':(iq%2 ==0)?'2px':'0',width:'34px','height':'100%'}">
<image :src="item" mode='aspectFill' style="width: 100%;height: 100%;"></image> <image :src="item" mode='aspectFill' style="width: 100%;height: 100%;"></image>
</view> </view>
<view v-if="x.files.length==4" v-for="(item, iq) in x.files" :key="iq" <view style="width: 100%;height: 100%;display: flex;flex-direction: row;" v-if="x.files.length==3">
:style="{'margin-right':(iq%2 ==0)?'2px':'0',width:'34px','height':'34px','margin-bottom':(iq==0||iq==1)?'2px':'0'}"> <image :src="x.files[0]" mode='aspectFill' style="width: 34px;height: 100%;margin-right: 2px;"></image>
<image :src="item" mode='aspectFill' style="width: 100%;height: 100%;"></image> <view style="width: 34px;height: 100%;display: flex;flex-direction: column;justify-content: space-between;">
<view v-if="iq!=0" v-for="(item, iq) in x.files" :key="iq" style="width: 34px;height: 34px;">
<image :src="item" mode='aspectFill' style="width: 100%;height: 100%;"></image>
</view>
</view>
</view>
<view v-if="x.files.length>3" v-for="(item, iq) in x.files" :key="iq" :style="{'margin-right':(iq%2 ==0)?'2px':'0',width:'34px','height':'34px','margin-bottom':(iq==0||iq==1)?'2px':'0'}">
<image :src="item" mode='aspectFill' style="width: 100%;height: 100%;"></image>
</view> </view>
</view> </view>
<view class="inter-r-t-r"> <view class="inter-r-t-r">
...@@ -218,7 +231,7 @@ ...@@ -218,7 +231,7 @@
showAuth: false, showAuth: false,
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 7,
}, },
mainColor: "", mainColor: "",
secondary: '', secondary: '',
...@@ -384,12 +397,12 @@ ...@@ -384,12 +397,12 @@
//语音播放 //语音播放
playVoice(x) { playVoice(x) {
let that = this let that = this
if(innerAudioContext.src!=x.files[0]){//如果切换听其他的语音 if (innerAudioContext.src != x.files[0]) { //如果切换听其他的语音
innerAudioContext.stop(); innerAudioContext.stop();
this.nowbofo =false this.nowbofo = false
} }
innerAudioContext.src = x.files[0]; innerAudioContext.src = x.files[0];
if (this.nowbofo == false) { if (this.nowbofo == false) {
innerAudioContext.play() innerAudioContext.play()
this.nowbofo = true this.nowbofo = true
} else { } else {
...@@ -397,6 +410,21 @@ ...@@ -397,6 +410,21 @@
this.nowbofo = false this.nowbofo = false
} }
}, },
getList() {
this.msg.pageIndex = 1;
this.g = [];
this.init();
},
lower(e) {
console.log(2)
if (this.msg.pageIndex < this.page_count) {
this.msg.pageIndex++;
this.status = "loading";
this.init();
} else {
this.status = "nomore";
}
},
reloadUserinfo() { reloadUserinfo() {
this.u = uni.getStorageSync("mall_UserInfo"); this.u = uni.getStorageSync("mall_UserInfo");
// this.showAuth=false; // this.showAuth=false;
......
<template>
</template>
<script>
</script>
<style>
</style>
...@@ -372,10 +372,10 @@ ...@@ -372,10 +372,10 @@
setTimeout(() => { setTimeout(() => {
uni.navigateBack({ uni.navigateBack({
success: function() { success: function() {
beforePage.$vm.init(); // 执行前一个页面的created方法 beforePage.$vm.getList(); // 执行前一个页面的created方法
} }
}); });
}, 1000) }, 500)
} }
} }
); );
......
...@@ -112,7 +112,7 @@ export default { ...@@ -112,7 +112,7 @@ export default {
// 获取小程序APPID // 获取小程序APPID
Vue.prototype.GetMiniAppId = function() { Vue.prototype.GetMiniAppId = function() {
let appObj = {}; let appObj = {};
let appType = 1; let appType = 6;
switch (appType) { switch (appType) {
case 1: //赞羊 case 1: //赞羊
appObj = { appObj = {
......
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