浏览代码

ui 修改 (未完成)

zxl 1 年之前
父节点
当前提交
565f73b60a

+ 4 - 0
README.md

@@ -95,6 +95,10 @@ https://js.design/ti?c=fMpU7uE9B48CA8a/ // ui图
 | |		|		|		|----index(设置首页)
 | |		|		|		|----aboutUs(关于我们)
 | |		|		|		|----personInformation(个人信息)
+| |		|   |----profit(提现)
+| |		|   |   |----index(提现主页)
+| |		|   |   |----withdraw(提现)
+| |		|
 | |		|
 | |		|
 | |		|

+ 11 - 11
src/PageMine/orderModules/index.vue

@@ -90,21 +90,21 @@
 						name: '已付款',
 						type: 1,
 					},
-					{
-						name: '待发货',
-						type: 2,
-					},
-					{
-						name: '已发货',
-						type: 3,
-					},
+					// {
+					// 	name: '待发货',
+					// 	type: 2,
+					// },
+					// {
+					// 	name: '已发货',
+					// 	type: 3,
+					// },
 					{
 						name: '已完成',
-						type: 4,
+						type: 3,
 					},
 					{
 						name: '已关闭',
-						type: 5,
+						type: 4,
 					}
 					// ,
 					//       {
@@ -336,4 +336,4 @@
 	::deep .u-tabs__wrapper__nav__item__text {
 		font-size: 30px;
 	}
-</style>
+</style>

+ 188 - 0
src/PageMine/profit/index.vue

@@ -0,0 +1,188 @@
+<template>
+  <view class="container">
+    <view class="item-box">
+      <view class="item" :key="item" v-for="item of price_list">
+        <view class="item-text">{{ item.name }}</view>
+        <view class="item-price">{{ item.price }}</view>
+      </view>
+    </view>
+
+    <view class="item-box">
+      <view class="item" :key="item" v-for="item of price_list1">
+        <view class="item-text">{{ item.name }}</view>
+        <view class="item-price">{{ item.price }}</view>
+      </view>
+    </view>
+
+    <view class="item-box2">
+      <view class="item" :key="item" v-for="item of price_list2">
+        <view class="item-text">{{ item.name }}</view>
+        <view class="item-price">{{ item.price }}</view>
+      </view>
+    </view>
+
+    <view class="item-box3">
+      <view class="item">
+        <view class="item-text">可提现金额</view>
+        <view class="item-price">150.00</view>
+      </view>
+      <view class="btn-box">
+        <button class="btn" @click="handlerWithdrawFunds">提现</button>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      price_list: [
+        {
+          name: '钱包余额(元)',
+          price: '258.00',
+        },
+        {
+          name: '总收益(元)',
+          price: '258.00',
+        },
+        {
+          name: '待转入(元)',
+          price: '258.00',
+        },
+      ],
+      price_list1: [
+        {
+          name: '总收益(元)',
+          price: '258.00',
+        },
+        {
+          name: '已提现(元)',
+          price: '258.00',
+        },
+        {
+          name: '待总结(元)',
+          price: '258.00',
+        },
+      ],
+      price_list2: [
+        {
+          name: '已提现',
+          price: '150.00',
+        },
+        {
+          name: '待结算',
+          price: '108.00',
+        },
+        {
+          name: '已失效',
+          price: '10.00',
+        },
+      ],
+    };
+  },
+  methods: {
+    // 点击提现
+    handlerWithdrawFunds() {
+      uni.navigateTo({
+        url: '/PageMine/profit/withdraw',
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.container {
+  margin-top: 25rpx;
+  background-color: #efefef;
+  min-height: calc(100vh - 10rpx);
+  .item-box,
+  .item-box2 {
+    width: 90%;
+    padding: 20rpx;
+    background-color: #347caf;
+    border-radius: 20rpx;
+    margin: 10rpx auto 0;
+    display: flex;
+    justify-content: space-around;
+    .item {
+      color: #fff;
+      text-align: center;
+      .item-text {
+        font-size: 28rpx;
+      }
+      .item-price {
+        font-size: 36rpx;
+        font-weight: bold;
+        margin-top: 20rpx;
+      }
+    }
+  }
+  .item-box2 {
+    margin-top: 20rpx;
+  }
+  .item-box3 {
+    width: 90%;
+    padding: 20rpx;
+    background-color: #347caf;
+    border-radius: 20rpx;
+    color: #fff;
+    margin: 20rpx auto;
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    .btn {
+      width: 260rpx;
+      height: 80rpx;
+      border-radius: 60rpx;
+    }
+    .item {
+      color: #fff;
+      text-align: center;
+      .item-text {
+        font-size: 28rpx;
+      }
+      .item-price {
+        font-size: 36rpx;
+        font-weight: bold;
+        margin-top: 20rpx;
+      }
+    }
+  }
+
+  .footer-item {
+    width: 95%;
+    background-color: #347caf;
+    border-radius: 20rpx;
+    color: #fff;
+    margin: 20rpx auto;
+    .img {
+      width: 100%;
+    }
+  }
+  .item-box4 {
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    padding: 20rpx;
+    .btn {
+      width: 260rpx;
+      height: 80rpx;
+      border-radius: 60rpx;
+    }
+    .item {
+      color: #fff;
+      text-align: center;
+      .item-text {
+        font-size: 28rpx;
+      }
+      .item-price {
+        font-size: 36rpx;
+        font-weight: bold;
+        margin-top: 20rpx;
+      }
+    }
+  }
+}
+</style>

+ 112 - 0
src/PageMine/profit/withdraw.vue

@@ -0,0 +1,112 @@
+<template>
+  <view class="container">
+    <view class="draw-box">
+      <span class="title">提现金额</span>
+      <view class="draw">
+        <span class="draw-span">¥</span>
+        <u--input type="number " placeholder="请输入提现金额" border="bottom" clearable></u--input>
+      </view>
+      <view class="draw-footer">
+        <view class="footer-l">可提现余额¥0.00</view>
+        <view class="footer-r" @click="handlerWidthDrawBtn">全部提现</view>
+      </view>
+    </view>
+
+    <view class="draw-box margin-box item-box2">
+      <view class="item-l">
+        <view class="l-title">预估收益</view>
+        <view class="l-text">2021年4月1日 - 2021年4月30日</view>
+      </view>
+      <view class="item-t">234.56</view>
+    </view>
+
+    <view class="draw-box margin-box item-box2">
+      <view class="item-l">
+        <view class="l-title">已提现收益</view>
+        <view class="l-text">2021年1月1日 - 2021年3月30日</view>
+      </view>
+      <view class="item-t">500.56</view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {};
+  },
+  methods: {
+    // 点击提现
+    handlerWidthDrawBtn() {
+      uni.showToast({
+        title: '没钱',
+        icon: 'none',
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.container {
+  background-color: #efefef;
+  padding: 20rpx;
+  min-height: calc(100vh - 40rpx);
+  .draw-box {
+    padding: 20rpx;
+    background-color: #fff;
+    border-radius: 20rpx;
+    .title {
+      font-size: 36rpx;
+      font-weight: bold;
+    }
+    .draw {
+      display: flex;
+      align-items: center;
+      margin: 40rpx 0 20rpx;
+      .draw-span {
+        font-size: 36rpx;
+        font-weight: bold;
+      }
+    }
+    .draw-footer {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .footer-l {
+        font-size: 40rpx;
+        color: #9ca3af;
+      }
+      .footer-r {
+        color: #000;
+        font-size: 28rpx;
+      }
+    }
+  }
+
+  .margin-box {
+    margin: 20rpx 0;
+  }
+
+  .item-box2 {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .item-l {
+      font-size: 28rpx;
+      .l-title {
+        color: #000;
+      }
+      .l-text {
+        color: #9ca3af;
+        margin-top: 20rpx;
+      }
+    }
+    .item-t {
+      font-size: 28rpx;
+      font-weight: bold;
+      color: #9ca3af;
+    }
+  }
+}
+</style>

+ 13 - 1
src/pages.json

@@ -247,7 +247,19 @@
 					"style": {
 						"navigationBarTitleText": "关于我们"
 					}
-				}
+				},
+        {
+        	"path": "profit/index",
+        	"style": {
+        		"navigationBarTitleText": "提现"
+        	}
+        },
+        {
+        	"path": "profit/withdraw",
+        	"style": {
+        		"navigationBarTitleText": "提现"
+        	}
+        }
 			]
 		},
 		{

+ 1 - 1
src/pages/tabbar/components/TapList.vue

@@ -41,7 +41,7 @@
             icon: 'home-fill',
             title: '我的店铺',
             url: '',
-            isLink: false,
+            isLink: true,
           },
           {
             id: '1',

+ 244 - 265
src/pages/tabbar/mine.vue

@@ -1,291 +1,270 @@
 <template>
-	<view class="container">
-		<view :style="{ height: systemBar + 'px', backgroundColor: '#337bad' }" />
-		<view>
-			<view class="head-info">
-				<view class="head-flex">
-					<view class="flex">
-						<view style="margin-right: 20rpx">
-							<!-- <u-avatar :src="avatar" size="80" @tap="$Router.push('/pages/client/clientUser/personal')" /> -->
-							<u-avatar :src="avatar" size="80" @click='handlerReviewImg' />
-						</view>
-						<view>
-							<view class="nickname">{{ nickname }}</view>
-							<view class="flex">
-								<text class="setAuth" @tap="$Router.push('/PageMine/setting/index')">
-									设置
-								</text>
-								<!-- <text class="setAuth">认证</text> -->
-							</view>
-						</view>
-					</view>
+  <view class="container">
+    <view class="head-info">
+      <view class="head-flex">
+        <view class="flex">
+          <view style="margin-right: 20rpx">
+            <!-- <u-avatar :src="avatar" size="80" @tap="$Router.push('/pages/client/clientUser/personal')" /> -->
+            <u-avatar :src="avatar" size="80" @click='handlerReviewImg' />
+          </view>
+          <view class="nickname"> {{ nickname }} </view>
+        </view>
 
-					<view @tap="$Router.push('/PageMine/setting/index')">
-						<u-icon name="setting" color="#ffffff" size="26"></u-icon>
-					</view>
-				</view>
-				<!-- 列表 -->
-				<view class="Collect">
-					<u-grid :border="false" col="4">
-						<u-grid-item v-for="(listItem, listIndex) in collectList" :key="listIndex"
-							@tap="$Router.push(listItem.url)">
-							<u-icon :customStyle="{ paddingTop: 20 + 'rpx' }" :name="listItem.name" :size="28"
-								color="#fff" />
-							<text class="grid-text">{{ listItem.title }}</text>
-						</u-grid-item>
-					</u-grid>
-				</view>
-				<!-- 订单 -->
-				<view class="order-out-box">
-					<view class="order-inner-box">
-						<u-grid :border="false" col="4" style="background-color: #fff">
-							<u-grid-item v-for="(listItem, listIndex) in oderList" :key="listIndex"
-								@tap="gotoOrder(listItem)">
-								<u-icon :name="listItem.name" :size="34" />
-								<text class="grid-text">{{ listItem.title }}</text>
-							</u-grid-item>
-						</u-grid>
-					</view>
-				</view>
-			</view>
+        <view class='setting-img-box' @tap="$Router.push('/PageMine/setting/index')">
+          <image class='setting-img' src='@/static/user/mine/icon_user_mine_setting.png'></image>
+          <!-- <u-icon name="setting" color="#000" size="26"></u-icon> -->
+        </view>
+      </view>
+      <!-- 收藏 积分 购物车 优惠券  -->
 
-			<!-- 我的收益 -->
-			<!-- <view class="income" @click="handlerSkipMyProfit"> -->
-			<view class="income">
-				<!-- <view class="income-head">
-					<text class="my-income">我的钱包</text>
-					<u-icon name="arrow-right" />
-				</view>
-				<view class="income-content">
-					<u-grid :border="false" col="4" bgColor="#fff">
-						<u-grid-item v-for="(listItem, listIndex) in incomeList" :key="listIndex">
-							<view class="num-box">{{ listItem.num }}元</view>
-							<view class="num-title">{{ listItem.title }}</view>
-						</u-grid-item>
-					</u-grid>
-				</view> -->
+      <view class="collect-box">
+        <u-grid :border="false" col="4">
+          <u-grid-item v-for="(listItem, listIndex) in collectList" :key="listIndex" @tap="$Router.push(listItem.url)">
+            <u-icon :customStyle="{ paddingTop: 20 + 'rpx' }" :name="listItem.name" :size="28" color="#000" />
+            <text class="grid-text">{{ listItem.title }}</text>
+          </u-grid-item>
+        </u-grid>
+      </view>
 
-			</view>
-			<!-- 列表 -->
-			<TapList></TapList>
+      <view class="order-out-box">
+        <view class="order-inner-box">
+          <u-grid :border="false" col="4" style="background-color: #fff">
+            <u-grid-item v-for="(listItem, listIndex) in oderList" :key="listIndex" @tap="gotoOrder(listItem)">
+              <u-icon :name="listItem.name" :size="34" />
+              <text class="grid-text">{{ listItem.title }}</text>
+            </u-grid-item>
+          </u-grid>
+        </view>
+      </view>
 
-		</view>
-		<tabbar currentTab="clientMine" />
-	</view>
+      <!-- 我的收益 -->
+      <view class="income" @click="handlerSkipMyProfit">
+        <view class="income-head">
+          <text class="my-income">我的钱包</text>
+          <u-icon name="arrow-right" />
+        </view>
+        <view class="income-content">
+          <u-grid :border="false" col="4" bgColor="#fff">
+            <u-grid-item v-for="(listItem, listIndex) in incomeList" :key="listIndex">
+              <view class="num-box">{{ listItem.num }}元</view>
+              <view class="num-title">{{ listItem.title }}</view>
+            </u-grid-item>
+          </u-grid>
+        </view>
+      </view>
+
+    </view>
+
+    <!-- 列表 -->
+    <TapList></TapList>
+
+    <tabbar currentTab="clientMine" />
+  </view>
 </template>
 
 <script>
-	import {
-		mapGetters
-	} from 'vuex';
-	import TapList from './components/TapList.vue';
-	export default {
-		components: {
-			TapList
-		},
-		data() {
-			return {
-				system: {},
-				systemBar: 0,
-				collectList: [{
-						name: 'photo',
-						title: '收藏',
-						url: '/PageMine/favourite',
-					},
-					// {
-					//   name: 'lock',
-					//   title: '积分',
-					//   url: '/pages/client/clientUser/myScore/index',
-					// },
-					{
-						name: 'star',
-						title: '购物车',
-						url: '/PageMine/shopCar',
-					},
-					{
-						name: 'hourglass',
-						title: '优惠券',
-						url: '/PageMine/coupon',
-					},
-				],
-				oderList: [{
-						name: 'order',
-						title: '全部订单',
-						type: 0,
-					},
-					{
-						name: 'bag-fill',
-						title: '已发货',
-						type: 1,
-					},
-					{
-						name: 'car-fill',
-						title: '已完成',
-						type: 2,
-					}
-					// {
-					//   name: 'heart',
-					//   title: '待评价',
-					//   type: 3,
-					// },
-				],
-				incomeList: [{
-						num: '0.00',
-						title: '总收益',
-					},
-					{
-						num: '0.00',
-						title: '本月收益',
-					},
-					{
-						num: '0.00',
-						title: '本周收益',
-					},
-					{
-						num: '0.00',
-						title: '可提现',
-					},
-				]
-			};
-		},
-		computed: {
-			...mapGetters(['userId', 'gender', 'avatar', 'nickname'])
-		},
-		methods: {
-			getHeight() {
-				wx.getSystemInfo({
-					success: res => {
-						this.system = res;
-					},
-				});
-				this.systemBar = this.system.statusBarHeight;
-			},
-			// 点击跳转到全部订单
-			gotoOrder(item) {
-				this.$store.commit('order/GET_ORDER_TYPE', item)
-				uni.navigateTo({
-					url: `/PageMine/orderModules/index`,
-				});
-			},
-			// 点击跳转到我的收益
-			// handlerSkipMyProfit() {
-			// 	uni.navigateTo({
-			// 		url: '/pages/client/clientUser/myProfit',
-			// 	});
-			// },
-			// 点击预览图片
-			handlerReviewImg() {
-				uni.previewImage({
-					urls: [this.avatar],
-				});
-			}
-		},
-		onLoad() {
-			this.getHeight();
-		},
-	};
+  import {
+    mapGetters
+  } from 'vuex';
+  import TapList from './components/TapList.vue';
+  export default {
+    components: {
+      TapList
+    },
+    data() {
+      return {
+        system: {},
+        systemBar: 0,
+        collectList: [{
+            name: 'photo',
+            title: '收藏',
+            url: '/PageMine/favourite',
+          },
+          {
+            name: 'lock',
+            title: '积分',
+            url: '/pages/client/clientUser/myScore/index',
+          },
+          {
+            name: 'star',
+            title: '购物车',
+            url: '/PageMine/shopCar',
+          },
+          {
+            name: 'hourglass',
+            title: '优惠券',
+            url: '/PageMine/coupon',
+          },
+        ],
+        oderList: [{
+            name: 'order',
+            title: '全部订单',
+            type: 0,
+          },
+          {
+            name: 'bag-fill',
+            title: '已发货',
+            type: 1,
+          },
+          {
+            name: 'car-fill',
+            title: '已完成',
+            type: 2,
+          }
+          // {
+          //   name: 'heart',
+          //   title: '待评价',
+          //   type: 3,
+          // },
+        ],
+        incomeList: [{
+            num: '0.00',
+            title: '总收益',
+          },
+          {
+            num: '0.00',
+            title: '本月收益',
+          },
+          {
+            num: '0.00',
+            title: '本周收益',
+          },
+          {
+            num: '0.00',
+            title: '可提现',
+          },
+        ]
+      };
+    },
+    computed: {
+      ...mapGetters(['userId', 'gender', 'avatar', 'nickname'])
+    },
+    methods: {
+      getHeight() {
+        wx.getSystemInfo({
+          success: res => {
+            this.system = res;
+          },
+        });
+        this.systemBar = this.system.statusBarHeight;
+      },
+      // 点击跳转到全部订单
+      gotoOrder(item) {
+        this.$store.commit('order/GET_ORDER_TYPE', item)
+        uni.navigateTo({
+          url: `/PageMine/orderModules/index`,
+        });
+      },
+      // 点击跳转到我的收益
+      handlerSkipMyProfit() {
+      	uni.navigateTo({
+      		url: '/PageMine/profit/index',
+      	});
+      },
+      // 点击预览图片
+      handlerReviewImg() {
+        uni.previewImage({
+          urls: [this.avatar],
+        });
+      }
+    },
+    onLoad() {
+      this.getHeight();
+    },
+  };
 </script>
 
 <style lang="scss" scoped>
-	.container {
-		min-height: 100vh;
-		background-color: #efefef;
-		box-sizing: border-box;
-
-		.flex {
-			display: flex;
-		}
+  .container {
 
-		.head-info {
-			background-color: #337bad;
-			height: 360rpx;
-			padding: 20rpx;
-			position: relative;
+    .flex {
+      display: flex;
+      align-items: center;
+    }
 
-			.head-flex {
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
+    .head-info {
+      padding: 200rpx 22rpx 0;
+      background: linear-gradient(180deg, #D4E2FF 0%, #E6EAFB 53%, #F2F2F2);
 
-				.nickname {
-					font-size: 36rpx;
-					color: #ffffff;
-					margin-bottom: 8rpx;
-					margin-top: 20rpx;
-				}
+      .head-flex {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        .nickname {
+          font-size: 36rpx;
+          color: #0C1223;
+          margin-bottom: 8rpx;
+          margin-top: 20rpx;
+          font-weight: bold;
+        }
+        .setting-img-box{
+          padding-top:4rpx;
+          .setting-img{
+            width:48rpx;
+            height:48rpx;
+          }
+        }
+      }
 
-				.setAuth {
-					width: 90rpx;
-					height: 40rpx;
-					font-size: 24rpx;
-					display: block;
-					cursor: pointer;
-					margin-right: 10rpx;
-					line-height: 40rpx;
-					text-align: center;
-					border-radius: 20rpx;
-					background-color: rgba(255, 255, 255, 0.4);
-				}
-			}
+      .collect-box {
+        width: 100%;
 
-			.Collect {
-				.grid-text {
-					font-size: 30rpx;
-					color: #fff;
-				}
-			}
+        .grid-text {
+          font-size: 30rpx;
+          color: #000;
+        }
+      }
 
-			.order-out-box {
-				width: 94%;
-				position: absolute;
-				bottom: -80rpx;
+      .order-out-box {
+        width: 100%;
+        margin-top: 44rpx;
 
-				.order-inner-box {
-					padding: 20rpx;
-					font-size: 30rpx;
-					border-radius: 10rpx;
-					background-color: $uni-bg-color;
-				}
-			}
-		}
+        .order-inner-box {
+          padding: 30rpx;
+          font-size: 30rpx;
+          border-radius: 10rpx;
+          background-color: $uni-bg-color;
+        }
+      }
+    }
 
-		.income {
-			padding: 20rpx;
-			border-radius: 10rpx;
-			// margin: 100rpx 20rpx 20rpx 20rpx;
-			margin: 40rpx 20rpx 20rpx 20rpx;
-			// background-color: $uni-bg-color;
+    .income {
+      padding: 22rpx;
+      border-radius: 10rpx;
+      width: calc(100% - 44rpx);
+      background-color: $uni-bg-color;
+      margin-top:24rpx;
+      .income-head {
+        display: flex;
+        justify-content: space-between;
 
-			.income-head {
-				display: flex;
-				justify-content: space-between;
+        .my-income {
+          color: $uni-color-primary;
+          font-size: 32rpx;
+          font-weight: 600;
+        }
+      }
 
-				.my-income {
-					color: $uni-color-primary;
-					font-size: 32rpx;
-					font-weight: 600;
-				}
-			}
+      .income-content {
+        margin: 15rpx 0;
 
-			.income-content {
-				margin: 15rpx 0;
+        .num-box {
+          padding: 20rpx 0;
+          font-size: 36rpx;
+          font-weight: 600;
+          color: $uni-text-color;
+        }
 
-				.num-box {
-					padding: 20rpx 0;
-					font-size: 36rpx;
-					font-weight: 600;
-					color: $uni-text-color;
-				}
+        .num-title {
+          font-size: 28rpx;
+          color: $uni-text-color-grey;
+        }
+      }
+    }
+  }
 
-				.num-title {
-					font-size: 28rpx;
-					color: $uni-text-color-grey;
-				}
-			}
-		}
-	}
+  .flex {
+    display: flex;
+  }
 
-	.flex {
-		display: flex;
-	}
 </style>

二进制
src/static/user/mine/icon_user_mine_coupon.png


二进制
src/static/user/mine/icon_user_mine_feedback.png


二进制
src/static/user/mine/icon_user_mine_helpcenter.png


二进制
src/static/user/mine/icon_user_mine_myshop.png


二进制
src/static/user/mine/icon_user_mine_myteam.png


二进制
src/static/user/mine/icon_user_mine_reserve.png


二进制
src/static/user/mine/icon_user_mine_score.png


二进制
src/static/user/mine/icon_user_mine_servicecenter.png


二进制
src/static/user/mine/icon_user_mine_setting.png


二进制
src/static/user/mine/icon_user_mine_shopcar.png


二进制
src/static/user/mine/icon_user_mine_star.png