Skip to content

W
wechat-web
Commit 03d407c2 by 无尘
Options

fix: 修改 路由模式为： history

parent 6cdfa29e
Showing with 25 additions and 11 deletions
changelog.md
## [1.0.1](http://115.159.76.241/wechat/wechat-web/compare/v1.0.0...v1.0.1) (2019-02-22)
## [1.0.1](http://115.159.76.241/wechat/wechat-web/compare/v1.0.0...v1.0.1) (2019-02-27)
### Bug Fixes
* 修改参数和接口返回一致 ([a0ade96](http://115.159.76.241/wechat/wechat-web/commits/a0ade96))
* 修改请求 url ([6cdfa29](http://115.159.76.241/wechat/wechat-web/commits/6cdfa29))
### Features
......
dist/css/chunk-2be2540f.aa575d63.css → dist/css/chunk-132a6dc5.720462c8.css
.card-contain[data-v-34f89b7e]{position:relative;width:100%;padding:.26667rem;background:#f4f5f6}.card-contain .card-contain-inner[data-v-34f89b7e]{width:100%}.card-contain .card-contain-inner .card-brand-list[data-v-34f89b7e]{width:100%;padding:0 .21333rem .21333rem .21333rem;background:#fff;border-radius:.13333rem}.card-contain .card-contain-inner .card-brand-list+.card-brand-list[data-v-34f89b7e]{margin-top:.26667rem}.card-contain .card-contain-inner .card-brand-list .card-brand-title[data-v-34f89b7e]{width:100%;height:1.2rem;line-height:1.2rem;font-size:.37333rem;color:#232326}.card-contain .card-contain-inner .card-brand-list .card-list-cell[data-v-34f89b7e]{width:100%;height:2.66667rem;background-image:url(../img/coupon_bg.99b2feae.png);background-size:100%;background-repeat:no-repeat;border-radius:.13333rem;background-color:rgba(63,187,101,.06);border:.02667rem solid rgba(63,187,101,.16);font-size:.29333rem;color:#333}.card-contain .card-contain-inner .card-brand-list .card-list-cell+.card-list-cell[data-v-34f89b7e]{margin-top:.26667rem}.card-contain .card-contain-inner .card-brand-list .card-list-cell .card-list-cell_top[data-v-34f89b7e]{width:100%;height:.93333rem;line-height:.93333rem;padding:0 .32rem;border-bottom:.02667rem dashed rgba(63,187,101,.16)}.card-contain .card-contain-inner .card-brand-list .card-list-cell .card-list-arrow[data-v-34f89b7e]{position:relative}.card-contain .card-contain-inner .card-brand-list .card-list-cell .card-list-arrow_left[data-v-34f89b7e]{position:absolute;left:-.16rem;top:-.16rem;width:.26667rem;height:.26667rem;-webkit-transform:rotate(45deg);transform:rotate(45deg);background-color:#fff;border-right:.02667rem solid rgba(63,187,101,.3);border-top:.02667rem solid rgba(63,187,101,.3)}.card-contain .card-contain-inner .card-brand-list .card-list-cell .card-list-arrow_right[data-v-34f89b7e]{position:absolute;right:-.16rem;top:-.16rem;width:.26667rem;height:.26667rem;-webkit-transform:rotate(45deg);transform:rotate(45deg);background-color:#fff;border-left:.02667rem solid rgba(63,187,101,.3);border-bottom:.02667rem solid rgba(63,187,101,.3)}.card-contain .card-contain-inner .card-brand-list .card-list-cell .card-list-cell_body[data-v-34f89b7e]{width:100%;height:1.73333rem}.card-contain .card-contain-inner .card-brand-list .card-list-cell .card-list-cell_body_left[data-v-34f89b7e]{height:100%;border-right:.02667rem dashed rgba(63,187,101,.13)}.card-contain .card-contain-inner .card-brand-list .card-list-cell .card-list-cell_body_right[data-v-34f89b7e]{padding-left:.4rem}.card-contain .card-contain-inner .card-brand-list .show-all[data-v-34f89b7e]{width:100%;height:.85333rem;line-height:1.06667rem;text-align:center}.card-contain .card-contain-inner .card-brand-list .show-all .van-icon-arrow-down[data-v-34f89b7e],.card-contain .card-contain-inner .card-brand-list .show-all .van-icon-arrow-up[data-v-34f89b7e]{vertical-align:middle}
\ No newline at end of file
.card-contain[data-v-1d1adfce]{position:relative;width:100%;padding:.26667rem;background:#f4f5f6}.card-contain .card-contain-inner[data-v-1d1adfce]{width:100%}.card-contain .card-contain-inner .card-brand-list[data-v-1d1adfce]{width:100%;padding:0 .21333rem .21333rem .21333rem;background:#fff;border-radius:.13333rem}.card-contain .card-contain-inner .card-brand-list+.card-brand-list[data-v-1d1adfce]{margin-top:.26667rem}.card-contain .card-contain-inner .card-brand-list .card-brand-title[data-v-1d1adfce]{width:100%;height:1.2rem;line-height:1.2rem;font-size:.37333rem;color:#232326}.card-contain .card-contain-inner .card-brand-list .card-list-cell[data-v-1d1adfce]{width:100%;height:2.66667rem;background-image:url(../img/coupon_bg.99b2feae.png);background-size:100%;background-repeat:no-repeat;border-radius:.13333rem;background-color:rgba(63,187,101,.06);border:.02667rem solid rgba(63,187,101,.16);font-size:.29333rem;color:#333}.card-contain .card-contain-inner .card-brand-list .card-list-cell+.card-list-cell[data-v-1d1adfce]{margin-top:.26667rem}.card-contain .card-contain-inner .card-brand-list .card-list-cell .card-list-cell_top[data-v-1d1adfce]{width:100%;height:.93333rem;line-height:.93333rem;padding:0 .32rem;border-bottom:.02667rem dashed rgba(63,187,101,.16)}.card-contain .card-contain-inner .card-brand-list .card-list-cell .card-list-arrow[data-v-1d1adfce]{position:relative}.card-contain .card-contain-inner .card-brand-list .card-list-cell .card-list-arrow_left[data-v-1d1adfce]{position:absolute;left:-.16rem;top:-.16rem;width:.26667rem;height:.26667rem;-webkit-transform:rotate(45deg);transform:rotate(45deg);background-color:#fff;border-right:.02667rem solid rgba(63,187,101,.3);border-top:.02667rem solid rgba(63,187,101,.3)}.card-contain .card-contain-inner .card-brand-list .card-list-cell .card-list-arrow_right[data-v-1d1adfce]{position:absolute;right:-.16rem;top:-.16rem;width:.26667rem;height:.26667rem;-webkit-transform:rotate(45deg);transform:rotate(45deg);background-color:#fff;border-left:.02667rem solid rgba(63,187,101,.3);border-bottom:.02667rem solid rgba(63,187,101,.3)}.card-contain .card-contain-inner .card-brand-list .card-list-cell .card-list-cell_body[data-v-1d1adfce]{width:100%;height:1.73333rem}.card-contain .card-contain-inner .card-brand-list .card-list-cell .card-list-cell_body_left[data-v-1d1adfce]{height:100%;border-right:.02667rem dashed rgba(63,187,101,.13)}.card-contain .card-contain-inner .card-brand-list .card-list-cell .card-list-cell_body_right[data-v-1d1adfce]{padding-left:.4rem}.card-contain .card-contain-inner .card-brand-list .show-all[data-v-1d1adfce]{width:100%;height:.85333rem;line-height:1.06667rem;text-align:center}.card-contain .card-contain-inner .card-brand-list .show-all .van-icon-arrow-down[data-v-1d1adfce],.card-contain .card-contain-inner .card-brand-list .show-all .van-icon-arrow-up[data-v-1d1adfce]{vertical-align:middle}
\ No newline at end of file
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-2be2540f.aa575d63.css rel=prefetch><link href=css/chunk-53e58b52.52b6d22f.css rel=prefetch><link href=css/chunk-6e279502.e435f517.css rel=prefetch><link href=css/chunk-74569dce.4a6355a1.css rel=prefetch><link href=css/chunk-779e6e30.be7eb860.css rel=prefetch><link href=js/chunk-2be2540f.8ce42874.js rel=prefetch><link href=js/chunk-53e58b52.a2411343.js rel=prefetch><link href=js/chunk-6e279502.ea96302a.js rel=prefetch><link href=js/chunk-74569dce.661eb8ec.js rel=prefetch><link href=js/chunk-779e6e30.f0b42150.js rel=prefetch><link href=css/app.e356cd6b.css rel=preload as=style><link href=js/app.54fc480b.js rel=preload as=script><link href=js/chunk-vendors.428c58b2.js rel=preload as=script><link href=css/app.e356cd6b.css rel=stylesheet></head><body><div id=app></div><script src=js/chunk-vendors.428c58b2.js></script><script src=js/app.54fc480b.js></script></body></html>
\ No newline at end of file
<!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-132a6dc5.720462c8.css rel=prefetch><link href=css/chunk-53e58b52.52b6d22f.css rel=prefetch><link href=css/chunk-6e279502.e435f517.css rel=prefetch><link href=css/chunk-74569dce.4a6355a1.css rel=prefetch><link href=css/chunk-779e6e30.be7eb860.css rel=prefetch><link href=js/chunk-132a6dc5.d34b95bc.js rel=prefetch><link href=js/chunk-53e58b52.a2411343.js rel=prefetch><link href=js/chunk-6e279502.ea96302a.js rel=prefetch><link href=js/chunk-74569dce.661eb8ec.js rel=prefetch><link href=js/chunk-779e6e30.f0b42150.js rel=prefetch><link href=css/app.e356cd6b.css rel=preload as=style><link href=js/app.2d26f11e.js rel=preload as=script><link href=js/chunk-vendors.428c58b2.js rel=preload as=script><link href=css/app.e356cd6b.css rel=stylesheet></head><body><div id=app></div><script src=js/chunk-vendors.428c58b2.js></script><script src=js/app.2d26f11e.js></script></body></html>
\ No newline at end of file
dist/js/chunk-132a6dc5.d34b95bc.js 0 → 100644
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-132a6dc5"],{"34ea":function(t,a,c){"use strict";var r=c("81fa"),e=c.n(r);e.a},"70b5":function(t,a,c){t.exports=c.p+"img/coupon-null-icon.8e2c71ff.png"},"81fa":function(t,a,c){},c3a6:function(t,a,c){"use strict";c("68ef")},db31:function(t,a,c){"use strict";c.r(a);var r=function(){var t=this,a=t.$createElement,r=t._self._c||a;return r("div",{staticClass:"card-contain border-box",style:{"min-height":t.$store.state.bodyH+"px"}},[r("div",{staticClass:"card-contain-inner"},t._l(t.cardList,function(a,c){return r("div",{key:c,staticClass:"card-brand-list border-box"},[r("div",{staticClass:"card-brand-title"},[t._v(t._s(a.brandName))]),t._l(a.cardData,function(c,e){return[e<a.showCount?r("div",{key:e,staticClass:"card-list-cell border-box"},[r("div",{staticClass:"card-list-cell_top border-box flex "},[r("div",{staticClass:"card-list-cell_top_left flex-1"},[t._v(t._s(c.cardTitle))]),r("div",{staticClass:"card-list-cell_top_right flex-1 text-right"},[t._v(t._s(c.cardNum))])]),t._m(0,!0),r("div",{staticClass:"card-list-cell_body flex flex-align-center flex-pack-center"},[r("div",{staticClass:"card-list-cell_body_left flex-1 flex flex-align-center flex-pack-center font-30"},[r("span",{staticClass:"font-15 m-t-10"},[t._v("¥")]),t._v(t._s(c.cardPrice)+"\n ")]),r("div",{staticClass:"card-list-cell_body_right border-box flex-2"},[r("div",{staticClass:"cell-body_right_cell"},[t._v(t._s(c.cardCondition))]),r("div",{staticClass:"cell-body_right_cell"},[t._v(t._s(c.cardDate))]),r("div",{staticClass:"cell-body_right_cell"},[t._v(t._s(c.cardStore))])])])]):t._e()]}),a.cardData.length>3&&a.cardData.length>a.showCount?r("div",{staticClass:"show-all font-14 color-848689",on:{click:function(c){t.showAllData(a)}}},[t._v("\n 展开剩余"+t._s(a.cardData.length-3)+"张 "),r("van-icon",{attrs:{name:"arrow-down"}})],1):t._e(),a.cardData.length>3&&a.cardData.length==a.showCount?r("div",{staticClass:"show-all font-14 color-848689",on:{click:function(c){t.showPartData(a)}}},[t._v("\n 收起 "),r("van-icon",{attrs:{name:"arrow-up"}})],1):t._e()],2)}),0),t.cardList.length?t._e():r("div",{staticClass:"no-card-data no-data-contain"},[r("img",{attrs:{src:c("70b5"),alt:"card-no-data"}}),r("p",{staticClass:"font-16 color-848689"},[t._v("你还没有卡券哦")])])])},e=[function(){var t=this,a=t.$createElement,c=t._self._c||a;return c("div",{staticClass:"card-list-arrow"},[c("div",{staticClass:"card-list-arrow_left"}),c("div",{staticClass:"card-list-arrow_right"})])}],n=(c("e7e5"),c("d399")),s=(c("96cf"),c("3b8d")),i=c("bd86"),o=(c("c3a6"),c("ad06")),d=(c("cadf"),c("551c"),c("097d"),c("0c6d")),l=function(t){return Object(d["a"])("/gicfwh/get-tpn-card-list.json",t)},f={name:"cards",components:Object(i["a"])({},o["a"].name,o["a"]),data:function(){return{cardList:[{brandName:"MATERIAL GIRL",showCount:3,cardData:[{cardTitle:"感恩节抵扣券",cardNum:"23554666773",cardPrice:"100",cardDate:"2018.12.01--2018.12.31",cardCondition:"满￥89使用",cardStore:"仅限武林银泰店使用",backgroundColor:"#fef5f5"},{cardTitle:"感恩节抵扣券",cardNum:"23554666773",cardPrice:"100",cardDate:"2018.12.01--2018.12.31",cardCondition:"满￥89使用",cardStore:"仅限武林银泰店使用",backgroundColor:"#fef5f5"},{cardTitle:"感恩节抵扣券",cardNum:"23554666773",cardPrice:"100",cardDate:"2018.12.01--2018.12.31",cardCondition:"满￥89使用",cardStore:"仅限武林银泰店使用",backgroundColor:"#fef5f5"},{cardTitle:"感恩节抵扣券",cardNum:"23554666773",cardPrice:"100",cardDate:"2018.12.01--2018.12.31",cardCondition:"满￥89使用",cardStore:"仅限武林银泰店使用",backgroundColor:"#fef5f5"}]}]}},computed:{},methods:{showAllData:function(t){t.showCount=t.cardData.length},showPartData:function(t){t.showCount=3},getCardList:function(){var t=Object(s["a"])(regeneratorRuntime.mark(function t(){var a,c,r;return regeneratorRuntime.wrap(function(t){while(1)switch(t.prev=t.next){case 0:return a=this,c={},t.next=4,l(c);case 4:r=t.sent,0==r.errcode?a.cardList=r.result||[]:Object(n["a"])(r.message);case 6:case"end":return t.stop()}},t,this)}));function a(){return t.apply(this,arguments)}return a}()},mounted:function(){this.getCardList()}},u=f,_=(c("34ea"),c("2877")),v=Object(_["a"])(u,r,e,!1,null,"1d1adfce",null);v.options.__file="index.vue";a["default"]=v.exports}}]);
//# sourceMappingURL=chunk-132a6dc5.d34b95bc.js.map
\ No newline at end of file
dist/js/chunk-2be2540f.8ce42874.js deleted 100644 → 0
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2be2540f"],{"70b5":function(t,a,c){t.exports=c.p+"img/coupon-null-icon.8e2c71ff.png"},"819b":function(t,a,c){},ba17:function(t,a,c){"use strict";var r=c("819b"),e=c.n(r);e.a},c3a6:function(t,a,c){"use strict";c("68ef")},db31:function(t,a,c){"use strict";c.r(a);var r=function(){var t=this,a=t.$createElement,r=t._self._c||a;return r("div",{staticClass:"card-contain border-box",style:{"min-height":t.$store.state.bodyH+"px"}},[r("div",{staticClass:"card-contain-inner"},t._l(t.cardList,function(a,c){return r("div",{key:c,staticClass:"card-brand-list border-box"},[r("div",{staticClass:"card-brand-title"},[t._v(t._s(a.brandName))]),t._l(a.cardData,function(c,e){return[e<a.showCount?r("div",{key:e,staticClass:"card-list-cell border-box"},[r("div",{staticClass:"card-list-cell_top border-box flex "},[r("div",{staticClass:"card-list-cell_top_left flex-1"},[t._v(t._s(c.cardTitle))]),r("div",{staticClass:"card-list-cell_top_right flex-1 text-right"},[t._v(t._s(c.cardNum))])]),t._m(0,!0),r("div",{staticClass:"card-list-cell_body flex flex-align-center flex-pack-center"},[r("div",{staticClass:"card-list-cell_body_left flex-1 flex flex-align-center flex-pack-center font-30"},[r("span",{staticClass:"font-15 m-t-10"},[t._v("¥")]),t._v(t._s(c.cardPrice)+"\n ")]),r("div",{staticClass:"card-list-cell_body_right border-box flex-2"},[r("div",{staticClass:"cell-body_right_cell"},[t._v(t._s(c.cardCondition))]),r("div",{staticClass:"cell-body_right_cell"},[t._v(t._s(c.cardDate))]),r("div",{staticClass:"cell-body_right_cell"},[t._v(t._s(c.cardStore))])])])]):t._e()]}),a.cardData.length>3&&a.cardData.length>a.showCount?r("div",{staticClass:"show-all font-14 color-848689",on:{click:function(c){t.showAllData(a)}}},[t._v("\n 展开剩余"+t._s(a.cardData.length-3)+"张 "),r("van-icon",{attrs:{name:"arrow-down"}})],1):t._e(),a.cardData.length>3&&a.cardData.length==a.showCount?r("div",{staticClass:"show-all font-14 color-848689",on:{click:function(c){t.showPartData(a)}}},[t._v("\n 收起 "),r("van-icon",{attrs:{name:"arrow-up"}})],1):t._e()],2)}),0),t.cardList.length?t._e():r("div",{staticClass:"no-card-data no-data-contain"},[r("img",{attrs:{src:c("70b5"),alt:"card-no-data"}}),r("p",{staticClass:"font-16 color-848689"},[t._v("你还没有卡券哦")])])])},e=[function(){var t=this,a=t.$createElement,c=t._self._c||a;return c("div",{staticClass:"card-list-arrow"},[c("div",{staticClass:"card-list-arrow_left"}),c("div",{staticClass:"card-list-arrow_right"})])}],n=(c("e7e5"),c("d399")),s=(c("96cf"),c("3b8d")),i=c("bd86"),o=(c("c3a6"),c("ad06")),d=(c("cadf"),c("551c"),c("097d"),c("0c6d")),l=function(t){return Object(d["a"])("/gicfwh/get-tpn-card-list.json",t)},f={name:"cards",components:Object(i["a"])({},o["a"].name,o["a"]),data:function(){return{cardList:[{brandName:"MATERIAL GIRL",showCount:3,cardData:[{cardTitle:"感恩节抵扣券",cardNum:"23554666773",cardPrice:"100",cardDate:"2018.12.01--2018.12.31",cardCondition:"满￥89使用",cardStore:"仅限武林银泰店使用",backgroundColor:"#fef5f5"},{cardTitle:"感恩节抵扣券",cardNum:"23554666773",cardPrice:"100",cardDate:"2018.12.01--2018.12.31",cardCondition:"满￥89使用",cardStore:"仅限武林银泰店使用",backgroundColor:"#fef5f5"},{cardTitle:"感恩节抵扣券",cardNum:"23554666773",cardPrice:"100",cardDate:"2018.12.01--2018.12.31",cardCondition:"满￥89使用",cardStore:"仅限武林银泰店使用",backgroundColor:"#fef5f5"},{cardTitle:"感恩节抵扣券",cardNum:"23554666773",cardPrice:"100",cardDate:"2018.12.01--2018.12.31",cardCondition:"满￥89使用",cardStore:"仅限武林银泰店使用",backgroundColor:"#fef5f5"}]}]}},computed:{},methods:{showAllData:function(t){t.showCount=t.cardData.length},showPartData:function(t){t.showCount=3},getCardList:function(){var t=Object(s["a"])(regeneratorRuntime.mark(function t(){var a,c,r;return regeneratorRuntime.wrap(function(t){while(1)switch(t.prev=t.next){case 0:return a=this,c={},t.next=4,l(c);case 4:r=t.sent,1==r.errcode?a.cardList=r.result:Object(n["a"])(r.message);case 6:case"end":return t.stop()}},t,this)}));function a(){return t.apply(this,arguments)}return a}()},mounted:function(){this.getCardList()}},u=f,_=(c("ba17"),c("2877")),b=Object(_["a"])(u,r,e,!1,null,"34f89b7e",null);b.options.__file="index.vue";a["default"]=b.exports}}]);
//# sourceMappingURL=chunk-2be2540f.8ce42874.js.map
\ No newline at end of file
src/router.js
......@@ -46,7 +46,10 @@ routes.forEach(route => {
route.path = route.path || '/' + (route.name || '');
});
const router = new Router({ routes });
const router = new Router({
mode: 'history',
routes
});
router.beforeEach((to, from, next) => {
const title = to.meta && to.meta.title;
......
src/views/cards/index.vue
......@@ -132,8 +132,13 @@ export default {
// Signature: ''
}
let resData = await getCardsData(params);
if (resData.errcode == 1) {
that.cardList = resData.result;
if (resData.errcode == 0) {
/* if (!!resData.result && !!resData.result.length) {
resData.result.forEach(ele => {
});
} */
that.cardList = resData.result || [];
}else {
Toast(resData.message);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment