Merge branch 'feature/8月迭代下'

src/components/posmembers/posmembers.js

@@ -8,7 +8,7 @@ import {
   checkStatus,
   checkSuccess
 } from "../../../static/js/checkStatus";
-import { formatLongTime, paddingBorth } from "@/utils/utils";
+import { formatLongTime, paddingBorth, debounce } from "@/utils/utils";
 import { mapState } from "vuex";
 import UserInfoCard from '../wechatmembers/UserInfoCard.vue'
 
@@ -137,7 +137,8 @@ export default {
         phoneStatus: 0,
         authStatus: 0
       },
-      integralFlag: ""
+      integralFlag: "",
+      debounce
     };
   },
   computed: {
@@ -442,7 +443,6 @@ export default {
           if (this.storeForm.subOptType == 3) {
             this.storeForm.fromSubStoreId = this.storeForm.deleteSubStoreId;
           }
-
           doFetch(url.updateStore, {
             memberIds: this.selectAll == true ? "-1" : memberIdsArr.join(","),
             remark: this.storeForm.remark,

src/components/posmembers/posmembers.vue

@@ -716,7 +716,7 @@
             <el-button @click="dialogMainstoreVisible = false">取 消</el-button>
             <el-button
               type="primary"
-              @click="submitMainStore('mainstoreForm')"
+              @click="debounce(submitMainStore,300)('mainstoreForm')"
             >确 定</el-button>
           </div>
         </el-dialog>
@@ -811,7 +811,7 @@
             <el-button @click="dialogSubStoreVisible = false">取 消</el-button>
             <el-button
               type="primary"
-              @click="submitStore('storeForm')"
+              @click="debounce(submitStore,300)('storeForm')"
             >确 定</el-button>
           </div>
         </el-dialog>

src/components/wechatmembers/frozenMember.vue

@@ -378,6 +378,7 @@ export default {
       }
     },
     getList(options) {
+      console.log(options);
       const datas = {
         pageSize: options.pSize,
         currentPage: options.cPage,
@@ -388,8 +389,9 @@ export default {
           "name,nickName,photoUrl,cardNo,crateCardDateString,wxMember,posMember"
       };
       doFetch("/api-member/ajax-members-do-frozen", datas).then(res => {
+        console.log(res.data);
         if (res.data.errorCode === 0) {
-          if (res.data.result.result.length > 0) {
+          if (res.data.result.result && res.data.result.result.length > 0) {
             this.frozenList = res.data.result.result.map(ele => ({
               ...ele,
               cardNum: ele.cardNum ? ele.cardNum : "--",

src/components/wechatmembers/total.js

@@ -8,7 +8,7 @@ import {
   checkStatus,
   checkSuccess
 } from "../../../static/js/checkStatus";
-import { formatLongTime, paddingBorth } from "@/utils/utils";
+import { formatLongTime, paddingBorth, debounce } from "@/utils/utils";
 import { mapState } from "vuex";
 import UserInfoCard from './UserInfoCard.vue'
 
@@ -142,7 +142,8 @@ export default {
         phoneStatus: 0,
         authStatus: 0
       },
-      integralFlag: ""
+      integralFlag: "",
+      debounce
     };
   },
   computed: {

src/components/wechatmembers/wechat-total.vue

@@ -716,7 +716,7 @@
             <el-button @click="dilogMainstoreVisible = false">取 消</el-button>
             <el-button
               type="primary"
-              @click="submitMainStore('mainstoreForm')"
+              @click="debounce(submitMainStore, 300)('mainstoreForm')"
             >确 定</el-button>
           </div>
         </el-dialog>
@@ -812,7 +812,7 @@
             <el-button @click="dilogSubStoreVisible = false">取 消</el-button>
             <el-button
               type="primary"
-              @click="submitStore('storeForm')"
+              @click="debounce(submitStore, 300)('storeForm')"
             >确 定</el-button>
           </div>
         </el-dialog>

src/components/wechatmembers/wechatmembers.js

@@ -8,7 +8,7 @@ import {
   checkStatus,
   checkSuccess
 } from "../../../static/js/checkStatus";
-import { formatLongTime, paddingBorth } from "@/utils/utils";
+import { formatLongTime, paddingBorth, debounce } from "@/utils/utils";
 import { mapState } from "vuex";
 import UserInfoCard from './UserInfoCard.vue'
 
@@ -143,7 +143,8 @@ export default {
         phoneStatus: 0,
         authStatus: 0
       },
-      integralFlag: ""
+      integralFlag: "",
+      debounce
     };
   },
   computed: {

src/components/wechatmembers/wechatmembers.vue

@@ -713,7 +713,7 @@
             <el-button @click="dilogMainstoreVisible = false">取 消</el-button>
             <el-button
               type="primary"
-              @click="submitMainStore('mainstoreForm')"
+              @click="debounce(submitMainStore,300)('mainstoreForm')"
             >确 定</el-button>
           </div>
         </el-dialog>
@@ -808,7 +808,7 @@
             <el-button @click="dilogSubStoreVisible = false">取 消</el-button>
             <el-button
               type="primary"
-              @click="submitStore('storeForm')"
+              @click="debounce(submitStore,300)('storeForm')"
             >确 定</el-button>
           </div>
         </el-dialog>

src/utils/utils.js

@@ -102,4 +102,17 @@ export function findAnyComponent(context, componentName, root = null) {
     }
   }
   return children;
-}
\ No newline at end of file
+}
+
+export function debounce(func, wait) {
+  let timeout;
+
+  return function(...args) {
+    console.log(args);
+    let that = this;
+    clearTimeout(timeout);
+    timeout = setTimeout(_ => {
+      func.apply(that, args);
+    }, wait);
+  };
+}