2023-11-8

manifest.json

@@ -112,9 +112,9 @@
             "port" : 4526, //端口号
             "proxy" : {
                 "/api" : {
-                    "target" : "http://test.shangshigo.com", //请求的目标域名
+                    // "target" : "http://test.shangshigo.com", //请求的目标域名
 
-                    // "target": "http://qudou.frp.liuniu946.com", //请求的目标域名
+                    "target": "http://jp.frp.qiniu1314.com", //请求的目标域名
                     "changeOrigin" : true
                 }
             }

pages/money/qudou.vue

@@ -6,17 +6,17 @@
 				<view class="goback-box" @click="toBack">
 					<image class="goback" src="../../static/icon/fanhui.png" mode=""></image>
 				</view>
-				<view class="header">我的趣豆</view>
+				<view class="header">积分</view>
 			</view>
 			<view class="content-bg">
-				<image src="../../static/img/yongjin-bg.png" mode=""></image>
+				<image src="../../static/img/myfans.png" mode=""></image>
 			</view>
 			<view class="money-box">
 				<view class="money">{{ userInfo.integral }}</view>
-				<view>余额</view>
+				<view>当前余额</view>
 			</view>
 		</view>
-		<view class="moneybtn-box flex">
+		<!-- <view class="moneybtn-box flex">
 			<view class="money-btn" v-if="userInfo.staff" @click="navto('/pages/money/qdwallet?type=2')">
 				<view class="flex-center">
 					<image class="tipIcon" src="../../static/icon/qudou3.png" mode="scaleToFill"></image>
@@ -49,8 +49,8 @@
 					</text>
 				</view>
 			</view>
-		</view>
-		<!-- <view class="info-box flex">
+		</view> -->
+		<view class="info-box flex">
 			<view class="info-item">
 				<view class="info-font">累计收入</view>
 				<view class="info-num">{{ recharge }}</view>
@@ -60,7 +60,7 @@
 				<view class="info-font">累计支出</view>
 				<view class="info-num">{{ orderStatusSum }}</view>
 			</view>
-		</view> -->
+		</view>
 		<view class="navbar">
 			<view v-for="(item, index) in navList" :key="index" class="nav-item"
 				:class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>

pages/public/forget.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="container">
 		<view class="container_text">
-			<image class="banner-img" src="/static/img/img01.png" mode="scaleToFill"></image>
-			<view class="title-img"><image class="title-image" src="../../static/img/login-title.png" mode=""></image></view>
+			<image class="banner-img" src="/static/img/login.png" mode="scaleToFill"></image>
+			<!-- <view class="title-img"><image class="title-image" src="../../static/img/login-title.png" mode=""></image></view> -->
 		</view>
-		<view class="loginTitle"><text>修改密码</text></view>
+		<!-- <view class="loginTitle"><text>修改密码</text></view> -->
 		<view class="login_text">
 			<view class="login_input flex_item">
 				<view class="login_img"><image class="phone" src="/static/icon/img03.png"></image></view>
