许成详 6 years ago
parent
commit
33457eec05

+ 2
- 1
src/pages/login/index.vue View File

96
           token: token
96
           token: token
97
         }
97
         }
98
       }).then(res => {
98
       }).then(res => {
99
-        console.log(res)
99
+        // console.log(res)
100
+        document.onkeydown = function (event) {}
100
         this.saveToken(res.token)
101
         this.saveToken(res.token)
101
         this.$message({
102
         this.$message({
102
           message: '登陆成功',
103
           message: '登陆成功',

+ 12
- 13
src/pages/system/cardAndCouponManager/cardManager/edit.vue View File

120
                   type="daterange"
120
                   type="daterange"
121
                   range-separator="至"
121
                   range-separator="至"
122
                   start-placeholder="开始日期"
122
                   start-placeholder="开始日期"
123
-                  end-placeholder="结束日期"
124
-                  :picker-options="pickerOptions">
123
+                  end-placeholder="结束日期">
125
                 </el-date-picker>
124
                 </el-date-picker>
126
               </div>
125
               </div>
127
             </div>
126
             </div>
285
       defaultCaseId: x => x.app.cases.default,
284
       defaultCaseId: x => x.app.cases.default,
286
       OrgId: x => x.app.user.OrgId,
285
       OrgId: x => x.app.user.OrgId,
287
     }),
286
     }),
288
-    pickerOptions () {
289
-      const courseId = this.cardInfo.Targets[0].TargetId
290
-      const couse = (this.courseList || []).filter(x => x.CourseId === courseId)[0] || {}
291
-      const beginDate = new Date(couse.BeginDate).getTime()
292
-      const endDate = new Date(couse.EndDate).getTime()
293
-      return {
294
-        disabledDate (time) {
295
-          return time.getTime() < beginDate || time.getTime() > endDate
296
-        }
297
-      }
298
-    },
287
+    // pickerOptions () {
288
+    //   const courseId = this.cardInfo.Targets[0].TargetId
289
+    //   const couse = (this.courseList || []).filter(x => x.CourseId === courseId)[0] || {}
290
+    //   const beginDate = new Date(couse.BeginDate).getTime()
291
+    //   const endDate = new Date(couse.EndDate).getTime()
292
+    //   return {
293
+    //     disabledDate (time) {
294
+    //       return time.getTime() < beginDate || time.getTime() > endDate
295
+    //     }
296
+    //   }
297
+    // },
299
     CaseId: {
298
     CaseId: {
300
       get () {
299
       get () {
301
         return this.postData.caseid || this.defaultCaseId
300
         return this.postData.caseid || this.defaultCaseId

+ 1
- 1
src/util/api.js View File

99
     },
99
     },
100
     bindKeyByQrCode: {
100
     bindKeyByQrCode: {
101
       method: 'post',
101
       method: 'post',
102
-      url: `${baseUrl}${common}/case/key/:keyid/:customerid`
102
+      url: `${baseUrl}${common}/verify/case/key/:keyid/:customerid`
103
     },
103
     },
104
     getRolesList: { // 获取角色列表
104
     getRolesList: { // 获取角色列表
105
       method: 'get',
105
       method: 'get',