1

App.vue

@@ -197,7 +197,9 @@
 					this.globalData.community_reply_auth = res.data.community_reply_auth
 					this.globalData.margin_ico_switch = res.data.margin_ico_switch
 					this.globalData.margin_ico = res.data.margin_ico
-					this.$store.commit("VIEW_COLOR", res.data.global_theme.theme)
+					// this.$store.commit("VIEW_COLOR", res.data.global_theme.theme)
+					let topicColor = '--view-theme: #116636;--view-assist:#FE960F;--view-priceColor:#FE960F;--view-bgColor:rgba(254, 150, 15,.1);--view-minorColor:rgba(66, 202, 77,.1);--view-bntColor11:#FDBA00;--view-bntColor12:#FFAA00;--view-bntColor21:#42CA4D;--view-bntColor22:#70E038;'
+					this.$store.commit("VIEW_COLOR", topicColor)
 					this.$store.commit("KEY_COLOR",'_' + res.data.global_theme.type)
 					try {
 						uni.setStorageSync('SUBSCRIBE_MESSAGE', res.data.tempid);

pages.json

@@ -34,12 +34,9 @@
 			}
 		},
 		{
-			"path": "pages/goods_details/index",
+			"path": "pages/auth/index",
 			"style": {
-				// #ifdef MP || APP-PLUS
-					
-				"navigationBarBackgroundColor": "#F2F2F2"
-				// #endif
+				"navigationBarTitleText": "加载中"
 			}
 		},
 		{
@@ -48,18 +45,6 @@
 				"navigationBarTitleText": "商品分类"
 			}
 		},
-		{
-			"path": "pages/news_details/index",
-			"style": {
-				"navigationBarTitleText": "资讯详情"
-			}
-		},
-		{
-			"path": "pages/auth/index",
-			"style": {
-				"navigationBarTitleText": "加载中"
-			}
-		},
 		{
 			"path": "pages/order_pay_status/index",
 			"style": {
@@ -93,6 +78,34 @@
 				}
 			]
 		},
