瀏覽代碼

```
feat(api): 完善token刷新机制并优化请求处理

- 添加token刷新状态控制,防止重复刷新请求
- 实现请求队列处理,确保刷新期间的请求正确处理
- 将token头部字段从token改为Authorization,并添加Bearer前缀
- 修复请求失败时的错误处理逻辑
- 优化loading状态的显示和隐藏

feat(charging): 更新充电页面UI和数据展示

- 添加充电启动动画效果
- 集成半环形进度条组件
- 优化参数数据显示,添加默认值处理
- 更新订单信息显示,支持空值显示
- 调整页面布局和样式
```

zouzexu 4 天之前
父節點
當前提交
75e12c310e
共有 72 個文件被更改,包括 1319 次插入410 次删除
  1. 183 0
      components/zs-half-ring-progress/half-ring-progress.vue
  2. 1 0
      static/img/charge-icon.svg
  3. 78 12
      static/js/api.js
  4. 61 0
      subPackages/charging/charging/charging.css
  5. 57 23
      subPackages/charging/charging/charging.vue
  6. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  7. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  8. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/app-navigation/app-navigation.js.map
  9. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/ax-body/ax-body.js.map
  10. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/ax-custom-title/ax-custom-title.js.map
  11. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/ax-ios-indicator/ax-ios-indicator.js.map
  12. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/ax-popup/ax-popup.js.map
  13. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/zs-half-ring-progress/half-ring-progress.js.map
  14. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  15. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  16. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/map/map.js.map
  17. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/my.js.map
  18. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/subPackages/charging/charging/charging.js.map
  19. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/subPackages/charging/new-site/new-site.js.map
  20. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/subPackages/charging/site-more/site-more.js.map
  21. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/subPackages/charging/site/site.js.map
  22. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/subPackages/charging/terminal/terminal.js.map
  23. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/subPackages/coupon/coupon-buy/coupon-buy.js.map
  24. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/subPackages/coupon/coupons/coupons.js.map
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/subPackages/coupon/recharge-log/recharge-log.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/subPackages/order/order-detail/order-detail.js.map
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/subPackages/order/order/order.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/subPackages/other/banner-page/banner-page.js.map
  29. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/subPackages/other/feedback-reply/feedback-reply.js.map
  30. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/subPackages/other/feedback/feedback.js.map
  31. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/subPackages/other/search/search.js.map
  32. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/lime-painter/components/l-painter/l-painter.js.map
  33. 108 44
      unpackage/dist/dev/mp-weixin/common/vendor.js
  34. 12 12
      unpackage/dist/dev/mp-weixin/components/app-navigation/app-navigation.js
  35. 14 14
      unpackage/dist/dev/mp-weixin/components/ax-body/ax-body.js
  36. 11 11
      unpackage/dist/dev/mp-weixin/components/ax-custom-title/ax-custom-title.js
  37. 11 11
      unpackage/dist/dev/mp-weixin/components/ax-ios-indicator/ax-ios-indicator.js
  38. 12 12
      unpackage/dist/dev/mp-weixin/components/ax-popup/ax-popup.js
  39. 195 0
      unpackage/dist/dev/mp-weixin/components/zs-half-ring-progress/half-ring-progress.js
  40. 4 0
      unpackage/dist/dev/mp-weixin/components/zs-half-ring-progress/half-ring-progress.json
  41. 1 0
      unpackage/dist/dev/mp-weixin/components/zs-half-ring-progress/half-ring-progress.wxml
  42. 125 0
      unpackage/dist/dev/mp-weixin/components/zs-half-ring-progress/half-ring-progress.wxss
  43. 3 3
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  44. 1 1
      unpackage/dist/dev/mp-weixin/pages/login/login.js
  45. 3 3
      unpackage/dist/dev/mp-weixin/pages/map/map.js
  46. 8 8
      unpackage/dist/dev/mp-weixin/pages/my/my.js
  47. 8 8
      unpackage/dist/dev/mp-weixin/project.private.config.json
  48. 1 0
      unpackage/dist/dev/mp-weixin/static/img/charge-icon.svg
  49. 78 12
      unpackage/dist/dev/mp-weixin/static/js/api.js
  50. 9 0
      unpackage/dist/dev/mp-weixin/subPackages/charging/charging/charging.js
  51. 2 1
      unpackage/dist/dev/mp-weixin/subPackages/charging/charging/charging.json
  52. 0 0
      unpackage/dist/dev/mp-weixin/subPackages/charging/charging/charging.wxml
  53. 98 0
      unpackage/dist/dev/mp-weixin/subPackages/charging/charging/charging.wxss
  54. 14 14
      unpackage/dist/dev/mp-weixin/subPackages/charging/new-site/new-site.js
  55. 2 2
      unpackage/dist/dev/mp-weixin/subPackages/charging/site-more/site-more.js
  56. 1 1
      unpackage/dist/dev/mp-weixin/subPackages/charging/site/site.js
  57. 16 16
      unpackage/dist/dev/mp-weixin/subPackages/charging/terminal/terminal.js
  58. 15 15
      unpackage/dist/dev/mp-weixin/subPackages/coupon/coupon-buy/coupon-buy.js
  59. 15 15
      unpackage/dist/dev/mp-weixin/subPackages/coupon/coupons/coupons.js
  60. 14 14
      unpackage/dist/dev/mp-weixin/subPackages/coupon/recharge-log/recharge-log.js
  61. 14 14
      unpackage/dist/dev/mp-weixin/subPackages/order/order-detail/order-detail.js
  62. 15 15
      unpackage/dist/dev/mp-weixin/subPackages/order/order/order.js
  63. 14 14
      unpackage/dist/dev/mp-weixin/subPackages/other/banner-page/banner-page.js
  64. 15 15
      unpackage/dist/dev/mp-weixin/subPackages/other/feedback-reply/feedback-reply.js
  65. 14 14
      unpackage/dist/dev/mp-weixin/subPackages/other/feedback/feedback.js
  66. 14 14
      unpackage/dist/dev/mp-weixin/subPackages/other/search/search.js
  67. 12 12
      unpackage/dist/dev/mp-weixin/subPackages/other/web/web.js
  68. 11 11
      unpackage/dist/dev/mp-weixin/uni_modules/lime-painter/components/l-painter-image/l-painter-image.js
  69. 11 11
      unpackage/dist/dev/mp-weixin/uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode.js
  70. 11 11
      unpackage/dist/dev/mp-weixin/uni_modules/lime-painter/components/l-painter-text/l-painter-text.js
  71. 11 11
      unpackage/dist/dev/mp-weixin/uni_modules/lime-painter/components/l-painter-view/l-painter-view.js
  72. 16 16
      unpackage/dist/dev/mp-weixin/uni_modules/lime-painter/components/l-painter/l-painter.js

+ 183 - 0
components/zs-half-ring-progress/half-ring-progress.vue

@@ -0,0 +1,183 @@
+<template>
+  <view class="progress-container">
+    <!-- 半环进度容器 -->
+    <view class="ring-wrapper">
+      <!-- 背景环(半环底色) -->
+      <view class="ring-bg"></view>
+      <!-- 进度环(渐变+动态进度) -->
+      <view class="ring-progress" :style="{ transform: `rotate(${progressDeg}deg)` }">
+        <!-- 左侧环(青色渐变) -->
+
+      </view>
+      <!-- 进度原点(圆点) -->
+      <view class="progress-dot" :style="{ transform: `rotate(${progressDeg}deg)` }"></view>
+      <!-- 中间文字(百分比+提示) -->
+      <view class="progress-text">
+        <text class="percent">{{ progress }}%</text>
+        <text class="tips">{{ tipText }}</text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "half-ring-progress",
+  props: {
+    // 进度值(0-100)
+    progress: {
+      type: Number,
+      default: 30,
+      validator: val => val >= 0 && val <= 100
+    },
+    // 底部提示文字
+    tipText: {
+      type: String,
+      default: "充电枪正在充电中"
+    },
+    // 是否启用动画
+    animated: {
+      type: Boolean,
+      default: true
+    },
+    // 主题颜色(用于渐变)
+    themeColor: {
+      type: String,
+      default: '#49a6f4'
+    }
+  },
+  computed: {
+    // 计算进度对应的旋转角度(从左侧-90°开始,顺时针旋转)
+    progressDeg() {
+      return -90 + (this.progress * 1.8);
+    },
+    // 渐变颜色(从青色到蓝色)
+    gradientColor() {
+      return 'linear-gradient(99deg, #8FF8FB 0%, #47AEFF 100%)';
+    }
+  }
+};
+</script>
+
+<style scoped>
+.progress-container {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 20rpx;
+}
+
+.ring-wrapper {
+  position: relative;
+  width: 400rpx;
+  height: 200rpx;
+  overflow: hidden;
+}
+
+/* 背景半环样式 */
+.ring-bg {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 400rpx;
+  height: 400rpx;
+  border-radius: 50%;
+  border: 16rpx solid #97DAFF;
+  box-sizing: border-box;
+  clip: rect(0rpx, 400rpx, 200rpx, 0rpx);
+}
+
+/* 进度半环容器(控制旋转) */
+.ring-progress {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 400rpx;
+  height: 200rpx;
+  overflow: hidden;
+  transition: transform 0.6s ease-in-out;
+}
+
+/* 左侧半环(青色) */
+.ring-left {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 400rpx;
+  height: 400rpx;
+  border-radius: 50%;
+  border: 16rpx solid #8FF8FB;
+  box-sizing: border-box;
+  clip: rect(0rpx, 200rpx, 400rpx, 0rpx);
+}
+
+/* 中间过渡区 */
+.ring-middle {
+  position: absolute;
+  top: 0;
+  left: 150rpx;
+  width: 100rpx;
+  height: 400rpx;
+  background: linear-gradient(to right, #8FF8FB, #5EC8FE);
+  clip: rect(0rpx, 100rpx, 200rpx, 0rpx);
+}
+
+/* 右侧半环(蓝色) */
+.ring-right {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 400rpx;
+  height: 400rpx;
+  border-radius: 50%;
+  border: 16rpx solid #47AEFF;
+  box-sizing: border-box;
+  clip: rect(0rpx, 400rpx, 400rpx, 200rpx);
+}
+
+/* 进度原点(末端圆点) */
+.progress-dot {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  width: 28rpx;
+  height: 28rpx;
+  background: #FFFFFF;
+  border: 5rpx solid #47AEFF;
+  border-radius: 50%;
+  transform-origin: center 200rpx;
+  margin-left: -14rpx;
+  margin-top: -14rpx;
+  box-shadow: 0 0 16rpx rgba(71, 174, 255, 0.8);
+  transition: transform 0.6s ease-in-out;
+  z-index: 10;
+}
+
+/* 中间文字样式 */
+.progress-text {
+  position: absolute;
+  top: 65%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  text-align: center;
+}
+
+.percent {
+  display: block;
+  font-size: 60rpx;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 10rpx;
+}
+
+.tips {
+  display: block;
+  font-size: 24rpx;
+  color: #666;
+}
+
+/* 高亮文字(如“充电中”) */
+.tips text {
+  color: v-bind(themeColor);
+}
+</style>

+ 1 - 0
static/img/charge-icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><defs><style>.a{fill:#2b303a;}.b{fill:none;}</style></defs><g transform="translate(-60 -498)"><g transform="translate(-181.76 400.85)"><path class="a" d="M354.651,102.362H350.5a2.08,2.08,0,0,1-2.1-2.106,2.056,2.056,0,0,1,2-2.106h4.154a2.113,2.113,0,0,1,.1,4.212ZM354.643,100.7Zm-4.247-.887a.409.409,0,0,0-.334.443.417.417,0,0,0,.435.443h4.148a.49.49,0,0,0,.238-.443.409.409,0,0,0-.334-.443Z" transform="translate(-101.301)"/><path class="a" d="M253.738,253h-5.32a3.662,3.662,0,0,1-3.657-3.657v-9.864a3.6,3.6,0,0,1,.372-1.6.831.831,0,0,1,1.492.733,1.955,1.955,0,0,0-.2.869v9.864a2,2,0,0,0,2,2h5.32a2,2,0,0,0,2-2v-9.865a1.965,1.965,0,0,0-.118-.672.831.831,0,1,1,1.563-.568,3.622,3.622,0,0,1,.218,1.24v9.864A3.662,3.662,0,0,1,253.738,253Z" transform="translate(0 -136.115)"/><path class="a" d="M409.956,366.649a.832.832,0,0,1-.727-1.233l1.093-1.981h-2.139a.831.831,0,0,1-.733-1.222l1.773-3.325a.831.831,0,1,1,1.467.782l-1.121,2.1h2.161a.831.831,0,0,1,.728,1.233l-1.773,3.214A.832.832,0,0,1,409.956,366.649Z" transform="translate(-158.923 -254.423)"/></g><rect class="b" width="20" height="20" transform="translate(60 498)"/></g></svg>

+ 78 - 12
static/js/api.js

@@ -6,6 +6,10 @@ const api = {};
 // 标志位:控制登录提示弹窗只显示一次
 let isLoginPromptShown = false;
 
+// 标志位:控制token刷新状态,防止重复刷新
+let isRefreshing = false;
+let failedQueue = [];
+
 // 网络请求封装
 const Request = function (opts) {
   const originalComplete = opts.complete;
@@ -102,8 +106,8 @@ api.base = function (method, url, data, opts) {
               console.log("进入刷新请求");
               const refreshResult = await refreshToken();
               if (refreshResult) {
-                // 刷新成功,更新header中的token并重新请求
-                options.header.token = getAccessToken();
+                // 刷新成功,更新header中的Authorization并重新请求
+                options.header.Authorization = "Bearer " + getAccessToken();
                 try {
                   const db = await Request(options);
                   resolve(db);
@@ -113,7 +117,7 @@ api.base = function (method, url, data, opts) {
               } else {
                 // 刷新失败,执行登录
                 // await api.login();
-                options.header.token = getAccessToken();
+                options.header.Authorization = "Bearer " + getAccessToken();
                 try {
                   const db = await Request(options);
                   resolve(db);
@@ -136,13 +140,13 @@ api.base = function (method, url, data, opts) {
         }
       })
       .catch(async (err) => {
-        if (err.data.code == "A0230") {
+        if (err.data?.code == "A0230") {
           try {
             // 尝试刷新token
             const refreshResult = await refreshToken();
             if (refreshResult) {
-              // 刷新成功,更新header中的token并重新请求
-              options.header.token = getAccessToken();
+              // 刷新成功,更新header中的Authorization并重新请求
+              options.header.Authorization = "Bearer " + getAccessToken();
               try {
                 const db = await Request(options);
                 resolve(db);
@@ -156,14 +160,14 @@ api.base = function (method, url, data, opts) {
 
               if (currentRoute === "pages/index/index") {
                 // 在首页时只显示弱提示
-                $app.popup.toast(`${err.data.msg}`);
+                $app.popup.toast(`${err.data?.msg}`);
               } else {
                 // 非首页时显示登录确认框
                 if (!isLoginPromptShown) {
                   isLoginPromptShown = true;
                   // 清除登录缓存
                   $app.popup
-                    .confirm(`${err.data.msg},点击确定去登录`, "提示", {
+                    .confirm(`${err.data?.msg},点击确定去登录`, "提示", {
                       showCancel: true,
                     })
                     .then((confirmed) => {
@@ -180,10 +184,12 @@ api.base = function (method, url, data, opts) {
             reject(err);
           }
         } else {
-          $app.popup.alert(`服务器响应失败\r\n${err.data.msg}`, "数据请求");
+          $app.popup.alert(`服务器响应失败\r\n${err.data?.msg}`, "数据请求");
         }
         /*失败处理,此处为非200状态码引起的错误*/
-        options.hideLoading();
+        if (options.loading && typeof options.hideLoading == "function") {
+          options.hideLoading();
+        }
       });
   });
 };
@@ -193,11 +199,38 @@ const getAccessToken = function () {
   return uni.getStorageSync($config.keyname.accessToken);
 };
 
+// 处理请求队列
+const processQueue = (error, token = null) => {
+  failedQueue.forEach((prom) => {
+    if (error) {
+      prom.reject(error);
+    } else {
+      prom.resolve(token);
+    }
+  });
+
+  failedQueue = [];
+};
+
 // 新增:刷新token的方法
 const refreshToken = async function () {
+  // 如果正在刷新,将请求加入队列
+  if (isRefreshing) {
+    return new Promise((resolve, reject) => {
+      failedQueue.push({ resolve, reject });
+    });
+  }
+
+  isRefreshing = true;
+
   const refreshToken = uni.getStorageSync($config.keyname.refreshToken);
   console.log("刷新token", refreshToken);
-  if (!refreshToken) return false;
+  if (!refreshToken) {
+    isRefreshing = false;
+    processQueue(new Error("No refresh token available"));
+    return false;
+  }
+
   try {
     const res = await Request({
       url: pathJoin($config.url.request, $config.api.refreshToken),
@@ -207,13 +240,25 @@ const refreshToken = async function () {
         "content-type": "application/json",
       },
     });
+
     if (res.code === "00000") {
       uni.setStorageSync($config.keyname.accessToken, res.data.accessToken);
       uni.setStorageSync($config.keyname.refreshToken, res.data.refreshToken);
+
+      const newToken = getAccessToken();
+      isRefreshing = false;
+      processQueue(null, newToken);
+
       return true;
+    } else {
+      isRefreshing = false;
+      processQueue(new Error("Token refresh failed"));
+      return false;
     }
-    return false;
   } catch (e) {
+    console.error("Token refresh error:", e);
+    isRefreshing = false;
+    processQueue(e);
     return false;
   }
 };
@@ -300,6 +345,27 @@ api.upload = function (file, opts) {
       },
       opts || {}
     );
+
+    uni.uploadFile({
+      ...options,
+      success: (res) => {
+        if (options.loading && typeof options.hideLoading == "function") {
+          options.hideLoading();
+        }
+        try {
+          const data = JSON.parse(res.data);
+          resolve(data);
+        } catch (e) {
+          resolve(res);
+        }
+      },
+      fail: (err) => {
+        if (options.loading && typeof options.hideLoading == "function") {
+          options.hideLoading();
+        }
+        reject(err);
+      },
+    });
   });
 };
 

+ 61 - 0
subPackages/charging/charging/charging.css

@@ -83,6 +83,67 @@
 .timer {
   text-align: center;
 }
+.circleBox {
+  position: relative;
+  width: 100px;
+  height: 100px;
+  margin: 10px auto;
+}
+
+.circle,
+.circle1,
+.circle2,
+.circle3 {
+  width: 2vw;
+  height: 2vw;
+  background: rgba(112, 161, 255, 0.1);
+  border: 1px solid rgba(112, 161, 255, 0.15);
+  border-radius: 999px;
+  position: absolute;
+  top: 50%;
+  left: 10%;
+  /* transform: translate(-50%,-75%); */
+}
+.circle1,
+.circle2,
+.circle3 {
+  animation-name: circleChange;
+  animation-duration: 3s;
+  animation-iteration-count: infinite;
+  animation-timing-function: linear;
+}
+.circle1 {
+  animation-delay: 1s;
+}
+.circle2 {
+  animation-delay: 2s;
+}
+.circle3 {
+  animation-delay: 3s;
+}
+
+@keyframes circleChange {
+  0% {
+    transform: scale(1);
+    opacity: 0.95;
+  }
+  25% {
+    transform: scale(2);
+    opacity: 0.75;
+  }
+  50% {
+    transform: scale(3);
+    opacity: 0.5;
+  }
+  75% {
+    transform: scale(4);
+    opacity: 0.25;
+  }
+  100% {
+    transform: scale(5);
+    opacity: 0.05;
+  }
+}
 .timer .value {
   color: #3eb6f8;
   font-size: 30px;

+ 57 - 23
subPackages/charging/charging/charging.vue

@@ -1,6 +1,6 @@
 <template>
 	<ax-body blank="0" hideIndicatorArea>
-		<image src="@/static/img/page-bg01.png" class="page-background"></image>
+		<!-- <image src="@/static/img/page-bg01.png" class="page-background"></image> -->
 		<view class="body">
 			<view v-if="exiting.visible" class="exiting">
 				<view class="app-flex c-center column contet">
@@ -18,54 +18,84 @@
 				</view>
 				<view @click="exiting.visible = false" class="mask"></view>
 			</view>
-			<view v-if="!deviceInfo" class="timer">
-				<view class="value" style="font-size: 22px;">充电正在启动中......</view>
-				<view v-if="isShowBtn" class="name" style="color: red;font-size: 14px;">长时间无法启动可点击“长按结束充电”按钮结束订单。</view>
+			<view v-if="deviceInfo" class="timer">
+				<view class="circleBox">
+					<view class="circle"></view>
+					<view class="circle1"></view>
+					<view class="circle2"></view>
+					<view class="circle3"></view>
+				</view>
+				<view class="timer-box">
+					<view class="value" style="font-size: 22px;">充电正在启动中</view>
+					<view v-if="isShowBtn" class="name">长时间无法启动可点击“长按结束充电”按钮结束订单。</view>
+				</view>
 			</view>
 			<!-- 主图 -->
+			<!-- v-if="deviceInfo.status == '1'" -->
 			<view class="app-flex c-center host-graph">
-				<image
-					src="https://national-motion.oss-cn-beijing.aliyuncs.com/20251230/9ca38a2aa5784e06b9cac31587b188b3.png"
-					mode="widthFix" class="image"></image>
+				<half-ring-progress :progress="80" tipText="充电枪正在" :theme-color="'#00bfff'"></half-ring-progress>
+<!--				<image-->
+<!--					src="https://national-motion.oss-cn-beijing.aliyuncs.com/20260108/2bf62776bec44e3ab43ac3df02d8deac.gif"-->
+<!--					mode="widthFix" class="image"></image>-->
 			</view>
 			<!-- 主参数 -->
 			<view class="parameter-info-box">
 				<!-- 充电动画 -->
-				<view class="charge-loading-box" v-if="deviceInfo.status == '1'">
+				<!-- <view class="charge-loading-box" v-if="deviceInfo.status == '1'">
 					<view class="charge-loading">
 						<image class="charge-icon" src="../../static/img/charge_loading.svg" mode=""></image>
 						<view class="c-loading"></view>
 					</view>
-				</view>
+				</view> -->
 				<!-- 计时器 -->
-				<view class="timer" v-if="deviceInfo.status == '1'">
-					<view class="value">{{ timer.text }}</view>
-					<view class="name">充电时间</view>
+				<view class="timer-father">
+					<view class="item-value">{{ timer.text }}</view>
+					<view class="item-name">充电时间</view>
 				</view>
 				<view class="parameter">
 					<view class="param">
 						<view class="name">电流A</view>
-						<view class="value">{{ deviceInfo.current || '0' }}</view>
+						<view class="value">
+							<text v-if="deviceInfo.current">{{ deviceInfo.current }}</text>
+							<image v-else style="width: 40rpx;height: 40rpx;" src="@/static/img/charge-icon.svg"
+								mode="" />
+						</view>
 					</view>
 					<view class="split"></view>
 					<view class="param">
 						<view class="name">电压V</view>
-						<view class="value">{{ deviceInfo.voltage || '0' }}</view>
+						<view class="value">
+							<text v-if="deviceInfo.voltage">{{ deviceInfo.voltage }}</text>
+							<image v-else style="width: 40rpx;height: 40rpx;" src="@/static/img/charge-icon.svg"
+								mode="" />
+						</view>
 					</view>
 					<view class="split"></view>
 					<view class="param">
 						<view class="name">功率KW</view>
-						<view class="value">{{ deviceInfo.power || '0' }}</view>
+						<view class="value">
+							<text v-if="deviceInfo.power">{{ deviceInfo.power }}</text>
+							<image v-else style="width: 40rpx;height: 40rpx;" src="@/static/img/charge-icon.svg"
+								mode="" />
+						</view>
 					</view>
 					<view class="split"></view>
 					<view class="param">
 						<view class="name">电量/度</view>
-						<view class="value">{{ deviceInfo.totalPower || '0' }}</view>
+						<view class="value">
+							<text v-if="deviceInfo.totalPower">{{ deviceInfo.totalPower }}</text>
+							<image v-else style="width: 40rpx;height: 40rpx;" src="@/static/img/charge-icon.svg"
+								mode="" />
+						</view>
 					</view>
 					<view class="split"></view>
 					<view class="param">
 						<view class="name">费用/元</view>
-						<view class="value">{{ deviceInfo.totalMoney || '0' }}</view>
+						<view class="value">
+							<text v-if="deviceInfo.totalMoney">{{ deviceInfo.totalMoney }}</text>
+							<image v-else style="width: 40rpx;height: 40rpx;" src="@/static/img/charge-icon.svg"
+								mode="" />
+						</view>
 					</view>
 				</view>
 				<view class="end-charge-box">
@@ -77,19 +107,19 @@
 				<view>
 					<view class="cell">
 						<view class="lable">订单编号</view>
-						<view class="contet">{{ deviceInfo.chargeOrderNo }}</view>
+						<view class="contet">{{ deviceInfo.chargeOrderNo || '-' }}</view>
 					</view>
 					<view class="cell">
 						<view class="lable">终端编号</view>
-						<view class="contet">{{ deviceInfo.connectorCode }}</view>
+						<view class="contet">{{ deviceInfo.connectorCode || '-' }}</view>
 					</view>
 					<view class="cell">
 						<view class="lable">充电电站</view>
-						<view class="contet">{{ deviceInfo.stationName }}</view>
+						<view class="contet">{{ deviceInfo.stationName || '-' }}</view>
 					</view>
 					<view class="cell">
 						<view class="lable">充电终端</view>
-						<view class="contet">{{ deviceInfo.connectorName }}</view>
+						<view class="contet">{{ deviceInfo.connectorName || '-' }}</view>
 					</view>
 				</view>
 				<view class="tips">账单信息可能会有所延迟,具体以实际结算为准</view>
@@ -103,10 +133,14 @@
 </template>
 
 <script>
+import halfRingProgress from '@/components/zs-half-ring-progress/half-ring-progress.vue'
 // 终态状态码:2-结算中, 3-已完成, 5-未成功充电
 const TERMINAL_STATUS = ['2', '3', '5'];
 
 export default {
+	components: {
+		halfRingProgress
+	},
 	onLoad(opts) {
 		console.log("启动充值页面的参数:", opts)
 		this.orderInfo.id = opts.orderId;
@@ -200,11 +234,11 @@ export default {
 				// 检查是否显示结束按钮
 				this.checkShowEndBtn(res.data.startTime);
 				// 启动轮询(无论是否正在停止充电,都继续轮询等待状态变化)
-				this.startPolling();
+				// this.startPolling();
 			}).catch(err => {
 				console.error('获取充电信息失败:', err);
 				// 请求失败时也要确保轮询继续
-				this.startPolling();
+				// this.startPolling();
 			});
 		},
 		/**

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/app-navigation/app-navigation.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/ax-body/ax-body.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/ax-custom-title/ax-custom-title.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/ax-ios-indicator/ax-ios-indicator.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/ax-popup/ax-popup.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/zs-half-ring-progress/half-ring-progress.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/map/map.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/my.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/subPackages/charging/charging/charging.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/subPackages/charging/new-site/new-site.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/subPackages/charging/site-more/site-more.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/subPackages/charging/site/site.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/subPackages/charging/terminal/terminal.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/subPackages/coupon/coupon-buy/coupon-buy.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/subPackages/coupon/coupons/coupons.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/subPackages/coupon/recharge-log/recharge-log.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/subPackages/order/order-detail/order-detail.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/subPackages/order/order/order.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/subPackages/other/banner-page/banner-page.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/subPackages/other/feedback-reply/feedback-reply.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/subPackages/other/feedback/feedback.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/subPackages/other/search/search.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/lime-painter/components/l-painter/l-painter.js.map


+ 108 - 44
unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -3298,7 +3298,7 @@ function resolveLocaleChain(locale) {
 
 /***/ }),
 
-/***/ 220:
+/***/ 227:
 /*!*********************************************************************************************************************************!*\
   !*** D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/uni_modules/lime-painter/components/common/relation.js ***!
   \*********************************************************************************************************************************/
@@ -3470,7 +3470,7 @@ function children(parent) {
 
 /***/ }),
 
-/***/ 221:
+/***/ 228:
 /*!*********************************************************************************************************************************!*\
   !*** D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/uni_modules/lime-painter/components/l-painter/props.js ***!
   \*********************************************************************************************************************************/
@@ -3529,7 +3529,7 @@ exports.default = _default;
 
 /***/ }),
 
-/***/ 222:
+/***/ 229:
 /*!*********************************************************************************************************************************!*\
   !*** D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/uni_modules/lime-painter/components/l-painter/utils.js ***!
   \*********************************************************************************************************************************/
@@ -3819,7 +3819,23 @@ function getImageInfo(path, useCORS) {
 
 /***/ }),
 
-/***/ 223:
+/***/ 23:
+/*!***************************************************************!*\
+  !*** ./node_modules/@babel/runtime/helpers/classCallCheck.js ***!
+  \***************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+function _classCallCheck(instance, Constructor) {
+  if (!(instance instanceof Constructor)) {
+    throw new TypeError("Cannot call a class as a function");
+  }
+}
+module.exports = _classCallCheck, module.exports.__esModule = true, module.exports["default"] = module.exports;
+
+/***/ }),
+
+/***/ 230:
 /*!***********************************************************************************************************************************!*\
   !*** D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/uni_modules/lime-painter/components/l-painter/painter.js ***!
   \***********************************************************************************************************************************/
@@ -6192,22 +6208,6 @@ n.WEB == I && (window.Painter = Bt);
 
 /***/ }),
 
-/***/ 23:
-/*!***************************************************************!*\
-  !*** ./node_modules/@babel/runtime/helpers/classCallCheck.js ***!
-  \***************************************************************/
-/*! no static exports found */
-/***/ (function(module, exports) {
-
-function _classCallCheck(instance, Constructor) {
-  if (!(instance instanceof Constructor)) {
-    throw new TypeError("Cannot call a class as a function");
-  }
-}
-module.exports = _classCallCheck, module.exports.__esModule = true, module.exports["default"] = module.exports;
-
-/***/ }),
-
 /***/ 24:
 /*!************************************************************!*\
   !*** ./node_modules/@babel/runtime/helpers/createClass.js ***!
@@ -12388,6 +12388,10 @@ var api = {};
 // 标志位:控制登录提示弹窗只显示一次
 var isLoginPromptShown = false;
 
+// 标志位:控制token刷新状态,防止重复刷新
+var isRefreshing = false;
+var failedQueue = [];
+
 // 网络请求封装
 var Request = function Request(opts) {
   var originalComplete = opts.complete;
@@ -12498,8 +12502,8 @@ api.base = function (method, url, data, opts) {
                             _context.next = 25;
                             break;
                           }
-                          // 刷新成功,更新header中的token并重新请求
-                          options.header.token = getAccessToken();
+                          // 刷新成功,更新header中的Authorization并重新请求
+                          options.header.Authorization = "Bearer " + getAccessToken();
                           _context.prev = 13;
                           _context.next = 16;
                           return Request(options);
@@ -12518,7 +12522,7 @@ api.base = function (method, url, data, opts) {
                         case 25:
                           // 刷新失败,执行登录
                           // await api.login();
-                          options.header.token = getAccessToken();
+                          options.header.Authorization = "Bearer " + getAccessToken();
                           _context.prev = 26;
                           _context.next = 29;
                           return Request(options);
@@ -12559,12 +12563,13 @@ api.base = function (method, url, data, opts) {
                 };
               }()).catch( /*#__PURE__*/function () {
                 var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(err) {
-                  var refreshResult, db, currentPage, currentRoute;
+                  var _err$data;
+                  var refreshResult, db, currentPage, currentRoute, _err$data2, _err$data3, _err$data4;
                   return _regenerator.default.wrap(function _callee2$(_context2) {
                     while (1) {
                       switch (_context2.prev = _context2.next) {
                         case 0:
-                          if (!(err.data.code == "A0230")) {
+                          if (!(((_err$data = err.data) === null || _err$data === void 0 ? void 0 : _err$data.code) == "A0230")) {
                             _context2.next = 29;
                             break;
                           }
@@ -12577,8 +12582,8 @@ api.base = function (method, url, data, opts) {
                             _context2.next = 19;
                             break;
                           }
-                          // 刷新成功,更新header中的token并重新请求
-                          options.header.token = getAccessToken();
+                          // 刷新成功,更新header中的Authorization并重新请求
+                          options.header.Authorization = "Bearer " + getAccessToken();
                           _context2.prev = 7;
                           _context2.next = 10;
                           return Request(options);
@@ -12600,13 +12605,13 @@ api.base = function (method, url, data, opts) {
                           currentRoute = currentPage ? currentPage.route : "";
                           if (currentRoute === "pages/index/index") {
                             // 在首页时只显示弱提示
-                            _app.default.popup.toast("".concat(err.data.msg));
+                            _app.default.popup.toast("".concat((_err$data2 = err.data) === null || _err$data2 === void 0 ? void 0 : _err$data2.msg));
                           } else {
                             // 非首页时显示登录确认框
                             if (!isLoginPromptShown) {
                               isLoginPromptShown = true;
                               // 清除登录缓存
-                              _app.default.popup.confirm("".concat(err.data.msg, ",\u70B9\u51FB\u786E\u5B9A\u53BB\u767B\u5F55"), "提示", {
+                              _app.default.popup.confirm("".concat((_err$data3 = err.data) === null || _err$data3 === void 0 ? void 0 : _err$data3.msg, ",\u70B9\u51FB\u786E\u5B9A\u53BB\u767B\u5F55"), "提示", {
                                 showCancel: true
                               }).then(function (confirmed) {
                                 isLoginPromptShown = false;
@@ -12630,10 +12635,12 @@ api.base = function (method, url, data, opts) {
                           _context2.next = 30;
                           break;
                         case 29:
-                          _app.default.popup.alert("\u670D\u52A1\u5668\u54CD\u5E94\u5931\u8D25\r\n".concat(err.data.msg), "数据请求");
+                          _app.default.popup.alert("\u670D\u52A1\u5668\u54CD\u5E94\u5931\u8D25\r\n".concat((_err$data4 = err.data) === null || _err$data4 === void 0 ? void 0 : _err$data4.msg), "数据请求");
                         case 30:
                           /*失败处理,此处为非200状态码引起的错误*/
-                          options.hideLoading();
+                          if (options.loading && typeof options.hideLoading == "function") {
+                            options.hideLoading();
+                          }
                         case 31:
                         case "end":
                           return _context2.stop();
@@ -12663,24 +12670,51 @@ var getAccessToken = function getAccessToken() {
   return uni.getStorageSync(_config.default.keyname.accessToken);
 };
 
+// 处理请求队列
+var processQueue = function processQueue(error) {
+  var token = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+  failedQueue.forEach(function (prom) {
+    if (error) {
+      prom.reject(error);
+    } else {
+      prom.resolve(token);
+    }
+  });
+  failedQueue = [];
+};
+
 // 新增:刷新token的方法
 var refreshToken = /*#__PURE__*/function () {
   var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
-    var refreshToken, res;
+    var refreshToken, res, newToken;
     return _regenerator.default.wrap(function _callee4$(_context4) {
       while (1) {
         switch (_context4.prev = _context4.next) {
           case 0:
+            if (!isRefreshing) {
+              _context4.next = 2;
+              break;
+            }
+            return _context4.abrupt("return", new Promise(function (resolve, reject) {
+              failedQueue.push({
+                resolve: resolve,
+                reject: reject
+              });
+            }));
+          case 2:
+            isRefreshing = true;
             refreshToken = uni.getStorageSync(_config.default.keyname.refreshToken);
             console.log("刷新token", refreshToken);
             if (refreshToken) {
-              _context4.next = 4;
+              _context4.next = 9;
               break;
             }
+            isRefreshing = false;
+            processQueue(new Error("No refresh token available"));
             return _context4.abrupt("return", false);
-          case 4:
-            _context4.prev = 4;
-            _context4.next = 7;
+          case 9:
+            _context4.prev = 9;
+            _context4.next = 12;
             return Request({
               url: pathJoin(_config.default.url.request, _config.default.api.refreshToken),
               method: "post",
@@ -12691,27 +12725,38 @@ var refreshToken = /*#__PURE__*/function () {
                 "content-type": "application/json"
               }
             });
-          case 7:
+          case 12:
             res = _context4.sent;
             if (!(res.code === "00000")) {
-              _context4.next = 12;
+              _context4.next = 22;
               break;
             }
             uni.setStorageSync(_config.default.keyname.accessToken, res.data.accessToken);
             uni.setStorageSync(_config.default.keyname.refreshToken, res.data.refreshToken);
+            newToken = getAccessToken();
+            isRefreshing = false;
+            processQueue(null, newToken);
             return _context4.abrupt("return", true);
-          case 12:
+          case 22:
+            isRefreshing = false;
+            processQueue(new Error("Token refresh failed"));
             return _context4.abrupt("return", false);
-          case 15:
-            _context4.prev = 15;
-            _context4.t0 = _context4["catch"](4);
+          case 25:
+            _context4.next = 33;
+            break;
+          case 27:
+            _context4.prev = 27;
+            _context4.t0 = _context4["catch"](9);
+            console.error("Token refresh error:", _context4.t0);
+            isRefreshing = false;
+            processQueue(_context4.t0);
             return _context4.abrupt("return", false);
-          case 18:
+          case 33:
           case "end":
             return _context4.stop();
         }
       }
-    }, _callee4, null, [[4, 15]]);
+    }, _callee4, null, [[9, 27]]);
   }));
   return function refreshToken() {
     return _ref4.apply(this, arguments);
@@ -12811,6 +12856,25 @@ api.upload = function (file, opts) {
       // 设置关闭LOADING的方法
       hideLoading: hideLoading
     }, opts || {});
+    uni.uploadFile(_objectSpread(_objectSpread({}, options), {}, {
+      success: function success(res) {
+        if (options.loading && typeof options.hideLoading == "function") {
+          options.hideLoading();
+        }
+        try {
+          var data = JSON.parse(res.data);
+          resolve(data);
+        } catch (e) {
+          resolve(res);
+        }
+      },
+      fail: function fail(err) {
+        if (options.loading && typeof options.hideLoading == "function") {
+          options.hideLoading();
+        }
+        reject(err);
+      }
+    }));
   });
 };
 

File diff suppressed because it is too large
+ 12 - 12
unpackage/dist/dev/mp-weixin/components/app-navigation/app-navigation.js


File diff suppressed because it is too large
+ 14 - 14
unpackage/dist/dev/mp-weixin/components/ax-body/ax-body.js


File diff suppressed because it is too large
+ 11 - 11
unpackage/dist/dev/mp-weixin/components/ax-custom-title/ax-custom-title.js


File diff suppressed because it is too large
+ 11 - 11
unpackage/dist/dev/mp-weixin/components/ax-ios-indicator/ax-ios-indicator.js


File diff suppressed because it is too large
+ 12 - 12
unpackage/dist/dev/mp-weixin/components/ax-popup/ax-popup.js


File diff suppressed because it is too large
+ 195 - 0
unpackage/dist/dev/mp-weixin/components/zs-half-ring-progress/half-ring-progress.js


+ 4 - 0
unpackage/dist/dev/mp-weixin/components/zs-half-ring-progress/half-ring-progress.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

+ 1 - 0
unpackage/dist/dev/mp-weixin/components/zs-half-ring-progress/half-ring-progress.wxml

@@ -0,0 +1 @@
+<view class="progress-container data-v-00ef5f96"><view class="ring-wrapper data-v-00ef5f96"><view class="ring-bg data-v-00ef5f96"></view><view class="ring-progress data-v-00ef5f96" style="{{'transform:'+('rotate('+progressDeg+'deg)')+';'}}"></view><view class="progress-dot data-v-00ef5f96" style="{{'transform:'+('rotate('+progressDeg+'deg)')+';'}}"></view><view class="progress-text data-v-00ef5f96"><text class="percent data-v-00ef5f96">{{progress+"%"}}</text><text class="tips data-v-00ef5f96">{{tipText}}</text></view></view></view>

+ 125 - 0
unpackage/dist/dev/mp-weixin/components/zs-half-ring-progress/half-ring-progress.wxss

@@ -0,0 +1,125 @@
+
+.progress-container.data-v-00ef5f96 {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 20rpx;
+}
+.ring-wrapper.data-v-00ef5f96 {
+  position: relative;
+  width: 400rpx;
+  height: 200rpx;
+  overflow: hidden;
+}
+
+/* 背景半环样式 */
+.ring-bg.data-v-00ef5f96 {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 400rpx;
+  height: 400rpx;
+  border-radius: 50%;
+  border: 16rpx solid #97DAFF;
+  box-sizing: border-box;
+  clip: rect(0rpx, 400rpx, 200rpx, 0rpx);
+}
+
+/* 进度半环容器(控制旋转) */
+.ring-progress.data-v-00ef5f96 {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 400rpx;
+  height: 200rpx;
+  overflow: hidden;
+  transition: -webkit-transform 0.6s ease-in-out;
+  transition: transform 0.6s ease-in-out;
+  transition: transform 0.6s ease-in-out, -webkit-transform 0.6s ease-in-out;
+}
+
+/* 左侧半环(青色) */
+.ring-left.data-v-00ef5f96 {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 400rpx;
+  height: 400rpx;
+  border-radius: 50%;
+  border: 16rpx solid #8FF8FB;
+  box-sizing: border-box;
+  clip: rect(0rpx, 200rpx, 400rpx, 0rpx);
+}
+
+/* 中间过渡区 */
+.ring-middle.data-v-00ef5f96 {
+  position: absolute;
+  top: 0;
+  left: 150rpx;
+  width: 100rpx;
+  height: 400rpx;
+  background: linear-gradient(to right, #8FF8FB, #5EC8FE);
+  clip: rect(0rpx, 100rpx, 200rpx, 0rpx);
+}
+
+/* 右侧半环(蓝色) */
+.ring-right.data-v-00ef5f96 {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 400rpx;
+  height: 400rpx;
+  border-radius: 50%;
+  border: 16rpx solid #47AEFF;
+  box-sizing: border-box;
+  clip: rect(0rpx, 400rpx, 400rpx, 200rpx);
+}
+
+/* 进度原点(末端圆点) */
+.progress-dot.data-v-00ef5f96 {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  width: 28rpx;
+  height: 28rpx;
+  background: #FFFFFF;
+  border: 5rpx solid #47AEFF;
+  border-radius: 50%;
+  -webkit-transform-origin: center 200rpx;
+          transform-origin: center 200rpx;
+  margin-left: -14rpx;
+  margin-top: -14rpx;
+  box-shadow: 0 0 16rpx rgba(71, 174, 255, 0.8);
+  transition: -webkit-transform 0.6s ease-in-out;
+  transition: transform 0.6s ease-in-out;
+  transition: transform 0.6s ease-in-out, -webkit-transform 0.6s ease-in-out;
+  z-index: 10;
+}
+
+/* 中间文字样式 */
+.progress-text.data-v-00ef5f96 {
+  position: absolute;
+  top: 65%;
+  left: 50%;
+  -webkit-transform: translate(-50%, -50%);
+          transform: translate(-50%, -50%);
+  text-align: center;
+}
+.percent.data-v-00ef5f96 {
+  display: block;
+  font-size: 60rpx;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 10rpx;
+}
+.tips.data-v-00ef5f96 {
+  display: block;
+  font-size: 24rpx;
+  color: #666;
+}
+
+/* 高亮文字(如“充电中”) */
+.tips text.data-v-00ef5f96 {
+  color: v-bind(themeColor);
+}
+

+ 3 - 3
unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 194))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 201))
     },
     axPopup: function () {
-      return __webpack_require__.e(/*! import() | components/ax-popup/ax-popup */ "components/ax-popup/ax-popup").then(__webpack_require__.bind(null, /*! @/components/ax-popup/ax-popup.vue */ 201))
+      return __webpack_require__.e(/*! import() | components/ax-popup/ax-popup */ "components/ax-popup/ax-popup").then(__webpack_require__.bind(null, /*! @/components/ax-popup/ax-popup.vue */ 208))
     },
     appNavigation: function () {
-      return Promise.all(/*! import() | components/app-navigation/app-navigation */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/app-navigation/app-navigation")]).then(__webpack_require__.bind(null, /*! @/components/app-navigation/app-navigation.vue */ 208))
+      return Promise.all(/*! import() | components/app-navigation/app-navigation */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/app-navigation/app-navigation")]).then(__webpack_require__.bind(null, /*! @/components/app-navigation/app-navigation.vue */ 215))
     },
   }
 } catch (e) {

+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 194))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 201))
     },
   }
 } catch (e) {

+ 3 - 3
unpackage/dist/dev/mp-weixin/pages/map/map.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 194))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 201))
     },
     axPopup: function () {
-      return __webpack_require__.e(/*! import() | components/ax-popup/ax-popup */ "components/ax-popup/ax-popup").then(__webpack_require__.bind(null, /*! @/components/ax-popup/ax-popup.vue */ 201))
+      return __webpack_require__.e(/*! import() | components/ax-popup/ax-popup */ "components/ax-popup/ax-popup").then(__webpack_require__.bind(null, /*! @/components/ax-popup/ax-popup.vue */ 208))
     },
     appNavigation: function () {
-      return Promise.all(/*! import() | components/app-navigation/app-navigation */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/app-navigation/app-navigation")]).then(__webpack_require__.bind(null, /*! @/components/app-navigation/app-navigation.vue */ 208))
+      return Promise.all(/*! import() | components/app-navigation/app-navigation */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/app-navigation/app-navigation")]).then(__webpack_require__.bind(null, /*! @/components/app-navigation/app-navigation.vue */ 215))
     },
   }
 } catch (e) {

+ 8 - 8
unpackage/dist/dev/mp-weixin/pages/my/my.js

@@ -101,28 +101,28 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 194))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 201))
     },
     axPopup: function () {
-      return __webpack_require__.e(/*! import() | components/ax-popup/ax-popup */ "components/ax-popup/ax-popup").then(__webpack_require__.bind(null, /*! @/components/ax-popup/ax-popup.vue */ 201))
+      return __webpack_require__.e(/*! import() | components/ax-popup/ax-popup */ "components/ax-popup/ax-popup").then(__webpack_require__.bind(null, /*! @/components/ax-popup/ax-popup.vue */ 208))
     },
     lPainter: function () {
-      return Promise.all(/*! import() | uni_modules/lime-painter/components/l-painter/l-painter */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/lime-painter/components/l-painter/l-painter")]).then(__webpack_require__.bind(null, /*! @/uni_modules/lime-painter/components/l-painter/l-painter.vue */ 215))
+      return Promise.all(/*! import() | uni_modules/lime-painter/components/l-painter/l-painter */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/lime-painter/components/l-painter/l-painter")]).then(__webpack_require__.bind(null, /*! @/uni_modules/lime-painter/components/l-painter/l-painter.vue */ 222))
     },
     lPainterView: function () {
-      return Promise.all(/*! import() | uni_modules/lime-painter/components/l-painter-view/l-painter-view */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/lime-painter/components/l-painter-view/l-painter-view")]).then(__webpack_require__.bind(null, /*! @/uni_modules/lime-painter/components/l-painter-view/l-painter-view.vue */ 226))
+      return Promise.all(/*! import() | uni_modules/lime-painter/components/l-painter-view/l-painter-view */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/lime-painter/components/l-painter-view/l-painter-view")]).then(__webpack_require__.bind(null, /*! @/uni_modules/lime-painter/components/l-painter-view/l-painter-view.vue */ 233))
     },
     lPainterImage: function () {
-      return Promise.all(/*! import() | uni_modules/lime-painter/components/l-painter-image/l-painter-image */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/lime-painter/components/l-painter-image/l-painter-image")]).then(__webpack_require__.bind(null, /*! @/uni_modules/lime-painter/components/l-painter-image/l-painter-image.vue */ 231))
+      return Promise.all(/*! import() | uni_modules/lime-painter/components/l-painter-image/l-painter-image */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/lime-painter/components/l-painter-image/l-painter-image")]).then(__webpack_require__.bind(null, /*! @/uni_modules/lime-painter/components/l-painter-image/l-painter-image.vue */ 238))
     },
     lPainterQrcode: function () {
-      return Promise.all(/*! import() | uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode")]).then(__webpack_require__.bind(null, /*! @/uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode.vue */ 236))
+      return Promise.all(/*! import() | uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode")]).then(__webpack_require__.bind(null, /*! @/uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode.vue */ 243))
     },
     lPainterText: function () {
-      return Promise.all(/*! import() | uni_modules/lime-painter/components/l-painter-text/l-painter-text */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/lime-painter/components/l-painter-text/l-painter-text")]).then(__webpack_require__.bind(null, /*! @/uni_modules/lime-painter/components/l-painter-text/l-painter-text.vue */ 241))
+      return Promise.all(/*! import() | uni_modules/lime-painter/components/l-painter-text/l-painter-text */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/lime-painter/components/l-painter-text/l-painter-text")]).then(__webpack_require__.bind(null, /*! @/uni_modules/lime-painter/components/l-painter-text/l-painter-text.vue */ 248))
     },
     appNavigation: function () {
-      return Promise.all(/*! import() | components/app-navigation/app-navigation */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/app-navigation/app-navigation")]).then(__webpack_require__.bind(null, /*! @/components/app-navigation/app-navigation.vue */ 208))
+      return Promise.all(/*! import() | components/app-navigation/app-navigation */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/app-navigation/app-navigation")]).then(__webpack_require__.bind(null, /*! @/components/app-navigation/app-navigation.vue */ 215))
     },
   }
 } catch (e) {

+ 8 - 8
unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -9,29 +9,29 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pages/login/login",
-          "pathName": "pages/login/login",
+          "name": "启动充电",
+          "pathName": "subPackages/charging/charging/charging",
           "query": "",
           "scene": null,
           "launchMode": "default"
         },
         {
-          "name": "订单详情",
-          "pathName": "pages/order-detail/order-detail",
+          "name": "pages/login/login",
+          "pathName": "pages/login/login",
           "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "站点详情新",
-          "pathName": "pages/new-site/new-site",
+          "name": "订单详情",
+          "pathName": "pages/order-detail/order-detail",
           "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "设备启动页面",
-          "pathName": "pages/charging/charging",
+          "name": "站点详情新",
+          "pathName": "pages/new-site/new-site",
           "query": "",
           "launchMode": "default",
           "scene": null

+ 1 - 0
unpackage/dist/dev/mp-weixin/static/img/charge-icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><defs><style>.a{fill:#2b303a;}.b{fill:none;}</style></defs><g transform="translate(-60 -498)"><g transform="translate(-181.76 400.85)"><path class="a" d="M354.651,102.362H350.5a2.08,2.08,0,0,1-2.1-2.106,2.056,2.056,0,0,1,2-2.106h4.154a2.113,2.113,0,0,1,.1,4.212ZM354.643,100.7Zm-4.247-.887a.409.409,0,0,0-.334.443.417.417,0,0,0,.435.443h4.148a.49.49,0,0,0,.238-.443.409.409,0,0,0-.334-.443Z" transform="translate(-101.301)"/><path class="a" d="M253.738,253h-5.32a3.662,3.662,0,0,1-3.657-3.657v-9.864a3.6,3.6,0,0,1,.372-1.6.831.831,0,0,1,1.492.733,1.955,1.955,0,0,0-.2.869v9.864a2,2,0,0,0,2,2h5.32a2,2,0,0,0,2-2v-9.865a1.965,1.965,0,0,0-.118-.672.831.831,0,1,1,1.563-.568,3.622,3.622,0,0,1,.218,1.24v9.864A3.662,3.662,0,0,1,253.738,253Z" transform="translate(0 -136.115)"/><path class="a" d="M409.956,366.649a.832.832,0,0,1-.727-1.233l1.093-1.981h-2.139a.831.831,0,0,1-.733-1.222l1.773-3.325a.831.831,0,1,1,1.467.782l-1.121,2.1h2.161a.831.831,0,0,1,.728,1.233l-1.773,3.214A.832.832,0,0,1,409.956,366.649Z" transform="translate(-158.923 -254.423)"/></g><rect class="b" width="20" height="20" transform="translate(60 498)"/></g></svg>

+ 78 - 12
unpackage/dist/dev/mp-weixin/static/js/api.js

@@ -6,6 +6,10 @@ const api = {};
 // 标志位:控制登录提示弹窗只显示一次
 let isLoginPromptShown = false;
 
+// 标志位:控制token刷新状态,防止重复刷新
+let isRefreshing = false;
+let failedQueue = [];
+
 // 网络请求封装
 const Request = function (opts) {
   const originalComplete = opts.complete;
@@ -102,8 +106,8 @@ api.base = function (method, url, data, opts) {
               console.log("进入刷新请求");
               const refreshResult = await refreshToken();
               if (refreshResult) {
-                // 刷新成功,更新header中的token并重新请求
-                options.header.token = getAccessToken();
+                // 刷新成功,更新header中的Authorization并重新请求
+                options.header.Authorization = "Bearer " + getAccessToken();
                 try {
                   const db = await Request(options);
                   resolve(db);
@@ -113,7 +117,7 @@ api.base = function (method, url, data, opts) {
               } else {
                 // 刷新失败,执行登录
                 // await api.login();
-                options.header.token = getAccessToken();
+                options.header.Authorization = "Bearer " + getAccessToken();
                 try {
                   const db = await Request(options);
                   resolve(db);
@@ -136,13 +140,13 @@ api.base = function (method, url, data, opts) {
         }
       })
       .catch(async (err) => {
-        if (err.data.code == "A0230") {
+        if (err.data?.code == "A0230") {
           try {
             // 尝试刷新token
             const refreshResult = await refreshToken();
             if (refreshResult) {
-              // 刷新成功,更新header中的token并重新请求
-              options.header.token = getAccessToken();
+              // 刷新成功,更新header中的Authorization并重新请求
+              options.header.Authorization = "Bearer " + getAccessToken();
               try {
                 const db = await Request(options);
                 resolve(db);
@@ -156,14 +160,14 @@ api.base = function (method, url, data, opts) {
 
               if (currentRoute === "pages/index/index") {
                 // 在首页时只显示弱提示
-                $app.popup.toast(`${err.data.msg}`);
+                $app.popup.toast(`${err.data?.msg}`);
               } else {
                 // 非首页时显示登录确认框
                 if (!isLoginPromptShown) {
                   isLoginPromptShown = true;
                   // 清除登录缓存
                   $app.popup
-                    .confirm(`${err.data.msg},点击确定去登录`, "提示", {
+                    .confirm(`${err.data?.msg},点击确定去登录`, "提示", {
                       showCancel: true,
                     })
                     .then((confirmed) => {
@@ -180,10 +184,12 @@ api.base = function (method, url, data, opts) {
             reject(err);
           }
         } else {
-          $app.popup.alert(`服务器响应失败\r\n${err.data.msg}`, "数据请求");
+          $app.popup.alert(`服务器响应失败\r\n${err.data?.msg}`, "数据请求");
         }
         /*失败处理,此处为非200状态码引起的错误*/
-        options.hideLoading();
+        if (options.loading && typeof options.hideLoading == "function") {
+          options.hideLoading();
+        }
       });
   });
 };
@@ -193,11 +199,38 @@ const getAccessToken = function () {
   return uni.getStorageSync($config.keyname.accessToken);
 };
 
+// 处理请求队列
+const processQueue = (error, token = null) => {
+  failedQueue.forEach((prom) => {
+    if (error) {
+      prom.reject(error);
+    } else {
+      prom.resolve(token);
+    }
+  });
+
+  failedQueue = [];
+};
+
 // 新增:刷新token的方法
 const refreshToken = async function () {
+  // 如果正在刷新,将请求加入队列
+  if (isRefreshing) {
+    return new Promise((resolve, reject) => {
+      failedQueue.push({ resolve, reject });
+    });
+  }
+
+  isRefreshing = true;
+
   const refreshToken = uni.getStorageSync($config.keyname.refreshToken);
   console.log("刷新token", refreshToken);
-  if (!refreshToken) return false;
+  if (!refreshToken) {
+    isRefreshing = false;
+    processQueue(new Error("No refresh token available"));
+    return false;
+  }
+
   try {
     const res = await Request({
       url: pathJoin($config.url.request, $config.api.refreshToken),
@@ -207,13 +240,25 @@ const refreshToken = async function () {
         "content-type": "application/json",
       },
     });
+
     if (res.code === "00000") {
       uni.setStorageSync($config.keyname.accessToken, res.data.accessToken);
       uni.setStorageSync($config.keyname.refreshToken, res.data.refreshToken);
+
+      const newToken = getAccessToken();
+      isRefreshing = false;
+      processQueue(null, newToken);
+
       return true;
+    } else {
+      isRefreshing = false;
+      processQueue(new Error("Token refresh failed"));
+      return false;
     }
-    return false;
   } catch (e) {
+    console.error("Token refresh error:", e);
+    isRefreshing = false;
+    processQueue(e);
     return false;
   }
 };
@@ -300,6 +345,27 @@ api.upload = function (file, opts) {
       },
       opts || {}
     );
+
+    uni.uploadFile({
+      ...options,
+      success: (res) => {
+        if (options.loading && typeof options.hideLoading == "function") {
+          options.hideLoading();
+        }
+        try {
+          const data = JSON.parse(res.data);
+          resolve(data);
+        } catch (e) {
+          resolve(res);
+        }
+      },
+      fail: (err) => {
+        if (options.loading && typeof options.hideLoading == "function") {
+          options.hideLoading();
+        }
+        reject(err);
+      },
+    });
   });
 };
 

File diff suppressed because it is too large
+ 9 - 0
unpackage/dist/dev/mp-weixin/subPackages/charging/charging/charging.js


+ 2 - 1
unpackage/dist/dev/mp-weixin/subPackages/charging/charging/charging.json

@@ -1,6 +1,7 @@
 {
   "navigationBarTitleText": "正在充电",
   "usingComponents": {
-    "ax-body": "/components/ax-body/ax-body"
+    "ax-body": "/components/ax-body/ax-body",
+    "half-ring-progress": "/components/zs-half-ring-progress/half-ring-progress"
   }
 }

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/subPackages/charging/charging/charging.wxml


+ 98 - 0
unpackage/dist/dev/mp-weixin/subPackages/charging/charging/charging.wxss

@@ -95,6 +95,104 @@
 .timer.data-v-442e69c1 {
   text-align: center;
 }
+.circleBox.data-v-442e69c1 {
+  position: relative;
+  width: 100px;
+  height: 100px;
+  margin: 10px auto;
+}
+.circle.data-v-442e69c1,
+.circle1.data-v-442e69c1,
+.circle2.data-v-442e69c1,
+.circle3.data-v-442e69c1 {
+  width: 2vw;
+  height: 2vw;
+  background: rgba(112, 161, 255, 0.1);
+  border: 1px solid rgba(112, 161, 255, 0.15);
+  border-radius: 999px;
+  position: absolute;
+  top: 50%;
+  left: 10%;
+  /* transform: translate(-50%,-75%); */
+}
+.circle1.data-v-442e69c1,
+.circle2.data-v-442e69c1,
+.circle3.data-v-442e69c1 {
+  -webkit-animation-name: circleChange-data-v-442e69c1;
+          animation-name: circleChange-data-v-442e69c1;
+  -webkit-animation-duration: 3s;
+          animation-duration: 3s;
+  -webkit-animation-iteration-count: infinite;
+          animation-iteration-count: infinite;
+  -webkit-animation-timing-function: linear;
+          animation-timing-function: linear;
+}
+.circle1.data-v-442e69c1 {
+  -webkit-animation-delay: 1s;
+          animation-delay: 1s;
+}
+.circle2.data-v-442e69c1 {
+  -webkit-animation-delay: 2s;
+          animation-delay: 2s;
+}
+.circle3.data-v-442e69c1 {
+  -webkit-animation-delay: 3s;
+          animation-delay: 3s;
+}
+@-webkit-keyframes circleChange-data-v-442e69c1 {
+0% {
+    -webkit-transform: scale(1);
+            transform: scale(1);
+    opacity: 0.95;
+}
+25% {
+    -webkit-transform: scale(2);
+            transform: scale(2);
+    opacity: 0.75;
+}
+50% {
+    -webkit-transform: scale(3);
+            transform: scale(3);
+    opacity: 0.5;
+}
+75% {
+    -webkit-transform: scale(4);
+            transform: scale(4);
+    opacity: 0.25;
+}
+100% {
+    -webkit-transform: scale(5);
+            transform: scale(5);
+    opacity: 0.05;
+}
+}
+@keyframes circleChange-data-v-442e69c1 {
+0% {
+    -webkit-transform: scale(1);
+            transform: scale(1);
+    opacity: 0.95;
+}
+25% {
+    -webkit-transform: scale(2);
+            transform: scale(2);
+    opacity: 0.75;
+}
+50% {
+    -webkit-transform: scale(3);
+            transform: scale(3);
+    opacity: 0.5;
+}
+75% {
+    -webkit-transform: scale(4);
+            transform: scale(4);
+    opacity: 0.25;
+}
+100% {
+    -webkit-transform: scale(5);
+            transform: scale(5);
+    opacity: 0.05;
+}
+}
 .timer .value.data-v-442e69c1 {
   color: #3eb6f8;
   font-size: 30px;

File diff suppressed because it is too large
+ 14 - 14
unpackage/dist/dev/mp-weixin/subPackages/charging/new-site/new-site.js


+ 2 - 2
unpackage/dist/dev/mp-weixin/subPackages/charging/site-more/site-more.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 194))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 201))
     },
     axIosIndicator: function () {
-      return __webpack_require__.e(/*! import() | components/ax-ios-indicator/ax-ios-indicator */ "components/ax-ios-indicator/ax-ios-indicator").then(__webpack_require__.bind(null, /*! @/components/ax-ios-indicator/ax-ios-indicator.vue */ 246))
+      return __webpack_require__.e(/*! import() | components/ax-ios-indicator/ax-ios-indicator */ "components/ax-ios-indicator/ax-ios-indicator").then(__webpack_require__.bind(null, /*! @/components/ax-ios-indicator/ax-ios-indicator.vue */ 253))
     },
   }
 } catch (e) {

+ 1 - 1
unpackage/dist/dev/mp-weixin/subPackages/charging/site/site.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 194))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 201))
     },
   }
 } catch (e) {

File diff suppressed because it is too large
+ 16 - 16
unpackage/dist/dev/mp-weixin/subPackages/charging/terminal/terminal.js


File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/subPackages/coupon/coupon-buy/coupon-buy.js


File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/subPackages/coupon/coupons/coupons.js


File diff suppressed because it is too large
+ 14 - 14
unpackage/dist/dev/mp-weixin/subPackages/coupon/recharge-log/recharge-log.js


File diff suppressed because it is too large
+ 14 - 14
unpackage/dist/dev/mp-weixin/subPackages/order/order-detail/order-detail.js


File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/subPackages/order/order/order.js


File diff suppressed because it is too large
+ 14 - 14
unpackage/dist/dev/mp-weixin/subPackages/other/banner-page/banner-page.js


File diff suppressed because it is too large
+ 15 - 15
unpackage/dist/dev/mp-weixin/subPackages/other/feedback-reply/feedback-reply.js


File diff suppressed because it is too large
+ 14 - 14
unpackage/dist/dev/mp-weixin/subPackages/other/feedback/feedback.js


File diff suppressed because it is too large
+ 14 - 14
unpackage/dist/dev/mp-weixin/subPackages/other/search/search.js


+ 12 - 12
unpackage/dist/dev/mp-weixin/subPackages/other/web/web.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["subPackages/other/web/web"],{
 
-/***/ 180:
+/***/ 187:
 /*!*****************************************************************************************************************************!*\
   !*** D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/main.js?{"page":"subPackages%2Fother%2Fweb%2Fweb"} ***!
   \*****************************************************************************************************************************/
@@ -13,7 +13,7 @@
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 __webpack_require__(/*! uni-pages */ 26);
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 25));
-var _web = _interopRequireDefault(__webpack_require__(/*! ./subPackages/other/web/web.vue */ 181));
+var _web = _interopRequireDefault(__webpack_require__(/*! ./subPackages/other/web/web.vue */ 188));
 // @ts-ignore
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 createPage(_web.default);
@@ -21,7 +21,7 @@ createPage(_web.default);
 
 /***/ }),
 
-/***/ 181:
+/***/ 188:
 /*!********************************************************************************************************!*\
   !*** D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/subPackages/other/web/web.vue ***!
   \********************************************************************************************************/
@@ -30,8 +30,8 @@ createPage(_web.default);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _web_vue_vue_type_template_id_e0bee58c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./web.vue?vue&type=template&id=e0bee58c& */ 182);
-/* harmony import */ var _web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./web.vue?vue&type=script&lang=js& */ 184);
+/* harmony import */ var _web_vue_vue_type_template_id_e0bee58c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./web.vue?vue&type=template&id=e0bee58c& */ 189);
+/* harmony import */ var _web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./web.vue?vue&type=script&lang=js& */ 191);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 39);
 
