mkm/new_shop_mer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
DESKTOP-GMUNQ1B\k 2024-04-10 17:08:27 +08:00
parent 46b6d92a36
commit e52f05a384
8 changed files with 406 additions and 355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.eslintignore
View File

@ -2,3 +2,5 @@ build/*.js
src/assets src/assets
public public
dist dist
views/
views

3
.eslintrc.js
View File

@ -37,7 +37,8 @@ module.exports = {
'camelcase': [0, { 'camelcase': [0, {
'properties': 'always' 'properties': 'always'
}], }],
'comma-dangle': [2, 'never'], // 'comma-dangle': [2, 'never'],
'comma-dangle': "off",
'comma-spacing': [2, { 'comma-spacing': [2, {
'before': false, 'before': false,
'after': true 'after': true

3
package.json
View File

@ -53,6 +53,7 @@
"file-saver": "2.0.1", "file-saver": "2.0.1",
"fuse.js": "3.4.4", "fuse.js": "3.4.4",
"html2canvas": "^1.1.0", "html2canvas": "^1.1.0",
"jquery": "^3.7.1",
"js-cookie": "2.2.0", "js-cookie": "2.2.0",
"jsonlint": "1.6.3", "jsonlint": "1.6.3",
"jszip": "3.2.1", "jszip": "3.2.1",
@ -69,8 +70,8 @@
"screenfull": "4.2.0", "screenfull": "4.2.0",
"showdown": "1.9.0", "showdown": "1.9.0",
"sortablejs": "^1.15.0", "sortablejs": "^1.15.0",
"view-design": "^4.3.2",
"v-viewer": "^1.5.1", "v-viewer": "^1.5.1",
"view-design": "^4.3.2",
"vue": "2.6.10", "vue": "2.6.10",
"vue-awesome-swiper": "^3.1.3", "vue-awesome-swiper": "^3.1.3",
"vue-count-to": "1.0.13", "vue-count-to": "1.0.13",

1
src/main.js
View File

@ -54,6 +54,7 @@ import * as filters from "./filters"; // global filters modalTemplates
import notice from "@/libs/notice"; // global filters import notice from "@/libs/notice"; // global filters
import guidancePop from "@/components/guidancePop"; import guidancePop from "@/components/guidancePop";
import { getToken } from "./utils/auth"; import { getToken } from "./utils/auth";
Vue.prototype.bus = new Vue(); Vue.prototype.bus = new Vue();
Vue.use(uploadPicture); Vue.use(uploadPicture);
Vue.use(FormCreate); Vue.use(FormCreate);

71
src/views/accounts/payType.vue
View File

@ -1,16 +1,9 @@
<template> <template>
<div class="divBox"> <div class="divBox">
<el-card class="box-card"> <el-card class="box-card">
<form-create <form-create v-model:api="fapi" v-if="FormData" ref="fc" v-loading="loading" :option="option"
v-if="FormData" :rule="FormData.rule" class="formBox" handle-icon="false" @submit="onSubmit">
ref="fc" </form-create>
v-loading="loading"
:option="option"
:rule="FormData.rule"
class="formBox"
handle-icon="false"
@submit="onSubmit"
/>
</el-card> </el-card>
</div> </div>
</template> </template>
@ -28,17 +21,23 @@
import formCreate from '@form-create/element-ui' import formCreate from '@form-create/element-ui'
import { paymentTypeApi } from '@/api/accounts' import { paymentTypeApi } from '@/api/accounts'
import request from '@/api/request' import request from '@/api/request'
import { roterPre } from '@/settings' import { roterPre } from '@/settings';
export default { export default {
name: 'payType', name: 'payType',
data() { data() {
return { return {
fapi: {},
option: { option: {
form: { form: {
labelWidth: '150px' labelWidth: '150px'
}, },
global: { global: {
'*': {
props: {
disabled: false
}
},
upload: { upload: {
props: { props: {
onSuccess(rep, file) { onSuccess(rep, file) {
@ -48,7 +47,10 @@ export default {
} }
} }
} }
} },
submitBtn: {
show: true,
},
}, },
FormData: null, FormData: null,
loading: false, loading: false,
@ -70,13 +72,32 @@ export default {
mounted() { mounted() {
this.getFrom(); this.getFrom();
setTimeout(() => {
console.log(this.$refs.fc)
}, 2000);
}, },
methods: { methods: {
// 为了隐藏提交按钮
getDomInfo() {
var labels = document.getElementsByTagName("label");
for (let i = 0; i < labels.length; i++) {
let label = labels[i];
if (label.innerText == '审核通过' && label.className.indexOf("is-checked") > -1) {
this.option.submitBtn.show = false;
} else if (label.innerText != '审核通过' && label.className.indexOf("is-checked") > -1) {
this.option.submitBtn.show = true;
}
}
},
setTagsViewTitle() { setTagsViewTitle() {
this.deepTraversal(this.menuList, "children"); this.deepTraversal(this.menuList, "children");
const route = Object.assign({}, this.tempRoute, { title: this.titles }); const route = Object.assign({}, this.tempRoute, { title: this.titles });
this.$store.dispatch("tagsView/updateVisitedView", route); this.$store.dispatch("tagsView/updateVisitedView", route);
}, },
deepTraversal(arr, child) { deepTraversal(arr, child) {
const that = this; const that = this;
function traversal(a) { function traversal(a) {
@ -96,11 +117,25 @@ export default {
traversal(arr); traversal(arr);
}, },
changes() {
this.getDomInfo();
},
getFrom() { getFrom() {
this.loading = true this.loading = true
paymentTypeApi().then(async res => { paymentTypeApi().then(async res => {
this.FormData = res.data this.FormData = res.data;
this.loading = false this.FormData.rule[0] = {
...this.FormData.rule[0],
on: {
change: this.changes
}
}
this.loading = false;
this.$nextTick(() => {
this.getDomInfo();
})
}).catch(res => { }).catch(res => {
this.$message.error(res.message) this.$message.error(res.message)
this.loading = false this.loading = false
@ -118,6 +153,10 @@ export default {
} }
</script> </script>
<style scoped> <style lang="scss">
.divBox {
.el-select--medium {
width: 100% !important;
}
}
</style> </style>

10
src/views/product/addProduct/index.vue
View File

@ -275,8 +275,8 @@
<el-input v-if="formThead[iii].title !== '付费会员价' && <el-input v-if="formThead[iii].title !== '付费会员价' &&
formThead[iii].title !== '商品编号' && formThead[iii].title !== '商品编号' &&
formThead[iii].title !== '库存' formThead[iii].title !== '库存'
" v-model="scope.row[iii]" type="number" min="0" size="small" class="priceBox" " v-model="scope.row[iii]" type="number" min="0" size="small" class="priceBox" controls-position="right"
controls-position="right" @blur="memberPrice(formThead[iii], scope.row)" /> @blur="memberPrice(formThead[iii], scope.row)" />
<el-input v-if="formThead[iii].title === '库存' && formValidate.type == 2" v-model="scope.row[iii]" <el-input v-if="formThead[iii].title === '库存' && formValidate.type == 2" v-model="scope.row[iii]"
type="text" size="small" class="priceBox" disabled /> type="text" size="small" class="priceBox" disabled />
<el-input v-else-if="formThead[iii].title === '库存' && formValidate.type != 2" <el-input v-else-if="formThead[iii].title === '库存' && formValidate.type != 2"
@ -2538,9 +2538,9 @@ export default {
if (!this.formValidate.cate_id) { if (!this.formValidate.cate_id) {
return this.$message.warning("基本信息-平台商品分类不能为空"); return this.$message.warning("基本信息-平台商品分类不能为空");
} }
// if (!this.formValidate.mer_cate_id) { if (!this.formValidate.mer_cate_id) {
// return this.$message.warning("基本信息-商户商品分类不能为空"); return this.$message.warning("基本信息-商户商品分类不能为空");
// } }
if (!this.formValidate.image) { if (!this.formValidate.image) {
return this.$message.warning("基本信息-商品封面图不能为空"); return this.$message.warning("基本信息-商品封面图不能为空");
} }

198
src/views/systemForm/setSystem/modifyStoreInfo.vue
View File

@ -44,10 +44,13 @@
<div class="basic-information"> <div class="basic-information">
<div> <div>
<span class="basic-label">是否开启商户：</span> <span class="basic-label">是否开启商户：</span>
<el-tooltip v-if="merData.is_margin == 1 && merData.mer_state == 0" class="item" effect="dark" content="请先支付店铺保证金！" placement="top-start"> <el-tooltip v-if="merData.is_margin == 1 && merData.mer_state == 0" class="item" effect="dark"
<el-switch disabled v-model="merData.mer_state" :width="55" active-text="开启" inactive-text="关闭" :active-value="1" :inactive-value="0" /> content="请先支付店铺保证金！" placement="top-start">
<el-switch disabled v-model="merData.mer_state" :width="55" active-text="开启" inactive-text="关闭"
:active-value="1" :inactive-value="0" />
</el-tooltip> </el-tooltip>
<el-switch v-else v-model="merData.mer_state" active-text="开启" inactive-text="关闭" :active-value="1" :inactive-value="0" :width="55" /> <el-switch v-else v-model="merData.mer_state" active-text="开启" inactive-text="关闭" :active-value="1"
:inactive-value="0" :width="55" />
<span class="trip">开启，店铺即可展示在移动端</span> <span class="trip">开启，店铺即可展示在移动端</span>
</div> </div>
</div> </div>
@ -83,7 +86,8 @@
<img src="@/assets/images/margin03.png" /> <img src="@/assets/images/margin03.png" />
<div class="alic"> <div class="alic">
<span class="text_g">剩余保证金￥{{ merData.margin }}元</span> <span class="text_g">剩余保证金￥{{ merData.margin }}元</span>
<el-button v-if="merData.margin>0" type="primary" size="small" @click="applyReturn">申请退回保证金</el-button> <el-button v-if="merData.margin > 0" type="primary" size="small"
@click="applyReturn">申请退回保证金</el-button>
</div> </div>
</div> </div>
</div> </div>
@ -117,7 +121,8 @@
<img v-if="merData.is_margin == 10" src="@/assets/images/margin03.png" /> <img v-if="merData.is_margin == 10" src="@/assets/images/margin03.png" />
<div class="alic" v-if="merData.is_margin == 10"> <div class="alic" v-if="merData.is_margin == 10">
<span class="text_g">剩余保证金￥{{ merData.margin }}元</span> <span class="text_g">剩余保证金￥{{ merData.margin }}元</span>
<el-button v-if="merData.margin>0" type="primary" size="small" @click="applyReturn">申请退回保证金</el-button> <el-button v-if="merData.margin > 0" type="primary" size="small"
@click="applyReturn">申请退回保证金</el-button>
</div> </div>
<div class="alic" v-if="merData.is_margin == -1"> <div class="alic" v-if="merData.is_margin == -1">
<span class="text_b b01"> 审核中</span> <span class="text_b b01"> 审核中</span>
@ -136,15 +141,8 @@
</div> </div>
</div> </div>
<!--申请退回保障金银行信息弹窗--> <!--申请退回保障金银行信息弹窗-->
<el-dialog <el-dialog v-if="modalBank" v-model="modalBank" :visible.sync="modalBank" title="申请退回保证金" width="600px"
v-if="modalBank" close-on-click-modal custom-class="dialog-scustom">
v-model="modalBank"
:visible.sync="modalBank"
title="申请退回保证金"
width="600px"
close-on-click-modal
custom-class="dialog-scustom"
>
<div class="bank-container"> <div class="bank-container">
<div class="item">说明： <span class="red">申请退回保证金则视为关闭店铺，请谨慎操作！</span></div> <div class="item">说明： <span class="red">申请退回保证金则视为关闭店铺，请谨慎操作！</span></div>
<div class="item"> <div class="item">
@ -155,7 +153,8 @@
</div> </div>
</div> </div>
<div class="title">账号信息：</div> <div class="title">账号信息：</div>
<el-form ref="bankValidate" :model="bankValidate" :rules="bankRules" label-width="100px" @submit.native.prevent> <el-form ref="bankValidate" :model="bankValidate" :rules="bankRules" label-width="100px"
@submit.native.prevent>
<el-form-item label="真实姓名：" prop="name"> <el-form-item label="真实姓名：" prop="name">
<el-input v-model="bankValidate.name" type="text" placeholder="请输入真实姓名" /> <el-input v-model="bankValidate.name" type="text" placeholder="请输入真实姓名" />
</el-form-item> </el-form-item>
@ -180,7 +179,7 @@
<div v-if="infoType == '2'" class="business-msg"> <div v-if="infoType == '2'" class="business-msg">
<div class="form-data"> <div class="form-data">
<el-form ref="ruleForm" :model="merData" :rules="rules" label-width="150px" class="demo-ruleForm"> <el-form ref="ruleForm" :model="merData" :rules="rules" label-width="150px" class="demo-ruleForm">
<el-form-item class="form-item" label="店铺背景图：" prop="mer_banner"> <!-- <el-form-item class="form-item" label="店铺背景图：" prop="mer_banner">
<div class="upLoadPicBox" @click="modalPicTap('1')"> <div class="upLoadPicBox" @click="modalPicTap('1')">
<div v-if="merData.mer_banner" class="pictrue"> <div v-if="merData.mer_banner" class="pictrue">
<img :src="merData.mer_banner"> <img :src="merData.mer_banner">
@ -190,7 +189,7 @@
</div> </div>
<div class="trip">建议尺寸：710*200px</div> <div class="trip">建议尺寸：710*200px</div>
</div> </div>
</el-form-item> </el-form-item> -->
<el-form-item class="form-item" label="店铺头像：" prop="mer_avatar"> <el-form-item class="form-item" label="店铺头像：" prop="mer_avatar">
<div class="upLoadPicBox" @click="modalPicTap('2')"> <div class="upLoadPicBox" @click="modalPicTap('2')">
<div v-if="merData.mer_avatar" class="pictrue"> <div v-if="merData.mer_avatar" class="pictrue">
@ -202,7 +201,7 @@
<div class="trip">建议尺寸：120*120px</div> <div class="trip">建议尺寸：120*120px</div>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item class="form-item" label="店铺街背景图："> <!-- <el-form-item class="form-item" label="店铺街背景图：">
<div class="upLoadPicBox" @click="modalPicTap('3')"> <div class="upLoadPicBox" @click="modalPicTap('3')">
<div v-if="merData.mini_banner" class="pictrue"> <div v-if="merData.mini_banner" class="pictrue">
<img :src="merData.mini_banner"> <img :src="merData.mini_banner">
@ -212,8 +211,9 @@
</div> </div>
<div class="trip">建议尺寸：710*134px或710*460px(请根据平台要求选择尺寸，此图如未上传默认展示店铺背景图)</div> <div class="trip">建议尺寸：710*134px或710*460px(请根据平台要求选择尺寸，此图如未上传默认展示店铺背景图)</div>
</div> </div>
</el-form-item> </el-form-item> -->
<el-form-item class="form-item" label="店铺资质：" :prop="merData.sys_bases_status == 1 ? 'uploadedqualifications' : ''"> <el-form-item class="form-item" label="店铺资质："
:prop="merData.sys_bases_status == 1 ? 'uploadedqualifications' : ''">
<div class="upLoadPicBox_qualification"> <div class="upLoadPicBox_qualification">
<div v-for="(item, index) in uploadedQualifications" :key="index" class="uploadpicBox_list"> <div v-for="(item, index) in uploadedQualifications" :key="index" class="uploadpicBox_list">
<div class="uploadpicBox_list_image"> <div class="uploadpicBox_list_image">
@ -224,7 +224,8 @@
<i class="el-icon-view" @click="viewImage(item, index)" /> <i class="el-icon-view" @click="viewImage(item, index)" />
</div> </div>
</div> </div>
<el-upload :action="fileUrl" :show-file-list="false" list-type="picture-card" multiple :headers="myHeaders" :on-success="setQualificationsList" :before-upload="beforeUploadQualification"> <el-upload :action="fileUrl" :show-file-list="false" list-type="picture-card" multiple
:headers="myHeaders" :on-success="setQualificationsList" :before-upload="beforeUploadQualification">
<i class="el-icon-plus" /> <i class="el-icon-plus" />
</el-upload> </el-upload>
</div> </div>
@ -236,7 +237,9 @@
</el-checkbox> </el-checkbox>
</el-checkbox-group> <span class="trip">只选择一种配送方式时,会自动修改店铺所有商品的配送方式</span> </el-checkbox-group> <span class="trip">只选择一种配送方式时,会自动修改店铺所有商品的配送方式</span>
</el-form-item> </el-form-item>
<el-row v-if="(merData.delivery_way.length == 1 && merData.delivery_way[0] == '1') || (merData.delivery_way.length == 2)" :gutter="24"> <el-row
v-if="(merData.delivery_way.length == 1 && merData.delivery_way[0] == '1') || (merData.delivery_way.length == 2)"
:gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="提货点名称：" prop="mer_take_name"> <el-form-item label="提货点名称：" prop="mer_take_name">
<el-input v-model="merData.mer_take_name" maxlength="30" placeholder="请输入提货点名称" /> <el-input v-model="merData.mer_take_name" maxlength="30" placeholder="请输入提货点名称" />
@ -244,14 +247,12 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="提货点电话：" prop="mer_take_phone"> <el-form-item label="提货点电话：" prop="mer_take_phone">
<el-input <el-input v-model="merData.mer_take_phone" placeholder="请输入提货点电话" />
v-model="merData.mer_take_phone"
placeholder="请输入提货点电话"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="(merData.delivery_way.length == 1 && merData.delivery_way[0] == '1') || (merData.delivery_way.length == 2)" > <el-row
v-if="(merData.delivery_way.length == 1 && merData.delivery_way[0] == '1') || (merData.delivery_way.length == 2)">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="详细地址：" prop="mer_take_address"> <el-form-item label="详细地址：" prop="mer_take_address">
<el-input v-model="merData.mer_take_address" placeholder="请输入详细地址" /> <el-input v-model="merData.mer_take_address" placeholder="请输入详细地址" />
@ -259,53 +260,27 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="经纬度：" prop="mer_take_location"> <el-form-item label="经纬度：" prop="mer_take_location">
<el-input <el-input v-model="merData.mer_take_location" enter-button="查找位置" placeholder="请查找位置" readonly>
v-model="merData.mer_take_location" <el-button slot="append" type="primary" @click="onSearchs">查找位置</el-button>
enter-button="查找位置"
placeholder="请查找位置"
readonly
>
<el-button
slot="append"
type="primary"
@click="onSearchs"
>查找位置</el-button>
</el-input> </el-input>
<div slot="content">请点击查找位置选择位置</div> <div slot="content">请点击查找位置选择位置</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="(merData.delivery_way.length == 1 && merData.delivery_way[0] == '1') || (merData.delivery_way.length == 2)" > <el-row
v-if="(merData.delivery_way.length == 1 && merData.delivery_way[0] == '1') || (merData.delivery_way.length == 2)">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="提货点营业日期：" prop="mer_take_day"> <el-form-item label="提货点营业日期：" prop="mer_take_day">
<el-select <el-select v-model="merData.mer_take_day" filterable multiple placeholder="请选择营业时间">
v-model="merData.mer_take_day" <el-option v-for="item in date" :key="item.date_id" :label="item.date_name" :value="item.date_id" />
filterable
multiple
placeholder="请选择营业时间"
>
<el-option
v-for="item in date"
:key="item.date_id"
:label="item.date_name"
:value="item.date_id"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="提货点营业时间：" required> <el-form-item label="提货点营业时间：" required>
<el-time-picker <el-time-picker v-model="value1" placeholder="开始时间" value-format="HH:mm" @change="onchangeTime1">
v-model="value1"
placeholder="开始时间"
value-format="HH:mm"
@change="onchangeTime1">
</el-time-picker> </el-time-picker>
<el-time-picker <el-time-picker v-model="value2" placeholder="结束时间" value-format="HH:mm" @change="onchangeTime2">
v-model="value2"
placeholder="结束时间"
value-format="HH:mm"
@change="onchangeTime2">
</el-time-picker> </el-time-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -323,9 +298,7 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="联系客服方式："> <el-form-item label="联系客服方式：">
<el-radio-group <el-radio-group v-model="merData.services_type">
v-model="merData.services_type"
>
<el-radio :label="0" class="radio">线上客服</el-radio> <el-radio :label="0" class="radio">线上客服</el-radio>
<el-radio :label="1">拨打电话</el-radio> <el-radio :label="1">拨打电话</el-radio>
</el-radio-group> </el-radio-group>
@ -338,14 +311,17 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="商户地址：" prop="mer_address"> <el-form-item label="商户地址：" prop="mer_address">
<el-input v-model="merData.mer_address" enter-button="查找位置" placeholder="请输入商户地址（地址中请包含城市名称，否则会影响搜索精度）"> <el-input v-model="merData.mer_address" enter-button="查找位置"
placeholder="请输入商户地址（地址中请包含城市名称，否则会影响搜索精度）">
<el-button slot="append" type="primary" @click="onSearch">查找位置</el-button> <el-button slot="append" type="primary" @click="onSearch">查找位置</el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div style="width: 460px;margin-left: 150px;"> <div style="width: 460px;margin-left: 150px;">
<Maps v-if="mapKey" ref="mapChild" class="map-sty" :map-key="mapKey" :lat="Number(merData.lat || 34.34127)" :lon="Number(merData.long || 108.93984)" :address="merData.mer_address" @getCoordinates="getCoordinates" /> <Maps v-if="mapKey" ref="mapChild" class="map-sty" :map-key="mapKey"
:lat="Number(merData.lat || 34.34127)" :lon="Number(merData.long || 108.93984)"
:address="merData.mer_address" @getCoordinates="getCoordinates" />
</div> </div>
<el-form-item /> <el-form-item />
</el-form> </el-form>
@ -354,7 +330,8 @@
<div v-if="infoType == '3'" class="user-msg"> <div v-if="infoType == '3'" class="user-msg">
<div class="basic-information"> <div class="basic-information">
<span class="basic-label"> 商户手续费：</span> <span class="basic-label"> 商户手续费：</span>
{{ Number(merData.commission_rate) > 0 ? (parseFloat(merData.commission_rate)).toFixed(2) : (parseFloat(merData.merchantCategory.commission_rate * 100)).toFixed(2)}}% {{ Number(merData.commission_rate) > 0 ? (parseFloat(merData.commission_rate)).toFixed(2) :
(parseFloat(merData.merchantCategory.commission_rate * 100)).toFixed(2) }}%
</div> </div>
<div class="basic-information"> <div class="basic-information">
<span class="basic-label"> 添加商品：</span> <span class="basic-label"> 添加商品：</span>
@ -377,27 +354,13 @@
<el-button type="primary" :loading="submitLoading" @click="submitForm('ruleForm')">提交</el-button> <el-button type="primary" :loading="submitLoading" @click="submitForm('ruleForm')">提交</el-button>
</div> </div>
</div> </div>
<el-dialog <el-dialog v-if="modalMap" v-model="modalMap" :visible.sync="modalMap" title="选择位置" close-on-click-modal
v-if="modalMap" class="mapBox" custom-class="dialog-scustom">
v-model="modalMap"
:visible.sync="modalMap"
title="选择位置"
close-on-click-modal
class="mapBox"
custom-class="dialog-scustom"
>
<iframe id="mapPage" width="100%" height="500px" frameborder="0" :src="keyUrl" /> <iframe id="mapPage" width="100%" height="500px" frameborder="0" :src="keyUrl" />
</el-dialog> </el-dialog>
<!--保证金记录--> <!--保证金记录-->
<el-dialog <el-dialog v-if="modalRecord" :visible.sync="modalRecord" title="操作记录" width="800px" close-on-click-modal
v-if="modalRecord" class="mapBox" custom-class="dialog-scustom">
:visible.sync="modalRecord"
title="操作记录"
width="800px"
close-on-click-modal
class="mapBox"
custom-class="dialog-scustom"
>
<el-table :data="tableData.data" :loading="loading" size="small"> <el-table :data="tableData.data" :loading="loading" size="small">
<el-table-column label="序号" min-width="50"> <el-table-column label="序号" min-width="50">
<template scope="scope"> <template scope="scope">
@ -416,14 +379,8 @@
<el-table-column prop="create_time" label="操作时间" min-width="120" /> <el-table-column prop="create_time" label="操作时间" min-width="120" />
</el-table> </el-table>
<div class="acea-row row-right page"> <div class="acea-row row-right page">
<el-pagination <el-pagination :page-size="tableFrom.limit" :current-page="tableFrom.page" layout="prev, pager, next, jumper"
:page-size="tableFrom.limit" :total="tableData.total" @size-change="handleSizeChange" @current-change="pageChange" />
:current-page="tableFrom.page"
layout="prev, pager, next, jumper"
:total="tableData.total"
@size-change="handleSizeChange"
@current-change="pageChange"
/>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
@ -549,7 +506,8 @@ export default {
mer_take_day: [], mer_take_day: [],
mer_take_location: '', mer_take_location: '',
id: 0, id: 0,
mer_take_status: 0 }, // 默认数据 mer_take_status: 0
}, // 默认数据
myHeaders: { 'X-Token': getToken() }, myHeaders: { 'X-Token': getToken() },
uploadedQualifications: [], // 资质图片列表 uploadedQualifications: [], // 资质图片列表
mapKey: '', // 地图key mapKey: '', // 地图key
@ -570,7 +528,6 @@ export default {
{ value: '2', name: '快递配送' } { value: '2', name: '快递配送' }
], ],
rules: { rules: {
mer_banner: [{ required: true, message: '请上传店铺banner' }],
mer_avatar: [{ required: true, message: '请上传店铺头像' }], mer_avatar: [{ required: true, message: '请上传店铺头像' }],
mer_info: [{ required: true, message: '请输入商户简介', trigger: 'blur' }, mer_info: [{ required: true, message: '请输入商户简介', trigger: 'blur' },
{ min: 3, max: 200, message: '长度在 3 到 200 个字符', trigger: 'blur' } { min: 3, max: 200, message: '长度在 3 到 200 个字符', trigger: 'blur' }
@ -931,22 +888,26 @@ export default {
::v-deep .el-textarea__inner { ::v-deep .el-textarea__inner {
height: 90px; height: 90px;
} }
.information { .information {
width: 100%; width: 100%;
padding: 10px 20px 80px 20px; padding: 10px 20px 80px 20px;
background: #ffffff; background: #ffffff;
h2 { h2 {
text-align: center; text-align: center;
color: #303133; color: #303133;
font-weight: bold; font-weight: bold;
font-size: 20px; font-size: 20px;
} }
.lab-title { .lab-title {
width: max-content; width: max-content;
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
color: #303133; color: #303133;
margin: 10px 10%; margin: 10px 10%;
&::before { &::before {
content: ""; content: "";
display: inline-block; display: inline-block;
@ -958,10 +919,12 @@ export default {
top: 1px; top: 1px;
} }
} }
.user-msg { .user-msg {
padding: 0 20px; padding: 0 20px;
margin-top: 20px; margin-top: 20px;
} }
.basic-information { .basic-information {
padding: 0 100px; padding: 0 100px;
margin-bottom: 20px; margin-bottom: 20px;
@ -969,6 +932,7 @@ export default {
text-rendering: optimizeLegibility; text-rendering: optimizeLegibility;
font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif; font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
color: #606266; color: #606266;
.basic-label { .basic-label {
display: inline-block; display: inline-block;
text-align: right; text-align: right;
@ -976,26 +940,33 @@ export default {
margin-right: 10px; margin-right: 10px;
} }
} }
.trip { .trip {
color: #999999; color: #999999;
font-weight: normal; font-weight: normal;
font-size: 12px; font-size: 12px;
} }
.demo-ruleForm { .demo-ruleForm {
overflow: hidden; overflow: hidden;
} }
.form-data { .form-data {
padding: 30px 8%; padding: 30px 8%;
.map-sty { .map-sty {
width: 100%; width: 100%;
} }
.pictrue img { .pictrue img {
border-radius: 4px; border-radius: 4px;
object-fit: cover; object-fit: cover;
} }
.tip-form { .tip-form {
display: flex; display: flex;
align-items: center; align-items: center;
span { span {
white-space: nowrap; white-space: nowrap;
padding-left: 10px; padding-left: 10px;
@ -1003,6 +974,7 @@ export default {
} }
} }
} }
.submit-button { .submit-button {
display: flex; display: flex;
justify-content: center; justify-content: center;
@ -1014,20 +986,26 @@ export default {
background-color: rgba(255, 255, 255, 0.7); background-color: rgba(255, 255, 255, 0.7);
} }
} }
.information ::v-deep .el-form-item__label { .information ::v-deep .el-form-item__label {
color: #303133; color: #303133;
} }
.bank-container { .bank-container {
padding: 0 20px; padding: 0 20px;
.item { .item {
margin-top: 10px; margin-top: 10px;
color: #282828; color: #282828;
font-size: 13px; font-size: 13px;
line-height: 26px; line-height: 26px;
} }
.red { .red {
color:rgb(237, 64, 20);; color: rgb(237, 64, 20);
;
} }
.title { .title {
color: #303133; color: #303133;
margin: 15px 0; margin: 15px 0;
@ -1035,21 +1013,26 @@ export default {
} }
} }
.font_red { .font_red {
color: red; color: red;
margin-right: 5px; margin-right: 5px;
} }
.spanBtn { .spanBtn {
color: var(--prev-color-primary); color: var(--prev-color-primary);
font-size: 12px; font-size: 12px;
cursor: pointer; cursor: pointer;
} }
.margin_main { .margin_main {
position: relative; position: relative;
.margin_price { .margin_price {
cursor: pointer; cursor: pointer;
} }
} }
.margin_modal { .margin_modal {
position: absolute; position: absolute;
left: -20px; left: -20px;
@ -1063,63 +1046,77 @@ export default {
padding-bottom: 30px; padding-bottom: 30px;
box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3); box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
display: none; display: none;
.alic { .alic {
text-align: center; text-align: center;
} }
img { img {
display: block; display: block;
width: 150px; width: 150px;
height: 116px; height: 116px;
margin: 20px auto 50px; margin: 20px auto 50px;
} }
span { span {
margin-bottom: 10px; margin-bottom: 10px;
display: block; display: block;
font-weight: normal; font-weight: normal;
text-align: center; text-align: center;
} }
.text_g { .text_g {
font-size: 16px; font-size: 16px;
color: #303133; color: #303133;
} }
.text_b { .text_b {
color: #606266; color: #606266;
font-size: 18px; font-size: 18px;
font-weight: bold; font-weight: bold;
margin-bottom: 14px; margin-bottom: 14px;
&.b02 { &.b02 {
color: #EF9B6F; color: #EF9B6F;
} }
&.b01 { &.b01 {
color: #57D1A0; color: #57D1A0;
} }
} }
.el-button { .el-button {
margin-top: 25px; margin-top: 25px;
} }
} }
.margin_refused { .margin_refused {
display: block; display: block;
margin-bottom: 10px; margin-bottom: 10px;
text-align: center; text-align: center;
color: #606266; color: #606266;
span { span {
display: inline; display: inline;
// color: red; // color: red;
} }
} }
.margin_count { .margin_count {
position: relative; position: relative;
display: inline-block; display: inline-block;
padding-bottom: 10px; padding-bottom: 10px;
.pay_btn:hover+.erweima { .pay_btn:hover+.erweima {
display: block; display: block;
} }
&:hover { &:hover {
.margin_modal { .margin_modal {
display: block; display: block;
} }
} }
.erweima { .erweima {
position: absolute; position: absolute;
left: 0; left: 0;
@ -1139,22 +1136,26 @@ export default {
height: 160px; height: 160px;
margin-top: 20px; margin-top: 20px;
} }
.pay_type { .pay_type {
font-size: 16px; font-size: 16px;
color: #303133; color: #303133;
font-weight: normal; font-weight: normal;
} }
.pay_price { .pay_price {
font-size: 18px; font-size: 18px;
color: #E57272; color: #E57272;
margin: 10px 0; margin: 10px 0;
} }
.pay_title { .pay_title {
font-size: 16px; font-size: 16px;
color: #303133; color: #303133;
margin-top: 20px; margin-top: 20px;
} }
.pay_time { .pay_time {
font-size: 12px; font-size: 12px;
color: #6D7278; color: #6D7278;
@ -1163,6 +1164,7 @@ export default {
} }
} }
::v-deep .el-upload--picture-card { ::v-deep .el-upload--picture-card {
width: 58px; width: 58px;
height: 58px; height: 58px;
@ -1177,11 +1179,13 @@ export default {
.upLoadPicBox_qualification { .upLoadPicBox_qualification {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
.uploadpicBox_list { .uploadpicBox_list {
position: relative; position: relative;
height: 58px; height: 58px;
width: 58px; width: 58px;
margin: 0 20px 20px 0; margin: 0 20px 20px 0;
.uploadpicBox_list_image { .uploadpicBox_list_image {
position: absolute; position: absolute;
top: 0; top: 0;
@ -1190,6 +1194,7 @@ export default {
height: 58px; height: 58px;
border-radius: 4px; border-radius: 4px;
overflow: hidden; overflow: hidden;
img { img {
width: 100%; width: 100%;
height: 100%; height: 100%;
@ -1215,6 +1220,7 @@ export default {
} }
} }
} }
.uploadpicBox_list:hover .uploadpicBox_list_method { .uploadpicBox_list:hover .uploadpicBox_list_method {
z-index: 11; z-index: 11;
opacity: 1; opacity: 1;

3
vue.config.js
View File

@ -28,7 +28,8 @@ module.exports = {
outputDir: 'dist', outputDir: 'dist',
assetsDir: 'mer', assetsDir: 'mer',
indexPath: process.env.NODE_ENV === 'development' ? 'index.html' : 'mer.html', indexPath: process.env.NODE_ENV === 'development' ? 'index.html' : 'mer.html',
lintOnSave: process.env.NODE_ENV === 'development', lintOnSave: false,
// lintOnSave: process.env.NODE_ENV === 'development',
productionSourceMap: false, productionSourceMap: false,
devServer: { devServer: {
port: port, port: port,