Merge branch 'master' of http://git.lcpcp.cc/zpj/global-merchant-center

src/locales/Arab.json

@@ -209,6 +209,7 @@
     "text11": "سعر التذكرة",
     "text12": "عمولة",
     "text13": "رصيد غير كافٍ",
-    "text14": "إذهب للشحن"
+    "text14": "إذهب للشحن",
+		"text15": "رصيد"
   }
 }

src/locales/en.json

@@ -209,6 +209,7 @@
 		"text11": "Ticket Price",
 		"text12": "Commission",
 		"text13": "Insufficient Balance",
-		"text14": "Recharge"
+		"text14": "Recharge",
+		"text15": "Balance"
 	}
 }

src/locales/zh-CN.json

@@ -209,6 +209,7 @@
 		"text11": "票價",
 		"text12": "佣金",
 		"text13": "餘額不足",
-		"text14": "去充值"
+		"text14": "去充值",
+		"text15": "餘額"
 	}
 }

src/views/Forestage/Tourism/index.vue

@@ -97,7 +97,7 @@
 
 
 		<!-- <order-detail ref="orderDetail" :orderId="orderId"></order-detail> -->
-		<order-sett ref="orderSett" :orderId="orderId" @order-success="getInfo"></order-sett>
+		<order-sett ref="orderSett" :orderId="orderId" :userInfo="userInfo" @order-success="getInfo"></order-sett>
 		<!-- <balance-tip ref="balanceTip" :orderDetail="orderDetail"></balance-tip> -->
 	</div>
 </template>

src/views/Forestage/Tourism/order-detail.vue

@@ -27,6 +27,11 @@
                 <div class="num special">{{ orderDetail.yield_money }}</div>
                 <div class="unit">USDT</div>
               </i>
+              <i class="item">
+                <div class="label">{{$t('other.text15')}}：</div>
+                <div class="num special">{{ userInfo.money }}</div>
+                <div class="unit">USDT</div>
+              </i>
             </div>
           </div>
         </div>
@@ -41,7 +46,8 @@ export default {
   name: 'order-sett',
   components: { Bounced },
   props: {
-    orderDetail: {}
+    orderDetail: {},
+    userInfo: {}
   },
   data () {
     return {

src/views/Forestage/Tourism/order-sett.vue

@@ -13,7 +13,7 @@
       </template>
     </Bounced>
 
-    <order-detail ref="orderDetail" :orderDetail="orderDetail"></order-detail>
+    <order-detail ref="orderDetail" :orderDetail="orderDetail" :userInfo="userInfo"></order-detail>
     <balance-tip ref="balanceTip" :orderDetail="orderDetail"></balance-tip>
   </div>
 </template>
@@ -27,7 +27,7 @@ export default {
   name: 'order-sett',
   components: { Bounced, OrderDetail, BalanceTip},
   props: {
-
+    userInfo: {}
   },
   data() {
     return {