Merge branch 'feature/会员标签调整' into dev

src/components/axios/url.js

@@ -80,7 +80,8 @@ const urlConfig = {
   getBlockList: '/api-member/enteprise-black-list-page', // 黑名单列表
   addToWhiteList: '/api-member/update-member-white-list', // 加入白名单
   memberTagGroupDetail: '/api-member/member-tag-group-detail', //会员分组详情
-  memberStoredRecordList: '/api-member/member-stored-record-list' //储值列表(储值明细列表)
+  memberStoredRecordList: '/api-member/member-stored-record-list', //储值列表(储值明细列表)
+  memberStoredTypeList: '/api-member/member-stored-type-list'// 储值列表-储值类型
 }
 
 const defaultUrl = Object.assign({}, urlConfig);

src/components/wechatmembers/storedValue.vue

@@ -11,9 +11,9 @@
             @change="handleChange"
             >
             <el-option
-                v-for="item in selectData"
+                v-for="item in typeList"
                 :key="item.value"
-                :label="item.label"
+                :label="item.key"
                 :value="item.value"
             ></el-option>
             </el-select>
@@ -160,6 +160,12 @@ export default ({
         totalCount: 0
       },
       listData:[],
+      typeList:[
+          {
+              value: 0, 
+              key: "所有"
+          }
+      ],
       searchType:0,
       beginTime: "",
       endTime: "",
@@ -190,6 +196,8 @@ export default ({
       }
   },
   mounted(){
+      console.log('ss');
+     this.memberStoredTypeList()
      this.getListData();
   },
   methods:{
@@ -208,6 +216,19 @@ export default ({
       this.page.pageSize = val;
       this.getListData();
     },
+    memberStoredTypeList() {
+        doFetch(url.memberStoredTypeList).then(res => {
+          if (res.data.response.errorCode === 0) {
+            const {typeList=[]} = res.data.response.result;
+            this.typeList = this.typeList.concat(typeList);
+          } else {
+            checkFalse(res.data.message);
+          }
+        })
+        .catch(err => {
+          checkStatus(err);
+        });
+    },
     getListData() {
         doFetch(url.memberStoredRecordList,{
         memberId: this.memberId,

src/components/wechatmembers/wechatTotalDetail.js

@@ -464,7 +464,7 @@ export default {
     },
     goStoreValue(val) {
       if(this.memberInfo.storedValueFlag) {
-        this.$router.push({ path: '/storeValue', query: { memberId: this.memberId } });
+        this.$router.push({ path: '/storedValue', query: { memberId: this.memberId } });
       }else {
         this.$message.info("未对接储值明细，暂无数据");
       }

src/components/wechatmembers/wechatmemberDetail.js

@@ -445,7 +445,7 @@ export default {
     },
     goStoreValue(val) {
       if(this.memberInfo.storedValueFlag) {
-        this.$router.push({ path: '/storeValue', query: { memberId: this.memberId } });
+        this.$router.push({ path: '/storedValue', query: { memberId: this.memberId } });
       }else {
         this.$message.info("未对接储值明细，暂无数据");
       }