xuwenqiang1992 %!s(int64=2) %!d(string=hai) anos
pai
achega
7094dc73fe
Modificáronse 7 ficheiros con 97 adicións e 11 borrados
  1. 9 0
      App.vue
  2. 1 1
      index.html
  3. 9 3
      main.js
  4. 1 1
      manifest.json
  5. 49 2
      pages.json
  6. 25 4
      pages/index/index.vue
  7. 3 0
      uni.scss

+ 9 - 0
App.vue

@@ -13,5 +13,14 @@
 </script>
 
 <style>
+	@import "@/static/iconfont/iconfont.css";
+</style>
+
+<style lang="scss">
 	/*每个页面公共css */
+	@import url("/common/css/uni.css");
+	@import url("/common/css/common.css");
+	@import url("/colorui/main.css");
+	@import url("/colorui/icon.css");
+	@import "uview-ui/index.scss";
 </style>

+ 1 - 1
index.html

@@ -9,7 +9,7 @@
         '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
         (coverSupport ? ', viewport-fit=cover' : '') + '" />')
     </script>
-    <title></title>
+    <title>都能运</title>
     <!--preload-links-->
     <!--app-context-->
   </head>

+ 9 - 3
main.js

@@ -1,12 +1,18 @@
 import App from './App'
-
 // #ifndef VUE3
 import Vue from 'vue'
-import './uni.promisify.adaptor'
+import { fliters } from 'common/filter/filters.js'
+import uView from "uview-ui";
+Vue.use(uView);
+// 引入全局 uView 框架
+// 定义全局自定义过滤器
+Object.keys(fliters).forEach(key => {
+    Vue.filter(key, fliters[key])
+})
 Vue.config.productionTip = false
 App.mpType = 'app'
 const app = new Vue({
-  ...App
+    ...App
 })
 app.$mount()
 // #endif

+ 1 - 1
manifest.json

@@ -8,7 +8,7 @@
     /* 5+App特有相关 */
     "app-plus" : {
         "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
+        "nvueStyleCompiler" : "都能运",
         "compilerVersion" : 3,
         "splashscreen" : {
             "alwaysShowBeforeRender" : true,

+ 49 - 2
pages.json

@@ -1,9 +1,52 @@
 {
+	"easycom": {
+		// npm安装的方式不需要前面的"@/",下载安装的方式需要"@/"
+		// npm安装方式
+		// "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
+		// 下载安装方式
+		"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
+	},
 	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
 		{
+			"path" : "pages/login/login",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "登录都能运",
+				"enablePullDownRefresh": false
+			}
+			
+		},
+		{
+			"path" : "pages/index/tabbar",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "工作台",
+				"enablePullDownRefresh": true
+			}
+			
+		},
+		{
+			"path" : "pages/feedback/scanOrderCode",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "连续扫码装车",
+				"enablePullDownRefresh": false
+			}
+			
+		},
+		{
+			"path" : "pages/feedback/print",
+			"style" :                                                                                    
+			{
+				"navigationBarTitleText": "支线交接",
+				"enablePullDownRefresh": false
+			}
+			
+		},
+		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "都能运"
 			}
 		}
 	],
@@ -13,5 +56,9 @@
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
 	},
-	"uniIdRouter": {}
+	"uniIdRouter": {},
+	//底部导航
+		"tabBar":{
+			
+		}
 }

+ 25 - 4
pages/index/index.vue

@@ -1,8 +1,28 @@
 <template>
-	<view class="content">
-		<image class="logo" src="/static/logo.png"></image>
+	<view class="">
+		<image v-if="show" class="logo animated bounceIn fast" src="/static/logo.png"></image>
 		<view class="text-area">
-			<text class="title">{{title}}</text>
+			<text class="title" @tap="show = !show">{{title}}</text>
+		</view>
+		<scroll-view scroll-x="true" class="scroll-row">
+			<view style="width: 200upx;" class="border border-danger scroll-row-item">1</view>
+			<view style="width: 200upx;" class="border scroll-row-item">2</view>
+			<view style="width: 200upx;" class="border scroll-row-item">3</view>
+			<view style="width: 200upx;" class="border scroll-row-item">4</view>
+			<view style="width: 200upx;" class="border scroll-row-item">5</view>
+		</scroll-view>
+		
+		<view class="row p-2">
+			<view class="span-4 text-center">2</view>
+			<view class="span-4 text-center">1</view>
+			<view class="span-4 text-center">3</view>
+			<view class="span-4 text-center">4</view>
+			<view class="span-4 text-center">5</view>
+			<view class="span-4 text-center">6</view>
+			<view class="span-4 text-center">7</view>
+			<view class="span-4 text-center">8</view>
+			<view class="span-4 text-center">9</view>
+			<view class="span-4 text-center">10</view>
 		</view>
 	</view>
 </template>
@@ -11,11 +31,12 @@
 	export default {
 		data() {
 			return {
+				show: false,
 				title: 'Hello'
 			}
 		},
 		onLoad() {
-
+			console.log(uni.getStorageSync("erpToken"));
 		},
 		methods: {
 

+ 3 - 0
uni.scss

@@ -13,6 +13,9 @@
  */
 
 /* 颜色变量 */
+// 引入uview全局scss变量
+@import "/uview-ui/theme.scss";
+/* 颜色变量 */
 
 /* 行为相关颜色 */
 $uni-color-primary: #007aff;