fix:配置cnd

public/index.html

@@ -28,11 +28,21 @@
   <!-- require cdn assets js -->
   <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.js) { %>
     <script type="text/javascript" src="<%= htmlWebpackPlugin.options.cdn.js[i] %>">
-      console.log(i)
+
     </script>
 
     <% } %>
       <!-- built files will be auto injected -->
+      <!-- <script type="text/javascript" src="./js/axios.js"> </script>
+      <script type="text/javascript" src="./js/clipboard.js"> </script>
+      <script type="text/javascript" src="./js/cookie.js"> </script>
+      <script type="text/javascript" src="./js/data-set.js"> </script>
+      <script type="text/javascript" src="./js/nprogress.js"> </script>
+      <script type="text/javascript" src="./js/router.js"> </script>
+      <script type="text/javascript" src="./js/vue.js"> </script>
+      <script type="text/javascript" src="./js/vuex.js"> </script> -->
+      <!-- <script type="text/javascript" src="js/"> </script>
+      <script type="text/javascript" src="js/"> </script> -->
 </body>
 
 </html>

public/js/cookie.js

@@ -0,0 +1,8 @@
+/**
+ * Minified by jsDelivr using Terser v3.14.1.
+ * Original file: /npm/js-cookie@2.2.1/src/js.cookie.js
+ * 
+ * Do NOT use SRI with dynamically generated files! More information: https://www.jsdelivr.com/using-sri-with-dynamic-files
+ */
+!function (e) { var n; if ("function" == typeof define && define.amd && (define(e), n = !0), "object" == typeof exports && (module.exports = e(), n = !0), !n) { var t = window.Cookies, o = window.Cookies = e(); o.noConflict = function () { return window.Cookies = t, o } } }(function () { function e() { for (var e = 0, n = {}; e < arguments.length; e++) { var t = arguments[e]; for (var o in t) n[o] = t[o] } return n } function n(e) { return e.replace(/(%[0-9A-Z]{2})+/g, decodeURIComponent) } return function t(o) { function r() { } function i(n, t, i) { if ("undefined" != typeof document) { "number" == typeof (i = e({ path: "/" }, r.defaults, i)).expires && (i.expires = new Date(1 * new Date + 864e5 * i.expires)), i.expires = i.expires ? i.expires.toUTCString() : ""; try { var c = JSON.stringify(t); /^[\{\[]/.test(c) && (t = c) } catch (e) { } t = o.write ? o.write(t, n) : encodeURIComponent(String(t)).replace(/%(23|24|26|2B|3A|3C|3E|3D|2F|3F|40|5B|5D|5E|60|7B|7D|7C)/g, decodeURIComponent), n = encodeURIComponent(String(n)).replace(/%(23|24|26|2B|5E|60|7C)/g, decodeURIComponent).replace(/[\(\)]/g, escape); var f = ""; for (var u in i) i[u] && (f += "; " + u, !0 !== i[u] && (f += "=" + i[u].split(";")[0])); return document.cookie = n + "=" + t + f } } function c(e, t) { if ("undefined" != typeof document) { for (var r = {}, i = document.cookie ? document.cookie.split("; ") : [], c = 0; c < i.length; c++) { var f = i[c].split("="), u = f.slice(1).join("="); t || '"' !== u.charAt(0) || (u = u.slice(1, -1)); try { var a = n(f[0]); if (u = (o.read || o)(u, a) || n(u), t) try { u = JSON.parse(u) } catch (e) { } if (r[a] = u, e === a) break } catch (e) { } } return e ? r[e] : r } } return r.set = i, r.get = function (e) { return c(e, !1) }, r.getJSON = function (e) { return c(e, !0) }, r.remove = function (n, t) { i(n, "", e(t, { expires: -1 })) }, r.defaults = {}, r.withConverter = t, r }(function () { }) });
+//# sourceMappingURL=/sm/b0ce608ffc029736e9ac80a8dd6a7db2da8e1d45d2dcfc92043deb2214aa30d8.map

src/pages/business/agent.vue

@@ -195,7 +195,7 @@
             >
           </div>
           <div slot="managementSource" slot-scope="{ text }">
-            {{ text.managementSource == "1" ? "渠道" : "代理人" }}
+            {{ text == "1" ? "渠道" : "代理人" }}
           </div>
         </standard-table>
       </div>

src/pages/business/channel.vue

@@ -186,7 +186,7 @@
               >
             </div>
             <div slot="managementSource" slot-scope="{ text }">
-              {{ text.managementSource == "1" ? "渠道" : "代理人" }}
+              {{ text == "1" ? "渠道" : "代理人" }}
             </div>
           </standard-table>
         </div>

src/pages/profit/profit.vue

@@ -94,7 +94,7 @@
         :dataSource="detailTable"
         :pagination="false"
         style="background: #fff"
-        rowKey="id"
+        rowKey="expensesId"
         :scroll="{ y: 900 }"
         :loading="detailsLoading"
         @change="sortTable"
@@ -196,6 +196,7 @@ export default {
   //   mixins: [mixin],
   data() {
     return {
+      sortedInfo: null,
       columns1: [
         {
           title: "序号",
@@ -215,6 +216,7 @@ export default {
           title: "金额",
           dataIndex: "applyAmount",
           sorter: true,
+          // sortOrder: sortedInfo.columnKey === "applyAmount" && sortedInfo.order,
         },
         {
           title: "占总支出比例",
@@ -260,6 +262,11 @@ export default {
       ],
       yearShowOne: false,
       time: "",
+      orderBy: null,
+      detailObj: {
+        yearAndMonth: "",
+        type: "",
+      },
     };
   },
   mounted() {
@@ -271,32 +278,26 @@ export default {
     sortTable(pagination, filters, sorter) {
       console.log(sorter);
       if (sorter.order) {
-        const order = sorter.order === "ascend" ? "asc" : "desc";
-        if (order == "asc") {
-          // this.detailTable = this.detailTable.sort((a, b) => {
-          //   // console.log(a.applyAmount, b.applyAmount);
-          //   // return b.applyAmount - a.applyAmount;
-          // });
+        // const sorterColumn = sorter.field;
+        this.orderBy = sorter.order === "ascend" ? "asc" : "desc";
+        console.log(this.orderBy);
+        if (this.orderBy == "asc") {
+          this.getDetailTreeList(this.detailObj);
         } else {
-          // this.detailTable = this.detailTable.sort((a, b) => {
-          //   // console.log(a.applyAmount, b.applyAmount);
-          //   // return a.applyAmount - b.applyAmount;
-          // });
+          this.getDetailTreeList(this.detailObj);
         }
       }
     },
-    openDialog(val, type) {
-      // console.log(val, type);
-      this.detailTable = [];
-      this.visible = true;
+    getDetailTreeList(obj) {
       this.detailsLoading = true;
       this.$API.profit
         .getDetails({
-          yearAndMonth: val.yearAndMonth,
-          expensesType: type,
+          yearAndMonth: obj.yearAndMonth,
+          expensesType: obj.type,
+          orderBy: this.orderBy,
         })
         .then((res) => {
-          // console.log(res);
+          console.log(res);
           if (res.data.code === 200) {
             this.detailsLoading = false;
 
@@ -304,6 +305,17 @@ export default {
           }
         });
     },
+    openDialog(val, type) {
+      // console.log(val, type);
+      this.detailTable = [];
+      this.visible = true;
+      this.detailObj = {
+        yearAndMonth: val.yearAndMonth,
+        type: type,
+      };
+
+      this.getDetailTreeList(this.detailObj);
+    },
     onLoadData(treeNode) {
       return new Promise((resolve) => {
         if (treeNode.dataRef.children) {

vue.config.js

@@ -23,14 +23,14 @@ const assetsCDN = {
   css: [
   ],
   js: [
-    '//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js',
-    '//cdn.jsdelivr.net/npm/vue-router@3.6.5/dist/vue-router.min.js',
-    '//cdn.jsdelivr.net/npm/vuex@3.4.0/dist/vuex.min.js',
-    '//cdn.jsdelivr.net/npm/axios@0.19.2/dist/axios.min.js',
-    '//cdn.jsdelivr.net/npm/nprogress@0.2.0/nprogress.min.js',
-    '//cdn.jsdelivr.net/npm/clipboard@2.0.6/dist/clipboard.min.js',
-    '//cdn.jsdelivr.net/npm/@antv/data-set@0.11.4/build/data-set.min.js',
-    '//cdn.jsdelivr.net/npm/js-cookie@2.2.1/src/js.cookie.min.js'
+    '//fastly.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js',
+    '//fastly.jsdelivr.net/npm/vue-router@3.6.5/dist/vue-router.min.js',
+    '//fastly.jsdelivr.net/npm/vuex@3.4.0/dist/vuex.min.js',
+    '//fastly.jsdelivr.net/npm/axios@0.19.2/dist/axios.min.js',
+    '//fastly.jsdelivr.net/npm/nprogress@0.2.0/nprogress.min.js',
+    '//fastly.jsdelivr.net/npm/clipboard@2.0.6/dist/clipboard.min.js',
+    '//fastly.jsdelivr.net/npm/@antv/data-set@0.11.4/build/data-set.min.js',
+    '//fastly.jsdelivr.net/npm/js-cookie@2.2.1/src/js.cookie.min.js'
   ]
 }