shish пре 6 година
родитељ
комит
2419d71369
3 измењених фајлова са 20 додато и 12 уклоњено
  1. 2 3
      saas/src/saas/shop/list.vue
  2. 11 9
      store/src/admin/home/console.vue
  3. 7 0
      store/src/api/merchant/index.js

+ 2 - 3
saas/src/saas/shop/list.vue

@@ -63,9 +63,8 @@
 
 
 			<!-- 平台帐号激活 -->
 			<!-- 平台帐号激活 -->
 			<template #slot-activation="{scope}">
 			<template #slot-activation="{scope}">
-				<el-button type="primary" size="mini" @click="bindJump(`/merchant/add-platform-merchant`)">公众号激活</el-button>
-
-				<el-button type="primary" size="mini" @click="bindJump(`/merchant/add-platform-merchant`)">小程序激活</el-button>
+				<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>
 			</template>
 			</template>
 
 
 			<template #slot-op-btn="{scope}">
 			<template #slot-op-btn="{scope}">

+ 11 - 9
store/src/admin/home/console.vue

@@ -2,23 +2,25 @@
   <view>加载中...</view>
   <view>加载中...</view>
 </template>
 </template>
 <script>
 <script>
+import { getMerchantDetail } from "@/api/merchant";
 export default {
 export default {
   name: "console",
   name: "console",
   data() {
   data() {
     return {};
     return {};
   },
   },
   onLoad() {
   onLoad() {
-    this.$util.pageTo({
-      url: "/admin/official/index",
-      type:2
-    }); 
+    getMerchantDetail({ id: this.option.id }).then(res => {
+      console.log(res.data)
+    });
+
+    
   },
   },
   methods: {
   methods: {
-    goTo(){
-    this.$util.pageTo({
-      url: "/admin/official/index",
-      type:2
-    });      
+    goTo() {
+      this.$util.pageTo({
+        url: "/admin/official/index",
+        type: 2
+      });
     }
     }
   }
   }
 };
 };

+ 7 - 0
store/src/api/merchant/index.js

@@ -0,0 +1,7 @@
+import https from '@/plugins/luch-request_0.0.7/request'
+/** *
+ * 商家信息
+ */
+export const getMerchantDetail = data => {
+	return https.get('/merchant/detail', data)
+}