fix: 修改品牌不调用接口

d1973d58 · 无尘 · 23c206ff · d1973d58 · d1973d58 · d1973d58
Commit d1973d58 authored Jul 19, 2019 by 无尘
7 changed files
--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=favicon.ico><title></title><link href=css/chunk-22470e30.9fc010f7.css rel=prefetch><link href=css/chunk-4a4fbe1a.05a38bb0.css rel=prefetch><link href=css/chunk-5179e400.c48503d9.css rel=prefetch><link href=css/chunk-8ba63460.244ad228.css rel=prefetch><link href=css/chunk-8e82d01e.3cba777f.css rel=prefetch><link href=css/chunk-a1dc0af2.18cdfd01.css rel=prefetch><link href=js/chunk-22470e30.b60df800.js rel=prefetch><link href=js/chunk-4a4fbe1a.a502276c.js rel=prefetch><link href=js/chunk-5179e400.94a7a630.js rel=prefetch><link href=js/chunk-8ba63460.59cbeda3.js rel=prefetch><link href=js/chunk-8e82d01e.f0ccac3f.js rel=prefetch><link href=js/chunk-a1dc0af2.4abe4286.js rel=prefetch><link href=css/app.26b754ca.css rel=preload as=style><link href=js/app.a230da98.js rel=preload as=script><link href=js/chunk-vendors.63e5230c.js rel=preload as=script><link href=css/app.26b754ca.css rel=stylesheet></head><body><div id=app></div><script src=js/chunk-vendors.63e5230c.js></script><script src=js/app.a230da98.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=favicon.ico><title></title><link href=css/chunk-22470e30.9fc010f7.css rel=prefetch><link href=css/chunk-4a4fbe1a.05a38bb0.css rel=prefetch><link href=css/chunk-5179e400.c48503d9.css rel=prefetch><link href=css/chunk-8ba63460.244ad228.css rel=prefetch><link href=css/chunk-8e82d01e.3cba777f.css rel=prefetch><link href=css/chunk-a1dc0af2.18cdfd01.css rel=prefetch><link href=js/chunk-22470e30.b60df800.js rel=prefetch><link href=js/chunk-4a4fbe1a.a502276c.js rel=prefetch><link href=js/chunk-5179e400.94a7a630.js rel=prefetch><link href=js/chunk-8ba63460.59cbeda3.js rel=prefetch><link href=js/chunk-8e82d01e.f0ccac3f.js rel=prefetch><link href=js/chunk-a1dc0af2.75550498.js rel=prefetch><link href=css/app.26b754ca.css rel=preload as=style><link href=js/app.bc2de622.js rel=preload as=script><link href=js/chunk-vendors.63e5230c.js rel=preload as=script><link href=css/app.26b754ca.css rel=stylesheet></head><body><div id=app></div><script src=js/chunk-vendors.63e5230c.js></script><script src=js/app.bc2de622.js></script></body></html>
\ No newline at end of file
--- a/dist/js/app.a230da98.js
+++ b/dist/js/app.a230da98.js
--- a/dist/js/app.a230da98.js.map
+++ b/dist/js/app.a230da98.js.map
--- a/dist/js/chunk-a1dc0af2.4abe4286.js.map
+++ b/dist/js/chunk-a1dc0af2.4abe4286.js.map
--- a/dist/js/chunk-a1dc0af2.4abe4286.js
+++ b/dist/js/chunk-a1dc0af2.4abe4286.js
--- a/dist/js/chunk-a1dc0af2.75550498.js.map
+++ b/dist/js/chunk-a1dc0af2.75550498.js.map
--- a/src/views/pointMall/index.vue
+++ b/src/views/pointMall/index.vue
@@ -195,8 +195,8 @@ export default {
        appkey: '', // 获取 token 用
        activityUrl: '' // 积分抽奖地址
      },
-      activeBrand: '',
+      activeBrand: '女装',
-      brandsData: [],
+      brandsData: ['女装','男装','乐町','MG','童装'],
      logoList: [
        {
          brandName: '女装',
@@ -384,8 +384,6 @@ export default {
          })
        }
        that.cardsData = resData.data;
-        /* eslint-disable */
-        console.log(that.cardsData )
      }else {
        Toast(resData.errorMessage);
      }
@@ -451,9 +449,8 @@ export default {
      if (resData.errorCode == 0) {
        that.token = resData.data.userToken;
        that.$nextTick(() => {
-          Promise.all([that.getBrand(),that.getData()]).then(function() {
+          that.getCardsData(0);
-            that.getCardsData(0);
+          that.getData();
-          });
        })
      }else {
        Toast(resData.errorMessage);