Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui

manager/src/api/index.js

@@ -400,7 +400,7 @@ export const getChildRegion = (id) => {
 
 // 重置用户密码
 export const resetPassword = (params) => {
-  return postRequest(`/passport/user/resetPassword/${params}"`);
+  return postRequest(`/passport/user/resetPassword/${params}`);
 };
 
 // 初始化商品索引

seller/src/views/goods/goods-seller/goodsOperationSec.vue

@@ -1383,6 +1383,10 @@ export default {
         this.$Message.error("已存在相同规格值！");
         return;
       }
+      if (val.value === '') {
+        this.$Message.error("规格值不能为空！");
+        return;
+      }
       let curVal = this.currentSkuVal;
       this.skuTableData = this.skuTableData.map((e) => {
         if (e[val.name] === curVal) {