Merge remote-tracking branch 'origin/developerC' into developerB

src/main/java/com/caimei/www/controller/BaseController.java

@@ -23,8 +23,6 @@ import java.util.List;
 public class BaseController {
 	@Value("${caimei.coreServer}")
 	private String coreServer;
-	@Value("${caimei.spiServer}")
-    private String spiServer;
     /** 打包时间 */
     @Value("${caimei.siteEnv}")
     private String siteEnv;
@@ -58,7 +56,6 @@ public class BaseController {
 	    model.addAttribute("version", buildTime);
 		// spi服务器地址
 		model.addAttribute("coreServer", coreServer);
-		model.addAttribute("spiServer", spiServer);
 		// 搜索热门关键字
 		List<String> searchHotWord = baseService.getSearchHotWord();
 		model.addAttribute("searchHotWord", searchHotWord);

src/main/java/com/caimei/www/controller/ClassificationController.java

@@ -1,42 +0,0 @@
-package com.caimei.www.controller;
-
-import com.caimei.www.mapper.ProductDao;
-import com.caimei.www.pojo.JsonModel;
-import com.caimei.www.pojo.classify.Bigtype;
-import com.caimei.www.pojo.classify.SmallType;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * Description
- *
- * @author : plf
- * @date : 2020/12/23
- */
-@Controller
-@RequestMapping("classification")
-public class ClassificationController extends BaseController {
-    @Resource
-    private ProductDao productDao;
-
-    @GetMapping("/select.html")
-    public String selectUp() {
-        return "help/select";
-    }
-
-    @GetMapping("bigTypeData")
-    @ResponseBody
-    public JsonModel bigTypeData(){
-        List<Bigtype> bigtypeList = productDao.findBigtype();
-        bigtypeList.forEach((bigtype)->{
-            List<SmallType> smallTypes = productDao.findSmalltype();
-            bigtype.setSmallTypes(smallTypes);
-        });
-        return JsonModel.success(bigtypeList);
-    }
-}

src/main/java/com/caimei/www/controller/authorized/document/DocumentAuthController.java → src/main/java/com/caimei/www/controller/authorized/document/DocumentAuthApi.java

@@ -19,7 +19,7 @@ import reactor.core.publisher.Mono;
  */
 @RestController
 @RequestMapping("/document")
-public class DocumentAuthController {
+public class DocumentAuthApi {
 
     private DocumentAuthService documentAuthService;
 

src/main/java/com/caimei/www/controller/unlimited/EquipmentController.java

@@ -55,14 +55,4 @@ public class EquipmentController extends BaseController {
         model.addAttribute("equipment", detail);
         return equipment_DETAIL_PATH;
     }
-
-    /**
-     * 获取项目仪器详情页中层信息(搭配推荐,相似商品)
-     */
-    @GetMapping("/equipment/recommend")
-    @ResponseBody
-    public JsonModel<List<PageFloor>> getEquipmentRecommendById(Integer equipmentId) {
-        return equipmentService.getEquipmentRecommendById(equipmentId);
-    }
-
 }

src/main/java/com/caimei/www/controller/unlimitedApi/RepairApi.java

@@ -0,0 +1,66 @@
+package com.caimei.www.controller.unlimitedApi;
+
+import com.caimei.www.pojo.JsonModel;
+import com.caimei.www.pojo.link.PageVo;
+import com.caimei.www.pojo.link.RepairVo;
+import com.caimei.www.service.link.RepairService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2021/10/20
+ */
+@RestController
+@RequestMapping("/repair")
+public class RepairApi {
+
+    private RepairService repairService;
+    @Autowired
+    public void setRepairService(RepairService repairService) {
+        this.repairService = repairService;
+    }
+
+    /**
+     * 维修列表 （旧：/pcCenter/findMaintenance）
+     */
+    @GetMapping("/list")
+    public JsonModel findMaintenance(RepairVo repairVo, PageVo pageVo) {
+        return repairService.findMaintenance(repairVo, pageVo);
+    }
+
+    /**
+     * 申请维修 （旧：/pcCenter/applyMaintenance）
+     */
+    @PostMapping("/apply")
+    public JsonModel applyMaintenance(RepairVo repairVo) {
+        return repairService.applyMaintenance(repairVo);
+    }
+
+    /**
+     * 维修详情 （旧：/pcCenter/maintenance/detail）
+     * id 维修id
+     */
+    @GetMapping("/detail")
+    public JsonModel maintenanceDetail(Integer id) {
+        return repairService.findMaintenanceDetail(id);
+    }
+
+    /**
+     * 评价维修  （旧：/pcCenter/maintenance/evaluation）
+     * @param solveStatus    是否解决问题：0未解决，1已解决
+     * @param serviceRating  服务评分，一颗心表示1，多颗数次之
+     * @param serviceEvaluate  服务评价
+     */
+    @PostMapping("/evaluation")
+    public JsonModel evaluationMaintenance(Integer id, String solveStatus, String serviceRating, String serviceEvaluate){
+        return repairService.evaluationMaintenance(id, solveStatus, serviceRating, serviceEvaluate);
+
+    }
+
+}

src/main/java/com/caimei/www/controller/ShortLinkApi.java → src/main/java/com/caimei/www/controller/unlimitedApi/ShortLinkApi.java

@@ -1,4 +1,4 @@
-package com.caimei.www.controller;
+package com.caimei.www.controller.unlimitedApi;
 
 import com.caimei.www.service.link.ShortLinkService;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/caimei/www/mapper/RepairDao.java

@@ -0,0 +1,33 @@
+package com.caimei.www.mapper;
+
+import com.caimei.www.pojo.link.RepairLinkVo;
+import com.caimei.www.pojo.link.RepairUserVo;
+import com.caimei.www.pojo.link.RepairVo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2021/10/20
+ */
+@Mapper
+public interface RepairDao {
+    List<RepairVo> findMaintenance(RepairVo repairVo);
+
+    RepairUserVo getRepairUser(Integer userId);
+
+    String findOrderNoInToday(String date);
+
+    void insertMaintenance(RepairVo repairVo);
+
+    void insertMaintenanceLink(RepairLinkVo userLink);
+
+    RepairVo findMaintenanceDetail(Integer id);
+
+    int checkMobileSubmitTime(String mobile, String date);
+
+    void updateMaintenace(RepairVo repairVo);
+}

src/main/java/com/caimei/www/pojo/link/PageVo.java

@@ -0,0 +1,112 @@
+package com.caimei.www.pojo.link;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2020/3/9
+ */
+@Data
+public class PageVo<T> implements Serializable {
+    /** 当前页码 */
+    @Builder.Default
+    private int pageNum = 1;
+    /** 每页大小 */
+    @Builder.Default
+    private int pageSize = 10;
+    /** 总记录数 */
+    private int totalRecord;
+    /** 总页数 */
+    private int totalPage;
+    /** 是否有后一页 */
+    private boolean hasNextPage;
+    /** 是否有前一页 */
+    private boolean hasPreviousPage;
+    /** 查询结果 */
+    List<T> results;
+
+    public PageVo(List<T> list) {
+        if (list instanceof com.github.pagehelper.Page) {
+            com.github.pagehelper.Page<T> page = (com.github.pagehelper.Page<T>) list;
+            this.pageNum = page.getPageNum();
+            this.pageSize = page.getPageSize();
+            this.totalRecord = (int) page.getTotal();
+            this.totalPage = page.getPages();
+            setHasPreviousAndNext();
+            this.results = page;
+        } else if (list != null) {
+            this.pageSize = list.size();
+            this.totalRecord = list.size();
+            this.totalPage = 1;
+            this.results = list;
+        }
+    }
+
+    public PageVo(int pageNum, int pageSize, int totalRecord, List<T> results) {
+        super();
+        this.pageNum = pageNum;
+        this.pageSize = pageSize;
+        this.totalRecord = totalRecord;
+        this.totalPage = totalRecord % pageSize == 0 ? totalRecord / pageSize : totalRecord / pageSize + 1;
+        this.results = results;
+        if (this.pageNum < 2) {
+            hasPreviousPage = false;
+        } else {
+            hasPreviousPage = true;
+        }
+        if (this.pageNum < totalPage) {
+            hasNextPage = true;
+        } else {
+            hasNextPage = false;
+        }
+    }
+
+    public PageVo(int pageNum, int maxSize, int totalRecord, int totalPage,
+                  List<T> results) {
+        super();
+        this.pageNum = pageNum;
+        this.pageSize = maxSize;
+        this.totalRecord = totalRecord;
+        this.totalPage = totalPage;
+        this.results = results;
+        if (this.pageNum < 2) {
+            hasPreviousPage = false;
+        } else {
+            hasPreviousPage = true;
+        }
+        if (this.pageNum < totalPage) {
+            hasNextPage = true;
+        } else {
+            hasNextPage = false;
+        }
+    }
+
+    public PageVo() {super();}
+
+    public void setHasPreviousAndNext() {
+        if (this.pageNum < 2) {
+            hasPreviousPage = false;
+        } else {
+            hasPreviousPage = true;
+        }
+        if (this.pageNum < totalPage) {
+            hasNextPage = true;
+        } else {
+            hasNextPage = false;
+        }
+    }
+
+    public int countTotalPage() {
+        int total = totalRecord % pageSize == 0 ? totalRecord / pageSize : totalRecord / pageSize + 1;
+        this.setTotalPage(total);
+        return total;
+    }
+
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/caimei/www/pojo/link/RepairLinkVo.java

@@ -0,0 +1,34 @@
+package com.caimei.www.pojo.link;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 仪器维修分享链接
+ *
+ * @author : Aslee
+ * @date : 2020/9/1
+ */
+@Data
+public class RepairLinkVo implements Serializable {
+    private Integer id;
+    /**
+     * 用户ID
+     */
+    private Integer userId;
+    /**
+     *链接uuid
+     */
+    private String linkCode;
+    /**
+     * 1表示用户, 2表示维修商
+     */
+    private String type;
+    /**
+     * 仪器维修表ID
+     */
+    private Integer cmInstrumentMaintenanceId;
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/caimei/www/pojo/link/RepairUserVo.java

@@ -0,0 +1,35 @@
+package com.caimei.www.pojo.link;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2021/10/20
+ */
+@Data
+public class RepairUserVo implements Serializable {
+    /**
+     *用户ID
+     */
+    private Integer userId;
+    /**
+     * 用户名
+     */
+    private String userName;
+    /**
+     * 用户类型，见表c_usertype或枚举UserType
+     */
+    private Integer registerUserTypeId;
+    /**
+     * 企业账号名
+     */
+    private String account;
+    /**
+     * 手机号码
+     */
+    private String mobile;
+}

src/main/java/com/caimei/www/pojo/link/RepairVo.java

@@ -0,0 +1,189 @@
+package com.caimei.www.pojo.link;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 仪器维修
+ *
+ * @author : Aslee
+ * @date : 2020/9/1
+ */
+@Data
+public class RepairVo implements Serializable {
+    private Integer id;
+    /**
+     * 订单号
+     */
+    private String orderNo;
+    /**
+     *用户ID
+     */
+    private Integer userId;
+    /**
+     *仪器名称
+     */
+    private String instrumentName;
+    /**
+     *生产厂家
+     */
+    private String manufacturer;
+    /**
+     *仪器品牌/型号
+     */
+    private String instrumentBrand;
+    /**
+     *维修数量
+     */
+    private String maintenanceNum;
+    /**
+     *仪器图1
+     */
+    private String instrumentImage1;
+    /**
+     *仪器图2
+     */
+    private String instrumentImage2;
+    /**
+     *仪器图3
+     */
+    private String instrumentImage3;
+    /**
+     *仪器图4
+     */
+    private String instrumentImage4;
+    /**
+     *仪器图5
+     */
+    private String instrumentImage5;
+    /**
+     * 仪器图，以,隔开
+     */
+    private String instrumentImages;
+    /**
+     * 仪器图数组
+     */
+    private String[] instrumentArr;
+    /**
+     *问题描述
+     */
+    private String problemDescription;
+    /**
+     *用户账号
+     */
+    private String userAccount;
+    /**
+     *用户名称
+     */
+    private String userName;
+    /**
+     *用户联系人
+     */
+    private String userContact;
+    /**
+     *用户手机号
+     */
+    private Long userMobile;
+    /**
+     *用户联系地址
+     */
+    private String userAddress;
+    /**
+     *维修商名称
+     */
+    private String maintainerName;
+    /**
+     * 维修商手机号
+     */
+    private Long maintainerMobile;
+    /**
+     * 维修商联系地址
+     */
+    private String maintainerAddress;
+    /**
+     * 维修状态1.已提交，2已对接（确认真实后）3已评价，4取消
+     */
+    private String status;
+    /**
+     * 真实性 1已核实，2无效
+     */
+    private Long authenticity;
+    /**
+     * 服务评分，一颗心表示1，多颗数次之
+     */
+    private Long serviceRating;
+    /**
+     * 服务评价
+     */
+    private String serviceEvaluate;
+    /**
+     * 是否解决：0未解决，1已解决
+     */
+    private String solveStatus;
+    /**
+     * 取消原因
+     */
+    private String cancelReason;
+    /**
+     * 提交时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date submitDate;
+    /**
+     * 对接时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date dockingDate;
+    /**
+     * 评价时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date evaluateDate;
+    /**
+     * 取消时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date cancelDate;
+    /**
+     * 关键词 查询条件
+     */
+    private String keyword;
+    /**
+     * 注册时间开始 查询条件
+     */
+    private String startTime;
+    /**
+     * 注册时间结束  查询条件
+     */
+    private String endTime;
+    /**
+     * 省
+     */
+    private String provinceName;
+    /**
+     * 市
+     */
+    private String cityName;
+    /**
+     * 区
+     */
+    private String townName;
+    /**
+     *能不能评价 true 就是用户可评价,  false 就是供应商不可评价仅查看
+     */
+    private boolean canEvaluation;
+    /**
+     * true 只展示基本信息,  false  展示详细信息
+     */
+    private boolean onlyBaseInfo;
+    /**
+     *信息查看者类型 1=用户查看可以评价; (供应商只能查看不能操作)2=没有对接供应商查看基本信息; 3已对接供应查看完整信息
+     */
+    private String viewerType;
+
+    private static final long serialVersionUID = 1L;
+
+}

src/main/java/com/caimei/www/service/generate/impl/GenerateHtmlImpl.java

@@ -42,8 +42,6 @@ public class GenerateHtmlImpl implements GenerateHtml {
     private String destPath;
 	@Value("${caimei.coreServer}")
 	private String coreServer;
-	@Value("${caimei.spiServer}")
-    private String spiServer;
     /** 打包时间 */
     @Value("${caimei.siteEnv}")
     private String siteEnv;
@@ -145,7 +143,6 @@ public class GenerateHtmlImpl implements GenerateHtml {
 	    map.put("version", buildTime);
 		// spi服务器地址
 		map.put("coreServer", coreServer);
-		map.put("spiServer", spiServer);
 		// 搜索热门关键字
 		List<String> searchHotWord = baseService.getSearchHotWord();
 		map.put("searchHotWord", searchHotWord);
@@ -187,7 +184,6 @@ public class GenerateHtmlImpl implements GenerateHtml {
         map.put("version", buildTime);
         // spi服务器地址
         map.put("coreServer", coreServer);
-        map.put("spiServer", spiServer);
         // 搜索热门关键字
         List<String> searchHotWord = baseService.getSearchHotWord();
         map.put("searchHotWord", searchHotWord);

src/main/java/com/caimei/www/service/link/RepairService.java

@@ -0,0 +1,41 @@
+package com.caimei.www.service.link;
+
+import com.caimei.www.pojo.JsonModel;
+import com.caimei.www.pojo.link.PageVo;
+import com.caimei.www.pojo.link.RepairVo;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2021/10/20
+ */
+public interface RepairService {
+    /**
+     * 维修列表
+     * @param repairVo 维修列表查询条件
+     * @param pageVo 分页对象
+     * @return
+     */
+    JsonModel findMaintenance(RepairVo repairVo, PageVo pageVo);
+
+    /**
+     * 申请维修
+     * @param repairVo 申请维修提交的数据
+     */
+    JsonModel applyMaintenance(RepairVo repairVo);
+
+    /**
+     * 维修详情
+     * @param id
+     */
+    JsonModel findMaintenanceDetail(Integer id);
+
+    /**
+     * 评价维修
+     * @param solveStatus    是否解决问题：0未解决，1已解决
+     * @param serviceRating  服务评分，一颗心表示1，多颗数次之
+     * @param serviceEvaluate  服务评价
+     */
+    JsonModel evaluationMaintenance(Integer id, String solveStatus, String serviceRating, String serviceEvaluate);
+}

src/main/java/com/caimei/www/service/link/impl/RepairServiceImpl.java

@@ -0,0 +1,223 @@
+package com.caimei.www.service.link.impl;
+
+import com.caimei.www.mapper.RepairDao;
+import com.caimei.www.pojo.JsonModel;
+import com.caimei.www.pojo.link.PageVo;
+import com.caimei.www.pojo.link.RepairLinkVo;
+import com.caimei.www.pojo.link.RepairUserVo;
+import com.caimei.www.pojo.link.RepairVo;
+import com.caimei.www.service.link.RepairService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.util.StringUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.lang.reflect.Method;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2021/10/20
+ */
+@Slf4j
+@Service
+public class RepairServiceImpl implements RepairService {
+    @Resource
+    private RepairDao repairDao;
+
+    /**
+     * 维修列表
+     *
+     * @param repairVo 维修列表查询条件
+     * @param page   分页对象
+     * @return
+     */
+    @Override
+    public JsonModel findMaintenance(RepairVo repairVo, PageVo page) {
+        if (repairVo.getUserId() == null) {
+            return JsonModel.error("参数错误");
+        }
+        PageHelper.startPage(page.getPageNum(), page.getPageSize());
+        List<RepairVo> list = repairDao.findMaintenance(repairVo);
+        PageVo<RepairVo> pageVo = new PageVo<>(list);
+        return JsonModel.success(pageVo);
+    }
+
+    /**
+     * 申请维修
+     *
+     * @param repairVo 申请维修提交的数据
+     */
+    @Override
+    public JsonModel applyMaintenance(RepairVo repairVo) {
+        JsonModel JsonModel = paramsCheck(repairVo);
+        if (JsonModel.getCode() == -1) {
+            return JsonModel;
+        }
+        if (repairVo.getUserId() != null) {
+            RepairUserVo user = repairDao.getRepairUser(repairVo.getUserId());
+            repairVo.setUserId(user.getUserId());
+            repairVo.setUserName(user.getUserName());
+            if (user.getRegisterUserTypeId() == 1 || user.getRegisterUserTypeId() == 3) {
+                repairVo.setUserAccount(user.getAccount());
+            } else {
+                repairVo.setUserAccount(user.getMobile());
+            }
+        }
+        try {
+            String date = new SimpleDateFormat("yyyyMMdd").format(new Date());
+            //维修单号orderNo的生成规则 日期加上两位数字  2019080801
+            String orderNo = repairDao.findOrderNoInToday(date);
+            String no;
+            if (StringUtil.isEmpty(orderNo)) {
+                no = "01";
+            } else {
+                String substring = orderNo.substring(8);
+                int number = Integer.parseInt(substring);
+                number += 1;
+                if (number <= 9) {
+                    no = "0" + number;
+                } else {
+                    no = String.valueOf(number);
+                }
+            }
+            repairVo.setOrderNo(date + no);
+            repairVo.setSubmitDate(new Date());
+            //维修状态1.已提交，2已对接（确认真实后）3已评价，4取消
+            repairVo.setStatus("1");
+            String instrumentImages = repairVo.getInstrumentImages();
+            if (StringUtil.isNotEmpty(instrumentImages)) {
+                String[] instrumentImageArr = instrumentImages.split(",");
+                if (instrumentImageArr.length > 5) {
+                    return JsonModel.error("图片数量不能超过5张");
+                }
+                Class clazz = repairVo.getClass();
+                for (int i = 0; i < instrumentImageArr.length; i++) {
+                    Method method =  clazz.getDeclaredMethod("setInstrumentImage" + (i + 1),String.class);
+                    method.invoke(repairVo, instrumentImageArr[i]);
+                }
+            }
+            repairDao.insertMaintenance(repairVo);
+            RepairLinkVo userLink = new RepairLinkVo();
+            userLink.setType("1");
+            userLink.setUserId(repairVo.getUserId());
+            userLink.setCmInstrumentMaintenanceId(repairVo.getId());
+            userLink.setLinkCode(UUID.randomUUID().toString().replaceAll("-", ""));
+            RepairLinkVo repairerLink = new RepairLinkVo();
+            repairerLink.setType("2");
+            repairerLink.setUserId(repairVo.getUserId());
+            repairerLink.setCmInstrumentMaintenanceId(repairVo.getId());
+            repairerLink.setLinkCode(UUID.randomUUID().toString().replaceAll("-", ""));
+            repairDao.insertMaintenanceLink(userLink);
+            repairDao.insertMaintenanceLink(repairerLink);
+        } catch (Exception e) {
+            log.error("try-catch:",e);
+            return JsonModel.error("数据异常");
+        }
+        return JsonModel;
+    }
+
+    /**
+     * 维修详情
+     *
+     * @param id
+     */
+    @Override
+    public JsonModel findMaintenanceDetail(Integer id) {
+        if (id == null) {
+            return JsonModel.error("参数异常");
+        }
+        RepairVo repairVo = repairDao.findMaintenanceDetail(id);
+        if (repairVo == null) {
+            return JsonModel.error("参数异常");
+        }
+        Class clazz = repairVo.getClass();
+        List<String> instrumentImageList = new ArrayList<>();
+        for (int i = 0; i < 5; i++) {
+            try {
+                Method getMethod = clazz.getDeclaredMethod("getInstrumentImage" + (i+1));
+                Object image = getMethod.invoke(repairVo);
+                if (image != null && StringUtil.isNotEmpty(image.toString())) {
+                    instrumentImageList.add(image.toString()) ;
+                }
+            } catch (Exception e) {
+                log.error("try-catch:",e);
+            }
+        }
+        String[] instrumentArr = instrumentImageList.toArray(new String[instrumentImageList.size()]);
+        if (instrumentArr.length == 0) {
+            repairVo.setInstrumentArr(null);
+        }else{
+            repairVo.setInstrumentArr(instrumentArr);
+        }
+        return JsonModel.success(repairVo);
+    }
+
+    /**
+     * 评价维修
+     *
+     * @param id
+     * @param solveStatus     是否解决问题：0未解决，1已解决
+     * @param serviceRating   服务评分，一颗心表示1，多颗数次之
+     * @param serviceEvaluate 服务评价
+     */
+    @Override
+    public JsonModel evaluationMaintenance(Integer id, String solveStatus, String serviceRating, String serviceEvaluate) {
+        if (id  == null || StringUtil.isEmpty(solveStatus) || StringUtil.isEmpty(serviceEvaluate) || StringUtil.isEmpty(serviceRating)) {
+            return JsonModel.error("参数不全");
+        }
+        RepairVo repairVo = repairDao.findMaintenanceDetail(id);
+        if (repairVo == null){
+            return JsonModel.error("参数异常");
+        }
+        try {
+            repairVo.setServiceEvaluate(serviceEvaluate);
+            repairVo.setServiceRating(Long.valueOf(serviceRating));
+            repairVo.setSolveStatus(solveStatus);
+            repairVo.setStatus("3");
+            repairVo.setEvaluateDate(new Date());
+            repairDao.updateMaintenace(repairVo);
+        } catch (Exception e) {
+            JsonModel.error("服务器内部异常");
+        }
+        return JsonModel.success();
+    }
+
+    /**
+     * 验证提交的维修信息
+     */
+    private JsonModel paramsCheck(RepairVo bean) {
+        if (StringUtil.isEmpty(bean.getProvinceName()) || StringUtil.isEmpty(bean.getCityName())
+                || StringUtil.isEmpty(bean.getTownName()) || StringUtil.isEmpty(bean.getUserAddress())) {
+            return JsonModel.error("地址信息不全");
+        }
+        if (StringUtil.isEmpty(bean.getUserContact())) {
+            return JsonModel.error("联系人信息不全");
+        }
+        if (bean.getUserMobile() == null) {
+            return JsonModel.error("联系电话信息不全");
+        }
+        if (StringUtil.isEmpty(bean.getInstrumentName())) {
+            return JsonModel.error("仪器名称信息不全");
+        }
+        if (StringUtil.isEmpty(bean.getProblemDescription())) {
+            return JsonModel.error("问题描述信息不全");
+        }
+        //同一手机号同一天内只能提交一次申请
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        //CmInstrumentMaintenance 的orderNo 生成规则就是  2019080802 日期加数字的规则,通过模糊查询查询出用户今日提交次数
+        int times = repairDao.checkMobileSubmitTime(bean.getUserMobile().toString(), sdf.format(new Date()));
+        if (times != 0) {
+            return JsonModel.error("抱歉，您今天已经提交过了");
+        }
+        return JsonModel.success();
+    }
+
+}

src/main/java/com/caimei/www/service/page/EquipmentService.java

@@ -21,10 +21,4 @@ public interface EquipmentService {
      */
     PageContent getEquipmentById(Integer equipmentId);
 
-    /**
-     * 获取项目仪器详情页中层信息(搭配推荐,相似商品)
-     * @param equipmentId
-     * @return
-     */
-    JsonModel<List<PageFloor>> getEquipmentRecommendById(Integer equipmentId);
 }

src/main/java/com/caimei/www/service/page/impl/EquipmentServiceImpl.java

@@ -1,20 +1,13 @@
 package com.caimei.www.service.page.impl;
 
 import com.caimei.www.mapper.EquipmentDao;
-import com.caimei.www.mapper.SinglePageDao;
-import com.caimei.www.pojo.JsonModel;
-import com.caimei.www.pojo.page.ImageLink;
 import com.caimei.www.pojo.page.PageContent;
-import com.caimei.www.pojo.page.PageFloor;
 import com.caimei.www.pojo.page.Parameter;
 import com.caimei.www.service.page.EquipmentService;
-import com.caimei.www.utils.ImageUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,11 +21,6 @@ import java.util.List;
 public class EquipmentServiceImpl implements EquipmentService {
     @Resource
     private EquipmentDao equipmentDao;
-    @Resource
-    SinglePageDao singlePageDao;
-
-    @Value("${caimei.wwwDomain}")
-    private String domain;
 
     /**
      * 项目仪器详情
@@ -49,34 +37,4 @@ public class EquipmentServiceImpl implements EquipmentService {
         }
         return equipment;
     }
-
-    /**
-     * 获取项目仪器详情页中层信息(搭配推荐,相似商品)
-     *
-     * @param equipmentId
-     * @return
-     */
-    @Override
-    public JsonModel<List<PageFloor>> getEquipmentRecommendById(Integer equipmentId) {
-        if (equipmentId == null) { return JsonModel.error("参数异常", null);}
-        List<PageFloor> floorList = singlePageDao.getFloorByPageId(equipmentId);
-        if (floorList.size() > 0) {
-            List<PageFloor> tempList = new ArrayList<>();
-            floorList.forEach(floor -> {
-                List<ImageLink> imageLinks = singlePageDao.getDataByFloorId(floor.getId());
-                if (imageLinks.size() > 0) {
-                    imageLinks.forEach(img -> {
-                        img.setImage(ImageUtil.getImageURL("actType", img.getImage(), 0, domain));
-                    });
-                    floor.setFloorData(imageLinks);
-                } else {
-                    tempList.add(floor);
-                }
-            });
-            if(tempList.size() > 0){
-                floorList.removeAll(tempList);
-            }
-        }
-        return JsonModel.success(floorList);
-    }
 }

src/main/java/com/caimei/www/service/page/impl/HomeServiceImpl.java

@@ -37,8 +37,6 @@ public class HomeServiceImpl implements HomeService {
     private String domain;
 	@Value("${caimei.coreServer}")
 	private String coreServer;
-	@Value("${caimei.spiServer}")
-	private String spiServer;
 
     /**
      * 首页轮播
@@ -70,7 +68,7 @@ public class HomeServiceImpl implements HomeService {
     @Override
     public Map<String, Object> getHomeSideJson() {
         try {
-            String sideResult = RequestUtil.sendGet(spiServer+"/home/top/data?source=1");
+            String sideResult = RequestUtil.sendGet(coreServer+"/commodity/home/sidebar?source=1");
             log.debug(sideResult);
             Map<String, Object> sideMap = JSONObject.parseObject(sideResult, Map.class);
             return JSONObject.parseObject(String.valueOf(sideMap.get("data")), Map.class);

src/main/resources/config/dev/application-dev.yml

@@ -4,14 +4,14 @@ spring:
   #数据源连接--start
   datasource:
     #本地连接数据库
-    #driverClassName: com.mysql.jdbc.Driver
-    #url: jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
-    #username: developer
-    #password: 05bZ/OxTB:X+yd%1
-    #测试连接数据库
-    url: jdbc:mysql://120.79.25.27:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    driverClassName: com.mysql.jdbc.Driver
+    url: jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
     username: developer
-    password: J5p3tgOVazNl4ydf
+    password: 05bZ/OxTB:X+yd%1
+    #测试连接数据库
+    #url: jdbc:mysql://120.79.25.27:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    #username: developer
+    #password: J5p3tgOVazNl4ydf
     #type: com.zaxxer.hikari.HikariDataSource
     hikari:
       minimum-idle: 5
@@ -54,10 +54,10 @@ logging:
 # 服务域名
 caimei:
   siteEnv: 0 #网站环境，（2：正式环境，1：测试环境，0：开发环境）
-  spiServer: https://spi-b.caimei365.com
-  #spiServer: http://192.168.2.68:8008
-  coreServer: https://core-b.caimei365.com
+  spiServer: http://192.168.2.68:8008
+  #coreServer: https://core-b.caimei365.com
   #coreServer: http://192.168.2.68:18002
+  coreServer: http://192.168.2.75:18002
   imageDomain: https://img-b.caimei365.com
   wwwDomain: http:localhost:8009
   destPath: D:/_PLAN_WORKSPACE/test/static

src/main/resources/mapper/RepairMapper.xml

@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.caimei.www.mapper.RepairDao">
+    <select id="findMaintenance" resultType="com.caimei.www.pojo.link.RepairVo">
+        SELECT
+        id,
+        orderNo,
+        instrumentName,
+        manufacturer,
+        submitDate,
+        maintainerName,
+        maintainerMobile,
+        status
+        FROM cm_instrument_maintenance a
+        <where>
+            <if test="userId != null">
+                AND a.userId = #{userId}
+            </if>
+            <if test="keyword != null and keyword != ''">
+                AND (a.maintainerName LIKE concat('%',#{keyword},'%')
+                OR a.instrumentName LIKE concat('%',#{keyword},'%'))
+            </if>
+            <if test="startTime != null and startTime != ''">
+                AND a.submitDate <![CDATA[ >= ]]> #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND a.submitDate <![CDATA[ <= ]]>  #{endTime}
+            </if>
+            <if test="status != null and status != '' and status != 0">
+                AND a.status = ${status}
+            </if>
+        </where>
+    </select>
+    <select id="getRepairUser" resultType="com.caimei.www.pojo.link.RepairUserVo">
+        SELECT
+            userID AS userId, userName, account, mobile, registerUserTypeID AS registerUserTypeId
+        FROM user WHERE userID = #{userId}
+    </select>
+    <select id="findOrderNoInToday" resultType="java.lang.String">
+        SELECT IFNULL(orderNo,"")
+        FROM cm_instrument_maintenance
+        WHERE DATE_FORMAT(submitDate,'%Y%m%d') = #{date} AND submitDate is not null
+        ORDER BY id DESC limit 1
+    </select>
+    <select id="findMaintenanceDetail" resultType="com.caimei.www.pojo.link.RepairVo">
+        SELECT
+            id,
+            orderNo,
+            userId,
+            instrumentName,
+            manufacturer,
+            instrumentBrand,
+            maintenanceNum,
+            instrumentImage1,
+            instrumentImage2,
+            instrumentImage3,
+            instrumentImage4,
+            instrumentImage5,
+            problemDescription,
+            userAccount,
+            userName,
+            userContact,
+            userMobile,
+            userAddress,
+            maintainerName,
+            maintainerMobile,
+            maintainerAddress,
+            status,
+            authenticity,
+            serviceRating,
+            serviceEvaluate,
+            solveStatus,
+            cancelReason,
+            submitDate,
+            dockingDate,
+            evaluateDate,
+            cancelDate,
+            provinceName,
+            cityName,
+            townName
+        FROM cm_instrument_maintenance
+        WHERE id = #{id}
+    </select>
+    <select id="checkMobileSubmitTime" resultType="java.lang.Integer">
+        SELECT count(id)
+        FROM cm_instrument_maintenance
+        WHERE userMobile = #{mobile} AND orderNo LIKE concat(#{date},"%")
+    </select>
+    <insert id="insertMaintenance">
+        INSERT INTO cm_instrument_maintenance(
+            orderNo,
+            userId,
+            instrumentName,
+            manufacturer,
+            instrumentBrand,
+            maintenanceNum,
+            instrumentImage1,
+            instrumentImage2,
+            instrumentImage3,
+            instrumentImage4,
+            instrumentImage5,
+            problemDescription,
+            userAccount,
+            userName,
+            userContact,
+            userMobile,
+            userAddress,
+            maintainerName,
+            maintainerMobile,
+            maintainerAddress,
+            status,
+            authenticity,
+            serviceRating,
+            serviceEvaluate,
+            solveStatus,
+            cancelReason,
+            submitDate,
+            dockingDate,
+            evaluateDate,
+            cancelDate,
+            provinceName,
+            cityName,
+            townName
+        ) VALUES (
+             #{orderNo},
+             #{userId},
+             #{instrumentName},
+             #{manufacturer},
+             #{instrumentBrand},
+             #{maintenanceNum},
+             #{instrumentImage1},
+             #{instrumentImage2},
+             #{instrumentImage3},
+             #{instrumentImage4},
+             #{instrumentImage5},
+             #{problemDescription},
+             #{userAccount},
+             #{userName},
+             #{userContact},
+             #{userMobile},
+             #{userAddress},
+             #{maintainerName},
+             #{maintainerMobile},
+             #{maintainerAddress},
+             #{status},
+             #{authenticity},
+             #{serviceRating},
+             #{serviceEvaluate},
+             #{solveStatus},
+             #{cancelReason},
+             #{submitDate},
+             #{dockingDate},
+             #{evaluateDate},
+             #{cancelDate},
+             #{provinceName},
+             #{cityName},
+             #{townName}
+         )
+    </insert>
+    <insert id="insertMaintenanceLink">
+        INSERT INTO cm_instrument_maintenance_links(
+            id,
+            userId,
+            linkCode,
+            type,
+            cmInstrumentMaintenanceId
+        ) VALUES (
+             #{id},
+             #{userId},
+             #{linkCode},
+             #{type},
+             #{cmInstrumentMaintenanceId}
+         )
+    </insert>
+    <update id="updateMaintenace">
+        update cm_instrument_maintenance
+        SET serviceRating = #{serviceRating},
+            serviceEvaluate = #{serviceEvaluate},
+            solveStatus = #{solveStatus} ,
+            status = #{status},
+            evaluateDate = #{evaluateDate}
+        WHERE id = #{id}
+    </update>
+</mapper>

src/main/resources/static/css/help/select.css

@@ -1,26 +0,0 @@
-#selectClass{background: #fff}
-.productlist{padding: 30px}
-.select{
-    height: 36px;
-    width: 150px;
-}
-table{
-    width: 100%;
-    margin:auto;
-}
-table tbody tr,table tbody td{
-    line-height: 36px;
-    text-align: center;
-}
-select{
-    width: 100%;
-    height: 36px;
-    border: none;
-    text-align: center;
-    text-align-last: center;
-    cursor: pointer;
-}
-option{
-    text-align:center;
-}
-

src/main/resources/static/js/account/register-club.js

@@ -421,7 +421,7 @@ var registerPage = new Vue({
         },
         ChangeGetcity:function(event){//加载市
             var _this = this;
-            PublicApi.GetCity({ provinceId: _this.addressfrom.province },function(response){
+            PublicApi.GetCity({ type:1, parentId: _this.addressfrom.province },function(response){
                 if(response.code == 0 ){
                     _this.cityArray = response.data;
                     _this.addressfrom.city = event.target.value;
@@ -438,7 +438,7 @@ var registerPage = new Vue({
         },
         ChangeGetcTown:function(event){//选择地区
             var _this = this;
-            PublicApi.GetTown({ cityId: _this.addressfrom.city },function(response){
+            PublicApi.GetTown({ type:2, parentId: _this.addressfrom.city },function(response){
                 if(response.code == 0 ){
                     _this.townArray = response.data;
                     _this.clubUpgradeUser.townId = event.target.value;

src/main/resources/static/js/account/register-supplier.js

@@ -259,7 +259,7 @@ var registerPage = new Vue({
         },
         ChangeGetcity:function(event){//加载市
             var _this = this;
-            PublicApi.GetCity({ provinceId: _this.addressfrom.province },function(response){
+            PublicApi.GetCity({ type:1, parentId: _this.addressfrom.province },function(response){
                 if(response.code == 0 ){
                     _this.cityArray = response.data;
                     _this.addressfrom.city = event.target.value;
@@ -276,7 +276,7 @@ var registerPage = new Vue({
         },
         ChangeGetcTown:function(event){//选择地区
             var _this = this;
-            PublicApi.GetTown({ cityId: _this.addressfrom.city },function(response){
+            PublicApi.GetTown({ type:2, parentId: _this.addressfrom.city },function(response){
                 if(response.code == 0 ){
                     _this.townArray = response.data;
                     _this.supplierUser.townId = event.target.value;

src/main/resources/static/js/account/supplier-information.js

@@ -228,7 +228,7 @@ var registerPage = new Vue({
         },
         ChangeGetcity:function(event){//加载市
             var _this = this;
-            PublicApi.GetCity({ provinceId: _this.supplierUser.provinceId },function(response){
+            PublicApi.GetCity({ type:1, parentId: _this.supplierUser.provinceId },function(response){
                 if(response.code == 0 ){
                     _this.cityArray = response.data;
                     _this.supplierUser.cityId = event.target.value;
@@ -245,7 +245,7 @@ var registerPage = new Vue({
         },
         ChangeGetcTown:function(event){//选择地区
             var _this = this;
-            PublicApi.GetTown({ cityId: _this.supplierUser.cityId },function(response){
+            PublicApi.GetTown({ type:2, parentId: _this.supplierUser.cityId },function(response){
                 if(response.code == 0 ){
                     _this.townArray = response.data;
                     _this.supplierUser.townId = event.target.value;

src/main/resources/static/js/base.js

@@ -1,5 +1,4 @@
 var coreServer = $("#coreServer").val();
-var spiServer = $("#spiServer").val();
 var isPC = ($(window).width()>768);
 var globalUserData = '';
 var GLOBAL_TOKEN = 'X-Token';
@@ -25,7 +24,7 @@ if(localStorage.getItem('userInfo')){
         if (userAgent.match(/MicroMessenger/i)) {
             // 微信浏览器自动授权登录
             var urlForWeChat = 'https://www.caimei365.com/we_chat/redirect_uri.html';
-            $.get(spiServer+'/user/authorizationLink?mode=1&redirectUri='+urlForWeChat, function(r){
+            $.get(coreServer+'/user/login/auth/link?mode=1&redirectUri='+urlForWeChat, function(r){
                 if(r.code===0 && r.data){
                     setBaseCookie("weChatAutoLogin", 1);
                     setBeforeUrl();
@@ -573,35 +572,6 @@ function updateUrlParam(params) {
     }
 }
 
-function tokenAjax(type, url, params, callback, errorBack){
-    $.ajax({
-        type: type,
-        url: spiServer + url,
-        xhrFields: {
-            withCredentials: true
-        },
-        data: params,
-        headers:{
-            'Content-Type': type=='post'?'application/x-www-form-urlencoded':'application/json;charset=utf8',
-            'X-Token':GLOBAL_TOKEN
-        },
-        success : function (res) {
-            if(res.code === -99){
-                localStorage.removeItem('userInfo');
-                delBaseCookie("loginBeforePath");
-                // window.location.href ='/login.html';
-            }else{
-                callback(res);
-            }
-        },
-        error : function (res) {
-           alertInfo("网络连接超时,请重试!",function (res) {
-               console.log(res)
-           });
-        }
-    });
-}
-
 function setSearchProductList(list, userId, callback) {//处理搜索
     var productIdArr = [];
     var resultData = [];
@@ -790,43 +760,3 @@ function dialog(txt,callback) {
     });
 }
 
-// 加入购物车
-function addShoppingCart(userId, productId, count, callback){
-    tokenAjax("post", "/shoppingCart/addCart", {
-        userID: userId,
-        productID: productId,
-        productCount: count
-    },function (res) {
-        if(res && res.code*1 === 0){
-            globalHead.getHeadCart(userId);
-            $.confirm({
-                useBootstrap: false,
-                boxWidth: (isPC?'338px':'74.6vw'),
-                title: false,
-                content:'<div class="cartAlert"><h6>商品已成功加入购物车！</h6><p>当前购物车共<em>'+res.data+'</em>种商品</p></div>',
-                closeIcon: true,
-                animation: 'opacity',
-                closeAnimation: 'opacity',
-                animateFromElement: false,
-                scrollToPreviousElement: false,
-                buttons: {
-                    login: {
-                        text: '去结算',
-                        btnClass: 'btn-to-cart',
-                        action: function(){
-                            window.location.href = '/shopping/cart.html';
-                        }
-                    },
-                    close: {
-                        text: '继续购物',
-                        btnClass: 'btn-to-goon',
-                        action: callback?callback():function(){}
-                    }
-                }
-            });
-        } else {
-            dialog("加入购物车失败！");
-        }
-    });
-}
-

src/main/resources/static/js/common/ajax.service.js

@@ -11,10 +11,7 @@
 */
 var Http = {
         AjaxService : function(option){
-            var NODE_ENV_BASE_URL = $("#spiServer").val();
-            if(option.isHost){
-                NODE_ENV_BASE_URL = $("#coreServer").val();
-            }
+            var NODE_ENV_BASE_URL = $("#coreServer").val();
             var REV_TOKEN_ENV = '',REV_TOKEN_USERID='';
             var GET_LOGIN_STAUS = JSON.parse(window.localStorage.getItem("userInfo"));
             if (GET_LOGIN_STAUS != null) {
@@ -56,7 +53,7 @@ var Http = {
             return def;
         },
         uploadImage : function(option,callback) {//上传图片
-            var NODE_ENV_BASE_URL = $("#spiServer").val();
+            var NODE_ENV_BASE_URL = $("#coreServer").val();
             // var NODE_ENV_BASE_URL = 'https://spi-b.caimei365.com';
             $.ajax({
                 url: NODE_ENV_BASE_URL + option.url,

src/main/resources/static/js/common/serviceapi/beautyArchive.service.js

@@ -1,25 +1,23 @@
 // 美业资料库列表
 var BeautyArchiveApi = {
     //获取资料库商品列表
-    GetArchiveProduct: function (params, callback) {//资料库获取详情
+    GetArchiveProduct: function (params, callback) {
         Http.AjaxService({
             url: '/commodity/product/archive',
             type: 'GET',
             data: params,
             json: false,
-            isHost: true,
         }).then(function (res) {
             callback(res);
         });
     },
-    //获取商品资料列表
-    GetProdcutArchiveDetails: function (params, callback) {//资料库获取详情
+    //资料库获取详情
+    GetProdcutArchiveDetails: function (params, callback) {
         Http.AjaxService({
             url: '/commodity/product/archive/detail',
             type: 'GET',
             data: params,
             json: false,
-            isHost: true,
         }).then(function (res) {
             callback(res);
         });
@@ -31,7 +29,6 @@ var BeautyArchiveApi = {
             type: 'POST',
             data: params,
             json: false,
-            isHost: true,
         }).then(function (res) {
             callback(res);
         });

src/main/resources/static/js/common/serviceapi/club.service.js

@@ -4,7 +4,8 @@
  * auther ZHJY
  */
 var ClubApi = {
-        ClubRegister: function (params, callback) {//获取扫码登陆二维码
+        //获取扫码登陆二维码
+        ClubRegister: function (params, callback) {
             Http.AjaxService({
                 url:'/club/common',
                 type:'post',
@@ -17,4 +18,4 @@ var ClubApi = {
                 callback(res);
             });
         },
-};
+};

src/main/resources/static/js/common/serviceapi/order.service.js

@@ -11,7 +11,6 @@ var OrderApi = {
                 type:'GET',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -24,7 +23,6 @@ var OrderApi = {
                 type:'POST',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -37,7 +35,6 @@ var OrderApi = {
                 type:'POST',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -50,19 +47,18 @@ var OrderApi = {
                 type:'POST',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
             });
         },
-        GetAddressSelect:function(params,callback){ //获取省市区信息
+        //获取省市区信息
+        GetAddressSelect:function(params,callback){
             Http.AjaxService({
                 url:'/order/address/select',
                 type:'get',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res)
@@ -75,7 +71,6 @@ var OrderApi = {
                 type:'GET',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -88,7 +83,6 @@ var OrderApi = {
                 type:'GET',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -114,7 +108,6 @@ var OrderApi = {
                 type:'GET',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -127,7 +120,6 @@ var OrderApi = {
                 type:'POST',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -140,7 +132,6 @@ var OrderApi = {
                 type:'GET',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -153,7 +144,6 @@ var OrderApi = {
                 type:'GET',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -162,10 +152,10 @@ var OrderApi = {
         /* 查询订单列表选项卡标签数量*/
         GetQueryOrderNum: function (params, callback) {
             Http.AjaxService({
-                url:'/pcCenter/getOrderNum',
+                url:'/order/club/count',
                 type:'GET',
                 data:params,
-                json:false
+                json:false,
             })
             .then(function(res){
                 callback(res);
@@ -178,7 +168,6 @@ var OrderApi = {
                 type:'post',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -191,7 +180,6 @@ var OrderApi = {
                 type:'POST',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -204,7 +192,6 @@ var OrderApi = {
                 type:'POST',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -217,7 +204,6 @@ var OrderApi = {
                 type:'POST',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -230,7 +216,6 @@ var OrderApi = {
                 type:'GET',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -243,7 +228,6 @@ var OrderApi = {
                 type:'post',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -256,7 +240,6 @@ var OrderApi = {
                 type:'get',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -269,7 +252,18 @@ var OrderApi = {
                 type:'post',
                 data:params,
                 json:false,
-                isHost:true
+            })
+            .then(function(res){
+                callback(res);
+            });
+        },
+        // 机构最新订单
+        OrderClubLatest: function (params, callback) {
+            Http.AjaxService({
+                url:'/order/club/latest',
+                type:'get',
+                data:params,
+                json:false,
             })
             .then(function(res){
                 callback(res);

src/main/resources/static/js/common/serviceapi/pages.service.js

@@ -7,21 +7,10 @@ var PagesApi = {
         /* 二级列表页 */
         GetPageTopicData: function (params, callback) {
             Http.AjaxService({
-                url:'/page/topic',
+                url:'/commodity/page/floor',
                 type:'GET',
                 data:params,
-                json:false
-            })
-            .then(function(res){
-                callback(res);
-            });
-        },
-        GetPageTopicInfoData: function (params, callback) {
-            Http.AjaxService({
-                url:'/page/topic/info',
-                type:'GET',
-                data:params,
-                json:false
+                json:false,
             })
             .then(function(res){
                 callback(res);
@@ -34,7 +23,6 @@ var PagesApi = {
                 type:'GET',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);

src/main/resources/static/js/common/serviceapi/product.service.js

@@ -208,7 +208,7 @@ var ProductApi = {
         },
         getActivityData: function (params, callback) {
             Http.AjaxService({
-                url: '/commodity/page/floor',
+                url: '/commodity/page/beauty',
                 type: 'get',
                 data: params,
                 json: true,

src/main/resources/static/js/common/serviceapi/repair.service.js

@@ -7,7 +7,7 @@ var RepairApi = {
         /* 查询用户维修列表 */
         GetFindMaintenance: function (params, callback) {
             Http.AjaxService({
-                url:'/pcCenter/findMaintenance',
+                url:'/repair/list',
                 type:'GET',
                 data:params,
                 json:false
@@ -19,7 +19,7 @@ var RepairApi = {
         /* 用户申请维修 */
         AddApplyMaintenance: function (params, callback) {
             Http.AjaxService({
-                url:'/pcCenter/applyMaintenance',
+                url:'/repair/apply',
                 type:'POST',
                 data:params,
                 json:false
@@ -31,7 +31,7 @@ var RepairApi = {
          /* 维修详情 */
         MaintenanceDetail: function (params, callback) {
             Http.AjaxService({
-                url:'/pcCenter/maintenance/detail',
+                url:'/repair/detail',
                 type:'GET',
                 data:params,
                 json:false
@@ -56,7 +56,7 @@ var RepairApi = {
         /* 维修详情 提交评论 */
        evaluation: function (params, callback) {
             Http.AjaxService({
-                url:'/pcCenter/maintenance/evaluation',
+                url:'/repair/evaluation',
                 type:'POST',
                 data:params,
                 json:false

src/main/resources/static/js/common/serviceapi/second.service.js

@@ -12,19 +12,19 @@ var SecondApi = {
         },
         uploadimg: function (params, callback) {//上传图片
             Http.uploadImage({
-                url:'/formData/MultiPictareaddData',
+                url:'/tools/image/upload/multi',
                 data:params
             },callback)
         },
         uploadFile: function (params, callback) {//上传文件
             Http.uploadImage({
-                url:'/file/upload',
+                url:'/tools/file/upload/oss',
                 data:params
             },callback)
         },
         deleteOssFile: function (params, callback) {//删除Oss文件
             Http.AjaxService({
-                url:'/file/delete',
+                url:'/tools/file/delete/oss',
                 type:'post',
                 data:params,
                 json:false,
@@ -65,12 +65,13 @@ var SecondApi = {
         },
         ProductCount: function (params, callback) {//浏览量
             Http.AjaxService({
-                url:'/product/updateSecondHandProductCount',
+                url:'/commodity/second/views',
                 type:'get',
                 data:params,
                 json:true,
                 mask:true,
-                replace:false
+                replace:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -92,12 +93,13 @@ var SecondApi = {
         },
          ProductRecommend: function (params, callback) {//商品详情/相关推荐
             Http.AjaxService({
-                url:'/product/getSecondHandProductRecommend',
+                url:'/commodity/second/recommend',
                 type:'get',
                 data:params,
                 json:true,
                 mask:true,
-                replace:false
+                replace:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);

src/main/resources/static/js/common/serviceapi/shopping.service.js

@@ -140,5 +140,20 @@ var ShoppingApi = {
             .then(function(res){
                 callback(res);
             });
+        },
+        /**
+         * @购物车-购物车数量
+         * @param:userId 用户userId
+         */
+        ShoppingCartCount: function(){
+            Http.AjaxService({
+                url:'/order/club/cart/count',
+                type:'get',
+                data:params,
+                json:false
+            })
+            .then(function(res){
+                callback(res);
+            });
         }
 };

src/main/resources/static/js/common/serviceapi/supplier.service.js

@@ -42,7 +42,7 @@ var SupplierApi = {
         },
         uploadimg: function (params, callback) {//供应商添加物流上传图片
             Http.uploadImage({
-                url:'/formData/MultiPictareaddData',
+                url:'/tools/image/upload/multi',
                 data:params},callback)
         },
         GetMyProductList: function (params, callback) {//供应商商品列表
@@ -344,10 +344,11 @@ var SupplierApi = {
         },
         homePageData: function (params, callback) {//供应商 首页个人中心
             Http.AjaxService({
-                url:'/supplier/homePageData',
+                url:'/user/shop/personal/data',
                 type:'get',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -355,7 +356,7 @@ var SupplierApi = {
         },
          uploadAvatar: function (params, callback) {//供应商 首页上传头像成功后调用
             Http.AjaxService({
-                url:'/user/uploadAvatar',
+                url:'/user/center/avatar/save',
                 type:'post',
                 data:params,
                 json:false
@@ -366,7 +367,7 @@ var SupplierApi = {
         },
         dressUpList : function(params,callback) {//装扮主页列表
             Http.AjaxService({
-                url:'/supplier/dressUp',
+                url:'/user/shop/home/images',
                 type:'get',
                 data:params,
                 json:true
@@ -377,7 +378,7 @@ var SupplierApi = {
         },
          ShopBanner : function(params,callback) {//装扮主页修改与添加
             Http.AjaxService({
-                url:'/supplier/saveShopBanner',
+                url:'/user/shop/home/images/update',
                 type:'POST',
                 data:params,
                 json:false
@@ -388,7 +389,7 @@ var SupplierApi = {
         },
         deleteShopBanner : function(params,callback) {//装扮主页删除广告 Integer shopBannerId
             Http.AjaxService({
-                url:'/supplier/deleteShopBanner',
+                url:'/user/shop/home/images/delete',
                 type:'POST',
                 data:params,
                 json:false
@@ -411,7 +412,7 @@ var SupplierApi = {
         },
          GetMymessageList : function(params,callback) {//个人中心消息列表
             Http.AjaxService({
-                url:'/user/messageList',
+                url:'/user/center/messages',
                 type:'get',
                 data:params,
                 json:true

src/main/resources/static/js/common/serviceapi/user.service.js

@@ -122,7 +122,7 @@ var UserApi = {
         },
         GetMyPcCenterInfo : function(params,callback) {//机构个人中心数据查询(暂时废除)
             Http.AjaxService({
-                url:'/pcCenter/myPcCenter',
+                url:'/user/club/personal/data',
                 type:'get',
                 data:params,
                 json:true
@@ -133,7 +133,7 @@ var UserApi = {
         },
         GetMymessageList : function(params,callback) {//个人中心消息列表
             Http.AjaxService({
-                url:'/user/messageList',
+                url:'/user/center/messages',
                 type:'get',
                 data:params,
                 json:true
@@ -144,7 +144,7 @@ var UserApi = {
         },
         UserPuploadAvatar : function(params,callback) {//机构个人中心头像更新
             Http.AjaxService({
-                url:'/user/uploadAvatar ',
+                url:'/user/center/avatar/save',
                 type:'post',
                 data:params,
                 json:false

src/main/resources/static/js/common/serviceapi/utils.service.js

@@ -5,17 +5,17 @@
  */
 var PublicApi = {
         uploadimg: function (params, callback) {//供应商添加物流上传图片
-            Http.uploadImage({ url:'/formData/MultiPictareaddData',data:params},callback)
+            Http.uploadImage({ url:'/tools/image/upload/multi',data:params},callback)
         },
         uploadFile: function (params, callback) {//上传文件
             Http.uploadImage({
-                url:'/file/upload',
+                url:'/tools/file/upload/oss',
                 data:params
             },callback)
         },
         deleteOssFile: function (params, callback) {//删除Oss文件
             Http.AjaxService({
-                url:'/file/delete',
+                url:'/tools/file/delete/oss',
                 type:'post',
                 data:params,
                 json:false,
@@ -50,28 +50,28 @@ var PublicApi = {
                 callback(res)
             });
         },
-        GetHomeBanner:function(params,callback){ //首页bnner
-            Http.AjaxService({
-                url:'/home/banner',
-                type:'get',
-                data:params,
-                json:false
-            })
-            .then(function(res){
-                callback(res)
-            });
-        },
-        GetHomeRightData:function(params,callback){ //首页右侧模块
-            Http.AjaxService({
-                url:'/home/top/data',
-                type:'get',
-                data:params,
-                json:false
-            })
-            .then(function(res){
-                callback(res)
-            });
-        },
+        // GetHomeBanner:function(params,callback){ //首页bnner
+        //     Http.AjaxService({
+        //         url:'/home/banner',
+        //         type:'get',
+        //         data:params,
+        //         json:false
+        //     })
+        //     .then(function(res){
+        //         callback(res)
+        //     });
+        // },
+        // GetHomeRightData:function(params,callback){ //首页右侧模块
+        //     Http.AjaxService({
+        //         url:'/commodity/home/sidebar',
+        //         type:'get',
+        //         data:params,
+        //         json:false,
+        //     })
+        //     .then(function(res){
+        //         callback(res)
+        //     });
+        // },
         GetProductClassify:function(params,callback){ //获取一级分类
             Http.AjaxService({
                 url:'/commodity/classify',
@@ -84,23 +84,24 @@ var PublicApi = {
                 callback(res)
             });
         },
-        GetNavigationMenu:function(params,callback){ //获取顶部导航
-            Http.AjaxService({
-                url:'/home/init',
-                type:'get',
-                data:params,
-                json:false
-            })
-            .then(function(res){
-                callback(res)
-            });
-        },
+        // GetNavigationMenu:function(params,callback){ //获取顶部导航
+        //     Http.AjaxService({
+        //         url:'/home/init',
+        //         type:'get',
+        //         data:params,
+        //         json:false
+        //     })
+        //     .then(function(res){
+        //         callback(res)
+        //     });
+        // },
         GetProvince:function(params,callback){ //获取省份信息
             Http.AjaxService({
-                url:'/club/province',
+                url:'/order/address/select',
                 type:'get',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res)
@@ -108,10 +109,11 @@ var PublicApi = {
         },
         GetCity:function(params,callback){ //获取区分信息
             Http.AjaxService({
-                url:'/club/city',
+                url:'/order/address/select',
                 type:'get',
                 data:params,
-                json:true
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res)
@@ -119,10 +121,11 @@ var PublicApi = {
         },
         GetTown:function(params,callback){ //获取市信息
             Http.AjaxService({
-                url:'/club/town',
+                url:'/order/address/select',
                 type:'get',
                 data:params,
-                json:true
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res)
@@ -445,7 +448,7 @@ var PublicApi = {
         },
         markAsRead:function (params,callback) {//已读消息
             Http.AjaxService({
-                url:'/user/markAsRead',
+                url:'/user/center/messages/read',
                 type:'post',
                 data:params,
                 json:false
@@ -456,7 +459,7 @@ var PublicApi = {
         },
         deleteMessage:function (params,callback) {//删除消息
             Http.AjaxService({
-                url:'/user/deleteMessage',
+                url:'/user/center/messages/delete',
                 type:'post',
                 data:params,
                 json:false

src/main/resources/static/js/document/base.js

@@ -1,4 +1,3 @@
-var spiServer = $("#spiServer").val();
 var isPC = ($(window).width()>768);
 /** 表单输入框校验 */
 function verifyHandle(obj){

src/main/resources/static/js/flea-market/form.js

@@ -479,7 +479,7 @@ var fleaMarketForm = new Vue({
         },
         getcity:function(event){//加载市
            var _this = this;
-            PublicApi.GetCity({ provinceId: _this.from.province },function(response){
+            PublicApi.GetCity({ type:1, parentId: _this.from.province },function(response){
                  if(response.code == 0 ){
                     _this.cityArray = response.data;
                      _this.from.city = event.target.value;

src/main/resources/static/js/help/select.js

@@ -1,35 +0,0 @@
-var selectClass = new Vue({
-    el:'#selectClass',
-    data:{
-        commodityType:'',
-
-        List:[
-            {id:'1010',name:'卡琪紫红色精华油',shop:'供应商',stauts:'已上架',bigName:'会所常用品',smallName:'客装产品',tinyName:'其他'},
-            {id:'1011',name:'卡琪紫红色精华油',shop:'供应商',stauts:'已上架',bigName:'会所常用品',smallName:'客装产品',tinyName:'其他'},
-            {id:'1012',name:'卡琪紫红色精华油',shop:'供应商',stauts:'已上架',bigName:'会所常用品',smallName:'客装产品',tinyName:'其他'},
-            {id:'1013',name:'卡琪紫红色精华油',shop:'供应商',stauts:'已上架',bigName:'会所常用品',smallName:'客装产品',tinyName:'其他'},
-            {id:'1014',name:'卡琪紫红色精华油',shop:'供应商',stauts:'已上架',bigName:'会所常用品',smallName:'客装产品',tinyName:'其他'},
-            {id:'1015',name:'卡琪紫红色精华油',shop:'供应商',stauts:'已上架',bigName:'会所常用品',smallName:'客装产品',tinyName:'其他'},
-            {id:'1016',name:'卡琪紫红色精华油',shop:'供应商',stauts:'已上架',bigName:'会所常用品',smallName:'客装产品',tinyName:'其他'},
-            {id:'1017',name:'卡琪紫红色精华油',shop:'供应商',stauts:'已上架',bigName:'会所常用品',smallName:'客装产品',tinyName:'其他'},
-            {id:'1018',name:'卡琪紫红色精华油',shop:'供应商',stauts:'已上架',bigName:'会所常用品',smallName:'客装产品',tinyName:'其他'},
-            {id:'1019',name:'卡琪紫红色精华油',shop:'供应商',stauts:'已上架',bigName:'会所常用品',smallName:'客装产品',tinyName:'其他'},
-            {id:'1020',name:'卡琪紫红色精华油',shop:'供应商',stauts:'已上架',bigName:'会所常用品',smallName:'客装产品',tinyName:'其他'},
-        ],
-        bigList:[]
-    },
-    methods:{
-        changeAttr:function (event) {
-            this.commodityType = event.target.value;
-
-        },
-
-    },
-    mounted:function () {
-        var _this = this;
-        $.getJSON(spiServer+"/classification/bigTypeData").done(function (r) {
-                if (r.code === 0 && r.data) {
-                }
-            });
-    }
-})

src/main/resources/static/js/index.js

@@ -5,9 +5,9 @@ var homeData = new Vue({
     data: {
         userId:0,
         asideNav: [],
-        liveList:[],//右侧直播模块
-        cmImageList:[],//右侧活动模块
-        infoList:[],//右侧文章模块
+        // liveList:[],//右侧直播模块
+        // cmImageList:[],//右侧活动模块
+        // infoList:[],//右侧文章模块
         popupFlag:false,
         couponEntry:2,// 活动优惠券弹窗显示控制
         homePageFloor:[]//楼层
@@ -98,19 +98,19 @@ var homeData = new Vue({
                 }
             });
         },
-        GetHomeRightData: function(){//模块加载
-            var _self = this;
-            PublicApi.GetHomeRightData({ source: 1 },function(response){
-                if(response.code == 0){
-                    var data = response.data;
-                    _self.liveList = data.liveList;
-                    _self.cmImageList = data.cmImageList;
-                    _self.infoList = data.infoList;
-                }else{
-                    CAIMEI.Alert(response.msg, '确定');
-                }
-            });
-        },
+        // GetHomeRightData: function(){//模块加载
+        //     var _self = this;
+        //     PublicApi.GetHomeRightData({ source: 1 },function(response){
+        //         if(response.code == 0){
+        //             var data = response.data;
+        //             _self.liveList = data.liveList;
+        //             _self.cmImageList = data.cmImageList;
+        //             _self.infoList = data.infoList;
+        //         }else{
+        //             CAIMEI.Alert(response.msg, '确定');
+        //         }
+        //     });
+        // },
         GetHomeData: function(){//获取首页楼层
             var _self = this;
             PublicApi.GetHomeData({ source: 1,userId: _self.userId },function(response){

src/main/resources/static/js/single-page/live.js

@@ -50,7 +50,7 @@ var livePage = new Vue({
         },
         getLiveArticle: function(){
             var _self = this;
-            $.getJSON(spiServer+"/search/query/article/type" ,{
+            $.getJSON(coreServer+"/commodity/search/query/article/type" ,{
                 id: 8,
                 pageSize: 4,
                 pageNum: 1

src/main/resources/static/js/single-page/topic.js

@@ -1,46 +1,31 @@
 var topicPage = new Vue({
     el: "#topicPage",
     data: {
-        pageType: 0,
+        pageId: 0,
         floorDatas: [],
         buttonName:'',
         buttonLink:''
-    },
-    computed: {
-
     },
     methods: {
         getFloorDatas: function () {
             var _self = this;
-            if(_self.pageType ===0){return;}
-            PagesApi.GetPageTopicData({type: _self.pageType},function(response){
-                if(response.code === 0){
-                    _self.floorDatas = response.data;
-                }else{
+            if(_self.pageId ===0){return;}
+            PagesApi.GetPageTopicData({pageId: _self.pageId, source: 1}, function (response) {
+                if (response.code === 0) {
+                    var data = response.data;
+                    _self.floorDatas = data.floorList;
+                    _self.buttonLink = data.page.buttonLink;
+                    _self.buttonName = data.page.buttonName;
+                } else {
                     CAIMEI.Alert(response.msg, '确定', false);
                 }
             });
         },
-        GetPageTopicBanner:function(){
-            var _self = this;
-            PagesApi.GetPageTopicInfoData({type: _self.pageType},function(response){
-                if(response.code === 0){
-                    _self.buttonLink = response.data.buttonLink;
-                    _self.buttonName = response.data.buttonName;
-                }else{
-                    CAIMEI.Alert(response.msg, '确定', false);
-                }
-            });
-        }
     },
     created: function () {
         var paramsArr = window.location.pathname.split(".")[0].split("-");
-        this.pageType  =  paramsArr.length>=1 ? paramsArr[1] : '';
+        this.pageId  =  paramsArr.length>=1 ? paramsArr[1] : '';
         // 获取列表数据
         this.getFloorDatas();
-        this.GetPageTopicBanner();
-    },
-    mounted: function () {
-        var _self = this;
     }
 });

src/main/resources/static/js/supplier-center/setting/information.js

@@ -405,7 +405,7 @@
         },
         getcity:function(event){//加载市
            var _this = this;
-            PublicApi.GetCity({ provinceId: _this.params.provinceId },function(response){
+            PublicApi.GetCity({ type:1, parentId: _this.params.provinceId },function(response){
                  if(response.code == 0 ){
                     _this.cityArray = response.data;
                      _this.params.cityId = event.target.value;

src/main/resources/static/js/supplier-center/shop/decoration.js

@@ -5,9 +5,9 @@ var decoration = new Vue({
         iconflag:true,
         bgflag:false,
         logoShow:false,
-        formData:new FormData(),
         params:{
-            shopID:'',
+            id: '',
+            shopId:'',
             title:'',
             link:'',
             info:'',
@@ -18,15 +18,16 @@ var decoration = new Vue({
         list:[],
     },
     methods:{
-          uploadlogo:function () { //上传图片
+        uploadlogo: function () { //上传图片
             var _this = this;
             var inputDOM = _this.$refs.images;
             var file = inputDOM.files;
-            _this.formData.append('file', file[0]);
-            SupplierApi.uploadimg(_this.formData,function(response){
-               _this.params.image = response.data;
-               _this.logoShow = true;
-               _this.iconflag = false;
+            var formData = new FormData();
+            formData.append('file', file[0]);
+            SupplierApi.uploadimg(formData, function (response) {
+                _this.params.image = response.data;
+                _this.logoShow = true;
+                _this.iconflag = false;
                 event.target.value = '';
             });
         },
@@ -49,15 +50,16 @@ var decoration = new Vue({
             if(_this.params.image==''){
                 CAIMEI.dialog('请上传广告图片')
             }else {
-            console.log(_this.params)
-                SupplierApi.ShopBanner(_this.params,function (res) {
-                   CAIMEI.dialog('提交成功');
+                console.log(_this.params);
+                SupplierApi.ShopBanner(_this.params, function (res) {
+                    debugger
+                    CAIMEI.dialog('提交成功');
                     location.reload()
                 })
             }
         },
-        editpictures:function(item){
-             var _this = this;
+        editpictures: function (item) {
+            var _this = this;
             _this.name = '编辑主页广告图';
             _this.shopBannerId = item.shopBannerID;
             _this.bgflag = true;
@@ -65,28 +67,40 @@ var decoration = new Vue({
             _this.params.link = item.link;
             _this.params.info = item.info;
             _this.params.image = item.image;
-            if(item.image !=''){
-            _this.params.image=item.image;
-            _this.logoShow = true;
-            _this.iconflag = false;
-             }else {
+            _this.params.id = item.id;
+            if (item.image != '') {
+                _this.params.image = item.image;
+                _this.logoShow = true;
+                _this.iconflag = false;
+            } else {
                 _this.logoShow = false;
                 _this.iconflag = true;
-             }
+            }
         },
         deletepictures:function(item){
             var _this = this;
-            var shopBannerId = item.shopBannerID;
-            console.log(shopBannerId)
+            var id = item.id;
             CAIMEI.Modal('您确定要删除么？','取消','确定',function () {
-               SupplierApi.deleteShopBanner({shopBannerId:shopBannerId},function (res) {
-                    if(res.code==0){
+                SupplierApi.deleteShopBanner({id: id}, function (res) {
+                    if (res.code == 0) {
                         CAIMEI.dialog('删除成功');
                         location.reload()
                     }
-               })
+                })
             })
         },
+        // 获取广告图片列表
+        fetchDressUpList: function () {
+            var _self = this;
+            SupplierApi.dressUpList({shopId: _self.params.shopId}, function (res) {
+                if (res.code == 0) {
+                    console.log(res);
+                    if (res.data.length > 0) {
+                        _self.list = res.data;
+                    }
+                }
+            });
+        },
         close:function () {
             var _this = this;
             _this.bgflag = false;
@@ -95,22 +109,13 @@ var decoration = new Vue({
             _this.params.info = '';
             _this.params.image = '';
         }
-
     },
     mounted:function () {
         var _self = this;
-         if(globalUserData){
-              _self.params.shopID = globalUserData.shopId;
-
-            }
-        SupplierApi.dressUpList({shopId:_self.params.shopID},function (res) {
-            if(res.code==0){
-                console.log(res)
-                if(res.data.length>0){
-                _self.list =res.data;
-                }
-            }
-        })
+        if (globalUserData) {
+            _self.params.shopId = globalUserData.shopId;
+        }
+        this.fetchDressUpList();
         $('.navLayout').find('.navList').removeClass("on").find('.con').hide().find('a').removeClass("on");
         $('.navLayout').find('.navList').eq(1).addClass("on").find('.con').show().find('a').eq(1).addClass("on");
     }

src/main/resources/static/js/supplier-center/shop/release.js

@@ -967,7 +967,7 @@ var releaseContainer = new Vue({
             _this.vShow_detailInfoEditor = false;
             ClassicEditor.create(document.querySelector('#detailInfoEditor'), {
                 ckfinder: {
-                    uploadUrl: _this.NODE_ENV_BASE_URL+'/formData/ckeditorImage'
+                    uploadUrl: _this.NODE_ENV_BASE_URL+'/tools/image/upload/ckeditor'
                 }
             }).then(function(editor) {
                 window.detailInfoEditor = editor;
@@ -983,7 +983,7 @@ var releaseContainer = new Vue({
             _this.vShow_orderInfoEditor = false;
             ClassicEditor.create(document.querySelector('#orderInfoEditor'), {
                 ckfinder: {
-                    uploadUrl: _this.NODE_ENV_BASE_URL+'/formData/ckeditorImage'
+                    uploadUrl: _this.NODE_ENV_BASE_URL+'/tools/image/upload/ckeditor'
                 }
             }).then(function(editor) {
                 window.orderInfoEditor = editor;
@@ -999,7 +999,7 @@ var releaseContainer = new Vue({
             _this.vShow_orderInfoEditor = false;
             ClassicEditor.create(document.querySelector('#severInfoEditor'), {
                 ckfinder: {
-                    uploadUrl: _this.NODE_ENV_BASE_URL+'/formData/ckeditorImage'
+                    uploadUrl: _this.NODE_ENV_BASE_URL+'/tools/image/upload/ckeditor'
                 }
             }).then(function(editor) {
                 window.severInfoEditor = editor;
@@ -1179,7 +1179,7 @@ var releaseContainer = new Vue({
     },
     mounted: function () {
         var _this = this;
-        var NODE_ENV_BASE_URL = $('#spiServer').val();
+        var NODE_ENV_BASE_URL = $('#coreServer').val();
         _this.NODE_ENV_BASE_URL = NODE_ENV_BASE_URL;
         if(globalUserData){
             _this.releaseParams.shopId = globalUserData.shopId;

src/main/resources/static/js/supplier/index.js

@@ -46,7 +46,7 @@ var supplierHome = new Vue({
         },
         getShopInfo: function(){
             var _self = this;
-            $.getJSON(spiServer + "/supplier/home/detail",{supplierId: this.params.id}).done(function (r) {
+            $.getJSON(coreServer + "/user/shop/home/data",{shopId: this.params.id}).done(function (r) {
                 if (r.code === 0 && r.data) {
                     _self.supplierInfo = r.data;
                 }
@@ -54,7 +54,7 @@ var supplierHome = new Vue({
         },
         getBanners: function(){
             var _self = this;
-            $.getJSON(spiServer + "/supplier/home/images",{supplierId: this.params.id}).done(function (r) {
+            $.getJSON(coreServer + "/user/shop/home/images",{shopId: this.params.id}).done(function (r) {
                 if (r.code === 0 && r.data) {
                    _self.supplierBanner = r.data;
                     _self.supplierBanner = r.data;

src/main/resources/static/js/user-center/dashboard.js

@@ -8,7 +8,6 @@ var helpSuggestion = new Vue({
         degree:'',
         userInfo:{},
         vipInfo: {},
-        formData:new FormData(),
         unReadMessageCount:'',// 消息数
         confirmedCount:'',// 待確認數量
         paymentCount:'',// 待付款
@@ -69,23 +68,35 @@ var helpSuggestion = new Vue({
                     var data = response.data;
                     _self.userInfo = data.user;
                     _self.degree = data.degree;
+                    _self.productList = data.homePageAdvertiseList;
+                    _self.newsList = data.homePageInfoList;
+                    _self.couponNum = data.couponNum;
+                    _self.isRequset = false;
+                }else{
+                    CAIMEI.Alert(response.msg, '确定', false);
+                    _self.isRequset = false;
+                }
+            })
+        },
+        // 获取订单数量
+        GetQueryOrderNum: function(){
+            var _self = this;
+            OrderApi.GetQueryOrderNum({userId: _self.userId}, function (response) {
+                if (response.code === 0) {
+                    var data = response.data;
                     _self.unReadMessageCount = _self.showBadge(data.unReadMessageCount);
                     _self.confirmedCount = _self.showBadge(data.confirmedCount);
                     _self.paymentCount = _self.showBadge(data.paymentCount);
                     _self.waitShipmentsCount = _self.showBadge(data.waitShipmentsCount);
                     _self.shipmentsCount = _self.showBadge(data.shipmentsCount);
                     _self.salesReturnCount = _self.showBadge(data.salesReturnCount);
-                    _self.productList = data.homePageAdvertiseList;
-                    _self.newsList = data.homePageInfoList;
-                    _self.couponNum = data.couponNum;
-                    _self.isRequset = false;
-                }else{
+                } else {
                     CAIMEI.Alert(response.msg, '确定', false);
                     _self.isRequset = false;
                 }
             })
         },
-        GetUserClubHome(){
+        GetUserClubHome: function(){
             var _self = this;
             UserApi.GetUserClubHome({userId:_self.userId}, function(response){
                 console.log(response);
@@ -101,8 +112,9 @@ var helpSuggestion = new Vue({
             var _self = this;
             var inputDOM = _self.$refs.clubUseLogo;
             var file = inputDOM.files;
-            _self.formData.append('file', file[0]);
-            PublicApi.uploadimg(_self.formData,function(response){
+            var formData = new FormData();
+            formData.append('file', file[0]);
+            PublicApi.uploadimg(formData, function (response) {
                 _self.userInfo.image = response.data;
                 event.target.value = '';
                 UserApi.UserPuploadAvatar({userId:_self.userId,image:response.data},function(res){
@@ -156,6 +168,7 @@ var helpSuggestion = new Vue({
             _self.userId = globalUserData.userId;
             _self.GetUserClubHome();
             _self.GetMyPcCenterInfo();
+            _self.GetQueryOrderNum();
             _self.GetInitBeansInfo();
             _self.isShowBeansAlet = false;
         }

src/main/resources/static/js/user-center/repair/form-user.js

@@ -100,7 +100,7 @@ var addFormPage = new Vue({
         },
         GetCtiyFn: function(){//获取市
             var _self = this;
-            PublicApi.GetCity({ provinceId: _self.addressfrom.province },function(response){
+            PublicApi.GetCity({ type:1, parentId: _self.addressfrom.province },function(response){
                 if(response.code == 0 ){
                     _self.cityArray = response.data;
                 }else{
@@ -110,7 +110,7 @@ var addFormPage = new Vue({
         },
         GetTownFn: function(){//获取区
             var _self = this;
-            PublicApi.GetTown({ cityId: _self.addressfrom.city },function(response){
+            PublicApi.GetTown({ type:2, parentId: _self.addressfrom.city },function(response){
                 if(response.code == 0 ){
                     _self.townArray = response.data;
                 }else{

src/main/resources/static/js/user-center/repair/repair.js

@@ -90,7 +90,7 @@ var repairForm = new Vue({
            var donClass = '#cityname';
            var domCityname =  document.querySelector(donClass);
            _this.postData.cityName = domCityname.options[domCityname.selectedIndex].text;
-            PublicApi.GetCity({ provinceId: _this.provinceID },function(response){
+            PublicApi.GetCity({ type:1, parentId: _this.provinceID },function(response){
                  if(response.code == 0 ){
                     _this.cityArray = response.data;
                      _this.cityID = event.target.value;

src/main/resources/static/js/user-center/setting/information.js

@@ -422,7 +422,7 @@ var informationPage = new Vue({
         },
         GetCtiyFn: function(){//获取市
             var _self = this;
-            PublicApi.GetCity({ provinceId: _self.addressfrom.provinceId },function(response){
+            PublicApi.GetCity({ type:1, parentId: _self.addressfrom.provinceId },function(response){
                 if(response.code == 0 ){
                     _self.cityArray = response.data;
                 }else{
@@ -432,7 +432,7 @@ var informationPage = new Vue({
         },
         GetTownFn: function(){//获取区
             var _self = this;
-            PublicApi.GetTown({ cityId: _self.addressfrom.cityId },function(response){
+            PublicApi.GetTown({ type:2, parentId: _self.addressfrom.cityId },function(response){
                 if(response.code == 0 ){
                     _self.townArray = response.data;
                 }else{

src/main/resources/static/js/user-center/setting/upgrade.js

@@ -362,7 +362,7 @@ var upgradePage = new Vue({
         // },
         // GetCtiyFn: function(){//获取市
         //     var _self = this;
-        //     PublicApi.GetCity({ provinceId: _self.addressfrom.provinceID },function(response){
+        //     PublicApi.GetCity({ type:1, parentId: _self.addressfrom.provinceID },function(response){
         //         if(response.code == 0 ){
         //             _self.cityArray = response.data;
         //         }else{
@@ -372,7 +372,7 @@ var upgradePage = new Vue({
         // },
         // GetTownFn: function(){//获取区
         //     var _self = this;
-        //     PublicApi.GetTown({ cityId: _self.addressfrom.cityID },function(response){
+        //     PublicApi.GetTown({ type:2, parentId: _self.addressfrom.cityID },function(response){
         //         if(response.code == 0 ){
         //             _self.townArray = response.data;
         //         }else{
@@ -395,7 +395,7 @@ var upgradePage = new Vue({
         },
         getcity:function(event){//加载市
            var _this = this;
-            PublicApi.GetCity({ provinceId: _this.clubUpgradeUser.provinceId },function(response){
+            PublicApi.GetCity({ type:1, parentId: _this.clubUpgradeUser.provinceId },function(response){
                  if(response.code == 0 ){
                     _this.cityArray = response.data;
                      _this.clubUpgradeUser.cityId = event.target.value;

src/main/resources/templates/account/components/header.html

@@ -10,6 +10,6 @@
             <p class="accountLogin">已有账号？请直接<a href="/login.html" rel="nofollow">登录</a></p>
         </div>
     </div>
-    <input type="hidden" th:value="${spiServer}" id="spiServer"><input type="hidden" th:value="${coreServer}" id="coreServer">
+    <input type="hidden" th:value="${coreServer}" id="coreServer">
     <input type="hidden" th:value="${agent}" id="userAgent">
 </header>

src/main/resources/templates/account/register-club.html

@@ -93,15 +93,15 @@
                     <div class="address">
                         <select name="provinceID" id="cProvince" @change="ChangeProvince">
                             <option value="" >请选择</option>
-                            <option v-for="(item ,index) in ProvinceList" :key="index" :value='item.provinceID' >{{item.name}}</option>
+                            <option v-for="(item ,index) in ProvinceList" :key="index" :value='item.id' >{{item.name}}</option>
                         </select>
                         <select name="cityID" id="cCity" @change="ChangeGetcity($event)" >
                             <option value="">请选择</option>
-                            <option v-for="(item ,index) in cityArray" :key="index" :value="item.cityID" >{{item.name}}</option>
+                            <option v-for="(item ,index) in cityArray" :key="index" :value="item.id" >{{item.name}}</option>
                         </select>
                         <select name="townID" id="cTown" @change="ChangeGetcTown($event)" needverify>
                             <option value="">请选择</option>
-                            <option v-for="(item ,index) in townArray" :key="index" :value="item.townID"  >{{item.name}}</option>
+                            <option v-for="(item ,index) in townArray" :key="index" :value="item.id"  >{{item.name}}</option>
                         </select>
                         <textarea placeholder="请输入您的详细联系地址"  v-model="clubUpgradeUser.address" @blur="blurHandle($event)" needverify></textarea>
                         <span class="errTips icon mIcon" tips="请输入正确的联系地址"></span>

src/main/resources/templates/account/register-supplier.html

@@ -91,15 +91,15 @@
                         <p><em>*</em>联系地址：</p>
                         <select name="provinceID" id="cProvince" @change="ChangeProvince">
                             <option value="">请选择</option>
-                            <option v-for="(item ,index) in ProvinceList" :key="index" :value='item.provinceID' >{{item.name}}</option>
+                            <option v-for="(item ,index) in ProvinceList" :key="index" :value='item.id' >{{item.name}}</option>
                         </select>
                         <select name="cityID" id="cCity" @change="ChangeGetcity($event)" >
                             <option value="">请选择</option>
-                            <option v-for="(item ,index) in cityArray" :key="index" :value="item.cityID" >{{item.name}}</option>
+                            <option v-for="(item ,index) in cityArray" :key="index" :value="item.id" >{{item.name}}</option>
                         </select>
                         <select name="townID" id="cTown" @change="ChangeGetcTown($event)">
                             <option value="">请选择</option>
-                            <option v-for="(item ,index) in townArray" :key="index" :value="item.townID"  >{{item.name}}</option>
+                            <option v-for="(item ,index) in townArray" :key="index" :value="item.id"  >{{item.name}}</option>
                         </select>
                         <span class="errTips icon mIcon"></span>
                     </div>

src/main/resources/templates/account/supplier-information.html

@@ -47,15 +47,15 @@
                         <p><em>*</em>联系地址：</p>
                         <select name="provinceID" id="cProvince" @change="ChangeProvince"  v-model="supplierUser.provinceId">
                             <option value="0">请选择</option>
-                            <option v-for="(item ,index) in ProvinceList" :key="index" :value='item.provinceID'>{{item.name}}</option>
+                            <option v-for="(item ,index) in ProvinceList" :key="index" :value='item.id'>{{item.name}}</option>
                         </select>
                         <select name="cityID" id="cCity" @change="ChangeGetcity($event)" v-model="supplierUser.cityId">
                             <option value="0">请选择</option>
-                            <option v-for="(item ,index) in cityArray" :key="index" :value="item.cityID" >{{item.name}}</option>
+                            <option v-for="(item ,index) in cityArray" :key="index" :value="item.id" >{{item.name}}</option>
                         </select>
                         <select name="townID" id="cTown" @change="ChangeGetcTown($event)" v-model="supplierUser.townId">
                             <option value="0">请选择</option>
-                            <option v-for="(item ,index) in townArray" :key="index" :value="item.townID"  >{{item.name}}</option>
+                            <option v-for="(item ,index) in townArray" :key="index" :value="item.id"  >{{item.name}}</option>
                         </select>
                         <textarea placeholder="请输入您的详细联系地址"  v-model="supplierUser.address" @blur="blurHandle($event)" needverify></textarea>
                         <i class="checked icon mIcon"></i>

src/main/resources/templates/article/components/article-header.html

@@ -24,7 +24,6 @@
     <input type="hidden" th:value="${labelId}" id="labelId">
     <input type="hidden" th:value="${typeId}" id="typeId">
     <input type="hidden" th:value="${pageNum}" id="pageNum">
-    <input type="hidden" th:value="${spiServer}" id="spiServer">
     <input type="hidden" th:value="${coreServer}" id="coreServer">
     <input type="hidden" th:value="${agent}" id="userAgent">
 </header>

src/main/resources/templates/components/header.html

@@ -196,7 +196,6 @@
             </div>
         </div>
     </div>
-    <input type="hidden" th:value="${spiServer}" id="spiServer">
     <input type="hidden" th:value="${coreServer}" id="coreServer">
     <input type="hidden" th:value="${agent}" id="userAgent">
 </header>

src/main/resources/templates/document/beauty-archive.html

@@ -8,7 +8,6 @@
     <link th:href="@{/css/document/beauty-archive.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
-<input type="hidden" th:value="${spiServer}" id="spiServer">
 <input type="hidden" th:value="${coreServer}" id="coreServer">
 
 <div id="beautyArchive" v-cloak>

src/main/resources/templates/document/details.html

@@ -25,7 +25,7 @@
                 </div>
             </div>
         </div>
-        <input type="hidden" th:value="${spiServer}" id="spiServer"><input type="hidden" th:value="${coreServer}" id="coreServer">
+        <input type="hidden" th:value="${coreServer}" id="coreServer">
         <input type="hidden" th:value="${agent}" id="userAgent">
     </div>
     <div class="document-content">

src/main/resources/templates/document/list.html

@@ -24,7 +24,7 @@
                 </div>
             </div>
         </div>
-        <input type="hidden" th:value="${spiServer}" id="spiServer"><input type="hidden" th:value="${coreServer}" id="coreServer">
+        <input type="hidden" th:value="${coreServer}" id="coreServer">
         <input type="hidden" th:value="${agent}" id="userAgent">
     </div>
     <div class="document-content clear">

src/main/resources/templates/document/login.html

@@ -18,7 +18,7 @@
                 <span>采美资料库</span>
             </div>
         </div>
-        <input type="hidden" th:value="${spiServer}" id="spiServer"><input type="hidden" th:value="${coreServer}" id="coreServer">
+        <input type="hidden" th:value="${coreServer}" id="coreServer">
         <input type="hidden" th:value="${agent}" id="userAgent">
     </header>
     <div class="login-contailer">

src/main/resources/templates/document/more-content.html

@@ -24,7 +24,7 @@
                 </div>
             </div>
         </div>
-        <input type="hidden" th:value="${spiServer}" id="spiServer"><input type="hidden" th:value="${coreServer}" id="coreServer">
+        <input type="hidden" th:value="${coreServer}" id="coreServer">
         <input type="hidden" th:value="${agent}" id="userAgent">
     </div>
     <div class="document-content">

src/main/resources/templates/error/404.html

@@ -89,7 +89,7 @@
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
 <script type="text/javascript">
-    if(!($('#spiServer').val() && $('#spiServer').val().length>0)){
+    if(!($('#coreServer').val() && $('#coreServer').val().length>0)){
         window.location.href = '/404.html';
     }
 </script>

src/main/resources/templates/flea-market/form.html

@@ -135,12 +135,12 @@
                         <i class="cCity icon mIcon selected"></i>
                         <select class="address-input reg-select city" name="cityID" id="cCity" @change="getcity($event)" >
                             <option value="" >请选择</option>
-                            <option v-for="(item ,index) in cityArray" :key="index" :value="item.cityID" >{{item.name}}</option>
+                            <option v-for="(item ,index) in cityArray" :key="index" :value="item.id" >{{item.name}}</option>
                         </select>
                         <i class="cTown icon mIcon selected"></i>
                         <select class="address-input reg-select town" name="townID" id="cTown" @change="getcTown($event)">
                             <option value="" >请选择</option>
-                            <option v-for="(item ,index) in townArray" :key="index" :value="item.townID"  >{{item.name}}</option>
+                            <option v-for="(item ,index) in townArray" :key="index" :value="item.id"  >{{item.name}}</option>
                         </select>
                         <span class="release-tips errTips icon mIcon" v-show="vShow_TownId">{{fromMessage}}</span>
                             <textarea type="text" id="addressDetails" class="border-grey address-details" v-model="secondParams.address" maxlength="50" placeholder="请填写详细地址，如街道/小区/门牌等" /></textarea>

src/main/resources/templates/help/select.html

@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="https://www.thymeleaf.org ">
-<head>
-    <title>采美365网</title>
-    <template th:replace="components/head-link"></template>
-    <link th:href="@{/css/help/select.css(v=${version})}" rel="stylesheet" type="text/css">
-    <template th:replace="components/analysis"></template>
-</head>
-	<body>
-	<!-- 引用头部 -->
-<template th:replace="components/header"></template>
-		<div id="selectClass">
-			<div class="productlist">
-				<table width="300" border="1" cellspacing="0">
-					<tr>
-						<th>商品ID</th>
-						<th>名称</th>
-						<th>供应商</th>
-						<th>状态</th>
-						<th>一级分类</th>
-						<th>二级分类</th>
-						<th>三级分类</th>
-						<th>商品属性</th>
-						<th>新一级</th>
-						<th>新二级</th>
-					</tr>
-					<tr v-for="(item,index) in List">
-						<td>{{item.id}}</td>
-						<td>{{item.name}}</td>
-						<td>{{item.shop}}</td>
-						<td>{{item.stauts}}</td>
-						<td>{{item.bigName}}</td>
-						<td>{{item.smallName}}</td>
-						<td>{{item.tinyName}}</td>
-						<td>
-							<select @change="changeAttr($event)">
-								<option value="0">属性</option>
-								<option value="1">产品</option>
-								<option value="2">仪器</option>
-							</select>
-						</td>
-						<td>
-							<select @change="preserve($event)">
-								<option>一级分类</option>
-							</select>
-						</td>
-						<td>
-							<select @change="SeconPreserve($event)">
-								<option>二类分类</option>
-							</select>
-						</td>
-					</tr>
-				</table>
-			</div>
-		</div>
-<!-- 引入底部 -->
-<template th:replace="components/footer"></template>
-<template th:replace="components/foot-link"></template>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/help/select.js(v=${version})}"></script>
-	</body>
-</html>

src/main/resources/templates/pay/caimei-pay.html

@@ -11,7 +11,7 @@
     <div class="inner clear">
         <div class="logo"><a href="/index.html"><img src="/img/base/index_logo.png" alt=""></a></div>
         <div class="text">生美/医美采购服务平台</div>
-        <input type="hidden" th:value="${spiServer}" id="spiServer"><input type="hidden" th:value="${coreServer}" id="coreServer">
+        <input type="hidden" th:value="${coreServer}" id="coreServer">
         <input type="hidden" th:value="${agent}" id="userAgent">
     </div>
 </div>

src/main/resources/templates/pay/caimei-paymobile.html

@@ -11,7 +11,7 @@
     <div class="inner clear">
         <div class="logo"><a href="/index.html"><img src="/img/base/index_logo.png" alt=""></a></div>
         <div class="text">收银台</div>
-        <input type="hidden" th:value="${spiServer}" id="spiServer"><input type="hidden" th:value="${coreServer}" id="coreServer">
+        <input type="hidden" th:value="${coreServer}" id="coreServer">
         <input type="hidden" th:value="${agent}" id="userAgent">
     </div>
 </div>

src/main/resources/templates/pay/caimei-starspay.html

@@ -11,7 +11,7 @@
     <div class="inner clear">
         <div class="logo"><a href="/index.html"><img src="/img/base/index_logo.png" alt=""></a></div>
         <div class="text">生美/医美采购服务平台</div>
-        <input type="hidden" th:value="${spiServer}" id="spiServer"><input type="hidden" th:value="${coreServer}" id="coreServer">
+        <input type="hidden" th:value="${coreServer}" id="coreServer">
         <input type="hidden" th:value="${agent}" id="userAgent">
     </div>
 </div>

src/main/resources/templates/pay/caimei-success.html

@@ -13,7 +13,7 @@
     <div class="inner clear">
         <div class="logo"><a href="/index.html"><img src="/img/base/index_logo.png" alt=""></a></div>
         <div class="text">收银台</div>
-        <input type="hidden" th:value="${spiServer}" id="spiServer"><input type="hidden" th:value="${coreServer}" id="coreServer">
+        <input type="hidden" th:value="${coreServer}" id="coreServer">
         <input type="hidden" th:value="${agent}" id="userAgent">
     </div>
 </div>

src/main/resources/templates/pay/caimei-wechatpay.html

@@ -10,7 +10,7 @@
 <body>
 <!-- 引用头部 -->
 <div class="head-wrap">
-    <input type="hidden" th:value="${spiServer}" id="spiServer"><input type="hidden" th:value="${coreServer}" id="coreServer">
+    <input type="hidden" th:value="${coreServer}" id="coreServer">
     <input type="hidden" th:value="${agent}" id="userAgent">
 </div>
 <div class="pay-container  clearfix" id="payContainer" :class="isRequest? 'active' : ''">

src/main/resources/templates/pay/caimei-wisapay.html

@@ -11,7 +11,6 @@
     <div class="inner clear">
         <div class="logo"><a href="/index.html"><img src="/img/base/index_logo.png" alt=""></a></div>
         <div class="text">生美/医美采购服务平台</div>
-        <input type="hidden" th:value="${spiServer}" id="spiServer">
         <input type="hidden" th:value="${agent}" id="userAgent">
     </div>
 </div>

src/main/resources/templates/product/qualityauthorize.html

@@ -7,7 +7,6 @@
     <template th:replace="components/analysis"></template>
 </head>
 <body>
-<input type="hidden" th:value="${spiServer}" id="spiServer">
 <input type="hidden" th:value="${agent}" id="userAgent">
 <div class="container" id="qualityAuthorize">
     <!-- 顶部logo区域 -->

src/main/resources/templates/single-page/topic.html

@@ -38,7 +38,7 @@
             </div>
         </div>
     </div>
-    <div v-if="pageType==6" class="contactBox">
+    <div v-if="pageId==6" class="contactBox">
         <div class="tit"><span>加入正品联盟</span></div>
         <div class="cont">
             <span class="icon mIcon call">0755-22907771转806<br>15338851365</span>

src/main/resources/templates/supplier-center/order/sales-list.html

@@ -11,7 +11,7 @@
 <body>
 <!-- 引用头部 -->
 <div>
-    <input type="hidden" th:value="${spiServer}" id="spiServer"><input type="hidden" th:value="${coreServer}" id="coreServer">
+    <input type="hidden" th:value="${coreServer}" id="coreServer">
     <input type="hidden" th:value="${agent}" id="userAgent">
 </div>
 <!-- 我的采美 -->

src/main/resources/templates/supplier-center/repair/detail.html

@@ -11,7 +11,6 @@
 <body>
 <!--维修详情-->
 <div id="repairDetailPage">
-    <input type="hidden" th:value="${spiServer}" id="spiServer">
     <input type="hidden" th:value="${coreServer}" id="coreServer">
     <div class="navLayout" v-cloak>
         <div class="wrap clear">

src/main/resources/templates/supplier-center/setting/information.html

@@ -60,11 +60,11 @@
                                  </select>
                                  <select name="cityID" id="cityID" @change="getcity($event)" v-model="params.cityId">
                                      <option value="0"  selected="">请选择</option>
-                                     <option v-for="(item ,index) in cityArray" :key="index" :value="item.cityID">{{item.name}}</option>
+                                     <option v-for="(item ,index) in cityArray" :key="index" :value="item.id">{{item.name}}</option>
                                  </select>
                                  <select name="townID" id="townID" @change="getcTown($event)" v-model="params.townId">
                                      <option value="0">请选择</option>
-                                     <option v-for="(item ,index) in townArray" :key="index" :value="item.townID" >{{item.name}}</option>
+                                     <option v-for="(item ,index) in townArray" :key="index" :value="item.id" >{{item.name}}</option>
                                  </select>
                                  <textarea placeholder="建议您如实填写详细地址，例如：街道名称，门牌号码，楼层和房间号等信息"  v-model="params.address" maxlength="25"></textarea>
                                     <i class="checked icon mIcon"></i>

src/main/resources/templates/supplier/index.html

@@ -20,7 +20,7 @@
             <template v-if="supplierBanner.length>0">
                 <li class="swiper-slide mfc" v-for="banner in supplierBanner">
                     <a :href="banner.link" target="_blank">
-                        <img src="/img/base/placeholder.png" :data-original="banner.image">
+                        <img :src="banner.image" >
                     </a>
                 </li>
             </template>
@@ -57,7 +57,7 @@
                     <div v-if="(floor.type === 1 && floor.productList.length > 0) || floor.type === 2" class="part">
                         <div class="title" v-html="floor.title" :id="floor.type === 2 ? 'supProduct' : ''"></div>
                         <!--主推商品列表-->
-                        <ul class="productList clear mfw" v-if="floor.type === 2 && floor.productList.length > 0">
+                        <ul class="productList clear mfw" v-if="floor.productList.length > 0">
                             <li class="productItem " v-for="p in floor.productList">
                                 <a class="image" :href="'/product-'+p.productId+'.html'">
                                     <img src="/img/base/placeholder.png" :data-original="p.image" :alt="p.name">

src/main/resources/templates/user-center/dashboard.html

@@ -225,6 +225,7 @@
 <script charset="utf-8" type="text/javascript" th:src="@{/lib/datapicker/moment-2.29.min.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/user.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/order.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/user-center/dashboard.js(v=${version})}"></script>
 </body>
 </html>

src/main/resources/templates/user-center/repair/form-user.html

@@ -46,15 +46,15 @@
                             <div class="address">
                                 <select name="province" id="province" ref="cProvince" @change="ChangeProvince" v-model="addressfrom.province">
                                     <option value="" >请选择</option>
-                                    <option v-for="(item ,index) in ProvinceList" :key="index" :value='item.provinceID' >{{item.name}}</option>
+                                    <option v-for="(item ,index) in ProvinceList" :key="index" :value='item.id' >{{item.name}}</option>
                                 </select>
                                 <select name="city" id="cCity" @change="ChangeGetcity($event)" v-model="addressfrom.city">
                                     <option value="" >请选择</option>
-                                    <option v-for="(item ,index) in cityArray" :key="index" :value="item.cityID" >{{item.name}}</option>
+                                    <option v-for="(item ,index) in cityArray" :key="index" :value="item.id" >{{item.name}}</option>
                                 </select>
                                 <select name="town" id="cTown" @change="ChangeGetcTown($event)" v-model="addressfrom.town">
                                     <option value="" >请选择</option>
-                                    <option v-for="(item ,index) in townArray" :key="index" :value="item.townID"  >{{item.name}}</option>
+                                    <option v-for="(item ,index) in townArray" :key="index" :value="item.id"  >{{item.name}}</option>
                                 </select>
                                 <textarea placeholder="建议您如实填写详细地址，例如：街道名称，门牌号码，楼层和房间号等信息"  v-model.trim="form.userAddress"></textarea>
                             </div>

src/main/resources/templates/user-center/repair/form.html

@@ -45,11 +45,11 @@
                     </select>
                     <select id="cityname" @change="getcity($event)">
                         <option value="">请选择</option>
-                        <option v-for="(item ,index) in cityArray" :key="index" :value="item.cityID">{{item.name}}</option>
+                        <option v-for="(item ,index) in cityArray" :key="index" :value="item.id">{{item.name}}</option>
                     </select>
                     <select id="townname" @change="getcTown($event)">
                         <option value="">请选择</option>
-                        <option v-for="(item ,index) in townArray" :key="index" :value="item.townID" >{{item.name}}</option>
+                        <option v-for="(item ,index) in townArray" :key="index" :value="item.id" >{{item.name}}</option>
                     </select>
                     <textarea v-model.trim="postData.userAddress" placeholder="建议您如实填写详细收货地址，例如：街道名称，门牌号码，楼层和房间号等信息"></textarea>
                 </div>

src/main/resources/templates/user-center/setting/information.html

@@ -63,15 +63,15 @@
                                 <div class="address">
                                     <select name="provinceID" id="cProvince" @change="ChangeProvince" v-model="clubUpgradeUser.provinceId">
                                         <option value="" >请选择</option>
-                                        <option v-for="(item ,index) in ProvinceList" :key="index" :value='item.provinceID' >{{item.name}}</option>
+                                        <option v-for="(item ,index) in ProvinceList" :key="index" :value='item.id' >{{item.name}}</option>
                                     </select>
                                     <select name="cityID" id="cCity" @change="ChangeGetcity($event)" v-model="clubUpgradeUser.cityId">
                                         <option value="" >请选择</option>
-                                        <option v-for="(item ,index) in cityArray" :key="index" :value="item.cityID" >{{item.name}}</option>
+                                        <option v-for="(item ,index) in cityArray" :key="index" :value="item.id" >{{item.name}}</option>
                                     </select>
                                     <select name="townID" id="cTown" @change="ChangeGetcTown($event)" v-model="clubUpgradeUser.townId">
                                         <option value="" >请选择</option>
-                                        <option v-for="(item ,index) in townArray" :key="index" :value="item.townID"  >{{item.name}}</option>
+                                        <option v-for="(item ,index) in townArray" :key="index" :value="item.id"  >{{item.name}}</option>
                                     </select>
                                     <textarea placeholder="建议您如实填写详细地址，例如：街道名称，门牌号码，楼层和房间号等信息"  v-model="clubUpgradeUser.address" ></textarea>
                                     <i class="checked icon mIcon"></i>

src/main/resources/templates/user-center/setting/upgrade.html

@@ -58,11 +58,11 @@
                                     </select>
                                     <select name="cityID" id="cCity" @change="getcity($event)" v-model="clubUpgradeUser.cityId">
                                         <option value="0" >请选择</option>
-                                        <option v-for="(item ,index) in cityArray" :key="index" :value="item.cityID" >{{item.name}}</option>
+                                        <option v-for="(item ,index) in cityArray" :key="index" :value="item.id" >{{item.name}}</option>
                                     </select>
                                     <select name="townID" id="cTown" @change="getcTown($event)" v-model="clubUpgradeUser.townId">
                                         <option value="0" >请选择</option>
-                                        <option v-for="(item ,index) in townArray" :key="index" :value="item.townID"  >{{item.name}}</option>
+                                        <option v-for="(item ,index) in townArray" :key="index" :value="item.id"  >{{item.name}}</option>
                                     </select>
                                     <textarea placeholder="建议您如实填写详细地址，例如：街道名称，门牌号码，楼层和房间号等信息"  v-model="clubUpgradeUser.address"></textarea>
                                 </div>

src/main/resources/templates/we_chat/redirect_uri.html

@@ -6,7 +6,7 @@
     <template th:replace="components/head-link"></template>
 </head>
 <body>
-<input type="hidden" th:value="${spiServer}" id="spiServer">
+
 <input type="hidden" th:value="${coreServer}" id="coreServer">
 <input type="hidden" th:value="${agent}" id="userAgent">
 <template th:replace="components/foot-link"></template>