@@ -60,7 +60,7 @@ component.options.__file = "subPackages/other/web/web.vue"
 
 /***/ }),
 
-/***/ 182:
+/***/ 189:
 /*!***************************************************************************************************************************************!*\
   !*** D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/subPackages/other/web/web.vue?vue&type=template&id=e0bee58c& ***!
   \***************************************************************************************************************************************/
@@ -69,7 +69,7 @@ component.options.__file = "subPackages/other/web/web.vue"
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_template_id_e0bee58c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./web.vue?vue&type=template&id=e0bee58c& */ 183);
+/* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_template_id_e0bee58c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./web.vue?vue&type=template&id=e0bee58c& */ 190);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_template_id_e0bee58c___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_template_id_e0bee58c___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -82,7 +82,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 183:
+/***/ 190:
 /*!***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/subPackages/other/web/web.vue?vue&type=template&id=e0bee58c& ***!
   \***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -118,7 +118,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 184:
+/***/ 191:
 /*!*********************************************************************************************************************************!*\
   !*** D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/subPackages/other/web/web.vue?vue&type=script&lang=js& ***!
   \*********************************************************************************************************************************/
@@ -127,14 +127,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./web.vue?vue&type=script&lang=js& */ 185);
+/* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./web.vue?vue&type=script&lang=js& */ 192);
 /* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 185:
+/***/ 192:
 /*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/subPackages/other/web/web.vue?vue&type=script&lang=js& ***!
   \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -182,5 +182,5 @@ exports.default = _default;
 
 /***/ })
 
