-
+
![]()
@@ -13,7 +18,11 @@
:before-close="beforeClose"
>
-
+
@@ -21,19 +30,20 @@
diff --git a/src/components/service-list/service_shop_menu-new.vue b/src/components/service-list/service_shop_menu-new.vue
index eb2970903fa4f7b6885206dc6da12a350d61d390..66b3669ccef8d81f2d88df629dce08209e3b147d 100644
--- a/src/components/service-list/service_shop_menu-new.vue
+++ b/src/components/service-list/service_shop_menu-new.vue
@@ -97,8 +97,8 @@ export default {
item.default = "shop_nav_iv_chanpinzy";
break;
default:
- item.active = "1";
- item.default = "1";
+ item.active = "shop_tool_ic_sjfw_sel";
+ item.default = "shop_tool_ic_sjfw";
break;
}
});
diff --git a/src/pages/data-analysis/my-service.vue b/src/pages/data-analysis/my-service.vue
index 5c82d4122f0b442a75852ef00ffefa7ac5f3a688..18d03794838c044d85f619503af80bf232c91d9c 100644
--- a/src/pages/data-analysis/my-service.vue
+++ b/src/pages/data-analysis/my-service.vue
@@ -478,31 +478,11 @@ export default {
},
], // 服务状态统计
starlistData: [
- {
- star: 5,
- count: 0,
- unit: "个",
- },
- {
- star: 4,
- count: 0,
- unit: "个",
- },
- {
- star: 3,
- count: 0,
- unit: "个",
- },
- {
- star: 2,
- count: 0,
- unit: "个",
- },
- {
- star: 1,
- count: 0,
- unit: "个",
- },
+ { star: 5, count: 0, unit: "个" },
+ { star: 4, count: 0, unit: "个" },
+ { star: 3, count: 0, unit: "个" },
+ { star: 2, count: 0, unit: "个" },
+ { star: 1, count: 0, unit: "个" },
], // 服务评分
starlistTotal: 0,
hotSearchHeader: [], // 热门搜索 表头
diff --git a/src/pages/data-analysis/org-service.vue b/src/pages/data-analysis/org-service.vue
index 700241b184690bfeade5166fbd7bd6dcac70f0f9..2788a80b1950aa5de3c011d1e2bc5acce49036a4 100644
--- a/src/pages/data-analysis/org-service.vue
+++ b/src/pages/data-analysis/org-service.vue
@@ -497,8 +497,14 @@ export default {
toplistTargetValue: 40, // 服务调用排名分析 目标值
commentlistData: [], // 服务评价
linelistData: [], // 服务状态统计
- starlistData: [], // 服务评分
- starlistTotal: 15,
+ starlistData: [
+ { star: 5, count: 0, unit: "个" },
+ { star: 4, count: 0, unit: "个" },
+ { star: 3, count: 0, unit: "个" },
+ { star: 2, count: 0, unit: "个" },
+ { star: 1, count: 0, unit: "个" },
+ ], // 服务评分
+ starlistTotal: 0,
hotSearchHeader: [], // 热门搜索 表头
hotSearchData: [], // 热门搜索 数据
graph_arr: {
@@ -951,4 +957,4 @@ export default {
word-break: break-all;
white-space: nowrap;
}
-
\ No newline at end of file
+
diff --git a/src/pages/data-analysis/super-service.vue b/src/pages/data-analysis/super-service.vue
index 0fa8659b940859b8ad0c0898ce9bd2595a1acd5c..221ac3c6502ad5adfedb02eb619596f054eb9613 100644
--- a/src/pages/data-analysis/super-service.vue
+++ b/src/pages/data-analysis/super-service.vue
@@ -495,8 +495,14 @@ export default {
toplistTargetValue: 40, // 服务调用排名分析 目标值
commentlistData: [], // 服务评价
linelistData: [], // 服务状态统计
- starlistData: [], // 服务评分
- starlistTotal: 15,
+ starlistData: [
+ { star: 5, count: 0, unit: "个" },
+ { star: 4, count: 0, unit: "个" },
+ { star: 3, count: 0, unit: "个" },
+ { star: 2, count: 0, unit: "个" },
+ { star: 1, count: 0, unit: "个" },
+ ], // 评分
+ starlistTotal: 10,
hotSearchHeader: [], // 热门搜索 表头
hotSearchData: [], // 热门搜索 数据
graph_arr: {
@@ -715,26 +721,30 @@ export default {
})
.then((response) => {
if (response.data.success == 1) {
+ let _data = response.data.data;
+
if (this.right_3_state == 0) {
- let data = response.data.data || [];
- this.commentlistData = data.concat(this.commentlistData);
+ _data = _data || [];
+
+ this.commentlistData = _data.concat(this.commentlistData);
+
if (this.commentlistData && this.commentlistData.length != 0) {
this.last_id = this.commentlistData[0].last_id;
}
} else {
- let data = response.data.data;
- this.starlistData[0].count = data.score5;
- this.starlistData[1].count = data.score4;
- this.starlistData[2].count = data.score3;
- this.starlistData[3].count = data.score2;
- this.starlistData[4].count = data.score1;
- this.starlistTotal =
- data.score5 +
- data.score4 +
- data.score3 +
- data.score2 +
- data.score1;
- console.log(this.starlistData, this.starlistTotal);
+ if (_data) {
+ this.starlistData[0].count = _data.score5;
+ this.starlistData[1].count = _data.score4;
+ this.starlistData[2].count = _data.score3;
+ this.starlistData[3].count = _data.score2;
+ this.starlistData[4].count = _data.score1;
+ this.starlistTotal =
+ _data.score5 +
+ _data.score4 +
+ _data.score3 +
+ _data.score2 +
+ _data.score1;
+ }
}
}
});
@@ -957,4 +967,4 @@ export default {
word-break: break-all;
white-space: nowrap;
}
-
\ No newline at end of file
+
diff --git a/src/pages/service_shop/shop_car_apply.vue b/src/pages/service_shop/shop_car_apply.vue
index 3afaa42c966b8f35798fac93200505e352c9aad8..6d4b1cda05958caead8e589b75bf00e60c8a371e 100644
--- a/src/pages/service_shop/shop_car_apply.vue
+++ b/src/pages/service_shop/shop_car_apply.vue
@@ -14,17 +14,16 @@
@@ -40,14 +39,14 @@ export default {
components: {
infoList,
applyForm,
- serviceList,
+ serviceList
},
data() {
return {
formInline: {
depart: "",
preson: "",
- phone: "",
+ phone: ""
},
all_cost: 0,
now_money: 0,
@@ -55,13 +54,13 @@ export default {
{
title: "服务申请",
type: "solt",
- solt_name: "apply_info",
+ solt_name: "apply_info"
},
{
title: "申请的服务",
type: "solt",
- solt_name: "apply_service",
- },
+ solt_name: "apply_service"
+ }
],
post_arr: [],
service_arr: [
@@ -112,18 +111,18 @@ export default {
"",
{
name: "共享",
- val: "share",
+ val: "share"
},
{
name: "受限",
- val: "limit",
+ val: "limit"
},
{
name: "敏感",
- val: "mg",
- },
+ val: "mg"
+ }
],
- temp_sub_arr: [],
+ temp_sub_arr: []
};
},
watch: {},
@@ -136,7 +135,7 @@ export default {
} else {
// console.log(JSON.parse(window.sessionStorage.getItem("shoppingCart")));
var temp_arr = [];
- JSON.parse(window.sessionStorage.getItem("shoppingCart")).forEach((e) => {
+ JSON.parse(window.sessionStorage.getItem("shoppingCart")).forEach(e => {
temp_arr.push(e.id);
});
this.get_car_list(temp_arr);
@@ -146,7 +145,7 @@ export default {
mounted() {},
methods: {
get_account_money() {
- this.$http.get(`/apaas/backmgt/user/myAccount`).then((res) => {
+ this.$http.get(`/apaas/backmgt/user/myAccount`).then(res => {
if (res.data.success) {
this.now_money = res.data.data.account_balance || 0;
}
@@ -155,7 +154,7 @@ export default {
get_one_app(app_data) {
this.$http
.get(`/apaas/serviceapp/v3/shopcart/appinfo?app_id=${app_data.app_id}`)
- .then((response) => {
+ .then(response => {
console.log(response);
let data = response.data.data;
if (response.data.success && data) {
@@ -189,7 +188,7 @@ export default {
.get(
`/apaas/serviceapp/v3/shopcart/serviceinfo?service_id=${service_data.service_id}`
)
- .then((response) => {
+ .then(response => {
console.log(response);
let data = response.data.data;
if (response.data.success && data) {
@@ -209,14 +208,14 @@ export default {
objs.tips = [
{
tip: this.share_arr[data.openness].name,
- type: this.share_arr[data.openness].val,
- },
+ type: this.share_arr[data.openness].val
+ }
];
objs.auth = data.organization_name;
objs.size = "";
objs.count = "";
let request_spcs_info = data.request_spcs_info || [];
- request_spcs_info.forEach((el) => {
+ request_spcs_info.forEach(el => {
if (service_data.spec_id == el.id) {
let size = "";
let count = "";
@@ -249,7 +248,7 @@ export default {
.catch(() => {});
},
deal_data(data) {
- data.forEach((e) => {
+ data.forEach(e => {
if (e.selected) {
e.selected = 1;
} else {
@@ -262,7 +261,7 @@ export default {
},
abc() {
return new Promise((resolve, reject) => {
- this.$refs.apply_info.$refs.ruleForm.validate((valid) => {
+ this.$refs.apply_info.$refs.ruleForm.validate(valid => {
console.log(valid);
if (valid) {
flag = true;
@@ -279,13 +278,13 @@ export default {
});
},
sub_service() {
- if (this.all_cost > this.now_money) {
+ if (parseFloat(this.all_cost) > parseFloat(this.now_money)) {
this.$message.error("余额不足，请进行充值");
return;
}
let formInline = this.$refs.apply_info.formInline;
let flag = null;
- this.$refs.apply_info.$refs.ruleForm.validate((valid) => {
+ this.$refs.apply_info.$refs.ruleForm.validate(valid => {
console.log(valid);
if (valid) {
var phone_ruler = /^(?:(?:\+|00)86)?1[3-9]\d{9}$/;
@@ -296,9 +295,9 @@ export default {
var temp = {
apply_part: {
o_name: formInline.preson,
- o_mobile: formInline.phone,
+ o_mobile: formInline.phone
},
- carts: [],
+ carts: []
};
var temp1 = this.$refs.apply_service.$refs.apply_service_state;
this.post_arr.forEach((e, idx) => {
@@ -313,7 +312,7 @@ export default {
app_id: 0,
scene: temp1[idx].sceneinput,
apply_file: temp1[idx].fileList,
- apply_fields: [],
+ apply_fields: []
});
// 判断表格ref是否存在
this.temp_sub_arr = temp1[idx].$refs.apply_service_state_table
@@ -334,7 +333,7 @@ export default {
app_id: e.app_id,
scene: this.$refs.apply_service.$refs.apply_service_state[idx]
.sceneinput,
- apply_file: "",
+ apply_file: ""
});
}
});
@@ -351,7 +350,7 @@ export default {
this.$http
.post(`/apaas/serviceapp/v3/shopcart/apply`, temp)
- .then((response) => {
+ .then(response => {
console.log(response);
if (response.data.success) {
this.$store.commit("setMenuCartState");
@@ -376,10 +375,10 @@ export default {
var temp_cost = 0;
this.$http
.get(`/apaas/serviceapp/v3/shopcart/list`)
- .then((response) => {
+ .then(response => {
console.log(response);
let data = response.data.data.valid;
- data.forEach((e) => {
+ data.forEach(e => {
if (car_arr.indexOf(e.id) == -1) {
return;
}
@@ -412,8 +411,8 @@ export default {
this.service_arr[l]["tips"] = [
{
tip: this.share_arr[e.service.openness].name,
- type: this.share_arr[e.service.openness].val,
- },
+ type: this.share_arr[e.service.openness].val
+ }
];
this.service_arr[l]["auth"] = e.service.organization_name;
this.service_arr[l]["size"] = "";
@@ -452,7 +451,7 @@ export default {
this.all_cost = temp_cost;
// this.service_arr =
})
- .catch((response) => {});
+ .catch(response => {});
},
floatAdd(arg1, arg2) {
let r1, r2, m, c;
@@ -485,8 +484,8 @@ export default {
arg2 = Number(arg2.toString().replace(".", ""));
}
return (arg1 + arg2) / m;
- },
- },
+ }
+ }
};
diff --git a/src/pages/user/user_info.vue b/src/pages/user/user_info.vue
index 8f1fd43630f0926c77770863be1bbe94a14785ea..4fa0d20785484a5051bd2688292c1275c58792a8 100644
--- a/src/pages/user/user_info.vue
+++ b/src/pages/user/user_info.vue
@@ -1,11 +1,17 @@
- {{ $t("lang.personal_center") }}
+ {{
+ $t("lang.personal_center")
+ }}
{{ $t("lang.profile") }}
-
+
@@ -17,8 +23,14 @@
密码：
-
- 修改密码
+
+ 修改密码
昵称：
@@ -49,29 +61,45 @@
组织机构：
-
+
当前用户类型：
-
+
升级为开发者
+ >升级为开发者
升级为开发者
+ >升级为开发者
-
+
业务系统名：
@@ -83,9 +111,16 @@
IP（白名单）：
-
+
{{ item }}
-
+
-
增加
+
增加
IP（黑名单）：
-
+
{{ item }}
-
+
-
增加
+
增加
密钥：
-
+
复制
- 重置
+ 重置
描述：
-
+
旧密码：
-
+
新密码：
-
+ style="cursor: pointer"
+ :class="visible1 ? 'eye_dis' : 'eye'"
+ > -->
@@ -160,15 +226,15 @@
-
+ style="cursor: pointer"
+ :class="visible2 ? 'eye_dis' : 'eye'"
+ > -->
@@ -197,6 +263,7 @@
+
+
diff --git a/static/view/demo/page-echarts_web_map.html b/static/view/demo/page-echarts_web_map.html
index f490f88d793a558930aa165ec46649c838e7cf1d..f19fa63735813af3a1c4020221013e88a1971952 100644
--- a/static/view/demo/page-echarts_web_map.html
+++ b/static/view/demo/page-echarts_web_map.html
@@ -34,13 +34,16 @@
+
+
+
diff --git a/yarn.lock b/yarn.lock
index 9ed43797c02fdef0d3bc3677ed9a03c9be67adf2..3a1f88dfb733cf7e6376199b559782d95a5e5778 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2450,6 +2450,11 @@ crypto-browserify@^3.11.0:
randombytes "^2.0.0"
randomfill "^1.0.3"
+crypto-js@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.0.0.tgz#2904ab2677a9d042856a2ea2ef80de92e4a36dcc"
+ integrity sha512-bzHZN8Pn+gS7DQA6n+iUmBfl0hO5DJq++QP3U6uTucDtk/0iGpXd/Gg7CGR0p8tJhofJyaKoWBuJI4eAO00BBg==
+
css-color-names@0.0.4, css-color-names@^0.0.4:
version "0.0.4"
resolved "https://registry.npm.taobao.org/css-color-names/download/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
+ 
-
+
+