Merge branch 'master' of http://git.qiniu1314.com/cmy/xc

pages/user/user.vue

@@ -83,7 +83,7 @@
 					<image class="oitem-image" src="../../static/user/u1.png" mode=""></image>
 					<view class="oitem-font">我的好友</view>
 				</view>
-				<view class="oitem" @click="navTo('/pages/order/order?state=1')">
+				<view class="oitem" @click="openKf()">
 					<image class="oitem-image" src="../../static/user/u2.png" mode=""></image>
 					<view class="oitem-font">联系客服</view>
 				</view>
@@ -102,7 +102,11 @@
 				
 			</view>
 		</view>
-		
+		<uni-popup ref="popupkf" type="center">
+			<view class="popup-box">
+				
+			</view>
+		</uni-popup>
 	</view>
 </template>
 <script>
@@ -762,4 +766,10 @@
 			}
 		}
 	}
+	.popup-box {
+		background-image: url('../../static/user/tc.png');
+		width: 542rpx;
+		height: 647rpx;
+		background-size: 100% 100%;
+	}
 </style>