国际化

Eservice/agent/billCanUseProduct/index.wxml

@@ -17,7 +17,7 @@
             {{language['商品编号']||'商品编号'}}:{{item.itemno}}
           </view>
           <view class="small">
-            {{language['商品型号']||'商品型号'}}:{{item.model}}
+            {{language['商品型号']||'商品型号'}}:{{language[item.model]||item.model}}
           </view>
         </view>
         <view class="avatar" slot="right-icon">

Eservice/saler/billCanUseProduct/index.wxml

@@ -16,7 +16,7 @@
             {{language['商品编号']||'商品编号'}}:{{item.itemno}}
           </view>
           <view class="small">
-            {{language['商品型号']||'商品型号'}}:{{item.model}}
+            {{language['商品型号']||'商品型号'}}:{{language[item.model]||item.model}}
           </view>
         </view>
         <view class="avatar" slot="right-icon">

Eservice/serviceMaterial/index.wxml

@@ -22,7 +22,7 @@
           {{language['商品编号']||'商品编号'}}:{{item.itemno}}
         </view>
         <view class="small">
-          {{language['商品型号']||'商品型号'}}:{{item.model}}
+          {{language['商品型号']||'商品型号'}}:{{language[item.model]||item.model}}
         </view>
       </view>
       <view class="avatar" slot="right-icon">

Eservice/workerLeader/billCanUseProduct/index.wxml

@@ -22,7 +22,7 @@
           {{language['商品编号']||'商品编号'}}:{{item.itemno}}
         </view>
         <view class="small">
-          {{language['商品型号']||'商品型号'}}:{{item.model}}
+          {{language['商品型号']||'商品型号'}}:{{language[item.model]||item.model}}
         </view>
       </view>
       <view class="avatar" slot="right-icon">

Universal/dataTeam/index.wxml

@@ -19,7 +19,7 @@
 			</view>
 			<view class="tags">
 				<van-tag wx:if="{{item.isleader}}" style="margin-right: 10rpx;" type="danger">负责人</van-tag>
-				<van-tag type="primary">{{item.position}}</van-tag>
+				<van-tag type="primary">{{language[item.position]||item.position}}</van-tag>
 			</view>
 		</view>
 		<view class="set" wx:if="{{isleader && item.isleader==0}}">

miniprogram_npm/tdesign-miniprogram/swipe-cell/swipe-cell.wxml

@@ -23,7 +23,7 @@
       <slot name="left" />
       <view
         wx:for="{{left}}"
-        class="{{classPrefix}}__content {{item.className}}"
+        class="{{classPrefix}}__content {{language[item.className]||item.className}}"
         style="{{item.style}}"
         wx:key="index"
         data-action="{{item}}"
@@ -42,7 +42,7 @@
       <slot name="right" />
       <view
         wx:for="{{right}}"
-        class="{{classPrefix}}__content {{item.className}}"
+        class="{{classPrefix}}__content {{language[item.className]||item.className}}"
         style="{{item.style}}"
         wx:key="index"
         data-action="{{item}}"

packageA/account/detail.wxml

@@ -36,10 +36,10 @@
 				{{language['产品编码']||'产品编码'}}：{{item.itemno}}
 			</view>
 			<view class="col">
-				{{language['型号']||'型号'}}：{{item.model}}
+				{{language['型号']||'型号'}}：{{language[item.model]||item.model}}
 			</view>
 			<view class="col">
-				{{language['规格']||'规格'}}：{{item.spec}}
+				{{language['规格']||'规格'}}：{{language[item.spec]||item.spec}}
 			</view>
 			<view class="col">
 				{{language['订单单价']||'订单单价'}}：{{item.showOrderprice}}

packageA/activity/detail.wxml

@@ -50,8 +50,8 @@
 					{{language['产品编号']||'产品编号'}}:{{item.itemno||' --'}}
 				</view>
 				<view class="subfield line-1">
-					<text style="margin-right: 15rpx;">{{language['型号']||'型号'}}:{{item.model||' --'}}</text>
-					<text>{{language['规格']||'规格'}}:{{item.spec||' --'}}</text>
+					<text style="margin-right: 15rpx;">{{language['型号']||'型号'}}:{{language[item.model]||item.model||' --'}}</text>
+					<text>{{language['规格']||'规格'}}:{{language[item.spec]||item.spec||' --'}}</text>
 				</view>
 				<view class="price line-1">
 					{{language['价格']||'价格'}}：<text class="num">￥{{item.gradeprice || item.price}}元</text><text wx:if="{{item.gradeprice<item.oldprice ||item.price<item.oldprice}}" style="text-decoration:line-through; color:#999;">/{{item.oldprice+language['元']||'元'}}</text>

