Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
source-trace-manage-go
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tracing
source-trace-manage-go
Commits
d5982581
Commit
d5982581
authored
Sep 27, 2020
by
zL
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
部分代码变更
parent
63d1250d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
107 additions
and
64 deletions
+107
-64
Uncertified.vue
src/entry/refactoring/views/category/Uncertified.vue
+85
-0
newProductList.vue
src/entry/refactoring/views/category/newProductList.vue
+22
-64
No files found.
src/entry/refactoring/views/category/Uncertified.vue
0 → 100644
View file @
d5982581
<
template
>
<common-dialog
showMask
@
closePopup=
"$emit('confirm')"
>
<div
class=
"delete_dialog"
>
<h2
class=
"title"
>
提示
</h2>
<img
class=
"img"
src=
"../../../../assets/images/weirenzheng-2.png"
alt=
"删除"
/>
<p
class=
"tip"
>
您还未认证不能进行上链
</p>
<div
class=
"btnbox"
>
<button
class=
"g-btn_primary btn_confirm"
@
click=
"$emit('confirm')"
>
取消
</button>
<button
class=
"g-btn_primary btn_cancel"
@
click=
"$emit('cancel')"
>
去认证
</button>
</div>
</div>
</common-dialog>
</
template
>
<
script
lang=
"ts"
>
import
{
Component
,
Prop
,
Vue
}
from
"vue-property-decorator"
;
import
CommonDialog
from
"@/components/CommonDialog.vue"
;
@
Component
({
components
:
{
CommonDialog
,
},
})
export
default
class
Uncertified
extends
Vue
{
@
Prop
()
tip
!
:
string
;
}
</
script
>
<
style
scoped
>
.delete_dialog
{
height
:
372px
;
width
:
600px
;
text-align
:
center
;
}
.title
{
margin
:
0
;
padding-left
:
44px
;
line-height
:
106px
;
font-weight
:
500
;
color
:
#000
;
font-size
:
22px
;
text-align
:
left
;
}
.img
{
margin-top
:
7px
;
}
.tip
{
margin
:
17px
0
0
0
;
/* todo ui图切块有空白无法还原 */
color
:
#ffce57
;
font-size
:
18px
;
line-height
:
25px
;
}
.btnbox
{
float
:
right
;
margin-right
:
49px
;
}
.btn_confirm
{
float
:
left
;
margin-top
:
56px
;
width
:
120px
;
height
:
40px
;
color
:
#5c6476
;
background
:
white
;
}
.btn_cancel
{
float
:
left
;
margin-top
:
56px
;
width
:
120px
;
padding
:
0
;
height
:
40px
;
border-radius
:
4px
;
text-align
:
center
;
line-height
:
40px
;
}
</
style
>
src/entry/refactoring/views/category/newProductList.vue
View file @
d5982581
...
...
@@ -59,19 +59,13 @@
>
<span
class=
"pager-count"
>
共
{{
Math
.
ceil
(
total
/
10
)
}}
页
</span>
</pagination>
<!-- 复制组件 -->
<!--
<common-dialog
v-if=
"showCopy"
@
closePopup=
"showCopy=false"
showMask
>
<copy-goods
@
close=
"showCopy=false"
:oldname=
"oldname"
:id=
"infoId"
@
update=
"update"
></copy-goods>
</common-dialog>
-->
<!-- 未认证提示组件 -->
<!--
<uncertified
v-if=
"showUncertified"
@
confirm=
"showUncertified = false"
@
cancel=
"UncertifiedConfirm"
></uncertified>
-->
<!--
<div
hidden
>
{{
back
}}{{
back2
}}
</div>
-->
</div>
<!-- 未认证提示组件 -->
<uncertified
v-if=
"showUncertified"
@
confirm=
"showUncertified = false"
@
cancel=
"UncertifiedConfirm"
></uncertified>
<!-- 增量 -->
<common-dialog
v-if=
"showIncrements"
...
...
@@ -107,7 +101,8 @@
>
<add-goods
@
cancel=
"isShowAdd = false"
></add-goods>
</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-content"
>
<i
...
...
@@ -126,7 +121,7 @@
</div>
</div>
</div>
</div>
-->
</div>
</div>
</
template
>
...
...
@@ -139,13 +134,7 @@ import IncrementalDataList from "../../components/newProductList/IncrementalData
import
Increments
from
"../../components/newProductList/increment.vue"
;
// 增量
import
AddGoods
from
"./addGoods.vue"
;
// 添加存证
import
deleteGoods
from
"./deleteGoods.vue"
;
// 删除组件
// 重命名组件
// import copyGoods from "@/views/category/copyGoods.vue";
// 未认证提示组件
// import Uncertified from "@/views/template/Uncertified.vue";
// 分割线------------------------------------------------
// import TemplatePopup from "@/entry/refactoring/views/template/TemplatePopup.vue";
import
Uncertified
from
"./Uncertified.vue"
;
// 未认证提示组件
export
default
{
components
:
{
...
...
@@ -156,9 +145,7 @@ export default {
AddGoods
,
Increments
,
deleteGoods
,
// copyGoods,
// Uncertified,
// TemplatePopup,
Uncertified
,
},
data
()
{
return
{
...
...
@@ -186,14 +173,9 @@ export default {
TheIncrementalData
:
null
,
//增量数据
};
},
computed
:
{},
watch
:
{},
created
()
{
this
.
getList
();
// 获取所有商品
},
mounted
()
{},
beforeDestroy
()
{},
methods
:
{
// 展开增量更新列表
async
expandTheList
(
item
,
index
)
{
...
...
@@ -273,13 +255,17 @@ export default {
});
});
},
//
上链
//
上链>查询是否认证
upload
(
item
)
{
this
.
getInfo
();
this
.
infoId
=
item
.
id
;
this
.
localName
=
item
.
name
;
this
.
localState
=
item
.
status
;
this
.
localDetail
=
item
.
detail
;
if
(
this
.
$store
.
state
.
userInfos
.
auth_suc
===
1
)
{
this
.
isShowToChainDialog
=
true
;
this
.
infoId
=
item
.
id
;
this
.
localName
=
item
.
name
;
this
.
localState
=
item
.
status
;
this
.
localDetail
=
item
.
detail
;
}
else
{
this
.
showUncertified
=
true
;
}
},
// 删除增量存证
async
deleteIncremental
(
id
)
{
...
...
@@ -295,23 +281,7 @@ export default {
});
}
},
// 获取个人信息
async
getInfo
()
{
const
res
=
await
this
.
$ajax
({
type
:
"get"
,
url
:
GO_URLS
.
user
+
`/`
+
JSON
.
parse
(
String
(
sessionStorage
.
getItem
(
"user"
))).
id
,
});
if
(
res
)
{
if
(
res
.
data
.
auth_suc
===
1
)
{
this
.
isShowToChainDialog
=
true
;
}
else
{
this
.
showUncertified
=
true
;
}
}
},
// 跳转个人中心
UncertifiedConfirm
()
{
this
.
$router
.
push
(
"/userCenter"
);
...
...
@@ -386,18 +356,6 @@ export default {
this
.
infoId
=
item
.
id
;
this
.
status
=
item
.
status
;
},
// 复制成功之后的回调
// update() {
// this.getList();
// },
// 复制商品
// copyGoods(item) {
// this.infoId = item.itemId;
// this.oldname = "";
// this.showCopy = true;
// },
// 请求
async
getList
()
{
// 构建请求
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment