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

z8.3

Browse Source
This commit is contained in:
ghusermoon 2020-08-03 14:34:56 +08:00
parent 7ae10c200d
commit af768bff80
11 changed files with 258 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/api/user.js
View File

@ -392,6 +392,10 @@ export default {
sendCommentList() { sendCommentList() {
return vm.$u.post('member/sendCommentList'); return vm.$u.post('member/sendCommentList');
}, },
// 发现收藏列表
articleCollectList() {
return vm.$u.post('article/articleCollectList');
},
} }
} }
} }

1
components/index/video-item/index.vue
View File

@ -233,7 +233,6 @@ export default {
uni.navigateTo({ uni.navigateTo({
url: '/pageB/photo/index?id=' + id url: '/pageB/photo/index?id=' + id
}); });
}, },
}, },
} }

43
components/mine/address-active/index.vue
View File

@ -49,6 +49,7 @@ export default {
area: '', // 详细地址 area: '', // 详细地址
area_id: '', // 地区id 省 area_id: '', // 地区id 省
city_id: '', // 城市id city_id: '', // 城市id
debounce: true,
} }
}, },
props: { props: {
@ -78,18 +79,20 @@ export default {
}, },
//　判断是不是编辑页面 调用接口 //　判断是不是编辑页面 调用接口
confirmBtn() { confirmBtn() {
if(!this.debounce) return;
this.debounce = false;
this.info ? this.editAddress() : this.addAddress(); this.info ? this.editAddress() : this.addAddress();
}, },
chooseArea() { // chooseArea() {
uni.chooseLocation({ // uni.chooseLocation({
success: function (res) { // success: function (res) {
console.log('位置名称：' + res.name); // console.log('位置名称：' + res.name);
console.log('详细地址：' + res.address); // console.log('详细地址：' + res.address);
console.log('纬度：' + res.latitude); // console.log('纬度：' + res.latitude);
console.log('经度：' + res.longitude); // console.log('经度：' + res.longitude);
} // }
}); // });
}, // },
// 验证 // 验证
validateValue() { validateValue() {
if(this.$u.test.isEmpty(this.name)) { if(this.$u.test.isEmpty(this.name)) {
@ -134,6 +137,7 @@ export default {
back: true, back: true,
}) })
} else { } else {
this.debounce = true;
this.showToast(res.message, 'warning'); this.showToast(res.message, 'warning');
} }
}) })
@ -153,20 +157,13 @@ export default {
// latitude, // latitude,
}).then((res)=>{ }).then((res)=>{
if (res.errCode == 0) { if (res.errCode == 0) {
uni.redirectTo({ this.$refs.uToast.show({
url: '/pageE/more/Address' title: res.message,
}); type: 'success',
// this.$refs.uToast.show({ back: true,
// title: res.message, })
// type: 'success',
// // url: '/pageE/more/Address',
// callback() {
// uni.redirectTo({
// url: '/pageE/more/Address'
// });
// }
// })
} else { } else {
this.debounce = true;
this.showToast(res.message, 'warning'); this.showToast(res.message, 'warning');
} }
}) })

9
pageB/triedDress/index.vue
View File

@ -12,10 +12,10 @@
<view class="area" @click="show=true"> <view class="area" @click="show=true">
<label for="address">省市区:</label> <label for="address">省市区:</label>
<input type="text" id="address" placeholder="" v-model="address" disabled /> <input type="text" id="address" placeholder="" v-model="address" disabled />
<view> <!-- <view>
<image src="/static/image/mine/24.png"></image> <image src="/static/image/mine/24.png"></image>
<text>定位</text> <text>定位</text>
</view> </view> -->
</view> </view>
<view> <view>
<label for="area">详细地址:</label> <label for="area">详细地址:</label>
@ -78,6 +78,7 @@ export default {
minute: true, minute: true,
second: false second: false
}, },
debounce: true,
} }
}, },
mounted() { mounted() {
@ -127,7 +128,9 @@ export default {
this.time = time; this.time = time;
}, },
confirmBtn() { confirmBtn() {
if(!this.debounce) return;
if(!this.verification()) return false; if(!this.verification()) return false;
this.debounce = false;
this.$u.api.saveGoodsTry({ this.$u.api.saveGoodsTry({
member_name: this.name, member_name: this.name,
member_mobile: this.phone, member_mobile: this.phone,
@ -139,7 +142,6 @@ export default {
appointment_time: new Date(this.time), appointment_time: new Date(this.time),
}).then(res => { }).then(res => {
if (res.errCode == 0) { if (res.errCode == 0) {
// this.$u.route({ type: 'navigateBack' });
this.$refs.uToast.show({ this.$refs.uToast.show({
title: res.message, title: res.message,
back: true, back: true,
@ -149,6 +151,7 @@ export default {
title: res.message, title: res.message,
type: 'error', type: 'error',
}) })
this.debounce = true;
} }
}) })
}, },

8
pageC/cart/index.vue
View File

@ -54,6 +54,7 @@ export default {
checkedAll: false, checkedAll: false,
checkedGoods: [], checkedGoods: [],
totalPrice: '0.00', totalPrice: '0.00',
debounce: true,
} }
}, },
watch: { watch: {
@ -74,9 +75,11 @@ export default {
} }
}, },
onPullDownRefresh() { onPullDownRefresh() {
this.debounce = true;
this.getCartList(); this.getCartList();
}, },
onShow() { onShow() {
this.debounce = true;
this.getCartList(); this.getCartList();
}, },
methods: { methods: {
@ -91,6 +94,8 @@ export default {
}, },
// 结算 // 结算
settlementOrder() { settlementOrder() {
if(!this.debounce) return;
this.debounce = false;
if(!this.checkedGoods.length) return false; if(!this.checkedGoods.length) return false;
// 拼接后端需要的数据形式 // 拼接后端需要的数据形式
let id = [], temp = ''; let id = [], temp = '';
@ -108,6 +113,9 @@ export default {
this.$u.route({ this.$u.route({
url: '/pageC/cart/ConfirmOrder' url: '/pageC/cart/ConfirmOrder'
}) })
} else {
this.$u.toast(res.message);
this.debounce = true;
} }
}) })
}, },

