合并测试修改

pagesA/pages/index/getCarCode.vue

@@ -48,7 +48,7 @@
                 </div>
                 <u-gap bgColor="transparent" height="20"></u-gap>
                 <div class="list">
-                    <div class="list__item" v-for="(vo,inx) in items" :key="inx">
+                    <div class="list__item" v-for="(vo,inx) in mallList" :key="inx">
                         <div class="list__img">
                             <!-- <image :src="vo.img" /> -->
                         </div>
@@ -60,13 +60,40 @@
                                 <text>{{vo.tip}}</text>
                             </div>
                             <div class="money__num">
-                                <text class="num__one">¥{{vo.price2}}</text>
-                                <text class="num__two">¥{{vo.price2}}</text>
+                                <text class="num__one">¥{{vo.currentPrice/100}}</text>
+                                <text class="num__two">¥{{vo.originalPrice/100}}</text>
                             </div>
                         </div>
-                        <div class="list__add" @click="add">
+						<u-number-box v-model="value" :min="0" @click="selectMall(vo.id)">
+						        <view
+						            slot="minus"
+						            class="minus"
+						        >
+						            <u-icon
+						                name="minus"
+						                size="12"
+						            ></u-icon>
+						        </view>
+						        <text
+						            slot="input"
+						            style="width: 50rpx;text-align: center;"
+						            class="input"
+						        >{{value}}</text>
+						        <view
+						            slot="plus"
+						            class="plus"
+						        >
+						            <u-icon
+						                name="plus"
+						                color="#FFFFFF"
+						                size="12"
+						            ></u-icon>
+						        </view>
+						    </u-number-box>
+                        <!-- <div class="list__add" @click="add">
+							
                             <image src="@/static/index/get-car-code2.png" />
-                        </div>
+                        </div> -->
                     </div>
                 </div>
             </div>
@@ -76,7 +103,7 @@
         <div class="price__bottom">
             <div class="price">
                 <div class="price__num">
-                    共<span>{{nums}}</span>件
+                    共<span>{{selectMallList.length}}</span>件
                 </div>
                 <div class="price__all">
                     合计<span class="num__two">￥00.00</span>
@@ -128,6 +155,12 @@ export default {
 			addressInfo: {},
 			//免费挪车码
 			freeCode: {},
+			//普通商品列表
+			mallList: [],
+			value: 0,
+			//
+			selectMallList: [],
+			
         }
     },
     methods: {
@@ -235,10 +268,31 @@ export default {
 				}
 			})
 		},
+		getMallList(){
+			let opts = { url: '/app/mall/list', method: 'get' };
+			this.http.httpTokenRequest(opts, {classification: "1"}).then(res => {
+				if (res.data.code == 200) {
+					this.mallList = res.data.data.rows
+				}
+			})
+		},
+		selectMall(id){
+			console.log(id)
+			let exist = false
+			this.selectMallList.forEach(element=>{
+				if(element == id ){
+					exist = true
+				}
+			})
+			if(!exist){
+				this.selectMallList.push(id)
+			}
+		}
     },
 	onShow() {
 		this.getAddressList()
 		this.getMoveCode()
+		this.getMallList()
 	},
 };
 </script>
@@ -505,7 +559,7 @@ export default {
                     .list__money {
                         margin: 0 20rpx;
                         margin-left: 100rpx;
-
+						width: 400rpx;
                         .money__title {
                             font-size: 32rpx;
                             font-family: PingFang SC;
@@ -560,4 +614,33 @@ export default {
         }
     }
 }
+.minus {
+		width: 22px;
+		height: 22px;
+		border-width: 1px;
+		border-color: #E6E6E6;
+		border-top-left-radius: 100px;
+		border-top-right-radius: 100px;
+		border-bottom-left-radius: 100px;
+		border-bottom-right-radius: 100px;
+		@include flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.input {
+		padding: 0 10px;
+	}
+
+	.plus {
+		width: 22px;
+		height: 22px;
+		background-color: #FF0000;
+		border-radius: 50%;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+	}
 </style>

pagesB/pages/move-car/myMoveCar.vue

@@ -6,7 +6,7 @@
 <view class="appCotent">
 <div class="myMoveCar">
     <div class="my__search">
-        <u-search placeholder="请输入车牌号" :showAction='false' bgColor='#ffffff' v-model="keyword"></u-search>
+        <u-search placeholder="请输入车牌号" :showAction='false' bgColor='#ffffff' v-model="keyword" @change="getMyMoveCodeList"></u-search>
     </div>
     <div class="my__list">
       <scroll-list ref="list" :option="option" @load="load">
@@ -65,32 +65,33 @@ export default {
     },
     methods: {
       // 加载数据
-      load(paging) {
-        setTimeout(() => {
-          let list = [];
-          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
-              this.items = [...this.items, ...list]
-              // 加载成功  参数对象{list: 当前列表,total: 数据总长度(后端查询的total)}
-              this.$refs.list.loadSuccess({
-                list: this.items,
-                total: res.data.total
-              });
-              // 加载失败
-              // this.$refs.list.loadFail()
-            }
-          })
-        }, this.$u.random(100, 1000));
-      },
+      // load(paging) {
+      //   setTimeout(() => {
+      //     let list = [];
+      //     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
+      //         this.items = [...this.items, ...list]
+      //         // 加载成功  参数对象{list: 当前列表,total: 数据总长度(后端查询的total)}
+      //         this.$refs.list.loadSuccess({
+      //           list: this.items,
+      //           total: res.data.total
+      //         });
+      //         // 加载失败
+      //         // this.$refs.list.loadFail()
+      //       }
+      //     })
+      //   }, this.$u.random(100, 1000));
+      // },
         goView(id){
             uni.navigateTo({
                 url: '/pagesB/pages/move-car/moveCarDetail?id=' + id
             })
         },
 		getMyMoveCodeList(){
-			let opts = { url: '/app/moveCode/list', method: 'get' };
+			
+			let opts = { url: '/app/moveCode/list?carNo=' + this.keyword, method: 'get' };
 			this.http.httpTokenRequest(opts, {}).then(res => {
 				if (res.data.code == 200) {
 					this.items = res.data.rows
@@ -117,9 +118,12 @@ export default {
 		cancelModal(){
 			this.unbindShow = false
 		},
+		searchMoveCode(){
+			
+		}
     },
 	created() {
-		//this.getMyMoveCodeList()
+		this.getMyMoveCodeList()
 	}
 
 }