xiaohaizhao 1 год назад
Родитель
Сommit
829082cdb0
2 измененных файлов с 4 добавлено и 4 удалено
  1. 2 2
      miniprogram_npm/@vant/weapp/dialog/dialog.js
  2. 2 2
      packageA/contacts/detail.wxml

+ 2 - 2
miniprogram_npm/@vant/weapp/dialog/dialog.js

@@ -28,8 +28,8 @@ var defaultOptions = {
     customStyle: '',
     messageAlign: '',
     overlayStyle: '',
-    confirmButtonText: '确认',
-    cancelButtonText: '取消',
+    confirmButtonText: getApp().globalData.Language.getMapText('确认'),
+    cancelButtonText: getApp().globalData.Language.getMapText('取消'),
     showConfirmButton: true,
     showCancelButton: false,
     closeOnClickOverlay: false,

+ 2 - 2
packageA/contacts/detail.wxml

@@ -11,8 +11,8 @@
         </view>
     </view>
     <view class="exp">{{language['联系方式']||'联系方式'}}:{{detail.phonenumber || detail.telephone||'--'}}</view>
-    <view class="exp">{{language['分级']||'分级'}}:{{detail.grade||'--'}}</view>
-    <view class="exp">{{language['群组']||'群组'}}:{{detail.groupname||'--'}}</view>
+    <view class="exp">{{language['分级']||'分级'}}:{{language[detail.grade]||detail.grade||'--'}}</view>
+    <view class="exp">{{language['群组']||'群组'}}:{{language[detail.groupname]||detail.groupname||'--'}}</view>
     <view class="exp">{{language['最近跟进时间']||'最近跟进时间'}}:{{detail.followupdate||'--'}}</view>
     <view class="exp">{{language['营销费用']||'营销费用'}}:{{detail.showSalesfeesamount||'--'}}</view>
     <Yl-group id='Group' wx:if="{{auth.isdatateam}}" slot='bottom' add='{{true}}' ownertable='sys_phonebook' ownerid='{{detail.sys_phonebookid}}' />