+		{
+			"root": "pages/goods_details",
+			"name": "goods_details",
+			"pages": [
+				{
+					"path": "index",
+					"style": {
+						// #ifdef MP || APP-PLUS
+							
+						"navigationBarBackgroundColor": "#F2F2F2"
+						// #endif
+					}
+				}
+			]
+		},
+		
+		{
+			"root": "pages/news_details",
+			"name": "news_details",
+			"pages": [
+				{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "资讯详情"
+					}
+				}
+			]
+		},
 		
 		{
 			"root": "pages/order_details",
@@ -1130,38 +1143,38 @@
 		//#endif
 	},
 	"tabBar": {
-		"color": "#282828",
-		"selectedColor": "#E93323",
+		"color": "#999999",
+		"selectedColor": "#116636",
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
 		"list": [{
 				"pagePath": "pages/index/index",
-				"iconPath": "static/images/1-001.png",
-				"selectedIconPath": "static/images/1-002.png",
+				"iconPath": "static/images/n1.png",
+				"selectedIconPath": "static/images/n11.png",
 				"text": "首页"
 			},
 			{
 				"pagePath": "pages/goods_cate/goods_cate",
-				"iconPath": "static/images/2-001.png",
-				"selectedIconPath": "static/images/2-002.png",
-				"text": "分类"
+				"iconPath": "static/images/n2.png",
+				"selectedIconPath": "static/images/n22.png",
+				"text": "直营店"
 			},
 			{
 				"pagePath": "pages/plant_grass/index",
-				"iconPath": "static/images/5-001.png",
-				"selectedIconPath": "static/images/5-002.png",
-				"text": "逛逛"
+				"iconPath": "static/images/n3.png",
+				"selectedIconPath": "static/images/n33.png",
+				"text": "联盟店"
 			},
 			{
 				"pagePath": "pages/order_addcart/order_addcart",
-				"iconPath": "static/images/3-001.png",
-				"selectedIconPath": "static/images/3-002.png",
+				"iconPath": "static/images/n4.png",
+				"selectedIconPath": "static/images/n44.png",
 				"text": "购物车"
 			},
 			{
 				"pagePath": "pages/user/index",
-				"iconPath": "static/images/4-001.png",
-				"selectedIconPath": "static/images/4-002.png",
+				"iconPath": "static/images/n5.png",
+				"selectedIconPath": "static/images/n55.png",
 				"text": "我的"
 			}
 		]

pages/index/component/goodList.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="index-product-wrapper" :style="{ marginTop: mbConfig + 'rpx', background: themeColor,borderRadius: bgStyle+'rpx'}" v-if="tempArr.length">
+	<view class="index-product-wrapper" :style="{ marginTop: mbConfig + 'rpx',borderRadius: bgStyle+'rpx'}" v-if="tempArr.length">
 		<!-- 单列 -->
 		<block v-if="itemStyle == 0">	
 			<view class="list-box animated listA" :class="tempArr.length > 0 ? 'fadeIn on' : ''">
@@ -169,15 +169,18 @@ export default {
 
 <style lang="scss" scoped>
 .index-product-wrapper {
-	margin: 30rpx 20rpx 0 20rpx;
+	// margin: 30rpx 20rpx 0 20rpx;
+	margin: 0rpx 24rpx 0 24rpx;
 	.list-box {
 		display: flex;
 		flex-wrap: wrap;
 		justify-content: space-between;
-		padding: 20rpx 20rpx 0;
+		// padding: 20rpx 20rpx 0;
 		.item {
-			width: 328rpx;
+			// width: 328rpx;
+			width: calc(50% - 11rpx);
 			margin-bottom: 20rpx;
+			background: #fff;
 			overflow: hidden;
 			position: relative;
 			&.on {

pages/index/component/headerSerch.vue

@@ -1,6 +1,6 @@
 <template>
 	<!-- #ifdef H5 -->
-	<view class="header" :style="'background:  '+ bgColor +' ;margin-top:'+ mbConfig +'rpx;'">
+	<view class="header" :style="'margin-top:'+ mbConfig +'rpx;'">
 		<view class="serch-wrapper acea-row row-between-wrapper" :style="'padding-left:'+prConfig+'rpx;'">
 			<view v-if="logoConfig" class="logo skeleton-rect">
 				<image :src="logoConfig" mode=""></image>
@@ -19,17 +19,35 @@
 	<!-- #endif -->
 	<!-- #ifdef MP || APP-PLUS -->	
 	<view>		
-		<view class="mp-header" :style="'background: '+ bgColor +' ;margin-top:'+ mbConfig +'rpx;'">
+	<!-- :style="'margin-top:'+ mbConfig +'rpx;'" -->
+		<view class="mp-header" >
 			<view class="sys-head skeleton-rect" :style="{ height: statusBarHeight }"></view>
-			<view class="serch-box skeleton-rect" style="height: 43px;">
-				<view class="serch-wrapper flex" :style="'padding-left:'+prConfig+'rpx;'">
+			<view class="serch-box skeleton-rect" style="height: 43px;display: flex;justify-content: space-between;align-items: center;min-width: 550rpx;max-width: 550rpx;">
+				<!-- <view class="serch-wrapper flex" :style="'padding-left:'+prConfig+'rpx;'">
 					<view v-if="logoConfig" class="logo skeleton-rect"><image :src="logoConfig" mode=""></image></view>
 					<navigator :url="merId ? '/pages/store/list/index?mer_id='+merId : '/pages/columnGoods/goods_search/index'" :class="logoConfig ? 'input' : 'uninput'" 
 					hover-class="none" class="skeleton-rect box" :style="'border-radius:'+boxStyle+'rpx;text-align:'+txtStyle">
 						<text class="iconfont icon-xiazai5"></text>
 						搜索商品
 					</navigator>
+				</view> -->
+				<view class="indexTitle">
+					惠通商城
 				</view>
+				<image src="/static/images/xiaoxi.png" mode="" class="xiaoxi"></image>
+			</view>
+			<view class="serch-box skeleton-rect" style="height: 110rpx;">
+				<view class="serch-wrapper flex">
+					<view v-if="logoConfig" class="logo skeleton-rect"><image :src="logoConfig" mode=""></image></view>
+					<navigator :url="merId ? '/pages/store/list/index?mer_id='+merId : '/pages/columnGoods/goods_search/index'" :class="logoConfig ? 'input' : 'uninput'" 
+					hover-class="none" class="skeleton-rect box" :style="'border-radius:'+'80'+'rpx;text-align:'+txtStyle">
+						<text class="iconfont icon-xiazai5"></text>
+						搜索商品
+					</navigator>
+					<view class="searchBtn">搜索</view>
+				</view>
+				
+			
 			</view>
 		</view>
 		<view :style="'height:'+marTop+'px;'"></view>
@@ -135,7 +153,7 @@
 			height: 42rpx;
 		}
 		.input,.uninput {
-			line-height: 64rpx;
+			line-height: 80rpx;
 			padding: 0 0 0 30rpx;
 			background: rgba(237, 237, 237, 1);
 			border: 1px solid rgba(241, 241, 241, 1);
@@ -157,11 +175,27 @@
 		/* #ifdef H5 */
 		padding-bottom: 20rpx;
 		/* #endif */
-		background-color: #fff;
+		// background-color: #fff;
+		background-size: cover;
+		background-image: url(http://b2.njrenzhou.com/uploads/def/20240314/ebc9ea0e40ac396e6c768d56fd3a1a36.png);
+		// margin-bottom: 24rpx;
+		.indexTitle{
+			margin:0 24rpx;
+			font-family: Alibaba PuHuiTi;
+			font-weight: bold;
+			font-size: 36rpx;
+			color: #222222;
+		}
+		.xiaoxi{
+			width:44rpx;
+			height:44rpx;
+		}
 		.serch-wrapper {
 			height: 100%;
 			align-items: center;
-			padding: 0 50rpx 0 53rpx;
+			// padding: 0 50rpx 0 53rpx;
+			padding: 0 24rpx;
+			position: relative;
 			image {
 				width: 118rpx;
 				height: 42rpx;
@@ -177,7 +211,7 @@
 				flex: 1;
 				width: 500rpx;
 				/* #endif */
-				height: 58rpx;
+				height: 80rpx;
 				padding: 0 0 0 30rpx;
 				background: rgba(247, 247, 247, 1);
 				border: 1px solid rgba(241, 241, 241, 1);
@@ -190,11 +224,27 @@
 			}
 			.uninput {
 				/* #ifdef MP */
-				min-width: 450rpx;
-				max-width: 480rpx;
+				// min-width: 450rpx;
+				// max-width: 480rpx;
+				width: 100%;
 				/* #endif*/
 			}
 		}
+		.searchBtn{
+			position: absolute;
+			z-index:2;
+			width: 120rpx;
+			height: 66rpx;
+			background: linear-gradient(0deg, #89B929, #116636);
+			border-radius: 33px;
+			font-family: Alibaba PuHuiTi;
+			font-weight: 400;
+			font-size: 28rpx;
+			line-height: 66rpx;
+			text-align: center;
+			color: #FFFFFF;
+			right: 31rpx;
+		}
 	}
 /* #endif */
 </style>

pages/index/component/pictureCube.vue

@@ -137,6 +137,9 @@
 </script>
 
 <style lang="scss" scoped>
+	.acea-row{
+		justify-content: space-between;
+	}
 	 .pageOn{
 			border-radius:24rpx!important;
 			.advertItem01{
@@ -258,7 +261,8 @@
 		.advertItem02{
 			width: 100%;
 			.item{
-				width: 50%;
+				// width: 50%;
+				width:48%;
 				height: auto;
 				image{
 					width: 100%;

pages/index/component/swiperBg.vue

@@ -1,5 +1,6 @@
 <template>
-	<view class="swiperBg" :style="'margin-top:' + marginTop +'rpx;background: linear-gradient(180deg, '+ bgColor0 +' 50%, '+ bgColor1 +' 100%);'">
+	<!-- :style="'margin-top:' + marginTop +'rpx;'" -->
+	<view class="swiperBg" style="margin-top:-2rpx;">
 		<!-- 单图模式 -->
 		<block v-if="swiperType == 0">
 			<view class="item-img" v-for="(item,index) in imgUrls" :key="index" :style="{padding:'0 '+paddinglr+'rpx',marginBottom:itemEdge+'rpx'}">
@@ -130,8 +131,14 @@
 <style lang="scss" scoped>
 	.swiperBg {
 		position: relative;
-		background: #fff;
+		// background: #fff;
+		background-image: url(http://b2.njrenzhou.com/uploads/def/20240314/ebc9ea0e40ac396e6c768d56fd3a1a36.png);
 		z-index: 1;
+		background-size: cover;
+		background-position: bottom;
+		margin-top: -1px;
+		padding-bottom: 30rpx;
+		padding-top: 10rpx;
 		.colorBg {
 			position: absolute;
 			left: 0;

pages/index/index.vue

@@ -92,7 +92,7 @@
 						<!-- 首页推荐 -->
 						<view class="index-product-wrapper">
 							<!-- 首发新品 -->
-							<recommend v-if="recommend_switch == 1" :hostProduct="hostProduct" :indexP="true" :isLogin="isLogin"></recommend>
+							<!-- <recommend v-if="recommend_switch == 1" :hostProduct="hostProduct" :indexP="true" :isLogin="isLogin"></recommend> -->
 							<view class="loadingicon acea-row row-center-wrapper" v-if="hostProduct.length > 0">
 								<text class="loading iconfont icon-jiazai" :hidden="hotLoading == false"></text>
 								{{ hotTitle }}

pages/order_addcart/order_addcart.vue

@@ -107,7 +107,9 @@
 					</view>
 				</view>
 				<view class='money acea-row row-middle' v-if="footerswitch==true">
-					<text class='t-color'>￥{{selectCountPrice}}</text>
+					<text style="color:#E53623;font-size:26rpx;">
+						<text style="font-size: 28rpx;color: #333333;">合计：</text>
+						￥{{selectCountPrice}}</text>
 					<form @submit="subOrder" report-submit='true'>
 						<button class='placeOrder' formType="submit">去结算</button>
 					</form>
@@ -952,7 +954,7 @@
 					margin: 0 0 0 10rpx;
 					font-size: 28rpx;
 					color: #282828;
-					font-weight: bold;
+					// font-weight: bold;
 				}
 				.icon-xiangyou {
 					margin-top: 6rpx;
@@ -1032,6 +1034,7 @@
 		font-size: 32rpx;
 		color: #282828;
 		margin-top: 28rpx;
+		font-weight: bold;
 	}
 	.shoppingCart .list .item .picTxt .carnum {
 		height: 47rpx;
@@ -1157,13 +1160,13 @@
 	.shoppingCart .footer .placeOrder {
 		color: #fff;
 		font-size: 30rpx;
-		width: 226rpx;
-		height: 70rpx;
+		width: 186rpx;
+		height: 77rpx;
 		border-radius: 50rpx;
 		text-align: center;
-		line-height: 70rpx;
+		line-height: 77rpx;
 		margin-left: 22rpx;
-		background-color: var(--view-theme);
+		background: $btn-color;
 	}
 	.shoppingCart .footer .button .bnt {
 		font-size: 28rpx;