From 5c2fe68592f9d652b4a5d2ba1040e670de17f195 Mon Sep 17 00:00:00 2001
From: chenkun <3289431190@qq.com>
Date: Sun, 25 Aug 2024 23:48:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=94=B6=E7=9B=8A=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=92=8C=E6=8F=90=E7=8E=B0=E9=A1=B5=E9=9D=A2/?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=AC=E5=85=B1css=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common.css                                       |  10 ++
 pages/index/center.vue                           |   3 +-
 pages/mine/addBankCard.vue                       |  29 ++---
 pages/mine/incomeRecord.vue                      |  81 ++++++++++--
 pages/mine/purse.vue                             |  12 +-
 pages/mine/sonPage/promotion/promotionDetail.vue |  37 ++----
 pages/mine/withdraw.vue                          | 154 +++++++++++++++++++++--
 static/image/incomeRecord/1.png                  | Bin 0 -> 310 bytes
 8 files changed, 255 insertions(+), 71 deletions(-)
 create mode 100644 common.css
 create mode 100644 static/image/incomeRecord/1.png

diff --git a/common.css b/common.css
new file mode 100644
index 0000000..2076400
--- /dev/null
+++ b/common.css
@@ -0,0 +1,10 @@
+.bottomBtn {
+    position: fixed;
+    bottom: 5%;
+    left: 25%;
+    width: 50%;
+    height: 80rpx;
+    text-align: center;
+    color: #ffffff;
+    background: linear-gradient(to right, #3c69f1, #5f3bf5);
+}
\ No newline at end of file
diff --git a/pages/index/center.vue b/pages/index/center.vue
index f901709..53253ab 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -106,7 +106,8 @@ export default {
         {name: 'star', imageUrl: '/static/image/center/1.png', title: '我的银行卡',
           gotoPageUrl: '/mine/addBankCard'
         },
-        {name: 'star', imageUrl: '/static/image/center/1.png', title: '我的钱包'},
+        {name: 'star', imageUrl: '/static/image/center/1.png', title: '我的钱包',
+          gotoPageUrl: '/mine/purse'},
       ],
       // 其他列表
       otherList: [
diff --git a/pages/mine/addBankCard.vue b/pages/mine/addBankCard.vue
index 492fc16..6be6ee6 100644
--- a/pages/mine/addBankCard.vue
+++ b/pages/mine/addBankCard.vue
@@ -35,12 +35,19 @@
         <input class="input" placeholder="请输入身份证号" v-model="idCard" />
       </view>
 
-      <button class="next-button" @click="onNextClick">下一步</button>
+      <!--<button class="next-button" @click="onNextClick">下一步</button>-->
     </view>
+
+    <!--下一步按钮-->
+    <button @click="onNextClick" class="bottomBtn">
+      下一步
+    </button>
   </view>
 </template>
 
 <script>
+import '../../common.css'; // 引入公共 CSS 文件
+
 export default {
   data() {
     return {
@@ -107,26 +114,6 @@ export default {
       border-radius: 4px;
     }
   }
-
-  .next-button {
-    position: fixed;
-    bottom: 20px;           // 距离页面底部20px
-    left: 16px;             // 与页面左边保持一定距离
-    right: 16px;            // 与页面右边保持一定距离
-    background: $uni-linear-gradient-btn-color;  // 按钮背景渐变
-    color: white;           // 按钮文字颜色
-    text-align: center;     // 文字居中
-    padding: 10px 0;        // 内边距，增加按钮的高度
-    font-size: 18px;        // 按钮文字大小
-    z-index: 1000;          // 确保按钮位于其他内容的上方
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    width: 50%;
-    height: 80rpx;
-    border-radius: 10rpx;
-  }
-
 }
 
 
diff --git a/pages/mine/incomeRecord.vue b/pages/mine/incomeRecord.vue
index c5a56bd..ac47a74 100644
--- a/pages/mine/incomeRecord.vue
+++ b/pages/mine/incomeRecord.vue
@@ -1,19 +1,80 @@
 <template>
-	<view>
-		收益记录
-	</view>
+  <view class="incomeRecord">
+    <!--顶部导航栏-->
+    <navbar leftClick @leftClick="$utils.navigateBack" title="收益记录"/>
+
+
+    <!--内容区域-->
+    <view class="content">
+      <view class="title">收益记录</view>
+
+      <view class="list">
+        <view class="item" v-for="(item,index) in 20" :key="index">
+          <view class="left">
+            <image src="/static/image/incomeRecord/1.png" style="width: 70%;height: 70%;"></image>
+          </view>
+          <view class="center">
+            <view>小李</view>
+            <view>2024.02.02</view>
+          </view>
+          <view class="right">
+            <view>收益金额</view>
+            <view>¥10000</view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				
-			};
-		}
-	}
+export default {
+  data() {
+    return {};
+  }
+}
 </script>
 
 <style lang="scss" scoped>
+.incomeRecord {
+  .content {
+    padding: 0 40rpx;
+    height: calc(100vh - 240rpx);
+
+    .title {
+      font-weight: bold;
+      margin-top: 5%;
+    }
+
+    .list {
+      padding-top: 50rpx;
+
+      .item {
+        display: flex;
+        gap: 20rpx;
+        //height: 80rpx;
+        margin-bottom: 40rpx;
+
+
+        .left {
+          display: flex;
+          justify-content: center;
+          align-items: flex-start;
+          width: 15%;
+
+        }
+
+        .center {
+          width: 60%;
+        }
 
+        .right {
+          width: 30%;
+          text-align: center;
+        }
+      }
+    }
+  }
+}
 </style>
diff --git a/pages/mine/purse.vue b/pages/mine/purse.vue
index 52a45eb..d3942a1 100644
--- a/pages/mine/purse.vue
+++ b/pages/mine/purse.vue
@@ -59,11 +59,17 @@
     <!--收益记录和去提现-->
     <span class="income-record" @click="gotoIncomeRecordPage">收益记录</span>
 
-    <button class="withdraw-button" @click="gotoWithdrawPage">去提现</button>
+
+    <!--去提现按钮-->
+    <button @click="gotoWithdrawPage" class="bottomBtn">
+      去提现
+    </button>
   </view>
 </template>
 
 <script>
+import '../../common.css'; // 引入公共 CSS 文件
+
 export default {
   data() {
     return {};
@@ -71,11 +77,11 @@ export default {
   methods: {
     // 跳转到收益记录页面
     gotoIncomeRecordPage() {
-      this.$utils.navigateTo('/pages/mine/incomeRecord');
+      this.$utils.navigateTo('/mine/incomeRecord');
     },
     // 跳转到提现页面
     gotoWithdrawPage() {
-      this.$utils.navigateTo('/pages/mine/withdraw');
+      this.$utils.navigateTo('/mine/withdraw');
     }
   }
 }
diff --git a/pages/mine/sonPage/promotion/promotionDetail.vue b/pages/mine/sonPage/promotion/promotionDetail.vue
index a666bd3..834000e 100644
--- a/pages/mine/sonPage/promotion/promotionDetail.vue
+++ b/pages/mine/sonPage/promotion/promotionDetail.vue
@@ -35,16 +35,8 @@
       </view>
 
 
-      <!--  继续发布按钮-->
-      <view class="bottom">
-        <button @click="continueToPublish" class="continueBtn">
-          继续发布
-        </button>
-      </view>
-
-
       <!--确认发布弹框-->
-      <uv-popup ref="popup" mode="center" custom-style="height: 400rpx;" :closeOnClickOverlay="false" >
+      <uv-popup ref="popup" mode="center" custom-style="height: 400rpx;" :closeOnClickOverlay="false">
         <view class="content">
           <view class="title">
             推广选项
@@ -81,10 +73,16 @@
 
 
     </view>
+
+    <!--继续推广按钮-->
+    <button @click="continueToPromotion" class="bottomBtn">
+      继续推广
+    </button>
   </view>
 </template>
 
 <script>
+import '../../../../common.css'; // 引入公共 CSS 文件
 export default {
   onLoad: function (options) {
     // 获取传递过来的 id 参数
@@ -112,8 +110,8 @@ export default {
       console.log('confirm', e);
       this.form.cycle = e.value[0]
     },
-    // 推广确认按钮
-    continueToPublish() {
+    // 继续推广按钮
+    continueToPromotion() {
       this.$refs.popup.open();
     },
     // 金额发生变化
@@ -178,8 +176,6 @@ export default {
   }
 
 
-
-
   .content {
     display: flex;
     flex-direction: column;
@@ -204,22 +200,13 @@ export default {
     }
 
 
-    .confirmBottom {
-      position: fixed;
-      bottom: 38%;
-      left: 30%;
-      width: 38%;
-      height: 100rpx;
 
-      .confirmPromotionBtn {
-        color: #ffffff;
-        background: $uni-linear-gradient-btn-color;
-      }
-    }
   }
+
+
 }
 
-/deep/.uv-popup .uv-popup__content{
+/deep/ .uv-popup .uv-popup__content {
   border-radius: 20rpx;
 }
 </style>
diff --git a/pages/mine/withdraw.vue b/pages/mine/withdraw.vue
index 0726841..6a0efd2 100644
--- a/pages/mine/withdraw.vue
+++ b/pages/mine/withdraw.vue
@@ -1,19 +1,151 @@
 <template>
-	<view>
-		提现
-	</view>
+  <view class="withdraw">
+    <!--顶部导航栏-->
+    <navbar leftClick @leftClick="$utils.navigateBack" title="提现"/>
+
+    <!--内容区-->
+    <view class="content">
+
+      <!--上部分-->
+      <view class="content-top">
+        <view class="aaa">
+          <view class="top">￥1240,045</view>
+          <view class="bottom">可提现金额</view>
+        </view>
+      </view>
+
+      <!--下部分-->
+      <view class="content-bottom">
+
+        <view class="inputComponent">
+          <view class="left">填写提现金额</view>
+          <view class="centerAndRight">
+            <view class="center">
+              <uv-input placeholder="输入金额" v-model="withdrawMoney"
+                        border="none" @change="moneyChange"></uv-input>
+            </view>
+            <view class="right">全部提现</view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <!--提现按钮-->
+    <button @click="withdrawPage" class="bottomBtn">
+      提现
+    </button>
+
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				
-			};
-		}
-	}
+import '../../common.css'; // 引入公共 CSS 文件
+
+export default {
+  data() {
+    return {
+      withdrawMoney: "",
+    };
+  },
+  methods: {
+    // 金额发生变化
+    moneyChange(e) {
+      console.log(e)
+      this.withdrawMoney = e
+    },
+
+    // 提现
+    withdrawPage() {
+      // this.$utils.navigateTo('/mine/withdraw');
+    }
+  }
+}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
+.withdraw {
+  .content {
+    .content-top {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      padding-top: 60rpx;
+      background-color: #f8faff;
+
+      height: 10vh;
+
+      .aaa {
+        color: #000000;
+
+        .top {
+          font-size: 50rpx;
+        }
+
+        .bottom {
+          font-size: 14px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+      }
+
+
+    }
+
+    .content-bottom {
+      border-radius: 50rpx 50rpx 0 0;
+      box-shadow: 0 -10rpx 10rpx rgba(0, 0, 0, 0.2); /* 仅上边的阴影效果 */
+      background-color: #fff;
+      height: calc(90vh - 240rpx);
+      //width: 100vw;
+      padding: 40rpx;
+
+      .inputComponent {
+        display: flex;
+
+        //gap: 20rpx;
+        //border: 1px solid red;
+
+        .left {
+          display: flex;
+          justify-content: flex-start;
+          align-items: center;
+
+          font-size: 30rpx;
+
+          width: 50%;
+          margin-right: 20rpx;
+        }
+
+        .centerAndRight {
+          display: flex;
+          width: 50%;
+
+          .center {
+            width: 60%;
+          }
+
+          .right {
+            display: flex;
+            justify-content: flex-end;
+            align-items: center;
+            font-size: 32rpx;
+            margin-left: 20rpx;
+
+            width: 40%;
+
+
+            background: $uni-linear-gradient-color;
+            -webkit-background-clip: text; /*将设置的背景颜色限制在文字中*/
+            -webkit-text-fill-color: transparent; /*给文字设置成透明*/
+          }
+        }
+
+
+      }
+    }
+  }
+
+}
 
 </style>
diff --git a/static/image/incomeRecord/1.png b/static/image/incomeRecord/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..16f3d480bfc62e066ba2296b63c3b5ab36f8f1ee
GIT binary patch
literal 310
zcmeAS@N?(olHy`uVBq!ia0vp^!a&T&!3HGHN~m`NDaPU;cPEB*=VV?2IV{Cao*^7S
zP{WbZ0pvgMba4!^=v{kpqwiq{k%ou=Z@ypF!EMICrm*papi^Xn;H7j<wgh&!6P-;)
zhlFn|5a}?{oLIAS`k~I&6(20?%hmV#zb|>zb(2d&a`MG3e(Sb2=Om_tu2N0X=8ef@
zPY=COF~4hP5?e!A(Vp_jv%5pyOkqmc<dCw))hz1AR3?{B{@-Tx{;qSP?j|Sw?9;!m
zvcBX`!)JS82ldO*f|YC&1m0cvb8&*@iS*qcpBnhAynR9_A%EM|6WveObc(U%fBXC~
ziuvnHnFrDpzxA&qJMFo$NXF>9`fEe}Pb$Z|kCZ81kYQkJaFb8x)jJLJD}$%2pUXO@
GgeCxNg?&!|

literal 0
HcmV?d00001