diff --git a/.env.development b/.env.development
index 5cf9da4f1..9a547cc1a 100644
--- a/.env.development
+++ b/.env.development
@@ -2,5 +2,5 @@ NODE_ENV = 'development'
VITE_NOW_TYPE = 'dist'
# Base API
-# VITE_APP_BASE_URL='http://192.168.1.22:8545'
-VITE_APP_BASE_URL='https://test-multi-store.lihaink.cn'
+VITE_APP_BASE_URL='http://192.168.1.22:8545'
+# VITE_APP_BASE_URL='https://test-multi-store.lihaink.cn'
diff --git a/src/assets/iconfont/demo_index.html b/src/assets/iconfont/demo_index.html
index bc1627e26..26e36a510 100644
--- a/src/assets/iconfont/demo_index.html
+++ b/src/assets/iconfont/demo_index.html
@@ -54,6 +54,78 @@
+ -
+
+
结算
+ 
+
+
+ -
+
+
结算报表
+ 
+
+
+ -
+
+
结算单
+ 
+
+
+ -
+
+
结算管理
+ 
+
+
+ -
+
+
返利规则
+ 
+
+
+ -
+
+
月结
+ 
+
+
+ -
+
+
结算单管理
+ 
+
+
+ -
+
+
月结管理
+ 
+
+
+ -
+
+
智慧销售
+ 
+
+
+ -
+
+
智慧销售管理
+ 
+
+
+ -
+
+
后端商品毛利
+ 
+
+
+ -
+
+
成本查询
+ 
+
+
-
流量
@@ -242,7 +314,7 @@
-
-
供货价管理
+ 采购价管理

