上传

service-uniapp-client/.env

@@ -10,4 +10,4 @@ VITE_REDIRECT_URI=https://h5.yixuandaojia.com
 
 
 VITE_APPID=wxe36bd1a3deea74a3
-VITE_MAP_KEY=V5RBZ-QRK63-JAO3B-RLSOB-FLWJF-DVFGH
+VITE_MAP_KEY=LGABZ-VJZ6U-6ZMVR-G3SYN-IND2V-7BBG3

service-uniapp-client/components/address/redactAddress.vue

@@ -116,7 +116,7 @@
 				display: flex;
 				align-items: center;
 				height: 78rpx;
-				color: #5FCC9F;
+				color: #6e3009;
 			}
 
 			.van-cell__value {
@@ -126,7 +126,7 @@
 		}
 
 		&::v-deep .van-field__error-message {
-			color: #5AC796;
+			color: #6e3009;
 			font-size: 20rpx;
 			margin-top: 10rpx;
 		}

service-uniapp-client/components/couponList.vue

@@ -27,7 +27,7 @@
 		</view>
 	</view>
 	
-	<van-empty v-else image="/static/empty/coupon.png" image-size="400rpx" description="暂无优惠券"/>
+	<van-empty v-else image="/static/empty/data.png" image-size="400rpx" description="暂无优惠券"/>
 </template>
 
 <script>

service-uniapp-client/components/placard.vue

@@ -27,6 +27,7 @@
 	export default {
 		name: 'Placard',
 		components : { VueQrcode },
+		props : ['userInfo'],
 		data() {
 			return {
 				qrCodeValue: import.meta.env.VITE_REDIRECT_URI + `?vid=${this.getUserInfo()}`,
@@ -46,7 +47,7 @@
 				tempFilePath: '',
 
 				_rpx: 0,
-				_center: 0
+				_center: 0,
 			}
 		},
 		methods: {
@@ -66,7 +67,7 @@
 				bg.src = import.meta.env.VITE_REDIRECT_URI + '/static/placard/placard-bg.png'
 				//logo
 				let logo = new Image();
-				logo.src = import.meta.env.VITE_REDIRECT_URI + '/static/placard/logo.png'
+				logo.src = import.meta.env.VITE_REDIRECT_URI + '/static/login/logo.png'
 
 				bg.onload = () => {
 					logo.onload = () => {		//确保背景和logo加载完成(不然海报可能会少logo)
@@ -86,7 +87,7 @@
 							//绘制文字
 							ctx.font = `bold ${40 * rpx}px 楷体`
 							ctx.textAlign = 'center'
-							ctx.fillStyle = "#59B495";
+							ctx.fillStyle = "#ecb978";
 							ctx.fillText('上门服务', center, 200 * rpx, 400)
 						
 							ctx.fillStyle = "#0A543B";
@@ -114,12 +115,12 @@
 						
 							//画图形
 							this.paintingCapsule(ctx, center - (90 * rpx / 2), 250 * rpx, 90 * rpx, 25 * rpx,
-								13 * rpx, '#59B495', 'time')
+								13 * rpx, '#ecb978', 'time')
 							this.paintingCapsule(ctx, center + (130 * rpx / 2), 530 * rpx, 25 * rpx, 70 * rpx,
-								13 * rpx, '#BCEED6', 'coupon')
+								13 * rpx, '#ffe6ed', 'coupon')
 						
 							////画海报最后的标签列表
-							this.drawList(ctx, 135 * rpx, 650 * rpx, 60 * rpx, 20 * rpx, 10 * rpx, '#59B495')
+							this.drawList(ctx, 135 * rpx, 650 * rpx, 60 * rpx, 20 * rpx, 10 * rpx, '#ecb978')
 						
 							uni.canvasToTempFilePath({
 								x: 0, // 起点坐标
@@ -219,13 +220,14 @@
 				})
 			},
 			getUserInfo(){
-				if(localStorage.getItem('userInfo')){
-					return JSON.parse(localStorage.getItem('userInfo')).id
-				}else{
-					uni.navigateTo({
-						url: '/pages/login/login'
-					})
-				}
+				// if(localStorage.getItem('userInfo')){
+				// 	return JSON.parse(localStorage.getItem('userInfo')).id
+				// }else{
+				// 	uni.navigateTo({
+				// 		url: '/pages/login/login'
+				// 	})
+				// }
+				return this.userInfo.id
 			}
 		}
 	}
@@ -257,10 +259,10 @@
 					width: 72%;
 					height: 80rpx;
 					border-radius: 40rpx;
-					color: white;
 					font-size: 28rpx;
-					background: linear-gradient(180deg, #6FDFBE, #5AC796);
 					margin-top: 40rpx;
+					background: linear-gradient(178deg, #ffe6ed, #ecb978);
+					color: #6e3009;
 				}
 			}
 		}

service-uniapp-client/manifest.json

@@ -88,7 +88,7 @@
         "sdkConfigs" : {
             "maps" : {
                 "qqmap" : {
-                    "key" : "V5RBZ-QRK63-JAO3B-RLSOB-FLWJF-DVFGH"
+                    "key" : "LGABZ-VJZ6U-6ZMVR-G3SYN-IND2V-7BBG3"
                 }
             }
         },

service-uniapp-client/pages.json

@@ -177,7 +177,7 @@
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "秦柔到家",
+		"navigationBarTitleText": "宜轩到家",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8",
 	    "navigationStyle":"custom"

service-uniapp-client/pages/mine/distribution.vue

@@ -47,7 +47,7 @@
 		<van-overlay :show="show" @click="show = false" z-index="999999">
 			<div style="display: flex;justify-content: center;
 			height: 100%;align-items: center;">
-				<placard ref="placard"></placard>
+				<placard ref="placard" :userInfo="userInfo"></placard>
 			</div>
 		</van-overlay>
 	</view>
@@ -73,13 +73,23 @@
 					{ title : '费用明细' },
 					{ title : '提现记录' },
 					{ title : '收益记录' }
-				]
+				],
+				userInfo : {},
 			}
 		},
 		onShow() {
 			this.getAgentFlow()
+			this.getUserInfo()
 		},
 		methods: {
+			//获取用户信息
+			getUserInfo() {
+				this.$api('getUserInfo', {}, res => {
+					if (res.code == 200) {
+						this.userInfo = res.result;
+					}
+				})
+			},
 			getAgentFlow() {
 				this.$api('getAgentFlow', {
 					type: this.type
@@ -176,7 +186,7 @@
 
 			.box1 {
 				height: 100px;
-				background: linear-gradient(to right, #4899a6, #6fc6ad);
+				background: linear-gradient(to right, #ecb978, #ffe6ed);
 			}
 
 			.content {
@@ -185,12 +195,12 @@
 				justify-content: space-around;
 				width: 94%;
 				height: 140px;
-				background-color: #F5FDFB;
+				background-color: #F0F0F0;
 				top: 20px;
 				left: 3%;
 				z-index: 9;
 				border-radius: 10px;
-				box-shadow: 0px 1px 7px 1px #4899a6;
+				box-shadow: 0px 1px 7px 1px #6e300955;
 
 				.content-box {
 					display: flex;
@@ -224,7 +234,7 @@
 							width: 200rpx;
 							display: flex;
 							justify-content: space-around;
-							color: #4C9FA6;
+							color: #6e3009;
 							font-size: 18px;
 
 						}
@@ -248,8 +258,8 @@
 							display: inline-block;
 							padding: 5px 20px;
 							text-align: center;
-							border: 1px solid #96C8CB;
-							color: #76B7BA;
+							border: 1px solid #6e3009;
+							color: #6e3009;
 							border-radius: 5px;
 
 						}

service-uniapp-client/pages/mine/withdraw.vue

@@ -4,11 +4,22 @@
 		<view class="banner" />
 
 		<view class="b-relative center font-m">
-			<image src="/static/ms/w.png" />
+			<image src="/static/ms/1120.jpg" />
 			<view class="title" style="position: absolute; top: 40rpx; left: 40rpx">
 				<view style="line-height: 40rpx; font-size: 28rpx">账号余额</view>
 				<view style="line-height: 60rpx; font-size: 40rpx">￥{{ userInfo.price }}</view>
 			</view>
+			
+			<!-- <view class="title" style="position: absolute; top: 0; left: 0;
+			width: 100%;height: 100%;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			gap: 50rpx;">
+				<view style="line-height: 40rpx; font-size: 38rpx">账号余额</view>
+				<view style="line-height: 60rpx; font-size: 50rpx">￥{{ userInfo.price }}</view>
+			</view> -->
 		</view>
 
 		<view class="from-body">
@@ -144,7 +155,7 @@
 		.banner {
 			width: 100vw;
 			height: 256rpx;
-			background: #cfece7;
+			background: rgba(#ecb978, 0.2);
 		}
 
 		.center {
@@ -164,7 +175,7 @@
 			font-weight: 700;
 			text-align: left;
 			color: #ffffff;
-			text-shadow: 0 4rpx 6rpx 0 rgba(40, 170, 133, 0.81);
+			text-shadow: 0 4rpx 6rpx 0 rgba(#ecb978, 0.81);
 		}
 
 		.item-line input {
@@ -278,11 +289,11 @@
 			width: 85%;
 			height: 80rpx;
 			border-radius: 40rpx;
-			color: white;
+			color: $uni-color;
 			text-align: center;
 			line-height: 80rpx;
 			font-size: 28rpx;
-			background: linear-gradient(180deg, #6FDFBE, #5AC796);
+			background: linear-gradient(178deg, #ffe6ed, #ecb978);
 		}
 
 		@media all and (min-width: 961px) {

service-uniapp-client/pages/technician/technicianDetail.vue

@@ -241,7 +241,7 @@
 						this.getReview(this.reviewQueryParams.fraction)
 						
 						if (res.result.msgTechnician.images == '') { //如果用户没有上传个人相册，那么这里给个默认值
-							this.technicianImages = ['/static/technician/album.png']
+							this.technicianImages = ['/static/technician/album.png?a=1']
 						} else {
 							this.technicianImages = res.result.msgTechnician.images.split(',')
 						}