Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui into dev-gl

This commit is contained in:
paulGao
2022-05-19 17:30:32 +08:00
24 changed files with 591 additions and 186 deletions

View File

@@ -13,6 +13,6 @@ module.exports = {
*/
aMapKey: "b440952723253aa9fe483e698057bf7d", //高德web端申请的api key
website: "https://www.pickmall.cn", //官网地址
enableCDN: false, //生产环境 是否启用cdn加载 vue等js
enableCDN: true, //生产环境 是否启用cdn加载 vue等js
port: 10002, //端口
};

View File

@@ -432,15 +432,15 @@ export const result = [{
component: "shop/shopSetting",
children: null,
},
{
name: "shopAddress",
level: 2,
type: 0,
title: "自提管理",
path: "shopAddress",
component: "shop/shopAddress",
children: null,
}
// {
// name: "shopAddress",
// level: 2,
// type: 0,
// title: "自提管理",
// path: "shopAddress",
// component: "shop/shopAddress",
// children: null,
// }
]
}
]

View File

@@ -1125,6 +1125,7 @@ export default {
this.$Message.error("规格值不能大于10个");
return;
}
this.$set(item.spec_values, item.spec_values.length, {
name: item.name,
value: "",
@@ -1209,7 +1210,6 @@ export default {
this.skuTableColumn = pushData;
//克隆所有渲染的数据
let cloneTemp = cloneObj(this.skuInfo);
if (cloneTemp[0]) {
//存放最终结果
let result = [];
@@ -1353,6 +1353,15 @@ export default {
});
}
},
// 判断相同数组的值
scalarArrayEquals(array1, array2) {
return (
array1.length === array2.length &&
array1.every(function (v, i) {
return v === array2[i];
})
);
},
/** 自动完成表单所需方法*/
filterMethod(value, option) {
return option.toUpperCase().indexOf(value.toUpperCase()) !== -1;

View File

@@ -29,18 +29,18 @@ let externals = {
// 使用CDN的内容
let cdn = {
css: ["https://cdn.jsdelivr.net/npm/view-design@4.1.1/dist/styles/iview.css"],
css: ["https://cdn.pickmall.cn/cdn/iview.css"],
js: [
// vue must at first!
"https://cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js",
"https://cdn.jsdelivr.net/npm/vuex@3.1.2/dist/vuex.min.js",
"https://cdn.jsdelivr.net/npm/vue-router@3.1.3/dist/vue-router.min.js",
"https://cdn.jsdelivr.net/npm/axios@0.19.0/dist/axios.min.js",
"https://cdn.jsdelivr.net/npm/view-design@4.1.1/dist/iview.min.js",
"https://cdn.jsdelivr.net/npm/vue-lazyload@1.3.3/vue-lazyload.min.js",
"https://cdn.jsdelivr.net/npm/js-cookie@2.2.1/src/js.cookie.min.js",
"https://cdn.jsdelivr.net/npm/wangeditor@latest/dist/wangEditor.min.js",
"https://cdn.jsdelivr.net/npm/sockjs-client@1/dist/sockjs.min.js",
"https://cdn.pickmall.cn/cdn/vue.min.js",
"https://cdn.pickmall.cn/cdn/vuex.min.js",
"https://cdn.pickmall.cn/cdn/vue-router.min.js",
"https://cdn.pickmall.cn/cdn/axios.min.js",
"https://cdn.pickmall.cn/cdn/iview.min.js",
"https://cdn.pickmall.cn/cdn/vue-lazyload.min.js",
"https://cdn.pickmall.cn/cdn/js.cookie.min.js",
"https://cdn.pickmall.cn/cdn/wangEditor.min.js",
"https://cdn.pickmall.cn/cdn/sockjs.min.js",
"https://gw.alipayobjects.com/os/lib/antv/g2/4.1.24/dist/g2.min.js"
]
};