Skip to content

E
ElectricitySheep
Commit 8d791188 authored by 罗超's avatar 罗超
Browse files
Options

1

parent 8e8f6424
Hide whitespace changes
Inline Side-by-side
Showing with 503 additions and 92 deletions
src/components/blindDate/customerActiveEvaluation.vue 0 → 100644
View file @ 8d791188
<template>
<div class="setMember usersList usersListEdit">
<div class="head-title">
<span @click="CommonJump('recruitStick')" class="blue point">招募贴</span>
/ 评价编辑
</div>
<div class="content">
<el-form
style="width: 50%"
:model="addMsg"
:rules="rules"
ref="addMsg"
label-width="150px"
>
<el-form-item label="用户名" prop="UserName">
<el-input v-model="addMsg.UserName" size="small"></el-input>
</el-form-item>
<el-form-item label="评价时间" prop="CreateDate">
<el-date-picker
size="small"
v-model="addMsg.CreateDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间"
>
</el-date-picker>
</el-form-item>
<el-form-item label="用户头像">
<el-tooltip
class="item"
effect="dark"
content="建议尺寸100*100"
placement="top"
>
<el-button @click="openChangeDig(1)" size="small"
>选择文件</el-button
>
</el-tooltip>
<div
class="app-gallery-item"
style="position: relative; width: 100px; margin-top: 10px"
>
<img
v-if="!addMsg.userPath || addMsg.userPath == ''"
src="../../assets/img/default.png"
style="width: 80px; height: 80px"
alt=""
/>
<img
v-else
style="width: 80px; height: 80px"
:src="addMsg.userPath"
alt=""
/>
</div>
</el-form-item>
<el-form-item label="评价内容">
<el-input
type="textarea"
:rows="5"
v-model="addMsg.Content"
size="small"
></el-input>
</el-form-item>
<el-form-item label="评价图片">
<div class="pj-img-box">
<div
v-for="(src, i) in addMsg.ImageList"
:key="i"
style="position: relative"
>
<el-image
class="pj-img"
:src="src"
fit="contain"
:preview-src-list="addMsg.ImageList"
>
</el-image>
<i
class="el-icon-delete-solid del-icon"
@click="handleRemove(i)"
></i>
</div>
<el-upload
class="uploadDiv"
:http-request="UploadImage"
:multiple="true"
:show-file-list="false"
action
>
<i class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</div>
</el-form-item>
</el-form>
</div>
<div style="margin-top: 20px">
<el-button size="small" type="primary" @click="Save('addMsg')"
>保存</el-button
>
</div>
<!-- 选择文件 -->
<el-dialog title="选择文件" :visible.sync="changeState" width="1240px">
<ChooseImg @SelectId="SelectId"></ChooseImg>
</el-dialog>
</div>
</template>
<script>
import ChooseImg from "@/components/global/ChooseImg.vue";
export default {
components: {
ChooseImg,
},
data() {
return {
rules: {
UserName: [
{
type: "string",
required: true,
message: "请输入用户名",
trigger: "change",
},
],
CreateDate: [
{
type: "string",
required: true,
message: "请选择时间",
trigger: "change",
},
],
UserPhoto: [
{
type: "string",
required: true,
message: "请选择头像",
trigger: "change",
},
],
},
addMsg: {
CreateDate: "",
UserName: "",
UserPhoto: "",
ActivityId: 0,
Content: "",
ImageList: [],
ParentId: 0,
ReplyUserId: 0,
},
msg: {
pageIndex: 1,
pageSize: 15,
CommentGrade: 0,
PlatformSource: 0,
UserName: "",
GoodsName: "",
Content: "",
},
tableData: [],
changeState: false,
imgType: 1,
};
},
created() {
this.addMsg.ActivityId = this.$route.query.data.Id;
console.log(139, this.addMsg);
},
methods: {
SelectId(msg) {
if (this.imgType == 1) {
let url = this.getIconLink(msg.url);
this.addMsg.UserPhoto = msg.selectId;
this.addMsg.userPath = url;
}
if (this.imgType == 2) {
let url = this.getIconLink(msg.url);
this.addMsg.CommentImgList = [url];
this.addMsg.pjPath = url;
}
this.changeState = false;
},
openChangeDig(num) {
this.changeState = true;
this.imgType = num;
},
Save(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
if (this.addMsg.UserPhoto == "") {
this.Error("请选择头像");
return;
}
if (this.addMsg.Content == "" && this.addMsg.Content.length == 0) {
this.Error("请输入评论或上传图片");
return;
}
this.apipost(
"/api/Miai/SgetActivityDiscussInfo",
this.addMsg,
(res) => {
if (res.data.resultCode == 1) {
this.CommonJump("recruitStick");
this.Success("操作成功");
} else {
this.Error(res.data.message);
}
}
);
} else {
return false;
}
});
},
//选择图片
UploadImage(file) {
this.UploadFileToTencent(this.FileType().UserImg, file.file, (res) => {
if (res.resultCode == 1) {
this.addMsg.ImageList.push(res.FileUrl);
}
});
},
//删除图片
handleRemove(index) {
this.addMsg.ImageList.splice(index, 1);
},
},
};
</script>
<style>
.usersListEdit .tip {
margin-left: 10px;
display: inline-block;
height: 30px;
line-height: 30px;
color: #ff4544;
background-color: #fef0f0;
padding: 0 20px;
border-radius: 5px;
}
.usersListEdit .app-image {
background-size: cover;
background-position: center center;
width: 80px;
height: 80px;
border-radius: 0%;
}
.setMember .setTable .el-table__body .cell {
display: flex;
align-items: center;
}
.setMember .commonLabel .el-form-item__label {
margin-top: -4px;
}
.setMember .discount .el-form-item__label {
padding-right: 30px;
margin-top: -4px;
}
.setMember .el-form-item .elzk {
position: absolute;
left: -25px;
top: 8px;
}
.setMember .el-form-item {
position: relative;
}
.usersList .blue {
color: #409eff;
}
.usersList .content {
background: #fff;
margin-top: 10px;
padding: 20px;
box-sizing: border-box;
}
/* ----------上传区域样式------------ */
.pj-img-box {
display: flex;
flex-wrap: wrap;
}
.uploadDiv {
display: inline-block;
}
.uploadDiv .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
}
.uploadDiv .el-upload:hover {
border-color: #409eff;
}
.avatar-uploader-icon {
font-size: 28px;
color: #8c939d;
width: 100px;
height: 100px;
line-height: 100px;
text-align: center;
}
.pj-img {
width: 100px;
height: 100px;
display: block;
margin: 0 10px 10px 0;
box-shadow: 0px 10px 30px 0px rgba(36, 36, 36, 0.2);
}
.del-icon {
font-size: 16px;
position: absolute;
top: 0;
right: 10px;
color: red;
}
</style>
src/components/blindDate/recruitStick.vue
View file @ 8d791188
...@@ -84,12 +84,13 @@ ...@@ -84,12 +84,13 @@
</el-table-column> </el-table-column>
<el-table-column prop="ImageList" label="图片" width="80"> <el-table-column prop="ImageList" label="图片" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<img <!-- <img
v-for="(item, index) in scope.row.ImageList" v-for="(item, index) in scope.row.ImageList"
style="width: 50px" style="width: 50px"
:key="index" :key="index"
:src="item" :src="item"
/> /> -->
<img style="width: 50px" :src="scope.row.ImageList[0]" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="DianZanNum" label="点赞数" width="80"> <el-table-column prop="DianZanNum" label="点赞数" width="80">
...@@ -192,6 +193,19 @@ ...@@ -192,6 +193,19 @@
@click="delete_b(scope.row)" @click="delete_b(scope.row)"
/> />
</el-tooltip> </el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="编辑评价"
placement="top"
>
<img
src="../../assets/img/userman/add_remark.png"
alt=""
class="imgstyle"
@click="jumpPage('customerActiveEvaluation', scope.row)"
/>
</el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -288,11 +302,20 @@ export default { ...@@ -288,11 +302,20 @@ export default {
}, },
}); });
}, },
//去版面设置
goBanMianSet() { goBanMianSet() {
this.$router.push({ this.$router.push({
path: "/PPPlusStyle", path: "/PPPlusStyle",
}); });
}, },
jumpPage(url, data) {
this.$router.push({
path: url,
query: {
data: data,
},
});
},
}, },
}; };
</script> </script>
src/components/sallCenter/plugin/posts.vue
View file @ 8d791188
...@@ -745,15 +745,6 @@ ...@@ -745,15 +745,6 @@
<el-radio :label="2">关注</el-radio> <el-radio :label="2">关注</el-radio>
<el-radio :label="3">手动关联</el-radio> <el-radio :label="3">手动关联</el-radio>
</el-radio-group> </el-radio-group>
<!-- <el-select v-model="cat.range" placeholder="请选择">
<el-option
v-for="item in postsOptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select> -->
</div> </div>
</div> </div>
<div flex="box:first" v-if="cat.isCustom === 0"> <div flex="box:first" v-if="cat.isCustom === 0">
...@@ -764,30 +755,6 @@ ...@@ -764,30 +755,6 @@
</div> </div>
<div flex="box:first" v-if="cat.isCustom === 0"> <div flex="box:first" v-if="cat.isCustom === 0">
<div class="diy-goods-label">自定义帖子</div> <div class="diy-goods-label">自定义帖子</div>
<div>
<el-switch
v-model="cat.range"
:active-value="3"
:inactive-value="1"
></el-switch>
</div>
</div>
<div flex="box:first" v-if="cat.range === 1 || cat.range === 2">
<div class="diy-goods-label">贴子数量</div>
<div>
<el-input
v-model.number="cat.goodsNum"
type="number"
min="1"
max="30"
size="small"
@change="catGoodsNumChange(catIndex)"
></el-input>
</div>
</div>
<!-- <div flex="box:first">
<div class="diy-goods-label">手动指定</div>
<div> <div>
<el-switch <el-switch
v-model="cat.staticGoods" v-model="cat.staticGoods"
...@@ -795,51 +762,133 @@ ...@@ -795,51 +762,133 @@
:inactive-value="false" :inactive-value="false"
></el-switch> ></el-switch>
</div> </div>
</div> --> </div>
<div flex="box:first" v-if="cat.range === 3"> <!-- 系统分类 -->
<div class="diy-goods-label">贴子列表</div> <div v-if="cat.isCustom === 0">
<div> <div flex="box:first" v-if="!cat.staticGoods">
<draggable <div class="diy-goods-label">贴子数量</div>
v-model="cat.goodsList" <div>
class="goods-list" <el-input
style="display: flex" v-model.number="cat.goodsNum"
> type="number"
<div min="1"
class="goods-item" max="30"
v-for="(goods, goodsIndex) in cat.goodsList" size="small"
:key="goodsIndex" @change="catGoodsNumChange(catIndex)"
></el-input>
</div>
</div>
<div flex="box:first" v-if="cat.staticGoods">
<div class="diy-goods-label">贴子列表</div>
<div>
<draggable
v-model="cat.goodsList"
class="goods-list"
style="display: flex"
> >
<el-tooltip
effect="dark"
content="移除商品"
placement="top"
>
<el-button
@click="deleteGoods(goodsIndex, catIndex)"
circle
class="goods-delete"
type="danger"
icon="el-icon-close"
></el-button>
</el-tooltip>
<div <div
class="goods-pic" class="goods-item"
:style=" v-for="(goods, goodsIndex) in cat.goodsList"
'background-image:url(' + :key="goodsIndex"
getIconLink(goods.picUrl) + >
')' <el-tooltip
effect="dark"
content="移除商品"
placement="top"
>
<el-button
@click="deleteGoods(goodsIndex, catIndex)"
circle
class="goods-delete"
type="danger"
icon="el-icon-close"
></el-button>
</el-tooltip>
<div
class="goods-pic"
:style="
'background-image:url(' +
getIconLink(goods.picUrl) +
')'
"
></div>
</div>
</draggable>
<div class="goods-add">
<el-button
@click="
showGoodsDialog(catIndex), (ckGoods = cat.goodsNum)
" "
></div> icon="el-icon-plus"
>
</el-button>
</div> </div>
</draggable> </div>
<div class="goods-add"> </div>
<el-button </div>
@click=" <!-- 自定义分类 -->
showGoodsDialog(catIndex), (ckGoods = cat.goodsNum) <div v-if="cat.isCustom === 1">
" <div
icon="el-icon-plus" flex="box:first"
v-if="cat.range === 1 || cat.range === 2"
>
<div class="diy-goods-label">贴子数量</div>
<div>
<el-input
v-model.number="cat.goodsNum"
type="number"
min="1"
max="30"
size="small"
@change="catGoodsNumChange(catIndex)"
></el-input>
</div>
</div>
<div flex="box:first" v-if="cat.range === 3">
<div class="diy-goods-label">贴子列表</div>
<div>
<draggable
v-model="cat.goodsList"
class="goods-list"
style="display: flex"
> >
</el-button> <div
class="goods-item"
v-for="(goods, goodsIndex) in cat.goodsList"
:key="goodsIndex"
>
<el-tooltip
effect="dark"
content="移除商品"
placement="top"
>
<el-button
@click="deleteGoods(goodsIndex, catIndex)"
circle
class="goods-delete"
type="danger"
icon="el-icon-close"
></el-button>
</el-tooltip>
<div
class="goods-pic"
:style="
'background-image:url(' +
getIconLink(goods.picUrl) +
')'
"
></div>
</div>
</draggable>
<div class="goods-add">
<el-button
@click="
showGoodsDialog(catIndex), (ckGoods = cat.goodsNum)
"
icon="el-icon-plus"
>
</el-button>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -854,21 +903,21 @@ ...@@ -854,21 +903,21 @@
</template> </template>
<template v-else> <template v-else>
<el-form-item label="贴子添加"> <el-form-item label="贴子添加">
<el-radio v-model="data.addGoodsType" :label="0" <el-radio v-model="data.addActivityType" :label="0"
>自动添加</el-radio >自动添加</el-radio
> >
<el-radio v-model="data.addGoodsType" :label="1" <el-radio v-model="data.addActivityType" :label="1"
>手动添加</el-radio >手动添加</el-radio
> >
</el-form-item> </el-form-item>
<el-form-item v-show="data.addGoodsType == 0" label="贴子数量"> <el-form-item v-show="data.addActivityType == 0" label="贴子数量">
<el-input <el-input
size="small" size="small"
v-model.number="data.goodsLength" v-model.number="data.activityLength"
type="number" type="number"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-show="data.addGoodsType == 1" label="贴子列表"> <el-form-item v-show="data.addActivityType == 1" label="贴子列表">
<draggable <draggable
v-model="data.list" v-model="data.list"
class="goods-list" class="goods-list"
...@@ -986,13 +1035,20 @@ ...@@ -986,13 +1035,20 @@
<i v-if="data.goodsTagPicUrl==''" class="el-icon-picture-outline"></i> <i v-if="data.goodsTagPicUrl==''" class="el-icon-picture-outline"></i>
<div class="size-tip">64 × 64</div> <div class="size-tip">64 × 64</div>
</div> </div>
</el-form-item> </el-form-item>-->
<el-form-item label="背景颜色"> <el-form-item label="背景颜色">
<div class="input-color" flex="dir:left cross:center"> <div class="input-color" flex="dir:left cross:center">
<el-color-picker size="small" v-model="data.backgroundColor"></el-color-picker> <el-color-picker
<el-input size="small" style="width: 80px;margin-right: 25px;" v-model="data.backgroundColor"></el-input> size="small"
v-model="data.backgroundColor"
></el-color-picker>
<el-input
size="small"
style="width: 80px; margin-right: 25px"
v-model="data.backgroundColor"
></el-input>
</div> </div>
</el-form-item> --> </el-form-item>
</el-form> </el-form>
</div> </div>
</div> </div>
......
src/components/sallCenter/templateEdit.vue
View file @ 8d791188
...@@ -1977,9 +1977,10 @@ export default { ...@@ -1977,9 +1977,10 @@ export default {
isCked: false, isCked: false,
data: { data: {
catPosition: "top", catPosition: "top",
// goodsLength: 10, //商品数量 activityLength: 10, //帖子数量
addActivityType: 0,
catStyle: 1, catStyle: 1,
listStyle: 5, //列表样式[5-瀑布流,6-卡片模式] listStyle: 5, //列表样式[5-瀑布流,-1-卡片模式]
backgroundColor: "#fff", //背景颜色 backgroundColor: "#fff", //背景颜色
// PaddingTop: 0, //上边距 // PaddingTop: 0, //上边距
// PaddingBottom: 0, //下边距 // PaddingBottom: 0, //下边距
...@@ -1987,7 +1988,7 @@ export default { ...@@ -1987,7 +1988,7 @@ export default {
// PaddingRight: 0, //右边距 // PaddingRight: 0, //右边距
// SearchFilletPX: 0, //组件圆角 // SearchFilletPX: 0, //组件圆角
list: [], //自定义列表 list: [], //自定义列表
catList: [], catList: [], //分类列表
}, },
}; };
this.dataList.push(PPPlusObj); this.dataList.push(PPPlusObj);
......
src/router/index.js
View file @ 8d791188
...@@ -351,6 +351,11 @@ export default new Router({ ...@@ -351,6 +351,11 @@ export default new Router({
path: '/vipBuyList', //vip购买记录、 path: '/vipBuyList', //vip购买记录、
name: 'vipBuyList', name: 'vipBuyList',
component: resolve => require(['@/components/blindDate/vipBuyList'], resolve), component: resolve => require(['@/components/blindDate/vipBuyList'], resolve),
}, // 相亲 活动评价
{
path: '/customerActiveEvaluation',
name: 'customerActiveEvaluation',
component: resolve => require(['@/components/blindDate/customerActiveEvaluation'], resolve),
},] },]
}, },
{ {
...@@ -1172,11 +1177,11 @@ export default new Router({ ...@@ -1172,11 +1177,11 @@ export default new Router({
name: 'customerEvaluation', name: 'customerEvaluation',
component: resolve => require(['@/components/orderMan/customerEvaluation'], resolve), component: resolve => require(['@/components/orderMan/customerEvaluation'], resolve),
}, },
// 订单管理 批量发货 // 订单管理 客户评价
{ {
path: '/BulkShipment', path: '/customerEvaluation',
name: 'BulkShipment', name: 'customerEvaluation',
component: resolve => require(['@/components/orderMan/BulkShipment'], resolve), component: resolve => require(['@/components/orderMan/customerEvaluation'], resolve),
}, },
// 订单管理 批量发货 // 订单管理 批量发货
{ {
...@@ -1501,7 +1506,7 @@ export default new Router({ ...@@ -1501,7 +1506,7 @@ export default new Router({
name: 'monthlyReport', name: 'monthlyReport',
component: resolve => require(['@/components/statistics/monthlyReport'], resolve), component: resolve => require(['@/components/statistics/monthlyReport'], resolve),
}, },
//营销中心 充值管理 //营销中心 充值管理
{ {
path: '/rechargeManage', path: '/rechargeManage',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment