From e6d8d87c3178c3dcec852673dc5e287f44f67331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Fri, 27 Aug 2021 18:10:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BA=97=E9=93=BA=E7=AB=AF?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=87=8F=E5=B0=91=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=8A=A8=E6=80=81cdn=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=EF=BC=8C=E4=BC=98=E5=8C=96=E9=80=9F=E5=BA=A630%+?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seller/package.json | 20 +- seller/public/index.html | 177 +++---- seller/src/api/shops.js | 3 +- seller/src/libs/util.js | 2 +- seller/src/locale/index.js | 28 - seller/src/locale/lang/en-US.js | 24 - seller/src/locale/lang/zh-CN.js | 24 - seller/src/main.js | 9 +- seller/src/router/router.js | 4 +- seller/src/views/Main.vue | 4 +- .../goods/goods-seller/goodsOperationSec.vue | 477 +++++++++--------- seller/src/views/login.vue | 4 +- seller/src/views/main-components/footer.vue | 16 +- .../main-components/tags-page-opened.vue | 2 +- .../src/views/my-components/lili/editor.vue | 36 +- seller/vue.config.js | 193 ++++--- 16 files changed, 455 insertions(+), 568 deletions(-) delete mode 100644 seller/src/locale/index.js delete mode 100644 seller/src/locale/lang/en-US.js delete mode 100644 seller/src/locale/lang/zh-CN.js diff --git a/seller/package.json b/seller/package.json index d912dcb6..362c9ad7 100644 --- a/seller/package.json +++ b/seller/package.json @@ -13,38 +13,20 @@ "@amap/amap-jsapi-loader": "0.0.7", "@antv/g2": "^4.1.14", "axios": "^0.21.1", - "core-js": "^3.6.5", - "countup.js": "^2.0.4", - "date-fns": "^1.30.1", - "dplayer": "^1.26.0", - "gitalk": "^1.6.2", - "html2canvas": "^1.0.0-rc.5", "js-cookie": "^2.2.1", "node-sass": "^4.14.1", - "pinyin": "^2.9.0", - "print-js": "^1.0.63", - "qrcodejs2": "0.0.2", - "quill": "^1.3.7", "sass-loader": "^8.0.2", "sockjs-client": "^1.4.0", - "stompjs": "^2.3.3", - "swiper": "^6.3.5", "uuid": "^8.3.2", + "view-design": "^4.6.1", "vue": "^2.6.10", - "vue-awesome": "^4.0.2", - "vue-awesome-swiper": "^4.1.1", - "vue-clipboard2": "^0.3.0", - "vue-cropper": "^0.4.9", - "vue-i18n": "^8.15.1", "vue-json-excel": "^0.3.0", - "vue-json-pretty": "^1.4.1", "vue-lazyload": "^1.3.3", "vue-qr": "^2.3.0", "vue-router": "^3.1.3", "vuedraggable": "^2.23.2", "vuex": "^3.4.0", "wangeditor": "^4.6.13", - "xlsx": "^0.16.2", "xss": "^1.0.7" }, "devDependencies": { diff --git a/seller/public/index.html b/seller/public/index.html index b7c7be20..c007cd8b 100644 --- a/seller/public/index.html +++ b/seller/public/index.html @@ -1,108 +1,87 @@ - - - - - - - lili store - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - + + diff --git a/seller/src/api/shops.js b/seller/src/api/shops.js index 35100159..7fb16d1a 100644 --- a/seller/src/api/shops.js +++ b/seller/src/api/shops.js @@ -1,8 +1,7 @@ // 统一请求路径前缀在libs/axios.js中修改 import {getRequest, postRequest, putRequest, deleteRequest, importRequest, getRequestWithNoToken} from '@/libs/axios'; -// Vaptcha ID -export const vaptchaID = "5dce36188713b71e70a41eb7" + // 获取数据字典 export const getDictData = "/dictData/getByType/" // Websocket diff --git a/seller/src/libs/util.js b/seller/src/libs/util.js index fbd61e67..8de25d1f 100644 --- a/seller/src/libs/util.js +++ b/seller/src/libs/util.js @@ -77,7 +77,7 @@ util.getRouterObjByName = function (routers, name) { util.handleTitle = function (vm, item) { if (typeof item.title == 'object') { - return vm.$t(item.title.i18n); + return item.title; } else { return item.title; } diff --git a/seller/src/locale/index.js b/seller/src/locale/index.js deleted file mode 100644 index ea3e99f0..00000000 --- a/seller/src/locale/index.js +++ /dev/null @@ -1,28 +0,0 @@ -import Vue from 'vue'; -import VueI18n from 'vue-i18n'; -import zhLocale from './lang/zh-CN'; -import enLocale from './lang/en-US'; -import zhCnLocale from 'view-design/src/locale/lang/zh-CN'; -import enUsLocale from 'view-design/src/locale/lang/en-US'; - -Vue.use(VueI18n); - -// 根据浏览器信息自动设置语言 -const navLang = navigator.language; -const localLang = (navLang == 'zh-CN' || navLang == 'en-US') ? navLang : false; -const lang = window.localStorage.lang || localLang || 'zh-CN'; - -Vue.config.lang = lang; - -// 多语言配置 vue-i18n 6.x+ -Vue.locale = () => { }; -const messages = { - 'zh-CN': Object.assign(zhCnLocale, zhLocale), - 'en-US': Object.assign(enUsLocale, enLocale) -}; -const i18n = new VueI18n({ - locale: lang, - messages -}); - -export default i18n; diff --git a/seller/src/locale/lang/en-US.js b/seller/src/locale/lang/en-US.js deleted file mode 100644 index eaaff0a1..00000000 --- a/seller/src/locale/lang/en-US.js +++ /dev/null @@ -1,24 +0,0 @@ -export default { - lili: 'lili', - usernameLogin: 'UsernameLogin', - mobileLogin: 'MobileLogin', - autoLogin: 'Auto Login', - forgetPass: 'Forget Password', - otherLogin: 'Sign in with', - regist: 'Register', - login: 'Login', - logining: 'Logining...', - home: 'home', - switchLangTitle: 'Switch Lang', - international: 'Switch Lang', - userCenter: 'Account Center', - changePass: 'Account Pass', - logout: 'Logout', - tagOption: 'Label Options', - closeAll: 'Close All', - closeOthers: 'Close Others', - help: 'Help', - privacy: 'Privacy', - terms: 'Terms', - rights: 'All Rights Reserved' -}; diff --git a/seller/src/locale/lang/zh-CN.js b/seller/src/locale/lang/zh-CN.js deleted file mode 100644 index 968673b1..00000000 --- a/seller/src/locale/lang/zh-CN.js +++ /dev/null @@ -1,24 +0,0 @@ -export default { - lili: 'lili', - usernameLogin: '账户密码登录', - mobileLogin: '手机号登录', - autoLogin: '自动登录', - forgetPass: '忘记密码', - otherLogin: '其他方式登录', - regist: '注册账户', - login: '登录', - logining: '登录中...', - home: '首页', - switchLangTitle: '切换语言', - international: '多语言切换', - userCenter: '个人中心', - changePass: '修改密码', - logout: '退出登录', - tagOption: '标签选项', - closeAll: '关闭全部', - closeOthers: '关闭其他', - help: '帮助', - privacy: '隐私', - terms: '条款', - rights: '版权所有' -}; diff --git a/seller/src/main.js b/seller/src/main.js index 1869ce00..99dc25c8 100644 --- a/seller/src/main.js +++ b/seller/src/main.js @@ -11,7 +11,6 @@ import vueQr from "vue-qr"; import App from "./App"; import { router } from "./router/index"; import store from "./store"; -import i18n from "@/locale"; import { getRequest, @@ -27,7 +26,6 @@ import util from "@/libs/util"; import dictUtil from "@/libs/dictUtil"; import VueLazyload from "vue-lazyload"; -import VueClipboard from "vue-clipboard2"; import * as filters from "@/utils/filters"; // global filter @@ -38,11 +36,9 @@ Vue.use(VueLazyload, { error: require("./assets/img-error.png"), loading: require("./assets/loading2.gif") }); -Vue.use(ViewUI, { - i18n: (key, value) => i18n.t(key, value) -}); -Vue.use(VueClipboard); +Vue.use(ViewUI); + Vue.component("vue-qr", vueQr); //此处将vue-qr添加为全局组件 // 挂载全局使用的方法 @@ -84,7 +80,6 @@ new Vue({ el: "#app", router, store, - i18n, render: h => h(App), data: { currentPageName: "" diff --git a/seller/src/router/router.js b/seller/src/router/router.js index e7174a9c..41f99bb2 100644 --- a/seller/src/router/router.js +++ b/seller/src/router/router.js @@ -19,7 +19,7 @@ export const otherRouter = { children: [ { path: "home", - title: { i18n: "home" }, + title: "首页", name: "home_index", component: () => import("@/views/home/home.vue") }, @@ -132,7 +132,7 @@ export const otherRouter = { title: "订单详情", name: "order-detail", component: () => import("@/views/order/order/orderDetail.vue") - }, + } // { // path: "/*", diff --git a/seller/src/views/Main.vue b/seller/src/views/Main.vue index 1fd57c47..eeb0744c 100644 --- a/seller/src/views/Main.vue +++ b/seller/src/views/Main.vue @@ -24,8 +24,8 @@
- {{ $t('changePass') }} - {{ $t('logout') }} + 切换 + 退出 diff --git a/seller/src/views/goods/goods-seller/goodsOperationSec.vue b/seller/src/views/goods/goods-seller/goodsOperationSec.vue index 89dadb80..9f5b012c 100644 --- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue +++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue @@ -9,14 +9,14 @@ {{ this.baseInfoForm.categoryName[0] }} > {{ this.baseInfoForm.categoryName[1] }} > {{ this.baseInfoForm.categoryName[2] }} - + - + - + - - 零售型 批发型 @@ -50,23 +48,21 @@

商品规格及图片

- + - + - +
- -
+ +
- + +
- +
@@ -100,8 +96,7 @@
- +
- +
规格详细
+ + "> - +
+ +
+