浏览代码

px转rpx,样式调整

chenrong 1 年之前
父节点
当前提交
3cce7d38db
共有 40 个文件被更改,包括 1295 次插入1076 次删除
  1. 2 2
      component/Mloading.vue
  2. 7 7
      component/imgPopup.vue
  3. 1 1
      component/noData.vue
  4. 76 0
      component/pageTitle.vue
  5. 61 61
      component/paymentPopup.vue
  6. 4 1
      pages.json
  7. 14 14
      pages/addressEdit/addressEdit.vue
  8. 15 15
      pages/addressManage/addressManage.vue
  9. 22 22
      pages/consumptionRecords/consumptionRecords.vue
  10. 19 19
      pages/coupon/coupon.vue
  11. 38 30
      pages/drawCard_box/drawCard_box.vue
  12. 32 26
      pages/drawCard_box/drawCard_boxDetail.vue
  13. 75 50
      pages/drawCard_first/drawCard_first.vue
  14. 80 91
      pages/drawCard_fullSet/drawCard_fullSet.vue
  15. 20 20
      pages/drawCard_fullSet/goods.vue
  16. 15 15
      pages/drawCard_fullSet/winningList.vue
  17. 91 91
      pages/drawCard_infinite/drawCard_infinite.vue
  18. 86 62
      pages/drawCard_last/drawCard_last.vue
  19. 43 38
      pages/drawCardsList/drawCardsList.vue
  20. 13 13
      pages/excellentValue/excellentValue.vue
  21. 31 31
      pages/index/index.vue
  22. 8 8
      pages/integralRecord/integralRecord.vue
  23. 22 22
      pages/invite/invite.vue
  24. 85 85
      pages/knapsack/knapsack.vue
  25. 85 85
      pages/knapsackTab/knapsack.vue
  26. 16 16
      pages/login/login.vue
  27. 8 8
      pages/message/message.vue
  28. 2 2
      pages/mine/mine.vue
  29. 81 81
      pages/order/order.vue
  30. 41 41
      pages/orderConfirm/orderConfirm.vue
  31. 36 36
      pages/raffle/raffle.vue
  32. 4 4
      pages/rule/rule.vue
  33. 2 2
      pages/shoppingMall/shoppingMall.vue
  34. 14 14
      pages/user/editUser/editUser.vue
  35. 22 20
      pages/user/user.vue
  36. 4 4
      pages/userAgreement/userAgreement.vue
  37. 18 18
      pages/vip/vip.vue
  38. 15 15
      pages/winningRecord/winningRecord.vue
  39. 6 6
      static/style.scss
  40. 81 0
      utils/utils.js

+ 2 - 2
component/Mloading.vue

@@ -29,7 +29,7 @@ export default {
 .loading {
   // width: 100%;
   // height: 100%;
-  padding: 20px;
+  padding: 40rpx;
   display: flex;
   justify-content: center;
   align-items: center;
@@ -37,7 +37,7 @@ export default {
 }
 .text {
   display: inline-block;
-  font-size: 12px;
+  font-size: 24rpx;
   color: #9999;
 }
 .loadingIcon {

+ 7 - 7
component/imgPopup.vue

@@ -5,7 +5,7 @@
         <view class="title">奖品预览</view>
         <image class="img" :src="imgUrl" mode="widthFix"></image>
         <p class="name">
-          <span style="margin-right: 10px">奖品名称:</span>
+          <span style="margin-right: 20rpx">奖品名称:</span>
           {{ name }}
         </p>
       </view>
@@ -45,32 +45,32 @@ export default {
 
 <style scoped lang="scss">
 .popupContent {
-  padding: 10px;
+  padding: 20rpx;
   width: 70vw;
   min-height: 40vh;
   background: #fff;
-  border-radius: 5px;
+  border-radius: 10rpx;
   display: flex;
   justify-content: center;
   align-content: flex-start;
   flex-wrap: wrap;
 
   .title {
-    margin-bottom: 10px;
+    margin-bottom: 20rpx;
     text-align: center;
   }
   .img {
     width: 60vw;
     height: 60vw;
-    box-shadow: 1px 1px 4px #9c9c9c;
+    box-shadow: 2rpx 2rpx 8rpx #9c9c9c;
   }
 
   .name {
     width: 100%;
-    margin-top: 20px;
+    margin-top: 40rpx;
     text-align: center;
     font-weight: 600;
-    font-size: 15px;
+    font-size: 30rpx;
   }
 }
 </style>

+ 1 - 1
component/noData.vue

@@ -20,7 +20,7 @@
   }
   .text {
     color: #999999;
-    font-size: 16px;
+    font-size: 32rpx;
     text-align: center;
     position: absolute;
     top: 75%;

+ 76 - 0
component/pageTitle.vue

@@ -0,0 +1,76 @@
+<template>
+  <div>
+    <!-- <div :style="{
+			'margin-top': safeAreaTop,
+			'height': '60rpx',
+		}">
+		</div> -->
+    <div
+      class="text-white bold text-center mt-2 pageTitle"
+      :style="{
+        'margin-top': safeAreaTop,
+        color: color,
+      }"
+    >
+      <uni-icons
+        type="left"
+        size="20"
+        :color="color"
+        :style="{
+          position: 'absolute',
+          left: 0,
+          'margin-left': '20rpx',
+        }"
+        @click="back"
+      ></uni-icons>
+      {{ title }}
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    title: {
+      type: String,
+      default: '',
+    },
+    color: {
+      type: String,
+      default: '#000',
+    },
+  },
+  data() {
+    return {
+      safeAreaTop: '88rpx',
+    }
+  },
+  mounted() {
+    this.getSafeAreaTop()
+  },
+  methods: {
+    getSafeAreaTop() {
+      wx.getSystemInfo({
+        success: res => {
+          this.safeAreaTop = res.safeArea.top + 'px'
+        },
+      })
+    },
+    back() {
+      wx.navigateBack({ delta: 1 })
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.pageTitle {
+  z-index: 10;
+  position: relative;
+  height: 80rpx;
+  width: 100vw;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+</style>

+ 61 - 61
component/paymentPopup.vue

@@ -94,7 +94,7 @@
             <image class="img" :src="item.prizeIcon" mode="aspectFill"></image>
             <view class="info">
               <view class="row name">
-                <span style="margin-right: 10px">{{ item.prizeName }}</span>
+                <span style="margin-right: 20rpx">{{ item.prizeName }}</span>
                 <span v-if="item.prizeType == 4">随机</span>
                 <span>{{ item.prizeNum }}张</span>
               </view>
@@ -132,7 +132,7 @@
           <view class="leftIcon"></view>
           <view class="left">
-            <span style="font-size: 18px">{{ item.discount }}</span>
+            <span style="font-size: 36rpx">{{ item.discount }}</span>
           </view>
           <view class="right">
             <view class="row title">
@@ -376,16 +376,16 @@ export default {
 <style scoped lang="scss">
 .popupContent {
   background-color: #f8f8f8;
-  border-radius: 10px 10px 0 0;
+  border-radius: 20rpx 20rpx 0 0;
 
   > .row {
-    margin: 10px 20px 0 20px;
+    margin: 20rpx 40rpx 0 40rpx;
     display: flex;
     justify-content: space-between;
-    padding: 12px;
+    padding: 24rpx;
     background: #fff;
-    border-radius: 6px;
-    font-size: 14px;
+    border-radius: 12rpx;
+    font-size: 28rpx;
     color: #666666;
 
     .price {
@@ -394,7 +394,7 @@ export default {
     }
 
     .label {
-      margin-right: 10px;
+      margin-right: 20rpx;
     }
 
     .number {
@@ -405,15 +405,15 @@ export default {
 
       // justify-content: flex-end;
       .item {
-        width: 48px;
-        height: 24px;
+        width: 96rpx;
+        height: 48rpx;
         background: #dddddd;
-        border-radius: 51px;
+        border-radius: 102rpx;
         color: #000000;
-        line-height: 24px;
+        line-height: 48rpx;
         text-align: center;
-        font-size: 12px;
-        margin-right: 5px;
+        font-size: 24rpx;
+        margin-right: 10rpx;
 
         flex-grow: 0;
         flex-shrink: 0;
@@ -429,35 +429,35 @@ export default {
         display: flex;
         align-items: center;
         color: #ff2c43;
-        font-size: 12px;
+        font-size: 24rpx;
       }
 
       .noCoupon {
         display: flex;
         align-items: center;
         color: #8c8c8c;
-        font-size: 12px;
+        font-size: 24rpx;
       }
     }
   }
 
   > .title {
     text-align: center;
-    padding: 15px;
+    padding: 30rpx;
     font-weight: 600;
 
     .close {
       position: absolute;
-      right: 15px;
-      top: 15px;
+      right: 30rpx;
+      top: 30rpx;
     }
   }
 }
 
 .tip {
-  margin: 10px 20px 0 20px;
+  margin: 20rpx 40rpx 0 40rpx;
   color: #000000;
-  font-size: 12px;
+  font-size: 24rpx;
   display: flex;
   align-items: center;
 
@@ -467,8 +467,8 @@ export default {
 }
 
 .button {
-  margin: 10px auto;
-  width: 210px;
+  margin: 20rpx auto;
+  width: 420rpx;
 }
 
 .popup2 {
@@ -481,9 +481,9 @@ export default {
 
 .lotteryResults {
   width: 76vw;
-  padding-top: 62px;
+  padding-top: 124rpx;
   // background: #fff;
-  border-radius: 10px;
+  border-radius: 20rpx;
   position: absolute;
   top: -10vh;
   left: 50%;
@@ -491,42 +491,42 @@ export default {
 
   > .title {
     text-align: center;
-    padding: 16px;
-    height: 20px;
+    padding: 32rpx;
+    height: 40rpx;
     font-weight: 600;
     color: #fff;
 
     .close {
       position: absolute;
-      right: 15px;
-      top: 15px;
+      right: 30rpx;
+      top: 30rpx;
     }
   }
 
   .Rectangle {
-    width: calc(100% - 1px);
+    width: calc(100% - 2rpx);
     position: absolute;
-    bottom: 45px;
-    left: 3px;
+    bottom: 90rpx;
+    left: 6rpx;
   }
 
   .text {
-    width: calc(100% - 1px);
-    height: 50px;
-    line-height: 50px;
+    width: calc(100% - 2rpx);
+    height: 100rpx;
+    line-height: 100rpx;
     position: absolute;
-    bottom: 45px;
-    left: 3px;
+    bottom: 90rpx;
+    left: 6rpx;
     text-align: center;
     color: #fff;
-    text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
-    font-size: 12px;
+    text-shadow: 0rpx 2rpx 0rpx rgba(0, 0, 0, 0.5);
+    font-size: 24rpx;
   }
 
   .close {
-    width: 30px;
-    height: 30px;
-    margin-top: 50px;
+    width: 60rpx;
+    height: 60rpx;
+    margin-top: 100rpx;
     position: relative;
     z-index: 4;
     left: 50%;
@@ -534,12 +534,12 @@ export default {
   }
 
   .prizes {
-    margin: 30px 15px 10px 19px;
+    margin: 60rpx 30rpx 20rpx 38rpx;
     position: relative;
-    height: calc(85vw - 30px);
+    height: calc(85vw - 60rpx);
     background: linear-gradient(180deg, #f77d4d 0%, #feae81 100%);
-    border-radius: 8px;
-    padding: 10px 15px;
+    border-radius: 16rpx;
+    padding: 20rpx 30rpx;
     overflow: auto;
 
     .loading {
@@ -555,16 +555,16 @@ export default {
       align-items: center;
       justify-content: center;
       text-align: center;
-      // margin-right: 5px;
+      // margin-right: 10rpx;
       background: #fff;
-      padding: 13px 15px;
-      margin-bottom: 10px;
-      border-radius: 8px;
+      padding: 26rpx 30rpx;
+      margin-bottom: 20rpx;
+      border-radius: 16rpx;
 
       .img {
         width: 15vw;
         height: 15vw;
-        border-radius: 5px;
+        border-radius: 10rpx;
       }
 
       .info {
@@ -579,7 +579,7 @@ export default {
         }
 
         .name {
-          font-size: 14px;
+          font-size: 28rpx;
         }
       }
     }
@@ -591,22 +591,22 @@ export default {
   min-height: 30vh;
   overflow: auto;
   background: #f8f8f8;
-  padding: 10px;
+  padding: 20rpx;
 
   .card {
     background: #fff;
-    border-radius: 8px;
+    border-radius: 16rpx;
     overflow: hidden;
     display: flex;
 
     .leftIcon {
       height: auto;
-      width: 8px;
+      width: 16rpx;
       background: #ff2c43;
     }
 
     .left {
-      width: 80px;
+      width: 160rpx;
       display: inline-flex;
       justify-content: center;
       align-items: center;
@@ -615,16 +615,16 @@ export default {
     }
 
     .right {
-      padding: 10px;
+      padding: 20rpx;
       color: #8e4a21;
 
       .row {
-        margin-bottom: 4px;
-        font-size: 12px;
+        margin-bottom: 8rpx;
+        font-size: 24rpx;
       }
 
       .title {
-        font-size: 14px;
+        font-size: 28rpx;
         font-weight: 600;
       }
 
@@ -633,7 +633,7 @@ export default {
       }
 
       .desc {
-        margin-top: 5px;
+        margin-top: 10rpx;
         color: #8c8c8c;
       }
     }

+ 4 - 1
pages.json

@@ -216,6 +216,7 @@
     {
       "path": "pages/drawCard_box/drawCard_box",
       "style": {
+		"navigationStyle": "custom",
         "navigationBarTitleText": "抽盒机",
         "enablePullDownRefresh": false
       }
@@ -223,6 +224,7 @@
     {
       "path": "pages/drawCard_box/drawCard_boxDetail",
       "style": {
+		"navigationStyle": "custom",
         "navigationBarTitleText": "",
         "enablePullDownRefresh": false
       }
@@ -251,6 +253,7 @@
     {
       "path": "pages/drawCardsList/drawCardsList",
       "style": {
+		"navigationStyle": "custom",
         "navigationBarTitleText": "",
         "enablePullDownRefresh": false
       }
@@ -286,7 +289,7 @@
         "pagePath": "pages/drawCardsList/drawCardsList",
         "iconPath": "/static/img/cc.png",
         "selectedIconPath": "/static/img/cc.png",
-        "text": "抽机"
+        "text": "抽机"
       },
       {
         "pagePath": "pages/knapsackTab/knapsack",

+ 14 - 14
pages/addressEdit/addressEdit.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="container">
-    <uni-forms class="form" :rules="rules" ref="form" :modelValue="form" label-width="80px" label-align="right">
+    <uni-forms class="form" :rules="rules" ref="form" :modelValue="form" label-width="160rpx" label-align="right">
       <uni-forms-item label="姓名" required name="name">
         <uni-easyinput v-model="form.name" placeholder="请输入姓名" />
       </uni-forms-item>
@@ -143,18 +143,18 @@ export default {
 <style scoped lang="scss">
 .container {
   background: #fff;
-  padding: 20px;
+  padding: 40rpx;
 
   .form {
-    margin-top: 20px;
+    margin-top: 40rpx;
   }
 
   .inputBox {
-    border: 1px solid #f0f0f0;
-    border-radius: 4px;
-    height: 35px;
-    line-height: 35px;
-    padding-left: 10px;
+    border: 2rpx solid #f0f0f0;
+    border-radius: 8rpx;
+    height: 70rpx;
+    line-height: 70rpx;
+    padding-left: 20rpx;
     color: #333;
   }
 }
@@ -162,16 +162,16 @@ export default {
 .bottom {
   position: fixed;
   bottom: 0;
-  padding: 20px 0;
+  padding: 40rpx 0;
   text-align: center;
-  width: calc(100% - 40px);
+  width: calc(100% - 80rpx);
 
   .m_button {
-    height: 36px;
+    height: 72rpx;
     width: 40vw;
-    line-height: 36px;
-    border-radius: 18px;
-    font-size: 13px;
+    line-height: 72rpx;
+    border-radius: 36rpx;
+    font-size: 26rpx;
   }
 }
 </style>

+ 15 - 15
pages/addressManage/addressManage.vue

@@ -11,8 +11,8 @@
           </view>
           <uni-icons color="#ff5a5a" type="trash" size="25" @click="clickDelete(item)"></uni-icons>
         </view>
-        <view class="row" style="margin-top: 5px">
-          <view style="font-size: 12px">
+        <view class="row" style="margin-top: 10rpx">
+          <view style="font-size: 24rpx">
             {{ item.province }}{{ item.city }}{{ item.county }}{{ item.addressDetail }}
           </view>
           <uni-icons color="#00ce65" type="compose" size="25" @click="clickEdit(item)"></uni-icons>
@@ -101,16 +101,16 @@ export default {
   overflow: scroll;
 }
 .list {
-  margin-bottom: 60px;
+  margin-bottom: 120rpx;
 }
 .card {
-  margin-top: 10px;
-  margin-left: 10px;
-  margin-right: 10px;
-  padding: 10px;
+  margin-top: 20rpx;
+  margin-left: 20rpx;
+  margin-right: 20rpx;
+  padding: 20rpx;
   background: white;
-  border-radius: 5px;
-  font-size: 14px;
+  border-radius: 10rpx;
+  font-size: 28rpx;
   .row {
     display: flex;
     justify-content: space-between;
@@ -120,15 +120,15 @@ export default {
 .bottom {
   position: fixed;
   bottom: 0;
-  padding: 20px;
+  padding: 40rpx;
   text-align: center;
-  width: calc(100% - 40px);
+  width: calc(100% - 80rpx);
   .m_button {
-    height: 36px;
+    height: 72rpx;
     width: 40vw;
-    line-height: 36px;
-    border-radius: 18px;
-    font-size: 13px;
+    line-height: 72rpx;
+    border-radius: 36rpx;
+    font-size: 26rpx;
   }
 }
 </style>

+ 22 - 22
pages/consumptionRecords/consumptionRecords.vue

@@ -2,7 +2,7 @@
   <view class="container">
     <view class="tabs">
       <view :class="['tab', tabActive == 1 ? 'active' : '']" @click="tabClick(1)">一番赏</view>
-      <view :class="['tab', tabActive == 2 ? 'active' : '']" style="margin-left: 10px" @click="tabClick(2)">快递</view>
+      <view :class="['tab', tabActive == 2 ? 'active' : '']" style="margin-left: 20rpx" @click="tabClick(2)">快递</view>
     </view>
     <view class="list">
       <view class="item" v-for="(item, index) in list">
@@ -19,7 +19,7 @@
             <span v-if="item.order.orderType == 1">{{ item.name }}</span>
             <span v-else>下单发货</span>
           </view>
-          <view class="row" style="justify-content: space-between; font-size: 12px">
+          <view class="row" style="justify-content: space-between; font-size: 24rpx">
             <span class="textColor5">¥{{ item.order.goodsPrice }}</span>
             <span class="textColor3">
@@ -28,7 +28,7 @@
             </span>
           </view>
           <view class="row" style="justify-content: space-between">
-            <span style="font-size: 12px">{{ item.order.payTime }}</span>
+            <span style="font-size: 24rpx">{{ item.order.payTime }}</span>
             <span>
               实付金额:
               <span class="textColor5">{{ item.order.actualPrice }}</span>
@@ -106,18 +106,18 @@ export default {
 
 <style scoped lang="scss">
 .container {
-  padding: 10px;
+  padding: 20rpx;
 }
 .tabs {
   display: flex;
 
   .tab {
-    width: 68px;
-    height: 24px;
-    font-size: 14px;
+    width: 136rpx;
+    height: 48rpx;
+    font-size: 28rpx;
     background: #fff;
-    border-radius: 4px;
-    line-height: 24px;
+    border-radius: 8rpx;
+    line-height: 48rpx;
     text-align: center;
   }
   .active {
@@ -127,32 +127,32 @@ export default {
 }
 
 .list {
-  padding: 10px 0;
+  padding: 20rpx 0;
 
   .item {
     background: #fff;
-    border-radius: 4px;
+    border-radius: 8rpx;
     display: flex;
-    padding: 10px;
-    margin-bottom: 10px;
-    font-size: 14px;
+    padding: 20rpx;
+    margin-bottom: 20rpx;
+    font-size: 28rpx;
     align-items: center;
     position: relative;
 
     .tag {
       background: #def2e4;
       color: #00c537;
-      font-size: 16px;
-      padding: 2px 5px;
-      border-radius: 0 0 0 10px;
+      font-size: 32rpx;
+      padding: 4rpx 10rpx;
+      border-radius: 0 0 0 20rpx;
       position: absolute;
       right: 0;
       top: 0;
     }
     .icon {
-      width: 75px;
-      height: 75px;
-      border-radius: 4px;
+      width: 150rpx;
+      height: 150rpx;
+      border-radius: 8rpx;
     }
 
     .info {
@@ -160,12 +160,12 @@ export default {
       flex-direction: column;
       justify-content: flex-end;
       align-items: center;
-      padding-left: 10px;
+      padding-left: 20rpx;
       flex: 1;
 
       .row {
         width: 100%;
-        margin-top: 10px;
+        margin-top: 20rpx;
         display: flex;
       }
     }

+ 19 - 19
pages/coupon/coupon.vue

@@ -2,10 +2,10 @@
   <view class="container">
     <view class="tabs">
       <view :class="['tab', tabActive == 1 ? 'active' : '']" @click="tabClick(1)">可使用</view>
-      <view :class="['tab', tabActive == 2 ? 'active' : '']" style="margin-left: 10px" @click="tabClick(2)">
+      <view :class="['tab', tabActive == 2 ? 'active' : '']" style="margin-left: 20rpx" @click="tabClick(2)">
         已使用
       </view>
-      <view :class="['tab', tabActive == 3 ? 'active' : '']" style="margin-left: 10px" @click="tabClick(3)">
+      <view :class="['tab', tabActive == 3 ? 'active' : '']" style="margin-left: 20rpx" @click="tabClick(3)">
         已过期
       </view>
     </view>
@@ -13,7 +13,7 @@
       <view class="leftIcon"></view>
       <view class="left">
-        <span style="font-size: 18px">{{ item.discount }}</span>
+        <span style="font-size: 36rpx">{{ item.discount }}</span>
       </view>
       <view class="right">
         <view class="row title">
@@ -79,14 +79,14 @@ export default {
 <style scoped lang="scss">
 .tabs {
   display: flex;
-  margin-bottom: 10px;
+  margin-bottom: 20rpx;
   .tab {
-    width: 68px;
-    height: 24px;
-    font-size: 14px;
+    width: 136rpx;
+    height: 48rpx;
+    font-size: 28rpx;
     background: #fff;
-    border-radius: 4px;
-    line-height: 24px;
+    border-radius: 8rpx;
+    line-height: 48rpx;
     text-align: center;
   }
   .active {
@@ -96,22 +96,22 @@ export default {
 }
 .container {
   background: #eaeaea;
-  padding: 10px;
+  padding: 20rpx;
 
   .card {
     background: #fff;
-    border-radius: 8px;
+    border-radius: 16rpx;
     overflow: hidden;
     display: flex;
-    margin-bottom: 10px;
+    margin-bottom: 20rpx;
 
     .leftIcon {
       height: auto;
-      width: 8px;
+      width: 16rpx;
       background: #ff2c43;
     }
     .left {
-      width: 80px;
+      width: 160rpx;
       display: inline-flex;
       justify-content: center;
       align-items: center;
@@ -119,20 +119,20 @@ export default {
       font-weight: 600;
     }
     .right {
-      padding: 10px;
+      padding: 20rpx;
       .row {
-        margin-bottom: 4px;
-        font-size: 12px;
+        margin-bottom: 8rpx;
+        font-size: 24rpx;
       }
       .title {
-        font-size: 14px;
+        font-size: 28rpx;
         font-weight: 600;
       }
       .endTime {
         color: #ff2c43;
       }
       .desc {
-        margin-top: 5px;
+        margin-top: 10rpx;
         color: #8c8c8c;
       }
     }

+ 38 - 30
pages/drawCard_box/drawCard_box.vue

@@ -1,8 +1,6 @@
 <template>
   <view class="container">
-    <view class="title">
-      {{ detail.name }}
-    </view>
+    <PageTitle color="#000" :title="detail.name || ''" />
     <view class="boxsBr">
       <view class="boxs">
         <view class="box" v-for="(item, index) in bosList" @click="toDrawCard_boxDetail(item)">
@@ -17,7 +15,7 @@
       </view>
     </view>
     <view class="text">官方正品,非质量问题不支持退换</view>
-    <view class="number">{{ num }} / {{ detail.roundNum }} 箱</view>
+    <view class="number">{{ num }} / {{ detail.roundNum || 0 }} 箱</view>
     <view class="buttons">
       <view class="button" @click="boxChange(-1)">上一箱</view>
       <view class="button" @click="boxChange(1)">下一箱</view>
@@ -25,18 +23,22 @@
 
     <view class="rightButtons">
       <view class="button" @click="$navigateTo('/pages/rule/rule', { type: 4 })">规则</view>
-      <view class="button" style="top: 44px" @click="toKnapsack">背包</view>
+      <view class="button" style="top: 88rpx" @click="toKnapsack">背包</view>
     </view>
   </view>
 </template>
 
 <script>
 import { raffleDetailApi, getBoxList } from '@/api/drawCard.js'
+import PageTitle from '@/component/pageTitle.vue'
 export default {
+  components: {
+    PageTitle,
+  },
   data() {
     return {
       raffleId: null,
-      detail: null,
+      detail: {},
       num: 1,
       bosList: [],
     }
@@ -115,11 +117,15 @@ export default {
 
 <style scoped lang="scss">
 .container {
-  background: #9ec8f9;
+  background-image: url(https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_box/bk.png);
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  background-color: #9ec8f9;
   overflow: inherit;
+  padding-bottom: 20vw;
 
   .title {
-    padding: 20px 0;
+    padding: 40rpx 0;
     text-align: center;
     font-weight: 600;
   }
@@ -127,31 +133,31 @@ export default {
   .boxsBr {
     margin: 20vw auto 0 auto;
     width: 70vw;
-    height: 70vw;
+    // height: 70vw;
     background: linear-gradient(180deg, #f29b9b 0%, #e5bfb9 100%);
-    border-radius: 8px 8px 8px 8px;
-    padding: 4px;
+    border-radius: 16rpx 16rpx 16rpx 16rpx;
+    padding: 8rpx;
 
     .boxs {
       width: 100%;
       height: 100%;
       background: linear-gradient(180deg, #829bfb 0%, #9cdbfc 100%);
-      border-radius: 6px;
+      border-radius: 12rpx;
       display: grid;
       grid-template-columns: 1fr 1fr 1fr;
       grid-template-rows: 1fr 1fr 1fr;
-      grid-gap: 2px;
+      grid-gap: 4rpx;
 
       .box {
         background: linear-gradient(139deg, #a292e9 0%, #a0dfff 100%);
-        border-radius: 4px 4px 4px 4px;
+        border-radius: 8rpx 8rpx 8rpx 8rpx;
         opacity: 1;
-        border: 1px solid #ffffff;
+        border: 2rpx solid #ffffff;
         display: inline-flex;
         justify-content: center;
         align-items: center;
         color: #ffffff;
-        text-shadow: 2px 2px 2px #829bfb;
+        text-shadow: 4rpx 4rpx 4rpx #829bfb;
         font-weight: 600;
         position: relative;
 
@@ -172,23 +178,25 @@ export default {
       }
     }
   }
+
   .text {
     margin-top: 4vw;
     color: #000;
     width: 100%;
-    font-size: 14px;
+    font-size: 28rpx;
     text-align: center;
   }
+
   .number {
     margin-top: 4vw;
     text-align: center;
     color: #ffffff;
-    text-shadow: 2px 2px 2px #829bfb;
+    text-shadow: 4rpx 4rpx 4rpx #829bfb;
     font-weight: 600;
   }
 
   .buttons {
-    margin-top: 10px;
+    margin-top: 20rpx;
     display: flex;
     justify-content: space-around;
 
@@ -196,10 +204,10 @@ export default {
       color: #fff;
       font-weight: 600;
       background: linear-gradient(180deg, #89a9fa 0%, #716ff5 100%);
-      height: 40px;
-      border-radius: 20px;
-      padding: 0 30px;
-      line-height: 40px;
+      height: 80rpx;
+      border-radius: 40rpx;
+      padding: 0 60rpx;
+      line-height: 80rpx;
       width: 20vw;
       text-align: center;
     }
@@ -210,14 +218,14 @@ export default {
 
     .button2 {
       width: 35vw;
-      margin-bottom: 5px;
+      margin-bottom: 10rpx;
     }
   }
 
   .rightButtons {
     position: fixed;
     right: 0;
-    width: 50px;
+    width: 100rpx;
     height: 70vh;
     top: 50%;
     transform: translateY(-50%);
@@ -226,12 +234,12 @@ export default {
       position: absolute;
       right: 0;
       background: rgba(255, 255, 255, 0.7);
-      font-size: 10px;
+      font-size: 20rpx;
       text-align: center;
-      height: 24px;
-      line-height: 24px;
-      border-radius: 12px 0 0 12px;
-      width: 46px;
+      height: 48rpx;
+      line-height: 48rpx;
+      border-radius: 24rpx 0 0 24rpx;
+      width: 92rpx;
     }
   }
 }

+ 32 - 26
pages/drawCard_box/drawCard_boxDetail.vue

@@ -1,15 +1,16 @@
 <template>
   <view class="container">
+    <PageTitle color="#000" :title="detail.name || ''" />
     <view class="product">
       <uni-swiper-dot class="uni-swiper-dot-box" :info="info" :current="current" :mode="mode" field="content">
         <swiper class="swiper-box" @change="swiperChange" :current="swiperDotIndex">
           <swiper-item v-for="(item, index) in boxDetail.boxLeft">
-            <image class="swiperItem" :src="detail.prizeIcon" mode="aspectFit" />
+            <image class="swiperItem" :src="detail.icon" mode="aspectFit" />
           </swiper-item>
         </swiper>
       </uni-swiper-dot>
     </view>
-    <view class="number">{{ num }} / {{ boxDetail.boxLeft }} 包</view>
+    <view class="number">{{ num }} / {{ boxDetail.boxLeft || 0 }} 包</view>
     <view class="tipText">官方正品,非质量问题不支持退换</view>
     <view class="prizes">
       <view class="prizesLine">
@@ -42,7 +43,7 @@
     </view>
     <view class="rightButtons">
       <view class="button" @click="$navigateTo('/pages/rule/rule', { type: 4 })">规则</view>
-      <view class="button" @click="toKnapsack" style="top: 44px">背包</view>
+      <view class="button" @click="toKnapsack" style="top: 88rpx">背包</view>
       <view class="button" @click="toWinningRecord" style="bottom: 0">中奖记录</view>
     </view>
 
@@ -52,6 +53,7 @@
 </template>
 
 <script>
+import PageTitle from '@/component/pageTitle.vue'
 import paymentPopup from '@/component/paymentPopup.vue'
 import imgPopup from '@/component/imgPopup.vue'
 import { raffleDetailApi, getRoundPrizes, getBoxDetail } from '@/api/drawCard.js'
@@ -59,6 +61,7 @@ export default {
   components: {
     paymentPopup,
     imgPopup,
+    PageTitle,
   },
   data() {
     return {
@@ -89,15 +92,15 @@ export default {
       this.$refs.imgPopup.show(value)
     },
     aniRun() {
-      // 同时右平移到 100px,旋转 360 读
+      // 同时右平移到 200rpx,旋转 360 读
       this.$refs.ani.step({
-        translateX: '100px',
+        translateX: '200rpx',
         rotate: '360',
       })
-      // 上面的动画执行完成后,等待200毫秒平移到 0px,旋转到 0 读
+      // 上面的动画执行完成后,等待200毫秒平移到 0rpx,旋转到 0 读
       this.$refs.ani.step(
         {
-          translateX: '0px',
+          translateX: '0rpx',
           rotate: '0',
         },
         {
@@ -169,7 +172,10 @@ export default {
 
 <style scoped lang="scss">
 .container {
-  background: #9ec8f9;
+  background-image: url(https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_box/bk.png);
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  background-color: #9ec8f9;
   overflow: inherit;
 
   .product {
@@ -199,21 +205,21 @@ export default {
     margin-top: 5vw;
     text-align: center;
     color: #ffffff;
-    text-shadow: 2px 2px 2px #829bfb;
+    text-shadow: 4rpx 4rpx 4rpx #829bfb;
     font-weight: 600;
   }
 
   .tipText {
     text-align: center;
     margin-top: 3vw;
-    font-size: 13px;
+    font-size: 26rpx;
     font-weight: 600;
   }
 
   .prizes {
     margin-top: 15vw;
     overflow: auto;
-    padding: 0 20px;
+    padding: 0 40rpx;
 
     .prizesLine {
       position: relative;
@@ -222,9 +228,9 @@ export default {
 
     .prize {
       display: inline-block;
-      margin-right: 10px;
+      margin-right: 20rpx;
       background: linear-gradient(180deg, #faf1a7 0%, #ffe456 100%);
-      border-radius: 5px;
+      border-radius: 10rpx;
       overflow: hidden;
       width: 20vw;
 
@@ -238,7 +244,7 @@ export default {
         text-align: center;
 
         .name {
-          font-size: 12px;
+          font-size: 24rpx;
           width: calc(100% - 20rpx);
           overflow: hidden;
           text-overflow: ellipsis;
@@ -247,7 +253,7 @@ export default {
 
         .price {
           color: #ff2c43;
-          font-size: 12px;
+          font-size: 24rpx;
           font-weight: 600;
         }
       }
@@ -261,13 +267,13 @@ export default {
 
     .button {
       // width: 35vw;
-      height: 40px;
-      // padding: 0 20px;
-      border-radius: 20px;
-      line-height: 40px;
+      height: 80rpx;
+      // padding: 0 40rpx;
+      border-radius: 40rpx;
+      line-height: 80rpx;
       color: #fff;
       font-weight: 600;
-      font-size: 18px;
+      font-size: 36rpx;
       text-align: center;
     }
   }
@@ -275,7 +281,7 @@ export default {
   .rightButtons {
     position: fixed;
     right: 0;
-    width: 50px;
+    width: 100rpx;
     height: 70vh;
     top: 50%;
     transform: translateY(-50%);
@@ -284,12 +290,12 @@ export default {
       position: absolute;
       right: 0;
       background: rgba(255, 255, 255, 0.7);
-      font-size: 10px;
+      font-size: 20rpx;
       text-align: center;
-      height: 24px;
-      line-height: 24px;
-      border-radius: 12px 0 0 12px;
-      width: 46px;
+      height: 48rpx;
+      line-height: 48rpx;
+      border-radius: 24rpx 0 0 24rpx;
+      width: 92rpx;
     }
   }
 }

+ 75 - 50
pages/drawCard_first/drawCard_first.vue

@@ -15,25 +15,15 @@
         'background-repeat': 'no-repeat',
         'background-position': 'center center',
         'background-size': '100% 100%',
-        'padding-top': safeAreaTop,
         'box-sizing': 'border-box',
         overflow: 'scroll',
         'padding-bottom': '160rpx',
       }"
     >
-      <div class="text-white bold text-center mt-2">
-        <uni-icons
-          type="left"
-          size="20"
-          color="#fff"
-          style="position: absolute; left: 0; margin-left: 10px"
-          @click="back"
-        ></uni-icons>
-        FIRST赏详情
-      </div>
+      <PageTitle color="#fff" title="FIRST赏详情" />
       <div class="card relative">
         <div class="flex pt-3 px-3">
-          <image :src="detail.prizeIcon" style="width: 168rpx; height: 169rpx; border-radius: 8px" mode="aspectFill" />
+          <image :src="detail.icon" style="width: 168rpx; height: 169rpx; border-radius: 16rpx" mode="aspectFill" />
           <div class="flex-1 pl-2">
             <div class="" style="font-weight: 900">{{ detail.name }}</div>
             <div class="flex justify-between">
@@ -45,7 +35,7 @@
                 <span class="bold" style="color: #ff2c43; font-size: 28rpx">
                   .{{ ('' + detail.price).split('.')[1] }}
                 </span>
-                <span style="color: #4e504f; font-size: 14px">/张明信片</span>
+                <span style="color: #4e504f; font-size: 28rpx">/张明信片</span>
               </div>
               <div class="pt-2">
                 <img
@@ -55,31 +45,61 @@
                 />
               </div>
             </div>
-            <div class="flex justify-between" style="margin-top: 5px">
+            <div class="flex justify-between" style="margin-top: 10rpx">
               <div>
                 <img
                   src="https://fudaanfang.oss-cn-hangzhou.aliyuncs.com/festatic/bkm/item.png"
-                  style="width: 40rpx; height: 40rpx; border-radius: 50%; display: inline-block; border: 1px solid #fff"
+                  style="
+                    width: 40rpx;
+                    height: 40rpx;
+                    border-radius: 50%;
+                    display: inline-block;
+                    border: 2rpx solid #fff;
+                  "
                 />
                 <img
                   src="https://fudaanfang.oss-cn-hangzhou.aliyuncs.com/festatic/bkm/item.png"
                   class="relative right-2"
-                  style="width: 40rpx; height: 40rpx; border-radius: 50%; display: inline-block; border: 1px solid #fff"
+                  style="
+                    width: 40rpx;
+                    height: 40rpx;
+                    border-radius: 50%;
+                    display: inline-block;
+                    border: 2rpx solid #fff;
+                  "
                 />
                 <img
                   src="https://fudaanfang.oss-cn-hangzhou.aliyuncs.com/festatic/bkm/item.png"
                   class="relative right-4"
-                  style="width: 40rpx; height: 40rpx; border-radius: 50%; display: inline-block; border: 1px solid #fff"
+                  style="
+                    width: 40rpx;
+                    height: 40rpx;
+                    border-radius: 50%;
+                    display: inline-block;
+                    border: 2rpx solid #fff;
+                  "
                 />
                 <img
                   src="https://fudaanfang.oss-cn-hangzhou.aliyuncs.com/festatic/bkm/item.png"
                   class="relative right-6"
-                  style="width: 40rpx; height: 40rpx; border-radius: 50%; display: inline-block; border: 1px solid #fff"
+                  style="
+                    width: 40rpx;
+                    height: 40rpx;
+                    border-radius: 50%;
+                    display: inline-block;
+                    border: 2rpx solid #fff;
+                  "
                 />
                 <img
                   src="https://fudaanfang.oss-cn-hangzhou.aliyuncs.com/festatic/bkm/item.png"
                   class="relative right-8"
-                  style="width: 40rpx; height: 40rpx; border-radius: 50%; display: inline-block; border: 1px solid #fff"
+                  style="
+                    width: 40rpx;
+                    height: 40rpx;
+                    border-radius: 50%;
+                    display: inline-block;
+                    border: 2rpx solid #fff;
+                  "
                 />
               </div>
               <div class="flex items-center">
@@ -116,10 +136,10 @@
           class="absolute left-0 right-0 bottom-1 mx-auto"
           style="
             width: 690rpx;
-            height: 12px;
+            height: 24rpx;
             background: #4f5150;
-            box-shadow: inset 0px 4px 4px 0px rgba(0, 0, 0, 0.8);
-            border-radius: 22px 22px 22px 22px;
+            box-shadow: inset 0rpx 8rpx 8rpx 0rpx rgba(0, 0, 0, 0.8);
+            border-radius: 44rpx 44rpx 44rpx 44rpx;
             opacity: 1;
           "
         >
@@ -131,11 +151,11 @@
               width: 670rpx;
               min-height: 890rpx;
               background: linear-gradient(180deg, #ccd3d9 0%, #ffffff 5%);
-              border-radius: 0px 0px 0px 0px;
+              border-radius: 0rpx 0rpx 0rpx 0rpx;
               opacity: 1;
             "
           >
-            <div class="flex justify-around" style="margin: 10px 0">
+            <div class="flex justify-around" style="margin: 20rpx 0">
               <img
                 src="https://file.rongcyl.cn/festatic/bkm/first2/tab1.png"
                 v-if="tabIndex !== 1"
@@ -207,12 +227,12 @@
                     v-for="(item2, index2) in item.prizeList"
                     @click="showImg(item2)"
                     :class="['mr-2', item2.leftNum == 0 ? 'grey' : '']"
-                    style="width: 168rpx; background-color: #f9f6f2; border-radius: 4px; margin-bottom: 10px"
+                    style="width: 168rpx; background-color: #f9f6f2; border-radius: 8rpx; margin-bottom: 20rpx"
                   >
                     <image
                       :src="item2.icon"
                       mode="aspectFill"
-                      style="width: 144rpx; height: 144rpx; border-radius: 5px; margin: auto"
+                      style="width: 144rpx; height: 144rpx; border-radius: 10rpx; margin: auto"
                     />
                     <div class="fs13 pl-2 prizeName">{{ item2.name }}</div>
                     <div style="color: #ea6636" class="pl-2">
@@ -236,15 +256,15 @@
                       <span>{{ item.creatTime }}</span>
                     </view>
                   </view>
-                  <view class="row" style="margin-top: 10px">
+                  <view class="row" style="margin-top: 20rpx">
                     <view class="left">
                       <image class="img" :src="item.prizeIcon" mode="aspectFill"></image>
                     </view>
-                    <view class="right" style="font-size: 14px">
+                    <view class="right" style="font-size: 28rpx">
                       <view class="name">{{ item.prizeName }}</view>
                       <view class="row">
                         <view class="type">{{ $selectDictLabel(rewardType, item.prizeType) }} × 1</view>
-                        <span style="font-size: 12px">No.{{ item.id }}</span>
+                        <span style="font-size: 24rpx">No.{{ item.id }}</span>
                       </view>
                     </view>
                   </view>
@@ -262,6 +282,8 @@
 
       <div class="fixed right-2 bottom-20" style="height: 460rpx">
         <img
+          v-if="detail.resultUrl"
+          @click="toDloadFilePopup(detail.resultUrl)"
           src="https://file.rongcyl.cn/festatic/bkm/first2/fu.png"
           style="width: 88rpx; height: 88rpx; margin-bottom: 24rpx"
         />
@@ -316,16 +338,18 @@ import {
   prizeListApi,
   prizeUserListApi,
 } from '@/api/drawCard.js'
-import { cardType } from '@/utils/utils.js'
+import { cardType, toDloadFilePopup } from '@/utils/utils.js'
 
 import numImg from '@/component/numImg.vue'
 import paymentPopup from '@/component/paymentPopup.vue'
 import Title from '@/component/title.vue'
+import PageTitle from '@/component/pageTitle.vue'
 export default {
   data() {
     return {
+      toDloadFilePopup: toDloadFilePopup,
       rewardType: rewardType,
-      safeAreaTop: '0px',
+      safeAreaTop: '0rpx',
       tabIndex: 1,
       params: {
         raffleId: '',
@@ -341,6 +365,7 @@ export default {
   },
   components: {
     Title,
+    PageTitle,
     imgPopup,
     paymentPopup,
     numImg,
@@ -499,9 +524,9 @@ export default {
     width: 710rpx;
     margin: auto;
     background-color: #fff;
-    border-radius: 10px;
+    border-radius: 20rpx;
     height: 400rpx;
-    margin-top: 18px;
+    margin-top: 36rpx;
   }
 
   .c1 {
@@ -559,7 +584,7 @@ export default {
 }
 
 .list {
-  // height: calc(100% - 32rpx - 20px - 20px);
+  // height: calc(100% - 32rpx - 40rpx - 40rpx);
   // overflow: auto;
 }
 
@@ -572,25 +597,25 @@ export default {
 .titleTip {
   position: absolute;
   z-index: 2;
-  height: 32px;
-  line-height: 42px;
+  height: 64rpx;
+  line-height: 84rpx;
   padding-left: 25vw;
-  font-size: 12px;
+  font-size: 24rpx;
   color: #fff;
 }
 
 .winningRecord {
   .winningRecordCard {
-    margin-top: 10px;
-    border-radius: 8px;
+    margin-top: 20rpx;
+    border-radius: 16rpx;
     background: #f7f0e8;
-    padding: 10px;
+    padding: 20rpx;
     display: flex;
-    // box-shadow: 1px 1px 3px #b7b7b7;
+    // box-shadow: 2rpx 2rpx 6rpx #b7b7b7;
 
     .photo {
       // flex: 1;
-      margin-right: 8px;
+      margin-right: 16rpx;
       width: 10vw;
       height: 10vw;
       border-radius: 50%;
@@ -605,22 +630,22 @@ export default {
         align-items: center;
 
         .name {
-          font-size: 14px;
+          font-size: 28rpx;
           font-weight: 600;
         }
 
         .img {
           width: 15vw;
           height: 15vw;
-          border-radius: 2px;
-          margin-right: 5px;
+          border-radius: 4rpx;
+          margin-right: 10rpx;
         }
       }
       .right {
         flex: 1;
 
         .name {
-          font-size: 14px;
+          font-size: 28rpx;
           height: 10vw;
           overflow: hidden;
           text-overflow: ellipsis;
@@ -631,15 +656,15 @@ export default {
       }
 
       .type {
-        padding: 0 2px;
+        padding: 0 4rpx;
         background: #fc5b20;
         color: #fff;
-        font-size: 11px;
-        border-radius: 2px;
+        font-size: 22rpx;
+        border-radius: 4rpx;
       }
       .text1 {
         color: #666666;
-        font-size: 12px;
+        font-size: 24rpx;
       }
     }
   }

+ 80 - 91
pages/drawCard_fullSet/drawCard_fullSet.vue

@@ -1,23 +1,9 @@
 <template>
   <view class="container">
-    <view
-      class="bk"
-      :style="{
-        'padding-top': safeAreaTop,
-      }"
-    >
-      <div class="text-white bold text-center mt-2">
-        <uni-icons
-          type="left"
-          size="20"
-          color="#fff"
-          style="position: absolute; left: 0; margin-left: 10px"
-          @click="back"
-        ></uni-icons>
-        全套赏
-      </div>
-      <view class="head" style="margin-top: 18px">
-        <image class="img" :src="detail.prizeIcon" mode="aspectFill"></image>
+    <view class="bk">
+      <PageTitle color="#fff" title="全套赏详情" />
+      <view class="head" style="margin-top: 36rpx">
+        <image class="img" :src="detail.icon" mode="aspectFill"></image>
         <view class="info">
           <view class="title row">
             {{ detail.name }}
@@ -68,7 +54,7 @@
               :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_fullSet/icon1.png'"
               mode="widthFix"
             ></image>
-            <view class="row text2" style="font-size: 14px">已选择 {{ selectIndex.length }} 个</view>
+            <view class="row text2" style="font-size: 28rpx">已选择 {{ selectIndex.length }} 个</view>
           </view>
           <view class="right">
             <view class="text">
@@ -261,15 +247,17 @@ import { cardType, formatSeconds } from '@/utils/utils.js'
 
 import numImg from '@/component/numImg.vue'
 import paymentPopup from '@/component/paymentPopup.vue'
+import PageTitle from '@/component/pageTitle.vue'
 
 export default {
   components: {
+    PageTitle,
     numImg,
     paymentPopup,
   },
   data() {
     return {
-      safeAreaTop: '0px',
+      safeAreaTop: '0rpx',
       countdown: '',
       countdownInfinity: null,
       cardType: cardType,
@@ -528,7 +516,7 @@ export default {
 
   .bk {
     overflow: auto;
-    padding-top: 15px;
+    padding-top: 30rpx;
     background-image: url(https://file.rongcyl.cn/festatic/bkm/first2/bg.png);
     height: calc(100vh - 160rpx);
     background-repeat: no-repeat;
@@ -563,27 +551,27 @@ export default {
 
   .refresh {
     position: fixed;
-    right: 4px;
+    right: 8rpx;
     top: 75%;
-    width: 40px;
+    width: 80rpx;
     z-index: 5;
   }
 
   .head {
     background: #fff;
-    border: 10px;
-    padding: 15px;
-    border-radius: 10px 10px 0 0;
+    border: 20rpx;
+    padding: 30rpx;
+    border-radius: 20rpx 20rpx 0 0;
     display: flex;
     justify-content: space-between;
-    margin-bottom: 20px;
+    margin-bottom: 40rpx;
 
     .img {
-      width: 106px;
-      height: 106px;
-      border-radius: 5px;
+      width: 212rpx;
+      height: 212rpx;
+      border-radius: 10rpx;
       overflow: hidden;
-      margin-right: 10px;
+      margin-right: 20rpx;
     }
 
     .info {
@@ -593,22 +581,22 @@ export default {
       flex: 1;
 
       .row {
-        margin: 5px 0;
+        margin: 10rpx 0;
         display: flex;
         justify-content: space-between;
         color: #999999;
 
         .button {
-          width: 67px;
+          width: 134rpx;
         }
 
         .hot {
           display: flex;
-          font-size: 12px;
+          font-size: 24rpx;
           color: #999999;
 
           image {
-            width: 16px;
+            width: 32rpx;
           }
         }
 
@@ -617,8 +605,8 @@ export default {
 
           .photo {
             position: absolute;
-            width: 20px;
-            height: 20px;
+            width: 40rpx;
+            height: 40rpx;
             border-radius: 50%;
           }
         }
@@ -630,12 +618,12 @@ export default {
       }
 
       .price {
-        font-size: 16px;
+        font-size: 32rpx;
         font-weight: 600;
         color: #ff2c43;
 
         .text {
-          font-size: 14px;
+          font-size: 28rpx;
           color: #999999;
           font-weight: 500;
         }
@@ -644,25 +632,25 @@ export default {
   }
 
   .cardList {
-    margin: 10px;
-    border-radius: 12px;
+    margin: 20rpx;
+    border-radius: 24rpx;
     position: relative;
     // background: linear-gradient(180deg, #31b7fd 10%, #6478fd 90%);
     background: #ff6f01;
     // overflow: scroll;
-    padding-bottom: 1px;
+    padding-bottom: 2rpx;
 
     .countdown {
       position: absolute;
-      top: 1px;
-      padding-left: 70px;
-      font-size: 15px;
+      top: 2rpx;
+      padding-left: 140rpx;
+      font-size: 30rpx;
     }
 
     .itemHead {
       position: relative;
-      left: -10px;
-      top: -10px;
+      left: -20rpx;
+      top: -20rpx;
       width: calc(100% + 20rpx);
     }
 
@@ -670,14 +658,14 @@ export default {
       display: flex;
       justify-content: space-between;
       color: #fff;
-      padding: 0 15px 6px 15px;
+      padding: 0 30rpx 12rpx 30rpx;
 
       .left {
         .text1 {
           width: 6.5rem;
-          // font-size: 24px;
+          // font-size: 48rpx;
           // font-weight: 600;
-          // text-shadow: 1px 1px 0px #0A57BA;
+          // text-shadow: 2rpx 2rpx 0rpx #0A57BA;
           // font-family: YouSheBiaoTiHei-Regular, YouSheBiaoTiHei;
         }
 
@@ -692,14 +680,14 @@ export default {
         display: flex;
 
         .text {
-          width: 100px;
-          font-size: 12px;
+          width: 200rpx;
+          font-size: 24rpx;
           text-align: right;
         }
 
         .button {
-          width: 72px;
-          height: 30px;
+          width: 144rpx;
+          height: 30rpx;
         }
       }
     }
@@ -710,16 +698,16 @@ export default {
 
     .list {
       background: #fff;
-      padding: 15px;
-      border-radius: 12px;
-      // width: calc(100% - 80px);
-      // height: calc(100% - 70px);
+      padding: 30rpx;
+      border-radius: 24rpx;
+      // width: calc(100% - 160rpx);
+      // height: calc(100% - 140rpx);
       // position: absolute;
       // top: 0;
       display: grid;
       grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
       grid-template-rows: 1fr 1fr 1fr;
-      grid-gap: 15px;
+      grid-gap: 30rpx;
 
       .c1 {
         background-image: url(https://file.rongcyl.cn/festatic/bkm/imgv2/ka/kabk3.png);
@@ -762,7 +750,7 @@ export default {
 
         .kaBk {
           width: 100%;
-          border-radius: 4px;
+          border-radius: 8rpx;
           z-index: 2;
         }
 
@@ -778,49 +766,49 @@ export default {
 
     .buyButton {
       width: 40%;
-      margin: 10px auto;
+      margin: 20rpx auto;
     }
   }
 
   .winningList {
-    margin: 20px 10px;
-    padding: 15px;
+    margin: 40rpx 20rpx;
+    padding: 30rpx;
     background: linear-gradient(180deg, #ff6f01 10%, #ff5a01 90%);
-    border-radius: 12px;
+    border-radius: 24rpx;
 
     .winningListTitle {
-      width: 92px;
-      margin-bottom: 12px;
+      width: 184rpx;
+      margin-bottom: 24rpx;
     }
 
     .list {
       position: relative;
-      padding: 12px 7px 12px 12px;
-      border-radius: 12px;
+      padding: 24rpx 14rpx 24rpx 24rpx;
+      border-radius: 24rpx;
       background: #fff;
       display: flex;
 
       .item {
-        width: calc(100% / 6 - 5px);
+        width: calc(100% / 6 - 10rpx);
         // margin: 0 auto;
         position: relative;
         display: inline-flex;
         flex-direction: column;
         justify-content: center;
         align-items: center;
-        margin-right: 5px;
+        margin-right: 10rpx;
 
         .photo {
-          width: 40px;
-          height: 40px;
+          width: 80rpx;
+          height: 80rpx;
           border-radius: 50%;
           background: #b6b6b6;
         }
 
         .name {
-          margin-top: 5px;
+          margin-top: 10rpx;
           display: inline-block;
-          font-size: 11px;
+          font-size: 22rpx;
           max-width: 100%;
           overflow: hidden;
           white-space: nowrap;
@@ -834,7 +822,7 @@ export default {
     display: flex;
     justify-content: center;
     align-items: flex-start;
-    padding: 0 10px;
+    padding: 0 20rpx;
 
     .button1 {
       height: 70rpx;
@@ -846,17 +834,18 @@ export default {
       border-radius: 35rpx;
       padding: 0 20rpx;
       font-weight: 600;
+      font-size: 32rpx;
     }
   }
 
   .prizes {
     .title {
-      width: 103px;
+      width: 206rpx;
       margin: 0 auto;
     }
 
     .prizesList {
-      margin: 20px;
+      margin: 40rpx;
       position: relative;
       overflow: hidden;
       // z-index: 5;
@@ -870,12 +859,12 @@ export default {
 
       .prizesTitle {
         position: relative;
-        height: 30px;
-        line-height: 30px;
+        height: 60rpx;
+        line-height: 60rpx;
         width: 100%;
-        margin-left: 1px;
-        margin-top: 15px;
-        padding-left: 15px;
+        margin-left: 2rpx;
+        margin-top: 30rpx;
+        padding-left: 30rpx;
         color: #fff;
         font-weight: 800;
         background: linear-gradient(90deg, rgba(89, 166, 255, 0.8) 0%, rgba(158, 200, 249, 0) 100%);
@@ -885,7 +874,7 @@ export default {
         position: relative;
         display: grid;
         grid-template-columns: 1fr 1fr;
-        margin: 15px;
+        margin: 30rpx;
         white-space: wrap;
         text-align: center;
         // overflow: auto;
@@ -897,8 +886,8 @@ export default {
             display: inline-block;
             width: 36vw;
             height: 36vw;
-            border-radius: 10px;
-            margin: 0 5px;
+            border-radius: 20rpx;
+            margin: 0 10rpx;
           }
         }
       }
@@ -907,7 +896,7 @@ export default {
         position: relative;
         display: flex;
         justify-content: center;
-        margin: 15px;
+        margin: 30rpx;
 
         .image {
           text-align: center;
@@ -916,8 +905,8 @@ export default {
             display: inline-block;
             width: 45vw;
             height: 45vw;
-            border-radius: 10px;
-            margin: 0 5px;
+            border-radius: 20rpx;
+            margin: 0 10rpx;
           }
         }
       }
@@ -927,13 +916,13 @@ export default {
 
 .examples {
   width: 100%;
-  margin-bottom: 20px;
-  padding: 0 10px;
+  margin-bottom: 40rpx;
+  padding: 0 20rpx;
   display: flex;
 
   .example {
     width: 14vw;
-    margin-right: 10px;
+    margin-right: 20rpx;
     display: flex;
     justify-content: center;
     flex-wrap: wrap;

+ 20 - 20
pages/drawCard_fullSet/goods.vue

@@ -8,12 +8,12 @@
           v-for="(item2, index2) in item.prizeList"
           @click="showImg(item2)"
           :class="['mr-2', item2.leftNum == 0 ? 'grey' : '']"
-          style="width: 168rpx; background-color: #f9f6f2; border-radius: 4px; margin-bottom: 10px"
+          style="width: 168rpx; background-color: #f9f6f2; border-radius: 8rpx; margin-bottom: 20rpx"
         >
           <image
             :src="item2.icon"
             mode="aspectFill"
-            style="width: 144rpx; height: 144rpx; border-radius: 5px; margin: auto"
+            style="width: 144rpx; height: 144rpx; border-radius: 10rpx; margin: auto"
           />
           <div class="fs13 pl-2 prizeName">{{ item2.name }}</div>
           <div style="color: #ea6636" class="pl-2">
@@ -70,20 +70,20 @@ export default {
 <style scoped lang="scss">
 .container {
   background: linear-gradient(216deg, #fe854c 0%, #ff9a5a 100%);
-  padding-top: 15px;
+  padding-top: 30rpx;
   overflow: auto;
 }
 .list {
-  padding: 10px;
+  padding: 20rpx;
 }
 .prizes {
   .title {
-    width: 103px;
+    width: 206rpx;
     margin: 0 auto;
   }
 
   .prizesList {
-    margin: 20px;
+    margin: 40rpx;
     position: relative;
     overflow: hidden;
     // z-index: 5;
@@ -96,12 +96,12 @@ export default {
     }
     .prizesTitle {
       position: relative;
-      height: 30px;
-      line-height: 30px;
+      height: 60rpx;
+      line-height: 60rpx;
       width: 100%;
-      margin-left: 1px;
-      margin-top: 15px;
-      padding-left: 15px;
+      margin-left: 2rpx;
+      margin-top: 30rpx;
+      padding-left: 30rpx;
       color: #fff;
       font-weight: 800;
       background: linear-gradient(90deg, rgba(89, 166, 255, 0.8) 0%, rgba(158, 200, 249, 0) 100%);
@@ -110,7 +110,7 @@ export default {
       position: relative;
       display: grid;
       grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
-      margin: 15px;
+      margin: 30rpx;
       white-space: wrap;
       text-align: center;
       // overflow: auto;
@@ -122,8 +122,8 @@ export default {
           display: inline-block;
           width: 20vw;
           height: 20vw;
-          // border-radius: 10px;
-          margin: 0 5px;
+          // border-radius: 20rpx;
+          margin: 0 10rpx;
         }
       }
     }
@@ -131,7 +131,7 @@ export default {
       position: relative;
       display: flex;
       justify-content: center;
-      margin: 15px;
+      margin: 30rpx;
 
       .image {
         text-align: center;
@@ -140,8 +140,8 @@ export default {
           display: inline-block;
           width: 45vw;
           height: 45vw;
-          border-radius: 10px;
-          margin: 0 5px;
+          border-radius: 20rpx;
+          margin: 0 10rpx;
         }
       }
     }
@@ -150,10 +150,10 @@ export default {
 .titleTip {
   position: absolute;
   z-index: 2;
-  height: 32px;
-  line-height: 42px;
+  height: 64rpx;
+  line-height: 84rpx;
   padding-left: 25vw;
-  font-size: 12px;
+  font-size: 24rpx;
   color: #fff;
 }
 </style>

+ 15 - 15
pages/drawCard_fullSet/winningList.vue

@@ -108,48 +108,48 @@ export default {
 <style scoped lang="scss">
 .collapseItem {
   background: #fff;
-  border-radius: 8px;
-  margin: 0 10px 10px 10px;
+  border-radius: 16rpx;
+  margin: 0 20rpx 20rpx 20rpx;
   position: relative;
 }
 .collapseTitle {
   display: flex;
   align-items: center;
-  padding: 10px;
+  padding: 20rpx;
 
   .photo {
-    width: 40px;
-    height: 40px;
-    margin-right: 8px;
+    width: 80rpx;
+    height: 80rpx;
+    margin-right: 16rpx;
     border-radius: 50%;
   }
 
   .text {
-    font-size: 12px;
+    font-size: 24rpx;
     color: #333333;
     font-weight: 600;
   }
   .icon {
-    width: 24px;
-    height: 24px;
+    width: 48rpx;
+    height: 48rpx;
     position: absolute;
-    right: 10px;
+    right: 20rpx;
   }
 }
 .content {
   display: grid;
   grid-template-columns: 1fr 1fr 1fr 1fr;
-  grid-gap: 10px;
-  padding: 10px;
+  grid-gap: 20rpx;
+  padding: 20rpx;
   .item {
     width: 100%;
     display: flex;
     justify-content: center;
     background: linear-gradient(180deg, #faf1a7 0%, #ffe456 100%);
-    border-radius: 4px;
+    border-radius: 8rpx;
 
     .img {
-      height: 76px;
+      height: 152rpx;
     }
   }
 }
@@ -159,6 +159,6 @@ export default {
   background: none;
 }
 .collapse1 >>> .uni-collapse-item__wrap {
-  border-radius: 0 0 8px 8px;
+  border-radius: 0 0 16rpx 16rpx;
 }
 </style>

+ 91 - 91
pages/drawCard_infinite/drawCard_infinite.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="container">
     <view class="head">
-      <image class="img" :src="detail.prizeIcon" mode="aspectFill"></image>
+      <image class="img" :src="detail.icon" mode="aspectFill"></image>
       <view class="info">
         <view class="title row">
           {{ detail.name }}
@@ -34,8 +34,8 @@
       <div class="flex items-center" @click="showList">
         <img src="https://file.rongcyl.cn/festatic/bkm/ouking_a.png" class="w-10 h-10" />
         <div class="ml-1">
-          <div class="fontPFSCS" style="font-size: 15px">欧王奖励</div>
-          <div style="font-size: 12px">{{ ouCount }}届欧王</div>
+          <div class="fontPFSCS" style="font-size: 30rpx">欧王奖励</div>
+          <div style="font-size: 24rpx">{{ ouCount }}届欧王</div>
         </div>
       </div>
       <div class="flex items-center">
@@ -46,8 +46,8 @@
         />
         <img src="https://file.rongcyl.cn/festatic/bkm/x.png" class="w-10 h-10" v-else />
         <div class="ml-1" :style="{ color: detail.subType.includes('111') ? '' : '#a9bcd1' }">
-          <div class="fontPFSCS" style="font-size: 15px">随机掉落</div>
-          <div style="font-size: 12px">
+          <div class="fontPFSCS" style="font-size: 30rpx">随机掉落</div>
+          <div style="font-size: 24rpx">
             {{ detail.subType.includes('111') ? '已开启' : '未开启' }}
           </div>
         </div>
@@ -60,8 +60,8 @@
         />
         <img src="https://file.rongcyl.cn/festatic/bkm/free.png" class="w-10 h-10" v-else />
         <div class="ml-1" :style="{ color: detail.subType.includes('112') ? '' : '#a9bcd1' }">
-          <div class="fontPFSCS" style="font-size: 15px">随机免单</div>
-          <div style="font-size: 12px">
+          <div class="fontPFSCS" style="font-size: 30rpx">随机免单</div>
+          <div style="font-size: 24rpx">
             {{ detail.subType.includes('112') ? '已开启' : '未开启' }}
           </div>
         </div>
@@ -97,7 +97,7 @@
       <image
         class="button"
         @click="tabClick(1)"
-        style="margin-right: 20px"
+        style="margin-right: 40rpx"
         :src="'https://file.rongcyl.cn/festatic/bkm/imgv2' + `/drawCard_infinite/button1${active1 == 1 ? 'A' : ''}.png`"
         mode="widthFix"
       ></image>
@@ -118,7 +118,7 @@
         <view class="prizeRowContent">
           <view class="prizesTitle">
             <span>
-              <span style="font-size: 18px; margin-right: 5px; font-weight: 600">
+              <span style="font-size: 36rpx; margin-right: 10rpx; font-weight: 600">
                 {{ $selectDictLabel(rewardType, item.type) }}
               </span>
               <span style="font-weight: 600">概率 {{ item.probability }}%</span>
@@ -156,25 +156,25 @@
             <span class="name">{{ item.userName }}</span>
           </view>
           <view class="right text1">
-            <span style="margin-right: 5px">{{ item.creatTime }}</span>
+            <span style="margin-right: 10rpx">{{ item.creatTime }}</span>
             <span>No.{{ item.id }}</span>
           </view>
         </view>
-        <view class="row" style="margin-top: 10px">
+        <view class="row" style="margin-top: 20rpx">
           <view class="left">
             <image class="img" :src="item.prizeIcon" mode="aspectFill"></image>
             <span class="name">{{ item.prizeName }}</span>
           </view>
-          <view class="right" style="font-size: 14px">{{ $selectDictLabel(rewardType, item.prizeType) }} × 1</view>
+          <view class="right" style="font-size: 28rpx">{{ $selectDictLabel(rewardType, item.prizeType) }} × 1</view>
         </view>
       </view>
       <div class="text-center" v-if="winningRecordList.length == 0">
         <image
-          style="width: 80vw; margin: auto; margin-top: -40px"
+          style="width: 80vw; margin: auto; margin-top: -80rpx"
           :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/noData.png'"
           mode="widthFix"
         ></image>
-        <view class="text-center" style="margin-top: -30px; color: #999999">啊哦,没有任何内容</view>
+        <view class="text-center" style="margin-top: -60rpx; color: #999999">啊哦,没有任何内容</view>
       </div>
     </view>
     <view class="buttons2">
@@ -203,40 +203,40 @@
     <uni-popup ref="popup">
       <view class="popup-content oulist">
         <img src="https://file.rongcyl.cn/festatic/bkm/oulist.png" class="w-full h-full" />
-        <div class="absolute left-0 right-0 bottom-0 overflow-scroll py-2" style="height: 270px">
+        <div class="absolute left-0 right-0 bottom-0 overflow-scroll py-2" style="height: 540rpx">
           <div v-for="(ou, i) in ouList" :key="i" class="flex justify-between items-center px-2 py-2">
             <div class="flex mr-2">
               <img
                 :src="`https://file.rongcyl.cn/festatic/bkm/${i + 1}.png`"
                 v-if="i < 3"
                 class="inline-block mt-1"
-                style="width: 28px; height: 28px"
+                style="width: 56rpx; height: 56rpx"
               />
               <span
                 v-else
                 class="bold inline-block mt-1"
-                style="width: 28px; height: 28px; text-align: center; line-height: 28px"
+                style="width: 56rpx; height: 56rpx; text-align: center; line-height: 56rpx"
               >
                 {{ i + 1 }}
               </span>
               <img
                 :src="ou.userAvtar"
-                style="width: 34px; height: 34px; border-radius: 50%"
+                style="width: 68rpx; height: 68rpx; border-radius: 50%"
                 class="inline-block ml-2"
               />
             </div>
             <div class="flex-1">
-              <div style="font-size: 14px" class="bold">{{ ou.userName }}</div>
-              <div style="font-size: 11px; color: #666666">
-                <span style="margin-right: 18px">在线{{ ou.onlineTime }}分钟</span>
+              <div style="font-size: 28rpx" class="bold">{{ ou.userName }}</div>
+              <div style="font-size: 22rpx; color: #666666">
+                <span style="margin-right: 36rpx">在线{{ ou.onlineTime }}分钟</span>
                 <img src="https://file.rongcyl.cn/festatic/bkm/tri.png" class="w-4 h-4 inline-block relative top-1" />
-                <span style="font-size: 12px; color: #666666">{{ ou.reward }} 奖励</span>
+                <span style="font-size: 24rpx; color: #666666">{{ ou.reward }} 奖励</span>
               </div>
             </div>
 
             <div>
-              <span v-if="ou.status" style="color: #00c537; font-size: 12px">在线中</span>
-              <span v-else style="font-size: 12px; color: #666666">{{ ou.downTime | formatTime }}下线</span>
+              <span v-if="ou.status" style="color: #00c537; font-size: 24rpx">在线中</span>
+              <span v-else style="font-size: 24rpx; color: #666666">{{ ou.downTime | formatTime }}下线</span>
             </div>
           </div>
         </div>
@@ -250,7 +250,7 @@
       </div>
     </uni-popup>
     <imgPopup ref="imgPopup" />
-    <view style="width: 100%; height: 100px"></view>
+    <view style="width: 100%; height: 200rpx"></view>
   </view>
 </template>
 
@@ -425,37 +425,37 @@ export default {
 
 <style>
 .container >>> .uni-popup__wrapper.center {
-  border-radius: 12px !important;
+  border-radius: 24rpx !important;
 }
 </style>
 <style scoped lang="scss">
 .oulist {
-  width: 330px;
-  height: 408px;
+  width: 660rpx;
+  height: 816rpx;
   overflow: hidden;
   position: relative;
 }
 
 .container {
   background: #9ec8f9;
-  padding-top: 15px;
+  padding-top: 30rpx;
   overflow: auto;
 
   .head {
     background: #fff;
-    border: 10px;
-    padding: 15px;
-    border-radius: 10px 10px 0 0;
+    border: 20rpx;
+    padding: 30rpx;
+    border-radius: 20rpx 20rpx 0 0;
     display: flex;
     justify-content: space-between;
-    margin-bottom: 20px;
+    margin-bottom: 40rpx;
 
     .img {
-      width: 106px;
-      height: 106px;
-      border-radius: 5px;
+      width: 212rpx;
+      height: 212rpx;
+      border-radius: 10rpx;
       overflow: hidden;
-      margin-right: 10px;
+      margin-right: 20rpx;
     }
 
     .info {
@@ -465,22 +465,22 @@ export default {
       flex: 1;
 
       .row {
-        margin: 5px 0;
+        margin: 10rpx 0;
         display: flex;
         justify-content: space-between;
         color: #999999;
 
         .button {
-          width: 67px;
+          width: 134rpx;
         }
 
         .hot {
           display: flex;
-          font-size: 12px;
+          font-size: 24rpx;
           color: #999999;
 
           image {
-            width: 16px;
+            width: 32rpx;
           }
         }
 
@@ -489,8 +489,8 @@ export default {
 
           .photo {
             position: absolute;
-            width: 20px;
-            height: 20px;
+            width: 40rpx;
+            height: 40rpx;
             border-radius: 50%;
           }
         }
@@ -502,12 +502,12 @@ export default {
       }
 
       .price {
-        font-size: 16px;
+        font-size: 32rpx;
         font-weight: 600;
         color: #ff2c43;
 
         .text {
-          font-size: 14px;
+          font-size: 28rpx;
           color: #999999;
           font-weight: 500;
         }
@@ -519,26 +519,26 @@ export default {
     width: 95vw;
     height: 148rpx;
     background: rgba(255, 255, 255, 0.85);
-    box-shadow: 0px 2px 6px 0px rgba(176, 123, 255, 0.3);
-    border-radius: 24px;
+    box-shadow: 0rpx 4rpx 12rpx 0rpx rgba(176, 123, 255, 0.3);
+    border-radius: 48rpx;
     margin: auto;
     opacity: 1;
-    border: 1px solid rgba(58, 67, 207, 1);
+    border: 2rpx solid rgba(58, 67, 207, 1);
   }
 
   .box {
-    margin: 0 10px 10px 10px;
-    padding: 2px;
+    margin: 0 20rpx 20rpx 20rpx;
+    padding: 4rpx;
     background: linear-gradient(90deg, rgba(211, 252, 111, 1), rgba(61, 248, 255, 1));
-    box-shadow: 0px 2px 6px 0px rgba(176, 123, 255, 0.3);
-    border-radius: 24px;
+    box-shadow: 0rpx 4rpx 12rpx 0rpx rgba(176, 123, 255, 0.3);
+    border-radius: 48rpx;
 
     .boxContent {
       background: linear-gradient(90deg, #a4fcff 0%, #d3fc6e 100%);
-      border-radius: 24px;
+      border-radius: 48rpx;
       opacity: 1;
       display: flex;
-      padding: 8px 15px;
+      padding: 16rpx 30rpx;
 
       .boxLeft {
         position: relative;
@@ -547,13 +547,13 @@ export default {
         .row1 {
           display: flex;
           justify-content: space-between;
-          font-size: 18px;
-          margin-bottom: 4px;
+          font-size: 36rpx;
+          margin-bottom: 8rpx;
 
           .text {
             color: #000000;
             font-weight: 600;
-            text-shadow: -2px -1px 0px rgba(255, 255, 255, 1);
+            text-shadow: -4rpx -2rpx 0rpx rgba(255, 255, 255, 1);
             font-family: auto;
           }
 
@@ -565,31 +565,31 @@ export default {
 
         .row2 {
           position: relative;
-          top: 3px;
+          top: 6rpx;
           height: 12vw;
           border-radius: 6vw;
           background: linear-gradient(90deg, #65c3e5 0%, #b1ff29 100%);
 
           .row2content {
             position: relative;
-            top: -3px;
+            top: -6rpx;
             background: #0d2a2c;
             height: 12vw;
             border-radius: 6vw;
-            font-size: 10px;
+            font-size: 20rpx;
             color: rgba(255, 255, 255, 0.9);
             display: flex;
             flex-direction: column;
             justify-content: center;
             align-items: flex-start;
-            padding: 0 13px;
+            padding: 0 26rpx;
           }
         }
       }
 
       .boxRiaht {
         padding-left: 8vw;
-        padding-right: 15px;
+        padding-right: 30rpx;
         display: flex;
         align-items: center;
 
@@ -614,8 +614,8 @@ export default {
   .prizeList {
     .prizeRow {
       position: relative;
-      margin: 0 10px 10px 10px;
-      padding-bottom: 10px;
+      margin: 0 20rpx 20rpx 20rpx;
+      padding-bottom: 20rpx;
 
       .bk {
         position: relative;
@@ -628,13 +628,13 @@ export default {
 
       .prizeRowContent {
         position: relative;
-        width: calc(100% - 30px);
-        padding: 10px 15px;
+        width: calc(100% - 60rpx);
+        padding: 20rpx 30rpx;
         z-index: 2;
 
         .prizesTitle {
-          font-size: 12px;
-          padding-bottom: 5px;
+          font-size: 24rpx;
+          padding-bottom: 10rpx;
           width: 100%;
           color: #fff;
           display: flex;
@@ -642,17 +642,17 @@ export default {
 
           .sp {
             color: rgba(255, 255, 255, 0.7);
-            padding-top: 8px;
-            font-size: 10px;
+            padding-top: 16rpx;
+            font-size: 20rpx;
           }
         }
 
         .prizesItems {
           background: #fffbe8;
           display: flex;
-          width: calc(100% - 16px);
-          padding: 8px;
-          border-radius: 8px;
+          width: calc(100% - 32rpx);
+          padding: 16rpx;
+          border-radius: 16rpx;
 
           .prize {
             width: 22vw;
@@ -681,20 +681,20 @@ export default {
               overflow: hidden;
               white-space: nowrap;
               text-overflow: ellipsis;
-              font-size: 12px;
+              font-size: 24rpx;
               font-weight: 600;
               text-align: center;
             }
 
             .price {
               text-align: center;
-              font-size: 10px;
+              font-size: 20rpx;
               color: #999999;
 
               .priceText {
                 color: #ff2c43;
                 font-weight: 600;
-                font-size: 12px;
+                font-size: 24rpx;
               }
             }
           }
@@ -714,13 +714,13 @@ export default {
     .button {
       width: 13vw;
       height: 13vw;
-      font-size: 16px;
+      font-size: 32rpx;
       color: #fff;
       background: linear-gradient(270deg, #531dbb 0%, #6e2fe5 100%);
       text-align: center;
       line-height: 13vw;
-      border-radius: 4px;
-      box-shadow: inset 0px 2px 3px 0px rgba(255, 255, 255, 0.25);
+      border-radius: 8rpx;
+      box-shadow: inset 0rpx 4rpx 6rpx 0rpx rgba(255, 255, 255, 0.25);
       position: relative;
       transform: rotate(45deg);
       font-weight: 600;
@@ -733,10 +733,10 @@ export default {
 
   .winningRecord {
     .card {
-      margin: 10px 10px 0 10px;
-      border-radius: 8px;
+      margin: 20rpx 20rpx 0 20rpx;
+      border-radius: 16rpx;
       background: #fff;
-      padding: 10px;
+      padding: 20rpx;
 
       .row {
         display: flex;
@@ -748,28 +748,28 @@ export default {
           align-items: center;
 
           .photo {
-            margin-right: 5px;
-            width: 30px;
-            height: 30px;
+            margin-right: 10rpx;
+            width: 60rpx;
+            height: 60rpx;
             border-radius: 50%;
           }
 
           .name {
-            font-size: 14px;
+            font-size: 28rpx;
             font-weight: 600;
           }
 
           .img {
-            width: 40px;
-            height: 40px;
-            border-radius: 2px;
-            margin-right: 5px;
+            width: 80rpx;
+            height: 80rpx;
+            border-radius: 4rpx;
+            margin-right: 10rpx;
           }
         }
 
         .text1 {
           color: #666666;
-          font-size: 12px;
+          font-size: 24rpx;
         }
       }
     }

+ 86 - 62
pages/drawCard_last/drawCard_last.vue

@@ -16,25 +16,15 @@
         'background-repeat': 'no-repeat',
         'background-position': 'center center',
         'background-size': '100% 100%',
-        'padding-top': safeAreaTop,
         'box-sizing': 'border-box',
         overflow: 'scroll',
         'padding-bottom': '160rpx',
       }"
     >
-      <div class="text-white bold text-center mt-2">
-        <uni-icons
-          type="left"
-          size="20"
-          color="#fff"
-          style="position: absolute; left: 0; margin-left: 10px"
-          @click="back"
-        ></uni-icons>
-        FIRST赏详情
-      </div>
+      <PageTitle color="#fff" title="LAST赏详情" />
       <div class="card relative">
         <div class="flex pt-3 px-3">
-          <image :src="detail.prizeIcon" style="width: 168rpx; height: 169rpx; border-radius: 8px" mode="aspectFill" />
+          <image :src="detail.icon" style="width: 168rpx; height: 169rpx; border-radius: 16rpx" mode="aspectFill" />
           <div class="flex-1 pl-2">
             <div class="" style="font-weight: 900">{{ detail.name }}</div>
             <div class="flex justify-between">
@@ -46,7 +36,7 @@
                 <span class="bold" style="color: #ff2c43; font-size: 28rpx">
                   .{{ ('' + detail.price).split('.')[1] }}
                 </span>
-                <span style="color: #4e504f; font-size: 14px">/张明信片</span>
+                <span style="color: #4e504f; font-size: 28rpx">/张明信片</span>
               </div>
               <div class="pt-2">
                 <img
@@ -56,31 +46,61 @@
                 />
               </div>
             </div>
-            <div class="flex justify-between" style="margin-top: 5px">
+            <div class="flex justify-between" style="margin-top: 10rpx">
               <div>
                 <img
                   src="https://fudaanfang.oss-cn-hangzhou.aliyuncs.com/festatic/bkm/item.png"
-                  style="width: 40rpx; height: 40rpx; border-radius: 50%; display: inline-block; border: 1px solid #fff"
+                  style="
+                    width: 40rpx;
+                    height: 40rpx;
+                    border-radius: 50%;
+                    display: inline-block;
+                    border: 2rpx solid #fff;
+                  "
                 />
                 <img
                   src="https://fudaanfang.oss-cn-hangzhou.aliyuncs.com/festatic/bkm/item.png"
                   class="relative right-2"
-                  style="width: 40rpx; height: 40rpx; border-radius: 50%; display: inline-block; border: 1px solid #fff"
+                  style="
+                    width: 40rpx;
+                    height: 40rpx;
+                    border-radius: 50%;
+                    display: inline-block;
+                    border: 2rpx solid #fff;
+                  "
                 />
                 <img
                   src="https://fudaanfang.oss-cn-hangzhou.aliyuncs.com/festatic/bkm/item.png"
                   class="relative right-4"
-                  style="width: 40rpx; height: 40rpx; border-radius: 50%; display: inline-block; border: 1px solid #fff"
+                  style="
+                    width: 40rpx;
+                    height: 40rpx;
+                    border-radius: 50%;
+                    display: inline-block;
+                    border: 2rpx solid #fff;
+                  "
                 />
                 <img
                   src="https://fudaanfang.oss-cn-hangzhou.aliyuncs.com/festatic/bkm/item.png"
                   class="relative right-6"
-                  style="width: 40rpx; height: 40rpx; border-radius: 50%; display: inline-block; border: 1px solid #fff"
+                  style="
+                    width: 40rpx;
+                    height: 40rpx;
+                    border-radius: 50%;
+                    display: inline-block;
+                    border: 2rpx solid #fff;
+                  "
                 />
                 <img
                   src="https://fudaanfang.oss-cn-hangzhou.aliyuncs.com/festatic/bkm/item.png"
                   class="relative right-8"
-                  style="width: 40rpx; height: 40rpx; border-radius: 50%; display: inline-block; border: 1px solid #fff"
+                  style="
+                    width: 40rpx;
+                    height: 40rpx;
+                    border-radius: 50%;
+                    display: inline-block;
+                    border: 2rpx solid #fff;
+                  "
                 />
               </div>
               <div class="flex items-center">
@@ -106,7 +126,7 @@
         >
           <view
             class="absolute top-1 left-2"
-            style="width: 106rpx; height: 28rpx; font-size: 12px; font-weight: 600; color: #ffff00"
+            style="width: 106rpx; height: 28rpx; font-size: 24rpx; font-weight: 600; color: #ffff00"
           >
             {{ lockData.userId ? '锁箱中' : '' }}
           </view>
@@ -141,10 +161,10 @@
           class="absolute left-0 right-0 bottom-1 mx-auto"
           style="
             width: 690rpx;
-            height: 12px;
+            height: 24rpx;
             background: #4f5150;
-            box-shadow: inset 0px 4px 4px 0px rgba(0, 0, 0, 0.8);
-            border-radius: 22px 22px 22px 22px;
+            box-shadow: inset 0rpx 8rpx 8rpx 0rpx rgba(0, 0, 0, 0.8);
+            border-radius: 44rpx 44rpx 44rpx 44rpx;
             opacity: 1;
           "
         >
@@ -156,11 +176,11 @@
               width: 670rpx;
               min-height: 890rpx;
               background: linear-gradient(180deg, #ccd3d9 0%, #ffffff 5%);
-              border-radius: 0px 0px 0px 0px;
+              border-radius: 0rpx 0rpx 0rpx 0rpx;
               opacity: 1;
             "
           >
-            <div class="flex justify-around" style="margin: 10px 0">
+            <div class="flex justify-around" style="margin: 20rpx 0">
               <img
                 src="https://file.rongcyl.cn/festatic/bkm/first2/tab1.png"
                 v-if="tabIndex !== 1"
@@ -232,12 +252,12 @@
                     v-for="(item2, index2) in item.prizeList"
                     @click="showImg(item2)"
                     :class="['mr-2', item2.leftNum == 0 ? 'grey' : '']"
-                    style="width: 168rpx; background-color: #f9f6f2; border-radius: 4px; margin-bottom: 10px"
+                    style="width: 168rpx; background-color: #f9f6f2; border-radius: 8rpx; margin-bottom: 20rpx"
                   >
                     <image
                       :src="item2.icon"
                       mode="aspectFill"
-                      style="width: 144rpx; height: 144rpx; border-radius: 5px; margin: auto"
+                      style="width: 144rpx; height: 144rpx; border-radius: 10rpx; margin: auto"
                     />
                     <div class="fs13 pl-2 prizeName">{{ item2.name }}</div>
                     <div style="color: #ea6636" class="pl-2">
@@ -261,15 +281,15 @@
                       <span>{{ item.creatTime }}</span>
                     </view>
                   </view>
-                  <view class="row" style="margin-top: 10px">
+                  <view class="row" style="margin-top: 20rpx">
                     <view class="left">
                       <image class="img" :src="item.prizeIcon" mode="aspectFill"></image>
                     </view>
-                    <view class="right" style="font-size: 14px">
+                    <view class="right" style="font-size: 28rpx">
                       <view class="name">{{ item.prizeName }}</view>
                       <view class="row">
                         <view class="type">{{ $selectDictLabel(rewardType, item.prizeType) }} × 1</view>
-                        <span style="font-size: 12px">No.{{ item.id }}</span>
+                        <span style="font-size: 24rpx">No.{{ item.id }}</span>
                       </view>
                     </view>
                   </view>
@@ -287,6 +307,8 @@
 
       <div class="fixed right-2 bottom-20" style="height: 460rpx">
         <img
+          v-if="detail.resultUrl"
+          @click="toDloadFilePopup(detail.resultUrl)"
           src="https://file.rongcyl.cn/festatic/bkm/first2/fu.png"
           style="width: 88rpx; height: 88rpx; margin-bottom: 24rpx"
         />
@@ -342,18 +364,19 @@ import {
   prizeUserListApi,
   getLockInfoApi,
 } from '@/api/drawCard.js'
-import { cardType, formatSeconds } from '@/utils/utils.js'
+import { cardType, formatSeconds, toDloadFilePopup } from '@/utils/utils.js'
 
 import numImg from '@/component/numImg.vue'
 import paymentPopup from '@/component/paymentPopup.vue'
 import Title from '@/component/title.vue'
-
+import PageTitle from '@/component/pageTitle.vue'
 const { v4: uuidv4 } = require('uuid')
 export default {
   data() {
     return {
+      toDloadFilePopup: toDloadFilePopup,
       rewardType: rewardType,
-      safeAreaTop: '0px',
+      safeAreaTop: '0rpx',
       tabIndex: 1,
       params: {
         raffleId: '',
@@ -375,6 +398,7 @@ export default {
   },
   components: {
     Title,
+    PageTitle,
     imgPopup,
     paymentPopup,
     numImg,
@@ -646,9 +670,9 @@ export default {
     width: 710rpx;
     margin: auto;
     background-color: #fff;
-    border-radius: 10px;
+    border-radius: 20rpx;
     height: 400rpx;
-    margin-top: 18px;
+    margin-top: 36rpx;
   }
 
   .c1 {
@@ -706,7 +730,7 @@ export default {
 }
 
 .list {
-  // height: calc(100% - 32rpx - 20px - 20px);
+  // height: calc(100% - 32rpx - 40rpx - 40rpx);
   // overflow: auto;
 }
 
@@ -719,25 +743,25 @@ export default {
 .titleTip {
   position: absolute;
   z-index: 2;
-  height: 32px;
-  line-height: 42px;
+  height: 64rpx;
+  line-height: 84rpx;
   padding-left: 25vw;
-  font-size: 12px;
+  font-size: 24rpx;
   color: #fff;
 }
 
 .winningRecord {
   .winningRecordCard {
-    margin-top: 10px;
-    border-radius: 8px;
+    margin-top: 20rpx;
+    border-radius: 16rpx;
     background: #f7f0e8;
-    padding: 10px;
+    padding: 20rpx;
     display: flex;
-    // box-shadow: 1px 1px 3px #b7b7b7;
+    // box-shadow: 2rpx 2rpx 6rpx #b7b7b7;
 
     .photo {
       // flex: 1;
-      margin-right: 8px;
+      margin-right: 16rpx;
       width: 10vw;
       height: 10vw;
       border-radius: 50%;
@@ -753,15 +777,15 @@ export default {
         align-items: center;
 
         .name {
-          font-size: 14px;
+          font-size: 28rpx;
           font-weight: 600;
         }
 
         .img {
           width: 15vw;
           height: 15vw;
-          border-radius: 2px;
-          margin-right: 5px;
+          border-radius: 4rpx;
+          margin-right: 10rpx;
         }
       }
 
@@ -769,7 +793,7 @@ export default {
         flex: 1;
 
         .name {
-          font-size: 14px;
+          font-size: 28rpx;
           height: 10vw;
           overflow: hidden;
           text-overflow: ellipsis;
@@ -780,16 +804,16 @@ export default {
       }
 
       .type {
-        padding: 0 2px;
+        padding: 0 4rpx;
         background: #fc5b20;
         color: #fff;
-        font-size: 11px;
-        border-radius: 2px;
+        font-size: 22rpx;
+        border-radius: 4rpx;
       }
 
       .text1 {
         color: #666666;
-        font-size: 12px;
+        font-size: 24rpx;
       }
     }
   }
@@ -818,7 +842,7 @@ export default {
   .text {
     color: #fff;
     font-weight: 600;
-    font-size: 14px;
+    font-size: 28rpx;
   }
 
   .info {
@@ -833,7 +857,7 @@ export default {
     }
 
     .right {
-      margin-left: 10px;
+      margin-left: 20rpx;
       flex: 1;
       display: flex;
       flex-direction: column;
@@ -843,24 +867,24 @@ export default {
       .row {
         width: 100%;
         color: #fff;
-        font-size: 12px;
-        margin-bottom: 2px;
+        font-size: 24rpx;
+        margin-bottom: 4rpx;
         position: relative;
         display: flex;
         align-items: center;
 
         .time {
-          padding: 2px;
+          padding: 4rpx;
           color: #565656;
           background: #ffff00;
-          margin: 0 8px;
-          border-radius: 5px;
+          margin: 0 16rpx;
+          border-radius: 10rpx;
           font-weight: 600;
-          font-size: 12px;
+          font-size: 24rpx;
         }
 
         .name {
-          font-size: 13px;
+          font-size: 26rpx;
           font-weight: 600;
           color: #fff;
           width: 40%;
@@ -870,7 +894,7 @@ export default {
         }
 
         .tip {
-          font-size: 11px;
+          font-size: 22rpx;
           position: absolute;
           right: 0;
           font-weight: 500;

+ 43 - 38
pages/drawCardsList/drawCardsList.vue

@@ -1,5 +1,6 @@
 <template>
-  <view class="container" style="background-color: #131313">
+  <view class="container" style="background-color: #131313; overflow: scroll">
+    <!-- <PageTitle color="#fff" title="抽盒机" /> -->
     <uni-swiper-dot
       class="uni-swiper-dot-box"
       @clickItem="clickItem"
@@ -109,12 +110,12 @@
       <div class="card relative" v-for="(item, i) in list" @click="toDrawCard({ id: item.id })" :key="i">
         <image mode="aspectFill" :src="item.icon"></image>
         <div class="mt-1">{{ item.name }}</div>
-        <div class="flex justify-between" style="font-size: 13px; margin-top: 12rpx">
-          <div
+        <div class="flex justify-between" style="font-size: 26rpx; margin-top: 12rpx">
+          <!-- <div
             style="
-              border-radius: 3px;
-              height: 20px;
-              line-height: 20px;
+              border-radius: 6rpx;
+              height: 40rpx;
+              line-height: 40rpx;
               text-align: center;
               background: #fc5b20;
               color: #fff;
@@ -122,9 +123,9 @@
             "
           >
             创意热销
-          </div>
+          </div> -->
           <!-- 	  		<div>
-	  			<span style="font-size: 14px; margin-right: 4px; color: #fc5b20"
+	  			<span style="font-size: 28rpx; margin-right: 8rpx; color: #fc5b20"
 	  				class="bold">{{ item.totalNum }}</span>
 	  			<span style="color: #666666">销量</span>
 	  		</div> -->
@@ -139,9 +140,13 @@
 </template>
 
 <script>
+import PageTitle from '@/component/pageTitle.vue'
 import { raffleListApi } from '@/api/drawCard.js'
 
 export default {
+  components: {
+    PageTitle,
+  },
   data() {
     return {
       tabActive: 4,
@@ -224,8 +229,8 @@ export default {
 }
 
 .tabs {
-  margin: 10px 0;
-  height: 36px;
+  margin: 20rpx 0;
+  height: 72rpx;
   display: flex;
   justify-content: space-around;
   align-items: center;
@@ -239,46 +244,46 @@ export default {
 }
 
 .list {
-  padding: 10px;
+  padding: 20rpx;
 
   .kabk {
-    padding: 1px;
+    padding: 2rpx;
     background: linear-gradient(180deg, rgba(211, 74, 216, 0.3) 0%, rgba(58, 67, 207, 0.3) 25%);
-    border-radius: 13px;
-    box-shadow: 1px 1px 4px rgba(176, 123, 255, 0.5);
-    margin-bottom: 10px;
+    border-radius: 26rpx;
+    box-shadow: 2rpx 2rpx 8rpx rgba(176, 123, 255, 0.5);
+    margin-bottom: 20rpx;
     overflow: hidden;
   }
 
   .ka1 {
-    padding: 10px;
+    padding: 20rpx;
     display: flex;
     background: #fff;
-    border-radius: 12px;
+    border-radius: 24rpx;
     position: relative;
 
     .leftImg {
       width: 30vw;
       height: 30vw;
-      border-radius: 10px;
-      margin-right: 8px;
+      border-radius: 20rpx;
+      margin-right: 16rpx;
     }
 
     .rightInfo {
       flex: 1;
 
       .row {
-        margin-bottom: 5px;
+        margin-bottom: 10rpx;
 
         .price {
-          font-size: 14px;
+          font-size: 28rpx;
           font-weight: 600;
           color: #ff2c43;
         }
       }
 
       .title {
-        font-size: 17px;
+        font-size: 34rpx;
         font-weight: 600;
         width: 100%;
         white-space: nowrap;
@@ -291,25 +296,25 @@ export default {
         grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
 
         .prize {
-          border-radius: 4px;
+          border-radius: 8rpx;
           width: 10vw;
           height: 10vw;
-          margin-right: 5px;
+          margin-right: 10rpx;
         }
       }
 
       .tags {
         position: absolute;
-        right: -1px;
-        bottom: -2px;
+        right: -2rpx;
+        bottom: -4rpx;
         display: flex;
         flex-direction: row-reverse;
         justify-content: flex-end;
 
         .tag {
           position: relative;
-          width: 50px;
-          height: 20px;
+          width: 100rpx;
+          height: 40rpx;
         }
 
         .tag_0 {
@@ -317,12 +322,12 @@ export default {
         }
 
         .tag_1 {
-          right: -9px;
+          right: -18rpx;
           z-index: 2;
         }
 
         .tag_2 {
-          right: -18px;
+          right: -36rpx;
           z-index: 1;
         }
       }
@@ -333,9 +338,9 @@ export default {
 .list2 {
   display: grid;
   grid-template-columns: 1fr 1fr;
-  grid-gap: 10px;
-  padding: 10px;
-  width: calc(100% - 20px);
+  grid-gap: 20rpx;
+  padding: 20rpx;
+  width: calc(100% - 40rpx);
 
   .card {
     position: relative;
@@ -344,7 +349,7 @@ export default {
     // width: 344rpx;
     // height: 500rpx;
     background: #fff;
-    border-radius: 10px;
+    border-radius: 20rpx;
     margin-bottom: 20rpx;
     padding: 20rpx;
     padding-bottom: 12rpx;
@@ -352,7 +357,7 @@ export default {
     image {
       width: 100%;
       height: 50vw;
-      border-radius: 8px;
+      border-radius: 16rpx;
     }
   }
 }
@@ -371,14 +376,14 @@ export default {
     }
 
     .ka-info {
-      padding: 5px 5px 10px 5px;
+      padding: 10rpx 10rpx 20rpx 10rpx;
 
       .ka-name {
-        font-size: 12px;
+        font-size: 24rpx;
       }
 
       .row {
-        margin-top: 2px;
+        margin-top: 4rpx;
         justify-content: flex-end;
 
         .tag {

+ 13 - 13
pages/excellentValue/excellentValue.vue

@@ -12,7 +12,7 @@
           <view class="row">
             <view class="money">
               ¥
-              <span style="font-size: 16px">{{ item.price }}</span>
+              <span style="font-size: 32rpx">{{ item.price }}</span>
             </view>
             <view class="number">
               <view class="residue">剩余{{ item.balaceNum }}</view>
@@ -24,7 +24,7 @@
     </view>
   </view>
 </template>
-
+<uni-badge text="" type=""></uni-badge>
 <script>
 import { raffleListApi } from '@/api/drawCard.js'
 export default {
@@ -64,13 +64,13 @@ export default {
   .list {
     display: grid;
     grid-template-columns: 1fr 1fr;
-    grid-gap: 10px;
-    padding: 10px;
+    grid-gap: 20rpx;
+    padding: 20rpx;
     .ka {
       background: #fff;
-      width: calc(50vw - 15px);
-      box-shadow: 0px 2px 8px 2px rgba(0, 0, 0, 0.1);
-      border-radius: 10px;
+      width: calc(50vw - 30rpx);
+      box-shadow: 0rpx 4rpx 16rpx 4rpx rgba(0, 0, 0, 0.1);
+      border-radius: 20rpx;
       overflow: hidden;
       // height: 60vw;
 
@@ -87,18 +87,18 @@ export default {
         }
       }
       .ka-info {
-        padding: 10px;
+        padding: 20rpx;
         .ka-name {
-          font-size: 15px;
+          font-size: 30rpx;
           font-weight: 600;
         }
         .row {
-          margin-top: 5px;
+          margin-top: 10rpx;
           display: flex;
           justify-content: space-between;
 
           .money {
-            font-size: 12px;
+            font-size: 24rpx;
             font-weight: 600;
             color: #ff2c43;
           }
@@ -107,10 +107,10 @@ export default {
             align-items: center;
             .residue {
               color: #ff2c43;
-              font-size: 13px;
+              font-size: 26rpx;
             }
             .total {
-              font-size: 11px;
+              font-size: 22rpx;
             }
           }
         }

+ 31 - 31
pages/index/index.vue

@@ -67,7 +67,7 @@
           <img
             :src="`https://file.rongcyl.cn/festatic/bkm/tags/${item.type}.png`"
             class="absolute top-0 left-0"
-            style="width: 62px; height: 24px"
+            style="width: 124rpx; height: 48rpx"
           />
           <img
             :src="`https://file.rongcyl.cn/festatic/bkm/tags/tag1.png`"
@@ -89,11 +89,11 @@
           />
           <img :src="item.icon" />
           <div class="mt-1">{{ item.name }}</div>
-          <!-- <div class="flex justify-between" style="font-size: 13px; margin-top: 12rpx">
+          <!-- <div class="flex justify-between" style="font-size: 26rpx; margin-top: 12rpx">
             
             <img src="https://file.rongcyl.cn/festatic/bkm/imgv2/raffle/tag2.png" style="height: 35rpx; width: 80rpx" />
             <div>
-              <span style="font-size: 14px; margin-right: 4px; color: #fc5b20" class="bold">{{ item.totalNum }}</span>
+              <span style="font-size: 28rpx; margin-right: 8rpx; color: #fc5b20" class="bold">{{ item.totalNum }}</span>
               <span style="color: #666666">销量</span>
             </div>
           </div> -->
@@ -108,7 +108,7 @@
               <div class="tag" v-if="item.subType.includes('112')">免单</div>
             </div> -->
             <div
-              style="margin-top: 12rpx; color: #a79e9e; font-size: 12px"
+              style="margin-top: 12rpx; color: #a79e9e; font-size: 24rpx"
               v-if="!item.subType && (item.type == 5 || item.type == 2)"
             >
               剩余 {{ item.balaceNum }}/ {{ item.totalNum }}
@@ -123,7 +123,7 @@
     </div>
     <!-- <div
       class="fixed left-0 right-0 bottom-0 pb-1 bg-black flex justify-around items-center fs13"
-      style="color: #b4c9da; height: 80px"
+      style="color: #b4c9da; height: 160rpx"
     >
       <div class="text-center">
         <img src="https://file.rongcyl.cn/festatic/bkm/index2tabs/home_a.png" class="w-7 h-7" />
@@ -254,57 +254,57 @@ export default {
 
 <style scoped lang="scss">
 .area {
-  width: 168px;
-  height: 88px;
+  width: 336rpx;
+  height: 176rpx;
 }
 
 .c {
-  width: 82px;
-  height: 47px;
+  width: 164rpx;
+  height: 94rpx;
 }
 
 .center {
-  width: 38px;
-  height: 98px;
+  width: 76rpx;
+  height: 196rpx;
 }
 
 .clicks {
-  height: 98px;
+  height: 196rpx;
   background-image: linear-gradient(to bottom, #ffaea6, #ff654c);
 
   img {
-    height: 82px;
-    width: 82px;
+    height: 164rpx;
+    width: 164rpx;
   }
 }
 
 .tag {
-  border-radius: 3px;
+  border-radius: 6rpx;
   margin-top: 12rpx;
-  height: 20px;
-  line-height: 20px;
+  height: 40rpx;
+  line-height: 40rpx;
   text-align: center;
   background: #fc5b20;
   color: #fff;
   padding: 0 8rpx;
-  font-size: 13px;
+  font-size: 26rpx;
   display: inline-block;
-  margin-left: 10px;
+  margin-left: 20rpx;
 }
 
 .more {
-  width: 28px;
-  height: 98px;
+  width: 56rpx;
+  height: 196rpx;
 }
 
 .p {
   position: fixed;
-  bottom: 120px;
-  right: 20px;
+  bottom: 240rpx;
+  right: 40rpx;
 
   img {
-    width: 50px;
-    height: 50px;
+    width: 100rpx;
+    height: 100rpx;
   }
 }
 
@@ -313,21 +313,21 @@ export default {
   justify-content: space-around;
 
   .tab {
-    font-size: 16px;
+    font-size: 32rpx;
     font-weight: 400;
     color: #fff;
-    padding: 10px 0;
+    padding: 20rpx 0;
 
     &.active {
       font-weight: 600;
-      border-bottom: 2px solid #fc5b20;
+      border-bottom: 4rpx solid #fc5b20;
       color: #fc5b20;
     }
   }
 }
 
 .cards {
-  margin-top: 20px;
+  margin-top: 40rpx;
   display: flex;
   justify-content: space-between;
   padding: 0 20rpx;
@@ -338,7 +338,7 @@ export default {
     width: 344rpx;
     // height: 500rpx;
     background: #fff;
-    border-radius: 10px;
+    border-radius: 20rpx;
     margin-bottom: 20rpx;
     padding: 20rpx;
     padding-bottom: 12rpx;
@@ -346,7 +346,7 @@ export default {
     img {
       width: 308rpx;
       height: 308rpx;
-      border-radius: 8px;
+      border-radius: 16rpx;
     }
   }
 }

+ 8 - 8
pages/integralRecord/integralRecord.vue

@@ -80,18 +80,18 @@ export default {
   height: 100vh;
 
   .massage {
-    margin: 5px 10px;
+    margin: 10rpx 20rpx;
 
     .time {
-      font-size: 12px;
-      padding: 6px 0;
+      font-size: 24rpx;
+      padding: 12rpx 0;
       text-align: center;
     }
 
     .info {
       background: #fff;
-      border-radius: 5px;
-      padding: 10px;
+      border-radius: 10rpx;
+      padding: 20rpx;
 
       .row {
         display: flex;
@@ -99,13 +99,13 @@ export default {
       }
 
       .title {
-        font-size: 16px;
+        font-size: 32rpx;
         // font-weight: 600;
-        padding: 5px 0;
+        padding: 10rpx 0;
       }
 
       .text {
-        font-size: 12px;
+        font-size: 24rpx;
         color: #9999;
       }
     }

+ 22 - 22
pages/invite/invite.vue

@@ -127,25 +127,25 @@ export default {
   .page {
     max-height: 100vh;
     overflow: auto;
-    padding-top: 300px;
+    padding-top: 600rpx;
   }
 
   .illustrate {
     position: absolute;
-    right: 20px;
-    top: 40px;
-    font-size: 12px;
-    width: 67px;
-    height: 24px;
-    // padding: 5px 10px;
-    // border-radius: 4px;
+    right: 40rpx;
+    top: 80rpx;
+    font-size: 24rpx;
+    width: 134rpx;
+    height: 48rpx;
+    // padding: 10rpx 20rpx;
+    // border-radius: 8rpx;
   }
 
   .box {
     background: #fff;
-    margin: 20px 20px;
-    padding: 20px;
-    border-radius: 15px;
+    margin: 40rpx 40rpx;
+    padding: 40rpx;
+    border-radius: 30rpx;
     display: flex;
     justify-content: space-around;
 
@@ -158,26 +158,26 @@ export default {
 
       .label1 {
         width: 100%;
-        height: 22px;
+        height: 44rpx;
       }
 
       .label2 {
         width: 100%;
-        height: 22px;
+        height: 44rpx;
       }
 
       .value {
-        font-size: 28px;
+        font-size: 56rpx;
         font-weight: 600;
-        margin-top: 20px;
+        margin-top: 40rpx;
         width: 100%;
         display: flex;
         align-items: center;
         justify-content: center;
 
         image {
-          width: 40px;
-          height: 22px;
+          width: 80rpx;
+          height: 44rpx;
         }
       }
     }
@@ -186,10 +186,10 @@ export default {
   .buttons {
     display: flex;
     justify-content: center;
-    margin: 20px;
-    width: calc(100% - 40px);
+    margin: 40rpx;
+    width: calc(100% - 80rpx);
     image {
-      height: 64px;
+      height: 128rpx;
       position: relative;
     }
 
@@ -207,12 +207,12 @@ export default {
       border: none;
     }
     .button1 {
-      right: -8px;
+      right: -16rpx;
       width: 100%;
     }
 
     .button2 {
-      left: -8px;
+      left: -16rpx;
     }
   }
 

+ 85 - 85
pages/knapsack/knapsack.vue

@@ -39,7 +39,7 @@
               </view>
             </template>
             <view class="card">
-              <view class="row" style="margin-top: 10px">
+              <view class="row" style="margin-top: 20rpx">
                 <view class="left">
                   <image
                     class="img"
@@ -47,7 +47,7 @@
                     mode="aspectFill"
                   ></image>
                 </view>
-                <view class="right" style="font-size: 14px">
+                <view class="right" style="font-size: 28rpx">
                   <view class="row title">
                     {{ item.prizeName }}
                   </view>
@@ -61,7 +61,7 @@
                     <span>
                       <image
                         @click="decompose(item)"
-                        style="width: 44px"
+                        style="width: 88rpx"
                         :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/knapsack/button5.png'"
                         mode="widthFix"
                       ></image>
@@ -123,7 +123,7 @@
       <view class="tabs2 tabw">
         <image
           class="tabs2_bk"
-          style="width: 100%; height: 30px"
+          style="width: 100%; height: 60rpx"
           :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/knapsack/tabBk2.png'"
           mode=""
         ></image>
@@ -145,13 +145,13 @@
             <view class="status2 type3" v-if="item.order.orderStatus == 301">待收货</view>
             <view class="status2 type4" v-if="item.order.orderStatus == 401">已完成</view>
           </view>
-          <view class="row text" style="font-size: 12px">订单ID:{{ item.order.orderSn }}</view>
-          <view class="row" style="margin-top: 10px" v-for="(item2, index2) in item.prizeList">
+          <view class="row text" style="font-size: 24rpx">订单ID:{{ item.order.orderSn }}</view>
+          <view class="row" style="margin-top: 20rpx" v-for="(item2, index2) in item.prizeList">
             <view class="left">
               <image class="img2" :src="item2.prizeIcon" mode="aspectFill"></image>
             </view>
-            <view class="right" style="font-size: 14px">
-              <view class="row" style="font-size: 12px">
+            <view class="right" style="font-size: 28rpx">
+              <view class="row" style="font-size: 24rpx">
                 {{ item2.prizeName }}
               </view>
               <view class="row" style="font-weight: 600; color: #ff2c43">
@@ -160,13 +160,13 @@
               </view>
             </view>
           </view>
-          <view class="row button" style="font-size: 14px">
+          <view class="row button" style="font-size: 28rpx">
             <span></span>
             <span>
               实付金额:
               <span style="font-weight: 600; color: #ff2c43">
-                <span style="font-size: 18px">{{ item.order.actualPrice }}</span>
+                <span style="font-size: 36rpx">{{ item.order.actualPrice }}</span>
               </span>
             </span>
           </view>
@@ -364,7 +364,7 @@ export default {
       }
       if (index == 2) {
         this.$refs.ani.step({
-          translateX: '120px',
+          translateX: '240rpx',
         })
         this.$refs.ani.run(() => {
           console.log('动画支持完毕')
@@ -479,19 +479,19 @@ export default {
   overflow: auto;
 
   .tabs {
-    width: 240px;
-    height: 44px;
-    border-radius: 22px;
+    width: 480rpx;
+    height: 88rpx;
+    border-radius: 44rpx;
     background: rgba(255, 255, 255, 0.8);
-    margin: 20px auto 10px auto;
+    margin: 40rpx auto 20rpx auto;
     color: #005ecc;
-    font-size: 14px;
+    font-size: 28rpx;
     display: flex;
     position: relative;
 
     .tabsTransition {
       width: 50%;
-      height: 44px;
+      height: 88rpx;
       position: absolute;
 
       .tabsBk {
@@ -502,9 +502,9 @@ export default {
 
     .tab {
       width: 50%;
-      height: 44px;
+      height: 88rpx;
       text-align: center;
-      line-height: 44px;
+      line-height: 88rpx;
       z-index: 2;
     }
 
@@ -514,7 +514,7 @@ export default {
   }
 
   .tabs2 {
-    width: 240px;
+    width: 480rpx;
     margin: 0 auto;
     position: relative;
 
@@ -530,20 +530,20 @@ export default {
       justify-content: center;
       width: 100%;
       height: 100%;
-      font-size: 12px;
+      font-size: 24rpx;
 
       .text {
         color: #fff;
       }
 
       .select {
-        width: 80px;
+        width: 160rpx;
       }
     }
   }
 
   .tabw {
-    width: calc(100% - 20px);
+    width: calc(100% - 40rpx);
     margin: 0 auto;
 
     .tabs2_info {
@@ -551,26 +551,26 @@ export default {
 
       .tabItem {
         color: #fff;
-        padding: 5px 0;
-        font-size: 13px;
+        padding: 10rpx 0;
+        font-size: 26rpx;
       }
 
       .active {
         color: #8ef1ff !important;
-        border-bottom: solid 2px #8ef1ff;
+        border-bottom: solid 4rpx #8ef1ff;
       }
     }
   }
 
   .list {
-    padding: 10px;
-    padding-bottom: 70px;
+    padding: 20rpx;
+    padding-bottom: 140rpx;
 
     .swipeLeft {
       display: flex;
       align-items: center;
       justify-content: center;
-      width: 40px;
+      width: 80rpx;
 
       .radio {
         transform: scale(0.8);
@@ -578,23 +578,23 @@ export default {
     }
 
     .card {
-      margin-bottom: 10px;
-      border-radius: 8px;
+      margin-bottom: 20rpx;
+      border-radius: 16rpx;
       background: #fff;
-      padding: 10px;
+      padding: 20rpx;
 
       .row {
         display: flex;
         justify-content: space-between;
         .status2 {
           position: absolute;
-          right: 10px;
-          width: 44px;
-          height: 16px;
-          font-size: 12px;
-          border-radius: 2px;
+          right: 20rpx;
+          width: 88rpx;
+          height: 32rpx;
+          font-size: 24rpx;
+          border-radius: 4rpx;
           text-align: center;
-          padding: 2px 5px;
+          padding: 4rpx 10rpx;
         }
         .type1 {
           background: #ffe4e7;
@@ -621,28 +621,28 @@ export default {
           align-items: center;
 
           .photo {
-            margin-right: 5px;
-            width: 30px;
-            height: 30px;
+            margin-right: 10rpx;
+            width: 60rpx;
+            height: 60rpx;
             border-radius: 50%;
           }
 
           .name {
-            font-size: 14px;
+            font-size: 28rpx;
             font-weight: 600;
           }
 
           .img {
-            width: 100px;
-            height: 100px;
-            border-radius: 2px;
-            margin-right: 10px;
+            width: 200rpx;
+            height: 200rpx;
+            border-radius: 4rpx;
+            margin-right: 20rpx;
           }
           .img2 {
-            width: 75px;
-            height: 75px;
-            border-radius: 2px;
-            margin-right: 10px;
+            width: 150rpx;
+            height: 150rpx;
+            border-radius: 4rpx;
+            margin-right: 20rpx;
           }
         }
 
@@ -650,36 +650,36 @@ export default {
           flex: 1;
 
           .row {
-            margin-bottom: 5px;
+            margin-bottom: 10rpx;
           }
 
           .title {
-            font-size: 16px;
+            font-size: 32rpx;
             font-weight: 600;
           }
         }
 
         .text1 {
           color: #666666;
-          font-size: 12px;
+          font-size: 24rpx;
         }
       }
       .cardButtons {
-        padding-top: 10px;
-        border-top: solid 1px #eaeaea;
+        padding-top: 20rpx;
+        border-top: solid 2rpx #eaeaea;
         justify-content: flex-end;
 
         .button {
-          font-size: 12px;
-          margin-left: 10px;
-          padding: 4px 0;
-          width: 60px;
+          font-size: 24rpx;
+          margin-left: 20rpx;
+          padding: 8rpx 0;
+          width: 120rpx;
           text-align: center;
-          border-radius: 5px;
+          border-radius: 10rpx;
         }
         .button1 {
           color: #ff7d12;
-          border: solid 1px #ff7d12;
+          border: solid 2rpx #ff7d12;
         }
         .button2 {
           color: #fff;
@@ -695,11 +695,11 @@ export default {
     display: flex;
     justify-content: space-around;
     width: 100%;
-    padding: 10px 0;
-    margin-bottom: 30px;
+    padding: 20rpx 0;
+    margin-bottom: 60rpx;
 
     image {
-      height: 42px;
+      height: 84rpx;
     }
   }
 
@@ -709,8 +709,8 @@ export default {
     bottom: 0;
     display: flex;
     justify-content: space-between;
-    width: calc(100% - 20px);
-    padding: 10px;
+    width: calc(100% - 40rpx);
+    padding: 20rpx;
 
     .left {
       display: flex;
@@ -719,18 +719,18 @@ export default {
 
       .text {
         color: #999;
-        font-size: 14px;
-        margin-left: 10px;
+        font-size: 28rpx;
+        margin-left: 20rpx;
       }
 
       .radio1 {
-        width: 20px;
-        height: 20px;
+        width: 40rpx;
+        height: 40rpx;
       }
 
       .radio2 {
-        width: 18px;
-        height: 18px;
+        width: 36rpx;
+        height: 36rpx;
       }
     }
 
@@ -738,20 +738,20 @@ export default {
       display: flex;
 
       .button {
-        height: 30px;
-        padding: 0 20px;
-        border-radius: 15px;
-        font-size: 14px;
-        line-height: 30px;
-        margin-left: 15px;
+        height: 60rpx;
+        padding: 0 40rpx;
+        border-radius: 30rpx;
+        font-size: 28rpx;
+        line-height: 60rpx;
+        margin-left: 30rpx;
       }
       .button1 {
-        height: 28px;
-        border: solid 1px #ff8015;
+        height: 56rpx;
+        border: solid 2rpx #ff8015;
         color: #ff8015;
       }
       .button2 {
-        // border: solid 1px #FF8015;
+        // border: solid 2rpx #FF8015;
         background: linear-gradient(180deg, #ffad3d 0%, #ff740a 100%);
         color: #fff;
       }
@@ -767,11 +767,11 @@ export default {
 
 .tabs2_info >>> .uni-select {
   border: none !important;
-  font-size: 12px;
+  font-size: 24rpx;
 }
 
 .tabs2_info >>> .uni-icons {
-  font-size: 20px !important;
+  font-size: 40rpx !important;
 }
 
 .tabs2_info >>> .uni-select__input-text {
@@ -783,10 +783,10 @@ export default {
 }
 
 .tabs2_info >>> .uni-select__selector {
-  width: 100px;
+  width: 200rpx;
 }
 
 .tabs2_info >>> .uni-select__selector-item {
-  font-size: 12px;
+  font-size: 24rpx;
 }
 </style>

+ 85 - 85
pages/knapsackTab/knapsack.vue

@@ -39,7 +39,7 @@
               </view>
             </template>
             <view class="card">
-              <view class="row" style="margin-top: 10px">
+              <view class="row" style="margin-top: 20rpx">
                 <view class="left">
                   <image
                     class="img"
@@ -47,7 +47,7 @@
                     mode="aspectFill"
                   ></image>
                 </view>
-                <view class="right" style="font-size: 14px">
+                <view class="right" style="font-size: 28rpx">
                   <view class="row title">
                     {{ item.prizeName }}
                   </view>
@@ -61,7 +61,7 @@
                     <span>
                       <image
                         @click="decompose(item)"
-                        style="width: 44px"
+                        style="width: 88rpx"
                         :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/knapsack/button5.png'"
                         mode="widthFix"
                       ></image>
@@ -123,7 +123,7 @@
       <view class="tabs2 tabw">
         <image
           class="tabs2_bk"
-          style="width: 100%; height: 30px"
+          style="width: 100%; height: 60rpx"
           :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/knapsack/tabBk2.png'"
           mode=""
         ></image>
@@ -145,13 +145,13 @@
             <view class="status2 type3" v-if="item.order.orderStatus == 301">待收货</view>
             <view class="status2 type4" v-if="item.order.orderStatus == 401">已完成</view>
           </view>
-          <view class="row text" style="font-size: 12px">订单ID:{{ item.order.orderSn }}</view>
-          <view class="row" style="margin-top: 10px" v-for="(item2, index2) in item.prizeList">
+          <view class="row text" style="font-size: 24rpx">订单ID:{{ item.order.orderSn }}</view>
+          <view class="row" style="margin-top: 20rpx" v-for="(item2, index2) in item.prizeList">
             <view class="left">
               <image class="img2" :src="item2.prizeIcon" mode="aspectFill"></image>
             </view>
-            <view class="right" style="font-size: 14px">
-              <view class="row" style="font-size: 12px">
+            <view class="right" style="font-size: 28rpx">
+              <view class="row" style="font-size: 24rpx">
                 {{ item2.prizeName }}
               </view>
               <view class="row" style="font-weight: 600; color: #ff2c43">
@@ -160,13 +160,13 @@
               </view>
             </view>
           </view>
-          <view class="row button" style="font-size: 14px">
+          <view class="row button" style="font-size: 28rpx">
             <span></span>
             <span>
               实付金额:
               <span style="font-weight: 600; color: #ff2c43">
-                <span style="font-size: 18px">{{ item.order.actualPrice }}</span>
+                <span style="font-size: 36rpx">{{ item.order.actualPrice }}</span>
               </span>
             </span>
           </view>
@@ -364,7 +364,7 @@ export default {
       }
       if (index == 2) {
         this.$refs.ani.step({
-          translateX: '120px',
+          translateX: '240rpx',
         })
         this.$refs.ani.run(() => {
           console.log('动画支持完毕')
@@ -479,19 +479,19 @@ export default {
   overflow: auto;
 
   .tabs {
-    width: 240px;
-    height: 44px;
-    border-radius: 22px;
+    width: 480rpx;
+    height: 88rpx;
+    border-radius: 44rpx;
     background: rgba(255, 255, 255, 0.8);
-    margin: 20px auto 10px auto;
+    margin: 40rpx auto 20rpx auto;
     color: #005ecc;
-    font-size: 14px;
+    font-size: 28rpx;
     display: flex;
     position: relative;
 
     .tabsTransition {
       width: 50%;
-      height: 44px;
+      height: 88rpx;
       position: absolute;
 
       .tabsBk {
@@ -502,9 +502,9 @@ export default {
 
     .tab {
       width: 50%;
-      height: 44px;
+      height: 88rpx;
       text-align: center;
-      line-height: 44px;
+      line-height: 88rpx;
       z-index: 2;
     }
 
@@ -514,7 +514,7 @@ export default {
   }
 
   .tabs2 {
-    width: 240px;
+    width: 480rpx;
     margin: 0 auto;
     position: relative;
 
@@ -530,20 +530,20 @@ export default {
       justify-content: center;
       width: 100%;
       height: 100%;
-      font-size: 12px;
+      font-size: 24rpx;
 
       .text {
         color: #fff;
       }
 
       .select {
-        width: 80px;
+        width: 160rpx;
       }
     }
   }
 
   .tabw {
-    width: calc(100% - 20px);
+    width: calc(100% - 40rpx);
     margin: 0 auto;
 
     .tabs2_info {
@@ -551,26 +551,26 @@ export default {
 
       .tabItem {
         color: #fff;
-        padding: 5px 0;
-        font-size: 13px;
+        padding: 10rpx 0;
+        font-size: 26rpx;
       }
 
       .active {
         color: #8ef1ff !important;
-        border-bottom: solid 2px #8ef1ff;
+        border-bottom: solid 4rpx #8ef1ff;
       }
     }
   }
 
   .list {
-    padding: 10px;
-    padding-bottom: 70px;
+    padding: 20rpx;
+    padding-bottom: 140rpx;
 
     .swipeLeft {
       display: flex;
       align-items: center;
       justify-content: center;
-      width: 40px;
+      width: 80rpx;
 
       .radio {
         transform: scale(0.8);
@@ -578,23 +578,23 @@ export default {
     }
 
     .card {
-      margin-bottom: 10px;
-      border-radius: 8px;
+      margin-bottom: 20rpx;
+      border-radius: 16rpx;
       background: #fff;
-      padding: 10px;
+      padding: 20rpx;
 
       .row {
         display: flex;
         justify-content: space-between;
         .status2 {
           position: absolute;
-          right: 10px;
-          width: 44px;
-          height: 16px;
-          font-size: 12px;
-          border-radius: 2px;
+          right: 20rpx;
+          width: 88rpx;
+          height: 32rpx;
+          font-size: 24rpx;
+          border-radius: 4rpx;
           text-align: center;
-          padding: 2px 5px;
+          padding: 4rpx 10rpx;
         }
         .type1 {
           background: #ffe4e7;
@@ -621,28 +621,28 @@ export default {
           align-items: center;
 
           .photo {
-            margin-right: 5px;
-            width: 30px;
-            height: 30px;
+            margin-right: 10rpx;
+            width: 60rpx;
+            height: 60rpx;
             border-radius: 50%;
           }
 
           .name {
-            font-size: 14px;
+            font-size: 28rpx;
             font-weight: 600;
           }
 
           .img {
-            width: 100px;
-            height: 100px;
-            border-radius: 2px;
-            margin-right: 10px;
+            width: 200rpx;
+            height: 200rpx;
+            border-radius: 4rpx;
+            margin-right: 20rpx;
           }
           .img2 {
-            width: 75px;
-            height: 75px;
-            border-radius: 2px;
-            margin-right: 10px;
+            width: 150rpx;
+            height: 150rpx;
+            border-radius: 4rpx;
+            margin-right: 20rpx;
           }
         }
 
@@ -650,36 +650,36 @@ export default {
           flex: 1;
 
           .row {
-            margin-bottom: 5px;
+            margin-bottom: 10rpx;
           }
 
           .title {
-            font-size: 16px;
+            font-size: 32rpx;
             font-weight: 600;
           }
         }
 
         .text1 {
           color: #666666;
-          font-size: 12px;
+          font-size: 24rpx;
         }
       }
       .cardButtons {
-        padding-top: 10px;
-        border-top: solid 1px #eaeaea;
+        padding-top: 20rpx;
+        border-top: solid 2rpx #eaeaea;
         justify-content: flex-end;
 
         .button {
-          font-size: 12px;
-          margin-left: 10px;
-          padding: 4px 0;
-          width: 60px;
+          font-size: 24rpx;
+          margin-left: 20rpx;
+          padding: 8rpx 0;
+          width: 120rpx;
           text-align: center;
-          border-radius: 5px;
+          border-radius: 10rpx;
         }
         .button1 {
           color: #ff7d12;
-          border: solid 1px #ff7d12;
+          border: solid 2rpx #ff7d12;
         }
         .button2 {
           color: #fff;
@@ -695,11 +695,11 @@ export default {
     display: flex;
     justify-content: space-around;
     width: 100%;
-    padding: 10px 0;
-    margin-bottom: 10px;
+    padding: 20rpx 0;
+    margin-bottom: 20rpx;
 
     image {
-      height: 42px;
+      height: 84rpx;
     }
   }
 
@@ -709,8 +709,8 @@ export default {
     bottom: 0;
     display: flex;
     justify-content: space-between;
-    width: calc(100% - 20px);
-    padding: 10px;
+    width: calc(100% - 40rpx);
+    padding: 20rpx;
 
     .left {
       display: flex;
@@ -719,18 +719,18 @@ export default {
 
       .text {
         color: #999;
-        font-size: 14px;
-        margin-left: 10px;
+        font-size: 28rpx;
+        margin-left: 20rpx;
       }
 
       .radio1 {
-        width: 20px;
-        height: 20px;
+        width: 40rpx;
+        height: 40rpx;
       }
 
       .radio2 {
-        width: 18px;
-        height: 18px;
+        width: 36rpx;
+        height: 36rpx;
       }
     }
 
@@ -738,20 +738,20 @@ export default {
       display: flex;
 
       .button {
-        height: 30px;
-        padding: 0 20px;
-        border-radius: 15px;
-        font-size: 14px;
-        line-height: 30px;
-        margin-left: 15px;
+        height: 60rpx;
+        padding: 0 40rpx;
+        border-radius: 30rpx;
+        font-size: 28rpx;
+        line-height: 60rpx;
+        margin-left: 30rpx;
       }
       .button1 {
-        height: 28px;
-        border: solid 1px #ff8015;
+        height: 56rpx;
+        border: solid 2rpx #ff8015;
         color: #ff8015;
       }
       .button2 {
-        // border: solid 1px #FF8015;
+        // border: solid 2rpx #FF8015;
         background: linear-gradient(180deg, #ffad3d 0%, #ff740a 100%);
         color: #fff;
       }
@@ -767,11 +767,11 @@ export default {
 
 .tabs2_info >>> .uni-select {
   border: none !important;
-  font-size: 12px;
+  font-size: 24rpx;
 }
 
 .tabs2_info >>> .uni-icons {
-  font-size: 20px !important;
+  font-size: 40rpx !important;
 }
 
 .tabs2_info >>> .uni-select__input-text {
@@ -783,10 +783,10 @@ export default {
 }
 
 .tabs2_info >>> .uni-select__selector {
-  width: 100px;
+  width: 200rpx;
 }
 
 .tabs2_info >>> .uni-select__selector-item {
-  font-size: 12px;
+  font-size: 24rpx;
 }
 </style>

+ 16 - 16
pages/login/login.vue

@@ -128,40 +128,40 @@ export default {
     flex-direction: column;
     width: 100%;
     // background-color: rgba(255, 255, 255, 0.7);
-    // padding: 30px 10px;
+    // padding: 60rpx 20rpx;
     .logo {
-      width: 94px;
-      height: 94px;
+      width: 188rpx;
+      height: 188rpx;
       margin-bottom: 20vh;
     }
     .tip {
       display: flex;
       justify-content: center;
       align-items: center;
-      margin-bottom: 10px;
+      margin-bottom: 20rpx;
       color: #000;
-      font-size: 12px;
+      font-size: 24rpx;
 
       .checkBox {
-        // font-size: 12px;
-        height: 12px;
-        width: 12px;
+        // font-size: 24rpx;
+        height: 24rpx;
+        width: 24rpx;
       }
     }
     .button {
-      height: 48px;
-      width: calc(100% - 60px);
-      border-radius: 24px;
-      line-height: 48px;
-      font-size: 14px;
+      height: 96rpx;
+      width: calc(100% - 120rpx);
+      border-radius: 48rpx;
+      line-height: 96rpx;
+      font-size: 28rpx;
       background: #fea200;
       color: #fff;
-      margin-bottom: 20px;
+      margin-bottom: 40rpx;
     }
     .textButton {
-      font-size: 14px;
+      font-size: 28rpx;
       color: #666;
-      margin-bottom: 75px;
+      margin-bottom: 150rpx;
     }
   }
 }

+ 8 - 8
pages/message/message.vue

@@ -97,24 +97,24 @@ export default {
   height: 100vh;
 
   .massage {
-    margin: 5px 10px;
+    margin: 10rpx 20rpx;
     .time {
-      font-size: 12px;
-      padding: 6px 0;
+      font-size: 24rpx;
+      padding: 12rpx 0;
       text-align: center;
     }
     .info {
       background: #fff;
-      border-radius: 5px;
-      padding: 10px;
+      border-radius: 10rpx;
+      padding: 20rpx;
 
       .title {
-        font-size: 16px;
+        font-size: 32rpx;
         font-weight: 600;
-        padding: 5px 0;
+        padding: 10rpx 0;
       }
       .text {
-        font-size: 12px;
+        font-size: 24rpx;
         color: #9999;
       }
     }

+ 2 - 2
pages/mine/mine.vue

@@ -24,7 +24,7 @@
           class="rounded-full"
         />
         <img
-          style="width: 116rpx; height: 116rpx; border: 2px solid #fff; background-color: #bbbcc3; opacity: 0.4"
+          style="width: 116rpx; height: 116rpx; border: 4rpx solid #fff; background-color: #bbbcc3; opacity: 0.4"
           v-if="!hasLogin"
           class="rounded-full"
         />
@@ -343,6 +343,6 @@ export default {
   width: 70vw;
   position: relative;
   z-index: 1000;
-  border-radius: 5px;
+  border-radius: 10rpx;
 }
 </style>

+ 81 - 81
pages/order/order.vue

@@ -4,7 +4,7 @@
       <view class="tabs2 tabw">
         <image
           class="tabs2_bk"
-          style="width: 100%; height: 30px"
+          style="width: 100%; height: 60rpx"
           :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/knapsack/tabBk2.png'"
           mode=""
         ></image>
@@ -26,13 +26,13 @@
             <view class="status2 type3" v-if="item.order.orderStatus == 301">待收货</view>
             <view class="status2 type4" v-if="item.order.orderStatus == 401">已完成</view>
           </view>
-          <view class="row text" style="font-size: 12px">订单ID:{{ item.order.orderSn }}</view>
-          <view class="row" style="margin-top: 10px" v-for="(item2, index2) in item.prizeList">
+          <view class="row text" style="font-size: 24rpx">订单ID:{{ item.order.orderSn }}</view>
+          <view class="row" style="margin-top: 20rpx" v-for="(item2, index2) in item.prizeList">
             <view class="left">
               <image class="img2" :src="item2.prizeIcon" mode="aspectFill"></image>
             </view>
-            <view class="right" style="font-size: 14px">
-              <view class="row" style="font-size: 12px">
+            <view class="right" style="font-size: 28rpx">
+              <view class="row" style="font-size: 24rpx">
                 {{ item2.prizeName }}
               </view>
               <view class="row" style="font-weight: 600; color: #ff2c43">
@@ -41,13 +41,13 @@
               </view>
             </view>
           </view>
-          <view class="row button" style="font-size: 14px">
+          <view class="row button" style="font-size: 28rpx">
             <span></span>
             <span>
               实付金额:
               <span style="font-weight: 600; color: #ff2c43">
-                <span style="font-size: 18px">{{ item.order.actualPrice }}</span>
+                <span style="font-size: 36rpx">{{ item.order.actualPrice }}</span>
               </span>
             </span>
           </view>
@@ -231,19 +231,19 @@ export default {
   overflow: auto;
 
   .tabs {
-    width: 240px;
-    height: 44px;
-    border-radius: 22px;
+    width: 480rpx;
+    height: 88rpx;
+    border-radius: 44rpx;
     background: rgba(255, 255, 255, 0.8);
-    margin: 20px auto 10px auto;
+    margin: 40rpx auto 20rpx auto;
     color: #005ecc;
-    font-size: 14px;
+    font-size: 28rpx;
     display: flex;
     position: relative;
 
     .tabsTransition {
       width: 50%;
-      height: 44px;
+      height: 88rpx;
       position: absolute;
 
       .tabsBk {
@@ -254,9 +254,9 @@ export default {
 
     .tab {
       width: 50%;
-      height: 44px;
+      height: 88rpx;
       text-align: center;
-      line-height: 44px;
+      line-height: 88rpx;
       z-index: 2;
     }
 
@@ -266,7 +266,7 @@ export default {
   }
 
   .tabs2 {
-    width: 240px;
+    width: 480rpx;
     margin: 0 auto;
     position: relative;
 
@@ -282,20 +282,20 @@ export default {
       justify-content: center;
       width: 100%;
       height: 100%;
-      font-size: 12px;
+      font-size: 24rpx;
 
       .text {
         color: #fff;
       }
 
       .select {
-        width: 80px;
+        width: 160rpx;
       }
     }
   }
 
   .tabw {
-    width: calc(100% - 20px);
+    width: calc(100% - 40rpx);
     margin: 0 auto;
 
     .tabs2_info {
@@ -303,26 +303,26 @@ export default {
 
       .tabItem {
         color: #fff;
-        padding: 5px 0;
-        font-size: 13px;
+        padding: 10rpx 0;
+        font-size: 26rpx;
       }
 
       .active {
         color: #8ef1ff !important;
-        border-bottom: solid 2px #8ef1ff;
+        border-bottom: solid 4rpx #8ef1ff;
       }
     }
   }
 
   .list {
-    padding: 10px;
-    padding-bottom: 70px;
+    padding: 20rpx;
+    padding-bottom: 140rpx;
 
     .swipeLeft {
       display: flex;
       align-items: center;
       justify-content: center;
-      width: 40px;
+      width: 80rpx;
 
       .radio {
         transform: scale(0.8);
@@ -330,23 +330,23 @@ export default {
     }
 
     .card {
-      margin-bottom: 10px;
-      border-radius: 8px;
+      margin-bottom: 20rpx;
+      border-radius: 16rpx;
       background: #fff;
-      padding: 10px;
+      padding: 20rpx;
 
       .row {
         display: flex;
         justify-content: space-between;
         .status2 {
           position: absolute;
-          right: 10px;
-          width: 44px;
-          height: 16px;
-          font-size: 12px;
-          border-radius: 2px;
+          right: 20rpx;
+          width: 88rpx;
+          height: 32rpx;
+          font-size: 24rpx;
+          border-radius: 4rpx;
           text-align: center;
-          padding: 2px 5px;
+          padding: 4rpx 10rpx;
         }
         .type1 {
           background: #ffe4e7;
@@ -373,28 +373,28 @@ export default {
           align-items: center;
 
           .photo {
-            margin-right: 5px;
-            width: 30px;
-            height: 30px;
+            margin-right: 10rpx;
+            width: 60rpx;
+            height: 60rpx;
             border-radius: 50%;
           }
 
           .name {
-            font-size: 14px;
+            font-size: 28rpx;
             font-weight: 600;
           }
 
           .img {
-            width: 100px;
-            height: 100px;
-            border-radius: 2px;
-            margin-right: 10px;
+            width: 200rpx;
+            height: 200rpx;
+            border-radius: 4rpx;
+            margin-right: 20rpx;
           }
           .img2 {
-            width: 75px;
-            height: 75px;
-            border-radius: 2px;
-            margin-right: 10px;
+            width: 150rpx;
+            height: 150rpx;
+            border-radius: 4rpx;
+            margin-right: 20rpx;
           }
         }
 
@@ -402,36 +402,36 @@ export default {
           flex: 1;
 
           .row {
-            margin-bottom: 5px;
+            margin-bottom: 10rpx;
           }
 
           .title {
-            font-size: 16px;
+            font-size: 32rpx;
             font-weight: 600;
           }
         }
 
         .text1 {
           color: #666666;
-          font-size: 12px;
+          font-size: 24rpx;
         }
       }
       .cardButtons {
-        padding-top: 10px;
-        border-top: solid 1px #eaeaea;
+        padding-top: 20rpx;
+        border-top: solid 2rpx #eaeaea;
         justify-content: flex-end;
 
         .button {
-          font-size: 12px;
-          margin-left: 10px;
-          padding: 4px 0;
-          width: 60px;
+          font-size: 24rpx;
+          margin-left: 20rpx;
+          padding: 8rpx 0;
+          width: 120rpx;
           text-align: center;
-          border-radius: 5px;
+          border-radius: 10rpx;
         }
         .button1 {
           color: #ff7d12;
-          border: solid 1px #ff7d12;
+          border: solid 2rpx #ff7d12;
         }
         .button2 {
           color: #fff;
@@ -447,11 +447,11 @@ export default {
     display: flex;
     justify-content: space-around;
     width: 100%;
-    padding: 10px 0;
-    margin-bottom: 30px;
+    padding: 20rpx 0;
+    margin-bottom: 60rpx;
 
     image {
-      height: 42px;
+      height: 84rpx;
     }
   }
 
@@ -461,8 +461,8 @@ export default {
     bottom: 0;
     display: flex;
     justify-content: space-between;
-    width: calc(100% - 20px);
-    padding: 10px;
+    width: calc(100% - 40rpx);
+    padding: 20rpx;
 
     .left {
       display: flex;
@@ -471,18 +471,18 @@ export default {
 
       .text {
         color: #999;
-        font-size: 14px;
-        margin-left: 10px;
+        font-size: 28rpx;
+        margin-left: 20rpx;
       }
 
       .radio1 {
-        width: 20px;
-        height: 20px;
+        width: 40rpx;
+        height: 40rpx;
       }
 
       .radio2 {
-        width: 18px;
-        height: 18px;
+        width: 36rpx;
+        height: 36rpx;
       }
     }
 
@@ -490,20 +490,20 @@ export default {
       display: flex;
 
       .button {
-        height: 30px;
-        padding: 0 20px;
-        border-radius: 15px;
-        font-size: 14px;
-        line-height: 30px;
-        margin-left: 15px;
+        height: 60rpx;
+        padding: 0 40rpx;
+        border-radius: 30rpx;
+        font-size: 28rpx;
+        line-height: 60rpx;
+        margin-left: 30rpx;
       }
       .button1 {
-        height: 28px;
-        border: solid 1px #ff8015;
+        height: 56rpx;
+        border: solid 2rpx #ff8015;
         color: #ff8015;
       }
       .button2 {
-        // border: solid 1px #FF8015;
+        // border: solid 2rpx #FF8015;
         background: linear-gradient(180deg, #ffad3d 0%, #ff740a 100%);
         color: #fff;
       }
@@ -519,11 +519,11 @@ export default {
 
 .tabs2_info >>> .uni-select {
   border: none !important;
-  font-size: 12px;
+  font-size: 24rpx;
 }
 
 .tabs2_info >>> .uni-icons {
-  font-size: 20px !important;
+  font-size: 40rpx !important;
 }
 
 .tabs2_info >>> .uni-select__input-text {
@@ -535,10 +535,10 @@ export default {
 }
 
 .tabs2_info >>> .uni-select__selector {
-  width: 100px;
+  width: 200rpx;
 }
 
 .tabs2_info >>> .uni-select__selector-item {
-  font-size: 12px;
+  font-size: 24rpx;
 }
 </style>

+ 41 - 41
pages/orderConfirm/orderConfirm.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="container">
     <view class="list">
-      <view class="card" style="height: 60px; align-items: center" @click="toAddress" v-if="!addressId">
+      <view class="card" style="height: 120rpx; align-items: center" @click="toAddress" v-if="!addressId">
         <view class="row">
           <view class="left">
             <image
@@ -9,7 +9,7 @@
               :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/orderConfirm/icon1.png'"
               mode="widthFix"
             ></image>
-            <span class="text1" style="margin-left: 5px">添加地址</span>
+            <span class="text1" style="margin-left: 10rpx">添加地址</span>
           </view>
           <view class="">
             <image
@@ -20,7 +20,7 @@
           </view>
         </view>
       </view>
-      <view class="card" style="height: 60px; align-items: center" v-else @click="toAddress">
+      <view class="card" style="height: 120rpx; align-items: center" v-else @click="toAddress">
         <view class="row">
           <view>
             {{ address.name }}
@@ -29,8 +29,8 @@
             {{ address.tel }}
           </view>
         </view>
-        <view class="row" style="margin-top: 5px">
-          <view style="font-size: 12px">
+        <view class="row" style="margin-top: 10rpx">
+          <view style="font-size: 24rpx">
             {{ address.province }}{{ address.city }}{{ address.county }}{{ address.addressDetail }}
           </view>
         </view>
@@ -39,11 +39,11 @@
 
     <view class="list">
       <view class="card" v-for="(item, index) in list">
-        <view class="row" style="margin-top: 10px">
+        <view class="row" style="margin-top: 20rpx">
           <view class="left">
             <image class="img" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/ka.jpeg'" mode="aspectFill"></image>
           </view>
-          <view class="right" style="font-size: 14px">
+          <view class="right" style="font-size: 28rpx">
             <view class="row title">
               {{ item.prizeName }}
             </view>
@@ -55,7 +55,7 @@
             <!-- 						<view class="row button">
 							<span></span>
 							<span>
-								<image style="width: 44px;" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2' + /knapsack/button5.png" mode="widthFix"></image>
+								<image style="width: 88rpx;" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2' + /knapsack/button5.png" mode="widthFix"></image>
 							</span>
 						</view> -->
           </view>
@@ -229,13 +229,13 @@ export default {
 
 <style scoped lang="scss">
 .list {
-  padding: 10px;
+  padding: 20rpx;
 
   .swipeLeft {
     display: flex;
     align-items: center;
     justify-content: center;
-    width: 40px;
+    width: 80rpx;
 
     .radio {
       transform: scale(0.8);
@@ -243,10 +243,10 @@ export default {
   }
 
   .card {
-    margin-bottom: 10px;
-    border-radius: 8px;
+    margin-bottom: 20rpx;
+    border-radius: 16rpx;
     background: #fff;
-    padding: 10px;
+    padding: 20rpx;
     display: flex;
     flex-wrap: wrap;
     .row {
@@ -259,22 +259,22 @@ export default {
         align-items: center;
 
         .photo {
-          margin-right: 5px;
-          width: 30px;
-          height: 30px;
+          margin-right: 10rpx;
+          width: 60rpx;
+          height: 60rpx;
           border-radius: 50%;
         }
 
         .name {
-          font-size: 14px;
+          font-size: 28rpx;
           font-weight: 600;
         }
 
         .img {
-          width: 100px;
-          height: 100px;
-          border-radius: 2px;
-          margin-right: 10px;
+          width: 200rpx;
+          height: 200rpx;
+          border-radius: 4rpx;
+          margin-right: 20rpx;
         }
       }
 
@@ -282,20 +282,20 @@ export default {
         flex: 1;
 
         .row {
-          margin-bottom: 5px;
+          margin-bottom: 10rpx;
         }
 
         .title {
-          font-size: 16px;
+          font-size: 32rpx;
           font-weight: 600;
         }
       }
       .icon {
-        width: 16px;
+        width: 32rpx;
       }
       .text1 {
         color: #666666;
-        font-size: 12px;
+        font-size: 24rpx;
       }
     }
   }
@@ -306,8 +306,8 @@ export default {
   bottom: 0;
   display: flex;
   justify-content: space-between;
-  width: calc(100% - 20px);
-  padding: 10px 10px 30px 10px;
+  width: calc(100% - 40rpx);
+  padding: 20rpx 20rpx 60rpx 20rpx;
   .left {
     display: flex;
     justify-content: center;
@@ -315,16 +315,16 @@ export default {
 
     .text {
       color: #999;
-      font-size: 14px;
-      margin-left: 10px;
+      font-size: 28rpx;
+      margin-left: 20rpx;
     }
     .radio1 {
-      width: 20px;
-      height: 20px;
+      width: 40rpx;
+      height: 40rpx;
     }
     .radio2 {
-      width: 18px;
-      height: 18px;
+      width: 36rpx;
+      height: 36rpx;
     }
   }
 
@@ -332,34 +332,34 @@ export default {
     display: flex;
 
     .button {
-      height: 30px;
+      height: 60rpx;
     }
   }
 }
 .popupContent {
   .title {
     text-align: center;
-    padding: 15px;
+    padding: 30rpx;
     font-weight: 600;
   }
   .text {
-    padding: 10px 30px;
-    font-size: 14px;
+    padding: 20rpx 60rpx;
+    font-size: 28rpx;
   }
   .text2 {
-    padding: 10px;
+    padding: 20rpx;
     display: flex;
     justify-content: flex-end;
     .price {
-      font-size: 14px;
+      font-size: 28rpx;
       font-weight: 600;
       color: #ff2c43;
     }
   }
 
   .button {
-    margin: 20px auto;
-    height: 40px;
+    margin: 40rpx auto;
+    height: 80rpx;
   }
 }
 </style>

+ 36 - 36
pages/raffle/raffle.vue

@@ -102,7 +102,7 @@
             <view class="row">
               <span class="price">
-                <span style="font-size: 20px">{{ item.price }}</span>
+                <span style="font-size: 40rpx">{{ item.price }}</span>
               </span>
             </view>
             <view class="row prizes">
@@ -258,8 +258,8 @@ export default {
 }
 
 .tabs {
-  margin: 10px 0;
-  height: 36px;
+  margin: 20rpx 0;
+  height: 72rpx;
   display: flex;
   justify-content: space-around;
   align-items: center;
@@ -273,46 +273,46 @@ export default {
 }
 
 .list {
-  padding: 10px;
+  padding: 20rpx;
 
   .kabk {
-    padding: 1px;
+    padding: 2rpx;
     background: linear-gradient(180deg, rgba(211, 74, 216, 0.3) 0%, rgba(58, 67, 207, 0.3) 25%);
-    border-radius: 13px;
-    box-shadow: 1px 1px 4px rgba(176, 123, 255, 0.5);
-    margin-bottom: 10px;
+    border-radius: 26rpx;
+    box-shadow: 2rpx 2rpx 8rpx rgba(176, 123, 255, 0.5);
+    margin-bottom: 20rpx;
     overflow: hidden;
   }
 
   .ka1 {
-    padding: 10px;
+    padding: 20rpx;
     display: flex;
     background: #fff;
-    border-radius: 12px;
+    border-radius: 24rpx;
     position: relative;
 
     .leftImg {
       width: 30vw;
       height: 30vw;
-      border-radius: 10px;
-      margin-right: 8px;
+      border-radius: 20rpx;
+      margin-right: 16rpx;
     }
 
     .rightInfo {
       flex: 1;
 
       .row {
-        margin-bottom: 5px;
+        margin-bottom: 10rpx;
 
         .price {
-          font-size: 14px;
+          font-size: 28rpx;
           font-weight: 600;
           color: #ff2c43;
         }
       }
 
       .title {
-        font-size: 17px;
+        font-size: 34rpx;
         font-weight: 600;
         width: 100%;
         white-space: nowrap;
@@ -325,25 +325,25 @@ export default {
         grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
 
         .prize {
-          border-radius: 4px;
+          border-radius: 8rpx;
           width: 10vw;
           height: 10vw;
-          margin-right: 5px;
+          margin-right: 10rpx;
         }
       }
 
       .tags {
         position: absolute;
-        right: -1px;
-        bottom: -2px;
+        right: -2rpx;
+        bottom: -4rpx;
         display: flex;
         flex-direction: row-reverse;
         justify-content: flex-end;
 
         .tag {
           position: relative;
-          width: 50px;
-          height: 20px;
+          width: 100rpx;
+          height: 40rpx;
         }
 
         .tag_0 {
@@ -351,12 +351,12 @@ export default {
         }
 
         .tag_1 {
-          right: -9px;
+          right: -18rpx;
           z-index: 2;
         }
 
         .tag_2 {
-          right: -18px;
+          right: -36rpx;
           z-index: 1;
         }
       }
@@ -367,14 +367,14 @@ export default {
 .list2 {
   display: grid;
   grid-template-columns: 1fr 1fr;
-  grid-gap: 10px;
-  padding: 10px;
-  width: calc(100% - 20px);
+  grid-gap: 20rpx;
+  padding: 20rpx;
+  width: calc(100% - 40rpx);
 
   .ka {
-    width: calc(50vw - 15px);
-    box-shadow: 0px 2px 8px 2px rgba(0, 0, 0, 0.1);
-    border-radius: 10px;
+    width: calc(50vw - 30rpx);
+    box-shadow: 0rpx 4rpx 16rpx 4rpx rgba(0, 0, 0, 0.1);
+    border-radius: 20rpx;
     // height: 60vw;
 
     .top {
@@ -392,10 +392,10 @@ export default {
     }
 
     .ka-info {
-      padding: 10px;
+      padding: 20rpx;
 
       .ka-name {
-        font-size: 15px;
+        font-size: 30rpx;
         font-weight: 600;
         width: 100%;
         white-space: nowrap;
@@ -405,7 +405,7 @@ export default {
 
       .row {
         position: relative;
-        margin-top: 5px;
+        margin-top: 10rpx;
         display: flex;
         justify-content: space-between;
 
@@ -413,7 +413,7 @@ export default {
         }
 
         .money {
-          font-size: 12px;
+          font-size: 24rpx;
           font-weight: 600;
           color: #ff2c43;
         }
@@ -436,14 +436,14 @@ export default {
     }
 
     .ka-info {
-      padding: 5px 5px 10px 5px;
+      padding: 10rpx 10rpx 20rpx 10rpx;
 
       .ka-name {
-        font-size: 12px;
+        font-size: 24rpx;
       }
 
       .row {
-        margin-top: 2px;
+        margin-top: 4rpx;
         justify-content: flex-end;
 
         .tag {

+ 4 - 4
pages/rule/rule.vue

@@ -67,17 +67,17 @@ export default {
 
 <style scoped lang="scss">
 .container {
-  font-size: 14px;
-  padding: 10px;
+  font-size: 28rpx;
+  padding: 20rpx;
 
   .title {
   }
 
   .textInfo {
-    padding-bottom: 30px;
+    padding-bottom: 60rpx;
 
     p {
-      margin: 5px 0;
+      margin: 10rpx 0;
     }
   }
 }

+ 2 - 2
pages/shoppingMall/shoppingMall.vue

@@ -8,10 +8,10 @@
         @click="handleSubmit(goods)"
         class="mx-1 bg-white rounded-lg shadow-md mb-2"
       >
-        <img :src="goods.icon" class="rounded-t-lg w-full" style="height: 200px" />
+        <img :src="goods.icon" class="rounded-t-lg w-full" style="height: 400rpx" />
         <div class="bold p-2">{{ goods.name }}</div>
         <div class="text-right pr-2 mb-1">
-          <span style="font-size: 12px">积分:</span>
+          <span style="font-size: 24rpx">积分:</span>
           <span class="bold text-red-500">{{ goods.integral }}</span>
         </div>
 

+ 14 - 14
pages/user/editUser/editUser.vue

@@ -63,38 +63,38 @@ export default {
 <style scoped lang="scss">
 .container {
   background: #f8f8f8;
-  padding: 15px 10px;
+  padding: 30rpx 20rpx;
 
   .title {
-    margin-bottom: 15px;
+    margin-bottom: 30rpx;
     color: #333333;
-    font-size: 14px;
-    padding: 0 10px;
+    font-size: 28rpx;
+    padding: 0 20rpx;
   }
   .input {
-    margin-bottom: 15px;
+    margin-bottom: 30rpx;
   }
   .tip {
     color: #999999;
-    padding-left: 15px;
-    font-size: 12px;
-    margin-bottom: 40px;
+    padding-left: 30rpx;
+    font-size: 24rpx;
+    margin-bottom: 80rpx;
   }
   .button {
     background: #fea200;
     color: #fff;
     text-align: center;
-    height: 44px;
-    line-height: 44px;
+    height: 88rpx;
+    line-height: 88rpx;
     font-weight: 400;
-    border-radius: 4px;
+    border-radius: 8rpx;
   }
 }
 </style>
 <style scoped>
 .container >>> .uni-easyinput__content-input {
-  padding-left: 15px !important;
-  padding-top: 5px;
-  padding-bottom: 5px;
+  padding-left: 30rpx !important;
+  padding-top: 10rpx;
+  padding-bottom: 10rpx;
 }
 </style>

+ 22 - 20
pages/user/user.vue

@@ -120,6 +120,7 @@ export default {
       })
     },
     decryptPhoneNumber(e) {
+      let _this = this
       console.log(e, 'eeee')
       let params = {
         iv: e.detail.iv,
@@ -127,6 +128,7 @@ export default {
       }
       bindPhoneApi(params).then(res => {
         console.log(res, 'rrr')
+        _this.getUserInfo()
       })
     },
     loginOut() {
@@ -171,13 +173,13 @@ export default {
 .uesrInfo {
   background: #fff;
   overflow: hidden;
-  padding: 0 15px;
+  padding: 0 30rpx;
 }
 .userPhoto {
-  width: 74px;
-  height: 74px;
+  width: 148rpx;
+  height: 148rpx;
   position: relative;
-  margin: 30px auto 30px auto;
+  margin: 60rpx auto 60rpx auto;
   position: relative;
 
   .img {
@@ -187,15 +189,15 @@ export default {
     background: #dedede;
   }
   .icon {
-    height: 20px;
-    width: 20px;
+    height: 40rpx;
+    width: 40rpx;
     position: absolute;
     right: 0;
     bottom: 0;
   }
 }
 .list {
-  // margin: 0 10px;
+  // margin: 0 20rpx;
 }
 .right {
   display: flex;
@@ -204,32 +206,32 @@ export default {
 }
 .button {
   display: inline-block;
-  font-size: 11px;
+  font-size: 22rpx;
   font-weight: 500;
-  // width: 34px;
-  height: 22px;
-  border-radius: 11px;
-  line-height: 22px;
-  padding: 0 10px;
-  margin-right: 5px;
+  // width: 68rpx;
+  height: 44rpx;
+  border-radius: 22rpx;
+  line-height: 44rpx;
+  padding: 0 20rpx;
+  margin-right: 10rpx;
 }
 .bottom {
   position: absolute;
   width: 100%;
-  height: 18px;
+  height: 36rpx;
   display: flex;
   justify-content: center;
   bottom: 0;
-  margin-bottom: 30px;
+  margin-bottom: 60rpx;
 
   .line {
-    width: 1px;
+    width: 2rpx;
     height: 100%;
     background: #000;
-    // margin: 0 30px;
+    // margin: 0 60rpx;
   }
   .textButton {
-    font-size: 13px;
+    font-size: 26rpx;
     text-decoration: underline;
     width: 50%;
     text-align: center;
@@ -239,7 +241,7 @@ export default {
 <style scoped>
 .listItem >>> .uni-list-item__extra-text {
   color: #000;
-  font-size: 14px;
+  font-size: 28rpx;
   font-weight: 600;
 }
 .userPhoto >>> .uni-file-picker__lists {

+ 4 - 4
pages/userAgreement/userAgreement.vue

@@ -139,17 +139,17 @@ export default {
 
 <style scoped lang="scss">
 .container {
-  font-size: 14px;
-  padding: 10px;
+  font-size: 28rpx;
+  padding: 20rpx;
 
   .title {
   }
 
   .textInfo {
-    padding-bottom: 30px;
+    padding-bottom: 60rpx;
 
     p {
-      margin: 5px 0;
+      margin: 10rpx 0;
     }
   }
 }

+ 18 - 18
pages/vip/vip.vue

@@ -10,9 +10,9 @@
       <view class="vip">
         <view class="vipLive">
           <span class="color1">VIP</span>
-          <span class="color1" style="margin-left: 5px">{{ userInfo.userLevel }}</span>
+          <span class="color1" style="margin-left: 10rpx">{{ userInfo.userLevel }}</span>
         </view>
-        <view class="tip" style="font-size: 10px; margin: 5px 0">
+        <view class="tip" style="font-size: 20rpx; margin: 10rpx 0">
           离升级还有{{ userInfo.nextLevelLeftAmount || 0 }}元 ({{ userInfo.consumeAmount || 0 }}/{{
             userInfo.nextLevelAmount || 0
           }})
@@ -26,7 +26,7 @@
     <view class="vipBox" style="display: flex; align-items: center" v-for="(item, index) in vipRule" :key="index">
       <view class="left vipLive">
         <span class="color1">VIP</span>
-        <span class="color1" style="margin-left: 5px">{{ item.vipLevel }}</span>
+        <span class="color1" style="margin-left: 10rpx">{{ item.vipLevel }}</span>
       </view>
       <view class="right">
         <view class="row">获得条件:累计消费{{ item.minAmount }}元</view>
@@ -86,25 +86,25 @@ export default {
   }
 
   .vipBox {
-    margin: 15px;
+    margin: 30rpx;
     // background: #272833;
     background: linear-gradient(160deg, #fef5e4 0%, #272833 36%, #717171 100%);
-    border-radius: 10px;
+    border-radius: 20rpx;
     color: #fef7e4;
-    padding: 15px;
+    padding: 30rpx;
 
     .right {
-      margin-left: 10px;
-      font-size: 12px;
+      margin-left: 20rpx;
+      font-size: 24rpx;
 
       .row {
-        margin: 5px 0;
+        margin: 10rpx 0;
       }
     }
     .userInfo {
       display: flex;
       align-items: center;
-      margin-bottom: 10px;
+      margin-bottom: 20rpx;
 
       .userPhoto {
         width: 12vw;
@@ -115,34 +115,34 @@ export default {
       }
 
       .name {
-        margin-left: 10px;
+        margin-left: 20rpx;
         font-weight: 600;
-        font-size: 14px;
+        font-size: 28rpx;
       }
     }
     .vipLive {
-      font-size: 20px;
+      font-size: 40rpx;
       font-weight: 600;
     }
     .vip {
       .progress {
-        margin: 5px 0;
+        margin: 10rpx 0;
         width: 100%;
-        height: 6px;
+        height: 12rpx;
         background: #fff;
-        border-radius: 3px;
+        border-radius: 6rpx;
       }
 
       .progressActive {
         width: 0%;
         height: 100%;
-        border-radius: 3px;
+        border-radius: 6rpx;
         background: linear-gradient(116deg, #fef5e4 0%, #f89eb2 62%, #aa91da 100%);
       }
     }
   }
   .title {
-    margin: 20px 15px 10px 15px;
+    margin: 40rpx 30rpx 20rpx 30rpx;
     font-weight: 600;
     color: #fff;
   }

+ 15 - 15
pages/winningRecord/winningRecord.vue

@@ -7,16 +7,16 @@
           <span class="name">{{ item.userName }}</span>
         </view>
         <view class="right text1">
-          <span style="margin-right: 5px">{{ item.creatTime }}</span>
+          <span style="margin-right: 10rpx">{{ item.creatTime }}</span>
           <span>No.{{ item.id }}</span>
         </view>
       </view>
-      <view class="row" style="margin-top: 10px">
+      <view class="row" style="margin-top: 20rpx">
         <view class="left">
           <image class="img" :src="item.prizeIcon" mode="aspectFill"></image>
           <span class="name">{{ item.prizeName }}</span>
         </view>
-        <view class="right" style="font-size: 14px">{{ $selectDictLabel(rewardType, item.prizeType) }} × 1</view>
+        <view class="right" style="font-size: 28rpx">{{ $selectDictLabel(rewardType, item.prizeType) }} × 1</view>
       </view>
     </view>
     <noData v-if="list.length == 0" />
@@ -68,10 +68,10 @@ export default {
   background: #9ec8f9;
   overflow: auto;
   .card {
-    margin: 10px 10px 0 10px;
-    border-radius: 8px;
+    margin: 20rpx 20rpx 0 20rpx;
+    border-radius: 16rpx;
     background: #fff;
-    padding: 10px;
+    padding: 20rpx;
 
     .row {
       display: flex;
@@ -83,27 +83,27 @@ export default {
         align-items: center;
 
         .photo {
-          margin-right: 5px;
-          width: 30px;
-          height: 30px;
+          margin-right: 10rpx;
+          width: 60rpx;
+          height: 60rpx;
           border-radius: 50%;
         }
 
         .name {
-          font-size: 14px;
+          font-size: 28rpx;
           font-weight: 600;
         }
 
         .img {
-          width: 40px;
-          height: 40px;
-          border-radius: 2px;
-          margin-right: 5px;
+          width: 80rpx;
+          height: 80rpx;
+          border-radius: 4rpx;
+          margin-right: 10rpx;
         }
       }
       .text1 {
         color: #666666;
-        font-size: 12px;
+        font-size: 24rpx;
       }
     }
   }

+ 6 - 6
static/style.scss

@@ -39,22 +39,22 @@ image {
 }
 
 .fs11 {
-  font-size: 11px;
+  font-size: 22rpx;
 }
 .fs12 {
-  font-size: 12px;
+  font-size: 24rpx;
 }
 .fs13 {
-  font-size: 13px;
+  font-size: 26rpx;
 }
 .fs14 {
-  font-size: 14px;
+  font-size: 28rpx;
 }
 
 .fs16 {
-  font-size: 16px;
+  font-size: 32rpx;
 }
 
 .fs18 {
-  font-size: 18px;
+  font-size: 36rpx;
 }

+ 81 - 0
utils/utils.js

@@ -105,3 +105,84 @@ export const formatSeconds = value => {
   }
   return text
 }
+
+//打开下载文件弹窗
+export function toDloadFilePopup(url) {
+  wx.showModal({
+    title: '是否复制福袋详情下载地址?',
+    content:
+      '为保证抽赏公正,可提前下载福袋详情。福袋详情包含此抽赏奖品对应号码,在此抽赏结束后,公布解压密码。确认后可以前往浏览器打开地址。',
+    success(res) {
+      if (res.confirm) {
+        console.log('fffffffffff')
+        wx.setClipboardData({
+          //设置系统剪贴板的内容
+          data: url,
+          success(res) {
+            console.log(res, url)
+            wx.getClipboardData({
+              // 获取系统剪贴板的内容
+              success(res) {
+                wx.showModal({
+                  title: '复制成功。',
+                  content: '文件地址已复制到剪贴板,请到浏览器打开下载。',
+                })
+              },
+            })
+          },
+        })
+      } else if (res.cancel) {
+        console.log('用户点击取消')
+      }
+    },
+  })
+}
+
+// 微信小程序下载文件
+
+export function downloadFile(url, callback) {
+  console.log(url, 'url')
+  var fileName = url.substring(url.lastIndexOf('/') + 1, url.length)
+  var fileType = url.substring(url.lastIndexOf('.') + 1, url.length)
+  console.log(fileName, 'fileName')
+  console.log(fileType, 'fileType')
+  wx.downloadFile({
+    url: url,
+    // 1. 必须带有这个wx.env.USER_DATA_PATH,表示存储在用户本地 !!!
+    // fileName表示自定的文件名称
+    // 实际在PC端调试存储位置为类似 C:\Users\SJshe\AppData\Local\微信开发者工具\User Data\WeappFileSystem\o6zAJs3c0u3SeBVn_9MUgG6UZJ1M\wx2efdf4edd8bccb88
+    filePath: wx.env.USER_DATA_PATH + '/' + fileName,
+    success: function (res) {
+      console.log(res, 'ressssssssssssssssssssssssssss')
+      if (res.statusCode === 200) {
+        // wx.showModal({
+        // 	title: '文件下载成功。',
+        // 	content: '送送送送送送送送',
+        // })
+        unzip(res.filePath)
+      }
+    },
+    fail: function (e) {
+      // 强烈建议打印失败原因,便于排查
+      console.log(e.errMsg, '报错')
+    },
+  })
+}
+const fs = wx.getFileSystemManager()
+const unzip = filePath => {
+  fs.unzip({
+    zipFilePath: filePath,
+    targetPath: wx.env.USER_DATA_PATH + `/chaomi`,
+    success: () => {
+      wx.showModal({
+        title: '文件下载成功。',
+        content: '文件已下载到本地',
+      })
+      // readdir()
+    },
+    fail: function (e) {
+      // 强烈建议打印失败原因,便于排查
+      console.log(e, '报错2')
+    },
+  })
+}