Merge branch 'test'

.idea/.gitignore

@@ -0,0 +1,5 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/

.idea/codeStyles/Project.xml

@@ -0,0 +1,57 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <HTMLCodeStyleSettings>
+      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
+    </HTMLCodeStyleSettings>
+    <JSCodeStyleSettings version="0">
+      <option name="FORCE_SEMICOLON_STYLE" value="true" />
+      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
+      <option name="USE_DOUBLE_QUOTES" value="false" />
+      <option name="FORCE_QUOTE_STYlE" value="true" />
+      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
+      <option name="SPACES_WITHIN_OBJECT_TYPE_BRACES" value="false" />
+    </JSCodeStyleSettings>
+    <TypeScriptCodeStyleSettings version="0">
+      <option name="FORCE_SEMICOLON_STYLE" value="true" />
+      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
+      <option name="USE_DOUBLE_QUOTES" value="false" />
+      <option name="FORCE_QUOTE_STYlE" value="true" />
+      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
+      <option name="SPACES_WITHIN_OBJECT_TYPE_BRACES" value="false" />
+    </TypeScriptCodeStyleSettings>
+    <VueCodeStyleSettings>
+      <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
+      <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
+    </VueCodeStyleSettings>
+    <codeStyleSettings language="HTML">
+      <option name="SOFT_MARGINS" value="80" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="JavaScript">
+      <option name="SOFT_MARGINS" value="80" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="TypeScript">
+      <option name="SOFT_MARGINS" value="80" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="Vue">
+      <option name="SOFT_MARGINS" value="80" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>

.idea/git_toolbox_blame.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxBlameSettings">
+    <option name="version" value="2" />
+  </component>
+</project>

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,7 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="Stylelint" enabled="true" level="ERROR" enabled_by_default="true" />
+  </profile>
+</component>

.idea/jdt-user.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/jdt-user.iml" filepath="$PROJECT_DIR$/.idea/jdt-user.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

.idea/watcherTasks.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectTasksOptions" suppressed-tasks="SCSS" />
+</project>

src/pages/admin/add_order/pending_order/pay/index.vue

@@ -26,8 +26,7 @@
         <view class="center">
           <nut-ellipsis
             direction="end"
-            :content="itm.Goods.name"
+            :content="itm.Goods.name"></nut-ellipsis>
-          ></nut-ellipsis>
           <!-- <view class="title">{{ itm.Goods.name }}</view> -->
         </view>
         <view class="num">
@@ -45,28 +44,38 @@
         </view>
       </view>
     </view>
-    <view class="btn" @click="ok">立即收款</view>
+    <nut-button
+      style="border-radius: 10px"
+      shape="square"
+      block
+      :loading="isLoading"
+      type="primary"
+      @click="ok"
+      >立即收款</nut-button
+    >
   </view>
 </template>
 
 <script setup lang="ts">
-import { ref } from "vue";
+import {ref} from 'vue';
-import Taro from "@tarojs/taro";
+import Taro from '@tarojs/taro';
-import { getAfterOrder, createPayQr } from "../../../../../api/admin";
+import {getAfterOrder, createPayQr} from '@/api/admin';
 
 const data = ref<any>({});
 
-const val = ref("");
+const val = ref('');
+
+const isLoading = ref(false);
 
 Taro.useLoad((e: any) => {
   get_data(e);
 });
 
-const get_data = async ({ bid, oid }) => {
+const get_data = async ({bid, oid}) => {
   Taro.showLoading({
-    title: "加载中",
+    title: '加载中',
   });
-  const res = await getAfterOrder({ bid, oid });
+  const res = await getAfterOrder({bid, oid});
   data.value = res.data.data;
   Taro.hideLoading();
 };
@@ -74,43 +83,47 @@ const get_data = async ({ bid, oid }) => {
 const get_color = (status: number) => {
   switch (status) {
     case 0:
-      return "#FD0100";
+      return '#FD0100';
     case 1:
-      return "#03A113";
+      return '#03A113';
     case 2:
-      return "#FFA938";
+      return '#FFA938';
   }
 };
 
 const get_status_text = (status: number) => {
   switch (status) {
     case 0:
-      return "未付款";
+      return '未付款';
     case 1:
-      return "已付款";
+      return '已付款';
     case 2:
-      return "挂帐中";
+      return '挂帐中';
   }
 };
 
 const ok = async () => {
   if (!val.value)
     return Taro.showToast({
-      title: "请输入收款金额",
+      title: '请输入收款金额',
-      icon: "none",
+      icon: 'none',
     });
+  isLoading.value = true;
   const res = await createPayQr({
     oid: data.value.oid,
     bid: data.value.bid,
     price: Number(val.value),
   });
-  Taro.setStorageSync("pay_code", res.data.data.code_url);
+  Taro.setStorageSync('pay_code', res.data.data.code_url);
   Taro.navigateTo({
     url: `/pages/admin/add_order/pending_order/wx_pay_code/index?oid=${data.value.oid}&bid=${data.value.bid}`,
+    success: () => {
+      isLoading.value = false;
+    },
   });
 };
 </script>
 
 <style lang="scss">
-@import "./index.scss";
+@import './index.scss';
 </style>

src/utils/index.ts

@@ -7,11 +7,11 @@ export function calculateDistance(
   la2: number,
   lo2: number,
 ): any {
-  var radLat1 = (la1 * Math.PI) / 180.0;
+  const radLat1 = (la1 * Math.PI) / 180.0;
-  var radLat2 = (la2 * Math.PI) / 180.0;
+  const radLat2 = (la2 * Math.PI) / 180.0;
-  var a = radLat1 - radLat2;
+  const a = radLat1 - radLat2;
-  var b = (lo1 * Math.PI) / 180.0 - (lo2 * Math.PI) / 180.0;
+  const b = (lo1 * Math.PI) / 180.0 - (lo2 * Math.PI) / 180.0;
-  var s =
+  let s =
     2 *
     Math.asin(
       Math.sqrt(