diff --git a/pages/index/index.vue b/pages/index/index.vue index 2f50b7c..5a31ebd 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -25,8 +25,12 @@ 切换设备 - - + + + + 录入设备 + + @@ -312,7 +316,8 @@ user:{}, lastChar:'', timer:'', - bjflag:false + bjflag:false, + userobj:{} } }, // 分享到好友(会话) @@ -342,6 +347,15 @@ }, methods: { + // 点击进行设备录入 + btnluru(){ + this.datalist = '' + this.mac = '' + this.ver_data = {} + uni.navigateTo({ + url:'/pages/myorder/index' + }) + }, // 点击选择时间 btnshowjs() { this.showjs = true @@ -1649,6 +1663,23 @@ margin-left: 14rpx; } } + .selectnames { + font-size: 28rpx; + color: #3D3D3D; + border: 1px solid; + padding:0 20rpx; + box-sizing: border-box; + border-radius: 20rpx; + background-color: #48893B; + color: #fff; + height: 60rpx; + line-height: 60rpx; + image { + width: 32rpx; + height: 26rpx; + margin-left: 14rpx; + } + } .selectshezhi { image { diff --git a/pages/myorder/index.vue b/pages/myorder/index.vue index 6b05b88..89ee5a4 100644 --- a/pages/myorder/index.vue +++ b/pages/myorder/index.vue @@ -1,115 +1,526 @@ \ No newline at end of file diff --git a/pages/myorder/returned/index.vue b/pages/myorder/returned/index.vue index 72a1836..2ae34eb 100644 --- a/pages/myorder/returned/index.vue +++ b/pages/myorder/returned/index.vue @@ -1,202 +1,944 @@ \ No newline at end of file