修改选择物料弹窗，修改条数，添加滚动轴

pages/home.vue

@@ -69,12 +69,12 @@
 						转仓复核
 					</view>
 				</view>
-				
 			</view>
-			
-			
-			
 		</uni-card>
+		<!-- <button style="background: blue;color: #fff;margin: 40rpx;"></button> -->
+		<view class="logout"  @click="logout">
+			退出
+		</view>
 	</view>
 </template>
 
@@ -132,6 +132,17 @@
 			// })
 		},
 		methods: {
+			logout(){
+				uni.setStorage({
+					key: 'automaticLogin',
+					data: false,
+					success: function () {
+						uni.navigateTo({
+							url: '/pages/user/login'
+						})
+					}
+				});
+			},
 			toRouter(j) {
 				console.log(j)
 				wx.requestSubscribeMessage({
@@ -152,6 +163,14 @@
 </script>
 
 <style lang="less">
+	.logout{
+		text-align: center;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		line-height: 80rpx;
+	}
 	.menu-list-warp {
 		.menu-list-box {
 			width: 25%;

pages/materialTransfer/materialTransfer.vue

@@ -105,7 +105,7 @@
 					<input v-model="req.search" confirm-type="search" placeholder="请输入物料名称或编码"
 						@input="getSelectMaterialList" class="search-input" />
 				</view>
-				<ul>
+				<ul  style="height: 60vh;overflow-y: scroll;">
 					<li @click="selectMaterialList(i)" v-for="i in materialData" :key="i.id">
 						{{i.name}}
 					</li>
@@ -139,7 +139,7 @@
 				req: {
 					userId: null,
 					pageNum: 1,
-					pageSize: 10,
+					pageSize: 30,
 					search: null,
 					materialCode: null,
 				},

pages/materialTransfer/transferComposite.vue

@@ -102,7 +102,7 @@
 					<input v-model="req.search" :searchIcon="true" :border="true" placeholder="请输入物料名称或编码"
 						@input="getSelectMaterialList" class="search-input" />
 				</view>
-				<ul>
+				<ul  style="height: 60vh;overflow-y: scroll;">
 					<li @click="selectMaterialList(i)" v-for="i in materialData" :key="i.id">
 						{{i.name}}
 					</li>
@@ -136,7 +136,7 @@
 				req: {
 					userId: null,
 					pageNum: 1,
-					pageSize: 10,
+					pageSize: 30,
 					search: null,
 					materialCode: null,
 				},

pages/usedTotal/return-warehouse.vue

@@ -100,7 +100,7 @@
 						class="search-input"
 						 />
 				</view>
-				<ul>
+				<ul style="height: 60vh;overflow-y: scroll;">
 					<li @click="selectMaterialList(i)" v-for="i in materialData" :key="i.id">
 						{{i.name}}
 					</li>
@@ -134,7 +134,7 @@
 				req:{
 					userId:null,
 					pageNum:1,
-					pageSize:10,
+					pageSize:30,
 					search:null,
 					materialCode:null,
 				},

pages/user/login.vue

@@ -62,10 +62,14 @@
 			}
 		},
 		onLoad() {
-			
-			setTimeout(() => {
-				this.init()
-			}, 500)
+			const v = this
+			uni.getStorage({
+				key: 'automaticLogin',
+				success: function (res) {
+					if(res.data) v.init()
+					
+				}
+			});
 		},
 		methods: {
 			init() {
@@ -97,6 +101,7 @@
 						}
 						const loginForm = {...v.loginForm}
 						
+						
 						loginForm.password = this.$w_md5.hex_md5_32(loginForm.password)
 						uni.request({
 							url: 'https://cfm.bytesail.cn/api' + '/blade-auth/oauth/token?' + formateObjToParamStr(loginForm),
@@ -185,7 +190,13 @@
 							},
 							success: (res) => {
 								console.log(res)
-								
+								uni.setStorage({
+									key: 'automaticLogin',
+									data: true,
+									success: function () {
+										
+									}
+								});
 								if(res.statusCode == 200){
 									wx.setStorageSync(TOKEN_NAME,  res.data)
 									Vue.prototype.$token = res.data

unpackage/dist/build/mp-weixin/pages/home.wxml

@@ -1 +1 @@
-<view class="home"><uni-card vue-id="54490ea4-1" bind:__l="__l" vue-slots="{{['default']}}"><view class="title">库存</view><view class="menu-list-warp"><view data-event-opts="{{[['tap',[['toRouter',['/submit/submit']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/smck.png" mode></image><view>异常上报</view></view><block wx:if="{{isRoom}}"><view data-event-opts="{{[['tap',[['toRouter',['/usedTotal/usedTotal']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/tj.png" mode></image><view>库存统计</view></view></block></view></uni-card><uni-card vue-id="54490ea4-2" bind:__l="__l" vue-slots="{{['default']}}"><view class="title">出库管理</view><view class="menu-list-warp"><view data-event-opts="{{[['tap',[['toRouter',['/usedTotal/warehouse-list']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/smrk.png" mode></image><view>物料接收</view></view><view data-event-opts="{{[['tap',[['toRouter',['/usedTotal/return-warehouse']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/tc.png" mode></image><view>物料退仓</view></view><view data-event-opts="{{[['tap',[['toRouter',['/usedTotal/fabric-correction']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/kccx.png" mode></image><view>面料修正</view></view><view data-event-opts="{{[['tap',[['toRouter',['/materialTransfer/materialTransfer']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/xcjj.png" mode></image><view>面料转仓</view></view><block wx:if="{{isRoom2}}"><view data-event-opts="{{[['tap',[['toRouter',['/materialTransfer/transferCompositeList']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/fh.png" mode></image><view>转仓复核</view></view></block></view></uni-card></view>
+<view class="home"><uni-card vue-id="54490ea4-1" bind:__l="__l" vue-slots="{{['default']}}"><view class="title">库存</view><view class="menu-list-warp"><view data-event-opts="{{[['tap',[['toRouter',['/submit/submit']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/smck.png" mode></image><view>异常上报</view></view><block wx:if="{{isRoom}}"><view data-event-opts="{{[['tap',[['toRouter',['/usedTotal/usedTotal']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/tj.png" mode></image><view>库存统计</view></view></block></view></uni-card><uni-card vue-id="54490ea4-2" bind:__l="__l" vue-slots="{{['default']}}"><view class="title">出库管理</view><view class="menu-list-warp"><view data-event-opts="{{[['tap',[['toRouter',['/usedTotal/warehouse-list']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/smrk.png" mode></image><view>物料接收</view></view><view data-event-opts="{{[['tap',[['toRouter',['/usedTotal/return-warehouse']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/tc.png" mode></image><view>物料退仓</view></view><view data-event-opts="{{[['tap',[['toRouter',['/usedTotal/fabric-correction']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/kccx.png" mode></image><view>面料修正</view></view><view data-event-opts="{{[['tap',[['toRouter',['/materialTransfer/materialTransfer']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/xcjj.png" mode></image><view>面料转仓</view></view><block wx:if="{{isRoom2}}"><view data-event-opts="{{[['tap',[['toRouter',['/materialTransfer/transferCompositeList']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/fh.png" mode></image><view>转仓复核</view></view></block></view></uni-card><view data-event-opts="{{[['tap',[['logout',['$event']]]]]}}" class="logout" bindtap="__e">退出</view></view>

unpackage/dist/build/mp-weixin/pages/home.wxss

@@ -1 +1 @@
-.menu-list-warp .menu-list-box{width:25%;text-align:center;float:left;padding:20rpx}.menu-list-warp .menu-list-box image{width:100rpx;height:100rpx}
+.logout{text-align:center;position:fixed;bottom:0;left:0;right:0;line-height:80rpx}.menu-list-warp .menu-list-box{width:25%;text-align:center;float:left;padding:20rpx}.menu-list-warp .menu-list-box image{width:100rpx;height:100rpx}

unpackage/dist/dev/mp-weixin/pages/home.js

@@ -341,7 +341,7 @@ var _default = { data: function data() {return { userInfoData: [], notificationD
     // v.$post('/wx/message/notification',{}).then(res=>{
     // 	v.notificationData = res.data
     // })
-  }, methods: { toRouter: function toRouter(j) {console.log(j);wx.requestSubscribeMessage({ tmplIds: ['Tt0C6SOrtd2QXIdLqrm0CNdarUE4LG_lNJblUnkqTPM'], success: function success(res) {}, fail: function fail(err) {console.log(err);} });uni.navigateTo({ url: '/pages' + j });} } };exports.default = _default;
+  }, methods: { logout: function logout() {uni.setStorage({ key: 'automaticLogin', data: false, success: function success() {uni.navigateTo({ url: '/pages/user/login' });} });}, toRouter: function toRouter(j) {console.log(j);wx.requestSubscribeMessage({ tmplIds: ['Tt0C6SOrtd2QXIdLqrm0CNdarUE4LG_lNJblUnkqTPM'], success: function success(res) {}, fail: function fail(err) {console.log(err);} });uni.navigateTo({ url: '/pages' + j });} } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ }),

unpackage/dist/dev/mp-weixin/pages/home.wxml

@@ -1 +1 @@
-<view class="home"><uni-card vue-id="54490ea4-1" bind:__l="__l" vue-slots="{{['default']}}"><view class="title">库存</view><view class="menu-list-warp"><view data-event-opts="{{[['tap',[['toRouter',['/submit/submit']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/smck.png" mode></image><view>异常上报</view></view><block wx:if="{{isRoom}}"><view data-event-opts="{{[['tap',[['toRouter',['/usedTotal/usedTotal']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/tj.png" mode></image><view>库存统计</view></view></block></view></uni-card><uni-card vue-id="54490ea4-2" bind:__l="__l" vue-slots="{{['default']}}"><view class="title">出库管理</view><view class="menu-list-warp"><view data-event-opts="{{[['tap',[['toRouter',['/usedTotal/warehouse-list']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/smrk.png" mode></image><view>物料接收</view></view><view data-event-opts="{{[['tap',[['toRouter',['/usedTotal/return-warehouse']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/tc.png" mode></image><view>物料退仓</view></view><view data-event-opts="{{[['tap',[['toRouter',['/usedTotal/fabric-correction']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/kccx.png" mode></image><view>面料修正</view></view><view data-event-opts="{{[['tap',[['toRouter',['/materialTransfer/materialTransfer']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/xcjj.png" mode></image><view>面料转仓</view></view><block wx:if="{{isRoom2}}"><view data-event-opts="{{[['tap',[['toRouter',['/materialTransfer/transferCompositeList']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/fh.png" mode></image><view>转仓复核</view></view></block></view></uni-card></view>
+<view class="home"><uni-card vue-id="54490ea4-1" bind:__l="__l" vue-slots="{{['default']}}"><view class="title">库存</view><view class="menu-list-warp"><view data-event-opts="{{[['tap',[['toRouter',['/submit/submit']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/smck.png" mode></image><view>异常上报</view></view><block wx:if="{{isRoom}}"><view data-event-opts="{{[['tap',[['toRouter',['/usedTotal/usedTotal']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/tj.png" mode></image><view>库存统计</view></view></block></view></uni-card><uni-card vue-id="54490ea4-2" bind:__l="__l" vue-slots="{{['default']}}"><view class="title">出库管理</view><view class="menu-list-warp"><view data-event-opts="{{[['tap',[['toRouter',['/usedTotal/warehouse-list']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/smrk.png" mode></image><view>物料接收</view></view><view data-event-opts="{{[['tap',[['toRouter',['/usedTotal/return-warehouse']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/tc.png" mode></image><view>物料退仓</view></view><view data-event-opts="{{[['tap',[['toRouter',['/usedTotal/fabric-correction']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/kccx.png" mode></image><view>面料修正</view></view><view data-event-opts="{{[['tap',[['toRouter',['/materialTransfer/materialTransfer']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/xcjj.png" mode></image><view>面料转仓</view></view><block wx:if="{{isRoom2}}"><view data-event-opts="{{[['tap',[['toRouter',['/materialTransfer/transferCompositeList']]]]]}}" class="menu-list-box" bindtap="__e"><image src="../static/fh.png" mode></image><view>转仓复核</view></view></block></view></uni-card><view data-event-opts="{{[['tap',[['logout',['$event']]]]]}}" class="logout" bindtap="__e">退出</view></view>

unpackage/dist/dev/mp-weixin/pages/home.wxss

@@ -1,3 +1,11 @@
+.logout {
+  text-align: center;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  line-height: 80rpx;
+}
 .menu-list-warp .menu-list-box {
   width: 25%;
   text-align: center;

unpackage/dist/dev/mp-weixin/pages/materialTransfer/materialTransfer.js

@@ -325,7 +325,7 @@ var _default =
       req: {
         userId: null,
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 30,
         search: null,
         materialCode: null },
 

unpackage/dist/dev/mp-weixin/pages/materialTransfer/transferComposite.js

@@ -322,7 +322,7 @@ var _default =
       req: {
         userId: null,
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 30,
         search: null,
         materialCode: null },
 

unpackage/dist/dev/mp-weixin/pages/usedTotal/return-warehouse.js

@@ -306,7 +306,7 @@ var _default =
       req: {
         userId: null,
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 30,
         search: null,
         materialCode: null },
 

unpackage/dist/dev/mp-weixin/pages/user/login.js

@@ -234,10 +234,14 @@ var _api = __webpack_require__(/*! @/util/api.js */ 22);function _interopRequire
 
   },
   onLoad: function onLoad() {
+    var v = this;
+    uni.getStorage({
+      key: 'automaticLogin',
+      success: function success(res) {
+        if (res.data) v.init();
+
+      } });
 
-    // setTimeout(() => {
-    // 	this.init()
-    // }, 500)
   },
   methods: {
     init: function init() {var _this = this;
@@ -269,6 +273,7 @@ var _api = __webpack_require__(/*! @/util/api.js */ 22);function _interopRequire
           }
           var loginForm = _objectSpread({}, v.loginForm);
 
+
           loginForm.password = _this.$w_md5.hex_md5_32(loginForm.password);
           uni.request({
             url: 'https://cfm.bytesail.cn/api' + '/blade-auth/oauth/token?' + formateObjToParamStr(loginForm),
@@ -357,6 +362,12 @@ var _api = __webpack_require__(/*! @/util/api.js */ 22);function _interopRequire
 
             success: function success(res) {
               console.log(res);
+              uni.setStorage({
+                key: 'automaticLogin',
+                data: true,
+                success: function success() {
+
+                } });
 
               if (res.statusCode == 200) {
                 wx.setStorageSync(_cacheConstant.TOKEN_NAME, res.data);

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -228,6 +228,13 @@
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/usedTotal/return-warehouse",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }