商品模块化 联调

src/main/resources/static/css/article/article.css

@@ -72,7 +72,7 @@ dl,dd,dt{zoom:1}
 	.type a:hover{background-color:#e96c1c;border-bottom:solid 2px #fec19a}
 	.type a.current{background-color:#e96c1c;border-bottom:solid 2px #fec19a}
 	.nav .search{position:relative;display:table-cell;vertical-align:top;width:280px;height:32px;margin-left:39px}
-	.nav .search .keyword{width:280px;height:32px;line-height:32px;margin:22px 0 16px 0;padding:0 32px 0 10px;border:none;border-radius:12px;background:#eb7941;color:#fff;font-size:14px}
+	.nav .search .keyword{width:280px;height:32px;line-height:32px;margin:22px 0 16px 0;padding:0 32px 0 10px;border:none;border-radius:16px;background:#eb7941;color:#fff;font-size:14px}
 	.search .keyword:focus{border:none;outline:medium}
 	.search .searchBtn{position:absolute;top:22px;right:-1px;display:block;width:32px;height:32px;background:url(/img/info/search.png) no-repeat left 8px}
 	.search .keyword::-webkit-input-placeholder{color:#fff}

src/main/resources/static/css/product/instruement-list.css

@@ -150,7 +150,7 @@
     .productItem .price .price_text_tag .listTag{margin: 0;float: left}
     .productItem .price .main_price_unde { width: 100%;height: 31px;line-height: 31px;font-size: 14px;color: #4a4f58;text-align: left;float: left;}
     .productItem .price .main_price_show { width: 100%;height: 30px;line-height: 30px;font-size: 14px;color: #f94b4b;text-align: left;float: left;}
-    .productItem .name .tag{width: 44px;height: 18px;line-height: 18px;font-size: 12px;display: inline-block;margin-right: 5px;text-align: center;color: #FFFFFF !important;background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);border-radius: 0px 10px 0px 0px;margin-top: 2px;}
+    .productItem .name .tag{width: 44px;height: 18px;line-height: 18px;font-size: 12px;display: inline-block;margin-right: 5px;text-align: center;color: #FFFFFF !important;background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);border-radius: 0px 10px 0px 0px;}
 
 }
 

src/main/resources/static/css/supplier-center/shop/goods.css

@@ -1,58 +1,58 @@
 li{list-style: none}
  @media screen and (min-width:768px) {
-  .crumbs{color: #22272e;font-size: 16px;}
-  .head-top>form{overflow: hidden;background: #fff;padding:17px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07)}
-  form>div {float: left; height: 40px;font-size: 12px;color: #627386;line-height: 40px;margin-right: 10px;margin-bottom: 10px}
-  .Buyer {width: 210px; height: 34px;background-color: #ffffff;border-radius: 2px;border: solid 1px #b8bfca;padding-left: 10px;cursor: pointer;}
-  .state {width: 168px;height: 36px;background-color: #ffffff;border-radius: 2px;border: solid 1px #b8bfca;padding-left: 10px;
-  color: #627386;cursor: pointer; margin-right: 10px}
-  input::placeholder{color: #9aa5b5;font-size: 12px;}
-  textarea::placeholder{color: #9aa5b5;}
-  #newBtn div{height: 36px;border-radius: 2px;display: inline-block;text-align: center;cursor: pointer}
-  #newBtn{float: right;margin: 0}
-  .query-btn{background-color: #e15616;color: #fff;width: 88px;border: 1px solid #e15616}
-  .goods-main{width: 100%; height: auto; float: left; margin:10px 0;background: #fff;}
-  .goods-main-empty{width: 100%;height: 60px;line-height: 60px;text-align: center;float: left;margin-top: 20px;}
-  .goods-main-empty p{font-size: 14px;color: #333;}
-  .goods-main-empty p a{color: #e15616;text-decoration: underline;margin: 0 3px;}
-  .goods-title{ height: 56px;line-height: 56px;border-bottom: solid 1px #e2e7ef;padding: 0 20px}
-  .goods-main .goods-table ul li{float:left;width: 8%;text-align: center;color: #22272e;position: inherit}
-  .goods-main .goods-table ul li:nth-child(2){ width: 25%;}
-  .goods-main .goods-table ul li:nth-child(3),.goods-main .goods-table ul li:nth-child(4){width: 20%}
-  .goods-main .goods-table ul li:last-child{width: 23%;position: relative}
-  .tbody ul li{height: 96px;font-size: 12px;}
-  .tbody ul{padding: 0 20px;position: relative;height: 96px}
-  .tbodyle ul li:nth-child(2){width: 25%;}
-  .tbody ul li:nth-child(3),.goods-main .goods-table ul li:nth-child(3){ width: 16%}
-  .tbody ul li:last-child{width: 20%}
-  .goods-main .checkbox {overflow: hidden; cursor: pointer;}
-  .tbody .checkbox .box{ display: inline-block; width: 20px;height: 90px;margin-top: 2px;float: left;}
-  .goods-main  .tbody .checkbox span{ display: inline-block;float: left;margin-left: 6px;}
-  .checkbox .icon-weigouxuan:before{ width: 16px;height: 16px; background-position: -332px -32px;}
-  .checkbox .icon-gouxuan:before{width: 16px; height: 16px;background-position: -210px 0px}
-  .goods-main  .tbody .good-info{display: inline-block}
-  .goods-main  .tbody .good-info img{width: 80px;height: 80px;margin-top: 8px}
-  .tbody ul li .good-classFly,.tbody ul li .good-price,.tbody ul li .status{position: relative;top: 50%;left: 50%;transform: translate(-50%, -50%);width: fit-content;}
-  .goods-main  .tbody .good-name{margin-left: 8px;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;width: 112px}
-  .goods-main  .tbody .good-handle{text-align: left;padding: 0 7px;line-height: 35px;position: absolute;width: 180px;top: 0;left: 50px;right: 0;bottom: 0;margin: auto;height: fit-content}
-  .goods-main  .tbody .btn{padding: 0 11px;margin-right: 8px;height: 24px;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;display: inline-block;line-height: 24px;color: #e15616;}
-  .goods-container .good-footer{width: 95%;height: 56px;float: left;padding: 20px}
-  .goods-container .good-footer .footer-left{float: left;}
-  .goods-container .good-footer .checkbox {line-height: 70px;}
-  .goods-container .good-footer .checkbox .box{line-height: 74px;float: left;}
-  .goods-container .good-footer .checkbox span{display: inline-block;float: left;margin-left: 10px;}
-  .goods-container .good-footer .footer-right{float: right;margin-top: 20px;}
-  .goods-container .good-footer .footer-right .btn{width: 90px;height: 36px;display: block;line-height: 36px;text-align: center;font-size: 14px;border-radius: 2px;color: #FFF;}
-  .goods-container .good-footer .footer-right .btn.icon-weigouxuan{border: solid 1px #9aa5b5;color: #22272e;opacity: .5;}
-  .goods-container .good-footer .footer-right .btn.icon-gouxuan{background-color: #e15616;}
-  .bg-gouxuan{background-color: #f0f3f7;}
-  .good-price p {display: inline-block}
-  .priceTag{position: absolute;    top: 60px; right: 45px}
-  .pageWrap{width: 968px;margin: auto;padding: 32px 0}
-  .empty{background: #fff;margin-top: 10px;}
-  .navLayout{min-height: auto;}
-  .styleborder{border-top: 1px solid #e2e7ef}
-  .checkbox.checklist{line-height: 90px}
+    .crumbs{color: #22272e;font-size: 16px;}
+    .head-top>form{overflow: hidden;background: #fff;padding:17px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07)}
+    form>div {float: left; height: 40px;font-size: 12px;color: #627386;line-height: 40px;margin-right: 10px;margin-bottom: 10px}
+    .Buyer {width:156px; height: 34px;background-color: #ffffff;border-radius: 2px;border: solid 1px #b8bfca;padding-left: 10px;cursor: pointer;}
+    .state {width: 168px;height: 36px;background-color: #ffffff;border-radius: 2px;border: solid 1px #b8bfca;padding-left: 10px;color: #627386;cursor: pointer; margin-right: 10px}
+     .state.small{width: 140px;}
+     input::placeholder{color: #9aa5b5;font-size: 12px;}
+     textarea::placeholder{color: #9aa5b5;}
+     #newBtn div{height: 36px;border-radius: 2px;display: inline-block;text-align: center;cursor: pointer}
+      #newBtn{float: right;margin: 0}
+      .query-btn{background-color: #e15616;color: #fff;width: 88px;border: 1px solid #e15616}
+      .goods-main{width: 100%; height: auto; float: left; margin:10px 0;background: #fff;}
+      .goods-main-empty{width: 100%;height: 60px;line-height: 60px;text-align: center;float: left;margin-top: 20px;}
+      .goods-main-empty p{font-size: 14px;color: #333;}
+      .goods-main-empty p a{color: #e15616;text-decoration: underline;margin: 0 3px;}
+      .goods-title{ height: 56px;line-height: 56px;border-bottom: solid 1px #e2e7ef;padding: 0 20px}
+      .goods-main .goods-table ul li{float:left;width: 8%;text-align: center;color: #22272e;position: inherit}
+      .goods-main .goods-table ul li:nth-child(2){ width: 25%;}
+      .goods-main .goods-table ul li:nth-child(3),.goods-main .goods-table ul li:nth-child(4){width: 20%}
+      .goods-main .goods-table ul li:last-child{width: 23%;position: relative}
+      .tbody ul li{height: 96px;font-size: 12px;}
+      .tbody ul{padding: 0 20px;position: relative;height: 96px}
+      .tbodyle ul li:nth-child(2){width: 25%;}
+      .tbody ul li:nth-child(3),.goods-main .goods-table ul li:nth-child(3){ width: 16%}
+      .tbody ul li:last-child{width: 20%}
+      .goods-main .checkbox {overflow: hidden; cursor: pointer;}
+      .tbody .checkbox .box{ display: inline-block; width: 20px;height: 90px;margin-top: 2px;float: left;}
+      .goods-main  .tbody .checkbox span{ display: inline-block;float: left;margin-left: 6px;}
+      .checkbox .icon-weigouxuan:before{ width: 16px;height: 16px; background-position: -332px -32px;}
+      .checkbox .icon-gouxuan:before{width: 16px; height: 16px;background-position: -210px 0px}
+      .goods-main  .tbody .good-info{display: inline-block}
+      .goods-main  .tbody .good-info img{width: 80px;height: 80px;margin-top: 8px}
+      .tbody ul li .good-classFly,.tbody ul li .good-price,.tbody ul li .status{position: relative;top: 50%;left: 50%;transform: translate(-50%, -50%);width: fit-content;}
+      .goods-main  .tbody .good-name{margin-left: 8px;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;width: 112px}
+      .goods-main  .tbody .good-handle{text-align: left;padding: 0 7px;line-height: 35px;position: absolute;width: 180px;top: 0;left: 50px;right: 0;bottom: 0;margin: auto;height: fit-content}
+      .goods-main  .tbody .btn{padding: 0 11px;margin-right: 8px;height: 24px;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;display: inline-block;line-height: 24px;color: #e15616;}
+      .goods-container .good-footer{width: 95%;height: 56px;float: left;padding: 20px}
+      .goods-container .good-footer .footer-left{float: left;}
+      .goods-container .good-footer .checkbox {line-height: 70px;}
+      .goods-container .good-footer .checkbox .box{line-height: 74px;float: left;}
+      .goods-container .good-footer .checkbox span{display: inline-block;float: left;margin-left: 10px;}
+      .goods-container .good-footer .footer-right{float: right;margin-top: 20px;}
+      .goods-container .good-footer .footer-right .btn{width: 90px;height: 36px;display: block;line-height: 36px;text-align: center;font-size: 14px;border-radius: 2px;color: #FFF;}
+      .goods-container .good-footer .footer-right .btn.icon-weigouxuan{border: solid 1px #9aa5b5;color: #22272e;opacity: .5;}
+      .goods-container .good-footer .footer-right .btn.icon-gouxuan{background-color: #e15616;}
+      .bg-gouxuan{background-color: #f0f3f7;}
+      .good-price p {display: inline-block}
+      .priceTag{position: absolute;    top: 60px; right: 45px}
+      .pageWrap{width: 968px;margin: auto;padding: 32px 0}
+      .empty{background: #fff;margin-top: 10px;}
+      .navLayout{min-height: auto;}
+      .styleborder{border-top: 1px solid #e2e7ef}
+      .checkbox.checklist{line-height: 90px}
   }
 
 /*移动*/

src/main/resources/static/js/article/detail.js

@@ -59,7 +59,7 @@ var articleRelated = new Vue({
         $.get("/article/pv", {id: this.infoId}, function(res){
             if(res.code === 0){
                 // 更新文章索引
-                $.post(spiServer + "/search/manage/update/article", {aid: _self.infoId}, function(res){
+                $.post(coreServer + "/commodity/search/index/update/article", {articleId: _self.infoId}, function(res){
                     console.log(res.msg);
                 });
             }

src/main/resources/static/js/article/list.js

@@ -57,19 +57,20 @@ var articleList = new Vue({
                     var result = JSON.parse(r.data);
                     _self.listRecord = result.total;
                     var resultData = [];
+                    console.log('文章列表',result.items);
                     result.items.map(function (item) {
                         resultData.push({
-                            id: item.a_id,
-                            title: item.a_title,
-                            image: item.a_image,
-                            intro: item.a_intro,
-                            typeId: item.a_type_id,
-                            type: item.a_type_text,
-                            labelIds: item.a_label_ids.replace(/[^[\d|\S]]*/g, ',').split(","),
-                            labels: item.a_label_text.replace(/[^[\d|\S]]*/g, ',').split(","),
-                            pv: item.a_pv,
-                            publisher: item.a_publisher,
-                            publishDate: item.a_publish_date
+                            id: item.articleId,
+                            title: item.title,
+                            image: item.image,
+                            intro: item.intro,
+                            typeId: item.typeId,
+                            type: item.typeText,
+                            labelIds: item.labelIds.replace(/[^[\d|\S]]*/g, ',').split(","),
+                            labels: item.labelText.replace(/[^[\d|\S]]*/g, ',').split(","),
+                            pv: item.pv,
+                            publisher: item.publisher,
+                            publishDate: item.publishDate
                         });
                     });
                     if(isPC){
@@ -104,21 +105,21 @@ var articleList = new Vue({
         var requestUrl = '';
         var requestParams = {};
         if (this.params.typeId) {
-            requestUrl = spiServer+"/search/query/article/type";
+            requestUrl = coreServer+"/commodity/search/query/article/type";
             requestParams = {
                 id: this.params.typeId,
                 pageSize: this.params.size,
                 pageNum: this.params.num
             };
         } else if (this.params.labelId) {
-            requestUrl = spiServer+"/search/query/article/label";
+            requestUrl = coreServer+"/commodity/search/query/article/label";
             requestParams = {
                 id: this.params.labelId,
                 pageSize: this.params.size,
                 pageNum: this.params.num
             };
         } else if(this.params.keyword){
-            requestUrl = spiServer+"/search/query/article";
+            requestUrl = coreServer+"/commodity/search/query/article";
             requestParams = {
                 keyword: this.params.keyword,
                 pageSize: this.params.size,

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

@@ -5,7 +5,14 @@
  */
 var ClubApi = {
         ClubRegister: function (params, callback) {//获取扫码登陆二维码
-            Http.AjaxService({ url:'/club/common', type:'post', data:params, json:true, mask:true,replace:false})
+            Http.AjaxService({
+                url:'/club/common',
+                type:'post',
+                data:params,
+                json:true,
+                mask:true,
+                replace:false
+            })
             .then(function(res){
                 callback(res);
             });

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

@@ -5,49 +5,89 @@
  */
 var DocumentApi = {
         GetAuthorization: function (params, callback) {//资料库登录初始化
-            LocakkHost.AjaxService({ url:'/document/authorization', type:'get', data:params, json:false})
+            LocakkHost.AjaxService({
+                url:'/document/authorization',
+                type:'get',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         GetImgVerifyCode: function (params, callback) {//资料库获取图形验证码
-            LocakkHost.AjaxService({ url:'/document/getImgVerifyCode', type:'get', data:params, json:false})
+            LocakkHost.AjaxService({
+                url:'/document/getImgVerifyCode',
+                type:'get',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         DocumentNote: function (params, callback) {//资料库获取短信验证码
-            LocakkHost.AjaxService({ url:'/document/note', type:'get', data:params, json:true})
+            LocakkHost.AjaxService({
+                url:'/document/note',
+                type:'get',
+                data:params,
+                json:true
+            })
             .then(function(res){
                 callback(res);
             });
         },
         MobileCodeLogin: function (params, callback) {//资料库登录
-            LocakkHost.AjaxService({ url:'/document/mobileCodeLogin', type:'POST', data:params, json:false})
+            LocakkHost.AjaxService({
+                url:'/document/mobileCodeLogin',
+                type:'POST',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         GetDocumentDataList: function (params, callback) {//资料库获取列表
-            LocakkHost.AjaxService({ url:'/document/dataList', type:'GET', data:params, json:false})
+            LocakkHost.AjaxService({
+                url:'/document/dataList',
+                type:'GET',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         GetDocumentDataDetails: function (params, callback) {//资料库获取详情
-            LocakkHost.AjaxService({ url:'/document/dataDetails', type:'GET', data:params, json:false})
+            LocakkHost.AjaxService({
+                url:'/document/dataDetails',
+                type:'GET',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         GetDocumentMoreData: function (params, callback) {//资料库获取详情
-            LocakkHost.AjaxService({ url:'/document/moreData', type:'GET', data:params, json:false})
+            LocakkHost.AjaxService({
+                url:'/document/moreData',
+                type:'GET',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         GetDocumentDownloadLink: function (params, callback) {//资料库获取详情
-            LocakkHost.AjaxService({ url:'/document/downFileAll', type:'GET', data:params, json:false})
+            LocakkHost.AjaxService({
+                url:'/document/downFileAll',
+                type:'GET',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });

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

@@ -6,133 +6,228 @@
 var OrderApi = {
         /* 查询用户地址列表 */
         GetAddressList: function (params, callback) {
-            Http.AjaxService({ url:'/personalCenter/findAddress', type:'GET', data:params, json:false})
+            Http.AjaxService({
+                url:'/personalCenter/findAddress',
+                type:'GET',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         /* 添加,保存地址 */
         AddSaveAddress: function (params, callback) {
-            Http.AjaxService({ url:'/personalCenter/saveAddress', type:'POST', data:params, json:false})
+            Http.AjaxService({
+                url:'/personalCenter/saveAddress',
+                type:'POST',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         /* 设为默认地址 */
         DefaultAddress: function (params, callback) {
-            Http.AjaxService({ url:'/personalCenter/defaultAddress', type:'POST', data:params, json:false})
+            Http.AjaxService({
+                url:'/personalCenter/defaultAddress',
+                type:'POST',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         /* 删除地址 */
         DeleteAddress: function (params, callback) {
-            Http.AjaxService({ url:'/personalCenter/deleteAddress', type:'GET', data:params, json:false})
+            Http.AjaxService({
+                url:'/personalCenter/deleteAddress',
+                type:'GET',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         /* 删除地址 */
         GetFindInvoice: function (params, callback) {
-            Http.AjaxService({ url:'/personalCenter/findInvoice', type:'GET', data:params, json:false})
+            Http.AjaxService({
+                url:'/personalCenter/findInvoice',
+                type:'GET',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         /* 确认订单 */
         GetOrderConfirmInfo: function (params, callback) {
-            Http.AjaxService({ url:'/order/confirm', type:'GET', data:params, json:false})
+            Http.AjaxService({
+                url:'/order/confirm',
+                type:'GET',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         /* 获取订单邮费信息 */
         GetOrderPostage: function (params, callback) {
-            Http.AjaxService({ url:'/order/postage', type:'GET', data:params, json:false})
+            Http.AjaxService({
+                url:'/order/postage',
+                type:'GET',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         /* 提交订单 */
         ConfirmOrder: function (params, callback) {
-            Http.AjaxService({ url:'/order/submit', type:'POST', data:params, json:false})
+            Http.AjaxService({
+                url:'/order/submit',
+                type:'POST',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         /* 查询订单列表 */
         GetQueryOrderListData: function (params, callback) {
-            Http.AjaxService({ url:'/pcCenter/getOrderList', type:'GET', data:params, json:false})
+            Http.AjaxService({
+                url:'/pcCenter/getOrderList',
+                type:'GET',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         /* 查询订单详情 */
         QueryOrderDetailsInfo: function (params, callback) {
-            Http.AjaxService({ url:'/order/detail', type:'GET', data:params, json:false})
+            Http.AjaxService({
+                url:'/order/detail',
+                type:'GET',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         /* 查询订单列表选项卡标签数量*/
         GetQueryOrderNum: function (params, callback) {
-            Http.AjaxService({ url:'/pcCenter/getOrderNum', type:'GET', data:params, json:false})
+            Http.AjaxService({
+                url:'/pcCenter/getOrderNum',
+                type:'GET',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         /* 机构用户取消订单操作*/
         GetCancelOrder: function (params, callback) {
-            Http.AjaxService({ url:'/order/cancel', type:'GET', data:params, json:false})
+            Http.AjaxService({
+                url:'/order/cancel',
+                type:'GET',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         /* 机构用户删除订单操作*/
         GetDeleteOrder: function (params, callback) {
-            Http.AjaxService({ url:'/order/delete', type:'GET', data:params, json:false})
+            Http.AjaxService({
+                url:'/order/delete',
+                type:'GET',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         /* 机构用户确认收货操作*/
         GetAffirmOrder: function (params, callback) {
-            Http.AjaxService({ url:'/order/affirm', type:'GET', data:params, json:false})
+            Http.AjaxService({
+                url:'/order/affirm',
+                type:'GET',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         /* 机构用户确认订单操作*/
         AffirmOrderOrder: function (params, callback) {
-            Http.AjaxService({ url:'/order/affirmOrder', type:'POST', data:params, json:false})
+            Http.AjaxService({
+                url:'/order/affirmOrder',
+                type:'POST',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         /* 订单支付,效验付款规则 orderId 订单ID */
         OrderPaymentValidation: function (params, callback) {
-            Http.AjaxService({ url:'/order/paymentValidation', type:'GET', data:params, json:false})
+            Http.AjaxService({
+                url:'/order/paymentValidation',
+                type:'GET',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         /* 订单支付,效验付款规则 orderId 订单ID */
         OrderBalanceDeduction: function (params, callback) {
-            Http.AjaxService({ url:'/order/balanceDeduction', type:'post', data:params, json:false})
+            Http.AjaxService({
+                url:'/order/balanceDeduction',
+                type:'post',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         //订单查看物流
         seelogistics: function (params, callback) {
-            Http.AjaxService({ url:'/pcCenter/logistics', type:'get', data:params, json:false})
+            Http.AjaxService({
+                url:'/pcCenter/logistics',
+                type:'get',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         //  打款供应商
         confirmpayment: function (params, callback) {
-            Http.AjaxService({ url:'/order/affirm/payment', type:'post', data:params, json:false})
+            Http.AjaxService({
+                url:'/order/affirm/payment',
+                type:'post',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });

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

@@ -6,20 +6,35 @@
 var PagesApi = {
         /* 二级列表页 */
         GetPageTopicData: function (params, callback) {
-            Http.AjaxService({ url:'/page/topic', type:'GET', data:params, json:false})
+            Http.AjaxService({
+                url:'/page/topic',
+                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})
+            Http.AjaxService({
+                url:'/page/topic/info',
+                type:'GET',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         /* 活动商品专题列表 */
         GetPromotionsListData: function (params, callback) {
-            Http.AjaxService({ url:'/commodity/promotions/list', type:'GET', data:params, json:false})
+            Http.AjaxService({
+                url:'/commodity/promotions/list',
+                type:'GET',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });

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

@@ -5,57 +5,102 @@
  */
 var PayApi = {
         PayOrderOnLineSwitch: function (params, callback) {//网银支付链接初始化数据
-            Http.AjaxService({ url:'/PayOrder/onLineSwitch', type:'GET', data:params, json:true})
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/PayOrder/onLineSwitch',
+                type:'GET',
+                data:params,
+                json:true
+            })
+            .then(function(res){
+                callback(res);
+            });
         },
         PayOrderCheckoutCounter: function (params, callback) {//网银支付链接初始化数据
-            Http.AjaxService({ url:'/PayOrder/checkoutCounter', type:'GET', data:params, json:true})
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/PayOrder/checkoutCounter',
+                type:'GET',
+                data:params,
+                json:true
+            })
+            .then(function(res){
+                callback(res);
+            });
         },
         PayOrderPcMallPay: function (params, callback) {//查询跳转网银页面
-            Http.AjaxService({ url:'/PayOrder/pcMallPay', type:'POST', data:params, json:false})
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/PayOrder/pcMallPay',
+                type:'POST',
+                data:params,
+                json:false
+            })
+            .then(function(res){
+                callback(res);
+            });
         },
         PayOrderMiniWxPay: function (params, callback) {//调起微信公众号支付
-            Http.AjaxService({ url:'/PayOrder/miniWxPay', type:'post', data:params, json:false})
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/PayOrder/miniWxPay',
+                type:'post',
+                data:params,
+                json:false
+            })
+            .then(function(res){
+                callback(res);
+            });
         },
         PayOrderPayWhetherSuccess: function (params, callback) {//查询微信是否已完成支付
-            Http.AjaxService({ url:'/PayOrder/payWhetherSuccess', type:'GET', data:params, json:true})
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/PayOrder/payWhetherSuccess',
+                type:'GET',
+                data:params,
+                json:true
+            })
+            .then(function(res){
+                callback(res);
+            });
         },
         PayOrderFindOrderStatus: function (params, callback) {//查询判断是否已完成支付
-            Http.AjaxService({ url:'/PayOrder/findOrderStatus', type:'GET', data:params, json:true})
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/PayOrder/findOrderStatus',
+                type:'GET',
+                data:params,
+                json:true
+            })
+            .then(function(res){
+                callback(res);
+            });
         },
         PayOrderPayLink: function (params, callback) {//查询判断是否已完成支付unpaidAmount 本次待付款金额 orderId  主订单ID
-            Http.AjaxService({ url:'/PayOrder/payLink', type:'POST', data:params, json:false})
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/PayOrder/payLink',
+                type:'POST',
+                data:params,
+                json:false
+            })
+            .then(function(res){
+                callback(res);
+            });
         },
         PayOrdersecondHandPay: function (params, callback) {//发布二手商品支付 本次待付款金额 productID  主订单ID
-            Http.AjaxService({ url:'/PayOrder/secondHandPay', type:'POST', data:params, json:false})
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/PayOrder/secondHandPay',
+                type:'POST',
+                data:params,
+                json:false
+            })
+            .then(function(res){
+                callback(res);
+            });
         },
         PayOrderLinkData: function (params, callback) {//网银支付重定向数据初始化
-            Http.AjaxService({ url:'/PayOrder/linkData', type:'GET', data:params, json:true})
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/PayOrder/linkData',
+                type:'GET',
+                data:params,
+                json:true
+            })
+            .then(function(res){
+                callback(res);
+            });
         }
 };

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

@@ -5,63 +5,175 @@
  */
 var ProductApi = {
         GetProductDdtails: function (params, callback) {//获取商品详情
-            Http.AjaxService({ url:'/product/details', type:'get', data:params, json:true})
+            Http.AjaxService({
+                url:'/product/details',
+                type:'get',
+                data:params,
+                json:true
+            })
+            .then(function(res){
+                callback(res);
+            });
+        },
+        GetProductDdtailsImages: function (params, callback) {//获取商品图片
+            Http.AjaxService({
+                url:'/product/detail/images',
+                type:'get',
+                data:params,
+                json:true
+            })
+            .then(function(res){
+                callback(res);
+            });
+        },
+        GetProductDdtailsPrice: function (params, callback) {//获取商品价格
+            Http.AjaxService({
+                url:'/product/detail/price',
+                type:'get',
+                data:params,
+                json:true
+            })
+            .then(function(res){
+                callback(res);
+            });
+        },
+        GetProductDdtailsLadderPrice: function (params, callback) {//获取商品阶梯价格
+            Http.AjaxService({
+                url:'/product/ladderPrice',
+                type:'get',
+                data:params,
+                json:true
+            })
+            .then(function(res){
+                callback(res);
+            });
+        },
+        GetProductDdtailsParameter: function (params, callback) {//获取商品参数
+            Http.AjaxService({
+                url:'/product/detail/parameter',
+                type:'get',
+                data:params,
+                json:true
+            })
+            .then(function(res){
+                callback(res);
+            });
+        },
+        GetProductDdtailsRecommend: function (params, callback) {//获取商品推荐
+            Http.AjaxService({
+                url:'/product/detail/recommend',
+                type:'get',
+                data:params,
+                json:true
+            })
             .then(function(res){
                 callback(res);
             });
         },
         GetbigTypeclassify: function (params, callback) {//一二三级分类-商品分类列表
-            Http.AjaxService({ url:'/product/bigType/classify', type:'get', data:params, json:true})
+            Http.AjaxService({
+                url:'/commodity/type/id',
+                type:'get',
+                data:params,
+                json:true,
+                isHost:true
+            })
             .then(function(res){
                 callback(res);
             });
         },
         GethomeData:function (params, callback) {//产品仪器楼层
-             Http.AjaxService({ url:'/commodity/classify/product', type:'get', data:params, json:true, isHost:true})
+             Http.AjaxService({
+                 url:'/commodity/classify/product',
+                 type:'get',
+                 data:params,
+                 json:true,
+                 isHost:true
+             })
             .then(function(res){
                 callback(res);
             });
         },
-       GetSearchProduct:function (params, callback) {//产品仪器商品列表查询
-             Http.AjaxService({ url:'/search/query/product/type', type:'get', data:params, json:true})
+       GetSearchProduct:function (params, callback) {//根据分类ID 查询商品
+             Http.AjaxService({
+                 url:'/commodity/search/query/product/type',
+                 type:'get',
+                 data:params,
+                 json:true,
+                 isHost:true
+             })
             .then(function(res){
                 callback(res);
             });
         },
         GetbeautyProduct:function (params, callback) {//产品仪器商品列表查询
-             Http.AjaxService({ url:'/activity/data', type:'get', data:params, json:true})
+             Http.AjaxService({
+                 url:'/activity/data',
+                 type:'get',
+                 data:params,
+                 json:true
+             })
             .then(function(res){
                 callback(res);
             });
         },
         GetAuthProductDeatil:function (params, callback) {//产品仪器商品列表查询
-             Http.AjaxService({ url:'/product/auth/details', type:'get', data:params, json:true})
+             Http.AjaxService({
+                 url:'/product/auth/details',
+                 type:'get',
+                 data:params,
+                 json:true
+             })
             .then(function(res){
                 callback(res);
             });
         },
         GetProductSearchList:function (params, callback) {//产品仪器商品列表查询
-            Http.AjaxService({ url:'/commodity/search/query/product', type:'get', data:params, json:true, isHost:true})
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/commodity/search/query/product',
+                type:'get',
+                data:params,
+                json:true,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res);
+            });
         },
         GetSearchEquipmentList:function (params, callback) {//搜索项目仪器列表查询
-            Http.AjaxService({ url:'/commodity/search/query/equipment', type:'get', data:params, json:true, isHost:true})
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/commodity/search/query/equipment',
+                type:'get',
+                data:params,
+                json:true,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res);
+            });
         },
         GetPromotionsInfo:function (params, callback) {//获取促销活动详情
-            Http.AjaxService({ url:'/commodity/promotions/info', type:'get', data:params, json:true, isHost:true})
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/commodity/promotions/info',
+                type:'get',
+                data:params,
+                json:true,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res);
+            });
         },
         GetPromotionsProduct:function (params, callback) {//获取促销活动详情
-            Http.AjaxService({ url:'/commodity/promotions/product', type:'get', data:params, json:true, isHost:true})
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/commodity/promotions/product',
+                type:'get',
+                data:params,
+                json:true,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res);
+            });
         },
 };

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

@@ -6,28 +6,48 @@
 var RepairApi = {
         /* 查询用户维修列表 */
         GetFindMaintenance: function (params, callback) {
-            Http.AjaxService({ url:'/pcCenter/findMaintenance', type:'GET', data:params, json:false})
+            Http.AjaxService({
+                url:'/pcCenter/findMaintenance',
+                type:'GET',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         /* 用户申请维修 */
         AddApplyMaintenance: function (params, callback) {
-            Http.AjaxService({ url:'/pcCenter/applyMaintenance', type:'POST', data:params, json:false})
+            Http.AjaxService({
+                url:'/pcCenter/applyMaintenance',
+                type:'POST',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
          /* 维修详情 */
         MaintenanceDetail: function (params, callback) {
-            Http.AjaxService({ url:'/pcCenter/maintenance/detail', type:'GET', data:params, json:false})
+            Http.AjaxService({
+                url:'/pcCenter/maintenance/detail',
+                type:'GET',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         /* 维修详情 提交评论 */
        evaluation: function (params, callback) {
-            Http.AjaxService({ url:'/pcCenter/maintenance/evaluation', type:'POST', data:params, json:false})
+            Http.AjaxService({
+                url:'/pcCenter/maintenance/evaluation',
+                type:'POST',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });

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

@@ -32,7 +32,7 @@ var SecondApi = {
             });
         },
         ProductDetail: function (params, callback) {//商品详情
-            Http.AjaxService({ url:'/product/getSecondHandProductDetail', type:'get', data:params, json:true, mask:true,replace:false})
+            Http.AjaxService({ url:'/commodity/second/detail', type:'get', data:params, json:true, mask:true,replace:false, isHost:true})
             .then(function(res){
                 callback(res);
             });

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

@@ -5,15 +5,25 @@
  */
 var ShoppingApi = {
         GetShoppingCartList: function (params, callback) {//网银支付链接初始化数据
-            Http.AjaxService({ url:'/shoppingCart/list', type:'GET', data:params, json:true})
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/shoppingCart/list',
+                type:'GET',
+                data:params,
+                json:true
+            })
+            .then(function(res){
+                callback(res);
+            });
         },
         DeleteCartProducts: function (params, callback) {//查询跳转网银页面
-            Http.AjaxService({ url:'/shoppingCart/delete', type:'POST', data:params, json:false})
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/shoppingCart/delete',
+                type:'POST',
+                data:params,
+                json:false
+            })
+            .then(function(res){
+                callback(res);
+            });
         }
 };

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

@@ -5,40 +5,74 @@
  */
 var SupplierApi = {
         GetSearchShopList:function (params, callback) {//搜索供应商列表查询
-            Http.AjaxService({ url:'/commodity/search/query/shop', type:'get', data:params, json:true, isHost:true})
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/commodity/search/query/shop',
+                type:'get',
+                data:params,
+                json:true,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res);
+            });
         },
         ShipmentsInfo: function (params, callback) {//发货商品初始化
-            Http.AjaxService({ url:'/supplier/shipmentsInfo', type:'GET', data:params, json:true})
+            Http.AjaxService({
+                url:'/supplier/shipmentsInfo',
+                type:'GET',
+                data:params,
+                json:true
+            })
             .then(function(res){
                 callback(res);
             });
         },
         MyOrderList: function (params, callback) {//供应商订单列表
-            Http.AjaxService({ url:'/supplier/myOrderList', type:'GET', data:params, json:true})
+            Http.AjaxService({
+                url:'/supplier/myOrderList',
+                type:'GET',
+                data:params,
+                json:true
+            })
             .then(function(res){
                 callback(res);
             });
         },
         uploadimg: function (params, callback) {//供应商添加物流上传图片
-            Http.uploadImage({ url:'/formData/MultiPictareaddData',data:params},callback)
+            Http.uploadImage({
+                url:'/formData/MultiPictareaddData',
+                data:params},callback)
         },
         GetMyProductList: function (params, callback) {//供应商商品列表
-            Http.AjaxService({ url:'/supplier/myProduct', type:'GET', data:params, json:false})
+            Http.AjaxService({
+                url:'/commodity/shop/product/list',
+                type:'GET',
+                data:params,
+                json:false,
+                isHost:true
+            })
             .then(function(res){
                 callback(res);
             });
         },
         SwitchFeatured: function (params, callback) {//供应商商品增加删除 主推商品标志
-            Http.AjaxService({ url:'/supplier/switchFeatured', type:'POST', data:params, json:false})
+            Http.AjaxService({
+                url:'/supplier/switchFeatured',
+                type:'POST',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         SupplierSoldOut: function (params, callback) {//供应商商品下架(批量下架,单个商品下架)
-            Http.AjaxService({ url:'/supplier/soldOut', type:'POST', data:params, json:false})
+            Http.AjaxService({
+                url:'/supplier/soldOut',
+                type:'POST',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
@@ -50,171 +84,340 @@ var SupplierApi = {
             });
         },
          addBrand: function (params, callback) {//品牌管理/提交新品牌
-            Http.AjaxService({ url:'/supplier/addBrand', type:'post', data:params, json:false})
+            Http.AjaxService({
+                url:'/supplier/addBrand',
+                type:'post',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         addLogistics: function (params, callback) {//发货/添加物流页 确定提交订单列表
-            Http.AjaxService({ url:'/supplier/addLogistics', type:'post', data:params, json:false})
+            Http.AjaxService({
+                url:'/supplier/addLogistics',
+                type:'post',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         shipmentsRecord: function (params, callback) {//发货/添加物流页 确定提交订单列表
-            Http.AjaxService({ url:'/supplier/shipmentsRecord', type:'GET', data:params, json:false})
+            Http.AjaxService({
+                url:'/supplier/shipmentsRecord',
+                type:'GET',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         GetBrandAssociation: function (params, callback) {//发布商品品牌联想
-            Http.AjaxService({ url:'/supplier/brandAssociation', type:'GET', data:params, json:false})
+            Http.AjaxService({
+                url:'/supplier/brandAssociation',
+                type:'GET',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         logisticsInfo: function (params, callback) {//记录的查看物流
-            Http.AjaxService({ url:'/supplier/logisticsInfo', type:'GET', data:params, json:false})
+            Http.AjaxService({
+                url:'/supplier/logisticsInfo',
+                type:'GET',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         AddSupplierBrand: function (params, callback) {//发布商品提交新品牌
-            Http.AjaxService({ url:'/supplier/addBrand', type:'post', data:params, json:false})
+            Http.AjaxService({
+                url:'/supplier/addBrand',
+                type:'post',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
-        CheckSupplierBrandDetection: function (params, callback) {//发布商品提交新品牌
-            Http.AjaxService({ url:'/supplier/brandDetection', type:'get', data:params, json:false})
+        CheckSupplierBrandDetection: function (params, callback) {//发布商品检查是否品牌
+            Http.AjaxService({
+                url:'/supplier/brandDetection',
+                type:'get',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         AddSupplierReleaseProduct: function (params, callback) {//提交发布商品
-            Http.AjaxService({ url:'/supplier/releaseProduct', type:'post', data:params, json:false })
+            Http.AjaxService({
+                url:'/commodity/shop/product/release',
+                type:'post',
+                data:params,
+                json:false,
+                isHost:true
+            })
             .then(function(res){
                 callback(res);
             });
         },
         UpdateSearchManageProduct: function (params, callback) {//编辑商品更新搜索索引
-            Http.AjaxService({ url:'/search/manage/update/product', type:'post', data:params, json:false })
+            Http.AjaxService({
+                url:'/commodity/search/index/update/product',
+                type:'post',
+                data:params,
+                json:false,
+                isHost:true
+            })
                 .then(function(res){
                     callback(res);
                 });
         },
         SupplierViewShop: function (params, callback) {//查看店铺
-            Http.AjaxService({ url:'/supplier/viewShop', type:'get', data:params, json:false })
+            Http.AjaxService({
+                url:'/supplier/viewShop',
+                type:'get',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         SupplierViewShopProduct: function (params, callback) {//查看店铺供应商产品
-            Http.AjaxService({ url:'/supplier/product', type:'get', data:params, json:false })
+            Http.AjaxService({
+                url:'/supplier/product',
+                type:'get',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         SupplierViewShopInfo: function (params, callback) {//获取登录供应商信息
-            Http.AjaxService({ url:'/supplier/shopInfo', type:'get', data:params, json:false })
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/supplier/shopInfo',
+                type:'get',
+                data:params,
+                json:false
+            })
+            .then(function(res){
+                callback(res);
+            });
         },
         EditReleaseProductInfo: function (params, callback) {//编辑我的商品回显数据
-            Http.AjaxService({ url:'/supplier/productInfo', type:'get', data:params, json:false })
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/commodity/shop/product/form',
+                type:'get',
+                data:params,
+                json:false,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res);
+            });
         },
         SearchSupplierProduct: function (params, callback) {//编辑我的商品回显数据
-            Http.AjaxService({ url:'/supplier/productSearch', type:'get', data:params, json:false })
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/supplier/productSearch',
+                type:'get',
+                data:params,
+                json:false
+            })
+            .then(function(res){
+                callback(res);
+            });
         },
         shopInfo: function (params, callback) {//资料信息 回显数据
-            Http.AjaxService({ url:'/user/shop/info', type:'GET', data:params, json:false , isHost:true})
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/user/shop/info',
+                type:'GET',
+                data:params,
+                json:false ,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res);
+            });
         },
         kdList: function ( callback) {//快递公司
-            Http.AjaxService({ url:'/supplier/logisticsCompany', type:'GET',  json:false })
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/supplier/logisticsCompany',
+                type:'GET',
+                json:false
+            })
+            .then(function(res){
+                callback(res);
+            });
         },
         addLogisticsInfo: function (params, callback) {//追加物流
-            Http.AjaxService({ url:'/supplier/addLogisticsInfo', type:'post',data:params,  json:false })
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/supplier/addLogisticsInfo',
+                type:'post',
+                data:params,
+                json:false
+            })
+            .then(function(res){
+                callback(res);
+            });
         },
         cancelShipment: function (params, callback) {//查看物流/撤销发货
-            Http.AjaxService({ url:'/supplier/cancelShipment', type:'post', data:params, json:false })
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/supplier/cancelShipment',
+                type:'post',
+                data:params,
+                json:false
+            })
+            .then(function(res){
+                callback(res);
+            });
         },
         shopOrderDetails: function (params, callback) {//我的订单/查看详情
-            Http.AjaxService({ url:'/supplier/shopOrderDetails', type:'GET', data:params, json:false })
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/supplier/shopOrderDetails',
+                type:'GET',
+                data:params,
+                json:false
+            })
+            .then(function(res){
+                callback(res);
+            });
         },
          modifiedData: function (params, callback) {//资料信息提交
-            Http.AjaxService({ url:'/user/shop/info/update', type:'post', data:params, json:false, isHost:true })
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/user/shop/info/update',
+                type:'post',
+                data:params,
+                json:false,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res);
+            });
         },
         homePageData: function (params, callback) {//供应商 首页个人中心
-            Http.AjaxService({ url:'/supplier/homePageData', type:'get', data:params, json:false })
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/supplier/homePageData',
+                type:'get',
+                data:params,
+                json:false
+            })
+            .then(function(res){
+                callback(res);
+            });
         },
          uploadAvatar: function (params, callback) {//供应商 首页上传头像成功后调用
-            Http.AjaxService({ url:'/user/uploadAvatar', type:'post', data:params, json:false })
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/user/uploadAvatar',
+                type:'post',
+                data:params,
+                json:false
+            })
+            .then(function(res){
+                callback(res);
+            });
         },
         dressUpList : function(params,callback) {//装扮主页列表
-            Http.AjaxService({ url:'/supplier/dressUp', type:'get', data:params, json:true})
+            Http.AjaxService({
+                url:'/supplier/dressUp',
+                type:'get',
+                data:params,
+                json:true
+            })
             .then(function(res){
                 callback(res);
             });
         },
          ShopBanner : function(params,callback) {//装扮主页修改与添加
-            Http.AjaxService({ url:'/supplier/saveShopBanner', type:'POST', data:params, json:false})
+            Http.AjaxService({
+                url:'/supplier/saveShopBanner',
+                type:'POST',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         deleteShopBanner : function(params,callback) {//装扮主页删除广告 Integer shopBannerId
-            Http.AjaxService({ url:'/supplier/deleteShopBanner', type:'POST', data:params, json:false})
+            Http.AjaxService({
+                url:'/supplier/deleteShopBanner',
+                type:'POST',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         settlementList : function(params,callback) {//结算管理列表
-            Http.AjaxService({ url:'/supplier/settlementList', type:'get', data:params, json:true})
+            Http.AjaxService({
+                url:'/supplier/settlementList',
+                type:'get',
+                data:params,
+                json:true
+            })
             .then(function(res){
                 callback(res);
             });
         },
          GetMymessageList : function(params,callback) {//个人中心消息列表
-            Http.AjaxService({ url:'/user/messageList', type:'get', data:params, json:true})
+            Http.AjaxService({
+                url:'/user/messageList',
+                type:'get',
+                data:params,
+                json:true
+            })
             .then(function(res){
                 callback(res);
             });
         },
         salesList : function(params,callback) {//售货清单
-            Http.AjaxService({ url:'/supplier/salesList', type:'get', data:params, json:false})
+            Http.AjaxService({
+                url:'/supplier/salesList',
+                type:'get',
+                data:params,
+                json:false
+            })
+            .then(function(res){
+                callback(res);
+            });
+        },
+        GetShopProductMain : function(params,callback) {//售货清单
+            Http.AjaxService({
+                url:'/commodity/shop/product/main',
+                type:'get',
+                data:params,
+                json:false,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res);
+            });
+        },
+        GetSearchQueryProductSupplier : function(params,callback) {//售货清单
+            Http.AjaxService({
+                url:'/commodity/search/query/product/shop',
+                type:'get',
+                data:params,
+                json:false,
+                isHost:true
+            })
             .then(function(res){
                 callback(res);
             });
         },
+
 };

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

@@ -5,34 +5,64 @@
  */
 var UserApi = {
         PostLoginAccount : function (params,callback) {//新系统登录
-            Http.AjaxService({ url:'/user/login/password', type:'post', data:params, json:false, isHost:true})
-                .then(function(res){
-                    callback(res)
-                });
+            Http.AjaxService({
+                url:'/user/login/password',
+                type:'post',
+                data:params,
+                json:false,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res)
+            });
         },
         ToWechatLogin : function (params,callback) {//获取扫码登录参数
-            Http.AjaxService({ url:'/user/login/auth/parameters', type:'get', data:params, json:false, isHost:true})
-                .then(function(res){
-                    callback(res)
-                });
+            Http.AjaxService({
+                url:'/user/login/auth/parameters',
+                type:'get',
+                data:params,
+                json:false,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res)
+            });
         },
         ToWechatPolling : function (params,callback) {//扫码登录轮询
-            Http.AjaxService({ url:'/user/login/auth/scan/result', type:'get', data:params, json:false, isHost:true})
-                .then(function(res){
-                    callback(res)
-                });
+            Http.AjaxService({
+                url:'/user/login/auth/scan/result',
+                type:'get',
+                data:params,
+                json:false,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res)
+            });
         },
         ClubRegister: function (params, callback) {//机构注册
-            Http.AjaxService({ url:'/user/register/club', type:'post', data:params, json:false, isHost:true})
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/user/register/club',
+                type:'post',
+                data:params,
+                json:false,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res);
+            });
         },
         SupplierRgister:function(params, callback){//供应商注册
-            Http.AjaxService({url: '/user/register/shop', type: 'post', data: params, json: false, isHost:true})
-                .then(function (res) {
-                    callback(res)
-                });
+            Http.AjaxService({
+                url: '/user/register/shop',
+                type: 'post',
+                data: params,
+                json: false,
+                isHost:true
+            })
+            .then(function (res) {
+                callback(res)
+            });
         },
         /*
         * @params
@@ -43,103 +73,200 @@ var UserApi = {
         * token                 图片token
         * */
         getRegisterMobileCode: function (params, callback) {//机构注册获取短信验证码
-            Http.AjaxService({ url:'/user/sms/code', type:'get', data:params, json:false, isHost:true})
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/user/sms/code',
+                type:'get',
+                data:params,
+                json:false,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res);
+            });
         },
         getNoteSMScode : function (params,callback){//绑定机构运营人员获取短信验证码
-            Http.AjaxService({ url:'/user/sms/bind', type:'get', data:params, json:true, isHost:true})
-                .then(function(res){
-                    callback(res);
-                });
+            Http.AjaxService({
+                url:'/user/sms/bind',
+                type:'get',
+                data:params,
+                json:true,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res);
+            });
         },
         ClubUpgrade : function(params,callback) {//机构升级会员信息
-            Http.AjaxService({ url:'/user/register/club/upgrade', type:'post', data:params, json:false, isHost:true})
+            Http.AjaxService({
+                url:'/user/register/club/upgrade',
+                type:'post',
+                data:params,
+                json:false,
+                isHost:true
+            })
             .then(function(res){
                 callback(res);
             });
         },
         FindCompanyPwd : function(params,callback) {//用户找回密码
-            Http.AjaxService({ url:'/user/update/password', type:'post', data:params, json:false, isHost:true})
+            Http.AjaxService({
+                url:'/user/update/password',
+                type:'post',
+                data:params,
+                json:false,
+                isHost:true
+            })
             .then(function(res){
                 callback(res);
             });
         },
         GetMyPcCenterInfo : function(params,callback) {//机构个人中心数据查询
-            Http.AjaxService({ url:'/pcCenter/myPcCenter', type:'get', data:params, json:true})
+            Http.AjaxService({
+                url:'/pcCenter/myPcCenter',
+                type:'get',
+                data:params,
+                json:true
+            })
             .then(function(res){
                 callback(res);
             });
         },
         GetMymessageList : function(params,callback) {//个人中心消息列表
-            Http.AjaxService({ url:'/user/messageList', type:'get', data:params, json:true})
+            Http.AjaxService({
+                url:'/user/messageList',
+                type:'get',
+                data:params,
+                json:true
+            })
             .then(function(res){
                 callback(res);
             });
         },
         UserPuploadAvatar : function(params,callback) {//机构个人中心头像更新
-            Http.AjaxService({ url:'/user/uploadAvatar ', type:'post', data:params, json:false})
+            Http.AjaxService({
+                url:'/user/uploadAvatar ',
+                type:'post',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         GetMyOperationList : function(params,callback) {//查询机构运营人员管理列表
-            Http.AjaxService({ url:'/user/operation/list', type:'get', data:params, json:true, isHost:true})
+            Http.AjaxService({
+                url:'/user/operation/list',
+                type:'get',
+                data:params,
+                json:true,
+                isHost:true
+            })
             .then(function(res){
                 callback(res);
             });
         },
         DeleteMyOperation : function(params,callback) {//删除单个运营人员
-            Http.AjaxService({ url:'/user/operation/delete', type:'POST', data:params, json:false, isHost:true})
+            Http.AjaxService({
+                url:'/user/operation/delete',
+                type:'POST',
+                data:params,
+                json:false,
+                isHost:true
+            })
             .then(function(res){
                 callback(res);
             });
         },
         UpdateInvitationCode : function(params,callback) {//机构更新运营人员邀请码
-            Http.AjaxService({ url:'/user/operation/code/update', type:'POST', data:params, json:false, isHost:true})
+            Http.AjaxService({
+                url:'/user/operation/code/update',
+                type:'POST',
+                data:params,
+                json:false,
+                isHost:true
+            })
             .then(function(res){
                 callback(res);
             });
         },
         AddOperationUse : function(params,callback) {//添加运营人员
-            Http.AjaxService({ url:'/user/operation/save', type:'POST', data:params, json:false, isHost:true})
+            Http.AjaxService({
+                url:'/user/operation/save',
+                type:'POST',
+                data:params,
+                json:false,
+                isHost:true
+            })
             .then(function(res){
                 callback(res);
             });
         },
         GetApplicationData : function(params,callback) {//查询机构资料信息
-            Http.AjaxService({ url:'/user/club/info', type:'GET', data:params, json:false, isHost:true})
+            Http.AjaxService({
+                url:'/user/club/info',
+                type:'GET',
+                data:params,
+                json:false,
+                isHost:true
+            })
             .then(function(res){
                 callback(res);
             });
         },
         UpdateModifiedData: function(params,callback) {//查询机构资料信息
-            Http.AjaxService({ url:'/user/club/info/update', type:'POST', data:params, json:false, isHost:true})
+            Http.AjaxService({
+                url:'/user/club/info/update',
+                type:'POST',
+                data:params,
+                json:false,
+                isHost:true
+            })
             .then(function(res){
                 callback(res);
             });
         },
         SupplierShopInfo:function(params, callback){//供应商修改申请信息查询
-            Http.AjaxService({url: '/supplier/shopInfo', type: 'get', data: params, json: false})
+            Http.AjaxService({
+                url: '/supplier/shopInfo',
+                type: 'get',
+                data: params,
+                json: false
+            })
             .then(function (res) {
                 callback(res)
             });
         },
         UpdateCompanyInfo: function (params, callback) {//供应商修改申请信息保存
-            Http.AjaxService({ url:'/user/register/shop/apply', type:'post', data:params, json:false, isHost:true})
+            Http.AjaxService({
+                url:'/user/register/shop/apply',
+                type:'post',
+                data:params,
+                json:false,
+                isHost:true
+            })
             .then(function(res){
                 callback(res);
             });
         },
         BindOrganization : function(params,callback) {//扫码微信绑定机构
-            Http.AjaxService({ url:'/user/login/auth/scan/bind', type:'post', data:params, json:false, isHost:true})
+            Http.AjaxService({
+                url:'/user/login/auth/scan/bind',
+                type:'post',
+                data:params,
+                json:false,
+                isHost:true
+            })
             .then(function(res){
                 callback(res)
             });
         },
        Maintenance : function(params,callback) {//扫码微信绑定机构
-            Http.AjaxService({ url:'/pcCenter/applyMaintenance', type:'post', data:params, json:false})
+            Http.AjaxService({
+                url:'/pcCenter/applyMaintenance',
+                type:'post',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res)
             });

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

@@ -8,79 +8,150 @@ var PublicApi = {
             Http.uploadImage({ url:'/formData/MultiPictareaddData',data:params},callback)
         },
         GetHomeData:function(params,callback){ //首页数据
-            Http.AjaxService({ url:'/commodity/home/floor', type:'get', data:params, json:false, isHost:true})
-                .then(function(res){
-                    callback(res)
-                });
+            Http.AjaxService({
+                url:'/commodity/home/floor',
+                type:'get',
+                data:params,
+                json:false,
+                isHost:true
+            })
+            .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)
-                });
+            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)
-                });
+            Http.AjaxService({
+                url:'/home/top/data',
+                type:'get',
+                data:params,
+                json:false
+            })
+            .then(function(res){
+                callback(res)
+            });
         },
         GetProductClassify:function(params,callback){ //获取一级分类
-            Http.AjaxService({ url:'/commodity/classify', type:'get', data:params, json:false, isHost:true})
-                .then(function(res){
-                    callback(res)
-                });
+            Http.AjaxService({
+                url:'/commodity/classify',
+                type:'get',
+                data:params,
+                json:false,
+                isHost:true
+            })
+            .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)
-                });
+            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', type:'get', data:params, json:false})
-                .then(function(res){
-                    callback(res)
-                });
+            Http.AjaxService({
+                url:'/club/province',
+                type:'get',
+                data:params,
+                json:false
+            })
+            .then(function(res){
+                callback(res)
+            });
         },
         GetCity:function(params,callback){ //获取区分信息
-            Http.AjaxService({ url:'/club/city', type:'get', data:params, json:true})
-                .then(function(res){
-                    callback(res)
-                });
+            Http.AjaxService({
+                url:'/club/city',
+                type:'get',
+                data:params,
+                json:true
+            })
+            .then(function(res){
+                callback(res)
+            });
         },
         GetTown:function(params,callback){ //获取市信息
-            Http.AjaxService({ url:'/club/town', type:'get', data:params, json:true})
-                .then(function(res){
-                    callback(res)
-                });
+            Http.AjaxService({
+                url:'/club/town',
+                type:'get',
+                data:params,
+                json:true
+            })
+            .then(function(res){
+                callback(res)
+            });
         },
         GetFirstClassFication:function(params,callback){ //获取一级分类
-            Http.AjaxService({ url:'/supplier/primaryClassification', type:'get', data:params, json:true})
+            Http.AjaxService({
+                url:'/commodity/type/first',
+                type:'get',
+                data:params,
+                json:true,
+                isHost:true
+            })
             .then(function(res){
                 callback(res)
             });
         },
         GetTwoClassFication:function(params,callback){ //获取二级分类
-            Http.AjaxService({ url:'/supplier/secondaryClassification', type:'get', data:params, json:true})
+            Http.AjaxService({
+                url:'/commodity/type/second',
+                type:'get',
+                data:params,
+                json:true,
+                isHost:true
+            })
             .then(function(res){
                 callback(res)
             });
         },
         GetThreeClassFication:function(params,callback){ //获取三级分类
-            Http.AjaxService({ url:'/supplier/threeLevelClassification', type:'get', data:params, json:true})
+            Http.AjaxService({
+                url:'/commodity/type/third',
+                type:'get',
+                data:params,
+                json:true,
+                isHost:true
+            })
             .then(function(res){
                 callback(res)
             });
         },
         addCart : function (params,callback) { //加入购物车
-            Http.AjaxService({ url:'/shoppingCart/addCart', type:'post', data:params, json:false})
+            Http.AjaxService({
+                url:'/shoppingCart/addCart',
+                type:'post',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res)
             });
         },
         getImgVerifyCode : function (params,callback){ //获取图形验证图形
-            Http.AjaxService({ url:'/user/captcha', type:'get', data:params, json:true, isHost:true})
+            Http.AjaxService({
+                url:'/user/captcha',
+                type:'get',
+                data:params,
+                json:true,
+                isHost:true
+            })
             .then(function(res){
                 if (res.code == 0) {
                     callback(res);
@@ -88,197 +159,287 @@ var PublicApi = {
             });
         },
         getMobileSMScode : function (params,callback){//直接获取手机短信验证码
-            Http.AjaxService({ url:'/user/activateCodeByReg', type:'get', data:params, json:true})
+            Http.AjaxService({
+                url:'/user/activateCodeByReg',
+                type:'get',
+                data:params,
+                json:true
+            })
             .then(function(res){
                 callback(res);
             });
         },
         getEmailSMScode : function (params,callback) { //获取邮箱短信验证码
-            Http.AjaxService({ url:'/user/mail/code', type:'get', data:params, json:true, isHost:true})
+            Http.AjaxService({
+                url:'/user/mail/code',
+                type:'get',
+                data:params,
+                json:true,
+                isHost:true
+            })
             .then(function(res){
                 callback(res);
             });
         },
-        getEmailsms : function (opts) {// 直接获取邮箱验证码
-            var _email = {
-                    ele : opts.$email,
-                    value : opts.$email.val(),
-                    boolean : true,
-                    nullTip : '请输入邮箱地址',
-                    errTip : '邮箱格式不正确',
-                    subBtn : opts.$subBtn,
-                    regExp : new RegExp(_RegExp.email)
-                };
-            if(!_util.validateFn(_email)){
-                return;
-            }else{
-                var params = {
-                    email : opts.$email.val(),
-                    status : opts.$codeBtn.attr('data-codeType')
-                };
-                request.getEmailSMScode(params,function (response) {
-                    if(response.code == 0){
-                        cmModal.toast('邮箱验证码已发送',2000)
-                        opts.$codeBtn.val('(120s)重新获取');
-                        var _time = 120;
-                        var _timer = setInterval(function () {
-                            --_time;
-                            if (_time < 0) {
-                                clearInterval(_timer);
-                                opts.$codeBtn.val('获取校验码');
-                                opts.$codeBtn.attr("disabled", false);
-                            } else {
-                                opts.$codeBtn.val('(' + _time + 's)重新获取');
-                            }
-                        }, 1000);
-                    }else{
-                        opts.$codeBtn.val('获取校验码');
-                        opts.$email.siblings('.err-tip').show().html(response.msg);
-                        _util.hideTip(opts.$email.siblings('.err-tip'));
-                    }
-                })
-            }
-        },
         findCompanyPwd : function(params,callback) {//用户找回密码
-            Http.AjaxService({ url:'/user/findCompanyPwd', type:'post', data:params, json:true})
+            Http.AjaxService({
+                url:'/user/findCompanyPwd',
+                type:'post',
+                data:params,
+                json:true
+            })
             .then(function(res){
                 callback(res);
             });
         },
         clubChangeMobile:function(params,callback){//更换手机号
-            Http.AjaxService({ url:'/user/update/mobile', type:'post', data:params, json:false, isHost:true})
+            Http.AjaxService({
+                url:'/user/update/mobile',
+                type:'post',
+                data:params,
+                json:false,
+                isHost:true
+            })
             .then(function(res){
                 callback(res);
             });
         },
         editCompanyInfo : function (params,callback) {//获取要修改的企业信息
-            Http.AjaxService({ url:'/user/club/applicationData', type:'get', data:params, json:true})
+            Http.AjaxService({
+                url:'/user/club/applicationData',
+                type:'get',
+                data:params,
+                json:true
+            })
             .then(function(res){
                 callback(res);
             });
         },
         updateCompanyInfo : function (params,callback) {//提交机构修改申请信息
-            Http.AjaxService({ url:'/user/club/updateCompanyInfo', type:'post', data:params, json:true})
+            Http.AjaxService({
+                url:'/user/club/updateCompanyInfo',
+                type:'post',
+                data:params, json:true
+            })
             .then(function(res){
                 callback(res);
             });
         },
         modifiedData : function (params,callback) {//提交个人中心修改机构信息
-            Http.AjaxService({ url:'/operation/modifiedData', type:'post', data:params, json:false})
+            Http.AjaxService({
+                url:'/operation/modifiedData',
+                type:'post',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res);
             });
         },
         bindIngUseEmail : function(params,callback) { //未绑定邮箱账户绑定邮箱
-            Http.AjaxService({ url:'/user/binding', type:'post', data:params, json:true})
+            Http.AjaxService({
+                url:'/user/binding',
+                type:'post',
+                data:params,
+                json:true
+            })
             .then(function(res){
                 callback(res)
             });
         },
         getOperationList : function (params,callback) { //获取机构运营人员列表
-            Http.AjaxService({ url:'/user/bindOrganization', type:'post', data:params, json:false})
+            Http.AjaxService({
+                url:'/user/bindOrganization',
+                type:'post',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res)
             });
         },
         addOperation : function (params,callback) { //机构员工管理添加运营人员
-            Http.AjaxService({ url:'/operation/add', type:'post', data:params, json:false})
+            Http.AjaxService({
+                url:'/operation/add',
+                type:'post',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res)
             });
         },
         deleteOperation : function (params,callback) { //机构员工管理删除运营人员
-            Http.AjaxService({ url:'/operation/delete', type:'post', data:params, json:false})
+            Http.AjaxService({
+                url:'/operation/delete',
+                type:'post',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res)
             });
         },
         updateInvitationCode : function (params,callback) { //机构员工管理更新邀请码
-            Http.AjaxService({ url:'/operation/updateInvitationCode', type:'post', data:params, json:false})
+            Http.AjaxService({
+                url:'/operation/updateInvitationCode',
+                type:'post',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res)
             });
         },
         queryShoppingCartList:function(params,callback){ //购物车数据列表
-            Http.AjaxService({ url:'/shoppingCart/shoppingInfo', type:'get', data:params, json:false})
+            Http.AjaxService({
+                url:'/shoppingCart/shoppingInfo',
+                type:'get',
+                data:params, json:false
+            })
             .then(function(res){
                 callback(res)
             });
         },
         shoppingCartUpdate:function(params,callback){//更新商品增减
-            Http.AjaxService({ url:'/shoppingCart/update', type:'post', data:params, json:false})
+            Http.AjaxService({
+                url:'/shoppingCart/update',
+                type:'post',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res)
             });
         },
         shoppingCartDelete:function(params,callback) {//删除购物车商品
-            Http.AjaxService({ url:'/shoppingCart/delete', type:'post', data:params, json:false})
+            Http.AjaxService({
+                url:'/shoppingCart/delete',
+                type:'post',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res)
             });
         },
         queryOrderConfirmInfo:function(params,callback){ //购物车数据列表
-            Http.AjaxService({ url:'/order/confirm', type:'get', data:params, json:true})
+            Http.AjaxService({
+                url:'/order/confirm',
+                type:'get',
+                data:params,
+                json:true
+            })
             .then(function(res){
                 callback(res)
             });
         },
         queryAddressList:function(params,callback){ //地址列表
-            Http.AjaxService({ url:'/personalCenter/findAddress', type:'get', data:params, json:true})
+            Http.AjaxService({
+                url:'/personalCenter/findAddress',
+                type:'get',
+                data:params,
+                json:true
+            })
             .then(function(res){
                 callback(res)
             });
         },
         deleteNewAddress:function(params,callback){ //删除地址
-            Http.AjaxService({ url:'/personalCenter/deleteAddress', type:'get', data:params, json:true})
+            Http.AjaxService({
+                url:'/personalCenter/deleteAddress',
+                type:'get',
+                data:params,
+                json:true
+            })
             .then(function(res){
                 callback(res)
             });
         },
         addNewAddress:function(params,callback) {//保存地址
-            Http.AjaxService({ url:'/personalCenter/saveAddress', type:'post', data:params, json:false})
+            Http.AjaxService({
+                url:'/personalCenter/saveAddress',
+                type:'post',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res)
             });
         },
         defaultAddress:function(params,callback) {//设为默认地址
-            Http.AjaxService({ url:'/personalCenter/defaultAddress', type:'post', data:params, json:false})
+            Http.AjaxService({
+                url:'/personalCenter/defaultAddress',
+                type:'post',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res)
             });
         },
         getOrderPostage:function(params,callback){ //获取邮费信息
-            Http.AjaxService({ url:'/order/postage', type:'get', data:params, json:true})
+            Http.AjaxService({
+                url:'/order/postage',
+                type:'get',
+                data:params,
+                json:true
+            })
             .then(function(res){
                 callback(res)
             });
         },
         getFindInvoice:function(params,callback){ //获取发票信息
-            Http.AjaxService({ url:'/personalCenter/findInvoice', type:'get', data:params, json:true})
+            Http.AjaxService({
+                url:'/personalCenter/findInvoice',
+                type:'get',
+                data:params,
+                json:true
+            })
             .then(function(res){
                 callback(res)
             });
         },
         confirmOrder:function (params,callback) {//提交订单
-            Http.AjaxService({ url:'/order/submit', type:'post', data:params, json:false})
+            Http.AjaxService({
+                url:'/order/submit',
+                type:'post',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res)
             });
         },
         updateInvoice:function (params,callback) {//保存发票信息
-            Http.AjaxService({ url:'/personalCenter/invoice', type:'post', data:params, json:false})
+            Http.AjaxService({
+                url:'/personalCenter/invoice',
+                type:'post',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res)
             });
         },
         markAsRead:function (params,callback) {//已读消息
-            Http.AjaxService({ url:'/user/markAsRead', type:'post', data:params, json:false})
+            Http.AjaxService({
+                url:'/user/markAsRead',
+                type:'post',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res)
             });
         },
         deleteMessage:function (params,callback) {//删除消息
-            Http.AjaxService({ url:'/user/deleteMessage', type:'post', data:params, json:false})
+            Http.AjaxService({
+                url:'/user/deleteMessage',
+                type:'post',
+                data:params,
+                json:false
+            })
             .then(function(res){
                 callback(res)
             });

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

@@ -21,7 +21,7 @@ var fleaMarketForm = new Vue({
         BrandList:[],
         isShow:false,
         includedTax:'',
-        GoodsImagesList:[],
+        GoodsImagesList:['https://img.caimei365.com/group1/M00/03/CB/Cmis2F_NkrqAfl7uAADETMOGKpQ791.png'],
         oldNum:0,
         secondType:0,
         vShow_GoodsImages:false,
@@ -47,7 +47,7 @@ var fleaMarketForm = new Vue({
             secondProductType:'',//
             townId:'',//县区地址
             address:'',//详细地址
-            image:'',//图片
+            image:'https://img.caimei365.com/group1/M00/03/CB/Cmis2F_NkrqAfl7uAADETMOGKpQ791.png',//图片
             productDetails:'',//商品详细信息
             source:1,
             dockingPeopleMobile:'',

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

@@ -7,7 +7,7 @@ var fleaMarket = new Vue({
         tabIndex:0,
         userId:'',
         shopId:'',
-        id: $("#productId").val(),
+        productId: $("#productId").val(),
         isShow:false,
         isRequest:false,
         Showlogo:false,
@@ -33,7 +33,7 @@ var fleaMarket = new Vue({
     methods: {
         InfoData: function(){
           var  _this = this;
-          SecondApi.ProductDetail({productId:_this.id},function (res) {
+          SecondApi.ProductDetail({productId:_this.productId},function (res) {
            if(res.code==0){
                 _this.isRequest =true;
                     setTimeout(function(){

src/main/resources/static/js/product/detail.js

@@ -40,9 +40,9 @@ var productDetail = new Vue({
         getImages: function(){
             var _self = this;
             if(!this.productId){return;}
-            $.getJSON(spiServer + "/product/detail/images",{productId: this.productId}).done(function (r) {
-                if (r.code === 0 && r.data) {
-                    _self.images = r.data;
+            ProductApi.GetProductDdtailsImages({productId: _self.productId},function (response) {
+                if (response.code === 0 && response.data) {
+                    _self.images = response.data;
                     setTimeout(function(){
                         if (isPC) {
                             var magnifier = new ImageMagnifier(
@@ -105,19 +105,16 @@ var productDetail = new Vue({
         getProductPrice:function(){
             var _self = this;
             if(_self.productId ===0){return;}
-            $.getJSON(spiServer + "/product/detail/price",{
-                userId: GLOBAL_USER_ID,
-                productId: _self.productId
-            }).done(function (r) {
-                if (r.code === 0 && r.data) {
-                    _self.priceObj = r.data;
-                    _self.number = r.data.minBuyNumber;
-                    if(r.data.ladderPriceFlag===1){
+            ProductApi.GetProductDdtailsPrice({ userId: GLOBAL_USER_ID,productId: _self.productId},function (response) {
+                if (response.code === 0 && response.data) {
+                    _self.priceObj = response.data;
+                    _self.number = response.data.minBuyNumber;
+                    if(response.data.ladderPriceFlag===1){
                         _self.ladderPrice();
                     }
-                    if(r.data.actStatus==1){
-                        _self.promotions =  r.data.promotions;
-                        _self.promotionsId = r.data.promotions.id;
+                    if(response.data.actStatus==1){
+                        _self.promotions =  response.data.promotions;
+                        _self.promotionsId = response.data.promotions.id;
                     }
                 }
             });
@@ -125,23 +122,19 @@ var productDetail = new Vue({
         ladderPrice:function(){
             var _self = this;
             if(!this.productId){return;}
-            $.getJSON(spiServer + "/product/ladderPrice",{
-                productId: this.productId
-            }).done(function (r) {
-                if (r.code === 0 && r.data) {
-                    _self.ladderList =r.data;
+            ProductApi.GetProductDdtailsLadderPrice({ productId: _self.productId },function (response) {
+                if (response.code === 0 && response.data) {
+                    _self.ladderList =response.data;
                     _self.numberResize();
                 }
             });
         },
-        getParameters: function(){
+        getParameters: function(){//获取商品参数
             var _self = this;
             if(!this.productId){return;}
-            $.getJSON(spiServer + "/product/detail/parameter",{
-                productId: this.productId
-            }).done(function (r) {
-                if (r.code === 0 && r.data) {
-                    _self.parameters = r.data;
+            ProductApi.GetProductDdtailsParameter({ productId: _self.productId},function (response) {
+                if (response.code === 0 && response.data) {
+                    _self.parameters = response.data;
                 }
             });
         },
@@ -212,26 +205,28 @@ var productDetail = new Vue({
         getRecommends: function(){
             var _self = this;
             if(!this.productId){return;}
-            $.getJSON(spiServer + "/product/detail/recommend",{
-                productId: this.productId,
-                recommendType: this.recommendType,
-                identity: GLOBAL_USER_IDENTITY
-            }).done(function (r) {
-                if (r.code === 0 && r.data) {
-                    if(r.data.length > 0){
-                        _self.recommends = r.data;
-                        _self.recommendPage = isPC ? Math.ceil(r.data.length / 7) : Math.ceil(r.data.length / 3);
+            ProductApi.GetProductDdtailsRecommend(
+                {
+                    productId: _self.productId,
+                    recommendType: _self.recommendType,
+                    identity: GLOBAL_USER_IDENTITY
+                },
+                function (response) {
+                if (response.code === 0 && response.data) {
+                    if(response.data.length > 0){
+                        _self.recommends = response.data;
+                        _self.recommendPage = isPC ? Math.ceil(response.data.length / 7) : Math.ceil(response.data.length / 3);
                         setTimeout(function(){
                             if (isPC) {
                                 $('#productRecommend').slide({
-                                    mainCell:".swiper-wrapper"
-                                    ,titCell:".swiper-pagination span"
-                                    ,effect: "leftLoop"
-                                    ,interTime: 3000
-                                    ,autoPlay: true
-                                    ,scroll:7
-                                    ,vis:7
-                                    ,trigger: "mouseover"
+                                    mainCell:".swiper-wrapper",
+                                    titCell:".swiper-pagination span",
+                                    effect: "leftLoop",
+                                    interTime: 3000,
+                                    autoPlay: true,
+                                    scroll:7,
+                                    vis:7,
+                                    trigger: "mouseover"
                                 });
                             } else {
                                 var swiper = new Swiper('#productRecommend', {

src/main/resources/static/js/product/instruement.js

@@ -49,7 +49,7 @@
             }
         },
         toserch:function(item){
-            window.location.href='/product/instruelist.html?bigTypeID='+item.bigTypeID+'&typeSort='+this.typeSort+'&name='+this.nav_linkName
+            window.location.href='/product/instruelist.html?bigTypeID='+item.bigTypeId+'&typeSort='+this.typeSort+'&name='+this.nav_linkName
         },
         seeMore:function(page){
              page.isPageMore = !page.isPageMore;

src/main/resources/static/js/product/produce-list.js

@@ -58,15 +58,15 @@ var productList = new Vue({
     },
     methods:{
         getclassify:function(){
-        var _self = this;
-        ProductApi.GetbigTypeclassify({source:_self.source,bigTypeID:_self.bigTypeID},function (res) {
-            if(res.code==0){
-                _self.smalltypeList = res.data;
-            }else {
-           CAIMEI.Alert(res.msg,'确定',false)
-            }
-        })
-    },
+            var _self = this;
+            ProductApi.GetbigTypeclassify({ typeId:_self.bigTypeID, idType:1, source:_self.source },function (res) {
+                if(res.code==0){
+                    _self.smalltypeList = res.data.smallTypeList;
+                }else {
+               CAIMEI.Alert(res.msg,'确定',false)
+                }
+            })
+        },
        getproductList:function(){//商品列表
            var _self=this;
            ProductApi.GetSearchProduct(_self.params,function (res) {
@@ -86,11 +86,11 @@ var productList = new Vue({
                         }else{
                             _self.listData = _self.listData.concat(resultData);
                         }
-                        _self.listLoading = false;
-                        _self.requestFlag = true;
                }else {
-                CAIMEI.Alert(res.msg,'确定',false)
+                  console.log('暂无数据')
                }
+               _self.listLoading = false;
+               _self.requestFlag = true;
            })
         },
         checkNum: function () {
@@ -139,8 +139,8 @@ var productList = new Vue({
                 case 1://选择1集分类查询
                     this.bigName=item.name;
                     this.smallName = '';
-                    this.bigTypeID = item.bigTypeID;
-                    this.params.id = item.bigTypeID;
+                    this.bigTypeID = item.bigTypeId;
+                    this.params.id = item.bigTypeId;
                     this.smallName ='';
                     this.tinyName ='';
                     this.smallTypeID='';
@@ -151,15 +151,15 @@ var productList = new Vue({
                 case 2://选择二级分类查询
                     this.smallName = item.name;
                     this.tinyName = '';
-                    this.smallTypeID = item.smallTypeID;
-                    this.params.id = item.smallTypeID;
+                    this.smallTypeID = item.smallTypeId;
+                    this.params.id = item.smallTypeId;
                     this.tinyTypeID='';
                     this.tinytypeList =item.tinytypeList;
                     break;
                 case 3://选择三级分类查询
                     this.tinyName = item.name;
-                    this.tinyTypeID = item.tinyTypeID;
-                    this.params.id = item.tinyTypeID;
+                    this.tinyTypeID = item.tinyTypeId;
+                    this.params.id = item.tinyTypeId;
                     break;
             }
            this.listData=[];
@@ -176,11 +176,8 @@ var productList = new Vue({
         var _self = this;
         this.nav_linkName = decodeURI(CAIMEI.getUrlParam('name'));
         this.bigTypeID = getUrlParam('bigTypeID');
-        this.bigTypeID = getUrlParam('bigTypeID');
         this.smallTypeID = getUrlParam('smallTypeID');
         this.tinyTypeID = getUrlParam('tinyTypeID');
-        console.log( this.smallTypeID)
-        console.log( this.tinyTypeID)
         if(this.tinyTypeID==null &&  this.smallTypeID==null){
             this.params.id=this.bigTypeID;
             this.params.idType = 1;
@@ -194,31 +191,29 @@ var productList = new Vue({
             this.params.id=this.tinyTypeID;
             this.params.idType = 3;
         }
-
         var typeSort =  getUrlParam('typeSort');
         PublicApi.GetProductClassify({typeSort:typeSort,source:'www'},function (res) {
                 if (res.code==0){
                     _self.classify = res.data;
                     _self.classify.forEach(function (item) {
-                        if(_self.bigTypeID == item.bigTypeID){
-                                _self.bigName = item.name;
-                                if (item.smalltypeList!=''&&item.smalltypeList!=null){
-                                        _self.smalltypeList=item.smalltypeList;
-                                        _self.smalltypeList.forEach(function (pros) {
-                                    if(_self.smallTypeID==pros.smallTypeID){
-                                       _self.smallName = pros.name;
-                                     if(pros.tinytypeList!=''&&pros.tinytypeList!=null){
-                                        _self.tinytypeList = pros.tinytypeList;
-                                        _self.tinytypeList.forEach(function (thiny) {
-                                            if (thiny.tinyTypeID ==_self.tinyTypeID){
-                                                _self.tinyName=thiny.name;
-
-                                            }
-                                         })
-                                     }
-                                   }
-                                 })
-                                }
+                        if(_self.bigTypeID == item.bigTypeId){
+                            _self.bigName = item.name;
+                            if (item.smallTypeList!='' && item.smallTypeList!=null){
+                                _self.smalltypeList= item.smallTypeList;
+                                _self.smalltypeList.forEach(function (pros) {
+                                    if(_self.smallTypeID == pros.smallTypeId){
+                                        _self.smallName = pros.name;
+                                        if(pros.tinyTypeList!=''&&pros.tinyTypeList!=null){
+                                            _self.tinytypeList = pros.tinyTypeList;
+                                            _self.tinytypeList.forEach(function (thiny) {
+                                                if (thiny.tinyTypeId ==_self.tinyTypeID){
+                                                    _self.tinyName=thiny.name;
+                                                }
+                                            })
+                                        }
+                                    }
+                                })
+                            }
                         }
                     })
                 }else {
@@ -255,5 +250,4 @@ var productList = new Vue({
             });
         }
     }
-
 })

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

@@ -12,16 +12,17 @@ var myGoods = new Vue({
         tabIndex:1,
         featuredNum:'',//主图商品标志
         listQuery:{
-            shopID:'',
+            shopId:'',
             pageNum:1,
             pageSize:10,
             productCode:'',//货号
             name:'',//商品名称
             validFlag:'',//状态
             featuredFlag:'',//是否主推
-            bigTypeID:0,//一级
-            smallTypeID:0,//二级
-            tinyTypeID:0//三级
+            commodityType:0,//商品属性
+            bigTypeId:0,//一级
+            smallTypeId:0,//二级
+            tinyTypeId:0//三级
         },
         classificationFirstList:[],
         classificationTwoList:[],
@@ -110,6 +111,12 @@ var myGoods = new Vue({
         touchmoveFn: function(){
             this.isSelectActive=0;
         },
+        SelectChangeCommodityType:function(){//选择商品属性
+            var _this = this;
+            _this.listQuery.commodityType =event.target.value;
+            console.log('commodityType',_this.listQuery.commodityType);
+            _this.GetFistClassFn(_this.listQuery.commodityType);
+        },
         SelectChangeStateFn: function(){//选择状态
             var _this = this;
             _this.listQuery.validFlag =event.target.value;
@@ -118,9 +125,9 @@ var myGoods = new Vue({
             var _this = this;
             _this.listQuery.featuredFlag =event.target.value;
         },
-        GetFistClassFn: function(){//获取一级分类菜单
+        GetFistClassFn: function(value){//获取一级分类菜单
             var _this = this;
-            PublicApi.GetFirstClassFication({},function (response) {
+            PublicApi.GetFirstClassFication({typeSort:value},function (response) {
                 if(response.data.length>0){
                      _this.classificationFirstList = response.data;
                 }else {
@@ -154,30 +161,30 @@ var myGoods = new Vue({
         },
         ChangeClassificationFirst: function(){//选择一级分类
             var _this = this;
-            _this.listQuery.bigTypeID = event.target.value;
-            if(_this.listQuery.bigTypeID == ''){
-                _this.listQuery.bigTypeID = '';
+            _this.listQuery.bigTypeId = event.target.value;
+            if(_this.listQuery.bigTypeId == ''){
+                _this.listQuery.bigTypeId = '';
             }else{
-                _this.GetTwoClassFn(_this.listQuery.bigTypeID);
+                _this.GetTwoClassFn(_this.listQuery.bigTypeId);
             }
         },
         ChangeClassificationTwo: function(){//选择二级分类
             var _this = this;
-             _this.listQuery.smallTypeID = event.target.value;
+             _this.listQuery.smallTypeId = event.target.value;
                 console.log(event.target.value)
-            if(_this.listQuery.smallTypeID == ''){
-                _this.listQuery.smallTypeID = '';
+            if(_this.listQuery.smallTypeId == ''){
+                _this.listQuery.smallTypeId = '';
 
             }else{
-                _this.GetThreeClassFn(_this.listQuery.smallTypeID);
+                _this.GetThreeClassFn(_this.listQuery.smallTypeId);
                  console.log(2222)
             }
         },
         ChangeClassificationThree: function(){//选择三级分类
             var _this = this;
-             _this.listQuery.tinyTypeID = event.target.value;
-            if(_this.listQuery.tinyTypeID == ''){
-                _this.listQuery.tinyTypeID = '';
+             _this.listQuery.tinyTypeId = event.target.value;
+            if(_this.listQuery.tinyTypeId == ''){
+                _this.listQuery.tinyTypeId = '';
             }else{
             }
         },
@@ -280,7 +287,7 @@ var myGoods = new Vue({
             window.open('/product-'+pros.productID+'.html');
         },
         editGoodFn: function(pros){//编辑商品
-            location.href ='/supplier/release.html?productID='+pros.productID+'&type=edit';
+            location.href ='/supplier/release.html?productId='+pros.productId+'&type=edit';
         },
         ischeck: function(pros){//为未选中的时候改变为true，反之为true
             var _this = this;
@@ -395,12 +402,10 @@ var myGoods = new Vue({
         var _this = this;
         if(globalUserData){
             _this.userId = globalUserData.userId;
-            _this.listQuery.shopID = globalUserData.shopId;
+            _this.listQuery.shopId = globalUserData.shopId;
             _this.shopId =globalUserData.shopId;
         }
         _this.GetMyproductDataInfo();
-        _this.GetFistClassFn();
-
             if(!isPC){
             //移动端上垃加载更多
             $(window).on('scroll', function(){

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

@@ -20,23 +20,23 @@ var releaseContainer = new Vue({
         brandAssociationList:[],//品牌联想
         isNoneBrand:false,
         releaseParams:{
-            userID:0,
-            shopID:0,
+            userId:0,
+            shopId:0,
             name:'', //商品名称
             aliasName:'',//内部商品名称
-            bigTypeID:'',
-            smallTypeID:'',
-            tinyTypeID:'',//三级分类ID
-            brandID:'',//品牌ID
+            bigTypeId:'',
+            smallTypeId:'',
+            tinyTypeId:'',//三级分类ID
+            brandId:'',//品牌ID
             tags:'',//商品标签
             unit:'',//包装规格
             productCode:'',//商品编码
             productType:'',//商品类型,
             machineType:'',//医疗器械类型
             searchKey:'',//搜索关键词
-            qualificationImg:"",//器械资质
+            qualificationImg:"https://img.caimei365.com/group1/M00/03/E6/Cmis21_8EgmAPFAcAAFgNbV6g2U552.jpg",//器械资质
             normalPrice:'',//市场价
-            price1:'',//售价
+            price:'',//售价
             costPrice:'',//结算价
             includedTax:1,//是否含税
             invoiceType:1,//发票类型
@@ -46,7 +46,7 @@ var releaseContainer = new Vue({
             step:1,//购买数量
             // byFlag:0,//运费
             allAreaFlag:1,//销售区域
-            provinceIDs:0,//指定区域
+            provinceIds:0,//指定区域
             detailInfo:'',//商品详情信息
             orderInfo :'',//订购方案
             serviceInfo:'',//服务详情
@@ -99,7 +99,7 @@ var releaseContainer = new Vue({
         ],
         productDetailInfoID:null,
         ProvinceList:[],
-        GoodsImagesList:[],
+        GoodsImagesList:['https://img.caimei365.com/group1/M00/03/E6/Cmis21_8EgmAPFAcAAFgNbV6g2U552.jpg','https://img.caimei365.com/group1/M00/03/E6/Cmis21_8EgmAPFAcAAFgNbV6g2U552.jpg'],
         isProvince:false,
         provinceIns:0,
         oldNum:0,
@@ -139,7 +139,7 @@ var releaseContainer = new Vue({
         getclass:function(val){
             this.selectText.bigTypeID='请选择一级分类';
             this.selectText.smallTypeID = '请选择二级分类';
-            this.releaseParams.bigTypeID ='';
+            this.releaseParams.bigTypeId ='';
             this.classificationTwoList=[];
             this.classificationThreeList =[];
             this.GetFistClassFn(val);
@@ -150,8 +150,7 @@ var releaseContainer = new Vue({
                 if(response.code == 0){
                     console.log(response);
                     var data = response.data;
-                    _this.releaseParams.tinyTypeID = data.tinyTypeID;
-                    _this.releaseParams.brandID = data.brandID;
+                    _this.releaseParams.brandId = data.brandId;
                     _this.releaseParams.name = data.name;
                     _this.releaseParams.aliasName = data.aliasName;
                     _this.releaseParams.productType = data.productType;
@@ -160,10 +159,10 @@ var releaseContainer = new Vue({
                     _this.releaseParams.unit = data.unit;
                     _this.releaseParams.productCode = data.productCode;
                     _this.releaseParams.normalPrice = data.normalPrice;
-                    _this.releaseParams.price1 = data.price1;
+                    _this.releaseParams.price = data.price;
                     _this.releaseParams.includedTax = data.includedTax == '' ? 1 : data.includedTax;
                     _this.releaseParams.invoiceType = data.invoiceType;
-                    _this.releaseParams.taxPoint = data.taxPoint;
+                    _this.releaseParams.taxPoint = data.supplierTaxPoint;
                     _this.releaseParams.costPrice = data.costPrice;
                     _this.releaseParams.minBuyNumber = data.minBuyNumber;
                     _this.releaseParams.stock = data.stock;
@@ -180,9 +179,9 @@ var releaseContainer = new Vue({
                     _this.selectText.bigTypeID = data.bigTypeName;
                     _this.selectText.smallTypeID = data.smallTypeName;
                     _this.selectText.tinyTypeID = data.tinyTypeName;
-                    _this.releaseParams.bigTypeID = data.bigTypeID;
-                    _this.releaseParams.smallTypeID =data.smallTypeID;
-                    _this.releaseParams.tinyTypeID =data.tinyTypeID;
+                    _this.releaseParams.bigTypeId = data.bigTypeId;
+                    _this.releaseParams.smallTypeId =data.smallTypeId;
+                    _this.releaseParams.tinyTypeId =data.tinyTypeId;
                     _this.releaseParams.firstClassifyName = data.bigTypeName;
                     _this.releaseParams.twoClassifyName = data.smallTypeName;
                     _this.releaseParams.threeClassifyName = data.tinyTypeName;
@@ -216,26 +215,26 @@ var releaseContainer = new Vue({
         },
         EchoProductFn : function(type) {
             switch (type) {
-                case '0' && null:
+                case 0 && null:
                     this.selectText.goodsType = '其他';
                     break;
-                case '1':
+                case 1:
                     this.selectText.goodsType = '妆字号';
                     break;
-                case '2':
+                case 2:
                     this.selectText.goodsType = '械字号';
                     break;
             }
         },
         EchoMachineTypeFn : function(type) {
             switch (type) {
-                case '1' && null:
+                case 1 && null:
                     this.selectText.apparatusType = '一类医疗器械';
                     break;
-                case '2':
+                case 2:
                     this.selectText.apparatusType = '二类医疗器械';
                     break;
-                case '3':
+                case 3:
                     this.selectText.apparatusType = '三类医疗器械';
                     break;
             }
@@ -281,8 +280,7 @@ var releaseContainer = new Vue({
         },
         SelectChangeApparatusFn: function(option){//选择器械类型
             var _this = this;
-            _this.releaseParams.machineType = option.value;
-            console.log( _this.releaseParams.machineType)
+            _this.releaseParams.machineType = Number(option.value);
             _this.selectText.apparatusType = option.name;
             _this.isSelectActive = 0;
             _this.vShow_GoodsType = false;
@@ -291,7 +289,7 @@ var releaseContainer = new Vue({
             var _this = this;
             var name = e.target.value;
             if (name != ''){
-                SupplierApi.GetBrandAssociation({userId: _this.releaseParams.userID,name:name},function(response){
+                SupplierApi.GetBrandAssociation({userId: _this.releaseParams.userId,name:name},function(response){
                     if(response.code ==0){
                         if(response.data&&response.data.length>0){
                             _this.brandAssociationList = response.data;
@@ -314,9 +312,9 @@ var releaseContainer = new Vue({
                 SupplierApi.CheckSupplierBrandDetection({name:_this.releaseParams.brandName},function(response){
                     if(response.code ==0){
                         CAIMEI.dialog('您的品牌可以使用~');
-                        _this.releaseParams.brandID = response.data.id;
+                        _this.releaseParams.brandId = response.data.id;
                     }else{
-                        _this.releaseParams.brandID = '';
+                        _this.releaseParams.brandId = '';
                         CAIMEI.Modal('您输入的品牌名称暂未被采美收录，请检查品牌名称是否输入正确或者向采美提交该品牌','确定','去提交',function () {
                             setTimeout(function(){
                                 _this.isAddBrand = true;
@@ -344,14 +342,14 @@ var releaseContainer = new Vue({
             var _this = this;
             var params = {
                     name:_this.releaseParams.brandName,
-                    userID:_this.releaseParams.userID,
+                    userId:_this.releaseParams.userId,
                     logo:_this.brandImage,
                     description:_this.brandTextarea
             };
             SupplierApi.AddSupplierBrand(params,function(response){
                 if(response.code == 0){
                     CAIMEI.Alert('品牌提交成功，将在1-2个工作日内进行审核~','确定',true,function () {
-                        _this.releaseParams.brandID = response.data.id;
+                        _this.releaseParams.brandId = response.data.id;
                         _this.isBrandAssociation = false;
                         _this.isAddBrand = false;
                     });
@@ -367,7 +365,7 @@ var releaseContainer = new Vue({
         SelectChangeAssociationFn: function(option){//选择品牌
             var _this = this;
             _this.releaseParams.brandName = option.name;
-            _this.releaseParams.brandID = option.id;
+            _this.releaseParams.brandId = option.id;
             _this.isBrandAssociation = false;
             _this.vShow_BrandID = false;
         },
@@ -390,7 +388,7 @@ var releaseContainer = new Vue({
                     }else {
                         _this.classificationTwoList = [];
                         _this.releaseParams.twoClassifyName = '';
-                        _this.releaseParams.smallTypeID = ''
+                        _this.releaseParams.smallTypeId = ''
                     }
                 }else{
                     CAIMEI.Alert(response.msg, '确定', false);
@@ -406,7 +404,7 @@ var releaseContainer = new Vue({
                     }else {
                         _this.releaseParams.threeClassifyName = '';
                         _this.classificationThreeList = [];
-                        _this.releaseParams.tinyTypeID = ''
+                        _this.releaseParams.tinyTypeId = ''
                     }
                 }else{
                     CAIMEI.Alert(response.msg, '确定', false);
@@ -417,32 +415,32 @@ var releaseContainer = new Vue({
             var _this = this;
             _this.selectText.bigTypeID = option.name;
             _this.releaseParams.firstClassifyName = option.name;
-            _this.releaseParams.bigTypeID = option.bigTypeID
+            _this.releaseParams.bigTypeId = option.bigTypeId
             _this.selectText.smallTypeID='请选择二级分类';
             _this.selectText.tinyTypeID = '请选择三级分类';
-            _this.releaseParams.smallTypeID ='';
-            _this.releaseParams.tinyTypeID ='';
+            _this.releaseParams.smallTypeId ='';
+            _this.releaseParams.tinyTypeId ='';
             _this.classificationTwoList=[];
             _this.classificationThreeList =[];
             _this.isSelectActive = 0;
-            if(_this.releaseParams.bigTypeID!=''){
-                 _this.GetTwoClassFn(_this.releaseParams.bigTypeID);
+            if(_this.releaseParams.bigTypeId!=''){
+                 _this.GetTwoClassFn(_this.releaseParams.bigTypeId);
             }
         },
         ChangeClassificationTwo: function(option){//选择二级分类
             var _this = this;
-            if(!option.smallTypeID){_this.isSelectActive = 0; return;}
+            if(!option.smallTypeId){_this.isSelectActive = 0; return;}
             _this.selectText.smallTypeID = option.name;
             _this.selectText.tinyTypeID = '请选择三级分类';
-            _this.releaseParams.smallTypeID = option.smallTypeID;
+            _this.releaseParams.smallTypeId = option.smallTypeId;
             _this.releaseParams.twoClassifyName = option.name;
             _this.isSelectActive = 0;
-            _this.GetThreeClassFn(_this.releaseParams.smallTypeID);
+            _this.GetThreeClassFn(_this.releaseParams.smallTypeId);
         },
         ChangeClassificationThree: function(option){//选择三级分类
             var _this = this;
-            if(!option.tinyTypeID){_this.isSelectActive = 0; return;}
-            _this.releaseParams.tinyTypeID = option.tinyTypeID;
+            if(!option.tinyTypeId){_this.isSelectActive = 0; return;}
+            _this.releaseParams.tinyTypeId = option.tinyTypeId;
             _this.selectText.tinyTypeID = option.name;
             _this.releaseParams.threeClassifyName = option.name;
             _this.isSelectActive = 0;
@@ -646,6 +644,7 @@ var releaseContainer = new Vue({
         NextStep: function(){//进入第二步
             var _this = this;
             var KeyString = '',TagString='';
+            console.log(_this.releaseParams);
             if(_this.releaseParams.name == ''){
                 _this.vShow_Name = true;
                 _this.fromMessage = '请输入商品显示名';
@@ -673,7 +672,7 @@ var releaseContainer = new Vue({
                 },2000);
                 return;
             }
-            if(_this.releaseParams.bigTypeID == ''){
+            if(_this.releaseParams.bigTypeId == ''){
                 _this.vShow_TinyTypeID = true;
                 _this.fromMessage = '请选择商品分类';
                 _this.scrollIntoView();
@@ -683,7 +682,7 @@ var releaseContainer = new Vue({
                 return;
             }
             if(_this.classificationTwoList!=''&& _this.classificationTwoList!=null){
-                if(_this.releaseParams.smallTypeID == ''){
+                if(_this.releaseParams.smallTypeId == ''){
                     _this.vShow_TinyTypeID = true;
                     _this.fromMessage = '请选择二级分类';
                     _this.scrollIntoView();
@@ -694,7 +693,7 @@ var releaseContainer = new Vue({
                 }
             }
             if(_this.classificationThreeList!='' && _this.classificationThreeList!=null){
-                if(_this.releaseParams.tinyTypeID == ''){
+                if(_this.releaseParams.tinyTypeId == ''){
                     _this.vShow_TinyTypeID = true;
                     _this.fromMessage = '请选择三级分类';
                     _this.scrollIntoView();
@@ -704,7 +703,7 @@ var releaseContainer = new Vue({
                      return;
                 }
             }
-            if(_this.releaseParams.brandID == ''){
+            if(_this.releaseParams.brandId == ''){
                 _this.vShow_BrandID = true;
                 _this.fromMessage = '请选择商品品牌';
                 _this.scrollIntoView();
@@ -801,7 +800,7 @@ var releaseContainer = new Vue({
                 },2000);
                 return
             }
-            if(_this.releaseParams.price1 == ''){
+            if(_this.releaseParams.price == ''){
                 _this.vShow_Price1 = true;
                 _this.fromMessage = '请输入售价';
                 _this.scrollIntoView();
@@ -858,10 +857,10 @@ var releaseContainer = new Vue({
             if(_this.releaseParams.areaFlag == '0'){
                 _this.ProvinceList.forEach(function(el){
                     if(el.isChecked){
-                        _this.releaseParams.provinceIDs+=el.provinceID+',';
+                        _this.releaseParams.provinceIds+=el.provinceID+',';
                     }
                 });
-                if(_this.releaseParams.provinceIDs == ''){
+                if(_this.releaseParams.provinceIds == ''){
                     _this.vShow_isProvince = true;
                     _this.fromMessage = '请选择指定区域';
                     setTimeout(function(){
@@ -958,7 +957,7 @@ var releaseContainer = new Vue({
             _this.releaseParams.serviceInfo = severInfoEditor.getData();
             if(_this.releaseType == 'edit'){
                 _this.releaseParams.productDetailInfoID = _this.productDetailInfoID;
-                _this.releaseParams.productID = _this.productId;
+                _this.releaseParams.productId = _this.productId;
                 CAIMEI.returnedTarget();
                 _this.releaseParams = Object.assign(_this.releaseParams,{params:JSON.stringify(_this.params)});
                 delete _this.releaseParams.imageList;
@@ -973,7 +972,7 @@ var releaseContainer = new Vue({
                 if(response.code == 0){
                     CAIMEI.dialog('提交成功，等待审核',true,function () {
                         if(_this.releaseType == 'edit'){
-                            SupplierApi.UpdateSearchManageProduct({pid:_this.productId},function (res) {
+                            SupplierApi.UpdateSearchManageProduct({productId:_this.productId},function (res) {
                                 console.log('编辑商品更新搜索索引~~~成功');
                             })
                         }
@@ -1114,11 +1113,11 @@ var releaseContainer = new Vue({
         var NODE_ENV_BASE_URL = 'https://spi-b.caimei365.com';
         _this.NODE_ENV_BASE_URL = NODE_ENV_BASE_URL;
         if(globalUserData){
-            _this.releaseParams.userID = globalUserData.userId;
-            _this.releaseParams.shopID = globalUserData.shopId;
+            _this.releaseParams.shopId = globalUserData.shopId;
+            _this.releaseParams.userId = globalUserData.userId;
             _this.releaseType = CAIMEI.getUrlParam('type');
             if(  _this.releaseType == 'edit'){
-                _this.productId = Number(CAIMEI.getUrlParam('productID'));
+                _this.productId = Number(CAIMEI.getUrlParam('productId'));
                 _this.GetEditReleaseProductInfo(_this.productId);
             }
         }

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

@@ -70,51 +70,64 @@ var supplierHome = new Vue({
         },
         getMainProducts: function(){
             var _self = this;
-            $.getJSON(spiServer + "/supplier/home/products",{supplierId: this.params.id}).done(function (r) {
-                if (r.code === 0 && r.data) {
-                    if(_self.userId && _self.userId>0){
-                        var productIdArr = [];
-                        r.data.map(function (item) {
-                            // 0公开价格 1不公开价格 2仅对会员机构公开
-                            if (item.priceFlag !== 1) {
-                                productIdArr.push(item.id)
-                            }
-                        });
-                        setProductPrice(r.data, productIdArr.join(","), _self.userId, function () {
-                            _self.$forceUpdate();
-                            setTimeout(function(){
-                                // 图片懒加载
-                                $("img[data-original]").lazyload();
-                            },500);
-                        });
+            SupplierApi.GetShopProductMain(
+                {
+                    shopId: _self.params.id,
+                    identity: GLOBAL_USER_IDENTITY
+                },
+                function (res) {
+                    if (res.code === 0 && res.data) {
+                        if(_self.userId && _self.userId>0){
+                            var productIdArr = [];
+                            res.data.map(function (item) {
+                                // 0公开价格 1不公开价格 2仅对会员机构公开
+                                if (item.priceFlag !== 1) {
+                                    productIdArr.push(item.productId)
+                                }
+                            });
+                            setProductPrice(res.data, productIdArr.join(","), _self.userId, function () {
+                                _self.$forceUpdate();
+                                setTimeout(function(){
+                                    // 图片懒加载
+                                    $("img[data-original]").lazyload();
+                                },500);
+                            });
+                        }
+                        _self.mainProducts = res.data;
+                    } else {
+                        CAIMEI.Alert(res.msg, '确定');
                     }
-                    _self.mainProducts = r.data;
                 }
-            });
+            );
         },
         getProductLists: function(){
             var _self = this;
-            $.getJSON(spiServer + "/search/query/product/supplier",{
-                keyword: _self.params.keyword,
-                pageSize: _self.params.size,
-                pageNum: _self.params.num,
-                identity: GLOBAL_USER_IDENTITY,
-                id:_self.params.id
-            }, function (r) {
-                if (r.code === 0 && r.data) {
-                    var result = JSON.parse(r.data);
-                    _self.listRecord = result.total;
-                    var resultData = setSearchProductList(result.items, _self.userId, function(){
-                        _self.$forceUpdate();
-                        setTimeout(function(){
-                            // 图片懒加载
-                            $("img[data-original]").lazyload();
-                        },500);
-                    });
-                    _self.productLists = _self.productLists.concat(resultData);
+            SupplierApi.GetSearchQueryProductSupplier(
+                {
+                    keyword: _self.params.keyword,
+                    pageSize: _self.params.size,
+                    pageNum: _self.params.num,
+                    identity: GLOBAL_USER_IDENTITY,
+                    id:_self.params.id
+                },
+                function (res) {
+                    if (res.code === 0 && res.data) {
+                        var result = JSON.parse(res.data);
+                        _self.listRecord = result.total;
+                        var resultData = setSearchProductList(result.items, _self.userId, function () {
+                            _self.$forceUpdate();
+                            setTimeout(function () {
+                                // 图片懒加载
+                                $("img[data-original]").lazyload();
+                            }, 500);
+                        });
+                        _self.productLists = _self.productLists.concat(resultData);
+                        _self.requestFlag = true;
+                    } else {
+                        CAIMEI.Alert(res.msg, '确定');
+                    }
                 }
-                _self.requestFlag = true;
-            })
+            );
         },
         keyupSearch: function(event) {
             // 搜索输入框 按回车键搜索

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

@@ -60,32 +60,16 @@ var supplierList = new Vue({
                     var result = JSON.parse(res.data);
                     console.log(result);
                     _self.listRecord = result.total;
-                    var resultData = [];
-                    result.items.map(function (su) {
-                        if(su.products && su.products.length>0) {
-                            var productList = setSearchProductList(su.products, 0, function(){
-                                _self.$forceUpdate();
-                                setTimeout(function(){
-                                    // 图片懒加载
-                                    $("img[data-original]").lazyload();
-                                },500);
-                            });
-                        }
-                        resultData.push({
-                            id: su.id,
-                            name: su.name,
-                            license: su.license,
-                            logo: su.logo,
-                            businessScope: su.business,
-                            address: su.address,
-                            productList: productList
-                        });
-                    });
+                    var resultData = result.items;
                     if(isPC){
                         _self.listData = resultData;
                     }else{
                         _self.listData = _self.listData.concat(resultData);
                     }
+                    setTimeout(function(){
+                        // 图片懒加载
+                        $("img[data-original]").lazyload();
+                    },500);
                     _self.listLoading = false;
                     _self.requestFlag = true;
                 }else {

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

@@ -152,20 +152,20 @@
                             <div class="tabItem_right_content" v-for="(nav,i) in big.list" :class="{'on':i==0}">
                                 <div class="line"  v-if="nav.smallTypeList!==null&&nav.smallTypeList!==''" v-for="small in nav.smallTypeList">
                                     <div class="lft show">
-                                        <a :href="'/product/instruelist.html?bigTypeID='+nav.bigTypeID+'&smallTypeID='+small.smallTypeID+'&typeSort='+nav.typeSort+''" target="_blank">
+                                        <a :href="'/product/instruelist.html?bigTypeID='+nav.bigTypeId+'&smallTypeID='+small.smallTypeId+'&typeSort='+nav.typeSort+''" target="_blank">
                                             <span v-if="isPC"> > </span>
                                             <p>{{ small.name }}</p>
                                         </a>
                                     </div>
                                     <div class="rgt mfw" >
                                         <template v-if="small.tinyTypeList!='' && small.tinyTypeList!=null"  v-for="tiny in small.tinyTypeList">
-                                            <a class="3" :href="'/product/instruelist.html?bigTypeID='+nav.bigTypeID+'&smallTypeID='+small.smallTypeID+'&tinyTypeID='+tiny.tinyTypeID+'&typeSort='+nav.typeSort+''" target="_blank">
+                                            <a class="3" :href="'/product/instruelist.html?bigTypeID='+nav.bigTypeId+'&smallTypeID='+small.smallTypeId+'&tinyTypeID='+tiny.tinyTypeId+'&typeSort='+nav.typeSort+''" target="_blank">
                                                 <img v-if="!isPC" :src="tiny.crmIcon" alt="tiny.name">
                                                 <span v-text="tiny.name"></span>
                                             </a>
                                         </template>
                                         <template v-if="!small.tinyTypeList">
-                                            <a class="none" :href="'/product/instruelist.html?bigTypeID='+nav.bigTypeID+'&smallTypeID='+small.smallTypeID+'&typeSort='+nav.typeSort+''" target="_blank">
+                                            <a class="none" :href="'/product/instruelist.html?bigTypeID='+nav.bigTypeId+'&smallTypeID='+small.smallTypeId+'&typeSort='+nav.typeSort+''" target="_blank">
                                                 <img v-if="!isPC" :src="small.crmIcon" alt="全部商品">
                                                 <p>全部商品</p>
                                             </a>
@@ -175,13 +175,13 @@
                                 <template v-if="!nav.smallTypeList">
                                     <div class="line">
                                         <div class="lft none">
-                                            <a :href="'/product/instruelist.html?bigTypeID='+nav.bigTypeID+'&typeSort='+nav.typeSort+''" target="_blank">
+                                            <a :href="'/product/instruelist.html?bigTypeID='+nav.bigTypeId+'&typeSort='+nav.typeSort+''" target="_blank">
                                                 <span v-if="isPC"> > </span>
                                                 <p>{{ nav.name }}</p>
                                             </a>
                                         </div>
                                         <div class="rgt mfw" >
-                                            <a :href="'/product/instruelist.html?bigTypeID='+nav.bigTypeID+'&typeSort='+nav.typeSort+''" target="_blank">
+                                            <a :href="'/product/instruelist.html?bigTypeID='+nav.bigTypeId+'&typeSort='+nav.typeSort+''" target="_blank">
                                                 <img v-if="!isPC" :src="nav.crmIcon" alt="全部商品">
                                                 <p>全部商品</p>
                                             </a>

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

@@ -54,7 +54,7 @@
             </ul>
             <div class="shopList">
                 <div class="Listitem" v-if="isShow" v-for="(item, index) in tabchildList">
-                    <a class="itemImg onhref" :href="'/flea-market-'+item.productID+'.html'">
+                    <a class="itemImg onhref" :href="'/flea-market-'+item.productId+'.html'">
                         <img :src="item.imageList[0]" :class="item.sold==1?'activeImg':''" class="bigImg">
                     </a>
                     <div class="ItemInfo">
@@ -64,7 +64,7 @@
                             <span class="infotag sold" v-if="item.sold==1&&item.newAdded==1||item.sold==1&&item.newAdded==0">已售</span>
                             <span class="infotag other" v-if="item.brandID==161&&item.brandName!=''&&item.brandName!=null">{{item.brandName}}</span>
                         </div>
-                        <a class="productname" :href="'/flea-market-'+item.productID+'.html'">
+                        <a class="productname" :href="'/flea-market-'+item.productId+'.html'">
                             {{item.name}}
                         </a>
                         <div class="targetprice">

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

@@ -32,19 +32,19 @@
             <div class="classification">
                 <div class="class-title">分类</div>
                 <div class="class-nav-main">
-                    <div v-for="item in classify" @click="checkedClasslyFn(item,1)" :class="{'on':item.bigTypeID==bigTypeID}">{{item.name}}</div>
+                    <div v-for="item in classify" @click="checkedClasslyFn(item,1)" :class="{'on':item.bigTypeId == bigTypeID}">{{item.name}}</div>
                 </div>
             </div>
             <div class="classification" v-if="smalltypeList!='' && smalltypeList!=null">
                 <div class="class-title">二级</div>
                 <div class="class-nav-main">
-                    <div v-for="item in smalltypeList" @click="checkedClasslyFn(item,2)" :class="{'on':item.smallTypeID==smallTypeID}">{{item.name}}</div>
+                    <div v-for="item in smalltypeList" @click="checkedClasslyFn(item,2)" :class="{'on':item.smallTypeId == smallTypeID}">{{item.name}}</div>
                 </div>
             </div>
             <div class="classification" v-if="params.smallTypeID!=''&& tinytypeList!=''&& tinytypeList!=null">
                 <div class="class-title">三级</div>
                 <div class="class-nav-main">
-                    <div v-for="item in tinytypeList" @click="checkedClasslyFn(item,3)" :class="{'on':item.tinyTypeID==tinyTypeID}">{{item.name}}</div>
+                    <div v-for="item in tinytypeList" @click="checkedClasslyFn(item,3)" :class="{'on':item.tinyTypeId == tinyTypeID}">{{item.name}}</div>
                 </div>
             </div>
         </template>
@@ -52,25 +52,25 @@
                 <ul class="mfc class-nav-main">
                     <li class="class-title" :class="{'on':params.sortField == ''}" @click="toSortList('',1)">综合</li>
                         <template>
-                            <li v-if="params.sortField == 'p_sales' && params.sortType == 1" class="down"
-                            @click="toSortList('p_sales',0)"><span>销量</span></li>
-                            <li v-else-if="params.sortField == 'p_sales' && params.sortType == 0" class="up"
-                            @click="toSortList('p_sales',1)"><span>销量</span></li>
-                            <li v-else @click="toSortList('p_sales',0)"><span>销量</span></li>
+                            <li v-if="params.sortField == 'sales' && params.sortType == 1" class="down"
+                            @click="toSortList('sales',0)"><span>销量</span></li>
+                            <li v-else-if="params.sortField == 'sales' && params.sortType == 0" class="up"
+                            @click="toSortList('sales',1)"><span>销量</span></li>
+                            <li v-else @click="toSortList('sales',0)"><span>销量</span></li>
                         </template>
                         <template>
-                             <li v-if="params.sortField == 'p_favorite' && params.sortType == 1" class="down"
-                            @click="toSortList('p_favorite',0)"><span>人气</span></li>
-                            <li v-else-if="params.sortField == 'p_favorite' && params.sortType == 0" class="up"
-                            @click="toSortList('p_favorite',1)"><span>人气</span></li>
-                            <li v-else @click="toSortList('p_favorite',0)"><span>人气</span></li>
+                             <li v-if="params.sortField == 'favorite' && params.sortType == 1" class="down"
+                            @click="toSortList('favorite',0)"><span>人气</span></li>
+                            <li v-else-if="params.sortField == 'favorite' && params.sortType == 0" class="up"
+                            @click="toSortList('favorite',1)"><span>人气</span></li>
+                            <li v-else @click="toSortList('favorite',0)"><span>人气</span></li>
                         </template>
                         <template>
-                             <li v-if="params.sortField == 'p_price' && params.sortType == 1" class="down"
-                            @click="toSortList('p_price',0)"><span>价格</span></li>
-                            <li v-else-if="params.sortField == 'p_price' && params.sortType == 0" class="up"
-                            @click="toSortList('p_price',1)"><span>价格</span></li>
-                            <li v-else @click="toSortList('p_price',0)"><span>价格</span></li>
+                             <li v-if="params.sortField == 'price' && params.sortType == 1" class="down"
+                            @click="toSortList('price',0)"><span>价格</span></li>
+                            <li v-else-if="params.sortField == 'price' && params.sortType == 0" class="up"
+                            @click="toSortList('price',1)"><span>价格</span></li>
+                            <li v-else @click="toSortList('price',0)"><span>价格</span></li>
                         </template>
                 </ul>
             </div>
@@ -79,7 +79,7 @@
             <div class="list-container">
                 <ul class="clear mfw">
                     <li class="productItem " v-for="p in listData">
-                        <a class="image" :href="'/product-'+p.id+'.html'+'?name='+ nav_linkName">
+                        <a class="image" :href="'/product-'+p.productId+'.html'+'?name='+ nav_linkName">
                             <img src="/img/base/placeholder.png" :data-original="p.image" :alt="p.name">
                             <p class="name" v-html="addhtml + p.name" v-if="p.beautyActFlag==1"></p>
                             <p class="name" v-html="p.name" v-else></p>

src/main/resources/templates/supplier-center/shop/goods.html

@@ -50,14 +50,22 @@
                         </div>
                         <div class="form-row">
                             主推商品：
-                            <select name="" class="state" @change="SelectChangeInsideFn($event)">
+                            <select name="" class="state small" @change="SelectChangeInsideFn($event)">
                                 <option value="">请选择</option>
                                 <option value="1">是</option>
                                 <option value="0">否</option>
                             </select>
                         </div>
+                        <div class="form-row">
+                            商品属性：
+                            <select name="" class="state small" @change="SelectChangeCommodityType($event)">
+                                <option value="">请选择</option>
+                                <option value="1">产品</option>
+                                <option value="2">仪器</option>
+                            </select>
+                        </div>
                         <div class="form-row fenlei">
-                            <span class="">分类：</span>
+                            <span class="">商品分类：</span>
                             <select name="" class="state " @change="ChangeClassificationFirst($event)">
                                 <option value="">全部</option>
                                 <option v-for="x in classificationFirstList" :value="x.bigTypeID">{{x.name}}</option>
@@ -93,12 +101,12 @@
                                     <div class="checkbox checklist" @click='ischeck(product)'>
                                         <div class="box icon"
                                              :class="[product.productsChecked ?'icon-gouxuan':'icon-weigouxuan']"></div>
-                                        <span> {{product.productID}}</span>
+                                        <span> {{product.productId}}</span>
                                     </div>
                                 </li>
                                 <li>
                                     <div class="good-info">
-                                        <img :src="product.mainImage" :alt="product.name">
+                                        <img :src="product.image" :alt="product.name">
                                         <p class="good-name">{{product.name}}</p>
                                     </div>
                                 </li>
@@ -111,7 +119,7 @@
                                     <div class="good-price">
                                         <p>￥{{toFixedFn(product.normalPrice)}}</p>
                                         <p>/</p>
-                                        <p>￥{{toFixedFn(product.price1)}}</p>
+                                        <p>￥{{toFixedFn(product.price)}}</p>
                                     </div>
                                       <span v-if="product.promotions!=null" class="priceTag">
                                           <i class="tag icon mIcon" @click="toggleThisLadder($event)" v-text="product.promotions?product.promotions.name:''"></i>
@@ -144,9 +152,9 @@
                                 </li>
                                 <li>
                                     <div class="good-handle">
-                                        <a class="btn " href="javascript: void(0);" v-if="['0','1','2','3','8','9'].indexOf(product.validFlag)!=-1" @click="editGoodFn(product)">编辑</a>
-                                        <a class="btn primary" href="javascript: void(0);" v-if="['2'].indexOf(product.validFlag)!=-1" @click="pageLinkDetils(product)">查看</a>
-                                        <a class="btn " href="javascript: void(0);" v-if="['2'].indexOf(product.validFlag)!=-1" @click="ItemDownshelf(product)">下架</a>
+                                        <a class="btn " href="javascript: void(0);" v-if="[0,1,2,3,8,9].indexOf(product.validFlag)!=-1" @click="editGoodFn(product)">编辑</a>
+                                        <a class="btn primary" href="javascript: void(0);" v-if="[2].indexOf(product.validFlag)!=-1" @click="pageLinkDetils(product)">查看</a>
+                                        <a class="btn " href="javascript: void(0);" v-if="[2].indexOf(product.validFlag)!=-1" @click="ItemDownshelf(product)">下架</a>
                                         <a class="btn danger" href="javascript: void(0);" v-if="product.isDelFeatured" @click="DeletePushHotFn(product)">删除主页推荐</a>
                                         <a class="btn success" href="javascript: void(0);" v-if="product.isAddFeatured" @click="AddPushHotFn(product)">添加主页推荐</a>
                                     </div>
@@ -160,24 +168,24 @@
                                  <li>商品主图：</li>
                                   <li>
                                     <div class="checkbox" @click='ischeck(product)'>
-                                        <span style="color: #22272e"> {{product.productID}}</span>
+                                        <span style="color: #22272e"> {{product.productId}}</span>
                                         <div class="box icon mIcon":class="[product.productsChecked ?'icon-gouxuan':'icon-weigouxuan']"></div>
                                     </div>
                                 </li>
                             </ul>
                             <div class="tbody">
                                 <div class="good-info">
-                                     <img :src="product.mainImage" :alt="product.name">
+                                     <img :src="product.image" :alt="product.name">
                                      <p class="good-name">{{product.name}}</p>
                                      <a class="btn eit" href="javascript: void(0);"
-                                      v-if="['0','1','2','3','8','9','10'].indexOf(product.validFlag)!=-1"
+                                      v-if="[0,1,2,3,8,9,10].indexOf(product.validFlag)!=-1"
                                            @click="editGoodFn(product)">编辑</a>
                                 </div>
                                 <div  class="good-price">
                                     <span>市场价/售价：</span>
                                      <p>￥{{toFixedFn(product.normalPrice)}}</p>
                                      <p>/</p>
-                                     <p>￥{{toFixedFn(product.price1)}}</p>
+                                     <p>￥{{toFixedFn(product.price)}}</p>
                                       <span v-if="product.promotions!=null" class="priceTag">
                                           <i class="tag" @click="toggleThisLadder($event)" v-text="product.promotions?product.promotions.name:''"></i>
                                           <div class="promotion mFixed">

src/main/resources/templates/supplier-center/shop/release.html

@@ -242,7 +242,7 @@
                             <div class="release-from clear">
                                 <div class="release-label"><span class="star">*</span>售价:</div>
                                 <div class="release-input">
-                                    <input class="input price" v-model="releaseParams.price1" maxlength="40" type="number" placeholder="请输入商品售价" @input="input_price1">
+                                    <input class="input price" v-model="releaseParams.price" maxlength="40" type="number" placeholder="请输入商品售价" @input="input_price1">
                                     <span class="unit">{{releaseParams.unit}}</span>
                                     <span class="yang">￥</span>
                                 </div>

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

@@ -197,6 +197,7 @@
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier/index.js(v=${version})}"></script>
 </body>
 </html>

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

@@ -27,10 +27,10 @@
     <ul v-else class="supplierList">
         <li class="supplierItem clear" v-for="shop in listData">
             <div class="left">
-                <a :href="'/supplier/index.html?id='+shop.id" target="_blank" class="logo">
+                <a :href="'/supplier/index.html?id='+shop.shopId" target="_blank" class="logo">
                     <img :src="shop.logo" onerror="javascript:this.src='/img/default/suppliver.jpg';">
                 </a>
-                <h5><a :href="'/supplier/index.html?id='+shop.id" :title="shop.name" target="_blank">
+                <h5><a :href="'/supplier/index.html?id='+shop.shopId" :title="shop.name" target="_blank">
                     <span v-html="shop.name"></span>
                 </a>
                 <a v-if="shop.license" :href="shop.license" target="_blank" class="icon mIcon shop"></a>
@@ -38,23 +38,23 @@
                 <p>满意度：<span><i v-for="i in 5" class="icon mIcon heart"></i></span></p>
                 <p>所在地区：<span v-text="shop.address"></span></p>
                 <p>经营范围：
-                <span v-if="shop.businessScope!=''"><em v-for="scop in shop.businessScope ? shop.businessScope.split('/') : 0" class="tag" v-text="scop"></em></span>
+                <span v-if="shop.business!=''"><em v-for="scop in shop.business ? shop.business.split('/') : 0" class="tag" v-text="scop"></em></span>
                 <span v-else>暂无</span></p>
             </div>
             <div class="right">
                 <ul class="products clear mfc">
-                    <template v-if="shop.productList && shop.productList.length>0">
-                        <li v-for="product in shop.productList">
-                            <a :href="'/product-'+product.id+'.html'" target="_blank">
+                    <template v-if="shop.products && shop.products.length>0">
+                        <li v-for="product in shop.products">
+                            <a :href="'/product-'+product.productId+'.html'" target="_blank">
                                 <img src="/img/base/placeholder.png" :data-original="product.image">
                                 <span v-html="product.name"></span>
                             </a>
                         </li>
-                        <li v-if="shop.productList.length<3" v-for="i in (3-shop.productList.length)"></li>
+                        <li v-if="shop.products.length<3" v-for="i in (3-shop.products.length)"></li>
                     </template>
                     <li v-else-if="isPC" v-for="i in 3"></li>
                 </ul>
-                <a v-if="isPC" :href="'/supplier/index.html?id='+shop.id" target="_blank" class="four">进入本店铺>>></a>
+                <a v-if="isPC" :href="'/supplier/index.html?id='+shop.shopId" target="_blank" class="four">进入本店铺>>></a>
             </div>
         </li>
     </ul>