-},[[180,"common/runtime","common/vendor"]]]);
+},[[187,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../../.sourcemap/mp-weixin/subPackages/other/web/web.js.map

+ 11 - 11
unpackage/dist/dev/mp-weixin/uni_modules/lime-painter/components/l-painter-image/l-painter-image.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["uni_modules/lime-painter/components/l-painter-image/l-painter-image"],{
 
-/***/ 231:
+/***/ 238:
 /*!**************************************************************************************************************************************************!*\
   !*** D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/uni_modules/lime-painter/components/l-painter-image/l-painter-image.vue ***!
   \**************************************************************************************************************************************************/
@@ -9,8 +9,8 @@
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _l_painter_image_vue_vue_type_template_id_6347946f___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./l-painter-image.vue?vue&type=template&id=6347946f& */ 232);
-/* harmony import */ var _l_painter_image_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./l-painter-image.vue?vue&type=script&lang=js& */ 234);
+/* harmony import */ var _l_painter_image_vue_vue_type_template_id_6347946f___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./l-painter-image.vue?vue&type=template&id=6347946f& */ 239);
+/* harmony import */ var _l_painter_image_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./l-painter-image.vue?vue&type=script&lang=js& */ 241);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _l_painter_image_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _l_painter_image_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 39);
 
@@ -39,7 +39,7 @@ component.options.__file = "uni_modules/lime-painter/components/l-painter-image/
 
 /***/ }),
 