218
pageE/mine/ImageTextCollection.vue
View File

@ -1,18 +1,78 @@
<template> <template>
<view class="collection"> <view class="collection">
<view class="item-box" v-for="(item, index) in 5" :key="index"> <view class="item-box" v-for="(item, index) in articleList" :key="index">
<videoItem></videoItem> <view class="video-item" v-if="item">
<image class="head" :src="item.article_pic" v-if="item.type == 1"></image>
<view class="header_fist" v-else>
<view class="backes"></view>
<image class="head" :src="item.article_pic" @click="toDetailsPage(item.article_id)"></image>
</view>
<view class="title">{{ item.article_title }}</view>
<view class="jianjie">{{ item.article_content }}</view>
<view class="user">
<view class="info">
<image :src="item.member_avatar"></image>
<text>{{ item.member_nickname }}</text>
</view>
<u-icon name="trash" color="#333" size="36" @click="delArticle(item.article_id)"></u-icon>
<!-- <image src="/static/image/common/4.png" @click.stop="showAction(item)"></image> -->
<!-- <view class="action" v-if="show == item.article_id">
<view class="bubble">
<view @click.stop="delArticle(item.article_id)">
<image src="/static/image/common/8.png"></image>
<text>删除</text>
</view>
</view>
</view> -->
<view class="layer" v-if="show == item.article_id" @click.stop="show=-1"></view>
</view>
</view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import videoItem from "@/components/index/video-item/index"
export default { export default {
data() { data() {
return {} return {
show: -1,
articleList: [],
}
}, },
components: { onShow() {
videoItem this.articleCollectList();
},
// 下拉刷新
onPullDownRefresh() {
this.articleCollectList();
},
methods: {
showAction(item) {
this.show = this.show > 0 ? -1 : item.article_id;
},
articleCollectList() {
this.$u.api.articleCollectList().then(res => {
uni.stopPullDownRefresh();
if(res.errCode == 0) {
this.articleList = res.data;
} else {
this.articleList = [];
}
})
},
delArticle(id) {
this.$u.api.articleCollect({ article_id: id }).then(res => {
if(res.errCode == 0) {
this.articleCollectList();
} else {
this.$u.toast(res.message);
}
})
},
toDetailsPage(id) {
uni.navigateTo({
url: '/pageB/photo/index?id=' + id
});
},
} }
}; };
</script> </script>
@ -26,6 +86,152 @@ export default {
&:not(:nth-child(2n)) { &:not(:nth-child(2n)) {
margin-right: 20rpx; margin-right: 20rpx;
} }
.video-item{
height: 540rpx;
margin-top: 20rpx;
width: 335rpx;
box-shadow:0 3rpx 7rpx 0 rgba(153, 153, 153, 0.35);
padding-bottom: 20rpx;
border-radius: 20rpx;
overflow: hidden;
.head{
width: 100%;
height: 334rpx;
}
.title{
margin:0 auto;
margin-top: 20rpx;
font-size: 22rpx;
color: #333;
font-weight: 500;
line-height: 30rpx;
width: 300rpx;
overflow:hidden;
text-overflow:ellipsis;
display:-webkit-box;
-webkit-box-orient:vertical;
-webkit-line-clamp:2;
}
.jianjie{
height: 60rpx;
margin:0 auto;
margin-top: 20rpx;
font-size: 22rpx;
color: #666;
line-height: 30rpx;
width: 300rpx;
margin-left: 18rpx;
overflow:hidden;
text-overflow:ellipsis;
display:-webkit-box;
-webkit-box-orient:vertical;
-webkit-line-clamp:2;
}
.user{
display: flex;
justify-content: space-between;
align-items: center;
margin:0 auto;
margin-top: 20rpx;
width: 300rpx;
position: relative;
.info {
display: flex;
align-items: center;
>image{
width: 38rpx;
height: 38rpx;
border-radius: 50%;
}
>text{
font-size: 20rpx;
color:#333;
margin-left: 9rpx;
}
}
>image{
width: 37rpx;
height: 8rpx;
}
.action {
z-index: 19;
position: absolute;
right: 0rpx;
bottom: 55rpx;
// width: 234rpx;
background: rgba(255,255,255,1);
box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12);
border-radius: 6rpx;
.bubble {
position: relative;
background-color: #fff;
&::after {
position: absolute;
right: 10rpx;
bottom: 0;
content: '';
width: 60rpx;
height: 40rpx;
background-color: inherit;
transform: rotate(45deg);
margin-top: -10rpx;
z-index: -1;
box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12);
}
> view {
padding: 9rpx 12rpx;
display: flex;
align-items: center;
&:not(:last-child) {
border-bottom: 2rpx #ECECEC solid;
}
@mixin image-class($width, $height, $right) {
width: $width;
height: $height;
margin-right: $right;
}
> image {
&:first-child {
@include image-class($width: 21rpx, $height: 22rpx, $right: 12rpx);
}
&:nth-child(2) {
@include image-class($width: 22rpx, $height: 22rpx, $right: 12rpx);
}
&:last-child {
@include image-class($width: 24rpx, $height: 20rpx, $right: 9rpx);
}
}
> text {
font-size: 20rpx;
color: rgba(51,51,51,1);
}
}
}
}
.layer {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: 9;
background-color: transparent;
}
}
.header_fist{
position: relative;
.backes{
position: absolute;
top: 0;
background: rgba(0,0,0,0.6);
width: 100%;
height: 100%;
color: #fff;
}
}
}
} }
} }
</style> </style>

