合并测试修改

pagesB/pages/move-car/editCar.vue

@@ -157,8 +157,8 @@ export default {
       this.id = option.id
     },
     onReady() {
-      // 如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则
-      this.$refs.form1.setRules(this.rules)
+		// 如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则
+		this.$refs.form1.setRules(this.rules)
     },
     onShow(){
       this.getCarInfo()

pagesB/pages/move-car/myCall.vue

@@ -54,7 +54,7 @@ export default {
       load(paging) {
         setTimeout(() => {
           let list = [];
-          let opts = { url: '/app/moveLog/apply/list', method: 'get' };
+          let opts = { url: '/app/moveLog/apply/list?pageSize='+paging.size+'&pageNum='+paging.page, method: 'get' };
           this.http.httpTokenRequest(opts, {}).then(res => {
             if (res.data.code == 200) {
               list = res.data.rows

pagesB/pages/move-car/myMoveCar.vue

@@ -68,7 +68,7 @@ export default {
       load(paging) {
         setTimeout(() => {
           let list = [];
-          let opts = { url: '/app/moveCode/list', method: 'get' };
+          let opts = { url: '/app/moveCode/list?pageSize='+paging.size+'&pageNum='+paging.page, method: 'get' };
           this.http.httpTokenRequest(opts, {}).then(res => {
             if (res.data.code == 200) {
               list = res.data.rows

pagesB/pages/move-car/myRecord.vue

@@ -54,7 +54,7 @@ export default {
       load(paging) {
         setTimeout(() => {
           let list = [];
-          let opts = { url: '/app/moveLog/my/list', method: 'get' };
+          let opts = { url: '/app/moveLog/my/list?pageSize='+paging.size+'&pageNum='+paging.page, method: 'get' };
           this.http.httpTokenRequest(opts, {}).then(res => {
             if (res.data.code == 200) {
               list = res.data.rows

pagesB/pages/move-car/oneMoveCar.vue

@@ -145,8 +145,8 @@ export default {
             })
         },
 		getCarNumber(){
-			let opts = { url: '/app/moveCode/owner/' + this.moveCode, method: 'get' };
-			//let opts = { url: '/app/moveCode/owner/MV123', method: 'get' };
+			//let opts = { url: '/app/moveCode/owner/' + this.moveCode, method: 'get' };
+			let opts = { url: '/app/moveCode/owner/MV123', method: 'get' };
 			this.http.httpTokenRequest(opts, {}).then(res => {
 				if (res.data.code == 200) {
 					if(JSON.stringify(res.data.data) != "{}"){

pagesC/pages/shop/index.vue

@@ -38,8 +38,9 @@
                         ￥{{vo.currentPrice/100}}<span class="num__two">￥{{vo.originalPrice/100}}</span>
                     </div>
                 </div>
+				</scroll-list>
             </div>
-          </scroll-list>
+          
         </div>
     </view>
     <u-gap bgColor="transparent" height="60"></u-gap>
@@ -76,7 +77,7 @@ export default {
         // 加载数据
         load(paging) {
           setTimeout(() => {
-            let opts = { url: '/app/mall/list', method: 'get' };
+            let opts = { url: '/app/mall/list?pageSize='+paging.size+'&pageNum='+paging.page, method: 'get' };
             this.http.httpTokenRequest(opts, {classification: "2"}).then(res => {
               if (res.data.code == 200) {
                 let list = res.data.data.rows

pagesD/pages/personal/carTime.vue

@@ -112,7 +112,7 @@ export default {
           })
         }
       })
-    }
+    },
 		//获得订单详情
 		getWaybillInfo(){
 			let opts = { url: '/app/user/order/waybill/' + this.orderId, method: 'get' };

pagesD/pages/personal/myOrder.vue

@@ -190,6 +190,7 @@ export default {
     methods: {
       // 加载数据
       load(paging) {
+		  console.log(paging)
         setTimeout(() => {
           let list = [];
           let order = {}
@@ -206,7 +207,7 @@ export default {
             order.orderStatus = 30;
           }else{
           }
-          let opts = { url: '/app/user/order/list', method: 'get' };
+          let opts = { url: '/app/user/order/list?pageSize='+paging.size+'&pageNum='+paging.page, method: 'get' };
           this.http.httpTokenRequest(opts, order).then(res => {
             if (res.data.code == 200) {
               list = res.data.data.rows
@@ -292,7 +293,7 @@ export default {
 		},
     },
 	onShow() {
-		//this.getOrderList()
+		//this.load()
 	},
 	onLoad(e) {
 		if(e.current) {

pagesD/pages/personal/userInfo.vue

@@ -20,7 +20,7 @@
             <view class="user__title">
                 填写昵称
             </view>
-            <div class="user__input"><input v-model="user__nikename" placeholder="输入昵称(最多输入20个字符)" type="text">
+            <div class="user__input"><input v-model="user__nikename" @blur="" placeholder="输入昵称(最多输入20个字符)" type="text">
                 <div class="user__name__border"></div>
                 <div class="user__save" @click="save">保存</div>
             </div>
@@ -33,7 +33,9 @@
 				女
 			</div>
         </u-popup>
-        <u-datetime-picker :show="show__date" v-model="dateValue" ref='datetimePicker' mode="date" @confirm='confirm' @close='close__date' @cancel='close__date' :formatter="formatter" closeOnClickOverlay></u-datetime-picker>
+        <u-datetime-picker :show="show__date" v-model="dateValue" ref='datetimePicker' :minDate="-2209017600000" mode="date" @confirm='confirm' @close='close__date' @cancel='close__date' :formatter="formatter" closeOnClickOverlay>
+			
+		</u-datetime-picker>
         <view class="info__content">
             <active-form @clickFn='clickFn' :formDate.sync="formData"></active-form>
         </view>
@@ -138,6 +140,13 @@ export default {
         this.formData.forEach(element => {
           if (element.label === '生日') {
             element.rules.label = this.transformTime(e.value)
+			let opts = { url: '/app/user/update', method: 'post' };
+			let userInfoItem = { type: 4, val: element.rules.label };
+			this.http.httpTokenRequest(opts, userInfoItem).then(response => {
+			  if (response.data.code == 200) {
+			    
+			  }
+			})
           }
         });
         this.show__date = false
@@ -276,13 +285,13 @@ export default {
 							element.rules.value = this.userInfo.mobile
 						}
 						if (element.label === '昵称') {
-							element.rules.value = this.userInfo.nickName
+							//element.rules.value = this.userInfo.nickName
 						}
 						if (element.label === '性别') {
 							element.rules.label = this.userInfo.sex=="0"?"男":"女"
 						}
 						if (element.label === '生日') {
-							element.rules.value = this.userInfo.birthday
+							element.rules.label = this.userInfo.birthday
 						}
 					})
 				}