no message

component/numImg.vue

@@ -78,7 +78,7 @@ export default {
   align-items: center;
 
   .numImg {
-    height: 14px;
+    height: 26rpx;
   }
 }
 </style>

pages.json

@@ -108,6 +108,7 @@
     {
       "path": "pages/drawCard_first/drawCard_first",
       "style": {
+		"navigationStyle": "custom",
         "navigationBarTitleText": "FIRST赏",
         "enablePullDownRefresh": false
       }
@@ -157,6 +158,7 @@
     {
       "path": "pages/drawCard_last/drawCard_last",
       "style": {
+		"navigationStyle": "custom",
         "navigationBarTitleText": "LAST赏",
         "enablePullDownRefresh": false
       }
@@ -185,6 +187,7 @@
     {
       "path": "pages/drawCard_fullSet/drawCard_fullSet",
       "style": {
+		"navigationStyle": "custom",
         "navigationBarTitleText": "全套赏",
         "enablePullDownRefresh": false
       }

pages/drawCard_box/drawCard_boxDetail.vue

@@ -226,6 +226,7 @@ export default {
       background: linear-gradient(180deg, #faf1a7 0%, #ffe456 100%);
       border-radius: 5px;
       overflow: hidden;
+      width: 20vw;
 
       .prizeImg {
         width: 20vw;
@@ -238,6 +239,10 @@ export default {
 
         .name {
           font-size: 12px;
+          width: calc(100% - 20rpx);
+          overflow: hidden;
+          text-overflow: ellipsis;
+          padding: 0 10rpx;
         }
 
         .price {

pages/drawCard_first/drawCard_first.vue

@@ -2,7 +2,6 @@
   <div
     style="
       height: 100vh;
-
       background: linear-gradient(216deg, #fe854c 0%, #ff9a5a 100%);
       box-sizing: border-box;
       overflow: scroll;
@@ -22,7 +21,16 @@
         'padding-bottom': '160rpx',
       }"
     >
-      <div class="text-white bold text-center mt-2">FIRST赏详情</div>
+      <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>
       <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" />
@@ -224,7 +232,7 @@
                     <view class="left">
                       <span class="name">{{ item.userName }}</span>
                     </view>
-                    <view class="right text1">
+                    <view class="right text1" style="flex: initial">
                       <span>{{ item.creatTime }}</span>
                     </view>
                   </view>
@@ -475,6 +483,9 @@ export default {
       }
       this.$refs.paymentPopup.show(params, this.selectIndex, this.detail)
     },
+    back() {
+      wx.navigateBack({ delta: 1 })
+    },
   },
 }
 </script>

pages/drawCard_fullSet/drawCard_fullSet.vue

@@ -1,204 +1,255 @@
 <template>
   <view class="container">
-    <view class="head">
-      <image class="img" :src="detail.prizeIcon" mode="aspectFill"></image>
-      <view class="info">
-        <view class="title row">
-          {{ detail.name }}
-        </view>
-        <view class="row">
-          <view class="price">
-            ￥{{ detail.price }}
-            <span class="text">/张明信片</span>
+    <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="info">
+          <view class="title row">
+            {{ detail.name }}
           </view>
-          <image
-            @click="$navigateTo('/pages/rule/rule', { type: 3 })"
-            class="button"
-            src="https://fudaanfang.oss-cn-hangzhou.aliyuncs.com/festatic/bkm/first2/rule.png"
-            mode="widthFix"
-          ></image>
-        </view>
-        <view class="row">
-          <view class="users">
+          <view class="row">
+            <view class="price">
+              ￥{{ detail.price }}
+              <span class="text">/张明信片</span>
+            </view>
             <image
-              class="photo"
-              :style="'left:' + index * 11 + 'px'"
-              :src="'https://fudaanfang.oss-cn-hangzhou.aliyuncs.com/festatic/bkm/item.png'"
-              v-for="(item, index) in userList"
+              @click="$navigateTo('/pages/rule/rule', { type: 3 })"
+              class="button"
+              src="https://fudaanfang.oss-cn-hangzhou.aliyuncs.com/festatic/bkm/first2/rule.png"
               mode="widthFix"
             ></image>
           </view>
-          <view class="hot">
-            <image :src="'https://file.rongcyl.cn/festatic/bkm/imgv2' + '/first/hot.png'" mode="widthFix"></image>
-            {{ detail.hotNum }}
+          <view class="row">
+            <view class="users">
+              <image
+                class="photo"
+                :style="'left:' + index * 11 + 'px'"
+                :src="'https://fudaanfang.oss-cn-hangzhou.aliyuncs.com/festatic/bkm/item.png'"
+                v-for="(item, index) in userList"
+                mode="widthFix"
+              ></image>
+            </view>
+            <view class="hot">
+              <image :src="'https://file.rongcyl.cn/festatic/bkm/imgv2' + '/first/hot.png'" mode="widthFix"></image>
+              {{ detail.hotNum }}
+            </view>
           </view>
         </view>
       </view>
-    </view>
 
-    <view class="cardList">
-      <image
-        class="itemHead"
-        :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_fullSet/headBk.png'"
-        mode="widthFix"
-      ></image>
-      <view class="countdown textColor5">
-        {{ countdown }}
-      </view>
-      <view class="title">
-        <view class="left">
-          <image
-            class="text1"
-            :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="cardList">
+        <image
+          class="itemHead"
+          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_fullSet/headBk.png'"
+          mode="widthFix"
+        ></image>
+        <view class="countdown textColor5">
+          {{ countdown }}
         </view>
-        <view class="right">
-          <view class="text">
-            分享福袋有几率提高
-            <span style="color: #63fff6">S赏</span>
-            概率
-          </view>
-          <!-- <image class="button" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_fullSet/button1.png'" mode="widthFix"></image> -->
-          <button open-type="share" class="share_btn">
+        <view class="title">
+          <view class="left">
             <image
-              class="button"
-              :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_fullSet/button1.png'"
+              class="text1"
+              :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_fullSet/icon1.png'"
               mode="widthFix"
             ></image>
-          </button>
+            <view class="row text2" style="font-size: 14px">已选择 {{ selectIndex.length }} 个</view>
+          </view>
+          <view class="right">
+            <view class="text">
+              分享福袋有几率提高
+              <span style="color: #63fff6">S赏</span>
+              概率
+            </view>
+            <!-- <image class="button" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_fullSet/button1.png'" mode="widthFix"></image> -->
+            <button open-type="share" class="share_btn">
+              <image
+                class="button"
+                :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_fullSet/button1.png'"
+                mode="widthFix"
+              ></image>
+            </button>
+          </view>
         </view>
-      </view>
-      <view class="list">
-        <view
-          :class="['item', item.status == 0 ? 'c1' : 'c2']"
-          v-for="(item, index) in cardList"
-          @click="clickCard(item)"
-        >
-          <numImg v-if="item.status == 0" class="num" :value="item" :type="3" />
-          <img
-            v-if="item.status == 2"
-            src="https://file.rongcyl.cn/festatic/bkm/first2/gift_a.png"
-            style="width: 60rpx; height: 72rpx"
-          />
-          <img
-            v-if="item.status == 1"
-            src="https://file.rongcyl.cn/festatic/bkm/first2/lock.png"
-            style="width: 60rpx; height: 60rpx"
-          />
-          <image
-            v-if="item.check"
-            class="checkBk"
-            src="https://file.rongcyl.cn/festatic/bkm/imgv2/first/cardCheck.png"
-            mode="widthFix"
-          ></image>
+        <view class="list">
+          <view
+            :class="['item', item.status == 0 ? 'c1' : 'c2']"
+            v-for="(item, index) in cardList"
+            @click="clickCard(item)"
+          >
+            <numImg v-if="item.status == 0" class="num" :value="item" :type="3" />
+            <img
+              v-if="item.status == 2"
+              src="https://file.rongcyl.cn/festatic/bkm/first2/gift_a.png"
+              style="width: 60rpx; height: 72rpx"
+            />
+            <img
+              v-if="item.status == 1"
+              src="https://file.rongcyl.cn/festatic/bkm/first2/lock.png"
+              style="width: 60rpx; height: 60rpx"
+            />
+            <image
+              v-if="item.check"
+              class="checkBk"
+              src="https://file.rongcyl.cn/festatic/bkm/imgv2/first/cardCheck.png"
+              mode="widthFix"
+            ></image>
+          </view>
         </view>
       </view>
-      <image
-        class="buyButton"
-        @click="submit"
-        :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_fullSet/button2.png'"
-        mode="widthFix"
-      ></image>
-    </view>
 
-    <!-- <view class="examples">
-      <view class="example">
-        <image
-          class="exampleImg"
-          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/ka/kabk' + cardType(3, { status: 0 }) + '.png'"
-          mode="widthFix"
-        ></image>
-        <image class="tip" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/ka/bkType1.png'" mode="widthFix"></image>
+      <!-- <view class="examples">
+			  <view class="example">
+				<image
+				  class="exampleImg"
+				  :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/ka/kabk' + cardType(3, { status: 0 }) + '.png'"
+				  mode="widthFix"
+				></image>
+				<image class="tip" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/ka/bkType1.png'" mode="widthFix"></image>
+			  </view>
+			  <view class="example">
+				<image
+				  class="exampleImg"
+				  :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/ka/kabk' + cardType(3, { status: 2 }) + '.png'"
+				  mode="widthFix"
+				></image>
+				<image class="tip" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/ka/bkType5.png'" mode="widthFix"></image>
+			  </view>
+			  <view class="example">
+				<image
+				  class="exampleImg"
+				  :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/ka/kabk' + cardType(3, { status: 1 }) + '.png'"
+				  mode="widthFix"
+				></image>
+				<image class="tip" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/ka/bkType4.png'" mode="widthFix"></image>
+			  </view>
+			</view> -->
+
+      <view class="buttons">
+        <!-- 	<image class="button1" @click="toKnapsack"
+					:src="'https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_fullSet/button3.png'" mode="heightFix">
+				</image> -->
+        <!-- <image class="button1" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_fullSet/button4.png'" mode="heightFix"></image> -->
+        <!-- 	<image class="button1"
+					@click="$navigateTo('/pages/drawCard_fullSet/goods', { raffleId: params.raffleId })"
+					:src="'https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_fullSet/button5.png'" mode="heightFix">
+				</image> -->
+        <view class="button1" @click="$navigateTo('/pages/drawCard_fullSet/goods', { raffleId: params.raffleId })">
+          奖品预览
+        </view>
       </view>
-      <view class="example">
+      <view
+        class="winningList"
+        v-if="prizeUserList.length > 0"
+        @click="$navigateTo('/pages/drawCard_fullSet/winningList', { raffleId: params.raffleId })"
+      >
         <image
-          class="exampleImg"
-          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/ka/kabk' + cardType(3, { status: 2 }) + '.png'"
+          class="winningListTitle"
+          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_fullSet/icon2.png'"
           mode="widthFix"
         ></image>
-        <image class="tip" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/ka/bkType5.png'" mode="widthFix"></image>
+        <view class="list">
+          <view class="item" v-for="(item, index) in prizeUserList.slice(0, 5)">
+            <image class="photo" :src="item.userAvtar" mode="aspectFill"></image>
+            <view class="name">
+              {{ item.userName }}
+            </view>
+          </view>
+          <view class="item" v-if="prizeUserList.length > 5">
+            <image
+              class="photo"
+              :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_fullSet/icon3.png'"
+              mode="aspectFill"
+            ></image>
+            <view class="name" style="color: #6478fd">查看更多</view>
+          </view>
+        </view>
       </view>
-      <view class="example">
+      <view class="prizes" style="display: none">
         <image
-          class="exampleImg"
-          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/ka/kabk' + cardType(3, { status: 1 }) + '.png'"
+          class="title"
+          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/first/title.png'"
           mode="widthFix"
         ></image>
-        <image class="tip" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/ka/bkType4.png'" mode="widthFix"></image>
-      </view>
-    </view> -->
-
-    <view class="buttons">
-      <image
-        class="button1"
-        @click="toKnapsack"
-        :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_fullSet/button3.png'"
-        mode="heightFix"
-      ></image>
-      <!-- <image class="button1" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_fullSet/button4.png'" mode="heightFix"></image> -->
-      <image
-        class="button1"
-        @click="$navigateTo('/pages/drawCard_fullSet/goods', { raffleId: params.raffleId })"
-        :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_fullSet/button5.png'"
-        mode="heightFix"
-      ></image>
-    </view>
-    <view
-      class="winningList"
-      v-if="prizeUserList.length > 0"
-      @click="$navigateTo('/pages/drawCard_fullSet/winningList', { raffleId: params.raffleId })"
-    >
-      <image
-        class="winningListTitle"
-        :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_fullSet/icon2.png'"
-        mode="widthFix"
-      ></image>
-      <view class="list">
-        <view class="item" v-for="(item, index) in prizeUserList.slice(0, 5)">
-          <image class="photo" :src="item.userAvtar" mode="aspectFill"></image>
-          <view class="name">
-            {{ item.userName }}
-          </view>
-        </view>
-        <view class="item" v-if="prizeUserList.length > 5">
+        <view class="prizesList" v-for="(item, index) in prizeList">
           <image
-            class="photo"
-            :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_fullSet/icon3.png'"
-            mode="aspectFill"
+            class="bk"
+            :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/first/bk2.png'"
+            mode="scaleToFill"
           ></image>
-          <view class="name" style="color: #6478fd">查看更多</view>
-        </view>
-      </view>
-    </view>
-    <view class="prizes" style="display: none">
-      <image class="title" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/first/title.png'" mode="widthFix"></image>
-      <view class="prizesList" v-for="(item, index) in prizeList">
-        <image class="bk" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/first/bk2.png'" mode="scaleToFill"></image>
-        <view class="prizesTitle">
-          {{ $selectDictLabel(rewardType, item.type) }}
-        </view>
-        <view class="prizesImgOne" v-if="item.type == 22">
-          <view class="image" v-for="(item2, index2) in item.prizeList">
-            <image :class="item2.leftNum == 0 ? 'grey' : ''" :src="item2.icon" mode="aspectFill"></image>
+          <view class="prizesTitle">
+            {{ $selectDictLabel(rewardType, item.type) }}
           </view>
-        </view>
-        <view class="prizesImg" v-else>
-          <view class="image" v-for="(item2, index2) in item.prizeList">
-            <image :class="item2.leftNum == 0 ? 'grey' : ''" :src="item2.icon" mode="aspectFill"></image>
+          <view class="prizesImgOne" v-if="item.type == 22">
+            <view class="image" v-for="(item2, index2) in item.prizeList">
+              <image :class="item2.leftNum == 0 ? 'grey' : ''" :src="item2.icon" mode="aspectFill"></image>
+            </view>
+          </view>
+          <view class="prizesImg" v-else>
+            <view class="image" v-for="(item2, index2) in item.prizeList">
+              <image :class="item2.leftNum == 0 ? 'grey' : ''" :src="item2.icon" mode="aspectFill"></image>
+            </view>
           </view>
         </view>
       </view>
+      <div class="buy items-center">
+        <div class="pica ml-2" style="margin-top: -38rpx">
+          <img src="https://file.rongcyl.cn/festatic/bkm/first2/pica.png" class="w-full h-full" />
+        </div>
+        <div class="flex-1 text-white fs12 ml12 relative bottom-3 pl-3">
+          <span class="inline-block">已选{{ selectIndex.length }}个 合计:</span>
+          <span class="inline-block" style="color: #ea6636">
+            <span class="bold">¥</span>
+            <span class="fs18 bold">{{ (selectIndex.length * detail.price).toFixed(2) }}</span>
+          </span>
+        </div>
+        <img
+          @click="submit"
+          src="https://file.rongcyl.cn/festatic/bkm/first2/bug.png"
+          class="b_btn relative bottom-3 right-2"
+        />
+      </div>
     </view>
-    <image
-      class="refresh"
-      @click="refresh"
-      :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/first/refresh.png'"
-      mode="widthFix"
-    ></image>
+    <div class="fixed right-2 bottom-20" style="height: 460rpx">
+      <!-- 		  <img
+		    src="https://file.rongcyl.cn/festatic/bkm/first2/fu.png"
+		    style="width: 88rpx; height: 88rpx; margin-bottom: 24rpx"
+		  /> -->
+      <img
+        @click="toKnapsack"
+        src="https://file.rongcyl.cn/festatic/bkm/first2/bag.png"
+        style="width: 88rpx; height: 88rpx; margin-bottom: 24rpx"
+      />
+      <img
+        @click="refresh"
+        src="https://file.rongcyl.cn/festatic/bkm/first2/refresh.png"
+        style="width: 88rpx; height: 88rpx; margin-bottom: 24rpx"
+      />
+      <button open-type="share" class="share_btn">
+        <img
+          src="https://file.rongcyl.cn/festatic/bkm/first2/share.png"
+          style="width: 88rpx; height: 88rpx; margin-bottom: 24rpx"
+        />
+      </button>
+    </div>
+    <!-- <image class="refresh" @click="refresh"
+			:src="'https://file.rongcyl.cn/festatic/bkm/imgv2/first/refresh.png'" mode="widthFix"></image> -->
     <paymentPopup ref="paymentPopup" @callBack="paymentSuccess" />
-    <view style="height: 40px; width: 100%"></view>
   </view>
 </template>
 
@@ -218,6 +269,7 @@ export default {
   },
   data() {
     return {
+      safeAreaTop: '0px',
       countdown: '',
       countdownInfinity: null,
       cardType: cardType,
@@ -244,6 +296,9 @@ export default {
     }
     this.paymentSuccess()
   },
+  mounted() {
+    this.getSafeAreaTop()
+  },
   onHide() {
     if (!this.countdownInfinity) {
       clearInterval(this.countdownInfinity)
@@ -260,6 +315,13 @@ export default {
       // 获取中奖记录
       this.getPrizeUserList()
     },
+    getSafeAreaTop() {
+      wx.getSystemInfo({
+        success: res => {
+          this.safeAreaTop = res.safeArea.top + 'px'
+        },
+      })
+    },
     toKnapsack() {
       // 跳转背包界面
       wx.navigateTo({
@@ -437,6 +499,9 @@ export default {
       }
       this.getCardList()
     },
+    back() {
+      wx.navigateBack({ delta: 1 })
+    },
   },
 }
 </script>
@@ -458,9 +523,43 @@ export default {
 }
 
 .container {
-  background: #9ec8f9;
-  padding-top: 15px;
-  overflow: auto;
+  // background: #9ec8f9;
+  background: linear-gradient(216deg, #fe854c 0%, #ff9a5a 100%);
+
+  .bk {
+    overflow: auto;
+    padding-top: 15px;
+    background-image: url(https://file.rongcyl.cn/festatic/bkm/first2/bg.png);
+    height: calc(100vh - 160rpx);
+    background-repeat: no-repeat;
+    background-position: center center;
+    background-size: 100% 100%;
+    box-sizing: border-box;
+    overflow: scroll;
+    padding-bottom: 160rpx;
+
+    .buy {
+      position: fixed;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      width: 750rpx;
+      height: 160rpx;
+      background: #000000;
+      opacity: 1;
+      display: flex;
+
+      .pica {
+        width: 88rpx;
+        height: 88rpx;
+      }
+
+      .b_btn {
+        width: 232rpx;
+        height: 76rpx;
+      }
+    }
+  }
 
   .refresh {
     position: fixed;
@@ -548,7 +647,8 @@ export default {
     margin: 10px;
     border-radius: 12px;
     position: relative;
-    background: linear-gradient(180deg, #31b7fd 10%, #6478fd 90%);
+    // background: linear-gradient(180deg, #31b7fd 10%, #6478fd 90%);
+    background: #ff6f01;
     // overflow: scroll;
     padding-bottom: 1px;
 
@@ -563,7 +663,7 @@ export default {
       position: relative;
       left: -10px;
       top: -10px;
-      width: calc(100% + 10px);
+      width: calc(100% + 20rpx);
     }
 
     .title {
@@ -624,7 +724,7 @@ export default {
       .c1 {
         background-image: url(https://file.rongcyl.cn/festatic/bkm/imgv2/ka/kabk3.png);
         // width: 96rpx;
-        height: 128rpx;
+        height: 136rpx;
         background-repeat: no-repeat;
         background-position: center center;
         background-size: contain;
@@ -640,7 +740,7 @@ export default {
       .c2 {
         background-image: url(https://file.rongcyl.cn/festatic/bkm/imgv2/ka/kabk4.png);
         // width: 96rpx;
-        height: 128rpx;
+        height: 136rpx;
         background-repeat: no-repeat;
         background-position: center center;
         background-size: contain;
@@ -685,7 +785,7 @@ export default {
   .winningList {
     margin: 20px 10px;
     padding: 15px;
-    background: linear-gradient(180deg, #31b7fd 10%, #6478fd 90%);
+    background: linear-gradient(180deg, #ff6f01 10%, #ff5a01 90%);
     border-radius: 12px;
 
     .winningListTitle {
@@ -737,7 +837,15 @@ export default {
     padding: 0 10px;
 
     .button1 {
-      height: 52px;
+      height: 70rpx;
+      width: 140rpx;
+      line-height: 70rpx;
+      color: #fff;
+      background: linear-gradient(180deg, #fef104 10%, #ff7a33 90%);
+      text-align: center;
+      border-radius: 35rpx;
+      padding: 0 20rpx;
+      font-weight: 600;
     }
   }
 

pages/drawCard_fullSet/goods.vue

@@ -1,29 +1,34 @@
 <template>
-  <view class="container">
-    <view class="prizes">
-      <image class="title" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/first/title.png'" mode="widthFix"></image>
-      <view class="prizesList" v-for="(item, index) in prizeList">
-        <image class="bk" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/first/bk2.png'" mode="scaleToFill"></image>
-        <view class="prizesTitle">
-          {{ $selectDictLabel(rewardType, item.type) }}
-        </view>
-        <view class="prizesImgOne" v-if="item.type == 22">
-          <view class="image" v-for="(item2, index2) in item.prizeList" @click="showImg(item2)">
-            <image :class="item2.leftNum == 0 ? '' : ''" :src="item2.icon" mode="heightFix"></image>
-          </view>
-        </view>
-        <view class="prizesImg" v-else>
-          <view class="image" v-for="(item2, index2) in item.prizeList" @click="showImg(item2)">
-            <image :class="item2.leftNum == 0 ? '' : ''" :src="item2.icon" mode="heightFix"></image>
-          </view>
-        </view>
-      </view>
-    </view>
+  <view class="container list">
+    <div v-for="(item, index) in prizeList" :key="index">
+      <div class="titleTip">概率：{{ item.probability }}%(此概率为当前赏级概率)</div>
+      <Title :title="$selectDictLabel(rewardType, item.type).split('赏')[0]" />
+      <div class="flex pl-3 pt-3 mb-3" style="background-color: #f6f0e9">
+        <div
+          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"
+        >
+          <image
+            :src="item2.icon"
+            mode="aspectFill"
+            style="width: 144rpx; height: 144rpx; border-radius: 5px; margin: auto"
+          />
+          <div class="fs13 pl-2 prizeName">{{ item2.name }}</div>
+          <div style="color: #ea6636" class="pl-2">
+            <span class="fs11">参考价</span>
+            <span class="fs14 bold">{{ detail.price }}</span>
+          </div>
+        </div>
+      </div>
+    </div>
     <imgPopup ref="imgPopup" />
   </view>
 </template>
 
 <script>
+import Title from '@/component/title.vue'
 import imgPopup from '@/component/imgPopup.vue'
 import { rewardType } from '@/utils/commonConfig.js'
 import { prizeListApi } from '@/api/drawCard.js'
@@ -39,6 +44,7 @@ export default {
   },
   components: {
     imgPopup,
+    Title,
   },
   onLoad(query) {
     if (query.raffleId) {
@@ -63,10 +69,13 @@ export default {
 
 <style scoped lang="scss">
 .container {
-  background: #9ec8f9;
+  background: linear-gradient(216deg, #fe854c 0%, #ff9a5a 100%);
   padding-top: 15px;
   overflow: auto;
 }
+.list {
+  padding: 10px;
+}
 .prizes {
   .title {
     width: 103px;
@@ -138,4 +147,13 @@ export default {
     }
   }
 }
+.titleTip {
+  position: absolute;
+  z-index: 2;
+  height: 32px;
+  line-height: 42px;
+  padding-left: 25vw;
+  font-size: 12px;
+  color: #fff;
+}
 </style>

pages/drawCard_last/drawCard_last.vue

@@ -22,7 +22,16 @@
         'padding-bottom': '160rpx',
       }"
     >
-      <div class="text-white bold text-center mt-2">FIRST赏详情</div>
+      <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>
       <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" />
@@ -248,7 +257,7 @@
                     <view class="left">
                       <span class="name">{{ item.userName }}</span>
                     </view>
-                    <view class="right text1">
+                    <view class="right text1" style="flex: initial">
                       <span>{{ item.creatTime }}</span>
                     </view>
                   </view>
@@ -338,6 +347,8 @@ import { cardType, formatSeconds } from '@/utils/utils.js'
 import numImg from '@/component/numImg.vue'
 import paymentPopup from '@/component/paymentPopup.vue'
 import Title from '@/component/title.vue'
+
+const { v4: uuidv4 } = require('uuid')
 export default {
   data() {
     return {
@@ -619,6 +630,9 @@ export default {
       }
       this.$refs.paymentPopup.show(params, this.selectIndex, this.detail)
     },
+    back() {
+      wx.navigateBack({ delta: 1 })
+    },
   },
 }
 </script>

pages/knapsack/knapsack.vue

@@ -605,8 +605,8 @@ export default {
           color: #005ecc;
         }
         .type3 {
-          background: #00bcc8;
-          color: #00c537;
+          background: #d4f9fc;
+          color: #00bcc8;
         }
         .type4 {
           background: #def2e4;

pages/knapsackTab/knapsack.vue

@@ -605,8 +605,8 @@ export default {
           color: #005ecc;
         }
         .type3 {
-          background: #00bcc8;
-          color: #00c537;
+          background: #d4f9fc;
+          color: #00bcc8;
         }
         .type4 {
           background: #def2e4;

pages/mine/mine.vue

@@ -99,16 +99,16 @@
       </div>
       <div class="flex justify-around my-5 fs12 text-center">
         <div @click="$navigateTo('/pages/order/order?type=1')">
-          <img src="https://file.rongcyl.cn/festatic/bkm/mine/t1.png" style="width: 100rpx; height: 100rpx" />
-          <div class="mt-1">待发货</div>
+          <img src="https://file.rongcyl.cn/festatic/bkm/mine/t2.png" style="width: 100rpx; height: 100rpx" />
+          <div class="mt-1">待付款</div>
         </div>
         <div @click="$navigateTo('/pages/order/order?type=2')">
-          <img src="https://file.rongcyl.cn/festatic/bkm/mine/t2.png" style="width: 100rpx; height: 100rpx" />
-          <div class="mt-1">待收货</div>
+          <img src="https://file.rongcyl.cn/festatic/bkm/mine/t1.png" style="width: 100rpx; height: 100rpx" />
+          <div class="mt-1">待发货</div>
         </div>
         <div @click="$navigateTo('/pages/order/order?type=3')">
           <img src="https://file.rongcyl.cn/festatic/bkm/mine/t3.png" style="width: 100rpx; height: 100rpx" />
-          <div class="mt-1">已完成</div>
+          <div class="mt-1">待收货</div>
         </div>
         <div @click="$navigateTo('/pages/consumptionRecords/consumptionRecords')">
           <img src="https://file.rongcyl.cn/festatic/bkm/mine/t4.png" style="width: 100rpx; height: 100rpx" />

pages/order/order.vue

@@ -357,8 +357,8 @@ export default {
           color: #005ecc;
         }
         .type3 {
-          background: #00bcc8;
-          color: #00c537;
+          background: #d4f9fc;
+          color: #00bcc8;
         }
         .type4 {
           background: #def2e4;