bug修改

config/index.js

       '/api': {
         // target: 'https://dp.huiju360.com.cn/hj_operations',
         // target: 'http://192.168.0.62:8080', //wf
-        //target: 'http://127.0.0.1:8080', 
-        target: 'http://localhost:8080', //wf
+        // target: 'http://127.0.0.1:8080', 
+        // target: 'http://192.168.0.62:8080', //wf
         // target: 'http://192.168.0.11', //ys
-        // target: 'http://192.168.0.125:8080', //hyq
+        target: 'http://192.168.0.125:8080', //hyq
         // target: 'http://dev.ycjcjy.com/', //frp
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         // pathRewrite: {

src/pages/system/cardAndCouponManager/cardManager/edit.vue

     <form class="mainForm">
       <ul>
         <li class="flex-h">
-          <span>选择案场：</span>
+          <span>选择案场：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select v-model="cardInfo.CaseId" placeholder="请选择" @change="caseChange">
           </div>
         </li>
         <li class="flex-h">
-          <span>卡图片：</span>
+          <span>卡图片：<em>*</em></span>
           <div class="flex-item">
             <div>
               <el-upload
           </div>
         </li>
         <li class="flex-h">
-          <span>卡名称：</span>
+          <span>卡名称：<em>*</em></span>
           <div class="flex-item">
             <div style="width:200px;">
               <el-input
           </div>
         </li>
         <li class="flex-h">
-          <span>卡价格：</span>
+          <span>卡价格：<em>*</em></span>
           <div class="flex-item">
             <div style="width:200px;">
               <el-input
           </div>
         </li>
         <li class="flex-h">
-          <span>总张数：</span>
+          <span>总张数：<em>*</em></span>
           <div class="flex-item">
             <div style="width:200px;">
               <el-input
           </div>
         </li>
         <li class="flex-h">
-          <span>发送类型：</span>
+          <span>发送类型：<em>*</em></span>
           <div class="flex-item">
             <div>
               <el-radio v-model="cardInfo.SendType" label="channel">渠道</el-radio>
           </div>
         </li>
         <li class="flex-h" v-if="cardInfo.SendType === 'channel'">
-          <span>选择渠道：</span>
+          <span>选择渠道：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select v-model="cardInfo.ChannelId" placeholder="请选择">
           </div>
         </li>
         <li class="flex-h">
-          <span>目标课程：</span>
+          <span>目标课程：<em>*</em></span>
           <div class="flex-item">
             <div>
               <el-select v-model="cardInfo.Targets[0].TargetId" placeholder="请选择">
           </div>
         </li>
         <li class="flex-h">
-          <span>卡有效时间：</span>
+          <span>卡有效时间：<em>*</em></span>
           <div class="flex-item">
             <div>
               <div class="addLine flex-h" style="align-item:center;margin-bottom:20px;">
-                <!-- <el-date-picker
-                  v-model="cardInfo.StartDate"
-                  type="date"
-                  placeholder="选择起始日期">
-                </el-date-picker>
-                <span style="line-height:40px;">至</span>
-                <el-date-picker
-                  v-model="cardInfo.EndDate"
-                  type="date"
-                  placeholder="选择截止日期">
-                </el-date-picker> -->
                 <el-date-picker
                   v-model="date"
                   type="daterange"
           </div>
         </li>
         <li class="flex-h" v-if="cardInfo.SendType !== 'case' && cardInfo.SendType !== 'system'">
-          <span>视频：</span>
+          <span>视频：<em>*</em></span>
           <div class="flex-item">
             <div style="vertical-align: middle;">
               <a style="line-height: 40px;" v-if="videoOff" :href="cardInfo.VideoUrl" target="blank">{{cardInfo.VideoUrl}}</a>
           </div>
         </li>
         <li class="flex-h">
-          <span>分享描述：</span>
+          <span>分享描述：<em>*</em></span>
           <div class="flex-item">
             <div>
               <el-input
           </div>
         </li>
         <li class="flex-h">
-          <span>规则描述：</span>
+          <span>规则描述：<em>*</em></span>
           <div class="flex-item">
             <div>
               <el-input
           </div>
         </li>
         <li class="flex-h">
-          <span>使用说明：</span>
+          <span>使用说明：<em>*</em></span>
           <div class="flex-item">
             <div>
               <el-input
         TotalCount: '',
         CaseId: '',
         OrgId: '',
-        Share: {},
+        Share: {
+          CardShareInfo: '',
+          CardUseRule: '',
+          CardUseInstruction: '',
+        },
         Images: null,
         Targets: [{}],
         ChannelId: ''
     addGoods () { // 添加指定商品
       this.centerDialogVisible = true
     },
+    checkInfo () { // 校验表单信息
+      if (this.cardInfo.CaseId === '') {
+        this.$message({
+          type: 'error',
+          message: '案场不能为空'
+        })
+        return false
+      }
+      if (this.cardInfo.Images === '') {
+        this.$message({
+          type: 'error',
+          message: '卡图片不能为空'
+        })
+        return false
+      }
+      if (this.cardInfo.CardName === '') {
+        this.$message({
+          type: 'error',
+          message: '卡名称不能为空'
+        })
+        return false
+      }
+      if (this.cardInfo.Price === '') {
+        this.$message({
+          type: 'error',
+          message: '卡价格不能为空'
+        })
+        return false
+      }
+      if (this.cardInfo.TotalCount === '') {
+        this.$message({
+          type: 'error',
+          message: '总张数不能为空'
+        })
+        return false
+      }
+      if (this.cardInfo.SendType === '') {
+        this.$message({
+          type: 'error',
+          message: '发送类型不能为空'
+        })
+        return false
+      }
+      if (this.cardInfo.SendType === 'channel' && this.cardInfo.ChannelId === '') {
+        this.$message({
+          type: 'error',
+          message: '渠道不能为空'
+        })
+        return false
+      }
+      if (this.cardInfo.Targets[0].TargetId === '') {
+        this.$message({
+          type: 'error',
+          message: '目标课程不能为空'
+        })
+        return false
+      }
+      if (this.cardInfo.StartDate === '') {
+        this.$message({
+          type: 'error',
+          message: '开始时间不能为空'
+        })
+        return false
+      }
+      if (this.cardInfo.EndDate === '') {
+        this.$message({
+          type: 'error',
+          message: '截止时间不能为空'
+        })
+        return false
+      }
+      if (this.cardInfo.SendType === 'channel' && this.cardInfo.VideoUrl === '') {
+        this.$message({
+          type: 'error',
+          message: '视频不能为空'
+        })
+        return false
+      }
+      if (this.cardInfo.Share.CardShareInfo === '') {
+        this.$message({
+          type: 'error',
+          message: '分享描述不能为空'
+        })
+        return false
+      }
+      if (this.cardInfo.Share.CardUseRule === '') {
+        this.$message({
+          type: 'error',
+          message: '使用规则不能为空'
+        })
+        return false
+      }
+      if (this.cardInfo.Share.CardUseInstruction === '') {
+        this.$message({
+          type: 'error',
+          message: '使用说明不能为空'
+        })
+        return false
+      }
+    },
     submit () { // 保存
+      if (!this.checkInfo()) {
+        return false
+      }
       if (this.$route.query.id) {
         if (this.date !== '') {
           this.cardInfo.StartDate = this.date[0]
           }
         }
         this.cardInfo.TotalCount = this.cardInfo.TotalCount - 0
-        console.log(JSON.stringify(this.cardInfo))
         this.editCard(this.cardInfo).then((res) => {
-          this.$alert('操作成功', '提示', {
-            confirmButtonText: '确定',
-            callback: action => {
-              this.$router.push({ name: 'cardList' })
-            }
+          this.$message({
+            type: 'success',
+            message: '操作成功'
           })
+          this.$router.push({ name: 'cardList' })
         })
       } else {
         this.cardInfo.OrgId = this.OrgId

src/pages/system/cardAndCouponManager/couponManager/edit.vue

       <!-- <h1 style="font-size:22px;">{{isEdit === 0 ? '新建' : '编辑'}}{{couponInfo.CouponType === 'goods' ? '饮品优惠券' : '课程优惠券'}}</h1> -->
       <ul>
         <li class="flex-h">
-          <span>选择案场：</span>
+          <span>选择案场：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select v-model="couponInfo.CaseId" placeholder="请选择" @change="caseChange">
           </div>
         </li>
         <li class="flex-h">
-          <span>券图片：</span>
+          <span>券图片：<em>*</em></span>
           <div class="flex-item">
             <div>
               <el-upload
           </div>
         </li>
         <li class="flex-h">
-          <span>券名称：</span>
+          <span>券名称：<em>*</em></span>
           <div class="flex-item">
             <div style="width:200px;">
               <el-input
           </div>
         </li>
         <li class="flex-h">
-          <span>券类型：</span>
+          <span>券类型：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select v-model="couponInfo.CouponType" placeholder="请选择" @change="couponTypeChange">
           </div>
         </li>
         <li class="flex-h">
-          <span>券价格：</span>
+          <span>券价格：<em>*</em></span>
           <div class="flex-item">
             <div style="width:200px;">
               <el-input
           </div>
         </li>
         <li class="flex-h">
-          <span>总张数：</span>
+          <span>总张数：<em>*</em></span>
           <div class="flex-item">
             <div style="width:200px;">
               <el-input
           </div>
         </li>
         <li class="flex-h">
-          <span>发送类型：</span>
+          <span>发送类型：<em>*</em></span>
           <div class="flex-item">
             <div>
               <el-radio v-model="couponInfo.SendType" label="channel">渠道</el-radio>
           </div>
         </li>
         <li class="flex-h" v-if="couponInfo.SendType === 'channel'">
-          <span>选择渠道：</span>
+          <span>选择渠道：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select v-model="couponInfo.ChannelId" placeholder="请选择">
           </div>
         </li>
         <li class="flex-h">
-          <span>目标商品：</span>
+          <span>目标商品：<em>*</em></span>
           <div class="flex-item">
             <div>
               <el-radio v-model="couponInfo.IsAll" label="1">全部商品</el-radio>
           </div>
         </li>
         <li class="flex-h" v-if="couponInfo.CouponType === 'goods'">
-          <span>券有效时间：</span>
+          <span>券有效时间：<em>*</em></span>
           <div class="flex-item">
             <div>
               <div class="addLine flex-h" style="align-item:center;margin-bottom:20px;">
           </div>
         </li>
         <li class="flex-h" v-if="couponInfo.CouponType === 'course'">
-          <span>券有效时间：</span>
+          <span>券有效时间：<em>*</em></span>
           <div class="flex-item">
             <div>
               <el-date-picker
           </div>
         </li>
         <li class="flex-h" v-if="couponInfo.SendType !== 'case' && couponInfo.SendType !== 'system'">
-          <span>视频：</span>
+          <span>视频：<em>*</em></span>
           <div class="flex-item">
             <div style="vertical-align: middle;">
               <a style="line-height: 40px;" v-if="videoOff" :href="couponInfo.VideoUrl" target="blank">{{couponInfo.VideoUrl}}</a>
           </div>
         </li>
         <li class="flex-h">
-          <span>分享描述：</span>
+          <span>分享描述：<em>*</em></span>
           <div class="flex-item">
             <div>
               <el-input
           </div>
         </li>
         <li class="flex-h">
-          <span>规则描述：</span>
+          <span>规则描述：<em>*</em></span>
           <div class="flex-item">
             <div>
               <el-input
           </div>
         </li>
         <li class="flex-h">
-          <span>使用说明：</span>
+          <span>使用说明：<em>*</em></span>
           <div class="flex-item">
             <div>
               <el-input
         })
       }
     },
