diff --git a/.env.development b/.env.development index e1223e0..02523a1 100644 --- a/.env.development +++ b/.env.development @@ -10,14 +10,14 @@ ENV = 'development' # ADMIN 服务地址 VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 线上 # VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/ -# VITE_ADMIN_PROXY_PATH = http://localhost:9999/ -# VITE_ADMIN_PROXY_PATH = http://192.168.101.29:9999/ # 邓-本地 +VITE_ADMIN_PROXY_PATH = http://localhost:9999/ +#VITE_ADMIN_PROXY_PATH = http://192.168.101.29:9999/ # 邓-本地 # 图片访问基础地址 VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api # 线上 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc -# VITE_IMAGE_BASE_PATH = http://localhost:9999 -# VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地 +VITE_IMAGE_BASE_PATH = http://localhost:9999 +#VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地 # 代码生成服务地址 VITE_GEN_PROXY_PATH = http://192.168.110.156:5003 diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..5e07d0e --- /dev/null +++ b/.prettierrc @@ -0,0 +1,8 @@ +{ + "tabWidth": 2, + "useTabs": true, + "trailingComma": "all", + "semi": false, + "singleQuote": false, + "printWidth": 120 +} \ No newline at end of file diff --git a/src/api/hard/hard-after-sale.ts b/src/api/hard/hard-after-sale.ts index cbc6571..2462cb0 100644 --- a/src/api/hard/hard-after-sale.ts +++ b/src/api/hard/hard-after-sale.ts @@ -9,6 +9,23 @@ export function history(query?: Object) { }) } +export function agree(obj?: Object) { + return request({ + url: '/hard/hard-after-sale/agree', + method: 'put', + params: obj + }) +} + +export function disagree(obj?: Object) { + return request({ + url: '/hard/hard-after-sale/disagree', + method: 'post', + data: obj + }) +} + + export function detailByOrderId(query?: Object) { return request({ url: '/hard/hard-after-sale/detail-by-order-id', @@ -17,9 +34,10 @@ export function detailByOrderId(query?: Object) { }) } + export function pageJoin(query?: Object) { return request({ - url: '/hard/hard-after-sale/page', + url: '/hard/hard-after-sale/page-join', method: 'get', params: query }) diff --git a/src/api/wallet/mch-manage.ts b/src/api/wallet/mch-manage.ts index 864d6cd..fd9bf27 100644 --- a/src/api/wallet/mch-manage.ts +++ b/src/api/wallet/mch-manage.ts @@ -1,58 +1,58 @@ -import request from '/@/utils/request'; +import request from "/@/utils/request" -export function pageJoinSelect(query?: Object) { +export function select(query?: Object) { return request({ - url: '/wallet/mch-manage/page-join-select', - method: 'get', + url: "/wallet/mch-manage/select", + method: "get", params: query, - }); + }) } export function pageJoin(query?: Object) { return request({ - url: '/wallet/mch-manage/page-join', - method: 'get', + url: "/wallet/mch-manage/page-join", + method: "get", params: query, - }); + }) } export function fetchList(query?: Object) { return request({ - url: '/wallet/mch-manage/page', - method: 'get', + url: "/wallet/mch-manage/page", + method: "get", params: query, - }); + }) } export function addObj(obj?: Object) { return request({ - url: '/wallet/mch-manage', - method: 'post', + url: "/wallet/mch-manage", + method: "post", data: obj, - }); + }) } export function getObj(id?: string) { return request({ - url: '/wallet/mch-manage/' + id, - method: 'get', - }); + url: "/wallet/mch-manage/" + id, + method: "get", + }) } export function delObjs(ids?: Object) { return request({ - url: '/wallet/mch-manage', - method: 'delete', + url: "/wallet/mch-manage", + method: "delete", data: ids, - }); + }) } export function putObj(obj?: Object) { return request({ - url: '/wallet/mch-manage', - method: 'put', + url: "/wallet/mch-manage", + method: "put", data: obj, - }); + }) } /** @@ -61,10 +61,10 @@ export function putObj(obj?: Object) { */ export function selectMerchantList(type?: string) { return request({ - url: '/wallet/mch-manage/selectMerchantList', - method: 'get', + url: "/wallet/mch-manage/selectMerchantList", + method: "get", params: { type: type, }, - }); + }) } diff --git a/src/components/Select/SelectMch.vue b/src/components/Select/SelectMch.vue index 307856d..509095e 100644 --- a/src/components/Select/SelectMch.vue +++ b/src/components/Select/SelectMch.vue @@ -1,7 +1,16 @@ diff --git a/src/views/hard/hard-after-sale/form.vue b/src/views/hard/hard-after-sale/form.vue index c7156de..8527166 100644 --- a/src/views/hard/hard-after-sale/form.vue +++ b/src/views/hard/hard-after-sale/form.vue @@ -1,119 +1,118 @@ \ No newline at end of file diff --git a/src/views/hard/hard-order/index.vue b/src/views/hard/hard-order/index.vue index ad3d9a6..bc59cc4 100644 --- a/src/views/hard/hard-order/index.vue +++ b/src/views/hard/hard-order/index.vue @@ -8,6 +8,16 @@ + + + + + + + + + + {{ $t('common.queryBtn') }} @@ -78,7 +88,7 @@ - + + + + @@ -142,7 +170,7 @@ const { push } = useRouter() const FormDialog = defineAsyncComponent(() => import('./form.vue')); const ShopCar = defineAsyncComponent(() => import('../components/shop-car.vue')); // 定义查询字典 -const { hard_pay_type, hard_order_type, hard_order_status, hard_type } = useDict("hard_pay_type", "hard_order_type", "hard_order_status", "hard_type") +const { hard_pay_type, hard_order_type, hard_order_status, hard_type, hard_refund_status } = useDict("hard_pay_type", "hard_order_type", "hard_order_status", "hard_type", "hard_refund_status") // 定义变量内容 const formDialogRef = ref() const shopCarDialogRef = ref() @@ -191,7 +219,7 @@ const handleClick = (e: any) => { } const doRefund = (row: any) => { - push({ path: '/hard/hard-after-sale/order-refund', query: { id: row.id } }) + push({ path: '/hard/hard-after-sale/order-refund', query: { id: row.id, type: "view" } }) } // 导出excel diff --git a/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue b/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue index 78dd8eb..215e507 100644 --- a/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue +++ b/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue @@ -34,25 +34,23 @@ + + + + + + + + + + - - - - - - - - - - - - @@ -96,12 +94,13 @@ const form = reactive({ // 定义校验规则 const dataRules = ref({ barCode: [{ required: true, message: '条码不能为空', trigger: 'blur' }], - spec: [{ required: true, message: 'spec不能为空', trigger: 'blur' }], + spec: [{ required: true, message: '规格不能为空', trigger: 'blur' }], unit: [{ required: true, message: '单位不能为空', trigger: 'blur' }], status: [{ required: true, message: '状态不能为空', trigger: 'blur' }], packageNum: [{ required: true, message: '内装数量不能为空', trigger: 'blur' }], - purchasePrice: [{ required: true, message: '进价不能为空', trigger: 'blur' }], + // purchasePrice: [{ required: true, message: '进价不能为空', trigger: 'blur' }], retailPrice: [{ required: true, message: '零售价不能为空', trigger: 'blur' }], + promotionPrice: [{ required: true, message: '促销价不能为空', trigger: 'blur' }], }); // 打开弹窗 diff --git a/src/views/supermarket/supermarketSpu/form.vue b/src/views/supermarket/supermarketSpu/form.vue index faf0b54..88760ad 100644 --- a/src/views/supermarket/supermarketSpu/form.vue +++ b/src/views/supermarket/supermarketSpu/form.vue @@ -50,6 +50,13 @@ + + + + + + + @@ -72,11 +79,11 @@ - - - - - + + + + + @@ -87,31 +94,31 @@ - - - - - + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -142,18 +149,11 @@ - - - - - - - - - - - - + + + + +