电价查询，经济测算

androidPrivacy.json

@@ -1,38 +1,38 @@
 {
-  "version": "1",
-  "prompt": "template",
-  "title": "服务协议和隐私政策",
-  "message": "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://esos-iot.bjdexn.cn/wx_images/service.png\">《服务协议》</a>和<a href=\"https://esos-iot.bjdexn.cn/wx_images/privacy.png\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
-  "buttonAccept": "同意并接受",
-  "buttonRefuse": "暂不同意",
-  "hrefLoader": "system",
-  "backToExit":"false",
-  "second": {
-    "title": "确认提示",
-    "message": "　　进入应用前，你需先同意<a href=\"https://esos-iot.bjdexn.cn/wx_images/service.png\">《服务协议》</a>和<a href=\"https://esos-iot.bjdexn.cn/wx_images/privacy.png\">《隐私政策》</a>，否则将退出应用。",
-    "buttonAccept": "同意并继续",
-    "buttonRefuse": "退出应用"
-  },
-  "disagreeMode":{
-    "support": false,
-    "loadNativePlugins": false,
-    "visitorEntry": false,
-    "showAlways": false
-  },
-  "styles": {
-    "backgroundColor": "#FFFFFF",
-    "borderRadius":"5px",
-    "title": {
-      "color": "#222222"
+    "version" : "1",
+    "prompt" : "template",
+    "title" : "服务协议和隐私政策",
+    "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://esos-iot.bjdexn.cn/wx_images/service.png\">《服务协议》</a>和<a href=\"https://esos-iot.bjdexn.cn/wx_images/privacy.png\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+    "buttonAccept" : "同意并接受",
+    "buttonRefuse" : "暂不同意",
+    "hrefLoader" : "system",
+    "backToExit" : "false",
+    "second" : {
+        "title" : "确认提示",
+        "message" : "　　进入应用前，你需先同意<a href=\"https://esos-iot.bjdexn.cn/wx_images/service.png\">《服务协议》</a>和<a href=\"https://esos-iot.bjdexn.cn/wx_images/privacy.png\">《隐私政策》</a>，否则将退出应用。",
+        "buttonAccept" : "同意并继续",
+        "buttonRefuse" : "退出应用"
     },
-    "buttonAccept": {
-      "color": "#007545"
+    "disagreeMode" : {
+        "support" : false,
+        "loadNativePlugins" : false,
+        "visitorEntry" : false,
+        "showAlways" : false
     },
-    "buttonRefuse": {
-      "color": "#222222"
-    },
-    "buttonVisitor": {
-      "color": "#222222"
+    "styles" : {
+        "backgroundColor" : "#FFFFFF",
+        "borderRadius" : "5px",
+        "title" : {
+            "color" : "#222222"
+        },
+        "buttonAccept" : {
+            "color" : "#007545"
+        },
+        "buttonRefuse" : {
+            "color" : "#222222"
+        },
+        "buttonVisitor" : {
+            "color" : "#222222"
+        }
     }
-  }
 }

en.json

@@ -146,5 +146,33 @@
 		"charge": "Charge",
 		"discharge": "Discharge",
 		"standing": "Standing"
+	},
+	"electricityprice": {
+	"title":"Types of Industrial and Commercial Electricity",
+	"area":"Select Region",
+	"electricity":"Electricity classification",
+	"voltagelevel":"Voltage level",
+	"selectdate":"Select Date",
+	"monthlytime":"Monthly Peak/Off-Peak Rates",
+	"periodtime":"Period",
+	"timesharing":"Time-of-Use",
+	"electricityprice":"Electricity Rate",
+	"Trend":"Monthly Price Trend",
+	"CP":"CP",
+	"PK":"PK",
+	"SH":"SH",
+	"OP":"OP",
+	"SOP":"SOP",
+	"Spread":"Max Peak-Valley Spread",
+	"monthly":"Monthly TOU Spread",
+	"capacitycharge":"Capacity Charge",
+	"electricitys":"Base Electricity Price",
+	"energyCharge":"Energy Charge",
+	"demandcharge":"Demand Charge",
+	"capacityprice":"Capacity Price",
+	// "kWmonth":"$/kW-month",
+	"kVAmonth":"$/kVA-month",
+	"kWh_":"$/kW-month",
+	"Profile":"Daily Electricity Price Profile"
 	}
-}
+}  

font/demo.css

@@ -0,0 +1,539 @@
+/* Logo 字体 */
+@font-face {
+  font-family: "iconfont logo";
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
+}
+
+.logo {
+  font-family: "iconfont logo";
+  font-size: 160px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+/* tabs */
+.nav-tabs {
+  position: relative;
+}
+
+.nav-tabs .nav-more {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  height: 42px;
+  line-height: 42px;
+  color: #666;
+}
+
+#tabs {
+  border-bottom: 1px solid #eee;
+}
+
+#tabs li {
+  cursor: pointer;
+  width: 100px;
+  height: 40px;
+  line-height: 40px;
+  text-align: center;
+  font-size: 16px;
+  border-bottom: 2px solid transparent;
+  position: relative;
+  z-index: 1;
+  margin-bottom: -1px;
+  color: #666;
+}
+
+
+#tabs .active {
+  border-bottom-color: #f00;
+  color: #222;
+}
+
+.tab-container .content {
+  display: none;
+}
+
+/* 页面布局 */
+.main {
+  padding: 30px 100px;
+  width: 960px;
+  margin: 0 auto;
+}
+
+.main .logo {
+  color: #333;
+  text-align: left;
+  margin-bottom: 30px;
+  line-height: 1;
+  height: 110px;
+  margin-top: -50px;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.main .logo a {
+  font-size: 160px;
+  color: #333;
+}
+
+.helps {
+  margin-top: 40px;
+}
+
+.helps pre {
+  padding: 20px;
+  margin: 10px 0;
+  border: solid 1px #e7e1cd;
+  background-color: #fffdef;
+  overflow: auto;
+}
+
+.icon_lists {
+  width: 100% !important;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.icon_lists li {
+  width: 100px;
+  margin-bottom: 10px;
+  margin-right: 20px;
+  text-align: center;
+  list-style: none !important;
+  cursor: default;
+}
+
+.icon_lists li .code-name {
+  line-height: 1.2;
+}
+
+.icon_lists .icon {
+  display: block;
+  height: 100px;
+  line-height: 100px;
+  font-size: 42px;
+  margin: 10px auto;
+  color: #333;
+  -webkit-transition: font-size 0.25s linear, width 0.25s linear;
+  -moz-transition: font-size 0.25s linear, width 0.25s linear;
+  transition: font-size 0.25s linear, width 0.25s linear;
+}
+
+.icon_lists .icon:hover {
+  font-size: 100px;
+}
+
+.icon_lists .svg-icon {
+  /* 通过设置 font-size 来改变图标大小 */
+  width: 1em;
+  /* 图标和文字相邻时，垂直对齐 */
+  vertical-align: -0.15em;
+  /* 通过设置 color 来改变 SVG 的颜色/fill */
+  fill: currentColor;
+  /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示
+      normalize.css 中也包含这行 */
+  overflow: hidden;
+}
+
+.icon_lists li .name,
+.icon_lists li .code-name {
+  color: #666;
+}
+
+/* markdown 样式 */
+.markdown {
+  color: #666;
+  font-size: 14px;
+  line-height: 1.8;
+}
+
+.highlight {
+  line-height: 1.5;
+}
+
+.markdown img {
+  vertical-align: middle;
+  max-width: 100%;
+}
+
+.markdown h1 {
+  color: #404040;
+  font-weight: 500;
+  line-height: 40px;
+  margin-bottom: 24px;
+}
+
+.markdown h2,
+.markdown h3,
+.markdown h4,
+.markdown h5,
+.markdown h6 {
+  color: #404040;
+  margin: 1.6em 0 0.6em 0;
+  font-weight: 500;
+  clear: both;
+}
+
+.markdown h1 {
+  font-size: 28px;
+}
+
+.markdown h2 {
+  font-size: 22px;
+}
+
+.markdown h3 {
+  font-size: 16px;
+}
+
+.markdown h4 {
+  font-size: 14px;
+}
+
+.markdown h5 {
+  font-size: 12px;
+}
+
+.markdown h6 {
+  font-size: 12px;
+}
+
+.markdown hr {
+  height: 1px;
+  border: 0;
+  background: #e9e9e9;
+  margin: 16px 0;
+  clear: both;
+}
+
+.markdown p {
+  margin: 1em 0;
+}
+
+.markdown>p,
+.markdown>blockquote,
+.markdown>.highlight,
+.markdown>ol,
+.markdown>ul {
+  width: 80%;
+}
+
+.markdown ul>li {
+  list-style: circle;
+}
+
+.markdown>ul li,
+.markdown blockquote ul>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown>ul li p,
+.markdown>ol li p {
+  margin: 0.6em 0;
+}
+
+.markdown ol>li {
+  list-style: decimal;
+}
+
+.markdown>ol li,
+.markdown blockquote ol>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown code {
+  margin: 0 3px;
+  padding: 0 5px;
+  background: #eee;
+  border-radius: 3px;
+}
+
+.markdown strong,
+.markdown b {
+  font-weight: 600;
+}
+
+.markdown>table {
+  border-collapse: collapse;
+  border-spacing: 0px;
+  empty-cells: show;
+  border: 1px solid #e9e9e9;
+  width: 95%;
+  margin-bottom: 24px;
+}
+
+.markdown>table th {
+  white-space: nowrap;
+  color: #333;
+  font-weight: 600;
+}
+
+.markdown>table th,
+.markdown>table td {
+  border: 1px solid #e9e9e9;
+  padding: 8px 16px;
+  text-align: left;
+}
+
+.markdown>table th {
+  background: #F7F7F7;
+}
+
+.markdown blockquote {
+  font-size: 90%;
+  color: #999;
+  border-left: 4px solid #e9e9e9;
+  padding-left: 0.8em;
+  margin: 1em 0;
+}
+
+.markdown blockquote p {
+  margin: 0;
+}
+
+.markdown .anchor {
+  opacity: 0;
+  transition: opacity 0.3s ease;
+  margin-left: 8px;
+}
+
+.markdown .waiting {
+  color: #ccc;
+}
+
+.markdown h1:hover .anchor,
+.markdown h2:hover .anchor,
+.markdown h3:hover .anchor,
+.markdown h4:hover .anchor,
+.markdown h5:hover .anchor,
+.markdown h6:hover .anchor {
+  opacity: 1;
+  display: inline-block;
+}
+
+.markdown>br,
+.markdown>p>br {
+  clear: both;
+}
+
+
+.hljs {
+  display: block;
+  background: white;
+  padding: 0.5em;
+  color: #333333;
+  overflow-x: auto;
+}
+
+.hljs-comment,
+.hljs-meta {
+  color: #969896;
+}
+
+.hljs-string,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-strong,
+.hljs-emphasis,
+.hljs-quote {
+  color: #df5000;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-type {
+  color: #a71d5d;
+}
+
+.hljs-literal,
+.hljs-symbol,
+.hljs-bullet,
+.hljs-attribute {
+  color: #0086b3;
+}
+
+.hljs-section,
+.hljs-name {
+  color: #63a35c;
+}
+
+.hljs-tag {
+  color: #333333;
+}
+
+.hljs-title,
+.hljs-attr,
+.hljs-selector-id,
+.hljs-selector-class,
+.hljs-selector-attr,
+.hljs-selector-pseudo {
+  color: #795da3;
+}
+
+.hljs-addition {
+  color: #55a532;
+  background-color: #eaffea;
+}
+
+.hljs-deletion {
+  color: #bd2c00;
+  background-color: #ffecec;
+}
+
+.hljs-link {
+  text-decoration: underline;
+}
+
+/* 代码高亮 */
+/* PrismJS 1.15.0
+https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
+/**
+ * prism.js default theme for JavaScript, CSS and HTML
+ * Based on dabblet (http://dabblet.com)
+ * @author Lea Verou
+ */
+code[class*="language-"],
+pre[class*="language-"] {
+  color: black;
+  background: none;
+  text-shadow: 0 1px white;
+  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+  text-align: left;
+  white-space: pre;
+  word-spacing: normal;
+  word-break: normal;
+  word-wrap: normal;
+  line-height: 1.5;
+
+  -moz-tab-size: 4;
+  -o-tab-size: 4;
+  tab-size: 4;
+
+  -webkit-hyphens: none;
+  -moz-hyphens: none;
+  -ms-hyphens: none;
+  hyphens: none;
+}
+
+pre[class*="language-"]::-moz-selection,
+pre[class*="language-"] ::-moz-selection,
+code[class*="language-"]::-moz-selection,
+code[class*="language-"] ::-moz-selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+pre[class*="language-"]::selection,
+pre[class*="language-"] ::selection,
+code[class*="language-"]::selection,
+code[class*="language-"] ::selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+@media print {
+
+  code[class*="language-"],
+  pre[class*="language-"] {
+    text-shadow: none;
+  }
+}
+
+/* Code blocks */
+pre[class*="language-"] {
+  padding: 1em;
+  margin: .5em 0;
+  overflow: auto;
+}
+
+:not(pre)>code[class*="language-"],
+pre[class*="language-"] {
+  background: #f5f2f0;
+}
+
+/* Inline code */
+:not(pre)>code[class*="language-"] {
+  padding: .1em;
+  border-radius: .3em;
+  white-space: normal;
+}
+
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+  color: slategray;
+}
+
+.token.punctuation {
+  color: #999;
+}
+
+.namespace {
+  opacity: .7;
+}
+
+.token.property,
+.token.tag,
+.token.boolean,
+.token.number,
+.token.constant,
+.token.symbol,
+.token.deleted {
+  color: #905;
+}
+
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.inserted {
+  color: #690;
+}
+
+.token.operator,
+.token.entity,
+.token.url,
+.language-css .token.string,
+.style .token.string {
+  color: #9a6e3a;
+  background: hsla(0, 0%, 100%, .5);
+}
+
+.token.atrule,
+.token.attr-value,
+.token.keyword {
+  color: #07a;
+}
+
+.token.function,
+.token.class-name {
+  color: #DD4A68;
+}
+
+.token.regex,
+.token.important,
+.token.variable {
+  color: #e90;
+}
+
+.token.important,
+.token.bold {
+  font-weight: bold;
+}
+
+.token.italic {
+  font-style: italic;
+}
+
+.token.entity {
+  cursor: help;
+}

font/demo_index.html

@@ -0,0 +1,303 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8"/>
+  <title>iconfont Demo</title>
+  <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg" type="image/x-icon"/>
+  <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg"/>
+  <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
+  <link rel="stylesheet" href="demo.css">
+  <link rel="stylesheet" href="iconfont.css">
+  <script src="iconfont.js"></script>
+  <!-- jQuery -->
+  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/7bfddb60-08e8-11e9-9b04-53e73bb6408b.js"></script>
+  <!-- 代码高亮 -->
+  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/a3f714d0-08e6-11e9-8a15-ebf944d7534c.js"></script>
+  <style>
+    .main .logo {
+      margin-top: 0;
+      height: auto;
+    }
+
+    .main .logo a {
+      display: flex;
+      align-items: center;
+    }
+
+    .main .logo .sub-title {
+      margin-left: 0.5em;
+      font-size: 22px;
+      color: #fff;
+      background: linear-gradient(-45deg, #3967FF, #B500FE);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+    }
+  </style>
+</head>
+<body>
+  <div class="main">
+    <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">
+      <img width="200" src="https://img.alicdn.com/imgextra/i3/O1CN01Mn65HV1FfSEzR6DKv_!!6000000000514-55-tps-228-59.svg">
+      
+    </a></h1>
+    <div class="nav-tabs">
+      <ul id="tabs" class="dib-box">
+        <li class="dib active"><span>Unicode</span></li>
+        <li class="dib"><span>Font class</span></li>
+        <li class="dib"><span>Symbol</span></li>
+      </ul>
+      
+      <a href="https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=4935042" target="_blank" class="nav-more">查看项目</a>
+      
+    </div>
+    <div class="tab-container">
+      <div class="content unicode" style="display: block;">
+          <ul class="icon_lists dib-box">
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe679;</span>
+                <div class="name">选择时间</div>
+                <div class="code-name">&amp;#xe679;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe606;</span>
+                <div class="name">跳转</div>
+                <div class="code-name">&amp;#xe606;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe65b;</span>
+                <div class="name">地区</div>
+                <div class="code-name">&amp;#xe65b;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe631;</span>
+                <div class="name">电压</div>
+                <div class="code-name">&amp;#xe631;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe7a4;</span>
+                <div class="name">分类</div>
+                <div class="code-name">&amp;#xe7a4;</div>
+              </li>
+          
+          </ul>
+          <div class="article markdown">
+          <h2 id="unicode-">Unicode 引用</h2>
+          <hr>
+
+          <p>Unicode 是字体在网页端最原始的应用方式，特点是：</p>
+          <ul>
+            <li>支持按字体的方式去动态调整图标大小，颜色等等。</li>
+            <li>默认情况下不支持多色，直接添加多色图标会自动去色。</li>
+          </ul>
+          <blockquote>
+            <p>注意：新版 iconfont 支持两种方式引用多色图标：SVG symbol 引用方式和彩色字体图标模式。（使用彩色字体图标需要在「编辑项目」中开启「彩色」选项后并重新生成。）</p>
+          </blockquote>
+          <p>Unicode 使用步骤如下：</p>
+          <h3 id="-font-face">第一步：拷贝项目下面生成的 <code>@font-face</code></h3>
+<pre><code class="language-css"
+>@font-face {
+  font-family: 'iconfont';
+  src: url('iconfont.woff2?t=1749196727947') format('woff2'),
+       url('iconfont.woff?t=1749196727947') format('woff'),
+       url('iconfont.ttf?t=1749196727947') format('truetype');
+}
+</code></pre>
+          <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
+<pre><code class="language-css"
+>.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+</code></pre>
+          <h3 id="-">第三步：挑选相应图标并获取字体编码，应用于页面</h3>
+<pre>
+<code class="language-html"
+>&lt;span class="iconfont"&gt;&amp;#x33;&lt;/span&gt;
+</code></pre>
+          <blockquote>
+            <p>"iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
+          </blockquote>
+          </div>
+      </div>
+      <div class="content font-class">
+        <ul class="icon_lists dib-box">
+          
+          <li class="dib">
+            <span class="icon iconfont icon-xuanzeshijian"></span>
+            <div class="name">
+              选择时间
+            </div>
+            <div class="code-name">.icon-xuanzeshijian
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-guanbi"></span>
+            <div class="name">
+              跳转
+            </div>
+            <div class="code-name">.icon-guanbi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-diqu"></span>
+            <div class="name">
+              地区
+            </div>
+            <div class="code-name">.icon-diqu
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-dianya"></span>
+            <div class="name">
+              电压
+            </div>
+            <div class="code-name">.icon-dianya
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-fenlei"></span>
+            <div class="name">
+              分类
+            </div>
+            <div class="code-name">.icon-fenlei
+            </div>
+          </li>
+          
+        </ul>
+        <div class="article markdown">
+        <h2 id="font-class-">font-class 引用</h2>
+        <hr>
+
+        <p>font-class 是 Unicode 使用方式的一种变种，主要是解决 Unicode 书写不直观，语意不明确的问题。</p>
+        <p>与 Unicode 使用方式相比，具有如下特点：</p>
+        <ul>
+          <li>相比于 Unicode 语意明确，书写更直观。可以很容易分辨这个 icon 是什么。</li>
+          <li>因为使用 class 来定义图标，所以当要替换图标时，只需要修改 class 里面的 Unicode 引用。</li>
+        </ul>
+        <p>使用步骤如下：</p>
+        <h3 id="-fontclass-">第一步：引入项目下面生成的 fontclass 代码：</h3>
+<pre><code class="language-html">&lt;link rel="stylesheet" href="./iconfont.css"&gt;
+</code></pre>
+        <h3 id="-">第二步：挑选相应图标并获取类名，应用于页面：</h3>
+<pre><code class="language-html">&lt;span class="iconfont icon-xxx"&gt;&lt;/span&gt;
+</code></pre>
+        <blockquote>
+          <p>"
+            iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
+        </blockquote>
+      </div>
+      </div>
+      <div class="content symbol">
+          <ul class="icon_lists dib-box">
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-xuanzeshijian"></use>
+                </svg>
+                <div class="name">选择时间</div>
+                <div class="code-name">#icon-xuanzeshijian</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-guanbi"></use>
+                </svg>
+                <div class="name">跳转</div>
+                <div class="code-name">#icon-guanbi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-diqu"></use>
+                </svg>
+                <div class="name">地区</div>
+                <div class="code-name">#icon-diqu</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-dianya"></use>
+                </svg>
+                <div class="name">电压</div>
+                <div class="code-name">#icon-dianya</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-fenlei"></use>
+                </svg>
+                <div class="name">分类</div>
+                <div class="code-name">#icon-fenlei</div>
+            </li>
+          
+          </ul>
+          <div class="article markdown">
+          <h2 id="symbol-">Symbol 引用</h2>
+          <hr>
+
+          <p>这是一种全新的使用方式，应该说这才是未来的主流，也是平台目前推荐的用法。相关介绍可以参考这篇<a href="">文章</a>
+            这种用法其实是做了一个 SVG 的集合，与另外两种相比具有如下特点：</p>
+          <ul>
+            <li>支持多色图标了，不再受单色限制。</li>
+            <li>通过一些技巧，支持像字体那样，通过 <code>font-size</code>, <code>color</code> 来调整样式。</li>
+            <li>兼容性较差，支持 IE9+，及现代浏览器。</li>
+            <li>浏览器渲染 SVG 的性能一般，还不如 png。</li>
+          </ul>
+          <p>使用步骤如下：</p>
+          <h3 id="-symbol-">第一步：引入项目下面生成的 symbol 代码：</h3>
+<pre><code class="language-html">&lt;script src="./iconfont.js"&gt;&lt;/script&gt;
+</code></pre>
+          <h3 id="-css-">第二步：加入通用 CSS 代码（引入一次就行）：</h3>
+<pre><code class="language-html">&lt;style&gt;
+.icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
+&lt;/style&gt;
+</code></pre>
+          <h3 id="-">第三步：挑选相应图标并获取类名，应用于页面：</h3>
+<pre><code class="language-html">&lt;svg class="icon" aria-hidden="true"&gt;
+  &lt;use xlink:href="#icon-xxx"&gt;&lt;/use&gt;
+&lt;/svg&gt;
+</code></pre>
+          </div>
+      </div>
+
+    </div>
+  </div>
+  <script>
+  $(document).ready(function () {
+      $('.tab-container .content:first').show()
+
+      $('#tabs li').click(function (e) {
+        var tabContent = $('.tab-container .content')
+        var index = $(this).index()
+
+        if ($(this).hasClass('active')) {
+          return
+        } else {
+          $('#tabs li').removeClass('active')
+          $(this).addClass('active')
+
+          tabContent.hide().eq(index).fadeIn()
+        }
+      })
+    })
+  </script>
+</body>
+</html>

font/iconfont.css

@@ -0,0 +1,35 @@
+@font-face {
+  font-family: "iconfont"; /* Project id 4935042 */
+  src: url('iconfont.woff2?t=1749196727947') format('woff2'),
+       url('iconfont.woff?t=1749196727947') format('woff'),
+       url('iconfont.ttf?t=1749196727947') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-xuanzeshijian:before {
+  content: "\e679";
+}
+
+.icon-guanbi:before {
+  content: "\e606";
+}
+
+.icon-diqu:before {
+  content: "\e65b";
+}
+
+.icon-dianya:before {
+  content: "\e631";
+}
+
+.icon-fenlei:before {
+  content: "\e7a4";
+}
+

font/iconfont.json

@@ -0,0 +1,44 @@
+{
+  "id": "4935042",
+  "name": "储能工商业app",
+  "font_family": "iconfont",
+  "css_prefix_text": "icon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "10710887",
+      "name": "选择时间",
+      "font_class": "xuanzeshijian",
+      "unicode": "e679",
+      "unicode_decimal": 59001
+    },
+    {
+      "icon_id": "731126",
+      "name": "跳转",
+      "font_class": "guanbi",
+      "unicode": "e606",
+      "unicode_decimal": 58886
+    },
+    {
+      "icon_id": "3851353",
+      "name": "地区",
+      "font_class": "diqu",
+      "unicode": "e65b",
+      "unicode_decimal": 58971
+    },
+    {
+      "icon_id": "3988230",
+      "name": "电压",
+      "font_class": "dianya",
+      "unicode": "e631",
+      "unicode_decimal": 58929
+    },
+    {
+      "icon_id": "12025958",
+      "name": "分类",
+      "font_class": "fenlei",
+      "unicode": "e7a4",
+      "unicode_decimal": 59300
+    }
+  ]
+}

main.js

@@ -3,6 +3,8 @@ import App from './App'
 // #ifndef VUE3
 import Vue from 'vue'
 import './uni.promisify.adaptor'
+import dLoading from '@/uni_modules/d-loading/components/d-loading/d-loading.vue'
+Vue.component('dLoading',dLoading)
 Vue.config.productionTip = false
 App.mpType = 'app'
 const app = new Vue({

package.json

@@ -1,12 +1,15 @@
 {
-    "id": "jarvis-timePickerPopup",
-    "name": "时间范围弹窗选择器",
-    "displayName": "时间范围弹窗选择器",
+    "id": "zheng-loading",
+    "name": "加载动画zheng-loading",
+    "displayName": "加载动画zheng-loading",
     "version": "1.0.0",
-    "description": "时间范围弹窗选择器：使用uni-popup+picker-view实现",
+    "description": "自定义炫酷的加载动画，支持各个平台",
     "keywords": [
-        "时间选择器",
-        "时间范围"
+        "加载动画",
+        "炫酷动画",
+        "loading",
+        "加载中",
+        "动画"
     ],
     "dcloudext": {
         "category": [

pages.json

@@ -99,11 +99,27 @@
 		"path" : "pages/electricityprice/index",
 		"style" : 
 		{
-			"navigationBarTitleText" : "查询电价"
+			"navigationBarTitleText" : "查询电价",
+			"navigationStyle": "custom" // 取消默认导航栏
+		}
+	},
+	{
+		"path" : "pages/economiccalculation/index",
+		"style" : 
+		{
+			"navigationBarTitleText" : "经济测算",
+			"navigationStyle": "custom" // 取消默认导航栏
+		}
+	},
+	{
+		"path" : "pages/report/index",
+		"style" : 
+		{
+			"navigationBarTitleText" : "经济测算报告",
+			"navigationStyle": "custom" // 取消默认导航栏
 		}
 	}
-	
-	
+
   ],
   "tabBar": {
     "color": "#999999",

pages/devicedetails/index.vue

@@ -4,7 +4,7 @@
 		<view class="container_title">
 			<l-liquid v-model:current="modelVale" :percent="target" :outline="true" background="#007545"
 				waveColor="#007545" innerColor="rgba(#007545, 0.1)">
-				<text class="liquid_text">{{devicedata.soc}}%</text>
+				<text class="liquid_text">{{devicedata.soc}} <text class="income_unit">%</text></text>
 			</l-liquid>
 		</view>
 			
@@ -17,36 +17,36 @@
 					<view class="income_yesterday">
 						<image class="income_image" src="/static/realtimepower.png" mode="aspectFill" />
 						<view class="income_yesterday1">{{$t('devicedetails.power')}}:</view>
-						<view class="income_yesterday2">{{devicedata.realTimepower}}kW</view>
+						<view class="income_yesterday2">{{devicedata.realTimepower}} <text class="income_unit">kW</text></view>
 					</view>
 					<view class="income_tired">
 						<image class="income_image" src="/static/electriccurrent.png" mode="aspectFill" />
 						<view class="income_tired1">{{$t('devicedetails.charge')}}:</view>
-						<view class="income_tired2">{{devicedata.chargingCurrent}}A</view>
+						<view class="income_tired2">{{devicedata.chargingCurrent}} <text class="income_unit">A</text></view>
 					</view>
 				</view>
 				<view class="income">
 					<view class="income_yesterday">
 						<image class="income_image" src="/static/cumulativestorage.png" mode="aspectFill" />
 						<view class="income_yesterday1">{{$t('devicedetails.today')}}:</view>
-						<view class="income_yesterday2">{{devicedata.dayExportKwh}}kWh</view>
+						<view class="income_yesterday2">{{devicedata.dayExportKwh}} <text class="income_unit">kWh</text></view>
 					</view>
 					<view class="income_tired">
 						<image class="income_image" src="/static/storage.png" mode="aspectFill" />
 						<view class="income_tired1">{{$t('devicedetails.total')}}:</view>
-						<view class="income_tired2">{{devicedata.accumulativeExportKwh}}kWh</view>
+						<view class="income_tired2">{{devicedata.accumulativeExportKwh}} <text class="income_unit">kWh</text></view>
 					</view>
 				</view>
 				<view class="income">
 					<view class="income_yesterday">
 						<image class="income_image" src="/static/totalvoltage.png" mode="aspectFill" />
 						<view class="income_yesterday1">{{$t('devicedetails.battery')}}:</view>
-						<view class="income_yesterday2">{{devicedata.totalVoltageOfBattery}}V</view>
+						<view class="income_yesterday2">{{devicedata.totalVoltageOfBattery}} <text class="income_unit">V</text></view>
 					</view>
 					<view class="income_tired">
 						<image class="income_image" src="/static/biandianzhan.png" mode="aspectFill" />
 						<view class="income_tired1">{{$t('devicedetails.insulation')}}:</view>
-						<view class="income_tired2">{{devicedata.insulationImpedance}}kQ</view>
+						<view class="income_tired2">{{devicedata.insulationImpedance}} <text class="income_unit">kQ</text></view>
 					</view>
 				</view>
 				<view class="income_income">
@@ -169,8 +169,8 @@
 				<view class="strategybox">
 				<image class="strategycalendar" src="/static/calendar.png" mode=""></image>
 					<view class="power_iconstrategy">
-					<view class="power_yesterday1">{{date}}</view>
-					<view class="power_yesterday1">{{$t('devicedetails.listTitle')}}：{{weekdaytype==1?$t('devicedetails.weekdays'):$t('devicedetails.weekends')}}</view>
+					<view class="power_yesterday11">{{date}}</view>
+					<view class="power_yesterday11">{{$t('devicedetails.listTitle')}}：{{weekdaytype==1?$t('devicedetails.weekdays'):$t('devicedetails.weekends')}}</view>
 					</view>
 				</view>
 			
@@ -184,7 +184,7 @@
 				<view class="strategybox">
 				<image class="strategy" src="/static/startstop.png" mode=""></image>
 					<view class="power_iconstrategy">
-					<view class="power_yesterday1">{{$t('devicedetails.powerControl')}}</view>
+					<view class="power_yesterday11">{{$t('devicedetails.powerControl')}}</view>
 					<!-- <view class="power_yesterday1">2024-09-13</view> -->
 					</view>
 				</view>
@@ -762,6 +762,7 @@
 	}
 
 	.liquid_text {
+		font-size: 38rpx;
 		color: #fff;
 	}
 
@@ -783,6 +784,7 @@
 	}
 	.health{
 		color: #007545;
+		font-size: 28rpx;
 		margin-bottom: 20rpx;
 	}
 .container_box1{
@@ -845,16 +847,16 @@
 	.income_yesterday1,
 	.income_moon1,
 	.income_tired1 {
-		font-size: 24rpx;
+		font-size: 26rpx;
 		color: #999999;
 	}
 
 	.income_yesterday2,
 	.income_moon2,
 	.income_tired2 {
-		font-size: 24rpx;
+		font-size: 26rpx;
 		margin-left: 8rpx;
-		color: #999999;
+		color: #222;
 	}
 
 	.qiun_data {
@@ -935,6 +937,11 @@
 		margin-left:10rpx;
 		color: #999999;
 	}
+	.power_yesterday11{
+		font-size: 26rpx;
+		margin-left:10rpx;
+		color: #222;
+	}
 .power_moon2,.power_yesterday2,.power_tired2{
 	margin-top:10rpx;
 	font-size: 24rpx;
@@ -968,7 +975,7 @@
 		border: 0.2rpx solid #999999;
 		border-radius: 40rpx;
 		overflow: overlay;
-	}
+	}xz
 
 	.datecalendar_1sun {
 		flex: 1;
@@ -1169,6 +1176,8 @@
 			border-radius: 10rpx;
 			background-color: #ffffff;
 			margin-top: 20rpx;
+			overflow: hidden;
+			box-sizing: border-box;
 		} 
 		.power_iconstrategy{
 			flex-direction: column;
@@ -1189,7 +1198,7 @@
 		}
 		.power_strategy{
 			font-size: 24rpx;
-			color: #B2D5CB;
+			color: #ccc;
 			display: flex;
 			align-items: center;
 		}
@@ -1369,5 +1378,7 @@
 		.popupbutton{
 			display: flex;
 		}
-	
+	.income_unit{
+		font-size: 20rpx;
+	}
 </style>

pages/hostdetails/index.vue

@@ -4,7 +4,7 @@
 		<view class="container_title">
 			<l-liquid v-model:current="modelVale" :percent="target" :outline="true" background="#007545"
 				waveColor="#007545" innerColor="rgba(#007545, 0.1)">
-				<text class="liquid_text">{{devicedata.soc*1}}%</text>
+				<text class="liquid_text">{{devicedata.soc*1}} <text class="income_unit">%</text></text>
 			</l-liquid>
 		</view>
 		<view class="container_box">
@@ -42,46 +42,46 @@
 					<view class="income_tired_soc">
 						<image class="income_image" src="/static/soc.png" mode="aspectFit" />
 						<!-- <view class="income_tired1">今日放电</view> -->
-						<view class="income_tired2">{{devicedata.soc*1}}%</view>
+						<view class="income_tired2">{{devicedata.soc*1}} <text class="income_unit">%</text></view>
 					</view>
 				</view>
 				<view class="income">
 					<view class="income_yesterday">
 						<view class="income_yesterday1">{{$t('hostdetails.va')}}：</view>
-						<view class="income_yesterday2">{{devicedata.abLinevoltage*1}}V</view>
+						<view class="income_yesterday2">{{devicedata.abLinevoltage*1}} <text class="income_unit">V</text></view>
 					</view>
 				
 					<view class="income_tired">
 						<view class="income_tired1">{{$t('hostdetails.ia')}}：</view>
-						<view class="income_tired2">{{devicedata.aphasecurrent*1}}A</view>
+						<view class="income_tired2">{{devicedata.aphasecurrent*1}} <text class="income_unit">A</text></view>
 					</view>
 				</view>
 				<view class="income">
 					<view class="income_yesterday">
 						<view class="income_yesterday1">{{$t('hostdetails.vb')}}：</view>
-						<view class="income_yesterday2">{{devicedata.bcLinevoltage*1}}V</view>
+						<view class="income_yesterday2">{{devicedata.bcLinevoltage*1}} <text class="income_unit">V</text></view>
 					</view>
 				
 					<view class="income_tired">
 						<view class="income_tired1">{{$t('hostdetails.ib')}}：</view>
-						<view class="income_tired2">{{devicedata.bphasecurrent*1}}A</view>
+						<view class="income_tired2">{{devicedata.bphasecurrent*1}} <text class="income_unit">A</text></view>
 					</view>
 				</view>
 				<view class="income">
 					<view class="income_yesterday">
 						<view class="income_yesterday1">{{$t('hostdetails.vc')}}：</view>
-						<view class="income_yesterday2">{{devicedata.caLinevoltage*1}}V</view>
+						<view class="income_yesterday2">{{devicedata.caLinevoltage*1}} <text class="income_unit">V</text></view>
 					</view>
 				
 					<view class="income_tired">
 						<view class="income_tired1">{{$t('hostdetails.ic')}}：</view>
-						<view class="income_tired2">{{devicedata.cphasecurrent*1}}A</view>
+						<view class="income_tired2">{{devicedata.cphasecurrent*1}} <text class="income_unit">A</text></view>
 					</view>
 				</view>
 				<view class="income">
-					<view class="income_yesterday">
+					<view class="income_yesterday" style="margin-left: 20rpx;">
 						<view class="income_yesterday1">{{$t('hostdetails.ac')}}：</view>
-						<view class="income_yesterday2">{{devicedata.acPower*1}}kWh</view>
+						<view class="income_yesterday2">{{devicedata.acPower*1}} <text class="income_unit">kWh</text></view>
 					</view>
 				
 					<view class="income_tired">
@@ -104,7 +104,7 @@
 					{{item.emsDeviceId}}
 				</view>
 				<view class="energy_boxtitle2">
-					{{$t('hostdetails.ac')}}：{{item.communicationPower*1}}kW
+					{{$t('hostdetails.ac')}}：{{item.communicationPower*1}} <text class="income_unit">kW</text>
 				</view>
 			</view>
 			<view class="energy_right">
@@ -135,7 +135,7 @@
 						{{$t('hostdetails.fault')}}
 					</view>
 					<view class="energy_boxright2">
-						SOC:{{item.soc*1}}%
+						SOC:{{item.soc*1}} <text class="income_unit">%</text>
 					</view>
 				</view>
 				<image class="energy_jumpto" src="/static/jumpto.png" mode=""></image>
@@ -185,8 +185,8 @@
 				<view class="strategybox">
 				<image class="strategycalendar" src="/static/calendar.png" mode=""></image>
 					<view class="power_iconstrategy">
-					<view class="power_yesterday1">{{date}}</view>
-					<view class="power_yesterday1">{{$t('hostdetails.listTitle')}}：{{weekdaytype==1?$t('hostdetails.weekdays'):$t('hostdetails.weekends')}}</view>
+					<view class="power_yesterday11">{{date}}</view>
+					<view class="power_yesterday11">{{$t('hostdetails.listTitle')}}：{{weekdaytype==1?$t('hostdetails.weekdays'):$t('hostdetails.weekends')}}</view>
 					</view>
 				</view>
 			
@@ -200,7 +200,7 @@
 				<view class="strategybox">
 				<image class="strategy" src="/static/startstop.png" mode=""></image>
 					<view class="power_iconstrategy">
-					<view class="power_yesterday1">{{$t('hostdetails.powerControl')}}</view>
+					<view class="power_yesterday11">{{$t('hostdetails.powerControl')}}</view>
 					<!-- <view class="power_yesterday1">2024-09-13</view> -->
 					</view>
 				</view>
@@ -424,6 +424,7 @@
 	}
 
 	.liquid_text {
+		font-size: 38rpx;
 		color: #fff;
 	}
 
@@ -506,14 +507,14 @@
 	.income_yesterday1,
 	.income_moon1,
 	.income_tired1 {
-		font-size: 24rpx;
+		font-size: 28rpx;
 		color: #999999;
 	}
 
 	.income_yesterday2,
 	.income_moon2,
 	.income_tired2 {
-		font-size: 26rpx;
+		font-size: 28rpx;
 		font-weight: 400;
 	}
 
@@ -552,6 +553,7 @@
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
+		overflow: hidden;
 	}
 
 	.power_yesterday,
@@ -591,10 +593,15 @@
 	.power_yesterday1,
 	.power_moon1,
 	.power_tired1 {
-		font-size: 26rpx;
+		font-size: 28rpx;
 		margin-left:10rpx;
 		color: #999999;
 	}
+	.power_yesterday11{
+		font-size: 26rpx;
+		margin-left:10rpx;
+		color: #222;
+	}
 .power_moon2,.power_yesterday2,.power_tired2{
 	margin-top:10rpx;
 	font-size: 24rpx;
@@ -763,7 +770,7 @@
 	}
 
 	.energy_boxright1 {
-		padding: 8rpx 6rpx;
+		padding: 8rpx 30rpx;
 		font-size: 26rpx;
 		border-radius: 50rpx;
 		display: flex;
@@ -864,7 +871,7 @@
 	}
 	.power_strategy{
 		font-size: 24rpx;
-		color: #B2D5CB;
+		color: #ccc;
 		display: flex;
 		align-items: center;
 	}
@@ -1044,7 +1051,9 @@
 		.popupbutton{
 			display: flex;
 		}
-	
+	.income_unit{
+		font-size: 20rpx;
+	}
 </style>
 
 /*  */

pages/index/index.vue

@@ -43,10 +43,10 @@
 	掌握收益趋势
 </view>
 </view>
-<view class="topfinance">
+<view class="topfinance" @click="calculation">  
 	<image class="topfinanceimage" src="https://esos-iot.bjdexn.cn/myminio/project/c46bf20166d74c6ca6e0e5af87d5a5de.png" mode=""></image>
 	<view class="topfinance_title">
-		金融计算
+		经济测算
 	</view>
 	<view class="topfinance_subtitle">
 		金融服务全新升级
@@ -274,10 +274,16 @@
 				uni.navigateTo({
 					url:'/pages/electricityprice/index'
 				})
+			},
+			// 经济测算
+			calculation(){
+				uni.navigateTo({
+					url:'/pages/economiccalculation/index'
+				})
 			}
 		}
 	}
-</script>
+</script> 
 <!--  -->
 <style scoped>
 	.uni-page {

pages/login/index.vue

@@ -32,9 +32,7 @@
  <button class="button_button" color="#F0F5F5" @click="onLogin">{{$t('login.submit')}}</button>
  </view>
  <view class="agreement">
-	 <checkbox-group @change="checkboxChange">
-  <checkbox t-class="t_box" value="checked" icon="dot"></checkbox>
-	 </checkbox-group>
+  <radio @click.stop="checkboxChange" value="1" :checked="checked" color="#007545" />
  {{$t('login.terms')}}<text class="agreement_color" data-name="服务协议" @click="onprivacy"> {{$t('login.Terms')}}</text> {{$t('login.&')}}<text class="agreement_color" data-name="隐私政策" @click="onprivacy"> {{$t('login.Privacy')}}</text> </view>
  </view>
 			
@@ -69,6 +67,12 @@ import { onMounted,ref } from 'vue';
 		   icon: 'none',
 		 
 		   });
+		 }else if(account.value==''||password.value=='' ){
+			return uni.showToast({
+			  title: '请输入正确的账户与密码',
+			icon: 'none',
+					 
+			}); 
 		 }
 	 try {
 	    const response = await request({
@@ -93,11 +97,7 @@ import { onMounted,ref } from 'vue';
 	 
 	 };
 	 const checkboxChange = (e) => {
-			 if(e.detail.value[0]=='checked'){
-				 checked.value = true
-			 }else{
-				 checked.value = false
-			 }
+		 checked.value = !checked.value
 	 };
 	 const onprivacy = (e) => {
 			 // uni.navigateTo({
@@ -160,7 +160,7 @@ import { onMounted,ref } from 'vue';
 			}
 
 </script>
- <!-- 
+<!-- 
 
  --> 
 <style scoped>

pages/personalInformation/index.vue

@@ -1,25 +1,155 @@
 <template>
 	<view class="container">
 		<view class="account_number">
-	 
+	     	<image @click="chooseImage" class="account_to" :src="user.user.avatar" mode=""></image>
 		</view>
 		<view class="toptabbar">
-	 
+			<view class="toptabbar_">
+				<view class="toptabbar_box">
+								<view class="toptabbar_left">
+									名称
+								</view>
+									<view class="toptabbar_right">
+										{{user.user.loginName||''}}
+									</view>
+							</view>
+				<view class="toptabbar_box">
+					<view class="toptabbar_left">
+						角色
+					</view>
+						<view class="toptabbar_right">
+							{{user.user.roles[0].roleName||''}}
+						</view>
+				</view>
+				<view class="toptabbar_box">
+					<view class="toptabbar_left">
+						公司
+					</view>
+						<view class="toptabbar_right">
+							{{user.user.dept.deptName||''}}
+						</view>
+				</view>
+				<view class="toptabbar_box">
+					<view class="toptabbar_left">
+						创建时间
+					</view>
+						<view class="toptabbar_right">
+							{{user.user.createTime||''}}
+						</view>
+				</view>
+			
+			</view>
+		
 	</view>
 	 
 	</view>
 </template>
-
+<!--    -->
 <script>
+	import request from '@/utils/request';
 	export default {
 		data() {
 			return {
+				user:[],
 				
 			}
 		},
+	onLoad() {
+	 this.getuserinfo()
+	},
 		methods: {
-			
-		}
+	async getuserinfo() {
+				try {
+					const response = await request({
+						url: '/platform/user/selectaccountNumber',
+						method: 'post',
+						header: {
+							'Content-Type': 'application/x-www-form-urlencoded'
+						},
+					});
+					this.user = response.data
+				} catch (error) {
+					console.error('登录失败:', error);
+				}
+			},
+			  // 选择图片
+			  chooseImage() {
+			    uni.chooseImage({
+			      count: 1,
+			      sizeType: ['original', 'compressed'],
+			      sourceType: ['album', 'camera'],
+			      success: (res) => {
+			        const tempFilePaths = res.tempFilePaths;
+			        // 使用 uni.uploadFile 方式上传
+			        this.uploadFile(tempFilePaths[0]);
+			      },
+			      fail: (err) => {
+			        console.error('选择图片失败:', err);
+			        uni.showToast({
+			          title: '选择图片失败',
+			          icon: 'none'
+			        });
+			      }
+			    });
+			  },
+			 // 使用 uni.uploadFile 上传
+			  async uploadFile(filePath) {
+			    uni.showLoading({
+			      title: '上传中...'
+			    });
+			    
+			    try {
+			      const response = await new Promise((resolve, reject) => {
+			        uni.uploadFile({
+			          url: 'https://esos-iot.bjdexn.cn/platform/shu/upload/webPost', // 如 '/platform/shu/upload/webPost'
+			          filePath: filePath,
+			          name: 'file', // 后端接收的字段名
+			          formData: {},
+			          success: resolve,
+			          fail: reject
+			        });
+			      });
+			      
+			      const res = JSON.parse(response.data);
+			      await this.updateAvatar(res.data.url);
+			      
+			      uni.hideLoading();
+			      uni.showToast({
+			        title: '上传成功',
+			        icon: 'success'
+			      });
+			      
+			    } catch (error) {
+			      console.error('上传失败:', error);
+			      uni.hideLoading();
+			      uni.showToast({
+			        title: '上传失败',
+			        icon: 'none'
+			      });
+			    }
+			  },
+			 // 更新头像URL
+			  async updateAvatar(url) {
+				 
+			    try {
+			      const response = await request({
+			        url: '/platform/user/profile/update',
+			        method: 'post',
+			        header: {
+			         'Content-Type': 'application/x-www-form-urlencoded'
+			        },
+			        data:{avatar:url},
+			      });
+				  this.getuserinfo();
+			      // 更新本地用户信息等操作
+			      
+			    } catch (error) {
+			      console.error('头像更新失败:', error);
+			      throw error;
+			    }
+				
+			  }
+			}
 	}
 </script>
 
@@ -29,8 +159,9 @@
 	  		height: 100%;
 	  	}
 	  .container {
-	  	height: 92vh;
-	    background: linear-gradient(to bottom, #007545 -40%, #f0f5f5 40%, #f0f5f5 100%);
+	  	height: 100%;
+	    /* background: linear-gradient(to bottom, #007545 -40%, #f0f5f5 40%, #f0f5f5 100%); */
+		background-color: #f5f5f5;
 	    box-sizing: border-box;
 	  }     
 	  .account_number{
@@ -40,14 +171,33 @@
 		justify-content: center;
 		box-sizing: border-box;
 	  }
-	 
+	 .account_to{
+		 width: 200rpx;
+		 height: 200rpx;
+		 border-radius: 100rpx;
+	 }
  
 	   .toptabbar {
 	     width: 100%;
-	     padding: 10rpx 20rpx;
+	     padding: 10rpx 40rpx;
 	     box-sizing: border-box;
 	   }
-		
- 
- 
+	   .toptabbar_{
+		   border-radius: 10rpx;
+		   overflow: hidden;
+		   padding:0rpx 20rpx 20rpx 20rpx;
+		   background-color: #ffffff;
+	   }
+		.toptabbar_box{
+			width: 100%;
+			height: 120rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			border-bottom: 1rpx #f5f5f5 solid;
+		}
+        .toptabbar_left{
+		 font-size: 28rpx;
+		}
+
 </style>

pages/powerstation/index.vue

@@ -4,43 +4,45 @@
 		<view class="container_title">
 			<l-liquid v-model:current="modelVale" :percent="target" :outline="true" background="#007545"
 				waveColor="#007545" innerColor="rgba(#007545, 0.1)">
-				<text class="liquid_text">{{modelVale}}%</text>
+				<text class="liquid_text">{{modelVale}} <text class="income_unit">%</text></text>
 			</l-liquid>
 		</view>
 		<view class="container_box">
 			<view class="income_box">
 				<view class="income">
-					<view class="income_yesterday">
-						<image class="income_image" src="/static/income.png" mode="aspectFill" />
-						<view class="income_yesterday1">{{$t('powerstation.yesterdayEarnings')}}</view>
-						<view class="income_yesterday2">{{devicedata.yesterdaysearnings?devicedata.yesterdaysearnings.toFixed(2):''}}元</view>
-					</view>
+				
 					<view class="income_moon">
 						<image class="income_image" src="/static/charge.png" mode="aspectFill" />
 						<view class="income_moon1">{{$t('powerstation.todayCharge')}}</view>
-						<view class="income_moon2">{{devicedata.dayImportKwh}}kWh</view>
+						<view class="income_moon2">{{devicedata.dayImportKwh}} <text class="income_unit">kWh</text> </view>
 					</view>
 					<view class="income_tired">
 						<image class="income_image" src="/static/discharge.png" mode="aspectFill" />
 						<view class="income_tired1">{{$t('powerstation.todayDischarge')}}</view>
-						<view class="income_tired2">{{devicedata.dayExportKwh}}kWh</view>
+						<view class="income_tired2">{{devicedata.dayExportKwh}} <text class="income_unit">kWh</text></view>
 					</view>
-				</view>
-				<view class="income">
 					<view class="income_yesterday">
 						<image class="income_image" src="/static/Cumulative.png" mode="aspectFill" />
 						<view class="income_yesterday1">{{$t('powerstation.totalDischarge')}}</view>
-						<view class="income_yesterday2">{{Accumulateddischarge(devicedata.accumulativeExportKwh)}}</view>
+						<view class="income_yesterday2">{{Accumulateddischarge(devicedata.accumulativeExportKwh)}} <text class="income_unit">{{Accumulateddischargeunit(devicedata.accumulativeExportKwh)}}</text></view>
+					</view>
+				</view>
+				<view class="income">
+					<view class="income_yesterday">
+						<image class="income_image" src="/static/income.png" mode="aspectFill" />
+						<view class="income_yesterday1">{{$t('powerstation.yesterdayEarnings')}}</view>
+						<view class="income_yesterday2">{{devicedata.yesterdaysearnings?devicedata.yesterdaysearnings.toFixed(2):''}} <text class="income_unit">元</text></view>
 					</view>
+				
 					<view class="income_moon">
 						<image class="income_image" src="/static/totalrevenue.png" mode="aspectFill" />
 						<view class="income_moon1">{{$t('powerstation.totalEarnings')}}</view>
-						<view class="income_moon2">{{formatAmount(devicedata.totalProfit)}}元</view>
+						<view class="income_moon2">{{formatAmount(devicedata.totalProfit)}} <text class="income_unit">{{formatAmountunit(devicedata.totalProfit)}}</text> </view>
 					</view>
 					<view class="income_tired">
 						<image class="income_image" src="/static/efficiency.png" mode="aspectFill" />
 						<view class="income_tired1">{{$t('powerstation.systemEfficiency')}}</view>
-						<view class="income_tired2">99%</view>
+						<view class="income_tired2">99 <text class="income_unit">%</text></view>
 					</view>
 				</view>
 			</view>
@@ -61,15 +63,24 @@
 		<view class="datecalendar">
 			<view class="datecalendar_1">
 				<view @click="ondatecalendar(1)" class="datecalendar_1sun"
-					:style="brightcalendar == 1?'backgroundColor:#007544;color:#ffffff':'backgroundColor:#ffffff'">
+					:style="{
+					   backgroundColor: brightcalendar === 1 ? '#007544' : '#ffffff',
+					   color: brightcalendar === 1 ? '#ffffff' : 'inherit'
+					 }">
 					{{$t('powerstation.daily')}}
 				</view>
 				<view @click="ondatecalendar(2)" class="datecalendar_1moon"
-					:style="brightcalendar == 2?'backgroundColor:#007544;color:#ffffff':'backgroundColor:#ffffff'">
+					:style="{
+					   backgroundColor: brightcalendar === 2 ? '#007544' : '#ffffff',
+					   color: brightcalendar === 2 ? '#ffffff' : 'inherit'
+					 }">
 					{{$t('powerstation.monthly')}}
 				</view>
 				<view @click="ondatecalendar(3)" class="datecalendar_1year"
-					:style="brightcalendar==3?'backgroundColor:#007544;color:#ffffff':'backgroundColor:#ffffff'">
+					:style="{
+					   backgroundColor: brightcalendar === 3 ? '#007544' : '#ffffff',
+					   color: brightcalendar === 3 ? '#ffffff' : 'inherit'
+					 }">
 					{{$t('powerstation.yearly')}}
 				</view>
 			</view>
@@ -82,15 +93,15 @@
 		<!-- 图表 -->
 		<view class="qiun_data">
 			<view class="qiun_title" v-if="brightcalendar == 1">
-				{{tabIndex==0?$t('powerstation.batteryStatus')+'(MWh)':$t('powerstation.earnings')+'(元)'}}
+				{{tabIndex==0?$t('powerstation.batteryStatus'):$t('powerstation.earnings')}} <text class="income_unit">{{tabIndex==0?'(MWh)':'(万元)'}}</text>
 			</view>
 			<view class="qiun_title" v-if="brightcalendar == 2">
-				{{tabIndex==0?$t('powerstation.batteryStatus')+'(MWh)':$t('powerstation.earnings')+'(元)'}}
+				{{tabIndex==0?$t('powerstation.batteryStatus'):$t('powerstation.earnings')}} <text class="income_unit">{{tabIndex==0?'(MWh)':'(万元)'}}</text>
 			</view>
 			<view class="qiun_title" v-if="brightcalendar == 3">
-				{{tabIndex==0?$t('powerstation.batteryStatus')+'(MWh)':$t('powerstation.batteryStatus')+'(元)'}}
+				{{tabIndex==0?$t('powerstation.batteryStatus'):$t('powerstation.batteryStatus')}}<text class="income_unit">{{tabIndex==0?'(MWh)':'(万元)'}}</text> 
 			</view>
-			<qiun-data-charts type="column" :opts="opts" :ontouch="true" :chartData="chartData" />
+			<qiun-data-charts type="column" :opts="opts" :ontouch="true" :chartData="chartData" background='rgba(0,0,0,0)'/>
 		</view>
 <view class="energy_hostbox">
 	<view class="energy_host">
@@ -105,7 +116,7 @@
 					{{item.name||$t('powerstation.Unnamed')}}
 				</view>
 				<view class="energy_boxtitle2">
-					{{$t('powerstation.ac')}}：{{(item.acPower*1)}}kW
+					{{$t('powerstation.ac')}}：{{(item.acPower*1)}} <text class="income_unit">kW</text> 
 				</view>
 			</view>
 			<view class="energy_right">
@@ -150,7 +161,7 @@
 		<!-- 电站信息 -->
 		<view class="power_box">
 			<view class="powerstation">
-				<view class="power_yesterday" @click="ondevices">
+				<view class="power_yesterday">
 					<view class="power_icon">
 					<image src="/static/capacity.png" mode=""></image>
 					<view class="power_yesterday1">
@@ -158,9 +169,9 @@
 						{{$t('powerstation.installedCapacity')}}
 					</view>
 					</view>
-					<view class="power_yesterday2">{{devicedata.installedCap || ''}}kWh</view>
+					<view class="power_yesterday2">{{devicedata.installedCap || ''}} <text class="income_unit">kWh</text></view>
 				</view>
-				<view class="power_moon" @click="ondevices">
+				<view class="power_moon">
 					<view class="power_icon">
 					<image src="/static/date.png" mode=""></image>
 					<view class="power_moon1">
@@ -168,9 +179,9 @@
 						{{$t('powerstation.commissioningDate')}}
 						</view>
 					</view>
-					<view class="power_moon2">2023-08-20</view>
+					<view class="power_moon2">{{devicedata.operationDate}}</view>
 				</view>
-				<view class="power_tired" @click="ondevices">
+				<view class="power_tired">
 					<view class="power_icon">
 					<image src="/static/time.png" mode=""></image>
 					<view class="power_tired1">
@@ -178,7 +189,7 @@
 						{{$t('powerstation.commissioningTime')}}
 						</view>
 					</view>
-					<view class="power_tired2">389天</view>
+					<view class="power_tired2">{{devicedata.opertionTime }}<text class="income_unit">天</text></view>
 				</view>
 			</view>
 		</view>
@@ -221,8 +232,8 @@
 				<view class="strategybox">
 				<image class="strategycalendar" src="/static/calendar.png" mode=""></image>
 					<view class="power_iconstrategy">
-					<view class="power_yesterday1">{{date}}</view>
-					<view class="power_yesterday1">{{$t('powerstation.listTitle')}}：{{weekdaytype==1?$t('hostdetails.weekdays'):$t('hostdetails.weekends')}}</view>
+					<view class="power_yesterday11">{{date}}</view>
+					<view class="power_yesterday11">{{$t('powerstation.listTitle')}}：{{weekdaytype==1?$t('hostdetails.weekdays'):$t('hostdetails.weekends')}}</view>
 					</view>
 				</view>
 			
@@ -236,7 +247,7 @@
 				<view class="strategybox">
 				<image class="strategy" src="/static/startstop.png" mode=""></image>
 					<view class="power_iconstrategy">
-					<view class="power_yesterday1">{{$t('powerstation.powerControl')}}</view>
+					<view class="power_yesterday11">{{$t('powerstation.powerControl')}}</view>
 					<!-- <view class="power_yesterday1">2024-09-13</view> -->
 					</view>
 				</view>
@@ -269,7 +280,7 @@
 	} from 'vue';
 	import topTabbar from '@/components/top-tabbar.vue';
 	import KDatePicker from '../../components/k-date-picker/KDatePicker.vue';
