Merge branch 'master' of http://60.204.229.151:20080/chenkangxu/merchant-web

src/api/modules/mer_admin.js

@@ -52,6 +52,18 @@ export const mer_admin = {
     getProductCategory: () => {
         return $http.get(`/merchant-api/product/category/list?shopId=${JSON.parse(sessionStorage.getItem('userInfo')).shopId}`);
     },
+    //上架或下架
+    putOnShelvesProducts: (data) => {
+        return $http.post(`/merchant-api/product/batch/update/status`, data);
+    },
+    //批量删除商品
+    BatchDeleteProducts: (data) => {
+        return $http.post(`/merchant-api/product/batch/delete`, data);
+    },
+    //打折扣
+    setDiscounts: (data) => {
+        return $http.post(`merchant-api/activity/save`, data);
+    },
     //获取销售单位
     getSaleUnit: (data) => {
         return $http.request({ url: `/merchant-api/product/unit/list`, method: 'get', params: data });

src/views/modules/product/index.vue

@@ -29,7 +29,6 @@
               placeholder="商品搜索"
             ></el-input>
           </el-form-item>
-
           <el-form-item>
             <el-button type="primary" @click="$refs.oTable.reload()"
               >查询</el-button
@@ -92,6 +91,7 @@ export default {
         border: true,
         height: "auto",
         "row-id": "id",
+        "show-overflow": false,
       },
       productFilterType: "SALE",
       selectList: [],
@@ -112,6 +112,7 @@ export default {
         type: "warning",
       })
         .then(() => {
+          console.log("111");
           this.$api.mer_admin.BatchDeleteProducts(integers).then((res) => {
             this.$refs.oTable.reload();
           });

src/views/modules/product/popup/add-or-update.vue

@@ -187,16 +187,7 @@ export default {
               productIntroducePhoto: "",
               productPhotoList: [],
               productPlace: "",
-              productSpecificationList: [
-                {
-                  attributeValue: "默认",
-                  costPrice: 20,
-                  salePrice: 30,
-                  stockNum: 10,
-                  weight: 1,
-                  volume: 0.3,
-                },
-              ],
+              productSpecificationList: [],
               productUnit: "",
               productVideo: "",
               shelfLife: "",
@@ -657,9 +648,10 @@ export default {
                     v-model={this.place}
                     onChange={change}
                     options={this.$api.mer_admin.getCityOptions()}
-                    {...{
+                    props={{
                       props: {
-                        checkStrictly: true,
+                        label: "name",
+                        value: "name",
                       },
                     }}
                     clearable

src/views/modules/product/popup/add-price.vue

@@ -9,7 +9,7 @@
       :modalHandles="modalHandles"
     >
       <obj-table-plus
-        v-show="tableData.length > 1"
+        v-show="modalData.specType == 1"
         style="height: calc(100vh - 120px - 240px)"
         slot="dialog__after"
         ref="oTable"
@@ -86,7 +86,7 @@ export default {
   },
   computed: {
     modalCols() {
-      if (this.tableData.length == 1) {
+      if (this.modalData.specType == 0) {
         return [
           {
             label: "价格",
@@ -154,7 +154,7 @@ export default {
           type: "primary",
           submit: true,
           handle: debounce(() => {
-            if (this.tableData.length == 1) {
+            if (this.modalData.specType == 0) {
               this.$api.mer_admin
                 .saveProductBase(this.modalData)
                 .then((res) => {

src/views/modules/product/popup/add-specifications.vue

@@ -91,7 +91,6 @@ export default {
       //监控对象数据
       tableData: [],
       //表格属性
-      //表格属性
       tableProp: {
         height: "auto",
         border: true,
@@ -399,6 +398,8 @@ export default {
           disabled: () => this.tableData.length <= 0,
           // submit: true,
           handle: () => {
+            let volume = "" //重量
+            let weight = "" //体积
             let salePrice = ""; //价格范围
             let stockNum = ""; //库存范围
             let minSalePrice = Math.min.apply(

src/views/modules/product/popup/add-stock.vue

@@ -9,7 +9,7 @@
       :modalHandles="modalHandles"
     >
       <obj-table-plus
-        v-show="tableData.length > 1"
+        v-show="modalData.specType == 1"
         style="height: calc(100vh - 120px - 240px)"
         slot="dialog__after"
         ref="oTable"
@@ -86,7 +86,7 @@ export default {
   },
   computed: {
     modalCols() {
-      if (this.tableData.length == 1) {
+      if (this.modalData.specType == 0) {
         return [
           {
             label: "库存",
@@ -154,7 +154,7 @@ export default {
           type: "primary",
           submit: true,
           handle: debounce(() => {
-            if (this.tableData.length == 1) {
+            if (this.modalData.specType == 0) {
               this.$api.mer_admin
                 .saveProductBase(this.modalData)
                 .then((res) => {