From 8b3a8020921e416c648e183e01e013fad18bb104 Mon Sep 17 00:00:00 2001 From: gyq <875626088@qq.com> Date: Tue, 6 Jan 2026 13:51:52 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=9C=8D=E6=AD=A3=E5=BC=8F=E5=BF=AB=E6=8D=B7=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/index.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 40357d4..9ef1d14 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -74,8 +74,7 @@ const accountList = reactive([ { username: "19107220837", type: 'danger', label: '快乐时光店铺' }, { username: "18199991111", type: 'success', label: '草莓加盟主店可直接管理' }, { username: "18821670757", type: 'primary', label: '强盛集团' }, - { username: "19107220837", type: 'warning', label: '万维时光' }, - { username: "19112345678", type: 'success', label: '酸橘子·云贵小馆' }, + { username: "19112345678", type: 'danger', label: '酸橘子·云贵小馆' }, ]); // 快捷模拟登录 From b28fdeaf1199488be84c2898932684df70a6e32d Mon Sep 17 00:00:00 2001 From: gyq <875626088@qq.com> Date: Mon, 12 Jan 2026 10:25:03 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=9B=E4=BB=B6?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/common/index.ts | 116 ++ src/components/Upload/SingleImageUpload.vue | 10 +- src/utils/index.ts | 16 +- src/views/applyments/applyment_in.vue | 997 ++++++++++++++++++ .../applyments/components/selectAddress.vue | 128 +++ .../applyments/components/selectBank.vue | 135 +++ .../applyments/components/selectCategory.vue | 43 + .../components/selectShopsDialog.vue | 162 +++ .../applyments/components/singCodeDialog.vue | 38 + src/views/applyments/index.vue | 268 +++++ src/views/applyments/select_shop.vue | 71 ++ 11 files changed, 1978 insertions(+), 6 deletions(-) create mode 100644 src/api/common/index.ts create mode 100644 src/views/applyments/applyment_in.vue create mode 100644 src/views/applyments/components/selectAddress.vue create mode 100644 src/views/applyments/components/selectBank.vue create mode 100644 src/views/applyments/components/selectCategory.vue create mode 100644 src/views/applyments/components/selectShopsDialog.vue create mode 100644 src/views/applyments/components/singCodeDialog.vue create mode 100644 src/views/applyments/index.vue create mode 100644 src/views/applyments/select_shop.vue diff --git a/src/api/common/index.ts b/src/api/common/index.ts new file mode 100644 index 0000000..c188377 --- /dev/null +++ b/src/api/common/index.ts @@ -0,0 +1,116 @@ +import request from "@/utils/request"; + +/** + * 获取所有地域 + * @param params + * @returns + */ +export const getRegion = () => { + return request({ + url: `/system/admin/common/region`, + method: "get" + }); +} + +/** + * 获取所有银行 + * @param params + * @returns + */ +export const getBankInfo = (params: Object) => { + return request({ + url: `/system/admin/common/bankInfo`, + method: "get", + params + }); +} + +/** + * 类目信息表 + * @returns + */ +export const getCategory = () => { + return request({ + url: `/system/admin/common/category`, + method: "get" + }); +} + +interface getBankBranchListParams { + province?: string; // 省份 + city?: string; // 城市 + instId?: string; // 顶级机构ID +} +/** + * 获取所有支行 + * @params + * province?: string; // 省份 + * city?: string; // 城市 + * instId?: string; // 顶级机构ID + * @returns + */ +export const getBankBranchList = (params: getBankBranchListParams) => { + return request({ + url: `/order/admin/data/entryManager/bankBranchList`, + method: "get", + params + }); +} + +/** + * 申请进件 + * @data Object + * @returns + */ +export const entryManagerPost = (data: Object) => { + return request({ + url: `/order/admin/data/entryManager`, + method: "post", + data + }); +} + +/** + * 申请进件 + * @data { + * url string 图片地址 + * type string 可选 + * IdCard 身份证 + * BankCard 银行卡 + * BusinessLicense 营业执照 + * } + * @returns + */ +export const getInfoByImg = (params: Object) => { + return request({ + url: `/order/admin/data/entryManager/getInfoByImg`, + method: "get", + params + }); +} + +/** + * 获取进件信息详情 + * @data { shopId } + * @returns + */ +export const entryManagerDetail = (params: Object) => { + return request({ + url: `/order/admin/data/entryManager`, + method: "get", + params + }); +} + +/** + * 获取进件列表 + * @data { params } + * @returns + */ +export const entryManagerList = (params: Object) => { + return request({ + url: `/order/admin/data/entryManager/list`, + method: "get", + params + }); +} \ No newline at end of file diff --git a/src/components/Upload/SingleImageUpload.vue b/src/components/Upload/SingleImageUpload.vue index c9795a1..74f7035 100644 --- a/src/components/Upload/SingleImageUpload.vue +++ b/src/components/Upload/SingleImageUpload.vue @@ -172,12 +172,12 @@ const onError = (error: any) => { position: relative; overflow: hidden; cursor: pointer; - border: 1px var(--el-border-color) solid; - border-radius: 5px; + // border: 1px var(--el-border-color) solid; + // border-radius: 5px; - &:hover { - border-color: var(--el-color-primary); - } + // &:hover { + // border-color: var(--el-color-primary); + // } &__delete-btn { position: absolute; diff --git a/src/utils/index.ts b/src/utils/index.ts index bce4c8f..d3dbe87 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -299,4 +299,18 @@ export function includesString(target, searchStr, options = {}) { // 4. 执行包含判断 return processedTarget.includes(processedSearch); -} \ No newline at end of file +} + +/** + * 校验手机号码（中国大陆） + * - 支持 11 位手机号，号段 13x-19x + * @param {string} phone + * @returns {boolean} + */ +export function isValidMobile(phone: string): boolean { + if (!phone && phone !== 0) return false; + const s = String(phone).trim(); + // 中国大陆手机号正则：以1开头，第二位3-9，后面9位数字，总共11位 + const mobileRegex = /^1[3-9]\d{9}$/; + return mobileRegex.test(s); +} diff --git a/src/views/applyments/applyment_in.vue b/src/views/applyments/applyment_in.vue new file mode 100644 index 0000000..8c682ef --- /dev/null +++ b/src/views/applyments/applyment_in.vue @@ -0,0 +1,997 @@ + + + + + + \ No newline at end of file diff --git a/src/views/applyments/components/selectAddress.vue b/src/views/applyments/components/selectAddress.vue new file mode 100644 index 0000000..776752d --- /dev/null +++ b/src/views/applyments/components/selectAddress.vue @@ -0,0 +1,128 @@ + + + + + \ No newline at end of file diff --git a/src/views/applyments/components/selectBank.vue b/src/views/applyments/components/selectBank.vue new file mode 100644 index 0000000..c473385 --- /dev/null +++ b/src/views/applyments/components/selectBank.vue @@ -0,0 +1,135 @@ + + + + + \ No newline at end of file diff --git a/src/views/applyments/components/selectCategory.vue b/src/views/applyments/components/selectCategory.vue new file mode 100644 index 0000000..b2dad83 --- /dev/null +++ b/src/views/applyments/components/selectCategory.vue @@ -0,0 +1,43 @@ + + + \ No newline at end of file diff --git a/src/views/applyments/components/selectShopsDialog.vue b/src/views/applyments/components/selectShopsDialog.vue new file mode 100644 index 0000000..5a8a1ec --- /dev/null +++ b/src/views/applyments/components/selectShopsDialog.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/src/views/applyments/components/singCodeDialog.vue b/src/views/applyments/components/singCodeDialog.vue new file mode 100644 index 0000000..fa7fa6a --- /dev/null +++ b/src/views/applyments/components/singCodeDialog.vue @@ -0,0 +1,38 @@ + + + + + \ No newline at end of file diff --git a/src/views/applyments/index.vue b/src/views/applyments/index.vue new file mode 100644 index 0000000..e39bcce --- /dev/null +++ b/src/views/applyments/index.vue @@ -0,0 +1,268 @@ + + + + + + \ No newline at end of file diff --git a/src/views/applyments/select_shop.vue b/src/views/applyments/select_shop.vue new file mode 100644 index 0000000..75f97ad --- /dev/null +++ b/src/views/applyments/select_shop.vue @@ -0,0 +1,71 @@ + + + + + + \ No newline at end of file From 4c06f07ac6465cdd7650bb3563f92b4911632562 Mon Sep 17 00:00:00 2001 From: gyq <875626088@qq.com> Date: Mon, 12 Jan 2026 15:10:23 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/common/index.ts | 10 +- src/views/applyments/applyment_in.vue | 596 ++++++++---------- .../applyments/components/selectAddress.vue | 36 +- .../applyments/components/selectBank.vue | 72 ++- src/views/applyments/index.vue | 53 +- 5 files changed, 356 insertions(+), 411 deletions(-) diff --git a/src/api/common/index.ts b/src/api/common/index.ts index c188377..29b6c11 100644 --- a/src/api/common/index.ts +++ b/src/api/common/index.ts @@ -37,16 +37,14 @@ export const getCategory = () => { } interface getBankBranchListParams { - province?: string; // 省份 - city?: string; // 城市 - instId?: string; // 顶级机构ID + bankAliceCode?: string; + cityCode?: string; } /** * 获取所有支行 * @params - * province?: string; // 省份 - * city?: string; // 城市 - * instId?: string; // 顶级机构ID + * bankAliceCode 银行别名code bankAliasCode 从 /system/admin/common/bankInfo 获取 + * cityCode 市编码 wxProvinceCode 从 /system/admin/common/region 获取 * @returns */ export const getBankBranchList = (params: getBankBranchListParams) => { diff --git a/src/views/applyments/applyment_in.vue b/src/views/applyments/applyment_in.vue index 8c682ef..3526a80 100644 --- a/src/views/applyments/applyment_in.vue +++ b/src/views/applyments/applyment_in.vue @@ -47,13 +47,15 @@ + style="width: 300px;" v-loading="contactIdCardFrontPicUploadLoading"> - + - +
@@ -109,19 +111,21 @@
(上传图片自动识别 有效期)
 - + - + - + - +
