diff --git a/.env b/.env index 80a1924..e84851a 100644 --- a/.env +++ b/.env @@ -17,17 +17,17 @@ VITE_PWD_ENC_KEY='pigxpigxpigxpigx' VITE_OAUTH2_APP_CLIENT='mini:mini' # 图片访问基础地址 - VITE_IMAGE_BASE_PATH = http://localhost:9999 +VITE_IMAGE_BASE_PATH = http://localhost:9999 # VITE_IMAGE_BASE_PATH = http://192.168.101.64:9999 # 邓-本地 # VITE_IMAGE_BASE_PATH = https://123.156.230.15:8089/api # 线上 # VITE_IMAGE_BASE_PATH = http://220.191.229.171:8090/api # 线上 -#VITE_IMAGE_BASE_PATH = https://stgl.pj.gov.cn/api # 线上 -; # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc # 张 -#VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api # 信创线上 +# VITE_IMAGE_BASE_PATH = https://stgl.pj.gov.cn/api # 线上 +# VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc # 张 +# VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api # 信创线上 # ******************** start 开发环境 start ******************** -#VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上 -#VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/api +# VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上 +# VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/api # VITE_APP_DEV_SERVICE = http://192.168.101.64:9999 # 邓-本地 # VITE_APP_DEV_SERVICE = http://127.0.0.1:9999 VITE_APP_DEV_SERVICE = http://123.156.230.15:8089/api/ # 访客线上 @@ -35,12 +35,9 @@ VITE_APP_DEV_SERVICE = http://123.156.230.15:8089/api/ # 访客线上 # ******************** end 开发环境 end ******************** # ******************** start 生产环境 start **************** -#VITE_APP_PROD_SERVICE = http://123.156.228.134:48080/app-api -; #VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api -#VITE_APP_PROD_SERVICE = https://stgl.pj.gov.cn/api +# VITE_APP_PROD_SERVICE = http://123.156.228.134:48080/app-api +# VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api +# VITE_APP_PROD_SERVICE = https://stgl.pj.gov.cn/api VITE_APP_PROD_SERVICE = http://123.156.230.15:8089/api -#VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api # 信创线上 +# VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api # 信创线上 # ******************** end 生产环境 end ******************** - -#VITE_DEV_ENV = dev - VITE_DEV_ENV = prod diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 15d7fa7..416f29c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -53,6 +53,9 @@ importers: '@dcloudio/uni-quickapp-webview': specifier: 3.0.0-4020920240930001 version: 3.0.0-4020920240930001(postcss@8.5.1)(rollup@4.34.2)(vue@3.5.13(typescript@4.9.5)) + '@vant/weapp': + specifier: ^1.11.7 + version: 1.11.7 '@vue/compiler-core': specifier: ^3.5.11 version: 3.5.13 @@ -74,6 +77,9 @@ importers: pinia: specifier: ^2.2.6 version: 2.3.1(typescript@4.9.5)(vue@3.5.13(typescript@4.9.5)) + qrcode: + specifier: ^1.5.4 + version: 1.5.4 qs: specifier: ^6.13.1 version: 6.14.0 @@ -1565,6 +1571,9 @@ packages: peerDependencies: vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0 + '@vant/weapp@1.11.7': + resolution: {integrity: sha512-Rwn9BBnb4kHSV4XmvBicwtd42J+amEUfnFDcXJsGNPNX4a9c/DoT6YLsm4X1wB2+sQbdiQsbFBLAvGRBxCkD8g==} + '@vitejs/plugin-legacy@5.3.2': resolution: {integrity: sha512-8moCOrIMaZ/Rjln0Q6GsH6s8fAt1JOI3k8nmfX4tXUxE5KAExVctSyOBk+A25GClsdSWqIk2yaUthH3KJ2X4tg==} engines: {node: ^18.0.0 || >=20.0.0} @@ -2001,6 +2010,9 @@ packages: cjs-module-lexer@1.4.3: resolution: {integrity: sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==} + cliui@6.0.0: + resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==} + cliui@7.0.4: resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==} @@ -2150,6 +2162,10 @@ packages: supports-color: optional: true + decamelize@1.2.0: + resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==} + engines: {node: '>=0.10.0'} + decimal.js@10.5.0: resolution: {integrity: sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==} @@ -2190,6 +2206,9 @@ packages: resolution: {integrity: sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dijkstrajs@1.0.3: + resolution: {integrity: sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA==} + dom-walk@0.1.2: resolution: {integrity: sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==} @@ -3205,6 +3224,10 @@ packages: resolution: {integrity: sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==} engines: {node: '>=4.0.0'} + pngjs@5.0.0: + resolution: {integrity: sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==} + engines: {node: '>=10.13.0'} + postcss-import@14.1.0: resolution: {integrity: sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==} engines: {node: '>=10.0.0'} @@ -3297,6 +3320,11 @@ packages: resolution: {integrity: sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ==} hasBin: true + qrcode@1.5.4: + resolution: {integrity: sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg==} + engines: {node: '>=10.13.0'} + hasBin: true + qs@6.13.0: resolution: {integrity: sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==} engines: {node: '>=0.6'} @@ -3371,6 +3399,9 @@ packages: resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==} engines: {node: '>=0.10.0'} + require-main-filename@2.0.0: + resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==} + requires-port@1.0.0: resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==} @@ -3476,6 +3507,9 @@ packages: resolution: {integrity: sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==} engines: {node: '>= 0.8.0'} + set-blocking@2.0.0: + resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==} + setprototypeof@1.2.0: resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==} @@ -3919,11 +3953,18 @@ packages: resolution: {integrity: sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==} engines: {node: '>=10'} + which-module@2.0.1: + resolution: {integrity: sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==} + which@2.0.2: resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==} engines: {node: '>= 8'} hasBin: true + wrap-ansi@6.2.0: + resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==} + engines: {node: '>=8'} + wrap-ansi@7.0.0: resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==} engines: {node: '>=10'} @@ -3989,6 +4030,9 @@ packages: resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==} engines: {node: '>=0.4'} + y18n@4.0.3: + resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==} + y18n@5.0.8: resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==} engines: {node: '>=10'} @@ -4000,10 +4044,18 @@ packages: resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} engines: {node: '>= 6'} + yargs-parser@18.1.3: + resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==} + engines: {node: '>=6'} + yargs-parser@20.2.9: resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==} engines: {node: '>=10'} + yargs@15.4.1: + resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==} + engines: {node: '>=8'} + yargs@16.2.0: resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==} engines: {node: '>=10'} @@ -6268,6 +6320,8 @@ snapshots: transitivePeerDependencies: - rollup + '@vant/weapp@1.11.7': {} + '@vitejs/plugin-legacy@5.3.2(terser@5.37.0)(vite@5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0))': dependencies: '@babel/core': 7.26.7 @@ -6833,6 +6887,12 @@ snapshots: cjs-module-lexer@1.4.3: {} + cliui@6.0.0: + dependencies: + string-width: 4.2.3 + strip-ansi: 6.0.1 + wrap-ansi: 6.2.0 + cliui@7.0.4: dependencies: string-width: 4.2.3 @@ -6946,6 +7006,8 @@ snapshots: dependencies: ms: 2.1.3 + decamelize@1.2.0: {} + decimal.js@10.5.0: {} dedent@0.7.0: {} @@ -6970,6 +7032,8 @@ snapshots: diff-sequences@27.5.1: {} + dijkstrajs@1.0.3: {} + dom-walk@0.1.2: {} domexception@2.0.1: @@ -8176,6 +8240,8 @@ snapshots: pngjs@3.4.0: {} + pngjs@5.0.0: {} + postcss-import@14.1.0(postcss@8.5.1): dependencies: postcss: 8.5.1 @@ -8269,6 +8335,12 @@ snapshots: qrcode-terminal@0.12.0: {} + qrcode@1.5.4: + dependencies: + dijkstrajs: 1.0.3 + pngjs: 5.0.0 + yargs: 15.4.1 + qs@6.13.0: dependencies: side-channel: 1.1.0 @@ -8339,6 +8411,8 @@ snapshots: require-from-string@2.0.2: {} + require-main-filename@2.0.0: {} + requires-port@1.0.0: {} resolve-cwd@3.0.0: @@ -8469,6 +8543,8 @@ snapshots: transitivePeerDependencies: - supports-color + set-blocking@2.0.0: {} + setprototypeof@1.2.0: {} shebang-command@2.0.0: @@ -8935,10 +9011,18 @@ snapshots: tr46: 2.1.0 webidl-conversions: 6.1.0 + which-module@2.0.1: {} + which@2.0.2: dependencies: isexe: 2.0.0 + wrap-ansi@6.2.0: + dependencies: + ansi-styles: 4.3.0 + string-width: 4.2.3 + strip-ansi: 6.0.1 + wrap-ansi@7.0.0: dependencies: ansi-styles: 4.3.0 @@ -8984,14 +9068,35 @@ snapshots: xtend@4.0.2: {} + y18n@4.0.3: {} + y18n@5.0.8: {} yallist@3.1.1: {} yaml@1.10.2: {} + yargs-parser@18.1.3: + dependencies: + camelcase: 5.3.1 + decamelize: 1.2.0 + yargs-parser@20.2.9: {} + yargs@15.4.1: + dependencies: + cliui: 6.0.0 + decamelize: 1.2.0 + find-up: 4.1.0 + get-caller-file: 2.0.5 + require-directory: 2.1.1 + require-main-filename: 2.0.0 + set-blocking: 2.0.0 + string-width: 4.2.3 + which-module: 2.0.1 + y18n: 4.0.3 + yargs-parser: 18.1.3 + yargs@16.2.0: dependencies: cliui: 7.0.4 diff --git a/src/pages.json b/src/pages.json index 86b8eaa..22f515c 100644 --- a/src/pages.json +++ b/src/pages.json @@ -164,14 +164,14 @@ "disableScroll": true } }, - { - "path": "food", - "style": { - "navigationBarTitleText": "菜谱", - "navigationBarBackgroundColor": "#1777FF", - "disableScroll": true - } - }, + // { + // "path": "food", + // "style": { + // "navigationBarTitleText": "菜谱", + // "navigationBarBackgroundColor": "#1777FF", + // "disableScroll": true + // } + // }, { "path": "product-detail", "style": { @@ -260,12 +260,12 @@ "iconPath": "/static/tabbar/my.png", "selectedIconPath": "/static/tabbar/my-select.png" }, - { - "pagePath": "pages/integrated/visitor/verify", - "text": "访客核销", - "iconPath": "/static/tabbar/my.png", - "selectedIconPath": "/static/tabbar/my-select.png" - }, + // { + // "pagePath": "pages/integrated/visitor/verify", + // "text": "访客核销", + // "iconPath": "/static/tabbar/my.png", + // "selectedIconPath": "/static/tabbar/my-select.png" + // }, { "pagePath": "pages/tabbar/my", "text": "我的", diff --git a/src/pages/apply/foreign-apply.vue b/src/pages/apply/foreign-apply.vue index 739742b..391d48d 100644 --- a/src/pages/apply/foreign-apply.vue +++ b/src/pages/apply/foreign-apply.vue @@ -1,6 +1,6 @@ - \ No newline at end of file + diff --git a/src/pages/apply/stride-apply.vue b/src/pages/apply/stride-apply.vue index f6f8ee1..90de96a 100644 --- a/src/pages/apply/stride-apply.vue +++ b/src/pages/apply/stride-apply.vue @@ -1,111 +1,117 @@ - \ No newline at end of file + diff --git a/src/pages/boxes/apply.vue b/src/pages/boxes/apply.vue index 2aa2273..e54b56d 100644 --- a/src/pages/boxes/apply.vue +++ b/src/pages/boxes/apply.vue @@ -19,7 +19,7 @@ const state = reactive({ end: "", }, }) -const applyForm = reactive({ +let applyForm = reactive({ displayTimeRange: "", displayTimeRangeStr: "", bxDate: null, diff --git a/src/pages/merchant/food.vue b/src/pages/merchant/food.vue deleted file mode 100644 index c3e2e42..0000000 --- a/src/pages/merchant/food.vue +++ /dev/null @@ -1,201 +0,0 @@ - - - - - diff --git a/src/pages/test/login.vue b/src/pages/test/login.vue index d75825f..92c8578 100644 --- a/src/pages/test/login.vue +++ b/src/pages/test/login.vue @@ -11,9 +11,13 @@ - 登录 + 登录 - @@ -23,8 +27,9 @@ import { ref, reactive } from "vue" import { constant, router } from "@@/index" import { userApi } from "@@/api" +import request from "@/sheep/utils/request" -const applyForm = reactive({ +let applyForm = reactive({ username: "", password: "", }) @@ -64,15 +69,15 @@ const doSubmit = async () => { // import { useUserStore } from "@/store/user.js" // 使用store仓库 // const userStore = useUserStore() -// 获取用户信息的方法 +// 获取用户信息 const getUserInfo = () => { uni.getUserInfo({ success: (res) => { // 存储用户信息 - // console.log(res.userInfo); // userStore.updateUserInfo(res.userInfo) + console.log(res) - getToken(res) + login() }, fail: (res) => { return uni.showToast({ title: "API调用失败", icon: "error" }) @@ -81,27 +86,84 @@ const getUserInfo = () => { } // 请求获取token -const getToken = async (info: any) => { +const login = async () => { const result = await uni.login().catch((error) => error) - // 判断是否调用失败 if (result.errMsg === "login:ok") { const params = { mobile: "MINI@" + result.code, code: result.code, } - const res: any = await userApi.login(params) - if (res == 0) { - // const token = "Bearer 123456789" - // 更新获取的token - // userStore.updateToken(token) - router.back() - return uni.showToast({ title: "登录成功", icon: "none" }) - } else { - return uni.showToast({ title: "获取token失败，登录失败", icon: "error" }) - } + console.log("result.code", result.code) // 0e3XvSll2ptntf4bg3ol2BdVFH1XvSlM + console.log("params", params) + + const res: any = await request({ + url: "/auth/oauth2/token?grant_type=mobile", + method: "post", + data: params, + header: { + Authorization: "Basic bWluaTptaW5p", + "Content-Type": "application/x-www-form-urlencoded", + }, + }) + console.log("xx", res) + + // if (res == 0) { + // // const token = "Bearer 123456789" + // // 更新获取的token + // // userStore.updateToken(token) + + // router.back() + // return uni.showToast({ title: "登录成功", icon: "none" }) + // } else { + // return uni.showToast({ title: "获取token失败，登录失败", icon: "error" }) + // } } else { uni.showToast({ title: "获取登录code失败", icon: "error" }) } } + +// 绑定 +const bind = async (mobile?: string, code?: string) => { + // 1. 使用验证码登录获取token + const params = { + mobile: "SMS@" + "17319791971", + code: "0e3XvSll2ptntf4bg3ol2BdVFH1XvSlM", + grant_type: "mobile", + } + + const res = await request({ + url: "/auth/oauth2/token", + method: "post", + data: params, + header: { + Authorization: "Basic bWluaTptaW5p", + "Content-Type": "application/x-www-form-urlencoded", + }, + }) + console.log(res) + + const token = res.data.access_token + + // 2. 获取新的小程序code并完成绑定 + // uni.login({ + // success(loginRes) { + // wx.request({ + // url: "${BASE_URL}/admin/social/bind?state=MINI&code=" + loginRes.code, + // method: "post", + // header: { + // Authorization: "Bearer " + token, + // }, + // success() { + // wx.showToast({ + // title: "绑定成功", + // success() { + // wx.navigateBack() + // }, + // }) + // }, + // }) + // }, + // }) +} diff --git a/src/sheep/api/user.ts b/src/sheep/api/user.ts index bf2fe7c..5306ac9 100644 --- a/src/sheep/api/user.ts +++ b/src/sheep/api/user.ts @@ -2,16 +2,18 @@ import request from "@/sheep/utils/request" import { encryption } from "@/sheep/utils/encryption" // 将 Basic Auth 字符串提取为常量 -const BASIC_AUTH = "Basic " + window.btoa(import.meta.env.VITE_OAUTH2_APP_CLIENT) +// const BASIC_AUTH = "Basic " + window.btoa(import.meta.env.VITE_OAUTH2_APP_CLIENT) +const BASIC_AUTH = "Basic " + import.meta.env.VITE_OAUTH2_APP_CLIENT // 定义接口类型 interface LoginParams { - username: string - password: string - randomStr: string - code: string - grant_type: string - scope: string + username?: string + password?: string + randomStr?: string + mobile?: string + code?: string + grant_type?: string + scope?: string } export default { diff --git a/src/sheep/components/base/base-just-flot-nav/base-just-flot-nav.vue b/src/sheep/components/base/base-just-flot-nav/base-just-flot-nav.vue index 4bd72be..1e51c05 100644 --- a/src/sheep/components/base/base-just-flot-nav/base-just-flot-nav.vue +++ b/src/sheep/components/base/base-just-flot-nav/base-just-flot-nav.vue @@ -1,5 +1,5 @@ \ No newline at end of file + diff --git a/src/sheep/components/crud/crud-layout/crud-layout.vue b/src/sheep/components/crud/crud-layout/crud-layout.vue index bba4aef..1299650 100644 --- a/src/sheep/components/crud/crud-layout/crud-layout.vue +++ b/src/sheep/components/crud/crud-layout/crud-layout.vue @@ -1,5 +1,5 @@