浏览代码

修改node-sass版本和提交商品类型排序

1
mo 2 年之前
父节点
当前提交
83cb0de47d

文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/0.c7ebd182483f970b53f5.js.map


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/29.4cda0dd3fc032e2b8e21.js.map


文件差异内容过多而无法显示
+ 13765 - 5
package-lock.json


+ 2 - 2
package.json

@@ -43,7 +43,6 @@
     "friendly-errors-webpack-plugin": "^1.6.1",
     "html-webpack-plugin": "^2.30.1",
     "node-notifier": "^5.1.2",
-    "node-sass": "^4.14.1",
     "optimize-css-assets-webpack-plugin": "^3.2.0",
     "ora": "^1.2.0",
     "portfinder": "^1.0.13",
@@ -51,7 +50,8 @@
     "postcss-loader": "^2.0.8",
     "postcss-url": "^7.2.1",
     "rimraf": "^2.6.0",
-    "sass-loader": "^7.0.1",
+    "sass": "^1.54.8",
+    "sass-loader": "^7.3.1",
     "semver": "^5.3.0",
     "shelljs": "^0.7.6",
     "svg-sprite-loader": "^3.7.3",

+ 1 - 1
src/views/pms/product/components/ProductInfoDetail.vue

@@ -297,7 +297,7 @@ input[type="number"] {
 }
 
 .number-input {
-  /deep/ .el-input__inner {
+ ::v-deep .el-input__inner {
     text-align: left;
   }
 

+ 2 - 2
src/views/pms/product/index.vue

@@ -1,5 +1,5 @@
 <template>
-   
+
   <div class="app-container">
     <el-card class="filter-container" shadow="never">
       <div>
@@ -759,7 +759,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-/deep/.el-select--small {
+::v-deep.el-select--small {
   width: 203px !important;
 }
 </style>

+ 9 - 1
src/views/pms/productAttr/index.vue

@@ -22,6 +22,9 @@
         <el-table-column label="类型名称" align="center">
           <template slot-scope="scope">{{scope.row.name}}</template>
         </el-table-column>
+        <el-table-column label="排序" align="center" width="100">
+          <template slot-scope="scope">{{scope.row.sort}}</template>
+        </el-table-column>
         <el-table-column label="属性数量" width="200" align="center">
           <template slot-scope="scope">{{scope.row.attributeCount==null?0:scope.row.attributeCount}}</template>
         </el-table-column>
@@ -76,6 +79,9 @@
         <el-form-item label="类型名称" prop="name">
           <el-input v-model="productAttrCate.name" auto-complete="off"></el-input>
         </el-form-item>
+        <el-form-item label="排序值" prop="sort">
+          <el-input v-model.number="productAttrCate.sort" auto-complete="off"></el-input>
+        </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
@@ -157,6 +163,7 @@
         this.dialogTitle = "编辑类型";
         this.productAttrCate.name = row.name;
         this.productAttrCate.id = row.id;
+        this.productAttrCate.sort = row.sort;
       },
       getAttrList(index, row) {
         this.$router.push({path: '/pms/productAttrList',query:{cid:row.id,cname:row.name,type:0}})
@@ -170,7 +177,8 @@
             // let data = new URLSearchParams();
             // data.append("name",this.productAttrCate.name);
             let obj = {
-              name:this.productAttrCate.name
+              name:this.productAttrCate.name,
+              sort:this.productAttrCate.sort
             }
             if(this.dialogTitle==="添加类型"){
               createProductAttrCate(obj).then(response=>{

部分文件因为文件数量过多而无法显示