接口整改

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

@@ -70,7 +70,7 @@ public class HomeServiceImpl implements HomeService {
     @Override
     public Map<String, Object> getHomeSideJson() {
         try {
-            String sideResult = RequestUtil.sendGet(spiServer+"/home/top/data?source=1");
+            String sideResult = RequestUtil.sendGet(coreServer+"/commodity/home/sidebar?source=1");
             log.debug(sideResult);
             Map<String, Object> sideMap = JSONObject.parseObject(sideResult, Map.class);
             return JSONObject.parseObject(String.valueOf(sideMap.get("data")), Map.class);

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

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

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

@@ -25,7 +25,7 @@ if(localStorage.getItem('userInfo')){
         if (userAgent.match(/MicroMessenger/i)) {
             // 微信浏览器自动授权登录
             var urlForWeChat = 'https://www.caimei365.com/we_chat/redirect_uri.html';
-            $.get(spiServer+'/user/authorizationLink?mode=1&redirectUri='+urlForWeChat, function(r){
+            $.get(coreServer+'/user/login/auth/link?mode=1&redirectUri='+urlForWeChat, function(r){
                 if(r.code===0 && r.data){
                     setBaseCookie("weChatAutoLogin", 1);
                     setBeforeUrl();

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

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

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

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

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

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

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

@@ -11,7 +11,6 @@ var OrderApi = {
                 type:'GET',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -24,7 +23,6 @@ var OrderApi = {
                 type:'POST',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -37,7 +35,6 @@ var OrderApi = {
                 type:'POST',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -50,19 +47,18 @@ var OrderApi = {
                 type:'POST',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
             });
         },
-        GetAddressSelect:function(params,callback){ //获取省市区信息
+        //获取省市区信息
+        GetAddressSelect:function(params,callback){
             Http.AjaxService({
                 url:'/order/address/select',
                 type:'get',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res)
@@ -75,7 +71,6 @@ var OrderApi = {
                 type:'GET',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -88,7 +83,6 @@ var OrderApi = {
                 type:'GET',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -101,7 +95,6 @@ var OrderApi = {
                 type:'GET',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -114,7 +107,6 @@ var OrderApi = {
                 type:'POST',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -127,7 +119,6 @@ var OrderApi = {
                 type:'GET',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -140,7 +131,6 @@ var OrderApi = {
                 type:'GET',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -153,7 +143,6 @@ var OrderApi = {
                 type:'GET',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -166,7 +155,6 @@ var OrderApi = {
                 type:'post',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -179,7 +167,6 @@ var OrderApi = {
                 type:'POST',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -192,7 +179,6 @@ var OrderApi = {
                 type:'POST',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -205,7 +191,6 @@ var OrderApi = {
                 type:'POST',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -218,7 +203,6 @@ var OrderApi = {
                 type:'GET',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -231,7 +215,6 @@ var OrderApi = {
                 type:'post',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -244,7 +227,6 @@ var OrderApi = {
                 type:'get',
                 data:params,
                 json:false,
-                isHost:true
             })
             .then(function(res){
                 callback(res);
@@ -257,7 +239,18 @@ var OrderApi = {
                 type:'post',
                 data:params,
                 json:false,
-                isHost:true
+            })
+            .then(function(res){
+                callback(res);
+            });
+        },
+        // 机构最新订单
+        OrderClubLatest: function (params, callback) {
+            Http.AjaxService({
+                url:'/order/club/latest',
+                type:'get',
+                data:params,
+                json:false,
             })
             .then(function(res){
                 callback(res);

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -5,17 +5,17 @@
  */
 var PublicApi = {
         uploadimg: function (params, callback) {//供应商添加物流上传图片
-            Http.uploadImage({ url:'/formData/MultiPictareaddData',data:params},callback)
+            Http.uploadImage({ url:'/tools/image/upload/multi',data:params},callback)
         },
         uploadFile: function (params, callback) {//上传文件
             Http.uploadImage({
-                url:'/file/upload',
+                url:'/tools/file/upload/oss',
                 data:params
             },callback)
         },
         deleteOssFile: function (params, callback) {//删除Oss文件
             Http.AjaxService({
-                url:'/file/delete',
+                url:'/tools/file/delete/oss',
                 type:'post',
                 data:params,
                 json:false,
@@ -63,10 +63,10 @@ var PublicApi = {
         // },
         // GetHomeRightData:function(params,callback){ //首页右侧模块
         //     Http.AjaxService({
-        //         url:'/home/top/data',
+        //         url:'/commodity/home/sidebar',
         //         type:'get',
         //         data:params,
-        //         json:false
+        //         json:false,
         //     })
         //     .then(function(res){
         //         callback(res)
@@ -448,7 +448,7 @@ var PublicApi = {
         },
         markAsRead:function (params,callback) {//已读消息
             Http.AjaxService({
-                url:'/user/markAsRead',
+                url:'/user/center/messages/read',
                 type:'post',
                 data:params,
                 json:false
@@ -459,7 +459,7 @@ var PublicApi = {
         },
         deleteMessage:function (params,callback) {//删除消息
             Http.AjaxService({
-                url:'/user/deleteMessage',
+                url:'/user/center/messages/delete',
                 type:'post',
                 data:params,
                 json:false

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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