@@ -156,7 +160,7 @@ - + @@ -227,7 +231,7 @@ - + @@ -236,33 +240,36 @@ style="width: 300px;"> -
-
(上传图片自动识别 银行卡号)
 - + - +
-
+
\ No newline at end of file From 348ecdfc5454fc37ce17882554e3148ebada6607 Mon Sep 17 00:00:00 2001 From: gyq <875626088@qq.com> Date: Mon, 12 Jan 2026 18:18:36 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BF=9B=E4=BB=B6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/common/index.ts | 13 +++++ src/views/applyments/applyment_in.vue | 47 ++++++++++--------- .../applyments/components/selectBank.vue | 6 +-- .../applyments/components/singCodeDialog.vue | 35 ++++++++++++-- src/views/applyments/index.vue | 37 ++++++++++++--- 5 files changed, 100 insertions(+), 38 deletions(-) diff --git a/src/api/common/index.ts b/src/api/common/index.ts index 29b6c11..57055a4 100644 --- a/src/api/common/index.ts +++ b/src/api/common/index.ts @@ -111,4 +111,17 @@ export const entryManagerList = (params: Object) => { method: "get", params }); +} + +/** + * 主动查询进件信息状态 + * @data { params } + * @returns + */ +export const queryEntry = (params: Object) => { + return request({ + url: `/order/admin/data/entryManager/queryEntry`, + method: "get", + params + }); } \ No newline at end of file diff --git a/src/views/applyments/applyment_in.vue b/src/views/applyments/applyment_in.vue index 3526a80..12e0131 100644 --- a/src/views/applyments/applyment_in.vue +++ b/src/views/applyments/applyment_in.vue @@ -15,7 +15,7 @@ 商户基础信息
- + @@ -67,14 +67,14 @@
-
(上传图片自动识别 身份证名称 身份证号)
+
国徽面为正面 (上传图片自动识别 有效期)
-
(上传图片自动识别 有效期)
+
人像面为反面 (上传图片自动识别 身份证名称 身份证号)
 @@ -101,14 +101,14 @@
-
(上传图片自动识别 身份证名称 身份证号)
+
国徽面为正面 (上传图片自动识别 有效期)
-
(上传图片自动识别 有效期)
+
人像面为反面 (上传图片自动识别 身份证名称 身份证号)
 @@ -655,15 +655,18 @@ const rules = reactive({ const contactIdCardFrontPicUploadLoading = ref(false) async function contactIdCardFrontPicUpload(url: string) { try { - form.value.merchantBaseInfo.contactIdCardFrontPic.alipayId = '' - form.value.merchantBaseInfo.contactIdCardFrontPic.wechatId = '' + form.value.merchantBaseInfo.contactIdCardBackPic.alipayId = '' + form.value.merchantBaseInfo.contactIdCardBackPic.wechatId = '' contactIdCardFrontPicUploadLoading.value = true const res: any = await getInfoByImg({ url: url, type: 'IdCard' }) - form.value.merchantBaseInfo.contactPersonId = res.subImages[0].kvInfo.data.idNumber + + let date = res.subImages[0].kvInfo.data.validPeriod.split('-') + form.value.merchantBaseInfo.contactPersonIdStartDate = dayjs(date[0]).format('YYYY-MM-DD') + form.value.merchantBaseInfo.contactPersonIdEndDate = dayjs(date[1]).format('YYYY-MM-DD') } catch (error) { console.log(error); } @@ -674,17 +677,15 @@ async function contactIdCardFrontPicUpload(url: string) { const contactIdCardBackPicUploadLoading = ref(false) async function contactIdCardBackPicUpload(url: any) { try { - form.value.merchantBaseInfo.contactIdCardBackPic.alipayId = '' - form.value.merchantBaseInfo.contactIdCardBackPic.wechatId = '' + form.value.merchantBaseInfo.contactIdCardFrontPic.alipayId = '' + form.value.merchantBaseInfo.contactIdCardFrontPic.wechatId = '' contactIdCardBackPicUploadLoading.value = true const res: any = await getInfoByImg({ url: url, type: 'IdCard' }) - let date = res.subImages[0].kvInfo.data.validPeriod.split('-') - form.value.merchantBaseInfo.contactPersonIdStartDate = dayjs(date[0]).format('YYYY-MM-DD') - form.value.merchantBaseInfo.contactPersonIdEndDate = dayjs(date[1]).format('YYYY-MM-DD') + form.value.merchantBaseInfo.contactPersonId = res.subImages[0].kvInfo.data.idNumber } catch (error) { console.log(error); } @@ -695,16 +696,18 @@ async function contactIdCardBackPicUpload(url: any) { const idCardFrontPicSuccessLoading = ref(false) async function idCardFrontPicSuccess(url: string) { try { - form.value.legalPersonInfo.idCardFrontPic.alipayId = '' - form.value.legalPersonInfo.idCardFrontPic.wechatId = '' + form.value.legalPersonInfo.idCardBackPic.alipayId = '' + form.value.legalPersonInfo.idCardBackPic.wechatId = '' idCardFrontPicSuccessLoading.value = true const res: any = await getInfoByImg({ url: url, type: 'IdCard' }) - form.value.legalPersonInfo.legalPersonName = res.subImages[0].kvInfo.data.name - form.value.legalPersonInfo.legalPersonId = res.subImages[0].kvInfo.data.idNumber + + let date = res.subImages[0].kvInfo.data.validPeriod.split('-') + form.value.legalPersonInfo.legalIdPersonStartDate = dayjs(date[0]).format('YYYY-MM-DD') + form.value.legalPersonInfo.legalPersonIdEndDate = dayjs(date[1]).format('YYYY-MM-DD') } catch (error) { console.log(error); } @@ -715,17 +718,17 @@ async function idCardFrontPicSuccess(url: string) { const idCardBackPicSuccessLoading = ref(false) async function idCardBackPicSuccess(url: string) { try { - form.value.legalPersonInfo.idCardBackPic.alipayId = '' - form.value.legalPersonInfo.idCardBackPic.wechatId = '' + form.value.legalPersonInfo.idCardFrontPic.alipayId = '' + form.value.legalPersonInfo.idCardFrontPic.wechatId = '' idCardBackPicSuccessLoading.value = true const res: any = await getInfoByImg({ url: url, type: 'IdCard' }) - let date = res.subImages[0].kvInfo.data.validPeriod.split('-') - form.value.legalPersonInfo.legalIdPersonStartDate = dayjs(date[0]).format('YYYY-MM-DD') - form.value.legalPersonInfo.legalPersonIdEndDate = dayjs(date[1]).format('YYYY-MM-DD') + + form.value.legalPersonInfo.legalPersonName = res.subImages[0].kvInfo.data.name + form.value.legalPersonInfo.legalPersonId = res.subImages[0].kvInfo.data.idNumber } catch (error) { console.log(error); } diff --git a/src/views/applyments/components/selectBank.vue b/src/views/applyments/components/selectBank.vue index 20dca58..983ae09 100644 --- a/src/views/applyments/components/selectBank.vue +++ b/src/views/applyments/components/selectBank.vue @@ -55,15 +55,13 @@ watch(() => props.cityCode, async (newValue, oldValue) => { } }) -const bankList = ref>([]); +const bankList = ref>([]); const bankInstId = defineModel('bankInstId', { type: String, default: "", }); - - const bankName = defineModel('bankName', { type: String, default: "", @@ -73,7 +71,7 @@ const bankName = defineModel('bankName', { function bankChange(e: any) { let obj = bankList.value.find(item => item.bankCode == e) if (obj && obj.id) { - bankName.value = obj.bankAlias + bankName.value = obj.accountBank bankInstId.value = obj.bankCode getBankBranchListAjax(obj.bankAliasCode) } diff --git a/src/views/applyments/components/singCodeDialog.vue b/src/views/applyments/components/singCodeDialog.vue index fa7fa6a..f55568a 100644 --- a/src/views/applyments/components/singCodeDialog.vue +++ b/src/views/applyments/components/singCodeDialog.vue @@ -1,7 +1,7 @@ @@ -132,7 +133,7 @@ layout="total, sizes , prev, pager ,next, jumper " @current-change="paginationChange" />
- +
@@ -145,6 +146,10 @@ import ShopApi from "@/api/account/shop"; import { ElNotification, ElMessageBox } from "element-plus"; import addShop from "./components/addShop.vue"; import detailModal from "./components/detailModal.vue"; +import { useRouter } from "vue-router"; + +const router = useRouter() + const refActivateCode = ref(null); function activateCodeShow(row) { refActivateCode.value.open(row); @@ -186,12 +191,18 @@ function dropdownClick(e, row) { console.log(e); console.log(row); if (e == 0) { - refAddShop.value.show({mainId:row.id,shopType:row.shopType,isHeadShop:0},'addBranch'); + refAddShop.value.show({ mainId: row.id, shopType: row.shopType, isHeadShop: 0 }, 'addBranch'); return; } if (e.command == 1) { - refDetailModal.value.show(e.row); + // refDetailModal.value.show(e.row); + router.push({ + name: 'pay_setting', + query: { + shopId: row.id + } + }) return; } if (e == 5) { diff --git a/src/views/shop/list/pay_setting.vue b/src/views/shop/list/pay_setting.vue new file mode 100644 index 0000000..1533d0a --- /dev/null +++ b/src/views/shop/list/pay_setting.vue @@ -0,0 +1,127 @@ + + + + + + \ No newline at end of file From ed8be8a16ab69f99d16a06d2aeff94ec5673e498 Mon Sep 17 00:00:00 2001 From: gyq <875626088@qq.com> Date: Thu, 15 Jan 2026 13:54:19 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=96=B0=E7=89=88?= =?UTF-8?q?=E5=BA=97=E9=93=BA=E7=AE=A1=E7=90=86=E4=B8=89=E6=96=B9=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/account/shopMerchant.ts | 7 +- src/api/common/index.ts | 41 ++- src/api/coup/group.js | 6 +- .../shop/list/components/detailModal.vue | 233 +++++++----------- .../shop/list/components/payStatusCard.vue | 94 ++++++- src/views/shop/list/index.vue | 8 +- src/views/shop/list/pay_setting.vue | 56 +++-- 7 files changed, 271 insertions(+), 174 deletions(-) diff --git a/src/api/account/shopMerchant.ts b/src/api/account/shopMerchant.ts index 561e836..b2739c0 100644 --- a/src/api/account/shopMerchant.ts +++ b/src/api/account/shopMerchant.ts @@ -1,10 +1,11 @@ import request from "@/utils/request"; -import { Account_BaseUrl } from "@/api/config"; +import { Account_BaseUrl, Order_BaseUrl } from "@/api/config"; const baseURL = Account_BaseUrl + "/admin/shopMerchant"; +const orderURL = Order_BaseUrl + "/admin/shopMerchant"; const API = { get(shopId: string | number) { return request({ - url: `${baseURL}`, + url: `${orderURL}`, method: "get", params: { shopId: shopId @@ -14,7 +15,7 @@ const API = { edit(shopId: string | number, data: shopMerchantType) { delete data.id return request({ - url: `${baseURL}`, + url: `${orderURL}`, method: "put", data: { ...data, shopId }, }); diff --git a/src/api/common/index.ts b/src/api/common/index.ts index 57055a4..eeac0be 100644 --- a/src/api/common/index.ts +++ b/src/api/common/index.ts @@ -124,4 +124,43 @@ export const queryEntry = (params: Object) => { method: "get", params }); -} \ No newline at end of file +} + +/** + * 商户支付信息获取 + * @data { params } + * @returns + */ +export const shopMerchantGet = (params: Object) => { + return request({ + url: `/order/admin/shopMerchant`, + method: "get", + params + }); +} + +/** + * 商户支付信息修改 修改聚合支付信息 + * @data { params } + * @returns + */ +export const shopMerchantPut = (data: Object) => { + return request({ + url: `/order/admin/shopMerchant`, + method: "put", + data + }); +} + +/** + * 获取当前店铺的主店进件信息 + * @data { params } + * @returns + */ +export const getMainMerchant = (params: Object) => { + return request({ + url: `/order/admin/shopMerchant/getMainMerchant`, + method: "get", + params + }); +} diff --git a/src/api/coup/group.js b/src/api/coup/group.js index 4fccbd6..e843ced 100644 --- a/src/api/coup/group.js +++ b/src/api/coup/group.js @@ -10,7 +10,7 @@ export function searchstorestatus(type) { return request_php({ method: "post", headers: { - clint_type: type + 'ClintType': type }, url: "/meituan/searchstorestatus" }); @@ -79,7 +79,7 @@ export function getuisdk(data) { return request_php({ method: "post", headers: { - clint_type: 2 + 'ClintType': 2 }, url: "/douyin/getuisdk", data, @@ -214,7 +214,7 @@ export function thirdPartyCoupon_bindUrl(data) { return request_php({ method: "post", headers: { - clint_type: 1 + 'ClintType': 1 }, url: "/meituan/getuisdkurl", data, diff --git a/src/views/shop/list/components/detailModal.vue b/src/views/shop/list/components/detailModal.vue index 751a277..ab2d074 100644 --- a/src/views/shop/list/components/detailModal.vue +++ b/src/views/shop/list/components/detailModal.vue @@ -1,152 +1,105 @@ - + \ No newline at end of file diff --git a/src/views/shop/list/components/payStatusCard.vue b/src/views/shop/list/components/payStatusCard.vue index f7fe363..297022f 100644 --- a/src/views/shop/list/components/payStatusCard.vue +++ b/src/views/shop/list/components/payStatusCard.vue @@ -10,6 +10,9 @@ + + + 是否复用主店？ + + From 042dacec9897778cd639564bce276010dcc22715 Mon Sep 17 00:00:00 2001 From: gyq <875626088@qq.com> Date: Fri, 16 Jan 2026 09:36:56 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2=E9=A1=B5=E9=9D=A2=E6=95=88?= =?UTF-8?q?=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/shop/list/components/detailModal.vue | 13 +++++++++---- src/views/shop/list/components/payStatusCard.vue | 4 ++-- src/views/shop/list/index.vue | 5 +++-- src/views/shop/list/pay_setting.vue | 4 ++-- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/views/shop/list/components/detailModal.vue b/src/views/shop/list/components/detailModal.vue index ab2d074..92bc3f2 100644 --- a/src/views/shop/list/components/detailModal.vue +++ b/src/views/shop/list/components/detailModal.vue @@ -2,16 +2,17 @@
- + - + - + - + 保存 @@ -25,6 +26,10 @@ import { ref } from 'vue' import { useRoute } from 'vue-router' import { shopMerchantPut } from '@/api/common' +const inputStyle = { + width: '500px' +} + const props = defineProps({ detail: { type: Object, diff --git a/src/views/shop/list/components/payStatusCard.vue b/src/views/shop/list/components/payStatusCard.vue index 297022f..a98c93c 100644 --- a/src/views/shop/list/components/payStatusCard.vue +++ b/src/views/shop/list/components/payStatusCard.vue @@ -10,8 +10,8 @@