Merge branct push -u or h 'version_1.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management_vue into version_1.0

src/views/common/dingtalkluck.vue

@@ -42,6 +42,8 @@ export default {
       console.log('走钉钉免登流程')
       this.dingtalkLogin()
       this.checkDingTalkLogin()
+    } else {
+      this.verify = '请使用手机钉钉扫码打开'
     }
   },
   methods: {
@@ -87,7 +89,7 @@ export default {
             if (res && res.code === 0) {
               console.log('获取token')
               
-              this.dataForm.verify='已经登记，祝你好运！下午1点44分员工新天地现场开奖'
+              this.dataForm.verify='已经登记，祝您好运！七夕下午5点20分员工新天地现场开奖'
               
               console.log('跳转')
             } else {

src/views/common/lzluck.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-loading='hasSendCode'>
      <h1 class="brand-info__text">{{dataForm.verify}}</h1>
      <h2 class="brand-info__text">{{dataForm.uuid}}</h2>
 
@@ -58,9 +58,9 @@ export default {
       time: -1,
       rand: 0,
       timer: false,
-      hasSendCode: false,
+      hasSendCode: true,
       query: {
-        luckId:  2
+        luckId:  1//活动编号
       },
       data: [],
       luckdata: [],
@@ -94,10 +94,11 @@ export default {
               this.luckdata.unshift(item)
             }
             //这里更新中奖结果，并返回未中奖的数据
+            this.hasSendCode = true;
             apiUpdateLuck(this.luckdata).then(res => {
                 console.log(res)
                 if (res && res.code === 0) {
-                  console.log(res.luck.isFinish)
+                  console.log(res.luck)
                   this.requst = res.luck
                   if(res.luck.isFinish === 1){
                     this.dataForm.verify=res.luck.name + '——活动结束'
@@ -105,6 +106,7 @@ export default {
                 } else {
                   this.$message.error(res.msg)
                 }
+                this.hasSendCode = false;
               })
           }
       }
@@ -128,6 +130,7 @@ export default {
               this.dataForm.verify='无法登记。' + res.msg
               this.$message.error(res.msg)
             }
+            this.hasSendCode = false;
           })
     },
     dataTimeChange () {
@@ -135,12 +138,17 @@ export default {
         this.dataForm.uuid = this.requst.luckGoodsReqs[this.time].name
             setTimeout(() =>{
               this.randData(this.requst.luckGoodsReqs[this.time].counts)
-            }, 100)
+            }, 20)
       }
     },
     randData (count) {
       if (this.timer === true) {
         var obj = []
+        if(count > this.requst.luckRecordReqs.length){//当奖品数量大于人数时，由人数限制
+          console.log('奖品数大于报名人数')
+          count = this.requst.luckRecordReqs.length
+          console.log(count)
+        }
         for(var i = 0; i < count; i++){
           
           if(this.rand >= this.requst.luckRecordReqs.length){
@@ -152,7 +160,7 @@ export default {
         this.data = obj
         setTimeout(() =>{
               this.randData(count)
-        }, 100)
+        }, 20)
       }
     }
   }