Merge remote-tracking branch 'refs/remotes/origin/tianmaoxiaoyuan' into tianmaoxiaoyuan

taobao_mini/client/pages/myprize/myprize.js

@@ -72,7 +72,7 @@ Page({
     const t3 = new Date(endTime).getMinutes() + ''; //获取分
     const t4 = new Date(endTime).getSeconds() + ''; //获取秒
     console.log(endTime, new Date(endTime + 48 * 60 * 60 * 1000).toLocaleString(), 'endTime');
-        console.log('endtime str',t1 + "" + t2.padStart(2, '0') + ":" + t3.padStart(2, '0') + ":" + t4.padStart(2, '0'))
+    console.log('endtime str', t1 + "" + t2.padStart(2, '0') + ":" + t3.padStart(2, '0') + ":" + t4.padStart(2, '0'))
     this.setData({
       endTime: t1 + "" + t2.padStart(2, '0') + ":" + t3.padStart(2, '0') + ":" + t4.padStart(2, '0')
     })
@@ -132,7 +132,7 @@ Page({
    * 发奖
    */
   async cloudTBIssue(params) {
-        console.log('cloudTBIssue params',JSON.stringify(params))
+    console.log('cloudTBIssue params', JSON.stringify(params))
     const {
       cloud
     } = app;
@@ -185,17 +185,17 @@ Page({
       strategyCode,
       code,
       channel
-        }).then(()=>{
-            API.receivLaFeiPrize({id}).then((res)=>{
-                console.log('receivLaFeiPrize res',res)
+    }).then(() => {
+      API.receivLaFeiPrize({ id }).then((res) => {
+        console.log('receivLaFeiPrize res', res)
         this.getMyPrize()
       })
-            .catch((error)=>{
-                console.log('receivLaFeiPrize error',error)
+        .catch((error) => {
+          console.log('receivLaFeiPrize error', error)
         })
     })
-        .catch(err=>{
-            API.receivLaFeiPrize({result:err})
+      .catch(err => {
+        API.receivLaFeiPrize({ result: err })
       })
     // const { activityId } = app;
     // console.log(item, '领取权益')
@@ -218,25 +218,36 @@ Page({
   },
   // 领取实物前询问
   async handleGetEntity(e) {
-        my.confirm({
-            title: '领取奖品',
-            content: '是否允许访问您的粘贴板',
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            success: (result) => {
-                if (result.confirm) {
+
     const text = 'zzzxxx'
-                    commonToast('请前去钉钉领取，钉钉号为：' + text + '。钉钉号已经复制成功。', 3000);
     setClipboard({
       text: `${text}`
+    }).then(() => {
+      commonToast(' ' + text + '。钉钉号已经复制成功。', 3000);
+    }).catch(err=>{
+      console.log('handleGetEntity error',err)
     })
-                }
 
-            },
-            fail: (result) =>{
-                commonToast('访问剪贴板失败')
-            }
-        });
+
+    // my.confirm({
+    //     title: '领取奖品',
+    //     content: '是否允许访问您的粘贴板',
+    //     confirmButtonText: '确认',
+    //     cancelButtonText: '取消',
+    //     success: (result) => {
+    //         if (result.confirm) {
+    //             const text = 'zzzxxx'
+    //              setClipboard({
+    //               text: `${text}`
+    //             })
+    //             commonToast('请前去钉钉领取，钉钉号为：' + text + '。钉钉号已经复制成功。', 3000);
+    //         }
+
+    //     },
+    //     fail: (result) =>{
+    //         commonToast('访问剪贴板失败')
+    //     }
+    // });
 
 
     // if (flag) {