shish 6 лет назад
Родитель
Сommit
aa629202b1

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
saas/dist/saas/css/chunk-3682cc39.66e9561c.css


+ 1 - 1
saas/dist/saas/index.html

@@ -43,4 +43,4 @@
 			.once .sub-title {
 				color: #ababab;
 				font-size: 12px;
-			}</style><link href=/css/app.6f07e55a.css rel=preload as=style><link href=/css/chunk-libs.14efb97a.css rel=preload as=style><link href=/js/app.cd390044.js rel=preload as=script><link href=/js/chunk-libs.3aaf2719.js rel=preload as=script><link href=/css/chunk-libs.14efb97a.css rel=stylesheet><link href=/css/app.6f07e55a.css rel=stylesheet></head><body><noscript></noscript><div id=app><div class=once><div class=container><div class=title>正在加载资源</div><div class=sub-title>初次加载资源可能需要较多时间 请耐心等待</div></div><div class=footer><a href=https://www.baidu.com/ target=_blank>花卉宝</a></div></div></div><script src=/cdn/vue/2.6.10/vue.min.js></script><script src=/cdn/vue-router/3.1.3/vue-router.min.js></script><script src=/cdn/vuex/3.1.1/vuex.min.js></script><script src=/cdn/clipboard.js/2.0.4/clipboard.min.js></script><script src=/cdn/axios/0.19.0-beta.1/axios.min.js></script><script src=/cdn/nprogress/0.2.0/nprogress.min.js></script><script src=/cdn/Mock.js/1.0.1-beta3/mock-min.js></script><script src=/cdn/quill/2.0.0-dev.3/quill.min.js></script><script src=/cdn/element-ui/2.13.0/index.js></script><script src=/cdn/viewerjs/1.3.7/viewer.min.js></script><script src=/cdn/echarts/4.4.0-rc.1/echarts.min.js></script><script src=/cdn/npm/vue-echarts@4.0.2.js></script><script src=/js/chunk-libs.3aaf2719.js></script><script src=/js/app.cd390044.js></script></body></html>
+			}</style><link href=/css/app.6f07e55a.css rel=preload as=style><link href=/css/chunk-libs.14efb97a.css rel=preload as=style><link href=/js/app.f27e7697.js rel=preload as=script><link href=/js/chunk-libs.3aaf2719.js rel=preload as=script><link href=/css/chunk-libs.14efb97a.css rel=stylesheet><link href=/css/app.6f07e55a.css rel=stylesheet></head><body><noscript></noscript><div id=app><div class=once><div class=container><div class=title>正在加载资源</div><div class=sub-title>初次加载资源可能需要较多时间 请耐心等待</div></div><div class=footer><a href=https://www.baidu.com/ target=_blank>花卉宝</a></div></div></div><script src=/cdn/vue/2.6.10/vue.min.js></script><script src=/cdn/vue-router/3.1.3/vue-router.min.js></script><script src=/cdn/vuex/3.1.1/vuex.min.js></script><script src=/cdn/clipboard.js/2.0.4/clipboard.min.js></script><script src=/cdn/axios/0.19.0-beta.1/axios.min.js></script><script src=/cdn/nprogress/0.2.0/nprogress.min.js></script><script src=/cdn/Mock.js/1.0.1-beta3/mock-min.js></script><script src=/cdn/quill/2.0.0-dev.3/quill.min.js></script><script src=/cdn/element-ui/2.13.0/index.js></script><script src=/cdn/viewerjs/1.3.7/viewer.min.js></script><script src=/cdn/echarts/4.4.0-rc.1/echarts.min.js></script><script src=/cdn/npm/vue-echarts@4.0.2.js></script><script src=/js/chunk-libs.3aaf2719.js></script><script src=/js/app.f27e7697.js></script></body></html>

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
saas/dist/saas/js/app.f27e7697.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
saas/dist/saas/js/chunk-28ce9c4e.101b77eb.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
saas/dist/saas/js/chunk-3682cc39.6a959860.js


