国际化取消文字

components/My_displayData/displayData.wxml

@@ -59,4 +59,4 @@
         </view>
     </view>
 </My_card>
-<van-action-sheet show="{{ actionShow }}" actions="{{ actions }}" cancel-text="取消" bind:close="onClose" bind:cancel='onClose' bind:select='handleCallOut' />
+<van-action-sheet show="{{ actionShow }}" actions="{{ actions }}"cancel-text="{{language['取消']||'取消'}}" bind:close="onClose" bind:cancel='onClose' bind:select='handleCallOut' />

components/Yl_nav/index.js

@@ -5,15 +5,27 @@ Component({
         addGlobalClass: true
     },
     properties: {
-        sort: {type:Array}, //排序规则列表
-        search: {type:Boolean}, //是否开启搜索
-        list: {type:Array}, //功能列表
-        condition: {type:String}, //搜索内容
+        sort: {
+            type: Array
+        }, //排序规则列表
+        search: {
+            type: Boolean
+        }, //是否开启搜索
+        list: {
+            type: Array
+        }, //功能列表
+        condition: {
+            type: String
+        }, //搜索内容
         onClick: {
-            type:Function
+            type: Function
         },
-        startUsing: {type:Boolean}, //启用搜索
-        onSearch: {type:Function}, //搜索回调
+        startUsing: {
+            type: Boolean
+        }, //启用搜索
+        onSearch: {
+            type: Function
+        }, //搜索回调
         record: { //记录历史
             type: Boolean,
             value: true
@@ -32,17 +44,9 @@ Component({
             if (wx.getStorageSync('SearchHistory')) this.setData({
                 history: wx.getStorageSync('SearchHistory')
             })
+            getApp().globalData.Language.getLanguagePackage(this)
         },
         ready() {
-            /* let windowHeight = 0,
-                that = this;
-            wx.getSystemInfo({
-                success: (res => windowHeight = res.windowHeight)
-            });
-            let query = wx.createSelectorQuery().in(that).select('.Yl_head').boundingClientRect();
-            query.exec(res => that.setData({
-                listHeight: (windowHeight - res[0].bottom - 80) * 2
-            })) */
             getHeight.getHeight('.Yl_head', this).then(res => this.setData({
                 listHeight: res - 80
             }));
@@ -192,8 +196,9 @@ Component({
         },
         /* 设置列表高度 */
         setListHeight() {
-            let pages = getCurrentPages();
-            if (pages[pages.length - 1].setListHeight) pages[pages.length - 1].setListHeight();
+            let pages = getCurrentPages()[getCurrentPages().length - 1];
+            let model = pages.selectComponent("#ListBox");
+            if (model) model.automaticSetHei();
         },
         /* 搜索框焦点 */
         onFocus() {

components/Yl_nav/index.scss

@@ -14,6 +14,7 @@
         flex: 1;
         display: flex;
         justify-content: space-around;
+        overflow: hidden;
 
         .item {
             width: 216rpx;
@@ -83,6 +84,7 @@
     box-sizing: border-box;
     padding-left: 30rpx;
     padding-right: 30rpx;
+
     .v-but {
         width: 250rpx !important;
     }

components/Yl_nav/index.wxml

@@ -2,7 +2,7 @@
     <view class="mian">
         <navigator class="item" url="#" wx:for="{{list}}" wx:key="index" style="width: {{item.width}};" bindtap="onClick" data-item="{{item}}">
             <text class="iconfont {{item.icon}}" style="color: {{item.color}};" />
-            <text class="label">{{item.label}}</text>
+            <text class="label">{{language[item.label]||item.label}}</text>
         </navigator>
     </view>
     <navigator wx:if="{{search}}" class="search" url="#" bindtap="clickSearch">
@@ -11,10 +11,10 @@
 </view>
 
 <van-transition show="{{ startUsing }}" custom-class="block">
-    <van-search custom-class='Yl_search' value="{{ condition }}" bindfocus='onFocus' bind:blur='onBlur' shape="round" placeholder="请输入搜索关键词" 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>最近搜索记录</text>
+            <text>{{language['搜索历史记录']||'最近搜索记录'}}</text>
             <!-- <text class="iconfont icon-guanlian-shanchu" style="font-size: 24rpx;" bindtap="deleteHistory" /> -->
         </view>
         <view class="content" wx:if="{{showHistory}}">
@@ -31,24 +31,24 @@
     <Yl_ListBox height="{{listHeight}}" pullDown='{{false}}'>
         <view class="groud" wx:if="{{filter.stageList.length!=0}}">
             <view class="label">
-                排序类型
+                {{language['排序类型']||'排序类型'}}
             </view>
             <view class="content">
-                <van-button custom-class='but {{item.sorted==1?"active":""}}' wx:for="{{sort}}" wx:key="sortid" bindtap="handleSort" data-id="{{item.sortid}}">{{item.sortname}}</van-button>
+                <van-button custom-class='but {{item.sorted==1?"active":""}}' wx:for="{{sort}}" wx:key="sortid" bindtap="handleSort" data-id="{{item.sortid}}">{{language[item.sortname]||item.sortname}}</van-button>
             </view>
         </view>
         <view class="groud" wx:if="{{filter.stageList.length!=0}}">
             <view class="label">
-                查看顺序
+                {{language['查看顺序']||'查看顺序'}}
             </view>
             <view class="content">
-                <van-button custom-class='but {{reversed==0?"active":""}}' bindtap="handleReversed" data-id="0"><text class="iconfont icon-jiangxu1" />降序</van-button>
-                <van-button custom-class='but {{reversed==1?"active":""}}' bindtap="handleReversed" data-id="1"><text class="iconfont icon-shengxu" />升序</van-button>
+                <van-button custom-class='but {{reversed==0?"active":""}}' bindtap="handleReversed" data-id="0"><text class="iconfont icon-jiangxu1" />{{language['降序']||'降序'}}</van-button>
+                <van-button custom-class='but {{reversed==1?"active":""}}' bindtap="handleReversed" data-id="1"><text class="iconfont icon-shengxu" />{{language['升序']||'升序'}}</van-button>
             </view>
         </view>
     </Yl_ListBox>
     <view class="footer" bindtap="sortClick">
-        <van-button data-name="close" 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="confirm" custom-class='v-but confirm'>{{language['确定']||'确定'}}</van-button>
     </view>
 </van-popup>

packageA/activity/index.wxml

@@ -3,7 +3,7 @@
 
 <Yl_nav search list='{{navList}}' sort='{{content.sort}}' bind:onClick='navClick' bindonSearch="onSearch" />
 <!-- 显示类型 -->
-<van-action-sheet show="{{ classShow }}" bind:click-overlay='classClose' actions="{{ classActions }}" cancel-text="取消" bind:cancel="classClose" bind:select="classSelect" />
+<van-action-sheet show="{{ classShow }}" bind:click-overlay='classClose' actions="{{ classActions }}"cancel-text="{{language['取消']||'取消'}}" bind:cancel="classClose" bind:select="classSelect" />
 <view class="total">共{{content.total}}个</view>
 
 <Yl_ListBox id='ListBox' bind:getlist='getList'>

packageA/contacts/modules/list/index.wxml

@@ -20,6 +20,6 @@
     </navigator>
     <My_empty wx:if="{{list.length==0}}" />
 </Yl_ListBox>
-<van-action-sheet show="{{ classShow }}" actions="{{ classActions }}" cancel-text="取消" bind:click-overlay='classClose' bind:cancel="classClose" bind:select="classSelect" />
+<van-action-sheet show="{{ classShow }}" actions="{{ classActions }}"cancel-text="{{language['取消']||'取消'}}" bind:click-overlay='classClose' bind:cancel="classClose" bind:select="classSelect" />
 <Yl_Filtrate1 show='{{filterShow}}' list="{{filtratelist}}" dateRange minus='{{groupname?"80":"120"}}' bindhandle="handleFilter" />
 <Yl_FloatingButton wx:if="{{groupname!='客户联系人'&&groupname!='项目联系人'}}" bindtap="insertRows" />

packageA/contract/index.wxml

@@ -3,7 +3,7 @@
 
 <Yl_nav search list='{{navList}}' sort='{{content.sort}}' bind:onClick='navClick' bindonSearch="onSearch" />
 <!-- 显示类型 -->
-<van-action-sheet show="{{ classShow }}" actions="{{ classActions }}" cancel-text="取消" bind:cancel="classClose" bind:click-overlay='classClose' bind:select="classSelect" />
+<van-action-sheet show="{{ classShow }}" actions="{{ classActions }}"cancel-text="{{language['取消']||'取消'}}" bind:cancel="classClose" bind:click-overlay='classClose' bind:select="classSelect" />
 <view class="total">共{{content.total}}个</view>
 <Yl_ListBox id='ListBox' bind:getlist='getList'>
     <List list='{{list}}' />
@@ -45,4 +45,4 @@
 </Yl_filtrate>
 <!-- 浮动按钮 -->
 <Yl_FloatingButton wx:if="{{insert}}" bindtap="openType" />
-<van-action-sheet show="{{ typeShow }}" actions="{{ typeList }}" cancel-text="取消" bind:cancel='typeCancel' bind:select='typeSelect' bind:click-overlay='typeCancel' />
+<van-action-sheet show="{{ typeShow }}" actions="{{ typeList }}"cancel-text="{{language['取消']||'取消'}}" bind:cancel='typeCancel' bind:select='typeSelect' bind:click-overlay='typeCancel' />

packageA/finishforecast/index.wxml

@@ -6,4 +6,4 @@
     <view style="height: 80rpx;" />
 </Yl_ListBox>
 <Yl_Filtrate1 show='{{showFiltrate}}' list='{{filtrateList}}' dateRange dateRange1 dateRangeName='创建时间' bindhandle="handleFilter" />
-<van-action-sheet show="{{ classShow }}" actions="{{ classActions }}" cancel-text="取消" bind:cancel="classClose" bind:click-overlay='classClose' bind:select="classSelect" />
+<van-action-sheet show="{{ classShow }}" actions="{{ classActions }}"cancel-text="{{language['取消']||'取消'}}" bind:cancel="classClose" bind:click-overlay='classClose' bind:select="classSelect" />

packageA/invoiceforecast/index.wxml

@@ -7,4 +7,4 @@
 </Yl_ListBox>
 <Yl_Filtrate1 show='{{showFiltrate}}' list='{{filtrateList}}' dateRange dateRange1 dateRangeName='创建时间' bindhandle="handleFilter" />
 <!-- 显示类型 -->
-<van-action-sheet show="{{ classShow }}" actions="{{ classActions }}" cancel-text="取消" bind:cancel="classClose" bind:click-overlay='classClose' bind:select="classSelect" />
+<van-action-sheet show="{{ classShow }}" actions="{{ classActions }}"cancel-text="{{language['取消']||'取消'}}" bind:cancel="classClose" bind:click-overlay='classClose' bind:select="classSelect" />

packageA/offers/index.wxml

@@ -3,7 +3,7 @@
 
 <Yl_nav search list='{{navList}}' sort='{{content.sort}}' bind:onClick='navClick' bindonSearch="onSearch" />
 <!-- 显示类型 -->
-<van-action-sheet show="{{ classShow }}" actions="{{ classActions }}" cancel-text="取消" bind:cancel="classClose" bind:click-overlay='classClose' bind:select="classSelect" />
+<van-action-sheet show="{{ classShow }}" actions="{{ classActions }}"cancel-text="{{language['取消']||'取消'}}" bind:cancel="classClose" bind:click-overlay='classClose' bind:select="classSelect" />
 <view class="total">共{{content.total}}个</view>
 <Yl_ListBox id='ListBox' bind:getlist='getList'>
     <List list='{{list}}' />
@@ -46,4 +46,4 @@
 <!-- 浮动按钮 -->
 <Yl_FloatingButton wx:if="{{insert}}" bindtap="openType" />
 
-<van-action-sheet show="{{ typeShow }}" actions="{{ typeList }}" cancel-text="取消" bind:cancel='typeCancel' bind:click-overlay='typeCancel' bind:select='typeSelect' />
+<van-action-sheet show="{{ typeShow }}" actions="{{ typeList }}"cancel-text="{{language['取消']||'取消'}}" bind:cancel='typeCancel' bind:click-overlay='typeCancel' bind:select='typeSelect' />

packageA/offers/modules/product/index.wxml

@@ -10,6 +10,6 @@
     </view>
 </view>
 <List list='{{list}}' disabled='{{disabled}}' bind:deleteItem='deleteItems' bindchangeQueue='changeQueue' />
-<van-action-sheet show="{{ actionShow }}" actions="{{ actions }}" bind:select='selectorMode' bind:cancel='cancelSelector' bind:click-overlay='cancelSelector' z-index='999999999' cancel-text="取消" />
+<van-action-sheet show="{{ actionShow }}" actions="{{ actions }}" bind:select='selectorMode' bind:cancel='cancelSelector' bind:click-overlay='cancelSelector' z-index='999999999'cancel-text="{{language['取消']||'取消'}}" />
 
 <synchronous id="synchronous" bind:confirm='confirm' />

packageA/project/index.wxml

@@ -3,7 +3,7 @@
 
 <Yl_nav search list='{{navList}}' sort='{{content.sort}}' bind:onClick='navClick' bindonSearch="onSearch" />
 <!-- 显示类型 -->
-<van-action-sheet show="{{ classShow }}" actions="{{ classActions }}" cancel-text="取消" bind:cancel="classClose" bind:cancel="classClose" bind:select="classSelect" />
+<van-action-sheet show="{{ classShow }}" actions="{{ classActions }}"cancel-text="{{language['取消']||'取消'}}" bind:cancel="classClose" bind:cancel="classClose" bind:select="classSelect" />
 <view class="total">共{{content.total}}个</view>
 <Yl_ListBox id='ListBox' bind:getlist='getList'>
     <List list='{{list}}' />

packageA/project/modules/contract/index.wxml

@@ -11,4 +11,4 @@
 </view>
 <List list='{{list}}' disabled="{{disabled}}" bindchangeTotal="changeTotal" />
 
-<van-action-sheet show="{{ typeShow }}" actions="{{ typeList }}" z-index='99999' cancel-text="取消" bind:cancel='typeCancel' bind:select='typeSelect' />
+<van-action-sheet show="{{ typeShow }}" actions="{{ typeList }}" z-index='99999'cancel-text="{{language['取消']||'取消'}}" bind:cancel='typeCancel' bind:select='typeSelect' />

packageA/project/modules/fail/index.wxml

@@ -12,7 +12,7 @@
         <textarea class="textarea" maxlength='-1' placeholder='请填写' value="{{content}}" bindinput='onInput' />
     </view>
 </view>
-<van-action-sheet show="{{ show }}" actions="{{ actions }}" bind:cancel='onCancel' bind:select='onSelect' cancel-text="取消" />
+<van-action-sheet show="{{ show }}" actions="{{ actions }}" bind:cancel='onCancel' bind:select='onSelect'cancel-text="{{language['取消']||'取消'}}" />
 <view style="height: 130rpx;" />
 <view class="footer">
     <van-button custom-class='but' disabled='{{!defeatreason}}' bindclick="submit">确定</van-button>

packageA/publicClue/modules/shiftSite/index.wxml

@@ -1 +1 @@
-<van-action-sheet show="{{ show }}" actions="{{ siteList }}" z-index='99999' bind:select='onSelect' bind:cancel='onClose' bind:close='onClose' cancel-text="取消" />
+<van-action-sheet show="{{ show }}" actions="{{ siteList }}" z-index='99999' bind:select='onSelect' bind:cancel='onClose' bind:close='onClose'cancel-text="{{language['取消']||'取消'}}" />

packageA/publicCustomer/index.wxml

@@ -1,7 +1,7 @@
 <Yl_nav search list='{{navList}}' sort='{{content.sort}}' bind:onClick='navClick' bindonSearch="onSearch" />
 <view class="total">共{{content.total}}个</view>
 <!-- 显示类型 -->
-<van-action-sheet show="{{ classShow }}" actions="{{ classList }}" bind:cancel='classCancel' bind:close='classCancel' bind:select='classSelect' cancel-text="取消" />
+<van-action-sheet show="{{ classShow }}" actions="{{ classList }}" bind:cancel='classCancel' bind:close='classCancel' bind:select='classSelect'cancel-text="{{language['取消']||'取消'}}" />
 <Yl_ListBox id='ListBox' bind:getlist='getList'>
     <List list='{{list}}' />
     <view style="height: 80rpx;" />

packageA/saleAdmin/index.wxml

@@ -1,6 +1,6 @@
 <Yl_nav search list='{{navList}}' sort='{{content.sort}}' bind:onClick='navClick' bindonSearch="onSearch" />
 <!-- 显示类型 -->
-<van-action-sheet bind:click-overlay='classClose' show="{{ classShow }}" actions="{{ classActions }}" cancel-text="取消" bind:cancel="classClose" bind:select="classSelect" />
+<van-action-sheet bind:click-overlay='classClose' show="{{ classShow }}" actions="{{ classActions }}"cancel-text="{{language['取消']||'取消'}}" bind:cancel="classClose" bind:select="classSelect" />
 <view class="total">共{{content.total}}个</view>
 <!-- 浮动按钮 -->
 <Yl_FloatingButton wx:if="{{insert}}" bindtap="openType" />

packageA/saleClue/index.wxml

@@ -3,7 +3,7 @@
 
 <Yl_nav search list='{{navList}}' sort='{{content.sort}}' bind:onClick='navClick' bindonSearch="onSearch" />
 <!-- 显示类型 -->
-<van-action-sheet bind:click-overlay='classClose' show="{{ classShow }}" actions="{{ classActions }}" cancel-text="取消" bind:cancel="classClose" bind:select="classSelect" />
+<van-action-sheet bind:click-overlay='classClose' show="{{ classShow }}" actions="{{ classActions }}"cancel-text="{{language['取消']||'取消'}}" bind:cancel="classClose" bind:select="classSelect" />
 <view class="total">共{{content.total}}个</view>
 <!-- 浮动按钮 -->
 <Yl_FloatingButton wx:if="{{insert}}" bindtap="openType" />

packageA/salesForecasting/index.wxml

@@ -16,4 +16,4 @@
     </view>
 </Yl_filtrate>
 
-<van-action-sheet show="{{ typeShow }}" actions="{{ typeList }}" cancel-text="取消" bind:cancel='typeCancel' bind:select='typeSelect' />
+<van-action-sheet show="{{ typeShow }}" actions="{{ typeList }}"cancel-text="{{language['取消']||'取消'}}" bind:cancel='typeCancel' bind:select='typeSelect' />

packageA/setclient/detail.wxml

@@ -77,4 +77,4 @@
 </van-popup>
 <wxs src='../../utils/wxmlQueryPer.wxs' module="per" />
 <!-- 更换合作模式 -->
-<van-action-sheet show="{{ changeMode }}" actions="{{ modeList }}" cancel-text="取消" bind:select='modeSelect' bind:cancel='modeCancel' bind:click-overlay='modeCancel' z-index='9999999' />
+<van-action-sheet show="{{ changeMode }}" actions="{{ modeList }}"cancel-text="{{language['取消']||'取消'}}" bind:select='modeSelect' bind:cancel='modeCancel' bind:click-overlay='modeCancel' z-index='9999999' />

packageA/setclient/index.wxml

@@ -8,7 +8,7 @@
     <view style="height: 40px;" />
 </Yl_ListBox>
 <!-- 显示类型 -->
-<van-action-sheet show="{{ classShow }}" actions="{{ classActions }}" cancel-text="取消" bind:click-overlay='classClose' bind:cancel="classClose" bind:select="classSelect" />
+<van-action-sheet show="{{ classShow }}" actions="{{ classActions }}"cancel-text="{{language['取消']||'取消'}}" bind:click-overlay='classClose' bind:cancel="classClose" bind:select="classSelect" />
 <!-- 筛选条件 -->
 <Yl_Filtrate1 show='{{filterShow}}' list="{{filtratelist}}" dateRange bindhandle="handleFilter" />
 <!-- 浮动按钮 -->

packageA/setclient/modules/trace/add/index.wxml

@@ -25,7 +25,7 @@
     </view>
     <Yl_Files delete id="Yl_files" />
 </view>
-<van-action-sheet show="{{ show }}" actions="{{ actions }}" bind:cancel='onCancel' bind:select='onSelect' cancel-text="取消" />
+<van-action-sheet show="{{ show }}" actions="{{ actions }}" bind:cancel='onCancel' bind:select='onSelect'cancel-text="{{language['取消']||'取消'}}" />
 <view style="height: 130rpx;" />
 <view class="footer">
     <van-button custom-class='but' disabled='{{!content}}' bindclick="submit">确定</van-button>

packageA/target/index.wxml

@@ -13,7 +13,7 @@
         <view class="picker"><text class="iconfont icon-niandu" style="margin-right: 10rpx; color: #999;" />{{content.year}}<text class="iconfont icon-daoruxialajiantou" /></view>
     </picker>
 </view>
-<van-action-sheet show="{{ showActions }}" actions="{{ actions }}" bind:select='select' bind:cancel='cancelActions' cancel-text="取消" />
+<van-action-sheet show="{{ showActions }}" actions="{{ actions }}" bind:select='select' bind:cancel='cancelActions'cancel-text="{{language['取消']||'取消'}}" />
 <van-popup show="{{ popupShow }}" position="bottom" custom-style="height:100%;" round closeable bind:close="onClose">
     <view class="header">选择分析对象</view>
     <view style="height: 90rpx;" />

packageA/work/index.js

@@ -56,10 +56,12 @@ Page({
     onLoad(options) {
         getApp().globalData.Language.getLanguagePackage(this, '任务')
         this.setData({
-            classActions: wx.getStorageSync('templetList').map(v => {
+            classActions: wx.getStorageSync('templetList').map((v, i) => {
                 return {
                     name: v.templetname,
-                    index: v.templetid
+                    index: v.templetid,
+                    color: i == 0 ? '#3874F6' : '',
+                    i: i,
                 }
             }),
             'navList[0].label': wx.getStorageSync('templetList')[0].templetname,
@@ -193,11 +195,17 @@ Page({
     classSelect({
         detail
     }) {
+        console.log(detail)
         if (this.data.content.type == detail.index) return this.classClose();
         this.setData({
             "content.type": detail.index,
-            'navList[0].label': detail.name
+            'navList[0].label': detail.name,
+            classActions: this.data.classActions.map(v => {
+                v.color = detail.i == v.i ? '#3874F6' : ''
+                return v
+            })
         })
+        console.log("classActions", this.data.classActions)
         this.classClose();
         this.getList(true)
     },

packageA/work/index.wxml

@@ -8,7 +8,8 @@
 </Yl_ListBox>
 
 <!-- 显示类型 -->
-<van-action-sheet show="{{ classShow }}" actions="{{ classActions }}" cancel-text="取消" bind:click-overlay='classClose' bind:cancel="classClose" bind:select="classSelect" />
+<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">

pages/promotional/index.wxml

@@ -7,7 +7,7 @@
         </navigator>
     </view>
 </van-search>
-<van-action-sheet show="{{ sheetShow }}" actions="{{ actions }}" bind:close="sheetClose" bind:cancel="sheetClose" bind:select="sheetSelect" cancel-text="取消" />
+<van-action-sheet show="{{ sheetShow }}" actions="{{ actions }}" bind:close="sheetClose" bind:cancel="sheetClose" bind:select="sheetSelect"cancel-text="{{language['取消']||'取消'}}" />
 <!-- tabs -->
 <van-tabs wx:if="{{isTabs}}" sticky color='var(--assist)' title-active-color='var(--assist)' bind:change='tabChange' title-inactive-color='#999' z-index='9'>
     <van-tab title="总部" />