diff --git a/app.json b/app.json index c9d2eec..2b76d1a 100644 --- a/app.json +++ b/app.json @@ -1,6 +1,5 @@ { - "pages": [ - + "pages": [ "pages/index/index/index", "pages/goods/categoryList/categoryList", "pages/cart/cart/cart", @@ -66,12 +65,10 @@ "pages/user/user_coupon/user_coupon", "pages/user/grow_value/grow_value", "pages/payment/pay_success/pay_success", - "pages/user/plus/plus", - "pages/user/cardinfo/cardinfo", + "pages/user/cardinfo/cardinfo", "pages/user/Detailed/Detailed", "pages/user/Change_phone/Change_phone", - "pages/user/my_service/appment_main", "pages/user/my_service/i_service", "pages/user/my_service/cosmetology_list", @@ -79,7 +76,9 @@ "pages/user/my_service/tment_details", "pages/user/my_service/tment_eval", "pages/user/my_service/tment_order_list", - "pages/user/my_service/beauty_deta" + "pages/user/my_service/beauty_deta", + + "pages/user/labels/labels" ], "permission": { "scope.userLocation": { diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js index c91436d..2512a7b 100644 --- a/pages/goods/categoryList/categoryList.js +++ b/pages/goods/categoryList/categoryList.js @@ -219,8 +219,6 @@ Page({ } } - - console.log("现在是1级与2级所有的数据", arr) t.setData({one_level_classify:arr}); } @@ -307,8 +305,6 @@ Page({ lettersPosition = this.data.lettersPosition, eachLetterHeight = this.data.eachLetterHeight, letters = this.data.letters; - console.log(lettersPosition); - console.log(y); // 判断触摸点是否在字母导航栏上 if (x >= lettersPosition[0][0]) { for (let i = 0, len = lettersPosition.length; i < len; i++) { @@ -362,7 +358,6 @@ Page({ }, success: function (e) { var dda = e.data.data.pageData; - console.log("国家的数据", dda); s.setData({ nationlist:dda}) } }); @@ -392,7 +387,6 @@ Page({ success: function (e) { var arr=new Array(); var dda = e.data.data.pageData; - console.log("商品数据",dda); s.setData({brand_list:dda}); for (var i = 0; i < dda.length; i++) { @@ -418,7 +412,6 @@ Page({ } //进行排序 arr.sort(compare("zm")); - console.log(arr); s.setData({ groups: arr }); } @@ -456,8 +449,6 @@ Page({ //图片失败，默认图片 bind_bnerr2: function (e) { var _errImg = e.target.dataset.errorimg; - console.log('bind_bnerr2'); - console.log(_errImg); var _errObj = {}; _errObj[_errImg] = "/public/images/category.png"; this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; @@ -511,7 +502,6 @@ Page({ select_more:function(e){ var cid = e.currentTarget.dataset.cid; var pid = e.currentTarget.dataset.pid; - console.log("选择更多"+cid); var lurl = "/pages/goods/goodsList/goodsList?cat_id=" + cid + "&pid=" + pid; wx.navigateTo({ url: lurl }); diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 1e1decd..e967e1a 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -2631,8 +2631,6 @@ Page({ //---产品名称--- //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度 - console.log("ssssssss", th.data.data.goods_name); - context.setFillStyle("black"); context.setFontSize(21.3 * unit) th.draw_Text(context, th.data.data.goods_name, @@ -3136,9 +3134,6 @@ Page({ var index = th.data.sec_pick_index; item = th.data.sec_sto.s_arr[index]; } - - //th.setData({fir_pick_index:0}); - console.log("选择门店刷新", "def_pick_store", item); th.setData({ def_pick_store: item, sto_sele_name: item.pickup_name, @@ -3221,10 +3216,8 @@ Page({ if (th.data.choice_sort_store == 0) th.setData({ fir_pick_index: 0 }); - //s.showWarning("设置门店地址成功", null, 500, !1); getApp().globalData.pk_store = item; } else { - console.log("门店地址失败"); //s.showWarning("设置默认门店地址失败", null, 500, !1); getApp().my_warnning("设置默认门店地址失败",0,th) } diff --git a/pages/goods/search/search.js b/pages/goods/search/search.js index b220e77..069dda7 100644 --- a/pages/goods/search/search.js +++ b/pages/goods/search/search.js @@ -25,8 +25,6 @@ Page({ onLoad: function(t) { var th=this; a.getConfig2(function(rs){ - console.log("onload"); - console.log(rs); var arr=new Array(),arr2=new Array(); if (rs.hot_keywords != null && ut.trim(rs.hot_keywords)!="" ){ var arr1 = rs.hot_keywords.split('|'); @@ -96,9 +94,6 @@ Page({ changeTab: function(t) { var ord = t.currentTarget.dataset.href; var ad = t.currentTarget.dataset.ad; - - console.log("changeTab"); - console.log(ord + ":" + ad + ":" + this.data.requestUrl); var url = this.data.requestUrl; @@ -115,8 +110,6 @@ Page({ //-----------真的调用地址进行搜索------------ requestSearch: function(t) { var a = this; - console.log('requestSearch'); - console.log(t,"扫描商品的搜索商品1111111111111111111111111111"); this.data.requestUrl = t, //t += "&orderField=" + a.data.tabname; @@ -179,7 +172,6 @@ Page({ //-----点击搜索按钮---- search: function(t) { - console.log(t,"是什么的"); if ("string" != typeof t || "" == t) return a.showWarning("请输入搜索关键词"); this.resetData(), this.requestSearch(this.data.baseUrl + "&key_str=" + encodeURIComponent(t)); }, diff --git a/pages/index/index/index.js b/pages/index/index/index.js index 6231d92..ddf3450 100644 --- a/pages/index/index/index.js +++ b/pages/index/index/index.js @@ -6,10 +6,12 @@ var e = function (e) { i = require("../../../utils/util.js"), ut = i, s = require("../../../utils/common.js"), n = new e.default(); var regeneratorRuntime = require('../../../utils/runtime.js'); var api = require('../../../api/api.js'); +var d = getApp().globalData; Page({ data: { url: o.imghost, + swiperimage: ["/miniapp/images/title.png"],//,"/miniapp/images/newpeople/newpeople.png" resourceUrl: o.resourceUrl, logo: o.appLogo, homeData: null, @@ -50,13 +52,12 @@ Page({ pt_timer_arr:null, pt_timer:null, pt_timer_active:0, - //看下商家是否开通会员权益 is_boot:0, gd_category:null, is_no_more:0, - max_sw_height:0, //banner的最大高度 + is_disgraceful:0,//是否显示新人广告 }, onLoad: function () { @@ -73,10 +74,16 @@ Page({ th.setData({ is_boot: is_init }); } }) + th.is_new(); }, - - + //关闭新用户领取广告 + close_disgraceful:function(){ + var th = this; + th.setData({ + is_disgraceful:0 + }) + }, async onShow() { var th = this; if(getApp().globalData.user_id) getApp().requestCardNum(); @@ -173,7 +180,6 @@ Page({ var tt = { 'ad_code': o.imghost + a[i].ad_code, 'media_link': '' }; arr.push(tt); } - console.log(arr); if (arr.length>0) e.setData({ banner: arr, }); wx.stopPullDownRefresh(); @@ -199,7 +205,6 @@ Page({ //当前时间戳 var nt = ut.gettimestamp(); - console.log(nt); flash_data.forEach(function (val,ind) { if(val.start_time>nt) flash_data[ind].status=0; @@ -320,8 +325,6 @@ Page({ //--判断小程序是否过期-- setappdata: function (t) { - console.log('setappdata'); - console.log(t); if (t.isout == 1) wx.navigateTo({ url: "/pages/error/error?msg=小程序已经过期", @@ -478,8 +481,6 @@ Page({ countDown2() { if(!this.data.is_timer) return false; - - var th = this; // 获取当前时间，同时得到活动结束时间数组 var newTime = ut.gettimestamp(); @@ -545,10 +546,6 @@ Page({ var th=this; this.data.pt_timer=setInterval(function () { var item=ut.get_rand_item(th.data.pt_timer_arr); - - console.log("Interval_pt"); - console.log(item); - th.setData({pt_timer_active:1,pt_timer_item:item}); setTimeout(function () { th.setData({pt_timer_active:0}); @@ -564,7 +561,6 @@ Page({ wx.scanCode({ success: (res) => { var result = res.result; - console.log(res,"是什么所扫码的内容"+result); wx.navigateTo({ url: "/pages/goods/search/search?s_key="+result, }); @@ -616,6 +612,40 @@ Page({ //计算的高度值 var viewHeight = 715 / ratio; if(this.data.max_sw_height { + // var swiperimage = th.data.swiperimage; + // swiperimage.push("/api/weshop/marketing/newpeople/act/bound/judge"); + // if (res.data.code == 0) { + // th.setData({ + // is_disgraceful:1 + // }) + // } + // }) + + // getApp().request.promiseGet("/api/weshop/marketing/newpeople/act/judge", { + // data: { + // storeId: o.stoid, + // userId: d.user_id + // } + // }).then(res => { + // var swiperimage = th.data.swiperimage; + // swiperimage.push("/miniapp/images/newpeople/newpeople.png"); + // if (res.data.code == 0) { + // th.setData({ + // swiperimage: swiperimage + // }) + // } + // }) + + } }); \ No newline at end of file diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml index 5045efe..94e19af 100644 --- a/pages/index/index/index.wxml +++ b/pages/index/index/index.wxml @@ -1,265 +1,252 @@ - - - - - - - - 分类 - - - - - - - - - - - 扫一扫 - + + + + + + + + 分 + 类 + - - - - - - - - - - - - - - + + + + + + - - - - + + + + + + + 我的兴趣 ∟ + + + + + {{label}} + + + + + + + 标签 + + @@ -202,7 +225,7 @@ - + 确认修改 @@ -369,4 +392,5 @@ + \ No newline at end of file diff --git a/pages/user/userinfo/userinfo.wxss b/pages/user/userinfo/userinfo.wxss index 5336582..6b6da66 100644 --- a/pages/user/userinfo/userinfo.wxss +++ b/pages/user/userinfo/userinfo.wxss @@ -1,24 +1,30 @@ -.container{ - padding-bottom:165rpx; - transform: translate() +.container { + padding-bottom: 165rpx; + transform: translate(); } + .user-container { - font-size: 30rpx; + font-size: 30rpx; } -input{ + +input { width: 450rpx; } + .head { height: 220rpx; border-bottom: 6rpx solid rgb(245, 245, 245); border-top: 2rpx solid rgb(245, 245, 245); background-size: 100%; } -.angle{ + +.angle { transform: rotate(225deg); font-size: 24rpx; margin-top: 2rpx; + color: rgb(153, 153, 153); } + .Headportrait { width: 145rpx; height: 145rpx; @@ -33,18 +39,18 @@ input{ .AncrownMax { background-color: rgb(57, 57, 57); - height: 36rpx; border-radius: 20rpx; margin-right: 20rpx; line-height: 36rpx; padding-right: 14rpx; -padding-left: 10rpx; - + padding-left: 10rpx; } -.Nickname{ - max-width:170rpx; + +.Nickname { + max-width: 170rpx; } + .Ancrown { width: 30rpx; height: 30rpx; @@ -57,8 +63,7 @@ padding-left: 10rpx; border-radius: 20rpx; line-height: 36rpx; padding-left: 10rpx; -padding-right: 14rpx; - + padding-right: 14rpx; } .fuls { @@ -102,15 +107,16 @@ padding-right: 14rpx; height: 25rpx; margin-right: 10rpx; } -.confirm{ + +.confirm { width: 100%; - position:fixed; + position: fixed; left: 0rpx; bottom: 0rpx; height: 130rpx; - background-color: rgb(255,255,255); + background-color: rgb(255, 255, 255); z-index: 9; - border-top:1rpx solid #ddd + border-top: 1rpx solid #ddd; } .confirmtext { @@ -126,7 +132,7 @@ padding-right: 14rpx; } .hion { - width:300rpx ; + width: 300rpx; text-align: right; margin-top: 3rpx; margin-right: 5rpx; @@ -246,7 +252,7 @@ padding-right: 14rpx; } .code { - margin-bottom: 10rpx; + margin-bottom: 10rpx; } .user-txt-right { @@ -317,49 +323,58 @@ padding-right: 14rpx; width: 40rpx; margin-left: 36rpx; } + /* 日期控件 */ -.pi{ - width:200rpx; - height:auto; - margin-left:10rpx; + +.pi { + width: 200rpx; + height: auto; + margin-left: 10rpx; } -.vipmax{ + +.vipmax { margin-left: 20rpx; } - /* 门店地址 */ -.xc-address_frame{ - border-top:1rpx solid #eee; + +.xc-address_frame { + border-top: 1rpx solid #eee; width: 100%; height: auto; } -.on_height{ -height: 90rpx; + +.on_height { + height: 90rpx; } -.sn_height{ + +.sn_height { height: 170rpx; } -.xc-address_frame .address_frame{ - width: 92%; -padding-left: 10rpx; -margin: auto; +.xc-address_frame .address_frame { + width: 92%; + padding-left: 10rpx; + margin: auto; } -.stores-img{ -width: 40rpx; + +.stores-img { + width: 40rpx; height: 35rpx; margin-right: 10rpx; } -.shop_name{ + +.shop_name { margin-right: 10rpx; } -.address{ + +.address { width: 87%; margin-top: 5rpx; margin-bottom: 5rpx; } -.distance{ + +.distance { padding-left: 15rpx; padding-right: 15rpx; background: #eee; @@ -367,203 +382,281 @@ width: 40rpx; margin-right: 5rpx; color: #999; height: 38rpx; -line-height: 38rpx; - + line-height: 38rpx; } + /* 选择门店的弹窗 */ -.mongolia-layer{ - position: fixed; -left: 0; -top: 0; -right: 0; -bottom: 0; -z-index: 11; -background: rgba(0,0,0,0.4); -width: 100%; -height: 91.9%; +.mongolia-layer { + position: fixed; + left: 0; + top: 0; + right: 0; + bottom: 0; + z-index: 11; + background: rgba(0, 0, 0, 0.4); + width: 100%; + height: 91.9%; } -.popup-frame{ + +.popup-frame { position: fixed; -bottom:-1rpx; -z-index: 20; -background: white; -width: 100%; -border-radius: 20rpx 20rpx 0 0; -height: 72%; -} -.popup-top{ + bottom: -1rpx; + z-index: 20; + background: white; + width: 100%; + border-radius: 20rpx 20rpx 0 0; + height: 72%; +} + +.popup-top { border-bottom: 1rpx solid #eee; height: 155rpx; width: 95%; margin: auto; line-height: 155rpx; - } -.bg_rights{ - border-top: 2rpx solid ; - border-right: 2rpx solid ; - transform: rotate(45deg); - display:inline-block; - width:15rpx;height:15rpx; - border-color:#da0b31; + +.bg_rights { + border-top: 2rpx solid; + border-right: 2rpx solid; + transform: rotate(45deg); + display: inline-block; + width: 15rpx; + height: 15rpx; + border-color: #da0b31; } + .modal-closes { - position: absolute; - right: 30rpx; - top: 20rpx; - height: 50rpx; - line-height: 50rpx; + position: absolute; + right: 30rpx; + top: 20rpx; + height: 50rpx; + line-height: 50rpx; } -.choose_more{ + +.choose_more { margin-top: 40rpx; padding-right: 20rpx; - } -.choose_mores{ + +.choose_mores { margin-top: 30rpx; margin-right: 15rpx; - } -.store-list{ + +.store-list { width: 95%; height: 72%; overflow-y: scroll; margin: auto; } -.store-list .store_choose{ + +.store-list .store_choose { width: 100%; height: 120rpx; line-height: 125rpx; border-bottom: 1rpx solid #eee; - } -.store-list .store_choose .store{ -width: 100%; -margin: auto; -line-height: 37rpx; -padding-left: 20rpx; +.store-list .store_choose .store { + width: 100%; + margin: auto; + line-height: 37rpx; + padding-left: 20rpx; } -.xc-hook{ + +.xc-hook { width: 33rpx; height: 33rpx; transform: rotate(-145deg); -line-height: 37rpx; -text-align: center; + line-height: 37rpx; + text-align: center; } - .xc-hooks{ - width: 30rpx; + +.xc-hooks { + width: 30rpx; height: 30rpx; - border: 1rpx solid #999; - } - .address-frame{ - width: 93%; -margin-left: 7rpx; - - } - .nearby_store{ -margin-left: 17rpx; - } - .address_name{ - margin-right: 10rpx; - - } - .address-val{ - height: 38rpx; -line-height: 38rpx; - - } - .store-bottom{ - width: 85%; - margin: auto; - height: 70rpx; - } - .determine{ - width: 320rpx; + border: 1rpx solid #999; +} + +.address-frame { + width: 93%; + margin-left: 7rpx; +} + +.nearby_store { + margin-left: 17rpx; +} + +.address_name { + margin-right: 10rpx; +} + +.address-val { + height: 38rpx; + line-height: 38rpx; +} + +.store-bottom { + width: 85%; + margin: auto; + height: 70rpx; +} + +.determine { + width: 320rpx; height: 55rpx; border-radius: 50rpx; line-height: 55rpx; - } - .default{ - width: 260rpx; +} + +.default { + width: 260rpx; height: 55rpx; - border:3rpx solid #c8c8c8; - border-radius: 50rpx; - line-height: 55rpx; - } - .store-bottom-frame{ - width: 95%; - margin: auto; - - } - /* 门店分类列表 */ -.sort_store_list{ + border: 3rpx solid #c8c8c8; + border-radius: 50rpx; + line-height: 55rpx; +} + +.store-bottom-frame { + width: 95%; + margin: auto; +} + +/* 门店分类列表 */ + +.sort_store_list { height: 82%; overflow: hidden; overflow-y: scroll; width: 95%; margin: auto; } -.sort_store_list .sort-store-frame{ - width: 100%; -height: 100rpx; -line-height:100rpx; -border-bottom: 1rpx solid #eee; +.sort_store_list .sort-store-frame { + width: 100%; + height: 100rpx; + line-height: 100rpx; + border-bottom: 1rpx solid #eee; } -.sort_store_list .sort-store-frame .sort-store{ + +.sort_store_list .sort-store-frame .sort-store { width: 94.5%; margin: auto; } -.black_rights-frame{ -width: 50%； + +.black_rights-frame { + width: 50%；; } -.black_rights-frame .black_rights{ + +.black_rights-frame .black_rights { border-top: 3rpx solid; -border-right: 3rpx solid; -transform: rotate(45deg); -display: inline-block; -width: 20rpx; -height: 20rpx; + border-right: 3rpx solid; + transform: rotate(45deg); + display: inline-block; + width: 20rpx; + height: 20rpx; } -.xc-val-money{ - height:80rpx; + +.xc-val-money { + height: 80rpx; } -.xc-distance-bottom{ - margin-bottom: 40rpx; +.xc-distance-bottom { + margin-bottom: 40rpx; } -.xc-distance-top{ -margin-top: 10rpx; + +.xc-distance-top { + margin-top: 10rpx; } -.xc-width{ + +.xc-width { width: 100%; } -.right-arrow{ width: 15rpx; height:15rpx; - border-top: 2rpx solid #d70026; - border-right: 2rpx solid #d70026; - transform: rotate(45deg);display:inline-block; - margin-bottom:3rpx; + +.right-arrow { + width: 15rpx; + height: 15rpx; + border-top: 2rpx solid #d70026; + border-right: 2rpx solid #d70026; + transform: rotate(45deg); + display: inline-block; + margin-bottom: 3rpx; } -.xc-goods-attribute{ + +.xc-goods-attribute { border-bottom: 1px solid #eee; -padding-bottom: 15px; -margin-bottom:40rpx; + padding-bottom: 15px; + margin-bottom: 40rpx; } -.xc-val-fream{ + +.xc-val-fream { width: 105rpx; } -.is_stock{ -width: 58%; -height: 70rpx; -border-radius: 55rpx; + +.is_stock { + width: 58%; + height: 70rpx; + border-radius: 55rpx; } -.select_store_height{ + +.select_store_height { height: 50rpx; } -.butttem5{ + +.butttem5 { margin-bottom: 5rpx; } -.s_btn{ margin-top: 25rpx; } \ No newline at end of file +.s_btn { + margin-top: 25rpx; +} + +.padding { + padding: 0rpx 20rpx; +} + +.interest { + padding: 0rpx 20rpx; + padding-top: 30rpx; + padding-bottom: 30rpx; +} + +.lables { + display: inline-block; + padding-top: 25rpx; +} + +.lable { + display: inline-block; + height: 44rpx; + line-height: 44rpx; + margin-right: 15rpx; + color: rgb(255, 255, 255); + border: 2rpx solid rgb(255, 138, 160); + background-color: rgb(255, 138, 160); + padding: 0rpx 25rpx; + border-radius: 30rpx; + margin-bottom: 21rpx; + max-width: 195rpx; +} + +.add_lable { + height: 44rpx; + line-height: 44rpx; + color: rgb(189, 189, 189); + border: 2rpx solid rgb(189, 189, 189); + border-radius: 30rpx; + padding: 0rpx 25rpx; +} + +.plus { + font-weight: bold; + margin-right: 8rpx; +} + +.lable_wh { + height: 46rpx; + line-height: 46rpx; +}