diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..10b731c --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,5 @@ +# 默认忽略的文件 +/shelf/ +/workspace.xml +# 基于编辑器的 HTTP 客户端请求 +/httpRequests/ diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..c9827f9 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/git_toolbox_blame.xml b/.idea/git_toolbox_blame.xml new file mode 100644 index 0000000..7dc1249 --- /dev/null +++ b/.idea/git_toolbox_blame.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..7c4836f --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/.idea/jdt-user.iml b/.idea/jdt-user.iml new file mode 100644 index 0000000..24643cc --- /dev/null +++ b/.idea/jdt-user.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..df5e3fa --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml new file mode 100644 index 0000000..fb0d65a --- /dev/null +++ b/.idea/watcherTasks.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/pages/admin/add_order/pending_order/pay/index.vue b/src/pages/admin/add_order/pending_order/pay/index.vue index bafbf55..ba31e97 100644 --- a/src/pages/admin/add_order/pending_order/pay/index.vue +++ b/src/pages/admin/add_order/pending_order/pay/index.vue @@ -26,8 +26,7 @@ + :content="itm.Goods.name"> @@ -45,28 +44,38 @@ - 立即收款 + 立即收款 diff --git a/src/utils/index.ts b/src/utils/index.ts index d78e816..5ecb32a 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -7,11 +7,11 @@ export function calculateDistance( la2: number, lo2: number, ): any { - var radLat1 = (la1 * Math.PI) / 180.0; - var radLat2 = (la2 * Math.PI) / 180.0; - var a = radLat1 - radLat2; - var b = (lo1 * Math.PI) / 180.0 - (lo2 * Math.PI) / 180.0; - var s = + const radLat1 = (la1 * Math.PI) / 180.0; + const radLat2 = (la2 * Math.PI) / 180.0; + const a = radLat1 - radLat2; + const b = (lo1 * Math.PI) / 180.0 - (lo2 * Math.PI) / 180.0; + let s = 2 * Math.asin( Math.sqrt(