front/java-mall-admin
7
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

dev2 #1

Open
panjunjie wants to merge 201 commits from dev2 into main
pull from: dev2
merge into: front:main
Conversation 0 Commits 201 Files Changed 787 +95 -56
2 changed files with 95 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8a75f8a3b2 - Show all commits

4
src/views/store/base/components/StoreBaseEdit.vue
View File

@ -139,8 +139,8 @@
>
<el-switch
v-model="form.is_delivery_self"
:active-value="1"
:inactive-value="2"
:active-value=1
:inactive-value=2
@change="handleDeliveryStatus"
active-text="是"
inactive-text="否"

77
src/views/store/shopAudit/shopAuditDetails.vue
View File

@ -196,19 +196,16 @@
/> -->
</div>
</div>
<div class="item-info" style="margin: 40px 0">
<div class="item-info" style="margin: 40px 0;">
<div class="item-block">
<div class="item-lable">店铺门面正面图片</div>
<div>
<el-image
style="margin-right: 20px; width: 500px; height: 300px"
:src="
form.front_facade_image ||
require('@/assets/index_images/image.jpg')
"
:src="form.front_facade_image || require('@/assets/index_images/image.jpg')"
:preview-src-list="srcList1"
lazy
></el-image>
lazy />
<div class="upload-btn">
<el-upload
class="upload-demo"
@ -216,24 +213,19 @@
:data="uploadParams"
:show-file-list="false"
:limit="1"
:on-success="(response, file, fileList) => handleAvatarSuccess(response, file, fileList, 'front_facade_image')"
>
:on-success="(res,file,fileList)=>handleAvatarSuccess(res,file,fileList,'front_facade_image')">
<el-button size="small" type="primary">点击上传</el-button>
<div slot="tip" class="el-upload__tip">只能上传jpg/png文件</div>
</el-upload>
</div>
</div>
<div class="item-lable">店铺门面环境图片</div>
<div>
<el-image
style="margin-right: 20px; width: 500px; height: 300px"
:src="
form.environment_image ||
require('@/assets/index_images/image.jpg')
"
:preview-src-list="srcList2"
lazy
></el-image>
:src="form.environment_image || require('@/assets/index_images/image.jpg')"
:preview-src-list="srcList2" lazy />
<div class="upload-btn">
<el-upload
class="upload-demo"
@ -241,15 +233,58 @@
:data="uploadParams"
:show-file-list="false"
:limit="1"
:on-success="(response, file, fileList) => handleAvatarSuccess(response, file, fileList, 'environment_image')"
>
:on-success="(res,file,fileList)=>handleAvatarSuccess(res,file,fileList,'environment_image')">
<el-button size="small" type="primary">点击上传</el-button>
<div slot="tip" class="el-upload__tip">只能上传jpg/png文件</div>
</el-upload>
</div>
</div>
</div>
</div>
<div class="item-info" style="margin: 40px 0;">
<div class="item-block">
<div class="item-lable">门店收银台图片</div>
<div>
<el-image
style="margin-right: 20px; width: 500px; height: 300px"
:src="form.checkstand_image || require('@/assets/index_images/image.jpg')"
:preview-src-list="srcListNew1" lazy />
<div class="upload-btn">
<el-upload
class="upload-demo"
:action="uploadUrl"
:data="uploadParams"
:show-file-list="false"
:limit="1"
:on-success="(res,file,fileList)=>handleAvatarSuccess(res,file,fileList,'checkstand_image')">
<el-button size="small" type="primary">点击上传</el-button>
<div slot="tip" class="el-upload__tip">只能上传jpg/png文件</div>
</el-upload>
</div>
</div>
<div class="item-lable">许可证照片</div>
<div>
<el-image
style="margin-right: 20px; width: 500px; height: 300px"
:src="form.opening_permit_image || require('@/assets/index_images/image.jpg')"
:preview-src-list="srcListNew2" lazy />
<div class="upload-btn">
<el-upload
class="upload-demo"
:action="uploadUrl"
:data="uploadParams"
:show-file-list="false"
:limit="1"
:on-success="(res,file,fileList)=>handleAvatarSuccess(res,file,fileList,'opening_permit_image')">
<el-button size="small" type="primary">点击上传</el-button>
<div slot="tip" class="el-upload__tip">只能上传jpg/png文件</div>
</el-upload>
</div>
</div>
</div>
</div>
<div class="item-title">到账/结算 &nbsp;信息</div>
<div class="item-info">
<div class="item-block">
@ -980,7 +1015,7 @@
<el-button
v-if="![1,5].includes(form.approval_status)"
class="btn"
type="normal"
type="success"
@click="saveUserInfo()"
>
保存信息
@ -1090,6 +1125,8 @@ export default {
entity_type: '',
front_facade_image: '',
environment_image: '',
checkstand_image:'',
opening_permit_image:'',
biz_license_number: '',
biz_license_image: '',
biz_license_content:'',
@ -1214,6 +1251,8 @@ export default {
isIndeterminate: true,
srcList1: [],
srcList2: [],
srcListNew1:[],
srcListNew2:[],
srcList3: [],
srcList4: [],
srcList5: [],