xiaol 1 week ago
parent
commit
35bdd4b950

+ 9 - 11
pages/guild/itemIndex.vue

@@ -482,7 +482,7 @@
 	
 	//抢货通道
 	.team-buy {
-		background-image: url("@/static/img/indexChatBg.png");
+		background-image: url("@/static/img/indexChatBg1.png");
 		background-repeat: no-repeat;
 		background-position: left bottom;
 		background-size: 100% auto;
@@ -491,24 +491,22 @@
 		.team-show{
 			color: #fff;
 			font-weight: bold;
-			width: 410rpx;
 			text-align: center;
 			padding-top: 70rpx;
-			flex-direction: column;
-			display: flex;
-			line-height: 1;
-			align-items: center;
-			justify-content: center;
+			text-align: center;
 			.label {
-				font-size: 60rpx;
+				font-size: 45rpx;
+				padding-top: 15rpx;
 			}
 			.guNickname{
-				margin-top: 10rpx;
+				display: inline-block;
+				margin-top: 20rpx;
 				font-size: 28rpx;
-				padding: 15rpx 30rpx;
-				background-color: #FE2363;
+				padding: 8rpx 30rpx;
+				background-color: #fffdf1;
 				border: 1px solid #EDC299;
 				border-radius: 100rpx;
+				color: #EA3616;
 				box-shadow: 4rpx 4rpx 10rpx 2rpx #FCD3BF inset;
 			}
 		}

+ 6 - 7
pages/gz/index.vue

@@ -24,7 +24,7 @@
 			
 			.gz-tag{
 				position: absolute;
-				bottom: 16px;
+				bottom: 28px;
 				image{width: 48px;height: 15px;}
 			}
 			.nickname{
@@ -178,7 +178,7 @@
 			<image src="/static/img/detail_bg.png"></image>
 			</view>
 		<view class="app-h">
-			<uni-nav-bar color="#fff" :border="false" statusBar backgroundColor="transparent" left-icon="left" @clickLeft="utils.navigateBack()" fixed title="馆长中心"></uni-nav-bar>
+			<uni-nav-bar color="#fff" :border="false" statusBar backgroundColor="transparent" left-icon="left" @clickLeft="utils.navigateBack()" fixed title="总监职能中心"></uni-nav-bar>
 		</view>
 		
 		<view class="app-body">
@@ -190,9 +190,8 @@
 						<view class="gz-tag">
 							<image src="/static/img/gz_tip.png"></image>
 						</view>
-						<view class="nickname" style="margin-top: 3px;">{{ user.nickname || "" }}</view>
+						<view class="nickname" style="margin-top: 15rpx;">{{ user.nickname || "" }}</view>
 					</view>
-					
 					<view class="fx-g1"></view>
 					<view class="top-foot fx-r fx-bc fx-ac">
 						<view class="item">
@@ -264,7 +263,7 @@
 							<view class="people fx-r fx-bc fx-ac">
 								<image src="/static/img/gz_yy.png"></image>
 								<view class="label">被约小单数:</view>
-								<view class="value">{{ item.booking_size_fresh }}</view>
+								<view class="value">{{ item.booking_size_fresh }}</view>
 							</view>
 							<view class="fx-g1"></view>
 							<view class="people fx-r fx-bc fx-ac">
@@ -277,7 +276,7 @@
 							<view class="people fx-r fx-bc fx-ac">
 								<image src="/static/img/gz_yy.png"></image>
 								<view class="label">剩余小单量:</view>
-								<view class="value">{{ item.residue_size_fresh }}</view>
+								<view class="value">{{ item.residue_size_fresh }}</view>
 							</view>
 							<view class="fx-g1"></view>
 							<view class="people fx-r fx-bc fx-ac">
@@ -290,7 +289,7 @@
 							<view class="people fx-r fx-bc fx-ac">
 								<image src="/static/img/gz_yy.png"></image>
 								<view class="label">总小单数:</view>
-								<view class="value">{{ item.pro_count_fresh }}</view>
+								<view class="value">{{ item.pro_count_fresh }}</view>
 							</view>
 							<view class="fx-g1"></view>
 							<view class="people fx-r fx-bc fx-ac">

+ 14 - 17
pages/gz/order.vue

@@ -292,23 +292,20 @@
 				this.utils.showModal("你确定要" + item.order_id + "订单要拆分?,拆分之后,原有订单失效,生成新的2个订单。", ()=>{
 					uni.showLoading({ title:"操作..." });
 					console.log(type,'88')
-					this
-						.request
-						.post("auctionOrderCf",{id:item.id,small:type})
-						.then(res=>{
-							uni.hideLoading();
-							if(res.code == 200) {
-								this.utils.Tip("拆分成功");
-								this.$set(this.listAr[index],'gz_type','cf');
-								this.$set(this.listAr[index],'sub_order',res.data);
-							} else {
-								this.utils.Tip(res.msg);
-							}
-						})
-						.catch(err=>{
-							uni.hideLoading();
-							this.utils.Tip("加载失败,请重新尝试");
-						});
+					console.log(item.id,'99')
+					this.request.post("auctionOrderCf",{id:item.id,small:type}).then(res=>{
+						uni.hideLoading();
+						if(res.code == 200) {
+							this.utils.Tip("拆分成功");
+							this.$set(this.listAr[index],'gz_type','cf');
+							this.$set(this.listAr[index],'sub_order',res.data);
+						} else {
+							this.utils.Tip(res.msg);
+						}
+					}).catch(err=>{
+						uni.hideLoading();
+						this.utils.Tip("加载失败,请重新尝试");
+					});
 				});
 			},
 			

+ 17 - 14
pages/index/index.vue

@@ -13,7 +13,7 @@
 			<view class="top-body">
 				<view class="statusBar" :style="'height:'  + statusBarHeight + 'px'"></view>
 				<view class="panel fx-r fx-bc fx-ac">
-					<image src="/static/img/logo.png" mode="heightFix" class="index-img"></image>
+					<image src="/static/img/logo1.png" mode="heightFix" class="index-img"></image>
 					<view class="inputIndex">
 						<navigator url="../goods/list">
 							<view class="inputText fx-ac fx-bc fx-r">
@@ -81,7 +81,7 @@
 						<view class="team-show">
 							<view class="label">{{ guData.name }}</view>
 							<view class="guNickname">
-								{{ guData.nickname }}
+								总监:{{ guData.nickname }}
 							</view>
 							<view class="body fx-h fx-bc fx-ac">
 								
@@ -747,33 +747,36 @@
 
 	//抢货通道
 	.team-buy {
-		background-image: url("@/static/img/indexChatBg.png");
+		background-image: url("@/static/img/indexChatBg1.png");
 		background-repeat: no-repeat;
 		background-position: left bottom;
 		background-size: 100% auto;
-		margin:20rpx 30rpx 0;
+		margin:15rpx 10rpx 20rpx 10rpx;
 		height: 240rpx;
 		.team-show{
 			color: #fff;
 			font-weight: bold;
-			width: 410rpx;
 			text-align: center;
 			padding-top: 70rpx;
-			flex-direction: column;
-			display: flex;
-			line-height: 1;
-			align-items: center;
-			justify-content: center;
+			text-align: center;
+			// flex-direction: column;
+			// display: flex;
+			// line-height: 1;
+			// align-items: center;
+			// justify-content: center;
 			.label {
-				font-size: 60rpx;
+				font-size: 45rpx;
+				padding-top: 15rpx;
 			}
 			.guNickname{
-				margin-top: 10rpx;
+				display: inline-block;
+				margin-top: 20rpx;
 				font-size: 28rpx;
-				padding: 15rpx 30rpx;
-				background-color: #FE2363;
+				padding: 8rpx 30rpx;
+				background-color: #fffdf1;
 				border: 1px solid #EDC299;
 				border-radius: 100rpx;
+				color: #EA3616;
 				box-shadow: 4rpx 4rpx 10rpx 2rpx #FCD3BF inset;
 			}
 		}

BIN
static/img/gz_tip.png


BIN
static/img/indexChatBg.png


BIN
static/img/indexChatBg1.png


BIN
static/img/logo1.png