dev2 #1

Open
panjunjie wants to merge 174 commits from dev2 into main
20 changed files with 98 additions and 49 deletions
Showing only changes of commit fd6001d32d - Show all commits

View File

@ -5,5 +5,5 @@
window.ver = "2.0.278";
window.SYS = {CONFIG:{}, URL:{}};</script><script>window._AMapSecurityConfig = {
securityJsCode:"07788e7ebd7e913985722bfc5986999f"
}</script><script src="https://mall.gpxscs.cn/admin/config.js?v=2.0.278"></script><script src="https://mall.gpxscs.cn/admin/im/libs3.6.0.min.js?v=2.0.278"></script><script src="https://mall.gpxscs.cn/admin/im/im.js?v=2.0.278"></script><link href="static/css/chunk-05a0eb9e.a2ba01b6.css" rel="prefetch"><link href="static/css/chunk-19648027.83a11e8c.css" rel="prefetch"><link href="static/css/vab-extra.9da8d2d7.css" rel="prefetch"><link href="static/js/chunk-05a0eb9e.71beb66a.js" rel="prefetch"><link href="static/js/chunk-19648027.6233a553.js" rel="prefetch"><link href="static/js/vab-extra.29abc81b.js" rel="prefetch"><link href="static/css/app.d3766ec2.css" rel="preload" as="style"><link href="static/css/element-ui.0e3a750b.css" rel="preload" as="style"><link href="static/js/app.c6eeaab0.js" rel="preload" as="script"><link href="static/js/element-ui.4e8e0db4.js" rel="preload" as="script"><link href="static/js/vue.11eaebc3.js" rel="preload" as="script"><link href="static/css/element-ui.0e3a750b.css" rel="stylesheet"><link href="static/css/app.d3766ec2.css" rel="stylesheet"><link rel="icon" type="image/png" sizes="32x32" href="img/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="img/icons/favicon-16x16.png"><link rel="manifest" href="manifest.json"><meta name="theme-color" content="#ffffff"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><meta name="apple-mobile-web-app-title" content="xiaofa-admin"><link rel="apple-touch-icon" href="img/icons/apple-touch-icon-152x152.png"><link rel="mask-icon" href="img/icons/safari-pinned-tab.svg" color="#ffffff"><meta name="msapplication-TileImage" content="img/icons/msapplication-icon-144x144.png"><meta name="msapplication-TileColor" content="#ffffff"></head><body><noscript></noscript><div id="app"><div class="first-loading-wrp"><div class="loading-wrp"><span class="dot dot-spin"><i></i> <i></i> <i></i> <i></i></span></div><h1>小发同城</h1></div></div><script>if (window.location.hostname !== 'localhost') {
}</script><script src="static/js/element-ui.4e8e0db4.js"></script><script src="static/js/vue.11eaebc3.js"></script><script src="static/js/app.c6eeaab0.js"></script></body></html>
}</script><script src="https://mall.gpxscs.cn/admin/config.js?v=2.0.278"></script><script src="https://mall.gpxscs.cn/admin/im/libs3.6.0.min.js?v=2.0.278"></script><script src="https://mall.gpxscs.cn/admin/im/im.js?v=2.0.278"></script><link href="static/css/chunk-19648027.83a11e8c.css" rel="prefetch"><link href="static/css/chunk-9d08728e.a2ba01b6.css" rel="prefetch"><link href="static/css/vab-extra.9da8d2d7.css" rel="prefetch"><link href="static/js/chunk-19648027.6233a553.js" rel="prefetch"><link href="static/js/chunk-9d08728e.cce09ea2.js" rel="prefetch"><link href="static/js/vab-extra.29abc81b.js" rel="prefetch"><link href="static/css/app.d3766ec2.css" rel="preload" as="style"><link href="static/css/element-ui.0e3a750b.css" rel="preload" as="style"><link href="static/js/app.15437a55.js" rel="preload" as="script"><link href="static/js/element-ui.4e8e0db4.js" rel="preload" as="script"><link href="static/js/vue.11eaebc3.js" rel="preload" as="script"><link href="static/css/element-ui.0e3a750b.css" rel="stylesheet"><link href="static/css/app.d3766ec2.css" rel="stylesheet"><link rel="icon" type="image/png" sizes="32x32" href="img/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="img/icons/favicon-16x16.png"><link rel="manifest" href="manifest.json"><meta name="theme-color" content="#ffffff"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><meta name="apple-mobile-web-app-title" content="xiaofa-admin"><link rel="apple-touch-icon" href="img/icons/apple-touch-icon-152x152.png"><link rel="mask-icon" href="img/icons/safari-pinned-tab.svg" color="#ffffff"><meta name="msapplication-TileImage" content="img/icons/msapplication-icon-144x144.png"><meta name="msapplication-TileColor" content="#ffffff"></head><body><noscript></noscript><div id="app"><div class="first-loading-wrp"><div class="loading-wrp"><span class="dot dot-spin"><i></i> <i></i> <i></i> <i></i></span></div><h1>小发同城</h1></div></div><script>if (window.location.hostname !== 'localhost') {
}</script><script src="static/js/element-ui.4e8e0db4.js"></script><script src="static/js/vue.11eaebc3.js"></script><script src="static/js/app.15437a55.js"></script></body></html>

