Merge branch 'productization2' of http://47.96.128.196:3000/chenpm/product_wx into productization2

# Conflicts:
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/components/activity.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/components/dynamic.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/components/enterpriseSide.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/login2/login.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/activity/apply-popup.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/activity/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/activityPromulgate/list.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/addintention/addintention.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/chosseHouse/chosseHouse.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/companyHouse/companyHouse.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/companyreport/companyreport.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/companyreport/components/goReport.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/companyreport/components/handlereport.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/companyreport/components/reportDetails.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/companyreport/components/reportHistory.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/components/momo-multipleSelect/momo-multipleSelect.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/components/selectGenzongDep/tkitree.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/components/selectXiangguanDep/tkitree.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/components/select_dengjiren/tkitree.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/components/select_dengjiyuan/tkitree.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/components/tel-number/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/components/tkitree/tkitree.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/eventRelease/add.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/eventRelease/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/housedetails/housedetails.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/merchants/components/housemanger.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/merchants/components/mymechants.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/merchants/components/mymechantsdetails.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/modifyHandle/handle.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/modifyHandle/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/modifyReport/add.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/modifyReport/detail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/modifyReport/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/modifySend/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/password/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/peripheralService/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/repairDispatch-app/add.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/repairDispatch-app/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/repairprocessing-app/detail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/repairprocessing-app/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/reportRepair/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/todo/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/toread/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/venueRoom/confirm.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subPackages/venueRoom/meetingroom.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-row/components/uni-col/uni-col.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-row/components/uni-row/uni-row.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.js.map

pages/subPackages/reportRepair/repairRecord.vue

@@ -32,11 +32,17 @@ export default {
         dic_SelectList:[],
         params: {
           pageNum: 1,
-          pageSize: 10,
+          pageSize: 5,
           userId: getUserLocalStorageInfo().userId
         },
       }
     },
+  onPullDownRefresh() {
+    this.getByCodes()
+    setTimeout(function () {
+      uni.stopPullDownRefresh();
+    }, 1000);
+  },
     onShow(){
       this.getByCodes()
     },
@@ -129,6 +135,7 @@ export default {
     display: flex;
     flex-direction: column;
     align-items: center;
+    padding-bottom: 36rpx;
     .customLi{
       background: white;
       width: 686rpx;

unpackage/dist/dev/mp-weixin/pages/subPackages/components/tel-number/index.json

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