Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pos-uni/pages/index/index.vue

pos-uni/pages/index/index.vue

@@ -20,7 +20,7 @@
 						</view>
 						<view class="">收款</view>
 					</view>
-					<view class="s-box" @click="goMemberRecharge()">
+					<view class="s-box" @click="goRecharge()">
 						<view class="">
 							<image src="/static/imgs/cz.png" mode=""></image>
 						</view>
@@ -110,6 +110,11 @@
 			tabbar
 		},
 		methods: {
+			goRecharge(){
+				uni.navigateTo({
+					url:"/pagesHome/MemberRecharge/MemberRecharge"
+				})
+			},
 			goCode() {
 				uni.navigateTo({
 					url: '/pagesHome/PaymentCode/PaymentCode'
@@ -123,7 +128,7 @@
 
 			goAdd() {
 				uni.navigateTo({
-					url: '/pagesHome/AddVip/AddCode'
+					url: '/pagesHome/AddVip/AddVip'
 				})
 			},
 			goCollection() {
@@ -141,11 +146,6 @@
 					url: '/pagesHome/BusinessData/BusinessData'
 				})
 			},
-			goMemberRecharge() {
-				uni.navigateTo({
-					url: '/pagesHome/MemberRecharge/MemberRecharge'
-				})
-			},
 			goback() {
 				uni.navigateBack()
 			},