Explorar o código

图片地址替换

chenrong hai 1 ano
pai
achega
402506a82b

+ 81 - 0
component/imgPopup.vue

@@ -0,0 +1,81 @@
+<template>
+  <view class="content">
+    <uni-popup class="popup" ref="popup" type="center">
+      <view class="popupContent">
+        <view class="title">奖品预览</view>
+        <image class="img" :src="imgUrl" mode="widthFix"></image>
+        <p class="name">
+          <span style="margin-right: 10px">奖品名称:</span>
+          {{ name }}
+        </p>
+      </view>
+    </uni-popup>
+  </view>
+</template>
+
+<script>
+export default {
+  emits: ['callBack'],
+  props: {
+    value: {
+      type: Object,
+      default: {},
+    },
+  },
+  computed: {},
+  data() {
+    return {
+      imgUrl: '',
+      name: '',
+    }
+  },
+  mounted() {
+    // this.$refs.popup2.open('center')
+    // this.getLotteryResults()
+  },
+  methods: {
+    show(value) {
+      this.imgUrl = value.icon
+      this.name = value.name
+      this.$refs.popup.open()
+    },
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.popupContent {
+  padding: 10px;
+  width: 70vw;
+  min-height: 40vh;
+  background: #fff;
+  border-radius: 5px;
+  display: flex;
+  justify-content: center;
+  align-content: flex-start;
+  flex-wrap: wrap;
+
+  .title {
+    margin-bottom: 10px;
+    text-align: center;
+  }
+  .img {
+    width: 60vw;
+    height: 60vw;
+    box-shadow: 1px 1px 4px #9c9c9c;
+  }
+
+  .name {
+    width: 100%;
+    margin-top: 20px;
+    text-align: center;
+    font-weight: 600;
+    font-size: 15px;
+  }
+}
+</style>
+<style scoped>
+/* .popup2 >>> .uni-popup__wrapper {
+  top: -8vh;
+} */
+</style>

+ 1 - 1
component/noData.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="nodata">
-    <image class="img" :src="$fileUrl() + '/noData.png'" mode="widthFix"></image>
+    <image class="img" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/noData.png'" mode="widthFix"></image>
     <view class="text">啊哦,没有任何内容</view>
   </view>
 </template>

+ 3 - 3
component/numImg.vue

@@ -2,17 +2,17 @@
   <view class="number">
     <image
       class="numImg"
-      :src="$fileUrl() + '/ka/num' + cardType(type, value) + '/' + num1() + '.png'"
+      :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/ka/num' + cardType(type, value) + '/' + num1() + '.png'"
       mode="heightFix"
     ></image>
     <image
       class="numImg"
-      :src="$fileUrl() + '/ka/num' + cardType(type, value) + '/' + num2() + '.png'"
+      :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/ka/num' + cardType(type, value) + '/' + num2() + '.png'"
       mode="heightFix"
     ></image>
     <image
       class="numImg"
-      :src="$fileUrl() + '/ka/num' + cardType(type, value) + '/' + num3() + '.png'"
+      :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/ka/num' + cardType(type, value) + '/' + num3() + '.png'"
       mode="heightFix"
     ></image>
   </view>

+ 22 - 4
component/paymentPopup.vue

@@ -71,12 +71,21 @@
           <span>本人已满18岁且具备完全行为能力</span>
         </view>
 
-        <image @click="submit" class="button" :src="$fileUrl() + '/first/button5.png'" mode="widthFix"></image>
+        <image
+          @click="submit"
+          class="button"
+          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/first/button5.png'"
+          mode="widthFix"
+        ></image>
       </view>
     </uni-popup>
     <!-- 抽赏结果 -->
     <uni-popup class="popup2" ref="popup2" type="center">
-      <image class="bk" :src="$fileUrl() + '/winningLottery/bk.png'" mode="widthFix"></image>
+      <image
+        class="bk"
+        :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/winningLottery/bk.png'"
+        mode="widthFix"
+      ></image>
       <view class="lotteryResults">
         <view class="title">
           中奖详情
@@ -98,9 +107,18 @@
           </view>
           <Mloading class="loading" text="抽奖中..." v-if="prizes.length == 0" />
         </view>
-        <image class="Rectangle" :src="$fileUrl() + '/winningLottery/Rectangle.png'" mode="widthFix"></image>
+        <image
+          class="Rectangle"
+          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/winningLottery/Rectangle.png'"
+          mode="widthFix"
+        ></image>
         <view class="text">已放入背包,可前往背包查看~</view>
-        <image class="close" @click="close2" :src="$fileUrl() + '/winningLottery/icon.png'" mode="widthFix"></image>
+        <image
+          class="close"
+          @click="close2"
+          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/winningLottery/icon.png'"
+          mode="widthFix"
+        ></image>
       </view>
     </uni-popup>
     <!-- 选则优惠券 -->

+ 1 - 1
pages/consumptionRecords/consumptionRecords.vue

@@ -11,7 +11,7 @@
         <image
           v-else
           class="icon"
-          :src="$fileUrl() + '/consumptionRecords/expressDelivery.png'"
+          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/consumptionRecords/expressDelivery.png'"
           mode="aspectFill"
         ></image>
         <view class="info">

+ 34 - 8
pages/drawCard_box/drawCard_box.vue

@@ -6,23 +6,26 @@
     <view class="boxsBr">
       <view class="boxs">
         <view class="box" v-for="(item, index) in bosList" @click="toDrawCard_boxDetail(item)">
-          <span v-if="item.boxLeft == 0">已抽完</span>
-          <span v-if="item.boxLeft != 0 && item.boxStatus == 1">已爆头</span>
+          <image
+            class="boxImg"
+            :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_box/boxImg.png'"
+            mode="widthFix"
+          ></image>
+          <view class="tip" v-if="item.boxLeft == 0">已抽完</view>
+          <view class="tip" v-if="item.boxLeft != 0 && item.boxStatus == 1">已爆头</view>
         </view>
       </view>
     </view>
+    <view class="text">官方正品,非质量问题不支持退换</view>
     <view class="number">{{ num }} / {{ detail.roundNum }} 箱</view>
     <view class="buttons">
       <view class="button" @click="boxChange(-1)">上一箱</view>
       <view class="button" @click="boxChange(1)">下一箱</view>
     </view>
 
-    <view class="buttons">
-      <view class="button" @click="toKnapsack">背包</view>
-      <!-- <view class="button" @click="toWinningRecord">中奖记录</view> -->
-    </view>
     <view class="rightButtons">
       <view class="button">规则</view>
+      <view class="button" style="top: 44px" @click="toKnapsack">背包</view>
     </view>
   </view>
 </template>
@@ -117,6 +120,7 @@ export default {
     text-align: center;
     font-weight: 600;
   }
+
   .boxsBr {
     margin: 20vw auto 0 auto;
     width: 70vw;
@@ -146,12 +150,34 @@ export default {
         color: #ffffff;
         text-shadow: 2px 2px 2px #829bfb;
         font-weight: 600;
+        position: relative;
+
+        .boxImg {
+          width: 80%;
+          height: 80%;
+        }
+
+        .tip {
+          position: absolute;
+          background: rgba(0, 0, 0, 0.45);
+          height: 100%;
+          width: 100%;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
       }
     }
   }
-
+  .text {
+    margin-top: 4vw;
+    color: #000;
+    width: 100%;
+    font-size: 14px;
+    text-align: center;
+  }
   .number {
-    margin-top: 8vw;
+    margin-top: 4vw;
     text-align: center;
     color: #ffffff;
     text-shadow: 2px 2px 2px #829bfb;

+ 16 - 6
pages/drawCard_box/drawCard_boxDetail.vue

@@ -13,7 +13,7 @@
     <view class="tipText">官方正品,非质量问题不支持退换</view>
     <view class="prizes">
       <view class="prizesLine">
-        <view class="prize" v-for="(item, index) in prizeList">
+        <view class="prize" v-for="(item, index) in prizeList" @click="showImg(item)">
           <image class="prizeImg" :src="item.icon" mode="aspectFit"></image>
           <view class="info">
             <view class="name">
@@ -26,7 +26,7 @@
     </view>
     <view class="buttons">
       <view class="button button1" @click="currentChange">换一包</view>
-      <view class="button button2" @click="buy">就买它</view>
+      <view class="button button2" @click="buy" style="color: #6a3d11">就买它</view>
     </view>
     <view class="rightButtons">
       <view class="button">规则</view>
@@ -35,15 +35,18 @@
     </view>
 
     <paymentPopup ref="paymentPopup" @callBack="paymentSuccess" />
+    <imgPopup ref="imgPopup" />
   </view>
 </template>
 
 <script>
 import paymentPopup from '@/component/paymentPopup.vue'
+import imgPopup from '@/component/imgPopup.vue'
 import { raffleDetailApi, getRoundPrizes, getBoxDetail } from '@/api/drawCard.js'
 export default {
   components: {
     paymentPopup,
+    imgPopup,
   },
   data() {
     return {
@@ -61,12 +64,18 @@ export default {
     console.log(query, 'query')
     this.query = query
     if (query.raffleId) {
-      this.getBoxDetail()
-      this.getDetail()
-      this.getCard()
+      this.init()
     }
   },
   methods: {
+    init() {
+      this.getBoxDetail()
+      this.getDetail()
+      this.getCard()
+    },
+    showImg(value) {
+      this.$refs.imgPopup.show(value)
+    },
     aniRun() {
       // 同时右平移到 100px,旋转 360 读
       this.$refs.ani.step({
@@ -95,7 +104,7 @@ export default {
     },
     // 支付成功后回调
     paymentSuccess() {
-      // this.init()
+      this.init()
     },
     getDetail() {
       let params = {
@@ -198,6 +207,7 @@ export default {
       position: relative;
       white-space: nowrap;
     }
+
     .prize {
       display: inline-block;
       margin-right: 10px;

+ 103 - 20
pages/drawCard_first/drawCard_first.vue

@@ -14,30 +14,30 @@
           <image
             @click="$navigateTo('/pages/rule/rule', { type: 5 })"
             class="button"
-            :src="$fileUrl() + '/invite/button1.png'"
+            :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/invite/button1.png'"
             mode="widthFix"
           ></image>
         </view>
         <view class="row">
-          <view class="users">
+          <!--          <view class="users">
             <image
               class="photo"
               :style="'left:' + index * 11 + 'px'"
-              :src="$fileUrl() + '/Frame1.png'"
+              :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/Frame1.png'"
               v-for="(item, index) in userList"
               mode="widthFix"
             ></image>
           </view>
-          <!-- <view class="hot">
-						<image :src="$fileUrl() + /first/hot.png" mode="widthFix"></image>
-						{{ detail.hotNum }}
-					</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 class="cardList">
-      <image class="bk" :src="$fileUrl() + '/first/bk1.png'" mode="widthFix"></image>
+      <image class="bk" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/first/bk1.png'" mode="widthFix"></image>
       <view class="leftButton" @click="left"></view>
       <view class="rightButton" @click="right"></view>
       <view class="list">
@@ -45,48 +45,101 @@
           <image
             v-if="item.check"
             class="kaBkActive"
-            :src="$fileUrl() + '/ka/kabk' + cardType(1, item) + 'Active.png'"
+            :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/ka/kabk' + cardType(1, item) + 'Active.png'"
             mode="heightFix"
           ></image>
-          <image class="kaBk" :src="$fileUrl() + '/ka/kabk' + cardType(1, item) + '.png'" mode="widthFix"></image>
+          <image
+            class="kaBk"
+            :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/ka/kabk' + cardType(1, item) + '.png'"
+            mode="widthFix"
+          ></image>
           <numImg class="num" :value="item" :type="1" />
         </view>
       </view>
     </view>
+
+    <view class="examples">
+      <view class="example">
+        <image
+          class="exampleImg"
+          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/ka/kabk' + cardType(1, { 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(1, { 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(1, { 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="$fileUrl() + '/first/button6.png'" mode="widthFix"></image>
+      <image
+        class="button1"
+        @click="toKnapsack"
+        :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/first/button6.png'"
+        mode="widthFix"
+      ></image>
       <view class="">
-        <image class="button2" @click="submit" :src="$fileUrl() + '/first/button4.png'" mode="widthFix"></image>
-        <!-- <image class="button2" :src="$fileUrl() + /first/button1.png" mode="widthFix"></image> -->
+        <image
+          class="button2"
+          @click="submit"
+          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/first/button4.png'"
+          mode="widthFix"
+        ></image>
+        <!-- <image class="button2" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2' + /first/button1.png" mode="widthFix"></image> -->
       </view>
-      <image @click="toWinningRecord" class="button1" :src="$fileUrl() + '/first/button3.png'" mode="widthFix"></image>
+      <image
+        @click="toWinningRecord"
+        class="button1"
+        :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/first/button3.png'"
+        mode="widthFix"
+      ></image>
     </view>
 
     <view class="prizes">
-      <image class="title" :src="$fileUrl() + '/first/title.png'" mode="widthFix"></image>
+      <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="$fileUrl() + '/first/bk2.png'" mode="scaleToFill"></image>
+        <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">
+          <view class="image" v-for="(item2, index2) in item.prizeList" @click="showImg(item2)">
             <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">
+          <view class="image" v-for="(item2, index2) in item.prizeList" @click="showImg(item2)">
             <image :class="item2.leftNum == 0 ? 'grey' : ''" :src="item2.icon" mode="aspectFill"></image>
           </view>
         </view>
       </view>
     </view>
-    <image class="refresh" @click="refresh" :src="$fileUrl() + '/first/refresh.png'" mode="widthFix"></image>
+    <image
+      class="refresh"
+      @click="refresh"
+      :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/first/refresh.png'"
+      mode="widthFix"
+    ></image>
     <paymentPopup ref="paymentPopup" @callBack="paymentSuccess" />
+    <imgPopup ref="imgPopup" />
   </view>
 </template>
 
 <script>
+import imgPopup from '@/component/imgPopup.vue'
 import { rewardType } from '@/utils/commonConfig.js'
 import { prizePoolStatusApi, drawCardSubmitApi, raffleDetailApi, prizeListApi } from '@/api/drawCard.js'
 import { cardType } from '@/utils/utils.js'
@@ -98,6 +151,7 @@ export default {
   components: {
     numImg,
     paymentPopup,
+    imgPopup,
   },
   data() {
     return {
@@ -133,6 +187,9 @@ export default {
       //获取奖池
       this.getPrizeList()
     },
+    showImg(value) {
+      this.$refs.imgPopup.show(value)
+    },
     toKnapsack() {
       // 跳转背包界面
       wx.navigateTo({
@@ -343,7 +400,7 @@ export default {
   }
 
   .cardList {
-    margin: 10px 0;
+    margin-top: 10px;
     position: relative;
 
     .bk {
@@ -496,4 +553,30 @@ export default {
     }
   }
 }
+.examples {
+  width: 100%;
+  margin-bottom: 20px;
+  padding: 0 10px;
+  display: flex;
+
+  .example {
+    width: 14vw;
+    margin-right: 10px;
+    display: flex;
+    justify-content: center;
+    flex-wrap: wrap;
+    position: relative;
+
+    .exampleImg {
+      width: 13vw;
+    }
+
+    .tip {
+      width: 100%;
+      position: absolute;
+      bottom: 0;
+      transform: translateY(50%);
+    }
+  }
+}
 </style>

+ 102 - 19
pages/drawCard_fullSet/drawCard_fullSet.vue

@@ -14,17 +14,17 @@
           <image
             @click="$navigateTo('/pages/rule/rule', { type: 3 })"
             class="button"
-            :src="$fileUrl() + '/invite/button1.png'"
+            :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/invite/button1.png'"
             mode="widthFix"
           ></image>
         </view>
         <view class="row">
           <!-- <view class="users">
-						<image class="photo" :style="'left:' + index * 11 + 'px'" :src="$fileUrl() + '/Frame1.png'"
+						<image class="photo" :style="'left:' + index * 11 + 'px'" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/Frame1.png'"
 							v-for="(item, index) in userList" mode="widthFix"></image>
 					</view> -->
           <!-- <view class="hot">
-						<image :src="$fileUrl() + /first/hot.png" mode="widthFix"></image>
+						<image :src="'https://file.rongcyl.cn/festatic/bkm/imgv2' + /first/hot.png" mode="widthFix"></image>
 						{{ detail.hotNum }}
 					</view> -->
         </view>
@@ -32,13 +32,21 @@
     </view>
 
     <view class="cardList">
-      <image class="itemHead" :src="$fileUrl() + '/drawCard_fullSet/headBk.png'" mode="widthFix"></image>
+      <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="$fileUrl() + '/drawCard_fullSet/icon1.png'" mode="widthFix"></image>
+          <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>
         <view class="right">
@@ -47,9 +55,13 @@
             <span style="color: #63fff6">S赏</span>
             概率
           </view>
-          <!-- <image class="button" :src="$fileUrl() + '/drawCard_fullSet/button1.png'" mode="widthFix"></image> -->
+          <!-- <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="$fileUrl() + '/drawCard_fullSet/button1.png'" mode="widthFix"></image>
+            <image
+              class="button"
+              :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_fullSet/button1.png'"
+              mode="widthFix"
+            ></image>
           </button>
         </view>
       </view>
@@ -58,32 +70,64 @@
           <image
             v-if="item.check"
             class="kaBkActive"
-            :src="$fileUrl() + '/ka/kabk' + cardType(3, item) + 'Active.png'"
+            :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/ka/kabk' + cardType(3, item) + 'Active.png'"
             mode="heightFix"
           ></image>
-          <image class="kaBk" :src="$fileUrl() + '/ka/kabk' + cardType(3, item) + '.png'" mode="widthFix"></image>
+          <image
+            class="kaBk"
+            :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/ka/kabk' + cardType(3, item) + '.png'"
+            mode="widthFix"
+          ></image>
           <numImg class="num" :value="item" :type="3" />
         </view>
       </view>
       <image
         class="buyButton"
         @click="submit"
-        :src="$fileUrl() + '/drawCard_fullSet/button2.png'"
+        :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>
+      <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="$fileUrl() + '/drawCard_fullSet/button3.png'"
+        :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_fullSet/button3.png'"
         mode="heightFix"
       ></image>
-      <!-- <image class="button1" :src="$fileUrl() + '/drawCard_fullSet/button4.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="$fileUrl() + '/drawCard_fullSet/button5.png'"
+        :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_fullSet/button5.png'"
         mode="heightFix"
       ></image>
     </view>
@@ -92,7 +136,11 @@
       v-if="prizeUserList.length > 0"
       @click="$navigateTo('/pages/drawCard_fullSet/winningList', { raffleId: params.raffleId })"
     >
-      <image class="winningListTitle" :src="$fileUrl() + '/drawCard_fullSet/icon2.png'" mode="widthFix"></image>
+      <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>
@@ -101,15 +149,19 @@
           </view>
         </view>
         <view class="item" v-if="prizeUserList.length > 5">
-          <image class="photo" :src="$fileUrl() + '/drawCard_fullSet/icon3.png'" mode="aspectFill"></image>
+          <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="prizes" style="display: none">
-      <image class="title" :src="$fileUrl() + '/first/title.png'" mode="widthFix"></image>
+      <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="$fileUrl() + '/first/bk2.png'" mode="scaleToFill"></image>
+        <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>
@@ -125,7 +177,12 @@
         </view>
       </view>
     </view>
-    <image class="refresh" @click="refresh" :src="$fileUrl() + '/first/refresh.png'" mode="widthFix"></image>
+    <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>
 </template>
@@ -474,7 +531,7 @@ export default {
   }
 
   .cardList {
-    margin: 10px;
+    margin: 10px 10px 0 10px;
     border-radius: 12px;
     position: relative;
     background: linear-gradient(180deg, #31b7fd 10%, #6478fd 90%);
@@ -719,4 +776,30 @@ export default {
     }
   }
 }
+.examples {
+  width: 100%;
+  margin-bottom: 20px;
+  padding: 0 10px;
+  display: flex;
+
+  .example {
+    width: 14vw;
+    margin-right: 10px;
+    display: flex;
+    justify-content: center;
+    flex-wrap: wrap;
+    position: relative;
+
+    .exampleImg {
+      width: 13vw;
+    }
+
+    .tip {
+      width: 100%;
+      position: absolute;
+      bottom: 0;
+      transform: translateY(50%);
+    }
+  }
+}
 </style>

+ 12 - 4
pages/drawCard_fullSet/goods.vue

@@ -1,28 +1,30 @@
 <template>
   <view class="container">
     <view class="prizes">
-      <image class="title" :src="$fileUrl() + '/first/title.png'" mode="widthFix"></image>
+      <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="$fileUrl() + '/first/bk2.png'" mode="scaleToFill"></image>
+        <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">
+          <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">
+          <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>
+    <imgPopup ref="imgPopup" />
   </view>
 </template>
 
 <script>
+import imgPopup from '@/component/imgPopup.vue'
 import { rewardType } from '@/utils/commonConfig.js'
 import { prizeListApi } from '@/api/drawCard.js'
 export default {
@@ -35,6 +37,9 @@ export default {
       prizeList: [],
     }
   },
+  components: {
+    imgPopup,
+  },
   onLoad(query) {
     if (query.raffleId) {
       this.params.raffleId = query.raffleId
@@ -43,6 +48,9 @@ export default {
   },
   onShow() {},
   methods: {
+    showImg(value) {
+      this.$refs.imgPopup.show(value)
+    },
     getPrizeList() {
       prizeListApi(this.params).then(res => {
         console.log(res, '奖池预览')

+ 7 - 2
pages/drawCard_fullSet/winningList.vue

@@ -15,10 +15,15 @@
             <image
               v-if="collapseShow(index)"
               class="icon"
-              :src="$fileUrl() + '/drawCard_fullSet/icon4.png'"
+              :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_fullSet/icon4.png'"
+              mode="widthFix"
+            ></image>
+            <image
+              v-else
+              class="icon"
+              :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_fullSet/icon5.png'"
               mode="widthFix"
             ></image>
-            <image v-else class="icon" :src="$fileUrl() + '/drawCard_fullSet/icon5.png'" mode="widthFix"></image>
           </view>
         </template>
         <view class="content">

+ 28 - 11
pages/drawCard_infinite/drawCard_infinite.vue

@@ -14,17 +14,17 @@
           <image
             @click="$navigateTo('/pages/rule/rule', { type: 1 })"
             class="button"
-            :src="$fileUrl() + '/invite/button1.png'"
+            :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/invite/button1.png'"
             mode="widthFix"
           ></image>
         </view>
         <view class="row">
           <!-- <view class="users">
-						<image class="photo" :style="'left:' + index * 11 + 'px'" :src="$fileUrl() + '/Frame1.png'"
+						<image class="photo" :style="'left:' + index * 11 + 'px'" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/Frame1.png'"
 							v-for="(item, index) in userList" mode="widthFix"></image>
 					</view> -->
           <!-- <view class="hot">
-						<image :src="$fileUrl() + /first/hot.png" mode="widthFix"></image>
+						<image :src="'https://file.rongcyl.cn/festatic/bkm/imgv2' + /first/hot.png" mode="widthFix"></image>
 						{{ detail.hotNum }}
 					</view> -->
         </view>
@@ -81,7 +81,11 @@
           </view>
         </view>
         <view class="boxRiaht">
-          <image class="icon" :src="$fileUrl() + '/drawCard_infinite/icon1.png'" mode="widthFix"></image>
+          <image
+            class="icon"
+            :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_infinite/icon1.png'"
+            mode="widthFix"
+          ></image>
         </view>
       </view>
     </view>
@@ -90,19 +94,23 @@
         class="button"
         @click="tabClick(1)"
         style="margin-right: 20px"
-        :src="$fileUrl() + `/drawCard_infinite/button1${active1 == 1 ? 'A' : ''}.png`"
+        :src="'https://file.rongcyl.cn/festatic/bkm/imgv2' + `/drawCard_infinite/button1${active1 == 1 ? 'A' : ''}.png`"
         mode="widthFix"
       ></image>
       <image
         class="button"
         @click="tabClick(2)"
-        :src="$fileUrl() + `/drawCard_infinite/button2${active1 == 2 ? 'A' : ''}.png`"
+        :src="'https://file.rongcyl.cn/festatic/bkm/imgv2' + `/drawCard_infinite/button2${active1 == 2 ? 'A' : ''}.png`"
         mode="widthFix"
       ></image>
     </view>
     <view class="prizeList" v-if="active1 == 1">
       <view class="prizeRow" v-for="(item, index) in prizeList">
-        <image class="bk" :src="$fileUrl() + '/drawCard_infinite/bk.png'" mode="scaleToFill"></image>
+        <image
+          class="bk"
+          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_infinite/bk.png'"
+          mode="scaleToFill"
+        ></image>
         <view class="prizeRowContent">
           <view class="prizesTitle">
             <span>
@@ -114,9 +122,13 @@
             <span class="sp">各类别赏中赏概率不代表具体产品中赏概率</span>
           </view>
           <view class="prizesItems">
-            <view class="prize" v-for="(item2, index2) in item.prizeList">
+            <view class="prize" v-for="(item2, index2) in item.prizeList" @click="showImg(item2)">
               <view class="kaImg">
-                <image class="kabk" :src="$fileUrl() + '/drawCard_infinite/kaBk.png'" mode="widthFix"></image>
+                <image
+                  class="kabk"
+                  :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/drawCard_infinite/kaBk.png'"
+                  mode="widthFix"
+                ></image>
                 <image class="img" :src="item2.icon" mode="aspectFit"></image>
               </view>
               <view class="kaName">
@@ -155,7 +167,7 @@
       <div class="text-center" v-if="winningRecordList.length == 0">
         <image
           style="width: 80vw; margin: auto; margin-top: -40px"
-          :src="$fileUrl() + '/noData.png'"
+          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/noData.png'"
           mode="widthFix"
         ></image>
         <view class="text-center" style="margin-top: -30px; color: #999999">啊哦,没有任何内容</view>
@@ -225,6 +237,7 @@
         />
       </div>
     </uni-popup>
+    <imgPopup ref="imgPopup" />
     <view style="width: 100%; height: 100px"></view>
   </view>
 </template>
@@ -237,11 +250,12 @@ import { raffleDetailApi, prizeListApi, prizeUserListApi, combosApi, getOuCount,
 import { cardType, formatSeconds } from '@/utils/utils.js'
 
 import paymentPopup from '@/component/paymentPopup.vue'
-
+import imgPopup from '@/component/imgPopup.vue'
 export default {
   components: {
     paymentPopup,
     noData,
+    imgPopup,
   },
   onLoad(query) {
     console.log(query, 'query')
@@ -274,6 +288,9 @@ export default {
     },
   },
   methods: {
+    showImg(value) {
+      this.$refs.imgPopup.show(value)
+    },
     showList() {
       this.getOuKingList()
       this.$refs.popup.open('center')

+ 102 - 20
pages/drawCard_last/drawCard_last.vue

@@ -14,30 +14,30 @@
           <image
             @click="$navigateTo('/pages/rule/rule', { type: 5 })"
             class="button"
-            :src="$fileUrl() + '/invite/button1.png'"
+            :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/invite/button1.png'"
             mode="widthFix"
           ></image>
         </view>
         <view class="row">
-          <view class="users">
+          <!--          <view class="users">
             <image
               class="photo"
               :style="'left:' + index * 11 + 'px'"
-              :src="$fileUrl() + '/Frame1.png'"
+              :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/Frame1.png'"
               v-for="(item, index) in userList"
               mode="widthFix"
             ></image>
           </view>
-          <!-- <view class="hot">
-						<image :src="$fileUrl() + /first/hot.png" mode="widthFix"></image>
-						{{ detail.hotNum }}
-					</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 class="cardList">
-      <image class="bk" :src="$fileUrl() + '/first/bk1.png'" mode="widthFix"></image>
+      <image class="bk" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/first/bk1.png'" mode="widthFix"></image>
       <view class="leftButton" @click="left"></view>
       <view class="rightButton" @click="right"></view>
       <view class="list">
@@ -45,21 +45,66 @@
           <image
             v-if="item.check"
             class="kaBkActive"
-            :src="$fileUrl() + '/ka/kabk' + cardType(2, item) + 'Active.png'"
+            :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/ka/kabk' + cardType(2, item) + 'Active.png'"
             mode="heightFix"
           ></image>
-          <image class="kaBk" :src="$fileUrl() + '/ka/kabk' + cardType(2, item) + '.png'" mode="widthFix"></image>
+          <image
+            class="kaBk"
+            :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/ka/kabk' + cardType(2, item) + '.png'"
+            mode="widthFix"
+          ></image>
           <numImg class="num" :value="item" :type="2" />
         </view>
       </view>
     </view>
+    <view class="examples">
+      <view class="example">
+        <image
+          class="exampleImg"
+          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/ka/kabk' + cardType(2, { 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(2, { 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(2, { 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="$fileUrl() + '/first/button6.png'" mode="widthFix"></image>
+      <image
+        class="button1"
+        @click="toKnapsack"
+        :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/first/button6.png'"
+        mode="widthFix"
+      ></image>
       <view class="">
-        <image class="button2" @click="submit" :src="$fileUrl() + '/first/button4.png'" mode="widthFix"></image>
-        <!-- <image class="button2" :src="$fileUrl() + /first/button1.png" mode="widthFix"></image> -->
+        <image
+          class="button2"
+          @click="submit"
+          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/first/button4.png'"
+          mode="widthFix"
+        ></image>
+        <!-- <image class="button2" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2' + /first/button1.png" mode="widthFix"></image> -->
       </view>
-      <image @click="toWinningRecord" class="button1" :src="$fileUrl() + '/first/button3.png'" mode="widthFix"></image>
+      <image
+        @click="toWinningRecord"
+        class="button1"
+        :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/first/button3.png'"
+        mode="widthFix"
+      ></image>
     </view>
     <view class="lockBox">
       <view class="text" v-if="!lockData.userId">本福袋连续购买10发,即开启保护机制</view>
@@ -88,30 +133,37 @@
       </view>
     </view>
     <view class="prizes">
-      <image class="title" :src="$fileUrl() + '/first/title.png'" mode="widthFix"></image>
+      <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="$fileUrl() + '/first/bk2.png'" mode="scaleToFill"></image>
+        <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">
+          <view class="image" v-for="(item2, index2) in item.prizeList" @click="showImg(item2)">
             <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">
+          <view class="image" v-for="(item2, index2) in item.prizeList" @click="showImg(item2)">
             <image :class="item2.leftNum == 0 ? 'grey' : ''" :src="item2.icon" mode="aspectFill"></image>
           </view>
         </view>
       </view>
     </view>
-    <image class="refresh" @click="refresh" :src="$fileUrl() + '/first/refresh.png'" mode="widthFix"></image>
+    <image
+      class="refresh"
+      @click="refresh"
+      :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/first/refresh.png'"
+      mode="widthFix"
+    ></image>
     <paymentPopup ref="paymentPopup" @callBack="paymentSuccess" />
+    <imgPopup ref="imgPopup" />
   </view>
 </template>
 
 <script>
+import imgPopup from '@/component/imgPopup.vue'
 import { rewardType } from '@/utils/commonConfig.js'
 import { prizePoolStatusApi, drawCardSubmitApi, raffleDetailApi, prizeListApi, getLockInfoApi } from '@/api/drawCard.js'
 import { cardType, formatSeconds } from '@/utils/utils.js'
@@ -125,6 +177,7 @@ export default {
   components: {
     numImg,
     paymentPopup,
+    imgPopup,
   },
   data() {
     return {
@@ -198,6 +251,9 @@ export default {
       // 连接锁箱Socket
       this.connectSocket()
     },
+    showImg(value) {
+      this.$refs.imgPopup.show(value)
+    },
     leave() {
       console.log('离开页面')
       // 离开页面
@@ -499,7 +555,7 @@ export default {
   }
 
   .cardList {
-    margin: 10px 0;
+    margin-top: 10px;
     position: relative;
 
     .bk {
@@ -739,4 +795,30 @@ export default {
     }
   }
 }
+.examples {
+  width: 100%;
+  margin-bottom: 20px;
+  padding: 0 10px;
+  display: flex;
+
+  .example {
+    width: 14vw;
+    margin-right: 10px;
+    display: flex;
+    justify-content: center;
+    flex-wrap: wrap;
+    position: relative;
+
+    .exampleImg {
+      width: 13vw;
+    }
+
+    .tip {
+      width: 100%;
+      position: absolute;
+      bottom: 0;
+      transform: translateY(50%);
+    }
+  }
+}
 </style>

+ 12 - 9
pages/index/index --lod.vue

@@ -1,40 +1,43 @@
 <template>
   <view class="container">
-    <image class="headImg" mode="aspectFill" :src="$fileUrl() + '/homeHead.jpeg'"></image>
+    <image class="headImg" mode="aspectFill" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/homeHead.jpeg'"></image>
     <view class="headBarrage"></view>
 
     <view class="tabs">
       <view class="tab">
-        <image :src="$fileUrl() + '/Frame3.png'" alt="" />
+        <image :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/Frame3.png'" alt="" />
         <span>全部</span>
       </view>
       <view class="tab" @click="$navigateTo('/pages/excellentValue/excellentValue')">
-        <image :src="$fileUrl() + '/Frame4.png'" alt="" />
+        <image :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/Frame4.png'" alt="" />
         <span>超值挑战</span>
       </view>
       <view class="tab">
-        <image :src="$fileUrl() + '/Frame2.png'" alt="" />
+        <image :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/Frame2.png'" alt="" />
         <span>拍卖专区</span>
       </view>
       <view class="tab">
-        <image :src="$fileUrl() + '/Frame1.png'" alt="" />
+        <image :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/Frame1.png'" alt="" />
         <span>VIP福利</span>
       </view>
     </view>
     <view class="buttons">
       <view class="left">
-        <image :src="$fileUrl() + '/button3.png'" @click="toInvite"></image>
+        <image :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/button3.png'" @click="toInvite"></image>
       </view>
       <view class="right">
-        <image :src="$fileUrl() + '/button1.png'"></image>
-        <image :src="$fileUrl() + '/button2.png'" @click="$navigateTo('/pages/raffle/raffle')" />
+        <image :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/button1.png'"></image>
+        <image
+          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/button2.png'"
+          @click="$navigateTo('/pages/raffle/raffle')"
+        />
       </view>
     </view>
     <view class="list-title">- 热门推荐 -</view>
     <view class="list">
       <view class="ka" v-for="(item, index) in kaList">
         <view class="top">
-          <image mode="aspectFit" :src="$fileUrl() + '/ka.jpeg'"></image>
+          <image mode="aspectFit" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/ka.jpeg'"></image>
         </view>
         <view class="ka-info">
           <view class="ka-name">宝可梦简中原盒拆拆乐</view>

+ 44 - 13
pages/index/index.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="container">
-    <image class="headImg" mode="aspectFill" :src="$fileUrl() + '/homeHead.jpeg'" />
+    <image class="headImg" mode="aspectFill" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/homeHead.jpeg'" />
     <view class="headBarrage">
       <view class="barrage-container">
         <view v-for="(item, index) in barrageData" :key="index" class="barrage-item" :style="item.style">
@@ -11,42 +11,45 @@
 
     <view class="tabs">
       <view class="tab">
-        <image :src="$fileUrl() + '/Frame3.png'" alt="" />
+        <image :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/Frame3.png'" alt="" />
         <span>全部</span>
       </view>
       <view class="tab" @click="$navigateTo('/pages/excellentValue/excellentValue')">
-        <image :src="$fileUrl() + '/Frame4.png'" alt="" />
+        <image :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/Frame4.png'" alt="" />
         <span>超值挑战</span>
       </view>
       <view class="tab" @click="$navigateTo('/pages/task/index')">
-        <image :src="$fileUrl() + '/Frame2.png'" alt="" />
+        <image :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/Frame2.png'" alt="" />
         <span>任务大厅</span>
       </view>
       <view class="tab" @click="$navigateTo('/pages/index2/index')">
-        <image :src="$fileUrl() + '/Frame1.png'" alt="" />
+        <image :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/Frame1.png'" alt="" />
         <span>VIP福利</span>
       </view>
     </view>
     <view class="buttons">
       <view class="left">
-        <image :src="$fileUrl() + '/button3.png'" @click="toInvite" />
+        <image :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/button3.png'" @click="toInvite" />
       </view>
       <view class="right">
-        <image :src="$fileUrl() + '/button1.png'" />
-        <image :src="$fileUrl() + '/button2.png'" @click="$navigateTo('/pages/raffle/raffle')" />
+        <image :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/button1.png'" />
+        <image
+          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/button2.png'"
+          @click="$navigateTo('/pages/raffle/raffle')"
+        />
       </view>
     </view>
     <view class="list-title">- 热门推荐 -</view>
     <view class="list">
-      <view class="ka" v-for="(item, index) in kaList">
+      <view class="ka" v-for="(item, index) in kaList" @click="drawCard(item)">
         <view class="top">
-          <image mode="aspectFit" :src="$fileUrl() + '/ka.jpeg'" />
+          <image mode="aspectFit" :src="item.icon" />
         </view>
         <view class="ka-info">
-          <view class="ka-name">宝可梦简中原盒拆拆乐</view>
+          <view class="ka-name">{{ item.name }}</view>
           <view class="row">
             <uni-tag text="创意热销" inverted type="default"></uni-tag>
-            <view class="money">¥9.9</view>
+            <view class="money">¥{{ item.price }}</view>
           </view>
         </view>
       </view>
@@ -56,11 +59,13 @@
 
 <script>
 import { messageListApi } from '@/api/common.js'
+import { raffleListApi } from '@/api/drawCard.js'
+
 export default {
   data() {
     return {
       timer: null,
-      kaList: 6,
+      kaList: [],
       messageList: [],
       barrageData: [],
       barrageIndex: 0,
@@ -88,6 +93,7 @@ export default {
   },
   onShow() {
     this.getMessage()
+    this.getHot()
     this.interval = setInterval(() => {
       console.log('重复获取消息')
       this.barrageIndex = 0
@@ -109,6 +115,31 @@ export default {
     clearInterval(this.timer)
   },
   methods: {
+    drawCard(value) {
+      let url = ''
+      if (value.type == 1) {
+        url = '/pages/drawCard_infinite/drawCard_infinite'
+      } else if (value.type == 2) {
+        url = '/pages/drawCard_last/drawCard_last'
+      } else if (value.type == 3) {
+        url = '/pages/drawCard_fullSet/drawCard_fullSet'
+      } else if (value.type == 4) {
+        url = '/pages/drawCard_box/drawCard_box'
+      } else if (value.type == 5) {
+        url = '/pages/drawCard_first/drawCard_first'
+      }
+      this.$navigateTo(url, { id: value.id })
+    },
+    getHot() {
+      let params = {
+        limit: 999,
+        page: 1,
+        isHot: true,
+      }
+      raffleListApi(params).then(res => {
+        this.kaList = res.data.list
+      })
+    },
     getMessage() {
       messageListApi(this.params).then(res => {
         this.messageList = res.data.list

+ 20 - 8
pages/invite/invite.vue

@@ -1,37 +1,49 @@
 <template>
   <view class="container">
-    <image class="bk" :src="$fileUrl() + '/invite/bk.png'" mode=""></image>
+    <image class="bk" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/invite/bk.png'" mode=""></image>
     <view class="page">
       <image
         class="illustrate"
         @click="$navigateTo('/pages/rule/rule', { type: 6 })"
-        :src="$fileUrl() + '/invite/button1.png'"
+        :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/invite/button1.png'"
         mode=""
       ></image>
       <view class="box">
         <view class="item">
-          <image mode="aspectFit" class="label1" :src="$fileUrl() + '/invite/text2.png'"></image>
+          <image
+            mode="aspectFit"
+            class="label1"
+            :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/invite/text2.png'"
+          ></image>
           <view class="value">
             {{ person }}
-            <image mode="aspectFit" :src="$fileUrl() + '/invite/text3.png'"></image>
+            <image mode="aspectFit" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/invite/text3.png'"></image>
           </view>
         </view>
         <view class="item">
-          <image mode="aspectFit" class="label2" :src="$fileUrl() + '/invite/text1.png'"></image>
+          <image
+            mode="aspectFit"
+            class="label2"
+            :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/invite/text1.png'"
+          ></image>
           <view class="value">
             {{ reward }}
-            <image mode="aspectFit" :src="$fileUrl() + '/invite/text4.png'"></image>
+            <image mode="aspectFit" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/invite/text4.png'"></image>
           </view>
         </view>
       </view>
       <view class="buttons">
         <button open-type="share" class="button">
-          <image class="button1" mode="aspectFit" :src="$fileUrl() + '/invite/button2.png'"></image>
+          <image
+            class="button1"
+            mode="aspectFit"
+            :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/invite/button2.png'"
+          ></image>
         </button>
         <image
           class="button2"
           mode="aspectFit"
-          :src="$fileUrl() + '/invite/button3.png'"
+          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/invite/button3.png'"
           @click="promotionCode"
         ></image>
         <!-- 		<view class="m_button">

+ 21 - 9
pages/knapsack/knapsack.vue

@@ -2,7 +2,11 @@
   <view class="container">
     <view class="tabs">
       <uni-transition ref="ani" class="tabsTransition" :styles="styles" :show="true">
-        <image class="tabsBk" :src="$fileUrl() + '/knapsack/tabBk.png'" mode="widthFix"></image>
+        <image
+          class="tabsBk"
+          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/knapsack/tabBk.png'"
+          mode="widthFix"
+        ></image>
       </uni-transition>
 
       <view :class="['tab', activeIndex == 1 ? 'active' : '']" @click="tabClick(1)">现货奖品</view>
@@ -11,7 +15,11 @@
 
     <view class="content" v-if="activeIndex == 1">
       <view class="tabs2">
-        <image class="tabs2_bk" :src="$fileUrl() + '/knapsack/tabBk2.png'" mode="widthFix"></image>
+        <image
+          class="tabs2_bk"
+          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/knapsack/tabBk2.png'"
+          mode="widthFix"
+        ></image>
         <view class="tabs2_info">
           <span class="text">选择排序方式:</span>
           <uni-data-select class="select" v-model="params.sort" :localdata="sortList"></uni-data-select>
@@ -33,7 +41,11 @@
             <view class="card">
               <view class="row" style="margin-top: 10px">
                 <view class="left">
-                  <image class="img" :src="$fileUrl() + '/ka.jpeg'" mode="aspectFill"></image>
+                  <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="row title">
@@ -50,7 +62,7 @@
                       <image
                         @click="decompose(item)"
                         style="width: 44px"
-                        :src="$fileUrl() + '/knapsack/button5.png'"
+                        :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/knapsack/button5.png'"
                         mode="widthFix"
                       ></image>
                     </span>
@@ -67,13 +79,13 @@
         <image
           class="button"
           @click="clickCheckType(2)"
-          :src="$fileUrl() + '/knapsack/button3.png'"
+          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/knapsack/button3.png'"
           mode="heightFix"
         ></image>
         <image
           class="button"
           @click="clickCheckType(1)"
-          :src="$fileUrl() + '/knapsack/button4.png'"
+          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/knapsack/button4.png'"
           mode="heightFix"
         ></image>
       </view>
@@ -83,14 +95,14 @@
             class="radio1"
             @click="clickCheckAll(true)"
             v-if="!allCheck"
-            :src="$fileUrl() + '/knapsack/check.png'"
+            :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/knapsack/check.png'"
             mode="widthFix"
           ></image>
           <image
             class="radio2"
             @click="clickCheckAll(false)"
             v-else
-            :src="$fileUrl() + '/knapsack/checkActive.png'"
+            :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/knapsack/checkActive.png'"
             mode="widthFix"
           ></image>
           <view class="text" style="color: #000">全选</view>
@@ -112,7 +124,7 @@
         <image
           class="tabs2_bk"
           style="width: 100%; height: 30px"
-          :src="$fileUrl() + '/knapsack/tabBk2.png'"
+          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/knapsack/tabBk2.png'"
           mode=""
         ></image>
         <view class="tabs2_info">

+ 21 - 9
pages/knapsackTab/knapsack.vue

@@ -2,7 +2,11 @@
   <view class="container">
     <view class="tabs">
       <uni-transition ref="ani" class="tabsTransition" :styles="styles" :show="true">
-        <image class="tabsBk" :src="$fileUrl() + '/knapsack/tabBk.png'" mode="widthFix"></image>
+        <image
+          class="tabsBk"
+          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/knapsack/tabBk.png'"
+          mode="widthFix"
+        ></image>
       </uni-transition>
 
       <view :class="['tab', activeIndex == 1 ? 'active' : '']" @click="tabClick(1)">现货奖品</view>
@@ -11,7 +15,11 @@
 
     <view class="content" v-if="activeIndex == 1">
       <view class="tabs2">
-        <image class="tabs2_bk" :src="$fileUrl() + '/knapsack/tabBk2.png'" mode="widthFix"></image>
+        <image
+          class="tabs2_bk"
+          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/knapsack/tabBk2.png'"
+          mode="widthFix"
+        ></image>
         <view class="tabs2_info">
           <span class="text">选择排序方式:</span>
           <uni-data-select class="select" v-model="params.sort" :localdata="sortList"></uni-data-select>
@@ -33,7 +41,11 @@
             <view class="card">
               <view class="row" style="margin-top: 10px">
                 <view class="left">
-                  <image class="img" :src="$fileUrl() + '/ka.jpeg'" mode="aspectFill"></image>
+                  <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="row title">
@@ -50,7 +62,7 @@
                       <image
                         @click="decompose(item)"
                         style="width: 44px"
-                        :src="$fileUrl() + '/knapsack/button5.png'"
+                        :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/knapsack/button5.png'"
                         mode="widthFix"
                       ></image>
                     </span>
@@ -67,13 +79,13 @@
         <image
           class="button"
           @click="clickCheckType(2)"
-          :src="$fileUrl() + '/knapsack/button3.png'"
+          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/knapsack/button3.png'"
           mode="heightFix"
         ></image>
         <image
           class="button"
           @click="clickCheckType(1)"
-          :src="$fileUrl() + '/knapsack/button4.png'"
+          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/knapsack/button4.png'"
           mode="heightFix"
         ></image>
       </view>
@@ -83,14 +95,14 @@
             class="radio1"
             @click="clickCheckAll(true)"
             v-if="!allCheck"
-            :src="$fileUrl() + '/knapsack/check.png'"
+            :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/knapsack/check.png'"
             mode="widthFix"
           ></image>
           <image
             class="radio2"
             @click="clickCheckAll(false)"
             v-else
-            :src="$fileUrl() + '/knapsack/checkActive.png'"
+            :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/knapsack/checkActive.png'"
             mode="widthFix"
           ></image>
           <view class="text" style="color: #000">全选</view>
@@ -112,7 +124,7 @@
         <image
           class="tabs2_bk"
           style="width: 100%; height: 30px"
-          :src="$fileUrl() + '/knapsack/tabBk2.png'"
+          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/knapsack/tabBk2.png'"
           mode=""
         ></image>
         <view class="tabs2_info">

+ 2 - 2
pages/login/login.vue

@@ -1,8 +1,8 @@
 <template>
   <view class="loginPage">
-    <image class="bk" :src="$fileUrl() + '/loginBk.png'" mode="widthFix"></image>
+    <image class="bk" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/loginBk.png'" mode="widthFix"></image>
     <view class="box">
-      <image class="logo" :src="$fileUrl() + '/logo.png'" mode="widthFix"></image>
+      <image class="logo" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/logo.png'" mode="widthFix"></image>
       <button @click="wxLogin" class="button" type="default">微信授权登录</button>
       <view class="textButton" @click="noLogin">暂不登录</view>
       <view class="tip">

+ 13 - 9
pages/mine/mine.vue

@@ -6,7 +6,7 @@
         <uni-badge class="message" :text="massageNum" absolute="rightTop" size="small" :max-num="99" :offset="[4, 4]">
           <image
             class="icon"
-            :src="$fileUrl() + '/mine/massage.png'"
+            :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/mine/massage.png'"
             mode="widthFix"
             @click="$navigateTo('/pages/message/message')"
           ></image>
@@ -19,7 +19,11 @@
           <view class="id">
             ID:
             <span v-if="hasLogin">{{ userId || '' }}</span>
-            <image class="copy" :src="$fileUrl() + '/mine/copy.png'" mode="widthFix"></image>
+            <image
+              class="copy"
+              :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/mine/copy.png'"
+              mode="widthFix"
+            ></image>
           </view>
         </view>
       </view>
@@ -40,31 +44,31 @@
     </view>
     <view class="menus">
       <view class="title">
-        <image :src="$fileUrl() + '/mine/title.png'" mode=""></image>
+        <image :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/mine/title.png'" mode=""></image>
       </view>
       <view class="menuList">
         <view class="menu" @click="pageTo('/pages/addressManage/addressManage')">
-          <image :src="$fileUrl() + '/mine/menu1.png'"></image>
+          <image :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/mine/menu1.png'"></image>
           <span>地址管理</span>
         </view>
         <view class="menu" @click="pageTo('/pages/consumptionRecords/consumptionRecords')">
-          <image :src="$fileUrl() + '/mine/menu2.png'"></image>
+          <image :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/mine/menu2.png'"></image>
           <span>消费记录</span>
         </view>
         <view class="menu">
-          <image :src="$fileUrl() + '/mine/menu3.png'"></image>
+          <image :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/mine/menu3.png'"></image>
           <span>加群交流</span>
         </view>
         <view class="menu">
-          <image :src="$fileUrl() + '/mine/menu4.png'"></image>
+          <image :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/mine/menu4.png'"></image>
           <span>游戏规则</span>
         </view>
         <view class="menu">
-          <image :src="$fileUrl() + '/mine/menu5.png'"></image>
+          <image :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/mine/menu5.png'"></image>
           <span>用户协议</span>
         </view>
         <button class="menu btn" open-type="contact">
-          <image :src="$fileUrl() + '/mine/menu6.png'"></image>
+          <image :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/mine/menu6.png'"></image>
           <span>联系客服</span>
         </button>
       </view>

+ 19 - 6
pages/orderConfirm/orderConfirm.vue

@@ -4,11 +4,19 @@
       <view class="card" style="height: 60px; align-items: center" @click="toAddress" v-if="!addressId">
         <view class="row">
           <view class="left">
-            <image class="icon" :src="$fileUrl() + '/orderConfirm/icon1.png'" mode="widthFix"></image>
+            <image
+              class="icon"
+              :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/orderConfirm/icon1.png'"
+              mode="widthFix"
+            ></image>
             <span class="text1" style="margin-left: 5px">添加地址</span>
           </view>
           <view class="">
-            <image class="icon" :src="$fileUrl() + '/orderConfirm/icon2.png'" mode="widthFix"></image>
+            <image
+              class="icon"
+              :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/orderConfirm/icon2.png'"
+              mode="widthFix"
+            ></image>
           </view>
         </view>
       </view>
@@ -33,7 +41,7 @@
       <view class="card" v-for="(item, index) in list">
         <view class="row" style="margin-top: 10px">
           <view class="left">
-            <image class="img" :src="$fileUrl() + '/ka.jpeg'" mode="aspectFill"></image>
+            <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="row title">
@@ -47,7 +55,7 @@
             <!-- 						<view class="row button">
 							<span></span>
 							<span>
-								<image style="width: 44px;" :src="$fileUrl() + /knapsack/button5.png" mode="widthFix"></image>
+								<image style="width: 44px;" :src="'https://file.rongcyl.cn/festatic/bkm/imgv2' + /knapsack/button5.png" mode="widthFix"></image>
 							</span>
 						</view> -->
           </view>
@@ -65,7 +73,7 @@
         <image
           class="button"
           @click="clickSubmit"
-          :src="$fileUrl() + '/orderConfirm/button.png'"
+          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/orderConfirm/button.png'"
           mode="heightFix"
         ></image>
       </view>
@@ -83,7 +91,12 @@
           <view class="price" v-else>¥15</view>
         </view>
 
-        <image class="button" @click="payment" :src="$fileUrl() + '/orderConfirm/button2.png'" mode="heightFix"></image>
+        <image
+          class="button"
+          @click="payment"
+          :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/orderConfirm/button2.png'"
+          mode="heightFix"
+        ></image>
       </view>
     </uni-popup>
   </view>

+ 18 - 5
pages/raffle/raffle.vue

@@ -11,13 +11,25 @@
     >
       <swiper class="swiper-box" @change="change" :current="swiperDotIndex">
         <swiper-item>
-          <image class="swiperItem" :src="$fileUrl() + '/raffle/2.jpg'" mode="aspectFill" />
+          <image
+            class="swiperItem"
+            :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/raffle/2.jpg'"
+            mode="aspectFill"
+          />
         </swiper-item>
         <swiper-item>
-          <image class="swiperItem" :src="$fileUrl() + '/raffle/3.jpg'" mode="aspectFill" />
+          <image
+            class="swiperItem"
+            :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/raffle/3.jpg'"
+            mode="aspectFill"
+          />
         </swiper-item>
         <swiper-item>
-          <image class="swiperItem" :src="$fileUrl() + '/raffle/1.jpg'" mode="aspectFill" />
+          <image
+            class="swiperItem"
+            :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/raffle/1.jpg'"
+            mode="aspectFill"
+          />
         </swiper-item>
       </swiper>
     </uni-swiper-dot>
@@ -56,7 +68,7 @@
               <image
                 v-for="(item3, index3) in item.subType"
                 :class="['tag', 'tag_' + index3]"
-                :src="$fileUrl() + `/raffle/tag${subType(item3)}.png`"
+                :src="'https://file.rongcyl.cn/festatic/bkm/imgv2' + `/raffle/tag${subType(item3)}.png`"
                 mode="widthFix"
               ></image>
             </view>
@@ -173,7 +185,8 @@ export default {
       return index
     },
     tabImg(index) {
-      let url = this.$fileUrl() + '/raffle/tab' + index + (this.tabActive == index ? 'a' : '') + '.png'
+      let url =
+        'https://file.rongcyl.cn/festatic/bkm/imgv2/raffle/tab' + index + (this.tabActive == index ? 'a' : '') + '.png'
       return url
     },
     clickTab(index) {

+ 5 - 1
pages/user/user.vue

@@ -14,7 +14,11 @@
           @success="success"
           @fail="fail"
         >
-          <image class="icon" :src="$fileUrl() + '/mine/icon1.png'" mode="widthFix"></image>
+          <image
+            class="icon"
+            :src="'https://file.rongcyl.cn/festatic/bkm/imgv2/mine/icon1.png'"
+            mode="widthFix"
+          ></image>
         </uni-file-picker>
       </view>
       <uni-list class="list">

+ 2 - 0
static/style.scss

@@ -7,6 +7,8 @@ page {
 }
 image {
   display: block;
+  height: auto;
+  width: auto;
 }
 .container {
   min-height: 100vh;

+ 1 - 1
utils/commonConfig.js

@@ -21,7 +21,7 @@ export const rewardType = [
   },
   {
     label: 'E赏',
-    value: 4,
+    value: 5,
   },
   {
     label: 'FIRST赏',

+ 2 - 2
utils/utils.js

@@ -2,10 +2,10 @@ export function cardType(index, card) {
   let type = index
   switch (card.status) {
     case 1:
-      type = 5
+      type = 4
       break
     case 2:
-      type = 4
+      type = 5
       break
   }
   return type