diff --git a/pages.json b/pages.json index 50a4794..2086123 100644 --- a/pages.json +++ b/pages.json @@ -18,17 +18,17 @@ } } }, - { - "path": "pages/tabBar/category/category", - "style": { - "navigationBarTextStyle":"black", - "app-plus": { - "titleNView": false ,//禁用原生导航栏 - "bounce":"none" + // { + // "path": "pages/tabBar/category/category", + // "style": { + // "navigationBarTextStyle":"black", + // "app-plus": { + // "titleNView": false ,//禁用原生导航栏 + // "bounce":"none" - } - } - }, + // } + // } + // }, { "path": "pages/tabBar/cart/cart", "style": { @@ -259,24 +259,24 @@ "backgroundColorBottom":"#ffffff" } } - ,{ - "path" : "pages/user/deposit/deposit", - "style" : { - "navigationBarBackgroundColor":"#ffffff", - "navigationBarTitleText":"充值", - "backgroundColorTop":"#ffffff", - "backgroundColorBottom":"#ffffff" - } - } - ,{ - "path" : "pages/pay/payment/payment", - "style" : { - "navigationBarBackgroundColor":"#ffffff", - "navigationBarTitleText":"订单支付", - "backgroundColorTop":"#ffffff", - "backgroundColorBottom":"#ffffff" - } - } + // ,{ + // "path" : "pages/user/deposit/deposit", + // "style" : { + // "navigationBarBackgroundColor":"#ffffff", + // "navigationBarTitleText":"充值", + // "backgroundColorTop":"#ffffff", + // "backgroundColorBottom":"#ffffff" + // } + // } + // ,{ + // "path" : "pages/pay/payment/payment", + // "style" : { + // "navigationBarBackgroundColor":"#ffffff", + // "navigationBarTitleText":"订单支付", + // "backgroundColorTop":"#ffffff", + // "backgroundColorBottom":"#ffffff" + // } + // } ,{ "path" : "pages/pay/payment/uppayment", "style" : { diff --git a/pages/goods/goods-list/search.vue b/pages/goods/goods-list/search.vue index 021fe8b..c01fe2b 100644 --- a/pages/goods/goods-list/search.vue +++ b/pages/goods/goods-list/search.vue @@ -33,7 +33,7 @@ - {{goods.title}} + {{goods.price}} @@ -219,6 +219,15 @@ that.keywords = [] uni.setStorageSync('keywords',[]) }, + brightenKeyword(val, keyword) { + const Reg = new RegExp(keyword, 'i'); + let res = ''; + if (val) { + res = val.replace(Reg, `${keyword}`); + return res; + } + }, + //商品跳转 toGoods(e){ uni.showToast({title: '商品'+e.goods_id,icon:"none"}); diff --git a/pages/goods/goods.vue b/pages/goods/goods.vue index fa2ccb8..c1785af 100644 --- a/pages/goods/goods.vue +++ b/pages/goods/goods.vue @@ -150,6 +150,9 @@ + + {{good.username}} + 服务 diff --git a/pages/login/login.vue b/pages/login/login.vue index cc9b447..23d5d63 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -7,9 +7,20 @@ + + + + {{grid}} + + - + + + + + + @@ -49,7 +60,9 @@ qq: false, sinaweibo: false, xiaomi: false - } + }, + tabIndex:0, + orderType: ['手机登录','账号登录'], } }, onShow() { @@ -65,6 +78,9 @@ }, methods: { + showType(loginIndex){ + this.tabIndex = loginIndex; + }, oauthLogin(provider) { uni.showLoading(); //第三方登录 @@ -143,11 +159,23 @@ uni.showLoading({ title: '提交中...' }) - that.$u.api.login({ - code: loginRes.code, - username: that.username, - password: that.password - }).then( + let data = {}; + if(that.tabIndex===0){ + data={ + code: loginRes.code, + type:'mobphone', + username: that.username, + password: that.password + } + }else{ + data={ + code: loginRes.code, + type:'username', + username: that.username, + password: that.password + } + } + that.$u.api.login(data).then( res => { uni.hideLoading() if(res.code==0){ @@ -209,6 +237,11 @@ } } } + .on{ + color: #ffffff; + line-height: 70rpx; + border-bottom: solid 4upx #ffffff; + } .oauth { @media all and (max-height:150vw) { diff --git a/pages/login/register.vue b/pages/login/register.vue index 427a15f..c2dbc28 100644 --- a/pages/login/register.vue +++ b/pages/login/register.vue @@ -7,7 +7,7 @@ - + 用户名已存在 @@ -18,7 +18,7 @@ - + 立即注册 diff --git a/pages/tabBar/cart/cart.vue b/pages/tabBar/cart/cart.vue index 24f30f4..7546723 100644 --- a/pages/tabBar/cart/cart.vue +++ b/pages/tabBar/cart/cart.vue @@ -16,34 +16,39 @@ - - - - - + + {{row.username}} - - - - + + + + + + - - {{row.title}} - - - ¥{{row._price}} - - - - - - - - - + + + + + + + {{row.title}} + + + ¥{{row._price}} + + + + + + + + + + + - @@ -425,7 +430,7 @@ } .row{ width: calc(92%); - height: calc(22vw + 40upx); + height: calc(22vw + 110upx); margin: 20upx auto; border-radius: 15upx; @@ -453,6 +458,7 @@ z-index: 2; } .carrier{ + flex-direction: column; @keyframes showMenu { 0% {transform: translateX(0);}100% {transform: translateX(-30%);} } diff --git a/pages/tabBar/user/user.vue b/pages/tabBar/user/user.vue index b674352..0d9cae5 100644 --- a/pages/tabBar/user/user.vue +++ b/pages/tabBar/user/user.vue @@ -115,6 +115,7 @@ {text:'待发货',icon:"fahuo"}, {text:'待收货',icon:"shouhuo"}, {text:'待开票',icon:"pingjia"}, + {text:'待收票',icon:"qr"}, {text:'全部',icon:"tuihuo"} ], // 工具栏列表 diff --git a/pages/user/invoice/edit/edit.vue b/pages/user/invoice/edit/edit.vue index bd2744b..b227af8 100644 --- a/pages/user/invoice/edit/edit.vue +++ b/pages/user/invoice/edit/edit.vue @@ -49,6 +49,30 @@ + + + 联系人 + + + + + + + + 联系电话 + + + + + + + + 收票地址 + + + + +