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

bug 8.9

Browse Source
This commit is contained in:
ghusermoon 2020-08-09 18:39:35 +08:00
parent 9631e9f827
commit 9b93b6a5a9
20 changed files with 148 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pageB/sdetails/index.vue
View File

@ -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">

2
pageC/classify/goods.vue
View File

@ -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({

7
pageC/components/merchant/image-top.vue
View File

@ -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>

5
pageC/components/merchant/list-item.vue
View File

@ -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>

2
pageC/groupBuy/index.vue
View File

@ -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';
},
}
};

2
pageC/merchant/classifyGoods.vue
View File

@ -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) {

2
pageC/merchant/goods.vue
View File

@ -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) {

68
pageC/merchant/index.vue
View File

@ -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;

29
pageE/mine/EditUserInfo.vue
View File

@ -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({

2
pageE/mine/Integral.vue
View File

@ -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)=>{

6
pageE/mine/MedalIntroduction.vue
View File

@ -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);
}
})

4
pageE/mine/MemberServe.vue
View File

@ -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({

15
pageE/mine/MemberServeCoupon.vue
View File

@ -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';
},
},
};

6
pageE/mine/MineProgress.vue
View File

@ -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;

2
pageE/tool/Manicure.vue
View File

@ -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;

18
pageE/tool/MineCoupon.vue
View File

@ -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;

24
pageE/tool/MineHistory.vue
View File

@ -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;

4
pageE/tool/SendWash.vue
View File

@ -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', {

9
pageE/tool/WashOrder.vue
View File

@ -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;

5
pages/mine/index.vue
View File

@ -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;