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

Merge pull request 'time none8.3' (#105) from zhy into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/105
This commit is contained in:
hansu 2020-08-03 21:00:41 +08:00
commit 715793414f
10 changed files with 116 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/api/user.js
View File

@ -257,6 +257,15 @@ export default {
if(msg) Object.assign(params, {msg: msg}); if(msg) Object.assign(params, {msg: msg});
return vm.$u.post('Order/buyer_cancel', params); return vm.$u.post('Order/buyer_cancel', params);
}, },
// add_refund
refundOrder({ order_id, goods_id, refund_amount, refund_type = 1 } = {}) {
return vm.$u.post('order/add_refund', {
order_id: order_id,
goods_id: goods_id,
refund_amount: refund_amount,
refund_type: refund_type,
});
},
// 删除订单 // 删除订单
deleteOrder({ order_id }) { deleteOrder({ order_id }) {
return vm.$u.post('order/order_delete', { order_id: order_id }); return vm.$u.post('order/order_delete', { order_id: order_id });

32
components/mine/collection-item/index.vue
View File

@ -3,22 +3,22 @@
<u-empty mode="list" v-if="!list.length" color="#000" img-width="200" font-size="30" margin-top="300"></u-empty> <u-empty mode="list" v-if="!list.length" color="#000" img-width="200" font-size="30" margin-top="300"></u-empty>
<u-swipe-action <u-swipe-action
v-for="(item, index) in list" :key="index" v-for="(item, index) in list" :key="index"
:index='index' :index='item.fav_id'
:show="item.show" :show="item.show"
:options="options" :options="options"
@click="removeFavorite" @click="removeFavorite"
@open="open" @open="open"
> >
<view class="item u-border-bottom"> <view class="item u-border-bottom">
<image src="@/pageE/static/mine/23.png"></image> <image :src="item.goods_image"></image>
<!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 --> <!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
<view class="title-wrap"> <view class="title-wrap">
<view class="item-top u-line-2">木糖少女小紫薯西装领连衣裙夏季新款女装夏收腰格子格纹裙子</view> <view class="item-top u-line-2">{{ item.goods_name }}</view>
<view class="item-bottom"> <view class="item-bottom">
<view class="item-price">￥99</view> <view class="item-price">￥{{ item.favlog_price }}</view>
<view class="item-date"> <view class="item-date">
<image src="@/pageE/static/mine/26.png"></image> <image src="@/pageE/static/mine/26.png"></image>
<view>2020-05-17</view> <view>{{ item.fav_time }}</view>
</view> </view>
</view> </view>
</view> </view>
@ -30,20 +30,7 @@
export default { export default {
data() { data() {
return { return {
list: [ list: [],
{
id: 1,
show: false
},
{
id: 2,
show: false
},
{
id: 3,
show: false,
}
],
show: false, show: false,
options: [ options: [
{ {
@ -61,17 +48,18 @@ export default {
methods: { methods: {
getGoodsFavoritesList() { getGoodsFavoritesList() {
this.$u.api.getFavoritesList().then(res => { this.$u.api.getFavoritesList().then(res => {
if(res.errCode == 0) {} if(res.errCode == 0) {
this.list = res.data;
}
}) })
}, },
removeFavorite(id) { removeFavorite(id) {
this.$u.api.removeFavorite({ this.$u.api.removeFavorite({
id: id id: id
}).then(res => { }).then(res => {
this.$u.toast(res.message);
if(res.errCode == 0) { if(res.errCode == 0) {
this.getGoodsFavoritesList(); this.getGoodsFavoritesList();
} else {
this.$u.toast(res.message);
} }
}) })
}, },

10
components/mine/order-item/index.vue
View File

@ -82,7 +82,17 @@ export default {
}) })
}, },
applyRefund() { applyRefund() {
let params = {
order_id: this.order.order_id,
// goods_id: goods_id,
// refund_amount: refund_amount,
}
this.$u.api.refundOrder(params).then(res => {
this.$u.toast(res.message);
if(res.errCode == 0) {
}
})
}, },
confirmReceive() { confirmReceive() {
this.$u.api.confirmReceive({ this.$u.api.confirmReceive({

2
components/shop/recommend/pintuan.vue
View File

@ -20,7 +20,7 @@
<text>￥{{ info.goods_price }}</text> <text>￥{{ info.goods_price }}</text>
</view> </view>
</view> </view>
<image class="img" :src="info.groupbuy_image1"></image> <image class="img" :src="info.pintuan_image"></image>
</view> </view>
</view> </view>
</template> </template>

2
pageE/mine/EditUserInfo.vue
View File

@ -156,7 +156,7 @@ export default {
}).then(res => { }).then(res => {
if (res.errCode == 0) { if (res.errCode == 0) {
this.getUserInfo(); this.getUserInfo();
this.$u.toast(res.message); // this.$u.toast(res.message);
} }
}) })
}, },

41
pageE/mine/MineConcerns.vue
View File

@ -1,15 +1,16 @@
<template> <template>
<view class="concerns"> <view class="concerns">
<view> <view class="concerns-container">
<view v-for="(info, index) in list" :key="index"> <view v-for="(info, index) in list" :key="index">
<view class="daren-item" @click="toDetailsPage"> <view class="daren-item" @click="toDetailsPage">
<image class="head" :src="info.member_avatar"></image> <image class="head" :src="info.friend_tomavatar"></image>
<text class="name">{{ info.member_nickname }}</text> <text class="name">{{ info.friend_tomname }}</text>
<text class="zhuangtai">状态: {{ info.live_status == 1 ? '正在直播' : '未开播' }}</text> <!-- <text class="zhuangtai">状态: {{ info.live_status == 1 ? '正在直播' : '未开播' }}</text> -->
<view class="guanzhu" @click="changeType(info.member_id)" v-if="info.is_attention == 1">关注</view> <view class="guanzhu" @click="changeType(info.friend_frommid)" v-if="info.friend_followstate == 1">关注</view>
<view class="guanzhu action" @click="changeType(info.member_id)" v-else >未关注</view> <view class="guanzhu action" @click="changeType(info.friend_frommid)" v-else>未关注</view>
</view> </view>
</view> </view>
<u-empty mode="list" v-if="!list.length" color="#000" img-width="200" font-size="30" margin-top="300"></u-empty>
</view> </view>
</view> </view>
</template> </template>
@ -17,21 +18,32 @@
export default { export default {
data() { data() {
return { return {
list: [ list: []
{
member_avatar: '',
member_nickname: '111',
live_status: 0,
member_id: 1,
is_attention: 1,
} }
] },
onShow() {
this.attentionMemberList();
},
methods: {
attentionMemberList() {
this.$u.api.attentionMemberList().then(res => {
if(res.errCode == 0) {
this.list = res.data;
} else {
this.list = [];
}
})
} }
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.concerns { .concerns {
.concerns-container {
padding: 30rpx;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
.daren-item{ .daren-item{
width: 215rpx; width: 215rpx;
height: 282rpx; height: 282rpx;
@ -75,4 +87,5 @@ export default {
} }
} }
} }
}
</style> </style>

14
pageE/mine/StoreCollection.vue
View File

@ -3,20 +3,20 @@
<u-empty mode="list" v-if="!list.length" color="#000" img-width="200" font-size="30" margin-top="300"></u-empty> <u-empty mode="list" v-if="!list.length" color="#000" img-width="200" font-size="30" margin-top="300"></u-empty>
<u-swipe-action <u-swipe-action
v-for="(item, index) in list" :key="index" v-for="(item, index) in list" :key="index"
:index='index' :index='item.favlog_id'
:show="item.show" :show="item.show"
:options="options" :options="options"
@click="removeFavorite" @click="removeFavorite"
@open="open" @open="open"
> >
<view class="item u-border-bottom"> <view class="item u-border-bottom">
<image src="@/pageE/static/mine/23.png"></image> <image :src="item.store_avatar"></image>
<!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 --> <!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
<view class="title-wrap"> <view class="title-wrap">
<view class="item-name u-line-1">胖胖定制此层wrap在此为必写的，否则可能会出现标题定位错误</view> <view class="item-name u-line-1">{{ item.store_name }}</view>
<view class="item-date"> <view class="item-date">
<image src="@/pageE/static/mine/26.png"></image> <image src="@/pageE/static/mine/26.png"></image>
<view>2020-05-17</view> <view>{{ item.fav_time | date }}</view>
</view> </view>
</view> </view>
</view> </view>
@ -48,14 +48,14 @@ export default {
type: 2 // 店铺 type: 2 type: 2 // 店铺 type: 2
}) })
}, },
removeFavorite(id = 18) { removeFavorite(id) {
console.log(id);
this.$u.api.removeFavorite({ this.$u.api.removeFavorite({
id: id id: id
}).then(res => { }).then(res => {
this.$u.toast(res.message);
if(res.errCode == 0) { if(res.errCode == 0) {
this.getStoreFavoritesList(); this.getStoreFavoritesList();
} else {
this.$u.toast(res.message);
} }
}) })
}, },

2
pageE/tool/ManicureOrder.vue
View File

@ -90,7 +90,7 @@ export default {
}, },
chooseDate(e) { chooseDate(e) {
// let time = e.year + '年' + e.month + '月' + e.day + '日' + e.hour + '时' + e.minute + '分' // let time = e.year + '年' + e.month + '月' + e.day + '日' + e.hour + '时' + e.minute + '分'
let time = e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute let time = e.year + '/' + e.month + '/' + e.day + ' ' + e.hour + ':' + e.minute
this.time = time this.time = time
}, },
showToast(message, type) { showToast(message, type) {

19
pageE/tool/WashOrder.vue
View File

@ -57,10 +57,10 @@
<view class="order-view order-area" @click="showAddress=true"> <view class="order-view order-area" @click="showAddress=true">
<view class="title">省市区:</view> <view class="title">省市区:</view>
<input type="text" v-model="area" disabled /> <input type="text" v-model="area" disabled />
<view class="location"> <!-- <view class="location">
<image src="../static/mine/28.png"></image> <image src="../static/mine/28.png"></image>
<view>定位</view> <view>定位</view>
</view> </view> -->
</view> </view>
<view class="order-view order-address"> <view class="order-view order-address">
<view class="title">详细地址:</view> <view class="title">详细地址:</view>
@ -113,10 +113,10 @@
<view class="order-view order-area" @click="showAddress=true"> <view class="order-view order-area" @click="showAddress=true">
<view class="title">省市区:</view> <view class="title">省市区:</view>
<input type="text" v-model="area" disabled /> <input type="text" v-model="area" disabled />
<view class="location"> <!-- <view class="location">
<image src="../static/mine/28.png"></image> <image src="../static/mine/28.png"></image>
<view>定位</view> <view>定位</view>
</view> </view> -->
</view> </view>
<view class="order-view order-address"> <view class="order-view order-address">
<view class="title">详细地址:</view> <view class="title">详细地址:</view>
@ -248,8 +248,8 @@ export default {
}, },
onShow() { onShow() {
this.debounce = true; this.debounce = true;
this.current = 0; // this.current = 0;
this.swiperCurrent = 0; // this.swiperCurrent = 0;
this.showPopup = false; this.showPopup = false;
this.choose = false; this.choose = false;
}, },
@ -313,7 +313,7 @@ export default {
} }
} }
if(this.current == 0) { if(this.current == 0) {
if(JSON.stringify(this.checkedGoods) != '{}') { if(JSON.stringify(this.checkedGoods) == '{}') {
this.showToast('订单不能为空', 'warning'); this.showToast('订单不能为空', 'warning');
return false; return false;
} }
@ -322,7 +322,7 @@ export default {
this.showToast('衣服状况不能为空', 'warning'); this.showToast('衣服状况不能为空', 'warning');
return false; return false;
} }
if(JSON.stringify(this.type) != '{}') { if(JSON.stringify(this.type) == '{}') {
this.showToast('商品类型不能为空', 'warning'); this.showToast('商品类型不能为空', 'warning');
return false; return false;
} }
@ -349,7 +349,7 @@ export default {
return true; return true;
}, },
confirmSend() { confirmSend() {
if(!this.validationParams) return false; if(!this.validationParams()) return false;
let params = { let params = {
tid: this.type.value, tid: this.type.value,
member_name: this.name, member_name: this.name,
@ -655,6 +655,7 @@ export default {
.radio-view { .radio-view {
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 20rpx;
.radio { .radio {
margin-right: 20rpx; margin-right: 20rpx;
} }

2
pages/mine/index.vue
View File

@ -28,7 +28,7 @@
<view>店铺收藏</view> <view>店铺收藏</view>
</view> </view>
<view @click="toOtherPage('/mine/ImageTextCollection')"> <view @click="toOtherPage('/mine/ImageTextCollection')">
<view>9</view> <view>{{ userInfo.member_fav_article_num || 0 }}</view>
<view>图文收藏</view> <view>图文收藏</view>
</view> </view>
<view @click="toOtherPage('/mine/Integral')"> <view @click="toOtherPage('/mine/Integral')">