Merge pull request 'cmx' (#29) from cmx into master
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/29
This commit is contained in:
commit
795726bdb8
@ -86,8 +86,8 @@ const install = (Vue, vm) => {
|
||||
return vm.$u.post("/article/articleInfo",{article_id})
|
||||
},
|
||||
// 回复评论
|
||||
reply({article_id,pid,content}){
|
||||
return vm.$u.post("/article/articleAddComment",{article_id,pid,content})
|
||||
reply({article_id,pid,content,reply_id}){
|
||||
return vm.$u.post("/article/articleAddComment",{article_id,pid,content,reply_id})
|
||||
},
|
||||
// 达人是否可以直播
|
||||
canlive(){
|
||||
|
||||
@ -10,14 +10,15 @@
|
||||
<view class="status" v-if="info.view_type==1">待处理订单</view>
|
||||
<view class="status" v-else-if="info.view_type==2">已发货订单</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==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 class="name u-line-1">{{info.extend_order_goods[0].goods_name}}</view>
|
||||
<view class="info">
|
||||
<view class="num">共{{info.extend_order_goods[0].goods_num}}件商品</view>
|
||||
<view class="price">实付<span>￥{{info.extend_order_goods[0].goods_pay_price}}</span></view>
|
||||
<view class="num">共{{info.count_number}}件商品</view>
|
||||
<view class="price">实付<span>￥{{info.order_amount}}</span></view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
15
pages.json
15
pages.json
@ -266,29 +266,28 @@
|
||||
},
|
||||
"tabBar": {
|
||||
"color": "#7A7E83",
|
||||
"selectedColor": "#3cc51f",
|
||||
"selectedColor": "#FF780F",
|
||||
"borderStyle": "black",
|
||||
"backgroundColor": "#ffffff",
|
||||
"height": "50px",
|
||||
"fontSize": "10px",
|
||||
"iconWidth": "24px",
|
||||
"spacing": "3px",
|
||||
"list": [{
|
||||
"pagePath": "pages/index/index",
|
||||
"iconPath": "",
|
||||
"selectedIconPath": "",
|
||||
"iconPath": "static/image/tabbar/index.png",
|
||||
"selectedIconPath": "static/image/tabbar/indexselect.png",
|
||||
"text": "首页",
|
||||
"selectedColor": "#FBFBFB"
|
||||
}, {
|
||||
"pagePath": "pages/messages/messagesList",
|
||||
"iconPath": "",
|
||||
"selectedIconPath": "",
|
||||
"iconPath": "static/image/tabbar/info.png",
|
||||
"selectedIconPath": "static/image/tabbar/infoselect.png",
|
||||
"text": "消息",
|
||||
"selectedColor": "#FBFBFB"
|
||||
}, {
|
||||
"pagePath": "pages/user/index",
|
||||
"iconPath": "",
|
||||
"selectedIconPath": "",
|
||||
"iconPath": "static/image/tabbar/mine.png",
|
||||
"selectedIconPath": "static/image/tabbar/mineselect.png",
|
||||
"text": "我的",
|
||||
"selectedColor": "#FBFBFB"
|
||||
}]
|
||||
|
||||
@ -1,32 +1,38 @@
|
||||
<template>
|
||||
<view class="details">
|
||||
<view class="goods-info">
|
||||
<image :src="info.extend_order_goods[0].goods_image"></image>
|
||||
<view class="box" v-if="type<4">
|
||||
<view class="goods-info" v-for="list in info.extend_order_goods">
|
||||
<image :src="list.goods_image"></image>
|
||||
<view class="info-right">
|
||||
<view class="name u-line-1">{{ info.extend_order_goods[0].goods_name }}</view>
|
||||
<view class="name u-line-1">{{ list.goods_name }}</view>
|
||||
<view class="info">
|
||||
<view class="num">共{{ info.extend_order_goods[0].goods_num }}件商品</view>
|
||||
<view class="num">共{{ list.goods_num }}件商品</view>
|
||||
<view class="price">
|
||||
实付
|
||||
<span>￥{{ info.extend_order_goods[0].goods_pay_price }}</span>
|
||||
<span>￥{{ list.goods_pay_price }}</span>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="refunds-user" v-if="type == 2 || type == 3 || type == 4 || type == 5 || type == 6">
|
||||
<view>
|
||||
<image src="/static/image/home/2.png"></image>
|
||||
<view>{{ info.extend_order_common.reciver_name }}</view>
|
||||
</view>
|
||||
<view>
|
||||
<image src="/static/image/home/3.png"></image>
|
||||
<view>{{ info.extend_order_common.reciver_info.mob_phone }}</view>
|
||||
</view>
|
||||
<view>
|
||||
<image src="/static/image/home/4.png"></image>
|
||||
<view class="address u-line-1">{{ info.extend_order_common.reciver_info.address }}</view>
|
||||
<u-radio-group class="box" v-model="value" v-if="type>3">
|
||||
<view class="goods-info" v-for="list in info.refund_list">
|
||||
<image :src="list.goods_image"></image>
|
||||
<view class="info-right">
|
||||
<view class="name u-line-1">{{ list.goods_name }}</view>
|
||||
<view class="info">
|
||||
<view class="num">共{{ list.goods_num }}件商品</view>
|
||||
<view class="price">
|
||||
实付
|
||||
<span>￥{{ list.refund_amount }}</span>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<u-radio :name="list.refund_id" v-if="type==4" shape="circle" @change="radioGroupChange">
|
||||
</u-radio >
|
||||
</view>
|
||||
</u-radio-group>
|
||||
<!-- 待处理 -->
|
||||
<view class="user-info" v-if="type == 1">
|
||||
<view class="info-title">收件人信息</view>
|
||||
<view class="info-container">
|
||||
@ -44,6 +50,24 @@
|
||||
</view>
|
||||
</view>
|
||||
</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|| type == 7">
|
||||
<view>
|
||||
<image src="/static/image/home/2.png"></image>
|
||||
<view>{{ info.extend_order_common.reciver_name }}</view>
|
||||
<image src="/static/image/home/chat.png" @click="tochat(info.buyer_id)"></image>
|
||||
</view>
|
||||
<view>
|
||||
<image src="/static/image/home/3.png"></image>
|
||||
<view>{{ info.extend_order_common.reciver_info.mob_phone }}</view>
|
||||
</view>
|
||||
<view>
|
||||
<image src="/static/image/home/4.png"></image>
|
||||
<view class="address u-line-1">{{ info.extend_order_common.reciver_info.address }}</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 待处理 -->
|
||||
<view class="delivery" v-if="type == 1">
|
||||
<view class="title">派送方式</view>
|
||||
<view class="methods">
|
||||
@ -52,6 +76,7 @@
|
||||
</view>
|
||||
<view class="btn" @click="confirmpushstyle">确认</view>
|
||||
</view>
|
||||
<!-- 已发货 -->
|
||||
<view class="pushtimeline" v-if="type == 2">
|
||||
<view class="timelinetitle">物流信息</view>
|
||||
<view class="timelineid">订单单号:{{ info.order_sn }}</view>
|
||||
@ -60,11 +85,16 @@
|
||||
<view class="timelinetime">{{list.kd_time}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 已完成 -->
|
||||
<!-- 退款处理 -->
|
||||
<view class="refunds-option" v-if="type == 4">
|
||||
<view :class="{ active: cur == 0 }" @click="unrefuse">不处理</view>
|
||||
<view :class="{ active: cur == 1 }" @click="refuse">确定处理</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">
|
||||
<view class="title">骑手信息</view>
|
||||
<view class="input-info">
|
||||
@ -128,29 +158,51 @@ export default {
|
||||
express: '',
|
||||
type: '',
|
||||
orderid: 0,
|
||||
info: {},
|
||||
info: {
|
||||
extend_order_goods:[{}],
|
||||
extend_order_common:{
|
||||
reciver_info:{
|
||||
mob_phone:"",
|
||||
address:""
|
||||
},
|
||||
receive_name:""
|
||||
}
|
||||
},
|
||||
list: [],
|
||||
pushid: null,
|
||||
pushstate: false, //显示物流单号
|
||||
selctcar: null, //骑手信息
|
||||
companyidA: null, //物流派送公司id
|
||||
companyidB: null //骑手派送公司id
|
||||
companyidB: null, //骑手派送公司id
|
||||
value:"",
|
||||
refundid:null
|
||||
};
|
||||
},
|
||||
onLoad(option) {
|
||||
this.type = option.type;
|
||||
console.log(this.type)
|
||||
this.orderid = option.id;
|
||||
this.resetinfo();
|
||||
if (this.type == 1) {
|
||||
// 获取快递公司
|
||||
this.getcompanyinfo();
|
||||
}
|
||||
if (this.type == 2) {
|
||||
// 获取物流信息
|
||||
this.getcarinfo();
|
||||
}
|
||||
|
||||
// 订单状态： 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货
|
||||
},
|
||||
methods: {
|
||||
// 跳转详情页面
|
||||
tochat(ID){
|
||||
console.log(ID)
|
||||
},
|
||||
// 退款单选
|
||||
radioGroupChange(e) {
|
||||
this.refundid = e
|
||||
console.log(e);
|
||||
},
|
||||
// 人工配送
|
||||
pushstyleA() {
|
||||
this.cur = 0;
|
||||
@ -181,9 +233,8 @@ export default {
|
||||
this.showRefunds = false;
|
||||
if (this.cur == 0) {
|
||||
// 确定退款
|
||||
return;
|
||||
this.$u.api.refund({
|
||||
refund_id: this.orderid,
|
||||
refund_id: this.refundid,
|
||||
seller_state:2,
|
||||
seller_message:""
|
||||
}).then(res => {
|
||||
@ -197,14 +248,16 @@ export default {
|
||||
title: res.message,
|
||||
type: 'success'
|
||||
});
|
||||
uni.navigateBack({
|
||||
delta: 1
|
||||
});
|
||||
console.log(res);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
// 不进行退款
|
||||
return;
|
||||
this.$u.api.refund({
|
||||
refund_id: this.orderid,
|
||||
refund_id: this.refundid,
|
||||
seller_state:3,
|
||||
seller_message:""
|
||||
}).then(res => {
|
||||
@ -218,6 +271,9 @@ export default {
|
||||
title: res.message,
|
||||
type: 'success'
|
||||
});
|
||||
uni.navigateBack({
|
||||
delta: 1
|
||||
});
|
||||
console.log(res);
|
||||
}
|
||||
});
|
||||
@ -233,25 +289,6 @@ export default {
|
||||
this.cur = 0;
|
||||
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) {
|
||||
let obj = this.companylist[e[0]];
|
||||
@ -298,6 +335,9 @@ export default {
|
||||
title: res.message,
|
||||
type: 'success'
|
||||
});
|
||||
uni.navigateBack({
|
||||
delta: 1
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -348,6 +388,7 @@ export default {
|
||||
background-color: #ececec;
|
||||
.goods-info {
|
||||
background-color: #ffffff;
|
||||
width: 750rpx;
|
||||
padding: 30rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@ -381,6 +422,13 @@ export default {
|
||||
}
|
||||
}
|
||||
}
|
||||
.refunds-title{
|
||||
padding: 25rpx 30rpx;
|
||||
font-weight: 500;
|
||||
color: #333333;
|
||||
background-color: #ffffff;
|
||||
border-bottom: 2rpx solid #ececec;
|
||||
}
|
||||
.refunds-user {
|
||||
padding: 25rpx 30rpx;
|
||||
background-color: #ffffff;
|
||||
@ -388,6 +436,7 @@ export default {
|
||||
> view {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 30rpx;
|
||||
@mixin image-class($width, $right) {
|
||||
> image {
|
||||
@ -409,6 +458,7 @@ export default {
|
||||
@include image-class($width: 36rpx, $right: 22rpx);
|
||||
}
|
||||
> view {
|
||||
flex: 1;
|
||||
font-size: 26rpx;
|
||||
color: rgba(51, 51, 51, 1);
|
||||
}
|
||||
|
||||
@ -50,10 +50,14 @@
|
||||
</view>
|
||||
</view>
|
||||
<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 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 class="release-btn" @click="publish">
|
||||
<image src="../../static/image/index/publish.png"></image>
|
||||
@ -150,6 +154,8 @@ export default {
|
||||
this.getswiper();
|
||||
// 获取可投诉列表
|
||||
this.getcarlist();
|
||||
// 所有订单
|
||||
this.getallorder(0);
|
||||
const user = uni.getStorageSync('userinfo');
|
||||
console.log(user)
|
||||
this.imService.login(user.userId,user.member_avatar,"")
|
||||
@ -157,11 +163,6 @@ export default {
|
||||
// 订单状态： 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货
|
||||
},
|
||||
onShow() {
|
||||
this.current=0
|
||||
// 初始化数据
|
||||
this.resetarr()
|
||||
// 所有订单
|
||||
this.getallorder(0);
|
||||
this.publishstate = false;
|
||||
},
|
||||
onReachBottom() {
|
||||
@ -201,7 +202,7 @@ export default {
|
||||
this.getallorder(3);
|
||||
} else if (current == 6) {
|
||||
// 退货订单
|
||||
this.getallorder(5);
|
||||
this.getallorder(4);
|
||||
}
|
||||
},
|
||||
// 关闭发布弹窗
|
||||
@ -374,9 +375,6 @@ export default {
|
||||
this.current = index;
|
||||
this.num = 1;
|
||||
this.resetarr();
|
||||
if (index == 6) {
|
||||
this.getallorder(4);
|
||||
}
|
||||
this.reset();
|
||||
},
|
||||
// 发布内容跳转页面
|
||||
|
||||
@ -13,21 +13,9 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="refunds-user" v-if="type == 2 || type == 3 || type == 4">
|
||||
<view>
|
||||
<image src="/static/image/home/2.png"></image>
|
||||
<view>{{ info.goods_try_member_name }}</view>
|
||||
</view>
|
||||
<view>
|
||||
<image src="/static/image/home/3.png"></image>
|
||||
<view>{{ info.goods_try_member_mobile }}</view>
|
||||
</view>
|
||||
<view>
|
||||
<image src="/static/image/home/4.png"></image>
|
||||
<view class="address u-line-1">{{ info.goods_try_area_info }}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="user-info" v-if="type == 1">
|
||||
|
||||
<!-- 待处理订单/已发货订单，收货人信息 -->
|
||||
<view class="user-info">
|
||||
<view class="info-title">收件人信息</view>
|
||||
<view class="info-container">
|
||||
<view>
|
||||
@ -42,8 +30,29 @@
|
||||
<view class="title">收货地址</view>
|
||||
<view class="value u-line-1">{{ info.goods_try_area_info }}</view>
|
||||
</view>
|
||||
<view v-if="type==2">
|
||||
<view class="title">派送方式</view>
|
||||
<view class="value u-line-1">{{ info.goods_try_deliver_goods_type==1?"人工送达":"骑手" }}</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</view>
|
||||
<!-- 已拒绝/已完成订单，收货人信息 -->
|
||||
<!-- <view class="refunds-user" v-if="type == 3 || type == 4">
|
||||
<view>
|
||||
<image src="/static/image/home/2.png"></image>
|
||||
<view>{{ info.goods_try_member_name }}</view>
|
||||
</view>
|
||||
<view>
|
||||
<image src="/static/image/home/3.png"></image>
|
||||
<view>{{ info.goods_try_member_mobile }}</view>
|
||||
</view>
|
||||
<view>
|
||||
<image src="/static/image/home/4.png"></image>
|
||||
<view class="address u-line-1">{{ info.goods_try_area_info }}</view>
|
||||
</view>
|
||||
</view> -->
|
||||
<!-- 待处理订单 -->
|
||||
<view class="delivery" v-if="type == 1">
|
||||
<view class="title">派送方式</view>
|
||||
<view class="methods">
|
||||
@ -53,35 +62,44 @@
|
||||
|
||||
<view class="btn" @click="confirmpushstyle">确认</view>
|
||||
</view>
|
||||
<!-- <view class="refunds-option" v-if="type==4">
|
||||
<view :class="{active: cur==0}" @click="cur=0;showRefunds=true">不处理</view>
|
||||
<view :class="{active: cur==1}" @click="cur=1;showRefunds=true">确定处理</view>
|
||||
<!-- 已发货 -->
|
||||
<!-- 人工送达 -->
|
||||
<view class="refunds-user" v-if="info.goods_try_deliver_goods_type==1&&type==2">
|
||||
<view>
|
||||
<view>人工送达，请等待，货物正在飞速与你接近！</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 骑手 -->
|
||||
<view class="refunds-title" v-if="type==2">配送信息</view>
|
||||
<view class="refunds-title" v-if="type==3||type==4">提示信息</view>
|
||||
<view class="refunds-user" v-if="info.goods_try_deliver_goods_type==2&&type==2">
|
||||
<view>
|
||||
<image src="/static/image/home/2.png"></image>
|
||||
<view>{{ info.takeawayer_name }}</view>
|
||||
</view>
|
||||
<view>
|
||||
<image src="/static/image/home/3.png"></image>
|
||||
<view>{{ info.takeawayer_mobile }}</view>
|
||||
</view>
|
||||
<!-- 骑手公司 -->
|
||||
<!-- <view>
|
||||
<image src="/static/image/home/4.png"></image>
|
||||
<view class="address u-line-1">{{ info.goods_try_area_info }}</view>
|
||||
</view> -->
|
||||
<!-- <u-popup v-model="showDelivery" mode="center" border-radius="10" class="delivery-popup">
|
||||
<view class="title">骑手信息</view>
|
||||
<view class="input-info">
|
||||
<input type="text" placeholder="请输入您的姓名" v-model="name" />
|
||||
<input type="text" placeholder="请输入您的手机号" v-model="phone" />
|
||||
<input type="text" placeholder="请输入您的公司名称" v-model="company" />
|
||||
</view>
|
||||
<view class="btn">确认</view>
|
||||
</u-popup> -->
|
||||
<!-- 已经拒绝 -->
|
||||
<view class="refunds-user" v-if="type==3">
|
||||
<view>
|
||||
<view>抱歉，商家正忙无法接单，期待下次为您服务！</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 已完成订单 -->
|
||||
<view class="refunds-user" v-if="type==4">
|
||||
<view>
|
||||
<view>订单配送完成，期待下次为您服务！</view>
|
||||
</view>
|
||||
</view>
|
||||
<u-picker mode="selector" v-model="show" :default-selector="[0]" :range="list" range-key="content" @confirm="getselect"></u-picker>
|
||||
<!-- <u-popup v-model="showExpress" mode="center" border-radius="10" class="delivery-popup">
|
||||
<view class="title" @click="bindpushid">填写快递单号</view>
|
||||
<view class="input-info">
|
||||
<input type="text" placeholder="请输入快递单号" v-model="express" />
|
||||
</view>
|
||||
<view class="btn">确认</view>
|
||||
</u-popup> -->
|
||||
<!-- <u-popup v-model="showRefunds" mode="center" border-radius="10" class="refunds-popup">
|
||||
<view v-if="cur==1" class="popup-tips">确定处理<br />平台将进行退款</view>
|
||||
<view v-if="cur==0" class="popup-tips">确定不处理<br />平台将进行联系</view>
|
||||
<view class="popup-btn">
|
||||
<view class="cancel" @click="showRefunds=false">取消</view>
|
||||
<view class="determine">确定</view>
|
||||
</view>
|
||||
</u-popup> -->
|
||||
<u-toast ref="uToast" />
|
||||
</view>
|
||||
</template>
|
||||
@ -135,6 +153,13 @@ export default {
|
||||
type: 'error'
|
||||
});
|
||||
} else {
|
||||
this.$refs.uToast.show({
|
||||
title: res.message,
|
||||
type: 'success'
|
||||
});
|
||||
uni.navigateBack({
|
||||
delta: 1
|
||||
});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@ -150,6 +175,13 @@ export default {
|
||||
type: 'error'
|
||||
});
|
||||
} else {
|
||||
this.$refs.uToast.show({
|
||||
title: res.message,
|
||||
type: 'success'
|
||||
});
|
||||
uni.navigateBack({
|
||||
delta: 1
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -234,6 +266,13 @@ export default {
|
||||
}
|
||||
}
|
||||
}
|
||||
.refunds-title{
|
||||
padding: 25rpx 30rpx;
|
||||
font-weight: 500;
|
||||
color: #333333;
|
||||
background-color: #ffffff;
|
||||
border-bottom: 2rpx solid #ececec;
|
||||
}
|
||||
.refunds-user {
|
||||
padding: 25rpx 30rpx;
|
||||
background-color: #ffffff;
|
||||
@ -290,7 +329,7 @@ export default {
|
||||
border-bottom: 2rpx solid #ececec;
|
||||
}
|
||||
.title {
|
||||
width: 150rpx;
|
||||
width: 170rpx;
|
||||
font-size: 30rpx;
|
||||
margin-right: 10rpx;
|
||||
}
|
||||
|
||||
@ -32,8 +32,8 @@
|
||||
<!-- 标签 -->
|
||||
<view>
|
||||
<view class="titles">标签</view>
|
||||
<view class="form-view" @click="show_add()">+ 新建标签</view>
|
||||
<view :class="[item.state == true ? 'active' : '', 'form-view']" v-for="(item, index) in fileListes" :key="index" @click="changeselect(index)">
|
||||
<view class="form-view active" @click="show_add()">+ 新建标签</view>
|
||||
<view :class="['form-view',item.state == true ? 'active' : '']" v-for="(item, index) in fileListes" :key="index" @click="changeselect(index)">
|
||||
{{ item.name }}
|
||||
</view>
|
||||
</view>
|
||||
@ -46,10 +46,10 @@
|
||||
<view class="title"><text>选择商品</text></view>
|
||||
<!-- 商品列表 -->
|
||||
<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>
|
||||
<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>
|
||||
</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 newarr = this.list;
|
||||
this.shoplist = [];
|
||||
@ -246,11 +246,16 @@ export default {
|
||||
},
|
||||
// 选中某个复选框时，由checkbox时触发
|
||||
checkboxChange(e) {
|
||||
let id = e.name;
|
||||
if (e.value == true) {
|
||||
this.pushes(id);
|
||||
} else {
|
||||
let id = e;
|
||||
for(let num in this.list){
|
||||
if(id==this.list[num].goods_id){
|
||||
if(this.list[num].checked==true){
|
||||
this.delarr(id);
|
||||
}else{
|
||||
this.pushes(id);
|
||||
}
|
||||
this.list[num].checked = !this.list[num].checked
|
||||
}
|
||||
}
|
||||
},
|
||||
// 删除直播商品
|
||||
@ -261,7 +266,7 @@ export default {
|
||||
} else {
|
||||
let index = that.arres_list.indexOf(id);
|
||||
that.arres_list.splice(index, 1);
|
||||
that.getshoplist();
|
||||
that.getshoplist(id);
|
||||
}
|
||||
},
|
||||
// 增加直播商品
|
||||
@ -271,7 +276,7 @@ export default {
|
||||
console.log('为空');
|
||||
} else {
|
||||
that.arres_list.push(id);
|
||||
that.getshoplist();
|
||||
that.getshoplist(id);
|
||||
}
|
||||
},
|
||||
tosign() {
|
||||
@ -307,7 +312,7 @@ export default {
|
||||
margin: 0 auto;
|
||||
|
||||
.form-view {
|
||||
background: rgba(255, 120, 15, 1);
|
||||
background: #CDC7C8;
|
||||
border-radius: 6rpx;
|
||||
margin-right: 20rpx;
|
||||
font-size: 24rpx;
|
||||
@ -317,7 +322,7 @@ export default {
|
||||
color: #fff;
|
||||
}
|
||||
.active {
|
||||
background: red;
|
||||
background: #FF780F;
|
||||
}
|
||||
.scroll {
|
||||
width: 100%;
|
||||
|
||||
@ -24,8 +24,8 @@
|
||||
<!-- 标签 -->
|
||||
<view>
|
||||
<view class="titles">标签</view>
|
||||
<view class="form-view" @click="show_add()">+ 新建标签</view>
|
||||
<view :class="[item.state == true ? 'active' : '', 'form-view']" v-for="(item, index) in fileListes" :key="index" @click="changeselect(index)">
|
||||
<view class="form-view active" @click="show_add()">+ 新建标签</view>
|
||||
<view :class="['form-view',item.state == true ? 'active' : '']" v-for="(item, index) in fileListes" :key="index" @click="changeselect(index)">
|
||||
{{ item.name }}
|
||||
</view>
|
||||
</view>
|
||||
@ -37,10 +37,10 @@
|
||||
<view class="title"><text>选择商品</text></view>
|
||||
<!-- 商品列表 -->
|
||||
<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>
|
||||
<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>
|
||||
</view>
|
||||
<view><image :src="item.goods_image" mode="widthFix"></image></view>
|
||||
@ -270,11 +270,15 @@ export default {
|
||||
},
|
||||
// 选中某个复选框时，由checkbox时触发
|
||||
checkboxChange(e) {
|
||||
let id = e.name;
|
||||
if (e.value == true) {
|
||||
this.pushes(id);
|
||||
} else {
|
||||
for(let num in this.list){
|
||||
if(id==this.list[num].goods_id){
|
||||
if(this.list[num].checked==true){
|
||||
this.delarr(id);
|
||||
}else{
|
||||
this.pushes(id);
|
||||
}
|
||||
this.list[num].checked = !this.list[num].checked
|
||||
}
|
||||
}
|
||||
},
|
||||
// 删除直播商品
|
||||
@ -433,7 +437,7 @@ export default {
|
||||
-webkit-line-clamp: 2;
|
||||
}
|
||||
.form-view {
|
||||
background: rgba(255, 120, 15, 1);
|
||||
background: #CDC7C8;
|
||||
border-radius: 6rpx;
|
||||
margin-right: 20rpx;
|
||||
font-size: 24rpx;
|
||||
@ -443,7 +447,7 @@ export default {
|
||||
color: #fff;
|
||||
}
|
||||
.active {
|
||||
background: red;
|
||||
background: #FF780F;
|
||||
}
|
||||
.titles {
|
||||
font-size: 30rpx;
|
||||
|
||||
@ -31,12 +31,12 @@
|
||||
<view class="comment-list">
|
||||
<view class="item" v-for="(item, index) in info.articlecomment" :key="index">
|
||||
<view class="info">
|
||||
<image></image>
|
||||
<image :src="item.member_avatar"></image>
|
||||
<view class="center">
|
||||
<view class="name">{{item.member_nickname}}</view>
|
||||
<view class="name">{{item.member_nickname}}{{item.reply_member_nickname==null?"评论了文章":" 回复了 "+item.reply_member_nickname}}</view>
|
||||
<view class="time">{{item.create_time}}</view>
|
||||
</view>
|
||||
<view class="btn" @click="showreply(item.id)">回复</view>
|
||||
<view class="btn" @click="showreply(item.id,item.member_id)">回复</view>
|
||||
</view>
|
||||
<view class="content u-line-1">{{item.content}}</view>
|
||||
</view>
|
||||
@ -63,7 +63,8 @@ export default {
|
||||
},
|
||||
type:1,
|
||||
content:"",
|
||||
pid:null
|
||||
pid:null,
|
||||
replyid:null
|
||||
};
|
||||
},
|
||||
onLoad(option) {
|
||||
@ -74,9 +75,10 @@ export default {
|
||||
},
|
||||
methods: {
|
||||
// 展示回复弹框
|
||||
showreply(id){
|
||||
showreply(id,replyid){
|
||||
this.showChat = true
|
||||
this.pid = id
|
||||
this.replyid = replyid
|
||||
},
|
||||
// 回复评论
|
||||
reply(){
|
||||
@ -91,7 +93,8 @@ export default {
|
||||
this.$u.api.reply({
|
||||
pid:that.pid,
|
||||
content:that.content,
|
||||
article_id: that.id
|
||||
article_id: that.id,
|
||||
reply_id:that.replyid
|
||||
}).then(res => {
|
||||
if (res.errCode != 0) {
|
||||
this.$refs.uToast.show({
|
||||
@ -101,6 +104,8 @@ export default {
|
||||
} else {
|
||||
this.pid = "";
|
||||
this.content = "";
|
||||
this.getdetail();
|
||||
this.showChat = false
|
||||
this.$refs.uToast.show({
|
||||
title: res.message,
|
||||
type: 'success'
|
||||
|
||||
@ -35,6 +35,8 @@ export default {
|
||||
}
|
||||
},
|
||||
onLoad() {
|
||||
},
|
||||
onShow() {
|
||||
this.getmyinfo()
|
||||
},
|
||||
methods: {
|
||||
|
||||
BIN
static/image/home/chat.png
Normal file
BIN
static/image/home/chat.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 723 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 3.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 2.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 2.9 KiB |
BIN
static/image/tabbar/index.png
Normal file
BIN
static/image/tabbar/index.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 805 B |
BIN
static/image/tabbar/indexselect.png
Normal file
BIN
static/image/tabbar/indexselect.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 774 B |
BIN
static/image/tabbar/info.png
Normal file
BIN
static/image/tabbar/info.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 841 B |
BIN
static/image/tabbar/infoselect.png
Normal file
BIN
static/image/tabbar/infoselect.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 753 B |
BIN
static/image/tabbar/mine.png
Normal file
BIN
static/image/tabbar/mine.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 761 B |
BIN
static/image/tabbar/mineselect.png
Normal file
BIN
static/image/tabbar/mineselect.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 705 B |
Loading…
Reference in New Issue
Block a user