shish 3 лет назад
Родитель
Сommit
acaf8e9180
3 измененных файлов с 33 добавлено и 64 удалено
  1. 6 6
      ghsApp/src/admin/home/me.vue
  2. 21 47
      ghsApp/src/pagesStore/me/withdraw.vue
  3. 6 11
      hdApp/src/admin/home/me.vue

+ 6 - 6
ghsApp/src/admin/home/me.vue

@@ -42,9 +42,9 @@
               <view> <text>¥ </text> {{ shopInfo.balance||0 }} </view>
               <view>
                 可提现 ¥ {{ shopInfo.txBalance||0 }}
-                <text class="to-cash" @click="pageTo({ url: '/admin/shopYeChange/list' })" style="margin-left:30upx;">变动明细</text>
-                <text class="to-cash" @click="pageTo({ url: '/pagesStore/me/withdraw' })" style="margin-left:30upx;">提现记录</text>
-                <text v-if="shopInfo.txBalance > 0" @click="checkToApplyCash" class="to-cash" style="margin-left:30upx;">提现</text>
+                <text class="to-cash" @click="pageTo({ url: '/admin/shopYeChange/list' })">变动明细</text>
+                <text class="to-cash" @click="pageTo({ url: '/pagesStore/me/withdraw' })">提现记录</text>
+                <text class="to-cash" v-if="shopInfo.txBalance > 0" @click="checkToApplyCash">提现</text>
               </view>
             </view>
           </view>
@@ -57,8 +57,8 @@
               <view> <text>¥ </text> {{ shopInfo.money||0 }} </view>
               <view>
                 <text class="to-cash" @click="pageTo({ url: '/admin/shopMoneyChange/list' })" style="margin-left:0upx;">变动明细</text>
-                <text @click="outAmountFn" class="to-cash" style="margin-left:50upx;">取出</text>
-                <text @click="inAmountFn" class="to-cash" style="margin-left:50upx;">存入</text>
+                <text @click="outAmountFn" class="to-cash">取出</text>
+                <text @click="inAmountFn" class="to-cash">存入</text>
               </view>
             </view>
           </view>
