浏览代码

Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

ccj 2 年之前
父节点
当前提交
b0f3bb1d60
共有 5 个文件被更改,包括 66 次插入15 次删除
  1. 3 3
      pages.json
  2. 1 1
      pages/bill/index.vue
  3. 44 0
      pages/user/newReport.vue
  4. 18 11
      pages/user/setUp.vue
  5. 二进制
      static/img/tjbgc.png

+ 3 - 3
pages.json

@@ -387,10 +387,10 @@
 			}
 		},
 		{
-			"path": "pages/user/report",
+			"path": "pages/user/newReport",
 			"style": {
-				"navigationBarTitleText": "数据报表",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
 			}
 		},
 		{

+ 1 - 1
pages/bill/index.vue

@@ -108,7 +108,7 @@
 				dataInfo: [],
 				dateshow:false,
 				dateList:[{value:'一个月'},{value:'三个月'},{value:'一年'}],
-				datetext:''
+				datetext:'一个月'
 			}
 		},
 		onShow() {},

+ 44 - 0
pages/user/newReport.vue

@@ -0,0 +1,44 @@
+<template>
+	<view class="content">
+		<view class="header">
+			<image src="../../static/img/tjbgc.png" mode="widthFix" class="bgc"></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	import maoScroll from '@/components/mao-scroll/mao-scroll.vue';
+	export default {
+		components: {
+			maoScroll
+		},
+		data() {
+			return {
+
+				background: {
+					backgroundColor: '#2E303A',
+					backgroundColor: 'red',
+				},
+
+			}
+		},
+		onLoad: function(option) {
+
+		},
+		destroyed() {
+
+		},
+		onUnload() {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.bgc {
+		width: 100vw;
+	}
+</style>

+ 18 - 11
pages/user/setUp.vue

@@ -111,7 +111,7 @@
 				content: '您确定要退出吗?',
 				headUrl: "../../static/img/myimg/YongHu@3x.png",
 				username: "",
-				wechatNo:'',
+				wechatNo: '',
 				gridList: [{
 					num: 0,
 					name: '退出登录',
@@ -130,9 +130,17 @@
 		onShow() {
 			this.getList()
 			// #ifdef APP-PLUS
-			this.version = plus.runtime.version
-			console.log("当前版本为:", plus.runtime.version)
-			this.checkVersion()
+			plus.runtime.getProperty(plus.runtime.appid, (info) => {
+				//版本号
+				this.version = info.version;
+				console.log("当前版本为:", this.version)
+				this.checkVersion()
+				//appid
+				// this.appID = info.appid;
+			})
+			// this.version = plus.runtime.version
+			// console.log("当前版本为:", plus.runtime)
+			// this.checkVersion()
 			// #endif
 		},
 		onLoad() {},
@@ -152,13 +160,12 @@
 					url: baseUrlNew + '/appVersion/selectInfo',
 					data: {
 						appid: plus.runtime.appid,
-						version: plus.runtime.version,
+						version: this.version,
 						imei: "1",
 					},
 					method: 'GET',
 					success: (res) => {
-						var versionNo = plus.runtime.version
-						if (versionNo == res.data.data.version) {
+						if (this.version == res.data.data.version) {
 							this.version = "当前为最新版" + res.data.data.version
 						} else {
 							this.version = "发现新版本,立即更新"
@@ -174,7 +181,7 @@
 						url: 'https://api2.eliangeyun.com/appVersion/selectInfo',
 						data: {
 							appid: plus.runtime.appid,
-							version: plus.runtime.version,
+							version: this.version,
 							imei: "1"
 						},
 						method: 'GET',
@@ -341,12 +348,12 @@
 					this.headUrl = "../../static/img/myimg/YongHu@3x.png"
 				}
 				this.username = this.userInfo.userName
-				if(!uni.getStorageSync('userInfo').wechatNo){
+				if (!uni.getStorageSync('userInfo').wechatNo) {
 					this.wechatNo = this.userInfo.userName
-				}else{
+				} else {
 					this.wechatNo = this.userInfo.wechatNo
 				}
-				
+
 			},
 			switchPicture() {
 				uni.navigateTo({

二进制
static/img/tjbgc.png