Merge branch 'XK_USER_INDEX_UPDATE20190613'

# Conflicts:
#	view/index.html
#	view/js/chunk-0528a41a.5219caa7.js
#	view/js/chunk-0528a41a.667ddfb1.js
#	view/js/chunk-0da02e6a.6b1420d9.js
#	view/js/chunk-111df22d.7caf9eb1.js
#	view/js/chunk-111df22d.9a79ad48.js
#	view/js/chunk-178081d1.05b376f2.js
#	view/js/chunk-178081d1.60afbe78.js
#	view/js/chunk-5b9a2a70.bd3eae81.js
#	view/js/chunk-5e368d0a.b97e2dd2.js
#	view/js/chunk-6825be16.0bd2893a.js
#	view/js/chunk-6be99e9a.23030af2.js
#	view/js/chunk-6be99e9a.f659ae27.js

view/js/chunk-111df22d.9a79ad48.js~XK_USER_INDEX_UPDATE20190613

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-111df22d"],{2458:function(t,a,e){"use strict";var l=e("4e02"),s=e.n(l);s.a},"4e02":function(t,a,e){},e175:function(t,a,e){"use strict";e.r(a);var l=function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("section",{staticClass:"wallet-status"},[e("Header",{attrs:{title:t.title,meaushow:t.meaushow}}),t.walletInfoData.wallet_freeze_format?e("div",{staticClass:"status-content"},[e("ul",{staticClass:"form-wrap"},[e("li",{staticClass:"inp-wrap"},[e("label",{staticClass:"lineBlock va-m"},[t._v("冻结余额")]),1!==t.walletInfoData.wallet_status?e("input",{staticClass:"va-m inp",attrs:{readonly:"readonly",type:"text",value:"￥0.00"}}):e("input",{staticClass:"va-m inp",attrs:{readonly:"readonly",type:"text"},domProps:{value:t.walletInfoData.wallet_freeze_format}}),"¥0.00"!==t.walletInfoData.wallet_freeze_format?e("van-icon",{staticClass:"tips va-m",attrs:{name:"warning-o",size:"22px",color:"#f00"},on:{click:t.dialogTips}}):t._e()],1),e("li",{staticClass:"inp-wrap"},[e("label",{staticClass:"lineBlock va-m"},[t._v("钱包状态")]),1!==t.walletInfoData.wallet_status?e("input",{staticClass:"va-m inp",attrs:{readonly:"readonly",type:"text",value:"未启用"}}):e("input",{staticClass:"va-m inp",attrs:{readonly:"readonly",type:"text",value:"已启用"}})]),e("li",{staticClass:"inp-wrap"},[e("label",{staticClass:"lineBlock va-m"},[t._v("支付密码")]),1!==t.walletInfoData.wallet_status?e("input",{staticClass:"va-m inp",attrs:{readonly:"readonly",type:"text",value:"未启用"}}):e("input",{staticClass:"va-m inp",attrs:{readonly:"readonly",type:"text",value:"已启用"}}),1==t.walletInfoData.wallet_status?e("span",{staticClass:"forget-password va-m",on:{click:t.forgetPassword}},[t._v("忘记密码")]):t._e()]),e("li",{staticClass:"inp-wrap"},[e("label",{staticClass:"lineBlock va-m"},[t._v("我的银行卡")]),null==t.walletInfoData.bank_name?e("input",{staticClass:"va-m inp",attrs:{readonly:"readonly",type:"text",value:"未绑定"}}):e("input",{staticClass:"va-m inp",attrs:{readonly:"readonly",type:"text"},domProps:{value:t.walletInfoData.bank_name}}),null==t.walletInfoData.bank_name?e("span",{staticClass:"bind-bank va-m",on:{click:t.bindBank}},[t._v("绑卡")]):t._e()])]),1!==t.walletInfoData.wallet_status?e("a",{staticClass:"submit",attrs:{href:"javascript:;"},on:{click:t.submit}},[t._v("激活")]):t._e()]):t._e()],1)},s=[],n=e("e20c"),i=e("6e6d"),o=e("591a"),r=e("57af"),c=e("cf1e");i["a"].use(c["h"]).use(c["f"]);var p={name:"walletStatus",data:function(){return{title:"钱包状态",meaushow:!0}},computed:Object(n["a"])({},Object(o["c"])({walletInfoData:function(t){return t.wallet.walletInfoData}})),watch:{},created:function(){this.$store.dispatch({type:"getWalletInfo"})},methods:{dialogTips:function(){c["f"].alert({message:'<p style="font-size:16px;">您的'+this.walletInfoData.wallet_freeze_format+'元正在提现中，</p><p style="font-size:16px;">预计1个工作日后到账，</p><p style="font-size:16px;">节假日顺延，请耐心等候。</p>'}).then(function(){})},submit:function(){this.$router.push({path:"/wallet/activate"})},forgetPassword:function(){this.$router.push({path:"/wallet/retrieve"})},bindBank:function(){this.$router.push({path:"/wallet/verify"})}},components:{Header:r["a"]}},u=p,f=(e("2458"),e("17cc")),w=Object(f["a"])(u,l,s,!1,null,"ca2b3382",null);a["default"]=w.exports}}]);
\ No newline at end of file

view/js/chunk-178081d1.60afbe78.js~XK_USER_INDEX_UPDATE20190613

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-178081d1"],{"51d9":function(s,o,e){"use strict";e.r(o);var t=function(){var s=this,o=s.$createElement,e=s._self._c||o;return e("section",{staticClass:"wallet-activate"},[e("Header",{attrs:{title:s.title,meaushow:s.meaushow}}),e("div",{directives:[{name:"show",rawName:"v-show",value:s.step1,expression:"step1"}],staticClass:"activate-content"},[e("ul",{staticClass:"form-wrap"},[e("li",{staticClass:"inp-wrap"},[e("label",{staticClass:"va-m"},[s._v("安全手机号")]),e("br"),e("input",{directives:[{name:"model",rawName:"v-model",value:s.form.safeMobile,expression:"form.safeMobile"}],staticClass:"va-m inp",attrs:{type:"number",placeholder:"请输入手机号"},domProps:{value:s.form.safeMobile},on:{input:function(o){o.target.composing||s.$set(s.form,"safeMobile",o.target.value)}}})]),e("li",{directives:[{name:"show",rawName:"v-show",value:s.activateShowImgCode,expression:"activateShowImgCode"}],staticClass:"inp-wrap yzmImg"},[e("label",{staticClass:"va-m"},[s._v("图片验证码")]),e("br"),e("input",{directives:[{name:"model",rawName:"v-model",value:s.form.imgCode,expression:"form.imgCode"}],staticClass:"va-m inp",attrs:{type:"text",placeholder:"请输入验证码"},domProps:{value:s.form.imgCode},on:{input:function(o){o.target.composing||s.$set(s.form,"imgCode",o.target.value)}}}),e("img",{staticClass:"img-code va-m",attrs:{src:s.imgCodeVal,alt:"图片验证码"},on:{click:s.changeImgCode}})]),e("li",{staticClass:"inp-wrap"},[e("label",{staticClass:"va-m"},[s._v("验证码")]),e("br"),e("input",{directives:[{name:"model",rawName:"v-model",value:s.form.verifyCode,expression:"form.verifyCode"}],staticClass:"va-m inp",attrs:{type:"text",placeholder:"请输入验证码"},domProps:{value:s.form.verifyCode},on:{input:function(o){o.target.composing||s.$set(s.form,"verifyCode",o.target.value)}}}),s.yzmSend?e("a",{staticClass:"send-yzm va-m",attrs:{href:"javascript:;"},on:{click:s.getCode}},[s._v(s._s(s.countDownText))]):e("a",{staticClass:"sending-yzm va-m",attrs:{href:"javascript:;"}},[s._v("再次发送("+s._s(s.countDown)+"s)")])])]),e("p",{directives:[{name:"show",rawName:"v-show",value:s.formError,expression:"formError"}],staticClass:"form-error"},[s._v(s._s(s.formMsg))]),e("a",{staticClass:"next",class:{noClick:s.isClick},attrs:{href:"javascript:;"},on:{click:s.next}},[s._v("下一步")])]),e("div",{directives:[{name:"show",rawName:"v-show",value:s.step2,expression:"step2"}],staticClass:"activate-content"},[e("ul",{staticClass:"form-wrap"},[e("li",{staticClass:"inp-wrap"},[e("label",{staticClass:"va-m"},[s._v("设置支付密码")]),e("br"),s.showPassword?[e("input",{directives:[{name:"model",rawName:"v-model",value:s.form.password,expression:"form.password"}],staticClass:"va-m inp",attrs:{type:"password",placeholder:"密码由6~20位字母、数字组合而成"},domProps:{value:s.form.password},on:{input:function(o){o.target.composing||s.$set(s.form,"password",o.target.value)}}})]:[e("input",{directives:[{name:"model",rawName:"v-model",value:s.form.password,expression:"form.password"}],staticClass:"va-m inp",attrs:{type:"text",placeholder:"密码由6~20位字母、数字组合而成"},domProps:{value:s.form.password},on:{input:function(o){o.target.composing||s.$set(s.form,"password",o.target.value)}}})],s.showPassword?e("van-icon",{staticClass:"va-m f-r",attrs:{name:"closed-eye"},on:{click:s.changeShow}}):e("van-icon",{staticClass:"va-m f-r",attrs:{name:"eye-o"},on:{click:s.changeShow}})],2),e("li",{staticClass:"inp-wrap"},[e("label",{staticClass:"va-m"},[s._v("确认支付密码")]),e("br"),s.showPasswordConfirm?[e("input",{directives:[{name:"model",rawName:"v-model",value:s.form.passwordConfirm,expression:"form.passwordConfirm"}],staticClass:"va-m inp",attrs:{type:"password",placeholder:"请再次输入上面的密码"},domProps:{value:s.form.passwordConfirm},on:{input:function(o){o.target.composing||s.$set(s.form,"passwordConfirm",o.target.value)}}})]:[e("input",{directives:[{name:"model",rawName:"v-model",value:s.form.passwordConfirm,expression:"form.passwordConfirm"}],staticClass:"va-m inp",attrs:{type:"text",placeholder:"请再次输入上面的密码"},domProps:{value:s.form.passwordConfirm},on:{input:function(o){o.target.composing||s.$set(s.form,"passwordConfirm",o.target.value)}}})],s.showPasswordConfirm?e("van-icon",{staticClass:"va-m f-r",attrs:{name:"closed-eye"},on:{click:s.changeShowConfirm}}):e("van-icon",{staticClass:"va-m f-r",attrs:{name:"eye-o"},on:{click:s.changeShowConfirm}})],2)]),e("p",{directives:[{name:"show",rawName:"v-show",value:s.formError,expression:"formError"}],staticClass:"form-error"},[s._v(s._s(s.formMsg))]),e("a",{staticClass:"confirm",attrs:{href:"javascript:;"},on:{click:s.confirm}},[s._v("确认")])])],1)},r=[],a=(e("7c56"),e("e20c")),i=e("6e6d"),n=e("591a"),m=e("57af"),c=e("cf1e"),f=e("365c");i["a"].use(c["h"]);var l={name:"WalletActivate",data:function(){return{title:"激活钱包",meaushow:!0,showPassword:!0,showPasswordConfirm:!0,yzmSend:!0,countDown:60,countDownText:"发送验证码",step1:!0,step2:!1,form:{safeMobile:"",verifyCode:"",imgCode:"",password:"",passwordConfirm:""},formError:!1,formMsg:"",imgCodeVal:f["b"]+"public/verify",isClick:!0}},computed:Object(a["a"])({},Object(n["c"])({activateShowImgCode:function(s){return s.wallet.activateShowImgCode},activateCountDownFlag:function(s){return s.wallet.activateCountDownFlag}})),watch:{activateCountDownFlag:function(s){s?(this.yzmSend=!1,this.timeNum()):this.yzmSend=!0},form:{deep:!0,handler:function(s){s.safeMobile&&s.verifyCode?this.isClick=!1:this.isClick=!0}}},created:function(){},methods:{changeShow:function(){this.showPassword=!this.showPassword},changeShowConfirm:function(){this.showPasswordConfirm=!this.showPasswordConfirm},timeNum:function(){var s=this,o=setInterval(e,1e3);function e(){s.countDown--,s.countDown<=0&&(clearInterval(o),s.countDown=60,s.countDownText="再次发送",s.yzmSend=!0)}},changeImgCode:function(){this.imgCodeVal=f["b"]+"public/verify?"+(new Date).getTime()},verify:function(){if(!this.form.safeMobile)return this.formError=!0,void(this.formMsg="亲,请输入手机");var s=/^1[34578]\d{9}$/;return!!s.test(this.form.safeMobile)||(this.formError=!0,void(this.formMsg="亲,手机格式不正确"))},getCode:function(){this.verify()&&this.$store.dispatch({type:"smsVerifyActivate",mobile:this.form.safeMobile,imgCode:this.form.imgCode})},next:function(){if(!this.isClick&&this.verify()){if(!this.form.verifyCode)return this.formError=!0,void(this.formMsg="亲,请输入验证码");this.formError=!1,this.step1=!1,this.step2=!0}},confirm:function(){var s=new RegExp(/^[a-zA-Z0-9]{6,20}$/);return this.form.password?s.test(this.form.password)?this.form.passwordConfirm?this.form.password!==this.form.passwordConfirm?(this.formError=!0,void(this.formMsg="亲,两次输入支付密码不一致")):(this.formError=!1,void this.$store.dispatch({type:"activateWallet",mobile:this.form.safeMobile,verifyCode:this.form.verifyCode,password:this.form.password,passwordConfirm:this.form.passwordConfirm,referer:this.$route.query.referer})):(this.formError=!0,void(this.formMsg="亲,请再次输入支付密码")):(this.formError=!0,void(this.formMsg="亲,密码由6～20位字母、数字组合")):(this.formError=!0,void(this.formMsg="亲,请输入支付密码"))}},components:{Header:m["a"]}},d=l,p=(e("9fbd"),e("17cc")),v=Object(p["a"])(d,t,r,!1,null,"d0fe4bcc",null);o["default"]=v.exports},"7c56":function(s,o,e){var t=e("3754"),r=e("44de"),a=e("ddf7").f,i=e("a891").f,n=e("22e9"),m=e("f425"),c=t.RegExp,f=c,l=c.prototype,d=/a/g,p=/a/g,v=new c(d)!==d;if(e("dad2")&&(!v||e("b6f1")(function(){return p[e("8b37")("match")]=!1,c(d)!=d||c(p)==p||"/a/i"!=c(d,"i")}))){c=function(s,o){var e=this instanceof c,t=n(s),a=void 0===o;return!e&&t&&s.constructor===c&&a?s:r(v?new f(t&&!a?s.source:s,o):f((t=s instanceof c)?s.source:s,t&&a?m.call(s):o),e?this:l,c)};for(var u=function(s){s in c||a(c,s,{configurable:!0,get:function(){return f[s]},set:function(o){f[s]=o}})},w=i(f),h=0;w.length>h;)u(w[h++]);l.constructor=c,c.prototype=l,e("e5ef")(t,"RegExp",c)}e("c650")("RegExp")},"9fbd":function(s,o,e){"use strict";var t=e("cfbe"),r=e.n(t);r.a},cfbe:function(s,o,e){}}]);
\ No newline at end of file

