Merge remote-tracking branch 'origin/dev' into dev

pages/order/orderAfterSales/index.rpx.css

@@ -59,12 +59,12 @@
 .goodsImage {
     width: 128rpx;
     height: 128rpx;
-    margin-right: 20rpx;
     border: 2rpx solid #FFFFFF;
 }
 
 .all-products-item-content {
     width: 562rpx;
+    padding-left: 20rpx;
 }
 
 

pages/users/user_address/index.vue

@@ -173,14 +173,14 @@ export default {
 			});
 			that.district[this.valueRegion[0]].c.forEach((item, i) => {
 				if (this.region[1] == item.c) {
-					this.valueRegio[1] = i
+					this.valueRegion[1] = i
 					this.multiIndex[1] = i
 				}
 				city.push(item.n);
 			});
 			that.district[this.valueRegion[0]].c[this.valueRegion[1]].c.forEach((item, i) => {
 				if (this.region[2] == item.c) {
-					this.valueRegio[2] = i
+					this.valueRegion[2] = i
 					this.multiIndex[2] = i
 				}
 				area.push(item.n);