Merge branch 'zBackBranch' into 'master'

Z: Dot: backup.

See merge request !2

ybf_wx/dist/css/app.ea9ab3b0.css

+.main[data-v-2aad46c8]{background-color:#fff;width:100%;height:100%;justify-content:start}.lists[data-v-2aad46c8],.main[data-v-2aad46c8]{display:flex;flex-direction:column;overflow:scroll}.lists[data-v-2aad46c8]{height:auto;padding:.125rem .375rem;padding-bottom:1.25rem;justify-content:flex-start;align-items:flex-start}.list[data-v-2aad46c8]{height:4.375rem;box-shadow:0 .0625rem .125rem 0 #bbb;margin:.1875rem 0;padding:0 .375rem;border-radius:.1875rem;display:flex;flex-direction:row;justify-content:flex-start;align-items:center}.list-logo[data-v-2aad46c8]{width:3.125rem;height:3.125rem;border-radius:.1875rem}.list-infos[data-v-2aad46c8]{width:100;height:3.125rem;padding-left:.375rem;display:flex;flex-direction:column;justify-content:flex-start;align-items:flex-start}.list-info-title[data-v-2aad46c8]{width:100%;height:.5625rem;font-size:.5rem;font-weight:700;line-height:.5625rem}.list-info-dsc[data-v-2aad46c8]{margin-top:.1875rem;width:100%;height:.5rem;font-size:.375rem;font-weight:400;line-height:.5625rem}.menus[data-v-2aad46c8]{border-top:1px solid #c2c2c2;position:fixed;bottom:0;left:0;width:100%;height:1.5625rem;background-color:#fff;display:flex;flex-direction:row;justify-content:start;align-items:center}.menu[data-v-2aad46c8]{height:1.5625rem;width:50%;line-height:1.5625rem;text-align:center;font-size:.4375rem;color:#000}.activeMenu[data-v-2aad46c8]{color:#f08080}.testButton[data-v-2aad46c8]{border:1px solid red;width:auto;font-size:.4375rem;margin-top:.125rem;padding-bottom:.125rem}.fkwindow[data-v-2aad46c8]{border:1px solid #32cd32;padding:.125rem;height:3.125rem;width:100%;overflow:auto;font-size:.4375rem;word-wrap:break-word}*{margin:0;padding:0;-webkit-overflow-scrolling:touch;overflow-scrolling:touch;box-sizing:border-box;-webkit-box-sizing:border-box;-webkit-font-smoothing:antialiased}*,input,select,textarea{font-family:PingFangSC-Regular,Microsoft YaHei,lucida grande,lucida sans unicode,lucida,helvetica,Hiragino Sans GB,WenQuanYi Micro Hei,sans-serif}body,html{width:100%;height:100%}li,ul{list-style:none}a{text-decoration:none}::-webkit-input-placeholder{color:#fff;font-family:PingFangSC-Regular,Microsoft YaHei,lucida grande,lucida sans unicode,lucida,helvetica,Hiragino Sans GB,WenQuanYi Micro Hei,sans-serif;font-weight:400}input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{color:#bbb}.searchText::-webkit-input-placeholder{font-family:iconfont}h1,h2,h3,h4,h5,h6{line-height:1.2}p{margin:0;padding:0}.fr{float:right}.fl{float:left}.alignc{text-align:center}.alignr{text-align:right}input:focus{outline:none}#app{width:100%;height:100%}
\ No newline at end of file

ybf_wx/dist/css/chunk-dca24f36.24836553.css

+.main[data-v-9d0ae28a]{background-color:#fff;width:100%;height:100%;display:flex;flex-direction:column;justify-content:start}.tops[data-v-9d0ae28a]{border:.0625rem solid #add8e6;width:100%;height:3.125rem}.contents[data-v-9d0ae28a]{width:100%;height:100%;padding:.5rem;padding-bottom:1.25rem}.content[data-v-9d0ae28a]{border:0 solid orange;height:3.125rem;width:100%;padding:.125rem 0;margin-bottom:.5rem;border-radius:.125rem;box-shadow:0 .0625rem .125rem 0 #bbb;display:flex;flex-direction:row;justify-content:start}.content-imgs[data-v-9d0ae28a]{width:20%;height:100%;display:flex;flex-direction:column;justify-content:start;align-items:center}.imgs-img[data-v-9d0ae28a]{width:1.5625rem;height:1.5625rem;margin-top:.3125rem;border-radius:50%;object-fit:cover}.content-infos[data-v-9d0ae28a]{width:80%;height:100%}.infos-mains[data-v-9d0ae28a]{height:70%;width:100%;display:flex;flex-direction:row;justify-content:start}.mains[data-v-9d0ae28a]{width:70%;height:100%;display:flex;flex-direction:column;justify-content:flex-start}.main-usedPercent[data-v-9d0ae28a]{font-size:.4375rem;color:grey}.main-money[data-v-9d0ae28a]{font-size:.75rem}.buttons[data-v-9d0ae28a]{width:30%;height:100%;display:flex;flex-direction:column;justify-content:center;align-items:center}.button-send[data-v-9d0ae28a]{border:0 solid #00f;height:1.25rem;width:1.875rem;border-radius:.125rem;background-color:#445dfb;color:#fff;font-size:.5rem}.infos-tips[data-v-9d0ae28a]{height:30%;width:100%;border-top:1px dashed grey;padding-top:.1875rem;display:flex;flex-direction:row;justify-content:start;align-items:center}.tip-shareMan[data-v-9d0ae28a]{width:70%;height:100%;font-size:.4375rem;line-height:.5rem;color:#969696}.tip-commision[data-v-9d0ae28a]{width:30%;height:100%;font-size:.4375rem;line-height:.5rem;color:#969696}.menus[data-v-9d0ae28a]{border-top:1px solid #c2c2c2;position:fixed;bottom:0;left:0;width:100%;height:1.5625rem;background-color:#fff;display:flex;flex-direction:row;justify-content:start;align-items:center}.menu[data-v-9d0ae28a]{height:1.5625rem;width:50%;line-height:1.5625rem;text-align:center;font-size:.4375rem;color:#000}.activeMenu[data-v-9d0ae28a]{color:#f08080}.zListActive[data-v-9d0ae28a]{width:100%;height:auto;display:flex;flex-direction:column;justify-content:flex-start;align-items:flex-start}.zListActive>.inputs[data-v-9d0ae28a]{width:100%;height:auto;display:flex;flex-direction:row;justify-content:space-between;align-items:center}.zListActive>.inputs>.input[data-v-9d0ae28a]{border-color:#1e90ff;border-radius:.125rem;width:70%;height:1.25rem;font-size:.5rem}.zListActive>.inputs>.button[data-v-9d0ae28a]{border:1px solid #1e90ff;border-radius:.125rem;width:40%;height:1.25rem;font-size:.4375rem;line-height:1.125rem;text-align:center}.zListActive>.lists[data-v-9d0ae28a]{width:100%;height:auto;margin-top:.25rem;display:flex;flex-direction:column;justify-content:flex-start;align-items:flex-start}.zListActive>.lists>.item[data-v-9d0ae28a]{border:1px solid red;border-radius:.125rem}.zListActive>.lists>.item[data-v-9d0ae28a],.zListActive>.lists>.voucherUrl[data-v-9d0ae28a]{width:100%;height:3.125rem;margin-bottom:.5rem;padding:.125rem .125rem;box-shadow:0 .0625rem .125rem 0 #bbb;display:flex;flex-direction:column;justify-content:space-around;align-items:flex-start;font-size:.4375rem;text-wrap:none}.zListActive>.lists>.voucherUrl[data-v-9d0ae28a]{border:1px solid orange;border-radius:.125rem}
\ No newline at end of file

ybf_wx/dist/js/chunk-dca24f36.50cfdec9.js

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-dca24f36"],{"0062":function(t,e,i){},"16e1":function(t,e,i){"use strict";var s=i("0062"),r=i.n(s);r.a},"2fa1":function(t,e,i){"use strict";i.r(e);var s=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{staticClass:"main"},[i("div",{staticClass:"contents"},[t._l(t.test.list.main,(function(e,s){return i("div",{key:s},[i("div",{staticClass:"content"},[i("div",{staticClass:"content-imgs"},[i("img",{staticClass:"imgs-img",attrs:{src:e.imgUrl,alt:""}})]),i("div",{staticClass:"content-infos"},[i("div",{staticClass:"infos-mains"},[i("div",{staticClass:"mains"},[i("div",{staticClass:"main-usedPercent"},[t._v("核销率"+t._s(e.usedPercent)+"%")]),i("div",{staticClass:"main-money"},[t._v(t._s(e.money)+"元代金券")])]),i("div",{staticClass:"buttons"},[i("button",{staticClass:"button-send",on:{click:t.testEaPost}},[t._v("推送")])])]),i("div",{staticClass:"infos-tips"},[i("div",{staticClass:"tip-shareMan"},[t._v("最后分享："+t._s(e.shareMan))]),i("div",{staticClass:"tip-commision"},[t._v("佣金：¥ "+t._s(e.commision))])])])])])})),i("div",{staticStyle:{"font-size":"12px"}},[t._v("userId="+t._s(t.zcache.userId))]),i("div",{staticStyle:{"font-size":"12px"}},[t._v("storeId="+t._s(t.zcache.userInfo))]),i("div",{staticClass:"zListActive"},[i("div",{staticClass:"inputs"},[i("div",{staticClass:"button",on:{click:t.zTest}},[t._v("Redirect")]),i("div",{staticClass:"button",on:{click:t.zReadyDelVoucherList}},[t._v("Clear")]),i("div",{staticClass:"button",on:{click:t.zReadySetVoucherList}},[t._v("ReLoad")])]),i("div",{staticClass:"lists"},t._l(t.zlist.voucher,(function(e){return i("div",{key:e.coupon_id,staticClass:"item",on:{click:function(i){return t.zVoucherPick(e.action_id,e.coupon_id)}}},[i("div",[t._v("优惠券ID: "+t._s(e.coupon_id))]),i("div",[t._v("活动ID: "+t._s(e.action_id))]),i("div",[t._v("活动标题: "+t._s(e.coupon_title))]),i("div",[t._v("活动列表: "+t._s(e.coupon_link))])])})),0),i("div",{staticClass:"lists"},[""!==t.zlist.voucherUrl?i("div",{staticClass:"voucherUrl"},[i("div",{on:{click:t.zpick}},[t._v("小程序Url: "+t._s(t.zlist.voucherUrl))])]):t._e()])])],2),i("div",{staticClass:"menus"},[i("div",{staticClass:"menu",on:{click:t.buttonMainMarketingClick}},[t._v("精准营销")]),i("div",{staticClass:"menu activeMenu",on:{click:t.buttonSingleMarketingClick}},[t._v("一对一营销侧边栏")])])])},r=[],n=(i("a9e3"),i("9911"),i("35bc")),a=(i("d923"),i("a1ec"));function c(t){alert("---\x3ePostToEA: ea.js: IN.");var e={args:t};return alert("---\x3ePostToEA: ea.js: postData =".concat(JSON.stringify(e))),Object(a["a"])({url:"",method:"post",data:e})}function o(t){var e={args:t};return Object(a["a"])({url:"",method:"post",data:e})}i("d3b7");var u=i("bc3a"),d=i.n(u),l=(i("8237"),i("ae1f")),h=l["a"].appBaseUrlB,f=(console.log.bind(console),d.a.create({baseURL:h,timeout:2e4}));f.interceptors.request.use((function(t){return t}),(function(t){Promise.reject(t)})),f.interceptors.response.use((function(t){var e=t.data;return e}),(function(t){return Promise.reject(t)}));var v=f;i("4328");function p(t){return v({url:"/admin/auth/addressbook/clerk/getByUserIdOrUserName",method:"get",params:t})}var m=i("2b0e"),g=i("565f"),_=console.log.bind(console);m["a"].use(g["a"]);var I={name:"discountIndex",data:function(){return{zcache:{storeId:1,userId:"",userInfo:""},zlist:{voucher:[],voucherUrl:""},test:{list:{main:[{imgUrl:"/mainSale/test-city.png",usedPercent:"10",money:"100",shareMan:"Alice",commision:"11"},{imgUrl:"/mainSale/test-city.png",usedPercent:"20",money:"200",shareMan:"Bob",commision:"22"}]}},dis:{}}},created:function(){_("%c---\x3eCreated.","color: orange"),this.zcache.userId=this.$route.params.userId,alert("---\x3epage: discount: created: this.$route.params.userId =".concat(this.zcache.userId)),alert("---\x3epage: discount: created: this.$route.params =".concat(JSON.stringify(this.$route.params))),alert("---\x3epage: discount: created: this.$route =".concat(JSON.stringify(this.$route))),this.zReadyGetUserFromId()},mounted:function(){},methods:{zTestPreAuthCode:function(){var t={head:"https://open.weixin.qq.com/connect/oauth2/authorize?",appId:"wwd1cdbca7b8b2b6c4",redirectUrI:encodeURIComponent("qywx2.100smartdata.com"),responseType:"code",scope:"snsapi_base",state:"ztest",tail:"#wechat_redirect"},e=t.head+"appid="+t.appId+"&redirect_uri="+t.redirectUrI+"&response_type="+t.responseType+"&scope="+t.scope+"&state="+t.state+t.tail;_("%c---\x3ezTestPreAuthCode: Url =","background: orange",e)},zTest:function(){this.zTestPreAuthCode()},zReadyGetUserFromId:function(){var t=this,e={param:this.zcache.userId};alert("---\x3euserInfoFromId: postData = ".concat(JSON.stringify(e))),p(e).then((function(e){alert("---\x3euserInfoFromId: res = ".concat(JSON.stringify(e.data[0]))),t.zcache.userInfo=String(e.data[0].departmentId),t.zcache.storeId=1,t.zReadySetVoucherList()})).catch((function(t){}))},zReadySetVoucherList:function(){var t=this;this.zReadyDelVoucherList();var e={appCode:"0696",mdid:this.zcache.storeId};alert("---\x3ePostToEA: postData = ".concat(JSON.stringify(e))),_("%c---\x3eVoucherList: PD =","background: orange;",e),c(e).then((function(e){_("%c---\x3eVoucherList: RD =","background: limegreen;",e),alert("---\x3ePostToEA: Res = ".concat(JSON.stringify(e))),t.zVoucherSet(e.result.coupons)})).catch((function(t){alert("---\x3ePostToEA: err = ".concat(JSON.stringify(t)))}))},zReadyDelVoucherList:function(){this.zVoucherDel(),this.zVoucherUrlDel()},zVoucherPick:function(t,e){var i=this;this.zVoucherUrlDel();var s={appCode:"0697",action_id:Number(t),coupon_id:Number(e)};_("%c---\x3eVoucherWxUrl: PD =","background: red;",s),o(s).then((function(t){_("%c---\x3eVoucherWxUrl: RD =","background: green;",t),i.zVoucherUrlSet(t.result.link)}))},zpick:function(){_("%c---\x3eClick: Url =","background: orange;",String(this.zlist.voucherUrl)),window.wx.miniProgram.navigateTo({url:this.zlist.voucherUrl})},zVoucherSet:function(t){this.zlist.voucher=t},zVoucherDel:function(){this.zlist.voucher=[]},zVoucherUrlSet:function(t){this.zlist.voucherUrl=String(t)},zVoucherUrlDel:function(){this.zlist.voucherUrl=""},testEaPost:function(){var t={appCode:"0696",mdid:1};Object(n["a"])(t).then((function(t){}))},buttonSingleMarketingClick:function(){},buttonMainMarketingClick:function(){this.$router.push("MainSale")}}},z=I,b=(i("16e1"),i("2877")),C=Object(b["a"])(z,s,r,!1,null,"9d0ae28a",null);e["default"]=C.exports},7156:function(t,e,i){var s=i("861d"),r=i("d2bb");t.exports=function(t,e,i){var n,a;return r&&"function"==typeof(n=e.constructor)&&n!==i&&s(a=n.prototype)&&a!==i.prototype&&r(t,a),t}},"857a":function(t,e,i){var s=i("1d80"),r=/"/g;t.exports=function(t,e,i,n){var a=String(s(t)),c="<"+e;return""!==i&&(c+=" "+i+'="'+String(n).replace(r,"&quot;")+'"'),c+">"+a+"</"+e+">"}},9911:function(t,e,i){"use strict";var s=i("23e7"),r=i("857a"),n=i("eae9");s({target:"String",proto:!0,forced:n("link")},{link:function(t){return r(this,"a","href",t)}})},a9e3:function(t,e,i){"use strict";var s=i("83ab"),r=i("da84"),n=i("94ca"),a=i("6eeb"),c=i("5135"),o=i("c6b6"),u=i("7156"),d=i("c04e"),l=i("d039"),h=i("7c73"),f=i("241c").f,v=i("06cf").f,p=i("9bf2").f,m=i("58a8").trim,g="Number",_=r[g],I=_.prototype,z=o(h(I))==g,b=function(t){var e,i,s,r,n,a,c,o,u=d(t,!1);if("string"==typeof u&&u.length>2)if(u=m(u),e=u.charCodeAt(0),43===e||45===e){if(i=u.charCodeAt(2),88===i||120===i)return NaN}else if(48===e){switch(u.charCodeAt(1)){case 66:case 98:s=2,r=49;break;case 79:case 111:s=8,r=55;break;default:return+u}for(n=u.slice(2),a=n.length,c=0;c<a;c++)if(o=n.charCodeAt(c),o<48||o>r)return NaN;return parseInt(n,s)}return+u};if(n(g,!_(" 0o1")||!_("0b1")||_("+0x1"))){for(var C,k=function(t){var e=arguments.length<1?0:t,i=this;return i instanceof k&&(z?l((function(){I.valueOf.call(i)})):o(i)!=g)?u(new _(b(e)),i,k):b(e)},y=s?f(_):"MAX_VALUE,MIN_VALUE,NaN,NEGATIVE_INFINITY,POSITIVE_INFINITY,EPSILON,isFinite,isInteger,isNaN,isSafeInteger,MAX_SAFE_INTEGER,MIN_SAFE_INTEGER,parseFloat,parseInt,isInteger".split(","),S=0;y.length>S;S++)c(_,C=y[S])&&!c(k,C)&&p(k,C,v(_,C));k.prototype=I,I.constructor=k,a(r,g,k)}},eae9:function(t,e,i){var s=i("d039");t.exports=function(t){return s((function(){var e=""[t]('"');return e!==e.toLowerCase()||e.split('"').length>3}))}}}]);
+//# sourceMappingURL=chunk-dca24f36.50cfdec9.js.map
\ No newline at end of file

ybf_wx/src/utils/aRequestCF.js

@@ -4,6 +4,7 @@ import md5 from "js-md5"
 let BASE_API = "http://139.155.48.151:8084"
 const zlog = console.log.bind(console)
 
+// ztest
 
 // 创建 axios 实例
 const service = axios.create({