-/***/ 232:
+/***/ 239:
 /*!*********************************************************************************************************************************************************************************!*\
   !*** D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/uni_modules/lime-painter/components/l-painter-image/l-painter-image.vue?vue&type=template&id=6347946f& ***!
   \*********************************************************************************************************************************************************************************/
@@ -48,7 +48,7 @@ component.options.__file = "uni_modules/lime-painter/components/l-painter-image/
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_image_vue_vue_type_template_id_6347946f___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./l-painter-image.vue?vue&type=template&id=6347946f& */ 233);
+/* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_image_vue_vue_type_template_id_6347946f___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./l-painter-image.vue?vue&type=template&id=6347946f& */ 240);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_image_vue_vue_type_template_id_6347946f___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_image_vue_vue_type_template_id_6347946f___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -61,7 +61,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 233:
+/***/ 240:
 /*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/uni_modules/lime-painter/components/l-painter-image/l-painter-image.vue?vue&type=template&id=6347946f& ***!
   \*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -88,7 +88,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 234:
+/***/ 241:
 /*!***************************************************************************************************************************************************************************!*\
   !*** D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/uni_modules/lime-painter/components/l-painter-image/l-painter-image.vue?vue&type=script&lang=js& ***!
   \***************************************************************************************************************************************************************************/
@@ -97,14 +97,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_image_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./l-painter-image.vue?vue&type=script&lang=js& */ 235);
+/* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_image_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./l-painter-image.vue?vue&type=script&lang=js& */ 242);
 /* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_image_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_image_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_image_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_image_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_image_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 235:
+/***/ 242:
 /*!**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/uni_modules/lime-painter/components/l-painter-image/l-painter-image.vue?vue&type=script&lang=js& ***!
   \**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -118,7 +118,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _relation = __webpack_require__(/*! ../common/relation */ 220);
+var _relation = __webpack_require__(/*! ../common/relation */ 227);
 //
 //
 //
@@ -151,7 +151,7 @@ exports.default = _default;
     'uni_modules/lime-painter/components/l-painter-image/l-painter-image-create-component',
     {
         'uni_modules/lime-painter/components/l-painter-image/l-painter-image-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('2')['createComponent'](__webpack_require__(231))
+            __webpack_require__('2')['createComponent'](__webpack_require__(238))
         })
     },
     [['uni_modules/lime-painter/components/l-painter-image/l-painter-image-create-component']]

+ 11 - 11
unpackage/dist/dev/mp-weixin/uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode"],{
 
-/***/ 236:
+/***/ 243:
 /*!****************************************************************************************************************************************************!*\
   !*** D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode.vue ***!
   \****************************************************************************************************************************************************/
