Skip to content

H
h5-base
Commit 7c46afed authored by chenyishuai@singsingenglish.com's avatar chenyishuai@singsingenglish.com
Browse files
Options

64

parent 5258d57c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 23 deletions
dev/index.html
View file @ 7c46afed
......@@ -6,4 +6,4 @@
overflow: hidden;
position: fixed;
background: #f4f4f4;
}</style><link href=static/css/app.3c0ad5f24e07150c06bc3b21fbd29d4b.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 src=static/vconsole/vconsole.min.js></script><script type=text/javascript src=static/js/manifest.4a27e08165024350f9bc.js></script><script type=text/javascript src=static/js/vendor.1396ea78033e4259211e.js></script><script type=text/javascript src=static/js/app.1d859a82281714b4a5e3.js></script></body></html>
\ No newline at end of file
}</style><link href=static/css/app.3c0ad5f24e07150c06bc3b21fbd29d4b.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 src=static/vconsole/vconsole.min.js></script><script type=text/javascript src=static/js/manifest.a9f69f79dae2b6249eeb.js></script><script type=text/javascript src=static/js/vendor.1396ea78033e4259211e.js></script><script type=text/javascript src=static/js/app.d177755c699da5e9031d.js></script></body></html>
\ No newline at end of file
dev/static/js/0.2aa556f8dc46a4ba266a.js → dev/static/js/0.c452b2572e5fecb4a390.js
View file @ 7c46afed
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/1.e63cc8e8ea0eb51e34ae.js → dev/static/js/1.9bf79ea33042be938e87.js
View file @ 7c46afed
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/20.047ed15294b126bf7c75.js deleted 100644 → 0
View file @ 5258d57c
This diff is collapsed.
dev/static/js/20.40cd2bc590f736066757.js 0 → 100644
View file @ 7c46afed
This diff is collapsed.
dev/static/js/7.52328654031215eec384.js deleted 100644 → 0
View file @ 5258d57c
This diff is collapsed.
dev/static/js/7.c32362100a521035cab1.js 0 → 100644
View file @ 7c46afed
This diff is collapsed.
dev/static/js/app.1d859a82281714b4a5e3.js deleted 100644 → 0
View file @ 5258d57c
This diff is collapsed.
dev/static/js/app.d177755c699da5e9031d.js 0 → 100644
View file @ 7c46afed
This diff is collapsed.
dev/static/js/manifest.4a27e08165024350f9bc.js deleted 100644 → 0
View file @ 5258d57c
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,f,t){for(var d,o,b,i=0,u=[];i<a.length;i++)o=a[i],n[o]&&u.push(n[o][0]),n[o]=0;for(d in f)Object.prototype.hasOwnProperty.call(f,d)&&(e[d]=f[d]);for(c&&c(a,f,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=r(r.s=t[i]);return b};var a={},n={41:0};function r(c){if(a[c])return a[c].exports;var n=a[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,r){c=n[e]=[a,r]});c[2]=a;var f=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,r.nc&&t.setAttribute("nonce",r.nc),t.src=r.p+"static/js/"+e+"."+{0:"2aa556f8dc46a4ba266a",1:"e63cc8e8ea0eb51e34ae",2:"7beea4eb4f828fe771ad",3:"05a9632fa1b23e83453a",4:"03ce00e1c2648491b33d",5:"704a06f101829605fa7b",6:"026f7f4db0d0ec20019d",7:"52328654031215eec384",8:"ca8f31349f4c36b068c4",9:"607e2d29cc548a9ebc22",10:"b2c12d1a02836ebca36f",11:"6def6f87c50233d10294",12:"7609488df4fe9c22187f",13:"082f8365b64f58842f5a",14:"dd6b593e0b43c281248f",15:"7ed79964df837616767d",16:"578c715a9dfd07cb907d",17:"21d093a7c64e8e6383b1",18:"39d5f787179d4df7b4eb",19:"6ae799274e5b0051cb30",20:"047ed15294b126bf7c75",21:"b7de45138dad7ef570bb",22:"084b354db77cd0cb9f1f",23:"71004b18332c6b148168",24:"d71f9865d3c4d59dd149",25:"622b95107bb5858485f3",26:"ec0b7ada347942460200",27:"064e840e501ff9b79ae6",28:"4c5f0f68a13dd3e8a01c",29:"8d04a62ee78fc628a5b9",30:"9bcd686cd8b422f87c3b",31:"40604333d87e3ab7124e",32:"36917bae854a9d5d9250",33:"755d516b1380106ec605",34:"d4b49737304046ad821d",35:"484f3779289c054e3d13",36:"db8a14af0eae5772fc12",37:"11cef8d0e4a5fc526257",38:"484fb0d46b52bbc4cf54"}[e]+".js";var d=setTimeout(o,12e4);function o(){t.onerror=t.onload=null,clearTimeout(d);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return t.onerror=t.onload=o,f.appendChild(t),a},r.m=e,r.c=a,r.d=function(e,c,a){r.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},r.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dev/static/js/manifest.a9f69f79dae2b6249eeb.js 0 → 100644
View file @ 7c46afed
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(f,r,t){for(var d,o,b,i=0,u=[];i<f.length;i++)o=f[i],c[o]&&u.push(c[o][0]),c[o]=0;for(d in r)Object.prototype.hasOwnProperty.call(r,d)&&(e[d]=r[d]);for(a&&a(f,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var f={},c={41:0};function n(a){if(f[a])return f[a].exports;var c=f[a]={i:a,l:!1,exports:{}};return e[a].call(c.exports,c,c.exports,n),c.l=!0,c.exports}n.e=function(e){var a=c[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var f=new Promise(function(f,n){a=c[e]=[f,n]});a[2]=f;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"c452b2572e5fecb4a390",1:"9bf79ea33042be938e87",2:"5bd105ce3f27aafd42b9",3:"df615b23f17a30912d1b",4:"81f114f6d9f17c65242c",5:"08c7394fd38f53f13f26",6:"ad1648da69d720d39bfb",7:"c32362100a521035cab1",8:"28436d121bb2eef7b629",9:"6c3e0678c0b9a1755e94",10:"6c45073c238f4b0acae8",11:"63527e5eb89ffdf9ff28",12:"477f60ece425a6f8c08c",13:"2569f79a79a47b4a391f",14:"faf8b426fde50aebbf71",15:"7ed79964df837616767d",16:"3b0b8ccc26d68d08bd32",17:"fec7400f11507033191b",18:"f6d28946ec7e53987ea1",19:"3268052ca4bd9410680a",20:"40cd2bc590f736066757",21:"c5b97c20eeab081ca77e",22:"971be874abb8c99a251f",23:"95dd7cde0fd5f3d5dc48",24:"d71f9865d3c4d59dd149",25:"d7823aab0ae166145483",26:"a429ab1b776443ddf32a",27:"fee3b3ba9895683c31d5",28:"05abb4a25966bb63a873",29:"88a28b13ef752068d901",30:"9bcd686cd8b422f87c3b",31:"eb6d3a67f0ea7ef6ecd3",32:"36917bae854a9d5d9250",33:"90551372eed114ae129f",34:"47030c121a8712150211",35:"f0f8081304000fad92a0",36:"5563f849f0229816879e",37:"2163df37097ba17a8388",38:"484fb0d46b52bbc4cf54"}[e]+".js";var d=setTimeout(o,12e4);function o(){t.onerror=t.onload=null,clearTimeout(d);var a=c[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return t.onerror=t.onload=o,r.appendChild(t),f},n.m=e,n.c=f,n.d=function(e,a,f){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:f})},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,"a",a),a},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},n.p="",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/map/index.vue
View file @ 7c46afed
......@@ -626,10 +626,14 @@
this.scroll_to(dom[0].offsetTop)
}
}else{
let moneyDom = document.getElementsByClassName('money');
if(moneyDom.length>0 && moneyDom[0].offsetLeft !== 0){
this.scroll_to(moneyDom[0].offsetParent.offsetTop)
}
setTimeout(() => {
let moneyDom = document.getElementsByClassName('money');
console.log(moneyDom[0].offsetParent.offsetTop)
// debugger
if(moneyDom.length>0 && moneyDom[0].offsetLeft !== 0){
this.scroll_to(moneyDom[0].offsetParent.offsetTop)
}
}, 300);
}
})
}else{
......
src/components/subAccount/accept.vue
View file @ 7c46afed
......@@ -45,7 +45,7 @@
<script>
import img_logo from "../../assets/account/img_logo@3x.png";
import img_qr from "../../assets/shop/qr4.png";
import { bindAccountApi,mainAccountinfoApi } from "../../service/api";
import { bindAccountApi,mainAccountinfoApi,searchAccountinfoApi } from "../../service/api";
import common from '../../util/common'
export default {
name: "accept",
......@@ -68,11 +68,16 @@ export default {
// console.log(common.getParamhref())
console.log(this.$route.query)
// console.log(common.getUrlParam().code)
let ownDetail = JSON.parse(localStorage.getItem("userDesc"));
if(ownDetail.family_user==2){
this.acceptStatus = 1
}
if(this.$route.query.code){
searchAccountinfoApi(this.$route.query.code).then(res =>{
if(res.code==1){
this.acceptStatus = 1
}else{
this.errMsg = res.code
this.acceptStatus = 2
}
})
mainAccountinfoApi(this.$route.query.code).then(res =>{
this.userDetail = res
// console.log(res)
......
src/components/subAccount/index.vue
View file @ 7c46afed
......@@ -55,7 +55,7 @@
show-cancel-button
:show-confirm-button='bol'
:show-cancel-button='bol'>
<div class="content">此次解除授权后本月只剩<span>{{times-1}}}次</span>授权机会，确定解除授权吗</div>
<div class="content">此次解除授权后本月只剩<span>{{times}}次</span>授权机会，确定解除授权吗</div>
<div class="button">
<button class="certain" @click='relieve'>确定</button>
<button class="cancel" @click="confirmshow=false" >取消</button>
......
src/service/api.js
View file @ 7c46afed
......@@ -289,4 +289,8 @@ export const subAccountinfoApi = function () {
export const mainAccountinfoApi = function (authorization) {
return Vue.prototype.$fetch(`/api/client/user/main/info/${authorization}`)
};
// /api/client/user/main/info
//查询子账户信息
export const searchAccountinfoApi = function (authorization) {
return Vue.prototype.$fetch(`/user/click/link/${authorization}`)
};
// /user/click/link/
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