国际化适配

components/Yl_Attachment/index.js

@@ -14,6 +14,11 @@ Component({
 			type: Boolean
 		}
 	},
+	lifetimes: {
+		attached: function () {
+			getApp().globalData.Language.getLanguagePackage(this)
+		}
+	},
 	data: {
 		content: {
 			nocache: true,

components/Yl_Attachment/index.wxml

@@ -1,6 +1,6 @@
 <view class="head">
 	<view class="count">
-		总共{{content.total}}个
+		{{language['总共']||'总共'}} {{content.total}} {{language['个']||'个'}}
 	</view>
 	<view class="expand" wx:if="{{!disabled}}">
 		<Yl_Upload accept='media' bind:uploadCallback='addFiles'>

packageA/account/index.js

@@ -35,7 +35,7 @@ Page({
                     accountList: res.data.map(v => {
                         v.balance = CNY(v.balance)
                         v.expectedReward = CNY(v.expectedReward)
-                        v.accountname = v.hraccountname
+                        v.accountname = getApp().globalData.Language.getMapText(v.hraccountname)
                         return v
                     })
                 });

packageA/account/index.wxml

@@ -17,10 +17,10 @@
     <swiper-item wx:for="{{accountList}}" wx:key="name">
         <view class="upper">
             <view class="name">
-                {{item.accountname}}({{language['元']||'元'}})
+                {{language[item.accountname]||item.accountname}}({{language['元']||'元'}})
             </view>
             <view class="price">
-                {{item.balance}}
+                {{language[item.balance]||item.balance}}
             </view>
         </view>
         <view class="lower" wx:if="{{item.hraccountname}}">
@@ -57,12 +57,12 @@
 
 <view hover-class="navigator-hover" class="record" wx:for="{{recordList}}" wx:key="sa_accountclassid" data-item="{{item}}" bind:tap="toDetail">
     <view class="content">
-        <view class="title">{{language[item.type==0?'支出':'收入']||item.type==0?'支出':'收入'}}{{item.source?'-'+item.source:""}}</view>
+        <view class="title">{{item.type==0?language['支出']||'支出':language['收入']||'收入'}}{{item.source?'-'+language[item.source]||item.source:""}}</view>
         <view class="exp">{{language['凭证单号']||'凭证单号'}}：{{item.billno || ' --'}}</view>
-        <view class="exp">{{language['备注']||'备注'}}：{{item.showRemarks || ' --'}}</view>
+        <view class="exp">{{language['备注']||'备注'}}：{{language[item.showRemarks]||item.showRemarks || ' --'}}</view>
     </view>
     <view class="price" style="color:{{item.balance>=0?'#DB0D27':'var(--success)'}} ;">
-        {{item. amount}}
+        {{item.amount}}
     </view>
 </view>
 

packageA/invoice/detail.js

@@ -65,7 +65,7 @@ Page({
             value: CNY(item.quota)
         }, {
             label: "是否手工单",
-            value: item.byhand ? language['是'] || '是' : language['否'] || '否'
+            value: item.byhand ? getApp().globalData.Language.getMapText('是') : getApp().globalData.Language.getMapText('否')
         }, {
             label: "发票种类",
             value: item.invoiceline

packageA/market/index.js

@@ -28,6 +28,7 @@ Page({
 		this.getNum();
 		this.getTradefie();
 		this.getOptionTypeSelect();
+		getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
 	},
 	/* 业务员选择角色 */
 	selsectedRole(e) {

packageA/market/selected/index.js

@@ -16,6 +16,7 @@ Page({
   },
   onLoad(options) {
     this.getList();
+    getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
   },
   tabChange(e) {
     this.data.content.where.type = e.detail.name == '客户' ? 7 : 5;

packageA/market/selected/index.wxml

@@ -4,7 +4,7 @@
 </van-tabs>
 <van-search class="search" value="{{ content.where.condition }}" shape="round" placeholder="{{language['关键字']||'请输入搜索关键词'}}" bind:search='startSearch' bind:clear='onClear' />
 <Yl_ListBox id='ListBox' bind:getlist='getList'>
-    <view class="total">{{language['总共']||'共'}}{{content.total}}{{language['个']||'个'}}</view>
+    <view class="total">{{language['总共']||'共'}} {{content.total}} {{language['个']||'个'}}</view>
     <navigator class="setclient-list-item" url="#" wx:for="{{list}}" wx:key="sys_enterpriseid" data-item="{{item}}" bindtap="changeResult">
         <view class="con">
             <view class="portrait {{item.enterprisename <=2?'min-portrait':''}}">

packageA/orderForm/detail.wxml

@@ -12,12 +12,12 @@
 	</view>
 	<view class="exp" wx:if="{{userrole!='经销商'}}">{{language['企业']||'企业'}}：{{detail.enterprisename || ' --'}}</view>
 	<view class="exp" wx:if="{{detail.type=='项目订单'}}">{{language['关联项目']||'关联项目'}}：{{detail.projectname || language['暂无']||'暂无'}}</view>
-	<view class="exp">{{language['订单类型']||'订单类型'}}：{{detail.type}}</view>
+	<view class="exp">{{language['订单类型']||'订单类型'}}：{{language[detail.type]||detail.type}}</view>
 	<view class="exp">{{language['订单状态']||'订单状态'}}：{{language[detail.status]||detail.status}}</view>
 	<view class="exp">{{language['单据日期']||'单据日期'}}：{{detail.billdate || language['暂无']||'暂无'}}</view>
 	<view class="exp">{{language['创建日期']||'创建日期'}}：{{detail.createdate}}</view>
-	<view class="exp">{{language['核销状态']||'核销状态'}}：{{detail.writeoffstatus}}</view>
-	<view class="exp">{{language['开票状态']||'开票状态'}}：{{detail.invoicestatus}}</view>
+	<view class="exp">{{language['核销状态']||'核销状态'}}：{{language[detail.writeoffstatus]||detail.writeoffstatus}}</view>
+	<view class="exp">{{language['开票状态']||'开票状态'}}：{{language[detail.invoicestatus]||detail.invoicestatus}}</view>
 	<van-button custom-class='copy' bindtap="copyItem">{{language['一键复制订单']||'一键复制订单'}}</van-button>
 </view>
 
@@ -61,7 +61,7 @@
 	<view class="row">
 		<view class="label">{{language['支付账户']||'支付账户'}}</view>
 		<view style="font-size: 28rpx; text-align: right;">
-			{{account.name}}
+			{{language[account.name]||account.name}}
 			<text style="font-size: 22rpx;">{{account.text}}</text>
 		</view>
 	</view>
@@ -77,7 +77,7 @@
 				<input disabled="{{detail.status!='新建'}}" bindtap="isEdit" type="digit" class="remarks" placeholder-class='placeholder' value="{{detail.rebateamount}}" placeholder="{{language['使用金额']||'使用金额'}}" bindblur="setRebate_amount" />
 			</view>
 			<view class="row">
-				<view class="label" style="font-size: 28rpx;">{{language['支付合计']||'支付合计'}}：{{detail.amount}}（{{detail.accountclass.accountname}}）+ {{detail.rebateamount}}（{{language['返利金']||'返利金'}}）</view>
+				<view class="label" style="font-size: 28rpx;">{{language['支付合计']||'支付合计'}}：{{detail.amount}}（{{language[detail.accountclass.accountname]||detail.accountclass.accountname}}）+ {{detail.rebateamount}}（{{language['返利金']||'返利金'}}）</view>
 			</view>
 		</block>
 	</block>

packageA/orderForm/index.wxml

@@ -11,7 +11,7 @@
     <van-tab name="关闭" title="{{language['关闭']||'关闭'}}" />
 </van-tabs>
 <view class="tips">
-    {{language['共计']||'共计'}}{{content.total}}{{language['单，合计']||'单，合计'}}{{amount}}{{language['元']||'元'}}
+    {{language['共计']||'共计'}} {{content.total}} {{language['单，合计']||'单，合计'}} {{amount}} {{language['元']||'元'}}
 </view>
 <Yl_ListBox id='ListBox' bind:getlist='getList'>
     <List list="{{list}}" userrole="{{userrole}}" />

packageA/orderForm/modules/progress/index.wxml

@@ -4,8 +4,8 @@
         <view class="time">
             {{item.actiondate}}
         </view>
-        <view class="label">{{item.actionby}} <text style="color: var(--success);">{{item.action + item.type}}</text> </view>
-        <view class="content">{{item.remarks}}</view>
+        <view class="label">{{item.actionby}} <text style="color: var(--success);">{{(language[item.action]||item.action) + (language[item.type]||item.type)}}</text> </view>
+        <view class="content">{{language[item.remarks]||item.remarks}}</view>
     </navigator>
 </view>
 <block wx:if="{{list.length==0}}">

packageA/returnOne/detail.js

@@ -89,7 +89,7 @@ Page({
         value: data.rebate_userate + '%'
       }, {
         label: '是否实物返回',
-        value: data.isitemreturn ? language['是'] || '是' : language['否'] || '否'
+        value: data.isitemreturn ? getApp().globalData.Language.getMapText('是')  : getApp().globalData.Language.getMapText('否') 
       }, {
         label: '定金账户',
         value: data.accountname

packageA/shipment/detail.js

@@ -23,6 +23,7 @@ Page({
             sa_logisticsid: options.id
         });
         this.getDetail(true);
+        getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
     },
     /* 获取详情 */
     getDetail(init = false, show = true) {

packageA/target/index.js

@@ -95,7 +95,12 @@ Page({
         icon: "none"
       })
       this.setData({
-        list: res.data,
+        list: res.data.map(v => {
+          return {
+            name: getApp().globalData.Language.getMapText(v.tradefield),
+            tradefield: v.tradefield
+          }
+        }),
         tradefieldIndex: 0
       })
       this.setShowData();

packageA/target/index.wxml

@@ -1,7 +1,7 @@
 <!-- 过滤 -->
 <view class="filtrate">
-    <picker bindchange="bindTradefieldChange" value="{{tradefieldIndex}}" range-key='tradefield' range="{{list}}">
-        <view class="picker">{{list[tradefieldIndex].tradefield}}<text class="iconfont icon-daoruxialajiantou" /></view>
+    <picker bindchange="bindTradefieldChange" value="{{tradefieldIndex}}" range-key='name' range="{{list}}">
+        <view class="picker">{{list[tradefieldIndex].name}}<text class="iconfont icon-daoruxialajiantou" /></view>
     </picker>
     <view catchtap="openActions">
         {{language[actionSheet]||actionSheet}}<text class="iconfont icon-daoruxialajiantou" />

packageA/toolBill/detail.js

@@ -89,7 +89,7 @@ Page({
 				},
 				{
 					label: '是否实物返回',
-					value: data.isitemreturn ? language['是'] || '是' : language['否'] || '否'
+					value: data.isitemreturn ? getApp().globalData.Language.getMapText('是') : getApp().globalData.Language.getMapText('否')
 				}, {
 					label: "提交日期",
 					value: data.submitdate

packageA/toolBill/detail.wxml

@@ -5,7 +5,7 @@
 	<view class="num">
 		{{detail.billno}}
 	</view>
-	<view class="exp">{{language['状态']||'状态'}}：{{detail.status || '--'}}</view>
+	<view class="exp">{{language['状态']||'状态'}}：{{language[detail.status]||detail.status || '--'}}</view>
 	<view class="exp">{{language['单据日期']||'单据日期'}}：{{detail.billdate || '--'}}</view>
 	<view class="exp">{{language['来源单号']||'来源单号'}}：{{detail.sonum || '--'}}</view>
 	<view class="exp">{{language['是否实物返回']||'是否实物返回'}}：{{detail.isitemreturn ? language['是']||'是' : language['否']|| '否'}}</view>

packageA/toolBill/modules/selectProduct/index.wxml

@@ -1,5 +1,5 @@
 <van-search class="search" value="{{ params.content.where.condition }}" shape="round" placeholder="{{language['关键字']||'请输入搜索关键词'}}" bind:search='startSearch' bind:clear='onClear' />
-<view class="total">{{language['']||''}}共{{params.content.total}}{{language['']||''}}个</view>
+<view class="total">{{language['共']||'共'}} {{params.content.total}} {{language['个']||'个'}}</view>
 
 <Yl_ListBox id='ListBox' bind:getlist='getList'>
     <navigator class="setclient-list-item" url="#" wx:for="{{list}}" wx:key="itemno" data-id="{{item[idname]}}" bindtap="changeResult">

packageA/toolBill/modules/toolDetail/list/index.js

@@ -16,6 +16,11 @@ Component({
 	options: {
 		addGlobalClass: true
 	},
+	lifetimes: {
+		attached: function () {
+			getApp().globalData.Language.getLanguagePackage(this)
+		}
+	},
 	methods: {
 		toProductDetail(e) {
 			const {

select/product/index.wxml

@@ -28,10 +28,10 @@
                 </view>
                 <view class="subfield line-1">
                     <text>{{language['品牌']||'品牌'}}:{{language[item.brandname]||item.brandname}}</text>
-                    {{language['领域']||'领域'}}:{{item.tradefields}}
+                    {{language['领域']||'领域'}}:{{language[item.tradefields]||item.tradefields}}
                 </view>
                 <view class="price line-1">
-                    {{language['价格']||'价格'}}：<text class="num">{{item.newPrice}}元</text><text wx:if="{{item.oldPrice}}" style="text-decoration:line-through; color:#999;">/{{item.oldPrice}}</text>
+                    {{language['价格']||'价格'}}：<text class="num">{{item.newPrice}}{{language['元']||'元'}}</text><text wx:if="{{item.oldPrice}}" style="text-decoration:line-through; color:#999;">/{{item.oldPrice}}</text>
                 </view>
             </view>
         </view>