Explorar el Código

借用,菜单栏

littlegreen hace 2 años
padre
commit
47d00b387e
Se han modificado 100 ficheros con 2255 adiciones y 284 borrados
  1. 35 3
      common/iconfont/icon.scss
  2. 16 0
      common/js/core.js
  3. 2 3
      main.js
  4. 45 9
      pages.json
  5. 265 5
      pages/borrow/borrow.vue
  6. 7 2
      pages/home/home.vue
  7. 0 1
      pages/login/login.vue
  8. 144 0
      pages/menus/borrow-record/borrow-record.vue
  9. 137 0
      pages/menus/menu/menu.vue
  10. 180 0
      pages/menus/mine/mine.vue
  11. 19 0
      pages/return/return.vue
  12. 45 3
      pages/search/search.vue
  13. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  14. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  15. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  16. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u--input/u--input.js.map
  17. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u--text/u--text.js.map
  18. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-avatar/u-avatar.js.map
  19. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-button/u-button.js.map
  20. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-cell-group/u-cell-group.js.map
  21. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-cell/u-cell.js.map
  22. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-col/u-col.js.map
  23. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker.js.map
  24. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-empty/u-empty.js.map
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-input/u-input.js.map
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-line/u-line.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-link/u-link.js.map
  29. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-list-item/u-list-item.js.map
  30. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-list/u-list.js.map
  31. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map
  32. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-overlay/u-overlay.js.map
  33. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-picker/u-picker.js.map
  34. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-popup/u-popup.js.map
  35. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-row/u-row.js.map
  36. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
  37. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-search/u-search.js.map
  38. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-status-bar/u-status-bar.js.map
  39. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-text/u-text.js.map
  40. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-toolbar/u-toolbar.js.map
  41. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.js.map
  42. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/borrow/borrow.js.map
  43. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/borrowrecord/borrowrecord.js.map
  44. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/home.js.map
  45. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  46. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/logo/index.js.map
  47. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/menu/menu.js.map
  48. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/menus/borrow-record/borrow-record.js.map
  49. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/menus/borrowrecord/borrowrecord.js.map
  50. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/menus/menu/menu.js.map
  51. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/menus/mine/mine.js.map
  52. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map
  53. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/personInfo/personInfo.js.map
  54. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/return/return.js.map
  55. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/search/search.js.map
  56. 6 2
      unpackage/dist/dev/mp-weixin/app.json
  57. 3 1
      unpackage/dist/dev/mp-weixin/common/main.js
  58. 25 1
      unpackage/dist/dev/mp-weixin/common/main.wxss
  59. 1 2
      unpackage/dist/dev/mp-weixin/common/runtime.js
  60. 229 197
      unpackage/dist/dev/mp-weixin/common/vendor.js
  61. 50 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u--input/u--input.js
  62. 6 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u--input/u--input.json
  63. 1 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u--input/u--input.wxml
  64. 50 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u--text/u--text.js
  65. 6 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u--text/u--text.json
  66. 1 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u--text/u--text.wxml
  67. 52 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-avatar/u-avatar.js
  68. 7 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-avatar/u-avatar.json
  69. 1 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-avatar/u-avatar.wxml
  70. 54 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-avatar/u-avatar.wxss
  71. 52 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-button/u-button.js
  72. 2 1
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-button/u-button.json
  73. 1 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-button/u-button.wxml
  74. 183 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-button/u-button.wxss
  75. 5 5
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-cell-group/u-cell-group.js
  76. 5 5
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-cell/u-cell.js
  77. 52 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-col/u-col.js
  78. 4 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-col/u-col.json
  79. 1 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-col/u-col.wxml
  80. 80 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-col/u-col.wxss
  81. 52 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker.js
  82. 6 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker.json
  83. 1 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker.wxml
  84. 36 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker.wxss
  85. 52 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-empty/u-empty.js
  86. 6 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-empty/u-empty.json
  87. 1 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-empty/u-empty.wxml
  88. 57 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-empty/u-empty.wxss
  89. 5 5
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js
  90. 52 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-input/u-input.js
  91. 6 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-input/u-input.json
  92. 0 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-input/u-input.wxml
  93. 46 34
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-input/u-input.wxss
  94. 5 5
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-line/u-line.js
  95. 52 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-link/u-link.js
  96. 4 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-link/u-link.json
  97. 1 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-link/u-link.wxml
  98. 43 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-link/u-link.wxss
  99. 52 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-list-item/u-list-item.js
  100. 4 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-list-item/u-list-item.json

+ 35 - 3
common/iconfont/icon.scss

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3968184 */
-  src: url('//at.alicdn.com/t/c/font_3968184_368tz8o7jan.woff2?t=1679449842165') format('woff2'),
-       url('//at.alicdn.com/t/c/font_3968184_368tz8o7jan.woff?t=1679449842165') format('woff'),
-       url('//at.alicdn.com/t/c/font_3968184_368tz8o7jan.ttf?t=1679449842165') format('truetype');
+  src: url('//at.alicdn.com/t/c/font_3968184_hcrtd58fqgm.woff2?t=1679539173719') format('woff2'),
+       url('//at.alicdn.com/t/c/font_3968184_hcrtd58fqgm.woff?t=1679539173719') format('woff'),
+       url('//at.alicdn.com/t/c/font_3968184_hcrtd58fqgm.ttf?t=1679539173719') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,38 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-shijian:before {
+  content: "\1010f";
+}
+
+.icon-right:before {
+  content: "\e662";
+}
+
+.icon-baocun:before {
+  content: "\e648";
+}
+
+.icon-dangewenjian:before {
+  content: "\e649";
+}
+
+.icon-qianbao1:before {
+  content: "\e64e";
+}
+
+.icon-a-shezhi2:before {
+  content: "\e64f";
+}
+
+.icon-wenti-yuan:before {
+  content: "\e653";
+}
+
+.icon-xiangji:before {
+  content: "\e654";
+}
+
 .icon-saoyisao:before {
   content: "\ee17";
 }

+ 16 - 0
common/js/core.js

@@ -0,0 +1,16 @@
+function dateToString(val){
+	function addZero(num) {
+		return num < 10 ? "0" + num : num;
+	}
+	let date = new Date(val)
+	let year = date.getFullYear()
+	let month = date.getMonth()+1
+	let day = date.getDate()
+	let hour = date.getHours()
+	let min = addZero(date.getMinutes())
+	return year+"-"+month+"-"+day+" "+hour+":"+min;
+}
+
+export default{
+	dateToString
+}

+ 2 - 3
main.js

@@ -1,10 +1,9 @@
 import App from './App'
-
+import core from "common/js/core.js"
 import uView from "uview-ui";
 Vue.use(uView);
 
-
-
+Vue.prototype.$core = core
 
 // #ifndef VUE3
 import Vue from 'vue'

+ 45 - 9
pages.json