View File

@ -2376,7 +2376,7 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "im/libs3.6.0.min.js"
},
{
"revision": "ac885f45c55a372c18a2dac2908a8d2d",
"revision": "fd0bb8a8fc29ba6a6b0b589c456d4553",
"url": "index.html"
},
{
@ -2392,17 +2392,17 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "robots.txt"
},
{
"revision": "797d977ee58400efae9b",
"revision": "1476376bf52eca0503a5",
"url": "static/css/app.d3766ec2.css"
},
{
"revision": "84b54be21285a05e61b5",
"url": "static/css/chunk-05a0eb9e.a2ba01b6.css"
},
{
"revision": "f5dd29b853f67685e75d",
"url": "static/css/chunk-19648027.83a11e8c.css"
},
{
"revision": "c10cdebb2e5fcc83b03b",
"url": "static/css/chunk-9d08728e.a2ba01b6.css"
},
{
"revision": "7b9212a0410ce12f6058",
"url": "static/css/element-ui.0e3a750b.css"
@ -2636,17 +2636,17 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "static/img/xiaofa-logo.20439423.png"
},
{
"revision": "797d977ee58400efae9b",
"url": "static/js/app.c6eeaab0.js"
},
{
"revision": "84b54be21285a05e61b5",
"url": "static/js/chunk-05a0eb9e.71beb66a.js"
"revision": "1476376bf52eca0503a5",
"url": "static/js/app.15437a55.js"
},
{
"revision": "f5dd29b853f67685e75d",
"url": "static/js/chunk-19648027.6233a553.js"
},
{
"revision": "c10cdebb2e5fcc83b03b",
"url": "static/js/chunk-9d08728e.cce09ea2.js"
},
{
"revision": "7b9212a0410ce12f6058",
"url": "static/js/element-ui.4e8e0db4.js"

View File

@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
importScripts(
"precache-manifest.634df410da6c022589d350878bd1aa50.js"
"precache-manifest.e8d797c4bd4379590d8a1d61605b7283.js"
);
workbox.core.setCacheNameDetails({prefix: "xiaofa-admin"});

File diff suppressed because one or more lines are too long

View File

@ -1,7 +1,7 @@
/*!
* build: xiaofa-admin
* copyright: https://www.lancerdt.com
* time: 2025-9-22 11:00:41
* time: 2025-9-24 14:10:56
*/
/*!
* Quill Editor v1.3.7

View File

@ -1,5 +1,5 @@
/*!
* build: xiaofa-admin
* copyright: https://www.lancerdt.com
* time: 2025-9-22 11:00:41
* time: 2025-9-24 14:10:56
*/@media only screen and (max-width:767px){.hidden-xs-only{display:none!important}}@media only screen and (min-width:768px){.hidden-sm-and-up{display:none!important}}@media only screen and (min-width:768px) and (max-width:991px){.hidden-sm-only{display:none!important}}@media only screen and (max-width:991px){.hidden-sm-and-down{display:none!important}}@media only screen and (min-width:992px){.hidden-md-and-up{display:none!important}}@media only screen and (min-width:992px) and (max-width:1199px){.hidden-md-only{display:none!important}}@media only screen and (max-width:1199px){.hidden-md-and-down{display:none!important}}@media only screen and (min-width:1200px){.hidden-lg-and-up{display:none!important}}@media only screen and (min-width:1200px) and (max-width:1919px){.hidden-lg-only{display:none!important}}@media only screen and (max-width:1919px){.hidden-lg-and-down{display:none!important}}@media only screen and (min-width:1920px){.hidden-xl-only{display:none!important}}

View File

@ -1,5 +1,5 @@
/*!
* build: xiaofa-admin
* copyright: https://www.lancerdt.com
* time: 2025-9-22 11:00:41
* time: 2025-9-24 14:10:56
*/[data-v-28093814]:export{menu-color:#fff;menu-color-active:#fff;menu-background:#282c34;column-second-menu-background:#fff}.vab-avatar-list[data-v-28093814] .el-avatar{display:inline-block;margin-left:-15px;cursor:pointer;border:3px solid #fff}.echarts{width:600px;height:400px}[data-v-7f7baab5]:export{menu-color:#fff;menu-color-active:#fff;menu-background:#282c34;column-second-menu-background:#fff}@media only screen and (max-width:767px){[data-v-7f7baab5] .vab-cropper-canvas{display:block;float:none;margin:0 auto}[data-v-7f7baab5] .vab-cropper-preview{display:none}}[data-v-7f7baab5] .el-textarea{margin-top:20px}[data-v-7f7baab5] .el-dialog__footer{height:72px}[data-v-7f7baab5] .el-dialog__footer:before{display:block;clear:both;content:""}[data-v-7f7baab5] .el-dialog__footer>div>div{display:inline}[data-v-7f7baab5] .el-dialog__footer>div>div .el-upload-list{display:none}[data-v-7f7baab5] .el-dialog__footer>div>div .el-upload--picture-card{float:right;width:auto;height:32px;line-height:32px;vertical-align:middle;background-color:transparent;border:0;border-radius:0}[data-v-7f7baab5] .el-dialog__footer>div .el-button{float:right;margin-left:10px}.icon-selector-popper .el-card__body{position:relative;display:flex;flex-direction:column;align-items:center;justify-content:center;height:20px;cursor:pointer}.icon-selector-popper .el-card__body i{font-size:28px;color:rgba(0,0,0,.65);text-align:center;vertical-align:middle;pointer-events:none;cursor:pointer}.icon-selector-popper .el-pagination{margin:0}[data-v-3aef4cea]:export{menu-color:#fff;menu-color-active:#fff;menu-background:#282c34;column-second-menu-background:#fff}.upload[data-v-3aef4cea]{height:500px}.upload .upload-content .el-upload__tip[data-v-3aef4cea]{display:block;height:30px;line-height:30px}.upload .upload-content[data-v-3aef4cea] .el-upload--picture-card{width:128px;height:128px;margin:3px 8px 8px 8px;border:2px dashed #c0ccda}.upload .upload-content[data-v-3aef4cea] .el-upload-list--picture{margin-bottom:20px}.upload .upload-content[data-v-3aef4cea] .el-upload-list--picture-card .el-upload-list__item{width:128px;height:128px;margin:3px 8px 8px 8px}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -144,3 +144,14 @@ export function checkShopName(params) {
data: params,
})
}
//编辑用户信息
export function updateUserInfo(data){
return request({
url: URL.shop.merch.update,
method: 'post',
headers: {
'Content-Type': 'application/json',
},
data: data,
})
}

