文字修改

mall/src/pages/home/user.vue

@@ -61,18 +61,13 @@
 					<button class="button-com" v-if="shopUser.subscribe != 1 || !shopUser.mobile" @click="showPopup">申请会员</button>
 					<!-- <button class="button-com" v-if="shopUser.isFull != 1" @click="showPopup">申请会员</button> -->
 					<!-- <button class="button-com mini-btn" open-type="getUserInfo" v-if="loginInfo.isFull != 1" @getuserinfo="getWxAvatar">申请会员</button> -->
-					<button class="button-com" @click="pageToFn({
-					url: '/pages/pay/index',
-					query: {
-						pageStatus: 'recharge'
-					}
-				})">充值</button>
+					<!--<button class="button-com" @click="pageToFn({url: '/pages/pay/index',query: {pageStatus: 'recharge'}})">充值</button>-->
 					<button class="button-com red" @click="pageToFn({
 					url: '/pages/pay/index',
 					query: {
 						pageStatus: 'payment'
 					}
-				})">付款</button>
+				})">快速付款</button>
 				</div>
 			</div>
 		</template>

shop/src/service/shop/index.js

@@ -5,12 +5,16 @@ import store from '@/store';
 @Service('shop')
 export class LevelService extends BaseService {
 	downloadGatheringCode(id) {
-		return baseUrl + `/shop/download-gathering-code?id=${id}&token=${store.state.user.token}`;
+		return baseUrl + `/shop/gathering-code?id=${id}&token=${store.state.user.token}`;
+	}
+
+	downloadGatheringMiniCode(id) {
+		return baseUrl + `/shop/gathering-mini-code?id=${id}&token=${store.state.user.token}`;
 	}
 
 	downloadApplyMemberCode(id) {
 		return (
-			baseUrl + `/shop/download-apply-member-code?id=${id}&token=${store.state.user.token}`
+			baseUrl + `/shop/apply-member-code?id=${id}&token=${store.state.user.token}`
 		);
 	}
 }

shop/src/views/shop/list.vue

@@ -4,19 +4,21 @@
 			<template #table-column-gatheringCode="{scope}">
 				<el-link
 					type="primary"
-					v-if="shopInfo.extend.wxPayInit == '1'"
 					@click="download('gatheringCode', scope.row.id)"
-					>下载</el-link
-				>
+				>下载</el-link>
+			</template>
+			<template #table-column-gatheringMiniCode="{scope}">
+				<el-link
+					type="primary"
+					@click="download('gatheringMiniCode', scope.row.id)"
+				>下载</el-link>
 			</template>
 
 			<template #table-column-applyMemberCode="{scope}">
 				<el-link
 					type="primary"
-					v-if="shopInfo.extend.miniAuth == '1'"
 					@click="download('applyMemberCode', scope.row.id)"
-					>下载</el-link
-				>
+				>下载</el-link>
 			</template>
 
 			<template #slot-top-add>
@@ -113,12 +115,17 @@ export default {
 							align: 'center'
 						},
 						{
-							label: '收款码',
+							label: '微信支付宝收款',
 							prop: 'gatheringCode',
 							align: 'center'
 						},
 						{
-							label: '注册会员码',
+							label: '小程序收款',
+							prop: 'gatheringMiniCode',
+							align: 'center'
+						},
+						{
+							label: '会员注册码',
 							prop: 'applyMemberCode',
 							align: 'center'
 						}
@@ -383,6 +390,8 @@ export default {
 				p = this.$service.shop.downloadGatheringCode(id);
 			} else if (key == 'applyMemberCode') {
 				p = this.$service.shop.downloadApplyMemberCode(id);
+			} else if(key == 'gatheringMiniCode'){
+				p = this.$service.shop.downloadGatheringMiniCode(id);
 			}
 
 			location.href = p;
@@ -401,6 +410,6 @@ export default {
 
 <style lang="stylus" scoped>
 .shop-list {
-    height 100%;
+  height: 100%;
 }
 </style>