@@ -244,15 +244,15 @@ page {
 	.uni-button-green {
 		text-align: center;
 		color: #ffffff;
-		background-color: #db292b;
+		background-color: #E6C79D;
 		margin: 40rpx 10rpx;
 		border-radius: 50rpx;
 	}
 	.uni-button-green-plain {
-		border: 1px solid #db292b;
+		border: 1px solid #E6C79D;
 		margin: 40rpx 10rpx;
 		border-radius: 50rpx;
-		color: #db292b;
+		color: #E6C79D;
 		background-color: #ffffff;
 	}
 	.uni-button {
@@ -262,7 +262,7 @@ page {
 }
 
 .code {
-	color: #db292b;
+	color: #E6C79D;
 	font-size: 23rpx;
 	border-left: 1px solid #eeeeee;
 	width: 150rpx;
@@ -275,7 +275,7 @@ page {
 }
 
 .login {
-	background: #db292b;
+	background: #E6C79D;
 	margin-top: 96rpx;
 	color: #ffffff;
 	text-align: center;

pages/set/address.vue

@@ -205,7 +205,7 @@ page {
 	height: 80rpx;
 	font-size: $font-lg;
 	color: #fff;
-	background-color: $base-color;
+	background-color: #E6C79D;
 	border-radius: 10rpx;
 }
 </style>

pages/set/addressManage.vue

@@ -29,7 +29,7 @@
 			></uni-list-item>
 		</uni-list>
 
-		<button class="add-btn" @click="confirm">提交</button>
+		<button class="add-btn" @click="confirm">确认添加</button>
 	</view>
 </template>
 
@@ -217,8 +217,9 @@ page {
 	margin: 60rpx auto;
 	font-size: $font-lg;
 	color: #fff;
-	background-color: $base-color;
-	border-radius: 10rpx;
+	// background-color: $base-color;
+	background: #ECC697;
+	border-radius: 50rpx;
 	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
 }
 

pages/set/phone.vue

@@ -193,7 +193,8 @@
 		margin: 60rpx auto;
 		font-size: $font-lg;
 		color: #fff;
-		background-color: $base-color;
+		// background-color: $base-color;
+		background-color: #E6C79D;
 		border-radius: 10rpx;
 		// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
 	}
@@ -203,7 +204,7 @@
 	}
 
 	.code {
-		color: #dc262b;
+		color: #E6C79D;
 		font-size: 23rpx;
 		border-left: 1px solid #eeeeee;
 		width: 150rpx;

pages/set/set.vue

@@ -74,7 +74,7 @@ page {
 	&.log-out-btn {
 		margin-top: 40rpx;
 		.cell-tit {
-			color: $base-color;
+			color: #E6C79D;
 			text-align: center;
 			margin-right: 0;
 		}

pages/user/myAppointment.vue

@@ -6,21 +6,21 @@
 				<view class="goback-box" @click="toBack">
 					<image class="goback" src="../../static/icon/fanhui.png" mode=""></image>
 				</view>
-				<view class="header">我的易趣卷</view>
+				<view class="header">消费额度</view>
 			</view>
 			<view class="content-bg">
-				<image src="../../static/img/zhihuanjuan.png" mode=""></image>
+				<image src="../../static/img/myfans.png" mode=""></image>
 			</view>
 			<view class="money-box">
 				<view class="money">{{ userInfo.anticipate }}</view>
-				<view>余额</view>
+				<view>当前余额</view>
 			</view>
-			<view class="moneybtn-box">
+			<!-- <view class="moneybtn-box">
 				<view class="money-btn" @click="navto('/pages/money/recharge?status=2')"></view>
 				<view class="money-btn" @click="navto('/pages/money/wallet')">转账</view>
-			</view>
+			</view -->>
 		</view>
-		<!-- <view class="info-box flex">
+		<view class="info-box flex">
 			<view class="info-item">
 				<view class="info-font">累计收入</view>
 				<view class="info-num">{{ recharge }}</view>
@@ -30,7 +30,7 @@
 				<view class="info-font">累计支出</view>
 				<view class="info-num">{{ orderStatusSum }}</view>
 			</view>
-		</view> -->
+		</view>
 		<view class="navbar">
 			<view v-for="(item, index) in navList" :key="index" class="nav-item"
 				:class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>

pages/user/mygs.vue

@@ -4,12 +4,12 @@
 			<view class="status_bar"><!-- 这里是状态栏 --></view>
 			<view class="body-title">
 				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
-				<view class="header">我的收益</view>
+				<view class="header">我的奖金</view>
 			</view>
-			<view class="content-bg"><image src="../../static/img/gssy.png" mode=""></image></view>
+			<view class="content-bg"><image src="../../static/img/myfans.png" mode=""></image></view>
 			<view class="money-box">
-				<view class="money">{{ userInfo.profit }}</view>
-				<view>总收益</view>
+				<view class="money">{{ userInfo.brokeage_price || 0 }}</view>
+				<view>当前余额</view>
 			</view>
 		</view>
 		<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
@@ -33,14 +33,14 @@
 						</view>
 					</view>
 
-					<view class="price-box">
+					<!-- <view class="price-box">
 						共
 						<text class="num">1</text>
 						件商品 邮费
 						<text class="price">0</text>
 						实付款
 						<text class="price">{{ moneyNum(item.price) }}</text>
-					</view>
+					</view> -->
 				</view>
 				<uni-load-more :status="loadingType"></uni-load-more>
 			</view>

pages/user/user.vue

@@ -27,8 +27,8 @@
 			</view>
 			<view class="sy-box flex">
 				<view class="sy-item" @click="navTo('/pages/user/mygs')">
-					<view class="sy-item-val">{{ userInfo.profit > 0 ? userInfo.profit : '0' }}</view>
-					<view class="sy-item-name">我的收益</view>
+					<view class="sy-item-val">{{ userInfo.brokeage_price > 0 ? userInfo.brokeage_price : '0' }}</view>
+					<view class="sy-item-name">我的奖金</view>
 				</view>
 				<!-- <view class="jg"></view> -->
 				<!-- <view class="sy-item" @click="navTo('/pages/user/myyue')">
@@ -38,12 +38,12 @@
 				<view class="jg"></view>
 				<view class="sy-item" @click="navTo('/pages/money/qudou')">
 					<view class="sy-item-val">{{ userInfo.integral || '0.00' }}</view>
-					<view class="sy-item-name">我的趣豆</view>
+					<view class="sy-item-name">我的积分</view>
 				</view>
 				<view class="jg"></view>
 				<view class="sy-item" @click="navTo('/pages/user/myAppointment')">
-					<view class="sy-item-val">{{ userInfo.anticipate || '0.00' }}</view>
-					<view class="sy-item-name">我的易趣卷</view>
+					<view class="sy-item-val">{{ userInfo.orderStatusNum.sum_price || '0.00' }}</view>
+					<view class="sy-item-name">消费总额</view>
 				</view>
 			</view>
 		</view>

store/index.js

@@ -6,8 +6,8 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
 	namespaced: true,
 	state: {
-		baseURL: 'https://www.shangshiyiqu.com', //地址配置
-		// baseURL: 'http://test.shangshigo.com', //测试地址配置
+		// baseURL: 'https://www.shangshiyiqu.com', //地址配置
+		baseURL: 'http://jp.frp.qiniu1314.com', //测试地址配置
 		urlFile: '/index', //项目部署所在文件夹
 		userInfo: {}, //登录信息
 		loginInterceptor: false, //是否打开强制登录