4-7

components/page.vue

@@ -3,7 +3,7 @@
         :class="customClass"
         @click="clickPage"
         :style="{
-            'background-color': bgColor,
+            'background': bgColor,
             'min-height': '100vh'
         }"
     >

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "超级玛特",
+    "name" : "燚火漫域",
     "appid" : "__UNI__7C10576",
     "description" : "",
     "versionName" : "1.0.5",

pages.json

@@ -34,7 +34,10 @@
     {
       "path": "pages/weal/index",
       "style": {
-        "navigationBarTitleText": "福利"
+        "navigationBarTitleText": "福利",
+		"navigationBarBackgroundColor": "#fff",
+		"navigationBarTextStyle": "black",
+		"enablePullDownRefresh" : false
       },
       "usingComponents": {}
     },
@@ -69,7 +72,9 @@
     },
     {
       "path": "pages/login/index",
-      "style": {}
+      "style": {
+		  
+	  }
     },
     {
       "path": "pages/address/index",
@@ -315,7 +320,7 @@
   ],
   "globalStyle": {
     "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "超级玛特",
+    "navigationBarTitleText": "燚火漫域",
     "navigationBarBackgroundColor": "#fff",
     "backgroundColor": "#fff",
     "navigationStyle": "custom"

pages/award/index.vue

@@ -6,130 +6,105 @@
         >
             <view class="flex-column-align-center nav-title">宝箱</view>
         </view>
-        <view class="boxPage" :style="{ backgroundImage: 'url(' + ossurl.box.boxPageBg + ')' }">
+		
+        <view class="boxPage" :style="{ backgroundImage: 'url(' + ossurl.box.headbj + ')' }">
             <view class="seizeSeet" :style="{ paddingTop: statusBarHeight + 40 + 'px' }"></view>
+			<view class="p30">
+				<view class="headerBox" :style="{ backgroundImage: 'url(' + ossurl.box.headInfo + ')' }">
+				    <view class="userBox">
+				        <view class="avatar">
+				            <image
+				                class="avatarImg"
+				                :src="user ? user.avatar : ossurl.common.noavatar"
+				            />
+				        </view>
+				        <view class="userName" v-if="user">
+				            {{ user.nickname }}
+				        </view>
+				        <view class="numList" v-if="user">
+				            <view
+				                class="item"
+				                @click="showView({ url: '/pages/magic/index', login: true })"
+				            >
+				                <view class="numBox">
+				                    {{ showNumber('magicBalance') }}
+				                </view>
+				                <view class="numTitle">源石</view>
+				            </view>
+				            <view
+				                class="item"
+				                @click="showView({ url: '/pages/coupon/index', login: true })"
+				            >
+				                <view class="numBox">
+				                    {{ showNumber('couponCount') }}
+				                </view>
+				                <view class="numTitle">优惠券</view>
+				            </view>
+				            <view
+				                class="item"
+				                @click="showView({ url: '/pages/store/index', login: true })"
+				            >
+				                <view class="numBox">
+				                    {{ showNumber('inventoryCount') }}
+				                </view>
+				                <view class="numTitle">仓库</view>
+				            </view>
+				        </view>
+				    </view>
+				    <view class="searchBox">
+				        <view class="searchInput">
+				            <input
+				                type="text"
+				                confirm-type="search"
+				                placeholder="搜索你感兴趣的～"
+				                v-model.trim="keyword"
+				                placeholder-style="color:#A27400;font-size:12px;"
+				                @confirm="getData()"
+				            />
+				            <text class="cuIcon-search" @click="getData()"></text>
+				        </view>
+						<view class="rule fx-c-c" @click="showView({ url: '/pages/message/index', login: false })">
+							<text>i</text><text>规则</text>
+						</view>
+				    </view>
+				</view>
+				<!-- 广告 -->
+				<view>
+				    <view class="flex-align-center flex-center marginB10"></view>
+				    <view>
+				        <view class="marginT10">
+				            <barrage ref="barrage1" />
+				        </view>
+				        <view class="marginT5">
+				            <barrage :left="50" ref="barrage2" />
+				        </view>
+				    </view>
+				</view>
+			</view>
 
-            <view class="headerBox" :style="{ backgroundImage: 'url(' + ossurl.box.boxBg1 + ')' }">
-                <view class="searchBox">
-                    <view class="searchInput">
-                        <input
-                            type="text"
-                            confirm-type="search"
-                            placeholder="搜索你感兴趣的～"
-                            v-model.trim="keyword"
-                            placeholder-style="color:#A27400;font-size:12px;"
-                            @confirm="getData()"
-                        />
-                        <text class="cuIcon-search" @click="getData()"></text>
-                    </view>
-                    <view
-                        class="ruleBtn"
-                        @click="showView({ url: '/pages/message/index', login: false })"
-                    >
-                        <image :src="ossurl.box.ruleBtn" mode="widthFix" style="height: 27rpx" />
-                    </view>
-                </view>
-                <view
-                    class="userBox"
-                    :style="{ backgroundImage: 'url(' + ossurl.box.userBg + ')' }"
-                >
-                    <view class="avatar">
-                        <image
-                            class="avatarImg"
-                            :src="user ? user.avatar : ossurl.common.noavatar"
-                        />
-                    </view>
-                    <view class="userName" v-if="user">
-                        {{ user.nickname }}
-                    </view>
-                    <view class="numList" v-if="user">
-                        <view
-                            class="item"
-                            @click="showView({ url: '/pages/magic/index', login: true })"
-                        >
-                            <view class="numBox">
-                                {{ showNumber('magicBalance') }}
-                            </view>
-                            <view class="numTitle">源石</view>
-                        </view>
-                        <view
-                            class="item"
-                            @click="showView({ url: '/pages/coupon/index', login: true })"
-                        >
-                            <view class="numBox">
-                                {{ showNumber('couponCount') }}
-                            </view>
-                            <view class="numTitle">优惠券</view>
-                        </view>
-                        <view
-                            class="item"
-                            @click="showView({ url: '/pages/store/index', login: true })"
-                        >
-                            <view class="numBox">
-                                {{ showNumber('inventoryCount') }}
-                            </view>
-                            <view class="numTitle">仓库</view>
-                        </view>
-                    </view>
-                </view>
-                <!-- <swiper
-                    class="bannerSwiper"
-                    :indicator-dots="false"
-                    circular="true"
-                    :autoplay="true"
-                    interval="3000"
-                    duration="500"
-                    :current="current"
-                >
-                    <swiper-item
-                        v-for="(item, index) in boxBanner"
-                        :key="index"
-                        @click="gotoRoute(item)"
-                    >
-                        <view class="bannerBox">
-                            <image class="image" :src="item.cover" mode="aspectFill" />
-                        </view>
-                    </swiper-item>
-                </swiper> -->
-                <view>
-                    <view class="flex-align-center flex-center marginB10"></view>
-                    <!-- <barrage ref="barrage1" :top="20" /> -->
-                    <view>
-                        <view class="marginT10">
-                            <barrage ref="barrage1" />
-                        </view>
-                        <view class="marginT5">
-                            <barrage :left="50" ref="barrage2" />
-                        </view>
-                    </view>
-                </view>
-            </view>
-
-            <view class="tabList" :style="{ backgroundImage: 'url(' + ossurl.box.tabBg + ')' }">
-                <image
-                    class="tabItem"
-                    :src="tabValue == '' ? ossurl.box.allActive : ossurl.box.all"
-                    style="width: 160rpx"
-                    mode="widthFix"
-                    @click="changeTab('')"
-                />
-                <image
-                    class="tabItem"
-                    :src="tabValue === 'UNLIMITED' ? ossurl.box.superActive : ossurl.box.super"
-                    style="width: 160rpx"
-                    @click="changeTab('UNLIMITED')"
-                    mode="widthFix"
-                />
-                <image
-                    class="tabItem"
-                    :src="tabValue === 'YFS_PRO' ? ossurl.box.yfsActive : ossurl.box.yfs"
-                    style="width: 160rpx"
-                    @click="changeTab('YFS_PRO')"
-                    mode="widthFix"
-                />
-                <!-- -->
-            </view>
-            <view class="relative itemList" style="height: 100%">
+            <view class="listSection">
+            	<view class="tabList" :style="{ backgroundImage: 'url(' + ossurl.box.tabBg + ')' }">
+					<view class="tab">
+						<view class="item fx-c" @click="changeTab('')" :style="tabValue == '' ? 'background: url(' + ossurl.box.tabIndexbj + ')no-repeat' : 'background: #F3F3F3' ">
+							<view class="img">
+								<image :src="ossurl.box.tabIndex1" mode="widthFix" />
+							</view>
+							<text>全部</text>
+						</view>
+						<view class="item fx-c" @click="changeTab('UNLIMITED')" :style="tabValue == 'UNLIMITED' ? 'background: url(' + ossurl.box.tabIndexbj + ')no-repeat' : 'background: #F3F3F3' ">
+							<view class="img">
+								<image :src="ossurl.box.tabIndex2" mode="widthFix" />
+							</view>
+							<text>超级赏</text>
+						</view>
+						<view class="item fx-c" @click="changeTab('YFS_PRO')" :style="tabValue == 'YFS_PRO' ? 'background: url(' + ossurl.box.tabIndexbj + ')no-repeat' : 'background: #F3F3F3' ">
+							<view class="img">
+								<image :src="ossurl.box.tabIndex3" mode="widthFix" />
+							</view>
+							<text>一番赏</text>
+						</view>
+					</view>
+            	</view>
                 <view
                     v-for="item in list"
                     :key="item.id"
@@ -138,8 +113,8 @@
                 >
                     <view class="relative itemBox">
                         <div class="itemTag">
-                            <image v-if="item.mode === 'UNLIMITED'" :src="ossurl.box.cj"></image>
-                            <image v-else-if="item.mode === 'YFS_PRO'" :src="ossurl.box.yf"></image>
+                            <image v-if="item.mode === 'UNLIMITED'" :src="ossurl.box.cj" mode="widthFix"></image>
+                            <image v-else-if="item.mode === 'YFS_PRO'" :src="ossurl.box.yf" mode="widthFix"></image>
                         </div>
                         <image class="itemImage" mode="aspectFill" :src="item.cover"></image>
                         <view class="itemText">
@@ -152,7 +127,11 @@
                     </view>
                 </view>
             </view>
-            <coupon-com ref="couponRef" @success="refresh" />
+            
+
+            </view>
+            
+			<coupon-com ref="couponRef" @success="refresh" />
             <poster ref="posterRef" />
             <activity ref="activityRef" @success="getIndex" />
             <view
@@ -339,13 +318,13 @@
         },
         onShareAppMessage(res) {
             return {
-                title: '超级玛特 次元聚集地，潮玩新势力',
+                title: '燚火漫域 次元聚集地，潮玩新势力',
                 path: '/pages/award/index'
             }
         },
         onShareTimeline() {
             return {
-                title: '超级玛特 次元聚集地，潮玩新势力',
+                title: '燚火漫域 次元聚集地，潮玩新势力',
                 imageUrl: this.list[0].cover
             }
         },
@@ -622,6 +601,12 @@
 </script>
 <style></style>
 <style lang="scss" scoped>
+	.listSection{
+		background: #fff;
+		padding-top: 30rpx;
+		border-radius: 30rpx 30rpx 0 0;
+		margin-top: 30rpx;
+	}
     .boxPage {
         background-size: 100% auto;
         background-repeat: no-repeat;
@@ -629,8 +614,8 @@
     .headerBox {
         background-size: 100% auto;
         background-repeat: no-repeat;
-        padding: 100rpx 36rpx 24rpx 36rpx;
-
+        padding: 70rpx 56rpx 24rpx 6rpx;
+		box-sizing: border-box;
         .searchBox {
             display: flex;
             align-items: center;
@@ -645,19 +630,27 @@
             align-items: center;
             padding: 0 24rpx;
             margin-right: 30rpx;
+			margin-left: 40rpx;
             .cuIcon-search {
-                color: #d0ab4f;
+                color: #333;
             }
             input {
                 flex: 1;
             }
         }
-        .ruleBtn {
-            width: 138rpx;
-            image {
-                width: 138rpx;
-            }
-        }
+		.rule {
+			width: 112rpx;
+			height: 64rpx;
+			background: #464646;
+			border-radius: 12rpx;
+		
+			text {
+				color: #FFE957;
+				margin-left: 5rpx;
+				font-weight: bold;
+				font-size: 28rpx;
+			}
+		}
         .userBox {
             width: 680rpx;
             height: 162rpx;
@@ -703,7 +696,7 @@
                     font-size: 24rpx;
                     font-family: Source Han Sans, Source Han Sans;
                     font-weight: 350;
-                    color: #c88f00;
+                    color: #999;
                 }
             }
         }