@@ -408,9 +480,9 @@
@font-face {
font-family: 'iconfont';
- src: url('iconfont.woff2?t=1717554669936') format('woff2'),
- url('iconfont.woff?t=1717554669936') format('woff'),
- url('iconfont.ttf?t=1717554669936') format('truetype');
+ src: url('iconfont.woff2?t=1718867101197') format('woff2'),
+ url('iconfont.woff?t=1718867101197') format('woff'),
+ url('iconfont.ttf?t=1718867101197') format('truetype');
}
第二步:定义使用 iconfont 的样式
@@ -436,6 +508,114 @@
+ -
+
+
+ 结算
+
+ .icon-RectangleCopy48
+
+
+
+ -
+
+
+ 结算报表
+
+ .icon-RectangleCopy52
+
+
+
+ -
+
+
+ 结算单
+
+ .icon-RectangleCopy55
+
+
+
+ -
+
+
+ 结算管理
+
+ .icon-RectangleCopy56
+
+
+
+ -
+
+
+ 返利规则
+
+ .icon-RectangleCopy57
+
+
+
+ -
+
+
+ 月结
+
+ .icon-RectangleCopy58
+
+
+
+ -
+
+
+ 结算单管理
+
+ .icon-RectangleCopy61
+
+
+
+ -
+
+
+ 月结管理
+
+ .icon-RectangleCopy62
+
+
+
+ -
+
+
+ 智慧销售
+
+ .icon-RectangleCopy63
+
+
+
+ -
+
+
+ 智慧销售管理
+
+ .icon-RectangleCopy64
+
+
+
+ -
+
+
+ 后端商品毛利
+
+ .icon-RectangleCopy65
+
+
+
+ -
+
+
+ 成本查询
+
+ .icon-RectangleCopy66
+
+
+
-
@@ -718,7 +898,7 @@
-
- 供货价管理
+ 采购价管理
.icon-RectangleCopy13
@@ -967,6 +1147,102 @@
+ -
+
+
结算
+ #icon-RectangleCopy48
+
+
+ -
+
+
结算报表
+ #icon-RectangleCopy52
+
+
+ -
+
+
结算单
+ #icon-RectangleCopy55
+
+
+ -
+
+
结算管理
+ #icon-RectangleCopy56
+
+
+ -
+
+
返利规则
+ #icon-RectangleCopy57
+
+
+ -
+
+
月结
+ #icon-RectangleCopy58
+
+
+ -
+
+
结算单管理
+ #icon-RectangleCopy61
+
+
+ -
+
+
月结管理
+ #icon-RectangleCopy62
+
+
+ -
+
+
智慧销售
+ #icon-RectangleCopy63
+
+
+ -
+
+
智慧销售管理
+ #icon-RectangleCopy64
+
+
+ -
+
+
后端商品毛利
+ #icon-RectangleCopy65
+
+
+ -
+
+
成本查询
+ #icon-RectangleCopy66
+
+
-
diff --git a/src/assets/iconfont/iconfont.css b/src/assets/iconfont/iconfont.css
index 00dc8ad0f..24aa2ca96 100644
--- a/src/assets/iconfont/iconfont.css
+++ b/src/assets/iconfont/iconfont.css
@@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 4573174 */
- src: url('iconfont.woff2?t=1717554669936') format('woff2'),
- url('iconfont.woff?t=1717554669936') format('woff'),
- url('iconfont.ttf?t=1717554669936') format('truetype');
+ src: url('iconfont.woff2?t=1718867101197') format('woff2'),
+ url('iconfont.woff?t=1718867101197') format('woff'),
+ url('iconfont.ttf?t=1718867101197') format('truetype');
}
.iconfont {
@@ -13,6 +13,54 @@
-moz-osx-font-smoothing: grayscale;
}
+.icon-RectangleCopy48:before {
+ content: "\e6bc";
+}
+
+.icon-RectangleCopy52:before {
+ content: "\e6c0";
+}
+
+.icon-RectangleCopy55:before {
+ content: "\e6c5";
+}
+
+.icon-RectangleCopy56:before {
+ content: "\e6c7";
+}
+
+.icon-RectangleCopy57:before {
+ content: "\e6c9";
+}
+
+.icon-RectangleCopy58:before {
+ content: "\e6ca";
+}
+
+.icon-RectangleCopy61:before {
+ content: "\e6cb";
+}
+
+.icon-RectangleCopy62:before {
+ content: "\e6cc";
+}
+
+.icon-RectangleCopy63:before {
+ content: "\e6d0";
+}
+
+.icon-RectangleCopy64:before {
+ content: "\e6d2";
+}
+
+.icon-RectangleCopy65:before {
+ content: "\e6dc";
+}
+
+.icon-RectangleCopy66:before {
+ content: "\e6e1";
+}
+
.icon-RectangleCopy49:before {
content: "\e6bd";
}
diff --git a/src/assets/iconfont/iconfont.js b/src/assets/iconfont/iconfont.js
index b7d01ec13..371b6ac8d 100644
--- a/src/assets/iconfont/iconfont.js
+++ b/src/assets/iconfont/iconfont.js
@@ -1 +1 @@
-window._iconfont_svg_string_4573174='',function(c){var a=(a=document.getElementsByTagName("script"))[a.length-1],h=a.getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var t,l,o,p,v,e=function(a,h){h.parentNode.insertBefore(a,h)};if(h&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}t=function(){var a,h=document.createElement("div");h.innerHTML=c._iconfont_svg_string_4573174,(h=h.getElementsByTagName("svg")[0])&&(h.setAttribute("aria-hidden","true"),h.style.position="absolute",h.style.width=0,h.style.height=0,h.style.overflow="hidden",h=h,(a=document.body).firstChild?e(h,a.firstChild):a.appendChild(h))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(t,0):(l=function(){document.removeEventListener("DOMContentLoaded",l,!1),t()},document.addEventListener("DOMContentLoaded",l,!1)):document.attachEvent&&(o=t,p=c.document,v=!1,d(),p.onreadystatechange=function(){"complete"==p.readyState&&(p.onreadystatechange=null,i())})}function i(){v||(v=!0,o())}function d(){try{p.documentElement.doScroll("left")}catch(a){return void setTimeout(d,50)}i()}}(window);
\ No newline at end of file
+window._iconfont_svg_string_4573174='',function(c){var a=(a=document.getElementsByTagName("script"))[a.length-1],h=a.getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var t,l,v,o,p,e=function(a,h){h.parentNode.insertBefore(a,h)};if(h&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}t=function(){var a,h=document.createElement("div");h.innerHTML=c._iconfont_svg_string_4573174,(h=h.getElementsByTagName("svg")[0])&&(h.setAttribute("aria-hidden","true"),h.style.position="absolute",h.style.width=0,h.style.height=0,h.style.overflow="hidden",h=h,(a=document.body).firstChild?e(h,a.firstChild):a.appendChild(h))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(t,0):(l=function(){document.removeEventListener("DOMContentLoaded",l,!1),t()},document.addEventListener("DOMContentLoaded",l,!1)):document.attachEvent&&(v=t,o=c.document,p=!1,i(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,d())})}function d(){p||(p=!0,v())}function i(){try{o.documentElement.doScroll("left")}catch(a){return void setTimeout(i,50)}d()}}(window);
\ No newline at end of file
diff --git a/src/assets/iconfont/iconfont.json b/src/assets/iconfont/iconfont.json
index f7bdad978..c89272bbb 100644
--- a/src/assets/iconfont/iconfont.json
+++ b/src/assets/iconfont/iconfont.json
@@ -1,10 +1,94 @@
{
"id": "4573174",
- "name": "duo'men'dian",
+ "name": "多门店",
"font_family": "iconfont",
"css_prefix_text": "icon-",
"description": "",
"glyphs": [
+ {
+ "icon_id": "7551479",
+ "name": "结算",
+ "font_class": "RectangleCopy48",
+ "unicode": "e6bc",
+ "unicode_decimal": 59068
+ },
+ {
+ "icon_id": "7551480",
+ "name": "结算报表",
+ "font_class": "RectangleCopy52",
+ "unicode": "e6c0",
+ "unicode_decimal": 59072
+ },
+ {
+ "icon_id": "7551481",
+ "name": "结算单",
+ "font_class": "RectangleCopy55",
+ "unicode": "e6c5",
+ "unicode_decimal": 59077
+ },
+ {
+ "icon_id": "7551482",
+ "name": "结算管理",
+ "font_class": "RectangleCopy56",
+ "unicode": "e6c7",
+ "unicode_decimal": 59079
+ },
+ {
+ "icon_id": "7551483",
+ "name": "返利规则",
+ "font_class": "RectangleCopy57",
+ "unicode": "e6c9",
+ "unicode_decimal": 59081
+ },
+ {
+ "icon_id": "7551484",
+ "name": "月结",
+ "font_class": "RectangleCopy58",
+ "unicode": "e6ca",
+ "unicode_decimal": 59082
+ },
+ {
+ "icon_id": "7551485",
+ "name": "结算单管理",
+ "font_class": "RectangleCopy61",
+ "unicode": "e6cb",
+ "unicode_decimal": 59083
+ },
+ {
+ "icon_id": "7551488",
+ "name": "月结管理",
+ "font_class": "RectangleCopy62",
+ "unicode": "e6cc",
+ "unicode_decimal": 59084
+ },
+ {
+ "icon_id": "7552701",
+ "name": "智慧销售",
+ "font_class": "RectangleCopy63",
+ "unicode": "e6d0",
+ "unicode_decimal": 59088
+ },
+ {
+ "icon_id": "7552703",
+ "name": "智慧销售管理",
+ "font_class": "RectangleCopy64",
+ "unicode": "e6d2",
+ "unicode_decimal": 59090
+ },
+ {
+ "icon_id": "7553621",
+ "name": "后端商品毛利",
+ "font_class": "RectangleCopy65",
+ "unicode": "e6dc",
+ "unicode_decimal": 59100
+ },
+ {
+ "icon_id": "7553622",
+ "name": "成本查询",
+ "font_class": "RectangleCopy66",
+ "unicode": "e6e1",
+ "unicode_decimal": 59105
+ },
{
"icon_id": "7549358",
"name": "流量",
@@ -224,7 +308,7 @@
},
{
"icon_id": "7551349",
- "name": "供货价管理",
+ "name": "采购价管理",
"font_class": "RectangleCopy13",
"unicode": "e6b8",
"unicode_decimal": 59064
diff --git a/src/assets/iconfont/iconfont.ttf b/src/assets/iconfont/iconfont.ttf
index ea8c5aba5..115c946c5 100644
Binary files a/src/assets/iconfont/iconfont.ttf and b/src/assets/iconfont/iconfont.ttf differ
diff --git a/src/assets/iconfont/iconfont.woff b/src/assets/iconfont/iconfont.woff
index 012daa6fe..e7c199dd2 100644
Binary files a/src/assets/iconfont/iconfont.woff and b/src/assets/iconfont/iconfont.woff differ
diff --git a/src/assets/iconfont/iconfont.woff2 b/src/assets/iconfont/iconfont.woff2
index 016b83358..8ddb1ec85 100644
Binary files a/src/assets/iconfont/iconfont.woff2 and b/src/assets/iconfont/iconfont.woff2 differ
diff --git a/src/views/statistics/transaction/index.vue b/src/views/statistics/transaction/index.vue
index 03705a0b0..4016d5dc2 100644
--- a/src/views/statistics/transaction/index.vue
+++ b/src/views/statistics/transaction/index.vue
@@ -13,32 +13,32 @@
-
{{ rightInfo1[0]?.name }}
+
{{ rightInfo1[0]?.name }}{{ rightInfo1[0]?.now_money }}
- 今日: {{rightInfo1[0]?.now_money}}
- 日环比
+ 昨日: {{rightInfo1[0]?.last_money}}
+ 日环比:
{{rightInfo1[0]?.rate}}%
-
-
{{ rightInfo1[1]?.name }}
+
+
{{ rightInfo2[0]?.name }}{{ rightInfo2[0]?.now_money }}
- 今日: {{rightInfo1[1]?.now_money}}
- 日环比
- {{rightInfo1[1]?.rate}}%
+ 上月: {{rightInfo2[0]?.last_money}}
+ 月环比:
+ {{rightInfo2[0]?.rate}}%
-
{{ rightInfo2[0]?.name }}
+
{{ rightInfo1[1]?.name }}{{ rightInfo1[1]?.now_money }}
- 今日: {{rightInfo2[0]?.now_money}}
- 日环比
- {{rightInfo2[0]?.rate}}%
+ 昨日: {{rightInfo1[1]?.last_money}}
+ 日环比:
+ {{rightInfo1[1]?.rate}}%
-
-
{{ rightInfo2[1]?.name }}
+
+
{{ rightInfo2[1]?.name }}{{ rightInfo2[1]?.now_money }}
- 今日: {{rightInfo2[1]?.now_money}}
- 日环比
+ 上月: {{rightInfo2[1]?.last_money}}
+ 月环比:
{{rightInfo2[1]?.rate}}%
@@ -47,7 +47,7 @@
+
+
+
+
+
{{ item.name }}
+
{{ item.money }}
+
环比增长: {{
+ item.rate / 100 }}%
+
+
+
@@ -273,6 +288,8 @@ const rightOption2: any = reactive(JSON.parse(JSON.stringify(optionModel)))
// 颜色
const colorList = ['#5DB1FF', '#4CD384', '#FFC46A', '#CAA5F1', '#FFC46A', '#4CD384', '#5DB1FF', '#CAA5F1']
// 商品浏览量, 商品访客数, 加购件数, 下单件数, 支付件数, 支付金额, 成本金额, 退款金额, 退款件数, 访客-支付转化率
+const iconList = ref(['RectangleCopy58', 'RectangleCopy48', 'RectangleCopy65', 'RectangleCopy62', 'RectangleCopy56', 'RectangleCopy55', 'RectangleCopy57', 'RectangleCopy65']);
+
const startEndTime = ref(['', '']);
// 获取数据
const getData = () => {
@@ -320,7 +337,9 @@ const getData = () => {
type: 'line',
smooth: true,
data: item.value,
- name: item.name
+ name: item.name,
+ money: item.money,
+ rate: item.rate
}
});
@@ -333,4 +352,8 @@ onMounted(() => {
})
-
+
diff --git a/src/views/store/statistics/index.vue b/src/views/store/statistics/index.vue
index b5bcb4f99..4bd87405b 100644
--- a/src/views/store/statistics/index.vue
+++ b/src/views/store/statistics/index.vue
@@ -257,13 +257,12 @@ const basicList = reactive([
num: 0,
},
- {
- name: '微信会员卡激活数',
- type: 'card_count',
- icon: 'RectangleCopy7',
- num: 0,
-
- },
+ // {
+ // name: '微信会员卡激活数',
+ // type: 'card_count',
+ // icon: 'RectangleCopy7',
+ // num: 0,
+ // },
])
const startEndTime = ref(['', '']);
// 获取数据