‘更新一下index 新增java 接口请求’

src/App.vue

@@ -108,7 +108,7 @@ export default {
 }
 </script>
 <style>
-  @import "//at.alicdn.com/t/font_635492_t6jc0sd8qcj.css";
+  @import "//at.alicdn.com/t/font_635492_2e8rmd21ktq.css";
   @import "./assets/css/Semibold.css";
   @import "./assets/css/global/config.css";
   @import "./assets/css/fileIcon.css";

src/components/newTravelmanager/TravelGroupControl/TravelTemp/VToolBar.vue

@@ -21,6 +21,9 @@
         <div v-if="nextShow()">
             <i :class="isHorizontal === true?'iconfont ' + icon.rightZ:'iconfont ' + icon.bottomZ" @click="toNextZ"></i>
         </div>
+        <div v-if="isReset === true">
+            <i title="重置图片位置" :class="'iconfont ' + icon.reset" @click="toReset"></i>
+        </div>
     </div>
 </template>
 
@@ -76,6 +79,11 @@
             isDelete: {
                 type: Boolean,
                 default: true
+            },
+            // 是否重置
+            isReset: {
+                type: Boolean,
+                default: false
             }
         },
         data () {
@@ -91,7 +99,8 @@
                     rightY: 'icon-right1',
                     rightZ: 'icon-right',
                     bottomY: 'icon-arrowdown',
-                    bottomZ: 'icon-zhidi'
+                    bottomZ: 'icon-zhidi',
+                    reset: 'icon-zhongzhi'
                 }
             }
         },
@@ -146,6 +155,9 @@
             },
             toDelete: function () {
                 this.$emit('toDelete', this.name, this.index1, this.index2)
+            },
+            toReset: function () {
+                this.$emit('toReset', this.name, this.index1, this.index2)
             }
         }
     }

src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue

@@ -55,7 +55,9 @@
                   @toNextZ="imgToNextZ"
                   @toHuan="imgToHuan"
                   @toXuan="imgToXuan"
-                  @toDelete="imgToDelete">
+                  @toDelete="imgToDelete"
+                  @toReset="resetXY"
+                  :isReset='true'>
                 </vToolBar>
                 <input type="file" style="display:none" :id='"hotelfile_"+(item*2)+"_0"' @change="uploadpic">
               </div>
@@ -495,7 +497,9 @@
                 @toNextZ="imgToNextZ"
                 @toHuan="imgToHuan"
                 @toXuan="imgToXuan"
-                @toDelete="imgToDelete">
+                @toDelete="imgToDelete"
+                @toReset="resetXY"
+                :isReset='true'>
               </vToolBar>
               <input type="file" style="display:none" :id='"viewSpotfile_"+(item*4)+"_0"' @change="uploadpic">
             </div>
@@ -656,7 +660,9 @@
                   @toNextZ="imgToNextZ"
                   @toHuan="imgToHuan"
                   @toXuan="imgToXuan"
-                  @toDelete="imgToDelete">
+                  @toDelete="imgToDelete"
+                  @toReset="resetXY"
+                  :isReset='true'>
                 </vToolBar>
                 <input type="file" style="display:none" :id='"viewSpotfile_"+(item*4-2)+"_0"' @change="uploadpic">
               </div>
@@ -933,7 +939,9 @@
                 @toNextZ="imgToNextZ"
                 @toHuan="imgToHuan"
                 @toXuan="imgToXuan"
-                @toDelete="imgToDelete">
+                @toDelete="imgToDelete"
+                @toReset="resetXY"
+                :isReset='true'>
               </vToolBar>
               <input type="file" style="display:none" :id='"restaurantfile_"+(item*2)+"_0"' @change="uploadpic">
             </div>
@@ -1846,6 +1854,18 @@
         blockList.splice(index1,1);
         blockList.push(JSON.parse(nowBlock))
       },
+      // 图片高度重置
+      resetXY: function (name, index1, index2) {
+        let blockList = [];
+        if (name === 'hotel') {
+          blockList = this.hotelObj.list
+        } else if (name === 'viewSpot') {
+          blockList = this.viewSpotObj.list
+        } else if (name === 'restaurant') {
+          blockList = this.restaurantObj.list
+        }
+        this.imgTopReset(name, index1, index2);
+      },
       // 版块删除
       bolckToDelete: function (name, index1, index2) {
         console.log(name, index1)

src/plug/index.js

@@ -145,7 +145,8 @@ export default {
           //上传站点
           UploadUrl: locationName.indexOf('oytour') !== -1||locationName.indexOf('viitto')!==-1 ? "http://upload.oytour.com" : "http://127.0.0.1:8120",
           //文件站点
-          ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto')!==-1 ? "http://imgfile.oytour.com" :  'http://127.0.0.1:8130'
+          ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto')!==-1 ? "http://imgfile.oytour.com" : 'http://127.0.0.1:8130',
+          javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto')!==-1 ? "https://reborn.oytour.com" : "http://192.168.2.215:9000",
         };
         return obj;
       },
@@ -289,7 +290,51 @@ export default {
             }
           }, faildCall)
       },
-
+      Vue.prototype.apiJavaPost = function(cmd, msg, successCall, faildCall) {
+        if (msg == null || msg == "") {
+            msg = {}
+        }
+        var apiurl = this.domainManager().javaUrl + cmd;
+        var timestamp = (new Date()).valueOf();
+        this.apiurl = apiurl;
+        var token = "";
+        var key = "";
+        let userInfo = localStorage.userInfo ? JSON.parse(localStorage.userInfo) : ''
+        let uid = userInfo.EmployeeId ? userInfo.EmployeeId : 0
+        if (this.getLocalStorage() != null) {
+            token = this.getLocalStorage().token;
+            key = this.getLocalStorage().SecretKey;
+        }
+        var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
+        var md5Str = md5(`msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
+        var postData = {
+            "msg": msg,
+            "timestamp": timestamp,
+            "token": token,
+            "sign": md5Str,
+            "uid": uid
+        }
+        if(localStorage.g && localStorage.g!='undefined'){
+            postData.groupId = parseInt(JSON.parse(localStorage.g).i)
+        }
+        this.$http.post(apiurl, postData, {
+            headers: {
+                'Content-Type': 'application/json',
+                'Referer-Viitto': this.$route.path
+            }
+        })
+        .then(res => {
+            if (res.resultCode == 10000 || res.resultCode == 10001) {
+                this.$router.push({
+                    path: '/login'
+                })
+            } else if (res.resultCode == 10005) {
+                this.$router.go(-1)
+            } else {
+                successCall(res)
+            }
+        }, faildCall)
+      },
       //下载文件
       Vue.prototype.GetLocalFile = function (cmd, msg, fileName, successCall) {
         var apiurl = this.domainManager().LocalFileStreamDownLoadUrl;

src/router/config.js

@@ -91,6 +91,11 @@ export default {
           name: 'dmc',
           component: resolve => require(['@/components/temp/dmc'], resolve),
         },
+        {  // 营销活动
+          path: '/activity',
+          name: 'activity',
+          component: resolve => require(['@/components/temp/activity'], resolve),
+        },
         {
           path: '/operation',
           name: 'operation',
@@ -2726,6 +2731,14 @@ export default {
               meta: {
                 title: '销售提成规则'
               }
+            },
+            {
+              path: '/CouponList',
+              name: 'CouponList',
+              component: resolve => require(['@/components/activity/Coupon/CouponList'], resolve),
+              meta: {
+                title: '优惠券列表'
+              }
             }
           ]
         },