Переглянути джерело

优化细节,去掉首页的箭头和默认填写提现金额

JXDS18FUJT 2 роки тому
батько
коміт
8d9b6beae8

+ 9 - 2
src/api/request.ts

@@ -13,7 +13,7 @@ request.interceptors.request.use(config => {
 
 	else {
 		config.headers["Authorization"] = token?"Bearer " + token:"";
-
+                                                                              
 	}
 	// 让每个请求携带自定义token 请根据实际情况自行修改
 	// config.headers["Authorization"]="Bearer " +token;
@@ -23,6 +23,7 @@ request.interceptors.request.use(config => {
 })
 request.interceptors.response.use((res: AxiosResponse<Common.Res>) => {
 	if (res && res.data) {
+
 		switch (res.data.code) {
 			case 200:
 				break;
@@ -42,18 +43,22 @@ request.interceptors.response.use((res: AxiosResponse<Common.Res>) => {
 							break;
 					}
 				}, 2000)
+				
 				break;
 			case 502:
+				console.log('进入502')
 				if (res.data.msg == "微信授权无效,请重新授权") {
 					location.replace("https://coach.zzxcx.net/")
 					return
 				}
 			
 				Toast.fail(res.data.msg)
+				
 
 				break;
 			default:
 				Toast.fail(res.data.msg)
+				
 				break;
 		}
 	}
@@ -61,7 +66,9 @@ request.interceptors.response.use((res: AxiosResponse<Common.Res>) => {
 	// console.log(res)
 
 	return res;
-});
+},(error=>{
+	
+}));
 
 export default request;
 

+ 15 - 8
src/components/m-nav-bar/index.vue

@@ -1,15 +1,15 @@
 <template>
   <div class="header" :class="{
-      'header-border-bottom':border
+    'header-border-bottom': border
   }" :style="background ? 'background:'+background : 'background: transparent;'">
     <!-- <m-icon type="fanhui" @click="onClickLeft" /> -->
     <div class="left">
-      <img v-if="mode=='black'" @click="onClickLeft" class="left-arrow" src="./leftArrow_black.png" />
-      <img v-if="mode=='white'" @click="onClickLeft" class="left-arrow" src="./leftArrow_white.png" />
+      <img v-opacity="!hiddenArrow" v-if="mode == 'black'"  @click="onClickLeft" class="left-arrow" src="./leftArrow_black.png" />
+      <img v-opacity="!hiddenArrow" v-if="mode == 'white'" @click="onClickLeft" class="left-arrow" src="./leftArrow_white.png" />
     </div>
 
     <span :style="{
-      color:mode
+      color: mode
     }" class="title">{{ title }}</span>
   </div>
 </template>
@@ -20,10 +20,14 @@ import { useRouter } from 'vue-router';
 const props = defineProps({
   title: String,
   border: Boolean,
-  background:String,
-  mode:{
-    type:String,
-    default:'black'
+  background: String,
+  hiddenArrow: {
+    type: Boolean,
+    default: false
+  },
+  mode: {
+    type: String,
+    default: 'black'
   }
 });
 const router = useRouter();
@@ -38,6 +42,7 @@ const onClickLeft = () => {
 
 
 }
+
 .header {
   position: sticky;
   top: 0;
@@ -45,10 +50,12 @@ const onClickLeft = () => {
   padding: 20px;
 
   z-index: 999;
+
   .left {
     width: 100%;
     display: flex;
     justify-content: flex-start;
+
     .left-arrow {
       width: 18px;
       height: 34px;

+ 20 - 13
src/views/cashout/index.vue

@@ -13,7 +13,7 @@
 				placeholder="请输入金额">
 				<template #button>
 					<span @click="() => {
-						amount = userInfo.profitPrice / 100
+						amount = String(userInfo.profitPrice / 100)
 					
 					}" class="font26" style="color:#498EF5">全部提现</span>
 				</template>
@@ -23,12 +23,13 @@
 
 			</van-field>
 			<div class="button">
-				<van-button @click="cashToWx" class="cash-button" color="#01C18D" round icon="wechat" type="primary">
-					提现到微信</van-button>
+
 				<van-button @click="() => {
 					cashToCardShow = true
 				}" class="cash-button" color="#498EF5" round icon="credit-pay" type="primary">提现到银行卡
 				</van-button>
+				<van-button @click="cashToWx" class="cash-button" color="#01C18D" round icon="wechat" type="primary">
+					提现到微信</van-button>
 			</div>
 			<van-dialog @confirm="cashToCard" v-model:show="cashToCardShow" title="银行卡信息" show-cancel-button>
 				<van-cell-group inset>
@@ -84,14 +85,14 @@ import { computed, defineComponent, reactive, ref, onMounted } from 'vue'
 import bgImgIcon from '@/assets/img/bgImg.png'
 import { useStore } from 'vuex'
 import api from '@/api'
-import { Dialog, Toast, PickerOption } from 'vant';
+import { Dialog, Toast } from 'vant';
 import WXBANKLIST from '@/assets/js/wxBankList';
 import { useRoute } from 'vue-router';
 export default defineComponent({
 	setup() {
 		const store = useStore()
 		const route = useRoute()
-		const amount = ref(0)
+		const amount = ref<string>('')
 		const userInfo = computed(() => {
 			return store.state.userInfo
 		})
@@ -121,19 +122,23 @@ export default defineComponent({
 
 		})
 		const cashToCard = () => {
-			if (amount.value < 0.3) {
+			if (Number(amount.value) < 0.3) {
 				Toast.fail('提现金额需要0.3元以上')
 
 				return
 			}
 
 			api.wx.studentWxExtractWxwithbankdrawal({
-				amount: amount.value * 100,
-				bankCode: bankCode.value,
+				amount: Number(amount.value) * 100,
+				bankCode: bankCode.value || 0,
 				encBankNo: encBankNo.value,
 				encTrueName: encTrueName.value
 
 			}).then(res => {
+				if (res.data.code !== 200) {
+					Toast.fail(res.data.msg)
+					return
+				}
 				Toast.success('提现成功,到账有延迟')
 				store.dispatch('getUserInfo');
 				api.wx.studentWxExtractlist({
@@ -154,18 +159,20 @@ export default defineComponent({
 		}
 		const cashToWx = () => {
 			Dialog.confirm({
-				title: '提现申请',
-				message:
-					'提现到微信',
+				title: '提现到微信',
 			})
 				.then(() => {
-					if (amount.value < 1) {
+					if (Number(amount.value) < 1) {
 						Toast.fail('提现金额需要大于1元')
 						return
 					}
 					api.wx.studentWxExtractWithdraw({
-						amount: amount.value * 100
+						amount: Number(amount.value) * 100
 					}).then(res => {
+						if (res.data.code !== 200) {
+							Toast.fail(res.data.msg)
+							return
+						}
 						Toast.success('提现成功,到账有延迟')
 						store.dispatch('getUserInfo');
 						api.wx.studentWxExtractlist({

+ 1 - 1
src/views/home/index.vue

@@ -2,7 +2,7 @@
     <div>
         <div class="bg">
         </div>
-        <m-nav-bar title="个人中心"></m-nav-bar>
+        <m-nav-bar :hiddenArrow="true" title="个人中心"></m-nav-bar>
         <div class="info">
             <div class="left">
                 <img class="head" :src="userInfo.headImage" />

+ 15 - 12
src/views/order/index.vue

@@ -1,27 +1,30 @@
 <template>
     <div>
         <m-nav-bar background="#498EF5" mode="white" title="订单列表"></m-nav-bar>
-        <van-calendar :max-date="maxDate" @confirm="setTimeRange" :min-date="minDate" v-model:show="calendarShow"
-            type="range" :round="false" position="bottom" />
-        <div class="calendar">
-            <van-icon @click="()=>{
-                calendarShow=true
+        <div>
+            <van-calendar :max-date="maxDate" @confirm="setTimeRange" :min-date="minDate" v-model:show="calendarShow"
+                type="range" :round="false" position="bottom" />
+            <div class="calendar">
+                <van-icon @click="() => {
+                    calendarShow = true
                 
-            }" size="32" name="notes-o" />
-            <span @click="resetTimeRange" class="text">重置</span>
+                }" size="32" name="notes-o" />
+                <span @click="resetTimeRange" class="text">重置</span>
+            </div>
         </div>
+
         <div class="list">
-            <div v-for="(item,index) in orderList" :key="index" class="item">
-                <div class="order-time">下单时间:{{item.successTime}}</div>
+            <div v-for="(item, index) in orderList" :key="index" class="item">
+                <div class="order-time">下单时间:{{ item.successTime }}</div>
                 <div class="order-border"></div>
-                <div class="order-name">{{item.goodsName}}</div>
+                <div class="order-name">{{ item.goodsName }}</div>
                 <div class="order-money">
-                    <span style="color:#FF4D53">预估佣金¥{{item.commissionPrice/100}}</span>
+                    <span style="color:#FF4D53">预估佣金¥{{ item.commissionPrice / 100 }}</span>
                     <span style="color:#8A9099">付款金额¥1.00</span>
                 </div>
                 <div class="order-border"></div>
                 <div class="order-code">
-                    <span class="text">订单编号:{{item.outTradeNo}}</span>
+                    <span class="text">订单编号:{{ item.outTradeNo }}</span>
                     <div @click="copyCode(item.outTradeNo)" class="copy">
                         复制
                     </div>