diff --git a/components/common/common.vue b/components/common/common.vue index 3c97a728..1ad69567 100644 --- a/components/common/common.vue +++ b/components/common/common.vue @@ -67,7 +67,7 @@ // 底部菜单高度 footer_height_value_event(value) { this.setData({ - footer_height_value: (value*2)+40 + footer_height_value: (value*2)+20 }); this.$emit('footer-height', value); diff --git a/components/diy/diy.vue b/components/diy/diy.vue index 94a59014..12c21bd0 100644 --- a/components/diy/diy.vue +++ b/components/diy/diy.vue @@ -2,7 +2,7 @@ - + @@ -39,26 +39,34 @@ + + + - - - + + + + + + + + + @@ -107,7 +115,7 @@ propDataId: { type: [String, Number], default: '', - }, + } }, components: { componentDiyHeader, @@ -194,7 +202,10 @@ data_is_loading: 0, // 缓存key cache_key: app.globalData.data.cache_diy_data_key, - hackReset: false, + // 重置 + hack_reset: false, + // 底部导航高度 + footer_height_value: 0, }; }, created() { @@ -209,7 +220,7 @@ init_config(status) { if ((status || false) == true) { // 是否显示底部菜单,如果当前地址已经存在系统底部菜单中则不显示当前diy页面自定义的底部菜单 - var is_show_footer = this.propValue.header.com_data.content.bottom_navigation_show; + var is_show_footer = parseInt(this.propValue.header.com_data.content.bottom_navigation_show || 0) == 1; var is_tabbar = app.globalData.is_tabbar_pages(); this.setData({ is_show_footer: is_show_footer && !is_tabbar, @@ -223,7 +234,7 @@ init() { // tabs选项卡数据过滤 this.setData({ - hackReset: true, + hack_reset: true, header_data: this.propValue.header, footer_data: this.propValue.footer, diy_data: this.propValue.diy_data, @@ -242,7 +253,7 @@ this.setData({ is_tabs_type: bool, }); - const new_params = { + let new_params = { ...params, id: tabs_id, }; @@ -265,7 +276,7 @@ dataType: 'json', success: (res) => { // 数据处理 - const data = res.data.data.data; + let data = res.data.data.data; if (res.data.code == 0) { new_data = data?.config.diy_data || []; uni.setStorageSync(this.cache_key + tabs_id, new_data); @@ -329,7 +340,7 @@ title: this.$t('common.loading_in_text'), }); } - const new_data = { + let new_data = { category_id: this.tabs_id, page: this.goods_page, }; @@ -407,6 +418,8 @@ }, }); }, + + // 页面滚动事件 on_scroll_event(e) { this.setData({ scroll_top: e.detail.scrollTop, @@ -430,6 +443,13 @@ } // #endif }, + + // 底部菜单高度 + footer_height_value_event(value) { + this.setData({ + footer_height_value: (value*2)+20 + }); + } }, }; diff --git a/node_modules/jweixin-module/README.md b/node_modules/jweixin-module/README.md new file mode 100644 index 00000000..7c91d7b0 --- /dev/null +++ b/node_modules/jweixin-module/README.md @@ -0,0 +1,30 @@ +# jweixin-module + +微信JS-SDK + +## 安装 + +### NPM + +```shell +npm install jweixin-module --save +``` + +### UMD + +```http +https://unpkg.com/jweixin-module/out/index.js +``` + +## 使用 + +```js +var jweixin = require('jweixin-module') +jweixin.ready(function(){ + // TODO +}); +``` + +## 完整API + +>[微信JS-SDK说明文档](https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141115) diff --git a/node_modules/jweixin-module/lib/index.js b/node_modules/jweixin-module/lib/index.js new file mode 100644 index 00000000..1b5014bf --- /dev/null +++ b/node_modules/jweixin-module/lib/index.js @@ -0,0 +1 @@ +!function(e,n){"function"==typeof define&&(define.amd||define.cmd)?define(function(){return n(e)}):n(e,!0)}(window,function(o,e){if(!o.jWeixin){var n,c={config:"preVerifyJSAPI",onMenuShareTimeline:"menu:share:timeline",onMenuShareAppMessage:"menu:share:appmessage",onMenuShareQQ:"menu:share:qq",onMenuShareWeibo:"menu:share:weiboApp",onMenuShareQZone:"menu:share:QZone",previewImage:"imagePreview",getLocation:"geoLocation",openProductSpecificView:"openProductViewWithPid",addCard:"batchAddCard",openCard:"batchViewCard",chooseWXPay:"getBrandWCPayRequest",openEnterpriseRedPacket:"getRecevieBizHongBaoRequest",startSearchBeacons:"startMonitoringBeacons",stopSearchBeacons:"stopMonitoringBeacons",onSearchBeacons:"onBeaconsInRange",consumeAndShareCard:"consumedShareCard",openAddress:"editAddress"},a=function(){var e={};for(var n in c)e[c[n]]=n;return e}(),i=o.document,t=i.title,r=navigator.userAgent.toLowerCase(),s=navigator.platform.toLowerCase(),d=!(!s.match("mac")&&!s.match("win")),u=-1!=r.indexOf("wxdebugger"),l=-1!=r.indexOf("micromessenger"),p=-1!=r.indexOf("android"),f=-1!=r.indexOf("iphone")||-1!=r.indexOf("ipad"),m=(n=r.match(/micromessenger\/(\d+\.\d+\.\d+)/)||r.match(/micromessenger\/(\d+\.\d+)/))?n[1]:"",g={initStartTime:L(),initEndTime:0,preVerifyStartTime:0,preVerifyEndTime:0},h={version:1,appId:"",initTime:0,preVerifyTime:0,networkType:"",isPreVerifyOk:1,systemType:f?1:p?2:-1,clientVersion:m,url:encodeURIComponent(location.href)},v={},S={_completes:[]},y={state:0,data:{}};O(function(){g.initEndTime=L()});var I=!1,_=[],w={config:function(e){B("config",v=e);var t=!1!==v.check;O(function(){if(t)M(c.config,{verifyJsApiList:C(v.jsApiList),verifyOpenTagList:C(v.openTagList)},function(){S._complete=function(e){g.preVerifyEndTime=L(),y.state=1,y.data=e},S.success=function(e){h.isPreVerifyOk=0},S.fail=function(e){S._fail?S._fail(e):y.state=-1};var t=S._completes;return t.push(function(){!function(){if(!(d||u||v.debug||m<"6.0.2"||h.systemType<0)){var i=new Image;h.appId=v.appId,h.initTime=g.initEndTime-g.initStartTime,h.preVerifyTime=g.preVerifyEndTime-g.preVerifyStartTime,w.getNetworkType({isInnerInvoke:!0,success:function(e){h.networkType=e.networkType;var n="https://open.weixin.qq.com/sdk/report?v="+h.version+"&o="+h.isPreVerifyOk+"&s="+h.systemType+"&c="+h.clientVersion+"&a="+h.appId+"&n="+h.networkType+"&i="+h.initTime+"&p="+h.preVerifyTime+"&u="+h.url;i.src=n}})}}()}),S.complete=function(e){for(var n=0,i=t.length;n - + - + + + + + - - - - +