From a31e25fa9ec2fc7395f99246c4309d4423f9fa88 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 08 十二月 2022 16:53:15 +0800
Subject: [PATCH] #

---
 pages/temp/user.vue           |   73 ++++++++++++++++++
 pages/user/user.vue           |   65 ----------------
 pages.json                    |   69 ++++-------------
 static/image/home (1).png     |    0 
 static/image/desk.png         |    0 
 static/image/home.png         |    0 
 static/image/kehufuwu (1).png |    0 
 static/image/kehufuwu (2).png |    0 
 static/image/kehufuwu.png     |    0 
 static/image/desk (1).png     |    0 
 10 files changed, 89 insertions(+), 118 deletions(-)

diff --git a/pages.json b/pages.json
index 6da7a65..5a67c2a 100644
--- a/pages.json
+++ b/pages.json
@@ -8,65 +8,27 @@
 			}
 		},
 		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "涓壃CRM"
+			}
+		},
+		{
 			"path": "pages/home/home",
 			"style": {
 				"navigationBarTitleText": "涓婚〉"
 			}
 		},
 		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "uni-app"
-			}
-		},
-		{
 			"path": "pages/business/business",
 			"style": {
-				"app-plus":{
-					"titleNView": {
-						"buttons": [ //鍘熺敓鏍囬鏍忔寜閽厤缃�,
-							{
-							"type":"none",
-								"text": "涓氬姟",
-							"fontSize": "17",
-							"float":"left",
-							"width": "70"
-							},
-						{
-							"type":"none",
-							"float": "right",
-							"fontSrc":"/static/iconfont.ttf",
-							"text": "\ue69a"
-						}
-						]
-					}
-				}
+				"navigationBarTitleText": "涓氬姟"
 			}
 		},
 		{
 			"path": "pages/user/user",
 			"style": {
-				// "navigationBarTitleText": "鎴戠殑"
-				"app-plus":{
-				          "titleNView": {
-				              "buttons": [ //鍘熺敓鏍囬鏍忔寜閽厤缃�,
-				                  {
-				                "type":"none",
-				                      "text": "浣嶇疆",
-				                "fontSize": "17",
-				                "float":"left",
-				                "width": "70",
-				                "select": "true"
-				                  },
-				              {
-				                "type":"none",
-				                "float": "right",
-				                "fontSrc":"/static/iconfont.ttf",
-				                "text": "\ue69a"
-				              }
-				              ]
-				          }
-				        }
+				"navigationBarTitleText": "涓汉涓績"
 			}
 		}
 		
@@ -86,22 +48,23 @@
 		"backgroundColor": "#ffffff",
 		"list": [
 			{
-				"pagePath": "pages/home/home",
+				"pagePath": "pages/index/index",
 				"iconPath": "static/image/home.png",
-				"selectedIconPath": "static/image/Home-Filled-1.png",
+				"selectedIconPath": "static/image/home (1).png",
 				"text": "涓婚〉"
 			}, 
 			{
 				"pagePath": "pages/business/business",
-				"iconPath": "static/image/home.png",
-				"selectedIconPath": "static/image/Home-Filled-1.png",
+				"iconPath": "static/image/desk.png",
+				"selectedIconPath": "static/image/desk (1).png",
 				"text": "涓氬姟"
 			}, 
+			
 			{
 				"pagePath": "pages/user/user",
-				"iconPath": "static/image/person.png",
-				"selectedIconPath": "static/image/person-1.png",
-				"text": "鎴戠殑"
+				"iconPath": "static/image/kehufuwu (2).png",
+				"selectedIconPath": "static/image/kehufuwu.png",
+				"text": "涓汉涓績"
 			}]
 	}
 }
