diff --git a/packages/addAddress/addAddress.vue b/packages/addAddress/addAddress.vue index 0439539..38c6d64 100644 --- a/packages/addAddress/addAddress.vue +++ b/packages/addAddress/addAddress.vue @@ -3,32 +3,34 @@ - 收货人 - 请填写收货人姓名 + 收货人 + - 手机号码 - 请填写收货人手机号码 + 手机号码 + - - - 所在地区 - 请选择所在地区 - - - - - 详细地址 - 请填写详细地址:如道路、门牌号、楼栋号、单元室等 + + + + 所在地区 + {{ address.region.length > 0 ? address.region.join(',') : '请选择所在地区' }} + + + + + + 详细地址 + - + 保存 @@ -40,8 +42,57 @@ @@ -56,6 +107,7 @@ overflow-y: auto; height: 100%; } + .group_4 { padding-top: 2rpx; flex: 1 1 auto; @@ -96,6 +148,7 @@ font-weight: 500; line-height: 44rpx; white-space: nowrap; + width: 140rpx; } .text_3 { margin-left: 72rpx; @@ -110,6 +163,7 @@ font-weight: 500; line-height: 44rpx; white-space: nowrap; + width: 140rpx; } .text_5 { margin-left: 40rpx; @@ -132,6 +186,7 @@ font-weight: 500; line-height: 44rpx; white-space: nowrap; + width: 140rpx; } .text_9 { margin-left: 40rpx; @@ -147,12 +202,23 @@ font-weight: 500; line-height: 44rpx; white-space: nowrap; + width: 140rpx; } .text_7 { - margin-left: 40rpx; + margin-left: 18rpx; color: rgb(195, 195, 195); - font-size: 32rpx; + font-size: 28rpx; line-height: 44rpx; white-space: nowrap; + max-width: 440rpx; + overflow:hidden; + text-overflow:ellipsis; + } + .flex-row{ + display: flex; + align-items: center; + } + .black-color{ + color: #303133 !important; } \ No newline at end of file diff --git a/packages/address/address.vue b/packages/address/address.vue index 16026ab..37cddda 100644 --- a/packages/address/address.vue +++ b/packages/address/address.vue @@ -1,67 +1,30 @@ @@ -70,14 +33,40 @@ export default { data() { return { - + addressList: [{ + id: '1', + name: '邓平艺', + phone: '18454545455', + address: '北京北京市海淀区钻石大厦C座', + isDefault: true + },{ + id: '2', + name: '邓艺平', + phone: '18454545455', + address: '北京北京市海淀区钻石大厦C座', + isDefault: false + },{ + id: '3', + name: '洛阳', + phone: '18454545455', + address: '北京北京市海淀区钻石大厦C座', + isDefault: false + }] } }, methods: { - toNewAddr(){ - uni.navigateTo({ - url:"../addAddress/addAddress" - }) + radioChange(event){ + let id = event.detail.value; + this.addressList.forEach(item => { + if(item.id === id){ + item.isDefault = true; + }else{ + item.isDefault = false; + } + }); + }, + remove(){ + this.$msg('删除') } } } @@ -88,6 +77,10 @@ display: flex; background-color: #FFFFFF; } + +.scroll-view{ + height: calc(100vh - 200rpx); +} .checkBtn{ width: 44rpx; @@ -143,14 +136,15 @@ height: 96rpx; /* width: 90%; */ width: 686rpx; - border: #E7A23F 1rpx solid; + border: #E7A23F 2rpx solid; border-radius: 8rpx; position: fixed; - bottom: 200rpx; + bottom: 100rpx; left: calc(50% - 343rpx); justify-content: center; align-items: center; align-self: center; + color: #E7A23F; } diff --git a/pages.json b/pages.json index 50deeae..a91f0ee 100644 --- a/pages.json +++ b/pages.json @@ -72,7 +72,7 @@ "pages": [{ "path": "addAddress/addAddress", "style": { - "navigationBarTitleText": "新增收货地址", + "navigationBarTitleText": " ", "enablePullDownRefresh": false } },{ diff --git a/pages/index/index.vue b/pages/index/index.vue index 9f8fc06..3be27e9 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -2,7 +2,7 @@ - + 评级中心 @@ -16,6 +16,7 @@ + @@ -25,10 +26,8 @@ - 茅*屋 - + 茅*屋 + @@ -38,12 +37,12 @@ 全部 - - + + 待确认 - + 评级中 - + 待付款 - + 查看详情 - - + + 全面评级 - - + + 卡品评级 - - + + 签名评级 - - + + 套壳服务 - + + + + 阅读并同意 《相关协议》 @@ -140,7 +137,7 @@ 已评卡 @@ -168,11 +165,10 @@ 评级标准/卡砖设计 - @@ -185,7 +181,9 @@ lfHeader }, data() { - return {}; + return { + rateIndex: 0 + }; }, }; @@ -318,14 +316,6 @@ position: absolute; } - .section_10 { - margin-top: 84rpx; - align-self: center; - background-color: rgb(0, 0, 0); - border-radius: 4rpx; - width: 196rpx; - height: 8rpx; - } .section_3 { padding: 40rpx 0 38rpx; @@ -408,10 +398,15 @@ .image-wrapper { padding-top: 72rpx; - background-image: url('https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/62677e395a7e3f03107ffc5f/62677e4a35a7e10011e93a80/16509497753952125194.png'); - background-size: 100% 100%; - background-repeat: no-repeat; width: 112rpx; + position: relative; + .avatar{ + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + } } .badge { @@ -463,6 +458,10 @@ border-radius: 10rpx; border: solid 2rpx rgb(231, 162, 63); } + .grid-item-active{ + color: rgb(231, 162, 63) !important; + border: solid 2rpx rgb(231, 162, 63) !important; + } .grid-item_1 { padding: 22rpx 0 30rpx; @@ -507,6 +506,8 @@ border-radius: 50%; width: 40rpx; height: 40rpx; + position: relative; + z-index: 99; } .text_11 { @@ -553,7 +554,7 @@ .badge_1 { background-color: rgb(234, 43, 43); border-radius: 13rpx; - width: 26rpx; + min-width: 26rpx; position: absolute; right: 6rpx; top: 0; @@ -592,4 +593,15 @@ font-size: 28rpx; line-height: 40rpx; } + + .user-name{ + max-width: 360rpx; + white-space:nowrap; + overflow:hidden; + text-overflow:ellipsis; + } + + /deep/checkbox .wx-checkbox-input { + border-radius: 50% !important; + } diff --git a/pages/order/order.vue b/pages/order/order.vue index 20228af..ea097f7 100644 --- a/pages/order/order.vue +++ b/pages/order/order.vue @@ -79,7 +79,6 @@ - @@ -198,7 +197,7 @@ requestFunction: 'getList', ...publicKey }], - tabIndex: 4, + tabIndex: 0, scenic: {} } }, @@ -217,7 +216,8 @@ return `calc(100vh - 80rpx - 10rpx)`; } }, - onLoad(){ + onLoad(options){ + this.tabIndex = Number(options.current || this.tabIndex); this.scenic = uni.getStorageSync("scenic_key") || {}; this[ this.tabList[this.tabIndex].requestFunction ](); // 获取当前tab下的数据列表 }, @@ -248,12 +248,10 @@ }, 800); }, // 切换tab - switchTab(current){ - this.tabIndex = current; + switchTab(item){ + this.tabIndex = item.index; // 判断所切换到的tab下是否有数据并且isPage为true,如果没有再请求,否则啥也不干 let tabItem = this.tabList[this.tabIndex]; - // todo 方法报错... - console.log("tabItem", tabItem, current) if(tabItem.data.length === 0 && tabItem.isPage){ this[ tabItem.requestFunction ](); } @@ -361,12 +359,7 @@ .group_14 { margin-top: 50rpx; } - .section_6 { - background-color: rgb(0, 0, 0); - border-radius: 4rpx; - width: 196rpx; - height: 8rpx; - } + .section_7 { background-color: rgba(0, 0, 0, 0.5); width: 750rpx; diff --git a/pages/ratingQuery/ratingQuery.vue b/pages/ratingQuery/ratingQuery.vue index 7327d32..c1100ee 100644 --- a/pages/ratingQuery/ratingQuery.vue +++ b/pages/ratingQuery/ratingQuery.vue @@ -3,14 +3,8 @@ - - - 请输入评级编号 - - + + 搜索 @@ -23,8 +17,16 @@ @@ -35,6 +37,10 @@ overflow-y: auto; height: 100%; } + .search-input{ + width: 492rpx; + height: 84rpx; + } .section_2 { padding: 32rpx 32rpx 16rpx; flex: 1 1 auto; diff --git a/pages/settings/settings.vue b/pages/settings/settings.vue index aa10473..91ce12e 100644 --- a/pages/settings/settings.vue +++ b/pages/settings/settings.vue @@ -1,16 +1,15 @@ diff --git a/static/icon/rightArrow.png b/static/icon/rightArrow.png new file mode 100644 index 0000000..1c8a071 Binary files /dev/null and b/static/icon/rightArrow.png differ diff --git a/static/icon/search.png b/static/icon/search.png new file mode 100644 index 0000000..fda8cfc Binary files /dev/null and b/static/icon/search.png differ diff --git a/styles/iconFont.css b/styles/iconFont.css index e69de29..6d6ec2f 100644 --- a/styles/iconFont.css +++ b/styles/iconFont.css @@ -0,0 +1,30 @@ +@font-face { + font-family: "qxk-iconfont"; /* Project id 3366366 */ + src: url('//at.alicdn.com/t/font_3366366_z00q2fmfnp.woff2?t=1651192172384') format('woff2'), + url('//at.alicdn.com/t/font_3366366_z00q2fmfnp.woff?t=1651192172384') format('woff'), + url('//at.alicdn.com/t/font_3366366_z00q2fmfnp.ttf?t=1651192172384') format('truetype'); +} + +.qxk-iconfont { + font-family: "qxk-iconfont" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.qxk-icon-tuwenguanli:before { + content: "\e62d"; +} + +.qxk-icon-xinwen-moren:before { + content: "\e61d"; +} + +.qxk-icon-mulu:before { + content: "\e63e"; +} + +.qxk-icon-kefujiqirenbeifen:before { + content: "\e7ab"; +}