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

fixed bug

Browse Source
This commit is contained in:
cmxdd 2020-08-06 17:02:11 +08:00
parent 6ec2318d0c
commit 71a25fd11d
13 changed files with 55 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/order-item/index.vue
View File

@ -12,12 +12,13 @@
<view class="status" v-else-if="info.view_type==3">已完成订单</view> <view class="status" v-else-if="info.view_type==3">已完成订单</view>
<view class="status" v-else-if="info.view_type==4">申请退款</view> <view class="status" v-else-if="info.view_type==4">申请退款</view>
<view class="status" v-else-if="info.view_type==5">已退款订单</view> <view class="status" v-else-if="info.view_type==5">已退款订单</view>
<view class="status" v-else-if="info.view_type==6">拒绝退款</view> <view class="status" v-else-if="info.view_type==6">商家同意</view>
<view class="status" v-else-if="info.view_type==7">商家拒绝</view>
</view> </view>
<view class="name u-line-1">{{info.extend_order_goods[0].goods_name}}</view> <view class="name u-line-1">{{info.extend_order_goods[0].goods_name}}</view>
<view class="info"> <view class="info">
<view class="num">共{{info.extend_order_goods[0].goods_num}}件商品</view> <view class="num">共{{info.count_number}}件商品</view>
<view class="price">实付<span>￥{{info.goods_amount}}</span></view> <view class="price">实付<span>￥{{info.order_amount}}</span></view>
</view> </view>
</view> </view>
</view> </view>

14
pages.json
View File

@ -257,7 +257,7 @@
}, },
"tabBar": { "tabBar": {
"color": "#7A7E83", "color": "#7A7E83",
"selectedColor": "#3cc51f", "selectedColor": "#FF780F",
"borderStyle": "black", "borderStyle": "black",
"backgroundColor": "#ffffff", "backgroundColor": "#ffffff",
"height": "50px", "height": "50px",
@ -265,20 +265,20 @@
"spacing": "3px", "spacing": "3px",
"list": [{ "list": [{
"pagePath": "pages/index/index", "pagePath": "pages/index/index",
"iconPath": "", "iconPath": "static/image/tabbar/index.png",
"selectedIconPath": "", "selectedIconPath": "static/image/tabbar/indexselect.png",
"text": "首页", "text": "首页",
"selectedColor": "#FBFBFB" "selectedColor": "#FBFBFB"
}, { }, {
"pagePath": "pages/messages/messagesList", "pagePath": "pages/messages/messagesList",
"iconPath": "", "iconPath": "static/image/tabbar/info.png",
"selectedIconPath": "", "selectedIconPath": "static/image/tabbar/infoselect.png",
"text": "消息", "text": "消息",
"selectedColor": "#FBFBFB" "selectedColor": "#FBFBFB"
}, { }, {
"pagePath": "pages/user/index", "pagePath": "pages/user/index",
"iconPath": "", "iconPath": "static/image/tabbar/mine.png",
"selectedIconPath": "", "selectedIconPath": "static/image/tabbar/mineselect.png",
"text": "我的", "text": "我的",
"selectedColor": "#FBFBFB" "selectedColor": "#FBFBFB"
}] }]

30
pages/index/details.vue
View File

@ -28,8 +28,8 @@
</view> </view>
</view> </view>
</view> </view>
<u-radio :name="list.refund_id" shape="circle" @change="radioGroupChange"> <u-radio :name="list.refund_id" v-if="type==4" shape="circle" @change="radioGroupChange">
</u-radio> </u-radio >
</view> </view>
</u-radio-group> </u-radio-group>
<!-- 待处理 --> <!-- 待处理 -->
@ -52,7 +52,7 @@
</view> </view>
<!-- 待处理之后的 --> <!-- 待处理之后的 -->
<view class="refunds-title" v-if="type!=1">收件人信息</view> <view class="refunds-title" v-if="type!=1">收件人信息</view>
<view class="refunds-user" v-if="type == 2 || type == 3 || type == 4 || type == 5 || type == 6"> <view class="refunds-user" v-if="type == 2 || type == 3 || type == 4 || type == 5 || type == 6|| type == 7">
<view> <view>
<image src="/static/image/home/2.png"></image> <image src="/static/image/home/2.png"></image>
<view>{{ info.extend_order_common.reciver_name }}</view> <view>{{ info.extend_order_common.reciver_name }}</view>
@ -92,7 +92,9 @@
<view :class="{ active: cur == 1 }" @click="refuse">确定处理</view> <view :class="{ active: cur == 1 }" @click="refuse">确定处理</view>
</view> </view>
<!-- 同意退款/拒绝退款 --> <!-- 同意退款/拒绝退款 -->
<view class="refund" v-if="type == 5 || type == 6">退款状态:{{ type == 5 ? '同意退款，请注意查收！' : '拒绝退款，请等待客服联系！' }}</view> <view class="refund" v-if="type == 5 ">退款状态:同意退款，请注意查收！</view>
<view class="refund" v-if="type == 6 ">退款状态:商家同意退款，等待后台处理！</view>
<view class="refund" v-if="type == 7 ">退款状态:商家拒绝退款，请等待客服联系！</view>
<u-popup v-model="showDelivery" mode="center" border-radius="10" class="delivery-popup"> <u-popup v-model="showDelivery" mode="center" border-radius="10" class="delivery-popup">
<view class="title">骑手信息</view> <view class="title">骑手信息</view>
<view class="input-info"> <view class="input-info">
@ -287,25 +289,6 @@ export default {
this.cur = 0; this.cur = 0;
this.showRefunds = true; this.showRefunds = true;
}, },
// 获取物流信息
getcarinfo() {
this.$u.api.getpushinfo({
order_id: this.orderid
}).then(res => {
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
this.$refs.uToast.show({
title: res.message,
type: 'success'
});
console.log(res);
}
});
},
// 选择快递公司 // 选择快递公司
getselectcompany(e) { getselectcompany(e) {
let obj = this.companylist[e[0]]; let obj = this.companylist[e[0]];
@ -405,6 +388,7 @@ export default {
background-color: #ececec; background-color: #ececec;
.goods-info { .goods-info {
background-color: #ffffff; background-color: #ffffff;
width: 750rpx;
padding: 30rpx; padding: 30rpx;
display: flex; display: flex;
align-items: center; align-items: center;

21
pages/index/index.vue
View File

@ -50,10 +50,14 @@
</view> </view>
</view> </view>
<view v-else-if="current == 5"> <view v-else-if="current == 5">
<view v-for="(item, index) in finshlist" :key="index"><OrderItem :cur="current"></OrderItem></view> <view v-for="(item, index) in finshlist" :key="index">
<OrderItem :info="item"></OrderItem>
</view>
</view> </view>
<view v-else-if="current == 6"> <view v-else-if="current == 6">
<view v-for="(item, index) in badlist" :key="index"><OrderItem :cur="current"></OrderItem></view> <view v-for="(item, index) in badlist" :key="index">
<OrderItem :info="item"></OrderItem>
</view>
</view> </view>
<view class="release-btn" @click="publish"> <view class="release-btn" @click="publish">
<image src="../../static/image/index/publish.png"></image> <image src="../../static/image/index/publish.png"></image>
@ -150,15 +154,11 @@ export default {
this.getswiper(); this.getswiper();
// 获取可投诉列表 // 获取可投诉列表
this.getcarlist(); this.getcarlist();
// 所有订单
this.getallorder(0);
// 订单状态： 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货 // 订单状态： 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货
}, },
onShow() { onShow() {
this.num=1
this.current=0
// 初始化数据
this.resetarr()
// 所有订单
this.getallorder(0);
this.publishstate = false; this.publishstate = false;
}, },
onReachBottom() { onReachBottom() {
@ -198,7 +198,7 @@ export default {
this.getallorder(3); this.getallorder(3);
} else if (current == 6) { } else if (current == 6) {
// 退货订单 // 退货订单
this.getallorder(5); this.getallorder(4);
} }
}, },
// 关闭发布弹窗 // 关闭发布弹窗
@ -371,9 +371,6 @@ export default {
this.current = index; this.current = index;
this.num = 1; this.num = 1;
this.resetarr(); this.resetarr();
if (index == 6) {
this.getallorder(4);
}
this.reset(); this.reset();
}, },
// 发布内容跳转页面 // 发布内容跳转页面

25
pages/release/index.vue
View File

@ -46,10 +46,10 @@
<view class="title"><text>选择商品</text></view> <view class="title"><text>选择商品</text></view>
<!-- 商品列表 --> <!-- 商品列表 -->
<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll"> <scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll">
<view class="listes_shoping" v-for="(item, index) in list" :key="index"> <view class="listes_shoping" v-for="(item, index) in list" :key="index" @click="checkboxChange(item.goods_id)">
<view> <view>
<u-checkbox-group> <u-checkbox-group>
<u-checkbox @change="checkboxChange" shape="circle" active-color="#FF780F" v-model="item.checked" :name="item.goods_id"></u-checkbox> <u-checkbox shape="circle" active-color="#FF780F" v-model="item.checked" :disabled="true"></u-checkbox>
</u-checkbox-group> </u-checkbox-group>
</view> </view>
<view><image :src="item.goods_image" mode="widthFix"></image></view> <view><image :src="item.goods_image" mode="widthFix"></image></view>
@ -164,7 +164,7 @@ export default {
}); });
}, },
// 获取商品数组变化 // 获取商品数组变化
getshoplist() { getshoplist(id) {
let arr = this.arres_list; let arr = this.arres_list;
let newarr = this.list; let newarr = this.list;
this.shoplist = []; this.shoplist = [];
@ -246,11 +246,16 @@ export default {
}, },
// 选中某个复选框时，由checkbox时触发 // 选中某个复选框时，由checkbox时触发
checkboxChange(e) { checkboxChange(e) {
let id = e.name; let id = e;
if (e.value == true) { for(let num in this.list){
this.pushes(id); if(id==this.list[num].goods_id){
} else { if(this.list[num].checked==true){
this.delarr(id); this.delarr(id);
}else{
this.pushes(id);
}
this.list[num].checked = !this.list[num].checked
}
} }
}, },
// 删除直播商品 // 删除直播商品
@ -261,7 +266,7 @@ export default {
} else { } else {
let index = that.arres_list.indexOf(id); let index = that.arres_list.indexOf(id);
that.arres_list.splice(index, 1); that.arres_list.splice(index, 1);
that.getshoplist(); that.getshoplist(id);
} }
}, },
// 增加直播商品 // 增加直播商品
@ -271,7 +276,7 @@ export default {
console.log('为空'); console.log('为空');
} else { } else {
that.arres_list.push(id); that.arres_list.push(id);
that.getshoplist(); that.getshoplist(id);
} }
}, },
tosign() { tosign() {

18
pages/release/video.vue
View File

@ -37,10 +37,10 @@
<view class="title"><text>选择商品</text></view> <view class="title"><text>选择商品</text></view>
<!-- 商品列表 --> <!-- 商品列表 -->
<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll"> <scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll">
<view class="listes_shoping" v-for="(item, index) in list" :key="index"> <view class="listes_shoping" v-for="(item, index) in list" :key="index" @click="checkboxChange(item.goods_id)">
<view> <view>
<u-checkbox-group> <u-checkbox-group>
<u-checkbox @change="checkboxChange" shape="circle" active-color="#FF780F" v-model="item.checked" :name="item.goods_id"></u-checkbox> <u-checkbox shape="circle" active-color="#FF780F" v-model="item.checked" :disabled="true" ></u-checkbox>
</u-checkbox-group> </u-checkbox-group>
</view> </view>
<view><image :src="item.goods_image" mode="widthFix"></image></view> <view><image :src="item.goods_image" mode="widthFix"></image></view>
@ -270,11 +270,15 @@ export default {
}, },
// 选中某个复选框时，由checkbox时触发 // 选中某个复选框时，由checkbox时触发
checkboxChange(e) { checkboxChange(e) {
let id = e.name; for(let num in this.list){
if (e.value == true) { if(id==this.list[num].goods_id){
this.pushes(id); if(this.list[num].checked==true){
} else { this.delarr(id);
this.delarr(id); }else{
this.pushes(id);
}
this.list[num].checked = !this.list[num].checked
}
} }
}, },
// 删除直播商品 // 删除直播商品

2
pages/user/index.vue
View File

@ -35,6 +35,8 @@ export default {
} }
}, },
onLoad() { onLoad() {
},
onShow() {
this.getmyinfo() this.getmyinfo()
}, },
methods: { methods: {

BIN
static/image/tabbar/index.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 805 B

BIN
static/image/tabbar/indexselect.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 774 B

BIN
static/image/tabbar/info.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 841 B

BIN
static/image/tabbar/infoselect.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 753 B

BIN
static/image/tabbar/mine.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 761 B

BIN
static/image/tabbar/mineselect.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 705 B