src/api/modules/mer_admin.js

@@ -2,128 +2,108 @@ import $http from "@/utils/httpRequest.js";
 import city_data from "@/utils/country-level2-data.js";
 
 export const mer_admin = {
-  /**
+    /** 
-   * 登录
+ * 登录
-   * @param {object} params LoginParam
+ * @param {object} params LoginParam
-   * @param {number} params.type
+ * @param {number} params.type 
-   * @param {string} params.role
+ * @param {string} params.role 
-   * @param {string} params.username
+ * @param {string} params.username 
-   * @param {string} params.password
+ * @param {string} params.password 
-   * @param {string} params.mobile
+ * @param {string} params.mobile 
-   * @param {string} params.code
+ * @param {string} params.code 
-   * @returns
+ * @returns
-   */
+ */
-  loginByAccount: (params) => {
+    loginByAccount: (params) => {
-    return $http.post(`/auth/login`, {
+        return $http.post(`/auth/login`, {
-      ...params,
+            ...params,
-      type: 1,
+            type: 1
-    });
+        })
-  },
+    },
-  loginByMobile: (params) => {
+    loginByMobile: (params) => {
-    return $http.post(`/merchant-api/auth/sms/login`, {
+        return $http.post(`/merchant-api/auth/sms/login`, {
-      ...params,
+            ...params,
-      type: 2,
+            type: 2
-    });
+        })
-  },
+    },
-  getYZM(mobile) {
+    getYZM(mobile) {
-    return $http.get(`/merchant-api/auth/login/code?mobile=${mobile}`);
+        return $http.get(`/merchant-api/auth/login/code?mobile=${mobile}`);
-  },
+    },
-  getInfo() {
+    getInfo() {
-    return $http.get(`/merchant-api/auth/info`);
+        return $http.get(`/merchant-api/auth/info`);
-  },
+    },
-  //商品管理
+    //商品管理
-  //保存商品信息
+    //保存商品信息
-  saveProduct: (data) => {
+    saveProduct: (data) => {
-    return $http.post(`/merchant-api/product/save`, data);
+        return $http.post(`/merchant-api/product/save`, data);
-  },
+    },
-  //保存商品基本信息
+    //保存商品基本信息
-  saveProductBase: (data) => {
+    saveProductBase: (data) => {
-    return $http.post(`/merchant-api/product/save/basic`, data);
+        return $http.post(`/merchant-api/product/save/basic`, data);
-  },
+    },
-  //返回商品分类以及列表(聚合)
+    //返回商品分类以及列表(聚合)
-  getPolyProduct: (data) => {
+    getPolyProduct: (data) => {
-    return $http.post(`/merchant-api/product/polymerization/list`, data);
+        return $http.post(`/merchant-api/product/polymerization/list`, data);
-  },
+    },
-  //商品分页
+    //商品分页
-  getProductPage: (data) => {
+    getProductPage: (data) => {
-    return $http.post(`/merchant-api/product/page`, data);
+        return $http.post(`/merchant-api/product/page`, data);
-  },
+    },
-  //商户商品分类
+    //商户商品分类
-  getProductCategory: () => {
+    getProductCategory: () => {
-    return $http.get(
+        return $http.get(`/merchant-api/product/category/list?shopId=${JSON.parse(sessionStorage.getItem('userInfo')).shopId}`);
-      `/merchant-api/product/category/list?shopId=${
+    },
-        JSON.parse(sessionStorage.getItem("userInfo")).shopId
+    //获取销售单位
-      }`
+    getSaleUnit: (data) => {
-    );
+        return $http.request({ url: `/merchant-api/product/unit/list`, method: 'get', params: data });
-  },
+    },
-  //上架或下架
+    //文件上传
-  putOnShelvesProducts: (data) => {
+    uploadFile: () => {
-    return $http.post(`/merchant-api/product/batch/update/status`, data);
+        return `${window.SITE_CONFIG['baseUrl']}/merchant-api/file/upload`
-  },
+    },
-  //批量删除商品
+    //直接获取城市数据
-  BatchDeleteProducts: (data) => {
+    getCityOptions: () => {
-    return $http.post(`/merchant-api/product/batch/delete`, data);
+        return city_data;
-  },
+    },
-  //打折扣
+    //省市县数据
-  setDiscounts: (data) => {
+    getCity: () => {
-    return $http.post(`merchant-api/activity/save`, data);
+        return $http.get(`/merchant-api/common/pca`);
-  },
+    },
-  //获取销售单位
+    //添加运费模板
-  getSaleUnit: (data) => {
+    addShippingTemplate: (data) => {
-    return $http.request({
+        return $http.post(`/merchant-api/shippingTemplates/add`, data);
-      url: `/merchant-api/product/unit/list`,
+    },
-      method: "get",
+    //删除模板
-      params: data,
+    removeShippingTemplate: (id) => {
-    });
+        return $http.post(`/merchant-api/shippingTemplates/delete`, {
-  },
+            id
-  //文件上传
+        })
-  uploadFile: () => {
+    },
-    return `${window.SITE_CONFIG["baseUrl"]}/merchant-api/file/upload`;
+    //更新模板
-  },
+    updateShippingTemplate: (data) => {
-  //直接获取城市数据
+        return $http.post(`/merchant-api/shippingTemplates/update`, data);
-  getCityOptions: () => {
+    },
-    return city_data;
+    //获取模板分页
-  },
+    getShippingTemplatePage: (data) => {
-  //省市县数据
+        return $http.request({
-  getCity: () => {
+            method: 'get',
-    return $http.get(`/merchant-api/common/pca`);
+            url: '/merchant-api/shippingTemplates/page',
-  },
+            params: data
-  //添加运费模板
+        })
-  addShippingTemplate: (data) => {
+    },
-    return $http.post(`/merchant-api/shippingTemplates/add`, data);
+    //获取配送模板列表
-  },
+    getShippingTemplateList: (data) => {
-  //删除模板
+        return $http.request({
-  removeShippingTemplate: (id) => {
+            method: 'get',
-    return $http.post(`/merchant-api/shippingTemplates/delete`, {
+            url: '/merchant-api/shippingTemplates/list',
-      id,
+            params: data
-    });
+        })
-  },
+    },
-  //更新模板
+    //获取模板详情
-  updateShippingTemplate: (data) => {
+    getShippingTemplateInfo: (id) => {
-    return $http.post(`/merchant-api/shippingTemplates/update`, data);
+        return $http.request({
-  },
+            method: 'get',
-  //获取模板分页
+            url: '/merchant-api/shippingTemplates/list',
-  getShippingTemplatePage: (data) => {
+            params: { id }
-    return $http.request({
+        })
-      method: "get",
+    }
-      url: "/merchant-api/shippingTemplates/page",
+}
-      params: data,
-    });
-  },
-  //获取配送模板列表
-  getShippingTemplateList: (data) => {
-    return $http.request({
-      method: "get",
-      url: "/merchant-api/shippingTemplates/list",
-      params: data,
-    });
-  },
-  //获取模板详情
-  getShippingTemplateInfo: (id) => {
-    return $http.request({
-      method: "get",
-      url: "/merchant-api/shippingTemplates/list",
-      params: { id },
-    });
-  },
-};

