Prechádzať zdrojové kódy

perf: 优化包体积

yijianjun 2 týždňov pred
rodič
commit
2a34f8f1bf

+ 2 - 2
mer_plat_admin/src/router/index.js

@@ -29,7 +29,7 @@ import merchant from './modules/merchant';
 import pagediy from '@/router/modules/pagediy';
 import riderRouter from '@/router/modules/rider';
 import secondhandRouter from './modules/secondhand';
-import expressRouter from './modules/express';
+// import expressRouter from './modules/express';
 /**
  * Note: sub-menu only appear when route children.length >= 1
  * Detail see: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
@@ -82,7 +82,7 @@ export const constantRoutes = [
   //二手交易
   secondhandRouter,
   //快递
-  expressRouter,
+  // expressRouter,
 
   {
     path: '/404',

+ 27 - 38
mer_uniapp/pages.json

@@ -23,18 +23,7 @@
 				// #endif
 			}
 		},
-		{
-			"path": "pages/new_pages/index/index",
-			"style": {
-				"navigationBarTitleText": "首页",
-				"navigationStyle": "custom",
-				"navigationBarTextStyle": "black"
-					// #ifdef APP-PLUS
-					,
-				"enablePullDownRefresh": true
-				// #endif
-			}
-		},
+		
 		{
 			"path": "pages/order/index",
 			"style": {
@@ -1608,32 +1597,32 @@
 		// 	}]
 		// },
 		
-		{
-			"root": "pages/rider_index/",
-			"name": "rider",
-			"pages": [{
-					"path": "work/index",
-					"style": {
-						"navigationBarTitleText": "工作台",
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "order/index",
-					"style": {
-						"navigationBarTitleText": "跑腿记录",
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "index",
-					"style": {
-						"navigationBarTitleText": "跑腿记录",
-						"navigationStyle": "custom"
-					}
-				}
-			]
-		},
+		// {
+		// 	"root": "pages/rider_index/",
+		// 	"name": "rider",
+		// 	"pages": [{
+		// 			"path": "work/index",
+		// 			"style": {
+		// 				"navigationBarTitleText": "工作台",
+		// 				"navigationStyle": "custom"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "order/index",
+		// 			"style": {
+		// 				"navigationBarTitleText": "跑腿记录",
+		// 				"navigationStyle": "custom"
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "index",
+		// 			"style": {
+		// 				"navigationBarTitleText": "跑腿记录",
+		// 				"navigationStyle": "custom"
+		// 			}
+		// 		}
+		// 	]
+		// },
 		
 		
 		

+ 1 - 1
mer_uniapp/pages/activity/status/index.vue

@@ -283,7 +283,7 @@
 					showgroup: 1,
 				},
 				pinkPriceImg: '../static/images/pinkPrice.png',
-				pinkbackgd: '../static/images/pinkShare.png',
+				pinkbackgd: 'http://39.105.58.247:20800/crmebimage/public/store/2025/05/20/523c1b940a614e9fa22eb4a97b07dc5590yf5x3wco.png',
 				pinkWhiteBg: '../static/images/whiteBg.png',
 				qrcodeSize: 600,
 				canvasStatus: false, //是否显示海报

+ 2 - 2
mer_uniapp/pages/confession_wall/home/index.vue

@@ -257,7 +257,7 @@
 		<uni-popup ref="schoolRef" :is-mask-click="false">
 			<view class="w-full flex-center" :style="{height: windowHeight + 'px'}">
 				<navigator hover-class='none' url='/pages/discover/discover_user/index'>
-					<image src="/static/img/ic-school.png" mode="heightFix" style="height: 694rpx;width: 616rpx;"></image>
+					<image src="http://39.105.58.247:20800/crmebimage/public/store/2025/05/20/ac4f4703de5d4a8c9490e7e27c9f25b8pzzy4l1ywq.png" mode="heightFix" style="height: 694rpx;width: 616rpx;"></image>
 				</navigator>
 			</view>
 		</uni-popup>
@@ -372,7 +372,7 @@
 				urlDomain: this.$Cache.get("imgHost"),
 				sysHeight: sysHeight,
 				navH: '',
-				windowWidth: 0, //获取屏幕宽度🌟💗
+				windowWidth: 0, //获取屏幕宽度
 				interval: 3000,
 				swiperHeight: 0,
 				listMarTop: 0,

+ 2 - 2
mer_uniapp/pages/game_dazi/index.vue

@@ -108,7 +108,7 @@
 		<uni-popup ref="schoolRef" :is-mask-click="false">
 			<view class="w-full flex-center" :style="{height: windowHeight + 'px'}">
 				<navigator hover-class='none' url='/pages/discover/discover_user/index'>
-					<image src="/static/img/ic-school.png" mode="heightFix" style="height: 694rpx;width: 616rpx;"></image>
+					<image src="http://39.105.58.247:20800/crmebimage/public/store/2025/05/20/ac4f4703de5d4a8c9490e7e27c9f25b8pzzy4l1ywq.png" mode="heightFix" style="height: 694rpx;width: 616rpx;"></image>
 				</navigator>
 			</view>
 		</uni-popup>
@@ -225,7 +225,7 @@
 				urlDomain: this.$Cache.get("imgHost"),
 				sysHeight: sysHeight,
 				navH: '',
-				windowWidth: 0, //获取屏幕宽度🌟💗
+				windowWidth: 0, //获取屏幕宽度
 				interval: 3000,
 				swiperHeight: 0,
 				listMarTop: 0,

+ 1 - 1
mer_uniapp/pages/goods/goods_details/components/groupCard.vue

@@ -43,7 +43,7 @@
 			bgImage() {
 				return [
 					{
-						'background':`url(${this.urlDomain}crmebimage/presets/groupMb.png)`
+						'background':`url(${this.urlDomain}crmebimage/public/store/2025/05/20/e3bd7fcec2534635b73c8d42b6b63071hobdvcsrki.png)`
 					},
 					{
 						'background-size':`cover`

+ 1 - 1
mer_uniapp/pages/goods/order_list/index.vue

@@ -252,7 +252,7 @@
 				H5ShareBox: false, //公众号分享图片
 				pinkPriceImg: '../static/images/pinkPrice.png',
 				posterbackgd: '../static/images/posterbackgd.png',
-				pinkbackgd: '../static/images/pinkShare.png',
+				pinkbackgd: 'http://39.105.58.247:20800/crmebimage/public/store/2025/05/20/523c1b940a614e9fa22eb4a97b07dc5590yf5x3wco.png',
 				pinkWhiteBg: '../static/images/whiteBg.png',
 				imgTop: '',
 				imagePath: '', //海报路径

BIN
mer_uniapp/pages/goods/static/images/groupMb.png


BIN
mer_uniapp/pages/goods/static/images/pinkShare.png


+ 0 - 177
mer_uniapp/pages/new_pages/index/components/addTips.vue

@@ -1,177 +0,0 @@
-<template>
-	<!-- 小程序顶部提示 -->
-	<view>
-		<view class="tip_box" :class="{ anScale: isAm }" v-if="showTip"
-			:style="{ top: isCustom ? boxTop + 'px' : '0px' }">
-			<view class="arrow" :style="{ 'margin-right': arrowMargin + 'px', borderBottomColor: bgColor }"></view>
-			<view class="container" :style="{'margin-right': cotainerMargin + 'px',backgroundColor: bgColor,borderRadius: borderR + 'px',}">
-				<!-- 提示文字 -->
-				<view class="tips" :style="{ color: fontObj.color, fontSize: fontObj.fontSize, fontWeight: fontObj.fontWeight }">
-					{{ text }}</view>
-				<view class="close" @tap="tipHidden">
-					<text class="iconfont icon-cha3" v-if="closeColor"></text>
-					<text class="iconfont icon-cha3" style="color:#fff;" v-else></text>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	// +----------------------------------------------------------------------
-	// | CRMEB [ CRMEB赋能开发者,助力企业发展 ]
-	// +----------------------------------------------------------------------
-	// | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
-	// +----------------------------------------------------------------------
-	// | Licensed CRMEB并不是自由软件,未经许可不能去掉CRMEB相关版权
-	// +----------------------------------------------------------------------
-	// | Author: CRMEB Team <admin@crmeb.com>
-	// +----------------------------------------------------------------------
-	export default {
-		data() {
-			return {
-				showTip: false,
-				boxTop: 0,
-				arrowMargin: 0,
-				cotainerMargin: 0,
-				screenWidth: 0,
-			};
-		},
-		props: {
-			/* 是否是自定义头部 */
-			isCustom: {
-				type: Boolean,
-				default: false,
-			},
-			/* 背景颜色 */
-			bgColor: {
-				type: String,
-				default: "#ffffff",
-			},
-			/* 提示文字 */
-			text: {
-				type: String,
-				default: "添加到我的小程序",
-			},
-			/* 提示文字样式 */
-			fontObj: {
-				type: Object,
-				default: function() {
-					return {
-						color: "#202020",
-						fontSize: "12px",
-						fontWeight: "0",
-					};
-				},
-			},
-			/* 圆角大小  px*/
-			borderR: {
-				type: Number,
-				default: 5,
-			},
-			/* 延时出现 */
-			delay: {
-				type: Number,
-				default: 2000,
-			},
-			/* 关闭btn黑白两色 或者自行添加 */
-			closeColor: {
-				type: Boolean,
-				default: true,
-			},
-			/* 动画效果 */
-			isAm: {
-				type: Boolean,
-				default: true,
-			},
-		},
-		methods: {
-			tipHidden: function() {
-				uni.setStorageSync("my_tips_2020", "true");
-				this.showTip = false;
-			},
-			timeOut() {
-				this.tipHidden();
-				this.showTip = true;
-			},
-			init() {
-				if (uni.getStorageSync("my_tips_2020")) return;
-				let rect = uni.getMenuButtonBoundingClientRect();
-				let screenWidth = uni.getSystemInfoSync().screenWidth;
-				this.boxTop = rect.bottom;
-				this.arrowMargin = rect.width * 0.75 + 4;
-				this.cotainerMargin = screenWidth - rect.right;
-				this.timeOut();
-			},
-		},
-		onReady() {
-			this.init();
-		},
-	};
-</script>
-
-<style lang="scss" scoped>
-	@keyframes anScale {
-		from {
-			-webkit-transform: scale3d(0.96, 0.96, 0.96);
-			transform: scale3d(0.96, 0.96, 0.96);
-		}
-
-		50% {
-			-webkit-transform: scale3d(1, 1, 1);
-			transform: scale3d(1, 1, 1);
-		}
-
-		to {
-			-webkit-transform: scale3d(0.96, 0.96, 0.96);
-			transform: scale3d(0.96, 0.96, 0.96);
-		}
-	}
-
-	.anScale {
-		animation: anScale 1s linear infinite;
-	}
-
-	.tip_box {
-		width: 70%;
-		position: fixed;
-		top: 0;
-		right: 0;
-		z-index: 100;
-		display: flex;
-		justify-content: flex-end;
-		align-items: flex-end;
-		flex-direction: column;
-
-		.arrow {
-			width: 0;
-			height: 0;
-			border: 10rpx solid;
-			border-color: transparent;
-		}
-
-		.container {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			padding: 16rpx 24rpx;
-
-			.tips {
-				flex: 1;
-				padding-right: 12rpx;
-			}
-
-			.close {
-				height: 30rpx;
-				width: 30rpx;
-				font-size: 20rpx;
-				line-height: 30rpx;
-				color: #999;
-				.closeImg {
-					height: 100%;
-					width: 100%;
-				}
-			}
-		}
-	}
-</style>

BIN
mer_uniapp/pages/new_pages/index/error-network.png


+ 0 - 905
mer_uniapp/pages/new_pages/index/index.vue

@@ -1,905 +0,0 @@
-<template>
-	<view id="home" :data-theme="theme" :style="[pageStyle]">
-		<tui-skeleton v-if="showSkeleton"></tui-skeleton>
-		<!-- 有网内容 -->
-		<view v-if="!errorNetwork">
-			<view class="page-index tui-skeleton page_count" :class="{'bgf':navIndex >0}"
-				:style="{visibility: showSkeleton ? 'hidden' : 'visible'}">
-				<!-- 组合组件 -->
-				<homeComb :bgInfo="bgInfo" v-if="showHomeComb" :dataConfig="homeCombData" @changeTab="changeTab"
-					:isScrolled="isScrolled" :navIndex="navIndex"></homeComb>
-				<!-- 顶部搜索框 -->
-				<headerSearch :isScrolled="isScrolled" v-if="showHeaderSerch" :dataConfig="headerSerchCombData">
-				</headerSearch>
-				<!-- 分类 -->
-				<cateNav v-if="showCateNav" :dataConfig="cateNavData" @changeTab="changeTab"></cateNav>
-				<view class="page_content skeleton">
-					<view v-if="navIndex === 0">
-						<view v-for="(item, index) in styleConfig" :key="index">
-							<!-- 新闻简报 -->
-							<news v-if="item.name == 'news'" :dataConfig="item"></news>
-							<!-- 导航组 -->
-							<menus v-if="item.name == 'menus'" :dataConfig="item"></menus>
-							<!-- 文章列表 -->
-							<articleList v-if="item.name == 'homeArticle'" :dataConfig="item"></articleList>
-							<!-- 秒杀 -->
-							<seckill-data v-if="item.name == 'seckill'" :dataConfig="item"></seckill-data>
-							<!-- 小程序直播 -->
-							<!-- #ifdef MP -->
-							<liveBroadcast v-if="item.name == 'liveBroadcast'" :dataConfig="item"></liveBroadcast>
-							<!-- #endif -->
-							<!-- 优惠券 -->
-							<coupon v-if="item.name == 'homeCoupon'" :dataConfig="item"></coupon>
-							<!-- 图片魔方 -->
-							<pictureCube v-if="item.name == 'pictureCube'" :dataConfig="item"></pictureCube>
-							<!-- 热区 -->
-							<hotSpot v-if="item.name == 'homeHotspot'" :dataConfig="item"></hotSpot>
-							<!-- 轮播图 -->
-							<swiperBg v-if="item.name == 'swiperBg'" :dataConfig="item"></swiperBg>
-							<!-- 视频 -->
-							<shortVideo v-if="item.name == 'video'" :dataConfig="item"></shortVideo>
-							<!-- 店铺街 -->
-							<merchant-list v-if="item.name == 'homeMerchant'" :dataConfig="item"></merchant-list>
-							<!-- 拼团 -->
-							<group v-if="item.name == 'group'" :dataConfig="item"></group>
-							<!-- 积分 -->
-							<intergralShop v-if="item.name == 'intergral'" :dataConfig="item"></intergralShop>
-							<!-- 辅助线 -->
-							<guide v-if="item.name == 'guide'" :dataConfig="item"></guide>
-							<!-- 富文本-->
-							<rich-text-editor v-if="item.name == 'richTextEditor'"
-								:dataConfig="item"></rich-text-editor>
-							<!-- 辅助空白-->
-							<blank-page v-if="item.name == 'blankPage'" :dataConfig="item"></blank-page>
-							<!-- 标题 -->
-							<home-title v-if="item.name == 'titles'" :dataConfig="item"></home-title>
-							<!-- 逛逛 -->
-							<discover v-if="item.name == 'homeDiscover'" :dataConfig="item" :isLogin="isLogin">
-							</discover>
-							<!-- 商品列表 -->
-							<goodList v-if="item.name == 'goodList'" :dataConfig="item" @detail="goDetail"></goodList>
-							<!-- 选项卡商品列表-->
-							<homeTab v-if="item.name == 'homeTab'" :dataConfig="item" @detail="goDetail"></homeTab>
-						</view>
-					</view>
-
-					<!-- 分类页-->
-					<view class="productList" v-if="navIndex === 1 && sortList.length>0">
-						<view class="sort acea-row" :class="sortList.length ? '' : 'no_pad'"
-							:style="{ marginTop: sortMarTop + 'px' }">
-							<navigator hover-class="none"
-								:url="'/pages/goods/goods_list/index?cid=' + item.id + '&title=' + item.name"
-								class="item" v-for="(item, index) in sortList" :key="index">
-								<view class="pictrue">
-									<image :src="item.icon" class='slide-image tui-skeleton-rect'></image>
-								</view>
-								<view class="text">{{ item.name }}</view>
-							</navigator>
-							<view class="item" @click="bindMore()" v-if="sortList.length >= 9">
-								<view class="pictrues acea-row row-center-wrapper">
-									<text class="iconfont icon-gengduo2"></text>
-								</view>
-								<view class="text">更多</view>
-							</view>
-						</view>
-					</view>
-					<!-- 推荐商品,分类商品列表-->
-					<recommend v-if="categoryId>0" ref="recommendIndex" :categoryId='categoryId'
-						:isShowTitle="isShowTitle" @getRecommendLength="getRecommendLength"></recommend>
-					<view class='noCommodity' v-if="isNoCommodity&& navIndex > 0">
-						<view class='pictrue'>
-							<image :src="urlDomain+'crmebimage/presets/noShopper.png'"></image>
-						</view>
-						<text class="text-ccc">暂无商品</text>
-					</view>
-				</view>
-
-
-				<!-- #ifdef MP -->
-				<aTip :isCustom="true" :text="wxText" :borderR="5"></aTip>
-				<!-- #endif -->
-			</view>
-		</view>
-		<!-- 断网内容 -->
-		<view v-else>
-			<view class="error-network">
-				<image class="img" src="./error-network.png"></image>
-				<view class="title">网络连接断开</view>
-				<view class="con">
-					<view class="label">请检查情况:</view>
-					<view class="item">· 在设置中是否已开启网络权限</view>
-					<view class="item">· 当前是否处于弱网环境</view>
-					<view class="item">· 版本是否过低,升级试试吧</view>
-				</view>
-				<view class="btn" @click="reconnect">重新连接</view>
-			</view>
-		</view>
-		<!-- 备案号、授权信息 -->
-		<!-- #ifdef H5 -->
-		<view v-show="globalData.authorizeFilingNum || globalData.authorizeInfo" class="mt-40 mb-40rpx">
-			<view @click="toInternet" class="text-center text-24rpx text--w111-666 mb-24">
-				{{globalData.authorizeFilingNum}}
-			</view>
-			<view class="text-center text-24rpx text--w111-666">{{globalData.authorizeInfo}}</view>
-		</view>
-		<!-- #endif -->
-
-		<!-- 底部导航距离,做兼容处理的-->
-		<view v-if="bottomNavigationIsCustom" class="footerBottom"></view>
-		<pageFooter></pageFooter>
-		<!-- 优惠券弹窗 -->
-		<coupon-dialog :urlDomain="urlDomain" v-if="couponModal" :couponModal="couponModal"
-			@on-close="closeDialog"></coupon-dialog>
-	</view>
-</template>
-
-<script>
-	// +----------------------------------------------------------------------
-	// | CRMEB [ CRMEB赋能开发者,助力企业发展 ]
-	// +----------------------------------------------------------------------
-	// | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
-	// +----------------------------------------------------------------------
-	// | Licensed CRMEB并不是自由软件,未经许可不能去掉CRMEB相关版权
-	// +----------------------------------------------------------------------
-	// | Author: CRMEB Team <admin@crmeb.com>
-	// +----------------------------------------------------------------------
-	import Cache from '../../../utils/cache.js';
-	import tuiSkeleton from '@/components/base/tui-skeleton.vue';
-	import liveBroadcast from '@/components/homeIndex/liveBroadcast';
-	import merchantList from '@/components/homeIndex/merchant.vue'
-	import homeComb from '@/components/homeIndex/homeComb';
-	import recommend from "@/components/base/recommend.vue";
-	import seckillData from "@/components/homeIndex/seckill.vue";
-	import aTip from './components/addTips.vue';
-	import couponDialog from "@/components/homeIndex/couponDialog.vue"
-	import coupon from "@/components/homeIndex/coupon.vue";
-	import menus from "@/components/homeIndex/menus.vue";
-	import pictureCube from '@/components/homeIndex/pictureCube'
-	import news from '@/components/homeIndex/news'
-	import goodList from '@/components/homeIndex/goodList'
-	import guide from '@/components/homeIndex/guide';
-	import articleList from '@/components/homeIndex/articleList'
-	import swiperBg from '@/components/homeIndex/swiperBg'
-	import headerSearch from '@/components/homeIndex/headerSearch';
-	import cateNav from '@/components/homeIndex/cateNav';
-	import richTextEditor from '@/components/homeIndex/richTextEditor';
-	import shortVideo from '@/components/homeIndex/video';
-	import homeTab from '@/components/homeIndex/homeTab';
-	import discover from '@/components/homeIndex/discover';
-	import blankPage from '@/components/homeIndex/blankPage';
-	import homeTitle from '@/components/homeIndex/title';
-	import hotSpot from '@/components/homeIndex/hotSpot.vue';
-	import group from "@/components/homeIndex/group.vue";
-	import pageFooter from "@/components/pageFooter/index.vue";
-	import intergralShop from "@/components/homeIndex/intergralShop.vue";
-	import {
-		getIndexData,
-		getAppVersion,
-		getCategoryThird,
-		getDiy
-	} from '@/api/api.js';
-	// #ifdef MP-WEIXIN || APP-PLUS
-	import {
-		getTemlIds
-	} from '@/api/api.js';
-	// #endif
-	import {
-		mapGetters
-	} from "vuex";
-	import {
-		silenceBindingSpread,
-	} from '@/utils/index.js';
-	import animationType from '@/utils/animationType.js'
-	import {
-		goProductDetail
-	} from "@/libs/order";
-	import onShare from "@/mixins/onShare";
-	const arrTemp = ["beforePay", "afterPay", "createBargain", "pink"];
-	var statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
-	let app = getApp();
-	export default {
-		mixins: [onShare],
-		computed: mapGetters(['isLogin', 'uid', 'globalData', 'bottomNavigationIsCustom']),
-		components: {
-			aTip,
-			merchantList,
-			homeComb,
-			recommend,
-			tuiSkeleton,
-			seckillData,
-			pageFooter,
-			liveBroadcast,
-			couponDialog,
-			coupon,
-			menus,
-			pictureCube,
-			news,
-			goodList,
-			articleList,
-			swiperBg,
-			headerSearch,
-			cateNav,
-			guide,
-			richTextEditor,
-			shortVideo,
-			homeTab,
-			discover,
-			blankPage,
-			homeTitle,
-			hotSpot,
-			group,
-			intergralShop
-		},
-		data() {
-			return {
-				urlDomain: this.$Cache.get("imgHost"),
-				isNoCommodity: false,
-				isScrolled: false, //是否开始滚动
-				categoryId: 0,
-				showSkeleton: true, //骨架屏显示隐藏
-				isNodes: 0, //控制什么时候开始抓取元素节点,只要数值改变就重新抓取
-				statusBarHeight: statusBarHeight,
-				navIndex: 0, //判断首页显示内容,1显示分类页和商品,0首页
-				listActive: 0, // 当前选中项
-				theme: app.globalData.theme,
-				imgHost: '', //图片域名地址
-				appUpdate: {},
-				wxText: "点击添加到我的小程序,微信首页下拉即可访问商城。",
-				locationContent: '授权位置信息,提供完整服务',
-				sortMpTop: 0,
-				// #ifdef APP-PLUS || MP
-				isFixed: true,
-				// #endif
-				// #ifdef H5
-				isFixed: false,
-				// #endif
-				domOffsetTop: 50,
-				sortList: [],
-				sortMarTop: 0,
-				domHeight: 0,
-				cateNavActive: 0,
-				couponModal: false,
-				styleConfig: [], //DIY数据
-				diyId: 0, //DIYID
-				homeCombData: {}, //组合组件数据
-				showCateNav: false, //是否显示分类导航组件
-				cateNavData: {}, //分类导航组件数据
-				showHomeComb: false, //是否显示组合
-				showHeaderSerch: false, //是否显示搜索框
-				headerSerchCombData: {}, //搜索框对象
-				isShowTitle: false, //是否显示头部标题,同时也判断是否展示分类下的商品列表
-				bgColor: '', //背景颜色
-				bgPic: '', //背景图片
-				bgTabVal: '', //背景图片样式
-				windowHeight: 0,
-				pageStyle: {},
-				isDefault: 1, //是否首页,1是,0不是
-				errorNetwork: false, //是否有网络
-				bgInfo: {
-					colorPicker: '#f5f5f5',
-					isBgColor: 1,
-				},
-				
-			}
-		},
-		//下拉刷新
-		onPullDownRefresh() {
-			// #ifdef APP-PLUS
-			setTimeout(() => {
-				uni.reLaunch({
-					url: "/pages/index/index"
-				});
-				uni.stopPullDownRefresh();
-			}, 1000)
-			// #endif
-		},
-		onLoad(options) {
-			// #ifdef APP-PLUS
-			//app刚进入检测有无网络
-			this.snycNetWork();
-			//APP版本检测
-			this.appVersionConfig();
-			// #endif
-
-			//获取浏览器id
-			this.getOptionData(options)
-
-			//首页数据加载
-			this.getIndexConfig();
-
-			let that = this;
-			this.$nextTick(function() {
-				uni.getSystemInfo({
-					success: function(res) {
-						that.windowHeight = res.windowHeight;
-					}
-				});
-			})
-			// #ifdef MP || APP-PLUS
-			// this.getTemlIds()
-			// #endif
-		},
-		onShow() {
-
-			let self = this;
-			// #ifdef APP-PLUS
-			setTimeout(() => {
-				if (self.appUpdate.openUpgrade == 'true') {
-					self.appVersionConfig();
-				}
-			}, 1000)
-			// #endif
-
-			//新人礼的展示判断
-			let newGift = self.$Cache.get('newGift') ? JSON.parse(self.$Cache.get('newGift')) : [];
-			self.couponModal = newGift.length ? true : false;
-		},
-		// 滚动监听
-		onPageScroll(e) {
-			// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
-			uni.$emit('scroll');
-			if (e.scrollTop > this.domOffsetTop) {
-				this.isScrolled = true;
-			}
-			if (e.scrollTop < this.domOffsetTop) {
-				this.$nextTick(() => {
-					this.isScrolled = false;
-				});
-			}
-		},
-		methods: {
-			//获取扫码或者浏览器传来的值
-			getOptionData(options) {
-				let diyid = 0;
-				if (options.hasOwnProperty('id') || options.scene) {
-					if (options.scene) { // 仅仅小程序扫码进入
-						let value = this.$util.getUrlParams(decodeURIComponent(options.scene));
-						this.$store.commit('Change_Spread', value.sd);
-						//分销绑定
-						silenceBindingSpread(this.isLogin, value.sd);
-						diyid = value.id ? value.id : 0;
-					} else {
-						diyid = options.id ? options.id : 0;
-						this.$store.commit('Change_Spread', options.sd);
-						//分销绑定
-						silenceBindingSpread(this.isLogin, options.sd);
-					}
-				}
-				//diy数据加载
-				this.diyData(diyid, false);
-			},
-			//备案授权跳转
-			toInternet() {
-				window.open('https://beian.miit.gov.cn/#/Integrated/index')
-			},
-			//app刚进入检测有无网络
-			snycNetWork() {
-				uni.getNetworkType({
-					success: res => {
-						//res.networkType === 'none'无网络
-						this.errorNetwork = res.networkType === 'none';
-						//如果没有网络,清除骨架屏
-						if (this.errorNetwork) this.reloadData();
-					}
-				});
-			},
-			// 断网后重新链接
-			reconnect() {
-				uni.getNetworkType({
-					success: res => {
-						this.errorNetwork = res.networkType === 'none';
-						if (!this.errorNetwork) {
-							setTimeout(() => {
-								uni.reLaunch({
-									url: "/pages/index/index"
-								});
-							}, 1000)
-						}
-					}
-				});
-			},
-			/**
-			 * 获取DIY
-			 * @param {number} id
-			 * @param {boolean} type 区分是否是微页面
-			 */
-			diyData(id, type) {
-				let that = this;
-				that.styleConfig = []
-				uni.showLoading({
-					title: '加载中...'
-				});
-				getDiy(id).then(res => {
-					that.errorNetwork = false;
-					uni.setNavigationBarTitle({
-						title: res.data.title
-					});
-					uni.setNavigationBarColor({
-						//必须要16进制小写
-						frontColor: res.data.titleColor,
-						backgroundColor: res.data.titleBgColor.toString().toLowerCase(),
-					})
-					let data = res.data;
-					that.diyId = res.data.id;
-					that.isDefault = data.isDefault; //是否是首页,1是,0不是
-					that.styleConfig = that.$util.objToArr(res.data.value);
-					this.bgInfo.isBgColor = data.isBgColor
-					this.bgInfo.colorPicker = data.colorPicker
-					that.pageStyle = {
-						'background-color': data.isBgColor === 1 ? res.data.colorPicker : '',
-						'background-image': data.isBgPic === 1 ? `url(${res.data.bgPic})` : '',
-						'background-repeat': res.data.bgTabVal === 1 ? 'repeat-y' : 'no-repeat',
-						'background-size': res.data.bgTabVal === 2 ? 'cover' : 'contain'
-					};
-					uni.hideLoading();
-					if (type) {
-						that.styleConfig.forEach((item) => {
-							if (item.name == 'headerSerch' || item.name == 'homeComb' || item.name ==
-								'tabNav') {
-								that.styleConfig.splice(index, 1);
-							}
-						});
-					} else {
-						that.styleConfig.forEach((item) => {
-							if (item.name === 'tabNav') {
-								that.showCateNav = true;
-								that.cateNavData = item;
-							}
-							if (item.name === 'homeComb') {
-								that.showHomeComb = true
-								that.homeCombData = item;
-							}
-							if (item.name === 'headerSerch') {
-								that.showHeaderSerch = true
-								that.headerSerchCombData = item;
-							}
-						});
-					}
-					setTimeout(() => {
-						that.isNodes++;
-					}, 100);
-				}).catch(err => {
-					return that.$util.Tips({
-						title: err
-					});
-					uni.hideLoading();
-				});
-			},
-			bindMore() {
-				uni.setStorageSync('cateNavActive', this.cateNavActive);
-				uni.setStorageSync('categoryId', this.categoryId);
-				uni.switchTab({
-					url: `/pages/goods_cate/index`
-				})
-			},
-			getRecommendLength(e) {
-				this.isNoCommodity = e == 0 ? true : false;
-			},
-			// 导航分类切换
-			changeTab(index, item) {
-				//type=0微页面,1分类,2首页
-				this.cateNavActive = index;
-				if (item.type == 1) {
-					this.navIndex = 1;
-					if (!item.val) {
-						this.sortList = [];
-						this.categoryId = 0;
-						this.$util.Tips({
-							title: "请在平台端选择商品分类!确保加载商品分类数据。"
-						});
-						return;
-					} else {
-						getCategoryThird(item.val).then(res => {
-							this.sortList = res.data;
-							// #ifdef H5
-							self.sortMarTop = 10;
-							// #endif
-						});
-						this.categoryId = item.val;
-						this.isShowTitle = false;
-					}
-				} else if (item.type == 0) {
-					this.navIndex = 0;
-					this.isShowTitle = true;
-					this.categoryId = 0;
-					if (!item.val) {
-						return this.$util.Tips({
-							title: "请在平台端选择微页面链接!确保加载微页面数据。"
-						});
-					} else {
-						this.styleConfig = [];
-						this.diyData(item.val, true);
-					}
-				} else {
-					this.categoryId = 0;
-					this.navIndex = 0;
-					this.styleConfig = [];
-					this.diyData(item.val, false);
-				}
-			},
-			toNewsList() {
-				uni.navigateTo({
-					animationType: animationType.type,
-					animationDuration: animationType.duration,
-					url: '/pages/goods/news_list/index'
-				})
-			},
-			//清除骨架屏
-			reloadData() {
-				this.showSkeleton = false;
-			},
-			getElementData(el, callback) {
-				uni.createSelectorQuery().in(this).selectAll(el).boundingClientRect().exec((data) => {
-					callback(data[0]);
-				});
-			},
-			xieyiApp() {
-				uni.navigateTo({
-					url: '/pages/users/web_page/index?webUel=https://admin.java.crmeb.net/useragreement/xieyi.html&title=协议内容'
-				})
-			},
-			// #ifdef APP-PLUS
-			xieyiApp() {
-				uni.navigateTo({
-					animationType: animationType.type,
-					animationDuration: animationType.duration,
-					url: '/pages/users/web_page/index?webUel=https://admin.java.crmeb.net/useragreement/xieyi.html&title=协议内容'
-				})
-			},
-			// #endif
-			// #ifdef MP || APP-PLUS
-			getTemlIds() {
-				for (var i in arrTemp) {
-					this.getTem(arrTemp[i]);
-				}
-			},
-			getTem(data) {
-				getTemlIds({
-					type: data
-				}).then(res => {
-					if (res.data) {
-						let arr = res.data.map((item) => {
-							return item.tempId
-						})
-						wx.setStorageSync('tempID' + data, arr);
-					}
-				});
-			},
-			// #endif
-			// 首页数据
-			getIndexConfig: function() {
-				let that = this;
-				getIndexData().then(res => {
-					let imgHost = res.data.logoUrl.split('crmebimage')[0];
-					that.imgHost = imgHost;
-					that.$Cache.set('imgHost', imgHost + '/');
-					// #ifdef H5 || APP-PLUS
-					that.$store.commit("SET_CHATURL", res.data.yzfUrl);
-					Cache.set('chatUrl', res.data.yzfUrl);
-					// #endif
-					Cache.setItem({
-						name: 'platChatConfig',
-						value: {
-							servicePhone: res.data.consumerHotline, //客服电话
-							serviceLink: res.data.consumerH5Url, //云智服
-							serviceType: res.data.consumerType //客服类型四选一
-						}
-					});
-					this.reloadData();
-				}).catch(err => {
-					return this.$util.Tips({
-						title: err
-					});
-				});
-			},
-			appVersionConfig() {
-				var that = this;
-				//app升级
-				// 获取本地应用资源版本号
-				getAppVersion().then(res => {
-					that.$set(that.appUpdate, 'androidAddress', res.data.androidAddress);
-					that.$set(that.appUpdate, 'appVersion', res.data.appVersion);
-					that.$set(that.appUpdate, 'iosAddress', res.data.iosAddress);
-					that.$set(that.appUpdate, 'openUpgrade', res.data.openUpgrade);
-					plus.runtime.getProperty(plus.runtime.appid, function(inf) {
-						let nowVersion = (inf.version).split('.').join('');
-						let appVersion = (res.data.appVersion).split('.').join('');
-						uni.getSystemInfo({
-							success: (res) => {
-								if (appVersion > nowVersion) {
-									uni.showModal({
-										title: '更新提示',
-										content: '发现新版本,是否前去下载?',
-										showCancel: that.appUpdate.openUpgrade == '1' ?
-											true : false,
-										cancelColor: '#eeeeee',
-										confirmColor: '#FF0000',
-										success(response) {
-											if (response.confirm) {
-												switch (res.platform) {
-													case "android":
-														plus.runtime.openURL(that
-															.appUpdate
-															.androidAddress);
-														break;
-													case "ios":
-														plus.runtime.openURL(encodeURI(
-															that.appUpdate
-															.iosAddress));
-														break;
-												}
-
-											}
-										}
-									});
-								}
-							}
-						})
-					});
-				})
-			},
-			// 微信分享;
-			setOpenShare: function(data) {
-				let that = this;
-				if (that.$wechat.isWeixin()) {
-					let configAppMessage = {
-						desc: this.globalData.companyName,
-						title: this.globalData.companyName,
-						link: location.href
-					};
-					that.$wechat.wechatEvevt(["updateAppMessageShareData", "updateTimelineShareData"],
-						configAppMessage);
-				}
-			},
-			stopTouchMove() {
-				return true //禁止新闻swiper手动滑动
-			},
-			closeDialog() {
-				this.couponModal = false;
-				this.$Cache.clear('newGift');
-			},
-			goDetail(item) {
-				goProductDetail(item.id, 0, '')
-			},
-		},
-		mounted() {
-			let query = uni.createSelectorQuery().in(this);
-			query.select("#home").boundingClientRect();
-			query.exec(res => {
-				this.domHeight = res[0].height;
-			})
-		},
-	}
-</script>
-<style>
-	page {
-		height: auto;
-		display: flex;
-		flex-direction: column;
-		height: 100%;
-		/* #ifdef H5 */
-		background-color: #fff;
-		/* #endif */
-
-	}
-</style>
-<style lang="scss" scoped>
-	.error-network {
-		position: fixed;
-		left: 0;
-		top: 0;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		width: 100%;
-		height: 100%;
-		padding-top: 40rpx;
-		background: #fff;
-		padding-top: 30%;
-
-		.img {
-			width: 414rpx;
-			height: 336rpx;
-		}
-
-		.title {
-			position: relative;
-			top: -40rpx;
-			font-size: 32rpx;
-			color: #666;
-		}
-
-		.con {
-			font-size: 24rpx;
-			color: #999;
-
-			.label {
-				margin-bottom: 20rpx;
-			}
-
-			.item {
-				margin-bottom: 20rpx;
-			}
-		}
-
-		.btn {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			width: 508rpx;
-			height: 86rpx;
-			margin-top: 100rpx;
-			border: 1px solid #d74432;
-			color: #e93323;
-			font-size: 30rpx;
-			border-radius: 120rpx;
-		}
-	}
-
-	.ysize {
-		background-size: 100%;
-	}
-
-	.fullsize {
-		background-size: 100% 100%;
-	}
-
-	.repeat {
-		background-repeat: repeat;
-	}
-
-	.noRepeat {
-		background-repeat: no-repeat;
-	}
-
-	.noCommodity {
-		margin-top: 30%;
-	}
-
-	.icon-gengduo1 {
-		color: #F8F8F8;
-	}
-
-	.pageIndex {
-		padding: 0 24rpx;
-	}
-
-	.productList {
-		background-color: #F5F5F5;
-		margin-top: 20rpx;
-
-		// min-height: 70vh;
-		.sort {
-			width: 710rpx;
-			max-height: 380rpx;
-			background: rgba(255, 255, 255, 1);
-			border-radius: 16rpx;
-			padding: 0rpx 0rpx 20rpx 0rpx !important;
-			flex-wrap: wrap;
-			margin: 25rpx auto 0 auto;
-
-			&.no_pad {
-				padding: 0;
-			}
-
-			.item {
-				width: 20%;
-				margin-top: 20rpx;
-				text-align: center;
-
-				.pictrues {
-					width: 90rpx;
-					height: 90rpx;
-					background: #F5F5F5;
-					border-radius: 50%;
-					margin: 0 auto;
-				}
-
-				.pictrue {
-					width: 90rpx;
-					height: 90rpx;
-					background: #F5F5F5;
-					border-radius: 50%;
-					margin: 0 auto;
-				}
-
-				.slide-image {
-					width: 90rpx;
-					height: 90rpx;
-					border-radius: 50%;
-					overflow: hidden;
-				}
-
-				/deep/ .easy-loadimage,
-				uni-image,
-				.easy-loadimage {
-					width: 90rpx;
-					height: 90rpx;
-					display: inline-block;
-				}
-
-				.text {
-					color: #272727;
-					font-size: 24rpx;
-					margin-top: 10rpx;
-					// overflow: hidden;
-					white-space: nowrap;
-					text-overflow: ellipsis;
-				}
-			}
-		}
-	}
-
-	.productList .list {
-		padding: 0 20rpx;
-	}
-
-	.productList .list.on {
-		background-color: #fff;
-		border-top: 1px solid #f6f6f6;
-	}
-
-	.productList .list .item {
-		width: 345rpx;
-		margin-top: 20rpx;
-		background-color: #fff;
-		border-radius: 10rpx;
-
-		.name {
-			display: flex;
-			align-items: center;
-
-			.name_text {
-				display: inline-block;
-				max-width: 200rpx;
-			}
-		}
-	}
-
-	.page-index {
-		display: flex;
-		flex-direction: column;
-		min-height: 100%;
-
-		.page_content {
-			overflow-x: hidden;
-
-			// background-color: #f5f5f5;
-			.swiper {
-				position: relative;
-				width: 100%;
-				height: 246rpx;
-				margin: 0 auto;
-				border-radius: 10rpx;
-				overflow: hidden;
-				margin-bottom: 25rpx;
-				/* #ifdef MP */
-				margin-top: 20rpx;
-
-				/* #endif */
-				swiper,
-				swiper-item,
-				.slide-image,
-				image {
-					width: 100%;
-					height: 246rpx;
-					border-radius: 10rpx;
-				}
-			}
-		}
-	}
-
-	.fixed {
-		z-index: 100;
-		position: fixed;
-		left: 0;
-		top: 0;
-		background: linear-gradient(90deg, red 50%, #ff5400 100%);
-
-	}
-
-	.menu-txt {
-		font-size: 24rpx;
-		color: #454545;
-	}
-</style>

+ 0 - 388
mer_uniapp/pages/new_pages/index/style/main.scss

@@ -1,388 +0,0 @@
-.main {
-	padding: 0 20rpx;
-}
-.spike-bd {
-	margin-bottom: 20rpx;
-	border-radius: 16rpx;
-	padding: 0 20rpx 0 10rpx;
-	display: flex;
-	position: relative;
-	justify-content: space-between;
-	.title-img{
-		width: 136rpx;
-		height: 36rpx;
-	}
-	.title {
-		font-weight: bold;
-		color: #282828;
-		font-size: 0;
-		.title-img{
-			width: 136rpx;
-			height: 36rpx;
-		}
-	}
-	.spike-distance {
-		margin-left: 15rpx;
-		position: relative;
-		top: 1.4rpx;
-		display: flex;
-		border: 1px solid #e93323;
-		border-radius: 4rpx;
-		height: 40rpx;
-		/*#ifdef MP*/
-		padding-left: 108rpx;
-		/*#endif*/
-		/*#ifndef MP*/
-		padding-left: 100rpx;
-		/*#endif*/
-		.bg-red {
-			font-size: 20rpx;
-			color: #fff;
-			background-color: #e93323;
-			padding: 0 10rpx;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			height: 110%;
-			position: absolute;
-			left: -1rpx;
-			top: -2rpx;
-			width: 100rpx;
-			border-radius: 4rpx 0 0 4rpx;
-		}
-		/deep/.time {
-			font-size: 22rpx;
-			color: #e93323;
-			align-items: center;
-			/deep/.red {
-				margin: 0;
-			}
-		}
-		.red-color {
-			color: #e93323;
-		}
-	}
-	.more-btn {
-		color: #282828;
-		font-size: 24rpx;
-		.iconfont {
-			font-size: 22rpx;
-		}
-	}
-}
-.colum0{
-	white-space: nowrap; 
-	display: flex;
-}
-.combination-item {
-	/* #ifdef MP  */
-	width: 294rpx;
-	height: 140rpx;
-	/* #endif */
-	/* #ifdef H5 || APP-PLUS */
-	width: 328rpx;
-	height: 180rpx;
-	/* #endif */
-	display: inline-block;
-	background-size: 100%;
-	position: relative;
-	background-repeat: no-repeat;
-	border-radius: 16rpx;
-	.img-box {
-		width: 122rpx;
-		height: 122rpx;
-		position: absolute;
-		/deep/image,/deep/.easy-loadimage,/deep/uni-image {
-			width: 122rpx;
-			height: 122rpx;
-		}
-	}
-	.name {
-		font-size: 30rpx;
-		color: #333333;
-		font-weight: bold;
-		line-height: 32rpx;
-	}
-	.price {
-		display: block;
-		font-size: 30rpx;
-		font-weight: bold;
-		margin-top: 8rpx;
-		color: #e93323;
-		text {
-			font-size: 20rpx;
-		}
-	}
-	.gocom_btn {
-		display: block;
-		margin-top: 6rpx;
-		color: #fff;
-		font-size: 22rpx;
-		font-weight: bold;
-		width: 100rpx;
-		line-height: 30rpx;
-		text-align: center;
-		border-radius: 16rpx;
-		text {
-			font-weight: normal;
-			font-size: 16rpx;
-		}
-	}
-	&:nth-child(1) {
-		/* #ifdef MP  */
-		height: 336rpx;
-		/* #endif */
-		/* #ifdef H5 || APP-PLUS */
-		height: 378rpx;
-		/* #endif */
-		padding: 20rpx 20rpx 28rpx;
-		float: left;
-		.img-box {
-			width: 210rpx;
-			height: 210rpx;
-			right: 18rpx;
-			bottom: 18rpx;
-			/deep/image,/deep/.easy-loadimage,/deep/uni-image {
-				width: 210rpx;
-				height: 210rpx;
-			}
-		}
-		.gocom_btn {
-			background: linear-gradient(90deg, #fd5d48 0%, #f63724 100%);
-		}
-	}
-	&:nth-child(2),
-	&:nth-child(3) {
-		float: right;
-		padding: 20rpx 18rpx;
-		.name {
-			width: 148rpx;
-		}
-		.img-box {
-			right: 14rpx;
-			bottom: 14rpx;
-			/deep/image,/deep/.easy-loadimage,/deep/uni-image{
-				width: 122rpx;
-				height: 122rpx;
-			}
-		}
-	}
-	&:nth-child(2) {
-		.gocom_btn {
-			background: linear-gradient(90deg, #fdca1a 0%, #f7b21f 100%);
-		}
-	}
-	&:nth-child(3) {
-		margin-top: 18rpx;
-		.img-box {
-			right: 14rpx;
-			bottom: 14rpx;
-		}
-		.gocom_btn {
-			background: linear-gradient(90deg, #ffb052 0%, #fe961a 100%);
-		}
-	}
-}
-.spike-wrapper {
-	width: 100%;
-	&.wrapper2{
-		overflow: hidden;
-	}
-	.spike-item {
-		display: inline-block;
-		width: 222rpx;
-		margin: 0 20rpx 20rpx 0;
-		&.presell-item {
-			width: 210rpx;
-			.img-box {
-				height: 210rpx;
-				/deep/image,/deep/.easy-loadimage,uni-image{
-					height: 210rpx;
-				}
-			}
-			.name {
-				margin-top: 8rpx;
-				color: #282828;
-			}
-		}
-		&.assist-item {
-			box-shadow: 0px 2px 20px 0px rgba(0, 0, 0, 0.08);
-		}
-		.img-box {
-			position: relative;
-			height: 222rpx;
-			.participants {
-				padding: 4rpx 12rpx;
-				border-radius: 16rpx;
-				background: rgba(0, 0, 0, 0.35);
-				color: #fff;
-				text-align: center;
-				position: absolute;
-				top: 10rpx;
-				left: 10rpx;
-				font-size: 20rpx;
-			}
-			/deep/image,/deep/.easy-loadimage,uni-image {
-				width: 100%;
-				height: 222rpx;
-				border-radius: 16rpx;
-			}		
-			.box_bg {
-				position: absolute;
-				bottom: 0;
-				left: 0;
-				text-align: center;
-				width: 149rpx;
-				height: 42rpx;
-				line-height: 42rpx;
-				background-repeat: no-repeat;
-				background-size: cover;
-				color: #fff;
-				font-size: 22rpx;
-			}
-			.msg {
-				position: absolute;
-				left: 10rpx;
-				bottom: 16rpx;
-				width: 86rpx;
-				height: 30rpx;
-				background: rgba(255, 255, 255, 1);
-				border: 1px solid rgba(255, 109, 96, 1);
-				border-radius: 6rpx;
-				font-size: 20rpx;
-				color: $theme-color;
-			}
-		}
-		/deep/.img-box0 image,/deep/.img-box0 .easy-loadimage,/deep/.img-box0 uni-image  {
-				border-radius: 0;	
-		}
-		.info {
-			margin-top: 10rpx;
-			.name {
-				font-size: 26rpx;
-			}
-			.stock-box {
-				width: 100%;
-				height: 20rpx;
-				background-color: #ffdcd9;
-				border-radius: 20rpx;
-				margin-top: 13rpx;
-				position: relative;
-				color: #fff;
-				font-size: 18rpx;
-				line-height: 20rpx;
-				text-align: center;
-				overflow: hidden;
-				.grabbed {
-					height: 20rpx;
-					background: linear-gradient(#ff0000, #ff5400);
-					position: absolute;
-					top: 0;
-					left: 0;
-					border-radius: 20rpx;
-				}
-				.stock-sales {
-					position: absolute;
-					left: 50%;
-					margin-left: -40rpx;
-				}
-			}
-			.price-box {
-				display: flex;
-				align-items: center;
-				justify-content: start;
-				margin-top: 4rpx;
-				&.presell-price {
-					display: block;
-					.old-price {
-						display: block;
-						margin: 6rpx 0 0 0;
-					}
-				}
-				.tips {
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					width: 28rpx;
-					height: 28rpx;
-					background-color: $theme-color;
-					color: #fff;
-					font-size: 20rpx;
-					border-radius: 2px;
-				}
-				.price {
-					display: flex;
-					color: $theme-color;
-					font-size: 28rpx;
-					font-weight: bold;
-					text {
-						font-size: 18rpx;
-					}
-				}
-				.old-price {
-					display: flex;
-					margin-left: 10rpx;
-					color: #aaaaaa;
-					text-decoration: line-through;
-					font-size: 20rpx;
-					text {
-						font-size: 18rpx;
-					}
-				}
-			}
-		}
-		.assist-info {
-			.price {
-				display: flex;
-				color: $theme-color;
-				font-size: 28rpx;
-				font-weight: bold;
-				margin-top: 8rpx;
-				text {
-					font-size: 18rpx;
-				}
-				.assist_price {
-					font-size: 20rpx;
-					display: inline-block;
-					width: 82rpx;
-					height: 32rpx;
-					text-align: center;
-					line-height: 30rpx;
-					background: #ffeae5;
-					border-radius: 4rpx;
-				}
-			}
-			&.assist-info1{
-				padding-bottom: 20rpx;
-			}
-			.price-box {
-				padding: 15rpx 15rpx 8rpx;
-				.name {
-					font-size: 24rpx;
-					color: #333;
-					line-height: 30rpx;
-				}
-			}
-			.initiate_btn {
-				width: 100%;
-				height: 48rpx;
-				line-height: 48rpx;
-				background: linear-gradient(90deg, #ff0000 0%, #ff5400 100%);
-				text-align: center;
-				color: #fff;
-				font-size: 24rpx;
-				border-radius: 0 0 16rpx 16rpx;
-				margin: 0 auto;
-				&.initiate_btn1{
-					width: 90%;
-					border-radius: 24rpx;
-				}
-			}
-		}
-	}
-	&.wrapper1{
-		.spike-item{
-			width: 210rpx;	
-		}
-	}
-}

+ 1 - 1
mer_uniapp/pages/trade_fair/home/index.vue

@@ -107,7 +107,7 @@
 		<uni-popup ref="schoolRef" :is-mask-click="false">
 			<view class="w-full flex-center" :style="{height: windowHeight + 'px'}">
 				<navigator hover-class='none' url='/pages/trade_fair/trade_fair_user/index'>
-					<image src="/static/img/ic-school.png" mode="heightFix" style="height: 694rpx;width: 616rpx;"></image>
+					<image src="http://39.105.58.247:20800/crmebimage/public/store/2025/05/20/ac4f4703de5d4a8c9490e7e27c9f25b8pzzy4l1ywq.png" mode="heightFix" style="height: 694rpx;width: 616rpx;"></image>
 				</navigator>
 			</view>
 		</uni-popup>

+ 1 - 1
mer_uniapp/pages/users/user_rider/index.vue

@@ -10,7 +10,7 @@
 		<form @submit="formSubmit">
 			<view class="merchantsSettled">
 				<view class="merchantBg">
-					<image class="bag" src="/static/img/rider.jpg" alt="" srcset="" />
+					<image class="bag" src="http://39.105.58.247:20800/crmebimage/public/store/2025/05/20/bef91c7e7e5c45438256b775a555abd77fj8l44tr6.png" alt="" srcset="" />
 				</view>
 				<view class="list">
 					<view style="padding: 21rpx 0 86rpx 39rpx;">

BIN
mer_uniapp/static/img/ic-bg-settled.png


BIN
mer_uniapp/static/img/ic-school.png


BIN
mer_uniapp/static/img/rider.jpg