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

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -1931,9 +1931,9 @@
             that.$emit("saveMsg");
           }
           if (type == 2) {
-            that.btnTongBu = this.$t('objFill.v101.myOrdersAllType.tongbujd') + '...';
+            that.btnTongBu = that.$t('objFill.v101.myOrdersAllType.tongbujd') + '...';
           } else {
-            that.btnText = this.$t('pub.saveBtn') + '...';
+            that.btnText = that.$t('pub.saveBtn') + '...';
           }
         });
       },

src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue

@@ -1919,9 +1919,9 @@
             that.$emit("saveMsg");
           }
           if (type == 2) {
-            that.btnTongBu = this.$t('objFill.v101.myOrdersAllType.tongbujd');
+            that.btnTongBu = that.$t('objFill.v101.myOrdersAllType.tongbujd');
           } else {
-            that.btnText = this.$t('pub.saveBtn')+'...';
+            that.btnText = that.$t('pub.saveBtn')+'...';
           }
         });
       },

src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue

@@ -1745,9 +1745,9 @@
             that.$emit("saveMsg");
           }
           if (type == 2) {
-            that.btnTongBu = this.$t('objFill.v101.myOrdersAllType.tongbujd');
+            that.btnTongBu = that.$t('objFill.v101.myOrdersAllType.tongbujd');
           } else {
-            that.btnText = this.$t('pub.saveBtn')+'...';
+            that.btnText = that.$t('pub.saveBtn')+'...';
           }
         });
       },

src/components/newTravelmanager/TravelGroupControl/TravelPrice4.vue

@@ -1781,9 +1781,9 @@
             that.$emit("saveMsg");
           }
           if (type == 2) {
-            that.btnTongBu = this.$t('objFill.v101.myOrdersAllType.tongbujd');
+            that.btnTongBu = that.$t('objFill.v101.myOrdersAllType.tongbujd');
           } else {
-            that.btnText = this.$t('pub.saveBtn')+'...';
+            that.btnText = that.$t('pub.saveBtn')+'...';
           }
         });
       },