src/views/modules/product/index.vue

@@ -29,6 +29,7 @@
               placeholder="商品搜索"
             ></el-input>
           </el-form-item>
+
           <el-form-item>
             <el-button type="primary" @click="$refs.oTable.reload()"
               >查询</el-button
@@ -91,7 +92,6 @@ export default {
         border: true,
         height: "auto",
         "row-id": "id",
-        "show-overflow": false,
       },
       productFilterType: "SALE",
       selectList: [],
@@ -112,7 +112,6 @@ 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,7 +187,16 @@ export default {
               productIntroducePhoto: "",
               productPhotoList: [],
               productPlace: "",
-              productSpecificationList: [],
+              productSpecificationList: [
+                {
+                  attributeValue: "默认",
+                  costPrice: 20,
+                  salePrice: 30,
+                  stockNum: 10,
+                  weight: 1,
+                  volume: 0.3,
+                },
+              ],
               productUnit: "",
               productVideo: "",
               shelfLife: "",
@@ -648,10 +657,9 @@ export default {
                     v-model={this.place}
                     onChange={change}
                     options={this.$api.mer_admin.getCityOptions()}
-                    props={{
+                    {...{
                       props: {
-                        label: "name",
+                        checkStrictly: true,
-                        value: "name",
                       },
                     }}
                     clearable

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

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

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

@@ -91,6 +91,7 @@ export default {
       //监控对象数据
       tableData: [],
       //表格属性
+      //表格属性
       tableProp: {
         height: "auto",
         border: true,
@@ -398,8 +399,6 @@ 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="modalData.specType == 1"
+        v-show="tableData.length > 1"
         style="height: calc(100vh - 120px - 240px)"
         slot="dialog__after"
         ref="oTable"
@@ -86,7 +86,7 @@ export default {
   },
   computed: {
     modalCols() {
-      if (this.modalData.specType == 0) {
+      if (this.tableData.length == 1) {
         return [
           {
             label: "库存",
@@ -154,7 +154,7 @@ export default {
           type: "primary",
           submit: true,
           handle: debounce(() => {
-            if (this.modalData.specType == 0) {
+            if (this.tableData.length == 1) {
               this.$api.mer_admin
                 .saveProductBase(this.modalData)
                 .then((res) => {