Commit 667758dd authored by zenglun's avatar zenglun

修改一个人bug

parent e639e422
...@@ -59,4 +59,4 @@ ...@@ -59,4 +59,4 @@
"last 2 versions", "last 2 versions",
"not dead" "not dead"
] ]
} }
\ No newline at end of file
...@@ -2,11 +2,7 @@ ...@@ -2,11 +2,7 @@
<template> <template>
<div class="new-product-list"> <div class="new-product-list">
<!-- 缺省页 --> <!-- 缺省页 -->
<default-page <default-page tips="您还未添加存证" v-if="FirstEntry" @to-add="toEditTemplate" />
tips="您还未添加存证"
v-if="FirstEntry"
@to-add="toEditTemplate"
/>
<!-- 主体 --> <!-- 主体 -->
<div v-else class="new-product_list"> <div v-else class="new-product_list">
<!-- 头 --> <!-- 头 -->
...@@ -55,13 +51,7 @@ ...@@ -55,13 +51,7 @@
/> />
</div> </div>
<!-- 页码组件 --> <!-- 页码组件 -->
<pagination <pagination class="pager" v-model="page" :total="total" @change="pagechange" :size="10">
class="pager"
v-model="page"
:total="total"
@change="pagechange"
:size="10"
>
<span class="pager-count">{{ Math.ceil(total / 10) }}</span> <span class="pager-count">{{ Math.ceil(total / 10) }}</span>
</pagination> </pagination>
</div> </div>
...@@ -72,11 +62,7 @@ ...@@ -72,11 +62,7 @@
@cancel="UncertifiedConfirm" @cancel="UncertifiedConfirm"
></uncertified> ></uncertified>
<!-- 增量 --> <!-- 增量 -->
<common-dialog <common-dialog v-if="showIncrements" @closePopup="showIncrements = false" showMask>
v-if="showIncrements"
@closePopup="showIncrements = false"
showMask
>
<Increments <Increments
:pre_hash="preHash" :pre_hash="preHash"
:evidenceName="localName" :evidenceName="localName"
...@@ -85,11 +71,7 @@ ...@@ -85,11 +71,7 @@
></Increments> ></Increments>
</common-dialog> </common-dialog>
<!-- 删除组件 --> <!-- 删除组件 -->
<common-dialog <common-dialog v-if="showDeleteDialog" @closePopup="showDeleteDialog = false" showMask>
v-if="showDeleteDialog"
@closePopup="showDeleteDialog = false"
showMask
>
<delete-goods <delete-goods
@CloseDg="showDeleteDialog = false" @CloseDg="showDeleteDialog = false"
:id="infoId" :id="infoId"
...@@ -98,12 +80,7 @@ ...@@ -98,12 +80,7 @@
></delete-goods> ></delete-goods>
</common-dialog> </common-dialog>
<!-- 添加存证弹窗 --> <!-- 添加存证弹窗 -->
<common-dialog <common-dialog v-if="isShowAdd" @closePopup="isShowAdd = false" showMask class="style-addgoods">
v-if="isShowAdd"
@closePopup="isShowAdd = false"
showMask
class="style-addgoods"
>
<add-goods @cancel="isShowAdd = false"></add-goods> <add-goods @cancel="isShowAdd = false"></add-goods>
</common-dialog> </common-dialog>
<!-- copyGoods --> <!-- copyGoods -->
...@@ -113,38 +90,23 @@ ...@@ -113,38 +90,23 @@
showMask showMask
class="style-addgoods" class="style-addgoods"
> >
<copy-goods <copy-goods @close="isShowCopy = false" :Copydetails="Copydetails" @update="getList"></copy-goods>
@close="isShowCopy = false"
:Copydetails="Copydetails"
@update="getList"
></copy-goods>
</common-dialog> </common-dialog>
<!-- prompt --> <!-- prompt -->
<common-dialog showMask v-if="PromptShow" @closePopup="PromptShow = false"> <common-dialog showMask v-if="PromptShow" @closePopup="PromptShow = false">
<prompt <prompt tip="确定要隐藏该条记录吗" @close="PromptShow = false" @confirm="hiddenCertificate" />
tip="确定要隐藏该条记录吗"
@close="PromptShow = false"
@confirm="hiddenCertificate"
/>
</common-dialog> </common-dialog>
<!-- 增量弹窗 --> <!-- 增量弹窗 -->
<div class="chain-dialog" v-show="isShowToChainDialog"> <div class="chain-dialog" v-show="isShowToChainDialog">
<div class="chain-mask" @click="isShowToChainDialog = false"></div> <div class="chain-mask" @click="isShowToChainDialog = false"></div>
<div class="chain-content"> <div class="chain-content">
<i <i class="iconfont iconjiufuqianbaoicon08" @click="isShowToChainDialog = false"></i>
class="iconfont iconjiufuqianbaoicon08"
@click="isShowToChainDialog = false"
></i>
<img src="../../assets/images/category/chain_notice.png" /> <img src="../../assets/images/category/chain_notice.png" />
<div class="part-bottom"> <div class="part-bottom">
<h3>上链提示</h3> <h3>上链提示</h3>
<p class="line-one"> <p class="line-one">信息上链后,即将展示在区块链上以作永恒记录,如有虚假,</p>
信息上链后,即将展示在区块链上以作永恒记录,如有虚假,
</p>
<p class="line-two">登记⽅需⾃愿承担由此产⽣的⼀切后果。</p> <p class="line-two">登记⽅需⾃愿承担由此产⽣的⼀切后果。</p>
<div class="chain-btn" @click.stop="Confirm(TheIncrementalData)"> <div class="chain-btn" @click.stop="Confirm(TheIncrementalData)">确定上链</div>
确定上链
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -175,7 +137,7 @@ export default { ...@@ -175,7 +137,7 @@ export default {
deleteGoods, deleteGoods,
Uncertified, Uncertified,
copyGoods, copyGoods,
prompt, prompt
}, },
data() { data() {
return { return {
...@@ -183,7 +145,7 @@ export default { ...@@ -183,7 +145,7 @@ export default {
label: "全部", // 显示对应的搜索条件 label: "全部", // 显示对应的搜索条件
searchvalue: "", // 搜索关键词 searchvalue: "", // 搜索关键词
total: 10, // 存证总数 total: 10, // 存证总数
page: 1, // 当前页码 page: this.$store.getters.get_page, // 当前页码
chainStatus: null, // 上链状态 chainStatus: null, // 上链状态
FirstEntry: false, // 控制缺省页显示 FirstEntry: false, // 控制缺省页显示
showUncertified: false, // 个人认证 showUncertified: false, // 个人认证
...@@ -204,7 +166,7 @@ export default { ...@@ -204,7 +166,7 @@ export default {
isShowCopy: false, isShowCopy: false,
Copydetails: {}, Copydetails: {},
PromptShow: false, PromptShow: false,
PromptID: -1, PromptID: -1
}; };
}, },
created() { created() {
...@@ -238,15 +200,15 @@ export default { ...@@ -238,15 +200,15 @@ export default {
type: "POST", type: "POST",
url: GO_URLS.deleteBlockChainProof, url: GO_URLS.deleteBlockChainProof,
params: { params: {
id: this.PromptID, id: this.PromptID
}, }
}); });
if (res) { if (res) {
this.getList(); this.getList();
this.PromptShow = false; this.PromptShow = false;
this.$message({ this.$message({
type: "success", type: "success",
message: "隐藏成功!", message: "隐藏成功!"
}); });
} }
}, },
...@@ -298,7 +260,7 @@ export default { ...@@ -298,7 +260,7 @@ export default {
} else { } else {
this.$message({ this.$message({
message: "增量数据未上链,无法继续增量", message: "增量数据未上链,无法继续增量",
type: "warning", type: "warning"
}); });
} }
}, },
...@@ -309,7 +271,7 @@ export default { ...@@ -309,7 +271,7 @@ export default {
this.$confirm("此操作将永久删除该存证, 是否继续?", "提示", { this.$confirm("此操作将永久删除该存证, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning"
}) })
.then(() => { .then(() => {
that.deleteIncremental(item.id); that.deleteIncremental(item.id);
...@@ -317,7 +279,7 @@ export default { ...@@ -317,7 +279,7 @@ export default {
.catch(() => { .catch(() => {
this.$message({ this.$message({
type: "info", type: "info",
message: "已取消删除", message: "已取消删除"
}); });
}); });
}, },
...@@ -337,13 +299,13 @@ export default { ...@@ -337,13 +299,13 @@ export default {
async deleteIncremental(id) { async deleteIncremental(id) {
const res = await this.$ajax({ const res = await this.$ajax({
type: "delete", type: "delete",
url: GO_URLS.deleteIncrement + `/` + id, url: GO_URLS.deleteIncrement + `/` + id
}); });
if (res) { if (res) {
this.getList(); this.getList();
this.$message({ this.$message({
type: "success", type: "success",
message: "删除成功!", message: "删除成功!"
}); });
} }
}, },
...@@ -368,12 +330,12 @@ export default { ...@@ -368,12 +330,12 @@ export default {
const res = await this.$ajax({ const res = await this.$ajax({
type: "post", type: "post",
url: GO_URLS.sendBlockIncrementChain, url: GO_URLS.sendBlockIncrementChain,
params: { id: this.TheIncrementalData.id }, params: { id: this.TheIncrementalData.id }
}); });
if (res) { if (res) {
this.$message({ this.$message({
type: "success", type: "success",
message: "上链信息提交成功!", message: "上链信息提交成功!"
}); });
this.isShowToChainDialog = false; this.isShowToChainDialog = false;
this.getList(); this.getList();
...@@ -394,12 +356,12 @@ export default { ...@@ -394,12 +356,12 @@ export default {
const res = await this.$ajax({ const res = await this.$ajax({
type: "post", type: "post",
url: GO_URLS.sendBlockChian, url: GO_URLS.sendBlockChian,
params: { id: this.infoId }, params: { id: this.infoId }
}); });
if (res) { if (res) {
this.$message({ this.$message({
type: "success", type: "success",
message: "上链信息提交成功!", message: "上链信息提交成功!"
}); });
this.isShowToChainDialog = false; this.isShowToChainDialog = false;
this.getList(); this.getList();
...@@ -413,7 +375,7 @@ export default { ...@@ -413,7 +375,7 @@ export default {
this.$emit("update"); this.$emit("update");
this.$message({ this.$message({
type: "success", type: "success",
message: "删除存证成功!", message: "删除存证成功!"
}); });
}, },
// 展开删除存证弹窗 // 展开删除存证弹窗
...@@ -422,7 +384,7 @@ export default { ...@@ -422,7 +384,7 @@ export default {
this.infoId = item.id; this.infoId = item.id;
this.status = item.status; this.status = item.status;
}, },
// 请求 // 存证列表查询
async getList() { async getList() {
// 构建请求 // 构建请求
let params = { let params = {
...@@ -430,17 +392,18 @@ export default { ...@@ -430,17 +392,18 @@ export default {
is_valid: 0, //可用 is_valid: 0, //可用
page: this.page, page: this.page,
key_words: this.searchvalue, key_words: this.searchvalue,
page_size: 10, page_size: 10
}; };
const res = await this.$ajax({ const res = await this.$ajax({
type: "post", type: "post",
url: GO_URLS.list, url: GO_URLS.list,
params, params
}); });
if (res) { if (res) {
this.total = res.data.total; this.total = res.data.total;
this.$store.commit("setListOfInformation", res.data.results || []); this.$store.commit("setListOfInformation", res.data.results || []);
this.$store.commit("setGoodsNum", res.data.total); this.$store.commit("setGoodsNum", res.data.total);
this.$store.commit("setPage", this.page);
if (!res.data.results && !this.isFirst) { if (!res.data.results && !this.isFirst) {
if (this.isFirst) return; if (this.isFirst) return;
this.FirstEntry = true; this.FirstEntry = true;
...@@ -451,7 +414,7 @@ export default { ...@@ -451,7 +414,7 @@ export default {
} }
}, },
// 页码变更触发 // 页码变更触发
pagechange() { pagechange(page) {
this.getList(); this.getList();
}, },
// 搜索按钮 // 搜索按钮
...@@ -498,8 +461,8 @@ export default { ...@@ -498,8 +461,8 @@ export default {
// 添加存证 // 添加存证
toEditTemplate() { toEditTemplate() {
this.isShowAdd = true; this.isShowAdd = true;
}, }
}, }
}; };
</script> </script>
......
...@@ -28,42 +28,28 @@ ...@@ -28,42 +28,28 @@
</div> </div>
<span class="content-number">{{ serialNumber(index) }}</span> <span class="content-number">{{ serialNumber(index) }}</span>
</li> </li>
<li class="content-name" @click="showProduct(item, index)"> <li class="content-name" @click="showProduct(item, index)">{{ item.name }}</li>
{{ item.name }}
</li>
<li class="content-time">{{ item.update_time | formatTime }}</li> <li class="content-time">{{ item.update_time | formatTime }}</li>
<li class="content-chain"> <li class="content-chain">
<div class="content-the-above-link" v-if="item.status === 2"> <div class="content-the-above-link" v-if="item.status === 2">已上链</div>
已上链
</div>
<div <div
class="content-on-the-chain" class="content-on-the-chain"
v-if="item.status === 0" v-if="item.status === 0"
@click="$emit('upload', item)" @click="$emit('upload', item)"
> >点击上链</div>
点击上链
</div>
<div v-if="item.status === 1" class="content-status-ing">上链中</div> <div v-if="item.status === 1" class="content-status-ing">上链中</div>
<div <div
v-if="item.status === 3" v-if="item.status === 3"
class="content-status--fail" class="content-status--fail"
@click="$emit('upload', item)" @click="$emit('upload', item)"
> >上链失败</div>
上链失败 <div v-if="item.status === 4" class="content-the-above-link">隐藏中</div>
</div> <div v-if="item.status === 5" class="content-the-above-link">已隐藏</div>
<div v-if="item.status === 4" class="content-the-above-link">
隐藏中
</div>
<div v-if="item.status === 5" class="content-the-above-link">
已隐藏
</div>
<div <div
v-if="item.status === 6" v-if="item.status === 6"
class="content-status--fail" class="content-status--fail"
@click="$emit('privacy-settings', item)" @click="$emit('privacy-settings', item)"
> >隐藏失败</div>
隐藏失败
</div>
</li> </li>
<li class="content-qrcode"> <li class="content-qrcode">
<div class="content-code-box"> <div class="content-code-box">
...@@ -82,9 +68,7 @@ ...@@ -82,9 +68,7 @@
<img :src="QRcode" /> <img :src="QRcode" />
</div> </div>
<div class="imgbox" v-else> <div class="imgbox" v-else>
<img <img src="https://f10.baidu.com/it/u=557133877,2120362237&fm=72" />
src="https://f10.baidu.com/it/u=557133877,2120362237&fm=72"
/>
</div> </div>
<p @click="QRdownload(item)">下载二维码</p> <p @click="QRdownload(item)">下载二维码</p>
<p class="copy-address" @click="CopyAddress(item)">复制地址</p> <p class="copy-address" @click="CopyAddress(item)">复制地址</p>
...@@ -105,11 +89,7 @@ ...@@ -105,11 +89,7 @@
]" ]"
></i> ></i>
<!-- 浮动弹框 --> <!-- 浮动弹框 -->
<ul <ul class="set-menu block-ul" v-if="checkBlock === index" @mousedown.stop>
class="set-menu block-ul"
v-if="checkBlock === index"
@mousedown.stop
>
<li @click="handleChain(item)">查看区块链</li> <li @click="handleChain(item)">查看区块链</li>
<li @click="CopyAddress(item)">复制存证地址</li> <li @click="CopyAddress(item)">复制存证地址</li>
</ul> </ul>
...@@ -118,10 +98,7 @@ ...@@ -118,10 +98,7 @@
</li> </li>
<li class="content-set"> <li class="content-set">
<div class="set-btn_wrapper"> <div class="set-btn_wrapper">
<i <i @click.stop="openSet(item, index)" class="iconfont icongengduocaozuo"></i>
@click.stop="openSet(item, index)"
class="iconfont icongengduocaozuo"
></i>
<ul class="set-menu" v-if="checkSet === index" @mousedown.stop> <ul class="set-menu" v-if="checkSet === index" @mousedown.stop>
<li <li
v-if="item.status === 2 || item.status === 6" v-if="item.status === 2 || item.status === 6"
...@@ -129,28 +106,20 @@ ...@@ -129,28 +106,20 @@
$emit('privacy-settings', item); $emit('privacy-settings', item);
checkSet = -1; checkSet = -1;
" "
> >隐私设置</li>
隐私设置 <li v-if="item.status === 2" @click="increment(item, index)">增量更新</li>
</li>
<li v-if="item.status === 2" @click="increment(item, index)">
增量更新
</li>
<li <li
@click=" @click="
$emit('create-copy', item); $emit('create-copy', item);
checkSet = -1; checkSet = -1;
" "
> >创建副本</li>
创建副本
</li>
<li <li
@click=" @click="
$emit('delete-goods', item); $emit('delete-goods', item);
checkSet = -1; checkSet = -1;
" "
> >删除</li>
删除
</li>
</ul> </ul>
</div> </div>
</li> </li>
...@@ -159,11 +128,7 @@ ...@@ -159,11 +128,7 @@
style="width: 100%; overflow-y: auto; max-height: 250px" style="width: 100%; overflow-y: auto; max-height: 250px"
v-show="expandTheListIndex === index" v-show="expandTheListIndex === index"
> >
<ul <ul class="incremental-list" v-for="(item2, index2) in item.incrementList" :key="index2">
class="incremental-list"
v-for="(item2, index2) in item.incrementList"
:key="index2"
>
<li class="incremental-icon"> <li class="incremental-icon">
<i <i
class="iconfont" class="iconfont"
...@@ -172,12 +137,7 @@ ...@@ -172,12 +137,7 @@
]" ]"
></i> ></i>
</li> </li>
<li <li class="incremental-name" @click="enterDetails(item2, item, index)">{{ item2.name }}</li>
class="incremental-name"
@click="enterDetails(item2, item, index)"
>
{{ item2.name }}
</li>
<li class="incremental-time">{{ item2.update_time | formatTime }}</li> <li class="incremental-time">{{ item2.update_time | formatTime }}</li>
<li class="incremental-state"> <li class="incremental-state">
<span v-if="item2.status === 2" class="state-ban">已上链</span> <span v-if="item2.status === 2" class="state-ban">已上链</span>
...@@ -185,11 +145,10 @@ ...@@ -185,11 +145,10 @@
v-if="item2.status === 0" v-if="item2.status === 0"
class="state-start" class="state-start"
@click="$emit('incremental-chain', item2, item)" @click="$emit('incremental-chain', item2, item)"
>点击上链</span >点击上链</span>
>
<span v-if="item2.status === 1" class="state-ing">上链中</span> <span v-if="item2.status === 1" class="state-ing">上链中</span>
<span v-if="item2.status === 3" class="state-fail">上链失败</span> <span v-if="item2.status === 3" class="state-fail">上链失败</span>
<span v-if="item2.status === 5" class="state-ing"> 已隐藏 </span> <span v-if="item2.status === 5" class="state-ing">已隐藏</span>
</li> </li>
<li class="center-placeholder--one"></li> <li class="center-placeholder--one"></li>
<li class="center-placeholder--two"></li> <li class="center-placeholder--two"></li>
...@@ -200,8 +159,7 @@ ...@@ -200,8 +159,7 @@
:class="{ :class="{
'span-ban': item2.status === 1 || item2.status === 2, 'span-ban': item2.status === 1 || item2.status === 2,
}" }"
>删除</span >删除</span>
>
<span class="span-ban">复制</span> <span class="span-ban">复制</span>
</div> </div>
</li> </li>
...@@ -221,11 +179,11 @@ export default { ...@@ -221,11 +179,11 @@ export default {
checkBlock: -1, checkBlock: -1,
checkSet: -1, checkSet: -1,
expandTheListIndex: -1, expandTheListIndex: -1,
QRcode: "", // 二维码路劲 QRcode: "" // 二维码路劲
}; };
}, },
watch: { watch: {
getInfoList: function (newv, oldv) { getInfoList: function(newv, oldv) {
this.expandTheListIndex = -1; this.expandTheListIndex = -1;
if (this.$store.state.theAnchor != -1) { if (this.$store.state.theAnchor != -1) {
this.expandTheList( this.expandTheList(
...@@ -233,23 +191,23 @@ export default { ...@@ -233,23 +191,23 @@ export default {
this.$store.state.theAnchor this.$store.state.theAnchor
); );
} }
}, }
}, },
computed: { computed: {
// 获取存证信息列表 // 获取存证信息列表
getInfoList: function () { getInfoList: function() {
return this.$store.state.listOfInformation; return this.$store.state.listOfInformation;
}, },
// 获取当前页码 // 获取当前页码
getPage: function () { getPage: function() {
return this.$store.state.page; return this.$store.state.page;
}, },
// 序号 // 序号
serialNumber: function (index) { serialNumber: function(index) {
return function (index) { return function(index) {
return (this.getPage - 1) * 10 + (index + 1); return (this.getPage - 1) * 10 + (index + 1);
}; };
}, }
}, },
methods: { methods: {
increment(item, index) { increment(item, index) {
...@@ -266,8 +224,8 @@ export default { ...@@ -266,8 +224,8 @@ export default {
query: { query: {
personalTemplateId: item.id, //父级id personalTemplateId: item.id, //父级id
personalTemplateName: item.name, // 父级name personalTemplateName: item.name, // 父级name
childId: item2.id, // 当前存证id childId: item2.id // 当前存证id
}, }
}); });
}, },
// 展开增量数据列表 // 展开增量数据列表
...@@ -282,8 +240,8 @@ export default { ...@@ -282,8 +240,8 @@ export default {
params: { params: {
base_hash: item.hash, base_hash: item.hash,
page: 1, page: 1,
page_size: 10, page_size: 10
}, }
}); });
if (res) { if (res) {
let list = res.data.results; let list = res.data.results;
...@@ -312,7 +270,7 @@ export default { ...@@ -312,7 +270,7 @@ export default {
document.body.removeChild(input); document.body.removeChild(input);
this.$message({ this.$message({
message: "复制成功,请右键粘贴使用", message: "复制成功,请右键粘贴使用",
type: "success", type: "success"
}); });
}, },
// 二维码下载 // 二维码下载
...@@ -338,8 +296,8 @@ export default { ...@@ -338,8 +296,8 @@ export default {
this.$router.push({ this.$router.push({
path: "/editTemplate", path: "/editTemplate",
query: { query: {
personalTemplateId: item.id, personalTemplateId: item.id
}, }
}); });
}, },
openSet(item, index) { openSet(item, index) {
...@@ -359,8 +317,8 @@ export default { ...@@ -359,8 +317,8 @@ export default {
this.checkQR = index; this.checkQR = index;
this.QRcode = await getQR(item.hash); this.QRcode = await getQR(item.hash);
document.addEventListener("mousedown", this.onHindMenu); document.addEventListener("mousedown", this.onHindMenu);
}, }
}, }
}; };
</script> </script>
......
...@@ -5,6 +5,7 @@ const getters: GetterTree<StateTypes, any> = { ...@@ -5,6 +5,7 @@ const getters: GetterTree<StateTypes, any> = {
get_templateType: state => state.templateType, get_templateType: state => state.templateType,
get_templateData: state => state.templateData, get_templateData: state => state.templateData,
get_currentRoute: state => state.currentRoute, get_currentRoute: state => state.currentRoute,
get_page: state => state.page
}; };
export default getters; export default getters;
...@@ -16,6 +16,7 @@ export interface StateTypes { ...@@ -16,6 +16,7 @@ export interface StateTypes {
chainStatus: string, chainStatus: string,
templateType: number, templateType: number,
templateData: any, templateData: any,
currentRoute: number currentRoute: number,
} }
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