Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/pc-admin

src/config/api.js

@@ -275,6 +275,10 @@ const apis = {
     change: {
       method: 'put',
       url: `${commPrefix}/taPointsExchange/change`
+    },
+    update: {
+      method: 'put',
+      url: `${commPrefix}/taPointsExchange/:id`
     }
   },
   carouselFigure:{ // 轮播图列表查询

src/store/modules/exchange.js

@@ -112,19 +112,15 @@ export default {
         })
       })
     },
-    cancelDynamic (_, payload) {
+    verifyById (_, payload) {
       return new Promise((resolve, reject) => {
         request({
-          ...apis.dynamic.cancel,
+          ...apis.exchange.update,
           urlData: payload,
         }).then((data) => {
           resolve(data)
         }).catch((err) => {
-          const message = err.message || err.msg
-
-          if (typeof message === 'string') {
-            reject(message)
-          }
+          reject(err)
         })
       })
     }

src/views/exchange/verify.vue

@@ -27,8 +27,14 @@
         </div>
       </el-col>
     </el-row>
-    <el-button type="danger" style="margin:20px auto 0 auto;display:block" round>立即核销</el-button>
-    
+    <el-button type="danger" @click="showVerifyDialog = true" style="margin:20px auto 0 auto;display:block" round>立即核销</el-button>
+    <el-dialog title="核销数据" :visible.sync="showVerifyDialog">
+      <el-form>
+        <el-form-item label="扫描二维码数据">
+          <el-input v-model="verifyId" @keyup.enter.native="verifyEnter" placeholder="请用扫码枪扫描二维码"></el-input>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
   </el-tab-pane>
   <el-tab-pane label="手机号核销">
     <el-row>
@@ -81,6 +87,8 @@ export default {
         status: ""
       },
       verifyPhone: "",
+      verifyId: "",
+      showVerifyDialog: false,
       list: [],
       pageNavi: {
         current: 1,
@@ -91,7 +99,7 @@ export default {
   },
   computed: {},
   methods: {
-    ...mapExchangeActions(["getExchanges"]),
+    ...mapExchangeActions(["getExchanges", "verifyById"]),
     getList() {
       const pageNumber = this.pageNavi.current || 1;
       const pageSize = this.pageNavi.size;
@@ -114,7 +122,23 @@ export default {
     addGoods() {
       this.$router.push({ name: "goods.edit" });
     },
+    verifyEnter() {
+      this.verifyById({
+        id: this.verifyId
+      })
+        .then(res => {
+         this.$notify.info("核销成功");
+         this.showVerifyDialog = false;
+        })
+        .catch(err => {
+          this.$notify.error(err.msg || err.message);
+        });
+    },
     verifyTel() {
+      if(this.verifyPhone === ""){
+        this.$notify.error("请输入手机号");
+        return;
+      }
       this.$router.push({
         name: "verify.list",
         params: { tel: this.verifyPhone }