@@ -514,7 +514,7 @@ export default {
       border-radius: 25upx;
     }
     & .to-cash {
-      margin-left: 20upx;
+      margin-left:30upx;
       border: 1upx solid rgba(0, 0, 0, 0.2);
       border-radius: 25upx;
       font-size: 22upx;

+ 21 - 47
ghsApp/src/pagesStore/me/withdraw.vue

@@ -3,23 +3,29 @@
 		<block v-if="!$util.isEmpty(list.data)">
 			<t-table :headerBackgroundColor="'#F0F2F6'">
 				<t-tr header>
-					<t-th v-for="(item, index) in columns" :key="index" :align="item.align">
-						{{ item.name }}
-					</t-th>
+					<t-th><view style="width:150upx;">申请时间</view></t-th>
+					<t-th>到账时间</t-th>
+					<t-th>提现</t-th>
+					<t-th>实到</t-th>
+					<t-th>状态</t-th>
 				</t-tr>
 				<t-tr v-for="(item, index) in list.data" :key="index">
-					<t-td v-for="(column, colIndex) in columns" :key="colIndex" :align="column.align" :color="column.color" >
-						<view>
-							{{ item[column.dataIndex] || "" }}
+					<t-td>
+						<view style="width:150upx;">
+							<view>{{item.addTime.substr(5,11)}}</view>
+							<view>{{item.ptStyle==1?'零售':'批发'}}</view>
 						</view>
-					</t-td>
+						</t-td>
+					<t-td> <view>{{item.updateTime.substr(5,11)}}</view> </t-td>
+					<t-td> <view>{{item.amount}}</view> </t-td>
+					<t-td> <view>{{item.beAmount}}</view> </t-td>
+					<t-td> <view>{{item.status==1?'处理中':item.status==2?'已提现':'失败'}}</view> </t-td>
 				</t-tr>
 			</t-table>
 		</block>
 		<block v-else>
 			<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 		</block>
-    <!-- <kd-entrance></kd-entrance> -->
 	</view>
 </template>
 
@@ -28,58 +34,26 @@ import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import { withdrawCashList } from '@/api/store'
 import list from '@/mixins/list'
 export default {
-	name: "withDraw", //提现记录
+	name: "withDraw",
 	components: {
 		AppWrapperEmpty
 	},
 	mixins:[list],
 	data() {
 		return {
-			columns: [
-				{
-					name: "时间",
-					dataIndex: "addTime",
-					color: "info",
-					align: "center"
-				},
-				{
-					name: "提现",
-					dataIndex: "amount",
-					color: "info",
-					align: "center"
-				},
-				{
-					name: "实收",
-					dataIndex: "beAmount",
-					color: "info",
-					align: "center"
-				},
-				{
-					name: "状态",
-					dataIndex: "statusText",
-					color: "info",
-					align: "center"
-				}
-			],
 		};
 	},
 	methods: {
 		async init(){
-			 uni.showLoading({
-                    title: '加载中'
-                });
-				try {
+			uni.showLoading({ title: '加载中' })
+			try {
 				const res = await withdrawCashList({
 					page:this.list.page
 				})
-				res.data.list  = res.data.list.map(i=>({
-					...i,
-					statusText: i.status ==1?'待处理':i.status ==2?'已完成':'未通过'				  
-				}))
-			   this.completes(res)
-              } finally {
-                 uni.hideLoading(); 
-              }
+				this.completes(res)
+            } finally {
+            	uni.hideLoading(); 
+        	}
 		}
 	},
 	async onPullDownRefresh() {

+ 6 - 11
hdApp/src/admin/home/me.vue

@@ -35,20 +35,15 @@
           <view class="info-lf_box">
             <view> 账户余额(元) </view>
             <view> <text>¥ </text> {{ shopInfo.balance||0 }} </view>
-            <view> 可提现 ¥ {{ shopInfo.txBalance||0 }} <text v-if="shopInfo.txBalance > 0" @click="checkToApplyCash" class="to-cash">提现</text> </view>
+            <view> 可提现 ¥ {{ shopInfo.txBalance||0 }}
+            <text class="to-cash" @click="pageTo({ url: '/pagesStore/me/shopYeChange' })">变动明细</text>
+            <text class="to-cash" @click="pageTo({ url: '/pagesStore/me/withdraw' })">提现记录</text>
+            <text v-if="shopInfo.txBalance > 0" @click="checkToApplyCash" class="to-cash">提现</text> </view>
           </view>
         </view>
         <view class="module-com content_box user-open_bx">
           <view class="input-line-wrap">
 
-            <tui-list-cell @click="pageTo({ url: '/pagesStore/me/shopYeChange' })" class="line-cell" :hover="false" :arrow="true" >
-                <view class="tui-title">余额明细</view>
-            </tui-list-cell>
-
-            <tui-list-cell @click="pageTo({ url: '/pagesStore/me/withdraw' })" class="line-cell" :hover="false" :arrow="true" >
-              <view class="tui-title">提现记录</view>
-            </tui-list-cell>
-
             <tui-list-cell @click="pageTo({ url: '/pagesStore/me/income' })" class="line-cell" :hover="false" :arrow="true" >
               <view class="tui-title">收入明细</view>
             </tui-list-cell>
@@ -449,12 +444,12 @@ export default {
       border-radius: 25upx;
     }
     & .to-cash {
-      margin-left: 20upx;
       border: 1upx solid rgba(0, 0, 0, 0.2);
       border-radius: 25upx;
       font-size: 22upx;
-      padding: 0 15upx 0 15upx;
+      padding: 6upx 17upx 6upx 17upx;
       box-sizing: border-box;
+      margin-left:30upx;
     }
   }
   & .user-open_bx {