feat(custom): 地图apiKey更换，订单核销详情新增支付方式

.prettierrc.json

@@ -1,7 +1,8 @@
 {
   "arrowParens": "avoid",
   "bracketSameLine": true,
-  "bracketSpacing": false,
+  "bracketSpacing": true,
   "singleQuote": true,
-  "trailingComma": "all"
+  "trailingComma": "all",
+  "endOfLine": "lf"
 }

config/index.ts

@@ -51,7 +51,7 @@ const config = {
     prebundle: { enable: false },
   },
   cache: {
-    enable: false, // Webpack 持久化缓存配置，建议开启。默认配置请参考：https://docs.taro.zone/docs/config-detail#cache
+    enable: true, // Webpack 持久化缓存配置，建议开启。默认配置请参考：https://docs.taro.zone/docs/config-detail#cache
   },
   sass: {
     data: `@import "@nutui/nutui-taro/dist/styles/variables.scss";`,

package.json

@@ -36,9 +36,8 @@
     "lint:fix": "eslint --fix --ext .ts,.vue .",
     "lint:staged": "lint-staged",
     "prepare": "husky install",
-    "preview": "vite preview",
     "cz": "cz",
-    "lf": "npx prettier --write --end-of-line lf .",
+    "lf": "npx prettier --write",
     "postinstall": "weapp-tw patch",
     "build:weapp:prod:upload": "taro build --type weapp --upload --robot=1 --desc='正式环境'",
     "build:weapp:test:upload": "taro build --type weapp --upload --robot=2 --desc='测试环境' --mode test"
@@ -112,6 +111,7 @@
     "miniprogram-ci": "^2.0.10",
     "postcss": "8.4.29",
     "postcss-rem-to-responsive-pixel": "^6.0.2",
+    "prettier": "^3.5.3",
     "style-loader": "1.3.0",
     "stylelint": "9.3.0",
     "tailwindcss": "^3.4.17",
@@ -122,6 +122,5 @@
     "weapp-tailwindcss": "^3.7.0",
     "webpack": "^5.97.1",
     "yargs": "^17.7.2"
-  },
-  "packageManager": "pnpm@9.1.4+sha512.9df9cf27c91715646c7d675d1c9c8e41f6fce88246f1318c1aa6a1ed1aeb3c4f032fcdf4ba63cc69c4fe6d634279176b5358727d8f2cc1e65b65f43ce2f8bfb0"
+  }
 }

pnpm-workspace.yaml

@@ -0,0 +1,11 @@
+onlyBuiltDependencies:
+  - '@parcel/watcher'
+  - '@swc/core'
+  - '@tarojs/binding'
+  - core-js
+  - core-js-pure
+  - esbuild
+  - protobufjs
+  - swiper
+  - vue-demi
+  - weapp-tailwindcss

src/pages/admin/add_order/index.scss

@@ -3,7 +3,8 @@
   justify-content: center;
   box-sizing: border-box;
   height: 100vh;
-  background-image: url('./static/WechatIMG10.jpg');
+  // background-image: url('./static/WechatIMG10.jpg');
+  background-image: url('https://m.360buyimg.com/i/jfs/t1/288333/5/8622/43050/682e2e18Ff3a6e2af/bbc66c081c18a467.png');
   background-size: 100% 35%;
   background-repeat: no-repeat;
 

src/pages/admin/add_order/pending_order/components/Footer.vue

@@ -79,7 +79,11 @@
 
 <script setup lang="ts">
 import { onMounted, ref } from 'vue';
-import {cancelAfterOrder, confirmAfterOrder, editAfterOrder} from '@/api/admin';
+import {
+  cancelAfterOrder,
+  confirmAfterOrder,
+  editAfterOrder,
+} from '@/api/admin';
 import Taro from '@tarojs/taro';
 
 const props = defineProps({

src/pages/admin/verify/verify_list/index.vue

@@ -129,6 +129,8 @@ const getPayType = (type: number) => {
       return '平台积分支付';
     case 3:
       return '智多鑫积分支付';
+    case 3:
+      return '渔乐潮玩支付';
     default:
       return '未知';
   }

src/pages/hotGoods/hot_list/index.vue

@@ -189,7 +189,9 @@ const delOrder = async (oid: string) => {
         @click="tabChange(item.value)">
         <view class="text">{{ item.title }}</view>
         <view>{{ item.num }}</view>
-        <view class="line" :class="{lineColor: item.value === tabValue}"></view>
+        <view
+          class="line"
+          :class="{ lineColor: item.value === tabValue }"></view>
       </view>
     </view>
     <view v-if="orderList.length > 0">

src/pages/index/index.vue

@@ -127,8 +127,18 @@ const getUserLocal = async () => {
         url: `https://apis.map.qq.com/ws/geocoder/v1/?location=${res.latitude},${res.longitude}&key=S3GBZ-WR26O-IXNW2-SXBOD-LZXV6-WAFNO&get_poi=1`,
         method: 'GET',
         success: res => {
+          switch (res.data.status) {
+            case 121:
+              Taro.showToast({
+                title: res.data.message,
+                icon: 'none',
+              });
+              break;
+            default:
               const data = res.data.result.address_component;
               address.value = `${data.district}${data.street_number}`;
+              break;
+          }
         },
       });
     },

src/pages/users/order_list/index.vue

@@ -249,7 +249,9 @@ const closed = () => {
           >{{ item.title }}
         </view>
         <!-- <view>{{ item.num }}</view> -->
-        <view class="line" :class="{lineColor: item.value === tabValue}"></view>
+        <view
+          class="line"
+          :class="{ lineColor: item.value === tabValue }"></view>
       </view>
     </view>
     <view v-if="orderList.length > 0">