theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: theluyuan:1db45d40a7a529ae3fd80666e66ffe89a6682c8e
Branches Tags
theluyuan:master
theluyuan:qxf
theluyuan:zhy
theluyuan:xbx
theluyuan:gyh
theluyuan:xbx-new
theluyuan:zmr
theluyuan:cmx
theluyuan:lxb
..
compare: theluyuan:0e7139bc16195c17c4ccf403f9f0fc16d92292cb
Branches Tags
theluyuan:master
theluyuan:qxf
theluyuan:zhy
theluyuan:xbx
theluyuan:gyh
theluyuan:xbx-new
theluyuan:zmr
theluyuan:cmx
theluyuan:lxb

No commits in common. "1db45d40a7a529ae3fd80666e66ffe89a6682c8e" and "0e7139bc16195c17c4ccf403f9f0fc16d92292cb" have entirely different histories.
1db45d40a7 ... 0e7139bc16

14 changed files with 146 additions and 416 deletions
Show Stats Expand all files Collapse all files

1
App.vue
View File

@ -41,7 +41,6 @@
@import "/static/css/normalize"; @import "/static/css/normalize";
/* 顶部自定义导航留白 */ /* 顶部自定义导航留白 */
.status_bar { .status_bar {
z-index: 1000;
width: 100%; width: 100%;
height: var(--status-bar-height); height: var(--status-bar-height);
} }

7
common/api/shop.js
View File

@ -232,13 +232,6 @@ export default {
getPinTuanPush() { getPinTuanPush() {
return vm.$u.post('Specialci/pintuanPush'); return vm.$u.post('Specialci/pintuanPush');
}, },
// 拼团验证
pintuanVerify({ pintuan_id, pintuangroup_headid }) {
return vm.$u.post('Specialci/pintuanVerify', {
pintuan_id: pintuan_id,
pintuangroup_headid: pintuangroup_headid,
});
},
// 开团/参团 // 开团/参团
withImmediate({ pintuan_id, pintuangroup_headid, pintuangroup_id}) { withImmediate({ pintuan_id, pintuangroup_headid, pintuangroup_id}) {
return vm.$u.post('Specialci/withImmediate', { return vm.$u.post('Specialci/withImmediate', {

42
common/http.interceptor.js
View File

@ -47,30 +47,24 @@ const install = (Vue, vm) => {
// 假设201为token失效，这里跳转登录 // 假设201为token失效，这里跳转登录
// vm.$u.toast('您还没有登录哦，请先去登录！'); // vm.$u.toast('您还没有登录哦，请先去登录！');
if (res.data.data.action != "memberinfo") { if (res.data.data.action != "memberinfo") {
setTimeout(() => { uni.showModal({
// 此为uView的方法，详见路由相关文档 title: "温馨提示",
uni.navigateTo({ content: "您还未登录，请立即登录",
url: "/pageA/login/login", cancelText: "以后再说",
}) confirmText: "立即登录",
}, 1000) confirmColor: "#FF780F",
// uni.showModal({ success(res) {
// title: "温馨提示", // console.log(res);
// content: "您还未登录，请立即登录", if (res.confirm) {
// cancelText: "以后再说", setTimeout(() => {
// confirmText: "立即登录", // 此为uView的方法，详见路由相关文档
// confirmColor: "#FF780F", vm.$u.route('/pageA/login/login')
// success(res) { }, 500)
// // console.log(res); }
// if (res.confirm) { if (res.cancel) {
// setTimeout(() => { }
// // 此为uView的方法，详见路由相关文档 }
// vm.$u.route('/pageA/login/login') })
// }, 500)
// }
// if (res.cancel) {
// }
// }
// })
} }
return false; return false;
} else if (res.errCode == 1) { } else if (res.errCode == 1) {

2
components/shop/list/index.vue
View File

@ -14,7 +14,7 @@
</swiper-item> </swiper-item>
</swiper> </swiper>
<!-- 加载更多 --> <!-- 加载更多 -->
<u-loadmore class="load-size" :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" @loadmore="loadMore"></u-loadmore> <u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" @loadmore="loadMore"></u-loadmore>
</view> </view>
</template> </template>
<script> <script>

40
pageB/components/userinfo/index.vue
View File

@ -1,9 +1,8 @@
<template> <template>
<view class="userinfo" @click="stopClick()"> <view class="userinfo">
<view class="userhead"> <view class="userhead">
<image class="avatar" :src="item.member_avatar"></image> <image class="avatar" :src="item.member_avatar"></image>
<!-- <text class="follow" @click="following(item.member_id)">{{ is_follow ? "✓" : "+" }}</text> --> <text class="follow" @click="following(item.member_id)">{{ is_follow ? "✓" : "+" }}</text>
<image class="follow" :src=" !is_follow ? '../../static/image/userinfo/follow.png' : '../../static/image/userinfo/followed.png' " mode="" @click="following(item.member_id)"></image>
</view> </view>
<!-- 点赞 --> <!-- 点赞 -->
<view class="operat zan"> <view class="operat zan">
@ -63,10 +62,16 @@
.follow { .follow {
z-index: 100; z-index: 100;
position: absolute; position: absolute;
top: 80rpx; top: 90rpx;
left: 30rpx; left: 40rpx;
width: 50rpx; width: 36rpx;
height: 50rpx; height: 36rpx;
text-align: center;
line-height: 36rpx;
font-size: 34rpx;
border-radius: 50%;
color: #fff;
background-color: #FF780F;
} }
.operat { .operat {
@ -75,7 +80,6 @@
/* #endif */ /* #endif */
align-items: center; align-items: center;
flex-direction: column; flex-direction: column;
padding: 0 30rpx;
} }
.operat-span { .operat-span {
@ -106,7 +110,7 @@
}, },
watch: { watch: {
list(newValue, old) { list(newValue, old) {
// console.log(newValue); console.log(newValue);
this.item = newValue || {}; this.item = newValue || {};
this.is_follow = this.list.is_attention || false; this.is_follow = this.list.is_attention || false;
this.is_like = this.list.is_like || false; this.is_like = this.list.is_like || false;
@ -148,11 +152,6 @@
title: res.data.message, title: res.data.message,
icon: "none" icon: "none"
}) })
} else if (res.data.errCode == 401) {
uni.showToast({
title: "您还没有登录，请先登录！",
icon: "none"
})
} }
} }
}) })
@ -175,11 +174,6 @@
// console.log(res); // console.log(res);
this.is_like = !this.is_like; this.is_like = !this.is_like;
this.list.like_num = res.data.data.num; this.list.like_num = res.data.data.num;
} else if (res.data.errCode == 401) {
uni.showToast({
title: "您还没有登录，请先登录！",
icon: "none"
})
} else { } else {
uni.showToast({ uni.showToast({
title: res.data.message, title: res.data.message,
@ -206,11 +200,6 @@
console.log(res.data.num); console.log(res.data.num);
this.is_collect = !this.is_collect; this.is_collect = !this.is_collect;
this.list.collect_num = res.data.data.num; this.list.collect_num = res.data.data.num;
} else if (res.data.errCode == 401) {
uni.showToast({
title: "您还没有登录，请先登录！",
icon: "none"
})
} else { } else {
uni.showToast({ uni.showToast({
title: res.data.message, title: res.data.message,
@ -238,9 +227,6 @@
cart: this.is_cart cart: this.is_cart
}); });
}, },
// 冒泡
stopClick() {
}
} }
} }
</script> </script>