@@ -1,15 +1,7 @@
 {
 	"lazyCodeLoading":"requiredComponents",
 	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
-		{
-		    "path" : "pages/borrow/borrow",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "设备信息",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		},
+		
 		{
 			"path": "pages/logo/index",
 			"style": {
@@ -42,6 +34,50 @@
                 "enablePullDownRefresh": false
             }
             
+        },
+		{
+		    "path" : "pages/borrow/borrow",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "设备信息",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		},
+		{
+		    "path" : "pages/menus/mine/mine",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "个人信息",
+		        "enablePullDownRefresh": false
+		    }
+		},
+		{
+		    "path" : "pages/menus/borrow-record/borrow-record",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "借用记录",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		},
+		{
+		    "path" : "pages/menus/menu/menu",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "实验室设备管理",
+		        "enablePullDownRefresh": false
+		    } 
+		}
+        
+        ,{
+            "path" : "pages/return/return",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "归还设备",
+                "enablePullDownRefresh": false
+            }
+            
         }
     ],
 	"globalStyle": {

+ 265 - 5
pages/borrow/borrow.vue

@@ -1,8 +1,213 @@
 <template>
 	<view class="home">
 		<view class="detail-area">
-			<u-list>
-			</u-list>
+			<view class="layout-row">
+				<u-row
+					justify="space-between"
+					gutter="10">
+					 <u-col span="4">
+						<view class="demo-layout">
+							资产编号
+						</view>
+					</u-col>
+					<u-col span="8" >
+						<view class="demo-layout">001077-00007335</view>
+					</u-col>
+				</u-row>
+			</view>
+			<view class="layout-row">
+				<u-row
+					justify="space-between"
+					gutter="10">
+					 <u-col span="4">
+						<view class="demo-layout">资产名称</view>
+					</u-col>
+					<u-col span="8">
+						<view class="demo-layout">放免防护屏</view>
+					</u-col>
+				</u-row>
+			</view>
+			<view class="layout-row">
+				<u-row
+					justify="space-between"
+					gutter="10">
+					 <u-col span="4">
+						<view class="demo-layout">资产种类</view>
+					</u-col>
+					<u-col span="8">
+						<view class="demo-layout">固定资产</view>
+					</u-col>
+				</u-row>
+			</view>
+			<view class="layout-row">
+				<u-row
+					justify="space-between"
+					gutter="10">
+					 <u-col span="4">
+						<view class="demo-layout">资产分类</view>
+					</u-col>
+					<u-col span="8">
+						<view class="demo-layout">[3220399]其他医用电子仪器</view>
+					</u-col>
+				</u-row>
+			</view>
+			<view class="layout-row">
+				<u-row
+					justify="space-between"
+					gutter="10">
+					 <u-col span="4">
+						<view class="demo-layout">使用部门</view>
+					</u-col>
+					<u-col span="8">
+						<view class="demo-layout">生物医学工程系实验中心</view>
+					</u-col>
+				</u-row>
+			</view>
+			<view class="layout-row">
+				<u-row
+					justify="space-between"
+					gutter="10">
+					 <u-col span="4">
+						<view class="demo-layout">资产原值(元)</view>
+					</u-col>
+					<u-col span="8">
+						<view class="demo-layout">1820.00</view>
+					</u-col>
+				</u-row>
+			</view>
+			<view class="layout-row">
+				<u-row
+					justify="space-between"
+					gutter="10">
+					 <u-col span="4">
+						<view class="demo-layout">数量</view>
+					</u-col>
+					<u-col span="8">
+						<view class="demo-layout">1</view>
+					</u-col>
+				</u-row>
+			</view>
+			<view class="layout-row">
+				<u-row
+					justify="space-between"
+					gutter="10">
+					 <u-col span="4">
+						<view class="demo-layout">存放地点</view>
+					</u-col>
+					<u-col span="8">
+						<view class="demo-layout">番禺A1-512</view>
+					</u-col>
+				</u-row>
+			</view>
+			<view class="layout-row">
+				<u-row
+					justify="space-between"
+					gutter="10">
+					 <u-col span="4">
+						<view class="demo-layout">登记人</view>
+					</u-col>
+					<u-col span="8">
+						<view class="demo-layout">超级用户</view>
+					</u-col>
+				</u-row>
+			</view>
+			<view class="layout-row">
+				<u-row
+					justify="space-between"
+					gutter="10">
+					 <u-col span="4">
+						<view class="demo-layout">取得日期</view>
+					</u-col>
+					<u-col span="8">
+						<view class="demo-layout">2022-12-14</view>
+					</u-col>
+				</u-row>
+			</view>
+			<view class="layout-row">
+				<u-row
+					justify="space-between"
+					gutter="10">
+					 <u-col span="4">
+						<view class="demo-layout">资产用途</view>
+					</u-col>
+					<u-col span="8">
+						<view class="demo-layout">培训教学</view>
+					</u-col>
+				</u-row>
+			</view>
+			<view class="layout-row">
+				<u-row
+					justify="space-between"
+					gutter="10">
+					 <u-col span="4">
+						<view class="demo-layout">规格型号</view>
+					</u-col>
+					<u-col span="8">
+						<view class="demo-layout">RKD-01</view>
+					</u-col>
+				</u-row>
+			</view>
+		</view>
+		<view class="borrow-date" v-if="status==1">
+			<view class="layout-row">
+				<u-row
+					justify="space-between"
+					gutter="10">
+					 <u-col span="4">
+						<view class="demo-layout">借用日期</view>
+					</u-col>
+					<u-col span="8">
+						<view class="demo-layout">
+							<u--input
+							placeholder="请输入内容"
+							border="none"
+							v-model="borrowDate"
+							@focus="borrowShow = true"
+							></u--input>
+							<u-datetime-picker
+							:show="borrowShow"
+							v-model="borrowValue"
+							mode="datetime"
+							@confirm="changeDate"
+							@cancel="borrowShow = false"
+							></u-datetime-picker>
+						</view>
+					</u-col>
+				</u-row>
+			</view>
+			<view class="layout-row">
+				<u-row
+					justify="space-between"
+					gutter="10">
+					 <u-col span="4">
+						<view class="demo-layout">归还日期</view>
+					</u-col>
+					<u-col span="8">
+						<view class="demo-layout">
+							<u--input
+							placeholder="请输入内容"
+							border="none"
+							v-model="returnDate"
+							@focus="returnShow = true"
+							></u--input>
+							<u-datetime-picker
+							:show="returnShow"
+							v-model="returnValue"
+							mode="datetime"
+							@confirm="returnChange"
+							@cancel="returnShow = false"
+							></u-datetime-picker>
+						</view>
+					</u-col>
+				</u-row>
+			</view>
+		</view>
+		<view class="btn-area">
+			<u-button text="借用" color="#000" v-if="status==1">借用</u-button>
+			<u-button text="归还" color="#000" v-else-if="status==2">归还</u-button>
+		</view>
+		<view class="repair-btn">
+			<i class="iconfont icon-a-shezhi2"></i>
 		</view>
 	</view>
 </template>
@@ -11,11 +216,29 @@
 	export default {
 		data() {
 			return {
-				
+				borrowDate:this.$core.dateToString(new Date()),
+				returnDate:this.$core.dateToString(new Date()),
+				borrowShow:false,
+				borrowValue:Number(new Date()),
+				returnShow:false,
+				returnValue:Number(new Date()),
+				status:1
 			};
 		},
 		onLoad:function(option){
 			console.log(option.number)
+		},
+		methods:{
+			changeDate(val){
+				let date = this.$core.dateToString(val.value);
+				this.borrowDate = date
+				this.borrowShow = false
+			},
+			returnChange(val){
+				let date = this.$core.dateToString(val.value);
+				this.returnDate = date
+				this.returnShow = false
+			}
 		}
 	}
 </script>
@@ -29,8 +252,45 @@
 	box-sizing: border-box;
 }
 .detail-area{
-	height: 65%;
-	background-color: $uni-bg-color-grey;
+	height: 72%;
 	border: 1px solid $uni-border-black;
+	padding: 0 20rpx;
+	overflow-y: scroll;
+}
+.borrow-date{
+	border: 1px solid $uni-border-black;
+	padding: 0 20rpx;
+	margin-top: 20rpx;
+}
+.layout-row{
+	border-top: 2rpx solid #999999;
+	padding: 20rpx 0 ;
+}
+.demo-layout {
+	height: 25px;
+}
+.btn-area{
+	margin-top: 20rpx;
+	padding: 0 250rpx;
+}
+.repair-btn{
+	width: 80rpx;
+	height: 80rpx;
+	color: rgba(80, 80, 80, 1);
+	border-radius: 21px;
+	line-height: 150%;
+	box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.5);
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	text-align: center;
+	flex-direction: column;
+	font-size: 36rpx;
+	position: fixed;
+	bottom: 20rpx;
+	right: 20rpx;
+	.iconfont{
+		font-size: 42rpx;
+	}
 }
 </style>

