V6.2.4

components/cm-module/listTemplate/productList.vue

@@ -26,7 +26,7 @@
 									<text class="iconfont icon-wenhao" @click.stop="repurchModel"></text>
 								</view>
 							</view>
-							<button class="add-cart-btn" @click.stop="operationHanld(item)">选择数量</button>
+							<button class="add-cart-btn" @click.stop="operationHanld(item)">数量</button>
 						</view>
 					</view>
 				</view>
@@ -190,7 +190,7 @@
 				this.$util.modal('','此商品的价格有变化,原来的购买价已不适用','知道了','',false,() =>{})
 			},
 			btnClick() {
-				this.$api.switchTabTo('/pages/tabBar/cart/cart')
+				this.$api.navigateTo('/pages/goods/cart')
 			},
 			btnTouchstart() {
 				// console.log('btnTouchstart');

pages/search/search-order.vue

@@ -649,8 +649,9 @@
 			width: 100%;
 			height: 40rpx;
 			float: left;
+			line-height: 40rpx;
 			.bage-buss{
-				display: block;
+				display: inline-block;
 				float: left;
 				width: 64rpx;
 				height: 30rpx;
@@ -660,10 +661,10 @@
 				font-size: $font-size-24;
 				text-align: center;
 				color: #FFFFFF;
-				margin-top: 10rpx;
+				margin-top: 7rpx;
 			}
 			.bage-auto{
-				display: block;
+				isplay: inline-block;
 				float: left;
 				width: 64rpx;
 				height: 30rpx;
@@ -673,7 +674,7 @@
 				font-size: $font-size-24;
 				text-align: center;
 				color: #FFFFFF;
-				margin-top: 10rpx;
+				margin-top: 7rpx;
 			}
 			.bage-text{
 				font-size: $font-size-28;

pages/tabBar/user/user.vue

@@ -329,7 +329,7 @@
 		},
 		onShow(){
 			if(this.hasLogin){
-				this.$api.getStorage().then((resolve) =>{
+				this.$api.getComStorage('userInfo').then((resolve) =>{
 					this.userID = resolve.userID
 					this.getUserInfo()
 				}).catch(reject =>{

pages/user/order/order-cashier.vue

@@ -89,7 +89,7 @@
 				}else{
 					this.orderNumber = data.data.orderNo
 					this.orderIdentification = data.data.orderMark
-					this.payableAmount = data.data.payableAmount
+					this.payableAmount = Number(data.data.payableAmount).toFixed(2)
 				}
 				this.$api.getStorage().then((resolve) => {
 					this.userID = resolve.userID;

pages/user/order/order-list.vue

@@ -541,9 +541,10 @@
 		.order-title-t{
 			width: 100%;
 			height: 40rpx;
+			line-height: 40rpx;
 			float: left;
 			.bage-buss{
-				display: block;
+				display: inline-block;
 				float: left;
 				width: 64rpx;
 				height: 30rpx;
@@ -553,10 +554,10 @@
 				font-size: $font-size-24;
 				text-align: center;
 				color: #FFFFFF;
-				margin-top: 10rpx;
+				margin-top: 7rpx;
 			}
 			.bage-auto{
-				display: block;
+				display: inline-block;
 				float: left;
 				width: 64rpx;
 				height: 30rpx;
@@ -566,7 +567,7 @@
 				font-size: $font-size-24;
 				text-align: center;
 				color: #FFFFFF;
-				margin-top: 10rpx;
+				margin-top: 7rpx;
 			}
 			.bage-text{
 				font-size: $font-size-28;