diff --git a/components/nodata/nodata.js b/components/nodata/nodata.js index 7080d89..9752283 100644 --- a/components/nodata/nodata.js +++ b/components/nodata/nodata.js @@ -1,15 +1,5 @@ Component({ - externalClasses: ['nodata-container'], - //在.js文件中 - properties: { - // 简单的定义方式 - // max:Number - // 完整的定义方式 - title:{ - type:String, - value:'' - } - }, + externalClasses: ['nodata-container'], /*** 页面的初始数据***/ data: { diff --git a/components/nodata/nodata.wxml b/components/nodata/nodata.wxml index 8b3e531..536a987 100644 --- a/components/nodata/nodata.wxml +++ b/components/nodata/nodata.wxml @@ -1,4 +1,4 @@ - {{title?title:'暂无数据'}} + 暂无数据 diff --git a/packageA/pages/chongzhiDetails/chongzhiDetails.js b/packageA/pages/chongzhiDetails/chongzhiDetails.js index 255d2e6..05ae07f 100644 --- a/packageA/pages/chongzhiDetails/chongzhiDetails.js +++ b/packageA/pages/chongzhiDetails/chongzhiDetails.js @@ -23,7 +23,6 @@ Page({ */ onLoad: function (options) { - wx.showLoading(); const self = this; if(options.type) self.setData({type:options.type}); @@ -51,11 +50,11 @@ Page({ getApp().request.promiseGet("/api/weshop/ad/page",{ - data:{store_id:os.stoid,enabled:1,pid:1210} + data:{store_id:os.stoid,enabled:1,pid:601} }).then(res=>{ if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){ var a = res.data.data.pageData; - self.setData({show_img:a[0].ad_code,ad_color:a[0].bgcolor,ad:a[0] }); + self.setData({show_img:a[0].ad_code,ad_color:a[0].bgcolor}); } }) @@ -95,8 +94,6 @@ Page({ self.setData({ result: result, }); - - wx.hideLoading(); }, }); @@ -279,12 +276,4 @@ Page({ } }) }, - - - go_url:function (e){ - var url=e.currentTarget.dataset.url; - if(url){ - getApp().goto(url); - } - } }) \ No newline at end of file diff --git a/packageA/pages/chongzhiDetails/chongzhiDetails.wxml b/packageA/pages/chongzhiDetails/chongzhiDetails.wxml index 25fdc9b..055d1fe 100644 --- a/packageA/pages/chongzhiDetails/chongzhiDetails.wxml +++ b/packageA/pages/chongzhiDetails/chongzhiDetails.wxml @@ -3,30 +3,16 @@ - - - - 女王专享 - 你的美丽我来缔造 - - + - + + + 女王专享 + 你的美丽我来缔造 + + diff --git a/packageA/pages/chongzhiDetails/g_filter.wxs b/packageA/pages/chongzhiDetails/g_filter.wxs index f924278..f9bd741 100644 --- a/packageA/pages/chongzhiDetails/g_filter.wxs +++ b/packageA/pages/chongzhiDetails/g_filter.wxs @@ -6,11 +6,6 @@ var is_acting = function(endtime){ var bijiao = getDate(endtime) - getDate(); return bijiao > 0 ? true : false; } -var has_char=function(url,key){ - if(!url) return -1; - return url.indexOf(key); -} module.exports = { - is_acting:is_acting, - has_char:has_char, + is_acting:is_acting } \ No newline at end of file diff --git a/packageD/pages/user/deposit/prepaid/prepaid.js b/packageD/pages/user/deposit/prepaid/prepaid.js index 4b97d93..4aaf90e 100644 --- a/packageD/pages/user/deposit/prepaid/prepaid.js +++ b/packageD/pages/user/deposit/prepaid/prepaid.js @@ -13,8 +13,7 @@ Page({ iurl: o.imghost, showModal: false, //弹框控制器 perpaid: [], //数据, - paying:0, - is_get:0 + paying:0 }, onLoad:function (){ //定义第一次进入 @@ -51,9 +50,6 @@ Page({ }, /*预存款的劵*/ async yuck() { - - - wx.showLoading(); var user_id = getApp().globalData.user_id; var store_id = os.stoid; console.log(user_id, "有进来吗银行卡", store_id ); @@ -72,9 +68,6 @@ Page({ e.setData({ perpaid: perpaids,is_get:1 }); - - wx.hideLoading(); - }) }, diff --git a/packageD/pages/user/deposit/prepaid/prepaid.json b/packageD/pages/user/deposit/prepaid/prepaid.json index b71c846..8835af0 100644 --- a/packageD/pages/user/deposit/prepaid/prepaid.json +++ b/packageD/pages/user/deposit/prepaid/prepaid.json @@ -1,6 +1,3 @@ { - "usingComponents": {}, - "usingComponents": { - "nodata": "/components/nodata/nodata" - } + "usingComponents": {} } \ No newline at end of file diff --git a/packageD/pages/user/deposit/prepaid/prepaid.wxml b/packageD/pages/user/deposit/prepaid/prepaid.wxml index 2a48d15..b0f0384 100644 --- a/packageD/pages/user/deposit/prepaid/prepaid.wxml +++ b/packageD/pages/user/deposit/prepaid/prepaid.wxml @@ -38,11 +38,6 @@ - - - - - diff --git a/packageD/pages/user/deposit/prepaid/prepaid.wxss b/packageD/pages/user/deposit/prepaid/prepaid.wxss index c8e7c6e..d027d41 100644 --- a/packageD/pages/user/deposit/prepaid/prepaid.wxss +++ b/packageD/pages/user/deposit/prepaid/prepaid.wxss @@ -1,6 +1,3 @@ -image{ - height:auto; -} /* 图片 */ .picture{ /* margin-top: 5rpx; */ diff --git a/pages/user/userinfo/userinfo.js b/pages/user/userinfo/userinfo.js index 90cbd04..370e3a3 100644 --- a/pages/user/userinfo/userinfo.js +++ b/pages/user/userinfo/userinfo.js @@ -792,7 +792,6 @@ Page({ if(choice_guide){ a.staffName=choice_guide.StaffName; a.staffId=choice_guide.Id; - a.staffTel=choice_guide.Tel; } diff --git a/pages/user/userinfo/userinfo.wxml b/pages/user/userinfo/userinfo.wxml index 4b21b03..bd35eaa 100644 --- a/pages/user/userinfo/userinfo.wxml +++ b/pages/user/userinfo/userinfo.wxml @@ -238,14 +238,6 @@ - - {{guide_title}}电话 - - {{user.staffTel}} - - - -