4
pageB/details/index.vue
View File

@ -19,7 +19,7 @@
<view class="box"> <view class="box">
<videoItem v-for="item in listInfo" :key="item.article_id" :item="item" <videoItem v-for="item in listInfo" :key="item.article_id" :item="item"
@getArticlelist="getArticlelist"></videoItem> @getArticlelist="getArticlelist"></videoItem>
<view class="no-data" v-show="!listInfo && page">暂无数据</view> <view class="no-data" v-show="!listInfo && !page">暂无数据</view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
@ -74,7 +74,7 @@ export default {
userInfo: {}, // 用户信息 userInfo: {}, // 用户信息
listInfo: [], // 列表详情 listInfo: [], // 列表详情
member_id: 0, member_id: 0,
page: 1, page: 0,
} }
}, },
onLoad(option) { onLoad(option) {

3
pageB/photo/index.vue
View File

@ -81,6 +81,7 @@
<image :src="item.goods_image" mode="aspectFill"></image> <image :src="item.goods_image" mode="aspectFill"></image>
<view> <view>
<text class="title">{{ item.goods_advword }}</text> <text class="title">{{ item.goods_advword }}</text>
<text class="name">{{ item.goods_name }}</text>
<text class="price">{{ item.goods_promotion_price }}</text> <text class="price">{{ item.goods_promotion_price }}</text>
</view> </view>
</view> </view>
@ -329,7 +330,7 @@
& > view { & > view {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-around; justify-content: space-between;
color: #333; color: #333;
font-size: 28rpx; font-size: 28rpx;
.title { .title {

35
pageB/sdetails/index.vue
View File

@ -27,10 +27,10 @@
<text>￥{{ goodsInfo.pintuan_price || '0.00' }}</text> <text>￥{{ goodsInfo.pintuan_price || '0.00' }}</text>
<s>￥{{ goodsInfo.goods_price || '0.00' }}</s> <s>￥{{ goodsInfo.goods_price || '0.00' }}</s>
</view> </view>
<view class="collect" @click="switchCollect(goodsInfo.is_collect)"> <view class="collect" @click="switchCollect(goodsInfo.goods_collect)">
<u-icon name="star" color="#474747" size="28" v-if="goodsInfo.is_collect == 0"></u-icon> <u-icon name="star" color="#474747" size="28" v-if="!goodsInfo.goods_collect"></u-icon>
<u-icon name="star-fill" color="#FF7807" size="28" v-else></u-icon> <u-icon name="star-fill" color="#FF7807" size="28" v-else></u-icon>
<text>{{ !goodsInfo.is_collect == 1 ? '收藏' : '已收藏' }}</text> <text>{{ !goodsInfo.goods_collect ? '收藏' : '已收藏' }}</text>
</view> </view>
</view> </view>
</view> </view>
@ -139,6 +139,7 @@
</view> </view>
<view style="height:100rpx"></view> <view style="height:100rpx"></view>
</view> </view>
<u-toast ref="uToast" />
</scroll-view> </scroll-view>
</u-popup> </u-popup>
<!-- 普通商品 tool --> <!-- 普通商品 tool -->
@ -179,7 +180,7 @@
<view class="btn" v-else @click="spikeGoods">立即秒杀</view> <view class="btn" v-else @click="spikeGoods">立即秒杀</view>
</view> </view>
<!-- <tloos @buy="buy" @xuanze="xuanze" :id="id" :info="goodsInfo" :type="type"></tloos> --> <!-- <tloos @buy="buy" @xuanze="xuanze" :id="id" :info="goodsInfo" :type="type"></tloos> -->
<u-toast ref="uToast" :z-index='200000' /> <u-toast ref="uToast" />
</view> </view>
</template> </template>
<script> <script>
@ -466,19 +467,6 @@ export default {
} }
}) })
}, },
// 验证能否拼团
async pintuanVerify({ pintuan_id, pintuangroup_headid }) {
const res = await this.$u.api.pintuanVerify({
pintuan_id: pintuan_id,
pintuangroup_headid: pintuangroup_headid,
})
if(res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
});
}
return res.errCode;
},
/* /*
* @description 下单 订单步骤1：展示结算数据 * @description 下单 订单步骤1：展示结算数据
* @params {Number} type involvement 拼团或者 默认开团 * @params {Number} type involvement 拼团或者 默认开团
@ -507,21 +495,13 @@ export default {
} }
} }
if(!this.debounce) return; if(!this.debounce) return;
this.debounce = false;
let params = { let params = {
ifcart: ifcart, ifcart: ifcart,
cart_id: [this.goodsInfo.goods_id + '|' + num], cart_id: [this.goodsInfo.goods_id + '|' + num],
} }
if(this.type == 2) { if(this.type == 2) {
if(type == 'involvement') { if(type == 'involvement') {
// 验证能否拼团
let status = this.pintuanVerify({
pintuan_id: this.pintuan_id,
pintuangroup_headid: this.involvemenGroupInfo[0].user_id
}).then(status => {
if(status != 0) return true;
})
// console.log(status);
if(status) return false;
this.$store.commit('setGroupHeadId', this.involvemenGroupInfo[0].user_id); this.$store.commit('setGroupHeadId', this.involvemenGroupInfo[0].user_id);
Object.assign(params, { Object.assign(params, {
pintuan_id: this.pintuan_id, pintuan_id: this.pintuan_id,
@ -533,7 +513,6 @@ export default {
}) })
} }
} }
this.debounce = false;
this.$u.api.settlementOrder(params).then(res => { this.$u.api.settlementOrder(params).then(res => {
if(res.errCode == 0) { if(res.errCode == 0) {
// console.log('type' + this.type); // console.log('type' + this.type);
@ -629,7 +608,7 @@ export default {
}) })
}, },
switchCollect(status) { switchCollect(status) {
if(status == 1) { if(status) {
this.removeFavorite(); this.removeFavorite();
} else { } else {
this.addFavoriteGoods(); this.addFavoriteGoods();

344
pageB/video/video.nvue
View File

@ -1,17 +1,18 @@
<template> <template>
<view> <view>
<video id="videoId" :style="videoSize" :src="src" autoplay="true" :show-fullscreen-btn="false" @play="playing" <video id="videoId" :style="videoSize" :src="src" autoplay="true" :show-fullscreen-btn="false" @play="playing"
@pause="pausing" @ended="videoEnd" @timeupdate="timeupdate" :show-play-btn="false" controls="false" @click="stoping" @timeupdate="timeupdate" :show-play-btn="false" controls="false" @click="stoping" :enable-progress-gesture="false"></video>
:enable-progress-gesture="false" :show-center-play-btn="false"></video> <cover-image class="close" @click="goBack" src="../../static/close.png">
</cover-image>
<cover-image class="pause" @click="stoping" src="../../static/videoPlay.png" v-if="!is_play">
</cover-image>
<!-- 用户操作 --> <!-- 用户操作 -->
<userinfo class="user-info" :style="{ top: fixTop }" :list="list" :cart="cart_type" :comment="is_comment" :num="comment_num" <userinfo class="user-info" :list="list" :cart="cart_type" :comment="is_comment" :num="comment_num" @openCart="openPopup"></userinfo>
@openCart="openPopup"></userinfo> <cover-view class="info-box" @click="stopClick">>
<!-- 视频信息 -->
<cover-view class="info-box" @click="stopClick">
<view class="video-info-box"> <view class="video-info-box">
<image class="image-play" src="../../static/videoIcon.png" mode=""></image> <image class="image-play" src="../../static/videoIcon.png" mode=""></image>
<text class="video-slip">视频</text> <text class="video-slip">视频</text>
<text class="time">{{ time_count }}s</text> <text class="time">{{ time_count == 1 ? 0 : time_count }}s</text>
</view> </view>
<view> <view>
<text class="name">@{{ list.member_nickname }}</text> <text class="name">@{{ list.member_nickname }}</text>
@ -28,81 +29,40 @@
</block> </block>
</view> </view>
</cover-view> </cover-view>
<!-- 单个商品 --> <cover-view class="content-box" v-if="is_comment">
<cover-view class="good-one" v-if="cart_len == 1"> <view class="content-title">
<view class="one-list" v-for="(item,index) in list.goods" :key="index"> <text class="tips">评论</text>
<image class="one-image" :src="item.goods_image" mode=""></image> <text class="close-down" @click="closeComment">×</text>
<view class="one-box">
<view class="title-one">{{ item.goods_advword }}</view>
<view class="content-one">{{ item.goods_name }}</view>
<view class="good-price">￥{{ item.goods_promotion_price }}</view>
</view>
</view> </view>
</cover-view> <scroller class="comment-list">
<!-- 遮罩层 --> <view class="" v-for="(item,index) in commentList" :key="index">
<cover-view class="mask" @click.stop="stopClick" :style="videoSize" v-if="is_comment || cart_type"> <view class="comment-list-box">
<!-- 评论 --> <view class="comment-list-header">
<cover-view class="content-box" v-if="is_comment" ref="contentBox"> <image class="avatar" :src="item.member_avatar" mode=""></image>
<view class="content-title"> <view>
<text class="tips">评论</text> <text class="comment-title">{{ item.member_nickname }}</text>
<text class="close-down" @click="closeComment">×</text> <text class="comment-time">{{ item.create_time }}</text>
</view>
<scroller class="comment-list">
<view class="" v-for="(item,index) in commentList" :key="index">
<view class="comment-list-box">
<view class="comment-list-header">
<image class="avatar" :src="item.member_avatar" mode=""></image>
<view>
<text class="comment-title">{{ item.member_nickname }}</text>
<text class="comment-time">{{ item.create_time }}</text>
</view>
</view>
<text class="reply">回复</text>
</view>
<view class="content-main">
<text class="content-style">{{ item.content }}</text>
</view>
</view>
<view class="send-box">
<input class="send-val" type="text" value="" />
<text class="btn-send">发送</text>
</view>
<loading class="loading" @loading="onloading" :display="loadinging ? 'show' : 'hide'">
<loading-indicator class="indicator"></loading-indicator>
<text class="indicator-text">努力加载中</text>
</loading>
</scroller>
</cover-view>
<!-- 购物车 -->
<cover-view class="cart-box" v-if="cart_type">
<view class="cart-title">
<text class="tips">全部商品</text>
<text class="close-down" @click="cart_type = false">×</text>
</view>
<scroller class="cart-list">
<view class="" v-for="(item,index) in list.goods" :key="index">
<view class="cart-list-header" @click="goGoodInfo(item.goods_id)">
<image class="goods-img" :src="item.goods_image" mode=""></image>
<view class="goods-info">
<text class="good-title">{{ item.goods_advword }}</text>
<text class="good-price">{{ item.goods_promotion_price }}</text>
</view> </view>
</view> </view>
<text class="reply">回复</text>
</view> </view>
<loading class="loading" @loading="onloading" :display="loadinging ? 'show' : 'hide'"> <view class="content-main">
<loading-indicator class="indicator"></loading-indicator> <text class="content-style">{{ item.content }}</text>
<text class="indicator-text">努力加载中</text> </view>
</loading> </view>
</scroller> <view class="send-box">
</cover-view> <input class="send-val" type="text" value="" />
<text class="btn-send">发送</text>
</view>
<loading class="loading" @loading="onloading" :display="loadinging ? 'show' : 'hide'">
<loading-indicator class="indicator"></loading-indicator>
<text class="indicator-text">努力加载中</text>
</loading>
</scroller>
</cover-view> </cover-view>
<!-- 返回按钮 --> <list class="cart-box">
<cover-image class="close" @click="goBack" src="../../static/close.png"> <cell></cell>
</cover-image> </list>
<!-- 暂停按钮 -->
<cover-image class="pause" :style="{ top: fixTop + 100 }" @click="stoping" src="../../static/videoPlay.png"
v-if="!is_play">
</cover-image>
</view> </view>
</template> </template>
@ -116,7 +76,6 @@
data() { data() {
return { return {
videoSize: {}, videoSize: {},
fixTop: 0,
list: {}, list: {},
labelLen: [], labelLen: [],
cart_type: false, // 显示购物车 cart_type: false, // 显示购物车
@ -139,22 +98,7 @@
onReady() { onReady() {
this.videoBox = uni.createVideoContext("videoId", this); this.videoBox = uni.createVideoContext("videoId", this);
}, },
onBackPress() {
if (this.cart_type) {
this.cart_type = !this.cart_type;
} else if (this.is_edit) {
this.is_edit = !this.is_edit;
} else if (this.is_comment) {
this.is_comment = !this.is_comment;
} else {
return false;
}
return true;
},
methods: { methods: {
moveHandle() {
return false;
},
// 获取信息 // 获取信息
getVideoInfo(article_id) { getVideoInfo(article_id) {
uni.request({ uni.request({
@ -169,7 +113,6 @@
success: (res) => { success: (res) => {
this.list = res.data.data.info; this.list = res.data.data.info;
this.src = res.data.data.info.video_path; this.src = res.data.data.info.video_path;
this.cart_len = res.data.data.info.goods.length;
let item = res.data.data.info.label; let item = res.data.data.info.label;
let arr = []; let arr = [];
item.forEach(data => { item.forEach(data => {
@ -196,40 +139,40 @@
}, },
success: (res) => { success: (res) => {
if (res.data.errCode == 0) { if (res.data.errCode == 0) {
// console.log(res.data); console.log(res.data);
this.commentList = res.data.data; this.commentList = res.data.data;
} }
} }
}) })
}, },
// 发布评论 // 发布评论
sendComment() { sendComment() {
if (this.send_value.length == 0) { if (this.send_value.length == 0) {
this.$u.toast("内容不能为空！"); this.$u.toast("内容不能为空！");
return; return;
} }
uni.request({ uni.request({
url: temp_url + "article/articleAddComment", url: temp_url + "article/articleAddComment",
method: "POST", method: "POST",
data: { data: {
article_id: this.article_id, article_id: this.article_id,
content: this.send_value, content: this.send_value,
pid: this.pid, pid: this.pid,
reply_id: this.reply_id, reply_id: this.reply_id,
}, },
success: (res) => { success: (res) => {
if (res.data.errCode == 0) { if (res.data.errCode == 0) {
this.send_value = ""; this.send_value = "";
this.comment_num = res.data.num; this.comment_num = res.data.num;
console.log(res.data); console.log(res.data);
} else { } else {
uni.showToast({ uni.showToast({
title: res.data.message, title: res.data.message,
icon: "none" icon: "none"
}) })
} }
} }
}) })
}, },
// 获取手机信息 // 获取手机信息
getInfo() { getInfo() {
@ -237,13 +180,8 @@
success: (res) => { success: (res) => {
this.videoSize = { this.videoSize = {
width: "750rpx", width: "750rpx",
height: res.screenHeight + "px", height: res.screenHeight + "px"
} }
this.fixTop = "400rpx";
this.fixTop = res.screenHeight / 3;
// #ifdef H5
this.fixTop = 400 + 'rpx'
// #endif
} }
}) })
}, },
@ -252,19 +190,6 @@
// console.log(e); // console.log(e);
if (e.type == "play") {} if (e.type == "play") {}
}, },
pausing(e) {
if (e.type == "pause") {
this.is_play = false;
}
},
// 结束
videoEnd(e) {
// console.log(e);
if (e.type == "ended") {
this.is_play = false;
this.time_count = 0;
}
},
// 暂停 // 暂停
stoping() { stoping() {
this.is_play = !this.is_play; this.is_play = !this.is_play;
@ -277,9 +202,8 @@
// 监听视频 // 监听视频
timeupdate(e) { timeupdate(e) {
this.time_count = parseInt(e.detail.duration) - parseInt(e.detail.currentTime); this.time_count = parseInt(e.detail.duration) - parseInt(e.detail.currentTime);
// console.log(e.detail.currentTime,e.detail.duration);
if (e.detail.duration == e.detail.currentTime) { if (e.detail.duration == e.detail.currentTime) {
// this.is_play = false; this.is_play = false;
} }
// let num = parseInt((e.detail.currentTime/e.detail.duration)*100); // let num = parseInt((e.detail.currentTime/e.detail.duration)*100);
// this.linear = num + "%"; // this.linear = num + "%";
@ -287,23 +211,17 @@
}, },
// 打开弹窗 // 打开弹窗
openPopup(data) { openPopup(data) {
// console.log(data); console.log(data);
this.cart_type = data.cart; this.cart_type = data.cart;
this.is_comment = data.comment; this.is_comment = data.comment;
if (this.is_comment) { if (this.is_comment) {
this.page = 0; this.page = 0;
this.getComment(); this.getComment();
// this.is_play = true;
} }
}, },
// 关闭评论 // 关闭评论
closeComment() { closeComment() {
this.is_comment = false; this.is_comment = false;
// console.log(this.is_comment,this.is_play);
// if (!this.is_comment && this.is_play) {
// console.log(1);
// this.is_play = false;
// }
}, },
// 下拉加载 // 下拉加载
onloading(e) { onloading(e) {
@ -313,12 +231,6 @@
this.loadinging = false; this.loadinging = false;
}, 2000) }, 2000)
}, },
// 跳转
goGoodInfo(id) {
uni.navigateTo({
url: "/pageB/sdetails/index?id=" + id + "&type=" + 1,
})
},
// stop // stop
stopClick(event) { stopClick(event) {
event.stopPropagation(); event.stopPropagation();
@ -336,16 +248,16 @@
/* 关闭 */ /* 关闭 */
.close { .close {
position: fixed; position: fixed;
top: 100rpx; top: 80rpx;
right: 70rpx; right: 60rpx;
width: 30rpx; width: 30rpx;
height: 30rpx; height: 30rpx;
} }
/* 暂停 */ /* 暂停 */
.pause { .pause {
z-index: 99;
position: fixed; position: fixed;
top: 600rpx;
left: 330rpx; left: 330rpx;
width: 100rpx; width: 100rpx;
height: 100rpx; height: 100rpx;
@ -354,6 +266,7 @@
/* 用户操作 */ /* 用户操作 */
.user-info { .user-info {
position: fixed; position: fixed;
top: 360rpx;
right: 30rpx; right: 30rpx;
} }
@ -376,53 +289,6 @@
border-radius: 10rpx; border-radius: 10rpx;
background-color: rgba(255, 255, 255, .6); background-color: rgba(255, 255, 255, .6);
} }
.good-one {
position: absolute;
bottom: 300rpx;
right: 100rpx;
width: 450rpx;
padding: 20rpx;
border-radius: 10rpx;
background-color: rgba(0,0,0,0.6);
}
.one-list {
flex-direction: row;
}
.one-image {
width: 160rpx;
height: 160rpx;
margin-right: 20rpx;
border-radius: 4rpx;
}
.one-box {
justify-content: space-between;
}
.title-one {
width: 100rpx;
font-size: 28rpx;
color: #fff;
lines: 1;
}
.content-one {
width: 100rpx;
font-size: 24rpx;
color: #fff;
lines: 2;
}
.mask {
z-index: 999999;
position: fixed;
top: 0;
left: 0;
background-color: rgba(0, 0, 0, 0.5);
}
.content-box { .content-box {
z-index: 99; z-index: 99;
@ -454,19 +320,19 @@
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.content-main { .content-main {
flex-direction: row; flex-direction: row;
padding-left: 100rpx; padding-left: 100rpx;
} }
.content-style { .content-style {
width: 600rpx; width: 600rpx;
font-size: 26rpx; font-size: 26rpx;
color: #333; color: #333;
lines: 2; lines: 2;
} }
.comment-list-header { .comment-list-header {
flex-direction: row; flex-direction: row;
} }
@ -494,7 +360,6 @@
font-weight: 500; font-weight: 500;
color: #333; color: #333;
} }
.send-box { .send-box {
z-index: 10000; z-index: 10000;
position: fixed; position: fixed;
@ -510,77 +375,24 @@
border-color: #ececec; border-color: #ececec;
background-color: #fff; background-color: #fff;
} }
.send-val { .send-val {
width: 600rpx; width: 600rpx;
height: 88rpx; height: 88rpx;
font-size: 36rpx; font-size: 36rpx;
} }
.btn-send { .btn-send {
font-size: 30rpx; font-size: 30rpx;
color: #303133; color: #303133;
} }
.close-down { .close-down {
padding: 10rpx;
font-size: 50rpx; font-size: 50rpx;
text-align: center; text-align: center;
color: #333; color: #333;
} }
.cart-box {
z-index: 99;
position: fixed;
bottom: 0;
left: 0;
width: 750rpx;
height: 700rpx;
background-color: #fff;
}
.cart-title {
flex-direction: row;
align-items: center;
justify-content: space-between;
height: 88rpx;
padding: 0 20rpx;
border-color: #f2f2f2;
border-bottom-width: 1rpx;
background-color: #fff;
}
.cart-list {
}
.cart-list-header {
padding: 20rpx;
flex-direction: row;
border-bottom-width: 1rpx;
border-bottom-color: #ececec;
}
.goods-img {
width: 160rpx;
height: 160rpx;
margin-right: 10rpx;
}
.goods-info {
justify-content: space-around;
}
.good-title {
color: #333;
font-size: 30rpx;
}
.good-price {
font-size: 28rpx;
color: #FF3131;
}
.image-play { .image-play {
width: 22rpx; width: 22rpx;
height: 20rpx; height: 20rpx;

2
pageC/merchant/index.vue
View File

@ -88,7 +88,7 @@ export default {
indexlist: [], indexlist: [],
indextop: [], indextop: [],
info: {}, info: {},
page: 1, page: 0,
scrollHeiht: '', scrollHeiht: '',
} }
}, },

