提交

env.js

@@ -9,7 +9,7 @@ export const BASE_URL = 'https://fx.njrenzhou.cn'
 export const API_URL = `${BASE_URL}/addons/shopro/`
 
 // 全局网络图片地址变量，css背景图片地址变量在uni.scss中定义
-export const IMG_URL = 'https://file.shopro.top'
+export const IMG_URL = 'https://fx.njrenzhou.cn'
 
 //高德地图开发者Web服务key,逆坐标解析必须
 export const MAP_KEY = '265849207*********39753dc'

pages.json

@@ -273,7 +273,9 @@
 				{
 					"path": "merchant/detail",
 					"style": {
-						"navigationBarTitleText": "订单详情"
+						"navigationBarTitleText": "订单详情",
+						"navigationBarBackgroundColor": "#21222B",
+						"navigationBarTextStyle": "white"
 					},
 					"meta": {
 						"auth": true,
@@ -521,7 +523,9 @@
 				{
 					"path": "list",
 					"style": {
-						"navigationBarTitleText": "订单列表"
+						"navigationBarTitleText": "订单列表",
+						"navigationBarBackgroundColor": "#21222B",
+						"navigationBarTextStyle": "white"
 					},
 					"meta": {
 						"auth": true,
@@ -650,7 +654,10 @@
 			"pages": [{
 					"path": "faq",
 					"style": {
-						"navigationBarTitleText": "常见问题"
+						"navigationBarTitleText": "常见问题",
+						"navigationBarBackgroundColor": "#21222B",
+						"navigationBarTextStyle": "white"
+						
 					},
 					"meta": {
 						"auth": false,

pages/app/commission/index.vue

@@ -210,43 +210,44 @@ export default {
 			menuList: [
 				//menu
 				{
-					img: this.$IMG_URL + '/imgs/commission/commission_icon1.png',
+					// img: this.$IMG_URL + '/imgs/commission/commission_icon1.png',
+					img: '/static/images/f1.png',
 					title: '我的团队',
 					path: '/pages/app/commission/team'
 				},
 				{
-					img: this.$IMG_URL + '/imgs/commission/commission_icon2.png',
+					img: '/static/images/f2.png',
 					title: '佣金明细',
 					path: '/pages/app/commission/commission-log'
 				},
 				{
-					img: this.$IMG_URL + '/imgs/commission/commission_icon3.png',
+					img: '/static/images/f3.png',
 					title: '分销订单',
 					path: '/pages/app/commission/order'
 				},
 				{
-					img: this.$IMG_URL + '/imgs/commission/commission_icon4.png',
+					img: '/static/images/f4.png',
 					title: '推广商品',
 					path: '/pages/app/commission/goods'
 				},
+				// {
+				// 	img: '/static/images/f5.png',
+				// 	title: '我的资料',
+				// 	path: '/pages/app/commission/apply',
+				// 	isAgentFrom: true
+				// },
+				// {
+				// 	img: this.$IMG_URL + '/imgs/commission/commission_icon6.png',
+				// 	title: '分销排行',
+				// 	path: '/pages/app/commission/rankings'
+				// },
 				{
-					img: this.$IMG_URL + '/imgs/commission/commission_icon5.png',
+					img: '/static/images/f5.png',
-					title: '我的资料',
-					path: '/pages/app/commission/apply',
-					isAgentFrom: true
-				},
-				{
-					img: this.$IMG_URL + '/imgs/commission/commission_icon6.png',
-					title: '分销排行',
-					path: '/pages/app/commission/rankings'
-				},
-				{
-					img: this.$IMG_URL + '/imgs/commission/commission_icon7.png',
 					title: '邀请海报',
 					path: ''
 				},
 				{
-					img: this.$IMG_URL + '/imgs/commission/commission_icon8.png',
+					img: '/static/images/f6.png',
 					title: '分享记录',
 					path: '/pages/app/commission/share-log'
 				}
@@ -470,7 +471,7 @@ export default {
 
 <style lang="scss" scoped>
 .commission-wrap {
-	background: url($IMG_URL+'/imgs/commission/commission_bg1.jpg') no-repeat;
+	// background: url($IMG_URL+'/imgs/commission/commission_bg1.jpg') no-repeat;
 	background-size: cover;
 	height: 100%;
 	width: 100%;
@@ -694,7 +695,7 @@ export default {
 	min-height: 350rpx;
 	border-radius: 14rpx;
 	margin: 30rpx;
-	background: url($IMG_URL+'/imgs/commission/commission_card_bg.png') no-repeat;
+	background: url('/static/images/bg.png') no-repeat;
 	background-size: 100% 100%;
 	padding-top: 10rpx;
 	.card-top {
@@ -709,17 +710,17 @@ export default {
 			margin-bottom: 20rpx;
 		}
 		.log-btn {
-			width: 83rpx;
+			width: 86rpx;
-			line-height: 41rpx;
+			line-height: 43rpx;
 			border: 1rpx solid rgba(#ffffff, 0.33);
 			border-radius: 21rpx;
-			font-size: 22rpx;
+			font-size: 24rpx;
 			font-weight: 400;
-			color: #ffffff;
+			color: #030300;
 		}
 		.look-btn {
-			color: #fff;
+			color: #030300;
-			font-size: 40rpx;
+			font-size: 24rpx;
 		}
 	}
 	.head-img-box {
@@ -765,17 +766,19 @@ export default {
 	.card-bottom {
 		margin: 0 40rpx 40rpx;
 		.item-title {
-			font-size: 24rpx;
+			
-
+			font-size: 24upx;
+			font-family: Alibaba PuHuiTi;
 			font-weight: 400;
-			color: #ffffff;
+			color: #030300;
+			
 			line-height: 30rpx;
 		}
 		.item-detail {
-			font-size: 40rpx;
+			font-size: 48upx;
 			font-family: DIN;
 			font-weight: 500;
-			color: #fefefe;
+			color: #030300;
 			line-height: 30rpx;
 			margin-top: 30rpx;
 		}
@@ -791,10 +794,11 @@ export default {
 		.log-item-box {
 			height: 78rpx;
 			.log-time {
+				font-size: 26rpx;
+				font-family: Alibaba PuHuiTi;
+				font-weight: 400;
+				color: #808292;
 				margin-left: 30rpx;
-				font-size: 22rpx;
-				font-weight: 500;
-				color: #fefefe;
 				text-align: right;
 			}
 		}
@@ -808,15 +812,16 @@ export default {
 			padding-left: 6rpx;
 			padding-right: 20rpx;
 			.log-img {
-				width: 40rpx;
+				width: 60rpx;
-				height: 40rpx;
+				height: 60rpx;
 				border-radius: 50%;
 				margin-right: 10rpx;
 			}
 			.log-text {
-				font-size: 22rpx;
+				font-size: 26upx;
-				font-weight: 500;
+				font-family: Alibaba PuHuiTi;
-				color: #fefefe;
+				font-weight: 400;
+				color: #808292;
 				max-width: 480rpx;
 			}
 		}

pages/index/components/sh-grid.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="grid-wap u-m-b-10 u-flex u-flex-wrap u-col-center" v-if="list.length">
+	<view class="grid-wap u-m-b-20 u-flex u-flex-wrap u-col-center" v-if="list.length">
 		<view class="grid-item u-flex-col u-row-center u-col-center" v-for="(menu, index) in list" :key="index" @tap="jump(menu)">
 			<image class="tool-img" :src="menu.image" mode="aspectFill"></image>
 			<view class="item-title">{{ menu.name }}</view>
@@ -38,8 +38,9 @@ export default {
 <style lang="scss">
 // 宫格
 .grid-wap {
-	background: #fff;
+	background: #FFFFFF;
-	width: 750rpx;
+	border-radius: 20upx;
+	
 	padding: 30rpx 0 0;
 	.grid-item {
 		width: 25%;

pages/index/components/sh-order-card.vue

@@ -1,17 +1,17 @@
 <template>
 	<!-- 订单卡片 -->
-	<view class="sh-order-box u-flex u-m-b-10 u-p-r-20">
+	<view class="sh-order-box u-flex u-m-b-20 u-p-r-20">
 		<view class="order-box u-flex">
 			<view class="order-item u-flex-col " @tap="jump('/pages/order/list', { type: order.type })" v-for="order in orderNav" :key="order.id">
 				<view class="u-flex-col item-box u-col-center">
-					<image class="order-img" :src="$IMG_URL + order.img" mode=""></image>
+					<image class="order-img" :src="order.img" mode=""></image>
 					<text class="item-title">{{ order.title }}</text>
 					<view class="badge" v-if="orderNum && orderNum[order.type]">{{ orderNum[order.type] }}</view>
 				</view>
 			</view>
 			<view class="order-item u-flex-col " @tap="jump('/pages/order/after-sale/list')">
 				<view class="u-flex-col item-box u-col-center">
-					<image class="order-img" :src="$IMG_URL + '/imgs/user/tab55.png'" mode=""></image>
+					<image class="order-img" :src="'/static/images/tab4.png'" mode=""></image>
 					<text class="item-title">退换货</text>
 				</view>
 			</view>
@@ -20,7 +20,7 @@
 		<view class="order-item u-flex-col all-order " @tap="jump('/pages/order/list', { type: 'all' })">
 			<image class="cut-off--line" :src="$IMG_URL + '/imgs/user/cut_off_line.png'" mode=""></image>
 			<view class="u-flex-col item-box u-col-center">
-				<image class="order-img" :src="$IMG_URL + '/imgs/user/all_order.png'" mode="aspectFill"></image>
+				<image class="order-img" :src="'/static/images/tab5.png'" mode="aspectFill"></image>
 				<text class="item-title">全部订单</text>
 			</view>
 		</view>
@@ -41,7 +41,7 @@ export default {
 				{
 					id: 1,
 					title: '待付款',
-					img: '/imgs/user/tab11.png',
+					img: '/static/images/tab1.png',
 					type: 'nopay'
 				},
 				// {
@@ -53,13 +53,13 @@ export default {
 				{
 					id: 3,
 					title: '待收货',
-					img: '/imgs/user/tab33.png',
+					img: '/static/images/tab2.png',
 					type: 'noget'
 				},
 				{
 					id: 4,
 					title: '待评价',
-					img: '/imgs/user/tab44.png',
+					img: '/static/images/tab3.png',
 					type: 'nocomment'
 				}
 				// {
@@ -111,8 +111,9 @@ export default {
 }
 // 订单卡片
 .sh-order-box {
-	height: 180rpx;
+	height: 170rpx;
 	background: #fff;
+	border-radius: 20upx;
 	.order-box {
 		flex: 4;
 	}
@@ -141,7 +142,7 @@ export default {
 		.item-title {
 			font-size: 26rpx;
 			font-weight: 500;
-			color: rgba(153, 153, 153, 1);
+			color: #333333;
 			line-height: 24rpx;
 			margin-top: 20rpx;
 		}

pages/index/components/sh-wallet.vue

@@ -1,6 +1,6 @@
 <template>
 	<!-- 钱包卡片 -->
-	<view class="sh-wallet-box u-flex u-m-b-10 u-p-r-20">
+	<view class="sh-wallet-box u-flex u-m-b-20 u-p-r-20">
 		<view class="u-flex wallet-left">
 			<view class="wallet-item u-flex-col u-col-center" @tap="jump('/pages/user/wallet/index')">
 				<text class="wallet-item__detail item-balance u-ellipsis-1">{{ userInfo.money || '0' }}</text>
@@ -17,7 +17,7 @@
 		</view>
 		<view class="wallet-item u-flex-col wallet-right u-col-center" @tap="jump('/pages/user/wallet/index')">
 			<image class="cut-off--line" :src="$IMG_URL + '/imgs/user/cut_off_line.png'" mode=""></image>
-			<image class="wallet-img" :src="$IMG_URL + '/imgs/user/wallet.png'" mode="aspectFill"></image>
+			<image class="wallet-img" src="/static/images/wallet.png" mode="aspectFill"></image>
 			<text class="wallet-item__title">我的钱包</text>
 		</view>
 	</view>
@@ -50,9 +50,10 @@ export default {
 <style lang="scss">
 // 钱包卡片
 .sh-wallet-box {
-	background: #fff;
-	height: 180rpx;
 	position: relative;
+	height: 170upx;
+	background: #FFFFFF;
+	border-radius: 20upx;
 	.wallet-left {
 		flex: 4;
 	}
@@ -74,11 +75,13 @@ export default {
 			height: 46rpx;
 		}
 		.wallet-item__detail {
-			font-size: 28rpx;
+			
-			width: 180rpx;
+			font-size: 36upx;
 			text-align: center;
-			font-weight: 500;
+			font-family: PingFang SC;
-			color: rgba(168, 112, 13, 1);
+			font-weight: bold;
+			color: #21222B;
+			
 		}
 		.wallet-item__title {
 			font-size: 26rpx;

pages/index/index.vue

@@ -82,7 +82,7 @@
 			<!-- 登录提示 -->
 			<shopro-auth-modal></shopro-auth-modal>
 			<!-- 悬浮按钮 -->
-			<shopro-float-btn></shopro-float-btn>
+			<!-- <shopro-float-btn></shopro-float-btn> -->
 			<!-- 连续弹窗提醒 -->
 			<shopro-notice-modal v-if="!showPrivacy && isLogin"></shopro-notice-modal>
 			<!-- 隐私协议 -->

pages/index/user.vue

@@ -4,7 +4,7 @@
 		<!-- 个人信息卡片 -->
 		<userinfo-card v-if="userHeadData && userHeadData.style" :scrollTop="scrollTop" :detail="userHeadData" @onShare="onShare"></userinfo-card>
 		<!-- 自定义模块 -->
-		<view v-for="(item, index) in userTemplate" :key="item.id" style="border:2px solid red;padding:0 25upx;">
+		<view v-for="(item, index) in userTemplate" :key="item.id" style="padding:0 25upx;">
 			<!-- 轮播 -->
 			<sh-banner
 				v-if="item.type === 'banner' && index !== 0"
@@ -32,16 +32,20 @@
 			<sh-order-card v-if="item.type === 'order-card'"></sh-order-card>
 		</view>
 		<!-- copyright -->
-		<view class="copyright-box u-flex-col u-row-center u-col-center u-p-t-80 u-p-b-50" v-if="initShop.copyright">
+	<!-- 	<view class="copyright-box u-flex-col u-row-center u-col-center u-p-t-80 u-p-b-50" v-if="initShop.copyright">
 			<view class="copyright-text">{{ initShop.copyright[0] }}</view>
 			<view class="copyright-text">{{ initShop.copyright[1] }}</view>
+		</view> -->
+		<view class="copyright-box">
+			<view class="copyright-text">宁美科技版权所有</view>
+			<view class="copyright-text">Copyright 2023-2023</view>
 		</view>
 
 		<!-- #ifdef H5 -->
 		<view class="tabbar-hack" style="height: 120rpx; width:100%;"></view>
 		<!-- #endif -->
 		<!-- 关注弹窗 -->
-		<shopro-float-btn></shopro-float-btn>
+		<!-- <shopro-float-btn></shopro-float-btn> -->
 		<!-- 登录提示 -->
 		<shopro-auth-modal></shopro-auth-modal>
 		<!-- 分享组件 -->
@@ -134,10 +138,16 @@ export default {
 
 <style lang="scss">
 .copyright-box {
+	margin-top:70upx;
+	font-size: 24upx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #5D5F6B;
+	text-align:center;
+	padding-bottom:50upx;
 	.copyright-text {
-		font-size: 22rpx;
+		font-size: 24rpx;
-		font-weight: 500;
+		line-height: 54upx;
-		color: #c4c4c4;
 	}
 }
 </style>

pages/public/faq.vue

@@ -6,7 +6,7 @@
 		</u-collapse>
 
 		<!-- 更多 -->
-		<u-loadmore v-if="faqList.length" height="80rpx" :status="loadStatus" icon-type="flower" color="#ccc" />
+		<!-- <u-loadmore v-if="faqList.length" height="80rpx" :status="loadStatus" icon-type="flower" color="#ccc" /> -->
 	</view>
 </template>
 
@@ -16,10 +16,10 @@ export default {
 	data() {
 		return {
 			headStyle: {
-				color: '#a8700d'
+				color: '#FFFFFF'
 			},
 			itemStyle: {
-				borderBottom: '1rpx solid #eee',
+				borderBottom: '1rpx solid #333440',
 				padding: '20rpx 0'
 			},
 			faqList: [],
@@ -60,6 +60,6 @@ export default {
 
 <style lang="scss">
 	.faq-box{
-		background-color: #fff;
+		background-color: #21222B;
 	}
 </style>

uni.scss

@@ -4,4 +4,4 @@
  * uView自定义的css类名和scss变量，均以"u-"开头，不会造成冲突，请放心使用 
  */
 @import 'uview-ui/theme.scss';
-$IMG_URL: 'http://file.shopro.top'; //css中背景图片变量。js图片变量在env.js
+$IMG_URL: 'https://fx.njrenzhou.cn'; //css中背景图片变量。js图片变量在env.js