统一修改

wx.showModal

Eservice/components/productCard/index.js

@@ -33,8 +33,21 @@ Component({
         that = this;
       if (data.oldQty == value) return;
       wx.showModal({
-        title: `提示`,
-        content: `是否确定修改“${data.itemname}”数量为:${value}`,
+        cancelText: getApp().globalData.Language.getMapText('取消'),
+        confirmText: getApp().globalData.Language.getMapText('确定'),
+        title: getApp().globalData.Language.getMapText('提示'),
+        content: getApp().globalData.Language.joint([{
+          t: 1,
+          v: '是否确定修改',
+      }, {
+          v: data.itemname,
+          f: "“",
+          r: "”"
+      }, {
+          t: 1,
+          v: '数量为',
+          r: `:${value}`
+      }]),
         complete: (res) => {
           if (res.cancel) {
             that.setData({

Eservice/saler/serviceBillDetail/index.js

@@ -60,6 +60,8 @@ Page({
   }) {
     let that = this;
     wx.showModal({
+      cancelText: getApp().globalData.Language.getMapText('取消'),
+      confirmText: getApp().globalData.Language.getMapText('确定'),
       title: getApp().globalData.Language.getMapText('提示'),
       content: `是否确定删除“${detail.itemname}”`,
       complete: (res) => {

Eservice/workOrderDetail/index.js

@@ -44,8 +44,10 @@ Page({
     detail
   }) {
     wx.showModal({
+      cancelText: getApp().globalData.Language.getMapText('取消'),
+      confirmText: getApp().globalData.Language.getMapText('确定'),
       title: getApp().globalData.Language.getMapText('提示'),
-      content: getApp().globalData.Language.getMapText('是否确认删除')+`“${detail.itemname}”`,
+      content: getApp().globalData.Language.getMapText('是否确认删除') + `“${detail.itemname}”`,
       complete: (res) => {
         if (res.confirm) api._post({
           "id": "20230215202003",

Universal/dataTeam/index.js

@@ -74,6 +74,8 @@ Page({
     }) {
         let that = this;
         wx.showModal({
+            cancelText: getApp().globalData.Language.getMapText('取消'),
+            confirmText: getApp().globalData.Language.getMapText('确定'),
             title: getApp().globalData.Language.getMapText('提示'),
             content: getApp().globalData.Language.joint([{
                 t: 1,
@@ -121,6 +123,8 @@ Page({
         } = e.currentTarget.dataset,
             that = this;
         wx.showModal({
+            cancelText: getApp().globalData.Language.getMapText('取消'),
+            confirmText: getApp().globalData.Language.getMapText('确定'),
             title: getApp().globalData.Language.getMapText('提示'),
             content: getApp().globalData.Language.joint([{
                 t: 1,
@@ -173,6 +177,8 @@ Page({
         let result = this.data.result,
             that = this;
         wx.showModal({
+            cancelText: getApp().globalData.Language.getMapText('取消'),
+            confirmText: getApp().globalData.Language.getMapText('确定'),
             title: getApp().globalData.Language.getMapText('提示'),
             content: getApp().globalData.Language.joint([{
                 t: 1,

components/Yl_HeadNav/index.js

@@ -222,6 +222,8 @@ Component({
         deleteHistory(e) {
             let that = this;
             wx.showModal({
+                cancelText: getApp().globalData.Language.getMapText('取消'),
+                confirmText: getApp().globalData.Language.getMapText('确定'),
                 title: getApp().globalData.Language.getMapText('提示'),
                 content: getApp().globalData.Language.getMapText('是否删除所有搜索历史'),
                 complete: ({

packageA/activity/detail.js

@@ -176,8 +176,10 @@ Page({
 	clickBut() {
 		let that = this;
 		wx.showModal({
+			cancelText: getApp().globalData.Language.getMapText('取消'),
+			confirmText: getApp().globalData.Language.getMapText('确定'),
 			title: getApp().globalData.Language.getMapText('提示'),
-			content: getApp().globalData.Language.getMapText('是否确定创建促销订单')+'?',
+			content: getApp().globalData.Language.getMapText('是否确定创建促销订单') + '?',
 			complete: (res) => {
 				if (res.confirm) _Http.basic({
 					"id": 20221108111402,

packageA/borrow/detail.js

@@ -35,6 +35,8 @@ Page({
     onCopy() {
         let that = this;
         wx.showModal({
+            cancelText: getApp().globalData.Language.getMapText('取消'),
+            confirmText: getApp().globalData.Language.getMapText('确定'),
             title: getApp().globalData.Language.getMapText('提示'),
             content: getApp().globalData.Language.getMapText('是否确定复制该借用单'),
             complete: (a) => {
@@ -50,6 +52,8 @@ Page({
                         icon: "none"
                     })
                     wx.showModal({
+                        cancelText: getApp().globalData.Language.getMapText('取消'),
+                        confirmText: getApp().globalData.Language.getMapText('确定'),
                         title: getApp().globalData.Language.getMapText('提示'),
                         content: getApp().globalData.Language.getMapText('复制成功，是否立即前往'),
                         complete: (s) => {
@@ -113,6 +117,8 @@ Page({
         let that = this;
         console.log("设置收货人", item)
         wx.showModal({
+            cancelText: getApp().globalData.Language.getMapText('取消'),
+            confirmText: getApp().globalData.Language.getMapText('确定'),
             title: getApp().globalData.Language.getMapText('提示'),
             content: getApp().globalData.Language.joint([{
                 t: 1,
@@ -178,6 +184,8 @@ Page({
         let that = this;
         console.log("设置财务信息", item)
         wx.showModal({
+            cancelText: getApp().globalData.Language.getMapText('取消'),
+            confirmText: getApp().globalData.Language.getMapText('确定'),
             title: getApp().globalData.Language.getMapText('提示'),
             content: getApp().globalData.Language.joint([{
                 t: 1,
@@ -289,6 +297,8 @@ Page({
             that = this;
         if (value == this.data.detail.remarks) return;
         wx.showModal({
+            cancelText: getApp().globalData.Language.getMapText('取消'),
+            confirmText: getApp().globalData.Language.getMapText('确定'),
             title: getApp().globalData.Language.getMapText('提示'),
             content: getApp().globalData.Language.getMapText('是否确定修改订单备注') + '？',
             complete: async (res) => {
@@ -309,6 +319,8 @@ Page({
     deleteItem() {
         let that = this;
         wx.showModal({
+            cancelText: getApp().globalData.Language.getMapText('取消'),
+            confirmText: getApp().globalData.Language.getMapText('确定'),
             title: getApp().globalData.Language.getMapText('提示'),
             content: getApp().globalData.Language.getMapText('是否确认删除订单') + '？',
             complete: (res) => {
@@ -343,6 +355,8 @@ Page({
     submit() {
         let that = this;
         wx.showModal({
+            cancelText: getApp().globalData.Language.getMapText('取消'),
+            confirmText: getApp().globalData.Language.getMapText('确定'),
             title: getApp().globalData.Language.getMapText('提示'),
             content: getApp().globalData.Language.getMapText('是否确认提交订单') + '？',
             complete: (res) => {
@@ -368,6 +382,8 @@ Page({
     notarize() {
         let that = this;
         wx.showModal({
+            cancelText: getApp().globalData.Language.getMapText('取消'),
+            confirmText: getApp().globalData.Language.getMapText('确定'),
             title: getApp().globalData.Language.getMapText('提示'),
             content: getApp().globalData.Language.getMapText('是否确认交期') + '？',
             complete: (res) => {

packageA/borrow/index.js

@@ -171,6 +171,8 @@ Page({
         item
     }) {
         wx.showModal({
+            cancelText: getApp().globalData.Language.getMapText('取消'),
+            confirmText: getApp().globalData.Language.getMapText('确定'),
             title: getApp().globalData.Language.getMapText('提示'),
             content: getApp().globalData.Language.joint([{
                 v: '是否确定选择',
@@ -209,6 +211,8 @@ Page({
     handleCreated(e) {
         let that = this;
         wx.showModal({
+            cancelText: getApp().globalData.Language.getMapText('取消'),
+            confirmText: getApp().globalData.Language.getMapText('确定'),
             title: getApp().globalData.Language.getMapText('提示'),
             content: getApp().globalData.Language.joint([{
                 v: '是否确定选择',

packageA/borrow/modules/product/index.js

@@ -86,6 +86,8 @@ Component({
         dateChange(e) {
             let that = this;
             wx.showModal({
+                cancelText: getApp().globalData.Language.getMapText('取消'),
+                confirmText: getApp().globalData.Language.getMapText('确定'),
                 title: getApp().globalData.Language.getMapText('提示'),
                 content: getApp().globalData.Language.getMapText('是否确定将当前产品列表交期统一设置为') + `：${e.detail.value}`,
                 complete: (res) => {
@@ -156,6 +158,8 @@ Component({
         }) {
             let that = this;
             wx.showModal({
+                cancelText: getApp().globalData.Language.getMapText('取消'),
+                confirmText: getApp().globalData.Language.getMapText('确定'),
                 title: getApp().globalData.Language.getMapText('提示'),
                 content: getApp().globalData.Language.getMapText('是否确认删除') + `“${detail.itemname}”?`,
                 complete: (res) => {
@@ -209,6 +213,8 @@ Component({
         handleSelect(detail) {
             console.log(this.data.sa_orderid)
             wx.showModal({
+                cancelText: getApp().globalData.Language.getMapText('取消'),
+                confirmText: getApp().globalData.Language.getMapText('确定'),
                 title: getApp().globalData.Language.getMapText('提示'),
                 content: getApp().globalData.Language.getMapText('是否确认添加') + ' ' + detail.result.length + getApp().globalData.Language.getMapText('件商品') + ' ' + `?`,
                 complete: (res) => {

packageA/invoice/detail.js

@@ -65,7 +65,7 @@ Page({
             value: CNY(item.quota)
         }, {
             label: "是否手工单",
-            value: item.byhand ? language['是']||'是' : language['否']|| '否'
+            value: item.byhand ? language['是'] || '是' : language['否'] || '否'
         }, {
             label: "发票种类",
             value: item.invoiceline
@@ -171,6 +171,8 @@ Page({
         } else {
             let that = this;
             wx.showModal({
+                cancelText: getApp().globalData.Language.getMapText('取消'),
+                confirmText: getApp().globalData.Language.getMapText('确定'),
                 title: getApp().globalData.Language.getMapText('提示'),
                 content: getApp().globalData.Language.getMapText('是否确认提交该申请单') + '？',
                 complete: ({

packageA/invoice/modules/detailLine/index.js

@@ -80,6 +80,8 @@ Component({
         handleSelect(detail) {
             let that = this;
             wx.showModal({
+                cancelText: getApp().globalData.Language.getMapText('取消'),
+                confirmText: getApp().globalData.Language.getMapText('确定'),
                 title: getApp().globalData.Language.getMapText('提示'),
                 content: getApp().globalData.Language.joint([{
                     v: '是否确认添加',
@@ -164,6 +166,8 @@ Component({
             console.log(detail)
             let that = this;
             wx.showModal({
+                cancelText: getApp().globalData.Language.getMapText('取消'),
+                confirmText: getApp().globalData.Language.getMapText('确定'),
                 title: getApp().globalData.Language.getMapText('提示'),
                 content: getApp().globalData.Language.getMapText('是否确认删除') + `“${detail.itemname}”`,
                 complete: ({

packageA/invoice/update.js

@@ -195,6 +195,8 @@ Page({
 		content.sys_enterpriseid && (content.sys_enterpriseid = data.sys_enterpriseid[1][0]);
 		delete(content.principal)
 		wx.showModal({
+			cancelText: getApp().globalData.Language.getMapText('取消'),
+			confirmText: getApp().globalData.Language.getMapText('确定'),
 			title: getApp().globalData.Language.getMapText('提示'),
 			content: getApp().globalData.Language.getMapText('是否确定创建开票申请单') + '?',
 			complete: ({

packageA/market/selected/index.js

@@ -26,6 +26,8 @@ Page({
       item
     } = e.currentTarget.dataset;
     wx.showModal({
+      cancelText: getApp().globalData.Language.getMapText('取消'),
+      confirmText: getApp().globalData.Language.getMapText('确定'),
       title: getApp().globalData.Language.getMapText('提示'),
       content: getApp().globalData.Language.getMapText('是否确认选择') + ` ${item.enterprisename}?`,
       complete: ({

packageA/orderForm/add/add.js

@@ -91,6 +91,8 @@ Page({
         if (this.data.userrole == '业务员' && !this.data.agency.sys_enterpriseid) {
             let that = this;
             wx.showModal({
+                cancelText: getApp().globalData.Language.getMapText('取消'),
+                confirmText: getApp().globalData.Language.getMapText('确定'),
                 title: getApp().globalData.Language.getMapText('提示'),
                 content: getApp().globalData.Language.getMapText('您还未选择经销商！是否立即前往'),
                 complete: (res) => {
@@ -158,6 +160,8 @@ Page({
     }) {
         let that = this;
         wx.showModal({
+            cancelText: getApp().globalData.Language.getMapText('取消'),
+            confirmText: getApp().globalData.Language.getMapText('确定'),
             title: getApp().globalData.Language.getMapText('提示'),
             content: getApp().globalData.Language.joint([{
                 t: 1,

packageA/orderForm/add/float/index.js

@@ -92,6 +92,8 @@ Component({
             item
         }) {
             wx.showModal({
+                cancelText: getApp().globalData.Language.getMapText('取消'),
+                confirmText: getApp().globalData.Language.getMapText('确定'),
                 title: getApp().globalData.Language.getMapText('提示'),
                 content: getApp().globalData.Language.joint([{
                     t: 1,
@@ -142,6 +144,8 @@ Component({
             item
         }) {
             wx.showModal({
+                cancelText: getApp().globalData.Language.getMapText('取消'),
+                confirmText: getApp().globalData.Language.getMapText('确定'),
                 title: getApp().globalData.Language.getMapText('提示'),
                 content: getApp().globalData.Language.joint([{
                     t: 1,

packageA/orderForm/detail.js

@@ -184,6 +184,8 @@ Page({
         let that = this;
         console.log("选择经销商", item)
         wx.showModal({
+            cancelText: getApp().globalData.Language.getMapText('取消'),
+            confirmText: getApp().globalData.Language.getMapText('确定'),
             title: getApp().globalData.Language.getMapText('提示'),
             content: getApp().globalData.Language.modeBoxPrompts([{
                 t: 1,
@@ -258,6 +260,8 @@ Page({
         let that = this;
         console.log("设置收货人", item)
         wx.showModal({
+            cancelText: getApp().globalData.Language.getMapText('取消'),
+            confirmText: getApp().globalData.Language.getMapText('确定'),
             title: getApp().globalData.Language.getMapText('提示'),
             content: getApp().globalData.Language.modeBoxPrompts([{
                 t: 1,
@@ -325,6 +329,8 @@ Page({
         let that = this;
         console.log("设置财务信息", item)
         wx.showModal({
+            cancelText: getApp().globalData.Language.getMapText('取消'),
+            confirmText: getApp().globalData.Language.getMapText('确定'),
             title: getApp().globalData.Language.getMapText('提示'),
             content: getApp().globalData.Language.modeBoxPrompts([{
                 t: 1,
@@ -443,6 +449,8 @@ Page({
             that = this;
         if (value == remarks) return;
         wx.showModal({
+            cancelText: getApp().globalData.Language.getMapText('取消'),
+            confirmText: getApp().globalData.Language.getMapText('确定'),
             title: getApp().globalData.Language.getMapText('提示'),
             content: getApp().globalData.Language.modeBoxPrompts([{
                 t: 1,
@@ -550,6 +558,8 @@ Page({
     deleteItem() {
         let that = this;
         wx.showModal({
+            cancelText: getApp().globalData.Language.getMapText('取消'),
+            confirmText: getApp().globalData.Language.getMapText('确定'),
             title: getApp().globalData.Language.getMapText('提示'),
             content: getApp().globalData.Language.getMapText('是否确认删除订单') + '？',
             complete: (res) => {
@@ -584,6 +594,8 @@ Page({
     submit() {
         let that = this;
         wx.showModal({
+            cancelText: getApp().globalData.Language.getMapText('取消'),
+            confirmText: getApp().globalData.Language.getMapText('确定'),
             title: getApp().globalData.Language.getMapText('提示'),
             content: getApp().globalData.Language.getMapText('是否确认提交订单') + '？',
             complete: (res) => {
@@ -609,6 +621,8 @@ Page({
     notarize() {
         let that = this;
         wx.showModal({
+            cancelText: getApp().globalData.Language.getMapText('取消'),
+            confirmText: getApp().globalData.Language.getMapText('确定'),
             title: getApp().globalData.Language.getMapText('提示'),
             content: getApp().globalData.Language.getMapText('是否确认交期') + '？',
             complete: (res) => {
@@ -642,6 +656,8 @@ Page({
     copyItem() {
         let item = this.data.detail;
         wx.showModal({
+            cancelText: getApp().globalData.Language.getMapText('取消'),
+            confirmText: getApp().globalData.Language.getMapText('确定'),
             title: getApp().globalData.Language.getMapText('提示'),
             content: getApp().globalData.Language.getMapText('是否确认复制') + `${getApp().globalData.Language.showToast(item.type)}“${item.sonum}”`,
             complete: (res) => {
@@ -657,6 +673,8 @@ Page({
                         icon: "none"
                     });
                     wx.showModal({
+                        cancelText: getApp().globalData.Language.getMapText('取消'),
+                        confirmText: getApp().globalData.Language.getMapText('确定'),
                         title: getApp().globalData.Language.getMapText('提示'),
                         content: getApp().globalData.Language.showToast(item.type) + ' ' + getApp().globalData.Language.showToast('复制成功 是否立即前往'),
                         complete: (s) => {

packageA/orderForm/modules/product/index.js

@@ -87,6 +87,8 @@ Component({
         dateChange(e) {
             let that = this;
             wx.showModal({
+                cancelText: getApp().globalData.Language.getMapText('取消'),
+                confirmText: getApp().globalData.Language.getMapText('确定'),
                 title: getApp().globalData.Language.getMapText('提示'),
                 content: getApp().globalData.Language.getMapText('是否确定将当前产品列表交期统一设置为') + `：${e.detail.value}`,
                 complete: (res) => {
@@ -152,6 +154,8 @@ Component({
         }) {
             let that = this;
             wx.showModal({
+                cancelText: getApp().globalData.Language.getMapText('取消'),
+                confirmText: getApp().globalData.Language.getMapText('确定'),
                 title: getApp().globalData.Language.getMapText('提示'),
                 content: getApp().globalData.Language.getMapText('是否确认删除') + `“${detail.itemname}”?`,
                 complete: (res) => {
@@ -218,6 +222,8 @@ Component({
         handleSelect(detail) {
             let that = this;
             wx.showModal({
+                cancelText: getApp().globalData.Language.getMapText('取消'),
+                confirmText: getApp().globalData.Language.getMapText('确定'),
                 title: getApp().globalData.Language.getMapText('提示'),
                 content: getApp().globalData.Language.joint([{
                     v: '是否确认添加',

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

@@ -129,6 +129,8 @@ Component({
 				that = this;
 			let needdate = formatTime(new Date(detail), "-").split(' ')[0];
 			wx.showModal({
+				cancelText: getApp().globalData.Language.getMapText('取消'),
+				confirmText: getApp().globalData.Language.getMapText('确定'),
 				title: getApp().globalData.Language.getMapText('提示'),
 				content: getApp().globalData.Language.joint([{
 					v: '是否确定期望交期为',

packageA/remitVoucher/detail.js

@@ -160,6 +160,8 @@ Page({
 				break;
 			case "提交":
 				wx.showModal({
+					cancelText: getApp().globalData.Language.getMapText('取消'),
+					confirmText: getApp().globalData.Language.getMapText('确定'),
 					title: getApp().globalData.Language.getMapText('提示'),
 					content: getApp().globalData.Language.getMapText('是否确认提交该打款凭证') + `？`,
 					complete: ({
@@ -193,6 +195,8 @@ Page({
 				break;
 			case "退回":
 				wx.showModal({
+					cancelText: getApp().globalData.Language.getMapText('取消'),
+					confirmText: getApp().globalData.Language.getMapText('确定'),
 					title: getApp().globalData.Language.getMapText('提示'),
 					content: getApp().globalData.Language.getMapText('是否确认退回该打款凭证') + `？`,
 					complete: ({
@@ -217,6 +221,8 @@ Page({
 				break;
 			case "删除":
 				wx.showModal({
+					cancelText: getApp().globalData.Language.getMapText('取消'),
+					confirmText: getApp().globalData.Language.getMapText('确定'),
 					title: getApp().globalData.Language.getMapText('提示'),
 					content: getApp().globalData.Language.getMapText('是否删除该凭证') + `？`,
 					complete: ({

packageA/remitVoucher/modules/remitDetail.js

@@ -121,6 +121,8 @@ Component({
     deleteProduct(e) {
       if (this.properties.detail.status != '新建') return getApp().globalData.Language.showToast('非新建状态无法删除')
       wx.showModal({
+        cancelText: getApp().globalData.Language.getMapText('取消'),
+        confirmText: getApp().globalData.Language.getMapText('确定'),
         title: getApp().globalData.Language.getMapText('提示'),
         content: getApp().globalData.Language.getMapText('是否删除当前打款明细') + '?',
         complete: async (res) => {

packageA/returnOne/detail.js

@@ -89,7 +89,7 @@ Page({
         value: data.rebate_userate + '%'
       }, {
         label: '是否实物返回',
-        value: data.isitemreturn ? language['是']||'是' : language['否']|| '否'
+        value: data.isitemreturn ? language['是'] || '是' : language['否'] || '否'
       }, {
         label: '定金账户',
         value: data.accountname
@@ -122,6 +122,8 @@ Page({
   submit() {
     let that = this;
     wx.showModal({
+      cancelText: getApp().globalData.Language.getMapText('取消'),
+      confirmText: getApp().globalData.Language.getMapText('确定'),
       title: getApp().globalData.Language.getMapText('提示'),
       content: getApp().globalData.Language.getMapText('是否确定提交申请单') + '?',
       complete: ({
@@ -150,6 +152,8 @@ Page({
   notarize() {
     let that = this;
     wx.showModal({
+      cancelText: getApp().globalData.Language.getMapText('取消'),
+      confirmText: getApp().globalData.Language.getMapText('确定'),
       title: getApp().globalData.Language.getMapText('提示'),
       content: getApp().globalData.Language.getMapText('是否确定取消提交申请单') + '?',
       complete: ({
@@ -177,6 +181,8 @@ Page({
   },
   deleteItem() {
     wx.showModal({
+      cancelText: getApp().globalData.Language.getMapText('取消'),
+      confirmText: getApp().globalData.Language.getMapText('确定'),
       title: getApp().globalData.Language.getMapText('提示'),
       content: getApp().globalData.Language.getMapText('是否确定删除申请单') + '?',
       complete: ({

packageA/returnOne/modules/product/index.js

@@ -97,6 +97,8 @@ Component({
       console.log(detail)
       let that = this;
       wx.showModal({
+        cancelText: getApp().globalData.Language.getMapText('取消'),
+        confirmText: getApp().globalData.Language.getMapText('确定'),
         title: getApp().globalData.Language.getMapText('提示'),
         content: getApp().globalData.Language.getMapText('是否确认删除') + `“${detail.itemname}”?`,
         complete: (res) => {
@@ -144,6 +146,8 @@ Component({
     handleSelect(detail) {
       let that = this;
       wx.showModal({
+        cancelText: getApp().globalData.Language.getMapText('取消'),
+        confirmText: getApp().globalData.Language.getMapText('确定'),
         title: getApp().globalData.Language.getMapText('提示'),
         content: getApp().globalData.Language.modeBoxPrompts([{
           t: 1,

packageA/shipment/detail.js

@@ -132,6 +132,8 @@ Page({
     receiving() {
         let that = this;
         wx.showModal({
+            cancelText: getApp().globalData.Language.getMapText('取消'),
+            confirmText: getApp().globalData.Language.getMapText('确定'),
             title: getApp().globalData.Language.getMapText('提示'),
             content: getApp().globalData.Language.getMapText('是否确认收货?确认后不可更改'),
             complete: (res) => {

packageA/shopping/modules/standard/index.js

@@ -108,6 +108,8 @@ Component({
                     icon: "none"
                 });
                 wx.showModal({
+                    cancelText: getApp().globalData.Language.getMapText('取消'),
+                    confirmText: getApp().globalData.Language.getMapText('确定'),
                     title: getApp().globalData.Language.getMapText('提示'),
                     content: getApp().globalData.Language.getMapText('生成成功!是否立即前往'),
                     complete: (s) => {

packageA/shopping/modules/tool/index.js

@@ -111,6 +111,8 @@ Component({
                     icon: "none"
                 });
                 wx.showModal({
+                    cancelText: getApp().globalData.Language.getMapText('取消'),
+                    confirmText: getApp().globalData.Language.getMapText('确定'),
                     title: getApp().globalData.Language.getMapText('提示'),
                     content: getApp().globalData.Language.getMapText('生成成功!是否立即前往'),
                     complete: (s) => {

packageA/toolBill/detail.js

@@ -89,7 +89,7 @@ Page({
 				},
 				{
 					label: '是否实物返回',
-					value: data.isitemreturn ? language['是']||'是' : language['否']|| '否'
+					value: data.isitemreturn ? language['是'] || '是' : language['否'] || '否'
 				}, {
 					label: "提交日期",
 					value: data.submitdate
@@ -155,6 +155,8 @@ Page({
 				break;
 			case "提交":
 				wx.showModal({
+					cancelText: getApp().globalData.Language.getMapText('取消'),
+					confirmText: getApp().globalData.Language.getMapText('确定'),
 					title: getApp().globalData.Language.getMapText('提示'),
 					content: getApp().globalData.Language.getMapText('是否确认提交该工具归还单') + `？`,
 					complete: ({
@@ -182,6 +184,8 @@ Page({
 				break;
 			case "取消提交":
 				wx.showModal({
+					cancelText: getApp().globalData.Language.getMapText('取消'),
+					confirmText: getApp().globalData.Language.getMapText('确定'),
 					title: getApp().globalData.Language.getMapText('提示'),
 					content: getApp().globalData.Language.getMapText('是否确认取消提交该工具归还单') + `？`,
 					complete: ({
@@ -209,6 +213,8 @@ Page({
 				break;
 			case "删除":
 				wx.showModal({
+					cancelText: getApp().globalData.Language.getMapText('取消'),
+					confirmText: getApp().globalData.Language.getMapText('确定'),
 					title: getApp().globalData.Language.getMapText('提示'),
 					content: getApp().globalData.Language.getMapText('是否删除该工具归还单') + `？`,
 					complete: ({

packageA/toolBill/modules/toolDetail/index.js

@@ -103,6 +103,8 @@ Component({
 		}) {
 			let that = this;
 			wx.showModal({
+				cancelText: getApp().globalData.Language.getMapText('取消'),
+				confirmText: getApp().globalData.Language.getMapText('确定'),
 				title: getApp().globalData.Language.getMapText('提示'),
 				content: getApp().globalData.Language.getMapText('是否确认删除') + `“${detail.itemname}”?`,
 				complete: (res) => {
@@ -150,6 +152,8 @@ Component({
 		handleSelect(detail) {
 			let that = this;
 			wx.showModal({
+				cancelText: getApp().globalData.Language.getMapText('取消'),
+				confirmText: getApp().globalData.Language.getMapText('确定'),
 				title: getApp().globalData.Language.getMapText('提示'),
 				content: getApp().globalData.Language.joint([{
 					t: 1,

utils/work/work.js

@@ -75,10 +75,10 @@ function isHistory() {
 
 function isRemindChangePassword() {
     if (getApp().globalData.remindchangepassword) wx.showModal({
-        title: "提示",
-        content: "当前密码为初始密码，请前往修改密码",
-        confirmText: '前往修改',
-        cancelText: "下次再说",
+        title: getApp().globalData.Language.getMapText('提示'),
+        content: getApp().globalData.Language.getMapText('当前密码为初始密码，请前往修改密码'),
+        cancelText: getApp().globalData.Language.getMapText('下次再说'),
+        confirmText: getApp().globalData.Language.getMapText('前往修改'),
         success: ({
             confirm
         }) => {