diff --git a/common/http.interceptor.js b/common/http.interceptor.js index 3c636f0..146db5e 100644 --- a/common/http.interceptor.js +++ b/common/http.interceptor.js @@ -1,30 +1,35 @@ const install = (Vue, vm) => { - Vue.prototype.$u.http.setConfig({ - // baseUrl: 'http://2087p773d1.wicp.vip', // 请求的本域名 - // baseUrl: 'https://lchighpass.zhieasy.cn', - // baseUrl: 'http://speaking.viphk.91tunnel.com',//测试https://speaking.iava.top/ - // baseUrl: 'http://yml.dev.bc3.top',// - // baseUrl: 'https://ielts.zhieasy.cn',//正式 - baseURL: 'https://api.admin-v2.langsi.online', - // baseUrl: 'http://i3qsdb.natappfree.cc',//正式 + // Vue.prototype.$u.http.setConfig({ - // baseUrl: 'http://hwihh5.natappfree.cc', - // baseUrl: 'http://192.168.10.104:8088', - method: 'POST', - // 设置为json，返回后会对数据进行一次JSON.parse() - dataType: 'json', - showLoading: true, // 是否显示请求中的loading - loadingText: '...', // 请求loading中的文字提示 - loadingTime: 800, // 在此时间内，请求还没回来的话，就显示加载中动画，单位ms - originalData: false, // 是否在拦截器中返回服务端的原始数据 - loadingMask: true, // 展示loading的时候，是否给一个透明的蒙层，防止触摸穿透 - // 配置请求头信息 - header: { - 'content-type': 'application/json;charset=UTF-8', - 'Tenant-Id':1 - }, - }); + // baseURL: 'https://yruibao.com/admin', + + // // baseUrl: 'http://192.168.10.104:8088', + // method: 'POST', + // // 设置为json，返回后会对数据进行一次JSON.parse() + // dataType: 'json', + // showLoading: true, // 是否显示请求中的loading + // loadingText: '...', // 请求loading中的文字提示 + // loadingTime: 800, // 在此时间内，请求还没回来的话，就显示加载中动画，单位ms + // originalData: false, // 是否在拦截器中返回服务端的原始数据 + // loadingMask: true, // 展示loading的时候，是否给一个透明的蒙层，防止触摸穿透 + // // 配置请求头信息 + // header: { + // 'content-type': 'application/json;charset=UTF-8', + + // }, + // }); + Vue.prototype.$u.http.setConfig({ + baseUrl: 'http://192.168.2.87/dev-api', + loadingText: '努力加载中~', + loadingTime: 800, + // 设置自定义头部content-type + header: { + 'content-type': 'application/json;charset=UTF-8', + + }, + // ...... + }); // 请求拦截部分，如配置，每次请求前都会执行 Vue.prototype.$u.http.interceptor.request = (config) => { @@ -40,9 +45,9 @@ const install = (Vue, vm) => { // 方式四，如果token放在了Storage本地存储中，拦截是每次请求都执行的 // 所以哪怕您重新登录修改了Storage，下一次的请求将会是最新值 - // const token = uni.getStorageSync('token'); + const token = uni.getStorageSync('token'); - const token = " Bearer 830608e02a9e4209bffbde69b66f1315" + // const token = " eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImE1ZmE2YzM0LWM0Y2YtNGEwMS05YjY2LTE1M2M4YWY1YzU1YSJ9.Wze_tAjY7cCfw2K6mtDpTSd-QFLRF4A49Fx7bq7g2tVLKL4v5bqqHfpG0VQy7_a_CUQch5RPBTBIKMVCDupIqg" // console.log("我是token", token) config.header.Authorization = token; diff --git a/main.js b/main.js index dd128d8..c942412 100644 --- a/main.js +++ b/main.js @@ -2,9 +2,9 @@ import Vue from 'vue' import App from './App' import cookies from 'weapp-cookie' import uView from "uview-ui"; -import httpInterceptor from '@/common/http.interceptor.js' + // http接口API集中管理引入部分 -import httpApi from '@/common/http.api.js' +// import httpApi from '@/common/http.api.js' import store from "./store/index.js" import './uni.scss'; // 公共样式与字体图标 @@ -34,12 +34,13 @@ App.mpType = 'app' Vue.prototype.$store = store // #endif -const app = new Vue({ - store, - ...App -}) +const app = new Vue({ + store, + render: h => h(App), +}).$mount('#app'); +import httpInterceptor from '@/common/http.interceptor.js' Vue.use(httpInterceptor, app) -Vue.use(httpApi, app) +// Vue.use(httpApi, app) // #ifdef MP-WEIXIN Vue.prototype.wxLogin = async function(){ console.log("wxLogin") @@ -57,4 +58,4 @@ Vue.prototype.wxLogin = async function(){ -app.$mount() +// app.$mount() diff --git a/manifest.json b/manifest.json index 4f21a8b..9e51119 100644 --- a/manifest.json +++ b/manifest.json @@ -50,8 +50,8 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "libVersion": "latest", - "appid" : "wx5affa901f005d975", + "libVersion" : "latest", + "appid" : "wx3914d4d7441fb438", "setting" : { "urlCheck" : false }, diff --git a/package-lock.json b/package-lock.json index 5245a62..f7d9571 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,8 +1,107 @@ { "name": "dianbiao", "version": "1.0.0", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "dianbiao", + "version": "1.0.0", + "license": "ISC", + "dependencies": { + "crypto-js": "^4.1.1", + "echarts": "^5.4.0", + "fast-xml-parser": "^4.0.12", + "js-base64": "^3.7.3", + "js-md5": "^0.7.3", + "mp-html": "^2.4.2", + "mpvue-echarts": "^0.3.2", + "uview-ui": "^1.8.8", + "weapp-cookie": "^1.4.8" + } + }, + "node_modules/crypto-js": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz", + "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==" + }, + "node_modules/echarts": { + "version": "5.4.3", + "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.3.tgz", + "integrity": "sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==", + "dependencies": { + "tslib": "2.3.0", + "zrender": "5.4.4" + } + }, + "node_modules/fast-xml-parser": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.3.2.tgz", + "integrity": "sha512-rmrXUXwbJedoXkStenj1kkljNF7ugn5ZjR9FJcwmCfcCbtOMDghPajbc+Tck6vE6F5XsDmx+Pr2le9fw8+pXBg==", + "dependencies": { + "strnum": "^1.0.5" + }, + "bin": { + "fxparser": "src/cli/cli.js" + } + }, + "node_modules/js-base64": { + "version": "3.7.5", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.5.tgz", + "integrity": "sha512-3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA==" + }, + "node_modules/js-md5": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz", + "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==" + }, + "node_modules/mp-html": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/mp-html/-/mp-html-2.4.2.tgz", + "integrity": "sha512-MSfJh5ckuaI2uibeO4qiUl2e/j5fpXy6cmW/ZzSkb+U3rTJfMSNzODqrDwG0YWOd8BVI+tD9/jLZiBhJbMupUg==" + }, + "node_modules/mpvue-echarts": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/mpvue-echarts/-/mpvue-echarts-0.3.2.tgz", + "integrity": "sha512-KULGS1DOMNhXu3nBkBv6BtmnqjyHLc+2Dur7eW+2s2aic1NCOygglCMmAmMEU6/TGSR67ttFA2NYxXPUYbNhWQ==" + }, + "node_modules/set-cookie-parser": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.6.0.tgz", + "integrity": "sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ==" + }, + "node_modules/strnum": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz", + "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==" + }, + "node_modules/tslib": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" + }, + "node_modules/uview-ui": { + "version": "1.8.8", + "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.8.8.tgz", + "integrity": "sha512-Osal3yzXiHor0In9OPTZuXTaqTbDglMZ9RGK/MPYDoQQs+y0hrBCUD0Xp5T70C8i2lLu2X6Z11zJhmsQWMR7Jg==" + }, + "node_modules/weapp-cookie": { + "version": "1.4.8", + "resolved": "https://registry.npmjs.org/weapp-cookie/-/weapp-cookie-1.4.8.tgz", + "integrity": "sha512-YksOnCI4mM+MAlAf/5iL0aSzwfePHZTUS9NorL0RerAxJMOpzzrEZrMBF+wKS1usH/UQqkZTMSxjiWs0ZcAE9g==", + "dependencies": { + "set-cookie-parser": "^2.4.8" + } + }, + "node_modules/zrender": { + "version": "5.4.4", + "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.4.tgz", + "integrity": "sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==", + "dependencies": { + "tslib": "2.3.0" + } + } + }, "dependencies": { "crypto-js": { "version": "4.2.0", diff --git a/pages.json b/pages.json index b8b45e9..3c3eecb 100644 --- a/pages.json +++ b/pages.json @@ -2,6 +2,7 @@ "easycom": { "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" }, + "lazyCodeLoading": "requiredComponents", "pages": [{ "path": "pages/index/index", "style": { @@ -103,6 +104,115 @@ "enablePullDownRefresh": false, "navigationStyle": "custom" } + }, + { + "path" : "pages/shebei/eletj", + "style" : + { + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#4473f6", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, + { + "path" : "pages/shebei/sbdetail", + "style" : + { + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#4473f6", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, + { + "path" : "pages/userpage/skzh", + "style" : + { + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#4473f6", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, + { + "path" : "pages/userpage/bdcard", + "style" : + { + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#4473f6", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, + { + "path" : "pages/userpage/order_detail", + "style" : + { + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#4473f6", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, + { + "path" : "pages/userpage/cbRecord", + "style" : + { + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#4473f6", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, + { + "path" : "pages/userpage/czRecord", + "style" : + { + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#4473f6", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, + { + "path" : "pages/userpage/glRecord", + "style" : + { + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#4473f6", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, + { + "path" : "pages/userpage/userSet", + "style" : + { + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#4473f6", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, + { + "path" : "pages/userpage/czindex", + "style" : + { + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#4473f6", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, + { + "path" : "pages/login/login", + "style" : + { + "navigationBarTitleText" : "", + "enablePullDownRefresh" : false, + "navigationStyle": "custom" + } } diff --git a/pages/index/index.vue b/pages/index/index.vue index 2be0757..48f5812 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,10 +1,9 @@ @@ -119,124 +177,158 @@ return { bgc: { backgroundColor: "#F7FAFE", + }, + deviceInfo:{}, + loadings:false, + info:'', + tittxt:"首页", + titlist: [ + "全部", + "电表", + "水表", + + ], + curtitidx:0, + background: ['color1', 'color2', 'color3'], + indicatorDots: true, + autoplay: true, + interval: 2000, + duration: 500, + deviceList:[], + userType:'' } + }, + onLoad() { + if(uni.getStorageSync('userType')){ + + + this.userType=uni.getStorageSync('userType') + if(this.userType=='01'){ + this.getDeviceList() + }else if(this.userType=='00'){ + this.getdevice() + } + + }else{ + this.getuserinfo() + } + + + + }, methods: { async initChart() { - let value = 100; - let value2=552.03 - const option = { - // backgroundColor:"#061740", - title: { - show: false, - text: `历史请求满意度`, // 图表标题 - x: 'center', - y: '20', - textStyle: { - color: '#333', //'#fff', - fontSize: 20, - }, - }, - series: [ - { - type: 'pie', // 饼图类型 - radius: ['98%', '70%'], // 饼图半径，第一个值是内半径，第二个值是外半径 - silent: true, - clockwise: true, - startAngle: 90, // 起始角度 - z: 0, - zlevel: 0, - - data: [ - { - value: value, - name: '占比', // 数据项名称 - itemStyle: { - normal: { - color: '#8883F0', // 数据项颜色 - }, - }, - label: { - normal: { - position: 'center', - formatter: ` {a|${value2}}\n\n{b|剩余电量}`, // 标签内容格式 - rich: { - a: { - fontSize: 15, - fontWeight: '700', - color: '#333', - }, - b: { - fontSize: 11, - color: '#888', - }, - }, - }, - }, - }, - { - value: 100 - value, - name: '', - label: { - normal: { - show: false, - }, - }, - itemStyle: { - normal: { - color: '#173164', - }, - }, - }, - ], - }, - { - type: 'gauge', // 仪表盘类型 - radius: '130%', // 仪表盘半径，占图表容器的百分比 - center: ['50%', '50%'], // 仪表盘中心位置 - startAngle: 359, - endAngle: 359.9, - splitNumber: 2, // 刻度分割段数 - hoverAnimation: true, - axisTick: { - show: true, // 是否显示刻度线 - length: 10, // 刻度线长度 - lineStyle: { - color: 'auto', - width: 1, - }, - }, - splitLine: { - length: 0, // 刻度线分隔线长度 - lineStyle: { - width: 1, - color: '#061740', - }, - }, - axisLabel: { - show: false, // 是否显示刻度标签 - }, - pointer: { - show: false, // 是否显示指针 - }, - axisLine: { - lineStyle: { - opacity: 0, - }, - }, - detail: { - show: false, // 是否显示仪表盘详情 - }, - data: [ - { - value: 0, - name: '', - }, - ], - }, - ], - }; + let value = 100; + let value2 = this.deviceInfo.surplusElectriQuantity + const option = { + // backgroundColor:"#061740", + title: { + show: false, + text: `历史请求满意度`, // 图表标题 + x: 'center', + y: '20', + textStyle: { + color: '#333', //'#fff', + fontSize: 20, + }, + }, + series: [{ + type: 'pie', // 饼图类型 + radius: ['98%', '70%'], // 饼图半径，第一个值是内半径，第二个值是外半径 + silent: true, + clockwise: true, + startAngle: 90, // 起始角度 + z: 0, + zlevel: 0, + + data: [{ + value: value, + name: '占比', // 数据项名称 + itemStyle: { + normal: { + color: '#8883F0', // 数据项颜色 + }, + }, + label: { + normal: { + position: 'center', + formatter: ` {a|${value2}}\n\n{b|剩余电量}`, // 标签内容格式 + rich: { + a: { + fontSize: 15, + fontWeight: '700', + color: '#333', + }, + b: { + fontSize: 11, + color: '#888', + }, + }, + }, + }, + }, + { + value: 100 - value, + name: '', + label: { + normal: { + show: false, + }, + }, + itemStyle: { + normal: { + color: '#173164', + }, + }, + }, + ], + }, + { + type: 'gauge', // 仪表盘类型 + radius: '130%', // 仪表盘半径，占图表容器的百分比 + center: ['50%', '50%'], // 仪表盘中心位置 + startAngle: 359, + endAngle: 359.9, + splitNumber: 2, // 刻度分割段数 + hoverAnimation: true, + axisTick: { + show: true, // 是否显示刻度线 + length: 10, // 刻度线长度 + lineStyle: { + color: 'auto', + width: 1, + }, + }, + splitLine: { + length: 0, // 刻度线分隔线长度 + lineStyle: { + width: 1, + color: '#061740', + }, + }, + axisLabel: { + show: false, // 是否显示刻度标签 + }, + pointer: { + show: false, // 是否显示指针 + }, + axisLine: { + lineStyle: { + opacity: 0, + }, + }, + detail: { + show: false, // 是否显示仪表盘详情 + }, + data: [{ + value: 0, + name: '', + }, ], + }, + ], + }; // console.log( this.$refs.chartRef,'1111'); const chart = await this.$refs.chart.init(echarts); @@ -248,122 +340,314 @@ // }); return chart }, - + // 获取设备详情 + getDevice(){ + this.$u.get("app/device/1").then((res) => { + + + + + // this.$forceUpdate() + if (res.code == 200) { + this.deviceInfo=res.data + + this.loadings=true + } + }); + + }, + getuserinfo(){ + this.$u.get("/app/user/userInfo").then((res) => { + + + + + // this.$forceUpdate() + if (res.code == 200) { + + uni.setStorageSync('userType',res.data.userType) + this.userType=res.data.userType + if(this.userType=='01'){ + this.getDeviceList() + }else if(this.userType=='00'){ + this.getdevice() + } + + } + }); + }, + getDeviceList(){ + + this.$u.get("/app/device/list").then((res) => { + + // this.$forceUpdate() + if (res.code == 200) { + this.deviceList=res.rows + + } + }); + + }, + swiperchange(e){ + this.curtitidx=e.detail.current + console.log(e,'aaaa'); + }, + getdevice(){ + this.$u.get("/app/device/tenant").then((res) => { + this.deviceInfo=res.data + this.initChart() + }); + }, + changeidx(index){ + this.curtitidx=index + }, + toewm(){ + uni.navigateTo({ + url:"/pages/shebei/ewm" + }) + }, + toydfx(){ + uni.navigateTo({ + url:"/pages/shebei/eletj" + }) + }, + todetail(id){ + uni.navigateTo({ + url:"/pages/shebei/sbdetail?id="+id + }) + } } } + \ No newline at end of file diff --git a/pages/login/login.vue b/pages/login/login.vue new file mode 100644 index 0000000..52d03b5 --- /dev/null +++ b/pages/login/login.vue @@ -0,0 +1,179 @@ + + + + + diff --git a/pages/my.vue b/pages/my.vue index 572ab59..f92dbf7 100644 --- a/pages/my.vue +++ b/pages/my.vue @@ -4,44 +4,42 @@ height='36' id="navbar"> - - - + + + - - - 其他 - - - - - 充值记录 - - 01:00 - + + + + + + + 用户昵称 - - - - 常见问题 - - 充值、体现、使用说明 - - + + + 充值记录 - - - - 意见反馈 - - 01:00 - - + + + 抄表记录 + + + + 常见问题 + + + + 意见反馈 + + + + 设置 - + @@ -91,16 +89,28 @@ -
告警设备
+ + 充值记录 -
起充金额
+ + 抄表记录 -
帮助中心
+ + 常见问题 -
设置
+ + 意见反馈 + + + + 归零记录 + + + + 设置 @@ -117,7 +127,7 @@ data() { return { bgc: { - backgroundColor: "#8883F0", + backgroundColor: " rgba(0, 0, 0, 0)", }, } }, @@ -144,74 +154,84 @@ page{ width: 750rpx; height: 100vh; .userpage{ - .img{ - // position: absolute; - // position: fixed; - margin-top: -170rpx; + .top_box{ + padding-top: 40rpx; width: 750rpx; - height: 444rpx; + height: 352rpx; background-color: #8883F0; - z-index: 1; - } - .cont{ - // position: absolute; - // position: fixed; - display: flex; - flex-wrap: wrap; - align-content: flex-start; - margin-top: -185rpx; - width: 750rpx; - height: 1; - padding: 0 40rpx; - padding-top: 96rpx; - border-radius: 200rpx 0 0 0; + } + .bot_box{ + position: relative; + + padding: 40rpx 50rpx ; + margin-top: -50rpx; + width: 750rpx; + // min-height: 500rpx; background: #F7FAFE; - z-index: 10; - .tit{ - margin-left: 40rpx; - font-size: 40rpx; - font-family: HarmonyOS Sans SC, HarmonyOS Sans SC; - font-weight: 600; - color: #262B37; - } - .card{ + border-radius: 50rpx 50rpx 0 0; + .userinfo{ display: flex; - flex-wrap: nowrap; - align-items: center; - margin-top: 40rpx; - width: 670rpx; - height: 160rpx; + justify-content: center; + position: absolute; + top: -100rpx; + width: 650rpx; + height: 184rpx; background: #FFFFFF; box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(53,140,255,0.1); border-radius: 32rpx 32rpx 32rpx 32rpx; - image{ - margin-left: 40rpx; - width: 80rpx; - height: 80rpx; - } - .conts{ - margin-left: 40rpx; + .userimg_box{ display: flex; - flex-wrap: wrap; - .top{ - width: 100%; - font-size: 32rpx; - font-family: HarmonyOS Sans SC, HarmonyOS Sans SC; - font-weight: 600; - color: #262B37; - } - .bot{ - margin-top: 4rpx; - font-size: 28rpx; - font-family: HarmonyOS Sans SC, HarmonyOS Sans SC; - font-weight: 400; - color: #95989D; + align-items: center; + justify-content: center; + position: absolute; + top: -36rpx; + width: 140rpx; + height: 140rpx; + background: #FFFFFF; + border-radius: 50%; + image{ + width: 120rpx; + height: 120rpx; + border-radius: 50%; + } } + .nickname{ + width: 100%; + text-align: center; + margin-top: 110rpx; + + font-weight: 400; + font-size: 36rpx; + color: #262B37; + } + } + .botcard{ + margin-bottom: 32rpx; + display: flex; + align-items: center; + padding-left: 38rpx; + width: 650rpx; + height: 118rpx; + background: #FFFFFF; + border-radius: 30rpx; + box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42,130,228,0.1); + image{ + width: 52rpx; + height: 52rpx; + margin-right: 32rpx + ; + } + .txt{ + font-size: 30rpx; + font-family: Source Han Sans, Source Han Sans; + font-weight: 400; + color: #383838; + } } } - + } .fdpage{ .top_box{ @@ -306,6 +326,12 @@ page{ background: #FFFFFF; border-radius: 30rpx; box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42,130,228,0.1); + image{ + width: 52rpx; + height: 52rpx; + margin-right: 32rpx + ; + } .txt{ font-size: 30rpx; font-family: Source Han Sans, Source Han Sans; @@ -314,6 +340,7 @@ page{ } } } + } diff --git a/pages/shebei/eletj.vue b/pages/shebei/eletj.vue new file mode 100644 index 0000000..015001a --- /dev/null +++ b/pages/shebei/eletj.vue @@ -0,0 +1,263 @@ + + + + + \ No newline at end of file diff --git a/pages/shebei/sbdetail.vue b/pages/shebei/sbdetail.vue new file mode 100644 index 0000000..a8916b0 --- /dev/null +++ b/pages/shebei/sbdetail.vue @@ -0,0 +1,593 @@ + + + + + \ No newline at end of file diff --git a/pages/userpage/bdcard.vue b/pages/userpage/bdcard.vue new file mode 100644 index 0000000..447c2cd --- /dev/null +++ b/pages/userpage/bdcard.vue @@ -0,0 +1,139 @@ + + + + + diff --git a/pages/userpage/cbRecord.vue b/pages/userpage/cbRecord.vue new file mode 100644 index 0000000..b5a94d7 --- /dev/null +++ b/pages/userpage/cbRecord.vue @@ -0,0 +1,103 @@ + + + + + diff --git a/pages/userpage/czRecord.vue b/pages/userpage/czRecord.vue new file mode 100644 index 0000000..dbaead0 --- /dev/null +++ b/pages/userpage/czRecord.vue @@ -0,0 +1,151 @@ + + + + + \ No newline at end of file diff --git a/pages/userpage/czindex.vue b/pages/userpage/czindex.vue new file mode 100644 index 0000000..11dfb0a --- /dev/null +++ b/pages/userpage/czindex.vue @@ -0,0 +1,303 @@ + + + + + diff --git a/pages/userpage/glRecord.vue b/pages/userpage/glRecord.vue new file mode 100644 index 0000000..fab16f1 --- /dev/null +++ b/pages/userpage/glRecord.vue @@ -0,0 +1,103 @@ + + + + + diff --git a/pages/userpage/order_detail.vue b/pages/userpage/order_detail.vue new file mode 100644 index 0000000..992db4d --- /dev/null +++ b/pages/userpage/order_detail.vue @@ -0,0 +1,139 @@ + + + + + diff --git a/pages/userpage/shouzhi.vue b/pages/userpage/shouzhi.vue index b5ddb80..c7b497e 100644 --- a/pages/userpage/shouzhi.vue +++ b/pages/userpage/shouzhi.vue @@ -3,10 +3,7 @@ - - 充值记录 - 更多 - + 用户充值 @@ -21,9 +18,7 @@ - - 电费充值 - + diff --git a/pages/userpage/skzh.vue b/pages/userpage/skzh.vue new file mode 100644 index 0000000..97ec107 --- /dev/null +++ b/pages/userpage/skzh.vue @@ -0,0 +1,124 @@ + + + + + diff --git a/pages/userpage/userSet.vue b/pages/userpage/userSet.vue new file mode 100644 index 0000000..9d0386a --- /dev/null +++ b/pages/userpage/userSet.vue @@ -0,0 +1,309 @@ + + + + + \ No newline at end of file diff --git a/static/cb.png b/static/cb.png new file mode 100644 index 0000000..a1ded99 Binary files /dev/null and b/static/cb.png differ diff --git a/static/cz.png b/static/cz.png new file mode 100644 index 0000000..f480fdc Binary files /dev/null and b/static/cz.png differ diff --git a/static/device.png b/static/device.png new file mode 100644 index 0000000..944391a Binary files /dev/null and b/static/device.png differ diff --git a/static/ele.png b/static/ele.png new file mode 100644 index 0000000..ad7c280 Binary files /dev/null and b/static/ele.png differ diff --git a/static/ele1.png b/static/ele1.png new file mode 100644 index 0000000..3c9cd03 Binary files /dev/null and b/static/ele1.png differ diff --git a/static/gl.png b/static/gl.png new file mode 100644 index 0000000..7f08dd6 Binary files /dev/null and b/static/gl.png differ diff --git a/static/login.png b/static/login.png new file mode 100644 index 0000000..f2c3b6f Binary files /dev/null and b/static/login.png differ diff --git a/static/order_bg.png b/static/order_bg.png new file mode 100644 index 0000000..80cd150 Binary files /dev/null and b/static/order_bg.png differ diff --git a/static/tpbg.png b/static/tpbg.png new file mode 100644 index 0000000..3a17f6a Binary files /dev/null and b/static/tpbg.png differ diff --git a/static/wt.png b/static/wt.png new file mode 100644 index 0000000..0115588 Binary files /dev/null and b/static/wt.png differ diff --git a/static/yj.png b/static/yj.png new file mode 100644 index 0000000..7208c0e Binary files /dev/null and b/static/yj.png differ