diff --git a/pages/temp/user.vue b/pages/temp/user.vue
new file mode 100644
index 0000000..9ac1b0f
--- /dev/null
+++ b/pages/temp/user.vue
@@ -0,0 +1,73 @@
+<template>
+	<view class="">
+		<scroll-view class="scroll-Y">
+			<button size="mini" @click="up">btn</button>
+			<view style="margin: 2%;border-radius: 5rpx;background-color: #fff;width: 96%;min-height: 50rpx;
+			box-shadow: 0 0 10upx rgba(0, 0, 0, 0.1);">
+				<y-title title="title" />
+			</view>
+			<y-input title="鍟嗗搧鐮�" @input="show" v-model="matnr" placeholder=" 鎵爜 / 杈撳叆"/>
+			<y-input title="搴撲綅鐮�" @input="show" v-model="locno"/>
+			<y-input title="鎵樼洏鐮�" v-model="barcode" />
+			<y-input title="璁㈠崟鐮�" v-model="orderNo"></y-input>
+			<y-input-btn title="璁㈠崟鐮�" v-model="orderNo" btnTitle="鎻愬彇+" @confrim="changge"></y-input-btn>
+			<view>鍟嗗搧鐮侊細{{matnr}}</view>
+			<view>搴撲綅鐮侊細{{locno}}</view>
+			<view>鎵樼洏鐮侊細{{barcode}}</view>
+			<view>璁㈠崟鐮侊細{{orderNo}}</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data () {
+			return {
+				scrollY:true,
+				matnr:'1100878-10000-21074558989',
+				locno: '0100509',
+				barcode: '80006098',
+				orderNo: 'JK20220923',
+				matList: [{id:1},{id:2},{id:1},{id:2},{id:2},
+				{id:1},{id:2},{id:2},{id:1},{id:2},{id:2},{id:1},
+				{id:2},{id:2},{id:1},{id:2},{id:2},{id:1},{id:2}]
+				
+			}
+		},
+		methods: {
+			open() {
+				this.$refs.yPopup.open('center')
+			},
+			up() {
+				this.matnr = ''
+				console.log(this.matnr);
+			},
+			show() {
+				console.log(this.matnr,this.locno);
+			},
+			changge() {
+				this.matnr = ''
+				console.log(this.barcode,this.orderNo);
+			},
+			clear() {
+				console.log(this.barcode,this.orderNo);
+			}
+		}
+	
+	}
+</script>
+
+<style>
+	.vv {
+		width: 100%;height: 100rpx;
+		
+	}
+	.bb {
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 9ac1b0f..02409e3 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -1,73 +1,8 @@
 <template>
-	<view class="">
-		<scroll-view class="scroll-Y">
-			<button size="mini" @click="up">btn</button>
-			<view style="margin: 2%;border-radius: 5rpx;background-color: #fff;width: 96%;min-height: 50rpx;
-			box-shadow: 0 0 10upx rgba(0, 0, 0, 0.1);">
-				<y-title title="title" />
-			</view>
-			<y-input title="鍟嗗搧鐮�" @input="show" v-model="matnr" placeholder=" 鎵爜 / 杈撳叆"/>
-			<y-input title="搴撲綅鐮�" @input="show" v-model="locno"/>
-			<y-input title="鎵樼洏鐮�" v-model="barcode" />
-			<y-input title="璁㈠崟鐮�" v-model="orderNo"></y-input>
-			<y-input-btn title="璁㈠崟鐮�" v-model="orderNo" btnTitle="鎻愬彇+" @confrim="changge"></y-input-btn>
-			<view>鍟嗗搧鐮侊細{{matnr}}</view>
-			<view>搴撲綅鐮侊細{{locno}}</view>
-			<view>鎵樼洏鐮侊細{{barcode}}</view>
-			<view>璁㈠崟鐮侊細{{orderNo}}</view>
-		</scroll-view>
-	</view>
 </template>
 
 <script>
-	export default {
-		data () {
-			return {
-				scrollY:true,
-				matnr:'1100878-10000-21074558989',
-				locno: '0100509',
-				barcode: '80006098',
-				orderNo: 'JK20220923',
-				matList: [{id:1},{id:2},{id:1},{id:2},{id:2},
-				{id:1},{id:2},{id:2},{id:1},{id:2},{id:2},{id:1},
-				{id:2},{id:2},{id:1},{id:2},{id:2},{id:1},{id:2}]
-				
-			}
-		},
-		methods: {
-			open() {
-				this.$refs.yPopup.open('center')
-			},
-			up() {
-				this.matnr = ''
-				console.log(this.matnr);
-			},
-			show() {
-				console.log(this.matnr,this.locno);
-			},
-			changge() {
-				this.matnr = ''
-				console.log(this.barcode,this.orderNo);
-			},
-			clear() {
-				console.log(this.barcode,this.orderNo);
-			}
-		}
-	
-	}
 </script>
 
 <style>
-	.vv {
-		width: 100%;height: 100rpx;
-		
-	}
-	.bb {
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		overflow: hidden;
-	}
 </style>
\ No newline at end of file
diff --git "a/static/image/desk \0501\051.png" "b/static/image/desk \0501\051.png"
new file mode 100644
index 0000000..5604cc8
--- /dev/null
+++ "b/static/image/desk \0501\051.png"
Binary files differ
diff --git a/static/image/desk.png b/static/image/desk.png
new file mode 100644
index 0000000..36169e4
--- /dev/null
+++ b/static/image/desk.png
Binary files differ
diff --git "a/static/image/home \0501\051.png" "b/static/image/home \0501\051.png"
new file mode 100644
index 0000000..a490b7d
--- /dev/null
+++ "b/static/image/home \0501\051.png"
Binary files differ
diff --git a/static/image/home.png b/static/image/home.png
index b846304..84071a3 100644
--- a/static/image/home.png
+++ b/static/image/home.png
Binary files differ
diff --git "a/static/image/kehufuwu \0501\051.png" "b/static/image/kehufuwu \0501\051.png"
new file mode 100644
index 0000000..2c273d9
--- /dev/null
+++ "b/static/image/kehufuwu \0501\051.png"
Binary files differ
diff --git "a/static/image/kehufuwu \0502\051.png" "b/static/image/kehufuwu \0502\051.png"
new file mode 100644
index 0000000..8d08152
--- /dev/null
+++ "b/static/image/kehufuwu \0502\051.png"
Binary files differ
diff --git a/static/image/kehufuwu.png b/static/image/kehufuwu.png
new file mode 100644
index 0000000..173ef7a
--- /dev/null
+++ b/static/image/kehufuwu.png
Binary files differ

--
Gitblit v1.9.1