Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/assets/common/lang/jp.js

@@ -627,76 +627,3 @@ export const advmanager = {
 export const insManage = {
   im_acc:'従属アカウント',
 }
\ No newline at end of file
-export const active = {
-  ld_name: '受賞の名前',
-  ld_name2: '受賞の名前',
-  ld_status: '抽選の状態',
-  ld_jinyong: '禁用',
-  ld_addld: '入賞を新たにする',
-  ld_cjcs: '抽選回数(一人当たり)',
-  ld_editInfo: '抽選情報を修正する',
-  ld_seeDr: '賞を調べる',
-  ld_deletAC: 'イベントを削除',
-  ld_noData: 'あなたの必要なデータを見つけることができません。',
-  ld_cjNum: '抽選回数',
-  ld_cjRule: '抽選規則',
-  ld_djscwj: 'クリック/引っ張る',
-  ad_addad: '賞を追加する',
-  ad_xuhao: 'シリアル番号',
-  ad_adName: '賞の名',
-  ad_allNum: '賞の数',
-  ad_num: '当選数',
-  ad_endNum: '残りの数',
-  ad_status: '賞の状態  ',
-  ad_type: '賞のタイプ',
-  ad_thankCome: 'ありがとう参加',
-  ad_ybjx: '一般賞',
-  ad_yhq: 'クーポン',
-  ad_jxgl: '賞の関連',
-  ad_ssxl: '所属シリーズ',
-  ad_xlmc: 'シリーズ名',
-  cl_couponName: 'クーポンの名前',
-  cl_yizuofei: 'もう廃れた',
-  cl_addCoupon: '追加クーポン',
-  cl_couponNum: 'クーポンの数',
-  cl_ffzongliang: '数を支給する',
-  cl_sytiaojian: '使用条件',
-  cl_miane: '額面',
-  cl_djshiyong: '重ねて使用する',
-  cl_sxriqi: '発効日',
-  cl_sxzhuangtai: '発効状態',
-  cl_gqriqi: '期限切れの期日',
-  cl_addPp: '創建者',
-  cl_dyquan: '相殺券',
-  cl_zkquan: '割引券',
-  cl_byxu: '許さない',
-  cl_yuncu: '許可する',
-  cl_sxzhong: '発効中',
-  cl_wsxiao: '未発効',
-  cl_ygqi: '期限が切れた',
-  cl_deleteCoupon: 'クーポンを削除',
-  cl_couponType: 'クーポンのタイプ',
-  cl_yhqmiane: 'クーポンの額面',
-  cl_dkjezk: '金額を控除する/割引',
-  cl_mdskeyong: '満了する',
-  cl_yxjzhiri: '有効期限',
-  cl_zuofei: '廃棄する',
-  cl_syfanwei: '適用範囲',
-  cl_tongyong: '通用する',
-  cl_team: 'チーム',
-  cl_qianzheng: 'ビザ',
-  cl_jipiao: '航空券',
-  cl_wsyong: '未使用',
-  cl_ysyong: '使用済み',
-  cl_yzfei: 'もう廃れた',
-  cl_hdtujing: '方法を得る',
-  cl_hdqudao: 'ルートを得る',
-  cl_syzhuangtai: '使用状態',
-  cl_orderType: '注文タイプ',
-  cl_syriqi: '使用日',
-  cl_user: 'ユーザー',
-  cl_hdriqi: '日付を得る',
-  cl_choujiang: '賞をもらう',
-  cl_zanwu: '見送る',
-  cl_qita: '其他',
-}
\ No newline at end of file

src/assets/common/lang/zh.js

@@ -705,6 +705,7 @@ export const active = {
   cl_choujiang: '抽奖',
   cl_zanwu: '暂无',
   cl_qita: '其他',
+  cjjiangxiang: '抽奖奖项',
 }
 
 export const fnc = {
@@ -885,6 +886,8 @@ export const tips = {
   yssdliucheng: '注：以上费用类型将会被执行你设定的流程',
   zwsyfeiyong: '暂无适用费用！',
   qrsc: '确定删除',
+  scyhquan: '优惠券？删除后不可恢复！',
+  schdbkhf: '活动？删除后不可恢复！',
   lcmscbkhf: '流程吗？删除后不可恢复！',
   qsrmiaoshu: '请输入6个字的描述',
   srgjzjxguolv: '输入关键字进行过滤',
@@ -906,6 +909,10 @@ export const tips = {
   shanchutishi: '删除提示',
   shanchuchenggong: '删除成功',
   baocunchenggong: '保存成功',
+  wjdxbncgsz: '文件大小不能超过10M！',
+  qsctpian: '请上传图片！',
+  shangchuanzhong: '上传中...',
+  scchenggong: '上传成功',
 }
 export const Operation = {
   Op_ShortName:'线路简称',
@@ -927,6 +934,14 @@ export const Operation = {
 }
 export const rule = {
   company: '请选择公司',
+  qxzxuanlu: '请选择线路',
+  qsryhqmingcheng: '请输入优惠券名称',
+  qsrsytiaojian: '请输入使用条件',
+  qxzsxriqi: '请选择生效日期',
+  qxzjzriqi: '请选择截止日期',
+  qsryhqshuliang: '请输入优惠券数量',
+  zkqzdzkwzhe: '折扣券最大折扣为99折',
+  yxjzrbxdyksshijian: '有效截止日必须大于开始时间！',
   ldNmae: '请输入抽奖名称',
   ldNum: '请输入抽奖次数',
   startDate: '请选择开始日期',
@@ -957,4 +972,10 @@ export const rule = {
   qsrgzmingcheng: '请输入规则名称',
   qzsxzytxianlu: '请至少选择一个适用线路',
   qzsxzyggongsi: '请至少选择一个适用公司',
+  qsrjxmingcheng: '请输入奖项名称',
+  qxzjxleixing: '请选择奖项类型',
+  qxzjxguanlian: '请选择奖项关联',
+  qsrjxshuliang: '请输入奖项数量',
+  qxzjxzhuangtai: '请选择奖项状态',
+  qsrpaixu: '请输入排序',
 }

src/components/Login.vue

@@ -312,8 +312,20 @@ export default {
             this.$cookie.set("RB_Branch_id", userData.RB_Branch_id);
             this.$cookie.set("RB_Group_id", userData.RB_Group_id);
             localStorage.menu=JSON.stringify(firstTire)
-            this.$router.push({ path: "/index" });
             this.loginState = 0;
+            let previousPathInfo = localStorage.previousPathInfo ? JSON.parse(localStorage.previousPathInfo) : ''
+            if (previousPathInfo) {
+              let path = previousPathInfo.path.indexOf('login') === -1 ? previousPathInfo.path : 'index'
+              let query = previousPathInfo.query ? previousPathInfo.query : {}
+              if (path!== 'index') {
+                this.$router.push({ path: "/"+ path, query: query });
+              } else {
+                this.$router.push({ path: "/index" });
+              }
+            }else {
+                this.$router.push({ path: "/index" });
+              }
+            
             
             //登录成功后跳转页面
             // this.$notify.success({

src/components/activity/CouponList.vue

@@ -355,13 +355,13 @@ export default {
         branchId: '',
       },
       rules: {
-        branchId: [{ required: true, message: "请选择公司", trigger: "change" }],
-        lineId: [{ required: true, message: "请选择线路", trigger: "change" }],
-        couponsName: [{ required: true, message: "请输入优惠券名称", trigger: "blur" }],
-        useCondition: [{ required: true, message: "请输入使用条件", trigger: "blur" }],
-        effectDate: [{ required: true, message: "请选择生效日期", trigger: "change" }],
-        expirationDate: [{ required: true, message: "请选择截止日期", trigger: "change" }],
-        couponCount: [{ required: true, message: "请输入优惠券数量", trigger: "blur" }],
+        branchId: [{ required: true, message: this.$t('rule.company'), trigger: "change" }],
+        lineId: [{ required: true, message: this.$t('rule.qxzxuanlu'), trigger: "change" }],
+        couponsName: [{ required: true, message: this.$t('rule.qsryhqmingcheng'), trigger: "blur" }],
+        useCondition: [{ required: true, message: this.$t('rule.qsrsytiaojian'), trigger: "blur" }],
+        effectDate: [{ required: true, message: this.$t('rule.qxzsxriqi'), trigger: "change" }],
+        expirationDate: [{ required: true, message: this.$t('rule.qxzjzriqi'), trigger: "change" }],
+        couponCount: [{ required: true, message: this.$t('rule.qsryhqshuliang'), trigger: "blur" }],
       },
       addMsg: {
         couponsName: "",
@@ -461,14 +461,14 @@ export default {
     maxValue: function (val) {
       if (this.addMsg.couponsType === 2 && val >= 9.99) {
         this.addMsg.denomination = 9.99
-        this.$message.error("折扣券最大折扣为99折")
+        this.$message.error(this.$t('rule.zkqzdzkwzhe'))
       }
     },
     addData() {
       let sDate = new Date(this.addMsg.effectDate)
       let eDate = new Date(this.addMsg.expirationDate)
       if (sDate > eDate) {
-        return this.$message.error("有效截止日必须大于开始时间！")
+        return this.$message.error(this.$t('rule.yxjzrbxdyksshijian'))
       }
       this.isleaveBtn = false;
       this.apiJavaPost(
@@ -534,9 +534,9 @@ export default {
     },
     // 删除
     deleteItem: function (item) {
-      this.$confirm('确定删除“'+ item.couponsName +'”优惠券？删除后不可恢复！', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+      this.$confirm(this.$t('tips.qrsc')+'“'+ item.couponsName +'”'+this.$t('tips.scyhquan'), this.$t('tips.tips'), {
+           confirmButtonText: this.$t('pub.sureBtn'),
+          cancelButtonText: this.$t('pub.cancelBtn'),
           type: 'warning'
       }).then(() => {
           this.apiJavaPost("/api/sell/coupon/updateCouponStatus", {couponId: item.id, status: 3,}, res => {
@@ -550,7 +550,7 @@ export default {
       }).catch(() => {
           this.$message({
               type: 'info',
-              message: '已取消'
+              message: this.$t('hotel.hotel_HasBeenCancelled')
           });
       });
     },

src/components/activity/LuckyDraw.vue

@@ -489,9 +489,9 @@ export default {
     },
     // 删除抽奖
     deleteItem: function (item) {
-      this.$confirm('确定删除“'+ item.lotteryName +'”活动？删除后不可恢复！', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+      this.$confirm(this.$t('tips.qrsc')+'“'+ item.lotteryName +'”' + this.$t('tips.schdbkhf'), this.$t('tips.tips'), {
+          confirmButtonText: this.$t('pub.sureBtn'),
+          cancelButtonText: this.$t('pub.cancelBtn'),
           type: 'warning'
       }).then(() => {
           this.apiJavaPost("/api/sell/lottery/updateLotteryStatus", {lotteryId: item.id, status: 3,}, res => {
@@ -505,7 +505,7 @@ export default {
       }).catch(() => {
           this.$message({
               type: 'info',
-              message: '已取消'
+              message: this.$t('hotel.hotel_HasBeenCancelled')
           });
       });
     },
@@ -516,7 +516,7 @@ export default {
         query: { 
             lotteryId: item.id,
             blank: "y", 
-            tab: "抽奖奖项" 
+            tab: this.$t('active.cjjiangxiang') 
         }
       });
     },
@@ -555,7 +555,7 @@ export default {
     //上传图片
     uploadFileBtn(file) { //上传
         if(file.file.size > 1024 * 1024 * 10) {
-            this.$message.warning('文件大小不能超过10M！')
+            this.$message.warning(this.$t('tips.wjdxbncgsz'))
             return
         }
         //  1 文档  2 数据 3 图片
@@ -572,15 +572,15 @@ export default {
               typeOk = true;
             }
         })
-        if (!typeOk) return this.$message.error('请上传图片！');
+        if (!typeOk) return this.$message.error(this.$t('tips.qsctpian'));
         let newArr = [];
         newArr.push(file.file)
         let path = "/Upload/activity/"
-        this.$message.info('上传中...')
+        this.$message.info(this.$t('tips.shangchuanzhong'))
         this.UploadSelfFileT(path, newArr, x => {
             let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
             this.addMsg.image = this.domainManager().ViittoFileUrl + x.data.FilePath
-            this.$message.success('上传成功');
+            this.$message.success(this.$t('tips.scchenggong'));
             this.$forceUpdate();
         });
     },

src/components/activity/awardList.vue

@@ -129,12 +129,12 @@ export default {
           rank:'',  
       },
      rules:{ 
-        awardName: [{ required: true, message: "请输入奖项名称", trigger: "blur" }],
-        awardType: [{ required: true, message: "请选择奖项类型", trigger: "change" }],
-        awardRelationId: [{required: true, message: "请选择奖项关联", trigger: "change"}],
-        awardCount: [{ required: true, message: "请输入奖项数量", trigger: "blur" }],
-        awardStatus: [{ required: true, message: "请选择奖项状态", trigger: "change" }],
-        rank: [{ required: true, message: "请输入排序", trigger: "blur" }],
+        awardName: [{ required: true, message: this.$t('rule.qsrjxmingcheng'), trigger: "blur" }],
+        awardType: [{ required: true, message: this.$t('rule.qxzjxleixing'), trigger: "change" }],
+        awardRelationId: [{required: true, message: this.$t('rule.qxzjxguanlian'), trigger: "change"}],
+        awardCount: [{ required: true, message: this.$t('rule.qsrjxshuliang'), trigger: "blur" }],
+        awardStatus: [{ required: true, message: this.$t('rule.qxzjxzhuangtai'), trigger: "change" }],
+        rank: [{ required: true, message: this.$t('rule.qsrpaixu'), trigger: "blur" }],
       },
       loading:true,
       outerVisible:false,

src/components/index.vue

@@ -3081,6 +3081,7 @@ export default {
     exit() {
       this.$store.dispatch("logout")
       localStorage.removeItem("userInfo");
+      localStorage.removeItem("previousPathInfo");
       // this.$router.push({ path: "/login" });
       location.href='/'
     },

src/plug/index.js

@@ -241,8 +241,17 @@ export default {
 
     }
 
+    
+    
     //HTTP提交数据
     Vue.prototype.apipost = function (cmd, msg, successCall, faildCall) {
+      if (this.$route.name.indexOf('login') === -1) { 
+        let previousPathInfo = {
+          path: this.$route.name,
+          query: this.$route.query
+        }
+        localStorage.previousPathInfo = JSON.stringify(previousPathInfo);
+      }
         if (msg == null || msg == "") {
           msg = {}
         }
@@ -350,6 +359,13 @@ export default {
       },
 
       Vue.prototype.apiJavaPost = function (cmd, msg, successCall, faildCall) {
+        if (this.$route.name.indexOf('login') === -1) { 
+          let previousPathInfo = {
+            path: this.$route.name,
+            query: this.$route.query
+          }
+          localStorage.previousPathInfo = JSON.stringify(previousPathInfo);
+        }
         if (msg == null || msg == "") {
           msg = {}
         }

src/router/config.js

@@ -1430,7 +1430,7 @@ export default {
             { 
               path: '/priceIncomeConfirmInfo',///priceIncomeConfirmInfo
               name: 'priceIncomeConfirmInfo',
-              component: resolve => require(['@/components/TravelManager/TravelList//priceIncomeConfirmInfo'], resolve),
+              component: resolve => require(['@/components/TravelManager/TravelList/priceIncomeConfirmInfo'], resolve),
               meta: {
                 title: '收入确认单'
               },