diff --git a/components/auth-userInfo-mobile.vue b/components/auth-userInfo-mobile.vue index a5c38e2..2a0c632 100644 --- a/components/auth-userInfo-mobile.vue +++ b/components/auth-userInfo-mobile.vue @@ -2,13 +2,13 @@ - + - + - 恒美植发客服代表提醒您： - 您当前是游客身份 - 是否选择授权登录 + 恒美植发客服代表提醒您： + 您当前是游客身份 + 是否选择授权登录 申请 获取你的昵称、头像、地区及性别 @@ -220,14 +220,14 @@ } - diff --git a/components/drop-downs/drop-down.vue b/components/drop-downs/drop-down.vue index 7b9c250..58c6cf5 100644 --- a/components/drop-downs/drop-down.vue +++ b/components/drop-downs/drop-down.vue @@ -6,8 +6,8 @@ - {{item.childrenTitle}} + @tap.stop="chooseItem(index,item.id,item.title,dropObj.title)" v-for="(item,index) in dropObj.children" :key="index"> + {{item.title}} @@ -23,7 +23,7 @@ default:()=>{ return { title:'颜色', - childrenList:[ + children:[ { id:1, childrenTitle:'粉色' @@ -45,7 +45,7 @@ }; }, mounted() { - if(this.dropObj.childrenList.length){ + if(this.dropObj.children.length){ this.activeText = `请选择${this.dropObj.title}`; } else { this.activeText = `暂无可选项`; @@ -53,14 +53,14 @@ }, methods:{ // 选择事件 - chooseItem(index,id,title){ + chooseItem(index,id,title,mainTitle){ // 选中的下标 this.activeItem = index; // 选中的标题 this.activeText = title; // 隐藏弹框 this.showFrame = false; - this.$emit('chooseItem',{id:id,title:title}) + this.$emit('chooseItem',{id:id,title:title,mainTitle:mainTitle}) }, // 调起选择弹框 tuneUpEv(){ diff --git a/components/foot-tab.vue b/components/foot-tab.vue index 8f8aec0..03d6e34 100644 --- a/components/foot-tab.vue +++ b/components/foot-tab.vue @@ -8,7 +8,7 @@ - @@ -174,7 +174,7 @@ /* 图标-文字外框样式 start */ .item-box{display: flex;justify-content: space-around;align-items: center;} - .item-box>view{text-align: center;box-sizing: border-box;} + .item-box .foot-icon,.item-box .foot-title{text-align: center;box-sizing: border-box;} /* 图标-文字外框样式 end */ /* 突出的图标样式 start */ diff --git a/components/nothing-page.vue b/components/nothing-page.vue index 2a2a893..caf9740 100644 --- a/components/nothing-page.vue +++ b/components/nothing-page.vue @@ -1,7 +1,7 @@ diff --git a/pages/login/login.vue b/pages/login/login.vue index b5e3991..508dee7 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -8,23 +8,25 @@ :navBarTitle="'登录'"> - - - - - - 请授权绑定手机号 - - 暂不绑定 - - 立即绑定 - + + + + + + + 请授权绑定手机号 + + 暂不绑定 + + 立即绑定 + + diff --git a/pages/tabbar/cart/cart.vue b/pages/tabbar/cart/cart.vue index bea765e..a2b67ab 100644 --- a/pages/tabbar/cart/cart.vue +++ b/pages/tabbar/cart/cart.vue @@ -9,7 +9,9 @@ :fromWhere="1"> - + + + diff --git a/pages/tabbar/cate/cate.vue b/pages/tabbar/cate/cate.vue index 3099dec..e8c7ab3 100644 --- a/pages/tabbar/cate/cate.vue +++ b/pages/tabbar/cate/cate.vue @@ -8,64 +8,66 @@ :navBarTitle="'分类'"> - - - 分类筛选 - - - - - {{item}} + + + + 分类筛选 + + + + + {{item}} + - - - - - - {{item.title}} - ￥{{item.price}} - 限时优惠 + + + + + {{item.title}} + ￥{{item.price}} + 限时优惠 + - - - - - - - 筛选 - - - {{item.mainTitle}} - - - {{childitem.title}} + + + + + + 筛选 + + + {{item.mainTitle}} + + + {{childitem.title}} + - - - - 价格 - - - ~ - + + + 价格 + + + ~ + + + + + + 取消 + 确定 - - - 取消 - 确定 - + + - - @@ -215,6 +217,7 @@ this.screenList[mainIndex].childrenList.forEach((item,index)=>{ item.isCheck = false; }) + console.log(this.screenList); // 设置分类id this.categoryId = this.screenList[0].childrenList[childrenIndex].id; // 设置限时优惠 diff --git a/pages/tabbar/my/my.vue b/pages/tabbar/my/my.vue index b737979..0f02eb8 100644 --- a/pages/tabbar/my/my.vue +++ b/pages/tabbar/my/my.vue @@ -8,33 +8,35 @@ :navBarTitle="'个人中心'"> - - - {{userInfo.nickname}} - - - - - 我的订单 - - - 全部订单 - - - + + + + {{userInfo.nickname}} - - - - - {{itemo.title}} - {{itemo.num}} + + + + 我的订单 + + + 全部订单 + + + + + + + + + {{itemo.title}} + {{itemo.num}} + + + - - diff --git a/pagesA/distributionCenter/distributionCenter.vue b/pagesA/distributionCenter/distributionCenter.vue index db5d8f2..f7c1190 100644 --- a/pagesA/distributionCenter/distributionCenter.vue +++ b/pagesA/distributionCenter/distributionCenter.vue @@ -4,44 +4,46 @@ - - 我的佣金 - - ￥{{commission}} - - - - 累计收益 - ￥{{distributionInfo.commission_total}} - - - 累计提现 - ￥{{distributionInfo.withdrawal_total}} - - - 分享好友 - {{distributionInfo.invite_count}} - - - - 立即提现 - - 佣金记录 - - - - - {{item.name}} - + + + 我的佣金 + + ￥{{commission}} + + + + 累计收益 + ￥{{distributionInfo.commission_total}} - - {{item.created_at}} - -{{item.price}} + + 累计提现 + ￥{{distributionInfo.withdrawal_total}} + + + 分享好友 + {{distributionInfo.invite_count}} + + 立即提现 + + 佣金记录 + + + + + {{item.name}} + + + + {{item.created_at}} + -{{item.price}} + + + + + - - diff --git a/pagesA/getReadyDan/getReadyDan.vue b/pagesA/getReadyDan/getReadyDan.vue index 8c9131f..c8c5bc2 100644 --- a/pagesA/getReadyDan/getReadyDan.vue +++ b/pagesA/getReadyDan/getReadyDan.vue @@ -4,74 +4,74 @@ - - 配送方式 - - 快递 - 自提 + + + 配送方式 + + 快递 + 自提 + - - - - 收件人信息 - - - - {{addressInfo.name}}{{userPphone}} - {{addressInfo.province_str}}{{addressInfo.city_str}}{{addressInfo.county_str || ''}}{{addressInfo.address || ''}} + + + 收件人信息 + + + + {{addressInfo.name}}{{userPphone}} + {{addressInfo.province_str}}{{addressInfo.city_str}}{{addressInfo.county_str || ''}}{{addressInfo.address || ''}} + + 请完善收件人信息 + - 请完善收件人信息 - - - - - - - 自提地址 - - - - 佩丽饰品 - {{goAddress}} - - - - - 立即导航 - - + - - - - 订单信息 - - - + + + 自提地址 + + + 佩丽饰品 + {{goAddress}} + + + + + 立即导航 + + + + + + + 订单信息 + + + {{item.title}} - - - ￥{{item.price}} - x{{item.num}} + + ￥{{item.price}} + x{{item.num}} + + + 共{{allNum}}件 + 应付款：{{allPrice}} + - - 共{{allNum}}件 - 应付款：{{allPrice}} + + + 折扣优惠 + ￥{{discountPrice}} + + + + 快递费用 + ￥{{expressInfo.default_price}} - - - - 折扣优惠 - ￥{{discountPrice}} - - - - 快递费用 - ￥{{expressInfo.default_price}} diff --git a/pagesA/myAddress/myAddress.vue b/pagesA/myAddress/myAddress.vue index 9070926..f583b7b 100644 --- a/pagesA/myAddress/myAddress.vue +++ b/pagesA/myAddress/myAddress.vue @@ -5,25 +5,27 @@ - - - - {{item.userName}} {{item.userPhone}} - - {{item.userAddress}} - - - - 设为默认地址 + + + + + {{item.userName}} {{item.userPhone}} - - 编辑 - 删除 + {{item.userAddress}} + + + + 设为默认地址 + + + 编辑 + 删除 + + 新增地址 + - 新增地址 - diff --git a/pagesB/aboutUs/aboutUs.vue b/pagesB/aboutUs/aboutUs.vue index 14e0904..98f882c 100644 --- a/pagesB/aboutUs/aboutUs.vue +++ b/pagesB/aboutUs/aboutUs.vue @@ -3,16 +3,18 @@ - - - - + + + + + + + + 导航至佩丽 + + 关于佩丽 + - - 导航至佩丽 - - 关于佩丽 - diff --git a/pagesB/disclaimers/disclaimers.vue b/pagesB/disclaimers/disclaimers.vue index 6a14571..697b6b0 100644 --- a/pagesB/disclaimers/disclaimers.vue +++ b/pagesB/disclaimers/disclaimers.vue @@ -4,18 +4,20 @@ - - - - - + + + + + + + diff --git a/pagesB/orderDetail/orderDetail.vue b/pagesB/orderDetail/orderDetail.vue index 6c94ce1..434e166 100644 --- a/pagesB/orderDetail/orderDetail.vue +++ b/pagesB/orderDetail/orderDetail.vue @@ -4,109 +4,111 @@ - - - - - 订单编号 - {{orderInfo.coding}} - - - 下单时间 - {{orderInfo.created_at}} - - - 订单状态 - - 待付款 - 待发货 - 待收货 - 已完成 - 已取消 + + + + + + 订单编号 + {{orderInfo.coding}} - - - - - - - - {{item.spu_name}} - {{item.tag}} - - ￥{{item.price}}x{{item.num}} + + 下单时间 + {{orderInfo.created_at}} + + + 订单状态 + + 待付款 + 待发货 + 待收货 + 已完成 + 已取消 - - 共{{allNum}}件 - 共计：{{orderInfo.original_price}} - - - - - 物流信息 - - {{orderInfo.express_name}}：{{orderInfo.express_number||'暂无快递单号'}} - 复制 - - - - - 收件人信息 - - {{addressInfo.userName}}{{addressInfo.userPhone}} - {{addressInfo.userAddress}} - - - - - 配送方式 - 自提 - - - - {{appletName}} - {{goAddress}} + + + + + + {{item.spu_name}} + {{item.tag}} + + ￥{{item.price}}x{{item.num}} + + - - - - 立即导航 + + 共{{allNum}}件 + 共计：{{orderInfo.original_price}} - - - - - 商品总金额 - ￥{{orderInfo.original_price}} + + + 物流信息 + + {{orderInfo.express_name}}：{{orderInfo.express_number||'暂无快递单号'}} + 复制 + - - 折扣优惠 - 0 + + + 收件人信息 + + {{addressInfo.userName}}{{addressInfo.userPhone}} + {{addressInfo.userAddress}} + - - 快递费用 - {{orderInfo.freight}} + + + 配送方式 + 自提 + + + + {{appletName}} + {{goAddress}} + + + + + 立即导航 + + - - 实付： - ￥{{orderInfo.price}} + + + + 商品总金额 + ￥{{orderInfo.original_price}} + + + 折扣优惠 + 0 + + + 快递费用 + {{orderInfo.freight}} + + + 实付： + ￥{{orderInfo.price}} + - - - - - 取消订单 - - 立即支付 - - 确认收货 - - 再次购买 - - + + + + 取消订单 + + 立即支付 + + 确认收货 + + 再次购买 + + + diff --git a/pagesB/shopDetail/shopDetail.vue b/pagesB/shopDetail/shopDetail.vue index 6baf734..c2cd440 100644 --- a/pagesB/shopDetail/shopDetail.vue +++ b/pagesB/shopDetail/shopDetail.vue @@ -5,38 +5,48 @@ - - - - - {{detailObj.name}} - - {{detailObj.subtitle}} - - - 限时优惠 - - - ￥{{discountPrice}} - ￥{{originalPrice}} + + + + + + {{detailObj.name}} + + {{detailObj.subtitle}} + + + 限时优惠 + + + ￥{{discountPrice}} + ￥{{originalPrice}} + + + + + + + + + + + 作品介绍 + + - - - - - - - - 作品介绍 - - + - - + + + + + { + if(res.code==0){ + this.specList = res.data.spec; + this.specCehckList = res.data.sku_list; + } else { + this.$toolAll.tools.showToast(res.msg); + } + }).catch(err=>{ + this.$toolAll.tools.showToast(err.msg); + }) + }, // 查询商品详情 checkDetail(id){ this.$requst.post('/api/spu/detail',{id}).then(res=>{ @@ -122,8 +149,9 @@ // 设置商品详情 this.detailObj = res.data.detail; this.shopDetail = res.data; - - // 轮播 + // 调用查询规格事件 + this.specsEv(id); + // 轮播 start // 图片字符串转数组 let arrImg = this.detailObj.images.split(',') arrImg.forEach(item=>{ @@ -145,6 +173,7 @@ poster:'', } } + // 轮播 end // 原价金额转换 // this.originalPrice = this.$toolAll.tools.changeNum(this.detailObj.original_price); this.originalPrice = this.detailObj.original_price; @@ -162,19 +191,41 @@ }, // 尺寸选择事件 chooseItem(e){ - this.log(e); + let specIndex = this.specList.findIndex(item=>item.title==e.mainTitle); + this.specIdList[specIndex*1] = e.id; + let specStr = this.specIdList.join('_'); + this.transmitData = this.specCehckList.filter(item=>item.indexes==specStr); + console.log(this.transmitData); }, - addCart(){//添加购物车事件 - if(this.csNum==0){ - this.csNum++; - this.$toolAll.tools.showToast('正在加入购物车...'); - this.$requst.post('order/shopping-cart-add',{sku_id:this.skuDetail.id,num:this.buyNum}).then(res=>{ - if(res.code==0) { - this.$toolAll.tools.showToast('添加购物车成功(*^▽^*)'); - this.cartNumEv(); - this.csNum = 0; - } - }) + // 立即购买 + immediatelyBuy(){ + // 调用加入购物车事件 + this.addCart(1); + }, + addCart(index=0){//添加购物车事件 + if(this.transmitData.length){ + if(this.csNum==0){ + this.csNum++; + if(index==0){ + this.$toolAll.tools.showToast('正在加入购物车...'); + } + this.$requst.post('/api/order/shopping-cart-add',{sku_id:this.transmitData[0].id,num:1}).then(res=>{ + if(res.code==0) { + if(index==1){ + setTimeout(()=>{ + uni.navigateTo({ + url:'/pages/tabbar/cart/cart' + }) + },500) + } else { + this.$toolAll.tools.showToast('添加购物车成功(*^▽^*)'); + this.csNum = 0; + } + } + }) + } + } else { + this.$toolAll.tools.showToast('请选择商品参数') } }, } @@ -182,4 +233,17 @@