guolong
/
wj_nft_backend_page
0
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

Merge remote-tracking branch 'origin/dev' into dev

dev
caoyizhong 3 years ago
parent
dc5134fd04 d818796d03
commit
35b00dbe8d
2 changed files with 29 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/views/wjnft/artist/index.vue
  2. 47
      src/views/wjnft/collection/index.vue

4
src/views/wjnft/artist/index.vue
Unescape View File

@ -169,8 +169,8 @@
<!-- <el-table-column label="id" align="center" prop="id" />--> <!-- <el-table-column label="id" align="center" prop="id" />-->
<el-table-column label="序号" type="index" width="50"></el-table-column> <el-table-column label="序号" type="index" width="50"></el-table-column>
<!-- <el-table-column label="用户ID" align="center" prop="userId" />--> <!-- <el-table-column label="用户ID" align="center" prop="userId" />-->
<el-table-column label="创作者名称" align="center" prop="artistName"/> <el-table-column label="创作者名称" align="center" prop="artistName" />
<el-table-column label="创作者介绍" align="center" prop="artistIntroduction"/> <el-table-column label="创作者介绍" align="center" prop="artistIntroduction" width="700"/>
<el-table-column label="手机号码" align="center" prop="phoneNub"/> <el-table-column label="手机号码" align="center" prop="phoneNub"/>
<!-- <el-table-column label="标识 " align="center" prop="identifier" />--> <!-- <el-table-column label="标识 " align="center" prop="identifier" />-->
<el-table-column <el-table-column

47
src/views/wjnft/collection/index.vue
Unescape View File

@ -164,17 +164,17 @@
v-hasRole="['admin','tester']" v-hasRole="['admin','tester']"
>修改</el-button> >修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="danger" <!-- type="danger"-->
plain <!-- plain-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
size="mini" <!-- size="mini"-->
:disabled="multiple" <!-- :disabled="multiple"-->
@click="handleDelete" <!-- @click="handleDelete"-->
v-hasRole="['admin','tester']" <!-- v-hasRole="['admin','tester']"-->
>删除</el-button> <!-- >删除</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
@ -397,15 +397,15 @@
<el-form-item label="作品故事" prop="storyText"> <el-form-item label="作品故事" prop="storyText">
<editor v-model="form.storyText" :min-height="192"/> <editor v-model="form.storyText" :min-height="192"/>
</el-form-item> </el-form-item>
<el-form-item label="发售总数量" prop="issueNumber" v-hasRole="['admin','tester']" v-if="YC3"> <el-form-item label="发行总数量" prop="numberSales" v-hasRole="['admin','tester']" v-if="YC" >
<el-input v-model="form.issueNumber" placeholder="请输入发行总数量" maxLength = '6' οnkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}" <el-input v-model="form.numberSales" placeholder="请输入发行总数量" maxLength = '6' οnkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}" v-hasRole="['admin','tester']"/> onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}" v-hasRole="['admin','tester']"/>
</el-form-item> </el-form-item>
<el-form-item label="发行剩余总数量" prop="quantityIssued" v-hasRole="['admin','tester']" disabled=""> <el-form-item label="发售总数量" prop="issueNumber" v-hasRole="['admin','tester']" v-if="YC3">
<el-input v-model="form.quantityIssued" placeholder="请输入发行总数量" maxLength = '6' οnkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}" <el-input v-model="form.issueNumber" placeholder="请输入本次发售总数量(不能超过发行总数量)" maxLength = '6' οnkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}" v-hasRole="['admin','tester']"/> onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}" v-hasRole="['admin','tester']"/>
</el-form-item> </el-form-item>
<el-form-item label="艺术家手机号码" prop="artistId" v-if="YC" v-hasRole="['admin','tester']"> <el-form-item label="艺术家手机号码" prop="artistId" v-if="YC" v-hasRole="['admin','tester']" >
<el-input v-model="form.artistId" placeholder="请输入艺术家（店铺）手机号" <el-input v-model="form.artistId" placeholder="请输入艺术家（店铺）手机号"
onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}" onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}" onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
@ -855,7 +855,6 @@ export default {
obj.url= this.form.writerAvatar; obj.url= this.form.writerAvatar;
this.imgList.push( obj); this.imgList.push( obj);
this.form.seriesId = row.seriesName this.form.seriesId = row.seriesName
if(this.form.state === 1){ if(this.form.state === 1){
this.form.state = "待上架" this.form.state = "待上架"
this.YC3 =true this.YC3 =true
@ -932,7 +931,11 @@ export default {
return ; return ;
} }
if (this.form.issueNumber === null ||this.form.issueNumber === undefined){ if (this.form.issueNumber === null ||this.form.issueNumber === undefined){
this.$message.error("请输入作品数量") this.$message.error("请输入发行总数量")
return ;
}
if (this.form.numberSales === null ||this.form.numberSales === undefined){
this.$message.error("请输入发售总数量")
return ; return ;
} }
if (this.form.imagePath === null || this.form.imagePath === undefined){ if (this.form.imagePath === null || this.form.imagePath === undefined){
@ -959,7 +962,11 @@ export default {
} }
if (this.form.issueNumber === ""||this.form.issueNumber === null || this.form.issueNumber === undefined){ if (this.form.issueNumber === ""||this.form.issueNumber === null || this.form.issueNumber === undefined){
this.$message.error("请输入作品数量") this.$message.error("请输入发行总数量")
return ;
}
if (this.form.numberSales === ""||this.form.numberSales === null || this.form.numberSales === undefined){
this.$message.error("请输入发售总数量")
return ; return ;
} }
if (this.form.imagePath === ""||this.form.imagePath === null || this.form.imagePath === undefined){ if (this.form.imagePath === ""||this.form.imagePath === null || this.form.imagePath === undefined){
@ -986,7 +993,7 @@ export default {
handleDelete(row) { handleDelete(row) {
const id = row.id || this.ids const id = row.id || this.ids
const collectionName = row.collectionName || this.collectionName; const collectionName = row.collectionName || this.collectionName;
this.$modal.confirm('是否确认删除作品 名称为"' +collectionName + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除作品 名称为"' +collectionName + '"的作品？').then(function() {
return delCollection(id); return delCollection(id);
}).then(() => { }).then(() => {
this.getList(); this.getList();

Write Preview
Loading…
Cancel
Save