接口迁移bug修改

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

@@ -55,9 +55,9 @@ logging:
 caimei:
   siteEnv: 0 #网站环境，（2：正式环境，1：测试环境，0：开发环境）
   spiServer: http://192.168.2.68:8008
-  #coreServer: https://core-b.caimei365.com
+  coreServer: https://core-b.caimei365.com
   #coreServer: http://192.168.2.68:18002
-  coreServer: http://192.168.2.75: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/common/request.service.js

@@ -0,0 +1,72 @@
+/*
+*封装的ajax函数
+* Created by ZHJY on 2020/06/03.
+* @param  option.type     请求类型  get 和 post
+* @param  option.json     数据请求方式,
+* @param  option.url(必选) 请求的url地址   相同域名下的页面（此函数不支持跨域请求）
+* @param  option.data(必选) 请求协带的参数  以js对象的形式定义，如：{name:'张三'}
+* @param  option.replace  是否更新续签
+* @param  option.mask     是否使用模态层加载动画
+*/
+var Request = {
+    AjaxService: function (option) {
+        var REV_TOKEN_ENV = '', REV_TOKEN_USERID = '';
+        var GET_LOGIN_STAUS = JSON.parse(window.localStorage.getItem("userInfo"));
+        if (GET_LOGIN_STAUS != null) {
+            REV_TOKEN_ENV = GET_LOGIN_STAUS.token;
+            REV_TOKEN_USERID = GET_LOGIN_STAUS.userID;
+        } else {
+            REV_TOKEN_ENV = 'X-token'
+        }
+        var loading = '';
+        var def = $.Deferred();
+        $.ajax({
+            url: option.url,
+            data: option.data,
+            xhrFields: {//此处为跨域后台保持session一致,切勿删除!!!
+                withCredentials: true
+            },
+            type: option.type,
+            dataType: "json",
+            headers: {'X-Token': REV_TOKEN_ENV},
+            async: false,
+            contentType: option.json ? 'application/json;charset=UTF-8' : 'application/x-www-form-urlencoded',
+            beforeSend: function () {
+                // if (option.mask) {
+                //     loading = layer.load(0,{shade: [0.1,'#000']}); //0.1透明度的白色背景
+                // }
+            }
+        }).then(function (res) {
+            if (res.code == -99) {
+                CAIMEI.Storage.clear();
+                setBeforeUrl();
+                // location.href = "/login.html";
+            } else {
+                def.resolve(res);
+            }
+        }, function (error) {
+            console.log('网络请求超时，请重试~');
+            def.reject(error);
+        });
+        return def;
+    },
+    uploadImage: function (option, callback) {//上传图片
+        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,
+            type: 'POST',
+            cache: false,
+            data: option.data,
+            processData: false,
+            contentType: false,
+            dataType: "json",
+            success: function (res) {
+                callback(res)
+            },
+            error: function (xhr, type, errorThrown) {
+                console.log("照片上传失败")
+            }
+        });
+    }
+};

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

@@ -6,7 +6,7 @@
 var RepairApi = {
         /* 查询用户维修列表 */
         GetFindMaintenance: function (params, callback) {
-            Http.AjaxService({
+            Request.AjaxService({
                 url:'/repair/list',
                 type:'GET',
                 data:params,
@@ -18,7 +18,7 @@ var RepairApi = {
         },
         /* 用户申请维修 */
         AddApplyMaintenance: function (params, callback) {
-            Http.AjaxService({
+            Request.AjaxService({
                 url:'/repair/apply',
                 type:'POST',
                 data:params,
@@ -30,7 +30,7 @@ var RepairApi = {
         },
          /* 维修详情 */
         MaintenanceDetail: function (params, callback) {
-            Http.AjaxService({
+            Request.AjaxService({
                 url:'/repair/detail',
                 type:'GET',
                 data:params,
@@ -42,7 +42,7 @@ var RepairApi = {
         },
          /* 商户维修详情 */
         CommodityRroductRepair: function (params, callback) {
-            Http.AjaxService({
+            Request.AjaxService({
                 url:'/commodity/product/repair',
                 type:'GET',
                 data:params,
@@ -55,7 +55,7 @@ var RepairApi = {
         },
         /* 维修详情 提交评论 */
        evaluation: function (params, callback) {
-            Http.AjaxService({
+            Request.AjaxService({
                 url:'/repair/evaluation',
                 type:'POST',
                 data:params,

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

@@ -77,10 +77,10 @@ var helpSuggestion = new Vue({
         checkedItemFn:function(item){ //单选
             var _self = this;
                     if(event.target.checked){
-                         _self.checklist.push(item.messageID);
+                         _self.checklist.push(item.messageId);
                          _self.msgId = _self.checklist.toString()+','
                     }else {
-                      _self.checklist.splice(_self.checklist.indexOf(item.messageID), 1);
+                      _self.checklist.splice(_self.checklist.indexOf(item.messageId), 1);
                       _self.msgId = _self.checklist.toString()+','
                     }
                     if(_self.checklist.length==_self.messagesList.length){
@@ -97,7 +97,7 @@ var helpSuggestion = new Vue({
                     _self.checklist = [];
                     _self.messagesList.forEach(function (item) {
                              item.check = true;
-                             _self.checklist.push(item.messageID);
+                             _self.checklist.push(item.messageId);
                              _self.msgId = _self.checklist.toString()+','
                         })
                 }else{

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

@@ -80,11 +80,11 @@ var repairForm = new Vue({
                 event.target.value = '';
             });
         },
-         removeImagesFn: function(index){//删除图片
+        removeImagesFn: function (index) {//删除图片
             var _this = this;
-            _this.productImagesList.splice(index,1);
-            _this.postData.instrumentImages =_this.productImagesList.toString()+',';
-         },
+            _this.productImagesList.splice(index, 1);
+            _this.postData.instrumentImages = _this.productImagesList.toString() + ',';
+        },
          getcity:function(event){//加载市
            var _this = this;
            var donClass = '#cityname';

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

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

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

@@ -90,6 +90,7 @@
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" src="/js/common/request.service.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/repair.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/user-center/repair/detail.js(v=${version})}"></script>
 </body>

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

@@ -78,7 +78,7 @@
                             <div class="uploadGoodsImages">
                                 <div class="form-upload-image"  v-for="(item, index) in imagesList" :key="index">
                                     <img class="upload-img" :src="item" :data-image="item" :id="'uploadGoodsImages'+ index" @click="showViewerImageFn(index)">
-                                    <i class="icon mIcon del" @click="removeImagesFn(index)"></i>
+                                    <i class="icon mIcon del" @click="removeGoodsImagesFn(index)"></i>
                                 </div>
                                 <div class="formLine-file" v-show="imagesList.length<5">
                                     <input ref="goodsImages" type="file" name="file" value="" class="input-file file" accept="image/png,image/jpeg,image/gif,image/jpg"  @change="uploadGoodsImagesFn">
@@ -106,6 +106,7 @@
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" src="/js/common/request.service.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/repair.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/user-center/repair/form-user.js(v=${version})}"></script>
 </body>

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

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