diff --git a/resources/frontend/dist.zip b/resources/frontend/dist.zip
new file mode 100644
index 0000000..8f37a50
Binary files /dev/null and b/resources/frontend/dist.zip differ
diff --git a/resources/frontend/src/api/goods.js b/resources/frontend/src/api/goods.js
index 894a92a..02c2644 100644
--- a/resources/frontend/src/api/goods.js
+++ b/resources/frontend/src/api/goods.js
@@ -57,3 +57,13 @@ export function singleUpdate(id, data) {
data,
});
}
+
+// 图片上传
+export function imgUpload(data, item) {
+ return http({
+ url: "/api/upload",
+ Headers: item,
+ method: "post",
+ data,
+ });
+}
diff --git a/resources/frontend/src/router/index.js b/resources/frontend/src/router/index.js
index ab2b6e3..9405acd 100644
--- a/resources/frontend/src/router/index.js
+++ b/resources/frontend/src/router/index.js
@@ -1,6 +1,6 @@
import Vue from "vue";
import VueRouter from "vue-router";
-import axios from "axios";
+// import axios from "axios";
Vue.use(VueRouter);
diff --git a/resources/frontend/src/router/index1.js b/resources/frontend/src/router/index1.js
index 1b1a5c5..977d317 100644
--- a/resources/frontend/src/router/index1.js
+++ b/resources/frontend/src/router/index1.js
@@ -57,7 +57,7 @@ const list = [
component: () => import("../views/shuju/record.vue"),
},
{
- path: "/index/yingyeting/addgoods",
+ path: "ADDGOODS",
name: "新建商品",
component: () => import("../views/yingyeting/addgoods/addgoods.vue"),
},
@@ -67,10 +67,10 @@ const list = [
},
],
},
- {
- path: "/",
- redirect: "/index",
- },
+ // {
+ // path: "/",
+ // redirect: "/index",
+ // },
];
export default list;
diff --git a/resources/frontend/src/views/index.vue b/resources/frontend/src/views/index.vue
index 2fe43cf..4b52385 100644
--- a/resources/frontend/src/views/index.vue
+++ b/resources/frontend/src/views/index.vue
@@ -50,7 +50,7 @@
-
+
@@ -112,7 +112,7 @@ export default {
// table构造
$route: {
handler: function (val) {
- console.log("0.0", val);
+ // console.log("0.0", val);
this.titie = val.matched;
this.head = val.name;
this.levelData.push({ name: val.name, path: val.path });
@@ -126,7 +126,7 @@ export default {
}
this.levelData = newArr;
- console.log("table构造", this.levelData);
+ // console.log("table构造", this.levelData);
},
deep: true,
immediate: true,
diff --git a/resources/frontend/src/views/store/store.vue b/resources/frontend/src/views/store/store.vue
index 018264b..cd47a82 100644
--- a/resources/frontend/src/views/store/store.vue
+++ b/resources/frontend/src/views/store/store.vue
@@ -14,9 +14,24 @@
授权 授 权
- {{ scope.row.status }}
+ 重新授权
+ {{
+ scope.row.status
+ }}
@@ -120,6 +135,7 @@ export default {
storeList(page).then((res) => {
this.tableData = res.data.data;
this.Paginationdata = res.data.meta;
+ console.log(111111, this.tableData);
});
},
@@ -148,6 +164,11 @@ export default {
diff --git a/resources/frontend/src/views/yingyeting/yingyeting.vue b/resources/frontend/src/views/yingyeting/yingyeting.vue
index 5e544bf..155cb14 100644
--- a/resources/frontend/src/views/yingyeting/yingyeting.vue
+++ b/resources/frontend/src/views/yingyeting/yingyeting.vue
@@ -239,19 +239,9 @@
-
+
-
+
@@ -271,7 +261,7 @@
-
+
@@ -337,7 +327,7 @@
label="店铺订单"
min-width="110"
>
-
+
@@ -371,14 +361,9 @@
-
+
-
+
@@ -596,7 +581,7 @@ export default {
// console.log("我是路由信息", this.$route);
sessionStorage.setItem("商品ID", goodsid);
sessionStorage.setItem("ID", id);
- this.$router.push("/index/yingyeting/addgoods");
+ this.$router.push("/ADDGOODS");
},
// 获取商品列表
@@ -681,7 +666,7 @@ export default {
},
// 新增商品跳转
addNewgoods() {
- this.$router.push("/index/yingyeting/addgoods");
+ this.$router.push("/ADDGOODS");
},
//分页功能
diff --git a/resources/frontend/vue.config.js b/resources/frontend/vue.config.js
index c43d458..5781276 100644
--- a/resources/frontend/vue.config.js
+++ b/resources/frontend/vue.config.js
@@ -1,22 +1,24 @@
module.exports = {
lintOnSave: false,
- publicPath: './', // 配置打包之后的相对路径
+ publicPath: "./", // 配置打包之后的相对路径
devServer: {
open: true, // 设置浏览器自动打开项目
port: 8080, // 开发服务器运行端口号
overlay: {
warnings: false,
- errors: true
+ errors: true,
},
- proxy: { // 配置代理
- '/api': {
+ proxy: {
+ // 配置代理
+ "/api": {
// target: 'http://doc.ii090.com/mock/267/',
- target: 'http://erp.staging.miaoxuan66.cn',
+ target: "http://erp.staging.miaoxuan66.cn",
changeOrigin: true, // 开启代理
- pathRewrite: { // 重命名
- '^/api': 'api'
- }
- }
- }
- }
-}
+ pathRewrite: {
+ // 重命名
+ "^/api": "api",
+ },
+ },
+ },
+ },
+};
diff --git a/resources/node_modules/.package_versions.json b/resources/node_modules/.package_versions.json
new file mode 100644
index 0000000..9e26dfe
--- /dev/null
+++ b/resources/node_modules/.package_versions.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file