完善续期支付的流程

hdApp/src/admin/home/callback.vue

@@ -2,22 +2,26 @@
 <!-- icondaizhifu -->
 	<appResult :title="'充值成功'">
     <view class="yourAccount">你的账号已延长至</view>
-    <view class="dateLengthen">2021-05-14</view>
+    <view class="dateLengthen">{{userInfo.deadline}}</view>
 		<button class="admin-button-com big" @click="back">返回管理中心</button>
 	</appResult>
 </template>
 
 <script>
 import appResult from "@/components/app-result";
+import { mapGetters, mapState } from 'vuex'
 export default {
 	name: "BillingResult", // 开单结果
 	components: {
 		appResult
 	},
+  computed: {
+		...mapGetters({ userInfo: "getUser"})
+	},
   methods: {
     back() {
-      this.pageTo({url:'/admin/home/me', type: 3})
-    }
+      this.pageTo({url:'/admin/home/me', type: 4, queyr: {refresh: '1'}})
+    },
   }
 };
 </script>

hdApp/src/admin/home/console.vue

@@ -3,7 +3,6 @@
   </view>
 </template>
 <script>
-import { getMerchantDetail } from "@/api/merchant";
 export default {
   name: "console",
   data() {

hdApp/src/admin/home/me.vue

@@ -169,6 +169,10 @@ export default {
   },
   onShow () {
     // this.init()
+    if(uni.getStorageSync('switchTabQuery').refresh == '1') {
+      this.init()
+      uni.removeStorageSync('switchTabQuery')
+    }
   },
   methods: {
     shopShow () {

hdApp/src/admin/recharge/rechargeSuccess.vue

@@ -6,7 +6,7 @@
         <view :class="['iconfont', 'iconchenggong']"></view>
         <view class="result-title">充值成功</view>
         <view class="account">你的账号已延长至</view>
-        <view class="account">{{deadline}}</view>
+        <view class="account">{{userInfo.deadline}}</view>
         <view
           class="close_btn"
           @click="goClose"
@@ -17,17 +17,18 @@
 </template>
 
 <script>
-import { getMerchantDetail } from '@/api/merchant/index'
+import { mapGetters } from 'vuex'
 export default {
   name: "AppResult",
   data () {
     return {
-      deadline: ''
     }
   },
   mounted() {
-    this.getData()
   },
+  computed: {
+		...mapGetters({ userInfo: "getUser"})
+	},
   methods: {
     goClose () {
       this.$util.pageTo({
@@ -35,12 +36,6 @@ export default {
         type: 4
       })
     },
-    getData () {
-      getMerchantDetail().then(res => {
-        console.log('res', res)
-        this.deadline = res.data.deadline
-      }).catch(err => { console.log(err) })
-    }
   }
 };
 </script>

hdApp/src/api/merchant/index.js

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

hdApp/src/api/official/index.js

@@ -21,13 +21,6 @@ export const applyStatus = data => {
 	return https.get('/apply/apply-status', data)
 }
 
-/** *
- * 商家信息 介绍人 w
- */
-export const merchantDet = data => {
-	return https.get('/merchant/detail', data)
-}
-
 /** *
  * 申请试用 w
  */

hdApp/src/pagesClient/official/renewal.vue

@@ -64,14 +64,14 @@ export default {
       });
     },
     wxPay() {
-      renewWxPay({setId: '1'}).then(res => {
+      renewWxPay().then(res => {
         wexinPay(res.data, this.paySuccess, this.payFail)
       })
     },
     // 支付成功
     paySuccess() {
       this.$util.pageTo({
-        url: "/official/callback",
+        url: "/admin/home/callback",
         type: 2
       });
     },

hdApp/src/pagesInvite/list.vue

@@ -57,7 +57,6 @@
 import Tabs from "@/components/plugin/tabs";
 import InviteItem from "./inviteItem";
 import { appyleListApi,getWeixinId } from "@/api/invite/index";
-// import { getMerchantDetail } from "@/api/merchant/index";
 import { list } from "@/mixins";
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import AppAvatarModule from "@/components/module/app-avatar";