Sfoglia il codice sorgente

完善续期支付的功能

wangn 5 anni fa
parent
commit
fba37a28e3

+ 6 - 2
ghsApp/src/admin/home/callback.vue

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

+ 0 - 1
ghsApp/src/admin/home/console.vue

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

+ 4 - 0
ghsApp/src/admin/home/me.vue

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

+ 0 - 7
ghsApp/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)
-}

+ 0 - 7
ghsApp/src/api/official/index.js

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

+ 1 - 1
ghsApp/src/pagesClient/official/renewal.vue

@@ -55,7 +55,7 @@ export default {
       this._getMealDet()
       this._getMealDet()
     },
     },
     _getMealDet() {
     _getMealDet() {
-      getMealDet({ id: 1 }).then(res => {
+      getMealDet().then(res => {
         if (this.$util.isEmpty(res.data)) {
         if (this.$util.isEmpty(res.data)) {
           return false;
           return false;
         }
         }

+ 0 - 1
ghsApp/src/pagesInvite/list.vue

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