packageA/activity/modules/list/index.wxml

@@ -12,7 +12,7 @@
 			<view wx:if="{{item.type}}" style="background: #FA8C16;">
 				{{language[item.type]||item.type}}
 			</view>
-			<view wx:if="{{item.brandname}}" style="background: #FA8C16;">
+			<view wx:if="{{language[item.brandName]||item.brandName}}" style="background: #FA8C16;">
 				{{language[item.brandname]||item.brandname}}
 			</view>
 			<view wx:if="{{item.tradefield}}" style="background: #FA8C16;">

packageA/borrow/modules/product/list/index.wxml

@@ -16,12 +16,12 @@
 					{{language['编号']||'编号'}}:{{item.itemno}}
 				</view>
 				<view class="subfield">
-					<text class="line-1" style="margin-right: 6rpx;">{{language['型号']||'型号'}}：{{item.model||' --'}}</text>
-					<text class="line-1">{{language['规格']||'规格'}}：{{item.spec||' --'}}</text>
+					<text class="line-1" style="margin-right: 6rpx;">{{language['型号']||'型号'}}：{{language[item.model]||item.model||' --'}}</text>
+					<text class="line-1">{{language['规格']||'规格'}}：{{language[item.spec]||item.spec||' --'}}</text>
 				</view>
 				<view class="subfield">
-					<text class="line-1" style="margin-right: 6rpx;">{{language['材质']||'材质'}}：{{item.material||' --'}}</text>
-					<text class="line-1">{{language['标准']||'标准'}}：{{item.standards||' --'}}</text>
+					<text class="line-1" style="margin-right: 6rpx;">{{language['材质']||'材质'}}：{{language[item.material]||item.material||' --'}}</text>
+					<text class="line-1">{{language['标准']||'标准'}}：{{language[item.standards]||item.standards||' --'}}</text>
 				</view>
 				<view class="subfield">
 					<text class="line-1" style="margin-right: 6rpx;">{{language['已发数量']||'已发数量'}}：{{item.deliedqty||' --'}}</text>

packageA/invoice/modules/detailLine/list/index.wxml

@@ -19,8 +19,8 @@
                     {{language['可开票金额']||'可开票金额'}}：{{item.uninvoiceamount}}{{language['元']||'元'}}
                 </view>
                 <view class="subfield">
-                    <text class="line-1" style="margin-right: 6rpx;">{{language['型号']||'型号'}}：{{item.model||' --'}}</text>
-                    <text class="line-1">{{language['规格']||'规格'}}：{{item.spec||' --'}}</text>
+                    <text class="line-1" style="margin-right: 6rpx;">{{language['型号']||'型号'}}：{{language[item.model]||item.model||' --'}}</text>
+                    <text class="line-1">{{language['规格']||'规格'}}：{{language[item.spec]||item.spec||' --'}}</text>
                 </view>
             </view>
             <view wx:if="{{!disabled}}" class="delete" data-item="{{item}}" catchtap="deleteProduct">

packageA/market/detail.wxml

@@ -38,7 +38,7 @@
     {{language['选择商品']||'选择商品'}}
   </view>
   <view class="product-box">
-    <navigator url="#" class="product {{itemno===item.itemno?'active':''}}" wx:for="{{rows}}" wx:key="itemno" bindtap="changeItemno" data-item="{{item}}">{{item.spec}}</navigator>
+    <navigator url="#" class="product {{itemno===item.itemno?'active':''}}" wx:for="{{rows}}" wx:key="itemno" bindtap="changeItemno" data-item="{{item}}">{{language[item.spec]||item.spec}}</navigator>
   </view>
 </view>
 <van-tabs custom-class='tabs' title-active-color='var(--assist)' color='var(--assist)'>

packageA/orderForm/modules/list/index.wxml

@@ -2,7 +2,7 @@
     <view class="top">
         <view class="tags">
             <text wx:if="{{item.type}}">{{language[item.type]||item.type}}</text>
-            <text wx:if="{{item.brandname}}">{{language[item.brandname]||item.brandname}}</text>
+            <text wx:if="{{language[item.brandName]||item.brandName}}">{{language[item.brandname]||item.brandname}}</text>
             <text wx:if="{{item.tradefield}}">{{language[item.tradefield]||item.tradefield}}</text>
         </view>
         <view class="statu" style="color: {{set.color(item.status)}};">

packageA/orderForm/modules/product/list/index.wxml

@@ -16,12 +16,12 @@
                     {{language['编号']||'编号'}}:{{item.itemno}}
                 </view>
                 <view class="subfield">
-                    <text class="line-1" style="margin-right: 6rpx;">{{language['型号']||'型号'}}：{{item.model||' --'}}</text>
-                    <text class="line-1">{{language['规格']||'规格'}}：{{item.spec||' --'}}</text>
+                    <text class="line-1" style="margin-right: 6rpx;">{{language['型号']||'型号'}}：{{language[item.model]||item.model||' --'}}</text>
+                    <text class="line-1">{{language['规格']||'规格'}}：{{language[item.spec]||item.spec||' --'}}</text>
                 </view>
                 <view class="subfield">
-                    <text class="line-1" style="margin-right: 6rpx;">{{language['材质']||'材质'}}：{{item.material||' --'}}</text>
-                    <text class="line-1">{{language['标准']||'标准'}}：{{item.standards||' --'}}</text>
+                    <text class="line-1" style="margin-right: 6rpx;">{{language['材质']||'材质'}}：{{language[item.material]||item.material||' --'}}</text>
+                    <text class="line-1">{{language['标准']||'标准'}}：{{language[item.standards]||item.standards||' --'}}</text>
                 </view>
                 <view class="subfield">
                     <text class="line-1" style="margin-right: 6rpx;">{{language['已发数量']||'已发数量'}}：{{item.deliedqty||' --'}}</text>

packageA/remitVoucher/detail.js

@@ -87,7 +87,7 @@ Page({
 				value: data.billno
 			}, {
 				label: "状态",
-				value: data.status
+				value: getApp().globalData.Language.getMapText(data.status)
 			}, {
 				label: "经销商编号",
 				value: data.agentnum

packageA/returnOne/detail.js

@@ -80,7 +80,7 @@ Page({
         value: data.billdate
       }, {
         label: "状态",
-        value: data.status
+        value: getApp().globalData.Language.getMapText(data.status)
       }, {
         label: '来源单号',
         value: data.sonum

packageA/shipment/detail.js

@@ -53,7 +53,7 @@ Page({
                 value: data.logisticno
             }, {
                 label: "状态",
-                value: data.status == '审核' ? '待收货' : '已收货'
+                value: data.status == '审核' ? getApp().globalData.Language.getMapText('待收货') : getApp().globalData.Language.getMapText('已收货')
             }, {
                 label: "收货人",
                 value: data.name

packageA/shopping/modules/standard/index.wxml

@@ -12,8 +12,8 @@
                 <text class="iconfont icon-guanlian-shanchu" catchtap="deteleItem" data-item="{{item}}" />
             </view>
             <view class="exp">{{language['编号']||'编号'}}：{{item.itemno}}</view>
-            <view class="exp">{{language['规格']||'规格'}}：{{item.spec}}</view>
-            <view class="exp">{{language['型号']||'型号'}}：{{item.model}}</view>
+            <view class="exp">{{language['规格']||'规格'}}：{{language[item.spec]||item.spec}}</view>
+            <view class="exp">{{language['型号']||'型号'}}：{{language[item.model]||item.model}}</view>
             <view class="exp">{{language['品牌']||'品牌'}}：{{language[item.brandname]||item.brandname}}</view>
             <view class="exp">{{language['领域']||'领域'}}：{{item.tradefield_shoppingcart}}</view>
             <view class="exp"><text style="font-size: 24rpx;font-weight: 600;color: #FF3B30;">{{item.showPrice}}</text></view><!-- /<text style="font-size: 20rpx;">￥{{item.oldprice}}</text> -->

packageA/shopping/modules/tool/index.wxml

@@ -12,9 +12,9 @@
                 <text class="iconfont icon-guanlian-shanchu" catchtap="deteleItem" data-item="{{item}}" />
             </view>
             <view class="exp">{{language['编号']||'编号'}}：{{item.itemno}}</view>
-            <view class="exp">{{language['规格']||'规格'}}：{{item.spec}}</view>
-            <view class="exp">{{language['型号']||'型号'}}：{{item.model}}</view>
-            <view class="exp">{{language['品牌']||'品牌'}}：{{item.brandname||" --"}}</view>
+            <view class="exp">{{language['规格']||'规格'}}：{{language[item.spec]||item.spec}}</view>
+            <view class="exp">{{language['型号']||'型号'}}：{{language[item.model]||item.model}}</view>
+            <view class="exp">{{language['品牌']||'品牌'}}：{{language[item.brandName]||item.brandName||" --"}}</view>
             <view class="exp">{{language['领域']||'领域'}}：<text wx:for="{{language[item.tradefield]||item.tradefield}}" wx:key="index" wx:for-item="it">{{it.tradefield}}</text></view>
             <view class="exp"><text style="font-size: 24rpx;font-weight: 600;color: #FF3B30;">{{item.showPrice}}</text></view><!-- /<text style="font-size: 20rpx;">￥{{item.oldprice}}</text> -->
         </view>

packageA/tool/modules/list/index.wxml

@@ -12,7 +12,7 @@
     </view>
     <view class="right-box">
         <view class="title line-1">{{item.itemname||'--'}}</view>
-        <view class="type line-1">{{language['型号']||'型号'}}：{{item.model||'--'}} <text style="margin-left: 16rpx;">{{language['规格']||'规格'}}：{{item.spec||'--'}}</text></view>
+        <view class="type line-1">{{language['型号']||'型号'}}：{{language[item.model]||item.model||'--'}} <text style="margin-left: 16rpx;">{{language['规格']||'规格'}}：{{language[item.spec]||item.spec||'--'}}</text></view>
         <view class="tags">
             <view style="background: #FA8C16;">
                 {{language[item.brandname]||item.brandname}}
@@ -23,7 +23,7 @@
         </view>
         <view class="price">
             <view>
-                ￥ {{item.marketprice}}/{{item.unitname}}
+                ￥ {{item.marketprice}}/{{language[item.unitname]||item.unitname}}
             </view>
         </view>
         <block wx:if="{{userrole!='业务员'}}">

packageA/toolBill/detail.js

@@ -85,7 +85,7 @@ Page({
 					value: data.billdate
 				}, {
 					label: "状态",
-					value: data.status
+					value: getApp().globalData.Language.getMapText(data.status)
 				},
 				{
 					label: '是否实物返回',

packageA/toolBill/modules/selectProduct/index.wxml

@@ -27,7 +27,7 @@
         </view>
         <view class="bot">
             <text>{{language['订单']||'订单'}}:{{item.sonum||' --'}}</text>
-            <text>{{language['型号']||'型号'}}:{{item.model||' --'}}</text>
+            <text>{{language['型号']||'型号'}}:{{language[item.model]||item.model||' --'}}</text>
         </view>
     </navigator>
     <view wx:if="{{!radio}}" style="height: 130rpx;" />

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

@@ -16,12 +16,12 @@
 					{{language['编号']||'编号'}}:{{item.itemno}}
 				</view>
 				<view class="subfield">
-					<text class="line-1" style="margin-right: 6rpx;">{{language['型号']||'型号'}}：{{item.model||' --'}}</text>
-					<text class="line-1">{{language['规格']||'规格'}}：{{item.spec||' --'}}</text>
+					<text class="line-1" style="margin-right: 6rpx;">{{language['型号']||'型号'}}：{{language[item.model]||item.model||' --'}}</text>
+					<text class="line-1">{{language['规格']||'规格'}}：{{language[item.spec]||item.spec||' --'}}</text>
 				</view>
 				<view class="subfield">
-					<text class="line-1" style="margin-right: 6rpx;">{{language['材质']||'材质'}}：{{item.material||' --'}}</text>
-					<text class="line-1">{{language['标准']||'标准'}}：{{item.standards||' --'}}</text>
+					<text class="line-1" style="margin-right: 6rpx;">{{language['材质']||'材质'}}：{{language[item.material]||item.material||' --'}}</text>
+					<text class="line-1">{{language['标准']||'标准'}}：{{language[item.standards]||item.standards||' --'}}</text>
 				</view>
 				<view class="subfield">
 					<text class="line-1" style="margin-right: 6rpx;">{{language['起订数量']||'起订数量'}}：{{item.orderminqty||' --'}}</text>
@@ -45,7 +45,7 @@
 		</view>
 		<view class="row">
 			<view>
-				<view class="label">{{language['数量']||'数量'}}<text wx:if="{{item.unitname}}">({{item.unitname}})</text>：</view>
+				<view class="label">{{language['数量']||'数量'}}<text wx:if="{{language[item.unitname]||item.unitname}}">({{language[item.unitname]||item.unitname}})</text>：</view>
 				<input disabled='{{disabled}}' bindtap="isEdit" class="input" style="width: 240rpx;" type="digit" value="{{item.qty}}" data-name="qty" data-data="{{item}}" bindblur="onBlur" />
 			</view>
 			<view class="money">

pages/login/modules/login.js

@@ -63,7 +63,10 @@ function init() {
             list[3].data = list[3].data.filter(v => v.templetid != '99')
             list[3].data.unshift(data)
         }
-        wx.setStorageSync('templetList', list[3].data)
+        wx.setStorageSync('templetList', list[3].data.map(v => {
+            v.templetname = getApp().globalData.Language.getMapText(v.templetname)
+            return v
+        }))
         let pages = getCurrentPages();
         let prevPage = pages[pages.length - 2];
         if (prevPage && prevPage.__route__ == 'pages/tabbar/home/index') prevPage.refreshData();

pages/tabbar/home/index.js

@@ -34,7 +34,10 @@ Page({
                 res.data = res.data.filter(v => v.templetname != '站点全部')
                 res.data.unshift(data)
             }
-            wx.setStorageSync('templetList', res.data)
+            wx.setStorageSync('templetList', res.data.map(v => {
+                v.templetname = getApp().globalData.Language.getMapText(v.templetname)
+                return v
+            }))
         });
         isHistory();
         isRemindChangePassword();

pages/teams/index.wxml

@@ -12,7 +12,7 @@
             <view class="details">
                 <view class="user-name">
                     <view class="line-1">{{item.name}}</view>
-                    <view class="position">{{item.position}}</view>
+                    <view class="position">{{language[item.position]||item.position}}</view>
                     <view class="icon">
                         <text class="iconfont icon-a-wodetiaozhuan" />
                     </view>

select/activity/index.wxml

@@ -20,7 +20,7 @@
 				<view wx:if="{{item.type}}" style="background: #FA8C16;">
 					{{language[item.type]||item.type}}
 				</view>
-				<view wx:if="{{item.brandname}}" style="background: #FA8C16;">
+				<view wx:if="{{language[item.brandName]||item.brandName}}" style="background: #FA8C16;">
 					{{language[item.brandname]||item.brandname}}
 				</view>
 				<view wx:if="{{item.tradefield}}" style="background: #FA8C16;">

select/contacts/index.wxml

@@ -18,8 +18,8 @@
                     {{item[showName]}}
                 </view>
                 <view class="tags">
-                    <van-tag wx:if="{{item.position}}" style="margin-right: 8rpx;" type="primary">{{item.position}}</van-tag>
-                    <van-tag type="primary">{{item.depname}}</van-tag>
+                    <van-tag wx:if="{{language[item.position]||item.position}}" style="margin-right: 8rpx;" type="primary">{{language[item.position]||item.position}}</van-tag>
+                    <van-tag type="primary">{{language[item.depname]||item.depname}}</van-tag>
                 </view>
             </view>
             <view class="set" wx:if="{{!radio}}">

select/orderFormLine/index.wxml

@@ -32,8 +32,8 @@
 			</view>
 		</view>
 		<view class="bot">
-			<text>{{language['型号']||'型号'}}:{{item.model ||' --'}}</text>
-			<text>{{language['规格']||'规格'}}:{{item.spec ||' --'}}</text>
+			<text>{{language['型号']||'型号'}}:{{language[item.model]||item.model ||' --'}}</text>
+			<text>{{language['规格']||'规格'}}:{{language[item.spec]||item.spec ||' --'}}</text>
 		</view>
 	</navigator>
 	<view wx:if="{{!radio}}" style="height: 130rpx;" />

select/product/index.wxml

@@ -36,8 +36,8 @@
             </view>
         </view>
         <view class="bot">
-            <text style="padding-left:0;" class="line-1">{{language['型号']||'型号'}}:{{item.model||' --'}}</text>
-            <text class="line-1">{{language['规格']||'规格'}}:{{item.spec||' --'}}</text>
+            <text style="padding-left:0;" class="line-1">{{language['型号']||'型号'}}:{{language[item.model]||item.model||' --'}}</text>
+            <text class="line-1">{{language['规格']||'规格'}}:{{language[item.spec]||item.spec||' --'}}</text>
         </view>
     </navigator>
     <view wx:if="{{!radio}}" style="height: 130rpx;" />