diff --git a/app.js b/app.js index 459ae59..e612c7c 100644 --- a/app.js +++ b/app.js @@ -298,34 +298,45 @@ App({ //获取会员门店 get_user_store:function (func) { - var th=this; - //---空会员的情况--- - if(!th.globalData.userInfo){ - return func(null); - } - if(!this.globalData.pk_store){ - var pick_id=0; - //先找一个会员是否有设置默认的地址 - if(th.globalData.userInfo.def_pickup_id){ - pick_id= th.globalData.userInfo.def_pickup_id - } - //查找会员的注册的地址 - else if(th.globalData.userInfo.pickup_id){ - pick_id= th.globalData.userInfo.pickup_id - } - //---如果会员没有设置默认门店，同时也没有再注册的时候选择门店-- - if(pick_id==0) return func(null); - //获取用户注册时候的门店 - th.request.get("/api/weshop/pickup/get/"+os.stoid+"/"+this.globalData.userInfo.pickup_id,{ - data:{}, - success:function (res) { - th.globalData.pk_store=res.data.data; - func(th.globalData.pk_store); - } - }) - }else{ - func(this.globalData.pk_store); - } + var th=this; + this.getConfig2(function (conf) { + //---空会员的情况--- + if(!th.globalData.userInfo){ + return func(null); + } + if(!th.globalData.pk_store){ + var pick_id=0; + //先找一个会员是否有设置默认的地址 + if(th.globalData.userInfo.def_pickup_id){ + pick_id= th.globalData.userInfo.def_pickup_id + } + //查找会员的注册的地址 + else if(th.globalData.userInfo.pickup_id){ + //--购买门店是否默认登记门店-- + if(conf.switch_list){ + var t_swi=JSON.parse(conf.switch_list); + if(t_swi.is_regstores){ + pick_id= th.globalData.userInfo.pickup_id + } + } + + } + //---如果会员没有设置默认门店，同时也没有再注册的时候选择门店-- + if(pick_id==0) return func(null); + //获取用户注册时候的门店 + th.request.get("/api/weshop/pickup/get/"+os.stoid+"/"+pick_id,{ + data:{}, + success:function (res) { + th.globalData.pk_store=res.data.data; + func(th.globalData.pk_store); + } + }) + }else{ + func(th.globalData.pk_store); + } + }) + + }, //-------获取购物车数量---------- diff --git a/app.json b/app.json index 58e6904..a05e645 100644 --- a/app.json +++ b/app.json @@ -69,8 +69,13 @@ "pages/user/user_fw/user_fw", "pages/user/user_coupon/user_coupon", "pages/user/grow_value/grow_value", - "pages/payment/pay_success/pay_success" + "pages/payment/pay_success/pay_success", + "pages/user/plus/plus", + "pages/user/cardinfo/cardinfo", + "pages/user/Detailed/Detailed", + "pages/user/Change_phone/Change_phone" + ], "permission": { "scope.userLocation": { diff --git a/app.wxss b/app.wxss index 352c091..4071e99 100644 --- a/app.wxss +++ b/app.wxss @@ -145,6 +145,12 @@ justify-content:flex-start; align-items:center; } .flex{display: flex} +.ai-center{ + align-items: center; +} +.jc-center{ + justify-content: center; +} /* 水平左对齐 */ .flex-level-left{ display:flex; @@ -262,29 +268,7 @@ justify-content:space-around; font-style: normal; } -.fs22{ - font-size: 22rpx; -} - -.fs26{ - font-size: 26rpx; -} - - -.fs30{ - font-size:30rpx; -} - -.fs35{ - font-size:35rpx; -} -.fs45{ - font-size: 45rpx; -} -.fs50{ - font-size: 50rpx; -} /* 7.26 */ @@ -356,19 +340,33 @@ position: fixed; background: #ffe3e2; } -.fs32{ - font-size:32rpx; -} -.fs60{ font-size:60rpx;} -.fs28{ - font-size: 28rpx; -} .fs20{ font-size: 20rpx; } +.fs22{ + font-size: 22rpx; +} .fs24{ font-size: 24rpx; } + +.fs26{ + font-size: 26rpx; +} +.fs28{ + font-size: 28rpx; +} + +.fs30{ + font-size:30rpx; +} +.fs32{ + font-size:32rpx; +} + +.fs35{ + font-size:35rpx; +} .fs36 { font-size: 36rpx; } @@ -378,6 +376,13 @@ background: #ffe3e2; .ai_end{ align-items: flex-end; } +.fs45{ + font-size: 45rpx; +} +.fs50{ + font-size: 50rpx; +} +.fs60{ font-size:60rpx;} .flex-wrap{ flex-wrap:wrap; } \ No newline at end of file diff --git a/components/diy_picMax/diy_picMax.js b/components/diy_picMax/diy_picMax.js index f7ad03a..ad9af0e 100644 --- a/components/diy_picMax/diy_picMax.js +++ b/components/diy_picMax/diy_picMax.js @@ -14,13 +14,14 @@ Component({ ready: function () { //console.log(this.data.object.data) //--计算图片组合占用的高度-- + /*-- var height=0; this.properties.object.data.forEach(function (val,ind) { if(val.fir.x==0){ height+=val.y_span*187; } }) - this.setData({pic_height:height}) + this.setData({pic_height:height})--*/ }, methods: { diff --git a/components/diy_picMax/diy_picMax.wxml b/components/diy_picMax/diy_picMax.wxml index b518cc8..8a645cd 100644 --- a/components/diy_picMax/diy_picMax.wxml +++ b/components/diy_picMax/diy_picMax.wxml @@ -1,6 +1,7 @@ - + + - + diff --git a/components/diy_picMax/diy_picMax.wxss b/components/diy_picMax/diy_picMax.wxss index e5d053a..170aa45 100644 --- a/components/diy_picMax/diy_picMax.wxss +++ b/components/diy_picMax/diy_picMax.wxss @@ -1,8 +1,8 @@ .picMax{width: 100%;position: relative;} -.pic_item{position: absolute; top:0;left:0;} +.pic_item{display: inline-block; top:0;left:0;vertical-align: middle} .pic_item image{width: 100%; height: 100%} .width_1{width: 187.5rpx}.width_2{width: 375rpx;}.width_3{width: 562.5rpx}.width_4{width:748rpx;} -.height_1{height: 187.5rpx;}.height_2{height: 375rpx;}.height_3{height: 562.5rpx}.height_4{height: 748rpx;} -.mar_x1{margin-left:187.5rpx;}.mar_x2{margin-left:375rpx;}.mar_x3{margin-left:562.5rpx}.mar_x4{margin-left: 748rpx;} -.mar_y1{margin-top: 187.5rpx;}.mar_y2{margin-top: 375rpx;}.mar_y3{margin-top: 562.5rpx}.mar_y4{margin-top: 748rpx;} +/* .height_1{height: 187.5rpx;}.height_2{height: 375rpx;}.height_3{height: 562.5rpx}.height_4{height: 748rpx;} */ +/* .mar_x1{margin-left:187.5rpx;}.mar_x2{margin-left:375rpx;}.mar_x3{margin-left:562.5rpx}.mar_x4{margin-left: 748rpx;} +.mar_y1{margin-top: 187.5rpx;}.mar_y2{margin-top: 375rpx;}.mar_y3{margin-top: 562.5rpx}.mar_y4{margin-top: 748rpx;} */ .picMax-clear{clear: both;} \ No newline at end of file diff --git a/components/nav_box_card/nav_box.js b/components/nav_box_card/nav_box.js new file mode 100644 index 0000000..5fcacf6 --- /dev/null +++ b/components/nav_box_card/nav_box.js @@ -0,0 +1,29 @@ +var t = getApp(),os =t.globalData.setting; +Component({ + properties: { + }, + data: { + isopen:0, + iurl:os.imghost, + }, + + ready: function() { + }, + methods: { + //--点击打开事件-- + open_box:function () { + this.setData({isopen:1}); + }, + //--关闭事件-- + close_box:function(){ + this.setData({isopen:0}); + }, + //--跳转-- + goto:function (e) { + var url=e.currentTarget.dataset.url; + getApp().goto(url); + } + + } + +}) \ No newline at end of file diff --git a/components/nav_box_card/nav_box.json b/components/nav_box_card/nav_box.json new file mode 100644 index 0000000..e8cfaaf --- /dev/null +++ b/components/nav_box_card/nav_box.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/components/nav_box_card/nav_box.wxml b/components/nav_box_card/nav_box.wxml new file mode 100644 index 0000000..52b10ca --- /dev/null +++ b/components/nav_box_card/nav_box.wxml @@ -0,0 +1,13 @@ + + + + + + + 首页 + 分类 + 我的 + × + + + diff --git a/components/nav_box_card/nav_box.wxss b/components/nav_box_card/nav_box.wxss new file mode 100644 index 0000000..8c1de52 --- /dev/null +++ b/components/nav_box_card/nav_box.wxss @@ -0,0 +1,70 @@ +.box_main{ + width:80rpx; + height:80rpx; + background:#272636; + transition:width 0.8s; + -moz-transition:width 0.8s; /* Firefox 4 */ + -webkit-transition:width 0.8s; /* Safari and Chrome */ + -o-transition:width 0.8s; /* Opera */ + border-radius:50rpx ; + position: fixed; + right: 10rpx; + bottom:300rpx; + overflow: hidden; + z-index: 999999 + +} + +.box_isopen{ + width: 420rpx; +} + +.box_main .dian{ + text-align: center; +width: 50rpx; +height: 50rpx; +color: #ffff; +font-size: 50rpx; +background: none; + +} + +.box_main .dian image{ + width: 60rpx; +height: 20rpx; +margin: 0rpx 0 0 10rpx; +margin-bottom: 7rpx; + +} + +.box_main.box_isopen .dian{ + display: none; +} + +.box_main .cl_list{ + display: none; +} + +.box_main.box_isopen .cl_list{ + display: block; + margin-left: 20rpx; +} + +.box_main .cl_list .item{ + display: inline-block; + width:100rpx; + height:80rpx; + text-align: center; + line-height: 80rpx; + color: #fff; + vertical-align: top; + font-size: 32rpx; + +} + +.box_main .cl_list .item.big{ + font-size: 70rpx; +line-height: 70rpx; + +} + diff --git a/images/add2.png b/images/add2.png deleted file mode 100644 index a192bb5..0000000 --- a/images/add2.png +++ /dev/null diff --git a/images/dpr.png b/images/dpr.png deleted file mode 100644 index 2752849..0000000 --- a/images/dpr.png +++ /dev/null diff --git a/images/medal.png b/images/medal.png deleted file mode 100644 index 1ba68ee..0000000 --- a/images/medal.png +++ /dev/null diff --git a/images/nothingaddress.png b/images/nothingaddress.png deleted file mode 100644 index 39b0e99..0000000 --- a/images/nothingaddress.png +++ /dev/null diff --git a/images/quanyi2.png b/images/quanyi2.png deleted file mode 100644 index f10f332..0000000 --- a/images/quanyi2.png +++ /dev/null diff --git a/images/share/mackground.png b/images/share/mackground.png new file mode 100644 index 0000000..6bcf62e --- /dev/null +++ b/images/share/mackground.png diff --git a/pages/getphone/getphone.js b/pages/getphone/getphone.js index bd9b15e..6896cac 100644 --- a/pages/getphone/getphone.js +++ b/pages/getphone/getphone.js @@ -4,6 +4,13 @@ Page({ store:null, imghots: os.imghost, }, + + onLoad: function (options) { + //--判断是否有接受到邀请人的ID-- + if(options.first_leader){ + this.setData({first_leader:options.first_leader}); + } + }, onShow:function(){ var th=this,app = getApp(); var sessionKey = getApp().globalData.sessionKey; @@ -16,11 +23,8 @@ Page({ wx.navigateTo({ url: '/pages/togoin/togoin', }) return false; } - var user_info=getApp().globalData.userInfo; - console.log("getphone"); - console.log(user_info); if(user_info!=null && user_info.mobile!=undefined && user_info.mobile!="" && user_info.mobile!=null){ wx.navigateBack({ @@ -72,6 +76,11 @@ Page({ iv: e.iv, store_id: getApp().globalData.setting.stoid, }; + //--如果有邀请人的时候-- + if(th.data.first_leader){ + dd.first_leader=th.data.first_leader; + } + console.log(dd); app.request.get("/api/weshop/users/thirdLogin", { data: dd, diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml index a8e3b6d..867df8c 100644 --- a/pages/goods/categoryList/categoryList.wxml +++ b/pages/goods/categoryList/categoryList.wxml @@ -52,7 +52,7 @@ - + @@ -111,25 +111,25 @@ - + - - -