@@ -733,7 +726,53 @@
         color: #000000;
     }
     .tabList {
-        padding: 0 22rpx;
+        padding: 20rpx 22rpx;
+		.tab {
+			display: flex;
+			justify-content: space-between;
+		
+			.item {
+				width: 220rpx;
+				height: 68rpx;
+				background: #F3F3F3;
+				border-radius: 40rpx;
+				padding: 0 14rpx;
+				background-size: 100% 100%;
+				image {
+					margin-right: 16rpx;
+				}
+		
+				text {
+					font-size: 32rpx;
+					font-weight: bold;
+				}
+				.img{
+					width: 48rpx;
+					height: 48rpx;
+					overflow: hidden;
+					image{
+						width: 48rpx;
+					}
+				}
+			}
+		
+			.item1 {
+				display: flex;
+				width: 200rpx;
+				height: 78rpx;
+				background: url('https://file.supermarts.cn/file/yi_huo_man_yu/images/award/a3.png') no-repeat;
+				background-size: 100% 100%;
+				align-items: initial;
+		
+				image {
+					margin-top: 16rpx;
+				}
+		
+				text {
+					margin-top: 16rpx;
+				}
+			}
+		}
         .tabItem {
             margin-right: 24rpx;
             height: 150rpx;
@@ -784,11 +823,10 @@
             .itemTag {
                 position: absolute;
                 z-index: 1;
-                top: 12rpx;
-                right: 12rpx;
+                top: 0rpx;
+                left: 0rpx;
                 image {
-                    width: 112rpx;
-                    height: 64rpx;
+                    width: 152rpx;
                 }
             }
             .itemText {

pages/award_detail/index.vue

@@ -3,7 +3,7 @@
     <page :nav="false" ref="pageRef">
         <view
             class="detailWrapper"
-            :style="{ backgroundImage: 'url(' + ossurl.box.detail.awardBg + ')' }"
+            :style="{ backgroundImage: 'url(' + ossurl.box.headDetailbj + ')' }"
         >
             <view
                 class="pagae-nav"
@@ -47,7 +47,7 @@
                         </view>
                         <view
                             class="level"
-                            :style="{ backgroundImage: 'url(' + ossurl.box.detail.levelBg + ')' }"
+                            :style="{ backgroundImage: 'url(' + ossurl.mine.butbj + ')' }"
                         >
                             {{ getLevel(item.level) }}({{ item.probability }}%)
                         </view>
@@ -60,6 +60,9 @@
                     <image :src="ossurl.box.detail.right" mode="aspectFit" />
                 </view>
             </view>
+			<view class="swiperBottom">
+				<image :src="ossurl.box.detail.bottom" style="width: 100%;" mode="widthFix" />
+			</view>
         </view>
         <product-a
             v-if="products"
@@ -75,15 +78,13 @@
                 <view
                     class="relative btnItem"
                     @click="pay(1)"
-                    :style="{ backgroundImage: 'url(' + ossurl.box.detail.yfBtn + ')' }"
+                    :style="{ backgroundImage: 'url(' + ossurl.box.detail.yfBtn + '); color: #000;' }"
                 >
-                    <view>
-                        一发入魂
-                        <view v-if="$valid.isNumber2(data.specialPrice)" class="text">
-                            (¥{{ data.specialPrice }})
-                        </view>
-                        <view v-else class="text">(¥{{ data.price }})</view>
+                    一发入魂
+                    <view v-if="$valid.isNumber2(data.specialPrice)" class="text">
+                        (¥{{ data.specialPrice }})
                     </view>
+                    <view v-else class="text">(¥{{ data.price }})</view>
                 </view>
                 <view
                     class="relative btnItem"
@@ -107,16 +108,17 @@
                 </view>
             </view>
         </view>
-        <image class="ck" :src="ossurl.box.detail.warehouse" webp @click="showCK" />
-        <image class="mj" :src="ossurl.box.detail.stone" webp @click="$router.push('magic')" v-if="user"/>
-        <image class="record" :src="ossurl.box.detail.record" webp @click="showRecord" />
-        <image class="rule" :src="ossurl.box.detail.rule" webp @click="showRule" />
+        <image class="ck" :src="ossurl.box.detail.warehouse" webp @click="showCK" mode="widthFix" />
+        <image class="mj" :src="ossurl.box.detail.stone" webp @click="$router.push('magic')" v-if="user" mode="widthFix"/>
+        <image class="record" :src="ossurl.box.detail.record" webp @click="showRecord" mode="widthFix" />
+        <image class="rule" :src="ossurl.box.detail.rule" webp @click="showRule" mode="widthFix" />
         <image
             v-if="data && data.demoFlag === 1"
             class="sw"
             :src="ossurl.box.detail.demoBtn"
             webp
             @click="tryDemo"
+			mode="widthFix"
         />
         <record ref="recordRef" @close="onClose" :poolId="poolId" />
         <checkout
@@ -240,7 +242,7 @@
         },
         onShareTimeline() {
             return {
-                title: '超级玛特 次元聚集地，潮玩新势力',
+                title: '燚火漫域 次元聚集地，潮玩新势力',
                 query: 'poolId=' + this.poolId,
                 imageUrl: this.data.cover
             }
@@ -381,7 +383,7 @@
     .detailWrapper {
         background-size: 100% auto;
         background-repeat: no-repeat;
-        height: 1200rpx;
+        height: 1240rpx;
         .SwiperBox {
             position: relative;
             .prev,
@@ -390,8 +392,8 @@
                 top: 20%;
                 z-index: 90;
                 image {
-                    width: 138rpx;
-                    height: 138rpx;
+                    width: 108rpx;
+                    height: 108rpx;
                 }
             }
             .prev {
@@ -423,7 +425,7 @@
                 font-size: 24rpx;
                 font-family: Alimama ShuHeiTi, Alimama ShuHeiTi;
                 font-weight: 700;
-                color: #ec2c30;
+                color: #333;
                 background-size: 272rpx 62rpx;
                 background-position: center;
                 background-repeat: no-repeat;
@@ -515,7 +517,7 @@
         left: 0;
         right: 0;
         bottom: 0;
-        background: #fde9dd;
+        background: #373737;
         height: 168rpx;
         padding-bottom: 40rpx;
         .bottom-btns {
@@ -556,16 +558,14 @@
     .ck {
         position: fixed;
         right: 0rpx;
-        width: 72rpx;
-        height: 112rpx;
+        width: 84rpx;
     }
     .mj {
         bottom: 800rpx;
     }
     .sw {
         bottom: 540rpx;
-        width: 128rpx;
-        height: 128rpx;
+        width: 108rpx;
     }
     .ck {
         bottom: 690rpx;
@@ -573,15 +573,13 @@
     .record {
         position: fixed;
         left: 0rpx;
-        width: 72rpx;
-        height: 158rpx;
-        bottom: 640rpx;
+        width: 96rpx;
+        bottom: 670rpx;
     }
     .rule {
         position: fixed;
         left: 0rpx;
         bottom: 800rpx;
-        width: 72rpx;
-        height: 112rpx;
+        width: 84rpx;
     }
 </style>

pages/award_detail/pay_freedom.vue

@@ -25,7 +25,7 @@
                 </view>
             </view>
             <view class="flex-align-center paddingT13">
-                <view class="relative submitBtn" @click="pay">
+                <view class="relative submitBtn" :style="{ backgroundImage: 'url(' + ossurl.mine.butbj + ')' }" @click="pay">
                     <view class="">确认选择{{ price }}</view>
                 </view>
             </view>
@@ -37,6 +37,7 @@
 <script>
     import { throttle } from '@/utils'
     import resource from '@/utils/resource'
+	import ossurl from '@/utils/ossurl'
 
     const btns = [10, 20, 30, 40, 50]
     export default {
@@ -46,6 +47,7 @@
         },
         data() {
             return {
+				ossurl,
                 resource,
                 visible: false,
                 checkNum: btns[0][0],
@@ -164,13 +166,13 @@
                 font-weight: 500;
             }
             &.active {
-                background-color: #fec433;
+                background-color: #FFE957;
             }
             .checkIcon {
                 position: absolute;
                 bottom: 0;
                 right: 0;
-                color: #fec433;
+                color: #FFE957;
                 background-color: #000000;
                 height: 30rpx;
                 width: 36rpx;
@@ -197,7 +199,6 @@
         .submitBtn {
             width: 358rpx;
             height: 80rpx;
-            background: #fec433;
             border-radius: 178rpx 178rpx 178rpx 178rpx;
             font-size: 28rpx;
             font-family: Source Han Sans, Source Han Sans;

pages/award_detail/product_a.vue

@@ -1,12 +1,11 @@
 <template>
-    <view>
+    <view class="p30" style="padding-bottom: 200rpx;">
         <view class="levelBox" v-for="levelItem of Arrbylevel">
-            <view class="levelItem" v-if="levelItem.list.length > 0">
+            <view class="levelItem" v-if="levelItem.list.length > 0" :style="'background: url(' + levelItem.itembj + ')no-repeat; background-size: 100% 100%;'">
                 <view
-                    class="levelTitle"
+                    class="levelTitle fx-c-c"
                     :style="{
-                        color: levelItem.color,
-                        backgroundImage: 'url(' + ossurl.box.detail.levelListTitle + ')'
+                        color: levelItem.color
                     }"
                 >
                     {{ levelItem.title }}
@@ -30,9 +29,9 @@
                                     :src="item.spu.cover"
                                     mode="aspectFit"
                                 />
-
-                                <view class="text">
-                                    {{ $common.ignoreRatio0(item.probability) }}%
+								
+                                <view class="text Probability">
+									<text>{{ $common.ignoreRatio0(item.probability) }}%</text>
                                 </view>
                             </view>
                         </view>
@@ -79,21 +78,25 @@
                     {
                         ...LEVEL_MAP['A'],
                         level: 'A',
+                		itembj: ossurl.box.detail.itembjA,
                         list: levelA
                     },
                     {
                         ...LEVEL_MAP['B'],
                         level: 'B',
+                		itembj: ossurl.box.detail.itembjB,
                         list: levelB
                     },
                     {
                         ...LEVEL_MAP['C'],
                         level: 'C',
+                		itembj: ossurl.box.detail.itembjC,
                         list: levelC
                     },
                     {
                         ...LEVEL_MAP['D'],
                         level: 'D',
+                		itembj: ossurl.box.detail.itembjD,
                         list: levelD
                     }
                 ]
@@ -122,11 +125,11 @@
 
 <style lang="scss" scoped>
     .levelBox {
-        // padding: 16rpx 20rpx;
-        background-color: #fde9dd;
+		
     }
     .levelItem {
         padding: 8rpx 20rpx;
+		margin-bottom: 30rpx;
         .levelTitle {
             font-size: 36rpx;
             // background: #fdd6b3;
@@ -139,33 +142,25 @@
                 font-size: 24rpx;
                 font-family: Source Han Sans, Source Han Sans;
                 font-weight: 350;
+				background: #fff;
+				border-radius: 40rpx;
+				margin-left: 10rpx;
+				padding: 4rpx 16rpx;
             }
         }
         .levelList {
-            background: #fdd6b3;
-            padding:12rpx 18rpx 22rpx 18rpx;
+            // background: #fdd6b3;
+            padding: 12rpx 18rpx 22rpx 18rpx;
             border-radius: 0 0 24rpx 24rpx;
 
             .listBg {
                 overflow: hidden;
                 word-break: keep-all;
                 white-space: nowrap;
-                background-color: #fff;
                 padding-bottom: 24rpx;
                 border-radius: 24rpx;
                 position: relative;
                 width: 100%;
-                &::before {
-                    content: '';
-                    display: block;
-                    position: absolute;
-                    bottom: 0;
-                    width: 100%;
-                    left: 0;
-                    height: 50rpx;
-                    background: linear-gradient(90deg, #e5ff98 0%, #fa9d3a 100%);
-                    z-index: 0;
-                }
             }
             .levelListScroll {
                 overflow: auto;
@@ -173,25 +168,36 @@
 
             .item {
                 width: 155rpx;
-                height: 220rpx;
+                // height: 230rpx;
                 display: inline-block;
-                background-position: bottom;
+                background-position: 0 40rpx;
                 background-size: 100% auto;
                 background-repeat: no-repeat;
                 margin-left: 10px;
                 position: relative;
-
+				padding-top: 46rpx;
+				box-sizing: border-box;
+                // padding-bottom: 10rpx;
                 .super-image {
                     width: 140rpx;
-                    height: 180rpx;
+                    height: 170rpx;
                 }
                 .text {
                     color: #fff;
                     border-radius: 5rpx;
-                    font-size: 20rpx;
+                    font-size: 22rpx;
                     text-align: center;
                 }
+                .Probability {
+                    width: 100%;
+					height: 70rpx;
+					text-align: center;
+					text{
+						color: #000;
+					}
+                }
             }
         }
     }
 </style>
+

pages/award_detail/top.vue

@@ -72,7 +72,7 @@
             font-family: Alimama ShuHeiTi, Alimama ShuHeiTi;
             font-weight: 700;
             line-height: 58rpx;
-            background: linear-gradient(357deg, #e74b24 0%, #e77b24 100%);
+            background: linear-gradient(357deg, #000 0%, #333 100%);
             -webkit-background-clip: text;
             -webkit-text-fill-color: transparent;
             animation: roll 10s infinite linear;

pages/award_detail_yfs/box_choose.vue

@@ -34,6 +34,7 @@
                             })"
                             :key="item.number"
                             class="item invalid paddingY5 flex-align marginB10"
+							:style="{ backgroundImage: 'url(' + ossurl.box.detail.boxChoosebj + ')' }"
                             @click="choose(item)"
                         >
                             <view
@@ -221,7 +222,6 @@
             line-height: 48rpx;
         }
         .item {
-            background: #fff7e3;
             border-radius: 4px;
             padding: 14rpx;
             position: relative;
@@ -262,7 +262,6 @@
             }
 
             .itemBox {
-                background-color: #fff;
                 width: 100%;
                 display: flex;
                 align-items: center;

pages/award_detail_yfs/first_last.vue

@@ -1,7 +1,21 @@
 <template>
 	<view class="firstLast">
 		<view class="wrapper" :style="{ backgroundImage: 'url(' + ossurl.box.detail.yfsBg + ')' }">
-			<view class="title">
+			<view class="boxSection">
+				<view class="titlebox"><text>超帅模型对决</text></view>
+				<view class="t fx-c-s">
+					<view class="l fx-c">
+						<image style="width: 40rpx;" src="https://file.supermarts.cn/file/yi_huo_man_yu/images/award/i25.png" mode="widthFix">
+						</image>
+						<view class="Remaining">当前盒子剩余：<text style="font-size: 38rpx; font-weight: bold;">{{ box.leftQuantity }}</text>/{{ box.quantity }}发</view>
+					</view>
+					<view class="r fx-c">
+						<image style="width: 40rpx;" src="https://file.supermarts.cn/file/yi_huo_man_yu/images/award/i29.png" mode="widthFix"></image>
+						<text>玩法</text>
+					</view>
+				</view>
+			</view>
+			<!-- <view class="title">
 				{{ data.name }}
 				<view class="size">
 					<image :src="ossurl.box.detail.boxIcon" class="boxIcon" mode="aspectFit" />
@@ -9,7 +23,7 @@
 					<span class="currentSize">{{ box.leftQuantity }}</span>
 					/{{ box.quantity }}发
 				</view>
-			</view>
+			</view> -->
 			<view class="flex-align-around">
 				<view v-for="(item, index) in prizeList" :key="index" class="cell prize"
 					@click="showGoodsDetail(item.spu)">
@@ -30,7 +44,7 @@
 						<image :src="ossurl.box.detail.prev" style="width: 32rpx; height: 32rpx" />
 						<view class="font2">上一盒</view>
 					</view>
-					<view class="changeBox" @click="showBox">
+					<view class="changeBox" @click="showBox" :style="{ backgroundImage: 'url(' + ossurl.mine.butbj + ')' }">
 						<image :src="ossurl.box.detail.refreshIcon"
 							style="width: 32rpx; height: 32rpx; margin-right: 18rpx" />
 						换盒 (
@@ -43,7 +57,7 @@
 					</view>
 				</view>
 			</view>
-			<image :src="ossurl.box.detail.playMethod" @click="showRule" class="rule" />
+			<!-- <image :src="ossurl.box.detail.playMethod" @click="showRule" class="rule" /> -->
 		</view>
 		<rule ref="rule" />
 		<goods-detail ref="goodsDetailRef" @close="goodsDetailColse" />
@@ -95,16 +109,38 @@
 
 <style lang="scss" scoped>
 	.firstLast {
-		background-color: #fde9dd;
 		padding: 20rpx;
 	}
-
+	.boxSection{
+		.titlebox{
+			width: 100%;
+			text-align: center;
+			padding-top: 16rpx;
+			text{
+				font-size: 34rpx;
+				font-weight: bold;
+			}
+		}
+		.t{
+			margin-bottom: 26rpx;
+			.l{
+				padding-top: 20rpx;
+			}
+			.r{
+				padding-top: 2rpx;
+				text{
+					color: #999;
+					font-size: 24rpx;
+				}
+			}
+		}
+	}
 	.wrapper {
 		position: relative;
-		height: 386rpx;
+		height: 436rpx;
 		background-size: 100% 100%;
 		text-align: center;
-
+		
 		.title {
 			font-size: 28rpx;
 			font-family: Source Han Sans, Source Han Sans;
@@ -184,7 +220,7 @@
 		.changeBox {
 			width: 282rpx;
 			height: 60rpx;
-			background: #fec433;
+			// background: #fec433;
 			border-radius: 30rpx;
 			display: flex;
 			align-items: center;

pages/award_detail_yfs/index.vue

@@ -2,7 +2,7 @@
     <page :nav="false" ref="pageRef">
         <view
             class="detailWrapper"
-            :style="{ backgroundImage: 'url(' + ossurl.box.detail.awardBg + ')' }"
+            :style="'background-image:url(' + ossurl.box.headbj + ')'"
         >
             <view
                 class="pagae-nav"
@@ -47,7 +47,7 @@
                         </view>
                         <view
                             class="level"
-                            :style="{ backgroundImage: 'url(' + ossurl.box.detail.levelBg + ')' }"
+                            :style="{ backgroundImage: 'url(' + ossurl.mine.butbj + ')' }"
                         >
                             {{ getLevel(item.level) }}({{ getProbability(item) }})
                         </view>
@@ -60,6 +60,9 @@
                     <image :src="ossurl.box.detail.right" mode="aspectFit" />
                 </view>
             </view>
+			<view class="swiperBottom">
+				<image :src="ossurl.box.detail.bottom" style="width: 100%;" mode="widthFix" />
+			</view>
         </view>
         <!-- v-if="box && box.lock"-->
 
@@ -100,7 +103,7 @@
                 <view
                     class="relative btnItem"
                     @click="pay(1)"
-                    :style="{ backgroundImage: 'url(' + ossurl.box.detail.yfBtn + ')' }"
+                    :style="{ backgroundImage: 'url(' + ossurl.box.detail.yfBtn + '); color: #000;' }"
                 >
                     一发入魂
                     <view v-if="$valid.isNumber2(data.specialPrice)" class="text">
@@ -128,24 +131,28 @@
                 </view>
             </view>
         </view>
-        <image class="ck" :src="ossurl.box.detail.warehouse" webp @click="showCK" />
-        <image class="mj" :src="ossurl.box.detail.stone" v-if="user" webp @click="$router.push('magic')" />
-        <image class="record" :src="ossurl.box.detail.record" webp @click="showRecord" />
-        <image class="rule" :src="ossurl.box.detail.rule" webp @click="showRule" />
-        <image class="refresh" :src="ossurl.box.detail.refresh" webp @click="refreshBox(true)" />
+        <image class="ck" :src="ossurl.box.detail.warehouse" webp @click="showCK" mode="widthFix" />
+        <image class="mj" :src="ossurl.box.detail.stone" v-if="user" webp @click="$router.push('magic')" mode="widthFix" />
+        <image class="record" :src="ossurl.box.detail.record" webp @click="showRecord" mode="widthFix" />
+        <image class="rule" :src="ossurl.box.detail.rule" webp @click="showRule" mode="widthFix" />
+        <image class="refresh" :src="ossurl.box.detail.refresh" webp @click="refreshBox(true)" mode="widthFix" />
+		<!-- 锁定 -->
         <image
             v-if="box && !box.lock"
             class="lock"
             :src="ossurl.box.detail.lock"
             webp
             @click="boxLock"
+			mode="widthFix"
         />
+		<!-- 解锁 -->
         <image
             v-if="box && box.lock && user && box.lock.locker === user.userId"
             class="lock"
             :src="ossurl.box.detail.unlock"
             webp
             @click="boxUnLock"
+			mode="widthFix"
         />
         <image
             v-if="
@@ -155,6 +162,7 @@
             :src="ossurl.box.detail.Inclusive"
             webp
             @click="payAll"
+			mode="widthFix"
         />
         <box-choose ref="boxRef" v-if="data" :poolId="poolId" @choose="onChooseBox" />
         <num-choose ref="numRef" v-if="data" :poolId="poolId" @pay="onNumPay" />
@@ -278,7 +286,7 @@
         },
         onShareTimeline() {
             return {
-                title: '超级玛特 次元聚集地，潮玩新势力',
+                title: '燚火漫域 次元聚集地，潮玩新势力',
                 query: 'poolId=' + this.poolId,
                 imageUrl: this.data.cover
             }
@@ -587,8 +595,7 @@
     .detailWrapper {
         background-size: 100% auto;
         background-repeat: no-repeat;
-        background-color: #fde9dd;
-        height: 1200rpx;
+        height: 1240rpx;
         .SwiperBox {
             position: relative;
             .prev,
@@ -597,8 +604,8 @@
                 top: 20%;
                 z-index: 90;
                 image {
-                    width: 138rpx;
-                    height: 138rpx;
+                    width: 108rpx;
+                    height: 108rpx;
                 }
             }
             .prev {
@@ -630,7 +637,7 @@
                 font-size: 24rpx;
                 font-family: Alimama ShuHeiTi, Alimama ShuHeiTi;
                 font-weight: 700;
-                color: #ec2c30;
+                color: #333;
                 background-size: 272rpx 62rpx;
                 background-position: center;
                 background-repeat: no-repeat;
@@ -722,7 +729,7 @@
         left: 0;
         right: 0;
         bottom: 0;
-        background: #fde9dd;
+        background: #373737;
         height: 168rpx;
         padding-bottom: 40rpx;
 		z-index: 20;
@@ -762,8 +769,7 @@
     .ck {
         position: fixed;
         right: 0rpx;
-        width: 72rpx;
-        height: 112rpx;
+        width: 84rpx;
     }
     .mj {
         bottom: 800rpx;
@@ -779,30 +785,27 @@
     .record {
         position: fixed;
         left: 0rpx;
-        width: 72rpx;
-        height: 158rpx;
-        bottom: 640rpx;
+        width: 96rpx;
+        bottom: 670rpx;
     }
     .rule {
         position: fixed;
-        left: 0rpx;
+        left: 10rpx;
         bottom: 800rpx;
-        width: 72rpx;
-        height: 112rpx;
+        width: 84rpx;
     }
     .refresh {
         position: fixed;
         right: 0rpx;
-        width: 96rpx;
-        height: 96rpx;
+        width: 84rpx;
         bottom: 580rpx;
     }
     .lock {
         position: fixed;
-        left: 0rpx;
-        width: 96rpx;
+        left: 10rpx;
+        width: 84rpx;
         height: 96rpx;
-        bottom: 530rpx;
+        bottom: 540rpx;
     }
     .Inclusive {
         position: fixed;

pages/award_detail_yfs/num_choose.vue

@@ -13,7 +13,7 @@
             <view class="flex-align-center font2 paddingY5">
                 <view class="bold">
                     第
-                    <text class="color-theme">{{ box.number }}</text>
+                    <text style="color: #FFE957;">{{ box.number }}</text>
                     /{{ box.lastNumber }}盒
                 </view>
             </view>
@@ -68,7 +68,7 @@
                     </view>
                 </scroll-view>
                 <view class="btnBox">
-                    <view class="relative btn" @click="preview">
+                    <view class="relative btn" :style="{ backgroundImage: 'url(' + ossurl.mine.butbj + ')' }" @click="preview">
                         确定选择
                         <view class="text">
                             已选择
@@ -85,6 +85,7 @@
 <script>
     import resource from '@/utils/resource'
     import tabbar4 from '@/components/tabbar4'
+	import ossurl from '@/utils/ossurl'
     import { LEVEL_MAP } from '@/utils/config'
 
     export default {
@@ -94,6 +95,7 @@
         },
         data() {
             return {
+				ossurl,
                 LEVEL_MAP,
                 resource,
                 visible: false,
@@ -308,7 +310,7 @@
         .item {
             margin: 7px 6px;
 
-            background: #fec433;
+            background: #FFE957;
             border-radius: 4rpx;
             font-size: 24rpx;
             color: #000;
@@ -330,7 +332,7 @@
             .checkIcon {
                 width: 32rpx;
                 height: 28rpx;
-                color: #fec433;
+                color: #FFE957;
                 background: #000;
                 border-radius: 12rpx 0 0 0;
                 text-align: center;
@@ -354,7 +356,7 @@
             padding: 0 7px;
         }
         .selectItem {
-            background: #fec433;
+            background: #FFE957;
             .closeBtn {
                 color: #000;
                 background: rgba(255, 255, 255, 0.3);
@@ -372,7 +374,6 @@
             height: 80rpx;
             padding-top: 10rpx;
             font-size: 28rpx;
-            background: #fec433;
             text-align: center;
             border-radius: 178rpx 178rpx 178rpx 178rpx;
             font-weight: bold;

pages/award_detail_yfs/product_a.vue

@@ -1,27 +1,11 @@
 <template>
-    <!-- <view class="flex-wrap" style="margin: 0 4px 20px">
-        <view v-for="(item, index) in products" :key="item.spu.id" class="item" @click="showSwipe(index)"
-            :style="{width: itemWidth.width + 'px', height: itemWidth.height + 'px'}">
-            <image class="super" :src="LEVEL_MAP[item.level].bg" mode="scaleToFill"
-                :style="{width: itemWidth.width + 'px', height: itemWidth.height + 'px'}" />
-            <image class="super-image translateX" :style="{width: (itemWidth.width - 20) + 'px', height: itemWidth.height - 53 + 'px'}"
-                :src="item.spu.cover" mode="aspectFit" />
-            <image class="super-text" :src="LEVEL_MAP[item.level].titleImg" />
-            <view class="num flex-align"> {{getLeftNum(item)}}/{{item.quantity}}</view>
-            <view class="text">{{getProbability(item)}}</view>
-            <view v-if="getLeftNum(item) <= 0" class="sell-out flex-align-center">
-                <image :src="resource.award_sell_out" class="image"/>
-            </view>
-        </view>
-    </view> -->
-    <view style="padding-bottom: 200rpx;  background-color: #fde9dd;">
+    <view class="p30" style="padding-bottom: 200rpx;">
         <view class="levelBox" v-for="levelItem of Arrbylevel">
-            <view class="levelItem" v-if="levelItem.list.length > 0">
+            <view class="levelItem" v-if="levelItem.list.length > 0" :style="'background: url(' + levelItem.itembj + ')no-repeat; background-size: 100% 100%;'">
                 <view
-                    class="levelTitle"
+                    class="levelTitle fx-c-c"
                     :style="{
                         color: levelItem.color,
-                        backgroundImage: 'url(' + ossurl.box.detail.levelListTitle + ')'
                     }"
                 >
                     {{ levelItem.title }}
@@ -40,12 +24,12 @@
                                 }"
                                 @click="showSwipe(item)"
                             >
+                                <view class="text" style="color: #333;">{{ getLeftNum(item) }}/{{ item.quantity }}</view>
                                 <image
                                     class="super-image translateX"
                                     :src="item.spu.cover"
                                     mode="aspectFit"
                                 />
-                                <view class="text">{{ getLeftNum(item) }}/{{ item.quantity }}</view>
                                 <view
                                     class="text Probability"
                                     :style="{
@@ -53,7 +37,7 @@
                                         borderColor: levelItem.color
                                     }"
                                 >
-                                    {{ getProbability(item) }}
+                                    <text>{{ getProbability(item) }}</text>
                                 </view>
                             </view>
                         </view>
@@ -101,26 +85,33 @@
                     {
                         ...LEVEL_MAP['A'],
                         level: 'A',
+						itembj: ossurl.box.detail.itembjA,
                         list: levelA
                     },
                     {
                         ...LEVEL_MAP['B'],
                         level: 'B',
+						itembj: ossurl.box.detail.itembjB,
                         list: levelB
                     },
                     {
                         ...LEVEL_MAP['C'],
                         level: 'C',
+						itembj: ossurl.box.detail.itembjC,
                         list: levelC
                     },
                     {
                         ...LEVEL_MAP['D'],
                         level: 'D',
+						itembj: ossurl.box.detail.itembjD,
                         list: levelD
                     }
                 ]
             }
         },
+		created() {
+			console.log('sd', this.Arrbylevel);
+		},
         methods: {
             showSwipe(item) {
               console.log(item)
@@ -165,11 +156,11 @@
 
 <style lang="scss" scoped>
     .levelBox {
-        // padding: 16rpx 20rpx;
-        background-color: #fde9dd;
+		
     }
     .levelItem {
         padding: 8rpx 20rpx;
+		margin-bottom: 30rpx;
         .levelTitle {
             font-size: 36rpx;
             // background: #fdd6b3;
@@ -182,10 +173,14 @@
                 font-size: 24rpx;
                 font-family: Source Han Sans, Source Han Sans;
                 font-weight: 350;
+				background: #fff;
+				border-radius: 40rpx;
+				margin-left: 10rpx;
+				padding: 4rpx 16rpx;
             }
         }
         .levelList {
-            background: #fdd6b3;
+            // background: #fdd6b3;
             padding: 12rpx 18rpx 22rpx 18rpx;
             border-radius: 0 0 24rpx 24rpx;
 
@@ -193,22 +188,10 @@
                 overflow: hidden;
                 word-break: keep-all;
                 white-space: nowrap;
-                background-color: #fff;
                 padding-bottom: 24rpx;
                 border-radius: 24rpx;
                 position: relative;
                 width: 100%;
-                &::before {
-                    content: '';
-                    display: block;
-                    position: absolute;
-                    bottom: 0;
-                    width: 100%;
-                    left: 0;
-                    height: 50rpx;
-                    background: linear-gradient(90deg, #e5ff98 0%, #fa9d3a 100%);
-                    z-index: 0;
-                }
             }
             .levelListScroll {
                 overflow: auto;
@@ -223,6 +206,7 @@
                 background-repeat: no-repeat;
                 margin-left: 10px;
                 position: relative;
+				padding-top: 28rpx;
                 // padding-bottom: 10rpx;
                 .super-image {
                     width: 140rpx;
@@ -231,18 +215,16 @@
                 .text {
                     color: #fff;
                     border-radius: 5rpx;
-                    font-size: 20rpx;
+                    font-size: 22rpx;
                     text-align: center;
                 }
                 .Probability {
-                    background: #ffffff;
-                    border-radius: 376rpx 376rpx 376rpx 376rpx;
-                    opacity: 1;
-                    border: 2rpx solid #e1002e;
-                    font-size: 20rpx;
-                    // position: absolute;
-                    display: inline-block;
-                    padding: 4rpx 8rpx;
+                    width: 100%;
+					height: 70rpx;
+					text-align: center;
+					text{
+						color: #000;
+					}
                 }
             }
         }

pages/center/index.vue

@@ -6,31 +6,44 @@
         >
             <view class="flex-column-align-center nav-title">我的</view>
         </view>
-        <view
-            class="centerWrapper"
-            :style="{ backgroundImage: 'url(' + ossurl.box.boxPageBg + ')' }"
-        >
+        <view class="centerWrapper" :style="{ backgroundImage: 'url(' + ossurl.mine.headbj + ')' }" >
             <view class="userBox" v-if="user" @click="$router.push('user_info')">
-                <view class="avatarBox">
-                    <view class="avatarView">
-                        <image class="avatar" :src="user.avatar" />
-                        <image class="avatarEdit" :src="ossurl.mine.editIcon" />
-                    </view>
-                </view>
-                <view class="userInfo">
-                    <view class="nickname">{{ user.nickname || '' }}</view>
-                    <view class="idinfo">
-                        <view class="username" @click.native.stop="copy(user.username)">
-                            <image class="userInfoIcon" :src="ossurl.mine.id" />
-                            {{ user.username }}
-                            <view class="copyBtn">复制</view>
-                        </view>
-                        <div v-if="user.mobile" class="phone">
-                            <image class="userInfoIcon" :src="ossurl.mine.phone" />
-                            {{ user.mobile }}
-                        </div>
-                    </view>
+                <view class="center">
+                	<view class="avatarBox">
+                	    <view class="avatarView">
+                	        <image class="avatar" :src="user.avatar" />
+                	        <image class="avatarEdit" :src="ossurl.mine.editIcon" />
+                	    </view>
+                	</view>
+                	<view class="userInfo">
+                	    <view class="nickname">{{ user.nickname || '' }}</view>
+                	    <view class="idinfo">
+                	        <view class="username" @click.native.stop="copy(user.username)">
+                	            <image class="userInfoIcon" :src="ossurl.mine.headId" mode="widthFix"/>
+                	            {{ user.username }}
+                	            <view class="copyBtn">复制</view>
+                	        </view>
+                	        <div v-if="user.mobile" class="phone">
+                	            <image class="userInfoIcon" :src="ossurl.mine.headPhone" mode="widthFix"/>
+                	            {{ user.mobile }}
+                	        </div>
+                	    </view>
+                	</view>
                 </view>
+				<view class="numSection fx-c-s p30">
+					<view class="item" @click="gotoRoute('coupon')" v-if="user">
+						<text>{{ showNumber('couponCount') }}</text>
+						<text>优惠券</text>
+					</view>
+					<view class="item" @click="gotoRoute('store')"  v-if="user">
+						<text>{{ showNumber('inventoryCount') }}</text>
+						<text>仓库</text>
+					</view>
+					<view class="item" @click="gotoRoute('magic')"  v-if="user">
+						<text>{{ showNumber('magicBalance') }}</text>
+						<text>源石</text>
+					</view>
+				</view>
             </view>
 
             <view class="userBox" v-else @click="$router.push('login')">
@@ -49,10 +62,11 @@
             </view>
 
             <view class="mineWrapper">
+				
+				
                 <view class="stoneBox">
-                    <view
+                    <!-- <view
                         class="stoneList"
-                        :style="{ backgroundImage: 'url(' + ossurl.mine.mineBg1 + ')' }"
                     >
                         <view class="stoneItem" @click="gotoRoute('coupon')" v-if="user">
                             <image class="stoneIcon" :src="ossurl.mine.couponIcon" />
@@ -69,24 +83,29 @@
                             源石
                             <span class="stoneNum">{{ showNumber('magicBalance') }}</span>
                         </view>
-                    </view>
-                    <view class="flex flexList">
-                        <view class="flex-sub flexItem" @click="gotoRoute('pull_new_user')">
-                            <image class="flexIcon" :src="ossurl.mine.invite" />
-                            <view class="title">邀新有礼</view>
-                        </view>
-                        <view class="flex-sub flexItem" @click="gotoWeb()">
-                            <image class="flexIcon" :src="ossurl.mine.gift" />
-                            <view class="title">进群领福利</view>
-                        </view>
-                        <view class="flex-sub flexItem" @click="gotoRoute('message')">
-                            <image class="flexIcon" :src="ossurl.mine.message" />
-                            <view class="title">系统消息</view>
-                        </view>
-                        <view class="flex-sub flexItem" @click="gotoRoute('order_award')">
-                            <image class="flexIcon" :src="ossurl.mine.order" />
-                            <view class="title">宝箱订单</view>
-                        </view>
+                    </view> -->
+                    <view class="flexList p30">
+						<view class="title">
+							<text>常用功能</text>
+						</view>
+						<view class="center flex">
+							<view class="flex-sub flexItem" @click="gotoRoute('pull_new_user')">
+							    <image class="flexIcon" :src="ossurl.mine.invite" />
+							    <view class="title">邀新有礼</view>
+							</view>
+							<view class="flex-sub flexItem" @click="gotoWeb()">
+							    <image class="flexIcon" :src="ossurl.mine.gift" />
+							    <view class="title">进群领福利</view>
+							</view>
+							<view class="flex-sub flexItem" @click="gotoRoute('message')">
+							    <image class="flexIcon" :src="ossurl.mine.message" />
+							    <view class="title">系统消息</view>
+							</view>
+							<view class="flex-sub flexItem" @click="gotoRoute('order_award')">
+							    <image class="flexIcon" :src="ossurl.mine.order" />
+							    <view class="title">宝箱订单</view>
+							</view>
+						</view>
                     </view>
                 </view>
 
@@ -293,6 +312,28 @@
 
 <style lang="scss"></style>
 <style lang="scss" scoped>
+	.numSection{
+		padding-bottom: 40rpx;
+		margin-top: 50rpx;
+		.item{
+			width: 32%;
+			text-align: center;
+			border-right: 1rpx solid #dedede;
+			&:last-child {
+			   border-right: none;
+			}
+			text{
+				display: block;
+				&:nth-child(1) {
+					font-weight: bold;
+					font-size: 32rpx;
+				}
+				&:nth-child(2) {
+					color: #999;
+				}
+			}
+		}
+	}
     .pagae-nav {
         width: 100%;
         position: fixed;
@@ -312,95 +353,93 @@
         background-size: 100% auto;
         background-repeat: no-repeat;
         .userBox {
-            display: flex;
             padding-bottom: 40rpx;
-            .avatarBox {
-                height: 160rpx;
-                background-size: 100% 100%;
-                padding: 0 20rpx;
-                position: relative;
-                .avatarView {
-                    position: relative;
-                    display: inline-block;
-                    .avatar {
-                        width: 148rpx;
-                        height: 148rpx;
-                        border-radius: 50%;
-
-                        border: 8rpx solid #ffe996;
-                    }
-                    .avatarEdit {
-                        position: absolute;
-                        bottom: 0;
-                        right: 0;
-                        width: 48rpx;
-                        height: 48rpx;
-                    }
-                }
-                .centerEdit {
-                    width: 142rpx;
-                    height: 46rpx;
-                    position: absolute;
-                    right: 0;
-                    bottom: 20rpx;
-                }
-            }
-            .userInfo {
-                padding: 0 20rpx;
-                padding-bottom: 32rpx;
-                .nickname {
-                    font-size: 32rpx;
-                    font-family: Source Han Sans, Source Han Sans;
-                    font-weight: 700;
-                    color: #000000;
-                    padding: 24rpx 0 10rpx 0;
-                    margin-bottom: 20rpx;
-                }
-                .idinfo {
-                    display: flex;
-                    .username,
-                    .phone {
-                        display: flex;
-                        align-items: center;
-                        justify-content: center;
-                        margin-right: 44rpx;
-                    }
-                }
-                .copyBtn {
-                    background: rgba(255, 255, 255, 0.33);
-                    border-radius: 4rpx 4rpx 4rpx 4rpx;
-                    margin-left: 8rpx;
-                    color: #ac8906;
-                    font-size: 20rpx;
-                    padding: 4rpx 8rpx;
-                }
-                .info {
-                    font-size: 24rpx;
-                    font-family: Source Han Sans, Source Han Sans;
-                    font-weight: 350;
-                    color: #997A03;
-                }
-                .userInfoIcon {
-                    width: 32rpx;
-                    height: 32rpx;
-                    margin-right: 8rpx;
-                }
-            }
+			.center{
+				display: flex;
+				.avatarBox {
+				    height: 160rpx;
+				    background-size: 100% 100%;
+				    padding: 0 20rpx;
+				    position: relative;
+				    .avatarView {
+				        position: relative;
+				        display: inline-block;
+				        .avatar {
+				            width: 148rpx;
+				            height: 148rpx;
+				            border-radius: 50%;
+				
+				            border: 8rpx solid #ffe996;
+				        }
+				        .avatarEdit {
+				            position: absolute;
+				            bottom: 0;
+				            right: 0;
+				            width: 48rpx;
+				            height: 48rpx;
+				        }
+				    }
+				    .centerEdit {
+				        width: 142rpx;
+				        height: 46rpx;
+				        position: absolute;
+				        right: 0;
+				        bottom: 20rpx;
+				    }
+				}
+				.userInfo {
+				    padding: 0 20rpx;
+				    padding-bottom: 32rpx;
+				    .nickname {
+				        font-size: 32rpx;
+				        font-family: Source Han Sans, Source Han Sans;
+				        font-weight: 700;
+				        color: #000000;
+				        padding: 24rpx 0 10rpx 0;
+				        margin-bottom: 20rpx;
+				    }
+				    .idinfo {
+				        display: flex;
+				        .username,
+				        .phone {
+				            display: flex;
+				            align-items: center;
+				            justify-content: center;
+				            margin-right: 44rpx;
+				        }
+				    }
+				    .copyBtn {
+				        background: rgba(255, 255, 255, 0.33);
+				        border-radius: 4rpx 4rpx 4rpx 4rpx;
+				        margin-left: 8rpx;
+				        color: #ac8906;
+				        font-size: 20rpx;
+				        padding: 4rpx 8rpx;
+				    }
+				    .info {
+				        font-size: 24rpx;
+				        font-family: Source Han Sans, Source Han Sans;
+				        font-weight: 350;
+				        color: #997A03;
+				    }
+				    .userInfoIcon {
+				        width: 34rpx;
+				        margin-right: 8rpx;
+				    }
+				}
+			}
+            
         }
     }
 
     .mineWrapper {
         padding: 0 20rpx;
         background-color: #f6f6f6;
-        padding-top: 200rpx;
         position: relative;
-        margin-top: 100rpx;
+        margin-top: -50rpx;
+		
         .stoneBox {
           // margin-top: -40rpx;
-          position: absolute;
-          top: -100rpx;
-          left: 20rpx;
-          right: 20rpx;
             .flexIcon {
                 width: 96rpx;
                 height: 96rpx;
@@ -437,7 +476,14 @@
         .flexList {
             background-color: #fff;
             padding: 28rpx;
-            border-radius: 0 0 30rpx 30rpx;
+            border-radius: 20;
+			margin-bottom: 40rpx;
+			.title{
+				margin-bottom: 30rpx;
+				text{
+					font-weight: bold;
+				}
+			}
             .flexItem {
                 text-align: center;
                 flex: 1;

pages/exchange/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <page ref="pageRef" title="超级玛特周年蛋糕" nav-color="transparent" light>
+    <page ref="pageRef" title="燚火漫域周年蛋糕" nav-color="transparent" light>
         <view>
             <image :src="resource.ex_bg" web class="bg" mode="aspectFill" />
 

pages/fireworks_year/index.vue

@@ -120,11 +120,11 @@ const greeting = [
     '2023大吉大利',
     '2023水到渠成',
     '烟花岁岁爆竹声声',
-    '超级玛特祝您新年大吉',
+    '燚火漫域祝您新年大吉',
     '2023好事发生',
     '2023欧皇附体',
     '2023水逆退散',
-    '超级玛特祝您一路发发发'
+    '燚火漫域祝您一路发发发'
 ]
 export default {
     components: { rule },

pages/index/index.vue

@@ -30,75 +30,60 @@
                     top: statusBarHeight + 40 + 'px'
                 }"
             >
-                <view
-                    class="avatar"
-                >
-                    <image class="avatarImg" :src="user ? user.avatar : ossurl.common.noavatar" />
-                </view>
                 <view class="searchInput">
                     <input
                         type="text"
                         confirm-type="search"
                         placeholder="搜索你感兴趣的～"
                         v-model.trim="searchForm.keyword"
-                        placeholder-style="color:#fff;font-size:12px;"
+                        placeholder-style="font-size:12px;"
                         @confirm="search()"
                     />
-                    <text class="cuIcon-search" @click="search()"></text>
+						<view class="inputSubmit fx-c-c" @click="search()">
+							<image src="https://file.supermarts.cn/file/yi_huo_man_yu/images/index/i3.png" style="width: 48rpx;" mode="widthFix">
+							</image>
+						</view>
                 </view>
                 <view class="messageBtn" @click="showKefu">
-                    <image :src="ossurl.common.message" />
+                    <image :src="ossurl.home.message" />
                 </view>
             </view>
             <view class="moli-wrapper">
-                <swiper
-                    v-if="bannerList"
-                    class="moli-swiper"
-                    :indicator-dots="false"
-                    circular="true"
-                    :autoplay="true"
-                    interval="5000"
-                    duration="500"
-                >
-                    <swiper-item v-for="(item, index) in bannerList" :key="index">
-                        <index-banner :data="item" @click="gotoRoute(item)"></index-banner>
-                    </swiper-item>
-                </swiper>
-            </view>
-        </view>
-
-        <view class="indexTab">
-            <view
-                class="tabItem"
-                v-for="(item, index) of tabList.slice(0,4)"
-                :key="index"
-                @click="gotoRoute(item)"
-            >
-                <view class="itemBox">
-                    <image class="index_tab_img" :src="item.cover" mode="widthFix" />
-                    <view class="tabTitle">
-                        {{ item.title }}
-                        <view class="tip">{{ item.subtitle }}</view>
-                    </view>
-                </view>
-            </view>
-        </view>
-        <view class="wrapper">
-            <view class="ipList">
-                <view
-                    class="ipItem"
-                    :class="{ active: searchForm.worksId == item.id }"
-                    v-for="item of ipList"
-                    @click="changeworksId(item)"
-                    :key="item.id"
-                >
-                    <image class="ipImg" :src="item.cover" mode="aspectFill" />
-                    <view class="ipTitle">
-                        {{ item.name }}
-                    </view>
-                </view>
+				<view class="headerSection" :style="'background:url(' + ossurl.home.headbj + ')no-repeat'">
+					
+				</view>
             </view>
         </view>
+		
+		<view class="p30 header">
+			<view class="head fx-c-c">
+				<view class="banner">
+					<image :src="ossurl.home.banner" style="width: 100%;" mode="widthFix">
+					</image>
+				</view>
+			</view>
+			<view class="tab fx-c-s" :style="'background: url(' + ossurl.home.tabTypebj + ')no-repeat'">
+				<view class="item" v-for="(item,index) in tabList.slice(0,4)" :key="index" @click="gotoRoute(item)">
+					<image :src="item.img" style="width:96rpx;" mode="widthFix" />
+					<text>{{ item.title }}</text>
+				</view>
+			</view>
+		</view>
+		
+		<view class="mall p30">
+			<image :src="ossurl.home.typeTop" style="width: 100%;" mode="widthFix">
+			<view class="section">
+				<scroll-view scroll-x="true" class="nav" scroll-left="0" :scroll-with-animation="true">
+					<view class="imgAll" :style="{width: 750 + 'rpx'}">
+						<image @click="changeworksId('')" :src="ossurl.home.type1" style="width: 324rpx;" mode="widthFix">
+						<!-- <image @click="changeworksId('')" :src="ossurl.home.type2" style="width: 118rpx;" mode="widthFix"> -->
+						<image @click="changeworksId(4)" :src="ossurl.home.type3" style="width: 118rpx;" mode="widthFix">
+						<image @click="changeworksId(6)" :src="ossurl.home.type4" style="width: 118rpx;" mode="widthFix">
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+		
         <view style="margin: 20rpx 7px 0" v-if="tableData" class="flex-wrap">
             <goods-cell
                 v-for="(item, index) in tableData"
@@ -157,7 +142,19 @@
             },
 
             tabList() {
-                return this.$store.state.pageConfig['index_icon'].components[0].elements
+				let arr = this.$store.state.pageConfig['index_icon'].components[0].elements;
+				for (let i in arr) {
+					if(arr[i].title == '领福利') {
+						arr[i].img = this.ossurl.home.tab1;
+					}else if(arr[i].title == '开宝箱') {
+						arr[i].img = this.ossurl.home.tab2;
+					}else if(arr[i].title == '攻略') {
+						arr[i].img = this.ossurl.home.tab3;
+					}else if(arr[i].title == '邀请好友') {
+						arr[i].img = this.ossurl.home.tab4;
+					}
+				}
+                return arr
             },
             bannerList() {
                 return this.$store.state.pageConfig['index_banner'].components[0].elements
@@ -174,13 +171,13 @@
         },
         onShareAppMessage(res) {
             return {
-                title: '超级玛特 次元聚集地，潮玩新势力',
+                title: '燚火漫域 次元聚集地，潮玩新势力',
                 path: '/pages/award/index'
             }
         },
         onShareTimeline() {
             return {
-                title: '超级玛特 次元聚集地，潮玩新势力'
+                title: '燚火漫域 次元聚集地，潮玩新势力'
             }
         },
         onReady() {
@@ -218,8 +215,8 @@
             showKefu() {
                 this.$common.showKefu()
             },
-            changeworksId(item) {
-                this.searchForm.worksId = item.id
+            changeworksId(id) {
+                this.searchForm.worksId = id
                 this.search()
             },
             async getData() {
@@ -290,7 +287,6 @@
     .middle-banner-group {
         position: absolute;
         left: 0;
-
         bottom: 0;
         right: 0;
         opacity: 0;
@@ -372,10 +368,74 @@
     .moli-wrapper {
         flex: 1;
         overflow: hidden;
+		.headerSection{
+			width: 100%; 
+			height: 500rpx; 
+			background-size: 100% 100%;
+		}
     }
     .index_logan_img {
         width: 100%;
     }
+	.mall{
+		margin-top: 40rpx;
+		.section{
+			background: #fff;
+			.nav{
+				width: 680rpx;
+				overflow: hidden;
+				.imgAll{
+					padding: 34rpx;
+					width: 910rpx;
+					image{
+						display: inline-block;
+						margin-right: 58rpx;
+					}
+				}
+			}
+			
+		}
+	}
+	.header{
+		margin-top: -240rpx;
+		position: relative;
+		z-index: 10;
+		.tab {
+			background-size: 100% 100%;
+			height: 304rpx;
+			padding: 0 56rpx;
+		
+			.item {
+				text {
+					display: block;
+					margin-top: 26rpx;
+					font-size: 26rpx;
+					text-align: center;
+				}
+			}
+		}
+		.head {
+			background: #fff;
+			width: 100%;
+			border-radius: 30rpx 30rpx 0 0;
+			padding: 24rpx;
+			margin-top: 32rpx;
+			box-sizing: border-box;
+		
+			.banner {
+				width: 100%;
+		
+				image {
+					max-width: 100%;
+					display: inline-block;
+					position: relative;
+					z-index: 0;
+				}
+			}
+		
+		}
+	}
+	
     .indexTab {
         margin-top: -160rpx;
         padding: 10rpx;
@@ -464,15 +524,21 @@
             }
         }
         .searchInput {
-            height: 64rpx;
-            background: rgba(255, 255, 255, 0.5);
+            height: 74rpx;
+            background: #fff;
+			border: 6rpx solid #000000;
             border-radius: 640rpx 640rpx 640rpx 640rpx;
-            color: #fff;
             display: flex;
             flex: 1;
             align-items: center;
-            padding: 0 24rpx;
-            margin: 0 30rpx;
+            padding: 0 10rpx 0 24rpx;
+			.inputSubmit {
+				width: 114rpx;
+				height: 56rpx;
+				background: #000000;
+				border-radius: 582rpx 582rpx 582rpx 582rpx;
+				border: 4rpx solid #000000;
+			}
             input {
                 flex: 1;
             }

pages/login/index.vue

@@ -1,9 +1,12 @@
 <template>
-	<page ref="pageRef">
-		<view style="padding-top: 100rpx; text-align: center">
-			<image class="image" :src="ossurl.login.loginLogo" mode="widthFix" />
+<!-- 	<page ref="pageRef" :nav="false" :bgColor="'url(' + ossurl.login.loginbj + ')no-repeat 100% 100%'">
+
+	</page> -->
+	<view class="loginBj" :style="'background:url(' + ossurl.login.loginbj + ')no-repeat; background-size: 100% 100%;'">
+		<view class="p30" style="margin-bottom: 50rpx;">
+			<image class="image" :src="ossurl.home.logText" mode="widthFix" />
 		</view>
-		<view class="form">
+		<view class="form p30">
 			<u-form labelPosition="left" ref="form">
 				<u-form-item label="手机号" prop="phone" borderBottom labelWidth="80">
 					<u--input v-model="phone" border="none" type="number" placeholder="手机号"></u--input>
@@ -27,7 +30,7 @@
 					<text class="color-theme" @click.stop="show('privacy')">《隐私政策》</text>
 				</text>
 			</view>
-
+		
 			<view class=" " style="padding-top: 30rpx; text-align: center">
 				<button class="btn" @click="handleLogin">
 					登录
@@ -35,7 +38,7 @@
 				<view class="btn_back" @click.stop="$router.back()">返回</view>
 			</view>
 		</view>
-	</page>
+	</view>
 </template>
 
 <script>
@@ -154,12 +157,11 @@
 	}
 </script>
 
-<style>
-	page {
-		background: #fff;
-	}
-</style>
 <style lang="scss" scoped>
+	.loginBj{
+		height: 100vh;
+		padding-top: 400rpx;
+	}
 	.image {
 		width: 320rpx;
 	}
@@ -206,7 +208,7 @@
 	}
 
 	.form {
-		padding: 50rpx;
+		// padding: 50rpx;
 
 		.uni-form-item {
 			.uni-input {}

pages/playing_method/index.vue

@@ -10,7 +10,7 @@
             />
         </view>
         <view class="wrapper">
-            <view class="" v-if="rule && rule.setpTitle">
+            <!-- <view class="" v-if="rule && rule.setpTitle">
                 <view class="flex-column-align-center">
                     <image
                         :src="rule.setpTitle"
@@ -20,7 +20,7 @@
                         }"
                     />
                 </view>
-            </view>
+            </view> -->
             <view v-if="rule" style="font-size: 0;">
                 <image
                     v-for="(item, index) in rule.data"
@@ -48,8 +48,8 @@
                 ossurl.box.rule.step_4,
                 ossurl.box.rule.step_5,
                 ossurl.box.rule.step_6,
-                ossurl.box.rule.step_7,
-                ossurl.box.rule.step_8
+                // ossurl.box.rule.step_7,
+                // ossurl.box.rule.step_8
             ]
         },
         2: {
@@ -61,7 +61,7 @@
                 ossurl.box.rule.step_2_4,
                 ossurl.box.rule.step_2_5,
                 ossurl.box.rule.step_2_6,
-                ossurl.box.rule.step_2_7
+                // ossurl.box.rule.step_2_7
             ]
         }
     }

pages/popularize/index.vue

@@ -92,12 +92,12 @@ export default {
         if (this.$common.isLogin()) {
             const user = store.getters.user
             return {
-                title: `超级玛特，新人首抽1.9！`,
+                title: `燚火漫域，新人首抽1.9！`,
                 path: '/pages/award/index?pid=' + user.username
             }
         }
         return {
-            title: `超级玛特，新人首抽1.9！`,
+            title: `燚火漫域，新人首抽1.9！`,
             path: '/pages/award/index'
         }
     },

pages/product/index.vue

@@ -17,8 +17,8 @@
         <recommend
             v-if="data && data.recommendedMallGoods && data.recommendedMallGoods.length > 0"
             :data="data.recommendedMallGoods"
-        />
         <detail v-if="data" :data="data.spu" />
+        />
         <view class="fill-height marginT10"></view>
         <view class="bottom paddingX14 flex-align bgcolor-white">
             <!-- <button class="kefu flex-align-center" @click="$common.showKefu()">

pages/pull_new_user/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <page :nav="false" title="邀新得万元现金" ref="pageRef" light bgColor="#000">
+    <page :nav="false" title="邀新得万元现金" ref="pageRef" light bgColor="">
         <view
             class="pagae-nav"
             :style="{
@@ -16,7 +16,7 @@
         <view
             class="top"
             :style="
-                ' background-color: #000;background-image:url(' + ossurl.mine.pulluser.top + ')'
+                'background-image:url(' + ossurl.mine.pulluser.top + ')'
             "
         >
             <view class="btnBox flex">
@@ -35,7 +35,7 @@
         <view
             class="bottom relative"
             :style="
-                ' background-color: #000;background-image:url(' + ossurl.mine.pulluser.bottom + ')'
+                'background-image:url(' + ossurl.mine.pulluser.bottom + ')'
             "
         >
             <view class="getMoney" @click="getMoney()">
@@ -104,13 +104,13 @@
             if (this.$common.isLogin()) {
                 const user = store.getters.user
                 return {
-                    title: `超级玛特，新人优惠不停！`,
+                    title: `燚火漫域，新人优惠不停！`,
                     path: '/pages/award/index?pid=' + user.username,
                     imageUrl: ossurl.common.userShare
                 }
             }
             return {
-                title: `超级玛特，新人优惠不停！`,
+                title: `燚火漫域，新人优惠不停！`,
                 path: '/pages/award/index'
             }
         },

pages/pull_new_user/rule_dialog.vue

@@ -27,7 +27,7 @@
                         </view>
                         <view class="title-top">3.注意事项</view>
                         <view class="column">
-                            <p>(1).超级玛特有权调整和修改邀请规则，并通知用户;</p>
+                            <p>(1).燚火漫域有权调整和修改邀请规则，并通知用户;</p>
                             <p>
                                 (2).APP有权监控和限制用户的邀请行为，违规行为将取消奖励并可能受到惩罚;
                             </p>
@@ -37,7 +37,7 @@
                             <p>
                                 (4).使用邀请好友功能需遵守法律法规和APP规定不得存在刷小号等违规行为;
                             </p>
-                            <p>(5).在邀请过程中有任何问题可咨询超级玛特客服。</p>
+                            <p>(5).在邀请过程中有任何问题可咨询燚火漫域客服。</p>
                         </view>
                     </view>
                 </view>

pages/sell/index.vue

@@ -129,12 +129,12 @@ export default {
     },
     onShareAppMessage(res) {
         return {
-            title: '超级玛特 次元聚集地，潮玩新势力'
+            title: '燚火漫域 次元聚集地，潮玩新势力'
         }
     },
     onShareTimeline() {
         return {
-            title: '超级玛特 次元聚集地，潮玩新势力'
+            title: '燚火漫域 次元聚集地，潮玩新势力'
         }
     },
     methods: {

pages/sprint/index.vue

@@ -51,7 +51,7 @@
                     <view class="font5 paddingL10 color-theme bold">
                         榜单
                         <text style="color: #ff5055">前十名</text>
-                        可依名次获得相应奖品，结果于@超级玛特SuperMarts公众号中公布，奖品均于活动结束后三个工作日内发放。
+                        可依名次获得相应奖品，结果于@燚火漫域SuperMarts公众号中公布，奖品均于活动结束后三个工作日内发放。
                     </view>
                 </view>
             </view>

pages/vip/index.vue

@@ -163,13 +163,13 @@
         },
         onShareAppMessage(res) {
             return {
-                title: '超级玛特 次元聚集地，潮玩新势力',
+                title: '燚火漫域 次元聚集地，潮玩新势力',
                 path: '/pages/vip/index'
             }
         },
         onShareTimeline() {
             return {
-                title: '超级玛特 次元聚集地，潮玩新势力'
+                title: '燚火漫域 次元聚集地，潮玩新势力'
             }
         },
         onPullDownRefresh() {

pages/weal/activity.vue

@@ -172,8 +172,8 @@
                     class="paddingX15 paddingT20 paddingB30 color-white font4"
                     style="opacity: 0.8"
                 >
-                    <view class="text-center">微信小程序@超级玛特SuperMarts</view>
-                    <view class="text-center paddingT4">微信公众号@超级玛特SuperMarts</view>
+                    <view class="text-center">微信小程序@燚火漫域SuperMarts</view>
+                    <view class="text-center paddingT4">微信公众号@燚火漫域SuperMarts</view>
                     <view class="text-center paddingT4">客服@超级小可爱</view>
                     <view class="text-center paddingT4">
                         活动期间流水成就房暂时关闭使用,活动结束后恢复上线

pages/weal/index.vue

@@ -139,11 +139,9 @@
                 return 20
             },
             tabData() {
-                return !this.$store.state.hide
-                    ? this.roomNdj
-                        ? TAB_DATA_HIDE2
-                        : TAB_DATA_HIDE
-                    : TAB_DATA
+				console.log('数据', !this.$store.state.hide? this.roomNdj? TAB_DATA_HIDE2: TAB_DATA_HIDE: TAB_DATA);
+				
+                return !this.$store.state.hide? this.roomNdj? TAB_DATA_HIDE2: TAB_DATA_HIDE: TAB_DATA
             },
             headerBg() {
                 return this.scrollTop > 0 ? '#fff' : 'transparent'
@@ -153,6 +151,7 @@
             this.scrollTop = e.scrollTop
         },
         onShow(option) {
+			console.log("tabData", this.tabData);
             this.getParamConfig()
             this.getUser()
             if (!!getApp().globalData.wealActive || getApp().globalData.wealActive === 0) {

pages/weal/room.vue

@@ -44,7 +44,7 @@
                     </view>
                 </view>
             </view>
-            <view class="roomTypeList">
+            <!-- <view class="roomTypeList">
                 <view
                     class="roomTypeItem"
                     v-for="item of roomTab"
@@ -56,8 +56,72 @@
                         style="width: 130rpx; height: 176rpx"
                     />
                 </view>
-            </view>
-            <view class="roomList" style="padding: 0 9px">
+            </view> -->
+			<!-- <view class="roomTypeListSection">
+				<view class="center fx-c-s">
+					<view class="item" v-for="item of roomTab" :key="item.value" @click="handleChangeType(item)">
+						<text>{{ item.name }}</text>
+					</view>
+				</view>
+			</view> -->
+			<view class="p30">
+				<view class="roomTypeListSection fx-c-s">
+				  <view class="item fx-c-c" :class="{'on':tabIndex == index}" v-for="(item,index) in roomTab" :key="item.value" @click="handleChangeType(item, index)">
+					<text>{{ item.name }}</text>
+				  </view>
+				</view>
+			</view>
+			<!-- <view class="roomSection">
+				<view class="center">
+					<view class="item">
+						
+					</view>
+				</view>
+			</view> -->
+			<view class="roomSection p30 fx-c-s-w">
+				<view class="item" v-for="(item,index) in tableData" @click="showDetail(item)" :key="index" :style="'background: url(' + ossurl.welfare.itembj + ') no-repeat; background-size: 100% 100%;'">
+					  <view class="top fx-c-s">
+						<view class="l fx-c">
+						  <image :src="item.cover" class="userImg" style="width: 32rpx;" mode="widthFix"/>
+						  <view class="nickname">
+						      {{ item.user.nickname }}
+						  </view>
+						</view>
+						<view class="r">
+						  <text>{{ TYPE_MAP[item.type].name }}</text>
+						</view>
+					  </view>
+					  <view class="img">
+						<!-- <image src="https://cdn.magicmart.vip/magic/image/magic_1686382300000.png" style="width: 80%; margin: 0 auto;" mode="widthFix"/> -->
+						<swiper
+						    class="moli-swiper"
+						    :indicator-dots="false"
+						    circular="true"
+						    :autoplay="true"
+						    interval="5000"
+						    duration="500"
+						>
+						    <swiper-item
+						        v-for="(obj, objIndex) in item.luckRoomGoodsList.slice(0, 3)"
+						        :key="index"
+						    >
+						        <image
+						            :key="objIndex"
+						            :src="obj.spu.cover"
+						            mode="aspectFit"
+						            class="item-cover"
+						        />
+						    </swiper-item>
+						</swiper>
+					  </view>
+					  <view class="text">
+						<text>共{{ item.goodsQuantity }}件商品</text>
+						<text>{{ item.name }}</text>
+					  </view>
+				</view>
+			</view>
+			
+            <!-- <view class="roomList" style="padding: 0 9px">
                 <view
                     v-for="(item, index) in tableData"
                     @click="showDetail(item)"
@@ -102,21 +166,7 @@
                                     {{ item.user.nickname }}
                                 </view>
                             </view>
-                            <view class="roomUserAvatar">
-                                <!-- <view class="cu-avatar-group">
-                                    <view
-                                        class="cu-avatar radius sm"
-                                        v-for="user of item.participatingList.slice(0, 5)"
-                                        :key="user.userId"
-                                    >
-                                        <image
-                                            :src="user.avatar"
-                                            mode="scaleToFill"
-                                            class="avatar"
-                                        />
-                                    </view>
-                                </view> -->
-                            </view>
+                            <view class="roomUserAvatar"></view>
                             <view class="fire">
                                 <image
                                     :src="ossurl.welfare.fire"
@@ -134,21 +184,13 @@
                         webp
                         class="official"
                     />
-
-                    <!-- <view class="btn-wrapper flex-align-center">
-
-                        <text class="color-white font2" v-if="item.myParticipatedFlag === 1">
-                            已加入
-                        </text>
-                        <text class="font2" v-else>加入房间</text>
-                    </view> -->
                     <image
                         v-if="item.prizeMode === 1"
                         :src="ossurl.welfare.must"
                         class="must-flag"
                     />
                 </view>
-            </view>
+            </view> -->
             <empty v-if="isEmpty" :top="180" />
         </scroll-view>
 
@@ -165,24 +207,28 @@
     import resource from '@/utils/resource'
     const TYPE_MAP = {
         COMMON: {
+			name: '福利营',
             itemClass: 'item1',
             topFlag: ossurl.welfare.welfareIcon,
             flag: resource.weal_room_flag1,
             btn: resource.weal_btn_1
         },
         PASSWORD: {
+			name: '欧气营',
             itemClass: 'item2',
             topFlag: ossurl.welfare.passwordIcon,
             flag: resource.weal_room_flag2,
             btn: resource.weal_btn_2
         },
         ACHIEVEMENT: {
+			name: '口令营',
             itemClass: 'item3',
             topFlag: ossurl.welfare.achieveIcon,
             flag: resource.weal_room_flag3,
             btn: resource.weal_btn_3
         },
         EUROPEAN_GAS: {
+			name: '成就营',
             itemClass: 'item4',
             topFlag: ossurl.welfare.europeanIcon,
             flag: resource.weal_room_flag4,
@@ -259,7 +305,8 @@
                 requesting: false,
                 isRefreshClear: false,
                 type: '',
-                permission: null
+                permission: null,
+				tabIndex: 0
             }
         },
         computed: {
@@ -335,8 +382,9 @@
                 const res = await this.$service.weal.getRoomType()
                 this.permission = res
             },
-            handleChangeType(item) {
+            handleChangeType(item, index) {
                 this.type = item.value
+				this.tabIndex = index;
                 this.refresh(true)
             },
             search() {
@@ -369,6 +417,86 @@
     }
 </script>
 <style lang="scss" scoped>
+	.roomSection{
+	  padding-bottom: 200rpx;
+	  width: 100%;
+	  .item{
+	    width: 48%;
+	    height: 482rpx;
+	    margin-top: 30rpx;
+	    .top{
+	      .l{
+			.userImg{
+				border-radius: 50%;
+			}
+	        padding-left: 20rpx;
+	        margin-top: 10rpx;
+	        image{
+	          margin-right: 6rpx;
+	        }
+	        text{
+	          width: 150rpx;
+	          display: -webkit-box;
+	          overflow: hidden;
+	          text-overflow: ellipsis;
+	          word-break: break-all;
+	          -webkit-box-orient: vertical;
+	          -webkit-line-clamp: 1;
+	        }
+	      }
+	      .r{
+	        margin-right: 10rpx;
+	        margin-top: -6rpx;
+	        text{
+	          color: #969696;
+	          font-size: 24rpx;
+	        }
+	      }
+	    }
+	    .img{
+	      text-align: center;
+	    }
+	    .text{
+	      text-align: center;
+		  margin-top: 18rpx;
+	      text{
+	        display: block;
+	        &:nth-child(1) {
+	          color: #999;
+	        }
+	        &:nth-child(2) {
+	          color: #000;
+	          font-weight: bold;
+	          font-size: 30rpx;
+	        }
+	      }
+	    }
+	  }
+	}
+	.roomTypeListSection{
+	  background: #5a606e;
+	  margin-top: 30rpx;
+	  padding: 8rpx;
+	  border-radius: 8rpx;
+	  .item{
+	    width: 114rpx;
+	    height: 56rpx;
+	    box-sizing: border-box;
+		border-radius: 8rpx;
+	    text{
+	      color: #b2b6ce;
+	      font-weight: bold;
+		  // font-size: 28rpx;
+	    }
+	  }
+	  .on{
+	    background: #ffea5d;
+	    background-size: 100% 100%;
+	    text{
+	      color: #000;
+	    }
+	  }
+	}
     .container {
         padding-top: 172rpx;
     }

pages/weal_detail/index.vue

@@ -11,7 +11,7 @@
                 </view>
             </view>
         </view>
-        <view class="roomBg" :style="'background-image:url(' + ossurl.welfare.detail.roomBg + ')'">
+        <view class="roomBg" :style="'background-image:url(' + ossurl.box.headbj + ')'">
             <view v-if="data">
                 <view class="roomTitle">
                     {{ data.name }}
@@ -19,7 +19,7 @@
                 <view class="roomType">
                     <image :src="TYPE_MAP[data.type].topFlag" class="topFlag" />
                 </view>
-                <view class="description">{{ data.description }}</view>
+                <!-- <view class="description">{{ data.description }}</view> -->
                 <view class="timeBox">
                     <image :src="ossurl.welfare.detail.time" class="image" />
                     开赏：
@@ -150,7 +150,7 @@
                 >
                     <text>增加号签</text>
                 </view>
-                <view class="btn" @click="join" v-if="data.status == 1">
+                <view class="btn" @click="join" v-if="data.status == 1" :style="'background: url(' + ossurl.mine.butbj + ') no-repeat; background-size: 100% 100%;'">
                     <text v-if="data.myParticipatedFlag === 1">
                         <text v-if="data.participateMode == 1 && data.myAuditStatus == 0">
                             待审核
@@ -512,10 +512,10 @@
             display: flex;
             align-items: center;
             justify-content: center;
-            color: #c49300;
+            color: #333;
             font-size: 24rpx;
             .time {
-                color: #644b00;
+                color: #333;
             }
             .image {
                 width: 32rpx;
@@ -551,7 +551,7 @@
                 font-size: 24rpx;
                 font-family: Arial, Arial;
                 font-weight: 400;
-                color: #c49300;
+                color: #333;
                 line-height: 28rpx;
             }
         }
@@ -683,7 +683,9 @@
                 image {
                     width: 30px;
                     height: 30px;
-                    border-radius: 15px;
+                    // border-radius: 15px;
+					border-radius: 50%;
+					border: 4rpx solid #FFE957;
                 }
 
                 .text {
@@ -708,9 +710,9 @@
             display: flex;
             justify-content: center;
             font-size: 24rpx;
-            color: #c49300;
+            color: #333;
             .time {
-                color: #644b00;
+                color: #333;
             }
         }
         .btnBox {
@@ -721,7 +723,7 @@
         }
         .btn {
             height: 64rpx;
-            background: #fec433;
+            // background: #fec433;
             line-height: 64rpx;
             font-size: 28rpx;
             font-family: Source Han Sans, Source Han Sans;

pages/weal_detail/poster.vue

@@ -109,7 +109,7 @@ export default {
                 canvasUtil.circleImg(ctx, bgImg, 0, 0, width, height, 24)
                 // canvasUtil.drawOneText(
                 //     ctx,
-                //     '长摁识别小程序码 去超级玛特领手办吧',
+                //     '长摁识别小程序码 去燚火漫域领手办吧',
                 //     'normal bold 33px Arial',
                 //     '#fff',
                 //     width,

uni.scss

@@ -91,4 +91,29 @@ $color-3: #B8B8B8; //提示文字
 $color-4: #dadada;
 
 $color-line: #eee;
-$color-mask: rgba(0, 0, 0, 0.3);
+$color-mask: rgba(0, 0, 0, 0.3);
+
+.fx-c{
+  display: flex;
+  align-items: center;
+}
+.fx-c-c{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.fx-c-s{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.fx-c-s-w{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  flex-wrap: wrap;
+}
+.p30{
+	padding: 0 30rpx;
+	box-sizing: border-box;
+}

utils/config.js

@@ -8,7 +8,7 @@
  */
 import resource from './resource'
 import ossurl from './ossurl'
-export const NAME = '超级玛特'
+export const NAME = '燚火漫域'
 
 export const VERSION = '1.0.4'
 

utils/ossurl.js

@@ -1,8 +1,9 @@
-const supermart = 'https://cdn.supermarts.cn/supermart'
+const supermart = 'https://cdn.supermarts.cn/supermart' // oss地址
+const yihuo = 'https://file.supermarts.cn/file/yi_huo_man_yu/images'
 
 export default {
-    logoWhite: `${supermart}/logo_white.png`,
-    logoBlack: `${supermart}/logo_black.png`,
+    logoWhite: `${yihuo}/index/i1.png`,
+    logoBlack: `${yihuo}/index/i1.png`,
     common: {
         gift: `${supermart}/common/gift.png`,
         giftTop: `${supermart}/common/giftTop.png`,
@@ -12,11 +13,12 @@ export default {
         topBtn: `${supermart}/common/topBtn.png`,
         empty: `${supermart}/common/empty.png`,
         userShare: `${supermart}/common/userShare.jpg`,
-        posterBg: `${supermart}/common/posterBg.jpg`,
-        playRule: `${supermart}/common/playRule.jpg`
+        posterBg: `${yihuo}/large/t3.png`,
+        playRule: `${yihuo}/large/playRule.png`
     },
     login: {
-        loginLogo: `${supermart}/loginLogo.png`
+        loginLogo: `${supermart}/loginLogo.png`,
+        loginbj: `${yihuo}/function/l1.png`
     },
     box: {
         all: `${supermart}/box/all.png`,
@@ -29,52 +31,60 @@ export default {
         boxBg1: `${supermart}/box/boxBg1.png`,
         ruleBtn: `${supermart}/box/ruleBtn.png`,
         userBg: `${supermart}/box/userBg.png`,
-        yf: `${supermart}/box/yf.png`,
-        cj: `${supermart}/box/cj.png`,
+        yf: `${yihuo}/award/a5.png`,
+        cj: `${yihuo}/award/a4.png`,
         raffleBg: `${supermart}/box/raffleBg.png`,
         lotteryTitle: `${supermart}/box/lotteryTitle.png`,
         lotteryBg: `${supermart}/box/lotteryBg.png`,
         customerService: `${supermart}/box/customerService.png`,
         createList: `${supermart}/box/createList.png`,
         receiveBenefits: `${supermart}/box/receiveBenefits.png`,
+		headbj: `${yihuo}/award/a1.png`,
+		headInfo: `${yihuo}/award/a2.png`,
+		tabIndexbj: `${yihuo}/award/a3.png`,
+		tabIndex1: `${yihuo}/award/a8.png`,
+		tabIndex2: `${yihuo}/award/a9.png`,
+		tabIndex3: `${yihuo}/award/a10.png`,
+		headDetailbj: `${yihuo}/award/i1.png`,
 
         rule: {
-            cjsRule: `${supermart}/box/rule/cjsRule.png`,
-            yfsRule: `${supermart}/box/rule/yfsRule.png`,
-            step_1: `${supermart}/box/rule/step_1.png`,
-            step_2: `${supermart}/box/rule/step_2.png`,
-            step_3: `${supermart}/box/rule/step_3.png`,
-            step_4: `${supermart}/box/rule/step_4.png`,
-            step_5: `${supermart}/box/rule/step_5.png`,
-            step_6: `${supermart}/box/rule/step_6.png`,
+            cjsRule: `${yihuo}/large/t10.png`,
+            yfsRule: `${yihuo}/large/t11.png`,
+            step_1: `${yihuo}/large/d1/step_1.png`,
+            step_2: `${yihuo}/large/d1/step_2.png`,
+            step_3: `${yihuo}/large/d1/step_3.png`,
+            step_4: `${yihuo}/large/d1/step_4.png`,
+            step_5: `${yihuo}/large/d1/step_5.png`,
+            step_6: `${yihuo}/large/d1/step_6.png`,
             step_7: `${supermart}/box/rule/step_7.png`,
             step_8: `${supermart}/box/rule/step_8.png`,
-            step_2_1: `${supermart}/box/rule/step_2_1.png`,
-            step_2_2: `${supermart}/box/rule/step_2_2.png`,
-            step_2_3: `${supermart}/box/rule/step_2_3.png`,
-            step_2_4: `${supermart}/box/rule/step_2_4.png`,
-            step_2_5: `${supermart}/box/rule/step_2_5.png`,
-            step_2_6: `${supermart}/box/rule/step_2_6.png`,
+            step_2_1: `${yihuo}/large/d2/step_2_1.png`,
+            step_2_2: `${yihuo}/large/d2/step_2_2.png`,
+            step_2_3: `${yihuo}/large/d2/step_2_3.png`,
+            step_2_4: `${yihuo}/large/d2/step_2_4.png`,
+            step_2_5: `${yihuo}/large/d2/step_2_5.png`,
+            step_2_6: `${yihuo}/large/d2/step_2_6.png`,
             step_2_7: `${supermart}/box/rule/step_2_7.png`,
             ruleTitle: `${supermart}/box/rule/ruleTitle.png`,
-            ruleTip: `${supermart}/box/rule/ruleTip.png`
+            ruleTip: `${yihuo}/large/ruleTip.png`
         },
         detail: {
             awardBg: `${supermart}/box/detail/awardBg.jpg`,
-            csBtn: `${supermart}/box/detail/csBtn.png`,
-            demoBtn: `${supermart}/box/detail/demoBtn.png`,
-            left: `${supermart}/box/detail/left.png`,
-            right: `${supermart}/box/detail/right.png`,
-            rule: `${supermart}/box/detail/rule.png`,
-            stone: `${supermart}/box/detail/stone.png`,
-            warehouse: `${supermart}/box/detail/warehouse.png`,
-            wlBtn: `${supermart}/box/detail/wlBtn.png`,
-            yfBtn: `${supermart}/box/detail/yfBtn.png`,
-            levelA: `${supermart}/box/detail/levelA.png`,
-            levelB: `${supermart}/box/detail/levelB.png`,
-            levelC: `${supermart}/box/detail/levelC.png`,
-            levelD: `${supermart}/box/detail/levelD.png`,
-            record: `${supermart}/box/detail/record.png`,
+            csBtn: `${yihuo}/award/i18.png`,
+            demoBtn: `${yihuo}/award/i7.png`,
+            left: `${yihuo}/award/a6.png`,
+            right: `${yihuo}/award/a7.png`,
+            rule: `${yihuo}/award/i3.png`,
+            stone: `${yihuo}/award/i5.png`,
+            warehouse: `${yihuo}/award/i6.png`,
+            wlBtn: `${yihuo}/award/i17.png`,
+            yfBtn: `${yihuo}/award/i19.png`,
+            levelA: `${yihuo}/award/i13.png`,
+            levelB: `${yihuo}/award/i14.png`,
+            levelC: `${yihuo}/award/i15.png`,
+            levelD: `${yihuo}/award/i16.png`,
+            record: `${yihuo}/award/i4.png`,
+            boxChoosebj: `${yihuo}/award/a11.png`,
             levelListTitle: `${supermart}/box/detail/levelListTitle.png`,
             levelTextA: `${supermart}/box/detail/levelTextA.png`,
             levelTextB: `${supermart}/box/detail/levelTextB.png`,
@@ -84,15 +94,20 @@ export default {
             next: `${supermart}/box/detail/next.png`,
             prev: `${supermart}/box/detail/prev.png`,
             boxIcon: `${supermart}/box/detail/boxIcon.png`,
-            lock: `${supermart}/box/detail/lock.png`,
-            unlock: `${supermart}/box/detail/unlock.png`,
+            lock: `${yihuo}/award/i20.png`,
+            unlock: `${yihuo}/award/i21.png`,
             Inclusive: `${supermart}/box/detail/Inclusive.png`,
-            refresh: `${supermart}/box/detail/refresh.png`,
+            refresh: `${yihuo}/award/i22.png`,
             refreshIcon: `${supermart}/box/detail/refreshIcon.png`,
             playMethod: `${supermart}/box/detail/playMethod.png`,
-            yfsBg: `${supermart}/box/detail/yfsBg.png`,
+            yfsBg: `${yihuo}/award/i24.png`,
+            bottom: `${yihuo}/award/i8.png`,
             boxIndexBg: `${supermart}/box/detail/boxIndexBg.png`,
-            levelBg: `${supermart}/box/detail/levelBg.png`
+            levelBg: `${supermart}/box/detail/levelBg.png`,
+			itembjA: `${yihuo}/award/i9.png`,
+			itembjB: `${yihuo}/award/i10.png`,
+			itembjC: `${yihuo}/award/i11.png`,
+			itembjD: `${yihuo}/award/i12.png`,
         }
     },
     home: {
@@ -101,7 +116,22 @@ export default {
         indexTab3: `${supermart}/home/indexTab3.png`,
         indexTab4: `${supermart}/home/indexTab4.png`,
         allIp: `${supermart}/home/allIp.png`,
-        bottomIntro: `${supermart}/home/bottomIntro.jpg`
+		log: `${yihuo}/index/i1.png`,
+		headbj: `${yihuo}/index/i2.png`,
+		message: `${yihuo}/index/i4.png`,
+		typeTop: `${yihuo}/index/i11.png`,
+		banner: `${yihuo}/index/i5.png`,
+		tabTypebj: `${yihuo}/index/i6.png`,
+		tab1: `${yihuo}/index/i7.png`,
+		tab2: `${yihuo}/index/i8.png`,
+		tab3: `${yihuo}/index/i9.png`,
+		tab4: `${yihuo}/index/i10.png`,
+		type1: `${yihuo}/index/i12.png`,
+		type2: `${yihuo}/index/i13.png`,
+		type3: `${yihuo}/index/i14.png`,
+		type4: `${yihuo}/index/i15.png`,	
+		logText: `${yihuo}/user/l1.png`,
+        bottomIntro: `${yihuo}/large/bottomIntro.png`
     },
     welfare: {
         playMethod: `${supermart}/welfare/playMethod.png`,
@@ -110,33 +140,33 @@ export default {
         european: `${supermart}/welfare/european.png`,
         allActive: `${supermart}/welfare/allActive.png`,
         all: `${supermart}/welfare/all.png`,
-        achieveIcon: `${supermart}/welfare/achieveIcon.png`,
+        achieveIcon: `${yihuo}/weal/f10.png`,
         roomBg: `${supermart}/welfare/roomBg.png`,
         official: `${supermart}/welfare/official.png`,
         fire: `${supermart}/welfare/fire.png`,
         achieveActive: `${supermart}/welfare/achieveActive.png`,
         achieve: `${supermart}/welfare/achieve.png`,
-        welfareIcon: `${supermart}/welfare/welfareIcon.png`,
+        welfareIcon: `${yihuo}/weal/f8.png`,
         welfareActive: `${supermart}/welfare/welfareActive.png`,
         welfare: `${supermart}/welfare/welfare.png`,
-        passwordIcon: `${supermart}/welfare/passwordIcon.png`,
+        passwordIcon: `${yihuo}/weal/f9.png`,
         passwordActive: `${supermart}/welfare/passwordActive.png`,
         password: `${supermart}/welfare/password.png`,
-        europeanIcon: `${supermart}/welfare/europeanIcon.png`,
+        europeanIcon: `${yihuo}/weal/f11.png`,
         europeanActive: `${supermart}/welfare/europeanActive.png`,
         must: `${supermart}/welfare/must.png`,
         luckNumBg: `${supermart}/welfare/luckNumBg.png`,
         luckNum: `${supermart}/welfare/luckNum.png`,
-        roomRule: `${supermart}/welfare/roomRule.png`,
+        roomRule: `${yihuo}/large/roomRule.png`,
         inviteRule: `${supermart}/welfare/inviteRule.png`,
         blessingsRuleBg: `${supermart}/welfare/blessingsRuleBg.png`,
-        room: `${supermart}/welfare/room.png`,
-        roomActive: `${supermart}/welfare/roomActive.png`,
+        room: `${yihuo}/weal/w11.png`,
+        roomActive: `${yihuo}/weal/w11-1.png`,
         roomShare: `${supermart}/welfare/roomShare.png`,
-        wish: `${supermart}/welfare/wish.png`,
-        wishActive: `${supermart}/welfare/wishActive.png`,
-        toysIcon: `${supermart}/welfare/toys.png`,
-        toysActive: `${supermart}/welfare/toysActive.png`,
+        wish: `${yihuo}/weal/w13.png`,
+        wishActive: `${yihuo}/weal/w13-1.png`,
+        toysIcon: `${yihuo}/weal/w12.png`,
+        toysActive: `${yihuo}/weal/w12-1.png`,
         toysBg: `${supermart}/welfare/toysBg.jpg`,
         yfsRule: `${supermart}/welfare/yfsRule.png`,
         passwordDiaolgTitle: `${supermart}/welfare/passwordDiaolgTitle.png`,
@@ -150,6 +180,13 @@ export default {
             prev: `${supermart}/welfare/blessings/prev.png`,
             rule: `${supermart}/welfare/blessings/rule.png`
         },
+		headIcon1: `${yihuo}/weal/w3.png`,
+		headIcon2: `${yihuo}/weal/w4.png`,
+		headIcon3: `${yihuo}/weal/w5.png`,
+		headIconIndex: `${yihuo}/weal/w2.png`,
+		headbj: `${yihuo}/weal/w1.png`,
+		itembj: `${yihuo}/weal/w10.png`,
+		
         toys: {
             rule: `${supermart}/welfare/toys/rule.png`,
             ball: `${supermart}/welfare/toys/ball.png`,
@@ -170,10 +207,10 @@ export default {
         },
         detail: {
             roomBg: `${supermart}/welfare/detail/roomBg.png`,
-            numberSign: `${supermart}/welfare/detail/numberSign.png`,
+            numberSign: `${yihuo}/weal/f5.png`,
             numBg: `${supermart}/welfare/detail/numBg.png`,
             time: `${supermart}/welfare/detail/time.png`,
-            record: `${supermart}/welfare/detail/record.png`
+            record: `${yihuo}/weal/f4.png`
         }
     },
     mine: {
@@ -203,11 +240,15 @@ export default {
         exchange: `${supermart}/mine/exchange.png`,
         checkAll: `${supermart}/mine/checkAll.png`,
         pulluser: {
-            top: `${supermart}/mine/pulluser/top.png`,
-            bottom: `${supermart}/mine/pulluser/bottom.png`,
+            top: `${yihuo}/large/t12.png`,
+            bottom: `${yihuo}/large/t13.png`,
             rule: `${supermart}/mine/pulluser/rule.png`,
             title: `${supermart}/mine/pulluser/title.png`,
             ruleBg: `${supermart}/mine/pulluser/ruleBg.png`
-        }
+        },
+		headbj: `${yihuo}/user/u1.png`,
+		headId: `${yihuo}/user/u2.png`,
+		headPhone: `${yihuo}/user/u3.png`,
+		butbj: `${yihuo}/weal/f6.png`,
     }
 }

utils/resource.js

@@ -1,6 +1,7 @@
-const prefix = 'https://cdn.supermarts.cn/resource/magic'
-const pPrefix = 'https://cdn.supermarts.cn/resource'
-const prefixWow = 'https://cdn.supermarts.cn/resource/magicwow'
+const prefix = 'https://file.supermarts.cn/file/yi_huo_man_yu/resource/magic'
+const pPrefix = 'https://file.supermarts.cn/file/yi_huo_man_yu/resource'
+const prefixWow = 'https://file.supermarts.cn/file/yi_huo_man_yu/resource/magicwow'
+const yihuofix = 'https://file.supermarts.cn/file/yi_huo_man_yu/images'
 
 export default {
     listHeader: prefix + '/award/listHeader.png',
@@ -563,12 +564,15 @@ export default {
     new_user_bg: prefix + '/new_user_bg.png',
     room_share: prefix + '/room_share.png',
 
-    index_banner: prefixWow + '/index_banner.png',
+    index_banner: yihuofix + '/index/i2.png',
+    // index_banner: prefixWow + '/index_banner.png',
     index_group1: prefixWow + '/index_group1.png',
     index_logan: prefixWow + '/index_logan.png',
     index_tab1: prefixWow + '/index_tab1.png',
     index_tab2: prefixWow + '/index_tab2.png',
     index_tab3: prefixWow + '/index_tab3.png',
     index_tab4: prefixWow + '/index_tab4.png',
+	
+	login_bj: yihuofix + '/function/bj.jpg',
 }