From 6e66923f7fdf225818971ddcf1d9845b3608e2b3 Mon Sep 17 00:00:00 2001 From: zsk <710162063@qq.com> Date: Tue, 18 Mar 2025 10:54:50 +0800 Subject: [PATCH 1/3] APPID --- project.config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.config.json b/project.config.json index 577cad2..858bc26 100644 --- a/project.config.json +++ b/project.config.json @@ -44,7 +44,7 @@ "tabIndent": "insertSpaces", "tabSize": 2 }, - "appid": "wxe431e0b3abd9ae0b", + "appid": "wxb0dea4d11428c6a5", "packOptions": { "ignore": [], "include": [] From 0bd82bbf4ee6429d6ba1a334949a41dd39522bcc Mon Sep 17 00:00:00 2001 From: zsk <710162063@qq.com> Date: Tue, 18 Mar 2025 15:21:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?IOS=E5=A4=8D=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/billDetail/index.js | 64 ++++++++++++++++++++++++++++++++++------------ subPage/todayBill/index.js | 6 +++-- 2 files changed, 51 insertions(+), 19 deletions(-) diff --git a/pages/billDetail/index.js b/pages/billDetail/index.js index b99d16a..b7b66d5 100644 --- a/pages/billDetail/index.js +++ b/pages/billDetail/index.js @@ -88,11 +88,19 @@ Page({ var that = this; var text = "姓名：" + that.data.recordDetail.userName + "/" + (that.data.recordDetail.sex == 1 ? "男" : "女") + "/" + that.data.recordDetail.age + "岁" + (that.data.recordDetail.nation == "族" ? "" : "/" + that.data.recordDetail.nation) + "\n电话：" + (that.data.recordDetail.tel == "" || that.data.recordDetail.tel == undefined || that.data.recordDetail.tel == null ? "-" : that.data.recordDetail.tel) + "\n身份证号：" + (that.data.recordDetail.idCard == "" ? "-" : that.data.recordDetail.idCard) + "\n家庭地址：" + (that.data.recordDetail.address == "" || that.data.recordDetail.address == undefined || that.data.recordDetail.address == null ? "-" : that.data.recordDetail.address) + "\n报名岗位：" + that.data.recordDetail.storeJobName + "\n员工薪资：" + (that.data.recordDetail.employeeSalary || '-') + "\n代理政策：" + that.data.recordDetail.policy; + // #if MP app.copyFun(text,()=>{ console.log(123123); that.close2(); - }) + // #elif ANDROID || IOS + app.copyFun(text) + that.close2(); + // #endif + + + + // wx.setClipboardData({ // data: text, // success (res) { @@ -243,22 +251,31 @@ Page({ }else{ text = that.data.userinfo.totalZC; } - wx.setClipboardData({ - data: text, - success (res) { - wx.getClipboardData({ - success (res) { - console.log(res.data); // data - wx.showToast({ - title: "内容已复制", - icon: "none", - duration: 1500, - }); - that.close1(); - }, - }); - }, - }); + + // #if MP + app.copyFun(text,()=>{ + console.log(123123); + }) + // #elif ANDROID || IOS + app.copyFun(text) + // #endif + + // wx.setClipboardData({ + // data: text, + // success (res) { + // wx.getClipboardData({ + // success (res) { + // console.log(res.data); // data + // wx.showToast({ + // title: "内容已复制", + // icon: "none", + // duration: 1500, + // }); + // that.close1(); + // }, + // }); + // }, + // }); }, copyClose () { @@ -267,8 +284,21 @@ Page({ app.copyFun(text,()=>{ console.log(123123); that.close1(); + }) + // #if MP + app.copyFun(text,()=>{ + console.log(123123); + that.close1(); }) + // #elif ANDROID || IOS + app.copyFun(text) + that.close1(); + // #endif + + + + // wx.setClipboardData({ // data: text, // success (res) { diff --git a/subPage/todayBill/index.js b/subPage/todayBill/index.js index b2b91e7..917cb48 100644 --- a/subPage/todayBill/index.js +++ b/subPage/todayBill/index.js @@ -190,11 +190,13 @@ Page({ copyInfo (e) { let val = e.currentTarget.dataset.info; app.vibrateShort() + // #if MP app.copyFun(val.text, () => { console.log(123123); }) - - + // #elif ANDROID || IOS + app.copyFun(val.text) + // #endif }, /** * 用户点击右上角分享 From a6fd580fe64c1c70df0cbc1fc72ca17f9dfb24a2 Mon Sep 17 00:00:00 2001 From: zsk <710162063@qq.com> Date: Tue, 18 Mar 2025 15:34:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E6=88=90=E4=B8=BA=E4=BB=A3=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/detail/index.js | 17 ++++++++++------- pages/tobeAgency/index.js | 6 ++---- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pages/detail/index.js b/pages/detail/index.js index e0f8378..d3fbcc7 100644 --- a/pages/detail/index.js +++ b/pages/detail/index.js @@ -1869,13 +1869,16 @@ Page({ wx.showModal({ content: '抱歉，您需先成为伯才代理以获得使用权限。', // content: that.data.bclr, - contentColor: "#ccc", - confirmColor: "#1890ff", - confirmText: "确定", - showCancel: false, - success (res) { - - }, + confirmColor: '#1890ff', + confirmText: '成为代理', + cancelText: '知道了', + success (res) { + if (res.confirm) { + wx.navigateTo({ + url: '/pages/tobeAgency/index' + }) + } + } }); }, showFee () { diff --git a/pages/tobeAgency/index.js b/pages/tobeAgency/index.js index d5befd3..12d1527 100644 --- a/pages/tobeAgency/index.js +++ b/pages/tobeAgency/index.js @@ -50,7 +50,7 @@ Page({ /** * 生命周期函数--监听页面显示 */ - onShow () { }, + onShow () {}, /** * 地址选择 @@ -184,9 +184,7 @@ Page({ duration: 1000, success () { setTimeout(() => { - wx.switchTab({ - url: '../mine/index', - }) + wx.navigateBack() }, 1200); }, });