Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx
This commit is contained in:
commit
52508a1098
GPG Key ID:
A7972FD973317FF3
6
App.vue
6
App.vue
@ -43,6 +43,12 @@
|
||||
.status_bar {
|
||||
width: 100%;
|
||||
height: var(--status-bar-height);
|
||||
}
|
||||
/* 自定义下拉 */
|
||||
.load-size {
|
||||
::v-deep.u-more-text {
|
||||
font-size: 20rpx !important;
|
||||
}
|
||||
}
|
||||
/* #endif */
|
||||
</style>
|
||||
|
||||
@ -177,7 +177,7 @@
|
||||
console.log('视频错误信息:',e);
|
||||
},
|
||||
timeupdate(e) {
|
||||
console.log(e);
|
||||
console.log(e);
|
||||
},
|
||||
getRandomColor: function() {
|
||||
const rgb = []
|
||||
|
||||
@ -71,7 +71,7 @@
|
||||
value: '',
|
||||
login: '注册',
|
||||
show: false,
|
||||
is_check: null,
|
||||
is_check: true,
|
||||
member_mobile: '', //手机号
|
||||
smslog_type : '1',//状态
|
||||
sms_code : '', //验证码
|
||||
@ -104,9 +104,10 @@
|
||||
},
|
||||
// 用户注册
|
||||
loginIns(){
|
||||
console.log(this.is_check);
|
||||
let me = this;
|
||||
let type_phone = this.$u.test.mobile( this.member_mobile)
|
||||
if( this.member_mobile == ''){
|
||||
let type_phone = this.$u.test.mobile(this.member_mobile)
|
||||
if(this.member_mobile == ''){
|
||||
this.$refs.uToast.show({
|
||||
title: '手机号不能为空！',
|
||||
})
|
||||
@ -118,13 +119,13 @@
|
||||
});
|
||||
return false;
|
||||
}
|
||||
if( this.sms_code == ''){
|
||||
if(this.sms_code == ''){
|
||||
this.$refs.uToast.show({
|
||||
title: '验证码不能为空！',
|
||||
})
|
||||
return false;
|
||||
}
|
||||
if (this.is_check) {
|
||||
if (!this.is_check) {
|
||||
this.$refs.uToast.show({
|
||||
title: '请同意协议！',
|
||||
})
|
||||
@ -446,10 +447,6 @@
|
||||
.pact {
|
||||
position: relative;
|
||||
padding-left: 40rpx;
|
||||
overflow: hidden;
|
||||
// overflow: hidden; //超出的文本隐藏
|
||||
// text-overflow: ellipsis; //溢出用省略号显示
|
||||
// white-space: nowrap; //溢出不换行
|
||||
}
|
||||
.phones{
|
||||
margin-bottom: 90rpx!important;
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
<template>
|
||||
<view>
|
||||
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
|
||||
</style>
|
||||
@ -1,162 +1,231 @@
|
||||
<template>
|
||||
<view class="userinfo">
|
||||
<view class="userhead">
|
||||
<image :src="item.member_avatar"></image>
|
||||
<text class="follow" v-if="!is_follow" @click="following(item.member_id)">+</text>
|
||||
<u-icon v-else name="checkmark" color="#ffffff" :size="28" class="follow" @click="following(item.member_id)"></u-icon>
|
||||
<image class="avatar" :src="item.member_avatar"></image>
|
||||
<text class="follow" @click="following(item.member_id)">{{ is_follow ? "✓" : "+" }}</text>
|
||||
</view>
|
||||
<!-- 点赞 -->
|
||||
<!-- 点赞 -->
|
||||
<view class="operat zan">
|
||||
<u-icon name="thumb-up-fill" :color=" is_like ? '#FF7807' : '#ffffff' " :size="50" @click="likeType(item.article_id)"></u-icon>
|
||||
<text>{{item.like_num}}</text>
|
||||
<image class="operat-img" :src=" is_like ? '../../static/image/userinfo/dianzan1.png' : '../../static/image/userinfo/dianzan.png' "
|
||||
mode="" @click="likeType(item.article_id)"></image>
|
||||
<text class="operat-span">{{item.like_num}}</text>
|
||||
</view>
|
||||
<!-- 收藏 -->
|
||||
<!-- 收藏 -->
|
||||
<view class="operat shoucang">
|
||||
<u-icon name="star-fill" :color=" is_collect ? '#FF7807' : '#ffffff' " :size="50" @click="collecting(item.article_id)"></u-icon>
|
||||
<text>{{item.collect_num}}</text>
|
||||
<image class="operat-img" :src=" is_collect ? '../../static/image/userinfo/shoucang1.png' : '../../static/image/userinfo/shoucang.png' "
|
||||
mode="" @click="collecting(item.article_id)"></image>
|
||||
<text class="operat-span">{{item.collect_num}}</text>
|
||||
</view>
|
||||
<!-- 评论 -->
|
||||
<!-- 评论 -->
|
||||
<view class="operat pinglun">
|
||||
<u-icon name="more-circle-fill" :color=" is_content ? '#FF7807' : '#ffffff' " :size="50" @click="editing()"></u-icon>
|
||||
<text>{{ comment_num }}</text>
|
||||
<image class="operat-img" :src=" is_content ? '../../static/image/userinfo/pinglun1.png' : '../../static/image/userinfo/pinglun.png' "
|
||||
mode="" @click="editing(item.article_id)"></image>
|
||||
<text class="operat-span">{{ comment_num }}</text>
|
||||
</view>
|
||||
<!-- 购物车 -->
|
||||
<!-- 购物车 -->
|
||||
<view class="operat gouwu">
|
||||
<u-icon name="shopping-cart-fill" :color=" is_cart ? '#FF7807' : '#ffffff' " :size="50" @click="carting()"></u-icon>
|
||||
<image class="operat-img" :src=" is_cart ? '../../static/image/userinfo/gouwuche1.png' : '../../static/image/userinfo/gouwuche.png' "
|
||||
mode="" @click="carting()"></image>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
<style lang="scss" scoped>
|
||||
.userinfo{
|
||||
width: 110rpx;
|
||||
height: 570rpx;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
.userhead{
|
||||
position: relative;
|
||||
.userinfo {
|
||||
width: 110rpx;
|
||||
height: 570rpx;
|
||||
/* #ifndef APP-PLUS-NVUE */
|
||||
display: flex;
|
||||
/* #endif */
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.userhead {
|
||||
position: relative;
|
||||
/* #ifndef APP-PLUS-NVUE */
|
||||
display: flex;
|
||||
/* #endif */
|
||||
position: relative;
|
||||
align-items: center;
|
||||
&>image{
|
||||
width: 110rpx;
|
||||
height: 110rpx;
|
||||
border-radius: 50%;
|
||||
border: 2rpx solid #fff;
|
||||
}
|
||||
.follow {
|
||||
position: absolute;
|
||||
top: 90rpx;
|
||||
left: 35%;
|
||||
width: 36rpx;
|
||||
height: 36rpx;
|
||||
text-align: center;
|
||||
line-height: 36rpx;
|
||||
font-size: 36rpx;
|
||||
border-radius: 50%;
|
||||
color: #fff;
|
||||
background-color: #FF780F;
|
||||
}
|
||||
}
|
||||
.operat {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
& > text {
|
||||
margin-top: 10rpx;
|
||||
font-size: 28rpx;
|
||||
color: #fff;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.avatar {
|
||||
width: 110rpx;
|
||||
height: 110rpx;
|
||||
border-radius: 50%;
|
||||
/* #ifndef APP-PLUS-NVUE */
|
||||
border: 2rpx solid #fff;
|
||||
/* #endif */
|
||||
}
|
||||
|
||||
.follow {
|
||||
position: absolute;
|
||||
top: 90rpx;
|
||||
left: 40rpx;
|
||||
width: 36rpx;
|
||||
height: 36rpx;
|
||||
text-align: center;
|
||||
line-height: 36rpx;
|
||||
font-size: 36rpx;
|
||||
border-radius: 50%;
|
||||
color: #fff;
|
||||
background-color: #FF780F;
|
||||
}
|
||||
|
||||
.operat {
|
||||
/* #ifndef APP-PLUS-NVUE */
|
||||
display: flex;
|
||||
/* #endif */
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.operat-span {
|
||||
margin-top: 10rpx;
|
||||
font-size: 28rpx;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.operat-img {
|
||||
width: 50rpx;
|
||||
height: 50rpx;
|
||||
}
|
||||
</style>
|
||||
<script>
|
||||
export default {
|
||||
name:'userinfo',
|
||||
props:['list','cart','comment','num'],
|
||||
data(){
|
||||
return {
|
||||
is_follow: this.list.is_attention || false,
|
||||
is_like: this.list.is_like || false,
|
||||
is_collect: this.list.is_collect || false,
|
||||
is_content: false,
|
||||
is_cart: false,
|
||||
comment_num: this.list.comment_num || 0,
|
||||
item: this.list || {}
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
list(newValue,old) {
|
||||
// console.log(newValue,old);
|
||||
this.item = newValue || {};
|
||||
this.is_follow = this.list.is_attention || false;
|
||||
this.is_like = this.list.is_like || false;
|
||||
this.is_collect = this.list.is_collect || false;
|
||||
this.comment_num = this.list.comment_num || 0;
|
||||
},
|
||||
cart(newValue,old) {
|
||||
// console.log(newValue);
|
||||
this.is_cart = newValue;
|
||||
},
|
||||
comment(newValue,old) {
|
||||
// console.log(newValue,old);
|
||||
this.is_content = newValue;
|
||||
},
|
||||
num(newVal,old) {
|
||||
// console.log(newVal);
|
||||
this.comment_num = newVal;
|
||||
// this.item.comment_num = newVal;
|
||||
export default {
|
||||
name: 'userinfo',
|
||||
props: ['list', 'cart', 'comment', 'num'],
|
||||
data() {
|
||||
return {
|
||||
is_follow: this.list.is_attention || false,
|
||||
is_like: this.list.is_like || false,
|
||||
is_collect: this.list.is_collect || false,
|
||||
is_content: false,
|
||||
is_cart: false,
|
||||
comment_num: this.list.comment_num || 0,
|
||||
item: this.list || {}
|
||||
}
|
||||
},
|
||||
deep: true
|
||||
},
|
||||
methods: {
|
||||
// 关注
|
||||
following(id) {
|
||||
this.$u.api.attentionMember({member_id: id}).then(res => {
|
||||
if (res.errCode == 0) {
|
||||
this.is_follow = !this.is_follow;
|
||||
this.$u.toast(res.message);
|
||||
}
|
||||
})
|
||||
},
|
||||
// 点赞
|
||||
likeType(id) {
|
||||
// console.log(id);
|
||||
this.$u.post("article/articleLike",{article_id: id}).then(res => {
|
||||
if (res.errCode == 0) {
|
||||
// console.log(res);
|
||||
this.is_like = !this.is_like;
|
||||
this.list.like_num = res.data.num;
|
||||
} else {
|
||||
this.$u.toast(res.message);
|
||||
}
|
||||
})
|
||||
},
|
||||
// 收藏
|
||||
collecting(id) {
|
||||
this.$u.post("article/articleCollect",{article_id: id}).then(res => {
|
||||
if (res.errCode == 0) {
|
||||
// console.log(res);
|
||||
this.is_collect = !this.is_collect;
|
||||
this.list.collect_num = res.data.num;
|
||||
} else {
|
||||
this.$u.toast(res.message);
|
||||
}
|
||||
})
|
||||
},
|
||||
// 评论
|
||||
editing() {
|
||||
this.is_content = !this.is_content;
|
||||
// console.log(this.is_content);
|
||||
this.$emit("openCart",{ comment: this.is_content, cart: this.is_cart});
|
||||
},
|
||||
// 购物车
|
||||
carting() {
|
||||
this.is_cart = !this.is_cart;
|
||||
// console.log(this.is_cart);
|
||||
this.$emit("openCart",{ comment: this.is_content, cart: this.is_cart});
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
watch: {
|
||||
list(newValue, old) {
|
||||
console.log(newValue);
|
||||
this.item = newValue || {};
|
||||
this.is_follow = this.list.is_attention || false;
|
||||
this.is_like = this.list.is_like || false;
|
||||
this.is_collect = this.list.is_collect || false;
|
||||
this.comment_num = this.list.comment_num || 0;
|
||||
},
|
||||
cart(newValue, old) {
|
||||
// console.log(newValue);
|
||||
this.is_cart = newValue;
|
||||
},
|
||||
comment(newValue, old) {
|
||||
// console.log(newValue,old);
|
||||
this.is_content = newValue;
|
||||
},
|
||||
num(newVal, old) {
|
||||
// console.log(newVal);
|
||||
this.comment_num = newVal;
|
||||
// this.item.comment_num = newVal;
|
||||
},
|
||||
deep: true
|
||||
},
|
||||
methods: {
|
||||
// 关注
|
||||
following(id) {
|
||||
uni.request({
|
||||
url: "https://dmmall.sdbairui.com/api/member/attentionMember",
|
||||
method: "POST",
|
||||
data: {
|
||||
member_id: id
|
||||
},
|
||||
header: {
|
||||
Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
|
||||
},
|
||||
success: (res) => {
|
||||
if (res.data.errCode == 0) {
|
||||
this.is_follow = !this.is_follow;
|
||||
console.log(this.is_follow);
|
||||
uni.showToast({
|
||||
title: res.data.data.message,
|
||||
icon: "none"
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
// 点赞
|
||||
likeType(id) {
|
||||
// console.log(id);
|
||||
uni.request({
|
||||
url: "https://dmmall.sdbairui.com/api/article/articleLike",
|
||||
method: "POST",
|
||||
data: {
|
||||
article_id: id
|
||||
},
|
||||
header: {
|
||||
Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
|
||||
},
|
||||
success: (res) => {
|
||||
console.log(res);
|
||||
if (res.data.errCode == 0) {
|
||||
// console.log(res);
|
||||
this.is_like = !this.is_like;
|
||||
this.list.like_num = res.data.data.num;
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: res.data.message,
|
||||
icon: "none"
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
// 收藏
|
||||
collecting(id) {
|
||||
uni.request({
|
||||
url: "https://dmmall.sdbairui.com/api/article/articleCollect",
|
||||
method: "POST",
|
||||
data: {
|
||||
article_id: id
|
||||
},
|
||||
header: {
|
||||
Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
|
||||
},
|
||||
success: (res) => {
|
||||
console.log(res);
|
||||
if (res.data.errCode == 0) {
|
||||
console.log(res.data.num);
|
||||
this.is_collect = !this.is_collect;
|
||||
this.list.collect_num = res.data.data.num;
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: res.data.message,
|
||||
icon: "none"
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
// 评论
|
||||
editing() {
|
||||
this.is_content = !this.is_content;
|
||||
// console.log(this.is_content);
|
||||
this.$emit("openCart", {
|
||||
comment: this.is_content,
|
||||
cart: this.is_cart
|
||||
});
|
||||
},
|
||||
// 购物车
|
||||
carting() {
|
||||
this.is_cart = !this.is_cart;
|
||||
// console.log(this.is_cart);
|
||||
this.$emit("openCart", {
|
||||
comment: this.is_content,
|
||||
cart: this.is_cart
|
||||
});
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
@ -56,7 +56,7 @@
|
||||
</view>
|
||||
</block>
|
||||
<view class="no-data" v-if="!commentList.length">还没有评论，快来评论吧！</view>
|
||||
<u-loadmore v-else :status="status" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
|
||||
<u-loadmore v-else class="load-size" :status="status" size="20" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
|
||||
</scroll-view>
|
||||
<view class="editing" @touchend.prevent="openKeyInput">
|
||||
<input type="text" value="" :placeholder="edit_text" disabled="disabled" />
|
||||
@ -392,7 +392,7 @@
|
||||
</style>
|
||||
<script>
|
||||
import userinfo from "../components/userinfo/index" // 点赞组件
|
||||
import contentBox from "../components/shpoone/index" // 评论
|
||||
// import contentBox from "../components/shpoone/index" // 评论
|
||||
// import shoplist from "../components/shoplist/index" // 商品列表
|
||||
|
||||
export default {
|
||||
|
||||
@ -98,7 +98,7 @@
|
||||
<image class="close" src="/static/image/common/17.png" @click="showGroupUser=false"></image>
|
||||
</view>
|
||||
</u-popup>
|
||||
<u-popup v-model="showInvolvementUser" mode="center">
|
||||
<u-popup v-model="showInvolvementUser" mode="center" z-index="10078">
|
||||
<view class="involvement-container" v-if="involvemenGroupInfo.length">
|
||||
<view class="title u-line-1">参与{{ involvemenGroupInfo[0].member_nickname }}的拼团</view>
|
||||
<view class="involvement-view">
|
||||
@ -609,7 +609,7 @@ export default {
|
||||
background-color: #EEEBEE;
|
||||
.spike-view {
|
||||
position: absolute;
|
||||
top: 396rpx;
|
||||
top: 400rpx;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 104rpx;
|
||||
@ -1027,13 +1027,13 @@ export default {
|
||||
}
|
||||
}
|
||||
.spike-tool {
|
||||
z-index: 10076;
|
||||
display: flex;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 98rpx;
|
||||
display: flex;
|
||||
z-index: 10076;
|
||||
height: 100rpx;
|
||||
background-color: #FFFFFF;
|
||||
.left {
|
||||
width: 190rpx;
|
||||
@ -1056,8 +1056,8 @@ export default {
|
||||
}
|
||||
.btn {
|
||||
flex: 1;
|
||||
height: 98rpx;
|
||||
line-height: 98rpx;
|
||||
height: 104rpx;
|
||||
line-height: 104rpx;
|
||||
text-align: center;
|
||||
font-size: 32rpx;
|
||||
color: rgba(255,255,255,1);
|
||||
|
||||
@ -77,18 +77,37 @@ export default {
|
||||
}
|
||||
},
|
||||
onLoad(option) {
|
||||
this.value = option.value
|
||||
this.value = option.value;
|
||||
this.setViewHeight();
|
||||
this.ShopSearch()
|
||||
// this.plus.webview.currentWebview().setTitleNViewSearchInputText(option.value);
|
||||
this.setNavSearchInput();
|
||||
},
|
||||
onNavigationBarSearchInputConfirmed(value) {
|
||||
this.value = value.text
|
||||
console.log(this.value)
|
||||
this.ShopSearch()
|
||||
|
||||
},
|
||||
methods: {
|
||||
// 动态设置导航栏搜索框内容
|
||||
setNavSearchInput(keyword) {
|
||||
// #ifdef APP-PLUS
|
||||
let webView = this.$mp.page.$getAppWebview();
|
||||
webView.setTitleNViewSearchInputText(keyword);
|
||||
// #endif
|
||||
// #ifdef H5
|
||||
let inputSearch=document.querySelector('.uni-input-input[type=search]');
|
||||
var evt = new InputEvent('input', {
|
||||
inputType: 'insertText',
|
||||
data: keyword,
|
||||
dataTransfer: null,
|
||||
isComposing: false
|
||||
});
|
||||
if(inputSearch){
|
||||
inputSearch.value = keyword;
|
||||
inputSearch.dispatchEvent(evt);
|
||||
}
|
||||
// #endif
|
||||
},
|
||||
changeType(member_id){
|
||||
console.log(member_id);
|
||||
this.$emit("pChangeType")
|
||||
|
||||
@ -58,9 +58,28 @@ export default {
|
||||
onNavigationBarSearchInputConfirmed(value) {
|
||||
this.value = value.text
|
||||
this.ShopSearch()
|
||||
|
||||
},
|
||||
methods: {
|
||||
setNavSearchInput(keyword) {
|
||||
console.log(keyword);
|
||||
// #ifdef APP-PLUS
|
||||
let webView = this.$mp.page.$getAppWebview();
|
||||
webView.setTitleNViewSearchInputText(keyword);
|
||||
// #endif
|
||||
// #ifdef H5
|
||||
let inputSearch=document.querySelector('.uni-input-input[type=search]');
|
||||
const evt = new InputEvent('input', {
|
||||
inputType: 'insertText',
|
||||
data: keyword,
|
||||
dataTransfer: null,
|
||||
isComposing: false
|
||||
});
|
||||
if(inputSearch){
|
||||
inputSearch.value = keyword;
|
||||
inputSearch.dispatchEvent(evt);
|
||||
}
|
||||
// #endif
|
||||
},
|
||||
setOrderSort() {
|
||||
let sort = '';
|
||||
if(this.current == 0) {
|
||||
@ -75,6 +94,8 @@ export default {
|
||||
},
|
||||
// 排序方式 goods_salenum：销量 evaluation_count：评价 goods_price_asc：价格从低到高 goods_price_desc：价格从高到低
|
||||
async ShopSearch({ load = 'reload' } = {}) {
|
||||
console.log(this.value);
|
||||
this.setNavSearchInput(this.value);
|
||||
const sort = this.setOrderSort();
|
||||
const res = await this.$u.api.ShopSearch({
|
||||
keyword: this.value,
|
||||
|
||||
@ -1,16 +1,18 @@
|
||||
<template>
|
||||
<view>
|
||||
<video id="videoId" :style="videoSize" :src="src" autoplay="true" :loop="true" :show-fullscreen-btn="false" @play="playing"
|
||||
<video id="videoId" :style="videoSize" :src="src" autoplay="true" :show-fullscreen-btn="false" @play="playing" @timeupdate="timeupdate"
|
||||
:show-play-btn="false" controls="false" @click="stoping" :enable-progress-gesture="false"></video>
|
||||
<cover-image class="close" @click="goBack" src="../../static/close.png">
|
||||
</cover-image>
|
||||
<cover-view class="" src="../../static/videoPlay.png">
|
||||
</cover-view>
|
||||
<cover-image class="pause" @click="stoping" src="../../static/videoPlay.png" v-if="!is_play">
|
||||
</cover-image>
|
||||
<!-- 用户操作 -->
|
||||
<userinfo class="user-info" :list="list" :cart="cart_type" :comment="is_comment" :num="comment_num" @openCart="openPopup"></userinfo>
|
||||
<cover-view class="info-box">
|
||||
<view class="video-info-box">
|
||||
<image class="image-play" src="../../static/videoPlay.png" mode=""></image>
|
||||
<image class="image-play" src="../../static/videoIcon.png" mode=""></image>
|
||||
<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>
|
||||
<text class="name">@{{ list.member_nickname }}</text>
|
||||
@ -23,7 +25,7 @@
|
||||
</view>
|
||||
<view class="label-box">
|
||||
<block v-for="(item,index) in list.label" :key="index">
|
||||
<text class="label" :style="{ width: item.name.length * 40 + 'rpx' }">{{ item.name }}</text>
|
||||
<text class="label" :style="{ width: labelLen[index] * 40 + 'rpx' }">{{ item.name }}</text>
|
||||
</block>
|
||||
</view>
|
||||
</cover-view>
|
||||
@ -31,22 +33,28 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import userinfo from "../components/userinfo/index" // 点赞组件
|
||||
export default {
|
||||
components:{
|
||||
userinfo
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
videoSize: {},
|
||||
list: {},
|
||||
labelLen: [],
|
||||
cart_type: false, // 显示购物车
|
||||
is_comment: false, // 显示评论
|
||||
comment_num: 0, // 评论数
|
||||
src: "",
|
||||
is_play: true,
|
||||
timer: null,
|
||||
alltime: 7,
|
||||
time_count: 7,
|
||||
time_count: 0,
|
||||
linear: null,
|
||||
};
|
||||
},
|
||||
onLoad(option) {
|
||||
this.getVideoInfo(option.id);
|
||||
this.getInfo();
|
||||
this.aaa();
|
||||
},
|
||||
onReady() {
|
||||
this.videoBox = uni.createVideoContext("videoId", this);
|
||||
@ -60,9 +68,24 @@
|
||||
data: {
|
||||
article_id: article_id
|
||||
},
|
||||
header: {
|
||||
Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
|
||||
},
|
||||
success: (res) => {
|
||||
this.list = res.data.data.info;
|
||||
this.src = res.data.data.info.video_path;
|
||||
let item = res.data.data.info.label;
|
||||
let arr = [];
|
||||
item.forEach(data => {
|
||||
let str = escape(data.name);
|
||||
if(str.indexOf('%u')){
|
||||
// console.log(data.name);
|
||||
arr.push(Math.floor(data.name.length / 2));
|
||||
} else {
|
||||
arr.push(data.name.length);
|
||||
}
|
||||
})
|
||||
this.labelLen = arr;
|
||||
}
|
||||
})
|
||||
},
|
||||
@ -79,11 +102,8 @@
|
||||
},
|
||||
// 播放
|
||||
playing(e) {
|
||||
console.log(e);
|
||||
// console.log(e);
|
||||
if (e.type == "play") {
|
||||
this.alltime = 7;
|
||||
this.time_count = 7;
|
||||
this.aaa();
|
||||
}
|
||||
},
|
||||
// 暂停
|
||||
@ -91,24 +111,19 @@
|
||||
this.is_play = !this.is_play;
|
||||
if (this.is_play) {
|
||||
this.videoBox.play();
|
||||
this.aaa();
|
||||
} else {
|
||||
this.videoBox.pause();
|
||||
clearInterval(this.timer);
|
||||
this.temp_time = this.time_count;
|
||||
console.log(this.temp_time);
|
||||
}
|
||||
},
|
||||
// 倒计时
|
||||
aaa() {
|
||||
this.timer = setInterval(() => {
|
||||
if (this.time_count > 0 && this.time_count <= this.alltime) {
|
||||
this.time_count--;
|
||||
} else {
|
||||
clearInterval(this.timer);
|
||||
this.timer = null;
|
||||
}
|
||||
}, 1000);
|
||||
// 监听视频
|
||||
timeupdate(e) {
|
||||
this.time_count = parseInt(e.detail.duration) - parseInt(e.detail.currentTime);
|
||||
if (e.detail.duration == e.detail.currentTime) {
|
||||
this.is_play = false;
|
||||
}
|
||||
// let num = parseInt((e.detail.currentTime/e.detail.duration)*100);
|
||||
// this.linear = num + "%";
|
||||
// console.log(this.time_count);
|
||||
},
|
||||
goBack() {
|
||||
uni.navigateBack({
|
||||
@ -128,7 +143,23 @@
|
||||
width: 30rpx;
|
||||
height: 30rpx;
|
||||
}
|
||||
|
||||
|
||||
/* 暂停 */
|
||||
.pause {
|
||||
position: fixed;
|
||||
top: 600rpx;
|
||||
left: 330rpx;
|
||||
width: 100rpx;
|
||||
height: 100rpx;
|
||||
}
|
||||
|
||||
/* 用户操作 */
|
||||
.user-info {
|
||||
position: fixed;
|
||||
top: 360rpx;
|
||||
right: 30rpx;
|
||||
}
|
||||
|
||||
/* 底部信息 */
|
||||
.info-box {
|
||||
position: fixed;
|
||||
|
||||
@ -106,7 +106,7 @@ export default {
|
||||
},
|
||||
setViewHeight() {
|
||||
const res = uni.getSystemInfoSync();
|
||||
this.scrollHeight = res.windowHeight - (90 / 2) + 'px';
|
||||
this.scrollHeight = res.windowHeight - (res.windowWidth / 750) * 90 + 'px';
|
||||
},
|
||||
setTitle(title) {
|
||||
uni.setNavigationBarTitle({
|
||||
|
||||
@ -1,16 +1,17 @@
|
||||
<template>
|
||||
<view class="imageTop">
|
||||
<image :src="url" mode="aspectFit"></image>
|
||||
<image :src="url" mode="widthFix"></image>
|
||||
</view>
|
||||
</template>
|
||||
<style lang="scss" scoped>
|
||||
.imageTop{
|
||||
width: 100%;
|
||||
height: 500rpx;
|
||||
margin-bottom: 20rpx;
|
||||
overflow: hidden;
|
||||
>image{
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
margin-bottom: 20rpx;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@ -21,6 +22,6 @@ export default {
|
||||
return {
|
||||
}
|
||||
},
|
||||
props:['url']
|
||||
props:['url'],
|
||||
}
|
||||
</script>
|
||||
@ -1,17 +1,18 @@
|
||||
<template>
|
||||
<view class="listItem">
|
||||
<video v-if="type == '2'" :src="url" :show-fullscreen-btn="true"></video>
|
||||
<image v-else :src="url" mode="aspectFit"></image>
|
||||
<image v-else :src="url" mode="aspectFill"></image>
|
||||
</view>
|
||||
</template>
|
||||
<style lang="scss" scoped>
|
||||
.listItem{
|
||||
width: 365rpx;
|
||||
height: 500rpx;
|
||||
margin-bottom: 20rpx;
|
||||
overflow: hidden;
|
||||
>image,video{
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
margin-bottom: 20rpx;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -104,7 +104,7 @@ export default {
|
||||
},
|
||||
setViewHeight() {
|
||||
const res = uni.getSystemInfoSync();
|
||||
this.swiperHeight = res.windowHeight - (88 / 2) + 'px';
|
||||
this.swiperHeight = res.windowHeight - (res.windowWidth / 750) * 88 + 'px';
|
||||
},
|
||||
}
|
||||
};
|
||||
|
||||
@ -125,7 +125,7 @@ export default {
|
||||
},
|
||||
setViewHeight() {
|
||||
const res = uni.getSystemInfoSync();
|
||||
this.scrollHeight = res.windowHeight - 90 / 2 + 'px';
|
||||
this.scrollHeight = res.windowHeight - (res.windowWidth / 750) * 90 + 'px';
|
||||
// console.log(this.scrollHeight);
|
||||
},
|
||||
toDetailsPage(id) {
|
||||
|
||||
@ -115,7 +115,7 @@ export default {
|
||||
setViewHeight() {
|
||||
const res = uni.getSystemInfoSync();
|
||||
const otherHeight = 347 + 140 + 20 + 98;
|
||||
this.scrollHeight = res.windowHeight - otherHeight / 2 + 'px';
|
||||
this.scrollHeight = res.windowHeight - (res.windowWidth / 750) * otherHeight + 'px';
|
||||
// console.log(this.scrollHeight);
|
||||
},
|
||||
toDetailsPage(id) {
|
||||
|
||||
@ -38,12 +38,12 @@
|
||||
</view>
|
||||
<view class="main">
|
||||
<scroll-view class="video-image" scroll-y v-if="cur==0 && indextop.length" :style="{ height: scrollHeiht }">
|
||||
<view v-for="item in indextop" :key="item.id">
|
||||
<videoTop :url="item.article_pic" v-if="item.type == 2"></videoTop>
|
||||
<imageTop v-else :url="item.article_pic"></imageTop>
|
||||
<view v-for="item in indextop" :key="item.id" class="container-top">
|
||||
<videoTop :url="item.article_pic" v-if="item.type == 2" @click.native="toDetailsPage(item.article_id)"></videoTop>
|
||||
<imageTop v-else :url="item.article_pic" @click.native="toDetailsPage(item.article_id)"></imageTop>
|
||||
</view>
|
||||
<view style="display: flex;flex-wrap: wrap;" v-if="indexlist.length">
|
||||
<listitem :style="{'margin-left': index%2 == 1 ? '20rpx':'0'}" v-for="(item,index) in indexlist" :key="item.id" :type="item.type" :url="item.article_pic"></listitem>
|
||||
<view v-if="indexlist.length" class="container-bottom">
|
||||
<listitem v-for="item in indexlist" :key="item.id" :type="item.type" :url="item.article_pic" class="bottom-item" @click.native="toDetailsPage(item.article_id)"></listitem>
|
||||
</view>
|
||||
</scroll-view>
|
||||
<view class="item" v-if="cur==1">
|
||||
@ -109,6 +109,12 @@ export default {
|
||||
// if(e.index == 0) this.show = true;
|
||||
},
|
||||
methods: {
|
||||
toDetailsPage(id) {
|
||||
// console.log(11);
|
||||
this.$u.route('pageB/photo/index', {
|
||||
id: id
|
||||
});
|
||||
},
|
||||
switchCurrent(current) {
|
||||
this.cur = current;
|
||||
if(current == 0) {
|
||||
@ -123,15 +129,15 @@ export default {
|
||||
uni.stopPullDownRefresh();
|
||||
})
|
||||
},
|
||||
getStoreImgVideoList() {
|
||||
this.$u.api.getStoreImgVideoList({ id: this.sid }).then((res)=>{
|
||||
if(res.data.length) {
|
||||
this.indextop = [res.data[0], res.data[1]];
|
||||
this.indexlist = res.data.slice(2,);
|
||||
}
|
||||
uni.stopPullDownRefresh();
|
||||
})
|
||||
},
|
||||
// getStoreImgVideoList() {
|
||||
// this.$u.api.getStoreImgVideoList({ id: this.sid }).then((res)=>{
|
||||
// if(res.data.length) {
|
||||
// this.indextop = [res.data[0], res.data[1]];
|
||||
// this.indexlist = res.data.slice(2,);
|
||||
// }
|
||||
// uni.stopPullDownRefresh();
|
||||
// })
|
||||
// },
|
||||
attentionMember() {
|
||||
this.$u.api.attentionMember({ member_id: this.info.member_id }).then(res => {
|
||||
if(res.errCode == 0) {
|
||||
@ -149,13 +155,15 @@ export default {
|
||||
uni.stopPullDownRefresh();
|
||||
if (res.errCode == 0) {
|
||||
// this.articleList = res.data.list;
|
||||
if(res.data.list.length > 0) {
|
||||
this.indextop = [res.data.list[0]]
|
||||
this.indextop = [res.data.list[0], res.data.list[1]];
|
||||
}
|
||||
if(res.data.list.length > 1) {
|
||||
this.indextop.push(res.data.list[1]);
|
||||
this.indexlist.push(...res.data.list.slice(2,));
|
||||
if(JSON.stringify(res.data) != '[]') {
|
||||
if(res.data.list.length > 0) {
|
||||
this.indextop = [res.data.list[0]]
|
||||
// this.indextop = [res.data.list[0], res.data.list[1]];
|
||||
}
|
||||
if(res.data.list.length > 1) {
|
||||
this.indextop.push(res.data.list[1]);
|
||||
this.indexlist.push(...res.data.list.slice(2,));
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
@ -288,9 +296,23 @@ export default {
|
||||
.video-image {
|
||||
padding-bottom: 98rpx;
|
||||
}
|
||||
> view {
|
||||
margin-top: 20rpx;
|
||||
.container-top {
|
||||
> view {
|
||||
margin-bottom: 10rpx;
|
||||
}
|
||||
}
|
||||
.container-bottom {
|
||||
margin-top: 20rpx;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: space-between;
|
||||
.bottom-item {
|
||||
margin-bottom: 10rpx;
|
||||
}
|
||||
}
|
||||
// > view {
|
||||
// margin-top: 20rpx;
|
||||
// }
|
||||
}
|
||||
.tabbar {
|
||||
border-top: 1rpx #DBDADA solid;
|
||||
|
||||
@ -98,8 +98,37 @@ export default {
|
||||
},
|
||||
onNavigationBarButtonTap(e) {
|
||||
if( e.index == 0 ) uni.navigateBack();
|
||||
if( e.index == 1 ) this.customers();
|
||||
},
|
||||
methods: {
|
||||
customers(){
|
||||
function Friend(uuid, name, avatar,time = "", text = "",date = "") {
|
||||
this.uuid = uuid;
|
||||
this.name = name;
|
||||
this.avatar = avatar;
|
||||
this.online = false;
|
||||
this.unReadMessage = 0;
|
||||
this.text = text;
|
||||
this.time = time;
|
||||
this.date = date
|
||||
}
|
||||
// console.log(123)
|
||||
this.$u.api.getAtwillUserInfo({
|
||||
id: 1 // 平台店铺 id
|
||||
}).then((res)=>{
|
||||
// console.log(res)
|
||||
let user = new Friend(res.data.member_id,res.data.member_nickname,res.data.member_avatar)
|
||||
this.$u.route({
|
||||
url:"/pageD/privateChat/privateChat",
|
||||
params:{
|
||||
id:JSON.stringify(user)
|
||||
}
|
||||
|
||||
})
|
||||
}).catch((err)=>{
|
||||
console.log(err)
|
||||
})
|
||||
},
|
||||
changeAvatar() {
|
||||
const url = this.$u.http.config.baseUrl + '/Upload/uploadfile';
|
||||
uni.chooseImage({
|
||||
|
||||
@ -40,7 +40,7 @@ export default {
|
||||
setIntegralHeight() {
|
||||
const res = uni.getSystemInfoSync();
|
||||
// console.log(res.windowHeight);
|
||||
this.integralHeight = res.windowHeight - 251 / 2 + 'px';
|
||||
this.integralHeight = res.windowHeight - (res.windowWidth / 750) * 251 + 'px';
|
||||
},
|
||||
getMemberPointsStat() {
|
||||
this.$u.api.getMemberPointsStat().then((res)=>{
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<scroll-view scroll-y class="medal-article">
|
||||
<view class="medal-title">
|
||||
<image src="../static/mine/29.png"></image>
|
||||
<view>了解勋章</view>
|
||||
<view>{{ title }}</view>
|
||||
<image src="../static/mine/30.png"></image>
|
||||
</view>
|
||||
<view class="medal-content">
|
||||
@ -18,6 +18,7 @@ export default {
|
||||
data() {
|
||||
return {
|
||||
nodes: '',
|
||||
title: '',
|
||||
}
|
||||
},
|
||||
created() {
|
||||
@ -27,7 +28,8 @@ export default {
|
||||
getMemberPointsStat() {
|
||||
this.$u.api.getMemberPointsStat().then((res)=>{
|
||||
if (res.errCode == 0) {
|
||||
const nodes = res.data.grade_rule;
|
||||
this.title = res.data.grade_rule.document_title;
|
||||
const nodes = res.data.grade_rule.document_content;
|
||||
this.nodes = common.unescapeHTML(nodes);
|
||||
}
|
||||
})
|
||||
|
||||
@ -117,9 +117,9 @@ export default {
|
||||
setViewHeight() {
|
||||
const res = uni.getSystemInfoSync();
|
||||
// console.log(res.windowHeight);
|
||||
this.richHeight = res.windowHeight - (88 + 250) / 2 + 'px';
|
||||
this.richHeight = res.windowHeight - (88 + 250) * (res.windowWidth / 750) + 'px';
|
||||
// console.log(this.richHeight);
|
||||
this.swiperHeight = res.windowHeight - 88 / 2 + 'px';
|
||||
this.swiperHeight = res.windowHeight - (res.windowWidth / 750) * 88 + 'px';
|
||||
},
|
||||
viewProgress() {
|
||||
this.$u.route({
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
<swiper :current="swiperCouponCurrent" @animationfinish="couponAnimationFinish" :style="{ height: swiperHeight }">
|
||||
<swiper-item class="swiper-coupon-item" v-for="(_, i) in couponGroupList" :key="i">
|
||||
<scroll-view scroll-y style="height: 100%;" @scrolltolower="onreachBottom" class="coupon-scroll">
|
||||
<view v-for="(coupon, index) in couponList" :key="index" class="coupon-item">
|
||||
<view v-for="(coupon, index) in couponList[i]" :key="index" class="coupon-item">
|
||||
<Coupon :couponInfo="coupon" :status='0' :type="0" @exchange="exchangeCoupon($event)"></Coupon>
|
||||
</view>
|
||||
<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" v-if="couponList.length>=pageSize" @loadmore="onreachBottom"></u-loadmore>
|
||||
<u-empty text="暂无优惠券" mode="coupon" color="#000" v-if="!couponList.length"></u-empty>
|
||||
<u-empty text="暂无优惠券" mode="coupon" color="#000" v-if="!couponList[i] || !couponList[i].length"></u-empty>
|
||||
<u-loadmore :status="loadStatus" bgColor="#FFF" margin-bottom="60" v-if="!couponList[i] || couponList[i].length>=pageSize" @loadmore="onreachBottom"></u-loadmore>
|
||||
</scroll-view>
|
||||
</swiper-item>
|
||||
</swiper>
|
||||
@ -49,7 +49,7 @@ export default {
|
||||
},
|
||||
watch: {
|
||||
couponCurrent(index) {
|
||||
this.couponList = [];
|
||||
// this.couponList = [];
|
||||
const id = this.couponGroupList[index].gc_id;
|
||||
this.getCouponList({ gc_id: id, load: 'reload' });
|
||||
},
|
||||
@ -89,9 +89,10 @@ export default {
|
||||
})
|
||||
this.timer = true;
|
||||
if(res.errCode == 0) {
|
||||
if(load == 'reload') this.couponList = res.data;
|
||||
else if(load == 'loadmore') this.couponList.push(...res.data);
|
||||
if(load == 'reload') this.couponList[this.couponCurrent] = res.data;
|
||||
else if(load == 'loadmore') this.couponList[this.couponCurrent].push(...res.data);
|
||||
}
|
||||
this.$forceUpdate();
|
||||
return res.data.length;
|
||||
},
|
||||
exchangeCoupon(id) {
|
||||
@ -109,7 +110,7 @@ export default {
|
||||
},
|
||||
setViewHeight() {
|
||||
const res = uni.getSystemInfoSync();
|
||||
this.swiperHeight = res.windowHeight - ((88 + 10 + 88) / 2) + 'px';
|
||||
this.swiperHeight = res.windowHeight - ((88 + 10 + 88) * (res.windowWidth / 750)) + 'px';
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
<view class="distance">距离下一级还需要 {{ memberInfo.next_member_level_exppoints_diff }} 经验值</view>
|
||||
</view>
|
||||
<view class="body">
|
||||
<view class="title">
|
||||
<view class="title" v-if="memberInfo.level_rule">
|
||||
<image src="/static/image/mine/34.png"></image>
|
||||
<text>{{ memberInfo.level_rule.document_title }}</text>
|
||||
</view>
|
||||
@ -121,7 +121,7 @@ export default {
|
||||
}
|
||||
}
|
||||
.body {
|
||||
margin-top: 60rpx;
|
||||
margin-top: 20rpx;
|
||||
.title {
|
||||
height: 88rpx;
|
||||
display: flex;
|
||||
@ -131,7 +131,7 @@ export default {
|
||||
font-weight: 500;
|
||||
color: rgba(51,51,51,1);
|
||||
// border-bottom: #ECECEC 1rpx solid;
|
||||
margin-bottom: 30rpx;
|
||||
margin-bottom: 20rpx;
|
||||
> image {
|
||||
width: 29rpx;
|
||||
height: 36rpx;
|
||||
|
||||
@ -33,11 +33,12 @@
|
||||
fontSize: 24
|
||||
},
|
||||
sheetStatus: false,
|
||||
list: [{
|
||||
text: '换个账号登录',
|
||||
color: '#FF780F',
|
||||
fontSize: 28
|
||||
},
|
||||
list: [
|
||||
// {
|
||||
// text: '换个账号登录',
|
||||
// color: '#FF780F',
|
||||
// fontSize: 28
|
||||
// },
|
||||
{
|
||||
text: '退出登录',
|
||||
color: '#FF780F',
|
||||
@ -78,7 +79,7 @@
|
||||
// 退出登录选择 0：切换账号 | 1：退出登录
|
||||
choiceOption(index) {
|
||||
console.log(index);
|
||||
if (index == 1) {
|
||||
if (index == 0) {
|
||||
this.show = true;
|
||||
}
|
||||
},
|
||||
|
||||
@ -90,7 +90,7 @@ export default {
|
||||
},
|
||||
setViewHeight() {
|
||||
const res = uni.getSystemInfoSync();
|
||||
this.swiperHeight = res.windowHeight - (88 / 2) + 'px';
|
||||
this.swiperHeight = res.windowHeight - (88 * (res.windowWidth / 750)) + 'px';
|
||||
},
|
||||
tabsChange(index) {
|
||||
this.swiperCurrent = index;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
<scroll-view scroll-y class="scroll-coupon">
|
||||
<view v-if="couponList[index]">
|
||||
<view class="coupon-item" v-for="(coupon, c_index) in couponList[index]" :key="c_index">
|
||||
<Coupon :couponInfo="coupon" :status='index' :type="1" @use="useCoupon($event)" :goodsClass="goodsClass"></Coupon>
|
||||
<Coupon :couponInfo="coupon" :status='index' @use="useCoupon($event)" :goodsClass="goodsClass"></Coupon>
|
||||
</view>
|
||||
</view>
|
||||
<u-empty text="暂无优惠券" mode="coupon" v-if="!couponList[index] || !couponList[index].length"></u-empty>
|
||||
@ -68,12 +68,22 @@ export default {
|
||||
this.$forceUpdate();
|
||||
})
|
||||
},
|
||||
useCoupon(id) {
|
||||
console.log(id);
|
||||
useCoupon(coupon) {
|
||||
// console.log(coupon);
|
||||
if(coupon.type == 1) {
|
||||
this.$u.route({
|
||||
type: 'switchTab',
|
||||
url: 'pages/shop/index',
|
||||
})
|
||||
} else if(coupon.type == 2) {
|
||||
this.$u.route('pageC/merchant/index', {
|
||||
id: coupon.voucher_store_id,
|
||||
});
|
||||
}
|
||||
},
|
||||
setViewHeight() {
|
||||
const res = uni.getSystemInfoSync();
|
||||
this.swiperHeight = res.windowHeight - (88 / 2 + 11 / 2) + 'px';
|
||||
this.swiperHeight = res.windowHeight - (100 * (res.windowWidth / 750)) + 'px';
|
||||
},
|
||||
tabsChange(index) {
|
||||
this.swiperCurrent = index;
|
||||
|
||||
@ -4,12 +4,12 @@
|
||||
<view class="item-box">
|
||||
<!-- 需求：只显示最近五十条数据 后台未作限制 -->
|
||||
<view v-for="(item, index) in historyList.slice(0, 50)" :key="index" class="history-item">
|
||||
<view class="item-title">
|
||||
<view class="item-title" @click="viewStoreDetails(item.store_id)">
|
||||
<image :src="item.store_avatar"></image>
|
||||
<view>{{ item.store_name }}</view>
|
||||
<view class="u-line-2">{{ item.store_name }}</view>
|
||||
</view>
|
||||
<image :src="item.goods_image" class="item-image"></image>
|
||||
<view class="item-info">
|
||||
<image :src="item.goods_image" class="item-image" @click="viewGoodsDetails(item.goods_id)"></image>
|
||||
<view class="item-info" @click="viewGoodsDetails(item.goods_id)">
|
||||
<view class="info-name u-line-1">{{ item.goods_name }}</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -34,6 +34,22 @@ export default {
|
||||
this.getBrowseList();
|
||||
},
|
||||
methods: {
|
||||
viewStoreDetails(sid) {
|
||||
this.$u.route({
|
||||
url: 'pageC/merchant/index',
|
||||
params: {
|
||||
id: sid,
|
||||
}
|
||||
})
|
||||
},
|
||||
viewGoodsDetails(id) {
|
||||
this.$u.route({
|
||||
url: 'pageB/sdetails/index',
|
||||
params: {
|
||||
id: id,
|
||||
}
|
||||
})
|
||||
},
|
||||
async getBrowseList () {
|
||||
const res = await this.$u.api.getBrowseList({ page: this.page });
|
||||
this.timer = false;
|
||||
|
||||
@ -44,7 +44,7 @@
|
||||
<view class="btn" v-if="item.order_status == 20" @click="sendLaundryOrderConfirm(item.laundry_id)">
|
||||
确认完成
|
||||
</view>
|
||||
<view class="btn" v-if="item.order_status == 50" @click="toComment(item.laundry_id)">
|
||||
<view class="btn" v-if="item.order_status == 50 && !item.comment" @click="toComment(item.laundry_id)">
|
||||
去评价
|
||||
</view>
|
||||
</view>
|
||||
@ -192,7 +192,7 @@ export default {
|
||||
},
|
||||
setViewHeight() {
|
||||
const res = uni.getSystemInfoSync();
|
||||
this.swiperHeight = res.windowHeight - (88 / 2) + 'px';
|
||||
this.swiperHeight = res.windowHeight - (88 * (res.windowWidth / 750)) + 'px';
|
||||
},
|
||||
toComment(id) {
|
||||
this.$u.route('/pageE/tool/washComment', {
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<view>
|
||||
<u-tabs-swiper ref="tabs" :list="list" :is-scroll="false" active-color="#FF780F" :current="current" font-size="32" :show-bar="false" @change="tabsChange" height="88"></u-tabs-swiper>
|
||||
</view>
|
||||
<swiper :current="swiperCurrent" @animationfinish="animationfinish" :style="{ minHeight: swiperHeight }">
|
||||
<swiper :current="swiperCurrent" @animationfinish="animationfinish" class="aaa" :style="{ minHeight: swiperHeight }">
|
||||
<swiper-item class="swiper-item">
|
||||
<scroll-view scroll-y="true" style="height: 100%;">
|
||||
<view class="order-info">
|
||||
@ -175,7 +175,7 @@
|
||||
<view class="checkd">
|
||||
<label class="radio-view" v-for="(item, index) in items.extend_order_goods" :key="index">
|
||||
<view class="radio">
|
||||
<u-radio color="#F0AD4E" :name="items.order_id + ' ' + item.goods_id" active-color="#FF780F" icon-size="34" shape="circle"></u-radio>
|
||||
<u-radio color="#F0AD4E" :name="items.order_id + ' ' + item.goods_id" active-color="#FF780F" icon-size="24" shape="circle"></u-radio>
|
||||
</view>
|
||||
<view class="store_info">
|
||||
<view class="info_img">
|
||||
@ -267,7 +267,7 @@ export default {
|
||||
} else {
|
||||
this.typeList = [];
|
||||
}
|
||||
console.log(this.typeList);
|
||||
// console.log(this.typeList);
|
||||
})
|
||||
},
|
||||
confirmType(e) {
|
||||
@ -388,7 +388,7 @@ export default {
|
||||
},
|
||||
radioChange(e){
|
||||
const ids = e.split(" ");
|
||||
console.log(ids)
|
||||
// console.log(ids)
|
||||
let checkedGoods = {};
|
||||
this.orderList.forEach(order => {
|
||||
if(order.order_id == ids[0]) {
|
||||
@ -438,8 +438,7 @@ export default {
|
||||
},
|
||||
setViewHeight() {
|
||||
const res = uni.getSystemInfoSync();
|
||||
// this.swiperHeight = res.windowHeight - (88 / 2) + 'px';
|
||||
this.swiperHeight = res.windowHeight + 'px';
|
||||
this.swiperHeight = res.windowHeight - (res.windowWidth / 750) * 88 + 'px';
|
||||
},
|
||||
confirm(e){
|
||||
this.showPopup = false;
|
||||
@ -467,6 +466,9 @@ export default {
|
||||
flex: 1;
|
||||
// height: 95vh;
|
||||
}
|
||||
.aaa {
|
||||
overflow-y: scroll;
|
||||
}
|
||||
.order-info {
|
||||
.choose-info{
|
||||
display: flex;flex-wrap: wrap;
|
||||
|
||||
@ -1077,10 +1077,6 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
,{
|
||||
"path" : "pageB/components/nuserinfo/nuserinfo",
|
||||
"style" : {}
|
||||
}
|
||||
],
|
||||
"tabBar": {
|
||||
"color": "#999999",
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
@getArticlelist="getArticlelist"></videoItem>
|
||||
</view>
|
||||
</view>
|
||||
<u-loadmore :status="status" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
|
||||
<u-loadmore class="load-size" color="#999999" :status="status" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
|
||||
</view>
|
||||
</scroll-view>
|
||||
</swiper-item>
|
||||
@ -79,7 +79,7 @@
|
||||
<videoItem isguanzhu="true" v-for="(item,id) in fansList" :key="id" :item="item"></videoItem>
|
||||
</view>
|
||||
<view class="no-data" v-if="!fansList.length">您还没有关注哦，赶紧去点点关注！</view>
|
||||
<u-loadmore v-else :status="status_1" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
|
||||
<u-loadmore class="load-size" v-else :status="status_1" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -198,6 +198,7 @@
|
||||
margin: 200rpx auto 0;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
</style>
|
||||
<script>
|
||||
import { mapState } from 'vuex'
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<u-avatar @click="toOtherPage('/mine/MineInfo')" :src="userInfo.member_avatar + '?' + new Date().getTime()" :size="110"></u-avatar>
|
||||
<view class="user-info">
|
||||
<view class="info-left">
|
||||
<view class="user-nickname">{{ userInfo.member_nickname }}</view>
|
||||
<view class="user-nickname u-line-1">{{ userInfo.member_nickname }}</view>
|
||||
<view class="user-medal" @click="toOtherPage('/mine/MedalIntroduction')">
|
||||
<image src="/static/image/mine/13.png"></image>
|
||||
<view class="rank-title">{{ userInfo.member_grade_name }}</view>
|
||||
@ -192,13 +192,14 @@ export default {
|
||||
.info-left {
|
||||
margin-right: 15rpx;
|
||||
.user-nickname {
|
||||
width: 100rpx;
|
||||
font-size: 30rpx;
|
||||
color: rgba(51,51,51,1);
|
||||
margin-bottom: 19rpx;
|
||||
}
|
||||
.user-medal {
|
||||
display: flex;
|
||||
width: 110rpx;
|
||||
// width: 110rpx;
|
||||
// height: 25rpx;
|
||||
background: linear-gradient(269deg,rgba(175,175,175,1) 0%,rgba(224,224,224,1) 100%);
|
||||
border-radius: 13rpx;
|
||||
|
||||
BIN
static/image/userinfo/dianzan.png
Normal file
BIN
static/image/userinfo/dianzan.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.7 KiB |
BIN
static/image/userinfo/dianzan1.png
Normal file
BIN
static/image/userinfo/dianzan1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.8 KiB |
BIN
static/image/userinfo/gouwuche.png
Normal file
BIN
static/image/userinfo/gouwuche.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.4 KiB |
BIN
static/image/userinfo/gouwuche1.png
Normal file
BIN
static/image/userinfo/gouwuche1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.9 KiB |
BIN
static/image/userinfo/pinglun.png
Normal file
BIN
static/image/userinfo/pinglun.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.0 KiB |
BIN
static/image/userinfo/pinglun1.png
Normal file
BIN
static/image/userinfo/pinglun1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.6 KiB |
BIN
static/image/userinfo/shoucang.png
Normal file
BIN
static/image/userinfo/shoucang.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.2 KiB |
BIN
static/image/userinfo/shoucang1.png
Normal file
BIN
static/image/userinfo/shoucang1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.8 KiB |
BIN
static/videoIcon.png
Normal file
BIN
static/videoIcon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 4.7 KiB |
Loading…
x
Reference in New Issue
Block a user