@@ -9,8 +9,8 @@
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _l_painter_qrcode_vue_vue_type_template_id_24552746___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./l-painter-qrcode.vue?vue&type=template&id=24552746& */ 237);
-/* harmony import */ var _l_painter_qrcode_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./l-painter-qrcode.vue?vue&type=script&lang=js& */ 239);
+/* harmony import */ var _l_painter_qrcode_vue_vue_type_template_id_24552746___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./l-painter-qrcode.vue?vue&type=template&id=24552746& */ 244);
+/* harmony import */ var _l_painter_qrcode_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./l-painter-qrcode.vue?vue&type=script&lang=js& */ 246);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _l_painter_qrcode_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _l_painter_qrcode_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 39);
 
@@ -39,7 +39,7 @@ component.options.__file = "uni_modules/lime-painter/components/l-painter-qrcode
 
 /***/ }),
 
-/***/ 237:
+/***/ 244:
 /*!***********************************************************************************************************************************************************************************!*\
   !*** D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode.vue?vue&type=template&id=24552746& ***!
   \***********************************************************************************************************************************************************************************/
@@ -48,7 +48,7 @@ component.options.__file = "uni_modules/lime-painter/components/l-painter-qrcode
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_qrcode_vue_vue_type_template_id_24552746___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./l-painter-qrcode.vue?vue&type=template&id=24552746& */ 238);
+/* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_qrcode_vue_vue_type_template_id_24552746___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./l-painter-qrcode.vue?vue&type=template&id=24552746& */ 245);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_qrcode_vue_vue_type_template_id_24552746___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_qrcode_vue_vue_type_template_id_24552746___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -61,7 +61,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 238:
+/***/ 245:
 /*!***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode.vue?vue&type=template&id=24552746& ***!
   \***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -88,7 +88,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 239:
+/***/ 246:
 /*!*****************************************************************************************************************************************************************************!*\
   !*** D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode.vue?vue&type=script&lang=js& ***!
   \*****************************************************************************************************************************************************************************/