+    checkInfo () { // 校验表单信息
+      if (this.couponInfo.CaseId === '') {
+        this.$message({
+          type: 'error',
+          message: '案场不能为空'
+        })
+        return false
+      }
+      if (this.couponInfo.Images[0].CouponImageUrl === '') {
+        this.$message({
+          type: 'error',
+          message: '券图片不能为空'
+        })
+        return false
+      }
+      if (this.couponInfo.CouponName === '') {
+        this.$message({
+          type: 'error',
+          message: '券名称不能为空'
+        })
+        return false
+      }
+      if (this.couponInfo.CouponType === '') {
+        this.$message({
+          type: 'error',
+          message: '券类型不能为空'
+        })
+        return false
+      }
+      if (this.couponInfo.Price === '') {
+        this.$message({
+          type: 'error',
+          message: '券价格不能为空'
+        })
+        return false
+      }
+      if (this.couponInfo.TotalCount === '') {
+        this.$message({
+          type: 'error',
+          message: '总张数不能为空'
+        })
+        return false
+      }
+      if (this.couponInfo.SendType === '') {
+        this.$message({
+          type: 'error',
+          message: '发送类型不能为空'
+        })
+        return false
+      }
+      if (this.couponInfo.SendType === 'channel' && this.couponInfo.ChannelId === '') {
+        this.$message({
+          type: 'error',
+          message: '渠道不能为空'
+        })
+        return false
+      }
+      if (this.couponInfo.IsAll === 0 && this.couponInfo.Targets[0].TargetId === '') {
+        this.$message({
+          type: 'error',
+          message: '目标商品不能为空'
+        })
+        return false
+      }
+      if (this.couponInfo.SendType === 'channel' && this.couponInfo.VideoUrl === '') {
+        this.$message({
+          type: 'error',
+          message: '视频不能为空'
+        })
+        return false
+      }
+      if (this.couponInfo.Share.CouponShareInfo === '') {
+        this.$message({
+          type: 'error',
+          message: '分享描述不能为空'
+        })
+        return false
+      }
+      if (this.couponInfo.Share.UseRule === '') {
+        this.$message({
+          type: 'error',
+          message: '使用规则不能为空'
+        })
+        return false
+      }
+      if (this.couponInfo.Share.UseInstruction === '') {
+        this.$message({
+          type: 'error',
+          message: '使用说明不能为空'
+        })
+        return false
+      }
+    },
     submit () { // 保存
+      if (!this.checkInfo()) {
+        return false
+      }
       if (this.$route.query.id) {
         if (this.couponInfo.ValidDays) {
           this.couponInfo.StartDate = undefined

src/pages/system/caseManager/keyManager/add.vue

       this.postData.AreaIcon = res.result.url
     },
     submit () { // 提交数据
+      console.log('柜子编号:' + this.postData.beginnum + ' ' + this.postData.endnum)
       if (this.postData.beginnum === '') {
         this.$message({
           type: 'error',
         })
         return false
       }
-      console.log('柜子编号:' + this.postData.beginnum + ' ' + this.postData.endnum)
       this.postData.orgid = this.OrgId
       this.$ajax(this.$api.caseManager.addKey.url, {
         method: this.$api.caseManager.addKey.method,

src/pages/system/verificationManager/drawVerification/verificationList/index.vue

               </el-table-column>
             </el-table>
         </div>
-        <span class="noData" v-if="!info.length && ajaxOff">今日暂无可核销的课程</span>
+        <span class="noData" v-if="!info.length && ajaxOff">查不到当前信息，请核对二维码或详情</span>
       </div>
     </div>
   </div>

src/pages/system/verificationManager/phoneVerification/verificationList/index.vue

                 </template>
               </el-table-column>
               <el-table-column
-                label="操作">
+                label="操作"
+                width="200">
                 <template slot-scope="scope">
                   <el-button
                     size="mini"
                     type="success"
                     v-if="scope.row.VerifyStatus!=='used'"
                     @click="check(scope.row)">核销</el-button>
-                  <span v-else>已完成</span>
+                  <el-button
+                    size="mini"
+                    type="info"
+                    v-else>已完成</el-button>
                 </template>
               </el-table-column>
             </el-table>
             :total="courses.pagenum">
           </el-pagination>
         </div>
-        <span class="noData" v-else>今日暂无可核销的课程</span>
+        <span class="noData" v-else>查不到当前信息，请核对手机号或详情</span>
       </div>
     </div>
+    <el-dialog
+      title="选择绑定钥匙"
+      :visible.sync="centerDialogVisible"
+      width="400"
+      center>
+      <div>
+        <el-table
+          :data="dialogList"
+          stripe
+          style="width: 100%">
+          <el-table-column
+            prop="CustomerName"
+            label="当前用户">
+          </el-table-column>
+          <el-table-column
+            prop="LockNo"
+            label="锁柜号">
+          </el-table-column>
+          <el-table-column
+            prop="Status"
+            label="状态">
+            <template slot-scope="scope">
+              {{scope.row.Status === 1 ? '有人' : '无人'}}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            width="200">
+            <template slot-scope="scope">
+              <el-button
+                v-if="scope.row.Status === 0"
+                size="mini"
+                type="success"
+                @click="toBindKey(scope.row)">绑定</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          @current-change="handleCurrentChangeDialog"
+          :current-page.sync="postData.page"
+          :page-size="postData.pagesize"
+          layout="prev, pager, next, jumper"
+          :total="dialogTotal">
+        </el-pagination>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="centerDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
+    <el-dialog
+      title="提示"
+      :visible.sync="dialogVisible"
+      width="200">
+      <span>确认核销此课程</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="sureVerify">确 定</el-button>
+        <el-button type="primary" @click="sureAndBind">确定并绑定钥匙</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { createNamespacedHelpers } from 'vuex'
+import { mapState, createNamespacedHelpers } from 'vuex'
 
 const { mapState: mapVerifState, mapActions: mapVerifActions } = createNamespacedHelpers('verification')
+const { mapActions: mapDeviceActions } = createNamespacedHelpers('device')
 
 export default {
   name: '',
   data () {
     return {
+      dialogVisible: false,
+      dialogList: [],
+      centerDialogVisible: false,
+      customerId: '',
       customerName: '',
       phone: this.$route.query.tel,
       code: '',
       tel: '',
       page: 1,
       pagesize: 10,
+      postData: {
+        caseid: '',
+        page: 1,
+        pagesize: 6,
+      },
+      dialogTotal: 0,
     }
   },
   mounted () {
     this.$nextTick(function () {
-      this.getCustomerName({
-        id: this.phone
-      }).then((res) => {
-        console.log(res)
-        const { code, tel } = this.$route.query
-        this.code = code
-        this.tel = tel
-        this.getList()
-      })
+      this.init()
     })
   },
   computed: {
+    ...mapState({
+      cases: x => x.app.cases.list,
+      defaultCaseId: x => x.app.cases.default,
+      OrgId: x => x.app.user.OrgId,
+    }),
+    CaseId: {
+      get () {
+        return this.postData.caseid || this.defaultCaseId
+      },
+      set (val) {
+        this.postData.caseid = val
+      }
+    },
     ...mapVerifState({
       courses: x => x.courseVerifs
-    })
+    }),
   },
   methods: {
     ...mapVerifActions([
       'GetCourseVerListByTel',
       'getCustomerName'
     ]),
+    ...mapDeviceActions([
+      'getKeyList',
+      'bindKeyer',
+    ]),
+    init () {
+      this.getCustomerName({
+        id: this.phone
+      }).then((res) => {
+        if (res !== null) {
+          this.customerId = res.CustomerId
+          this.customerName = res.CustomerName
+          const { code, tel } = this.$route.query
+          this.code = code
+          this.tel = tel
+          this.getList()
+        } else {
+          this.$message({
+            type: 'error',
+            message: '未查询到用户信息'
+          })
+        }
+      })
+    },
     check (item) { // 核销
-      this.$confirm('确认核销此课程?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      this.currentItem = item
+      this.dialogVisible = true
+    },
+    sureVerify () {
+      this.CourseVerifs({ id: this.currentItem.CustomerDetailId, callback: this.afterCheck })
+      this.dialogVisible = false
+    },
+    sureAndBind () {
+      this.dialogVisible = false
+      this.getKeyList({
+        ...this.postData,
+        caseid: this.CaseId,
+      }).then((res) => {
+        // console.log(JSON.stringify(res))
+        this.dialogTotal = res.pagenum
+        this.dialogList = res.list
+        this.centerDialogVisible = true
       })
-        .then(() => {
-          this.CourseVerifs({id: item.CustomerDetailId, callback: this.afterCheck})
-        })
     },
     getList () {
       if (this.code && this.code !== '') {
-        this.GetCourseVerList({id: this.code, page: this.page, pagesize: this.pagesize})
+        this.GetCourseVerList({ id: this.code, page: this.page, pagesize: this.pagesize })
       } else {
         if (this.tel && this.tel !== '') {
-          this.GetCourseVerListByTel({tel: this.tel, page: this.page, pagesize: this.pagesize})
+          this.GetCourseVerListByTel({ tel: this.tel, page: this.page, pagesize: this.pagesize })
         }
       }
     },
       this.getList()
     },
     reback () { // 返回
-      this.$router.push({name: 'phoneVerification'})
+      this.$router.push({ name: 'phoneVerification' })
+    },
+    bindKey (item) { // 绑定钥匙
+    },
+    handleCurrentChangeDialog (val) {
+      this.postData.page = val
+      this.getKeyList({
+        ...this.postData,
+        caseid: this.CaseId,
+      }).then((res) => {
+        // console.log(JSON.stringify(res))
+        this.dialogTotal = res.pagenum
+        this.dialogList = res.list
+        this.centerDialogVisible = true
+      })
+    },
+    toBindKey (item) {
+      this.bindKeyer({
+        keyid: item.KeyId,
+        customerid: this.customerId,
+        customername: this.customerName
+      }).then((res) => {
+        // console.log(JSON.stringify(res))
+        this.CourseVerifs({ id: this.currentItem.CustomerDetailId, callback: this.afterCheck })
+        this.centerDialogVisible = false
+        this.postData.page = 1
+        this.dialogList = []
+        this.init()
+      })
     },
   }
 }
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss" scoped>
 .subPage {
-  .userInfo{
+  .userInfo {
     white-space: nowrap;
     font-size: 0;
-    >*{
+    > * {
       display: inline-block;
       margin-right: 10px;
     }
-    >b{
+    > b {
       font-weight: bolder;
       font-size: 15px;
       margin-right: 30px;
       }
     }
   }
-  .noData{
+  .noData {
     width: 100%;
     display: block;
     line-height: 40px;

src/pages/system/verificationManager/qrcodeVerification/verificationList/index.vue

               </el-table-column>
             </el-table>
         </div>
-        <span class="noData" v-else>今日暂无可核销的课程</span>
+        <span class="noData" v-else>查不到当前信息，请核对二维码或详情</span>
       </div>
     </div>
   </div>

src/store/case/device.js

     },
   },
   actions: {
+    bindKeyer ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        ajax(api.caseManager.bindKey.url, {
+          method: api.caseManager.bindKey.method,
+          urlData: { ...payload },
+        }).then(res => {
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    getKeyList ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        ajax(api.caseManager.getKeyListById.url, {
+          method: api.caseManager.getKeyListById.method,
+          queryData: { ...payload },
+        }).then(res => {
+          resolve(res)
+        }).catch(reject)
+      })
+    },
     GetDeviceList ({ commit }, payload) {
       return new Promise((resolve, reject) => {
         ajax(api.device.list.url, {

src/util/api.js

     },
   },
   caseManager: {
+    getKeyListById: {
+      method: 'get',
+      url: `${baseUrl}${common}/case/key`
+    },
+    bindKey: {
+      method: 'post',
+      url: `${baseUrl}${common}/case/key/:keyid/:customerid/:customername`
+    },
     getRolesList: { // 获取角色列表
       method: 'get',
       url: `${baseUrl}${common}/role`