Merge branch 'master' of http://47.98.226.240:3000/twt/wxThird

* 'master' of http://47.98.226.240:3000/twt/wxThird:
  首页修改
  22

# Conflicts:
#	pages/user/myOrder/mallOrderDetail.vue

pages/index/index.vue

@@ -646,6 +646,7 @@
 	.hotTop{
 		display: flex;
 		justify-content: space-between;
+		padding: 6rpx 0;
 	}
 	.hotSx{
 		width: 8rpx;

pages/shop/shop.vue

@@ -98,8 +98,7 @@
 				defaultpxActive:true,
 			}
 		},
-		onLoad() {
-			 
+		onLoad() {	 
 			this.userInfo = uni.getStorageSync("userInfo");
 			//this.getOrderTimes()
 			this.getcategoryList();

pages/user/myOrder/myOrder.vue

@@ -8,7 +8,7 @@
 			
 		</view>
 		<view class="main">
-			<view class="itemBg" v-for="(item,index) in items" @click="goDetail(item.ID)">
+			<view class="itemBg" v-for="(item,index) in items" @click="goDetail(item)">
 				<view class="itemTop">
 					<view style="itemType" v-if="item.SheetType==1">商城-商品订单</view>
 					<view style="itemType" v-if="item.SheetType==2">商城-项目订单</view>
@@ -27,8 +27,8 @@
 					<view class="shopName">{{item.SheetContent}}</view>
 					<view class="price">￥{{item.RealMoney}}</view>
 				</view>
-				<view class="itemName">{{item.CreateTime}}</view>
 
+				<view class="itemName">{{item.CreateTime}}</view>
 				
 
 			</view>
@@ -48,7 +48,7 @@
 			return {
 				page: 1,
 				tabIndex: '',
-				items: [],
+				items: [1,2,3],
 				isload: false,
 				 
 			}
@@ -76,11 +76,10 @@
 				this.page = 1;
 				this.getData()
 			},
-			goDetail(id) {
+			goDetail(item) {
 				uni.navigateTo({
+					url:"../../orderDetail/mallOrderDetail?id=" + item.id
 
-					url:"../../myOrder/mallOrderDetail?id=" + '123'
-					
 				})
 			},
 			getData() {
@@ -92,7 +91,6 @@
 					page: this.page,
 					limit: 10,
 					sheetState: this.tabIndex>0?this.tabIndex:''
-
 				}
 
 				this.$http('openOrderManagement/getOpenSheetList', padata, 'GET').then(res => {

pages/user/user.vue

@@ -257,6 +257,7 @@
 				});
 			},
 
+
 			goorder(num) {
 				uni.navigateTo({
 					url: './myOrder/mallOrderDetail'
@@ -266,6 +267,7 @@
 				// 	url: './myOrder/myOrder?num=' + num
 				// })
 			},
+			
 			queryMyDetail() {
 				uni.showLoading({
 					title: '加载中'
@@ -289,9 +291,9 @@
 			signOut() {
 				//uni.clearStorageSync();
 				uni.removeStorageSync('logodata');
-				uni.navigateTo({
-					url: '../login/login'
-				})
+				// uni.navigateTo({
+				// 	url: '../login/login'
+				// })
 			},
 
 		},