View File

@ -447,6 +447,8 @@ let url = {
merchDetail: api_url + '/admin/shop/merch/detail',
// 审批商家申请入驻
merchApproval: api_url + '/admin/shop/merch/approval',
//更新商家信息
update:api_url + '/admin/shop/merch/update',
// 发起合同签署
createByFile: api_url + '/admin/shop/esign/sign-flow/create-by-file',
//查看商家签署合同

View File

@ -55,7 +55,7 @@
<el-input
v-model.trim="queryForm.product_id"
clearable
:placeholder="__('品编号')"
:placeholder="__('品编号')"
style="width: 100px"
/>
</el-form-item>
@ -105,7 +105,7 @@
<el-select
v-model.trim="queryForm.product_state_id"
clearable
:placeholder="__('品状态')"
:placeholder="__('品状态')"
style="width: 100px"
>
<el-option
@ -237,7 +237,7 @@
<el-table-column
align="center"
fixed="left"
:label="__('品编号')"
:label="__('品编号')"
prop="product_id"
/>
<el-table-column
@ -262,7 +262,7 @@
</el-table-column>
<el-table-column
align="center"
:label="__('品名称')"
:label="__('品名称')"
prop="product_name"
show-overflow-tooltip
width="200"
@ -533,7 +533,7 @@ import {
label:"是"
}
],
data: [], //
data: [], //
defaultProps: {
children: 'children',
label: 'label',

View File

@ -61,6 +61,9 @@
/>
</el-select>
</el-form-item>
<el-form-item :label="__('分账比例')" prop="split_ratio">
<el-input v-model.trim="form.split_ratio" :placeholder="__('比例在70%-99%之间')" clearable />
</el-form-item>
<el-form-item :label="__('所属分站')" prop="subsite_id">
<el-select
v-model.trim="form.subsite_id"
@ -155,6 +158,7 @@ export default {
store_type: 1,
store_o2o_flag: 0,
subsite_id: 0,
split_ratio:0,
},
rules: {
user_password: [

View File

@ -26,7 +26,7 @@
class="item-input"
v-model="form.store_id"
clearable
:disabled="isReadonly"
disabled
/>
</div>
<div class="item-block">
@ -777,7 +777,7 @@
<el-step title="合同状态" :description="form.has_ec_signed == 1 ? '成功' : '未签署'"></el-step>
<el-step title="进件状态" :description="form.has_apply_mer == 1 ? '成功' : '未进件'"></el-step>
<el-step title="分账业务申请状态" :description="form.has_apply_split == 1 ? '已申请' : '未申请'"></el-step>
<el-step title="分账接收方绑定状态" :description="form.has_apply_split == 1 ? '已绑定' : '未绑定'"></el-step>
<el-step title="分账接收方绑定状态" :description="form.has_bind_receiver == 1 ? '已绑定' : '未绑定'"></el-step>
<el-step title="店铺创建状态" :description="form.store_status == 1 ? '已创建' : '未创建'"></el-step>
<el-step title="入驻完成" :description="form.approval_status == 1 ? '已完成' : '未完成'"></el-step>
</el-steps>
@ -871,7 +871,7 @@
:autosize="{ minRows: 15 }"
></el-input>
</div>
<div class="item-block item-block-2" v-show="form.signed_status <= 0">
<div class="item-block item-block-2">
<div>
<el-checkbox
:isIndeterminate="isIndeterminate"
@ -967,14 +967,22 @@
提交拉卡拉审核
</el-button>
<el-button
v-if="form.approval_status != 1 && form.has_apply_mer != 1"
v-if="form.approval_status != 1"
class="btn"
type="danger"
@click="getMerchApproval(2)"
>
驳回审核
</el-button>
<el-button
v-if="![1,5].includes(form.approval_status)"
class="btn"
type="normal"
@click="saveUserInfo()"
>
保存信息
</el-button>
<!-- <el-button class="btn" type="danger" @click="getCheckContractFile()">
查看商家签署合同
</el-button> -->
@ -982,18 +990,20 @@
class="btn btn-hetong"
type="success"
@click="createShop()"
v-if="form.has_apply_mer == 1 && form.approval_status == 5 && form.has_apply_split == 2 && form.store_status == 2"
v-if="form.has_apply_mer == 1 && form.approval_status == 5 && form.has_apply_split == 1
&& form.has_bind_receiver ==1 && form.has_apply_receiver ==1 &&
form.store_status == 2"
>
创建店铺
</el-button>
<el-button
<!-- <el-button
class="btn btn-hetong"
type="success"
@click="createSubAccount()"
v-if=" form.approval_status == 5 && form.has_apply_mer ==1 && form.has_apply_split != 1"
>
分账业务申请
</el-button>
</el-button> -->
<el-button class="btn" @click="close()">取消</el-button>
</div>
@ -1009,6 +1019,7 @@ import {
createShop,
createSubAccount,
checkShopName,
updateUserInfo
} from '@/api/shopAudit/shopAudit'
import { batchNoApi, imgOcrResultApi } from "@/api/upload";
@ -1106,7 +1117,8 @@ export default {
has_apply_receiver:'',// 1-2-,
has_bind_receiver:'',// 1-2-
other_license_list:[],
other_license_list_2:[]
other_license_list_2:[],
mchId:0
},
entityType: ['企业', '个人'],
approvalStatus:[
@ -1594,6 +1606,26 @@ export default {
})
})
},
saveUserInfo(){
this.$confirm('确定保存信息?','提示',{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(async()=>{
let res=await updateUserInfo(this.form);
if(res&&res.status==200){
this.$message({
type: 'success',
message: '保存成功',
})
}else{
this.$message({
type: 'error',
message: '保存失败',
})
}
})
},
getCreateByFile() {
this.$confirm('此操作将签署合同, 是否继续?', '提示', {
confirmButtonText: '确定',
@ -1751,7 +1783,7 @@ export default {
this.getMerchDetail();
},
async createShop(){
let res = await createShop({mchMobile:this.form.login_mobile})
let res = await createShop({mchId:this.form.mchId})
if(res && res.status == 200){
this.$message({
type: 'success',