@@ -97,14 +97,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_qrcode_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./l-painter-qrcode.vue?vue&type=script&lang=js& */ 240);
+/* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_qrcode_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./l-painter-qrcode.vue?vue&type=script&lang=js& */ 247);
 /* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_qrcode_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_qrcode_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_qrcode_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_qrcode_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_qrcode_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 240:
+/***/ 247:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode.vue?vue&type=script&lang=js& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -118,7 +118,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _relation = __webpack_require__(/*! ../common/relation */ 220);
+var _relation = __webpack_require__(/*! ../common/relation */ 227);
 //
 //
 //
@@ -150,7 +150,7 @@ exports.default = _default;
     'uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode-create-component',
     {
         'uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('2')['createComponent'](__webpack_require__(236))
+            __webpack_require__('2')['createComponent'](__webpack_require__(243))
         })
     },
     [['uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode-create-component']]

+ 11 - 11
unpackage/dist/dev/mp-weixin/uni_modules/lime-painter/components/l-painter-text/l-painter-text.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["uni_modules/lime-painter/components/l-painter-text/l-painter-text"],{
 
-/***/ 241:
+/***/ 248:
 /*!************************************************************************************************************************************************!*\
   !*** D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/uni_modules/lime-painter/components/l-painter-text/l-painter-text.vue ***!
   \************************************************************************************************************************************************/
@@ -9,8 +9,8 @@
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _l_painter_text_vue_vue_type_template_id_133934fd___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./l-painter-text.vue?vue&type=template&id=133934fd& */ 242);
-/* harmony import */ var _l_painter_text_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./l-painter-text.vue?vue&type=script&lang=js& */ 244);
+/* harmony import */ var _l_painter_text_vue_vue_type_template_id_133934fd___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./l-painter-text.vue?vue&type=template&id=133934fd& */ 249);
+/* harmony import */ var _l_painter_text_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./l-painter-text.vue?vue&type=script&lang=js& */ 251);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _l_painter_text_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _l_painter_text_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 39);
 
@@ -39,7 +39,7 @@ component.options.__file = "uni_modules/lime-painter/components/l-painter-text/l
 
 /***/ }),
 
-/***/ 242:
+/***/ 249:
 /*!*******************************************************************************************************************************************************************************!*\
   !*** D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/uni_modules/lime-painter/components/l-painter-text/l-painter-text.vue?vue&type=template&id=133934fd& ***!
   \*******************************************************************************************************************************************************************************/
@@ -48,7 +48,7 @@ component.options.__file = "uni_modules/lime-painter/components/l-painter-text/l
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_text_vue_vue_type_template_id_133934fd___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./l-painter-text.vue?vue&type=template&id=133934fd& */ 243);
+/* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_text_vue_vue_type_template_id_133934fd___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./l-painter-text.vue?vue&type=template&id=133934fd& */ 250);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_text_vue_vue_type_template_id_133934fd___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_text_vue_vue_type_template_id_133934fd___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -61,7 +61,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 243:
+/***/ 250:
 /*!*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/uni_modules/lime-painter/components/l-painter-text/l-painter-text.vue?vue&type=template&id=133934fd& ***!
   \*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -88,7 +88,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 244:
+/***/ 251:
 /*!*************************************************************************************************************************************************************************!*\
   !*** D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/uni_modules/lime-painter/components/l-painter-text/l-painter-text.vue?vue&type=script&lang=js& ***!
   \*************************************************************************************************************************************************************************/
@@ -97,14 +97,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_text_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./l-painter-text.vue?vue&type=script&lang=js& */ 245);
+/* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_text_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./l-painter-text.vue?vue&type=script&lang=js& */ 252);
 /* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_text_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_text_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_text_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_text_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_text_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 245:
+/***/ 252:
 /*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/uni_modules/lime-painter/components/l-painter-text/l-painter-text.vue?vue&type=script&lang=js& ***!
   \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -118,7 +118,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _relation = __webpack_require__(/*! ../common/relation */ 220);
+var _relation = __webpack_require__(/*! ../common/relation */ 227);
 //
 //
 //
@@ -156,7 +156,7 @@ exports.default = _default;
     'uni_modules/lime-painter/components/l-painter-text/l-painter-text-create-component',
     {
         'uni_modules/lime-painter/components/l-painter-text/l-painter-text-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('2')['createComponent'](__webpack_require__(241))
+            __webpack_require__('2')['createComponent'](__webpack_require__(248))
         })
     },
     [['uni_modules/lime-painter/components/l-painter-text/l-painter-text-create-component']]

+ 11 - 11
unpackage/dist/dev/mp-weixin/uni_modules/lime-painter/components/l-painter-view/l-painter-view.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["uni_modules/lime-painter/components/l-painter-view/l-painter-view"],{
 
-/***/ 226:
+/***/ 233:
 /*!************************************************************************************************************************************************!*\
   !*** D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/uni_modules/lime-painter/components/l-painter-view/l-painter-view.vue ***!
   \************************************************************************************************************************************************/
@@ -9,8 +9,8 @@
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _l_painter_view_vue_vue_type_template_id_0c5815fd___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./l-painter-view.vue?vue&type=template&id=0c5815fd& */ 227);
-/* harmony import */ var _l_painter_view_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./l-painter-view.vue?vue&type=script&lang=js& */ 229);
+/* harmony import */ var _l_painter_view_vue_vue_type_template_id_0c5815fd___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./l-painter-view.vue?vue&type=template&id=0c5815fd& */ 234);
+/* harmony import */ var _l_painter_view_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./l-painter-view.vue?vue&type=script&lang=js& */ 236);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _l_painter_view_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _l_painter_view_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 39);
 
@@ -39,7 +39,7 @@ component.options.__file = "uni_modules/lime-painter/components/l-painter-view/l
 
 /***/ }),
 
-/***/ 227:
+/***/ 234:
 /*!*******************************************************************************************************************************************************************************!*\
   !*** D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/uni_modules/lime-painter/components/l-painter-view/l-painter-view.vue?vue&type=template&id=0c5815fd& ***!
   \*******************************************************************************************************************************************************************************/
@@ -48,7 +48,7 @@ component.options.__file = "uni_modules/lime-painter/components/l-painter-view/l
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_view_vue_vue_type_template_id_0c5815fd___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./l-painter-view.vue?vue&type=template&id=0c5815fd& */ 228);
+/* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_view_vue_vue_type_template_id_0c5815fd___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./l-painter-view.vue?vue&type=template&id=0c5815fd& */ 235);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_view_vue_vue_type_template_id_0c5815fd___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_view_vue_vue_type_template_id_0c5815fd___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -61,7 +61,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 228:
+/***/ 235:
 /*!*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/uni_modules/lime-painter/components/l-painter-view/l-painter-view.vue?vue&type=template&id=0c5815fd& ***!
   \*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -88,7 +88,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 229:
+/***/ 236:
 /*!*************************************************************************************************************************************************************************!*\
   !*** D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/uni_modules/lime-painter/components/l-painter-view/l-painter-view.vue?vue&type=script&lang=js& ***!
   \*************************************************************************************************************************************************************************/
@@ -97,14 +97,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_view_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./l-painter-view.vue?vue&type=script&lang=js& */ 230);
+/* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_view_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../../../edgeDownload/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./l-painter-view.vue?vue&type=script&lang=js& */ 237);
 /* harmony import */ var _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_view_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_view_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_view_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_view_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_edgeDownload_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_l_painter_view_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 230:
+/***/ 237:
 /*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/zhongshuweilai/zswl.zip/zswl/code/charge_miniapp/charge_miniapp/uni_modules/lime-painter/components/l-painter-view/l-painter-view.vue?vue&type=script&lang=js& ***!
   \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -118,7 +118,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _relation = __webpack_require__(/*! ../common/relation */ 220);
+var _relation = __webpack_require__(/*! ../common/relation */ 227);
 //
 //
 //
@@ -155,7 +155,7 @@ exports.default = _default;
     'uni_modules/lime-painter/components/l-painter-view/l-painter-view-create-component',
     {
         'uni_modules/lime-painter/components/l-painter-view/l-painter-view-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('2')['createComponent'](__webpack_require__(226))
+            __webpack_require__('2')['createComponent'](__webpack_require__(233))
         })
     },
     [['uni_modules/lime-painter/components/l-painter-view/l-painter-view-create-component']]

File diff suppressed because it is too large
+ 16 - 16
unpackage/dist/dev/mp-weixin/uni_modules/lime-painter/components/l-painter/l-painter.js


Some files were not shown because too many files changed in this diff