bobo04052021@163.com před 1 rokem
rodič
revize
f361308c7f
6 změnil soubory, kde provedl 9 přidání a 103 odebrání
  1. 2 4
      main.js
  2. 4 37
      package-lock.json
  3. 1 0
      package.json
  4. 0 4
      pages.json
  5. 0 55
      pages/test1/firstmodel.vue
  6. 2 3
      uni.scss

+ 2 - 4
main.js

@@ -16,10 +16,8 @@ Vue.prototype.$store = store;
 Vue.prototype.$tip = tip;
 // config
 Vue.prototype.$config = configService;
-import uView from "@/uni_modules/uview-ui";
-Vue.use(uView);
-// 如此配置即可
-uni.$u.config.unit = "rpx";
+import uView from '@/uni_modules/uview-ui'
+Vue.use(uView)
 // request请求
 import { http } from "@/common/service/service.js";
 Vue.prototype.$http = http;

+ 4 - 37
package-lock.json

@@ -2,43 +2,10 @@
   "requires": true,
   "lockfileVersion": 1,
   "dependencies": {
-    "decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
-    },
-    "prettier": {
-      "version": "1.12.1",
-      "resolved": "http://registry.npm.taobao.org/prettier/download/prettier-1.12.1.tgz",
-      "integrity": "sha1-wa0g6APndJ+vkFpAnSNn4Gu+cyU="
-    },
-    "query-string": {
-      "version": "6.12.1",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.12.1.tgz",
-      "integrity": "sha512-OHj+zzfRMyj3rmo/6G8a5Ifvw3AleL/EbcHMD27YA31Q+cO5lfmQxECkImuNVjcskLcvBRVHNAB3w6udMs1eAA==",
-      "requires": {
-        "decode-uri-component": "^0.2.0",
-        "split-on-first": "^1.0.0",
-        "strict-uri-encode": "^2.0.0"
-      }
-    },
-    "split-on-first": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz",
-      "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw=="
-    },
-    "strict-uri-encode": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
-      "integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY="
-    },
-    "uni-simple-router": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/uni-simple-router/-/uni-simple-router-1.5.5.tgz",
-      "integrity": "sha512-VjBnwhvmWYHVNsj2zcPjYBwb9TqG7miR87qLBBLI4gHOnJVYmCyjZK/bj06f9slvTMbWXrze7LJ9/Hi/8DB0ag==",
-      "requires": {
-        "query-string": "^6.12.1"
-      }
+    "uview-ui": {
+      "version": "2.0.36",
+      "resolved": "https://registry.npmmirror.com/uview-ui/-/uview-ui-2.0.36.tgz",
+      "integrity": "sha512-ASSZT6M8w3GTO1eFPbsgEFV0U5UujK+8pTNr+MSUbRNcRMC1u63DDTLJVeArV91kWM0bfAexK3SK9pnTqF9TtA=="
     }
   }
 }

+ 1 - 0
package.json

@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "uview-ui": "^2.0.36",
     "vuex": "^3.6.2"
   }
 }

+ 0 - 4
pages.json

@@ -158,10 +158,6 @@
       "style": {}
     },
     {
-      "path": "pages/test1/test1",
-      "style": {}
-    },
-    {
       "path": "pages/history/history",
       "style": {}
     },

+ 0 - 55
pages/test1/firstmodel.vue

@@ -1,55 +0,0 @@
-<template>
-	<view>
-		<cu-custom><block slot="content">设备监控</block></cu-custom>
-		<view  scroll-x class="bg-white nav">
-			<view class="flex text-center">
-				<view class="cu-item flex-sub" :class="index==TabCur?'text-orange cur':''" v-for="(item,index) in 4" :key="index" @tap="tabSelect" :data-id="index">
-					Tab{{index}}
-				</view>
-			</view>
-		</view>
-		<scroll-view scroll-x class="bg-white nav">
-			<view class="flex text-center">
-				<view class="cu-item flex-sub" :class="index==TabCur?'text-orange cur':''" v-for="(item,index) in 4" :key="index" @tap="tabSelect" :data-id="index">
-					Tab{{index}}
-				</view>
-			</view>
-		</scroll-view>
-		<view class="main">
-			<view class="card" v-for="(item,index) in 4" :key="index">
-				Tab{{index}}
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				TabCur: 0,
-				scrollLeft: 0
-			};
-		},
-		methods: {
-			tabSelect(e) {
-				this.TabCur = e.currentTarget.dataset.id;
-				this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60
-			}
-		}
-	}
-</script>
-
-<style>
-	.main{
-		display: flex;
-		flex-direction: column;
-	}
-	.card{
-		margin: auto;
-		margin-top: 20rpx;
-		width: 90%;
-		height: 280rpx;
-		border:1rpx solid #000000;
-	}
-</style>

+ 2 - 3
uni.scss

@@ -13,7 +13,7 @@
  */
 
 /* 颜色变量 */
-
+@import '@/uni_modules/uview-ui/theme.scss';
 /* 行为相关颜色 */
 $uni-color-primary: #007aff;
 $uni-color-success: #4cd964;
@@ -76,5 +76,4 @@ $uni-font-size-title:40upx;
 $uni-color-subtitle: #555555; // 二级标题颜色
 $uni-font-size-subtitle:36upx;
 $uni-color-paragraph: #3F536E; // 文章段落颜色
-$uni-font-size-paragraph:30upx;
-@import '@/uni_modules/uview-ui/theme.scss';
+$uni-font-size-paragraph:30upx;