소스 검색

多语言适配

xiaohaizhao 1 년 전
부모
커밋
7b78ad90bd

+ 5 - 0
components/Yl_Filtrate1/index.js

@@ -77,6 +77,11 @@ Component({
             }));
         }
     },
+    lifetimes: {
+        attached() {
+            getApp().globalData.Language.getLanguagePackage(this)
+        }
+    },
     methods: {
         /* 选择 */
         onSelect(e) {

+ 13 - 13
components/Yl_Filtrate1/index.wxml

@@ -1,55 +1,55 @@
 <van-popup show="{{ show }}" position="right" custom-style="width: 660rpx; height:100vh;" z-index="{{zIndex}}" bind:close="onClose">
     <view class="head" />
-    <Yl_ListBox height="{{listHeight}}" pullDown='{{false}}'>
+    <Yl_ListBox automatic='{{false}}' height="{{listHeight}}" pullDown='{{false}}'>
         <slot name='head' />
         <block wx:for="{{list}}" wx:key="label">
             <MultilevelClass id="MultilevelClass" item='{{item}}' wx:if="{{item.type=='multilevelClass'}}" />
             <view wx:elif="{{item.list.length}}" class="groud">
                 <view class="label">
-                    {{item.label}}
+                    {{language[item.label]||item.label}}
                 </view>
                 <view class="content" wx:if="{{item.type!='checkbox'}}">
-                    <van-button custom-class='but {{item.index==i?"active":""}}' wx:for="{{item.list}}" wx:for-item="data" wx:for-index="i" wx:key="i" data-item="{{data}}" data-index="{{index}}" data-i="{{i}}" bindtap="onSelect">{{data[item.showName]}}</van-button>
+                    <van-button custom-class='but {{item.index==i?"active":""}}' wx:for="{{item.list}}" wx:for-item="data" wx:for-index="i" wx:key="i" data-item="{{data}}" data-index="{{index}}" data-i="{{i}}" bindtap="onSelect">{{language[data[item.showName]]||data[item.showName]}}</van-button>
                 </view>
                 <view wx:else class="content">
-                    <van-button custom-class='but {{per.query(item.index,i)?"active":""}}' wx:for="{{item.list}}" wx:for-item="data" wx:for-index="i" wx:key="i" data-item="{{data}}" data-index="{{index}}" data-i="{{i}}" bindtap="onSelectCheckbox">{{data[item.showName]}}</van-button>
+                    <van-button custom-class='but {{per.query(item.index,i)?"active":""}}' wx:for="{{item.list}}" wx:for-item="data" wx:for-index="i" wx:key="i" data-item="{{data}}" data-index="{{index}}" data-i="{{i}}" bindtap="onSelectCheckbox">{{language[data[item.showName]]||data[item.showName]}}</van-button>
                 </view>
             </view>
         </block>
         <view wx:if="{{dateRange}}" class="groud">
             <view class="label">
-                {{dateRangeName}}
+                {{language[dateRangeName]||dateRangeName}}
             </view>
             <view class="content time">
                 <picker mode="date" bindchange='changeDate' data-name="startdate">
-                    <view class="tbox">{{startdate||'开始日期'}}</view>
+                    <view class="tbox">{{startdate||language['开始日期']||"开始日期"}}</view>
                 </picker>
                 <view class="partition">-</view>
                 <picker mode="date" bindchange='changeDate' data-name="enddate">
-                    <view class="tbox">{{enddate||"结束日期"}}</view>
+                    <view class="tbox">{{enddate||language['结束日期']||"结束日期"}}</view>
                 </picker>
             </view>
         </view>
         <view wx:if="{{dateRange1}}" class="groud">
             <view class="label">
-                预测时间
+                {{language['预测时间']||"预测时间"}}
             </view>
             <view class="content time">
                 <picker mode="date" bindchange='changeDate' data-name="periodstart">
-                    <view class="tbox">{{periodstart||'开始日期'}}</view>
+                    <view class="tbox">{{periodstart||language['开始日期']||"开始日期"}}</view>
                 </picker>
                 <view class="partition">-</view>
                 <picker mode="date" bindchange='changeDate' data-name="periodend">
-                    <view class="tbox">{{periodend||"结束日期"}}</view>
+                    <view class="tbox">{{periodend||language['结束日期']||"结束日期"}}</view>
                 </picker>
             </view>
         </view>
         <slot />
     </Yl_ListBox>
     <view class="footer" bindtap="onClick">
-        <van-button data-name="close" custom-class='v-but'>关闭</van-button>
-        <van-button wx:if="{{isReset}}" data-name="reset" custom-class='v-but'>重置</van-button>
-        <van-button data-name="confirm" custom-class='v-but confirm'>确定</van-button>
+        <van-button data-name="close" custom-class='v-but'>{{language['关闭']||'关闭'}}</van-button>
+        <van-button wx:if="{{isReset}}" data-name="reset" custom-class='v-but'>{{language['重置']||'重置'}}</van-button>
+        <van-button data-name="confirm" custom-class='v-but confirm'>{{language['确定']||'确定'}}</van-button>
     </view>
 </van-popup>
 

+ 4 - 0
components/Yl_filtrate/index.js

@@ -14,6 +14,10 @@ Component({
         },
     },
     lifetimes: {
+        attached() {
+            getApp().globalData.Language.getLanguagePackage(this)
+            console.log("组件111111",this.data.language)
+        },
         ready() {
             getHeight.getHeight('.head', this).then(res => this.setData({
                 listHeight: res - 80

+ 4 - 4
components/Yl_filtrate/index.wxml

@@ -1,11 +1,11 @@
 <van-popup show="{{ show }}" position="right" custom-style="width: 660rpx; height:100vh;" z-index="{{zIndex}}" bind:close="onClose">
 	<view class="head" />
-	<Yl_ListBox height="{{listHeight}}" pullDown='{{false}}'>
+	<Yl_ListBox automatic='{{false}}' height="{{listHeight}}" pullDown='{{false}}'>
 		<slot />
 	</Yl_ListBox>
 	<view class="footer" bindtap="onClick">
-		<van-button data-name="close" custom-class='v-but'>关闭</van-button>
-		<van-button data-name="reset" custom-class='v-but'>重置</van-button>
-		<van-button data-name="confirm" custom-class='v-but confirm'>确定</van-button>
+		<van-button data-name="close" custom-class='v-but'>{{language['关闭']||'关闭'}}</van-button>
+		<van-button data-name="reset" custom-class='v-but'>{{language['重置']||'重置'}}</van-button>
+		<van-button data-name="confirm" custom-class='v-but confirm'>{{language['确定']||'确定'}}</van-button>
 	</view>
 </van-popup>

+ 1 - 1
components/Yl_nav/index.wxml

@@ -11,7 +11,7 @@
 </view>
 
 <van-transition show="{{ startUsing }}" custom-class="block">
-    <van-search custom-class='Yl_search' value="{{ condition }}" bindfocus='onFocus' bind:blur='onBlur' shape="round" placeholder="{{language['关键']||'请输入搜索关键词'}}" bind:search='startSearch' bind:clear='endSearch' />
+    <van-search custom-class='Yl_search' value="{{ condition }}" bindfocus='onFocus' bind:blur='onBlur' shape="round" placeholder="{{language['关键']||'请输入搜索关键词'}}" bind:search='startSearch' bind:clear='endSearch' />
     <view class="Yl_history" wx:if="{{record}}">
         <view class="label" wx:if="{{showHistory && history.length}}">
             <text>{{language['搜索历史记录']||'最近搜索记录'}}</text>

+ 0 - 20
packageA/work/index.js

@@ -94,23 +94,6 @@ Page({
             url: './add'
         })
     },
-    /* 筛选状态选择 */
-    selectStatus(e) {
-        const {
-            item
-        } = e.currentTarget.dataset;
-        this.setData({
-            "filter.statusActive": this.data.filter.statusActive == item ? "" : item
-        })
-    },
-    /* 筛选日期范围 */
-    changeDate(e) {
-        const name = e.currentTarget.dataset.name,
-            value = e.detail.value;
-        this.setData({
-            [`filter.${name}`]: value
-        })
-    },
     getList(init = false) {
         _Http.init(this.data.content, init).then(content => {
             _Http.basic({
@@ -162,9 +145,6 @@ Page({
                 })
                 break;
             case '2':
-                this.setData({
-                    'filter.show': true
-                })
                 break;
             case '3':
                 this.setData({

+ 0 - 2
packageA/work/index.scss

@@ -1,5 +1,3 @@
-@import "../../components/Yl_filtrate/groud.scss";
-
 page {
     height: 100vh;
     overflow: hidden;

+ 0 - 19
packageA/work/index.wxml

@@ -6,27 +6,8 @@
 <Yl_ListBox id='ListBox' bind:getlist='getList'>
     <list list='{{list}}' />
 </Yl_ListBox>
-
 <!-- 显示类型 -->
 <van-action-sheet show="{{ classShow }}" actions="{{ classActions }}" cancel-text="{{language['取消']||'取消'}}" bind:click-overlay='classClose' bind:cancel="classClose" bind:select="classSelect" />
-
-<!-- 筛选条件 -->
-<Yl_filtrate show="{{filter.show}}" bind:handle="handleFilter">
-    <view class="groud">
-        <view class="label">
-            {{language['筛选范围']||'筛选范围'}}
-        </view>
-        <view class="content time">
-            <picker mode="date" bindchange='changeDate' data-name="startdate">
-                <view class="tbox">{{filter.startdate||language['开始时间']||'开始时间'}}</view>
-            </picker>
-            <view class="partition">-</view>
-            <picker mode="date" bindchange='changeDate' data-name="enddate">
-                <view class="tbox">{{filter.enddate||language["结束时间"]||"结束时间"}}</view>
-            </picker>
-        </view>
-    </view>
-</Yl_filtrate>
 <!-- 浮动按钮 -->
 <Yl_FloatingButton bindtap="toAdd" />
 <Yl_Filtrate1 show='{{filtrate}}' list="{{filtratelist}}" bindhandle="handleFilter" />