shish 6 жил өмнө
parent
commit
0a6a06f416

+ 5 - 4
saas/src/cool/request/index.js

@@ -1,5 +1,7 @@
 import Vue from 'vue';
 import Vue from 'vue';
 
 
+//不要在这里引入方法,请在各vue文件里按需引入方法!!!!!!!!!!!!!!!!!!!!!!
+
 import common from '@/service/common/index';
 import common from '@/service/common/index';
 import system from '@/service/system/index';
 import system from '@/service/system/index';
 import test from '@/service/test/index';
 import test from '@/service/test/index';
@@ -18,7 +20,9 @@ import single from '@/service/single/index';
 import setting from '@/service/setting/index';
 import setting from '@/service/setting/index';
 import workbench from '@/service/workbench/index';
 import workbench from '@/service/workbench/index';
 import auth from '@/service/auth/index';
 import auth from '@/service/auth/index';
-// saas
+
+//不要在这里引入方法,请在各vue文件里按需引入方法!!!!!!!!!!!!!!!!!!!!!!
+
 import saasShop from '@/service/saas/shop/index';
 import saasShop from '@/service/saas/shop/index';
 import saasOrder from '@/service/saas/order/index';
 import saasOrder from '@/service/saas/order/index';
 import saasMember from '@/service/saas/member/index';
 import saasMember from '@/service/saas/member/index';
@@ -53,7 +57,6 @@ export function SET_SERVICE({ store }) {
 		setting,
 		setting,
 		workbench,
 		workbench,
 		auth,
 		auth,
-		// saas
 		saasShop,
 		saasShop,
 		saasOrder,
 		saasOrder,
 		saasMember,
 		saasMember,
@@ -67,6 +70,4 @@ export function SET_SERVICE({ store }) {
 
 
 	Vue.prototype.$service = modules;
 	Vue.prototype.$service = modules;
 	store.$service = modules;
 	store.$service = modules;
-
-	console.log('1111111');
 }
 }

+ 16 - 9
saas/src/saas/shop/list.vue

@@ -30,6 +30,9 @@
 					<el-button type="text" @click="payOption(2, scope.row)">配置</el-button>
 					<el-button type="text" @click="payOption(2, scope.row)">配置</el-button>
 				</div>
 				</div>
 			</template>
 			</template>
+			<template #table-column-h5Mall="{scope}">
+				<el-button type="text" @click="getH5MallQrCode(scope.row.id)">查看</el-button>
+			</template>
 
 
 			<!-- 公众号 -->
 			<!-- 公众号 -->
 			<template #table-column-wxAppId="{scope}">
 			<template #table-column-wxAppId="{scope}">
@@ -127,6 +130,7 @@
 
 
 <script>
 <script>
 import { getFirstHost } from '@/cool/utils';
 import { getFirstHost } from '@/cool/utils';
+import MerchantService from '@/service/merchant/index';
 
 
 export default {
 export default {
 	data() {
 	data() {
@@ -211,9 +215,10 @@ export default {
 							'min-width': '110px'
 							'min-width': '110px'
 						},
 						},
 						{
 						{
-							prop: 'adminName',
-							label: '店长',
-							align: 'center'
+							prop: 'h5Mall',
+							label: 'H5商城',
+							align: 'center',
+							'min-width': '100px'
 						},
 						},
 						{
 						{
 							prop: 'openAppId',
 							prop: 'openAppId',
@@ -245,12 +250,6 @@ export default {
 							align: 'center',
 							align: 'center',
 							'min-width': '100px'
 							'min-width': '100px'
 						},
 						},
-						{
-							prop: 'miniVersion',
-							label: '小程序版本',
-							align: 'center',
-							'min-width': '100px'
-						},
 						{
 						{
 							prop: 'expericeCode',
 							prop: 'expericeCode',
 							label: '体验码',
 							label: '体验码',
@@ -344,6 +343,14 @@ export default {
 			let formNamed = formName || 'form';
 			let formNamed = formName || 'form';
 			this.$refs[formNamed].resetFields();
 			this.$refs[formNamed].resetFields();
 			this.wxPayDialog = false;
 			this.wxPayDialog = false;
+		},
+		getH5MallQrCode(id) {
+			MerchantService.getH5MallQrCode(1).then(res=>{
+				console.log(res)
+			})
+			this.$alert('<strong>这是 <i>HTML</i> 片段</strong>', 'H5商城', {
+				dangerouslyUseHTMLString: true
+			});
 		}
 		}
 	}
 	}
 };
 };

+ 10 - 0
saas/src/service/merchant/index.js

@@ -0,0 +1,10 @@
+import { BaseService, Service } from '@/cool';
+export class MerchantService extends BaseService {
+    getH5MallQrCode(data) {
+        return this.request({
+            url: '/merchant/get-h5-mall-qr-code',
+            params: data
+        });
+    }
+}
+export default new MerchantService();