731

c4983a0c · chenyishuai@singsingenglish.com · ca08c6f5 · c4983a0c · ca08c6f5 · c4983a0c
Commit c4983a0c authored Aug 01, 2019 by chenyishuai@singsingenglish.com
7 changed files
--- a/dev/index.html
+++ b/dev/index.html
@@ -11,4 +11,4 @@
          position: fixed;
          background: #f4f4f4;
        }
-        /* html{font-size: 1px;} */</style><link href=static/css/app.129556e9383a4eca915187bdf43f354e.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.eae13e7d3f43aad100ff.js></script><script type=text/javascript src=static/js/vendor.73706c7cc85e5a0dcf64.js></script><script type=text/javascript src=static/js/app.2f76c9c65d56733dbe50.js></script></body></html>
\ No newline at end of file
+        /* html{font-size: 1px;} */</style><link href=static/css/app.129556e9383a4eca915187bdf43f354e.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.f6c93094f8c76ae81cf9.js></script><script type=text/javascript src=static/js/vendor.73706c7cc85e5a0dcf64.js></script><script type=text/javascript src=static/js/app.2f76c9c65d56733dbe50.js></script></body></html>
\ No newline at end of file
--- a/dev/static/js/8.34825d39206b6a0e6f3a.js
+++ b/dev/static/js/8.34825d39206b6a0e6f3a.js
--- a/dev/static/js/8.c0f371ac44eaecd44000.js
+++ b/dev/static/js/8.c0f371ac44eaecd44000.js
--- a/dev/static/js/manifest.eae13e7d3f43aad100ff.js
+++ b/dev/static/js/manifest.eae13e7d3f43aad100ff.js
-!function(e){var f=window.webpackJsonp;window.webpackJsonp=function(a,d,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],c[t]&&u.push(c[t][0]),c[t]=0;for(r in d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(f&&f(a,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=b(b.s=n[i]);return o};var a={},c={57:0};function b(f){if(a[f])return a[f].exports;var c=a[f]={i:f,l:!1,exports:{}};return e[f].call(c.exports,c,c.exports,b),c.l=!0,c.exports}b.e=function(e){var f=c[e];if(0===f)return new Promise(function(e){e()});if(f)return f[2];var a=new Promise(function(a,b){f=c[e]=[a,b]});f[2]=a;var d=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,b.nc&&n.setAttribute("nonce",b.nc),n.src=b.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"852e11733f08ed6ebf68",1:"24efca991b2d3812d1f8",2:"b4810cf4aaa5dbb398fc",3:"54fa89bd2bbb06703661",4:"ae7a4e2215f3d99a5d20",5:"3a39e10d3dc416e74402",6:"a21931b82e68dbe10c39",7:"e261d1ac70064d3deaca",8:"34825d39206b6a0e6f3a",9:"fcf2b2d643d7ef2b3d81",10:"9fac9d2a9e3d53e97f01",11:"382a5c11318af92fbb59",12:"0ecf58a89b4fc2a82470",13:"436dab9e7dd3bb983771",14:"db70f274239bf80de94a",15:"be352f7b2456c5e718bb",16:"d9657d596ed5fef12b1b",17:"fbd18139de0b13a6834b",18:"c38221332f620ad3f274",19:"4ff06adeb4bdb48bf53b",20:"7ebfa8f4c91914e77fef",21:"da73786f91e728410b17",22:"e55364228ebae84d8235",23:"85889905f55a37fff1a9",24:"69be3c796e6703e93042",25:"0e39f7a4c20acb074006",26:"9c649db055d761574150",27:"3dc03a880fade9d2e53b",28:"da96391cb22c86be22d5",29:"359ad1ee5bdeeb1318ea",30:"ef902e5dbe3f4638b21b",31:"3bbb6fac9f9c58f2a9b3",32:"e38c516bbdf070c56bad",33:"199b052e77ddc7a00c9a",34:"600fc943385b9659c26c",35:"622f69f0991eab4188a1",36:"d6b8387245352f632f67",37:"fbc16d51d34a46444b95",38:"672dfa4a19e599e4772e",39:"f80f18ac8e5d8d938108",40:"96646d8c16695f7e0740",41:"2aadcb1c5189985271e3",42:"bd3a3c85b5741337fb6f",43:"3e9a35c195fda147f986",44:"6892a2428a630359da7c",45:"aeffffc1121277483f8b",46:"6eeea39ece9ec4fef2eb",47:"bff16279a704d03fff30",48:"9009e5dbc9f19ad286f4",49:"7d1b01b1c958c748487e",50:"4bc930ca95c10f9642da",51:"d9e11241833a7e1dc106",52:"86f22738252758dfb3a0",53:"853d40b6ae9597fb1806",54:"5b2bad7a7f63f325a28e"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var f=c[e];0!==f&&(f&&f[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return n.onerror=n.onload=t,d.appendChild(n),a},b.m=e,b.c=a,b.d=function(e,f,a){b.o(e,f)||Object.defineProperty(e,f,{configurable:!1,enumerable:!0,get:a})},b.n=function(e){var f=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(f,"a",f),f},b.o=function(e,f){return Object.prototype.hasOwnProperty.call(e,f)},b.p="",b.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
+!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(f,b,n){for(var r,t,o,i=0,u=[];i<f.length;i++)t=f[i],c[t]&&u.push(c[t][0]),c[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(a&&a(f,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var f={},c={57:0};function d(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,d),c.l=!0,c.exports}d.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,d){a=c[e]=[f,d]});a[2]=f;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"1d066ed9d05d040481c7",1:"24efca991b2d3812d1f8",2:"b4810cf4aaa5dbb398fc",3:"54fa89bd2bbb06703661",4:"ae7a4e2215f3d99a5d20",5:"3a39e10d3dc416e74402",6:"a21931b82e68dbe10c39",7:"e261d1ac70064d3deaca",8:"c0f371ac44eaecd44000",9:"fcf2b2d643d7ef2b3d81",10:"9fac9d2a9e3d53e97f01",11:"382a5c11318af92fbb59",12:"0ecf58a89b4fc2a82470",13:"436dab9e7dd3bb983771",14:"db70f274239bf80de94a",15:"be352f7b2456c5e718bb",16:"d9657d596ed5fef12b1b",17:"fbd18139de0b13a6834b",18:"c38221332f620ad3f274",19:"4ff06adeb4bdb48bf53b",20:"7ebfa8f4c91914e77fef",21:"da73786f91e728410b17",22:"e55364228ebae84d8235",23:"85889905f55a37fff1a9",24:"69be3c796e6703e93042",25:"0e39f7a4c20acb074006",26:"9c649db055d761574150",27:"3dc03a880fade9d2e53b",28:"da96391cb22c86be22d5",29:"359ad1ee5bdeeb1318ea",30:"ef902e5dbe3f4638b21b",31:"3bbb6fac9f9c58f2a9b3",32:"e38c516bbdf070c56bad",33:"199b052e77ddc7a00c9a",34:"600fc943385b9659c26c",35:"622f69f0991eab4188a1",36:"d6b8387245352f632f67",37:"fbc16d51d34a46444b95",38:"672dfa4a19e599e4772e",39:"f80f18ac8e5d8d938108",40:"96646d8c16695f7e0740",41:"2aadcb1c5189985271e3",42:"bd3a3c85b5741337fb6f",43:"3e9a35c195fda147f986",44:"6892a2428a630359da7c",45:"aeffffc1121277483f8b",46:"6eeea39ece9ec4fef2eb",47:"bff16279a704d03fff30",48:"9009e5dbc9f19ad286f4",49:"7d1b01b1c958c748487e",50:"4bc930ca95c10f9642da",51:"d9e11241833a7e1dc106",52:"86f22738252758dfb3a0",53:"853d40b6ae9597fb1806",54:"5b2bad7a7f63f325a28e"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=c[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),f},d.m=e,d.c=f,d.d=function(e,a,f){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:f})},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},d.p="",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/dev/static/js/vendor-async.852e11733f08ed6ebf68.js
+++ b/dev/static/js/vendor-async.852e11733f08ed6ebf68.js
--- a/src/components/address-picker/Address.vue
+++ b/src/components/address-picker/Address.vue
 <template>
  <div class="address">
    <!--地址选择组件-->
-    <van-popup v-model="show" position="bottom"  >
+    <van-popup v-model="show" :close-on-click-overlay='clickCancel' position="bottom"  >
      <section style="width:100%; height: 100%;">
        <div class="padding">
          <span @click="hidePicker">取消</span>
@@ -70,19 +70,19 @@
        if (this.init) {
          this.initVal = this.init
        } 
-        console.log(73)
-       
      this.initAddress()
    },
    mounted() {
      let vm = this
      vm.show = vm.showAddressPicker
+      // console.log(vm.show,80)
    },
    components: {
    [Picker.name]: Picker
  },
    data() {
      return {
+        clickCancel:false,
        slots: [{
          flex: 1,
          values: [],

--- a/src/components/youbang/ybOrderRender.vue
+++ b/src/components/youbang/ybOrderRender.vue
@@ -136,6 +136,9 @@ export default {
    this.initPage();
  },
  methods: {
+    test(){
+      this.showAddressPicker = tr
+    },
    buttonClick(buttonType, buttonName) {
      this.$sa.track("buttonClick", {
        tabTitle: "商品",
@@ -264,7 +267,6 @@ export default {
            if (res.err_msg === 'get_brand_wcpay_request:fail') {
            }
            if (res.err_msg === 'get_brand_wcpay_request:cancel') {
-
              that.orderCancel=true
            }
          })