feat: 商品业务组件多样化/更换测试地址

2025-02-23 10:42:48 +08:00 · 2021-11-01 15:02:19 +08:00 · 2021-11-01 15:02:19 +08:00 · 8325ff6f55
commit 8325ff6f55
parent 89e3afb198
7 changed files with 115 additions and 145 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -2852,63 +2852,6 @@
          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
          "dev": true
        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
        "minimist": {
          "version": "1.2.5",
          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
@ -2923,28 +2866,6 @@
          "requires": {
            "minipass": "^3.1.1"
          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "vue-loader-v16": {
-          "version": "npm:vue-loader@16.8.2",
-          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.2.tgz",
-          "integrity": "sha512-Nkq+z9mAsMEK+qkXgK+9Ia7D8w9uu9j4ut0IMT5coMfux3rCgIp1QBB1CYwY0M34A1nRMSONEaWXxAAw6xSl/Q==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "chalk": "^4.1.0",
-            "hash-sum": "^2.0.0",
-            "loader-utils": "^2.0.0"
-          }
        }
      }
    },
@ -13278,6 +13199,87 @@
        }
      }
    },
+    "vue-loader-v16": {
+      "version": "npm:vue-loader@16.8.2",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.2.tgz",
+      "integrity": "sha512-Nkq+z9mAsMEK+qkXgK+9Ia7D8w9uu9j4ut0IMT5coMfux3rCgIp1QBB1CYwY0M34A1nRMSONEaWXxAAw6xSl/Q==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "chalk": "^4.1.0",
+        "hash-sum": "^2.0.0",
+        "loader-utils": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
    "vue-router": {
      "version": "3.5.3",
      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.3.tgz",
--- a/src/App.vue
+++ b/src/App.vue
@ -21,18 +21,13 @@ export default {
    }
  },
  created() {
-    if (process.env.NODE_ENV === 'development') {
-      // console.log('开发环境')
-      this.$httpApi
-        .loginAdminTest({ loginname: 'admin', pwd: '123456' })
-        .then((res) => {
-          console.log(res)
-          this.getPermission()
-        })
-    } else {
-      // console.log('生产环境')
-      this.getPermission()
-    }
+    this.$httpApi
+      .loginAdminTest({ loginname: 'admin', pwd: '123456' })
+      .then((res) => {
+        console.log(res)
+        this.getPermission()
+        this.getShopCommodity()
+      })
  },
  mounted() {
    //将hasPermission挂载到window
@ -48,6 +43,7 @@ export default {
        this.isRouterAlive = true
      })
    },
+    // 获取当前用户权限
    getPermission() {
      this.$httpApi.getPermission().then((res) => {
        let permissionsList = res.data.permissionsList
@ -57,9 +53,26 @@ export default {
        }
      })
    },
+    // 返回一个布尔值，判断对象是否包含特定的自身（非继承）属性
    hasPermission(permission) {
      return this.permissionsJson.hasOwnProperty(permission)
    },
+    // 获取商品数据
+    getShopCommodity() {
+      this.$httpApi
+        .getShopCommodity()
+        .then((res) => {
+          this.loading = false
+          console.log(res.data.shopCommodity, '------------------shopCommodity')
+          localStorage.setItem(
+            'shopCommodity',
+            JSON.stringify(res.data.shopCommodity)
+          )
+        })
+        .catch(() => {
+          this.loading = false
+        })
+    },
  },
 }
 </script>
@ -86,7 +99,7 @@ export default {
  transform: translateX(5px);
  opacity: 0;
 }
-.el-message-box.JSONView{
+.el-message-box.JSONView {
  width: 1100px;
 }
 </style>
--- a/src/api/api.js
+++ b/src/api/api.js
@ -114,7 +114,7 @@ class httpApi {
 		method: 'post'
 	})

