Merge branch 'feature/7月迭代-会员'

src/components/allCustomers/info.js

@@ -183,7 +183,7 @@ export default {
     count: function (n, o) {
       if (n === 3) {
         this.fullscreenLoading = false;
-        if (this.memberInfo.erpIntegralFlag) {
+        if (this.memberInfo.erpIntegralFlag && (this.memberInfo.cardNum || '').length > 0) { // cardNum为空不请求
           doFetchGet(url.getErpIntegral, { cardNo: this.memberInfo.cardNum || ''})
             .then(res => {
               if (res.data.errorCode === 0) {

src/components/wechatmembers/cardvoucher.vue

@@ -346,7 +346,7 @@
 </template>
 
 <script>
-import mixin from './cardMixin';
+import mixin from './integralMixin';
 import nav from "../../common/navbar/navbar.vue";
 import { doFetch } from "../../components/axios/api";
 import url from "../../components/axios/url";