16
pages.json
View File

@ -57,7 +57,8 @@
"navigationBarTitleText": "", "navigationBarTitleText": "",
"navigationStyle": "custom", "navigationStyle": "custom",
"app-plus": { "app-plus": {
"titleNView": false "titleNView": false,
"animationType": "slide-in-bottom"
} }
} }
}, },
@ -104,10 +105,7 @@
{ {
"path" : "video/video", "path" : "video/video",
"style" : { "style" : {
"navigationStyle":"custom", "navigationStyle":"custom"
"app-plus": {
"softinputMode": "adjustResize"
}
} }
}, },
{ {
@ -245,10 +243,10 @@
"style": { "style": {
"navigationStyle": "custom", "navigationStyle": "custom",
"app-plus": { "app-plus": {
"animationType": "fade-in", "animationType": "fade-in", // 设置fade-in淡入动画，为最合理的动画类型
"background": "transparent", "background": "transparent", // 背景透明
"backgroundColor": "rgba(0,0,0.5)", "backgroundColor": "rgba(0,0,0,0)", // 背景透明
"popGesture": "none" "popGesture": "none" // 关闭IOS屏幕左边滑动关闭当前页面的功能
} }
} }
}, },

66
pages/index/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<view> <view>
<view class="status_bar"></view> <view class="status_bar"></view>
<view class="index" @touchmove.stop.prevent="moveHandle"> <view class="index">
<view class="top"> <view class="top">
<view class="sosuo" @click="goSearch"> <view class="sosuo" @click="goSearch">
<u-icon name="search" color="#555" size="34rpx"></u-icon> <u-icon name="search" color="#555" size="34rpx"></u-icon>
@ -20,7 +20,7 @@
</view> </view>
<swiper class="card" @change="dianji" :current="num"> <swiper class="card" @change="dianji" :current="num">
<swiper-item> <swiper-item>
<scroll-view style="width:100%;height:100%" scroll-y="true" lower-threshold="200" upper-threshold="100" @scrolltolower="swiperBottom" @scrolltoupper="swiperTop"> <scroll-view style="width:100%;height:100%" scroll-y="true" lower-threshold="200" @scrolltolower="swiperBottom">
<view class="box"> <view class="box">
<!-- <indexad style="width:690rpx"></indexad> --> <!-- <indexad style="width:690rpx"></indexad> -->
<u-swiper mode="dot" :list="indexImageSwiper" name="adv_code" @click="clickFImage"></u-swiper> <u-swiper mode="dot" :list="indexImageSwiper" name="adv_code" @click="clickFImage"></u-swiper>
@ -91,24 +91,17 @@
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
page {
background-color: #fff;
}
.index { .index {
width: 750rpx; width: 750rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 100vh; height: 100vh;
/* #ifdef APP-PLUS */ /* #ifdef APP-PLUS */
padding-bottom: 88rpx; padding-bottom: 100rpx;
/* #endif */ /* #endif */
overflow: hidden; overflow: hidden;
.top { .top {
z-index: 10000;
position: fixed;
top: var(--status-bar-height);
left: 0;
display: flex; display: flex;
flex-shrink: 0; flex-shrink: 0;
align-items: center; align-items: center;
@ -116,7 +109,6 @@
width: 100%; width: 100%;
height: 88rpx; height: 88rpx;
padding: 0 30rpx; padding: 0 30rpx;
background-color: #fff;
.sosuo { .sosuo {
width: 32rpx; width: 32rpx;
@ -134,9 +126,8 @@
} }
.card { .card {
width: 100%;
height: 100%; height: 100%;
margin-top: 88rpx; width: 100%;
// pointer-events: none; // pointer-events: none;
.box { .box {
@ -147,8 +138,6 @@
.list { .list {
display: flex; display: flex;
padding-bottom: 50rpx;
margin-bottom: 50rpx;
} }
} }
@ -240,7 +229,7 @@
name: '关注' name: '关注'
}], }],
num: 0, num: 0,
page: 1, // 0即第一页 page: 0, // 0即第一页
follow_page: 0, // follow_page: 0, //
articleList: [], articleList: [],
recommendList: [], // 推荐达人 recommendList: [], // 推荐达人
@ -265,18 +254,12 @@
darenItem darenItem
}, },
onShow() { onShow() {
this.page = 1; this.articleList = [];
if (this.page != 1) { this.page = 0;
this.articleList = []; this.getArticlelist();
} this.getSwiper();
this.getArticlelist();
if (this.hasLogin) {
this.isNewmembervoucher();
}
}, },
onLoad(){ onLoad(){
this.getSwiper();
// 优惠券
if(this.$store.state.hasLogin){ if(this.$store.state.hasLogin){
this.isNewmembervoucher(); this.isNewmembervoucher();
const user = uni.getStorageSync('user_info'); const user = uni.getStorageSync('user_info');
@ -295,14 +278,10 @@
} }
}, },
onPullDownRefresh() { onPullDownRefresh() {
this.page = 1;
this.getArticlelist(); this.getArticlelist();
// this.getManicureList({ load: 'reload' }); // this.getManicureList({ load: 'reload' });
}, },
methods: { methods: {
moveHandle() {
return;
},
// 直播列表 // 直播列表
tabLiveList() { tabLiveList() {
this.$u.api.tabLiveList().then((res) => { this.$u.api.tabLiveList().then((res) => {
@ -349,8 +328,7 @@
// 状态请求 // 状态请求
if (a.type == "change") { // 强制请求一次 if (a.type == "change") { // 强制请求一次
if (this.num == 0) { if (this.num == 0) {
this.page = 1; this.page = 0;
this.articleList = [];
this.status = "loadmore"; this.status = "loadmore";
this.getArticlelist(); this.getArticlelist();
this.getSwiper(); this.getSwiper();
@ -369,30 +347,23 @@
}, },
// 发现别表 // 发现别表
getArticlelist() { getArticlelist() {
uni.showLoading({
title: "loading..."
})
this.$u.api.getArticlelist({ this.$u.api.getArticlelist({
page: this.page, page: this.page,
is_video_img: 0, // 查询视频1 图文2 都查0 is_video_img: 0, // 查询视频1 图文2 都查0
}).then(res => { }).then(res => {
// uni.stopPullDownRefresh();
this.status = "loading"; this.status = "loading";
if (res.errCode == 0) { if (res.errCode == 0) {
uni.hideLoading(); // uni.stopPullDownRefresh();
if (this.page == 1) { // console.log('37647744ghj', res)
if (this.page == 0) {
this.articleList = res.data.list; this.articleList = res.data.list;
this.status = "loadmore"; this.status = "loadmore";
} else if (res.data.length == 0 && this.page > 1) { } else if (res.data.length == 0 && this.page > 0) {
this.status = "nomore"; this.status = "nomore";
} else { } else {
this.articleList = this.articleList.concat(res.data.list); this.articleList = this.articleList.concat(res.data.list);
} }
if (res.data.length == 0 && this.page > 1) { this.page++;
console.log(111);
} else {
this.page++;
}
} else { } else {
this.status = "nomore" this.status = "nomore"
} }
@ -400,7 +371,8 @@
}, },
// 屏蔽更新列表 // 屏蔽更新列表
updateList() { updateList() {
this.page = 1; console.log(111);
this.page = 0;
this.getArticlelist(); this.getArticlelist();
}, },
// 发现下拉加载 // 发现下拉加载
@ -408,10 +380,6 @@
this.getArticlelist(); this.getArticlelist();
// console.log(e); // console.log(e);
}, },
swiperTop() {
// uni.startPullDownRefresh();
},
// 关注下拉
followBotton(e) { followBotton(e) {
this.getFollowList(); this.getFollowList();
// console.log(e); // console.log(e);

BIN
static/image/userinfo/follow.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
static/image/userinfo/followed.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB