Skip to content

H
h5-base
Commit 7e7229c3 authored by liwei's avatar liwei
Browse files
Options

Merge branch 'master' of http://git.singsingenglish.com/new-sing/wechat

parents 35810f1d e8b03340
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 8 deletions
dev/index.html
View file @ 7e7229c3
...@@ -11,4 +11,4 @@ ...@@ -11,4 +11,4 @@
position: fixed; position: fixed;
background: #f4f4f4; background: #f4f4f4;
} }
/* html{font-size: 1px;} */</style><link href=static/css/app.91d2eea1dfca80994de99748f577fac4.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script></script><script type=text/javascript src=static/js/manifest.b530d34480b436013ce7.js></script><script type=text/javascript src=static/js/vendor.a46051d06c394744be78.js></script><script type=text/javascript src=static/js/app.97353bbe6dee2c9beabe.js></script></body></html> /* html{font-size: 1px;} */</style><link href=static/css/app.91d2eea1dfca80994de99748f577fac4.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script></script><script type=text/javascript src=static/js/manifest.d6057512239e90549ebf.js></script><script type=text/javascript src=static/js/vendor.a46051d06c394744be78.js></script><script type=text/javascript src=static/js/app.97353bbe6dee2c9beabe.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dev/static/js/11.3dcba9e714e2dd2f1642.js deleted 100644 → 0
View file @ 35810f1d
This diff is collapsed.
dev/static/js/11.8b3c8a02002deaf09ace.js 0 → 100644
View file @ 7e7229c3
This diff is collapsed.
dev/static/js/manifest.b530d34480b436013ce7.js → dev/static/js/manifest.d6057512239e90549ebf.js
View file @ 7e7229c3
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(f,r,b){for(var d,t,o,i=0,u=[];i<f.length;i++)t=f[i],a[t]&&u.push(a[t][0]),a[t]=0;for(d in r)Object.prototype.hasOwnProperty.call(r,d)&&(e[d]=r[d]);for(c&&c(f,r,b);u.length;)u.shift()();if(b)for(i=0;i<b.length;i++)o=n(n.s=b[i]);return o};var f={},a={49:0};function n(c){if(f[c])return f[c].exports;var a=f[c]={i:c,l:!1,exports:{}};return e[c].call(a.exports,a,a.exports,n),a.l=!0,a.exports}n.e=function(e){var c=a[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var f=new Promise(function(f,n){c=a[e]=[f,n]});c[2]=f;var r=document.getElementsByTagName("head")[0],b=document.createElement("script");b.type="text/javascript",b.charset="utf-8",b.async=!0,b.timeout=12e4,n.nc&&b.setAttribute("nonce",n.nc),b.src=n.p+"static/js/"+e+"."+{0:"4abe9745786f805c643d",1:"4d5af33875f881fbf170",2:"5c7330fd3d0725ef74b7",3:"95c778ffc94c516ed93c",4:"512dbfc54143036436b6",5:"177b8f15e4c3cdaefc5c",6:"54c55d39e8766c1c5179",7:"cad1d8ddb8a33186c6e6",8:"e6208ee39755be230d36",9:"270f0165357adf86a105",10:"e7e75f52630c3f5f7921",11:"3dcba9e714e2dd2f1642",12:"930e9006116417e356cb",13:"e3807f34b8882de6d66c",14:"fa81ee4ecc5b9a82a064",15:"a5380d1ef2f6fd3e9fe4",16:"4005fa54cc59f995ef22",17:"4d4fefacb21c6a27c469",18:"bdd0e545e01a46590fab",19:"f8c23ec99fe543ba7c59",20:"c50eb69950e3b05c75ba",21:"b66faf32d39b00b402fc",22:"3e1c1e9957614840401d",23:"fd0164cb8d1b48e15d14",24:"c5cfefb13fa3c8a23cf9",25:"0ee772df2607cf771171",26:"2884e8e9df9c9c10450a",27:"6ca8044c5b7dbaea1939",28:"e9159c78646a00d7a136",29:"bc4b2e19d7bbdb26f35b",30:"0dfa7b2f351464837431",31:"58ef57a7139f62e43fba",32:"11027e4a30d5d1f15a57",33:"5b982bd46e542c17a68e",34:"52cb42be742874708eba",35:"15332b0458c1f2d684e9",36:"734179926fd497b7979d",37:"303c15b2a63b09cbb9b1",38:"6b7d629cbf5bf00d5f79",39:"b129a2de1d1687a78b98",40:"ac1fc8c242c022600367",41:"54122ed28fb233a82436",42:"acc5bf61cb041f593bfa",43:"667f1d1d775fdc8f576a",44:"8531f16a0f4a76e474b8",45:"7cf681e938528dcae32b",46:"c0b858d756b11b0bf319"}[e]+".js";var d=setTimeout(t,12e4);function t(){b.onerror=b.onload=null,clearTimeout(d);var c=a[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return b.onerror=b.onload=t,r.appendChild(b),f},n.m=e,n.c=f,n.d=function(e,c,f){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:f})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="",n.oe=function(e){throw console.error(e),e}}([]); !function(e){var c=window.webpackJsonp;window.webpackJsonp=function(f,n,r){for(var t,d,o,i=0,u=[];i<f.length;i++)d=f[i],a[d]&&u.push(a[d][0]),a[d]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(c&&c(f,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=b(b.s=r[i]);return o};var f={},a={49:0};function b(c){if(f[c])return f[c].exports;var a=f[c]={i:c,l:!1,exports:{}};return e[c].call(a.exports,a,a.exports,b),a.l=!0,a.exports}b.e=function(e){var c=a[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var f=new Promise(function(f,b){c=a[e]=[f,b]});c[2]=f;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,b.nc&&r.setAttribute("nonce",b.nc),r.src=b.p+"static/js/"+e+"."+{0:"4abe9745786f805c643d",1:"4d5af33875f881fbf170",2:"5c7330fd3d0725ef74b7",3:"95c778ffc94c516ed93c",4:"512dbfc54143036436b6",5:"177b8f15e4c3cdaefc5c",6:"54c55d39e8766c1c5179",7:"cad1d8ddb8a33186c6e6",8:"e6208ee39755be230d36",9:"1a823f031818b68ca150",10:"e7e75f52630c3f5f7921",11:"8b3c8a02002deaf09ace",12:"930e9006116417e356cb",13:"e3807f34b8882de6d66c",14:"fa81ee4ecc5b9a82a064",15:"a5380d1ef2f6fd3e9fe4",16:"4005fa54cc59f995ef22",17:"4d4fefacb21c6a27c469",18:"bdd0e545e01a46590fab",19:"f8c23ec99fe543ba7c59",20:"c50eb69950e3b05c75ba",21:"b66faf32d39b00b402fc",22:"3e1c1e9957614840401d",23:"fd0164cb8d1b48e15d14",24:"c5cfefb13fa3c8a23cf9",25:"0ee772df2607cf771171",26:"2884e8e9df9c9c10450a",27:"6ca8044c5b7dbaea1939",28:"e9159c78646a00d7a136",29:"bc4b2e19d7bbdb26f35b",30:"0dfa7b2f351464837431",31:"58ef57a7139f62e43fba",32:"11027e4a30d5d1f15a57",33:"5b982bd46e542c17a68e",34:"52cb42be742874708eba",35:"15332b0458c1f2d684e9",36:"734179926fd497b7979d",37:"303c15b2a63b09cbb9b1",38:"6b7d629cbf5bf00d5f79",39:"b129a2de1d1687a78b98",40:"ac1fc8c242c022600367",41:"54122ed28fb233a82436",42:"acc5bf61cb041f593bfa",43:"667f1d1d775fdc8f576a",44:"8531f16a0f4a76e474b8",45:"7cf681e938528dcae32b",46:"c0b858d756b11b0bf319"}[e]+".js";var t=setTimeout(d,12e4);function d(){r.onerror=r.onload=null,clearTimeout(t);var c=a[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return r.onerror=r.onload=d,n.appendChild(r),f},b.m=e,b.c=f,b.d=function(e,c,f){b.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:f})},b.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(c,"a",c),c},b.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},b.p="",b.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file \ No newline at end of file
src/components/buy/activityInvite.vue
View file @ 7e7229c3
...@@ -37,7 +37,8 @@ ...@@ -37,7 +37,8 @@
<img class="p-envelope" :src="envelopeUrl" /> <img class="p-envelope" :src="envelopeUrl" />
<span class="p-tips">贴心的邀请语提高成功率</span> <span class="p-tips">贴心的邀请语提高成功率</span>
</div> </div>
<img class="p-switch no-margin" :src="switchUrl" @click="onSwitch" /> <span class="p-switch no-margin" @click="onSwitch">换一换</span>
<!-- <img class="p-switch no-margin" :src="switchUrl" @click="onSwitch" /> -->
</div> </div>
<div class="p-comments"> <div class="p-comments">
<p v-html="comments[commentIndex].replace(/\n/g,'</br>')"></p> <p v-html="comments[commentIndex].replace(/\n/g,'</br>')"></p>
...@@ -190,6 +191,7 @@ export default { ...@@ -190,6 +191,7 @@ export default {
invite_code[1] = "USER"; invite_code[1] = "USER";
} }
let code = `${invite_code[0]}-${invite_code[1]}`; let code = `${invite_code[0]}-${invite_code[1]}`;
console.log(ownDetail,194)
let URL = `${process.env.BUY_URL}shopId=${this.shopId}&invite_code=${code}-${this.user_id}&nickname=${encodeURIComponent(ownDetail.nickname)}`; let URL = `${process.env.BUY_URL}shopId=${this.shopId}&invite_code=${code}-${this.user_id}&nickname=${encodeURIComponent(ownDetail.nickname)}`;
if (this.groupId && this.groupId !== "null") { if (this.groupId && this.groupId !== "null") {
...@@ -505,11 +507,11 @@ video { ...@@ -505,11 +507,11 @@ video {
margin-top: 10 * @toVw; margin-top: 10 * @toVw;
} }
.img-cvs { .img-cvs {
position: absolute; position: relative;
background: rgb(253, 168, 19); background: rgb(253, 168, 19);
width: 518 / 2 * @toVw; width: 518 / 2 * @toVw;
top: 25 * @toVh; top: 25 * @toVh;
left: 113 / 2 * @toVw; // left: 113 / 2 * @toVw;
.avatar-container { .avatar-container {
position: absolute; position: absolute;
top: 8 * @toVh; top: 8 * @toVh;
...@@ -554,7 +556,8 @@ video { ...@@ -554,7 +556,8 @@ video {
z-index: 10; z-index: 10;
} }
.inviteBtn { .inviteBtn {
position: absolute; // position: relative;
margin-top: 40* @toVw;
width: 100%; width: 100%;
opacity: 0; opacity: 0;
text-align: center; text-align: center;
...@@ -637,8 +640,10 @@ video { ...@@ -637,8 +640,10 @@ video {
margin-right: 12 * @toVw; margin-right: 12 * @toVw;
} }
.p-switch { .p-switch {
width: 15 * @toVw; // width: 15 * @toVw;
height: 15 * @toVw; height: 15 * @toVw;
color: #999999;
font-size: 13 * @toVw;
} }
.p-comments { .p-comments {
margin: 15px 0; margin: 15px 0;
......
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