Merge remote-tracking branch 'origin/master'

xinkeaboard-admin/src/pages/manage/product/cate_lists.js

@@ -289,6 +289,7 @@ export default class CateLists extends Component {
   get_list = (params, grade = '', updateFlag = false) => {
     const { dispatch } = this.props;
     let { data, expandedRowKeys } = this.state;
+    this.setState({loading: true})
     dispatch({
       type: 'product/get_cate_list_by_id',
       payload: {...params,pageSize:pageSize},
@@ -329,6 +330,7 @@ export default class CateLists extends Component {
         }
         this.setState({
           data: data,
+          loading: false
         });
       },
     });

xinkeaboard-admin/src/pages/manage/product/goods_setting.js

@@ -43,6 +43,7 @@ export default class GoodsSetting extends Component {
   get_setting = () => {
     const { dispatch } = this.props;
     let { info_data } = this.state;
+    this.setState({initLoading: true})
     // let str_info = 'goods_publish_need_audit,goods_sort_weight_sale,goods_sort_weight_view';
     let str_info = 'goods_publish_need_audit';
     dispatch({
@@ -77,7 +78,7 @@ export default class GoodsSetting extends Component {
             info_data.push(sld_config_save_btn);
           }
         }
-        this.setState({ info_data, flag: 1 });
+        this.setState({ info_data, flag: 1, initLoading: false });
       },
     });
   };

xinkeaboard-admin/src/pages/sysset/base/about_us.js

@@ -41,6 +41,7 @@ export default class SiteInfo extends Component {
   get_siet_base_info = () => {
     const { dispatch } = this.props;
     let { info_data } = this.state;
+    this.setState({initLoading: true})
     dispatch({
       type: 'sldsetting/get_site_base_info',
       callback: (res) => {
@@ -88,7 +89,7 @@ export default class SiteInfo extends Component {
             });
           }
         }
-        this.setState({ info_data, flag: 1 });
+        this.setState({ info_data, flag: 1, initLoading: false });
       },
     });
   };

xinkeaboard-admin/src/pages/sysset/base/site_info.js

@@ -40,6 +40,7 @@ export default class SiteInfo extends Component {
   get_siet_base_info = () => {
     const { dispatch } = this.props;
     let { info_data } = this.state;
+    this.setState({initLoading: true})
     dispatch({
       type: 'sldsetting/get_site_base_info',
       callback: (res) => {
@@ -82,7 +83,7 @@ export default class SiteInfo extends Component {
             info_data.push(sld_config_save_btn);
           }
         }
-        this.setState({ info_data, flag: 1 });
+        this.setState({ info_data, flag: 1, initLoading: false });
       },
     });
   };

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/system/seller/SellerPcDecoController.java

@@ -111,14 +111,13 @@ public class SellerPcDecoController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "decoId", value = "装修页id", required = true),
             @ApiImplicitParam(name = "decoType", value = "装修页类型", required = true),
-            @ApiImplicitParam(name = "webSite", value = "装修页站点"),
             @ApiImplicitParam(name = "decoName", value = "装修页名称", required = true),
             @ApiImplicitParam(name = "data", value = "装修页数据"),
             @ApiImplicitParam(name = "isEnable", value = "是否启用该装修页；0==不启用，1==启用")
     })
     @VendorLogger(option = "编辑装修页")
     @PostMapping("update")
-    public JsonResult<Integer> update(HttpServletRequest request, Integer decoId, String decoType,@RequestParam (value = "webSite", required = false,defaultValue = "1") String webSite, String decoName, String data, Integer isEnable) {
+    public JsonResult<Integer> update(HttpServletRequest request, Integer decoId, String decoType, String decoName, String data, Integer isEnable) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         TplPcMallDeco tplPcMallDecoDb = tplPcMallDecoModel.getTplPcMallDecoByDecoId(decoId);
@@ -128,7 +127,7 @@ public class SellerPcDecoController extends BaseController {
         TplPcMallDeco tplPcMallDeco = new TplPcMallDeco();
         tplPcMallDeco.setDecoId(decoId);
         tplPcMallDeco.setDecoType(decoType);
-        tplPcMallDeco.setWebSite(webSite);
+        tplPcMallDeco.setWebSite(tplPcMallDecoDb.getWebSite());
         tplPcMallDeco.setDecoName(decoName);
         tplPcMallDeco.setData(data);
         tplPcMallDeco.setIsEnable(isEnable);
@@ -143,7 +142,7 @@ public class SellerPcDecoController extends BaseController {
             //关闭其他开启的装修页
             TplPcMallDecoExample example = new TplPcMallDecoExample();
             example.setDecoIdNotEquals(decoId);
-            example.setWebSite(webSite);
+            example.setWebSite(tplPcMallDecoDb.getWebSite());
             example.setDecoType(tplPcMallDecoDb.getDecoType());
             example.setIsEnable(TplPcConst.IS_ENABLE_YES);
             example.setStoreId(vendor.getStoreId());

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/system/TplPcMallDecoModel.java

@@ -4,6 +4,7 @@ import com.slodon.b2b2c.core.constant.TplPcConst;
 import com.slodon.b2b2c.core.exception.MallException;
 import com.slodon.b2b2c.core.response.PagerInfo;
 import com.slodon.b2b2c.core.util.AssertUtil;
+import com.slodon.b2b2c.core.util.StringUtil;
 import com.slodon.b2b2c.dao.read.system.TplPcMallDecoReadMapper;
 import com.slodon.b2b2c.dao.write.system.TplPcMallDecoWriteMapper;
 import com.slodon.b2b2c.system.example.TplPcMallDecoExample;
@@ -91,15 +92,18 @@ public class TplPcMallDecoModel {
         if (StringUtils.isEmpty(tplPcMallDeco.getDecoId())) {
             throw new MallException("请选择要修改的数据");
         }
-        //名称查重
-        TplPcMallDecoExample example = new TplPcMallDecoExample();
-        example.setDecoIdNotEquals(tplPcMallDeco.getDecoId());
-        example.setDecoName(tplPcMallDeco.getDecoName());
-        example.setDecoType(tplPcMallDeco.getDecoType());
-        example.setWebSite(tplPcMallDeco.getWebSite());
-        example.setStoreId(tplPcMallDeco.getStoreId());
-        List<TplPcMallDeco> tplPcMallDecos = tplPcMallDecoReadMapper.listByExample(example);
-        AssertUtil.isTrue(!CollectionUtils.isEmpty(tplPcMallDecos), "名称重复，请重试");
+
+        if (!StringUtil.isEmpty(tplPcMallDeco.getDecoName())) {
+            //名称查重
+            TplPcMallDecoExample example = new TplPcMallDecoExample();
+            example.setDecoIdNotEquals(tplPcMallDeco.getDecoId());
+            example.setDecoName(tplPcMallDeco.getDecoName());
+            example.setDecoType(tplPcMallDeco.getDecoType());
+            example.setWebSite(tplPcMallDeco.getWebSite());
+            example.setStoreId(tplPcMallDeco.getStoreId());
+            List<TplPcMallDeco> tplPcMallDecos = tplPcMallDecoReadMapper.listByExample(example);
+            AssertUtil.isTrue(!CollectionUtils.isEmpty(tplPcMallDecos), "名称重复，请重试");
+        }
 
         int count = tplPcMallDecoWriteMapper.updateByPrimaryKeySelective(tplPcMallDeco);
         if (count == 0) {

xinkeaboard-web/components/Home/sourcingForm.vue

@@ -11,9 +11,9 @@
         <el-input-number
           v-model="form.quantity"
           :min="0"
-          :max="199999999"
+          :max="1999999999"
           :controls="false"
-          :placeholder="L['请输入数量'] + ' ( 0~199999999 ) '"
+          :placeholder="L['请输入数量'] + ' ( 0~1999999999 ) '"
         />
       </el-form-item>
       <el-form-item prop="message">