+ 7 - 2
pages/home/home.vue

@@ -16,7 +16,7 @@
 			@custom="search"></u-search>
 		</view>
 		<view class="rule-area">
-			借用规则
+			公告
 		</view>
 		<view class="borrow-area">
 			借用设备
@@ -26,7 +26,7 @@
 				<i class="iconfont icon-saoyisao"></i>
 				<text>扫码设备</text>
 			</view>
-			<view class="scan-mine">
+			<view class="scan-mine" @click="toMine">
 				<i class="iconfont icon-wode"></i>
 			</view>
 		</view>
@@ -45,6 +45,11 @@
 				uni.navigateTo({
 					url:'/pages/search/search?keyword='+this.keyword,
 				})
+			},
+			toMine(){
+				uni.navigateTo({
+					url:'/pages/menus/menu/menu',
+				})
 			}
 		},
 		onShow:function(){

+ 0 - 1
pages/login/login.vue

@@ -1,7 +1,6 @@
 <template>
 	<view class="content">
 		<view class="text-area">
-			<!-- <text class="title">{{title}}</text> -->
 			<view class="text-area-content">
 				<text class="text1">广州医科大</text>
 				<view class="line"></view>

+ 144 - 0
pages/menus/borrow-record/borrow-record.vue

@@ -0,0 +1,144 @@
+<template>
+	<view class="home">
+		<view class="list-area" v-for="item in dataList" :key="item.id">
+			<u-cell :isLink="true">
+				<view slot="title" class="u-slot-title">
+					<i class="iconfont icon-shijian"></i>
+					<text>{{item.updateTime}}</text>
+				</view>
+				<view slot="label" class="u-slot-label">
+					<text class="list-name">设备:{{item.name}}</text>
+					<text class="list-status">{{item.status | statusFilter}}</text>
+				</view>
+			</u-cell>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				name:"zzzzzssd78",
+				dataList:[
+					{
+						id:1,
+						name:"23242524",
+						status:0,
+						updateTime:"2022-2-2 18:20"
+					},
+					{
+						id:2,
+						name:"34dsvsdf2",
+						status:1,
+						updateTime:"2022-3-2 18:20"
+					},
+					{
+						id:3,
+						name:"34dsvsdf2",
+						status:1,
+						updateTime:"2022-3-2 18:20"
+					},
+					{
+						id:4,
+						name:"34dsvsdf2",
+						status:1,
+						updateTime:"2022-3-2 18:20"
+					},
+					{
+						id:5,
+						name:"34dsvsdf2",
+						status:1,
+						updateTime:"2022-3-2 18:20"
+					},
+					{
+						id:6,
+						name:"34dsvsdf2",
+						status:1,
+						updateTime:"2022-3-2 18:20"
+					},
+					{
+						id:7,
+						name:"34dsvsdf2",
+						status:1,
+						updateTime:"2022-3-2 18:20"
+					},
+					{
+						id:8,
+						name:"34dsvsdf2",
+						status:1,
+						updateTime:"2022-3-2 18:20"
+					},
+					{
+						id:9,
+						name:"34dsvsdf2",
+						status:1,
+						updateTime:"2022-3-2 18:20"
+					},
+					{
+						id:10,
+						name:"34dsvsdf2",
+						status:1,
+						updateTime:"2022-3-2 18:20"
+					}
+				]
+			};
+		},
+		filters:{
+			statusFilter(val){
+				let status;
+				switch(val){
+					case 0: 
+						status = "借用中"
+						break;
+					case 1:
+						status = "已归还"
+						break;
+					default:
+						status = "请联系管理员"
+						break;
+				}
+				return status;
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+page{
+	background-color: #eae9e9;
+}
+.home{
+	width: 100%;
+	height: 100%;
+	padding:20rpx 30rpx;
+	background-color: #eae9e9;
+	box-sizing: border-box;
+	.ul-area{
+		padding: 20rpx 30rpx 0;
+		box-sizing: border-box;
+	}
+}
+.list-area{
+	background-color: $uni-bg-color;
+	margin: 0 0 20rpx 0;
+	line-height: 150%;
+	.u-slot-title{
+		display: flex;
+		align-items: center;
+		.iconfont{
+			margin-right: 20rpx;
+			font-size: 38rpx;
+			font-weight: bold;
+		}
+	}
+	.u-slot-label{
+		position: relative;
+		.list-status{
+			position: absolute;
+			right: 140rpx;
+		}
+	}
+}
+
+</style>

+ 137 - 0
pages/menus/menu/menu.vue

@@ -0,0 +1,137 @@
+<template>
+	<view class="mine-area">
+		<view class="big-circle"></view>
+		<view class="avatar-area z10" >
+			<u-avatar :src="src" size="80" shape="circle"></u-avatar>
+		</view>
+		<view class="menu-area z10">
+			<view class="basic-msg">
+				<text class="basic-name">{{name}}</text>
+				<text class="basic-amount">借用中设备:{{amount}}</text>
+			</view>
+			<u-list>
+				<u-list-item>
+					<view class="menu-list" @click="toPersonInfo">
+						<i class="iconfont icon-ditu"></i>
+						<text>我的信息</text>
+					</view>
+				</u-list-item>
+				<u-list-item>
+					<view class="menu-list" @click="toBorrowRecord">
+						<i class="iconfont icon-qianbao"></i>
+						<text>借用记录</text>
+					</view>
+				</u-list-item>
+				<u-list-item>
+					<view class="menu-list">
+						<i class="iconfont icon-a-shezhi2"></i>
+						<text>故障上报</text>
+					</view>
+				</u-list-item>
+				<u-list-item>
+					<view class="menu-list">
+						<i class="iconfont icon-baogaoguanli"></i>
+						<text>故障处理</text>
+					</view>
+				</u-list-item>
+				<u-list-item>
+					<view class="menu-list">
+						<i class="iconfont icon-dangewenjian"></i>
+						<text>使用指南</text>
+					</view>
+				</u-list-item>
+				<u-list-item>
+					<view class="menu-list">
+						<i class="iconfont icon-bangzhu"></i>
+						<text>关于我们</text>
+					</view>
+				</u-list-item>
+			</u-list>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				src: 'https://tupian.qqw21.com/article/UploadPic/2021-1/20211722215735941.jpg',
+				name:"刘德华",
+				amount:2
+			};
+		},
+		methods:{
+			toPersonInfo(){
+				uni.navigateTo({
+					url:'/pages/menus/mine/mine'
+				})
+			},
+			toBorrowRecord(){
+				uni.navigateTo({
+					url:'/pages/menus/borrow-record/borrow-record'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+.mine-area{
+	background-color: #000;
+	height: 100vh;
+	position: relative;
+	overflow: hidden;
+}
+.big-circle{
+	width: 937px;
+	height: 937px;
+	background-color: rgba(255, 255, 255, 1);
+	border-radius: 50%;
+	position: absolute;
+	top: 25%;
+	left: 50%;
+	transform: translate(-50%, 0);
+	z-index: 1;
+}
+.avatar-area{
+	position: absolute;
+	top: 25%;
+	left: 20%;
+	transform: translateY(-50%);
+}
+.z10{
+	z-index: 10;
+}
+.menu-area{
+	height: 65%;
+	width: 100%;
+	position: absolute;
+	bottom: 0;
+	padding: 0 100rpx;
+	box-sizing: border-box;
+}
+.menu-list{
+	display: flex;
+	align-items: center;
+	font-size: 30rpx;
+	padding: 20rpx 0 ;
+	.iconfont{
+		font-size: 38rpx;
+		padding-right: 20rpx;
+	}
+}
+.basic-msg{
+	display: flex;
+	margin-bottom: 40rpx;
+	flex-direction: column;
+	.basic-name{
+		font-size: 32rpx;
+		line-height: 150%;
+	}
+	.basic-amount{
+		color: rgba(128, 128, 128, 1);
+		font-size: 26rpx;
+		line-height: 150%;
+	}
+}
+</style>

+ 180 - 0
pages/menus/mine/mine.vue

@@ -0,0 +1,180 @@
+<template>
+	<view class="home">
+		<view>
+			<view class="layout-row">
+				<u-row
+					justify="space-between"
+					gutter="10">
+					 <u-col span="3">
+						<view class="demo-layout">姓名</view>
+					</u-col>
+					<u-col span="9">
+						<view class="demo-layout">
+							<input type="text" v-model="form.name">
+						</view>
+					</u-col>
+				</u-row>
+			</view>
+			<view class="layout-row">
+				<u-row
+					justify="space-between"
+					gutter="10">
+					 <u-col span="3">
+						<view class="demo-layout">工号</view>
+					</u-col>
+					<u-col span="9">
+						<view class="demo-layout">
+							<input type="text" v-model="form.ID">
+						</view>
+					</u-col>
+				</u-row>
+			</view>
+			<view class="layout-row">
+				<u-row
+					justify="space-between"
+					gutter="10">
+					 <u-col span="3">
+						<view class="demo-layout">手机号</view>
+					</u-col>
+					<u-col span="9">
+						<view class="demo-layout">
+							<input type="text" v-model="form.phone">
+						</view>
+					</u-col>
+				</u-row>
+			</view>
+			<view class="layout-row">
+				<u-row
+					justify="space-between"
+					gutter="10">
+					 <u-col span="3">
+						<view class="demo-layout">邮箱</view>
+					</u-col>
+					<u-col span="9">
+						<view class="demo-layout">
+							<input type="text" v-model="form.email">
+						</view>
+					</u-col>
+				</u-row>
+			</view>
+			<view class="layout-row">
+				<u-row
+					justify="space-between"
+					gutter="10">
+					 <u-col span="3">
+						<view class="demo-layout">密码</view>
+					</u-col>
+					<u-col span="9">
+						<view class="demo-layout" style="width: 300rpx;">
+							<u-button color="#000" size="small" @click="popupShow = true">修改密码</u-button>
+						</view>
+					</u-col>
+				</u-row>
+			</view>
+		</view>
+		<u-popup :show="popupShow" @close="popupShow = false" >
+			<view class="popup-area">
+				<view class="layout-row" >
+					<u-row
+						justify="space-between"
+						gutter="10">
+						 <u-col span="3">
+							<view class="demo-layout">旧密码</view>
+						</u-col>
+						<u-col span="9">
+							<view class="demo-layout" style="width: 300rpx;">
+								<input type="text">
+							</view>
+						</u-col>
+					</u-row>
+				</view>
+				<view class="layout-row">
+					<u-row
+						justify="space-between"
+						gutter="10">
+						 <u-col span="3">
+							<view class="demo-layout">新密码</view>
+						</u-col>
+						<u-col span="9">
+							<view class="demo-layout" style="width: 300rpx;">
+								<input type="text">
+							</view>
+						</u-col>
+					</u-row>
+				</view>
+				<view class="layout-row">
+					<u-row
+						justify="space-between"
+						gutter="10">
+						 <u-col span="3">
+							<view class="demo-layout">确认密码</view>
+						</u-col>
+						<u-col span="9">
+							<view class="demo-layout" style="width: 300rpx;">
+								<input type="text">
+							</view>
+						</u-col>
+					</u-row>
+				</view>
+				<view class="pwd-btn">
+					<u-button size="small" @click="popupShow = false">取消</u-button>
+					<u-button color="#000" size="small" >确认</u-button>
+				</view>
+			</view>
+		</u-popup>
+		<view class="btn-area">
+			<u-button color="#000" size="small">保存</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				form:{
+					name:"张晓翠",
+					ID:"DDDDDSS2",
+					phone:"13545454542",
+					email:"13545454542@qq.com"
+				},
+				popupShow:false
+			};
+		},
+		methods:{
+			showPopup(){
+				
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.home{
+	position: relative;
+	height: 100vh;
+}
+.layout-row{
+	padding:50rpx 30rpx;
+	border-bottom:1rpx solid #c6c6c6;
+	font-size: 30rpx;
+}
+.btn-area{
+	position: absolute;
+	width: 300rpx;
+	bottom: 100rpx;
+	right: 50rpx;
+}
+.popup-area{
+	height: 700rpx;
+	box-sizing: border-box;
+	// padding: 0 30rpx;
+	.pwd-btn{
+		display: flex;
+		padding-top: 50rpx;
+		/deep/.u-button{
+			margin: 30rpx;
+		}
+	}
+}
+</style>

+ 19 - 0
pages/return/return.vue

@@ -0,0 +1,19 @@
+<template>
+	<view>
+		归还设备
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

+ 45 - 3
pages/search/search.vue

@@ -15,6 +15,12 @@
 			@search="search"
 			@custom="search"></u-search>
 		</view>
+		<u-empty
+			:show="emptyShow"
+			mode="search"
+			icon="http://cdn.uviewui.com/uview/empty/search.png"
+		>
+		</u-empty>
 		<u-cell-group :border="true">
 			<u-cell  
 			title="设备" 
@@ -42,6 +48,7 @@
 			return {
 				keyword:"",
 				checked:false,
+				emptyShow:false,
 				dataList:[
 					{
 						id:3,
@@ -62,7 +69,43 @@
 						status:2
 					},
 					{
-						id:3,
+						id:4,
+						name:'xxxx3',
+						number:'dssd3',
+						status:3
+					},
+					{
+						id:5,
+						name:'xxxx3',
+						number:'dssd3',
+						status:3
+					},
+					{
+						id:6,
+						name:'xxxx3',
+						number:'dssd3',
+						status:3
+					},
+					{
+						id:7,
+						name:'xxxx3',
+						number:'dssd3',
+						status:3
+					},
+					{
+						id:8,
+						name:'xxxx3',
+						number:'dssd3',
+						status:3
+					},
+					{
+						id:9,
+						name:'xxxx3',
+						number:'dssd3',
+						status:3
+					},
+					{
+						id:10,
 						name:'xxxx3',
 						number:'dssd3',
 						status:3
@@ -114,10 +157,9 @@
 
 <style lang="scss" scoped> 
 .home{
-	padding: 20rpx;
+	padding: 20rpx 20rpx 30rpx;
 	display: flex;
 	flex-direction: column;
-	height: 100vh;
 	box-sizing: border-box;
 }
 /deep/ .u-cell-group__wrapper{

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u--input/u--input.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u--text/u--text.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-avatar/u-avatar.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-button/u-button.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-cell-group/u-cell-group.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-cell/u-cell.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-col/u-col.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-empty/u-empty.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-input/u-input.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-line/u-line.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-link/u-link.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-list-item/u-list-item.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-list/u-list.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-overlay/u-overlay.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-picker/u-picker.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-popup/u-popup.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-row/u-row.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-search/u-search.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-status-bar/u-status-bar.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-text/u-text.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-toolbar/u-toolbar.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/borrow/borrow.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/borrowrecord/borrowrecord.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/home.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/logo/index.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/menu/menu.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/menus/borrow-record/borrow-record.js.map


+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/menus/borrowrecord/borrowrecord.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["uni-app:///main.js"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page"],"mappings":";;;;;;;;;;;;;AAAA;AAGA;AACA;AAHA;AACAA,EAAE,CAACC,iCAAiC,GAAGC,mBAAmB;AAG1DC,UAAU,CAACC,qBAAI,CAAC,C","file":"pages/menus/borrowrecord/borrowrecord.js","sourcesContent":["import 'uni-pages';\n// @ts-ignore\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './pages/menus/borrowrecord/borrowrecord.vue'\ncreatePage(Page)"],"sourceRoot":""}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/menus/menu/menu.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/menus/mine/mine.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map


+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/personInfo/personInfo.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["uni-app:///main.js"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page"],"mappings":";;;;;;;;;;;;;AAAA;AAGA;AACA;AAHA;AACAA,EAAE,CAACC,iCAAiC,GAAGC,mBAAmB;AAG1DC,UAAU,CAACC,mBAAI,CAAC,C","file":"pages/personInfo/personInfo.js","sourcesContent":["import 'uni-pages';\n// @ts-ignore\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './pages/personInfo/personInfo.vue'\ncreatePage(Page)"],"sourceRoot":""}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/return/return.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/search/search.js.map


+ 6 - 2
unpackage/dist/dev/mp-weixin/app.json

@@ -1,10 +1,14 @@
 {
   "pages": [
-    "pages/borrow/borrow",
     "pages/logo/index",
     "pages/login/login",
     "pages/home/home",
-    "pages/search/search"
+    "pages/search/search",
+    "pages/borrow/borrow",
+    "pages/menus/mine/mine",
+    "pages/menus/borrow-record/borrow-record",
+    "pages/menus/menu/menu",
+    "pages/return/return"
   ],
   "subPackages": [],
   "window": {

+ 3 - 1
unpackage/dist/dev/mp-weixin/common/main.js

@@ -15,13 +15,15 @@ var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/run
 var _typeof2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/typeof */ 13));
 __webpack_require__(/*! uni-pages */ 26);
 var _App = _interopRequireDefault(__webpack_require__(/*! ./App */ 27));
-var _uviewUi = _interopRequireDefault(__webpack_require__(/*! uview-ui */ 33));
+var _core = _interopRequireDefault(__webpack_require__(/*! common/js/core.js */ 33));
+var _uviewUi = _interopRequireDefault(__webpack_require__(/*! uview-ui */ 34));
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 25));
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 // @ts-ignore
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 _vue.default.use(_uviewUi.default);
+_vue.default.prototype.$core = _core.default;
 _vue.default.config.productionTip = false;
 _App.default.mpType = 'app';
 try {

+ 25 - 1
unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -256,7 +256,7 @@
 @font-face {
   font-family: "iconfont";
   /* Project id 3968184 */
-  src: url("//at.alicdn.com/t/c/font_3968184_368tz8o7jan.woff2?t=1679449842165") format("woff2"), url("//at.alicdn.com/t/c/font_3968184_368tz8o7jan.woff?t=1679449842165") format("woff"), url("//at.alicdn.com/t/c/font_3968184_368tz8o7jan.ttf?t=1679449842165") format("truetype");
+  src: url("//at.alicdn.com/t/c/font_3968184_hcrtd58fqgm.woff2?t=1679539173719") format("woff2"), url("//at.alicdn.com/t/c/font_3968184_hcrtd58fqgm.woff?t=1679539173719") format("woff"), url("//at.alicdn.com/t/c/font_3968184_hcrtd58fqgm.ttf?t=1679539173719") format("truetype");
 }
 .iconfont {
   font-family: "iconfont" !important;
@@ -265,6 +265,30 @@
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
+.icon-shijian:before {
+  content: "\1010f";
+}
+.icon-right:before {
+  content: "\e662";
+}
+.icon-baocun:before {
+  content: "\e648";
+}
+.icon-dangewenjian:before {
+  content: "\e649";
+}
+.icon-qianbao1:before {
+  content: "\e64e";
+}
+.icon-a-shezhi2:before {
+  content: "\e64f";
+}
+.icon-wenti-yuan:before {
+  content: "\e653";
+}
+.icon-xiangji:before {
+  content: "\e654";
+}
 .icon-saoyisao:before {
   content: "\ee17";
 }

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 2
unpackage/dist/dev/mp-weixin/common/runtime.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 229 - 197
unpackage/dist/dev/mp-weixin/common/vendor.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 50 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u--input/u--input.js


+ 6 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u--input/u--input.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "uv-input": "/node-modules/uview-ui/components/u-input/u-input"
+  }
+}

+ 1 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u--input/u--input.wxml

@@ -0,0 +1 @@
+<uv-input vue-id="3215cba6-1" value="{{value}}" type="{{type}}" fixed="{{fixed}}" disabled="{{disabled}}" disabledColor="{{disabledColor}}" clearable="{{clearable}}" password="{{password}}" maxlength="{{maxlength}}" placeholder="{{placeholder}}" placeholderClass="{{placeholderClass}}" placeholderStyle="{{placeholderStyle}}" showWordLimit="{{showWordLimit}}" confirmType="{{confirmType}}" confirmHold="{{confirmHold}}" holdKeyboard="{{holdKeyboard}}" focus="{{focus}}" autoBlur="{{autoBlur}}" disableDefaultPadding="{{disableDefaultPadding}}" cursor="{{cursor}}" cursorSpacing="{{cursorSpacing}}" selectionStart="{{selectionStart}}" selectionEnd="{{selectionEnd}}" adjustPosition="{{adjustPosition}}" inputAlign="{{inputAlign}}" fontSize="{{fontSize}}" color="{{color}}" prefixIcon="{{prefixIcon}}" suffixIcon="{{suffixIcon}}" suffixIconStyle="{{suffixIconStyle}}" prefixIconStyle="{{prefixIconStyle}}" border="{{border}}" readonly="{{readonly}}" shape="{{shape}}" customStyle="{{customStyle}}" formatter="{{formatter}}" ignoreCompositionEvent="{{ignoreCompositionEvent}}" data-event-opts="{{[['^focus',[['$emit',['focus']]]],['^blur',[['e0']]],['^keyboardheightchange',[['$emit',['keyboardheightchange']]]],['^change',[['e1']]],['^input',[['e2']]],['^confirm',[['e3']]],['^clear',[['$emit',['clear']]]],['^click',[['$emit',['click']]]]]}}" bind:focus="__e" bind:blur="__e" bind:keyboardheightchange="__e" bind:change="__e" bind:input="__e" bind:confirm="__e" bind:clear="__e" bind:click="__e" bind:__l="__l" vue-slots="{{['default']}}"><slot name="prefix"></slot><slot name="suffix"></slot></uv-input>

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 50 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u--text/u--text.js


+ 6 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u--text/u--text.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "uv-text": "/node-modules/uview-ui/components/u-text/u-text"
+  }
+}

+ 1 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u--text/u--text.wxml

@@ -0,0 +1 @@
+<uv-text vue-id="48c60447-1" type="{{type}}" show="{{show}}" text="{{text}}" prefixIcon="{{prefixIcon}}" suffixIcon="{{suffixIcon}}" mode="{{mode}}" href="{{href}}" format="{{format}}" call="{{call}}" openType="{{openType}}" bold="{{bold}}" block="{{block}}" lines="{{lines}}" color="{{color}}" decoration="{{decoration}}" size="{{size}}" iconStyle="{{iconStyle}}" margin="{{margin}}" lineHeight="{{lineHeight}}" align="{{align}}" wordWrap="{{wordWrap}}" customStyle="{{customStyle}}" data-event-opts="{{[['^click',[['$emit',['click']]]]]}}" bind:click="__e" bind:__l="__l"></uv-text>

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 52 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-avatar/u-avatar.js


+ 7 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-avatar/u-avatar.json

@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon",
+    "u--text": "/node-modules/uview-ui/components/u--text/u--text"
+  },
+  "component": true
+}

+ 1 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-avatar/u-avatar.wxml

@@ -0,0 +1 @@
+<view data-event-opts="{{[['tap',[['clickHandler',['$event']]]]]}}" class="{{['u-avatar','data-v-b36130f2','u-avatar--'+shape]}}" style="{{$root.s0}}" bindtap="__e"><block wx:if="{{$slots.default}}"><slot></slot></block><block wx:else><block wx:if="{{mpAvatar&&allowMp}}"><open-data style="{{'width:'+($root.g0)+';'+('height:'+($root.g1)+';')}}" type="userAvatarUrl" class="data-v-b36130f2"></open-data></block><block wx:if="{{mpAvatar&&allowMp}}"></block><block wx:else><block wx:if="{{icon}}"><u-icon vue-id="1b1b8aa6-1" name="{{icon}}" size="{{fontSize}}" color="{{color}}" class="data-v-b36130f2" bind:__l="__l"></u-icon></block><block wx:else><block wx:if="{{text}}"><u--text vue-id="1b1b8aa6-2" text="{{text}}" size="{{fontSize}}" color="{{color}}" align="center" customStyle="justify-content: center" class="data-v-b36130f2" bind:__l="__l"></u--text></block><block wx:else><image class="{{['u-avatar__image','data-v-b36130f2','u-avatar__image--'+shape]}}" style="{{'width:'+($root.g2)+';'+('height:'+($root.g3)+';')}}" src="{{avatarUrl||defaultUrl}}" mode="{{mode}}" data-event-opts="{{[['error',[['errorHandler',['$event']]]]]}}" binderror="__e"></image></block></block></block></block></view>

+ 54 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-avatar/u-avatar.wxss

@@ -0,0 +1,54 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+view.data-v-b36130f2, scroll-view.data-v-b36130f2, swiper-item.data-v-b36130f2 {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+.u-avatar.data-v-b36130f2 {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+}
+.u-avatar--circle.data-v-b36130f2 {
+  border-radius: 100px;
+}
+.u-avatar--square.data-v-b36130f2 {
+  border-radius: 4px;
+}
+.u-avatar__image--circle.data-v-b36130f2 {
+  border-radius: 100px;
+}
+.u-avatar__image--square.data-v-b36130f2 {
+  border-radius: 4px;
+}
+

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 52 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-button/u-button.js


+ 2 - 1
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-switch/u-switch.json → unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-button/u-button.json

@@ -1,6 +1,7 @@
 {
   "usingComponents": {
-    "u-loading-icon": "/node-modules/uview-ui/components/u-loading-icon/u-loading-icon"
+    "u-loading-icon": "/node-modules/uview-ui/components/u-loading-icon/u-loading-icon",
+    "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon"
   },
   "component": true
 }

+ 1 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-button/u-button.wxml

@@ -0,0 +1 @@
+<button class="{{['u-button','u-reset-button','data-v-3bf2dba7',bemClass]}}" style="{{$root.s0}}" hover-start-time="{{$root.m0}}" hover-stay-time="{{$root.m1}}" form-type="{{formType}}" open-type="{{openType}}" app-parameter="{{appParameter}}" hover-stop-propagation="{{hoverStopPropagation}}" send-message-title="{{sendMessageTitle}}" send-message-path="{{sendMessagePath}}" lang="{{lang}}" data-name="{{dataName}}" session-from="{{sessionFrom}}" send-message-img="{{sendMessageImg}}" show-message-card="{{showMessageCard}}" hover-class="{{!disabled&&!loading?'u-button--active':''}}" data-event-opts="{{[['getphonenumber',[['getphonenumber',['$event']]]],['getuserinfo',[['getuserinfo',['$event']]]],['error',[['error',['$event']]]],['opensetting',[['opensetting',['$event']]]],['launchapp',[['launchapp',['$event']]]],['tap',[['clickHandler',['$event']]]]]}}" bindgetphonenumber="__e" bindgetuserinfo="__e" binderror="__e" bindopensetting="__e" bindlaunchapp="__e" bindtap="__e"><block wx:if="{{loading}}"><u-loading-icon vue-id="113d4a8d-1" mode="{{loadingMode}}" size="{{loadingSize*1.15}}" color="{{loadingColor}}" class="data-v-3bf2dba7" bind:__l="__l"></u-loading-icon><text class="u-button__loading-text data-v-3bf2dba7" style="{{'font-size:'+(textSize+'px')+';'}}">{{loadingText||text}}</text></block><block wx:else><block wx:if="{{icon}}"><u-icon vue-id="113d4a8d-2" name="{{icon}}" color="{{iconColorCom}}" size="{{textSize*1.35}}" customStyle="{{({marginRight:'2px'})}}" class="data-v-3bf2dba7" bind:__l="__l"></u-icon></block><block wx:if="{{$slots.default}}"><slot></slot></block><block wx:else><text class="u-button__text data-v-3bf2dba7" style="{{'font-size:'+(textSize+'px')+';'}}">{{text}}</text></block></block></button>

+ 183 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-button/u-button.wxss

@@ -0,0 +1,183 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+view.data-v-3bf2dba7, scroll-view.data-v-3bf2dba7, swiper-item.data-v-3bf2dba7 {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+.u-button.data-v-3bf2dba7 {
+  width: 100%;
+}
+.u-button__text.data-v-3bf2dba7 {
+  white-space: nowrap;
+  line-height: 1;
+}
+.u-button.data-v-3bf2dba7:before {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  width: 100%;
+  height: 100%;
+  border: inherit;
+  border-radius: inherit;
+  -webkit-transform: translate(-50%, -50%);
+          transform: translate(-50%, -50%);
+  opacity: 0;
+  content: " ";
+  background-color: #000;
+  border-color: #000;
+}
+.u-button--active.data-v-3bf2dba7:before {
+  opacity: .15;
+}
+.u-button__icon + .u-button__text.data-v-3bf2dba7:not(:empty), .u-button__loading-text.data-v-3bf2dba7 {
+  margin-left: 4px;
+}
+.u-button--plain.u-button--primary.data-v-3bf2dba7 {
+  color: #3c9cff;
+}
+.u-button--plain.u-button--info.data-v-3bf2dba7 {
+  color: #909399;
+}
+.u-button--plain.u-button--success.data-v-3bf2dba7 {
+  color: #5ac725;
+}
+.u-button--plain.u-button--error.data-v-3bf2dba7 {
+  color: #f56c6c;
+}
+.u-button--plain.u-button--warning.data-v-3bf2dba7 {
+  color: #f56c6c;
+}
+.u-button.data-v-3bf2dba7 {
+  height: 40px;
+  position: relative;
+  align-items: center;
+  justify-content: center;
+  display: flex;
+  flex-direction: row;
+  box-sizing: border-box;
+  flex-direction: row;
+}
+.u-button__text.data-v-3bf2dba7 {
+  font-size: 15px;
+}
+.u-button__loading-text.data-v-3bf2dba7 {
+  font-size: 15px;
+  margin-left: 4px;
+}
+.u-button--large.data-v-3bf2dba7 {
+  width: 100%;
+  height: 50px;
+  padding: 0 15px;
+}
+.u-button--normal.data-v-3bf2dba7 {
+  padding: 0 12px;
+  font-size: 14px;
+}
+.u-button--small.data-v-3bf2dba7 {
+  min-width: 60px;
+  height: 30px;
+  padding: 0px 8px;
+  font-size: 12px;
+}
+.u-button--mini.data-v-3bf2dba7 {
+  height: 22px;
+  font-size: 10px;
+  min-width: 50px;
+  padding: 0px 8px;
+}
+.u-button--disabled.data-v-3bf2dba7 {
+  opacity: 0.5;
+}
+.u-button--info.data-v-3bf2dba7 {
+  color: #323233;
+  background-color: #fff;
+  border-color: #ebedf0;
+  border-width: 1px;
+  border-style: solid;
+}
+.u-button--success.data-v-3bf2dba7 {
+  color: #fff;
+  background-color: #5ac725;
+  border-color: #5ac725;
+  border-width: 1px;
+  border-style: solid;
+}
+.u-button--primary.data-v-3bf2dba7 {
+  color: #fff;
+  background-color: #3c9cff;
+  border-color: #3c9cff;
+  border-width: 1px;
+  border-style: solid;
+}
+.u-button--error.data-v-3bf2dba7 {
+  color: #fff;
+  background-color: #f56c6c;
+  border-color: #f56c6c;
+  border-width: 1px;
+  border-style: solid;
+}
+.u-button--warning.data-v-3bf2dba7 {
+  color: #fff;
+  background-color: #f9ae3d;
+  border-color: #f9ae3d;
+  border-width: 1px;
+  border-style: solid;
+}
+.u-button--block.data-v-3bf2dba7 {
+  display: flex;
+  flex-direction: row;
+  width: 100%;
+}
+.u-button--circle.data-v-3bf2dba7 {
+  border-top-right-radius: 100px;
+  border-top-left-radius: 100px;
+  border-bottom-left-radius: 100px;
+  border-bottom-right-radius: 100px;
+}
+.u-button--square.data-v-3bf2dba7 {
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
+}
+.u-button__icon.data-v-3bf2dba7 {
+  min-width: 1em;
+  line-height: inherit !important;
+  vertical-align: top;
+}
+.u-button--plain.data-v-3bf2dba7 {
+  background-color: #fff;
+}
+.u-button--hairline.data-v-3bf2dba7 {
+  border-width: 0.5px !important;
+}
+

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 5 - 5
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-cell-group/u-cell-group.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 5 - 5
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-cell/u-cell.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 52 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-col/u-col.js


+ 4 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-col/u-col.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

+ 1 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-col/u-col.wxml

@@ -0,0 +1 @@
+<view data-ref="u-col" data-event-opts="{{[['tap',[['clickHandler',['$event']]]]]}}" class="{{['u-col','data-v-26dd4db9','vue-ref','u-col-'+span]}}" style="{{$root.s0}}" bindtap="__e"><slot></slot></view>

+ 80 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-col/u-col.wxss

@@ -0,0 +1,80 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+view.data-v-26dd4db9, scroll-view.data-v-26dd4db9, swiper-item.data-v-26dd4db9 {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+.u-col.data-v-26dd4db9 {
+  padding: 0;
+  box-sizing: border-box;
+  display: block;
+}
+.u-col-0.data-v-26dd4db9 {
+  width: 0;
+}
+.u-col-1.data-v-26dd4db9 {
+  width: calc(100%/12);
+}
+.u-col-2.data-v-26dd4db9 {
+  width: calc(100%/12 * 2);
+}
+.u-col-3.data-v-26dd4db9 {
+  width: calc(100%/12 * 3);
+}
+.u-col-4.data-v-26dd4db9 {
+  width: calc(100%/12 * 4);
+}
+.u-col-5.data-v-26dd4db9 {
+  width: calc(100%/12 * 5);
+}
+.u-col-6.data-v-26dd4db9 {
+  width: calc(100%/12 * 6);
+}
+.u-col-7.data-v-26dd4db9 {
+  width: calc(100%/12 * 7);
+}
+.u-col-8.data-v-26dd4db9 {
+  width: calc(100%/12 * 8);
+}
+.u-col-9.data-v-26dd4db9 {
+  width: calc(100%/12 * 9);
+}
+.u-col-10.data-v-26dd4db9 {
+  width: calc(100%/12 * 10);
+}
+.u-col-11.data-v-26dd4db9 {
+  width: calc(100%/12 * 11);
+}
+.u-col-12.data-v-26dd4db9 {
+  width: calc(100%/12 * 12);
+}
+

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 52 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker.js


+ 6 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "u-picker": "/node-modules/uview-ui/components/u-picker/u-picker"
+  },
+  "component": true
+}

+ 1 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker.wxml

@@ -0,0 +1 @@
+<u-picker vue-id="01eaed7b-1" show="{{show}}" closeOnClickOverlay="{{closeOnClickOverlay}}" columns="{{columns}}" title="{{title}}" itemHeight="{{itemHeight}}" showToolbar="{{showToolbar}}" visibleItemCount="{{visibleItemCount}}" defaultIndex="{{innerDefaultIndex}}" cancelText="{{cancelText}}" confirmText="{{confirmText}}" cancelColor="{{cancelColor}}" confirmColor="{{confirmColor}}" data-ref="picker" data-event-opts="{{[['^close',[['close']]],['^cancel',[['cancel']]],['^confirm',[['confirm']]],['^change',[['change']]]]}}" bind:close="__e" bind:cancel="__e" bind:confirm="__e" bind:change="__e" class="data-v-7d06fb79 vue-ref" bind:__l="__l"></u-picker>

+ 36 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker.wxss

@@ -0,0 +1,36 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+view.data-v-7d06fb79, scroll-view.data-v-7d06fb79, swiper-item.data-v-7d06fb79 {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 52 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-empty/u-empty.js


+ 6 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-empty/u-empty.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon"
+  },
+  "component": true
+}

+ 1 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-empty/u-empty.wxml

@@ -0,0 +1 @@
+<block wx:if="{{show}}"><view class="u-empty data-v-6938e513" style="{{$root.s0}}"><block wx:if="{{!isSrc}}"><u-icon vue-id="55f7abbe-1" name="{{mode==='message'?'chat':'empty-'+mode}}" size="{{iconSize}}" color="{{iconColor}}" margin-top="14" class="data-v-6938e513" bind:__l="__l"></u-icon></block><block wx:else><image style="{{'width:'+($root.g0)+';'+('height:'+($root.g1)+';')}}" src="{{icon}}" mode="widthFix" class="data-v-6938e513"></image></block><text class="u-empty__text data-v-6938e513" style="{{$root.s1}}">{{text?text:icons[mode]}}</text><block wx:if="{{$slots.default||$slots.$default}}"><view class="u-empty__wrap data-v-6938e513"><slot></slot></view></block></view></block>

+ 57 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-empty/u-empty.wxss

@@ -0,0 +1,57 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+view.data-v-6938e513, scroll-view.data-v-6938e513, swiper-item.data-v-6938e513 {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+.u-empty.data-v-6938e513 {
+  display: flex;
+  flex-direction: row;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+.u-empty__text.data-v-6938e513 {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  margin-top: 20rpx;
+}
+.u-slot-wrap.data-v-6938e513 {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  margin-top: 20rpx;
+}
+

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 5 - 5
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 52 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-input/u-input.js


+ 6 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-input/u-input.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon"
+  }
+}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-input/u-input.wxml


+ 46 - 34
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-switch/u-switch.wxss → unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-input/u-input.wxss

@@ -24,7 +24,7 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
-view.data-v-4a8c9de7, scroll-view.data-v-4a8c9de7, swiper-item.data-v-4a8c9de7 {
+view.data-v-fdbb9fe6, scroll-view.data-v-fdbb9fe6, swiper-item.data-v-fdbb9fe6 {
   display: flex;
   flex-direction: column;
   flex-shrink: 0;
@@ -33,49 +33,61 @@ view.data-v-4a8c9de7, scroll-view.data-v-4a8c9de7, swiper-item.data-v-4a8c9de7 {
   align-items: stretch;
   align-content: flex-start;
 }
-.u-switch.data-v-4a8c9de7 {
+.u-input.data-v-fdbb9fe6 {
   display: flex;
   flex-direction: row;
-  box-sizing: border-box;
-  position: relative;
-  background-color: #fff;
-  border-width: 1px;
+  align-items: center;
+  justify-content: space-between;
+  flex: 1;
+}
+.u-input--radius.data-v-fdbb9fe6, .u-input--square.data-v-fdbb9fe6 {
+  border-radius: 4px;
+}
+.u-input--no-radius.data-v-fdbb9fe6 {
+  border-radius: 0;
+}
+.u-input--circle.data-v-fdbb9fe6 {
   border-radius: 100px;
-  transition: background-color 0.4s;
-  border-color: rgba(0, 0, 0, 0.12);
-  border-style: solid;
-  justify-content: flex-end;
+}
+.u-input__content.data-v-fdbb9fe6 {
+  flex: 1;
+  display: flex;
+  flex-direction: row;
   align-items: center;
-  overflow: hidden;
+  justify-content: space-between;
 }
-.u-switch__node.data-v-4a8c9de7 {
+.u-input__content__field-wrapper.data-v-fdbb9fe6 {
+  position: relative;
+  display: flex;
+  flex-direction: row;
+  margin: 0;
+  flex: 1;
+}
+.u-input__content__field-wrapper__field.data-v-fdbb9fe6 {
+  line-height: 26px;
+  text-align: left;
+  color: #303133;
+  height: 24px;
+  font-size: 15px;
+  flex: 1;
+}
+.u-input__content__clear.data-v-fdbb9fe6 {
+  width: 20px;
+  height: 20px;
+  border-radius: 100px;
+  background-color: #c6c7cb;
   display: flex;
   flex-direction: row;
   align-items: center;
   justify-content: center;
-  border-radius: 100px;
-  background-color: #fff;
-  border-radius: 100px;
-  box-shadow: 1px 1px 1px 0 rgba(0, 0, 0, 0.25);
-  transition-property: -webkit-transform;
-  transition-property: transform;
-  transition-property: transform, -webkit-transform;
-  transition-duration: 0.4s;
-  transition-timing-function: cubic-bezier(0.3, 1.05, 0.4, 1.05);
+  -webkit-transform: scale(0.82);
+          transform: scale(0.82);
+  margin-left: 4px;
 }
-.u-switch__bg.data-v-4a8c9de7 {
-  position: absolute;
-  border-radius: 100px;
-  background-color: #FFFFFF;
-  transition-property: -webkit-transform;
-  transition-property: transform;
-  transition-property: transform, -webkit-transform;
-  transition-duration: 0.4s;
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-  transition-timing-function: ease;
+.u-input__content__subfix-icon.data-v-fdbb9fe6 {
+  margin-left: 4px;
 }
-.u-switch--disabled.data-v-4a8c9de7 {
-  opacity: 0.6;
+.u-input__content__prefix-icon.data-v-fdbb9fe6 {
+  margin-right: 4px;
 }
 

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 5 - 5
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-line/u-line.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 52 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-link/u-link.js


+ 4 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-link/u-link.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

+ 1 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-link/u-link.wxml

@@ -0,0 +1 @@
+<text data-event-opts="{{[['tap',[['openLink',['$event']]]]]}}" class="u-link data-v-8a7be032" style="{{$root.s0}}" catchtap="__e">{{text}}</text>

+ 43 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-link/u-link.wxss

@@ -0,0 +1,43 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+view.data-v-8a7be032, scroll-view.data-v-8a7be032, swiper-item.data-v-8a7be032 {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+.u-link.data-v-8a7be032 {
+  line-height: 1;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  flex: 1;
+}
+

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 52 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-list-item/u-list-item.js


+ 4 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-list-item/u-list-item.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio