From 525f620a9c3d8576331dc496abd7218be9415741 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Tue, 21 May 2024 16:22:29 +0800 Subject: [PATCH 1/3] add --- .env.development | 2 +- src/views/merchant_withdraw/edit.vue | 2 - test.html | 136 +++++++++++++++++++++++---- 3 files changed, 118 insertions(+), 22 deletions(-) diff --git a/.env.development b/.env.development index 8bcc5d2..e8183e0 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ NODE_ENV = 'development' VITE_NOW_TYPE = 'dist' # Base API -VITE_APP_BASE_URL='http://192.168.1.22:8546' +VITE_APP_BASE_URL='http://192.168.1.13:8546' # VITE_APP_BASE_URL='https://erp.lihaink.cn' \ No newline at end of file diff --git a/src/views/merchant_withdraw/edit.vue b/src/views/merchant_withdraw/edit.vue index 8eaa384..8b09a67 100644 --- a/src/views/merchant_withdraw/edit.vue +++ b/src/views/merchant_withdraw/edit.vue @@ -173,8 +173,6 @@ const setFormData = async (data: Record) => { form.arrival_proof = JSON.parse(data.arrival_proof) } form.id = data.id - - } const getDetail = async (row: Record) => { diff --git a/test.html b/test.html index bee10d3..58ed078 100644 --- a/test.html +++ b/test.html @@ -1,22 +1,120 @@ - - - - - 公众号授权 - - - -
- 绑定成功! + + + + + 登录页面 + + + + + + + + + \ No newline at end of file From afca312830b84dc1e130e0fac9a8e1ea4a639d5d Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Tue, 21 May 2024 17:10:59 +0800 Subject: [PATCH 2/3] add --- .env.development | 5 - src/views/data/supplier/audit/detail.vue | 2 +- src/views/data/supplier/supplier/detail.vue | 21 ++- src/views/data/supplier/supplier/index.vue | 144 ++++---------------- 4 files changed, 50 insertions(+), 122 deletions(-) diff --git a/.env.development b/.env.development index f7a654f..ae28029 100644 --- a/.env.development +++ b/.env.development @@ -1,10 +1,5 @@ NODE_ENV = 'development' VITE_NOW_TYPE = 'dist' # Base API -<<<<<<< HEAD VITE_APP_BASE_URL='http://192.168.1.13:8546' # VITE_APP_BASE_URL='https://erp.lihaink.cn' -======= -# VITE_APP_BASE_URL='http://192.168.1.22:8546' -VITE_APP_BASE_URL='https://erp.lihaink.cn' ->>>>>>> 6aebc6e263b88ef40931c5e19a0a6a833a75e1e8 diff --git a/src/views/data/supplier/audit/detail.vue b/src/views/data/supplier/audit/detail.vue index f96f2a5..a4c7dd6 100644 --- a/src/views/data/supplier/audit/detail.vue +++ b/src/views/data/supplier/audit/detail.vue @@ -12,7 +12,7 @@ {{ formData.supplier.service_phone }} - {{ formData.supplier?.storeAddress }} + {{ formData.supplier?.mer_address }} {{ dataJSON.company_name }} diff --git a/src/views/data/supplier/supplier/detail.vue b/src/views/data/supplier/supplier/detail.vue index c2a80ba..5b6613b 100644 --- a/src/views/data/supplier/supplier/detail.vue +++ b/src/views/data/supplier/supplier/detail.vue @@ -1,6 +1,7 @@