7.19

pageC/accountBalance/accountBalance.vue

@@ -6,7 +6,7 @@
 
     <view class="mine-balance">
       <view class="title"> {{ i18n.myBalance }}（元） </view>
-      <view class="money"> 500.00 </view>
+      <view class="money"> {{ userInformation.balance }} </view>
       <view class="btn-list">
         <button class="withdrawal" @click="toWithdrawal">
           {{ i18n.withdrawal }}
@@ -45,23 +45,8 @@ export default {
   },
   data() {
     return {
-      moneyDetail: [
-        {
-          name: "充值",
-          time: "2024-1-1 09:34:31",
-          money: "+400",
-        },
-        {
-          name: "提现",
-          time: "2024-1-1 09:34:31",
-          money: "-400",
-        },
-        {
-          name: "充值",
-          time: "2024-1-1 09:34:31",
-          money: "+400",
-        },
-      ],
+      moneyDetail: [],
+      userInformation: {},
     };
   },
   computed: {
@@ -82,7 +67,7 @@ export default {
     //跳转明细页面
     toDetail() {
       uni.navigateTo({
-        url: "/pageC/balanceDetail/balanceDetail",
+        url: "/pageC/balanceDetail/balanceDetail?type=balance",
       });
     },
     //跳转充值页面
@@ -94,9 +79,28 @@ export default {
     //跳转提现页面
     toWithdrawal() {
       uni.navigateTo({
-        url: "/pageC/withdrawal/withdrawal",
+        url: "/pageC/withdrawal/withdrawal?type=balance",
       });
     },
+
+    //获取余额明细
+    getMoneyList() {
+      uni.$u.http
+        .get(`/api/finance?is_page=1&page=1&limit=10&account_type=balance`)
+        .then((res) => {
+          this.moneyDetail = res.data.slice(0, 3);
+        });
+    },
+    //获取余额
+    getUserInfo() {
+      uni.$u.http.get(`/api/member/info`).then((res) => {
+        this.userInformation = res;
+      });
+    },
+  },
+  mounted() {
+    this.getMoneyList();
+    this.getUserInfo();
   },
 };
 </script>

pageC/balanceDetail/balanceDetail.vue

@@ -1,86 +1,118 @@
 <template>
-	<view class="detail">
-		<!-- 顶部tab -->
-		<view class="tab">
-			<text :class="{'selected':selected == 1}" @click="swcthTab(1)">全部</text>
-			<text :class="{'selected':selected == 2}" @click="swcthTab(2)">收入</text>
-			<text :class="{'selected':selected == 3}" @click="swcthTab(3)">支出</text>
-		</view>
-		<!-- 顶部tab -->
-		
-		<view class="content">
-			<!-- 余额明细 -->
-			<MoneyDetail v-for="(item,index) in moneyDetail" :itemInfo="item" :key="index" />
-			<!-- 余额明细 -->
-		</view>
-	</view>
+  <view class="detail">
+    <!-- 顶部tab -->
+    <view class="tab">
+      <text :class="{ selected: selected == '' }" @click="swcthTab('')"
+        >全部</text
+      >
+      <text
+        :class="{ selected: selected == 'income' }"
+        @click="swcthTab('income')"
+        >收入</text
+      >
+      <text
+        :class="{ selected: selected == 'consume' }"
+        @click="swcthTab('consume')"
+        >支出</text
+      >
+    </view>
+    <!-- 顶部tab -->
+
+    <view class="content">
+      <!-- 余额明细 -->
+      <MoneyDetail
+        v-for="(item, index) in moneyDetail"
+        :itemInfo="item"
+        :key="index"
+      />
+      <!-- 余额明细 -->
+    </view>
+  </view>
 </template>
 
 <script>
-	import MoneyDetail from '../mineComponent/moneyDetail/index.vue'
-	export default {
-		components:{
-			MoneyDetail
-		},
-		data() {
-			return {
-				selected:1,//判断选中某个tab栏
-				//存放余额明细数据
-				moneyDetail: [{
-						name: '充值',
-						time: '2024-1-1 09:34:31',
-						money: '+400'
-					},
-					{
-						name: '提现',
-						time: '2024-1-1 09:34:31',
-						money: '-400'
-					},
-					{
-						name: '充值',
-						time: '2024-1-1 09:34:31',
-						money: '+400'
-					},
-				]
-			}
-		},
-		methods: {
-			swcthTab(num){
-				this.selected = num
-			}
-		}
-	}
+import MoneyDetail from "../mineComponent/moneyDetail/index.vue";
+export default {
+  components: {
+    MoneyDetail,
+  },
+  data() {
+    return {
+      selected: "", //判断选中某个tab栏
+      page: 1,
+      total: 0,
+      //存放余额明细数据
+      moneyDetail: [],
+      type: "",
+    };
+  },
+
+  onReachBottom() {
+    //商品总数量小于当前获取到的商品数量
+    if (this.total > this.moneyDetail.length) {
+      this.page++;
+      this.getMoneyList();
+    }
+  },
+  onLoad(options) {
+    this.type = options.type;
+  },
+  methods: {
+    swcthTab(num) {
+      this.selected = num;
+      this.getMoneyList(1);
+    },
+    //获取余额明细
+    getMoneyList(value) {
+      uni.$u.http
+        .get(
+          `/api/finance?is_page=1&page=${this.page}&limit=10&account_type=${this.type}&type=${this.selected}`
+        )
+        .then((res) => {
+          //判断是否为触底加载 不是直接赋值，是则连接两个数组,value存在则为筛选
+          if (this.moneyDetail.length == 0 || value) {
+            this.moneyDetail = res.data;
+          } else {
+            this.moneyDetail = this.moneyDetail.concat(res.data);
+          }
+          this.total = res.total;
+        });
+    },
+  },
+  mounted() {
+    this.getMoneyList();
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-.detail{
-	width: 100%;
-	height: 100vh;
-	background-color: #fff;
-	.tab{
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-		color: rgba(34, 34, 34, 0.6);
-		border-bottom: 1rpx solid rgba(0, 0, 0, 0.1);
-		height: 90rpx;
-	}
-	.selected{
-		color: #222;
-		font-weight: 600;
-		position: relative;
-	}
-	.selected::before{
-		content: '';
-		display: block;
-		height: 4rpx;
-		background-color: #f83224;
-		width: 100%;
-		position: absolute;
-		bottom: -24rpx;
-	}
-	.content{
-		padding: 0 32rpx;
-	}
+.detail {
+  width: 100%;
+  background-color: #fff;
+  .tab {
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    color: rgba(34, 34, 34, 0.6);
+    border-bottom: 1rpx solid rgba(0, 0, 0, 0.1);
+    height: 90rpx;
+  }
+  .selected {
+    color: #222;
+    font-weight: 600;
+    position: relative;
+  }
+  .selected::before {
+    content: "";
+    display: block;
+    height: 4rpx;
+    background-color: #f83224;
+    width: 100%;
+    position: absolute;
+    bottom: -24rpx;
+  }
+  .content {
+    padding: 0 32rpx;
+  }
 }
 </style>

pageC/ensureMoney/ensureMoney.vue

@@ -1,202 +1,229 @@
 <template>
-	<view class="balance">
-		<!-- 页面渐变色背景 -->
-		<view class="shadow">
-		</view>
-		<!-- 页面渐变色背景 -->
-
-		<view class="mine-balance">
-			<view class="title">
-				<text>我的保证金(元)</text>
-				<image src="../../static/mine/324.png" @click="toExplain" class="mine-324" mode=""></image>
-			</view>
-			<view class="money"> 500.00 </view>
-			<view class="btn-list">
-				<button class="withdrawal" @click="toWithdrawal">提现</button>
-				<button class="recharge" @click="toRecharge">充值</button>
-			</view>
-		</view>
-		<view class="money-detail">
-			<view class="money-title">
-				<text style="font-weight: 600;">保证金明细</text>
-				<AllRight name="全部" @toDetail='toDetail' />
-			</view>
-			<view class="">
-				<MoneyDetail v-for="(item,index) in moneyDetail" :itemInfo="item" :key="index" />
-			</view>
-		</view>
-		<view class="bottom-text">
-			没有更多数据了
-		</view>
-	</view>
+  <view class="balance">
+    <!-- 页面渐变色背景 -->
+    <view class="shadow"> </view>
+    <!-- 页面渐变色背景 -->
+
+    <view class="mine-balance">
+      <view class="title">
+        <text>我的保证金(元)</text>
+        <image
+          src="../../static/mine/324.png"
+          @click="toExplain"
+          class="mine-324"
+          mode=""
+        ></image>
+      </view>
+      <view class="money"> {{ userInformation.deposit }} </view>
+      <view class="btn-list">
+        <button class="withdrawal" @click="toWithdrawal">提现</button>
+        <button class="recharge" @click="toRecharge">充值</button>
+      </view>
+    </view>
+    <view class="money-detail">
+      <view class="money-title">
+        <text style="font-weight: 600">保证金明细</text>
+        <AllRight name="全部" @toDetail="toDetail" />
+      </view>
+      <view class="">
+        <MoneyDetail
+          v-for="(item, index) in moneyDetail"
+          :itemInfo="item"
+          :key="index"
+        />
+      </view>
+    </view>
+    <view class="bottom-text"> 没有更多数据了 </view>
+  </view>
 </template>
 
 <script>
-	import AllRight from '../mineComponent/allRight/allRight.vue';
-	import MoneyDetail from '../mineComponent/moneyDetail/index.vue'
-	export default {
-		components: {
-			AllRight,
-			MoneyDetail
-		},
-		data() {
-			return {
-				moneyDetail: [{
-						name: '充值',
-						time: '2024-1-1 09:34:31',
-						money: '+400'
-					},
-					{
-						name: '提现',
-						time: '2024-1-1 09:34:31',
-						money: '-400'
-					},
-					{
-						name: '充值',
-						time: '2024-1-1 09:34:31',
-						money: '+400'
-					},
-				]
-			};
-		},
-		created() {
-			uni.setNavigationBarColor({
-				frontColor: '#ffffff',
-				backgroundColor: '#f74639'
-			})
-		},
-		methods: {
-			//跳转明细页面
-			toDetail() {
-				uni.navigateTo({
-					url: '/pageC/balanceDetail/balanceDetail'
-				})
-			},
-			//跳转充值页面
-			toRecharge() {
-				uni.navigateTo({
-					url: '/pageD/ensureRecharge/ensureRecharge'
-				})
-			},
-			//跳转提现页面
-			toWithdrawal() {
-				uni.navigateTo({
-					url: '/pageC/withdrawal/withdrawal'
-				})
-			},
-			//跳转保证金说明
-			toExplain() {
-				uni.navigateTo({
-					url: "/pageC/ensureExplain/ensureExplain"
-				})
-			}
-		},
-	}
+import AllRight from "../mineComponent/allRight/allRight.vue";
+import MoneyDetail from "../mineComponent/moneyDetail/index.vue";
+export default {
+  components: {
+    AllRight,
+    MoneyDetail,
+  },
+  data() {
+    return {
+      moneyDetail: [
+        {
+          name: "充值",
+          time: "2024-1-1 09:34:31",
+          money: "+400",
+        },
+        {
+          name: "提现",
+          time: "2024-1-1 09:34:31",
+          money: "-400",
+        },
+        {
+          name: "充值",
+          time: "2024-1-1 09:34:31",
+          money: "+400",
+        },
+      ],
+      userInformation: {},
+    };
+  },
+  created() {
+    uni.setNavigationBarColor({
+      frontColor: "#ffffff",
+      backgroundColor: "#f74639",
+    });
+  },
+  methods: {
+    //跳转明细页面
+    toDetail() {
+      uni.navigateTo({
+        url: "/pageC/balanceDetail/balanceDetail?type=deposit",
+      });
+    },
+    //跳转充值页面
+    toRecharge() {
+      uni.navigateTo({
+        url: "/pageD/ensureRecharge/ensureRecharge",
+      });
+    },
+    //跳转提现页面
+    toWithdrawal() {
+      uni.navigateTo({
+        url: "/pageC/withdrawal/withdrawal?type=deposit",
+      });
+    },
+    //跳转保证金说明
+    toExplain() {
+      uni.navigateTo({
+        url: "/pageC/ensureExplain/ensureExplain",
+      });
+    },
+
+    //获取余额明细
+    getMoneyList() {
+      uni.$u.http
+        .get(`/api/finance?is_page=1&page=1&limit=10&account_type=deposit`)
+        .then((res) => {
+          this.moneyDetail = res.data.slice(0, 3);
+        });
+    },
+
+    //获取余额
+    getUserInfo() {
+      uni.$u.http.get(`/api/member/info`).then((res) => {
+        this.userInformation = res;
+      });
+    },
+  },
+  mounted() {
+    this.getMoneyList();
+    this.getUserInfo();
+  },
+};
 </script>
 
 <style lang="scss">
-	page {
-		background-color: "#f4f4f4";
-	}
-
-	.balance {
-		position: relative;
-		padding-top: 10px;
-
-		.shadow {
-			position: absolute;
-			top: 0;
-			height: 400px;
-			width: 100%;
-			background: -webkit-linear-gradient(#f74639, #f4f4f4);
-			/* Safari 5.1 - 6.0 */
-			background: -o-linear-gradient(#f74639, #f4f4f4);
-			/* Opera 11.1 - 12.0 */
-			background: -moz-linear-gradient(#f74639, #f4f4f4);
-			/* Firefox 3.6 - 15 */
-			background: linear-gradient(#f74639, #f4f4f4);
-			z-index: -1;
-		}
-
-		.mine-balance {
-			width: 96%;
-			margin: 0 auto;
-			background-color: #fff;
-			border-radius: 10px;
-			padding-top: 82rpx;
-			padding-bottom: 62rpx;
-
-			.title {
-				text-align: center;
-				font-size: 28rpx;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				color: #222;
-				height: 45prx;
-
-				.mine-324 {
-					width: 36rpx;
-					height: 36rpx;
-					margin-left: 10rpx;
-
-				}
-			}
-
-			.money {
-				font-size: 84rpx;
-				color: #222;
-				font-weight: 600;
-				text-align: center;
-				margin-top: 36rpx;
-			}
-
-			.btn-list {
-				display: flex;
-				justify-content: space-around;
-				margin-top: 76rpx;
-
-				.withdrawal {
-					width: 298rpx;
-					height: 88rpx;
-					background-color: rgba(248, 50, 36, 0.1);
-					border-radius: 44px;
-					color: #f83224;
-					font-size: 32rpx;
-				}
-
-				.recharge {
-					width: 298rpx;
-					height: 88rpx;
-					background-color: #f83224;
-					border-radius: 44px;
-					color: #fff;
-					font-size: 32rpx;
-					box-shadow: 0rpx 12rpx 28rpx -12rpx #f83224;
-				}
-			}
-		}
-
-		.money-detail {
-			background-color: #fff;
-			border-radius: 10px;
-			width: 88%;
-			margin: 10px auto;
-			padding: 0 28rpx;
-
-			.money-title {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				height: 108rpx;
-			}
-		}
-
-		.bottom-text {
-			text-align: center;
-			font-size: 24rpx;
-			color: #777;
-			margin-top: 44rpx;
-		}
-	}
-</style>
+page {
+  background-color: "#f4f4f4";
+}
+
+.balance {
+  position: relative;
+  padding-top: 10px;
+
+  .shadow {
+    position: absolute;
+    top: 0;
+    height: 400px;
+    width: 100%;
+    background: -webkit-linear-gradient(#f74639, #f4f4f4);
+    /* Safari 5.1 - 6.0 */
+    background: -o-linear-gradient(#f74639, #f4f4f4);
+    /* Opera 11.1 - 12.0 */
+    background: -moz-linear-gradient(#f74639, #f4f4f4);
+    /* Firefox 3.6 - 15 */
+    background: linear-gradient(#f74639, #f4f4f4);
+    z-index: -1;
+  }
+
+  .mine-balance {
+    width: 96%;
+    margin: 0 auto;
+    background-color: #fff;
+    border-radius: 10px;
+    padding-top: 82rpx;
+    padding-bottom: 62rpx;
+
+    .title {
+      text-align: center;
+      font-size: 28rpx;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      color: #222;
+      height: 45prx;
+
+      .mine-324 {
+        width: 36rpx;
+        height: 36rpx;
+        margin-left: 10rpx;
+      }
+    }
+
+    .money {
+      font-size: 84rpx;
+      color: #222;
+      font-weight: 600;
+      text-align: center;
+      margin-top: 36rpx;
+    }
+
+    .btn-list {
+      display: flex;
+      justify-content: space-around;
+      margin-top: 76rpx;
+
+      .withdrawal {
+        width: 298rpx;
+        height: 88rpx;
+        background-color: rgba(248, 50, 36, 0.1);
+        border-radius: 44px;
+        color: #f83224;
+        font-size: 32rpx;
+      }
+
+      .recharge {
+        width: 298rpx;
+        height: 88rpx;
+        background-color: #f83224;
+        border-radius: 44px;
+        color: #fff;
+        font-size: 32rpx;
+        box-shadow: 0rpx 12rpx 28rpx -12rpx #f83224;
+      }
+    }
+  }
+
+  .money-detail {
+    background-color: #fff;
+    border-radius: 10px;
+    width: 88%;
+    margin: 10px auto;
+    padding: 0 28rpx;
+
+    .money-title {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height: 108rpx;
+    }
+  }
+
+  .bottom-text {
+    text-align: center;
+    font-size: 24rpx;
+    color: #777;
+    margin-top: 44rpx;
+  }
+}
+</style>

pageC/mineComponent/moneyDetail/index.vue

@@ -1,63 +1,82 @@
 <template>
-	<view class="detail">
-		<view>
-			<view class="name">
-				{{itemInfo.name}}
-			</view>
-			<view class="time">
-				{{itemInfo.time}}
-			</view>
-			<view class="" v-if="withBool&&itemInfo.auditingStatus == 0" style="font-size: 24rpx;color: #f83224;">
-				驳回原因
-			</view>
-		</view>
-		<view class="">
-			<view style="font-weight: 600;">
-				{{itemInfo.money}}
-			</view>
-			<view class="auditing" v-if="withBool">
-				<text style="font-size: 24rpx;color: #f83224;" v-if="itemInfo.auditingStatus == 0">审核驳回</text>
-				<text style="font-size: 24rpx;color: #222;" v-else-if="itemInfo.auditingStatus == 1">审核中</text>
-				<text style="font-size: 24rpx;color: #33BD20;" v-else>审核通过</text>
-			</view>
-		</view>
-	</view>
+  <view class="detail">
+    <view>
+      <view class="name">
+        {{ itemInfo.type_name }}
+      </view>
+      <view class="time">
+        {{ itemInfo.created_at }}
+      </view>
+      <view
+        class=""
+        v-if="withBool && itemInfo.status == 'refused'"
+        style="font-size: 24rpx; color: #f83224; margin-top: 12rpx"
+      >
+        {{ itemInfo.remark }}
+      </view>
+    </view>
+    <view class="reason">
+      <view style="font-weight: 600">
+        {{ itemInfo.amount }}
+      </view>
+      <view class="auditing" v-if="withBool">
+        <text
+          style="font-size: 24rpx; color: #f83224"
+          v-if="itemInfo.status == 'refused'"
+          >审核驳回</text
+        >
+        <text
+          style="font-size: 24rpx; color: rgba(34, 34, 34, 0.6)"
+          v-else-if="itemInfo.status == 'apply'"
+          >审核中</text
+        >
+        <text style="font-size: 24rpx; color: #33bd20" v-else>审核通过</text>
+      </view>
+    </view>
+  </view>
 </template>
 
-
 <script>
-	export default {
-		props: {
-			itemInfo: {
-				type: Object,
-				default: {}
-			},
-			withBool:{
-				type:Boolean,
-				default:false
-			}
-		}
-	}
+export default {
+  props: {
+    itemInfo: {
+      type: Object,
+      default: {},
+    },
+    withBool: {
+      type: Boolean,
+      default: false,
+    },
+  },
+};
 </script>
 
 <style lang="scss">
-	.detail {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		height: 140rpx;
-		border-top: 2rpx solid rgba(151, 151, 151, 0.1);
+.detail {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  //   height: 140rpx;
+  padding: 24rpx 0;
+  //   border-top: 2rpx solid rgba(151, 151, 151, 0.2);
+  border-bottom: 2rpx solid rgba(151, 151, 151, 0.2);
 
-		.name {
-			font-size: 30rpx;
-			color: #222;
-		}
+  .name {
+    font-size: 30rpx;
+    color: #222;
+  }
 
-		.time {
-			font-size: 24rpx;
-			color: #222;
-			opacity: 0.6;
-			margin-top: 16rpx;
-		}
-	}
-</style>
+  .time {
+    font-size: 24rpx;
+    color: #222;
+    opacity: 0.6;
+    margin-top: 16rpx;
+  }
+  .reason {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: flex-end;
+  }
+}
+</style>

pageC/orderForm/component/orderInofrmation.vue

@@ -2,12 +2,8 @@
   <view class="detail" @click="$emit('toDetail', itemInfo)">
     <view class="title">
       <view class="title-left">
-        <image
-          class="header-img"
-          src="https://tse4-mm.cn.bing.net/th/id/OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA?rs=1&pid=ImgDetMain"
-          mode=""
-        ></image>
-        <text>{{ itemInfo.nickname }}</text>
+        <image class="header-img" :src="itemInfo.image" mode=""></image>
+        <text>{{ itemInfo.merchant_name }}</text>
         <image
           class="right-325"
           src="../../../static/mine/325.png"
@@ -20,26 +16,29 @@
         >{{ statusName }}</text
       >
     </view>
-    <view class="commodity-information">
+    <view
+      class="commodity-information"
+      v-for="item in itemInfo.order_goods"
+      :key="item.id"
+    >
       <view class="commodity-1">
-        <image
-          class="commodity-img"
-          src="https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/156939/24/43697/126104/6619de23F69802006/8432635baed61875.jpg.webp"
-          mode=""
-        ></image>
+        <image class="commodity-img" :src="item.goods_image" mode=""></image>
         <view class="">
           <view class="commodity-2">
-            <view class="commodity-title"> OATLY 噢麦力 醇香燕麦… </view>
+            <view class="commodity-title"> {{ item.goods.name_cn }} </view>
             <view class="commodity-price">
               <text style="font-size: 20rpx">￥</text>
-              <text>133</text>.
-              <text style="font-size: 20rpx">22</text>
+              <text>{{ item.goods.price.split(".")[0] }}</text
+              >.
+              <text style="font-size: 20rpx">{{
+                item.goods.price.split(".")[1]
+              }}</text>
             </view>
           </view>
 
           <view class="commodity-3">
-            <view class="specifications"> 【醇香】250ml*3 </view>
-            <view style="font-size: 24rpx"> x1 </view>
+            <view class="specifications"> {{ item.sku_item.item }} </view>
+            <view style="font-size: 24rpx"> x{{ item.goods_num }} </view>
           </view>
         </view>
       </view>

pageC/orderForm/orderForm.vue

@@ -59,7 +59,7 @@
           退款/售后
         </view>
       </view>
-      <view v-for="item in orderList" :key="item.id">
+      <view v-for="item in orderList">
         <view v-if="follow != 7">
           <OrderInofrmation
             :itemInfo="item"

pageC/recharge/recharge.vue

@@ -103,7 +103,6 @@ export default {
     //充值
     recharge() {
       let num = this.rmb == "" ? this.backgroundRed : this.rmb;
-
       uni.$u.http
         .post(`/api/recharge`, {
           account_type: "balance",

pageC/withdrawal/withdrawal.vue

@@ -1,113 +1,151 @@
 <template>
-	<view class="withdrawal">
-		<!-- 提现头部 -->
-		<view class="withdrawal-top">
-			<view class="title">
-				到账方式
-			</view>
-			<view class="wx">
-				<image src="../../static/mine/323.png" class="wx-logo" mode=""></image>
-				<text>微信余额</text>
-			</view>
-		</view>
-			<!-- 提现头部 -->
-		<view class="content">
-			<view class="money">
-				提现金额
-			</view>
-			<view class="inp">
-				<text>￥</text>
-				<input type="text" />
-				<text style="color: #f83224;">全部提现</text>
-			</view>
-			<text class="all-money">可提现金额￥345.00</text>
-			<button class="immediately">立即提现</button>
-			<view class="detail" @click="toWithdrawalDetail">
-				提现明细
-			</view>
-		</view>
-	</view>
+  <view class="withdrawal">
+    <!-- 提现头部 -->
+    <view class="withdrawal-top">
+      <view class="title"> 到账方式 </view>
+      <view class="wx">
+        <image src="../../static/mine/323.png" class="wx-logo" mode=""></image>
+        <text>微信余额</text>
+      </view>
+    </view>
+    <!-- 提现头部 -->
+    <view class="content">
+      <view class="money"> 提现金额 </view>
+      <view class="inp">
+        <text>￥</text>
+        <input type="number" v-model="money" />
+        <text style="color: #f83224" @click="whole">全部提现</text>
+      </view>
+      <text class="all-money" v-if="type == 'balance'"
+        >可提现金额￥{{ userInformation.balance }}</text
+      >
+      <text class="all-money" v-else
+        >可提现金额￥{{ userInformation.deposit }}</text
+      >
+      <button class="immediately" @click="immediatelyWithdrawal">
+        立即提现
+      </button>
+      <view class="detail" @click="toWithdrawalDetail"> 提现明细 </view>
+    </view>
+    <u-toast ref="uToast"></u-toast>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
+export default {
+  data() {
+    return {
+      money: "",
+      userInformation: {},
+      type: "",
+    };
+  },
+  onLoad(options) {
+    this.type = options.type;
+    if (options.type == "deposit") {
+      uni.setNavigationBarTitle({ title: "保证金提现" });
+    } else {
+      uni.setNavigationBarTitle({ title: "余额提现" });
+    }
+  },
+  methods: {
+    toWithdrawalDetail() {
+      uni.navigateTo({
+        url: "/pageC/withdrawalDetail/withdrawalDetail?type=" + this.type,
+      });
+    },
+    //立即提现
+    immediatelyWithdrawal() {
+      uni.$u.http
+        .post(`/api/withdraw`, { amount: this.money, account_type: this.type })
+        .then((res) => {
+          this.money = "";
+          this.getUserInfo();
+          this.$refs.uToast.show({
+            type: "default",
+            title: "默认主题",
+            message: "已提交提现申请",
+          });
+        });
+    },
 
-			}
-		},
-		methods: {
-			toWithdrawalDetail(){
-				uni.navigateTo({
-					url:"/pageC/withdrawalDetail/withdrawalDetail"
-				})
-			}
-		}
-	}
+    whole() {
+      this.money = this.userInformation.balance;
+    },
+    //获取余额
+    getUserInfo() {
+      uni.$u.http.get(`/api/member/info`).then((res) => {
+        this.userInformation = res;
+      });
+    },
+  },
+  mounted() {
+    this.getUserInfo();
+  },
+};
 </script>
 
 <style scoped lang="scss">
-	.withdrawal {
-		padding: 20rpx 24rpx 0;
-		
-		.withdrawal-top {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			height: 104rpx;
-			background-color: #fff;
-			border-radius: 16rpx;
-			padding: 0 24rpx;
-			.title {
-				font-size: 30rpx;
-			}
+.withdrawal {
+  padding: 20rpx 24rpx 0;
 
-			.wx {
-				display: flex;
-				align-items: center;
-				height: 50rpx;
-				.wx-logo {
-					width: 40rpx;
-					height: 40rpx;
-					margin-right: 10rpx;
-				}
-			}
-		}
-		.content{
-			background-color: #fff;
-			border-radius: 16rpx;
-			margin-top: 16rpx;
-			padding: 32rpx 24rpx 46rpx;
-			.money{
-				font-size: 30rpx;
-			}
-			.inp{
-				display: flex;
-				height: 110rpx;
-				align-items: center;
-				justify-content: space-between;
-				border-bottom: 2rpx solid rgba(151, 151, 151, 0.3);
-				margin-bottom: 18rpx;
-			}
-			.all-money{
-				font-size: 24rpx;
-				color: #555;
-			}
-			.immediately{
-				box-shadow: 0rpx 12rpx 28rpx -12rpx #F83224;
-				border-radius: 44rpx;
-				background-color: #F83224;
-				color: #fff;
-				margin-top: 60rpx;
-				margin-bottom: 60rpx;
-				
-			}
-			.detail{
-				text-align: center;
-				font-size: 26rpx;
-				opacity: 0.6;
-				color: #131415;
-			}
-		}
-	}
-</style>
+  .withdrawal-top {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    height: 104rpx;
+    background-color: #fff;
+    border-radius: 16rpx;
+    padding: 0 24rpx;
+    .title {
+      font-size: 30rpx;
+    }
+
+    .wx {
+      display: flex;
+      align-items: center;
+      height: 50rpx;
+      .wx-logo {
+        width: 40rpx;
+        height: 40rpx;
+        margin-right: 10rpx;
+      }
+    }
+  }
+  .content {
+    background-color: #fff;
+    border-radius: 16rpx;
+    margin-top: 16rpx;
+    padding: 32rpx 24rpx 46rpx;
+    .money {
+      font-size: 30rpx;
+    }
+    .inp {
+      display: flex;
+      height: 110rpx;
+      align-items: center;
+      justify-content: space-between;
+      border-bottom: 2rpx solid rgba(151, 151, 151, 0.3);
+      margin-bottom: 18rpx;
+    }
+    .all-money {
+      font-size: 24rpx;
+      color: #555;
+    }
+    .immediately {
+      box-shadow: 0rpx 12rpx 28rpx -12rpx #f83224;
+      border-radius: 44rpx;
+      background-color: #f83224;
+      color: #fff;
+      margin-top: 60rpx;
+      margin-bottom: 60rpx;
+    }
+    .detail {
+      text-align: center;
+      font-size: 26rpx;
+      opacity: 0.6;
+      color: #131415;
+    }
+  }
+}
+</style>

pageC/withdrawalDetail/withdrawalDetail.vue

@@ -1,57 +1,61 @@
 <template>
-	<view class="page">
-		<!-- 明细组件，根据传值确定展示的数据 -->
-		<MoneyDetail :withBool='true' v-for="(item,index) in moneyDetail" :itemInfo="item" :key="index" />
-		<!-- 明细组件，根据传值确定展示的数据 -->
-	</view>
+  <view class="page">
+    <!-- 明细组件，根据传值确定展示的数据 -->
+    <MoneyDetail
+      :withBool="true"
+      v-for="(item, index) in moneyDetail"
+      :itemInfo="item"
+      :key="index"
+    />
+    <!-- 明细组件，根据传值确定展示的数据 -->
+  </view>
 </template>
 
 <script>
-	import MoneyDetail from "../mineComponent/moneyDetail/index.vue"
-	export default {
-		components: {
-			MoneyDetail
-		},
-		data() {
-			return {
-				//保证金提现明细数据
-				moneyDetail: [{
-						name: '充值',
-						time: '2024-1-1 09:34:31',
-						money: '+400',
-						auditingStatus: 0
-					},
-					{
-						name: '提现',
-						time: '2024-1-1 09:34:31',
-						money: '-400',
-						auditingStatus: 1
-					},
-					{
-						name: '充值',
-						time: '2024-1-1 09:34:31',
-						money: '+400',
-						auditingStatus: 2
-					},
-				]
-			}
-		},
-		methods: {
-
-		},
-		mounted() {
-			uni.setBackgroundColor({
-				backgroundColor: '#ffffff'
-			})
-		}
-	}
+import MoneyDetail from "../mineComponent/moneyDetail/index.vue";
+export default {
+  components: {
+    MoneyDetail,
+  },
+  data() {
+    return {
+      //保证金提现明细数据
+      moneyDetail: [],
+      type: "",
+    };
+  },
+  onLoad(options) {
+    this.type = options.type;
+  },
+  methods: {
+    getwithdrawalDetailList() {
+      uni.$u.http
+        .get(
+          `/api/withdraw?is_page=1&page=1&limit=10&account_type=${this.type}`
+        )
+        .then((res) => {
+          this.moneyDetail = res.data;
+          this.moneyDetail.map((item) => {
+            item.type_name = "余额提现";
+            item.amount = "-" + item.amount;
+          });
+        });
+    },
+  },
+  mounted() {
+    this.getwithdrawalDetailList();
+    uni.setBackgroundColor({
+      backgroundColor: "#ffffff",
+    });
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.page {
-		background-color: #fff;
-		width: 92vw;
-		height: 100vh;
-		padding: 0 32rpx;
-	}
-</style>
+.page {
+  background-color: #fff;
+  width: 92vw;
+  height: 100vh;
+  padding: 0 32rpx;
+}
+</style>

pageD/afterSalesManage/afterSalesManage.vue

@@ -47,64 +47,7 @@ export default {
   data() {
     return {
       follow: 1,
-      orderList: [
-        {
-          name: "Trinity 自由比格",
-          status: 0,
-          headerImg:
-            "https://ts3.cn.mm.bing.net/th?id=OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2",
-          orderImg:
-            "https://img12.360buyimg.com/jdcms/s460x460_jfs/t1/226637/16/19995/180517/66696f86Fa90c7d49/3bc094e1eb7aeb12.jpg.avif",
-          orderDetail: "OATLY噢麦力 咖啡大师…",
-          orderPrice: "29.90",
-          specifications: "咖啡大师燕麦奶250ml*6瓶",
-          num: 1,
-          payPrice: "141.00",
-          remark: "买家急用，仓库尽早发货",
-        },
-        {
-          name: "Trinity 自由比格",
-          status: 1,
-          headerImg:
-            "https://ts3.cn.mm.bing.net/th?id=OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2",
-          orderImg:
-            "https://img12.360buyimg.com/jdcms/s460x460_jfs/t1/226637/16/19995/180517/66696f86Fa90c7d49/3bc094e1eb7aeb12.jpg.avif",
-          orderDetail: "OATLY噢麦力 咖啡大师…",
-          orderPrice: "29.90",
-          specifications: "咖啡大师燕麦奶250ml*6瓶",
-          num: 1,
-          payPrice: "141.00",
-          remark: "买家急用，仓库尽早发货",
-        },
-        {
-          name: "Trinity 自由比格",
-          status: 2,
-          headerImg:
-            "https://ts3.cn.mm.bing.net/th?id=OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2",
-          orderImg:
-            "https://img12.360buyimg.com/jdcms/s460x460_jfs/t1/226637/16/19995/180517/66696f86Fa90c7d49/3bc094e1eb7aeb12.jpg.avif",
-          orderDetail: "OATLY噢麦力 咖啡大师…",
-          orderPrice: "29.90",
-          specifications: "咖啡大师燕麦奶250ml*6瓶",
-          num: 1,
-          payPrice: "141.00",
-          remark: "买家急用，仓库尽早发货",
-        },
-        {
-          name: "Trinity 自由比格",
-          status: 3,
-          headerImg:
-            "https://ts3.cn.mm.bing.net/th?id=OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2",
-          orderImg:
-            "https://img12.360buyimg.com/jdcms/s460x460_jfs/t1/226637/16/19995/180517/66696f86Fa90c7d49/3bc094e1eb7aeb12.jpg.avif",
-          orderDetail: "OATLY噢麦力 咖啡大师…",
-          orderPrice: "29.90",
-          specifications: "咖啡大师燕麦奶250ml*6瓶",
-          num: 1,
-          payPrice: "141.00",
-          remark: "买家急用，仓库尽早发货",
-        },
-      ],
+      orderList: [],
     };
   },
   methods: {
@@ -119,7 +62,7 @@ export default {
     getOrderList() {
       uni.$u.http.get(`/api/order/refund_order`).then((res) => {
         console.log(res);
-        // this.orderList = res.data;
+        this.orderList = res.data;
       });
     },
   },

pageD/afterSalesManage/component/detailCard.vue

@@ -7,8 +7,8 @@
           src="https://ts3.cn.mm.bing.net/th?id=OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2"
           mode=""
         ></image>
-        <!-- {{ itemInfo.order.nickname }} -->
-        <text>张三</text>
+
+        <text>{{ itemInfo.order.nickname }}</text>
       </view>
       <text class="order-status">{{ deliveryStatus }}</text>
     </view>
@@ -21,7 +21,7 @@
         ></image>
         <view class="detail-right">
           <view class="title-price">
-            <view class="title"> OATLY噢麦力 咖啡大师… </view>
+            <view class="title"> {OATLY噢麦力 咖啡大师… }</view>
             <view class="price">
               <text style="font-size: 20rpx">￥</text>
               <text>133</text>.
@@ -50,18 +50,19 @@
       <button
         disabled
         class="btn-2"
-        v-if="itemInfo.status == 0 || itemInfo.status == 1"
+        :disabled="itemInfo.status == 3"
+        v-if="itemInfo.status == 0 || itemInfo.status == 3"
       >
         平台介入
       </button>
-      <button class="btn-1" v-if="itemInfo.status == 0 || itemInfo.status == 1">
+      <button class="btn-1" v-if="itemInfo.status == 0 || itemInfo.status == 3">
         拒绝申请
       </button>
-      <button class="btn-3" v-if="itemInfo.status == 0 || itemInfo.status == 1">
+      <button class="btn-3" v-if="itemInfo.status == 0 || itemInfo.status == 3">
         同意退款
       </button>
-      <button class="btn-2" v-if="itemInfo.status == 3">删除</button>
-      <button class="btn-2" v-if="itemInfo.status == 3">查看详情</button>
+      <button class="btn-2" v-if="itemInfo.status == 1">删除</button>
+      <button class="btn-2" v-if="itemInfo.status == 1">查看详情</button>
     </view>
   </view>
 </template>
@@ -81,13 +82,13 @@ export default {
       }
     },
     deliveryStatus() {
-      if (this.itemInfo.status == "refunding") {
+      if (this.itemInfo.status == "0") {
         return "待退款";
-      } else if (this.itemInfo.status == 1) {
+      } else if (this.itemInfo.status == "3") {
         return "平台介入";
-      } else if (this.itemInfo.status == 2) {
+      } else if (this.itemInfo.status == "2") {
         return "拒绝退款";
-      } else if (this.itemInfo.status == "refund") {
+      } else if (this.itemInfo.status == "1") {
         return "已退款";
       }
     },

pages/cart/cart.vue

@@ -85,7 +85,7 @@
                 >
                   <image
                     :src="chid.image"
-                    style="width: 172rpx; height: 172rpx"
+                    style="width: 172rpx; height: 172rpx; border-radius: 20rpx"
                     mode=""
                   >
                   </image>
@@ -93,8 +93,13 @@
                     ><view class="sold"> 商品下架 </view></view
                   >
                 </view>
-                <view class="good" style="flex: 1; margin-left: 10rpx">
-                  <view class="goodname">{{ chid.name_cn }}</view>
+                <view
+                  class="good"
+                  style="flex: 1; margin-left: 10rpx; width: 65%"
+                >
+                  <view class="goodname" :style="getFontColor(chid.status)">{{
+                    chid.name_cn
+                  }}</view>
                   <view class="goods" v-if="chid.sku_item.length > 0">{{
                     chid.sku_item[0].item
                   }}</view>
@@ -244,6 +249,7 @@ export default {
         },
       ],
       tabarheight: "",
+      removeProducts: 0, //已下架的商品数量
     };
   },
   computed: {
@@ -267,10 +273,15 @@ export default {
         duration: 300, // 滚动动画的时长
       });
     },
+    //商品下架之后的商品字体颜色
+    getFontColor(status) {
+      if (status == "down") {
+        return "color:rgba(51, 51, 51, .6)";
+      }
+    },
 
     //关注商品 or 删除商品
     followOrdelete(e) {
-      console.log("调用", e);
       //关注商品
       if (e.index == 0) {
         this.goodsList.map((item) => {
@@ -318,6 +329,17 @@ export default {
       return num;
     },
 
+    //获取排除下架的商品之后的商品数量
+    getNormalGoodsNum(value) {
+      let num = 0;
+      value.map((item) => {
+        if (item.status != "down") {
+          num++;
+        }
+      });
+      return num;
+    },
+
     //修改购物车商品数量
     addOrReduce(n) {
       uni.$u.http
@@ -335,12 +357,18 @@ export default {
       if (this.checkboxValue1.length == 0) {
         //没有数据则直接将选中店铺中的商品存入数组
         value.map((item) => {
-          this.checkboxValue1.push(item.cart.sku_item_id);
+          //商品下架不得选中
+          if (item.status != "down") {
+            this.checkboxValue1.push(item.cart.sku_item_id);
+          }
         });
       } else {
-        if (this.shop(value) > 0 && this.shop(value) == value.length) {
+        if (
+          this.shop(value) > 0 &&
+          this.shop(value) == this.getNormalGoodsNum(value)
+        ) {
           value.map((item) => {
-            //先判断选中的商品数组中该店铺商品是否已被选中，已被选中则取消选中，未被选中则推入选中状态
+            //先判断选中的商品数组中该店铺商品是否已被选中，已被选中则取消选中
             if (this.checkboxValue1.indexOf(item.cart.sku_item_id) >= 0) {
               this.checkboxValue1.splice(
                 this.checkboxValue1.indexOf(item.cart.sku_item_id),
@@ -349,18 +377,22 @@ export default {
             }
           });
         } else if (
-          (this.shop(value) > 0 && this.shop(value) != value.length) ||
+          (this.shop(value) > 0 &&
+            this.shop(value) != this.getNormalGoodsNum(value)) ||
           this.shop(value) == 0
         ) {
           value.map((item) => {
-            //先判断选中的商品数组中该店铺商品是否已被选中，已被选中则取消选中，未被选中则推入选中状态
-            if (this.checkboxValue1.indexOf(item.cart.sku_item_id) == -1) {
+            //先判断选中的商品数组中该店铺商品是否已被选中，未被选中则推入选中状态，商品下架不得选中
+            if (
+              this.checkboxValue1.indexOf(item.cart.sku_item_id) == -1 &&
+              item.status != "down"
+            ) {
               this.checkboxValue1.push(item.cart.sku_item_id);
             }
           });
         }
       }
-      if (this.checkboxValue1.length == this.goodsNum) {
+      if (this.checkboxValue1.length == this.goodsNum - this.removeProducts) {
         this.$refs.tabbar1.cancelAll();
       } else {
         this.$refs.tabbar1.cancelAll("取消");
@@ -404,20 +436,29 @@ export default {
         });
       });
       //判断是否全部选中
-      if (this.checkboxValue1.length == this.goodsNum && this.goodsNum != 0) {
+      if (
+        this.checkboxValue1.length == this.goodsNum - this.removeProducts &&
+        this.goodsNum != 0
+      ) {
         this.$refs.tabbar1.cancelAll();
-      } else if (this.checkboxValue1.length < this.goodsNum) {
+      } else if (
+        this.checkboxValue1.length <
+        this.goodsNum - this.removeProducts
+      ) {
         this.$refs.tabbar1.cancelAll("取消");
       }
     },
     //购物车全选
     allSelect() {
       const all = this.$refs.tabbar1.cancelAll("全选");
-      if (this.checkboxValue1.length == this.goodsNum && all.length == 0) {
+      if (
+        this.checkboxValue1.length == this.goodsNum - this.removeProducts &&
+        all.length == 0
+      ) {
         return;
       }
       //判断是否已经全选，如已全选，则取消全选
-      if (this.checkboxValue1.length == this.goodsNum) {
+      if (this.checkboxValue1.length == this.goodsNum - this.removeProducts) {
         this.checkboxValue1 = [];
         this.goodsPrice = 0;
         this.goodsWeight = 0;
@@ -425,7 +466,10 @@ export default {
         this.goodsList.map((item) => {
           item.goods.map((items) => {
             //判断是否有商品已被选中
-            if (this.checkboxValue1.indexOf(items.cart.sku_item_id) == -1) {
+            if (
+              this.checkboxValue1.indexOf(items.cart.sku_item_id) == -1 &&
+              items.status != "down"
+            ) {
               this.checkboxValue1.push(items.cart.sku_item_id);
               this.goodsWeight +=
                 items.sku_item[0].weight * items.cart.goods_num;
@@ -443,6 +487,11 @@ export default {
         //循环店铺，获取购物车商品数量
         this.goodsList.map((item) => {
           this.goodsNum += item.goods.length;
+          item.goods.map((items) => {
+            if (items.status == "down") {
+              this.removeProducts++;
+            }
+          });
         });
       });
     },
@@ -718,6 +767,10 @@ export default {
       line-height: 40rpx;
       text-align: left;
       font-style: normal;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      width: 100%;
     }
 
     .shopname {
@@ -760,8 +813,10 @@ export default {
   top: 0;
   left: 0;
   background-color: #c7c7c7;
-  opacity: 0.2;
+  opacity: 0.7;
   width: 100%;
   height: 100%;
+  z-index: 10000;
+  border-radius: 20rpx;
 }
 </style>