-	import { formatAmount,Accumulateddischarge } from '@/utils/format.js'; // 引入格式化函数
+	import { formatAmount,formatAmountunit,Accumulateddischarge,Accumulateddischargeunit } from '@/utils/format.js'; // 引入格式化函数
 	import request from '@/utils/request';
 	import {
 		getMonthRange,
@@ -373,9 +384,9 @@ const setIntervalDemo =() => {
 
 		enableScroll: true, //开启滚动条，X轴配置里需要配置itemCount单屏幕数据点数量
 		color: ["#B2D5CB"],
-		padding: [15, 10, 0, 15],
+		padding: [15, 0, 0, 0],
 		backgroundColor: "#B2D5CB",
-		legend: false,
+		legend: {},
 		xAxis: {
 			disableGrid: true,
 			itemCount: 5, //单屏数据密度即图表可视区域内显示的X轴数据点数量，仅在启用enableScroll时有效
@@ -392,7 +403,6 @@ const setIntervalDemo =() => {
 				type: "straight",
 				width: 2,
 				activeType: "hollow",
-
 			},
 			column: {
 				barBorderRadius: [4, 4, 0, 0],
@@ -429,7 +439,7 @@ const setIntervalDemo =() => {
 					if(tabIndex.value==0){
 						arr2.push((item['5c465aaa-b65e-463f-a9ae-a338a630a4c1_delta']/1000).toFixed(2));
 					}else{
-						arr2.push((item['a0acf8cf-7d12-49af-97d9-1a2e630c4bfe_delta']/1000).toFixed(2));
+						arr2.push((item['a0acf8cf-7d12-49af-97d9-1a2e630c4bfe_delta']/10000).toFixed(2));
 					}
 				} else if(brightcalendar.value == 2) {
 				const ymdSubstring = item.recordtime;
@@ -556,12 +566,23 @@ const setIntervalDemo =() => {
 		console.log(e);
 		open();
 	}
-	// 电站列表
+	// 计划详情
 	const ondevices = () => {
-	uni.navigateTo({
-		url: '/pages/strategy/index'
-	})
+		if(weekdaytype.value==1){
+			uni.navigateTo({
+				url: `/pages/strategy/index?id=${muitiStationdata.value[0].conscolidationId}&type=1`
+			})
+		}else{
+			uni.navigateTo({
+				url: `/pages/strategy/index?id=${muitiStationdata.value[0].conscolidationId}&type=2`
+			})
+		}
+		
+	// uni.navigateTo({
+	// 	url: `/pages/strategy/index?id=${optionsinfo.value.id}&type=1`
+	// })
 	}
+	 
 	const onhost = (item) => {
 		console.log(item);
 		uni.navigateTo({
@@ -651,7 +672,7 @@ const setIntervalDemo =() => {
 	}
 
 	.container {
-		background: linear-gradient(to bottom, #007545 -40%, #f0f5f5 40%, #f0f5f5 100%);
+		background: linear-gradient(to bottom, #007545 -50%, #f0f5f5 40%, #f0f5f5 100%);
 		box-sizing: border-box;
 		padding-bottom:1rpx;
 	}
@@ -662,6 +683,7 @@ const setIntervalDemo =() => {
 	}
 
 	.liquid_text {
+		font-size: 38rpx;
 		color: #fff;
 	}
 
@@ -732,17 +754,12 @@ const setIntervalDemo =() => {
 	.income_yesterday2,
 	.income_moon2,
 	.income_tired2 {
-		font-size: 26rpx;
+		font-size: 28rpx;
 		font-weight: 600;
 	}
-
-	.qiun_data {
-		width: 100%;
-		padding: 16rpx;
-		overflow: auto;
-		box-sizing: border-box;
+	.income_unit{
+		font-size: 20rpx;
 	}
-
 	.qiun_title {
 		height: 12%;
 		font-size: 28rpx;
@@ -752,8 +769,8 @@ const setIntervalDemo =() => {
 	.power_box {
 		width: 100%;
 		padding: 0rpx 20rpx;
-		box-sizing: border-box;
 		margin-bottom: 30rpx;
+		box-sizing: border-box;
 	}
 .power_box1 {
 		width: 100%;
@@ -763,8 +780,8 @@ const setIntervalDemo =() => {
 .power_box2{
 	width: 100%;
 	padding: 0rpx 20rpx;
-	box-sizing: border-box;
    margin-bottom: 30rpx;
+	box-sizing: border-box;
 }
 	.powerstation {
 		width: 100%;
@@ -812,11 +829,17 @@ const setIntervalDemo =() => {
 	.power_tired1 {
 		font-size: 26rpx;
 		margin-left:10rpx;
-		color: #999999;
+		color: #999;
+	}
+	.power_yesterday11{
+		font-size: 26rpx;
+		margin-left:10rpx;
+		color: #222;
 	}
 .power_moon2,.power_yesterday2,.power_tired2{
 	margin-top:10rpx;
-	font-size: 24rpx;
+	font-size: 28rpx;
+	font-weight: 600;
 }
 
 	.toptabbar {
@@ -947,10 +970,12 @@ const setIntervalDemo =() => {
 
 	.energy_boxtitle1 {
 		font-size: 28rpx;
+		margin-top: 6rpx;
+		font-weight: 600;
 	}
 
 	.energy_boxtitle2 {
-		font-size: 28rpx;
+		font-size: 26rpx;
 		margin-top: 4rpx;
 	}
 
@@ -967,7 +992,7 @@ const setIntervalDemo =() => {
 	}
 
 	.energy_boxright1 {
-		padding: 6rpx 8rpx;
+		padding: 6rpx 40rpx;
 		font-size: 26rpx;
 		border-radius: 50rpx;
 		display: flex;
@@ -1039,6 +1064,8 @@ const setIntervalDemo =() => {
 		border-radius: 10rpx;
 		background-color: #ffffff;
 		margin-top: 20rpx;
+		overflow: hidden;
+		box-sizing: border-box;
 	} 
 	.power_iconstrategy{
 		flex-direction: column;
@@ -1059,14 +1086,14 @@ const setIntervalDemo =() => {
 	}
 	.power_strategy{
 		font-size: 24rpx;
-		color: #B2D5CB;
+		color: #ccc;
 		display: flex;
 		align-items: center;
 	}
 		
 	.power_strategy1{
 		font-size: 24rpx;
-		color: #B2D5CB;
+		color: #999999;
 		display: flex;
 		align-items: center;
 	}
@@ -1239,5 +1266,5 @@ const setIntervalDemo =() => {
 		.popupbutton{
 			display: flex;
 		}
-	
+	 
 </style>

pages/product/index.vue

@@ -1,9 +1,11 @@
 <!--  -->
 <template>
 	<view class="container" @click="popup">
-		<view class="container_top">
-			
-		</view>
+	<view class="container_navbar">
+			<view class="container_top">
+			</view>
+	<uni-nav-bar color="#222" :border="false" :shadow="false" :fixed="true" backgroundColor="rgba(255, 255, 255, 0.3)" shadow title="" @clickLeft="onclickLeft"/>
+			</view>
 		<image class="account_numberimage" :src="ImageCollection[0]" mode="aspectFill">
 		</image>
 		<view class="prompt" @click.stop="changselect">
@@ -199,7 +201,7 @@
 		},
 		onLoad() {
 			this.ImageCollection = [
-				'https://esos-iot.bjdexn.cn/myminio/project/88861a6c1aa243878d02c3502bf8e2ab.jpg',
+				'https://esos-iot.bjdexn.cn/myminio/project/891e77523d9e4abcb5c86f0b65ea68be.png',
 				'https://esos-iot.bjdexn.cn/myminio/project/f3a4fc253ee64f59a5f315b8fecbe954.png',
 				'https://esos-iot.bjdexn.cn/myminio/project/1aa4d24ff7174774a7c4c3d540ee056d.png',
 				'https://esos-iot.bjdexn.cn/myminio/project/6f2068c504984021b7c06d34f546a032.png',
@@ -248,16 +250,20 @@
 	.container {
 		box-sizing: border-box;
 		padding-bottom: 20rpx;
-		padding-top: 88rpx;
 		background: linear-gradient(to bottom, #f0f5f5 -40%, #f0f5f5 40%, #f0f5f5 100%);
 	}
-.container_top{
+.container_navbar{
 	width: 100%;
-	height: 88rpx;
-	color: #222;
 	position: fixed;
-  left: 0rpx;
-  top: 0rpx;
+	top: 0rpx;
+	left: 0rpx;
+	padding: 0rpx;
+	z-index: 1;
+}
+.container_top{
+	width: 100%;
+	height: 80rpx;
+	background-color:rgba(255, 255, 255, 0.5);
 }
 	.account_number {
 		width: 100%;
@@ -443,9 +449,10 @@
 	  }
 	  .prompt{
 		  position: fixed;
-		   top: 98rpx;
+		   top: 80rpx;
 		   right: 20rpx;
 		   text-align: right;
+		   z-index: 9;
 	  }
 	  .promptimage{
 		  width: 60rpx;

pages/report/index.vue

@@ -0,0 +1,655 @@
+<template>
+	<view class="container">
+		<view class="container_navbar">
+			<view class="container_top">
+			</view>
+	<uni-nav-bar color="#222" :border="false" :shadow="false" :fixed="true" backgroundColor="rgba(255, 255, 255, 0.3)" shadow left-icon="left"
+		title="经济测算报告" @clickLeft="onclickLeft"/>
+			</view>
+		
+		<view class="container_box">
+			<view class="container_title">
+				<view class="calculation_left">
+					<text class="testbox">&#xe65b;</text>选择地区
+				</view>
+			</view>
+			<view class="container_Subtitle">
+				<view class="voltageleft">
+					<view class="voltagetop">
+						电压级别
+					</view>
+					<view class="voltagebuttn">
+						10kv
+					</view>
+				</view>
+				<view class="voltageright">
+					<view class="voltagetop">
+						用电类型
+					</view>
+					<view class="voltagebuttn">
+						大工业用电
+					</view>
+				</view>
+			</view>
+		</view>
+	<view class="invest">
+		<view class="invest_box">
+			<view class="investall">
+				<view class="invest_left">
+					<view class="invest_top">
+						<view class="investtop">
+							全投资IRR
+						</view>
+						<view class="investbotton">
+						8.86%
+						</view>
+					</view>
+					<view class="invest_botton">
+					<view class="invest_top">
+						<view class="investtop">
+							全投资静态回收期
+						</view>
+						<view class="investbotton">
+						7.05年
+						</view>
+					</view>
+					<view class="income_top">
+						<view class="investtop">
+							总投资收益率
+						</view>
+						<view class="investbotton">
+						5.15%
+						</view>
+					</view>
+					</view>
+				</view>
+				<view class="invest_right">
+					<view class="invest_righttop">
+						装机容量
+					</view>
+					<view class="invest_rightcenter">
+						10
+					</view>
+					<view class="invest_rightbotton">
+						MWh
+					</view>
+				</view>
+			</view>
+			<view class="investalls">
+				<view class="invest_left">
+					<view class="invest_botton">
+					<view class="invest_top">
+						<view class="investtop">
+							造价总成本
+						</view>
+						<view class="investbotton">
+						7.05年
+						</view>
+					</view>
+					<view class="income_tops">
+						<view class="investtop">
+							充放电总收益
+						</view>
+						<view class="investbotton">
+						5.15%
+						</view>
+					</view>
+					</view>
+					
+					<view class="invest_top invest_botton">
+						<view class="investtop">
+							税前利润
+						</view>
+						<view class="investbotton">
+						8.86%
+						</view>
+					</view>
+				
+				</view>
+			
+			</view>
+		</view>
+		<view class="collective">
+			分年集体数据
+		</view>
+		<qiun-data-charts type="column" :opts="optscolumn" :ontouch="true" :chartData="chartcolumn" />
+		<view class="contrast">
+		<view class="contrast_title">
+			<view class="contrast_titletop">
+				对比周期
+			</view>
+			<view class="contrast_titletops">
+				放电量<text class="Electricityprice_peakrightkwh">
+					(万/KWh)
+				</text> 
+			</view>
+			<view class="contrast_titletops">
+				充电量<text class="Electricityprice_peakrightkwh">
+					(万/KWh)
+				</text> 
+			</view>
+		</view>
+		<view class="contrast_middle">
+			<view class="contrast_titletop">
+				换电前充放电量
+			</view>
+			<view class="contrast_titletops">
+				3889.40
+			</view>
+			<view class="contrast_titletops">
+				4521.26
+			</view>
+		</view>
+		<view class="contrast_bottom">
+			<view class="contrast_titletop">
+				全周期充放电量
+			</view>
+			<view class="contrast_titletops">
+			   7340.29
+			</view>
+			<view class="contrast_titletops">
+				8532.79
+			</view>
+		</view>
+		</view>
+		
+	</view>
+	<view class="economy">
+		<view class="economy_top">
+			<view class="economy_topleft">
+				经济收益
+			</view>
+			<view class="economy_topright">
+				(单位：万元)
+			</view>
+		</view>
+		<view class="incomelist">
+		 <view class="incomelist_title">
+		 	<view class="incomelist_ul">
+		 		年份
+		 	</view>
+			<view class="incomelist_ul">
+				收益
+			</view>
+			<view class="incomelist_ul">
+				现金流
+			</view>
+			<view class="incomelist_ul">
+				投资收益
+			</view>
+		 </view>
+		 <view class="incomelist_titles">
+		 	<view class="incomelist_ul">
+		 		第一年
+		 	</view>
+		 			<view class="incomelist_ul">
+		 				163.52
+		 			</view>
+		 			<view class="incomelist_ul">
+		 				-839.45
+		 			</view>
+		 			<view class="incomelist_ul">
+		 				91.09
+		 			</view>
+		 </view>
+		 <view class="incomelist_title">
+		 	<view class="incomelist_ul">
+		 		合计
+		 	</view>
+		 			<view class="incomelist_ul">
+		 				163.52
+		 			</view>
+		 			<view class="incomelist_ul">
+		 				-839.45
+		 			</view>
+		 			<view class="incomelist_ul">
+		 				91.09
+		 			</view>
+		 </view>
+		</view>
+	</view>
+	<view class="Electricityprice">
+		<view class="Electricityprice_title">
+			时段电价
+		</view>
+		<qiun-data-charts type="column" :opts="electricity" :ontouch="true" :chartData="electricitychart" />
+		<view class="Electricityprice_peak">
+			<view class="Electricityprice_peakleft">
+				峰谷电价差
+			</view>
+			<view class="Electricityprice_peakright">
+				0.4799 
+				<view class="Electricityprice_peakrightkwh">
+					元/kWh
+				</view> 
+			</view>
+		</view>
+		<view class="Electricityprice_text">
+			测算结果根据当地各电价时段时长、变压器容量、每月实际需量、
+			电池效率及消耗、利用率最高等因素推算得出,现阶段仅供参考。
+		</view>
+	</view>
+	</view>
+</template>
+<!--    -->
+<script>
+	import request from '@/utils/request';
+	export default {
+		data() {
+			return {
+			optscolumn: {
+				color: ["#007545"],
+				padding: [15, 0, 0, 0],
+				backgroundColor: "#007545",
+				dataLabel: false, // 关闭数据标签
+				legend: {
+					show: true,
+					fontSize: 10 
+				},
+				xAxis: {
+					disableGrid: true,
+					labelCount: 24, // 显示全部24小时标签
+					rotate: 0, // 标签旋转45度
+					fontSize: 10
+				},
+				yAxis: {
+					gridType: "dash",
+					dashLength: 2,
+					fontSize: 10,
+					showTitle:true,
+					data: [{
+					title: '电量(万/kwh)',
+						titleOffsetX:24,
+					},
+					{
+					      position: "right",
+					      title: "时间(年)",
+						  fontSize:true,
+						  titleOffsetX:-18
+					            }
+					],
+				},
+				extra: {
+					line: {
+						type: "straight",
+						activeType: "hollow",
+			
+					},
+					column: {
+						width: 6,
+						barBorderRadius: [1.5, 1.5, 0, 0],
+					},
+				}
+			},
+			chartcolumn: {},
+			electricity: {
+				color: ["#007545"],
+				padding: [15, 0, 0, 0],
+				backgroundColor: "#007545",
+				dataLabel: false, // 关闭数据标签
+				legend: {
+					show: false
+				},
+				xAxis: {
+					disableGrid: true,
+					labelCount: 24, // 显示全部24小时标签
+					rotate: 0, // 标签旋转45度
+					fontSize: 10
+				},
+				yAxis: {
+					gridType: "dash",
+					dashLength: 2,
+					fontSize: 10,
+					showTitle:true,
+					data: [{
+					title: '电价(元/kWh)',
+						titleOffsetX:28,
+					}
+					],
+				},
+				extra: {
+					line: {
+						type: "straight",
+						activeType: "hollow",
+			
+					},
+					column: {
+						width: 20,
+						barBorderRadius: [2, 2, 0, 0],
+					},
+				}
+			},
+			electricitychart: {},
+			}
+		},
+		onLoad() {
+			setTimeout(() => {
+		this.chartcolumn = {
+			categories: [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15],
+			series: [{
+				name: '充电',
+				data: [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15]
+			},{
+				name: '放电',
+				data: [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15]
+			}]
+		};
+		}, 500);
+		setTimeout(() => {
+		this.electricitychart = {
+			categories: ['尖期','峰期','平期','谷时','深谷'],
+			series: [{
+				name: '电价',
+				data: [
+				{"value":4,"color": "#EE6666"},
+				{"value":3,"color": "#FAC858"},
+				{"value":2,"color": "#91CB74"},
+				{"value":1,"color": "#1890FF"},
+				{"value":5,"color": "#9A60B4"},
+				]
+			}
+			]
+		};
+		}, 500);
+		},
+		methods: {
+		onclickLeft(){
+			uni.navigateBack({
+			    delta: 1 // 返回的页面数，默认为1
+			});
+		}
+		}
+	}
+</script>
+
+<style scoped>
+	.uni-page {
+		width: 100%;
+		height: 100%;
+	}
+/deep/ .uni-nav-bar-text{
+	font-weight: 600;
+}
+	.container {
+		background-color: #ffffff;
+		box-sizing: border-box;
+		display: flex;
+		flex-direction: column;
+		/* align-items: center; */
+		background-image: url('https://esos-iot.bjdexn.cn/myminio/project/475a3a10bcf74300895b3dc82897237e.jpeg');
+		background-size: 100% auto;
+		background-repeat: no-repeat;
+		padding-bottom: 140rpx;
+	}
+.container_navbar{
+	width: 100%;
+	position: fixed;
+	top: 0rpx;
+	left: 0rpx;
+	padding: 0rpx;
+}
+.container_top{
+	width: 100%;
+	height: 40rpx;
+	background-color:rgba(255, 255, 255, 0.5);
+}
+	.account_number {
+		width: 100%;
+		padding: 20rpx;
+		display: flex;
+		justify-content: center;
+		box-sizing: border-box;
+	}
+
+
+	.toptabbar {
+		width: 100%;
+		padding: 10rpx 20rpx;
+		box-sizing: border-box;
+	}
+
+	.container_box {
+		height: 520rpx;
+		color: #222;
+		padding-top: 100rpx;
+		padding: 0rpx 30rpx;
+		box-sizing: border-box;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		background: linear-gradient(to bottom,
+				rgba(255, 255, 255, 0),
+				rgba(255, 255, 255, 0.8),
+				/* 完全透明 */
+				rgba(255, 255, 255, 1)
+				/* 80% 不透明 */
+			);
+	}
+	@font-face {
+	  font-family: 'iconfont';  /* Project id 4935042 */
+	  src: url('//at.alicdn.com/t/c/font_4935042_1qob4kor3dt.woff2?t=1749628842617') format('woff2'),
+	       url('//at.alicdn.com/t/c/font_4935042_1qob4kor3dt.woff?t=1749628842617') format('woff'),
+	       url('//at.alicdn.com/t/c/font_4935042_1qob4kor3dt.ttf?t=1749628842617') format('truetype');
+	/* 	src: url('@/font/iconfont.woff2?t=1748497918806') format('woff2'),
+			url('@/font/iconfont.woff?t=1748497918806') format('woff'),
+			url('@/font/iconfont.ttf?t=1748497918806') format('truetype'); */
+	}
+
+	.test {
+		font-family: iconfont;
+		margin-left: 16rpx;
+	}
+
+.testbox {
+		font-family: iconfont;
+		margin-right: 10rpx;
+	}
+.container_Subtitle{
+	margin-top: 40rpx;
+	display: flex;
+}
+	 .voltageleft{
+		 display: flex;
+		 flex-direction: column;
+	 }
+	 .voltageright{
+		 margin-left: 80rpx;
+	 }
+	 .voltagetop{
+		 color: #A2A0AB;
+		 font-weight: 500;
+		 font-size: 32rpx;
+	 }
+	 .voltagebuttn{
+		 margin-top: 20rpx;
+		 font-size: 38rpx;
+	 }
+	 .invest{
+		 padding: 0rpx 20rpx;
+		 box-sizing: border-box;
+	 }
+	 .invest_box{
+		width: 100%;
+		 display: flex;
+		 flex-direction: column;
+		 justify-content: space-between;
+		 padding: 20rpx;
+		 border-radius: 10rpx;
+		border:1rpx solid #f5f5f5;
+		background-color: #fff;
+		box-shadow: 0px 0px 1px 1rpx rgba(0, 0, 0, 0.1);
+		box-sizing: border-box;
+	 }
+	 .investall{
+		 width: 100%;
+		 height: 300rpx;
+		  display: flex;
+		  justify-content: space-between;
+		border-bottom: 1rpx dashed #ccc;
+		padding-bottom: 20rpx;
+	 }
+	 .investalls{
+	 		 width: 100%;
+	 		 height: 300rpx;
+	 		  display: flex;
+	 		  justify-content: space-between;
+	 		padding-bottom: 20rpx;
+	 }
+	 .invest_left{
+		 margin-top: 20rpx;
+		 font-size: 28rpx;
+	 }
+	 .invest_top{
+		 display: flex;
+		 flex-direction: column;
+	 }
+	 .invest_botton{
+		 display: flex;
+		 margin-top: 40rpx;
+	 }
+	 .income_top{
+		 margin-left: 20rpx;
+	 }
+	 .income_tops{
+	 		 margin-left: 100rpx;
+	 }
+	 .invest_right{
+		 width: 200rpx;
+		 display: flex;
+		 flex-direction: column;
+		 align-items: center;
+		 font-size: 24rpx;
+		 background-image: url("/static/battery.png");
+		 background-size: 100% auto;
+		 background-repeat: no-repeat;
+	 }
+	 .invest_righttop{
+		 margin-top: 80rpx;
+		 color: #90959B;
+	 }
+	 
+	 .invest_rightcenter{
+		 margin-top: 10rpx;
+	 }
+	 .invest_rightbotton{
+		 margin-top: 10rpx;
+	 }
+	 .investbotton{
+		 margin-top: 10rpx;
+	 }
+	 .collective{
+		 font-size: 30rpx;
+		 margin-top: 60rpx;
+		 margin-bottom: 10rpx;
+	 }
+	 .contrast{
+		 width: 100%;
+		 background-color: #f5f5f5;
+		 border-radius: 10rpx;
+		 padding: 20rpx;
+		 box-sizing: border-box;
+		 margin-top: 10rpx;
+	 }
+	 .contrast_title{
+		 display: flex;
+		 justify-content: space-between;
+		 font-size: 26rpx;
+	 }
+	 .contrast_middle{
+		 display: flex;
+		 justify-content: space-between;
+		 font-size: 26rpx;
+		 margin-top: 20rpx;
+	 }
+	 .contrast_bottom{
+		 display: flex;
+		 justify-content: space-between;
+		 font-size: 26rpx;
+		 margin-top: 20rpx;
+	 }
+	 .contrast_titletop{
+		 flex: 1;
+	 }
+	 .contrast_titletops{
+	  flex: 1;
+	  text-align: right;
+	 }
+	 .economy{
+		 margin-top: 60rpx;
+	 }
+	 .economy_top{
+		 display: flex;
+		 font-size: 28rpx;
+		 /* justify-content: space-between; */
+		 padding: 0rpx 20rpx;
+	 }
+	 .economy_topright{
+		 font-size: 22rpx;
+		 margin-top: 4rpx;
+		 margin-left: 10rpx;
+		 color: #ccc;
+	 }
+	 .incomelist{
+		 display: flex;
+		 flex-direction: column;
+		 margin-top: 20rpx;
+		 font-size: 26rpx;
+	 }
+	 .incomelist_title{
+		 display: flex;
+		 height: 80rpx;
+		 font-size: 26rpx;
+		 justify-content: space-between;
+		 background-color: #f5f5f5;
+	 }
+	 .incomelist_titles{
+		display: flex;
+		height: 80rpx;
+		font-size: 26rpx;
+		justify-content: space-between;
+		/* background-color: #f5f5f5; */
+	 }
+	 .incomelist_ul{
+		 flex: 1;
+		 display: flex;
+		 align-items: center;
+		 justify-content: center;
+		 
+	 }
+	 .Electricityprice{
+		 display: flex;
+		 flex-direction: column;
+		 padding: 20rpx;
+		 margin-top: 40rpx;
+	 }
+	 .Electricityprice_title{
+		 font-size: 28rpx;
+		 margin-bottom: 10rpx;
+	 }
+	 .Electricityprice_peak{
+		 display: flex;
+		 justify-content: space-between;
+		 background-color: #f5f5f5;
+		 padding: 20rpx;
+		 border-radius: 10rpx;
+		 font-size: 24rpx;
+		 margin-top: 20rpx;
+	 }
+	 .Electricityprice_peakright{
+		 font-size: 32rpx;
+		 display: flex;
+		 font-weight: 600;
+	 }
+	.Electricityprice_peakrightkwh{
+		 font-size: 22rpx;
+		 margin-top: 8rpx;
+		 margin-left: 10rpx;
+		 font-weight: 400;
+	 }
+	 .Electricityprice_text{
+		 font-size: 22rpx;
+		 margin-top: 20rpx;
+		 line-height: 35rpx;
+		 color: #ccc;
+	 }
+</style>

pages/strategy/index.vue

@@ -7,10 +7,10 @@
 		 	</view>
 			<view class="account_discharge">
 				<view class="account_discharge1">
-                {{$t('strategy.min')}}:0%
+                {{$t('strategy.min')}}: 0%
 				</view>
 				<view class="account_discharge2">
-				{{$t('strategy.max')}}:100%
+				{{$t('strategy.max')}}: 100%
 				</view>
 			</view>
 			<view class="account_text">

pages/user/index.vue

@@ -3,13 +3,14 @@
 	 <view class="setup">
 	 <view style="width: 100%;height:30rpx"></view>
 	 <view class="user">
-	 <image @click ="onuser" class="user_to" src="https://esos-iot.bjdexn.cn/wx_images/to1.jpg" mode=""/>
+		 
+	 <image @click="onuser" class="user_to" :src="user.user.avatar" mode=""/>
 	 <view class="user_name">
-	 <!-- <view class="user_name1">{{user.user.userName}}</view> -->
-	 <!-- <view class="user_name2">电话:{{user.user.phonenumber}}</view> -->
+	 <view class="user_name1">姓名: {{user.user.loginName}}</view>
+	 <view class="user_name2">电话: {{user.user.phonenumber}}</view>
 	 </view>
 	 </view>
-	 <view class="equipment">
+	<!-- <view class="equipment">
 	 <view class="equipment_1" @click ="onstation">
 	 <view class="user_left">
 	 <view class="user_leftname">{{$t('My.myDevices')}}</view>
@@ -28,7 +29,7 @@
 	 <image class="equipment_right" src="https://esos-iot.bjdexn.cn/wx_images/49.png" mode=""/></view>
 	 </view>
 	 
-	 </view>
+	 </view> -->
 	<!-- <view class="allocation_box">
 	 <view class="allocation" @click ="toconfigure">
 	 <view class="allocation_3">配置Wi-Fi</view>
@@ -92,29 +93,44 @@ import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 const { t } = useI18n()
 import { onShow } from '@dcloudio/uni-app';
+	import request from '@/utils/request';
  const defaultValue=ref()
  onShow(() => {
+	 getuserinfo()
  try {
      const language = uni.getStorageSync('userLanguage');
      console.log('Language:', language);
      defaultValue.value = language === 'en';
- 		   console.log(defaultValue.value);
    } catch (error) {
      console.error('读取 Storage 失败:', error);
    }
  });
  const accountInfo=ref('');
- const user=ref('')
+ const user=ref({})
  const stationName=ref('')
- 
+ const getuserinfo = async () => {
+ 	try {
+ 		const response = await request({
+ 			url: '/platform/user/selectaccountNumber',
+ 			method: 'post',
+ 			header: {
+ 				'Content-Type': 'application/x-www-form-urlencoded'
+ 			},
+ 		});
+ 		user.value = response.data
+  console.log(user.value);
+ 	} catch (error) {
+ 		console.error('登录失败:', error);
+ 	}
+ };
 	 onMounted(() => {
-	
+	getuserinfo()
 		 });
 		 
 		 // 头像
 		 const onuser=()=>{
 		 	 uni.navigateTo({
-		 	 				 url:"/pages/PersonalInformation/index"
+		 	 url:"/pages/personalInformation/index"
 		 	 })
 		 	 
 		  };
@@ -226,6 +242,7 @@ import { onShow } from '@dcloudio/uni-app';
  }
  .user{
    display: flex;
+   margin-top: 60rpx;
  }
  .user_to{
    width: 100rpx;
@@ -240,9 +257,11 @@ import { onShow } from '@dcloudio/uni-app';
  }
  .user_name1{
    font-size: 28rpx;
+   color: #ffffff;
  }
  .user_name2{
    font-size: 24rpx;
+   color: #ffffff;
  }
  .equipment{
  width: 100%;
@@ -350,7 +369,7 @@ import { onShow } from '@dcloudio/uni-app';
    background-color: #ffffff;
     padding: 10rpx 0rpx;
     box-sizing: border-box;
-    margin-top: 30rpx;
+    margin-top: 120rpx;
  box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.1);
  
   }
@@ -432,5 +451,71 @@ import { onShow } from '@dcloudio/uni-app';
    border: none !important;
    display: flex;
  }
+ .avatar-edit-container {
+   display: inline-block;
+   position: relative;
+ }
+ 
+ .avatar-wrapper {
+   position: relative;
+   border-radius: 50%;
+   overflow: hidden;
+   cursor: pointer;
+   transition: all 0.3s ease;
+   box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+ }
+ 
+ .avatar-img {
+   width: 100%;
+   height: 100%;
+   object-fit: cover;
+   display: block;
+   transition: transform 0.3s ease;
+ }
+ 
+ .avatar-wrapper:hover .avatar-img {
+   transform: scale(1.05);
+ }
+ 
+ .edit-overlay {
+   position: absolute;
+   top: 0;
+   left: 0;
+   width: 100%;
+   height: 100%;
+   background-color: rgba(0, 0, 0, 0.6);
+   display: flex;
+   align-items: center;
+   justify-content: center;
+   color: white;
+   border-radius: 50%;
+ }
+ 
+ .edit-content {
+   text-align: center;
+ }
+ 
+ .edit-icon {
+   font-size: 24px;
+   margin-bottom: 8px;
+   display: block;
+ }
+ 
+ .edit-text {
+   font-size: 14px;
+   display: block;
+   font-weight: 500;
+ }
  
+ .file-input {
+   display: none;
+ }
+ 
+ /* 过渡动画 */
+ .fade-enter-active, .fade-leave-active {
+   transition: opacity 0.3s;
+ }
+ .fade-enter, .fade-leave-to {
+   opacity: 0;
+ }
 </style>

uni_modules/d-loading/changelog.md

@@ -0,0 +1,2 @@
+## 1.0.0（2022-06-17）
+1.优化

uni_modules/d-loading/components/d-loading/d-loading.vue

@@ -0,0 +1,103 @@
+<template>
+    <view class="dengLoadingVue">
+        <view class="maskVueHiddenShow" v-if="statusLoading" @click="onCheckHiddenApi">
+            <view class="maskVueHiddenShowWrapper">
+                <!-- <image src="@/static/loading.gif" class="maskVueHiddenShowWrapperGif"></image> -->
+				 <div class="wave-loading">
+				    <div class="dot" v-for="i in 5" :key="i" :style="{
+				      animationDelay: `${i * 0.1}s`
+				    }"></div>
+				  </div>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+	
+    export default {
+        props: {
+            status:false,
+        },
+		created() {
+			if (this.statusLoading == true) {
+				var that = this
+				// setTimeout(function(){
+				// 	that.statusLoading = false
+				// },5000)
+			}
+		},
+        data() {
+            return {
+                statusLoading:true,
+            };
+        },
+		watch:{
+			status(e) {
+				this.statusLoading = e
+				
+			}
+		},
+		methods: {
+			onCheckHiddenApi() {
+				this.statusLoading = false
+			}
+		}
+    }
+</script>
+
+<style lang="scss">
+    .dengLoadingVue {
+        .maskVueHiddenShow {
+            z-index: 101;
+            position: fixed;
+            top: 0;
+            left: 0;
+            right: 0;
+            bottom: 0;
+            background-color: #fff;
+            opacity: 0.8;
+            //
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            .maskVueHiddenShowWrapper {
+                width: 80%;
+                height: 300rpx;
+                display: flex;
+				flex-direction: column;
+                align-items: center;
+                justify-content: center;
+                .maskVueHiddenShowWrapperGif {
+                    width: 400rpx;
+                    height: 300rpx;
+                }
+				
+            }
+        }
+    }
+	.wave-loading {
+	  display: flex;
+	  justify-content: center;
+	  align-items: center;
+	  height: 60px;
+	}
+	
+	.dot {
+	  width: 10px;
+	  height: 10px;
+	  margin: 0 5px;
+	  background-color: #007545;
+	  border-radius: 50%;
+	  animation: wave 1.2s ease-in-out infinite;
+	}
+	
+	@keyframes wave {
+	  0%, 60%, 100% {
+	    transform: translateY(0);
+	  }
+	  30% {
+	    transform: translateY(-15px);
+	  }
+	}
+</style>

uni_modules/d-loading/package.json

@@ -0,0 +1,89 @@
+{
+  "id": "d-loading",
+  "displayName": "2023_加载中页面动画loading",
+  "version": "1.0.0",
+  "description": "2023_加载中页面动画loading",
+  "keywords": [
+    "加载",
+    "loading",
+    "加载中",
+    "动画",
+    "弹出框"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.20"
+  },
+  "dcloudext": {
+    "category": [
+        "前端组件",
+        "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "y",
+          "vue3": "y"
+        },
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y",
+          "钉钉": "y",
+          "快手": "y",
+          "飞书": "y",
+          "京东": "y",
+          "小红书": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        }
+      }
+    }
+  }
+}

uni_modules/d-loading/readme.md

@@ -0,0 +1,60 @@
+# 插件名称：d-loading 更新时间：2022.06.17
+
+
+
+## 使用步骤 仅2步（已亲测）
+
+### 【一】准备：
+
+````
+1.复制图片目录到【根目录】：
+'@/uni_modules/d-swiper-type/components/d-swiper-type/pages/static'
+
+2.    main.js 中增加这2行代码
+
+import dLoading from '@/uni_modules/d-loading/components/d-loading/d-loading.vue'
+Vue.component('dLoading',dLoading)
+
+````
+
+
+### 【二】使用：
+````
+
+
+<template>
+	<view>
+	
+		<dLoading :status="loading"></dLoading>
+		
+	</view>
+</template>
+
+<script>
+	
+	export default {
+		data() {
+			return {
+				loading:''
+			}
+		},
+		onLoad() {
+			this.loading = true
+			
+			
+			var that = this
+			if (true) {
+				setTimeout(function(){
+					that.loading = false
+				},1000)
+			}
+			
+			
+		},
+	}
+</script>
+
+
+gif 来源color ui
+````
+

uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue

@@ -76,8 +76,8 @@
           'uni-calendar-item--multiple': weeks.multiple,
           'uni-calendar-item--after-checked': weeks.afterMultiple,
           'uni-calendar-item--disable': weeks.disable,
-		  'uni-calendar-item--workday-text': weeks.extraInfo && weeks.extraInfo.info === '工作日',
-		  'uni-calendar-item--restday-text': weeks.extraInfo && weeks.extraInfo.info === '休息日'
+		  'uni-calendar-item--workday-texts': weeks.extraInfo && weeks.extraInfo.info === '工作日',
+		  'uni-calendar-item--restday-texts': weeks.extraInfo && weeks.extraInfo.info === '休息日'
         }"
       >{{ weeks.extraInfo.info }}</text>
     </view>
@@ -226,4 +226,11 @@ $uni-restday-dot: #e43d33; // 休息日打点颜色
 .uni-calendar-item--restday-text {
   color: $uni-restday-color; // 休息日字体颜色
 }
+.uni-calendar-item--workday-texts {
+  color: $uni-text-color-disable; // 工作日字体颜色
+}
+
+.uni-calendar-item--restday-texts {
+  color: $uni-text-color-disable; // 休息日字体颜色
+}
 </style>

uni_modules/uni-easyinput/changelog.md

@@ -0,0 +1,115 @@
+## 1.1.19（2024-07-18）
+- 修复 初始值传入 null 导致input报错的bug
+## 1.1.18（2024-04-11）
+- 修复 easyinput组件双向绑定问题
+## 1.1.17（2024-03-28）
+- 修复 在头条小程序下丢失事件绑定的问题
+## 1.1.16（2024-03-20）
+- 修复 在密码输入情况下 清除和小眼睛覆盖bug 在edge浏览器下显示双眼睛bug
+## 1.1.15（2024-02-21）
+- 新增 左侧插槽：left
+## 1.1.14（2024-02-19）
+- 修复 onBlur的emit传值错误
+## 1.1.12（2024-01-29）
+- 补充 adjust-position文档属性补充
+## 1.1.11（2024-01-29）
+- 补充 adjust-position属性传递值：（Boolean）当键盘弹起时，是否自动上推页面
+## 1.1.10（2024-01-22）
+- 去除 移除无用的log输出
+## 1.1.9（2023-04-11）
+- 修复 vue3 下 keyboardheightchange 事件报错的bug
+## 1.1.8（2023-03-29）
+- 优化 trim 属性默认值
+## 1.1.7（2023-03-29）
+- 新增 cursor-spacing 属性
+## 1.1.6（2023-01-28）
+- 新增 keyboardheightchange 事件，可监听键盘高度变化
+## 1.1.5（2022-11-29）
+- 优化 主题样式
+## 1.1.4（2022-10-27）
+- 修复 props 中背景颜色无默认值的bug
+## 1.1.0（2022-06-30）
+
+- 新增 在 uni-forms 1.4.0 中使用可以在 blur 时校验内容
+- 新增 clear 事件，点击右侧叉号图标触发
+- 新增 change 事件 ，仅在输入框失去焦点或用户按下回车时触发
+- 优化 组件样式，组件获取焦点时高亮显示，图标颜色调整等
+
+## 1.0.5（2022-06-07）
+
+- 优化 clearable 显示策略
+
+## 1.0.4（2022-06-07）
+
+- 优化 clearable 显示策略
+
+## 1.0.3（2022-05-20）
+
+- 修复 关闭图标某些情况下无法取消的 bug
+
+## 1.0.2（2022-04-12）
+
+- 修复 默认值不生效的 bug
+
+## 1.0.1（2022-04-02）
+
+- 修复 value 不能为 0 的 bug
+
+## 1.0.0（2021-11-19）
+
+- 优化 组件 UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-easyinput](https://uniapp.dcloud.io/component/uniui/uni-easyinput)
+
+## 0.1.4（2021-08-20）
+
+- 修复 在 uni-forms 的动态表单中默认值校验不通过的 bug
+
+## 0.1.3（2021-08-11）
+
+- 修复 在 uni-forms 中重置表单，错误信息无法清除的问题
+
+## 0.1.2（2021-07-30）
+
+- 优化 vue3 下事件警告的问题
+
+## 0.1.1
+
+- 优化 errorMessage 属性支持 Boolean 类型
+
+## 0.1.0（2021-07-13）
+
+- 组件兼容 vue3，如何创建 vue3 项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+
+## 0.0.16（2021-06-29）
+
+- 修复 confirmType 属性（仅 type="text" 生效）导致多行文本框无法换行的 bug
+
+## 0.0.15（2021-06-21）
+
+- 修复 passwordIcon 属性拼写错误的 bug
+
+## 0.0.14（2021-06-18）
+
+- 新增 passwordIcon 属性，当 type=password 时是否显示小眼睛图标
+- 修复 confirmType 属性不生效的问题
+
+## 0.0.13（2021-06-04）
+
+- 修复 disabled 状态可清出内容的 bug
+
+## 0.0.12（2021-05-12）
+
+- 新增 组件示例地址
+
+## 0.0.11（2021-05-07）
+
+- 修复 input-border 属性不生效的问题
+
+## 0.0.10（2021-04-30）
+
+- 修复 ios 遮挡文字、显示一半的问题
+
+## 0.0.9（2021-02-05）
+
+- 调整为 uni_modules 目录规范
+- 优化 兼容 nvue 页面

uni_modules/uni-easyinput/components/uni-easyinput/common.js

@@ -0,0 +1,54 @@
+/**
+ * @desc 函数防抖
+ * @param func 目标函数
+ * @param wait 延迟执行毫秒数
+ * @param immediate true - 立即执行， false - 延迟执行
+ */
+export const debounce = function(func, wait = 1000, immediate = true) {
+	let timer;
+	return function() {
+		let context = this,
+			args = arguments;
+		if (timer) clearTimeout(timer);
+		if (immediate) {
+			let callNow = !timer;
+			timer = setTimeout(() => {
+				timer = null;
+			}, wait);
+			if (callNow) func.apply(context, args);
+		} else {
+			timer = setTimeout(() => {
+				func.apply(context, args);
+			}, wait)
+		}
+	}
+}
+/**
+ * @desc 函数节流
+ * @param func 函数
+ * @param wait 延迟执行毫秒数
+ * @param type 1 使用表时间戳，在时间段开始的时候触发 2 使用表定时器，在时间段结束的时候触发
+ */
+export const throttle = (func, wait = 1000, type = 1) => {
+	let previous = 0;
+	let timeout;
+	return function() {
+		let context = this;
+		let args = arguments;
+		if (type === 1) {
+			let now = Date.now();
+
+			if (now - previous > wait) {
+				func.apply(context, args);
+				previous = now;
+			}
+		} else if (type === 2) {
+			if (!timeout) {
+				timeout = setTimeout(() => {
+					timeout = null;
+					func.apply(context, args)
+				}, wait)
+			}
+		}
+	}
+}

uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue

@@ -0,0 +1,676 @@
+<template>
+	<view class="uni-easyinput" :class="{ 'uni-easyinput-error': msg }" :style="boxStyle">
+		<view class="uni-easyinput__content" :class="inputContentClass" :style="inputContentStyle">
+			<uni-icons v-if="prefixIcon" class="content-clear-icon" :type="prefixIcon" color="#c0c4cc" @click="onClickIcon('prefix')" size="22"></uni-icons>
+			<slot name="left">
+			</slot>
+			<!-- #ifdef MP-ALIPAY -->
+			<textarea :enableNative="enableNative" v-if="type === 'textarea'" class="uni-easyinput__content-textarea" :class="{ 'input-padding': inputBorder }" :name="name" :value="val" :placeholder="placeholder" :placeholderStyle="placeholderStyle" :disabled="disabled" placeholder-class="uni-easyinput__placeholder-class" :maxlength="inputMaxlength" :focus="focused" :autoHeight="autoHeight" :cursor-spacing="cursorSpacing" :adjust-position="adjustPosition" @input="onInput" @blur="_Blur" @focus="_Focus" @confirm="onConfirm" @keyboardheightchange="onkeyboardheightchange"></textarea>
+			<input :enableNative="enableNative" v-else :type="type === 'password' ? 'text' : type" class="uni-easyinput__content-input" :style="inputStyle" :name="name" :value="val" :password="!showPassword && type === 'password'" :placeholder="placeholder" :placeholderStyle="placeholderStyle" placeholder-class="uni-easyinput__placeholder-class" :disabled="disabled" :maxlength="inputMaxlength" :focus="focused" :confirmType="confirmType" :cursor-spacing="cursorSpacing" :adjust-position="adjustPosition" @focus="_Focus" @blur="_Blur" @input="onInput" @confirm="onConfirm" @keyboardheightchange="onkeyboardheightchange" />
+			<!-- #endif -->
+			<!-- #ifndef MP-ALIPAY -->
+			<textarea v-if="type === 'textarea'" class="uni-easyinput__content-textarea" :class="{ 'input-padding': inputBorder }" :name="name" :value="val" :placeholder="placeholder" :placeholderStyle="placeholderStyle" :disabled="disabled" placeholder-class="uni-easyinput__placeholder-class" :maxlength="inputMaxlength" :focus="focused" :autoHeight="autoHeight" :cursor-spacing="cursorSpacing" :adjust-position="adjustPosition" @input="onInput" @blur="_Blur" @focus="_Focus" @confirm="onConfirm" @keyboardheightchange="onkeyboardheightchange"></textarea>
+			<input v-else :type="type === 'password' ? 'text' : type" class="uni-easyinput__content-input" :style="inputStyle" :name="name" :value="val" :password="!showPassword && type === 'password'" :placeholder="placeholder" :placeholderStyle="placeholderStyle" placeholder-class="uni-easyinput__placeholder-class" :disabled="disabled" :maxlength="inputMaxlength" :focus="focused" :confirmType="confirmType" :cursor-spacing="cursorSpacing" :adjust-position="adjustPosition" @focus="_Focus" @blur="_Blur" @input="onInput" @confirm="onConfirm" @keyboardheightchange="onkeyboardheightchange" />
+			<!-- #endif -->
+
+			<template v-if="type === 'password' && passwordIcon">
+				<!-- 开启密码时显示小眼睛 -->
+				<uni-icons v-if="isVal" class="content-clear-icon" :class="{ 'is-textarea-icon': type === 'textarea' }" :type="showPassword ? 'eye-slash-filled' : 'eye-filled'" :size="22" :color="focusShow ? primaryColor : '#c0c4cc'" @click="onEyes"></uni-icons>
+			</template>
+			<template v-if="suffixIcon">
+				<uni-icons v-if="suffixIcon" class="content-clear-icon" :type="suffixIcon" color="#c0c4cc" @click="onClickIcon('suffix')" size="22"></uni-icons>
+			</template>
+			<template v-else>
+				<uni-icons v-if="clearable && isVal && !disabled && type !== 'textarea'" class="content-clear-icon" :class="{ 'is-textarea-icon': type === 'textarea' }" type="clear" :size="clearSize" :color="msg ? '#dd524d' : focusShow ? primaryColor : '#c0c4cc'" @click="onClear"></uni-icons>
+			</template>
+			<slot name="right"></slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * Easyinput 输入框
+	 * @description 此组件可以实现表单的输入与校验，包括 "text" 和 "textarea" 类型。
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3455
+	 * @property {String}	value	输入内容
+	 * @property {String }	type	输入框的类型（默认text） password/text/textarea/..
+	 * 	@value text			文本输入键盘
+	 * 	@value textarea	多行文本输入键盘
+	 * 	@value password	密码输入键盘
+	 * 	@value number		数字输入键盘，注意iOS上app-vue弹出的数字键盘并非9宫格方式
+	 * 	@value idcard		身份证输入键盘，信、支付宝、百度、QQ小程序
+	 * 	@value digit		带小数点的数字键盘	，App的nvue页面、微信、支付宝、百度、头条、QQ小程序支持
+	 * @property {Boolean}	clearable	是否显示右侧清空内容的图标控件，点击可清空输入框内容（默认true）
+	 * @property {Boolean}	autoHeight	是否自动增高输入区域，type为textarea时有效（默认true）
+	 * @property {String }	placeholder	输入框的提示文字
+	 * @property {String }	placeholderStyle	placeholder的样式(内联样式，字符串)，如"color: #ddd"
+	 * @property {Boolean}	focus	是否自动获得焦点（默认false）
+	 * @property {Boolean}	disabled	是否禁用（默认false）
+	 * @property {Number }	maxlength	最大输入长度，设置为 -1 的时候不限制最大长度（默认140）
+	 * @property {String }	confirmType	设置键盘右下角按钮的文字，仅在type="text"时生效（默认done）
+	 * @property {Number }	clearSize	清除图标的大小，单位px（默认15）
+	 * @property {String}	prefixIcon	输入框头部图标
+	 * @property {String}	suffixIcon	输入框尾部图标
+	 * @property {String}	primaryColor	设置主题色（默认#2979ff）
+	 * @property {Boolean}	trim	是否自动去除两端的空格
+	 * @property {Boolean}	cursorSpacing	指定光标与键盘的距离，单位 px
+	 * @property {Boolean}  ajust-position 当键盘弹起时，是否上推内容，默认值：true
+	 * @value both	去除两端空格
+	 * @value left	去除左侧空格
+	 * @value right	去除右侧空格
+	 * @value start	去除左侧空格
+	 * @value end		去除右侧空格
+	 * @value all		去除全部空格
+	 * @value none	不去除空格
+	 * @property {Boolean}	inputBorder	是否显示input输入框的边框（默认true）
+	 * @property {Boolean}	passwordIcon	type=password时是否显示小眼睛图标
+	 * @property {Object}	styles	自定义颜色
+	 * @event {Function}	input	输入框内容发生变化时触发
+	 * @event {Function}	focus	输入框获得焦点时触发
+	 * @event {Function}	blur	输入框失去焦点时触发
+	 * @event {Function}	confirm	点击完成按钮时触发
+	 * @event {Function}	iconClick	点击图标时触发
+	 * @example <uni-easyinput v-model="mobile"></uni-easyinput>
+	 */
+	function obj2strClass(obj) {
+		let classess = '';
+		for (let key in obj) {
+			const val = obj[key];
+			if (val) {
+				classess += `${key} `;
+			}
+		}
+		return classess;
+	}
+
+	function obj2strStyle(obj) {
+		let style = '';
+		for (let key in obj) {
+			const val = obj[key];
+			style += `${key}:${val};`;
+		}
+		return style;
+	}
+	export default {
+		name: 'uni-easyinput',
+		emits: [
+			'click',
+			'iconClick',
+			'update:modelValue',
+			'input',
+			'focus',
+			'blur',
+			'confirm',
+			'clear',
+			'eyes',
+			'change',
+			'keyboardheightchange'
+		],
+		model: {
+			prop: 'modelValue',
+			event: 'update:modelValue'
+		},
+		options: {
+			// #ifdef MP-TOUTIAO
+			virtualHost: false,
+			// #endif
+			// #ifndef MP-TOUTIAO
+			virtualHost: true
+			// #endif
+		},
+		inject: {
+			form: {
+				from: 'uniForm',
+				default: null
+			},
+			formItem: {
+				from: 'uniFormItem',
+				default: null
+			}
+		},
+		props: {
+			name: String,
+			value: [Number, String],
+			modelValue: [Number, String],
+			type: {
+				type: String,
+				default: 'text'
+			},
+			clearable: {
+				type: Boolean,
+				default: true
+			},
+			autoHeight: {
+				type: Boolean,
+				default: false
+			},
+			placeholder: {
+				type: String,
+				default: ' '
+			},
+			placeholderStyle: String,
+			focus: {
+				type: Boolean,
+				default: false
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			maxlength: {
+				type: [Number, String],
+				default: 140
+			},
+			confirmType: {
+				type: String,
+				default: 'done'
+			},
+			clearSize: {
+				type: [Number, String],
+				default: 24
+			},
+			inputBorder: {
+				type: Boolean,
+				default: true
+			},
+			prefixIcon: {
+				type: String,
+				default: ''
+			},
+			suffixIcon: {
+				type: String,
+				default: ''
+			},
+			trim: {
+				type: [Boolean, String],
+				default: false
+			},
+			cursorSpacing: {
+				type: Number,
+				default: 0
+			},
+			passwordIcon: {
+				type: Boolean,
+				default: true
+			},
+			adjustPosition: {
+				type: Boolean,
+				default: true
+			},
+			primaryColor: {
+				type: String,
+				default: '#2979ff'
+			},
+			styles: {
+				type: Object,
+				default () {
+					return {
+						color: '#333',
+						backgroundColor: '#fff',
+						disableColor: '#F7F6F6',
+						borderColor: '#e5e5e5'
+					};
+				}
+			},
+			errorMessage: {
+				type: [String, Boolean],
+				default: ''
+			},
+			// #ifdef MP-ALIPAY
+			enableNative: {
+				type: Boolean,
+				default: false
+			}
+			// #endif
+		},
+		data() {
+			return {
+				focused: false,
+				val: '',
+				showMsg: '',
+				border: false,
+				isFirstBorder: false,
+				showClearIcon: false,
+				showPassword: false,
+				focusShow: false,
+				localMsg: '',
+				isEnter: false // 用于判断当前是否是使用回车操作
+			};
+		},
+		computed: {
+			// 输入框内是否有值
+			isVal() {
+				const val = this.val;
+				// fixed by mehaotian 处理值为0的情况，字符串0不在处理范围
+				if (val || val === 0) {
+					return true;
+				}
+				return false;
+			},
+
+			msg() {
+				// console.log('computed', this.form, this.formItem);
+				// if (this.form) {
+				// 	return this.errorMessage || this.formItem.errMsg;
+				// }
+				// TODO 处理头条 formItem 中 errMsg 不更新的问题
+				return this.localMsg || this.errorMessage;
+			},
+			// 因为uniapp的input组件的maxlength组件必须要数值，这里转为数值，用户可以传入字符串数值
+			inputMaxlength() {
+				return Number(this.maxlength);
+			},
+
+			// 处理外层样式的style
+			boxStyle() {
+				return `color:${
+					this.inputBorder && this.msg ? '#e43d33' : this.styles.color
+				};`;
+			},
+			// input 内容的类和样式处理
+			inputContentClass() {
+				return obj2strClass({
+					'is-input-border': this.inputBorder,
+					'is-input-error-border': this.inputBorder && this.msg,
+					'is-textarea': this.type === 'textarea',
+					'is-disabled': this.disabled,
+					'is-focused': this.focusShow
+				});
+			},
+			inputContentStyle() {
+				const focusColor = this.focusShow ?
+					this.primaryColor :
+					this.styles.borderColor;
+				const borderColor =
+					this.inputBorder && this.msg ? '#dd524d' : focusColor;
+				return obj2strStyle({
+					'border-color': borderColor || '#e5e5e5',
+					'background-color': this.disabled ?
+						this.styles.disableColor : this.styles.backgroundColor
+				});
+			},
+			// input右侧样式
+			inputStyle() {
+				const paddingRight =
+					this.type === 'password' || this.clearable || this.prefixIcon ?
+					'' :
+					'10px';
+				return obj2strStyle({
+					'padding-right': paddingRight,
+					'padding-left': this.prefixIcon ? '' : '10px'
+				});
+			}
+		},
+		watch: {
+			value(newVal) {
+				// fix by mehaotian 解决 值为null的情况下，input报错的bug
+				if (newVal === null) {
+					this.val = '';
+					return
+				}
+				this.val = newVal;
+			},
+			modelValue(newVal) {
+				if (newVal === null) {
+					this.val = '';
+					return
+				}
+				this.val = newVal;
+			},
+			focus(newVal) {
+				this.$nextTick(() => {
+					this.focused = this.focus;
+					this.focusShow = this.focus;
+				});
+			}
+		},
+		created() {
+			this.init();
+			// TODO 处理头条vue3 computed 不监听 inject 更改的问题（formItem.errMsg）
+			if (this.form && this.formItem) {
+				this.$watch('formItem.errMsg', newVal => {
+					this.localMsg = newVal;
+				});
+			}
+		},
+		mounted() {
+			this.$nextTick(() => {
+				this.focused = this.focus;
+				this.focusShow = this.focus;
+			});
+		},
+		methods: {
+			/**
+			 * 初始化变量值
+			 */
+			init() {
+				if (this.value || this.value === 0) {
+					this.val = this.value;
+				} else if (
+					this.modelValue ||
+					this.modelValue === 0 ||
+					this.modelValue === ''
+				) {
+					this.val = this.modelValue; 
+				} else {
+					// fix by ht 如果初始值为null，则input报错，待框架修复
+					this.val = '';
+				}
+			},
+
+			/**
+			 * 点击图标时触发
+			 * @param {Object} type
+			 */
+			onClickIcon(type) {
+				this.$emit('iconClick', type);
+			},
+
+			/**
+			 * 显示隐藏内容，密码框时生效
+			 */
+			onEyes() {
+				this.showPassword = !this.showPassword;
+				this.$emit('eyes', this.showPassword);
+			},
+
+			/**
+			 * 输入时触发
+			 * @param {Object} event
+			 */
+			onInput(event) {
+				let value = event.detail.value;
+				// 判断是否去除空格
+				if (this.trim) {
+					if (typeof this.trim === 'boolean' && this.trim) {
+						value = this.trimStr(value);
+					}
+					if (typeof this.trim === 'string') {
+						value = this.trimStr(value, this.trim);
+					}
+				}
+				if (this.errMsg) this.errMsg = '';
+				this.val = value;
+				// TODO 兼容 vue2
+				this.$emit('input', value);
+				// TODO　兼容　vue3
+				this.$emit('update:modelValue', value);
+			},
+
+			/**
+			 * 外部调用方法
+			 * 获取焦点时触发
+			 * @param {Object} event
+			 */
+			onFocus() {
+				this.$nextTick(() => {
+					this.focused = true;
+				});
+				this.$emit('focus', null);
+			},
+
+			_Focus(event) {
+				this.focusShow = true;
+				this.$emit('focus', event);
+			},
+
+			/**
+			 * 外部调用方法
+			 * 失去焦点时触发
+			 * @param {Object} event
+			 */
+			onBlur() {
+				this.focused = false;
+				this.$emit('blur', null);
+			},
+			_Blur(event) {
+				let value = event.detail.value;
+				this.focusShow = false;
+				this.$emit('blur', event);
+				// 根据类型返回值，在event中获取的值理论上讲都是string
+				if (this.isEnter === false) {
+					this.$emit('change', this.val);
+				}
+				// 失去焦点时参与表单校验
+				if (this.form && this.formItem) {
+					const { validateTrigger } = this.form;
+					if (validateTrigger === 'blur') {
+						this.formItem.onFieldChange();
+					}
+				}
+			},
+
+			/**
+			 * 按下键盘的发送键
+			 * @param {Object} e
+			 */
+			onConfirm(e) {
+				this.$emit('confirm', this.val);
+				this.isEnter = true;
+				this.$emit('change', this.val);
+				this.$nextTick(() => {
+					this.isEnter = false;
+				});
+			},
+
+			/**
+			 * 清理内容
+			 * @param {Object} event
+			 */
+			onClear(event) {
+				this.val = '';
+				// TODO 兼容 vue2
+				this.$emit('input', '');
+				// TODO 兼容 vue2
+				// TODO　兼容　vue3
+				this.$emit('update:modelValue', '');
+				// 点击叉号触发
+				this.$emit('clear');
+			},
+
+			/**
+			 * 键盘高度发生变化的时候触发此事件
+			 * 兼容性：微信小程序2.7.0+、App 3.1.0+
+			 * @param {Object} event
+			 */
+			onkeyboardheightchange(event) {
+				this.$emit('keyboardheightchange', event);
+			},
+
+			/**
+			 * 去除空格
+			 */
+			trimStr(str, pos = 'both') {
+				if (pos === 'both') {
+					return str.trim();
+				} else if (pos === 'left') {
+					return str.trimLeft();
+				} else if (pos === 'right') {
+					return str.trimRight();
+				} else if (pos === 'start') {
+					return str.trimStart();
+				} else if (pos === 'end') {
+					return str.trimEnd();
+				} else if (pos === 'all') {
+					return str.replace(/\s+/g, '');
+				} else if (pos === 'none') {
+					return str;
+				}
+				return str;
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	$uni-error: #e43d33;
+	$uni-border-1: #dcdfe6 !default;
+
+	.uni-easyinput {
+		/* #ifndef APP-NVUE */
+		width: 100%;
+		/* #endif */
+		flex: 1;
+		position: relative;
+		text-align: left;
+		color: #333;
+		font-size: 14px;
+	}
+
+	.uni-easyinput__content {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		width: 100%;
+		display: flex;
+		box-sizing: border-box;
+		// min-height: 36px;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		// 处理border动画刚开始显示黑色的问题
+		border-color: #fff;
+		transition-property: border-color;
+		transition-duration: 0.3s;
+	}
+
+	.uni-easyinput__content-input {
+		/* #ifndef APP-NVUE */
+		width: auto;
+		/* #endif */
+		position: relative;
+		overflow: hidden;
+		flex: 1;
+		line-height: 1;
+		font-size: 14px;
+		height: 35px;
+		// min-height: 36px;
+
+		/*ifdef H5*/
+		& ::-ms-reveal {
+			display: none;
+		}
+
+		& ::-ms-clear {
+			display: none;
+		}
+
+		& ::-o-clear {
+			display: none;
+		}
+
+		/*endif*/
+	}
+
+	.uni-easyinput__placeholder-class {
+		color: #999;
+		font-size: 12px;
+		// font-weight: 200;
+	}
+
+	.is-textarea {
+		align-items: flex-start;
+	}
+
+	.is-textarea-icon {
+		margin-top: 5px;
+	}
+
+	.uni-easyinput__content-textarea {
+		position: relative;
+		overflow: hidden;
+		flex: 1;
+		line-height: 1.5;
+		font-size: 14px;
+		margin: 6px;
+		margin-left: 0;
+		height: 80px;
+		min-height: 80px;
+		/* #ifndef APP-NVUE */
+		min-height: 80px;
+		width: auto;
+		/* #endif */
+	}
+
+	.input-padding {
+		padding-left: 10px;
+	}
+
+	.content-clear-icon {
+		padding: 0 5px;
+	}
+
+	.label-icon {
+		margin-right: 5px;
+		margin-top: -1px;
+	}
+
+	// 显示边框
+	.is-input-border {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		box-sizing: border-box;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		border: 1px solid $uni-border-1;
+		border-radius: 4px;
+		/* #ifdef MP-ALIPAY */
+		overflow: hidden;
+		/* #endif */
+	}
+
+	.uni-error-message {
+		position: absolute;
+		bottom: -17px;
+		left: 0;
+		line-height: 12px;
+		color: $uni-error;
+		font-size: 12px;
+		text-align: left;
+	}
+
+	.uni-error-msg--boeder {
+		position: relative;
+		bottom: 0;
+		line-height: 22px;
+	}
+
+	.is-input-error-border {
+		border-color: $uni-error;
+
+		.uni-easyinput__placeholder-class {
+			color: mix(#fff, $uni-error, 50%);
+		}
+	}
+
+	.uni-easyinput--border {
+		margin-bottom: 0;
+		padding: 10px 15px;
+		// padding-bottom: 0;
+		border-top: 1px #eee solid;
+	}
+
+	.uni-easyinput-error {
+		padding-bottom: 0;
+	}
+
+	.is-first-border {
+		/* #ifndef APP-NVUE */
+		border: none;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		border-width: 0;
+		/* #endif */
+	}
+
+	.is-disabled {
+		background-color: #f7f6f6;
+		color: #d5d5d5;
+
+		.uni-easyinput__placeholder-class {
+			color: #d5d5d5;
+			font-size: 12px;
+		}
+	}
+</style>

uni_modules/uni-easyinput/package.json

@@ -0,0 +1,88 @@
+{
+  "id": "uni-easyinput",
+  "displayName": "uni-easyinput 增强输入框",
+  "version": "1.1.19",
+  "description": "Easyinput 组件是对原生input组件的增强",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "input",
+    "uni-easyinput",
+    "输入框"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uni-scss",
+      "uni-icons"
+    ],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}

uni_modules/uni-easyinput/readme.md

@@ -0,0 +1,11 @@
+
+
+### Easyinput 增强输入框
+> **组件名：uni-easyinput**
+> 代码块： `uEasyinput`
+
+
+easyinput 组件是对原生input组件的增强 ，是专门为配合表单组件[uni-forms](https://ext.dcloud.net.cn/plugin?id=2773)而设计的，easyinput 内置了边框，图标等，同时包含 input 所有功能
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-easyinput)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 

uni_modules/uni-file-picker/changelog.md

@@ -0,0 +1,81 @@
+## 1.0.12（2025-04-14）
+- 修复 支付宝小程序 上传样式问题
+## 1.0.10（2024-07-09）
+- 优化 vue3兼容性
+## 1.0.9（2024-07-09）
+- 修复 value 属性不兼容vue3的bug
+## 1.0.8（2024-03-20）
+- 补充 删除文件时返回文件下标
+## 1.0.7（2024-02-21）
+- 新增 微信小程序选择视频时改用chooseMedia,并返回视频缩略图
+## 1.0.6（2024-01-06）
+- 新增 微信小程序不再调用chooseImage,而是调用chooseMedia
+## 1.0.5（2024-01-03）
+- 新增 上传文件至云存储携带本地文件名称
+## 1.0.4（2023-03-29）
+- 修复 手动上传删除一个文件后不能再上传的bug
+## 1.0.3（2022-12-19）
+- 新增 sourceType 属性, 可以自定义图片和视频选择的来源
+## 1.0.2（2022-07-04）
+- 修复 在uni-forms下样式不生效的bug
+## 1.0.1（2021-11-23）
+- 修复 参数为对象的情况下，url在某些情况显示错误的bug
+## 1.0.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-file-picker](https://uniapp.dcloud.io/component/uniui/uni-file-picker)
+## 0.2.16（2021-11-08）
+- 修复 传入空对象 ，显示错误的Bug
+## 0.2.15（2021-08-30）
+- 修复 return-type="object" 时且存在v-model时，无法删除文件的Bug
+## 0.2.14（2021-08-23）
+- 新增 参数中返回 fileID 字段
+## 0.2.13（2021-08-23）
+- 修复 腾讯云传入fileID 不能回显的bug
+- 修复 选择图片后，不能放大的问题
+## 0.2.12（2021-08-17）
+- 修复 由于 0.2.11 版本引起的不能回显图片的Bug
+## 0.2.11（2021-08-16）
+- 新增 clearFiles(index) 方法，可以手动删除指定文件
+- 修复 v-model 值设为 null 报错的Bug
+## 0.2.10（2021-08-13）
+- 修复 return-type="object" 时，无法删除文件的Bug
+## 0.2.9（2021-08-03）
+- 修复 auto-upload 属性失效的Bug
+## 0.2.8（2021-07-31）
+- 修复 fileExtname属性不指定值报错的Bug
+## 0.2.7（2021-07-31）
+- 修复 在某种场景下图片不回显的Bug
+## 0.2.6（2021-07-30）
+- 修复 return-type为object下，返回值不正确的Bug
+## 0.2.5（2021-07-30）
+- 修复（重要） H5 平台下如果和uni-forms组件一同使用导致页面卡死的问题
+## 0.2.3（2021-07-28）
+- 优化 调整示例代码
+## 0.2.2（2021-07-27）
+- 修复 vue3 下赋值错误的Bug
+- 优化 h5平台下上传文件导致页面卡死的问题
+## 0.2.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 0.1.1（2021-07-02）
+- 修复 sourceType 缺少默认值导致 ios 无法选择文件
+## 0.1.0（2021-06-30）
+- 优化 解耦与uniCloud的强绑定关系 ，如不绑定服务空间，默认autoUpload为false且不可更改
+## 0.0.11（2021-06-30）
+- 修复 由 0.0.10 版本引发的 returnType 属性失效的问题
+## 0.0.10（2021-06-29）
+- 优化 文件上传后进度条消失时机
+## 0.0.9（2021-06-29）
+- 修复 在uni-forms 中，删除文件 ，获取的值不对的Bug
+## 0.0.8（2021-06-15）
+- 修复 删除文件时无法触发 v-model 的Bug
+## 0.0.7（2021-05-12）
+- 新增 组件示例地址
+## 0.0.6（2021-04-09）
+- 修复 选择的文件非 file-extname 字段指定的扩展名报错的Bug
+## 0.0.5（2021-04-09）
+- 优化 更新组件示例
+## 0.0.4（2021-04-09）
+- 优化 file-extname 字段支持字符串写法，多个扩展名需要用逗号分隔
+## 0.0.3（2021-02-05）
+- 调整为uni_modules目录规范
+- 修复 微信小程序不指定 fileExtname 属性选择失败的Bug

uni_modules/uni-file-picker/components/uni-file-picker/choose-and-upload-file.js

@@ -0,0 +1,287 @@
+'use strict';
+
+const ERR_MSG_OK = 'chooseAndUploadFile:ok';
+const ERR_MSG_FAIL = 'chooseAndUploadFile:fail';
+
+function chooseImage(opts) {
+	const {
+		count,
+		sizeType = ['original', 'compressed'],
+		sourceType,
+		extension
+	} = opts
+	return new Promise((resolve, reject) => {
+		// 微信由于旧接口不再维护，针对微信小程序平台改用chooseMedia接口
+		// #ifdef MP-WEIXIN
+		uni.chooseMedia({
+			count,
+			sizeType,
+			sourceType,
+			mediaType: ['image'],
+			extension,
+			success(res) {
+				res.tempFiles.forEach(item => {
+					item.path = item.tempFilePath;
+				})
+				resolve(normalizeChooseAndUploadFileRes(res, 'image'));
+			},
+			fail(res) {
+				reject({
+					errMsg: res.errMsg.replace('chooseImage:fail', ERR_MSG_FAIL),
+				});
+			},
+		})
+		// #endif
+		// #ifndef MP-WEIXIN
+		uni.chooseImage({
+			count,
+			sizeType,
+			sourceType,
+			extension,
+			success(res) {
+				resolve(normalizeChooseAndUploadFileRes(res, 'image'));
+			},
+			fail(res) {
+				reject({
+					errMsg: res.errMsg.replace('chooseImage:fail', ERR_MSG_FAIL),
+				});
+			},
+		});
+		// #endif
+
+	});
+}
+
+function chooseVideo(opts) {
+	const {
+		count,
+		camera,
+		compressed,
+		maxDuration,
+		sourceType,
+		extension
+	} = opts;
+	return new Promise((resolve, reject) => {
+		// 微信由于旧接口不再维护，针对微信小程序平台改用chooseMedia接口
+		// #ifdef MP-WEIXIN
+		uni.chooseMedia({
+			count,
+			compressed,
+			maxDuration,
+			sourceType,
+			extension,
+			mediaType: ['video'],
+			success(res) {
+				const {
+					tempFiles,
+				} = res;
+				resolve(normalizeChooseAndUploadFileRes({
+					errMsg: 'chooseVideo:ok',
+					tempFiles: tempFiles.map(item => {
+						return {
+							name: item.name || '',
+							path: item.tempFilePath,
+							thumbTempFilePath: item.thumbTempFilePath,
+							size:item.size,
+							type: (res.tempFile && res.tempFile.type) || '',
+							width:item.width,
+							height:item.height,
+							duration:item.duration,
+							fileType: 'video',
+							cloudPath: '',
+						}
+					}),
+				}, 'video'));
+			},
+			fail(res) {
+				reject({
+					errMsg: res.errMsg.replace('chooseVideo:fail', ERR_MSG_FAIL),
+				});
+			},
+		})
+		// #endif
+		// #ifndef MP-WEIXIN
+		uni.chooseVideo({
+			camera,
+			compressed,
+			maxDuration,
+			sourceType,
+			extension,
+			success(res) {
+				const {
+					tempFilePath,
+					duration,
+					size,
+					height,
+					width
+				} = res;
+				resolve(normalizeChooseAndUploadFileRes({
+					errMsg: 'chooseVideo:ok',
+					tempFilePaths: [tempFilePath],
+					tempFiles: [{
+						name: (res.tempFile && res.tempFile.name) || '',
+						path: tempFilePath,
+						size,
+						type: (res.tempFile && res.tempFile.type) || '',
+						width,
+						height,
+						duration,
+						fileType: 'video',
+						cloudPath: '',
+					}, ],
+				}, 'video'));
+			},
+			fail(res) {
+				reject({
+					errMsg: res.errMsg.replace('chooseVideo:fail', ERR_MSG_FAIL),
+				});
+			},
+		});
+		// #endif
+	});
+}
+
+function chooseAll(opts) {
+	const {
+		count,
+		extension
+	} = opts;
+	return new Promise((resolve, reject) => {
+		let chooseFile = uni.chooseFile;
+		if (typeof wx !== 'undefined' &&
+			typeof wx.chooseMessageFile === 'function') {
+			chooseFile = wx.chooseMessageFile;
+		}
+		if (typeof chooseFile !== 'function') {
+			return reject({
+				errMsg: ERR_MSG_FAIL + ' 请指定 type 类型，该平台仅支持选择 image 或 video。',
+			});
+		}
+		chooseFile({
+			type: 'all',
+			count,
+			extension,
+			success(res) {
+				resolve(normalizeChooseAndUploadFileRes(res));
+			},
+			fail(res) {
+				reject({
+					errMsg: res.errMsg.replace('chooseFile:fail', ERR_MSG_FAIL),
+				});
+			},
+		});
+	});
+}
+
+function normalizeChooseAndUploadFileRes(res, fileType) {
+	res.tempFiles.forEach((item, index) => {
+		if (!item.name) {
+			item.name = item.path.substring(item.path.lastIndexOf('/') + 1);
+		}
+		if (fileType) {
+			item.fileType = fileType;
+		}
+		item.cloudPath =
+			Date.now() + '_' + index + item.name.substring(item.name.lastIndexOf('.'));
+	});
+	if (!res.tempFilePaths) {
+		res.tempFilePaths = res.tempFiles.map((file) => file.path);
+	}
+	return res;
+}
+
+function uploadCloudFiles(files, max = 5, onUploadProgress) {
+	files = JSON.parse(JSON.stringify(files))
+	const len = files.length
+	let count = 0
+	let self = this
+	return new Promise(resolve => {
+		while (count < max) {
+			next()
+		}
+
+		function next() {
+			let cur = count++
+			if (cur >= len) {
+				!files.find(item => !item.url && !item.errMsg) && resolve(files)
+				return
+			}
+			const fileItem = files[cur]
+			const index = self.files.findIndex(v => v.uuid === fileItem.uuid)
+			fileItem.url = ''
+			delete fileItem.errMsg
+
+			uniCloud
+				.uploadFile({
+					filePath: fileItem.path,
+					cloudPath: fileItem.cloudPath,
+					fileType: fileItem.fileType,
+					onUploadProgress: res => {
+						res.index = index
+						onUploadProgress && onUploadProgress(res)
+					}
+				})
+				.then(res => {
+					fileItem.url = res.fileID
+					fileItem.index = index
+					if (cur < len) {
+						next()
+					}
+				})
+				.catch(res => {
+					fileItem.errMsg = res.errMsg || res.message
+					fileItem.index = index
+					if (cur < len) {
+						next()
+					}
+				})
+		}
+	})
+}
+
+
+
+
+
+function uploadFiles(choosePromise, {
+	onChooseFile,
+	onUploadProgress
+}) {
+	return choosePromise
+		.then((res) => {
+			if (onChooseFile) {
+				const customChooseRes = onChooseFile(res);
+				if (typeof customChooseRes !== 'undefined') {
+					return Promise.resolve(customChooseRes).then((chooseRes) => typeof chooseRes === 'undefined' ?
+						res : chooseRes);
+				}
+			}
+			return res;
+		})
+		.then((res) => {
+			if (res === false) {
+				return {
+					errMsg: ERR_MSG_OK,
+					tempFilePaths: [],
+					tempFiles: [],
+				};
+			}
+			return res
+		})
+}
+
+function chooseAndUploadFile(opts = {
+	type: 'all'
+}) {
+	if (opts.type === 'image') {
+		return uploadFiles(chooseImage(opts), opts);
+	} else if (opts.type === 'video') {
+		return uploadFiles(chooseVideo(opts), opts);
+	}
+	return uploadFiles(chooseAll(opts), opts);
+}
+
+export {
+	chooseAndUploadFile,
+	uploadCloudFiles
+};

uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue

@@ -0,0 +1,658 @@
+<template>
+	<view class="uni-file-picker">
+		<view v-if="title" class="uni-file-picker__header">
+			<text class="file-title">{{ title }}</text>
+			<text class="file-count">{{ filesList.length }}/{{ limitLength }}</text>
+		</view>
+		<upload-image v-if="fileMediatype === 'image' && showType === 'grid'" :readonly="readonly"
+			:image-styles="imageStyles" :files-list="filesList" :limit="limitLength" :disablePreview="disablePreview"
+			:delIcon="delIcon" @uploadFiles="uploadFiles" @choose="choose" @delFile="delFile">
+			<slot>
+				<view class="icon-add"></view>
+				<view class="icon-add rotate"></view>
+			</slot>
+		</upload-image>
+		<upload-file v-if="fileMediatype !== 'image' || showType !== 'grid'" :readonly="readonly"
+			:list-styles="listStyles" :files-list="filesList" :showType="showType" :delIcon="delIcon"
+			@uploadFiles="uploadFiles" @choose="choose" @delFile="delFile">
+			<slot><button type="primary" size="mini">选择文件</button></slot>
+		</upload-file>
+	</view>
+</template>
+
+<script>
+	import {
+		chooseAndUploadFile,
+		uploadCloudFiles
+	} from './choose-and-upload-file.js'
+	import {
+		get_file_ext,
+		get_extname,
+		get_files_and_is_max,
+		get_file_info,
+		get_file_data
+	} from './utils.js'
+	import uploadImage from './upload-image.vue'
+	import uploadFile from './upload-file.vue'
+	let fileInput = null
+	/**
+	 * FilePicker 文件选择上传
+	 * @description 文件选择上传组件，可以选择图片、视频等任意文件并上传到当前绑定的服务空间
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=4079
+	 * @property {Object|Array}	value	组件数据，通常用来回显 ,类型由return-type属性决定
+	 * @property {Boolean}	disabled = [true|false]	组件禁用
+	 * 	@value true 	禁用
+	 * 	@value false 	取消禁用
+	 * @property {Boolean}	readonly = [true|false]	组件只读，不可选择，不显示进度，不显示删除按钮
+	 * 	@value true 	只读
+	 * 	@value false 	取消只读
+	 * @property {String}	return-type = [array|object]	限制 value 格式，当为 object 时 ，组件只能单选，且会覆盖
+	 * 	@value array	规定 value 属性的类型为数组
+	 * 	@value object	规定 value 属性的类型为对象
+	 * @property {Boolean}	disable-preview = [true|false]	禁用图片预览，仅 mode:grid 时生效
+	 * 	@value true 	禁用图片预览
+	 * 	@value false 	取消禁用图片预览
+	 * @property {Boolean}	del-icon = [true|false]	是否显示删除按钮
+	 * 	@value true 	显示删除按钮
+	 * 	@value false 	不显示删除按钮
+	 * @property {Boolean}	auto-upload = [true|false]	是否自动上传，值为true则只触发@select,可自行上传
+	 * 	@value true 	自动上传
+	 * 	@value false 	取消自动上传
+	 * @property {Number|String}	limit	最大选择个数 ，h5 会自动忽略多选的部分
+	 * @property {String}	title	组件标题，右侧显示上传计数
+	 * @property {String}	mode = [list|grid]	选择文件后的文件列表样式
+	 * 	@value list 	列表显示
+	 * 	@value grid 	宫格显示
+	 * @property {String}	file-mediatype = [image|video|all]	选择文件类型
+	 * 	@value image	只选择图片
+	 * 	@value video	只选择视频
+	 * 	@value all		选择所有文件
+	 * @property {Array}	file-extname	选择文件后缀，根据 file-mediatype 属性而不同
+	 * @property {Object}	list-style	mode:list 时的样式
+	 * @property {Object}	image-styles	选择文件后缀，根据 file-mediatype 属性而不同
+	 * @event {Function} select 	选择文件后触发
+	 * @event {Function} progress 文件上传时触发
+	 * @event {Function} success 	上传成功触发
+	 * @event {Function} fail 		上传失败触发
+	 * @event {Function} delete 	文件从列表移除时触发
+	 */
+	export default {
+		name: 'uniFilePicker',
+		components: {
+			uploadImage,
+			uploadFile
+		},
+		options: {
+			virtualHost: true
+		},
+		emits: ['select', 'success', 'fail', 'progress', 'delete', 'update:modelValue', 'input'],
+		props: {
+			modelValue: {
+				type: [Array, Object],
+				default () {
+					return []
+				}
+			},
+			value: {
+				type: [Array, Object],
+				default () {
+					return []
+				}
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			disablePreview: {
+				type: Boolean,
+				default: false
+			},
+			delIcon: {
+				type: Boolean,
+				default: true
+			},
+			// 自动上传
+			autoUpload: {
+				type: Boolean,
+				default: true
+			},
+			// 最大选择个数 ，h5只能限制单选或是多选
+			limit: {
+				type: [Number, String],
+				default: 9
+			},
+			// 列表样式 grid | list | list-card
+			mode: {
+				type: String,
+				default: 'grid'
+			},
+			// 选择文件类型  image/video/all
+			fileMediatype: {
+				type: String,
+				default: 'image'
+			},
+			// 文件类型筛选
+			fileExtname: {
+				type: [Array, String],
+				default () {
+					return []
+				}
+			},
+			title: {
+				type: String,
+				default: ''
+			},
+			listStyles: {
+				type: Object,
+				default () {
+					return {
+						// 是否显示边框
+						border: true,
+						// 是否显示分隔线
+						dividline: true,
+						// 线条样式
+						borderStyle: {}
+					}
+				}
+			},
+			imageStyles: {
+				type: Object,
+				default () {
+					return {
+						width: 'auto',
+						height: 'auto'
+					}
+				}
+			},
+			readonly: {
+				type: Boolean,
+				default: false
+			},
+			returnType: {
+				type: String,
+				default: 'array'
+			},
+			sizeType: {
+				type: Array,
+				default () {
+					return ['original', 'compressed']
+				}
+			},
+			sourceType: {
+				type: Array,
+				default () {
+					return  ['album', 'camera']
+				}
+			},
+			provider: {
+				type: String,
+				default: '' // 默认上传到 unicloud 内置存储 extStorage 扩展存储
+			}
+		},
+		data() {
+			return {
+				files: [],
+				localValue: []
+			}
+		},
+		watch: {
+			value: {
+				handler(newVal, oldVal) {
+					this.setValue(newVal, oldVal)
+				},
+				immediate: true
+			},
+			modelValue: {
+				handler(newVal, oldVal) {
+					this.setValue(newVal, oldVal)
+				},
+				immediate: true
+			},
+		},
+		computed: {
+			filesList() {
+				let files = []
+				this.files.forEach(v => {
+					files.push(v)
+				})
+				return files
+			},
+			showType() {
+				if (this.fileMediatype === 'image') {
+					return this.mode
+				}
+				return 'list'
+			},
+			limitLength() {
+				if (this.returnType === 'object') {
+					return 1
+				}
+				if (!this.limit) {
+					return 1
+				}
+				if (this.limit >= 9) {
+					return 9
+				}
+				return this.limit
+			}
+		},
+		created() {
+			// TODO 兼容不开通服务空间的情况
+			if (!(uniCloud.config && uniCloud.config.provider)) {
+				this.noSpace = true
+				uniCloud.chooseAndUploadFile = chooseAndUploadFile
+			}
+			this.form = this.getForm('uniForms')
+			this.formItem = this.getForm('uniFormsItem')
+			if (this.form && this.formItem) {
+				if (this.formItem.name) {
+					this.rename = this.formItem.name
+					this.form.inputChildrens.push(this)
+				}
+			}
+		},
+		methods: {
+			/**
+			 * 公开用户使用，清空文件
+			 * @param {Object} index
+			 */
+			clearFiles(index) {
+				if (index !== 0 && !index) {
+					this.files = []
+					this.$nextTick(() => {
+						this.setEmit()
+					})
+				} else {
+					this.files.splice(index, 1)
+				}
+				this.$nextTick(() => {
+					this.setEmit()
+				})
+			},
+			/**
+			 * 公开用户使用，继续上传
+			 */
+			upload() {
+				let files = []
+				this.files.forEach((v, index) => {
+					if (v.status === 'ready' || v.status === 'error') {
+						files.push(Object.assign({}, v))
+					}
+				})
+				return this.uploadFiles(files)
+			},
+			async setValue(newVal, oldVal) {
+				const newData =  async (v) => {
+					const reg = /cloud:\/\/([\w.]+\/?)\S*/
+					let url = ''
+					if(v.fileID){
+						url = v.fileID
+					}else{
+						url = v.url
+					}
+					if (reg.test(url)) {
+						v.fileID = url
+						v.url = await this.getTempFileURL(url)
+					}
+					if(v.url) v.path = v.url
+					return v
+				}
+				if (this.returnType === 'object') {
+					if (newVal) {
+						await newData(newVal)
+					} else {
+						newVal = {}
+					}
+				} else {
+					if (!newVal) newVal = []
+					for(let i =0 ;i < newVal.length ;i++){
+						let v = newVal[i]
+						await newData(v)
+					}
+				}
+				this.localValue = newVal
+				if (this.form && this.formItem &&!this.is_reset) {
+					this.is_reset = false
+					this.formItem.setValue(this.localValue)
+				}
+				let filesData = Object.keys(newVal).length > 0 ? newVal : [];
+				this.files = [].concat(filesData)
+			},
+
+			/**
+			 * 选择文件
+			 */
+			choose() {
+				if (this.disabled) return
+				if (this.files.length >= Number(this.limitLength) && this.showType !== 'grid' && this.returnType ===
+					'array') {
+					uni.showToast({
+						title: `您最多选择 ${this.limitLength} 个文件`,
+						icon: 'none'
+					})
+					return
+				}
+				this.chooseFiles()
+			},
+
+			/**
+			 * 选择文件并上传
+			 */
+			chooseFiles() {
+				const _extname = get_extname(this.fileExtname)
+				// 获取后缀
+				uniCloud
+					.chooseAndUploadFile({
+						type: this.fileMediatype,
+						compressed: false,
+						sizeType: this.sizeType,
+						sourceType: this.sourceType,
+						// TODO 如果为空，video 有问题
+						extension: _extname.length > 0 ? _extname : undefined,
+						count: this.limitLength - this.files.length, //默认9
+						onChooseFile: this.chooseFileCallback,
+						onUploadProgress: progressEvent => {
+							this.setProgress(progressEvent, progressEvent.index)
+						}
+					})
+					.then(result => {
+						this.setSuccessAndError(result.tempFiles)
+					})
+					.catch(err => {
+						console.log('选择失败', err)
+					})
+			},
+
+			/**
+			 * 选择文件回调
+			 * @param {Object} res
+			 */
+			async chooseFileCallback(res) {
+				const _extname = get_extname(this.fileExtname)
+				const is_one = (Number(this.limitLength) === 1 &&
+						this.disablePreview &&
+						!this.disabled) ||
+					this.returnType === 'object'
+				// 如果这有一个文件 ，需要清空本地缓存数据
+				if (is_one) {
+					this.files = []
+				}
+
+				let {
+					filePaths,
+					files
+				} = get_files_and_is_max(res, _extname)
+				if (!(_extname && _extname.length > 0)) {
+					filePaths = res.tempFilePaths
+					files = res.tempFiles
+				}
+
+				let currentData = []
+				for (let i = 0; i < files.length; i++) {
+					if (this.limitLength - this.files.length <= 0) break
+					files[i].uuid = Date.now()
+					let filedata = await get_file_data(files[i], this.fileMediatype)
+					filedata.progress = 0
+					filedata.status = 'ready'
+					this.files.push(filedata)
+					currentData.push({
+						...filedata,
+						file: files[i]
+					})
+				}
+				this.$emit('select', {
+					tempFiles: currentData,
+					tempFilePaths: filePaths
+				})
+				res.tempFiles = files
+				// 停止自动上传
+				if (!this.autoUpload || this.noSpace) {
+					res.tempFiles = []
+				}
+				res.tempFiles.forEach((fileItem, index) => {
+					this.provider && (fileItem.provider = this.provider);
+					const fileNameSplit = fileItem.name.split('.')
+					const ext = fileNameSplit.pop()
+					const fileName = fileNameSplit.join('.').replace(/[\s\/\?<>\\:\*\|":]/g, '_')
+					fileItem.cloudPath = fileName + '_' + Date.now() + '_' + index + '.' + ext
+				})
+			},
+
+			/**
+			 * 批传
+			 * @param {Object} e
+			 */
+			uploadFiles(files) {
+				files = [].concat(files)
+				return uploadCloudFiles.call(this, files, 5, res => {
+						this.setProgress(res, res.index, true)
+					})
+					.then(result => {
+						this.setSuccessAndError(result)
+						return result;
+					})
+					.catch(err => {
+						console.log(err)
+					})
+			},
+
+			/**
+			 * 成功或失败
+			 */
+			async setSuccessAndError(res, fn) {
+				let successData = []
+				let errorData = []
+				let tempFilePath = []
+				let errorTempFilePath = []
+				for (let i = 0; i < res.length; i++) {
+					const item = res[i]
+					const index = item.uuid ? this.files.findIndex(p => p.uuid === item.uuid) : item.index
+
+					if (index === -1 || !this.files) break
+					if (item.errMsg === 'request:fail') {
+						this.files[index].url = item.path
+						this.files[index].status = 'error'
+						this.files[index].errMsg = item.errMsg
+						// this.files[index].progress = -1
+						errorData.push(this.files[index])
+						errorTempFilePath.push(this.files[index].url)
+					} else {
+						this.files[index].errMsg = ''
+						this.files[index].fileID = item.url
+						const reg = /cloud:\/\/([\w.]+\/?)\S*/
+						if (reg.test(item.url)) {
+							this.files[index].url = await this.getTempFileURL(item.url)
+						}else{
+							this.files[index].url = item.url
+						}
+
+						this.files[index].status = 'success'
+						this.files[index].progress += 1
+						successData.push(this.files[index])
+						tempFilePath.push(this.files[index].fileID)
+					}
+				}
+
+				if (successData.length > 0) {
+					this.setEmit()
+					// 状态改变返回
+					this.$emit('success', {
+						tempFiles: this.backObject(successData),
+						tempFilePaths: tempFilePath
+					})
+				}
+
+				if (errorData.length > 0) {
+					this.$emit('fail', {
+						tempFiles: this.backObject(errorData),
+						tempFilePaths: errorTempFilePath
+					})
+				}
+			},
+
+			/**
+			 * 获取进度
+			 * @param {Object} progressEvent
+			 * @param {Object} index
+			 * @param {Object} type
+			 */
+			setProgress(progressEvent, index, type) {
+				const fileLenth = this.files.length
+				const percentNum = (index / fileLenth) * 100
+				const percentCompleted = Math.round((progressEvent.loaded * 100) / progressEvent.total)
+				let idx = index
+				if (!type) {
+					idx = this.files.findIndex(p => p.uuid === progressEvent.tempFile.uuid)
+				}
+				if (idx === -1 || !this.files[idx]) return
+				// fix by mehaotian 100 就会消失，-1 是为了让进度条消失
+				this.files[idx].progress = percentCompleted - 1
+				// 上传中
+				this.$emit('progress', {
+					index: idx,
+					progress: parseInt(percentCompleted),
+					tempFile: this.files[idx]
+				})
+			},
+
+			/**
+			 * 删除文件
+			 * @param {Object} index
+			 */
+			delFile(index) {
+				this.$emit('delete', {
+					index,
+					tempFile: this.files[index],
+					tempFilePath: this.files[index].url
+				})
+				this.files.splice(index, 1)
+				this.$nextTick(() => {
+					this.setEmit()
+				})
+			},
+
+			/**
+			 * 获取文件名和后缀
+			 * @param {Object} name
+			 */
+			getFileExt(name) {
+				const last_len = name.lastIndexOf('.')
+				const len = name.length
+				return {
+					name: name.substring(0, last_len),
+					ext: name.substring(last_len + 1, len)
+				}
+			},
+
+			/**
+			 * 处理返回事件
+			 */
+			setEmit() {
+				let data = []
+				if (this.returnType === 'object') {
+					data = this.backObject(this.files)[0]
+					this.localValue = data?data:null
+				} else {
+					data = this.backObject(this.files)
+					if (!this.localValue) {
+						this.localValue = []
+					}
+					this.localValue = [...data]
+				}
+				// #ifdef VUE3
+				this.$emit('update:modelValue', this.localValue)
+				// #endif
+				// #ifndef VUE3
+				this.$emit('input', this.localValue)
+				// #endif
+			},
+
+			/**
+			 * 处理返回参数
+			 * @param {Object} files
+			 */
+			backObject(files) {
+				let newFilesData = []
+				files.forEach(v => {
+					newFilesData.push({
+						extname: v.extname,
+						fileType: v.fileType,
+						image: v.image,
+						name: v.name,
+						path: v.path,
+						size: v.size,
+						fileID:v.fileID,
+						url: v.url,
+						// 修改删除一个文件后不能再上传的bug, #694
+            uuid: v.uuid,
+            status: v.status,
+            cloudPath: v.cloudPath
+					})
+				})
+				return newFilesData
+			},
+			async getTempFileURL(fileList) {
+				fileList = {
+					fileList: [].concat(fileList)
+				}
+				const urls = await uniCloud.getTempFileURL(fileList)
+				return urls.fileList[0].tempFileURL || ''
+			},
+			/**
+			 * 获取父元素实例
+			 */
+			getForm(name = 'uniForms') {
+				let parent = this.$parent;
+				let parentName = parent.$options.name;
+				while (parentName !== name) {
+					parent = parent.$parent;
+					if (!parent) return false;
+					parentName = parent.$options.name;
+				}
+				return parent;
+			}
+		}
+	}
+</script>
+
+<style>
+	.uni-file-picker {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		overflow: hidden;
+		width: 100%;
+		/* #endif */
+		flex: 1;
+	}
+
+	.uni-file-picker__header {
+		padding-top: 5px;
+		padding-bottom: 10px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: space-between;
+	}
+
+	.file-title {
+		font-size: 14px;
+		color: #333;
+	}
+
+	.file-count {
+		font-size: 14px;
+		color: #999;
+	}
+
+	.icon-add {
+		width: 50px;
+		height: 5px;
+		background-color: #f1f1f1;
+		border-radius: 2px;
+	}
+
+	.rotate {
+		position: absolute;
+		transform: rotate(90deg);
+	}
+</style>

uni_modules/uni-file-picker/components/uni-file-picker/upload-file.vue

@@ -0,0 +1,325 @@
+<template>
+	<view class="uni-file-picker__files">
+		<view v-if="!readonly" class="files-button" @click="choose">
+			<slot></slot>
+		</view>
+		<!-- :class="{'is-text-box':showType === 'list'}" -->
+		<view v-if="list.length > 0" class="uni-file-picker__lists is-text-box" :style="borderStyle">
+			<!-- ,'is-list-card':showType === 'list-card' -->
+
+			<view class="uni-file-picker__lists-box" v-for="(item ,index) in list" :key="index" :class="{
+				'files-border':index !== 0 && styles.dividline}"
+			 :style="index !== 0 && styles.dividline &&borderLineStyle">
+				<view class="uni-file-picker__item">
+					<!-- :class="{'is-text-image':showType === 'list'}" -->
+					<!-- 	<view class="files__image is-text-image">
+						<image class="header-image" :src="item.logo" mode="aspectFit"></image>
+					</view> -->
+					<view class="files__name">{{item.name}}</view>
+					<view v-if="delIcon&&!readonly" class="icon-del-box icon-files" @click="delFile(index)">
+						<view class="icon-del icon-files"></view>
+						<view class="icon-del rotate"></view>
+					</view>
+				</view>
+				<view v-if="(item.progress && item.progress !== 100) ||item.progress===0 " class="file-picker__progress">
+					<progress class="file-picker__progress-item" :percent="item.progress === -1?0:item.progress" stroke-width="4"
+					 :backgroundColor="item.errMsg?'#ff5a5f':'#EBEBEB'" />
+				</view>
+				<view v-if="item.status === 'error'" class="file-picker__mask" @click.stop="uploadFiles(item,index)">
+					点击重试
+				</view>
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "uploadFile",
+		emits:['uploadFiles','choose','delFile'],
+		props: {
+			filesList: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			delIcon: {
+				type: Boolean,
+				default: true
+			},
+			limit: {
+				type: [Number, String],
+				default: 9
+			},
+			showType: {
+				type: String,
+				default: ''
+			},
+			listStyles: {
+				type: Object,
+				default () {
+					return {
+						// 是否显示边框
+						border: true,
+						// 是否显示分隔线
+						dividline: true,
+						// 线条样式
+						borderStyle: {}
+					}
+				}
+			},
+			readonly:{
+				type:Boolean,
+				default:false
+			}
+		},
+		computed: {
+			list() {
+				let files = []
+				this.filesList.forEach(v => {
+					files.push(v)
+				})
+				return files
+			},
+			styles() {
+				let styles = {
+					border: true,
+					dividline: true,
+					'border-style': {}
+				}
+				return Object.assign(styles, this.listStyles)
+			},
+			borderStyle() {
+				let {
+					borderStyle,
+					border
+				} = this.styles
+				let obj = {}
+				if (!border) {
+					obj.border = 'none'
+				} else {
+					let width = (borderStyle && borderStyle.width) || 1
+					width = this.value2px(width)
+					let radius = (borderStyle && borderStyle.radius) || 5
+					radius = this.value2px(radius)
+					obj = {
+						'border-width': width,
+						'border-style': (borderStyle && borderStyle.style) || 'solid',
+						'border-color': (borderStyle && borderStyle.color) || '#eee',
+						'border-radius': radius
+					}
+				}
+				let classles = ''
+				for (let i in obj) {
+					classles += `${i}:${obj[i]};`
+				}
+				return classles
+			},
+			borderLineStyle() {
+				let obj = {}
+				let {
+					borderStyle
+				} = this.styles
+				if (borderStyle && borderStyle.color) {
+					obj['border-color'] = borderStyle.color
+				}
+				if (borderStyle && borderStyle.width) {
+					let width = borderStyle && borderStyle.width || 1
+					let style = borderStyle && borderStyle.style || 0
+					if (typeof width === 'number') {
+						width += 'px'
+					} else {
+						width = width.indexOf('px') ? width : width + 'px'
+					}
+					obj['border-width'] = width
+
+					if (typeof style === 'number') {
+						style += 'px'
+					} else {
+						style = style.indexOf('px') ? style : style + 'px'
+					}
+					obj['border-top-style'] = style
+				}
+				let classles = ''
+				for (let i in obj) {
+					classles += `${i}:${obj[i]};`
+				}
+				return classles
+			}
+		},
+
+		methods: {
+			uploadFiles(item, index) {
+				this.$emit("uploadFiles", {
+					item,
+					index
+				})
+			},
+			choose() {
+				this.$emit("choose")
+			},
+			delFile(index) {
+				this.$emit('delFile', index)
+			},
+			value2px(value) {
+				if (typeof value === 'number') {
+					value += 'px'
+				} else {
+					value = value.indexOf('px') !== -1 ? value : value + 'px'
+				}
+				return value
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.uni-file-picker__files {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: flex-start;
+	}
+
+	.files-button {
+		// border: 1px red solid;
+	}
+
+	.uni-file-picker__lists {
+		position: relative;
+		margin-top: 5px;
+		overflow: hidden;
+	}
+
+	.file-picker__mask {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		color: #fff;
+		font-size: 14px;
+		background-color: rgba(0, 0, 0, 0.4);
+	}
+
+	.uni-file-picker__lists-box {
+		position: relative;
+	}
+
+	.uni-file-picker__item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+		padding: 8px 10px;
+		padding-right: 5px;
+		padding-left: 10px;
+	}
+
+	.files-border {
+		border-top: 1px #eee solid;
+	}
+
+	.files__name {
+		flex: 1;
+		font-size: 14px;
+		color: #666;
+		margin-right: 25px;
+		/* #ifndef APP-NVUE */
+		word-break: break-all;
+		word-wrap: break-word;
+		/* #endif */
+	}
+
+	.icon-files {
+		/* #ifndef APP-NVUE */
+		position: static;
+		background-color: initial;
+		/* #endif */
+	}
+
+	// .icon-files .icon-del {
+	// 	background-color: #333;
+	// 	width: 12px;
+	// 	height: 1px;
+	// }
+
+
+	.is-list-card {
+		border: 1px #eee solid;
+		margin-bottom: 5px;
+		border-radius: 5px;
+		box-shadow: 0 0 2px 0px rgba(0, 0, 0, 0.1);
+		padding: 5px;
+	}
+
+	.files__image {
+		width: 40px;
+		height: 40px;
+		margin-right: 10px;
+	}
+
+	.header-image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.is-text-box {
+		border: 1px #eee solid;
+		border-radius: 5px;
+	}
+
+	.is-text-image {
+		width: 25px;
+		height: 25px;
+		margin-left: 5px;
+	}
+
+	.rotate {
+		position: absolute;
+		transform: rotate(90deg);
+	}
+
+	.icon-del-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		margin: auto 0;
+		/* #endif */
+		align-items: center;
+		justify-content: center;
+		position: absolute;
+		top: 0px;
+		bottom: 0;
+		right: 5px;
+		height: 26px;
+		width: 26px;
+		// border-radius: 50%;
+		// background-color: rgba(0, 0, 0, 0.5);
+		z-index: 2;
+		transform: rotate(-45deg);
+	}
+
+	.icon-del {
+		width: 15px;
+		height: 1px;
+		background-color: #333;
+		// border-radius: 1px;
+	}
+
+	/* #ifdef H5 */
+	@media all and (min-width: 768px) {
+		.uni-file-picker__files {
+			max-width: 375px;
+		}
+	}
+
+	/* #endif */
+</style>

uni_modules/uni-file-picker/components/uni-file-picker/upload-image.vue

@@ -0,0 +1,282 @@
+<template>
+	<view class="uni-file-picker__container">
+		<view class="file-picker__box" v-for="(item,index) in filesList" :key="index" :style="boxStyle">
+			<view class="file-picker__box-content" :style="borderStyle">
+				<image class="file-image" :src="item.url" mode="aspectFill" @click.stop="prviewImage(item,index)"></image>
+				<view v-if="delIcon && !readonly" class="icon-del-box" @click.stop="delFile(index)">
+					<view class="icon-del"></view>
+					<view class="icon-del rotate"></view>
+				</view>
+				<view v-if="(item.progress && item.progress !== 100) ||item.progress===0 " class="file-picker__progress">
+					<progress class="file-picker__progress-item" :percent="item.progress === -1?0:item.progress" stroke-width="4"
+					 :backgroundColor="item.errMsg?'#ff5a5f':'#EBEBEB'" />
+				</view>
+				<view v-if="item.errMsg" class="file-picker__mask" @click.stop="uploadFiles(item,index)">
+					点击重试
+				</view>
+			</view>
+		</view>
+		<view v-if="filesList.length < limit && !readonly" class="file-picker__box" :style="boxStyle">
+			<view class="file-picker__box-content is-add" :style="borderStyle" @click="choose">
+				<slot></slot>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "uploadImage",
+		emits:['uploadFiles','choose','delFile'],
+		props: {
+			filesList: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			disabled:{
+				type: Boolean,
+				default: false
+			},
+			disablePreview: {
+				type: Boolean,
+				default: false
+			},
+			limit: {
+				type: [Number, String],
+				default: 9
+			},
+			imageStyles: {
+				type: Object,
+				default () {
+					return {
+						width: 'auto',
+						height: 'auto',
+						border: {}
+					}
+				}
+			},
+			delIcon: {
+				type: Boolean,
+				default: true
+			},
+			readonly:{
+				type:Boolean,
+				default:false
+			}
+		},
+		computed: {
+			styles() {
+				let styles = {
+					width: 'auto',
+					height: 'auto',
+					border: {}
+				}
+				return Object.assign(styles, this.imageStyles)
+			},
+			boxStyle() {
+				const {
+					width = 'auto',
+						height = 'auto'
+				} = this.styles
+				let obj = {}
+				if (height === 'auto') {
+					if (width !== 'auto') {
+						obj.height = this.value2px(width)
+						obj['padding-top'] = 0
+					} else {
+						obj.height = 0
+					}
+				} else {
+					obj.height = this.value2px(height)
+					obj['padding-top'] = 0
+				}
+
+				if (width === 'auto') {
+					if (height !== 'auto') {
+						obj.width = this.value2px(height)
+					} else {
+						obj.width = '33.3%'
+					}
+				} else {
+					obj.width = this.value2px(width)
+				}
+
+				let classles = ''
+				for(let i in obj){
+					classles+= `${i}:${obj[i]};`
+				}
+				return classles
+			},
+			borderStyle() {
+				let {
+					border
+				} = this.styles
+				let obj = {}
+				const widthDefaultValue = 1
+				const radiusDefaultValue = 3
+				if (typeof border === 'boolean') {
+					obj.border = border ? '1px #eee solid' : 'none'
+				} else {
+					let width = (border && border.width) || widthDefaultValue
+					width = this.value2px(width)
+					let radius = (border && border.radius) || radiusDefaultValue
+					radius = this.value2px(radius)
+					obj = {
+						'border-width': width,
+						'border-style': (border && border.style) || 'solid',
+						'border-color': (border && border.color) || '#eee',
+						'border-radius': radius
+					}
+				}
+				let classles = ''
+				for(let i in obj){
+					classles+= `${i}:${obj[i]};`
+				}
+				return classles
+			}
+		},
+		methods: {
+			uploadFiles(item, index) {
+				this.$emit("uploadFiles", item)
+			},
+			choose() {
+				this.$emit("choose")
+			},
+			delFile(index) {
+				this.$emit('delFile', index)
+			},
+			prviewImage(img, index) {
+				let urls = []
+				if(Number(this.limit) === 1&&this.disablePreview&&!this.disabled){
+					this.$emit("choose")
+				}
+				if(this.disablePreview) return
+				this.filesList.forEach(i => {
+					urls.push(i.url)
+				})
+
+				uni.previewImage({
+					urls: urls,
+					current: index
+				});
+			},
+			value2px(value) {
+				if (typeof value === 'number') {
+					value += 'px'
+				} else {
+					if (value.indexOf('%') === -1) {
+						value = value.indexOf('px') !== -1 ? value : value + 'px'
+					}
+				}
+				return value
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.uni-file-picker__container {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		box-sizing: border-box;
+		/* #endif */
+		flex-wrap: wrap;
+		margin: -5px;
+	}
+
+	.file-picker__box {
+		position: relative;
+		// flex: 0 0 33.3%;
+		width: 33.3%;
+		height: 0;
+		padding-top: 33.33%;
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+	}
+
+	.file-picker__box-content {
+		position: absolute;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		margin: 5px;
+		border: 1px #eee solid;
+		border-radius: 5px;
+		overflow: hidden;
+	}
+
+	.file-picker__progress {
+		position: absolute;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		/* border: 1px red solid; */
+		z-index: 2;
+	}
+
+	.file-picker__progress-item {
+		width: 100%;
+	}
+
+	.file-picker__mask {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		color: #fff;
+		font-size: 12px;
+		background-color: rgba(0, 0, 0, 0.4);
+	}
+
+	.file-image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.is-add {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+		justify-content: center;
+	}
+
+	.rotate {
+		position: absolute;
+		transform: rotate(90deg);
+	}
+
+	.icon-del-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+		justify-content: center;
+		position: absolute;
+		top: 3px;
+		right: 3px;
+		height: 26px;
+		width: 26px;
+		border-radius: 50%;
+		background-color: rgba(0, 0, 0, 0.5);
+		z-index: 2;
+		transform: rotate(-45deg);
+	}
+
+	.icon-del {
+		width: 15px;
+		height: 2px;
+		background-color: #fff;
+		border-radius: 2px;
+	}
+</style>

uni_modules/uni-file-picker/components/uni-file-picker/utils.js

@@ -0,0 +1,110 @@
+/**
+ * 获取文件名和后缀
+ * @param {String} name
+ */
+export const get_file_ext = (name) => {
+	const last_len = name.lastIndexOf('.')
+	const len = name.length
+	return {
+		name: name.substring(0, last_len),
+		ext: name.substring(last_len + 1, len)
+	}
+}
+
+/**
+ * 获取扩展名
+ * @param {Array} fileExtname
+ */
+export const get_extname = (fileExtname) => {
+	if (!Array.isArray(fileExtname)) {
+		let extname = fileExtname.replace(/(\[|\])/g, '')
+		return extname.split(',')
+	} else {
+		return fileExtname
+	}
+	return []
+}
+
+/**
+ * 获取文件和检测是否可选
+ */
+export const get_files_and_is_max = (res, _extname) => {
+	let filePaths = []
+	let files = []
+	if(!_extname || _extname.length === 0){
+		return {
+			filePaths,
+			files
+		}
+	}
+	res.tempFiles.forEach(v => {
+		let fileFullName = get_file_ext(v.name)
+		const extname = fileFullName.ext.toLowerCase()
+		if (_extname.indexOf(extname) !== -1) {
+			files.push(v)
+			filePaths.push(v.path)
+		}
+	})
+	if (files.length !== res.tempFiles.length) {
+		uni.showToast({
+			title: `当前选择了${res.tempFiles.length}个文件 ，${res.tempFiles.length - files.length} 个文件格式不正确`,
+			icon: 'none',
+			duration: 5000
+		})
+	}
+
+	return {
+		filePaths,
+		files
+	}
+}
+
+
+/**
+ * 获取图片信息
+ * @param {Object} filepath
+ */
+export const get_file_info = (filepath) => {
+	return new Promise((resolve, reject) => {
+		uni.getImageInfo({
+			src: filepath,
+			success(res) {
+				resolve(res)
+			},
+			fail(err) {
+				reject(err)
+			}
+		})
+	})
+}
+/**
+ * 获取封装数据
+ */
+export const get_file_data = async (files, type = 'image') => {
+	// 最终需要上传数据库的数据
+	let fileFullName = get_file_ext(files.name)
+	const extname = fileFullName.ext.toLowerCase()
+	let filedata = {
+		name: files.name,
+		uuid: files.uuid,
+		extname: extname || '',
+		cloudPath: files.cloudPath,
+		fileType: files.fileType,
+		thumbTempFilePath: files.thumbTempFilePath,
+		url: files.path || files.path,
+		size: files.size, //单位是字节
+		image: {},
+		path: files.path,
+		video: {}
+	}
+	if (type === 'image') {
+		const imageinfo = await get_file_info(files.path)
+		delete filedata.video
+		filedata.image.width = imageinfo.width
+		filedata.image.height = imageinfo.height
+		filedata.image.location = imageinfo.path
+	} else {
+		delete filedata.image
+	}
+	return filedata
+}

uni_modules/uni-file-picker/package.json

@@ -0,0 +1,86 @@
+{
+  "id": "uni-file-picker",
+  "displayName": "uni-file-picker 文件选择上传",
+  "version": "1.0.12",
+  "description": "文件选择上传组件，可以选择图片、视频等任意文件并上传到当前绑定的服务空间",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "图片上传",
+    "文件上传"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "App": {
+            "app-vue": "y",
+            "app-nvue": "n",
+            "app-harmony": "u",
+            "app-uvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}

uni_modules/uni-file-picker/readme.md

@@ -0,0 +1,11 @@
+
+## FilePicker 文件选择上传
+
+> **组件名：uni-file-picker**
+>  代码块： `uFilePicker`
+
+
+文件选择上传组件，可以选择图片、视频等任意文件并上传到当前绑定的服务空间
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-file-picker)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 

uni_modules/uni-nav-bar/changelog.md

@@ -0,0 +1,57 @@
+## 1.3.14（2024-10-15）
+- 修复 微信小程序中的getSystemInfo警告
+## 1.3.13（2024-10-12）
+- 修复 微信小程序中的getSystemInfo警告
+## 1.3.12（2024-10-12）
+- 修复 微信小程序中的getSystemInfo警告
+## 1.3.11（2023-03-29）
+- 修复 自定义状态栏高度闪动BUG
+## 1.3.10（2023-03-29）
+- 修复 暗黑模式下边线颜色错误的bug
+## 1.3.9（2022-10-13）
+- 修复 条件编译错误的bug
+## 1.3.8（2022-10-12）
+- 修复 nvue 环境 fixed 为 true 的情况下，无法置顶的 bug
+## 1.3.7（2022-08-11）
+- 修复 nvue 环境下 fixed 为 true 的情况下，无法置顶的 bug
+## 1.3.6（2022-06-30）
+- 修复 组件示例中插槽用法无法显示内容的bug
+## 1.3.5（2022-05-24）
+- 新增 stat 属性 ，可开启统计title 上报 ，仅使用了title 属性且项目开启了uni统计生效
+## 1.3.4（2022-01-24）
+- 更新 组件示例
+## 1.3.3（2022-01-24）
+- 新增 left-width/right-width属性 ，可修改左右两侧的宽度
+## 1.3.2（2022-01-18）
+- 修复 在vue下，标题不垂直居中的bug
+## 1.3.1（2022-01-18）
+- 修复 height 属性类型错误
+## 1.3.0（2022-01-18）
+- 新增 height 属性,可修改组件高度
+- 新增 dark 属性可可开启暗黑模式
+- 优化 标题字数过多显示省略号
+- 优化 插槽，插入内容可完全覆盖
+## 1.2.1（2022-01-10）
+- 修复 color 属性不生效的bug
+## 1.2.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-nav-bar](https://uniapp.dcloud.io/component/uniui/uni-nav-bar)
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.11（2021-05-12）
+- 新增 组件示例地址
+## 1.0.10（2021-04-30）
+- 修复 在nvue下fixed为true，宽度不能撑满的Bug
+## 1.0.9（2021-04-21）
+- 优化 添加依赖 uni-icons, 导入后自动下载依赖
+## 1.0.8（2021-04-14）
+- uni-ui 修复 uni-nav-bar 当 fixed 属性为 true 时铺不满屏幕的 bug
+
+## 1.0.7（2021-02-25）
+- 修复 easycom 下，找不到 uni-status-bar 的bug
+
+## 1.0.6（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+
+## 1.0.5（2021-02-05）
+- 调整为uni_modules目录规范

uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue

@@ -0,0 +1,357 @@
+<template>
+	<view class="uni-navbar" :class="{'uni-dark':dark, 'uni-nvue-fixed': fixed}">
+		<view class="uni-navbar__content" :class="{ 'uni-navbar--fixed': fixed, 'uni-navbar--shadow': shadow, 'uni-navbar--border': border }"
+			:style="{ 'background-color': themeBgColor, 'border-bottom-color':themeColor }" >
+			<status-bar v-if="statusBar" />
+			<view :style="{ color: themeColor,backgroundColor: themeBgColor ,height:navbarHeight}"
+				class="uni-navbar__header">
+				<view @tap="onClickLeft" class="uni-navbar__header-btns uni-navbar__header-btns-left"
+					:style="{width:leftIconWidth}">
+					<slot name="left">
+						<view class="uni-navbar__content_view" v-if="leftIcon.length > 0">
+							<uni-icons :color="themeColor" :type="leftIcon" size="20" />
+						</view>
+						<view :class="{ 'uni-navbar-btn-icon-left': !leftIcon.length > 0 }" class="uni-navbar-btn-text"
+							v-if="leftText.length">
+							<text :style="{ color: themeColor, fontSize: '12px' }">{{ leftText }}</text>
+						</view>
+					</slot>
+				</view>
+				<view class="uni-navbar__header-container " @tap="onClickTitle">
+					<slot>
+						<view class="uni-navbar__header-container-inner" v-if="title.length>0">
+							<text class="uni-nav-bar-text uni-ellipsis-1"
+								:style="{color: themeColor }">{{ title }}</text>
+						</view>
+					</slot>
+				</view>
+				<view @click="onClickRight" class="uni-navbar__header-btns uni-navbar__header-btns-right"
+					:style="{width:rightIconWidth}">
+					<slot name="right">
+						<view v-if="rightIcon.length">
+							<uni-icons :color="themeColor" :type="rightIcon" size="22" />
+						</view>
+						<view class="uni-navbar-btn-text" v-if="rightText.length && !rightIcon.length">
+							<text class="uni-nav-bar-right-text" :style="{ color: themeColor}">{{ rightText }}</text>
+						</view>
+					</slot>
+				</view>
+			</view>
+		</view>
+		<!-- #ifndef APP-NVUE -->
+		<view class="uni-navbar__placeholder" v-if="fixed">
+			<status-bar v-if="statusBar" />
+			<view class="uni-navbar__placeholder-view" :style="{ height:navbarHeight}" />
+		</view>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import statusBar from "./uni-status-bar.vue";
+	const getVal = (val) => typeof val === 'number' ? val + 'px' : val;
+
+	/**
+	 * 
+	 * 
+	 * NavBar 自定义导航栏
+	 * @description 导航栏组件，主要用于头部导航
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=52
+	 * @property {Boolean} dark 开启黑暗模式
+	 * @property {String} title 标题文字
+	 * @property {String} leftText 左侧按钮文本
+	 * @property {String} rightText 右侧按钮文本
+	 * @property {String} leftIcon 左侧按钮图标（图标类型参考 [Icon 图标](http://ext.dcloud.net.cn/plugin?id=28) type 属性）
+	 * @property {String} rightIcon 右侧按钮图标（图标类型参考 [Icon 图标](http://ext.dcloud.net.cn/plugin?id=28) type 属性）
+	 * @property {String} color 图标和文字颜色
+	 * @property {String} backgroundColor 导航栏背景颜色
+	 * @property {Boolean} fixed = [true|false] 是否固定顶部
+	 * @property {Boolean} statusBar = [true|false] 是否包含状态栏
+	 * @property {Boolean} shadow = [true|false] 导航栏下是否有阴影
+	 * @property {Boolean} stat 是否开启统计标题上报
+	 * @event {Function} clickLeft 左侧按钮点击时触发
+	 * @event {Function} clickRight 右侧按钮点击时触发
+	 * @event {Function} clickTitle 中间标题点击时触发
+	 */
+	export default {
+		name: "UniNavBar",
+		components: {
+			statusBar
+		},
+		emits: ['clickLeft', 'clickRight', 'clickTitle'],
+		props: {
+			dark: {
+				type: Boolean,
+				default: false
+			},
+			title: {
+				type: String,
+				default: ""
+			},
+			leftText: {
+				type: String,
+				default: ""
+			},
+			rightText: {
+				type: String,
+				default: ""
+			},
+			leftIcon: {
+				type: String,
+				default: ""
+			},
+			rightIcon: {
+				type: String,
+				default: ""
+			},
+			fixed: {
+				type: [Boolean, String],
+				default: false
+			},
+			color: {
+				type: String,
+				default: ""
+			},
+			backgroundColor: {
+				type: String,
+				default: ""
+			},
+			statusBar: {
+				type: [Boolean, String],
+				default: false
+			},
+			shadow: {
+				type: [Boolean, String],
+				default: false
+			},
+			border: {
+				type: [Boolean, String],
+				default: true
+			},
+			height: {
+				type: [Number, String],
+				default: 44
+			},
+			leftWidth: {
+				type: [Number, String],
+				default: 60
+			},
+			rightWidth: {
+				type: [Number, String],
+				default: 60
+			},
+			stat: {
+				type: [Boolean, String],
+				default: ''
+			}
+		},
+		computed: {
+			themeBgColor() {
+				if (this.dark) {
+					// 默认值
+					if (this.backgroundColor) {
+						return this.backgroundColor
+					} else {
+						return this.dark ? '#333' : '#FFF'
+					}
+				}
+				return this.backgroundColor || '#FFF'
+			},
+			themeColor() {
+				if (this.dark) {
+					// 默认值
+					if (this.color) {
+						return this.color
+					} else {
+						return this.dark ? '#fff' : '#333'
+					}
+				}
+				return this.color || '#333'
+			},
+			navbarHeight() {
+				return getVal(this.height)
+			},
+			leftIconWidth() {
+				return getVal(this.leftWidth)
+			},
+			rightIconWidth() {
+				return getVal(this.rightWidth)
+			}
+		},
+		mounted() {
+			if (uni.report && this.stat && this.title !== '') {
+				uni.report('title', this.title)
+			}
+		},
+		methods: {
+			onClickLeft() {
+				this.$emit("clickLeft");
+			},
+			onClickRight() {
+				this.$emit("clickRight");
+			},
+			onClickTitle() {
+				this.$emit("clickTitle");
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	$nav-height: 44px;
+
+	.uni-nvue-fixed {
+		/* #ifdef APP-NVUE */
+		position: sticky;
+		/* #endif */
+	}
+	.uni-navbar {
+		// box-sizing: border-box;
+	}
+
+	.uni-nav-bar-text {
+		/* #ifdef APP-PLUS */
+		font-size: 34rpx;
+		/* #endif */
+		/* #ifndef APP-PLUS */
+		font-size: 14px;
+		/* #endif */
+	}
+
+	.uni-nav-bar-right-text {
+		font-size: 12px;
+	}
+
+	.uni-navbar__content {
+		position: relative;
+		// background-color: #fff;
+		// box-sizing: border-box;
+		background-color: transparent;
+	}
+
+	.uni-navbar__content_view {
+		// box-sizing: border-box;
+	}
+
+	.uni-navbar-btn-text {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: flex-start;
+		align-items: center;
+		line-height: 12px;
+	}
+
+	.uni-navbar__header {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		padding: 0 10px;
+		flex-direction: row;
+		height: $nav-height;
+		font-size: 12px;
+	}
+
+	.uni-navbar__header-btns {
+		/* #ifndef APP-NVUE */
+		overflow: hidden;
+		display: flex;
+		/* #endif */
+		flex-wrap: nowrap;
+		flex-direction: row;
+		width: 120rpx;
+		// padding: 0 6px;
+		justify-content: center;
+		align-items: center;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-navbar__header-btns-left {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		width: 120rpx;
+		justify-content: flex-start;
+		align-items: center;
+	}
+
+	.uni-navbar__header-btns-right {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		// width: 150rpx;
+		// padding-right: 30rpx;
+		justify-content: flex-end;
+		align-items: center;
+	}
+
+	.uni-navbar__header-container {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		padding: 0 10px;
+		overflow: hidden;
+	}
+
+	.uni-navbar__header-container-inner {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		font-size: 12px;
+		overflow: hidden;
+		// box-sizing: border-box;
+	}
+
+
+	.uni-navbar__placeholder-view {
+		height: $nav-height;
+	}
+
+	.uni-navbar--fixed {
+		position: fixed;
+		z-index: 99;
+		/* #ifdef H5 */
+		left: var(--window-left);
+		right: var(--window-right);
+		/* #endif */
+		/* #ifndef H5 */
+		left: 0;
+		right: 0;
+		/* #endif */
+
+	}
+
+	.uni-navbar--shadow {
+		box-shadow: 0 1px 6px #ccc;
+	}
+
+	.uni-navbar--border {
+		border-bottom-width: 1rpx;
+		border-bottom-style: solid;
+		border-bottom-color: #eee;
+	}
+
+	.uni-ellipsis-1 {
+		overflow: hidden;
+		/* #ifndef APP-NVUE */
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		lines: 1;
+		text-overflow: ellipsis;
+		/* #endif */
+	}
+
+	// 暗主题配置
+	.uni-dark {}
+</style>

uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue

@@ -0,0 +1,30 @@
+<template>
+	<view :style="{ height: statusBarHeight }" class="uni-status-bar">
+		<slot />
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'UniStatusBar',
+		data() {
+			return {
+				// #ifdef MP-WEIXIN
+				statusBarHeight: uni.getWindowInfo().statusBarHeight + 'px',
+				// #endif
+				// #ifndef MP-WEIXIN
+				statusBarHeight: uni.getSystemInfoSync().statusBarHeight + 'px',
+				// #endif
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	.uni-status-bar {
+		// width: 750rpx;
+		height: 20px;
+		// height: var(--status-bar-height);
+	}
+</style>

uni_modules/uni-nav-bar/package.json

@@ -0,0 +1,87 @@
+{
+  "id": "uni-nav-bar",
+  "displayName": "uni-nav-bar 自定义导航栏",
+  "version": "1.3.14",
+  "description": "自定义导航栏组件，主要用于头部导航。",
+  "keywords": [
+    "uni-ui",
+    "导航",
+    "导航栏",
+    "自定义导航栏"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}

uni_modules/uni-nav-bar/readme.md

@@ -0,0 +1,15 @@
+
+
+## NavBar 导航栏
+> **组件名：uni-nav-bar**
+> 代码块： `uNavBar`
+
+导航栏组件，主要用于头部导航。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-nav-bar)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
+
+
+

unpackage/dist/build/app-plus/androidPrivacy.json

@@ -2,14 +2,14 @@
   "version": "1",
   "prompt": "template",
   "title": "服务协议和隐私政策",
-  "message": "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"\">《服务协议》</a>和<a href=\"\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+  "message": "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://esos-iot.bjdexn.cn/wx_images/service.png\">《服务协议》</a>和<a href=\"https://esos-iot.bjdexn.cn/wx_images/privacy.png\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
   "buttonAccept": "同意并接受",
   "buttonRefuse": "暂不同意",
   "hrefLoader": "system",
   "backToExit":"false",
   "second": {
     "title": "确认提示",
-    "message": "　　进入应用前，你需先同意<a href=\"\">《服务协议》</a>和<a href=\"\">《隐私政策》</a>，否则将退出应用。",
+    "message": "　　进入应用前，你需先同意<a href=\"https://esos-iot.bjdexn.cn/wx_images/service.png\">《服务协议》</a>和<a href=\"https://esos-iot.bjdexn.cn/wx_images/privacy.png\">《隐私政策》</a>，否则将退出应用。",
     "buttonAccept": "同意并继续",
     "buttonRefuse": "退出应用"
   },
@@ -20,19 +20,19 @@
     "showAlways": false
   },
   "styles": {
-    "backgroundColor": "#00FF00",
+    "backgroundColor": "#FFFFFF",
     "borderRadius":"5px",
     "title": {
-      "color": "#ff00ff"
+      "color": "#222222"
     },
     "buttonAccept": {
-      "color": "#ffff00"
+      "color": "#007545"
     },
     "buttonRefuse": {
-      "color": "#00ffff"
+      "color": "#222222"
     },
     "buttonVisitor": {
-      "color": "#00ffff"
+      "color": "#222222"
     }
   }
 }

unpackage/dist/build/app-plus/app-config-service.js

@@ -1,8 +1,8 @@
 
   ;(function(){
   let u=void 0,isReady=false,onReadyCallbacks=[],isServiceReady=false,onServiceReadyCallbacks=[];
-  const __uniConfig = {"pages":[],"globalStyle":{"backgroundColor":"#F8F8F8","navigationBar":{"backgroundColor":"#F8F8F8","titleText":"uni-app","type":"default","titleColor":"#000000"},"isNVue":false},"nvue":{"compiler":"uni-app","styleCompiler":"uni-app","flex-direction":"column"},"renderer":"auto","appname":"云链智安","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":true},"compilerVersion":"4.56","entryPagePath":"pages/device/index","entryPageQuery":"","realEntryPagePath":"","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000},"tabBar":{"position":"bottom","color":"#999999","selectedColor":"#007545","borderStyle":"black","blurEffect":"none","fontSize":"10px","iconWidth":"24px","spacing":"3px","height":"50px","list":[{"pagePath":"pages/device/index","text":"设备","iconPath":"/static/tabbar/device.png","selectedIconPath":"/static/tabbar/device-active.png"},{"pagePath":"pages/user/index","text":"我的","iconPath":"/static/tabbar/user.png","selectedIconPath":"/static/tabbar/user-active.png"}],"backgroundColor":"#ffffff","selectedIndex":0,"shown":true},"fallbackLocale":"en","locales":{},"darkmode":false,"themeConfig":{}};
-  const __uniRoutes = [{"path":"pages/device/index","meta":{"isQuit":true,"isEntry":true,"isTabBar":true,"tabBarIndex":0,"navigationBar":{"titleText":"设备","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/user/index","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":1,"navigationBar":{"backgroundColor":"#7FB8A2","titleText":"我的","type":"default"},"isNVue":false}},{"path":"pages/login/index","meta":{"navigationBar":{"titleText":"登录","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/devices/index","meta":{"backgroundColor":"#7FB8A2","navigationBar":{"backgroundColor":"#7FB8A2","titleText":"电站列表","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/powerstation/index","meta":{"backgroundColor":"#7FB8A2","navigationBar":{"backgroundColor":"#7FB8A2","titleText":"电站详情","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/hostdetails/index","meta":{"backgroundColor":"#7FB8A2","navigationBar":{"backgroundColor":"#7FB8A2","titleText":"主机详情","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/strategy/index","meta":{"backgroundColor":"#7FB8A2","navigationBar":{"backgroundColor":"#7FB8A2","titleText":"策略详情","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/devicedetails/index","meta":{"navigationBar":{"titleText":"设备详情","type":"default"},"isNVue":false}}].map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute));
+  const __uniConfig = {"pages":[],"globalStyle":{"backgroundColor":"#F8F8F8","navigationBar":{"backgroundColor":"#F8F8F8","titleText":"uni-app","type":"default","titleColor":"#000000"},"isNVue":false},"nvue":{"compiler":"uni-app","styleCompiler":"uni-app","flex-direction":"column"},"renderer":"auto","appname":"云链智安","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":true},"compilerVersion":"4.56","entryPagePath":"pages/index/index","entryPageQuery":"","realEntryPagePath":"","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000},"tabBar":{"position":"bottom","color":"#999999","selectedColor":"#007545","borderStyle":"black","blurEffect":"none","fontSize":"10px","iconWidth":"24px","spacing":"3px","height":"50px","list":[{"pagePath":"pages/index/index","text":"首页","iconPath":"/static/tabbar/home.png","selectedIconPath":"/static/tabbar/home-active.png"},{"pagePath":"pages/product/index","text":"产品","iconPath":"/static/tabbar/product.png","selectedIconPath":"/static/tabbar/product-active.png"},{"pagePath":"pages/device/index","text":"设备","iconPath":"/static/tabbar/device.png","selectedIconPath":"/static/tabbar/device-active.png"},{"pagePath":"pages/user/index","text":"我的","iconPath":"/static/tabbar/user.png","selectedIconPath":"/static/tabbar/user-active.png"}],"backgroundColor":"#ffffff","selectedIndex":0,"shown":true},"fallbackLocale":"en","locales":{},"darkmode":false,"themeConfig":{}};
+  const __uniRoutes = [{"path":"pages/index/index","meta":{"isQuit":true,"isEntry":true,"isTabBar":true,"tabBarIndex":0,"navigationBar":{"titleText":"首页","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/product/index","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":1,"navigationBar":{"titleText":"产品","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/device/index","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":2,"navigationBar":{"titleText":"设备","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/user/index","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":3,"navigationBar":{"backgroundColor":"#7FB8A2","titleText":"我的","type":"default"},"isNVue":false}},{"path":"pages/login/index","meta":{"navigationBar":{"titleText":"登录","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/devices/index","meta":{"backgroundColor":"#7FB8A2","navigationBar":{"backgroundColor":"#7FB8A2","titleText":"电站列表","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/powerstation/index","meta":{"backgroundColor":"#7FB8A2","navigationBar":{"backgroundColor":"#7FB8A2","titleText":"电站详情","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/hostdetails/index","meta":{"backgroundColor":"#7FB8A2","navigationBar":{"backgroundColor":"#7FB8A2","titleText":"主机详情","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/strategy/index","meta":{"backgroundColor":"#7FB8A2","navigationBar":{"backgroundColor":"#7FB8A2","titleText":"策略详情","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/devicedetails/index","meta":{"navigationBar":{"titleText":"设备详情","type":"default"},"isNVue":false}},{"path":"pages/deviceslist/index","meta":{"navigationBar":{"titleText":"设备列表","type":"default"},"isNVue":false}},{"path":"pages/personalInformation/index","meta":{"navigationBar":{"titleText":"个人信息","type":"default"},"isNVue":false}},{"path":"pages/electricityprice/index","meta":{"navigationBar":{"titleText":"查询电价","type":"default"},"isNVue":false}},{"path":"pages/economiccalculation/index","meta":{"navigationBar":{"titleText":"经济测算","type":"default"},"isNVue":false}}].map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute));
   __uniConfig.styles=[];//styles
   __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
   __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});

unpackage/dist/build/app-plus/manifest.json

@@ -147,6 +147,18 @@
       "height": "50px",
       "list": [
         {
+          "pagePath": "pages/index/index",
+          "text": "首页",
+          "iconPath": "/static/tabbar/home.png",
+          "selectedIconPath": "/static/tabbar/home-active.png"
+        },
+        {
+          "pagePath": "pages/product/index",
+          "text": "产品",
+          "iconPath": "/static/tabbar/product.png",
+          "selectedIconPath": "/static/tabbar/product-active.png"
+        },
+        {
           "pagePath": "pages/device/index",
           "text": "设备",
           "iconPath": "/static/tabbar/device.png",

unpackage/dist/build/app-plus/pages/devices/index.css

@@ -1 +1 @@
-.uni-top-tabbar .uni-swiper-tab[data-v-ada95435]{height:3.125rem}.uni-top-tabbar .uni-swiper-tab .swiper-tab-list[data-v-ada95435]{font-size:.875rem;font-weight:400;line-height:2.5625rem;width:48%;display:flex;flex-direction:column;align-items:center}.uni-top-tabbar .uni-swiper-tab .active .swiper-tab-line[data-v-ada95435]{height:.1875rem;width:100%}.uni-page[data-v-c6000887]{width:100%;height:100%}.container[data-v-c6000887]{height:100%;background:linear-gradient(to bottom,#007545 -40%,#f0f5f5 40%,#f0f5f5);box-sizing:border-box;display:flex;flex-direction:column}.account_number[data-v-c6000887]{width:100%;display:flex;justify-content:center}.account[data-v-c6000887]{font-size:1rem}.login_imgae1[data-v-c6000887]{margin-right:.625rem;width:1.25rem;height:1.25rem}.weui-input[data-v-c6000887]{flex:1;height:2.5rem}.password[data-v-c6000887]{width:90%;display:flex;align-items:center;font-size:.875rem;padding:0 .625rem;border:.03125rem #cccccc solid;box-sizing:border-box;border-radius:3.125rem;background-color:#f0f5f5}.toptabbar[data-v-c6000887]{width:100%;height:2.5rem;margin-top:20px;padding:.3125rem .625rem;box-sizing:border-box}.data_list[data-v-c6000887]{width:100%;flex:1;overflow-y:auto;display:flex;flex-direction:column;padding:10px;box-sizing:border-box}.empty-tip[data-v-c6000887]{text-align:center;color:#999;font-size:14px;padding:20px}.card[data-v-c6000887]{width:90%}.card_image[data-v-c6000887]{width:5rem;height:5rem;border-radius:.3125rem}.card_box[data-v-c6000887]{width:100%;height:6.25rem;box-sizing:border-box;border-radius:.3125rem;background-color:#fff;display:flex;align-items:center;padding:.9375rem;margin-top:.625rem}.card_title[data-v-c6000887]{flex:1;margin-left:.625rem;display:flex;flex-direction:column}.card_title1[data-v-c6000887]{font-size:1.125rem}.card_title2[data-v-c6000887]{font-size:.875rem;color:#ccc;margin-top:.3125rem}.card_title3[data-v-c6000887]{font-size:.875rem;color:#ccc;margin-top:.25rem}.uni-top-tabbar[data-v-c6000887]{height:3.125rem}
+.uni-top-tabbar .uni-swiper-tab[data-v-ada95435]{height:3.125rem}.uni-top-tabbar .uni-swiper-tab .swiper-tab-list[data-v-ada95435]{font-size:.875rem;font-weight:400;line-height:2.5625rem;width:48%;display:flex;flex-direction:column;align-items:center}.uni-top-tabbar .uni-swiper-tab .active .swiper-tab-line[data-v-ada95435]{height:.1875rem;width:100%}.uni-page[data-v-4f9efdb4]{width:100%;height:100%}.container[data-v-4f9efdb4]{height:100%;background:linear-gradient(to bottom,#007545 -40%,#f0f5f5 40%,#f0f5f5);box-sizing:border-box;display:flex;flex-direction:column}.account_number[data-v-4f9efdb4]{width:100%;display:flex;justify-content:center}.account[data-v-4f9efdb4]{font-size:1rem}.login_imgae1[data-v-4f9efdb4]{margin-right:.625rem;width:1.25rem;height:1.25rem}.weui-input[data-v-4f9efdb4]{flex:1;height:2.5rem}.password[data-v-4f9efdb4]{width:90%;display:flex;align-items:center;font-size:.875rem;padding:0 .625rem;border:.03125rem #cccccc solid;box-sizing:border-box;border-radius:3.125rem;background-color:#f0f5f5}.toptabbar[data-v-4f9efdb4]{width:100%;height:2.5rem;margin-top:20px;padding:.3125rem .625rem;box-sizing:border-box}.data_list[data-v-4f9efdb4]{width:100%;flex:1;overflow-y:auto;display:flex;flex-direction:column;padding:10px;box-sizing:border-box}.empty-tip[data-v-4f9efdb4]{text-align:center;color:#999;font-size:14px;padding:20px}.card[data-v-4f9efdb4]{width:90%}.card_image[data-v-4f9efdb4]{width:5rem;height:5rem;border-radius:.3125rem}.card_box[data-v-4f9efdb4]{width:100%;height:6.25rem;box-sizing:border-box;border-radius:.3125rem;background-color:#fff;display:flex;align-items:center;padding:.9375rem;margin-top:.625rem}.card_title[data-v-4f9efdb4]{flex:1;margin-left:.625rem;display:flex;flex-direction:column}.card_title1[data-v-4f9efdb4]{font-size:1.125rem}.card_title2[data-v-4f9efdb4]{font-size:.875rem;color:#ccc;margin-top:.3125rem}.card_title3[data-v-4f9efdb4]{font-size:.875rem;color:#ccc;margin-top:.25rem}.uni-top-tabbar[data-v-4f9efdb4]{height:3.125rem}

unpackage/dist/build/app-plus/pages/deviceslist/index.css

@@ -0,0 +1 @@
+#app[data-v-12e32bee]{width:100%;height:100%}uni-page[data-v-12e32bee]{width:100%;height:100%}uni-page-wrapper[data-v-12e32bee]{width:100%;height:100%}uni-page-body[data-v-12e32bee]{width:100%;height:100%}.container[data-v-12e32bee]{height:100%;background:linear-gradient(to bottom,#007545 -40%,#f0f5f5 40%,#f0f5f5);box-sizing:border-box;display:flex;flex-direction:column}.custom-tabs[data-v-12e32bee]{width:100%;height:100vh;padding:0 .625rem .625rem;overflow:auto;box-sizing:border-box}.custom_box[data-v-12e32bee]{width:100%;padding:.03125rem .625rem .625rem;border-radius:.625rem;background-color:#fff;box-sizing:border-box}.custom_title[data-v-12e32bee]{width:100%;display:flex;justify-content:space-between;padding:.625rem 0;border-bottom:.03125rem solid #E1E0F4;box-sizing:border-box}.custom_title_gl[data-v-12e32bee]{font-size:.8125rem;color:#222}.custom_div[data-v-12e32bee]{width:100%;display:flex;justify-content:space-between;margin-top:.625rem}.custom_div1[data-v-12e32bee]{font-size:.8125rem;color:#222}.battery[data-v-12e32bee]{font-size:.75rem;color:#222}.batteryccc[data-v-12e32bee]{font-size:.8125rem;color:#999}.tag_type1[data-v-12e32bee]{font-size:.875rem;color:#f0a26c;font-weight:500}.tag_type2[data-v-12e32bee]{font-size:.875rem;color:#15db9b;font-weight:500}.tag_type3[data-v-12e32bee]{font-size:.875rem;color:#b0c4de;font-weight:500}.tag_type2red[data-v-12e32bee]{font-size:.875rem;color:red;font-weight:500}.custom_box[data-v-12e32bee]{margin-top:.625rem}.tag_typetext[data-v-12e32bee]{width:100%;display:flex;font-size:.8125rem;justify-content:center;color:#b0c4de;margin-top:.625rem}

unpackage/dist/build/app-plus/pages/index/index.css

@@ -0,0 +1 @@
+.uni-page[data-v-9d236e6a]{width:100%;height:100%}.container[data-v-9d236e6a]{background:linear-gradient(to bottom,#007545 -40%,#f0f5f5 40%,#f0f5f5);box-sizing:border-box;padding-bottom:.625rem}.containertop[data-v-9d236e6a]{width:100%;height:4.375rem;display:flex;background-color:rgba(240,245,245,.8);padding-left:.625rem;padding-top:2.5rem;box-sizing:border-box;position:fixed;top:0;left:0;z-index:9}.containertop1[data-v-9d236e6a]{margin-right:1.875rem;color:#007545}.containertop2[data-v-9d236e6a]{margin-right:1.875rem;color:#222}.account_number[data-v-9d236e6a]{width:100%;height:208px;box-sizing:border-box;background-repeat:no-repeat;background-size:100%}.swiper[data-v-9d236e6a]{width:100%;height:100%}.swiper-item[data-v-9d236e6a]{display:block;width:100%;height:100%;text-align:center}.account_image[data-v-9d236e6a]{width:100%}.toptabbar[data-v-9d236e6a]{width:100%;padding:0 .625rem;margin-top:.9375rem;box-sizing:border-box}.toptabbar_box[data-v-9d236e6a]{width:100%;background-color:#fff;border-radius:.3125rem;padding:.625rem .9375rem;box-sizing:border-box}.uni-margin-wrap[data-v-9d236e6a]{width:100%;margin-top:.625rem;border-radius:.3125rem;overflow:auto}.uni-bg-red[data-v-9d236e6a]{display:flex;flex-direction:column;padding:.25rem;box-sizing:border-box}.swiper-items[data-v-9d236e6a]{width:100%;height:7.5rem;border-radius:.3125rem;overflow:auto}.swiper_title[data-v-9d236e6a]{width:100%;height:.625rem;display:flex;align-items:center;justify-content:center;font-size:.875rem}.scroll-Y[data-v-9d236e6a]{height:9.375rem}.uni-title[data-v-9d236e6a]{margin-bottom:.3125rem}.scroll-view_H[data-v-9d236e6a]{white-space:nowrap;width:100%}.scroll-view-item[data-v-9d236e6a]{height:9.375rem;line-height:9.375rem;text-align:center;font-size:1.125rem}.scroll-view-item_H[data-v-9d236e6a]{width:100%;height:14.25rem;text-align:center;font-size:1.125rem}.uni-bg-green[data-v-9d236e6a]{margin-top:1.25rem;border-radius:.3125rem}.scroll-view-item_title[data-v-9d236e6a]{height:1.25rem;font-size:.875rem;font-weight:600;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;width:100%;display:block;text-align:left}.scroll-view-item_subtitle[data-v-9d236e6a]{height:1.25rem;font-size:.75rem;color:#999;margin:.25rem 0;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;width:100%;display:block;text-align:left}.scroll-view-item_Himage[data-v-9d236e6a]{width:100%;height:11.25rem;border-radius:.3125rem}.toptabbarfinance[data-v-9d236e6a]{display:flex;justify-content:space-around;justify-content:space-between;padding:0 .625rem;margin-top:.625rem;box-sizing:border-box}.topfinance[data-v-9d236e6a]{width:32%;height:6.25rem;padding:.3125rem 0;border-radius:.25rem;display:flex;flex-direction:column;justify-content:center;align-items:center;background-color:#f0f5f5;box-sizing:border-box}.topfinanceimage[data-v-9d236e6a]{width:2.5rem;height:2.5rem}.topfinance_title[data-v-9d236e6a]{font-size:1rem;font-weight:550;margin-top:.25rem}.topfinance_subtitle[data-v-9d236e6a]{font-size:.6875rem;color:#959595}

unpackage/dist/build/app-plus/pages/personalInformation/index.css

@@ -0,0 +1 @@
+.uni-page[data-v-3d66a583]{width:100%;height:100%}.container[data-v-3d66a583]{height:92vh;background:linear-gradient(to bottom,#007545 -40%,#f0f5f5 40%,#f0f5f5);box-sizing:border-box}.account_number[data-v-3d66a583]{width:100%;padding:.625rem;display:flex;justify-content:center;box-sizing:border-box}.toptabbar[data-v-3d66a583]{width:100%;padding:.3125rem .625rem;box-sizing:border-box}

unpackage/dist/build/app-plus/pages/product/index.css

@@ -0,0 +1 @@
+.uni-page[data-v-64dc8d5c]{width:100%;height:100%}.container[data-v-64dc8d5c]{box-sizing:border-box;padding-bottom:.625rem;padding-top:2.75rem;background:linear-gradient(to bottom,#f0f5f5 -40%,#f0f5f5 40%,#f0f5f5)}.container_top[data-v-64dc8d5c]{width:100%;height:2.75rem;color:#222;position:fixed;left:0;top:0}.account_number[data-v-64dc8d5c]{width:100%;box-sizing:border-box}.account_numberimage[data-v-64dc8d5c]{width:100%;padding:0;margin:0}.account_image[data-v-64dc8d5c]{width:100%}.toptabbar[data-v-64dc8d5c]{width:100%;padding:0 .5rem;margin-top:.5rem;box-sizing:border-box}.toptabbar_box[data-v-64dc8d5c]{width:100%;background-color:#fff;border-radius:.3125rem;padding:.625rem .9375rem;box-sizing:border-box}.uni-margin-wrap[data-v-64dc8d5c]{width:100%;margin-top:.625rem;border-radius:.3125rem;overflow:auto}.swiper[data-v-64dc8d5c]{height:9.375rem}.swiper-itembody[data-v-64dc8d5c]{width:100%;height:100%;padding:0 .625rem;display:flex;justify-content:space-between;background-color:#eff0f2;border-radius:.3125rem;box-sizing:border-box}.swiper-title[data-v-64dc8d5c]{flex:1;display:flex;flex-direction:column;justify-content:center;padding-left:.625rem}.swiper-title1[data-v-64dc8d5c]{font-size:.9375rem}.swiper-title2[data-v-64dc8d5c]{font-size:.75rem;margin-top:.3125rem;color:#999}.swiper-item[data-v-64dc8d5c]{width:6.9375rem;height:100%;text-align:center}.uni-bg-red[data-v-64dc8d5c]{display:flex;flex-direction:column;padding:.25rem;box-sizing:border-box}.swiper-items[data-v-64dc8d5c]{width:100%;height:7.5rem;border-radius:.3125rem;overflow:auto;background-color:#eff0f2}.swiper_title[data-v-64dc8d5c]{width:100%;height:.625rem;display:flex;align-items:center;justify-content:center;font-size:.875rem;margin-top:.625rem}.scroll-Y[data-v-64dc8d5c]{height:9.375rem}.uni-title[data-v-64dc8d5c]{margin-top:.625rem;margin-bottom:.3125rem}.uni-common-mttitle[data-v-64dc8d5c]{margin-top:.75rem}.scroll-view_H[data-v-64dc8d5c]{white-space:nowrap;width:100%}.scroll-view-item[data-v-64dc8d5c]{height:9.375rem;line-height:9.375rem;text-align:center;font-size:1.125rem}.scroll-view-item_H[data-v-64dc8d5c]{width:100%;line-height:9.375rem;text-align:center;font-size:1.125rem}.Sourcenetwork[data-v-64dc8d5c]{width:100%;position:relative}.uni-bg-green[data-v-64dc8d5c]{width:100%;background-color:#eff0f2;margin-top:.625rem;border-radius:.3125rem}.Sourcenetwork_title[data-v-64dc8d5c]{width:100%;padding:.3125rem;box-sizing:border-box;position:absolute;bottom:0;left:0;border-bottom-right-radius:.3125rem;border-bottom-left-radius:.3125rem;background-color:rgba(0,117,69,.3);font-size:.875rem;color:#fff}.image-placeholder[data-v-64dc8d5c]{width:100%;height:100%;background-color:#eff0f2;display:flex;justify-content:center;align-items:center}.text[data-v-64dc8d5c]{font-size:12px;color:#666;margin-top:5px}.uni-px-5[data-v-64dc8d5c]{padding-left:10px;padding-right:10px}.uni-pb-5[data-v-64dc8d5c]{padding-bottom:10px}.prompt[data-v-64dc8d5c]{position:fixed;top:3.0625rem;right:.625rem;text-align:right}.promptimage[data-v-64dc8d5c]{width:1.875rem;height:1.875rem}.promptbox[data-v-64dc8d5c]{background-color:#fff;border-radius:.25rem;text-align:left}.promptbox1[data-v-64dc8d5c]{padding:.3125rem .625rem}

unpackage/dist/dev/app-plus/androidPrivacy.json

@@ -1,38 +1,38 @@
 {
-  "version": "1",
-  "prompt": "template",
-  "title": "服务协议和隐私政策",
-  "message": "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://esos-iot.bjdexn.cn/wx_images/service.png\">《服务协议》</a>和<a href=\"https://esos-iot.bjdexn.cn/wx_images/privacy.png\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
-  "buttonAccept": "同意并接受",
-  "buttonRefuse": "暂不同意",
-  "hrefLoader": "system",
-  "backToExit":"false",
-  "second": {
-    "title": "确认提示",
-    "message": "　　进入应用前，你需先同意<a href=\"https://esos-iot.bjdexn.cn/wx_images/service.png\">《服务协议》</a>和<a href=\"https://esos-iot.bjdexn.cn/wx_images/privacy.png\">《隐私政策》</a>，否则将退出应用。",
-    "buttonAccept": "同意并继续",
-    "buttonRefuse": "退出应用"
-  },
-  "disagreeMode":{
-    "support": false,
-    "loadNativePlugins": false,
-    "visitorEntry": false,
-    "showAlways": false
-  },
-  "styles": {
-    "backgroundColor": "#FFFFFF",
-    "borderRadius":"5px",
-    "title": {
-      "color": "#222222"
+    "version" : "1",
+    "prompt" : "template",
+    "title" : "服务协议和隐私政策",
+    "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://esos-iot.bjdexn.cn/wx_images/service.png\">《服务协议》</a>和<a href=\"https://esos-iot.bjdexn.cn/wx_images/privacy.png\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+    "buttonAccept" : "同意并接受",
+    "buttonRefuse" : "暂不同意",
+    "hrefLoader" : "system",
+    "backToExit" : "false",
+    "second" : {
+        "title" : "确认提示",
+        "message" : "　　进入应用前，你需先同意<a href=\"https://esos-iot.bjdexn.cn/wx_images/service.png\">《服务协议》</a>和<a href=\"https://esos-iot.bjdexn.cn/wx_images/privacy.png\">《隐私政策》</a>，否则将退出应用。",
+        "buttonAccept" : "同意并继续",
+        "buttonRefuse" : "退出应用"
     },
-    "buttonAccept": {
-      "color": "#007545"
+    "disagreeMode" : {
+        "support" : false,
+        "loadNativePlugins" : false,
+        "visitorEntry" : false,
+        "showAlways" : false
     },
-    "buttonRefuse": {
-      "color": "#222222"
-    },
-    "buttonVisitor": {
-      "color": "#222222"
+    "styles" : {
+        "backgroundColor" : "#FFFFFF",
+        "borderRadius" : "5px",
+        "title" : {
+            "color" : "#222222"
+        },
+        "buttonAccept" : {
+            "color" : "#007545"
+        },
+        "buttonRefuse" : {
+            "color" : "#222222"
+        },
+        "buttonVisitor" : {
+            "color" : "#222222"
+        }
     }
-  }
 }

unpackage/dist/dev/app-plus/app-config-service.js

@@ -2,7 +2,7 @@
   ;(function(){
   let u=void 0,isReady=false,onReadyCallbacks=[],isServiceReady=false,onServiceReadyCallbacks=[];
   const __uniConfig = {"pages":[],"globalStyle":{"backgroundColor":"#F8F8F8","navigationBar":{"backgroundColor":"#F8F8F8","titleText":"uni-app","type":"default","titleColor":"#000000"},"isNVue":false},"nvue":{"compiler":"uni-app","styleCompiler":"uni-app","flex-direction":"column"},"renderer":"auto","appname":"云链智安","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":true},"compilerVersion":"4.56","entryPagePath":"pages/index/index","entryPageQuery":"","realEntryPagePath":"","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000},"tabBar":{"position":"bottom","color":"#999999","selectedColor":"#007545","borderStyle":"black","blurEffect":"none","fontSize":"10px","iconWidth":"24px","spacing":"3px","height":"50px","list":[{"pagePath":"pages/index/index","text":"首页","iconPath":"/static/tabbar/home.png","selectedIconPath":"/static/tabbar/home-active.png"},{"pagePath":"pages/product/index","text":"产品","iconPath":"/static/tabbar/product.png","selectedIconPath":"/static/tabbar/product-active.png"},{"pagePath":"pages/device/index","text":"设备","iconPath":"/static/tabbar/device.png","selectedIconPath":"/static/tabbar/device-active.png"},{"pagePath":"pages/user/index","text":"我的","iconPath":"/static/tabbar/user.png","selectedIconPath":"/static/tabbar/user-active.png"}],"backgroundColor":"#ffffff","selectedIndex":0,"shown":true},"fallbackLocale":"en","locales":{},"darkmode":false,"themeConfig":{}};
-  const __uniRoutes = [{"path":"pages/index/index","meta":{"isQuit":true,"isEntry":true,"isTabBar":true,"tabBarIndex":0,"navigationBar":{"titleText":"首页","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/product/index","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":1,"navigationBar":{"titleText":"产品","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/device/index","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":2,"navigationBar":{"titleText":"设备","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/user/index","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":3,"navigationBar":{"backgroundColor":"#7FB8A2","titleText":"我的","type":"default"},"isNVue":false}},{"path":"pages/login/index","meta":{"navigationBar":{"titleText":"登录","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/devices/index","meta":{"backgroundColor":"#7FB8A2","navigationBar":{"backgroundColor":"#7FB8A2","titleText":"电站列表","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/powerstation/index","meta":{"backgroundColor":"#7FB8A2","navigationBar":{"backgroundColor":"#7FB8A2","titleText":"电站详情","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/hostdetails/index","meta":{"backgroundColor":"#7FB8A2","navigationBar":{"backgroundColor":"#7FB8A2","titleText":"主机详情","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/strategy/index","meta":{"backgroundColor":"#7FB8A2","navigationBar":{"backgroundColor":"#7FB8A2","titleText":"策略详情","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/devicedetails/index","meta":{"navigationBar":{"titleText":"设备详情","type":"default"},"isNVue":false}},{"path":"pages/deviceslist/index","meta":{"navigationBar":{"titleText":"设备列表","type":"default"},"isNVue":false}},{"path":"pages/PersonalInformation/index","meta":{"navigationBar":{"titleText":"个人信息","type":"default"},"isNVue":false}}].map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute));
+  const __uniRoutes = [{"path":"pages/index/index","meta":{"isQuit":true,"isEntry":true,"isTabBar":true,"tabBarIndex":0,"navigationBar":{"titleText":"首页","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/product/index","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":1,"navigationBar":{"titleText":"产品","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/device/index","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":2,"navigationBar":{"titleText":"设备","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/user/index","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":3,"navigationBar":{"backgroundColor":"#7FB8A2","titleText":"我的","type":"default"},"isNVue":false}},{"path":"pages/login/index","meta":{"navigationBar":{"titleText":"登录","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/devices/index","meta":{"backgroundColor":"#7FB8A2","navigationBar":{"backgroundColor":"#7FB8A2","titleText":"电站列表","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/powerstation/index","meta":{"backgroundColor":"#7FB8A2","navigationBar":{"backgroundColor":"#7FB8A2","titleText":"电站详情","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/hostdetails/index","meta":{"backgroundColor":"#7FB8A2","navigationBar":{"backgroundColor":"#7FB8A2","titleText":"主机详情","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/strategy/index","meta":{"backgroundColor":"#7FB8A2","navigationBar":{"backgroundColor":"#7FB8A2","titleText":"策略详情","type":"default","titleColor":"#ffffff"},"isNVue":false}},{"path":"pages/devicedetails/index","meta":{"navigationBar":{"titleText":"设备详情","type":"default"},"isNVue":false}},{"path":"pages/deviceslist/index","meta":{"navigationBar":{"titleText":"设备列表","type":"default"},"isNVue":false}},{"path":"pages/personalInformation/index","meta":{"navigationBar":{"titleText":"个人信息","type":"default"},"isNVue":false}},{"path":"pages/electricityprice/index","meta":{"navigationBar":{"titleText":"查询电价","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/economiccalculation/index","meta":{"navigationBar":{"titleText":"经济测算","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/report/index","meta":{"navigationBar":{"titleText":"经济测算报告","style":"custom","type":"default"},"isNVue":false}}].map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute));
   __uniConfig.styles=[];//styles
   __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
   __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});

unpackage/dist/dev/app-plus/app-renderjs.js

@@ -7419,6 +7419,12 @@ __renderjsModules.f9cb76fc = (() => {
         if (index !== void 0) {
           return series[index].name + "\uFF1A" + series[index].data + "\u5143";
         }
+      },
+      "timedemo": function(val, index, series) {
+        if (series.xAxis.data.includes(Number(val))) {
+          return val;
+        }
+        return "";
       }
     },
     //这里演示了自定义您的图表类型的option，可以随意命名，之后在组件上 type="demotype" 后，组件会调用这个花括号里的option，如果组件上还存在opts参数，会将demotype与opts中option合并后渲染图表。

unpackage/dist/dev/app-plus/pages/PersonalInformation/index.css

@@ -1,25 +1,46 @@
 
-.uni-page[data-v-c403fa49]{
+.uni-page[data-v-bcd57904]{
 	  		width: 100%;
 	  		height: 100%;
 }
-.container[data-v-c403fa49] {
-	  	height: 92vh;
-	    background: linear-gradient(to bottom, #007545 -40%, #f0f5f5 40%, #f0f5f5 100%);
+.container[data-v-bcd57904] {
+	  	height: 100%;
+	    /* background: linear-gradient(to bottom, #007545 -40%, #f0f5f5 40%, #f0f5f5 100%); */
+		background-color: #f5f5f5;
 	    box-sizing: border-box;
 }
-.account_number[data-v-c403fa49]{
+.account_number[data-v-bcd57904]{
 	    width: 100%;
 		padding: 0.625rem;
 		display: flex;
 		justify-content: center;
 		box-sizing: border-box;
 }
-.toptabbar[data-v-c403fa49] {
+.account_to[data-v-bcd57904]{
+		 width: 6.25rem;
+		 height: 6.25rem;
+		 border-radius: 3.125rem;
+}
+.toptabbar[data-v-bcd57904] {
 	     width: 100%;
-	     padding: 0.3125rem 0.625rem;
+	     padding: 0.3125rem 1.25rem;
 	     box-sizing: border-box;
 }
-		
- 
- 
+.toptabbar_[data-v-bcd57904]{
+		   border-radius: 0.3125rem;
+		   overflow: hidden;
+		   padding:0 0.625rem 0.625rem 0.625rem;
+		   background-color: #ffffff;
+}
+.toptabbar_box[data-v-bcd57904]{
+			width: 100%;
+			height: 3.75rem;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			border-bottom: 0.03125rem #f5f5f5 solid;
+}
+.toptabbar_left[data-v-bcd57904]{
+		 font-size: 0.875rem;
+}
+

unpackage/dist/dev/app-plus/pages/device/index.css

@@ -885,250 +885,277 @@ to {
   width: 100%;
 }
 
+.container_bj[data-v-1d9691da]{
+}
 .container[data-v-1d9691da] {
-  background: linear-gradient(to bottom, #007545 -40%, #f0f5f5 40%, #f0f5f5 100%);
-  box-sizing: border-box;
+	background: linear-gradient(to bottom, #007545 -10%, #f0f5f5 40%, #f0f5f5 100%);
+		/* background-image: url('@/static/222.jpg'); */
+		/* background-size: 100% 600rpx; */
+		/* background-repeat: no-repeat; */
+		/* box-sizing: border-box; */
 }
 .navigation[data-v-1d9691da] {
-  width: 100%;
-  height: 60px;
+		width: 100%;
+		height: 60px;
 }
 .power[data-v-1d9691da] {
-  width: 100%;
-  height: 220px;
-  padding:0 1.25rem;
-  display: flex;
-  justify-content: space-between;
-  color: #ffffff;
-  box-sizing: border-box;
+		width: 100%;
+		height: 220px;
+		padding: 0 1.25rem;
+		display: flex;
+		justify-content: space-between;
+		box-sizing: border-box;
+}
+.power_kwh[data-v-1d9691da]{
+	font-size: 0.625rem;
 }
 .power_1[data-v-1d9691da] {
-  height: 180px;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  text-align: center;
+		height: 180px;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		text-align: center;
 }
 .power_1 uni-image[data-v-1d9691da] {
-  width: 1rem;
-  height: 1rem;
-  margin-right: 0.3125rem;
+		width: 1rem;
+		height: 1rem;
+		margin-right: 0.3125rem;
 }
 .power_month[data-v-1d9691da] {
-  font-size: 0.875rem;
-  display: flex;
-  align-items: center;
+		font-size: 1rem;
+		color: #eee !important;
+		display: flex;
+		align-items: center;
 }
 .power_monthkwh[data-v-1d9691da] {
-  font-size: 1rem;
-  margin-top: 0.5rem;
+		font-size: 1rem;
+		margin-top: 0.5rem;
+		color: #fff;
 }
 .power_Cumulative[data-v-1d9691da] {
-  font-size: 0.875rem;
-  display: flex;
-  align-items: center;
-  margin-top: 1rem;
+		font-size: 1rem;
+		display: flex;
+		align-items: center;
+		margin-top: 1.3125rem;
+		color: #eee !important;
 }
 .power_Cumulativekwh[data-v-1d9691da] {
-  font-size: 1rem;
-  margin-top: 0.5rem;
+		font-size: 1rem;
+		margin-top: 0.5rem;
+		color: #fff;
 }
 .power_2[data-v-1d9691da] {
-  padding: 2px;
-  width: 170px;
-  height: 170px;
-  border-radius: 50%;
-  border: 3px solid #007544;
-  box-sizing: border-box;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  position: relative;
-  overflow: hidden;
+		padding: 2px;
+		width: 170px;
+		height: 170px;
+		border-radius: 50%;
+		border: 3px solid #007545;
+		box-sizing: border-box;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: relative;
+		overflow: hidden;
+		color: #fff
 }
 .power_2 uni-image[data-v-1d9691da] {
-  width: 160px;
-  height: 160px;
+		width: 160px;
+		height: 160px;
 }
 .power_2txt[data-v-1d9691da] {
-  position: absolute;
-  top: 36%;
+		position: absolute;
+		top: 32%;
+		color: #fff;
 }
 .power_2txt1[data-v-1d9691da] {
-  font-size: 0.875rem;
+		color: #eee !important;
+		font-size: 1.1875rem;
 }
 .power_2txtmeasure[data-v-1d9691da] {
-  font-size: 1.125rem;
-  margin-top: 10px;
-  text-align: center;
+		font-size: 1.125rem;
+		margin-top: 10px;
+		font-weight: 600;
+		color: #fff;
+		text-align: center;
 }
 
-/* 旋转动画 */
+	/* 旋转动画 */
 @keyframes rotate-1d9691da {
 from {
-    transform: rotate(0deg);
+			transform: rotate(0deg);
 }
 to {
-    transform: rotate(360deg);
+			transform: rotate(360deg);
 }
 }
 .rotating[data-v-1d9691da] {
-  animation: rotate-1d9691da 12s linear infinite;
-  transform-origin: 50% 50%;
-  -webkit-backface-visibility: hidden;
-          backface-visibility: hidden;
-  width: 180px;
-  height: 180px;
-  /* border-radius: 100rpx; */
-  /* background-color: #f0f5f5; */
-  overflow: hidden;
+		animation: rotate-1d9691da 12s linear infinite;
+		transform-origin: 50% 50%;
+		-webkit-backface-visibility: hidden;
+		        backface-visibility: hidden;
+		width: 180px;
+		height: 180px;
+		/* border-radius: 100rpx; */
+		/* background-color: #f0f5f5; */
+		overflow: hidden;
 }
 .income_box[data-v-1d9691da] {
-  width: 100%;
-  height: 6.25rem;
-  box-sizing: border-box;
-  padding: 0.625rem;
+		width: 100%;
+		height: 6.25rem;
+		box-sizing: border-box;
+		padding: 0.625rem;
 }
 .income[data-v-1d9691da] {
-  width: 100%;
-  height: 6.25rem;
-  border-radius: 0.5rem;
-  background-color: #ffffff;
-  display: flex;
-  align-items: center;
-  justify-content: space-around;
+		width: 100%;
+		height: 6.25rem;
+		border-radius: 0.5rem;
+		background-color: #ffffff;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
 }
 .income_yesterday1[data-v-1d9691da],
-.income_moon1[data-v-1d9691da],
-.income_tired1[data-v-1d9691da] {
-  font-size: 0.875rem;
-  color: #999999;
+	.income_moon1[data-v-1d9691da],
+	.income_tired1[data-v-1d9691da] {
+		font-size: 0.875rem;
+		color: #999999;
 }
 .income_yesterday2[data-v-1d9691da],
-.income_moon2[data-v-1d9691da],
-.income_tired2[data-v-1d9691da] {
-  margin-top: 0.625rem;
-  font-size: 1rem;
+	.income_moon2[data-v-1d9691da],
+	.income_tired2[data-v-1d9691da] {
+		margin-top: 0.625rem;
+		font-size: 1rem;
+		font-weight: 600;
+}
+.income_unit[data-v-1d9691da]{
+	font-size: 0.6875rem;
 }
 .power_box[data-v-1d9691da] {
-  width: 100%;
-  height: 6.875rem;
-  padding: 0.625rem;
-  box-sizing: border-box;
-  margin-top: 20px;
+		width: 100%;
+		height: 6.875rem;
+		padding: 0.625rem;
+		box-sizing: border-box;
+		margin-top: 20px;
 }
 .powerstation[data-v-1d9691da] {
-  width: 100%;
-  height: 6.875rem;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
+		width: 100%;
+		height: 6.875rem;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
 }
 .power_yesterday[data-v-1d9691da],
-.power_moon[data-v-1d9691da],
-.power_tired[data-v-1d9691da] {
-  width: 31%;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  background-color: #ffffff;
+	.power_moon[data-v-1d9691da],
+	.power_tired[data-v-1d9691da] {
+		width: 31%;
+		height: 100%;
+		display: flex;
+		border-radius: 0.3125rem;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		background-color: #ffffff;
 }
 .power_yesterday uni-image[data-v-1d9691da],
-.power_moon uni-image[data-v-1d9691da],
-.power_tired uni-image[data-v-1d9691da] {
-  width: 1.5rem;
-  height: 1.5rem;
-  padding: 0.40625rem;
-  border-radius: 100%;
+	.power_moon uni-image[data-v-1d9691da],
+	.power_tired uni-image[data-v-1d9691da] {
+		width: 1.5rem;
+		height: 1.5rem;
+		padding: 0.40625rem;
+		border-radius: 100%;
 }
 .power_yesterday uni-image[data-v-1d9691da] {
-  background-color: #007544;
+		background-color: #007544;
 }
 .power_moon uni-image[data-v-1d9691da] {
-  background-color: #3774f3;
+		background-color: #3774f3;
 }
 .power_tired uni-image[data-v-1d9691da] {
-  background-color: #b3cef9;
+		background-color: #b3cef9;
 }
 .power_yesterday1[data-v-1d9691da],
-.power_moon1[data-v-1d9691da],
-.power_tired1[data-v-1d9691da] {
-  margin: 0.3125rem 0;
-  font-size: 0.875rem;
-  color: #999999;
+	.power_moon1[data-v-1d9691da],
+	.power_tired1[data-v-1d9691da] {
+		margin: 0.3125rem 0;
+		font-size: 0.875rem;
+		color: #999999;
 }
 .toptabbar[data-v-1d9691da] {
-  width: 100%;
-  height: 2.5rem;
-  margin-top: 20px;
-  padding: 0.3125rem 0.625rem;
-  box-sizing: border-box;
+		width: 100%;
+		height: 2.5rem;
+		margin-top: 20px;
+		padding: 0.3125rem 0.625rem;
+		box-sizing: border-box;
 }
 [data-v-1d9691da] .uni-scroll-view-content {
-  display: flex;
-  justify-content: center;
+		display: flex;
+		justify-content: center;
 }
-.datecalendar[data-v-1d9691da]{
-	display: flex;
-	justify-content: space-between;
-	padding: 0 0.75rem;
-	margin-top: 1.875rem;
-}
-.datecalendar_1[data-v-1d9691da]{
-	width: 10rem;
-	height: 1.875rem;
-	display: flex;
-	font-size: 0.875rem;
-	border: 0.00625rem solid #999999;
-	border-radius: 1.25rem;
-	overflow: overlay;
-}
-.datecalendar_1sun[data-v-1d9691da]{
-	flex: 1;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	color: #222222;
-	background-color: #ffffff;
-}
-.datecalendar_1moon[data-v-1d9691da]{
-	flex: 1;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	background-color: #ffffff;
-	border-left: 0.00625rem solid #999999;
-	border-right: 0.00625rem solid #999999;
-}
-.datecalendar_1year[data-v-1d9691da]{
-	flex: 1;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	background-color: #ffffff;
-}
-.datecalendar_2[data-v-1d9691da]{
-	width: 5.625rem;
-	height: 1.875rem;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	font-size: 0.875rem;
-	border: 0.00625rem solid #999999;
-	border-radius: 1.25rem;
+.datecalendar[data-v-1d9691da] {
+		display: flex;
+		justify-content: space-between;
+		padding: 0 0.75rem;
+		margin-top: 1.875rem;
+}
+.datecalendar_1[data-v-1d9691da] {
+		width: 10rem;
+		height: 1.875rem;
+		display: flex;
+		font-size: 0.875rem;
+		border: 0.00625rem solid #999999;
+		border-radius: 1.25rem;
+		overflow: overlay;
+}
+.datecalendar_1sun[data-v-1d9691da] {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: #222222;
+		background-color: #ffffff;
+}
+.datecalendar_1moon[data-v-1d9691da] {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: #ffffff;
+		border-left: 0.00625rem solid #999999;
+		border-right: 0.00625rem solid #999999;
+}
+.datecalendar_1year[data-v-1d9691da] {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: #ffffff;
+}
+.datecalendar_2[data-v-1d9691da] {
+		width: 5.625rem;
+		height: 1.875rem;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 0.875rem;
+		border: 0.00625rem solid #999999;
+		border-radius: 1.25rem;
 }
 .qiun_data[data-v-1d9691da] {
-  width: 100%;
-  height: 18.75rem;
-  padding: 0.5rem;
-   overflow: auto; 
-  box-sizing: border-box;
+		width: 100%;
+		height: 18.75rem;
+		padding: 0.5rem;
+		overflow: auto;
+		box-sizing: border-box;
 }
-.qiun_title[data-v-1d9691da]{
-	height: 12%;
-	font-size: 0.875rem;
-	margin-left: 0.625rem;
+.qiun_title[data-v-1d9691da] {
+		height: 12%;
+		font-size: 0.875rem;
+		margin-left: 0.625rem;
+}
+.account_numberimage[data-v-1d9691da] {
+		width: 100%;
+		padding: 0;
+		position: fixed;
+		top: 0;
+		left: 0;
 }
-

unpackage/dist/dev/app-plus/pages/devicedetails/index.css

@@ -179,6 +179,12 @@ to {
 .uni-calendar-item--restday-text[data-v-65626c58] {
   color: #e43d33;
 }
+.uni-calendar-item--workday-texts[data-v-65626c58] {
+  color: #c0c0c0;
+}
+.uni-calendar-item--restday-texts[data-v-65626c58] {
+  color: #c0c0c0;
+}
 /**
  * 这里是uni-app内置的常用样式变量
  *
@@ -1155,6 +1161,7 @@ uni-page[data-v-41d19505] {
 		border: 0.3125rem solid #007545;
 }
 .liquid_text[data-v-41d19505] {
+		font-size: 1.1875rem;
 		color: #fff;
 }
 .container_title[data-v-41d19505] {
@@ -1174,6 +1181,7 @@ uni-page[data-v-41d19505] {
 }
 .health[data-v-41d19505]{
 		color: #007545;
+		font-size: 0.875rem;
 		margin-bottom: 0.625rem;
 }
 .container_box1[data-v-41d19505]{
@@ -1232,15 +1240,15 @@ uni-page[data-v-41d19505] {
 .income_yesterday1[data-v-41d19505],
 	.income_moon1[data-v-41d19505],
 	.income_tired1[data-v-41d19505] {
-		font-size: 0.75rem;
+		font-size: 0.8125rem;
 		color: #999999;
 }
 .income_yesterday2[data-v-41d19505],
 	.income_moon2[data-v-41d19505],
 	.income_tired2[data-v-41d19505] {
-		font-size: 0.75rem;
+		font-size: 0.8125rem;
 		margin-left: 0.25rem;
-		color: #999999;
+		color: #222;
 }
 .qiun_data[data-v-41d19505] {
 		width: 100%;
@@ -1313,6 +1321,11 @@ uni-page[data-v-41d19505] {
 		margin-left:0.3125rem;
 		color: #999999;
 }
+.power_yesterday11[data-v-41d19505]{
+		font-size: 0.8125rem;
+		margin-left:0.3125rem;
+		color: #222;
+}
 .power_moon2[data-v-41d19505],.power_yesterday2[data-v-41d19505],.power_tired2[data-v-41d19505]{
 	margin-top:0.3125rem;
 	font-size: 0.75rem;
@@ -1342,8 +1355,9 @@ uni-page[data-v-41d19505] {
 		border: 0.00625rem solid #999999;
 		border-radius: 1.25rem;
 		overflow: overlay;
-}
-.datecalendar_1sun[data-v-41d19505] {
+}xz
+
+	.datecalendar_1sun[data-v-41d19505] {
 		flex: 1;
 		display: flex;
 		align-items: center;
@@ -1527,6 +1541,8 @@ uni-page[data-v-41d19505] {
 			border-radius: 0.3125rem;
 			background-color: #ffffff;
 			margin-top: 0.625rem;
+			overflow: hidden;
+			box-sizing: border-box;
 }
 .power_iconstrategy[data-v-41d19505]{
 			flex-direction: column;
@@ -1547,7 +1563,7 @@ uni-page[data-v-41d19505] {
 }
 .power_strategy[data-v-41d19505]{
 			font-size: 0.75rem;
-			color: #B2D5CB;
+			color: #ccc;
 			display: flex;
 			align-items: center;
 }
@@ -1702,4 +1718,6 @@ uni-page[data-v-41d19505] {
 .popupbutton[data-v-41d19505]{
 			display: flex;
 }
-	
+.income_unit[data-v-41d19505]{
+		font-size: 0.625rem;
+}

unpackage/dist/dev/app-plus/pages/hostdetails/index.css

@@ -179,6 +179,12 @@ to {
 .uni-calendar-item--restday-text[data-v-65626c58] {
   color: #e43d33;
 }
+.uni-calendar-item--workday-texts[data-v-65626c58] {
+  color: #c0c0c0;
+}
+.uni-calendar-item--restday-texts[data-v-65626c58] {
+  color: #c0c0c0;
+}
 /**
  * 这里是uni-app内置的常用样式变量
  *
@@ -1153,6 +1159,7 @@ to {
 		border: 0.3125rem solid #007545;
 }
 .liquid_text[data-v-7a87688a] {
+		font-size: 1.1875rem;
 		color: #fff;
 }
 .container_title[data-v-7a87688a] {
@@ -1229,13 +1236,13 @@ to {
 .income_yesterday1[data-v-7a87688a],
 	.income_moon1[data-v-7a87688a],
 	.income_tired1[data-v-7a87688a] {
-		font-size: 0.75rem;
+		font-size: 0.875rem;
 		color: #999999;
 }
 .income_yesterday2[data-v-7a87688a],
 	.income_moon2[data-v-7a87688a],
 	.income_tired2[data-v-7a87688a] {
-		font-size: 0.8125rem;
+		font-size: 0.875rem;
 		font-weight: 400;
 }
 .qiun_data[data-v-7a87688a] {
@@ -1271,6 +1278,7 @@ to {
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
+		overflow: hidden;
 }
 .power_yesterday[data-v-7a87688a],
 	.power_moon[data-v-7a87688a],
@@ -1305,10 +1313,15 @@ to {
 .power_yesterday1[data-v-7a87688a],
 	.power_moon1[data-v-7a87688a],
 	.power_tired1[data-v-7a87688a] {
-		font-size: 0.8125rem;
+		font-size: 0.875rem;
 		margin-left:0.3125rem;
 		color: #999999;
 }
+.power_yesterday11[data-v-7a87688a]{
+		font-size: 0.8125rem;
+		margin-left:0.3125rem;
+		color: #222;
+}
 .power_moon2[data-v-7a87688a],.power_yesterday2[data-v-7a87688a],.power_tired2[data-v-7a87688a]{
 	margin-top:0.3125rem;
 	font-size: 0.75rem;
@@ -1460,7 +1473,7 @@ to {
 		justify-content: center;
 }
 .energy_boxright1[data-v-7a87688a] {
-		padding: 0.25rem 0.1875rem;
+		padding: 0.25rem 0.9375rem;
 		font-size: 0.8125rem;
 		border-radius: 1.5625rem;
 		display: flex;
@@ -1559,7 +1572,7 @@ to {
 }
 .power_strategy[data-v-7a87688a]{
 		font-size: 0.75rem;
-		color: #B2D5CB;
+		color: #ccc;
 		display: flex;
 		align-items: center;
 }
@@ -1714,4 +1727,6 @@ to {
 .popupbutton[data-v-7a87688a]{
 			display: flex;
 }
-	
+.income_unit[data-v-7a87688a]{
+		font-size: 0.625rem;
+}

unpackage/dist/dev/app-plus/pages/powerstation/index.css

@@ -672,6 +672,12 @@ to {
 .uni-calendar-item--restday-text[data-v-65626c58] {
   color: #e43d33;
 }
+.uni-calendar-item--workday-texts[data-v-65626c58] {
+  color: #c0c0c0;
+}
+.uni-calendar-item--restday-texts[data-v-65626c58] {
+  color: #c0c0c0;
+}
 /**
  * 这里是uni-app内置的常用样式变量
  *
@@ -1637,7 +1643,7 @@ to {
 		height: 100%;
 }
 .container[data-v-c23aac3f] {
-		background: linear-gradient(to bottom, #007545 -40%, #f0f5f5 40%, #f0f5f5 100%);
+		background: linear-gradient(to bottom, #007545 -50%, #f0f5f5 40%, #f0f5f5 100%);
 		box-sizing: border-box;
 		padding-bottom:0.03125rem;
 }
@@ -1646,6 +1652,7 @@ to {
 		border: 0.3125rem solid #007545;
 }
 .liquid_text[data-v-c23aac3f] {
+		font-size: 1.1875rem;
 		color: #fff;
 }
 .container_title[data-v-c23aac3f] {
@@ -1708,14 +1715,11 @@ to {
 .income_yesterday2[data-v-c23aac3f],
 	.income_moon2[data-v-c23aac3f],
 	.income_tired2[data-v-c23aac3f] {
-		font-size: 0.8125rem;
+		font-size: 0.875rem;
 		font-weight: 600;
 }
-.qiun_data[data-v-c23aac3f] {
-		width: 100%;
-		padding: 0.5rem;
-		overflow: auto;
-		box-sizing: border-box;
+.income_unit[data-v-c23aac3f]{
+		font-size: 0.625rem;
 }
 .qiun_title[data-v-c23aac3f] {
 		height: 12%;
@@ -1725,8 +1729,8 @@ to {
 .power_box[data-v-c23aac3f] {
 		width: 100%;
 		padding: 0 0.625rem;
-		box-sizing: border-box;
 		margin-bottom: 0.9375rem;
+		box-sizing: border-box;
 }
 .power_box1[data-v-c23aac3f] {
 		width: 100%;
@@ -1736,8 +1740,8 @@ to {
 .power_box2[data-v-c23aac3f]{
 	width: 100%;
 	padding: 0 0.625rem;
-	box-sizing: border-box;
    margin-bottom: 0.9375rem;
+	box-sizing: border-box;
 }
 .powerstation[data-v-c23aac3f] {
 		width: 100%;
@@ -1780,11 +1784,17 @@ to {
 	.power_tired1[data-v-c23aac3f] {
 		font-size: 0.8125rem;
 		margin-left:0.3125rem;
-		color: #999999;
+		color: #999;
+}
+.power_yesterday11[data-v-c23aac3f]{
+		font-size: 0.8125rem;
+		margin-left:0.3125rem;
+		color: #222;
 }
 .power_moon2[data-v-c23aac3f],.power_yesterday2[data-v-c23aac3f],.power_tired2[data-v-c23aac3f]{
 	margin-top:0.3125rem;
-	font-size: 0.75rem;
+	font-size: 0.875rem;
+	font-weight: 600;
 }
 .toptabbar[data-v-c23aac3f] {
 		width: 100%;
@@ -1900,9 +1910,11 @@ to {
 }
 .energy_boxtitle1[data-v-c23aac3f] {
 		font-size: 0.875rem;
+		margin-top: 0.1875rem;
+		font-weight: 600;
 }
 .energy_boxtitle2[data-v-c23aac3f] {
-		font-size: 0.875rem;
+		font-size: 0.8125rem;
 		margin-top: 0.125rem;
 }
 .energy_right[data-v-c23aac3f] {
@@ -1916,7 +1928,7 @@ to {
 		justify-content: center;
 }
 .energy_boxright1[data-v-c23aac3f] {
-		padding: 0.1875rem 0.25rem;
+		padding: 0.1875rem 1.25rem;
 		font-size: 0.8125rem;
 		border-radius: 1.5625rem;
 		display: flex;
@@ -1986,6 +1998,8 @@ to {
 		border-radius: 0.3125rem;
 		background-color: #ffffff;
 		margin-top: 0.625rem;
+		overflow: hidden;
+		box-sizing: border-box;
 }
 .power_iconstrategy[data-v-c23aac3f]{
 		flex-direction: column;
@@ -2006,13 +2020,13 @@ to {
 }
 .power_strategy[data-v-c23aac3f]{
 		font-size: 0.75rem;
-		color: #B2D5CB;
+		color: #ccc;
 		display: flex;
 		align-items: center;
 }
 .power_strategy1[data-v-c23aac3f]{
 		font-size: 0.75rem;
-		color: #B2D5CB;
+		color: #999999;
 		display: flex;
 		align-items: center;
 }
@@ -2161,4 +2175,4 @@ to {
 .popupbutton[data-v-c23aac3f]{
 			display: flex;
 }
-	
+	 

unpackage/dist/dev/app-plus/pages/product/index.css

@@ -1,3 +1,670 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.uniui-cart-filled[data-v-d31e1c47]:before {
+  content: "\e6d0";
+}
+.uniui-gift-filled[data-v-d31e1c47]:before {
+  content: "\e6c4";
+}
+.uniui-color[data-v-d31e1c47]:before {
+  content: "\e6cf";
+}
+.uniui-wallet[data-v-d31e1c47]:before {
+  content: "\e6b1";
+}
+.uniui-settings-filled[data-v-d31e1c47]:before {
+  content: "\e6ce";
+}
+.uniui-auth-filled[data-v-d31e1c47]:before {
+  content: "\e6cc";
+}
+.uniui-shop-filled[data-v-d31e1c47]:before {
+  content: "\e6cd";
+}
+.uniui-staff-filled[data-v-d31e1c47]:before {
+  content: "\e6cb";
+}
+.uniui-vip-filled[data-v-d31e1c47]:before {
+  content: "\e6c6";
+}
+.uniui-plus-filled[data-v-d31e1c47]:before {
+  content: "\e6c7";
+}
+.uniui-folder-add-filled[data-v-d31e1c47]:before {
+  content: "\e6c8";
+}
+.uniui-color-filled[data-v-d31e1c47]:before {
+  content: "\e6c9";
+}
+.uniui-tune-filled[data-v-d31e1c47]:before {
+  content: "\e6ca";
+}
+.uniui-calendar-filled[data-v-d31e1c47]:before {
+  content: "\e6c0";
+}
+.uniui-notification-filled[data-v-d31e1c47]:before {
+  content: "\e6c1";
+}
+.uniui-wallet-filled[data-v-d31e1c47]:before {
+  content: "\e6c2";
+}
+.uniui-medal-filled[data-v-d31e1c47]:before {
+  content: "\e6c3";
+}
+.uniui-fire-filled[data-v-d31e1c47]:before {
+  content: "\e6c5";
+}
+.uniui-refreshempty[data-v-d31e1c47]:before {
+  content: "\e6bf";
+}
+.uniui-location-filled[data-v-d31e1c47]:before {
+  content: "\e6af";
+}
+.uniui-person-filled[data-v-d31e1c47]:before {
+  content: "\e69d";
+}
+.uniui-personadd-filled[data-v-d31e1c47]:before {
+  content: "\e698";
+}
+.uniui-arrowthinleft[data-v-d31e1c47]:before {
+  content: "\e6d2";
+}
+.uniui-arrowthinup[data-v-d31e1c47]:before {
+  content: "\e6d3";
+}
+.uniui-arrowthindown[data-v-d31e1c47]:before {
+  content: "\e6d4";
+}
+.uniui-back[data-v-d31e1c47]:before {
+  content: "\e6b9";
+}
+.uniui-forward[data-v-d31e1c47]:before {
+  content: "\e6ba";
+}
+.uniui-arrow-right[data-v-d31e1c47]:before {
+  content: "\e6bb";
+}
+.uniui-arrow-left[data-v-d31e1c47]:before {
+  content: "\e6bc";
+}
+.uniui-arrow-up[data-v-d31e1c47]:before {
+  content: "\e6bd";
+}
+.uniui-arrow-down[data-v-d31e1c47]:before {
+  content: "\e6be";
+}
+.uniui-arrowthinright[data-v-d31e1c47]:before {
+  content: "\e6d1";
+}
+.uniui-down[data-v-d31e1c47]:before {
+  content: "\e6b8";
+}
+.uniui-bottom[data-v-d31e1c47]:before {
+  content: "\e6b8";
+}
+.uniui-arrowright[data-v-d31e1c47]:before {
+  content: "\e6d5";
+}
+.uniui-right[data-v-d31e1c47]:before {
+  content: "\e6b5";
+}
+.uniui-up[data-v-d31e1c47]:before {
+  content: "\e6b6";
+}
+.uniui-top[data-v-d31e1c47]:before {
+  content: "\e6b6";
+}
+.uniui-left[data-v-d31e1c47]:before {
+  content: "\e6b7";
+}
+.uniui-arrowup[data-v-d31e1c47]:before {
+  content: "\e6d6";
+}
+.uniui-eye[data-v-d31e1c47]:before {
+  content: "\e651";
+}
+.uniui-eye-filled[data-v-d31e1c47]:before {
+  content: "\e66a";
+}
+.uniui-eye-slash[data-v-d31e1c47]:before {
+  content: "\e6b3";
+}
+.uniui-eye-slash-filled[data-v-d31e1c47]:before {
+  content: "\e6b4";
+}
+.uniui-info-filled[data-v-d31e1c47]:before {
+  content: "\e649";
+}
+.uniui-reload[data-v-d31e1c47]:before {
+  content: "\e6b2";
+}
+.uniui-micoff-filled[data-v-d31e1c47]:before {
+  content: "\e6b0";
+}
+.uniui-map-pin-ellipse[data-v-d31e1c47]:before {
+  content: "\e6ac";
+}
+.uniui-map-pin[data-v-d31e1c47]:before {
+  content: "\e6ad";
+}
+.uniui-location[data-v-d31e1c47]:before {
+  content: "\e6ae";
+}
+.uniui-starhalf[data-v-d31e1c47]:before {
+  content: "\e683";
+}
+.uniui-star[data-v-d31e1c47]:before {
+  content: "\e688";
+}
+.uniui-star-filled[data-v-d31e1c47]:before {
+  content: "\e68f";
+}
+.uniui-calendar[data-v-d31e1c47]:before {
+  content: "\e6a0";
+}
+.uniui-fire[data-v-d31e1c47]:before {
+  content: "\e6a1";
+}
+.uniui-medal[data-v-d31e1c47]:before {
+  content: "\e6a2";
+}
+.uniui-font[data-v-d31e1c47]:before {
+  content: "\e6a3";
+}
+.uniui-gift[data-v-d31e1c47]:before {
+  content: "\e6a4";
+}
+.uniui-link[data-v-d31e1c47]:before {
+  content: "\e6a5";
+}
+.uniui-notification[data-v-d31e1c47]:before {
+  content: "\e6a6";
+}
+.uniui-staff[data-v-d31e1c47]:before {
+  content: "\e6a7";
+}
+.uniui-vip[data-v-d31e1c47]:before {
+  content: "\e6a8";
+}
+.uniui-folder-add[data-v-d31e1c47]:before {
+  content: "\e6a9";
+}
+.uniui-tune[data-v-d31e1c47]:before {
+  content: "\e6aa";
+}
+.uniui-auth[data-v-d31e1c47]:before {
+  content: "\e6ab";
+}
+.uniui-person[data-v-d31e1c47]:before {
+  content: "\e699";
+}
+.uniui-email-filled[data-v-d31e1c47]:before {
+  content: "\e69a";
+}
+.uniui-phone-filled[data-v-d31e1c47]:before {
+  content: "\e69b";
+}
+.uniui-phone[data-v-d31e1c47]:before {
+  content: "\e69c";
+}
+.uniui-email[data-v-d31e1c47]:before {
+  content: "\e69e";
+}
+.uniui-personadd[data-v-d31e1c47]:before {
+  content: "\e69f";
+}
+.uniui-chatboxes-filled[data-v-d31e1c47]:before {
+  content: "\e692";
+}
+.uniui-contact[data-v-d31e1c47]:before {
+  content: "\e693";
+}
+.uniui-chatbubble-filled[data-v-d31e1c47]:before {
+  content: "\e694";
+}
+.uniui-contact-filled[data-v-d31e1c47]:before {
+  content: "\e695";
+}
+.uniui-chatboxes[data-v-d31e1c47]:before {
+  content: "\e696";
+}
+.uniui-chatbubble[data-v-d31e1c47]:before {
+  content: "\e697";
+}
+.uniui-upload-filled[data-v-d31e1c47]:before {
+  content: "\e68e";
+}
+.uniui-upload[data-v-d31e1c47]:before {
+  content: "\e690";
+}
+.uniui-weixin[data-v-d31e1c47]:before {
+  content: "\e691";
+}
+.uniui-compose[data-v-d31e1c47]:before {
+  content: "\e67f";
+}
+.uniui-qq[data-v-d31e1c47]:before {
+  content: "\e680";
+}
+.uniui-download-filled[data-v-d31e1c47]:before {
+  content: "\e681";
+}
+.uniui-pyq[data-v-d31e1c47]:before {
+  content: "\e682";
+}
+.uniui-sound[data-v-d31e1c47]:before {
+  content: "\e684";
+}
+.uniui-trash-filled[data-v-d31e1c47]:before {
+  content: "\e685";
+}
+.uniui-sound-filled[data-v-d31e1c47]:before {
+  content: "\e686";
+}
+.uniui-trash[data-v-d31e1c47]:before {
+  content: "\e687";
+}
+.uniui-videocam-filled[data-v-d31e1c47]:before {
+  content: "\e689";
+}
+.uniui-spinner-cycle[data-v-d31e1c47]:before {
+  content: "\e68a";
+}
+.uniui-weibo[data-v-d31e1c47]:before {
+  content: "\e68b";
+}
+.uniui-videocam[data-v-d31e1c47]:before {
+  content: "\e68c";
+}
+.uniui-download[data-v-d31e1c47]:before {
+  content: "\e68d";
+}
+.uniui-help[data-v-d31e1c47]:before {
+  content: "\e679";
+}
+.uniui-navigate-filled[data-v-d31e1c47]:before {
+  content: "\e67a";
+}
+.uniui-plusempty[data-v-d31e1c47]:before {
+  content: "\e67b";
+}
+.uniui-smallcircle[data-v-d31e1c47]:before {
+  content: "\e67c";
+}
+.uniui-minus-filled[data-v-d31e1c47]:before {
+  content: "\e67d";
+}
+.uniui-micoff[data-v-d31e1c47]:before {
+  content: "\e67e";
+}
+.uniui-closeempty[data-v-d31e1c47]:before {
+  content: "\e66c";
+}
+.uniui-clear[data-v-d31e1c47]:before {
+  content: "\e66d";
+}
+.uniui-navigate[data-v-d31e1c47]:before {
+  content: "\e66e";
+}
+.uniui-minus[data-v-d31e1c47]:before {
+  content: "\e66f";
+}
+.uniui-image[data-v-d31e1c47]:before {
+  content: "\e670";
+}
+.uniui-mic[data-v-d31e1c47]:before {
+  content: "\e671";
+}
+.uniui-paperplane[data-v-d31e1c47]:before {
+  content: "\e672";
+}
+.uniui-close[data-v-d31e1c47]:before {
+  content: "\e673";
+}
+.uniui-help-filled[data-v-d31e1c47]:before {
+  content: "\e674";
+}
+.uniui-paperplane-filled[data-v-d31e1c47]:before {
+  content: "\e675";
+}
+.uniui-plus[data-v-d31e1c47]:before {
+  content: "\e676";
+}
+.uniui-mic-filled[data-v-d31e1c47]:before {
+  content: "\e677";
+}
+.uniui-image-filled[data-v-d31e1c47]:before {
+  content: "\e678";
+}
+.uniui-locked-filled[data-v-d31e1c47]:before {
+  content: "\e668";
+}
+.uniui-info[data-v-d31e1c47]:before {
+  content: "\e669";
+}
+.uniui-locked[data-v-d31e1c47]:before {
+  content: "\e66b";
+}
+.uniui-camera-filled[data-v-d31e1c47]:before {
+  content: "\e658";
+}
+.uniui-chat-filled[data-v-d31e1c47]:before {
+  content: "\e659";
+}
+.uniui-camera[data-v-d31e1c47]:before {
+  content: "\e65a";
+}
+.uniui-circle[data-v-d31e1c47]:before {
+  content: "\e65b";
+}
+.uniui-checkmarkempty[data-v-d31e1c47]:before {
+  content: "\e65c";
+}
+.uniui-chat[data-v-d31e1c47]:before {
+  content: "\e65d";
+}
+.uniui-circle-filled[data-v-d31e1c47]:before {
+  content: "\e65e";
+}
+.uniui-flag[data-v-d31e1c47]:before {
+  content: "\e65f";
+}
+.uniui-flag-filled[data-v-d31e1c47]:before {
+  content: "\e660";
+}
+.uniui-gear-filled[data-v-d31e1c47]:before {
+  content: "\e661";
+}
+.uniui-home[data-v-d31e1c47]:before {
+  content: "\e662";
+}
+.uniui-home-filled[data-v-d31e1c47]:before {
+  content: "\e663";
+}
+.uniui-gear[data-v-d31e1c47]:before {
+  content: "\e664";
+}
+.uniui-smallcircle-filled[data-v-d31e1c47]:before {
+  content: "\e665";
+}
+.uniui-map-filled[data-v-d31e1c47]:before {
+  content: "\e666";
+}
+.uniui-map[data-v-d31e1c47]:before {
+  content: "\e667";
+}
+.uniui-refresh-filled[data-v-d31e1c47]:before {
+  content: "\e656";
+}
+.uniui-refresh[data-v-d31e1c47]:before {
+  content: "\e657";
+}
+.uniui-cloud-upload[data-v-d31e1c47]:before {
+  content: "\e645";
+}
+.uniui-cloud-download-filled[data-v-d31e1c47]:before {
+  content: "\e646";
+}
+.uniui-cloud-download[data-v-d31e1c47]:before {
+  content: "\e647";
+}
+.uniui-cloud-upload-filled[data-v-d31e1c47]:before {
+  content: "\e648";
+}
+.uniui-redo[data-v-d31e1c47]:before {
+  content: "\e64a";
+}
+.uniui-images-filled[data-v-d31e1c47]:before {
+  content: "\e64b";
+}
+.uniui-undo-filled[data-v-d31e1c47]:before {
+  content: "\e64c";
+}
+.uniui-more[data-v-d31e1c47]:before {
+  content: "\e64d";
+}
+.uniui-more-filled[data-v-d31e1c47]:before {
+  content: "\e64e";
+}
+.uniui-undo[data-v-d31e1c47]:before {
+  content: "\e64f";
+}
+.uniui-images[data-v-d31e1c47]:before {
+  content: "\e650";
+}
+.uniui-paperclip[data-v-d31e1c47]:before {
+  content: "\e652";
+}
+.uniui-settings[data-v-d31e1c47]:before {
+  content: "\e653";
+}
+.uniui-search[data-v-d31e1c47]:before {
+  content: "\e654";
+}
+.uniui-redo-filled[data-v-d31e1c47]:before {
+  content: "\e655";
+}
+.uniui-list[data-v-d31e1c47]:before {
+  content: "\e644";
+}
+.uniui-mail-open-filled[data-v-d31e1c47]:before {
+  content: "\e63a";
+}
+.uniui-hand-down-filled[data-v-d31e1c47]:before {
+  content: "\e63c";
+}
+.uniui-hand-down[data-v-d31e1c47]:before {
+  content: "\e63d";
+}
+.uniui-hand-up-filled[data-v-d31e1c47]:before {
+  content: "\e63e";
+}
+.uniui-hand-up[data-v-d31e1c47]:before {
+  content: "\e63f";
+}
+.uniui-heart-filled[data-v-d31e1c47]:before {
+  content: "\e641";
+}
+.uniui-mail-open[data-v-d31e1c47]:before {
+  content: "\e643";
+}
+.uniui-heart[data-v-d31e1c47]:before {
+  content: "\e639";
+}
+.uniui-loop[data-v-d31e1c47]:before {
+  content: "\e633";
+}
+.uniui-pulldown[data-v-d31e1c47]:before {
+  content: "\e632";
+}
+.uniui-scan[data-v-d31e1c47]:before {
+  content: "\e62a";
+}
+.uniui-bars[data-v-d31e1c47]:before {
+  content: "\e627";
+}
+.uniui-checkbox[data-v-d31e1c47]:before {
+  content: "\e62b";
+}
+.uniui-checkbox-filled[data-v-d31e1c47]:before {
+  content: "\e62c";
+}
+.uniui-shop[data-v-d31e1c47]:before {
+  content: "\e62f";
+}
+.uniui-headphones[data-v-d31e1c47]:before {
+  content: "\e630";
+}
+.uniui-cart[data-v-d31e1c47]:before {
+  content: "\e631";
+}
+@font-face {
+  font-family: uniicons;
+  src: url("../../assets/uniicons.32e978a5.ttf");
+}
+.uni-icons[data-v-d31e1c47] {
+  font-family: uniicons;
+  text-decoration: none;
+  text-align: center;
+}
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.uni-status-bar[data-v-7920e3e0] {
+  height: 20px;
+}
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.uni-nav-bar-text[data-v-26544265] {
+  font-size: 1.0625rem;
+}
+.uni-nav-bar-right-text[data-v-26544265] {
+  font-size: 12px;
+}
+.uni-navbar__content[data-v-26544265] {
+  position: relative;
+  background-color: transparent;
+}
+.uni-navbar-btn-text[data-v-26544265] {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  align-items: center;
+  line-height: 12px;
+}
+.uni-navbar__header[data-v-26544265] {
+  display: flex;
+  padding: 0 10px;
+  flex-direction: row;
+  height: 44px;
+  font-size: 12px;
+}
+.uni-navbar__header-btns[data-v-26544265] {
+  overflow: hidden;
+  display: flex;
+  flex-wrap: nowrap;
+  flex-direction: row;
+  width: 3.75rem;
+  justify-content: center;
+  align-items: center;
+}
+.uni-navbar__header-btns-left[data-v-26544265] {
+  display: flex;
+  width: 3.75rem;
+  justify-content: flex-start;
+  align-items: center;
+}
+.uni-navbar__header-btns-right[data-v-26544265] {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-end;
+  align-items: center;
+}
+.uni-navbar__header-container[data-v-26544265] {
+  display: flex;
+  flex: 1;
+  padding: 0 10px;
+  overflow: hidden;
+}
+.uni-navbar__header-container-inner[data-v-26544265] {
+  display: flex;
+  flex: 1;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  font-size: 12px;
+  overflow: hidden;
+}
+.uni-navbar__placeholder-view[data-v-26544265] {
+  height: 44px;
+}
+.uni-navbar--fixed[data-v-26544265] {
+  position: fixed;
+  z-index: 99;
+  left: 0;
+  right: 0;
+}
+.uni-navbar--shadow[data-v-26544265] {
+  box-shadow: 0 1px 6px #ccc;
+}
+.uni-navbar--border[data-v-26544265] {
+  border-bottom-width: 0.03125rem;
+  border-bottom-style: solid;
+  border-bottom-color: #eee;
+}
+.uni-ellipsis-1[data-v-26544265] {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
 
 .uni-page[data-v-a911e391] {
 		width: 100%;
@@ -6,16 +673,20 @@
 .container[data-v-a911e391] {
 		box-sizing: border-box;
 		padding-bottom: 0.625rem;
-		padding-top: 2.75rem;
 		background: linear-gradient(to bottom, #f0f5f5 -40%, #f0f5f5 40%, #f0f5f5 100%);
 }
-.container_top[data-v-a911e391]{
+.container_navbar[data-v-a911e391]{
 	width: 100%;
-	height: 2.75rem;
-	color: #222;
 	position: fixed;
-  left: 0;
-  top: 0;
+	top: 0;
+	left: 0;
+	padding: 0;
+	z-index: 1;
+}
+.container_top[data-v-a911e391]{
+	width: 100%;
+	height: 2.5rem;
+	background-color:rgba(255, 255, 255, 0.5);
 }
 .account_number[data-v-a911e391] {
 		width: 100%;
@@ -178,9 +849,10 @@
 }
 .prompt[data-v-a911e391]{
 		  position: fixed;
-		   top: 3.0625rem;
+		   top: 2.5rem;
 		   right: 0.625rem;
 		   text-align: right;
+		   z-index: 9;
 }
 .promptimage[data-v-a911e391]{
 		  width: 1.875rem;

unpackage/dist/dev/app-plus/pages/user/index.css

@@ -377,6 +377,7 @@ to {
 }
 .user[data-v-79e6a490]{
    display: flex;
+   margin-top: 1.875rem;
 }
 .user_to[data-v-79e6a490]{
    width: 3.125rem;
@@ -391,9 +392,11 @@ to {
 }
 .user_name1[data-v-79e6a490]{
    font-size: 0.875rem;
+   color: #ffffff;
 }
 .user_name2[data-v-79e6a490]{
    font-size: 0.75rem;
+   color: #ffffff;
 }
 .equipment[data-v-79e6a490]{
  width: 100%;
@@ -496,7 +499,7 @@ to {
    background-color: #ffffff;
     padding: 0.3125rem 0;
     box-sizing: border-box;
-    margin-top: 0.9375rem;
+    margin-top: 3.75rem;
  box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.1);
 }
 .allocation_2[data-v-79e6a490]{
@@ -574,4 +577,62 @@ uni-button[data-v-79e6a490]{
    border: none !important;
    display: flex;
 }
+.avatar-edit-container[data-v-79e6a490] {
+   display: inline-block;
+   position: relative;
+}
+.avatar-wrapper[data-v-79e6a490] {
+   position: relative;
+   border-radius: 50%;
+   overflow: hidden;
+   cursor: pointer;
+   transition: all 0.3s ease;
+   box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+}
+.avatar-img[data-v-79e6a490] {
+   width: 100%;
+   height: 100%;
+   object-fit: cover;
+   display: block;
+   transition: transform 0.3s ease;
+}
+.avatar-wrapper:hover .avatar-img[data-v-79e6a490] {
+   transform: scale(1.05);
+}
+.edit-overlay[data-v-79e6a490] {
+   position: absolute;
+   top: 0;
+   left: 0;
+   width: 100%;
+   height: 100%;
+   background-color: rgba(0, 0, 0, 0.6);
+   display: flex;
+   align-items: center;
+   justify-content: center;
+   color: white;
+   border-radius: 50%;
+}
+.edit-content[data-v-79e6a490] {
+   text-align: center;
+}
+.edit-icon[data-v-79e6a490] {
+   font-size: 24px;
+   margin-bottom: 8px;
+   display: block;
+}
+.edit-text[data-v-79e6a490] {
+   font-size: 14px;
+   display: block;
+   font-weight: 500;
+}
+.file-input[data-v-79e6a490] {
+   display: none;
+}
  
+ /* 过渡动画 */
+.fade-enter-active[data-v-79e6a490], .fade-leave-active[data-v-79e6a490] {
+   transition: opacity 0.3s;
+}
+.fade-enter[data-v-79e6a490], .fade-leave-to[data-v-79e6a490] {
+   opacity: 0;
+}