+ 31 - 15
saas/src/saas/shop/list.vue

@@ -48,6 +48,14 @@
 					<el-button v-else type="text" @click="bindJump(`/wx-open/begin-auth?id=${scope.row.id}`)">待绑定</el-button>
 				</div>
 			</template>
+			<template #table-column-expericeCode="{scope}">
+				<div class="pay on">
+					<el-button
+						type="text"
+						@click="bindJump(`/wx-open/bind-open?merchantId=${scope.row.id}&id=6`)"
+					>查看</el-button>
+				</div>
+			</template>
 
 			<!-- 小程序 -->
 			<template #table-column-miniAppId="{scope}">
@@ -65,7 +73,11 @@
 			<template #slot-activation="{scope}">
 				<el-button type="primary" size="mini" @click="bindJump(`/wx-open/begin-auth?authType=1`)">公众号激活</el-button>
 				<el-button type="primary" size="mini" @click="bindJump(`/wx-open/begin-auth?authType=2`)">小程序激活</el-button>
-				<el-button type="primary" size="mini" @click="bindJump(`/wx-open/bind-open?isOpen=1&id=6`)">小程序体验码</el-button>
+				<el-button
+					type="primary"
+					size="mini"
+					@click="bindJump(`/wx-open/bind-open?isOpen=1&id=6`)"
+				>小程序体验码</el-button>
 			</template>
 
 			<template #slot-op-btn="{scope}">
@@ -136,11 +148,11 @@ export default {
 			plamPayType: 1,
 			form: {},
 			rule: {},
-			wxOpen:{wx_mini_base_id:0,wx_base_id:0},
+			wxOpen: { wx_mini_base_id: 0, wx_base_id: 0 }
 		};
 	},
 	mounted() {
-		this.getWxOpen()
+		this.getWxOpen();
 	},
 	methods: {
 		wxPayConfigFn() {},
@@ -149,19 +161,17 @@ export default {
 			let host = `http://api.saas.${getFirstHost()}.com`;
 			window.open(host + url);
 		},
-		getWxOpen(){
-			this.wxOpen = this.$service.saasWxOpen.getWxOpen()
-			console.log(this.wxOpen)
+		getWxOpen() {
+			this.wxOpen = this.$service.saasWxOpen.getWxOpen();
+			console.log(this.wxOpen);
 		},
 		// crud
 		onLoad({ ctx, app }) {
-			
-
 			this.app = app;
 			let applyHost = () => {
 				return this.$service.saasShop.merchantList();
 			};
-			
+
 			ctx.service({
 				page: applyHost
 			})
@@ -202,13 +212,13 @@ export default {
 							prop: 'wxPayInit',
 							label: '微信支付',
 							align: 'center',
-							'min-width': '120px'
+							'min-width': '100px'
 						},
 						{
 							prop: 'aliPayInit',
 							label: '支付宝支付',
 							align: 'center',
-							'min-width': '120px'
+							'min-width': '110px'
 						},
 						{
 							prop: 'adminName',
@@ -219,7 +229,7 @@ export default {
 							prop: 'openAppId',
 							label: '平台',
 							align: 'center',
-							'min-width': '120px',
+							'min-width': '100px',
 							formatter: row => {
 								switch (row.extend.openAppBind) {
 									case '0':
@@ -237,19 +247,25 @@ export default {
 							prop: 'wxAppId',
 							label: '公众号',
 							align: 'center',
-							'min-width': '120px'
+							'min-width': '100px'
 						},
 						{
 							prop: 'miniAppId',
 							label: '小程序',
 							align: 'center',
-							'min-width': '120px'
+							'min-width': '100px'
 						},
 						{
 							prop: 'miniVersion',
 							label: '小程序版本',
 							align: 'center',
-							'min-width': '120px'
+							'min-width': '100px'
+						},
+						{
+							prop: 'expericeCode',
+							label: '体验码',
+							align: 'center',
+							'min-width': '100px'
 						},
 						{
 							prop: 'setName',

Некоторые файлы не были показаны из-за большого количества измененных файлов