view/js/chunk-6be99e9a.f659ae27.js~XK_USER_INDEX_UPDATE20190613

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-6be99e9a"],{"3b11":function(t,a,s){},a1f0:function(t,a,s){"use strict";var e=s("3b11"),n=s.n(e);n.a},c96d:function(t,a,s){"use strict";s.r(a);var e=function(){var t=this,a=t.$createElement,s=t._self._c||a;return s("section",{staticClass:"wallet-withdraw"},[s("Header",{attrs:{title:t.title,meaushow:t.meaushow}}),s("div",{staticClass:"withdraw-content"},[s("div",{staticClass:"withdrawUser-ifo"},[s("p",[t._v("银行账号："+t._s(t.walletInfoData.bank_name)+"("+t._s(t.walletInfoData.bank_account)+")"),s("span",[t._v("储蓄卡")])]),s("p",[t._v("持卡人姓名："+t._s(t.walletInfoData.bank_user))]),s("p",[t._v("手机号："+t._s(t.walletInfoData.safe_mobile))])]),s("p",{staticClass:"withdraw-tips"},[s("van-icon",{staticClass:"tips va-m",staticStyle:{"font-size":"16px","margin-right":"0.1rem"},attrs:{name:"warning-o"}}),t._v("\n            提现金额预计1个工作日之后到账，节假日顺延，请耐心等待。\n        ")],1),s("div",{staticClass:"withdraw-amount"},[t._m(0),s("span",[t._v("￥")]),s("input",{directives:[{name:"model",rawName:"v-model",value:t.withdrawNum,expression:"withdrawNum"}],staticClass:"money",attrs:{type:"text",readonly:"readonly"},domProps:{value:t.withdrawNum},on:{touchstart:function(a){a.stopPropagation(),t.moneyBtn=!0},input:function(a){a.target.composing||(t.withdrawNum=a.target.value)}}}),t.amountNum?s("div",{staticClass:"withdraw-money"},[t._v("可提现金额 "+t._s(t.walletInfoData.wallet_usable_format)+"，"),s("span",{on:{click:t.withdraw}},[t._v("全部提现")])]):s("div",{staticClass:"amount-tips"},[t._v("输入金额超过可提现金额")])]),s("div",{staticClass:"withdraw-password"},[t._m(1),t.showPassword?[s("input",{directives:[{name:"model",rawName:"v-model",value:t.password,expression:"password"}],staticClass:"va-m inp password",attrs:{type:"password",placeholder:"请输入支付密码"},domProps:{value:t.password},on:{input:function(a){a.target.composing||(t.password=a.target.value)}}})]:[s("input",{directives:[{name:"model",rawName:"v-model",value:t.password,expression:"password"}],staticClass:"va-m inp password",attrs:{type:"text",placeholder:"请输入支付密码"},domProps:{value:t.password},on:{input:function(a){a.target.composing||(t.password=a.target.value)}}})],t.showPassword?s("van-icon",{staticClass:"va-m f-r",attrs:{name:"closed-eye"},on:{click:t.changeShow}}):s("van-icon",{staticClass:"va-m f-r",attrs:{name:"eye-o"},on:{click:t.changeShow}})],2),s("button",{staticClass:"submit",class:""==t.withdrawNum||t.amountWithdrawFlag?"submitNO":"",attrs:{disabled:t.amountWithdrawFlag},on:{click:t.submit}},[t._v("提交")])]),s("van-number-keyboard",{attrs:{show:t.moneyBtn,theme:"custom","extra-key":".","close-button-text":"完成",zIndex:t.zIndex},on:{blur:function(a){t.moneyBtn=!1},input:t.onInput,delete:t.onDelete}})],1)},n=[function(){var t=this,a=t.$createElement,s=t._self._c||a;return s("p",[s("em",[t._v("*")]),t._v(" 提现金额")])},function(){var t=this,a=t.$createElement,s=t._self._c||a;return s("p",[s("em",[t._v("*")]),t._v(" 支付密码")])}],o=(s("d4d5"),s("e20c")),i=s("6e6d"),r=s("591a"),w=s("57af"),l=s("cf1e");i["a"].use(l["h"]).use(l["m"]);var u={name:"walletWithdraw",data:function(){return{title:"钱包提现",meaushow:!0,showPassword:!0,amountNum:!0,password:"",withdrawNum:"",clickFlag:!0,moneyBtn:!1,zIndex:999999}},computed:Object(o["a"])({},Object(r["c"])({walletInfoData:function(t){return t.wallet.walletInfoData},amountWithdrawFlag:function(t){return t.wallet.amountWithdrawFlag}})),watch:{withdrawNum:function(t){Number(t)>Number(this.walletInfoData.wallet_usable)?this.amountNum=!1:this.amountNum=!0}},created:function(){this.$store.dispatch({type:"getWalletInfo"})},methods:{changeShow:function(){this.showPassword=!this.showPassword},withdraw:function(){this.withdrawNum=this.walletInfoData.wallet_usable},submit:function(){""!==this.withdrawNum&&(this.password?this.$store.dispatch({type:"walletWithdraw",amount:this.withdrawNum,pay_password:this.password}):Object(l["u"])({message:"请输入提现密码"}))},onInput:function(t){this.withdrawNum=this.withdrawNum+t},onDelete:function(t){this.withdrawNum=this.withdrawNum.slice(0,this.withdrawNum.length-1)}},components:{Header:w["a"]}},c=u,d=(s("a1f0"),s("17cc")),m=Object(d["a"])(c,e,n,!1,null,"04a4e7d8",null);a["default"]=m.exports}}]);
\ No newline at end of file