-	//获取当前用户权限
+	//手机登录接口
 	loginAdminTest = data => httpAjax({
 		url: '/loginAdminTest',
 		data,
--- a/src/components/rightslider/listswitchingstyle/productUpload.vue
+++ b/src/components/rightslider/listswitchingstyle/productUpload.vue
@ -1,34 +1,6 @@
 <!-- 已被弃用  该组件为抽离的 魔方组件种商品上传 -->
 <template>
  <div class="productUpload">
-    <!-- 分类名称 -->
-    <!-- <section v-for="(item, index) in datas.commoditylisttypetab" :key="index">
-
-    <div class="bor" />
-
-    <el-input v-model="item.text" class="tit" style="width: 100px" placeholder="请输入分组名称" size="mini" />
-    <i @click="delecommoditylisttypetab(index)" class="el-icon-delete" style="cursor: pointer;padding: 2px 4px;fnot-size: 12px;margin-left: 200px;color: red;" />
-
-    <vuedraggable v-model="item.imageList" v-bind="dragOptions">
-      <transition-group>
-        <section class="imgBanner" v-for="(item, ind) in item.imageList" :key="item+ind">
-          <i class="el-icon-circle-close" @click="delecommodityimg(index, ind)" />
-          <div class="imag">
-            <img draggable="false" :src="item.coverUrl" alt="">
-          </div>
-          <div class="imgText">
-            <div>
-              <el-input disabled="disabled" style="width: 65%" v-model="item.name" size="mini" />
-              <el-input disabled="disabled" type="number" style="width: 35%" v-model.number="item.price" size="mini" />
-            </div>
-            <el-input disabled="disabled" v-model="item.introduce" size="mini" />
-          </div>
-        </section>
-      </transition-group>
-    </vuedraggable>
-
-    <el-button @click="dialogVisibleshow('commoditylisttypetab', index)" class="uploadImg" type="primary" plain><i class="el-icon-plus" />点击添加商品</el-button>
-  </section> -->
    <vuedraggable v-model="datas.commoditylisttypetab" v-bind="dragOptions">
      <section
        class="magiccubestyleList"
--- a/src/router/index.js
+++ b/src/router/index.js
@ -4,7 +4,6 @@ import VueRouter from 'vue-router'
 Vue.use(VueRouter)

 const routes = [
-  // { path: '/', redirect: '/establishShop' },
  {
    path: '/',
    name: 'layout',
@ -12,7 +11,7 @@ const routes = [
    component: () => import('@/layout'),
    children: [
      {
-        //首页
+        //  首页
        path: '/home',
        name: 'home',
        component: () => import('@/layout/home'),
@ -20,7 +19,7 @@ const routes = [
    ],
  },
  {
-    //创建页面
+    //  创建页面
    path: '/establishShop',
    name: 'establishShop',
    component: () => import('@/views/establishShop'),
@ -28,7 +27,8 @@ const routes = [
 ]

 const router = new VueRouter({
-  routes,
+  base: process.env.BASE_URL,
+  routes
 })

 export default router
--- a/src/views/establishShop/index.vue
+++ b/src/views/establishShop/index.vue
@ -403,7 +403,7 @@ export default {
          this.tableData = res.data
        })
        .then(() => {
-          this.getShopCommodity()
+          this.loading = false
        })
        .catch(() => {
          this.loading = false
@ -667,24 +667,7 @@ export default {
      console.log(err)
      console.log(file)
      console.log(fileList)
-    },
-    getShopCommodity() {
-      this.$httpApi
-        .getShopCommodity()
-        .then((res) => {
-          this.loading = false
-
-          
-          console.log(res.data.shopCommodity, '------------------shopCommodity')
-          localStorage.setItem(
-            'shopCommodity',
-            JSON.stringify(res.data.shopCommodity)
-          )
-        })
-        .catch(() => {
-          this.loading = false
-        })
-    },
+    }
  },

  computed: {
--- a/vue.config.js
+++ b/vue.config.js
@ -12,7 +12,7 @@ module.exports = {
    open: true,
    proxy: {
      '/api': {
-        target: 'https://shop.starfirelink.com/',
+        target: 'https://player.okgene.work/',
        ws: true,
        changeOrigin: true,
        pathRewrite: {