diff --git a/framework/0-conf.js b/framework/0-conf.js
index c290209..3b39958 100644
--- a/framework/0-conf.js
+++ b/framework/0-conf.js
@@ -16,10 +16,10 @@ const baseUrlwws = 'ws://cashier.sxczgkj.cn/cashierService'
 // #endif
 
 // #ifdef APP || MP-WEIXIN
-// const baseUrl = debug ? proxyApi : 'https://cashier.sxczgkj.cn/cashierService' // 线上、、
-// const baseUrlwws = debug ? proxyApiwws : 'wss://cashier.sxczgkj.cn/netty' // 线上 
-const baseUrl = 'https://cashier.sxczgkj.cn/cashierService' // 线上
-const baseUrlwws = 'wss://cashier.sxczgkj.cn/netty' // 线上/
+const baseUrl = debug ? proxyApi : 'https://cashier.sxczgkj.cn/cashierService' // 线上、、
+const baseUrlwws = debug ? proxyApiwws : 'wss://cashier.sxczgkj.cn/netty' // 线上 
+// const baseUrl = 'https://cashier.sxczgkj.cn/cashierService' // 线上
+// const baseUrlwws = 'wss://cashier.sxczgkj.cn/netty' // 线上/
 // #endif
 
 // import VConsole from "./vConsole.js"
diff --git a/pages.json b/pages.json
index 9ba0cc5..190de03 100644
--- a/pages.json
+++ b/pages.json
@@ -200,6 +200,13 @@
 		// 		"navigationBarTextStyle": "black"
 		// 	}
 		// },
+		{
+			"path": "pages/chooseasong/index",
+			"style": {
+				"navigationBarTitleText": "歌曲列表",
+				"navigationBarTextStyle": "black"
+			}
+		},
 		{
 			"path": "pages/user/address/index",
 			"style": {
diff --git a/pages/chooseasong/index.vue b/pages/chooseasong/index.vue
new file mode 100644
index 0000000..806a58f
--- /dev/null
+++ b/pages/chooseasong/index.vue
@@ -0,0 +1,36 @@
+<template>
+	<view class="content">
+		<view class="search flex-between">
+			<view class="">
+				
+			</view>
+			<image src="@/static/avatar.png" mode="aspectFill"></image>
+		</view>
+		<view class="contentclass">
+			
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {},
+		data() {
+			return {};
+		},
+		onLoad() {},
+		computed: {},
+		mounted() {},
+		onShow() {},
+		methods: {}
+	};
+</script>
+
+<style scoped lang="scss">
+	.content {
+		.search{
+			width: 100%;
+			background: #fff;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3b6b0d0..31b964b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -226,7 +226,7 @@
 
 
 				</view>
-				<indexs v-if="!showindex" :usershopUserinfo='usershopUserinfo'></indexs>
+				<indexs v-if="!showindex" :usershopUserinfo='usershopUserinfo' :userInfo='userInfo'></indexs>
 			</view>
 </template>
 <script>
@@ -252,6 +252,7 @@
 		data() {
 			return {
 				showindex: false,
+				userInfo:'',//个人信息
 				NAME: uni.cache.get('NAME'),
 				timersetInterval: '0', //定时器
 				isFixedTop: false, //吸顶是否显示
@@ -340,6 +341,7 @@
 				if (res.code == 0) {
 					this.usershopUserinfo = res.data
 				}
+				this.loginwxuserInfo()  //个人信息接口
 			} else {
 				uni.getLocation({
 					type: 'wgs84',
@@ -391,6 +393,16 @@
 			}
 		},
 		methods: {
+			// 个人信息
+			async loginwxuserInfo() {
+				let res = await this.api.loginwxuserInfo({
+					userId: uni.cache.get('userInfo').id
+				})
+				if (res.code == 0) {
+					uni.cache.set('userInfo', res.data);
+					this.userInfo = uni.cache.get('userInfo')
+				}
+			},
 			closeproductlist() {
 				this.showproductlist = false
 				// console.log('close');
diff --git a/pages/index/indexs.vue b/pages/index/indexs.vue
index 84889e2..f91a50e 100644
--- a/pages/index/indexs.vue
+++ b/pages/index/indexs.vue
@@ -33,12 +33,12 @@
 				</view>
 				<view class="towcontentitem flex-colum" @click="scanCodehandle(1)">
 					<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/index/takeaway.png" mode="widthFix"
-						style="width: 128.05rpx; height: 120.41rpx;"></image>
-					<text class="towcontentitemtext">点个外卖</text>
+						style="width: 164rpx; height: 164rpx"></image>
+					<text class="towcontentitemtext">会员充值</text>
 				</view>
 			</view>
 			<view class="footer-banner">
-			<!-- 	<u-swiper :list="footerBanners" radius="20" height="274" :indicator="banners.length > 1"
+				<!-- 	<u-swiper :list="footerBanners" radius="20" height="274" :indicator="banners.length > 1"
 					imgMode="widthFix"></u-swiper> -->
 			</view>
 		</view>
@@ -52,7 +52,6 @@
 			return {
 				banners: ['https://czg-qr-order.oss-cn-beijing.aliyuncs.com/index/banner1.png'],
 				footerBanners: ['https://czg-qr-order.oss-cn-beijing.aliyuncs.com/index/footer_banner1.png'],
-				userInfo: uni.cache.get('userInfo'),
 			};
 		},
 		props: {
@@ -60,11 +59,17 @@
 				type: Object,
 				default () {
 					return {
-						amount:'',
+						amount: '',
 						shopName: ""
 					}
 				}
 			},
+			userInfo: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
 		},
 		methods: {
 			scanCodehandle(i) {
@@ -88,9 +93,13 @@
 					// url:'/pages/order_food/order_food'
 					// })
 				} else {
-					uni.showToast({
-						title: '此店铺暂未开通外卖',
-						icon: 'none'
+					// uni.pro.navigateTo('pay_code/pay_code?shopInfo=', {
+					// 	shopName: this.usershopUserinfo.shopName,
+					// 	amount: this.usershopUserinfo.amount,
+					// 	shopId: uni.cache.get('shopUser')
+					// })
+					uni.pro.navigateTo('member/memberdetails', {
+						shopId_id: uni.cache.get('shopUser'),
 					})
 				}
 			},
@@ -167,7 +176,7 @@
 
 		.after {
 			position: absolute;
-			top:46rpx;
+			top: 46rpx;
 			right: 0;
 			width: 40rpx;
 			height: 40rpx;
diff --git a/pages/member/components/card.vue b/pages/member/components/card.vue
index d81f118..1dbae69 100644
--- a/pages/member/components/card.vue
+++ b/pages/member/components/card.vue
@@ -3,7 +3,7 @@
 		<view class="towcontentitemone flex-start">
 			<image class="towcontentitemoneimage" :src="userInfo.logo" mode="aspectFill"></image>
 			<view class="towcontentitemonetext flex-colum-start">
-				<text class="towcontentitemonetextone">{{userInfo.chainName || '暂无昵称'}}</text>
+				<text class="towcontentitemonetextone">{{userInfo.shopName || '暂无昵称'}}</text>
 			</view>
 		</view>
 		<view class="towcontentitemthere flex-start">