4
pageE/more/AfterSalesHelp.vue
View File

@ -18,12 +18,16 @@ export default {
onLoad() { onLoad() {
this.getPolicyList(); this.getPolicyList();
}, },
onPullDownRefresh() {
this.getPolicyList();
},
methods: { methods: {
getPolicyList () { getPolicyList () {
this.$u.api.getUseHelpList({ this.$u.api.getUseHelpList({
page: this.page, page: this.page,
tid: 2 // 1:使用帮助列表 2: 售后政策列表 tid: 2 // 1:使用帮助列表 2: 售后政策列表
}).then((res)=>{ }).then((res)=>{
uni.stopPullDownRefresh();
if (res.errCode == 0) { if (res.errCode == 0) {
this.policyList = res.data.helpList; this.policyList = res.data.helpList;
} }

2
pageE/tool/Manicure.vue
View File

@ -96,7 +96,7 @@ export default {
}, },
tabsChange(index) { tabsChange(index) {
this.swiperCurrent = index; this.swiperCurrent = index;
this.toApplyPage(index); // this.toApplyPage(index);
}, },
animationfinish(e) { animationfinish(e) {
let current = e.detail.current; let current = e.detail.current;

1
pages.json
View File

@ -706,6 +706,7 @@
{ {
"path": "mine/ImageTextCollection", "path": "mine/ImageTextCollection",
"style": { "style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "图文收藏", "navigationBarTitleText": "图文收藏",
"app-plus": { "app-plus": {
"titleSize": "36px", "titleSize": "36px",

2
pages/mine/index.vue
View File

@ -158,10 +158,10 @@ export default {
methods: { methods: {
getUserInfo() { getUserInfo() {
this.$u.api.getMemberInfo().then(res => { this.$u.api.getMemberInfo().then(res => {
uni.stopPullDownRefresh();
if (res.errCode == 0) { if (res.errCode == 0) {
// this.userInfo = res.data.MemberArray; // this.userInfo = res.data.MemberArray;
this.$set(this, 'userInfo', res.data.MemberArray); this.$set(this, 'userInfo', res.data.MemberArray);
uni.stopPullDownRefresh();
} }
}) })
}, },

2
static/js/common.js
View File

@ -66,6 +66,6 @@ const common = {
if(format) result = hours + format + minutes + format + seconds; if(format) result = hours + format + minutes + format + seconds;
else result = hours + ':' + minutes + ':' + seconds; else result = hours + ':' + minutes + ':' + seconds;
return result; return result;
} },
} }
export default common export default common