fix:样式调整

pages/groupbuying/pickupVerification/index.vue

@@ -2,9 +2,7 @@
 	<view style="    padding: 30rpx;">
 		<view>
 			<img style="    height: 250rpx;
-	    width: 100%;"
-				src="http://www.gzzzyd.com/groupon/regiment/提货管理_2@2x.png"
-				alt="预览" @click="scanCode">
+		    width: 100%;" src="http://www.gzzzyd.com/groupon/regiment/提货管理_2@2x.png" alt="预览" @click="scanCode">
 		</view>
 
 		<view class="u-demo-block__content" style="margin-top: 15px;">
@@ -18,10 +16,11 @@
 
 
 		<view class="tool_list">
-			<view class="title">
+			<view class="title" style="    font-weight: 500;padding-left: 30rpx;">
 				&nbsp;&nbsp;核销记录
 			</view>
-			<mescroll-item ref="MescrollItem"  :i="index" :index="tabIndex" :height="height"  v-for="(tab,index) in tabsList" :key="index">
+			<mescroll-item ref="MescrollItem" :i="index" :index="tabIndex" :height="height" v-for="(tab, index) in tabsList"
+				:key="index">
 			</mescroll-item>
 		</view>
 
@@ -29,8 +28,8 @@
 </template>
 
 <script>
-	import MescrollItem from "./module/mescrollUni-item.vue";
-	import { confirmOrder} from '@/api/groupon.js'
+import MescrollItem from "./module/mescrollUni-item.vue";
+import { confirmOrder } from '@/api/groupon.js'
 import {
 	getUserInfo,
 	userEdit,
@@ -63,10 +62,10 @@ export default {
 	mixins: [colors],
 	data () {
 		return {
-			height:'750rpx',
-			pickupCode:'',
-			tabIndex:0,
-			tabsList:[{name:"核销记录"}]
+			height: '750rpx',
+			pickupCode: '',
+			tabIndex: 0,
+			tabsList: [{ name: "核销记录" }]
 
 		};
 	},
@@ -81,9 +80,9 @@ export default {
 			deep: true
 		}
 	},
-	onShow(){
+	onShow () {
 		let sysInfo = uni.getSystemInfoSync()
-		this.height= sysInfo.windowHeight -(sysInfo.screenWidth/750) * (530) +'px';
+		this.height = sysInfo.windowHeight - (sysInfo.screenWidth / 750) * (530) + 'px';
 		console.log(this.height)
 	},
 	onLoad () {
@@ -104,18 +103,18 @@ export default {
 	},
 	methods: {
 
-		scanCode() {
+		scanCode () {
 			let that = this;
 			uni.scanCode({
 				onlyFromCamera: true,
-				success: function(res) {
-					that.pickupCode =  res.result;
+				success: function (res) {
+					that.pickupCode = res.result;
 					console.log("scan code success ...", res.result)
 				},
-				fail() {
+				fail () {
 					console.log("scan code fail ...")
 				},
-				complete() {
+				complete () {
 					console.log("scan code complete ...")
 				}
 			})
@@ -125,10 +124,10 @@ export default {
 		},
 
 
-		confirmOrder(){
-			confirmOrder(this.pickupCode).then(res =>{
+		confirmOrder () {
+			confirmOrder(this.pickupCode).then(res => {
 				uni.$u.toast(res.msg)
-			}).catch(err =>{
+			}).catch(err => {
 				uni.$u.toast(err)
 			})
 		},
@@ -380,7 +379,7 @@ export default {
 }
 </script>
 
-<style scoped lang="scss">
+<style  lang="scss">
 .cartcolor {
 	color: var(--view-theme);
 	border: 1px solid var(--view-theme);
@@ -555,11 +554,35 @@ export default {
 	}
 }
 
-/deep/ .u-input{
+::v-deep .u-input {
+	padding-left: 20rpx !important;
 	background: white;
-	border-radius: 46rpx;
+	border-radius: 46rpx !important;
+	border: 1px solid #B22338 !important;
+	padding-top: 0 !important;
+	padding-bottom: 0 !important;
+	position: relative;
+	overflow: hidden;
 }
-	.bord{
-		border: 1px solid red;
+
+::v-deep .u-input button {
+	position: relative !important;
+	right: 0 !important;
+	transform: translateX(30px);
+	background: #B22338 !important;
+	text{
+		font-size: 15px !important;
 	}
+	color: white;
+	width: 240rpx !important;
+	height: 80rpx !important;
+	border: none !important;
+	display: flex !important;
+	justify-content: flex-start !important;
+	padding-left: 40rpx !important;
+}
+
+.bord {
+	border: 1px solid red;
+}
 </style>

pages/user/index.vue

@@ -4,7 +4,7 @@
 			<view class="sys-head">
 				<view class="sys-bar" :style="{ height: sysHeight }"></view>
 				<view class="sys-title">个人中心</view>
-				<view class="bg" ></view>
+				<view class="bg"></view>
 			</view>
 		</view>
 		<view class="mid" style="flex:1;overflow: hidden;padding: 30rpx;padding-top: 0; background: rgb(249,249,249);">
@@ -101,7 +101,7 @@
 							<view class="group-content-l">
 
 								<view class="content-num">
-									{{grouponStatis.lastNewViewTotal}}
+									{{ grouponStatis.lastNewViewTotal }}
 								</view>
 								<view class="content-info">
 									最新团购浏览总量 (次)
@@ -112,7 +112,7 @@
 
 
 								<view class="content-num">
-									{{grouponStatis.lastNewMake}}
+									{{ grouponStatis.lastNewMake }}
 								</view>
 								<view class="content-info">
 									最新团购成交总额 (元)
@@ -151,12 +151,12 @@
 
 							<navigator url="/pages/columnGoods/HotNewGoods/feedback" hover-class="none">
 								<u-cell isLink>
-								<view slot="title" class="u-slot-title">
-									<image src="http://www.gzzzyd.com/groupon/regiment/编组 6@2x.png" mode=""></image>
-									<text class="u-cell-text">建议与反馈</text>
-								</view>
+									<view slot="title" class="u-slot-title">
+										<image src="http://www.gzzzyd.com/groupon/regiment/编组 6@2x.png" mode=""></image>
+										<text class="u-cell-text">建议与反馈</text>
+									</view>
 
-							</u-cell>
+								</u-cell>
 							</navigator>
 
 							<u-cell isLink>
@@ -177,13 +177,13 @@
 							</navigator>
 
 							<navigator url="/pages/groupbuying/aboutUs/index" hover-class="none">
-							<u-cell isLink>
-								<view slot="title" class="u-slot-title">
-									<image src="http://www.gzzzyd.com/groupon/regiment/编组 8@2x(1).png" mode=""></image>
-									<text class="u-cell-text">关于我们</text>
-								</view>
-							</u-cell>
-						</navigator>
+								<u-cell isLink>
+									<view slot="title" class="u-slot-title">
+										<image src="http://www.gzzzyd.com/groupon/regiment/编组 8@2x(1).png" mode=""></image>
+										<text class="u-cell-text">关于我们</text>
+									</view>
+								</u-cell>
+							</navigator>
 							<navigator url="/pages/users/user_info/index" hover-class="none">
 								<u-cell isLink>
 
@@ -276,7 +276,7 @@
 								<!-- <view class="phone" v-if="!userInfo.username && isLogin" @tap="bindPhone">
 									{{$t('绑定手机号')}}</view> -->
 							</view>
-							<view  v-if="userInfo.livingHall === 1" class="message" style="    white-space: nowrap;">
+							<view v-if="userInfo.livingHall === 1" class="message" style="    white-space: nowrap;">
 								<text style="	color: rgb(174, 33, 56);margin-right: 20rpx;">切换团长</text>
 								<u-switch v-model="roleSwitch" activeColor="#75BE00" size="16" @change="changeRole"></u-switch>
 							</view>
@@ -286,20 +286,32 @@
 					</view>
 					<navigator url="/pages/groupbuying/promotion/index" hover-class="none">
 
-						<view class="group-buying-data2">
+						<!-- <view class="group-buying-data2">
 							<view class="group-title-2">
 								<view>
-									累计分享奖励(元) &nbsp; ￥{{statistics.allAccounts || 0}}
+									累计分享奖励(元) &nbsp; ￥{{ statistics.allAccounts || 0 }}
 								</view>
 								<view>
 									查看详情 >
 								</view>
 							</view>
+						</view> -->
+						<view class="group-buying-data3">
+							<u-cell :value="'查看详情'" isLink>
+								<view slot="title" class="u-slot-title">
+									<text class="u-cell-text my_order_text">累计分享奖励(元) &nbsp; ￥{{ statistics.allAccounts || 0 }}</text>
+								</view>
+
+							</u-cell>
 						</view>
+
+
+
+
 					</navigator>
 
 					<view class="my_order" @click="goOrderIndex">
-						<u-cell  value="全部订单" isLink>
+						<u-cell value="全部订单" isLink>
 							<view slot="title" class="u-slot-title">
 								<text class="u-cell-text my_order_text">我的订单</text>
 							</view>
@@ -308,15 +320,15 @@
 					</view>
 
 
-					<view class="order-wrapper origin" >
+					<view class="order-wrapper origin">
 						<view class="order-bd">
 							<block v-for="(item, index) in orderMenuOrigin" :key="index">
 								<view class="order-item" hover-class="none" @click="goRouter(item)">
 									<view class="pic">
-										 <image :src="item.img" mode=""></image>
-<!--										<text class="iconfont" :class="item.img"></text>-->
+										<image :src="item.img" mode=""></image>
+										<!--										<text class="iconfont" :class="item.img"></text>-->
 									</view>
-									<view class="txt order_menu_title">{{ item.title}}</view>
+									<view class="txt order_menu_title">{{ item.title }}</view>
 								</view>
 							</block>
 						</view>
@@ -327,12 +339,12 @@
 
 							<navigator url="/pages/columnGoods/HotNewGoods/feedback" hover-class="none">
 								<u-cell isLink>
-								<view slot="title" class="u-slot-title">
-									<image src="http://www.gzzzyd.com/groupon/regiment/编组 6@2x.png" mode=""></image>
-									<text class="u-cell-text">建议与反馈</text>
-								</view>
+									<view slot="title" class="u-slot-title">
+										<image src="http://www.gzzzyd.com/groupon/regiment/编组 6@2x.png" mode=""></image>
+										<text class="u-cell-text">建议与反馈</text>
+									</view>
 
-							</u-cell>
+								</u-cell>
 							</navigator>
 
 							<u-cell isLink>
@@ -353,13 +365,13 @@
 							</navigator>
 
 							<navigator url="/pages/groupbuying/aboutUs/index" hover-class="none">
-							<u-cell isLink>
-								<view slot="title" class="u-slot-title">
-									<image src="http://www.gzzzyd.com/groupon/regiment/编组 8@2x(1).png" mode=""></image>
-									<text class="u-cell-text">关于我们</text>
-								</view>
-							</u-cell>
-						</navigator>
+								<u-cell isLink>
+									<view slot="title" class="u-slot-title">
+										<image src="http://www.gzzzyd.com/groupon/regiment/编组 8@2x(1).png" mode=""></image>
+										<text class="u-cell-text">关于我们</text>
+									</view>
+								</u-cell>
+							</navigator>
 							<navigator url="/pages/users/user_info/index" hover-class="none">
 								<u-cell isLink>
 
@@ -378,7 +390,7 @@
 							退出登录
 						</button>
 					</view>
-					<my-swiper :type=4 ></my-swiper>
+					<my-swiper :type=4></my-swiper>
 
 				</view>
 
@@ -398,7 +410,7 @@ import {
 	updateUserInfo
 } from '@/api/user.js';
 
-import {commissionStatistics, grouponMngStatis} from '@/api/groupon.js'
+import { commissionStatistics, grouponMngStatis } from '@/api/groupon.js'
 
 import {
 	wechatAuthV2,
@@ -431,7 +443,7 @@ export default {
 		...mapGetters({
 			cartNum: 'cartNum',
 			isLogin: 'isLogin',
-			newCurrentRole:'newCurrentRole'
+			newCurrentRole: 'newCurrentRole'
 		})
 	},
 	filters: {
@@ -450,8 +462,8 @@ export default {
 	mixins: [colors],
 	data () {
 		return {
-			statistics:{},
-			grouponStatis:{},
+			statistics: {},
+			grouponStatis: {},
 			roleSwitch: false,
 			currentRole: 'employees',
 			storeMenu: [], // 商家管理
@@ -556,7 +568,7 @@ export default {
 		if (this.$store.getters.isLogin) {
 			this.commissionStatistics();
 		}
-		this.currentRole=this.$store.getters.newCurrentRole;
+		this.currentRole = this.$store.getters.newCurrentRole;
 		console.log(this.newCurrentRole);
 		this.grouponMngStatis();
 		let that = this;
@@ -581,73 +593,73 @@ export default {
 		...mapMutations(["setNewCurrentRole"]),
 
 
-		goOrderIndex(){
+		goOrderIndex () {
 			// uni.switchTab({
 			// 	url:'/pages/order/index'
 			// })
-      let item = {
-        img: 'http://www.gzzzyd.com/groupon/order/待付款@2x.png',
-        title: '全部',
-        url: '/pages/order/index?status=0'
-      };
-      var pages = getCurrentPages();
-      var page = (pages[pages.length - 1]).$page.fullPath;
-      if (item.url == page) return
-      getApp().globalData.switchId = item.title
-      uni.switchTab({
-        url: item.url,
-        fail (err) {
-          uni.redirectTo({
-            url: item.url
-          })
-        }
-      })
+			let item = {
+				img: 'http://www.gzzzyd.com/groupon/order/待付款@2x.png',
+				title: '全部',
+				url: '/pages/order/index?status=0'
+			};
+			var pages = getCurrentPages();
+			var page = (pages[pages.length - 1]).$page.fullPath;
+			if (item.url == page) return
+			getApp().globalData.switchId = item.title
+			uni.switchTab({
+				url: item.url,
+				fail (err) {
+					uni.redirectTo({
+						url: item.url
+					})
+				}
+			})
 		},
 
-		goMyMessage(){
+		goMyMessage () {
 			console.log("++++++++++++++++++++++++")
 			uni.switchTab({
 				url: '/pages/message/message'
 			});
 		},
 
-		commissionStatistics(){
+		commissionStatistics () {
 			commissionStatistics().then(res => {
-				this.statistics =res.data
+				this.statistics = res.data
 			})
 		},
 
-		grouponMngStatis(){
+		grouponMngStatis () {
 			grouponMngStatis().then(res => {
 				this.grouponStatis = res.data
 			})
 		},
-					/**
-			 * 退出登录
-			 *
-			 */
-		outLogin: function() {
-				let that = this;
-				if (that.loginType == 'h5') {
-					uni.showModal({
-						title: that.$t(`提示`),
-						content: that.$t(`确认退出登录`),
-						success: function(res) {
-							if (res.confirm) {
-								getLogout()
-									.then(res => {
-										// uni.clearStorage()
-										that.$store.commit("LOGOUT");
-										uni.reLaunch({
-											url: '/pages/index/index'
-										})
+		/**
+ * 退出登录
+ *
+ */
+		outLogin: function () {
+			let that = this;
+			if (that.loginType == 'h5') {
+				uni.showModal({
+					title: that.$t(`提示`),
+					content: that.$t(`确认退出登录`),
+					success: function (res) {
+						if (res.confirm) {
+							getLogout()
+								.then(res => {
+									// uni.clearStorage()
+									that.$store.commit("LOGOUT");
+									uni.reLaunch({
+										url: '/pages/index/index'
 									})
-									.catch(err => {});
-							} else if (res.cancel) {}
-						}
-					});
-				}
-			},
+								})
+								.catch(err => { });
+						} else if (res.cancel) { }
+					}
+				});
+			}
+		},
 		changeRole () {
 			this.currentRole = this.roleSwitch ? 'leader' : 'employees'
 			this.setNewCurrentRole(this.currentRole);
@@ -1129,7 +1141,7 @@ body {
 						display: flex;
 						align-items: center;
 						font-size: 32rpx;
-						margin-top: 30rpx;
+						margin-top: 10rpx;
 						font-weight: bolder;
 						color: #333333;
 
@@ -1147,8 +1159,9 @@ body {
 					.num {
 						display: flex;
 						align-items: center;
-						margin-top: 20rpx;
-						font-size: 26rpx;
+						margin-top: 10rpx;
+						font-size: 22rpx;
+						line-height: 36rpx;
 						color: rgba(255, 255, 255, 0.6);
 
 						image {
@@ -1166,7 +1179,8 @@ body {
 				display: flex;
 				margin-right: 20rpx;
 				height: 150rpx;
-   			 align-items: center;
+				align-items: center;
+
 				.num {
 					position: absolute;
 					top: -8rpx;
@@ -1250,8 +1264,9 @@ body {
 		.group-buying-data2 {
 			position: relative;
 			width: 100%;
-			height: 140rpx;
-			padding: 40rpx;
+			height: 100rpx;
+			padding: 28rpx;
+			box-sizing: border-box;
 			margin: 0 auto;
 			background-image: url('http://www.gzzzyd.com/groupon/regiment/提货管理@2x.png');
 			background-size: 100% auto;
@@ -1268,6 +1283,28 @@ body {
 			}
 		}
 
+		/deep/ .group-buying-data3 {
+			background-image: url('http://www.gzzzyd.com/groupon/regiment/提货管理@2x.png') !important;
+			background-size: 100% auto !important;
+
+			.u-slot-title {
+				text {
+
+					font-size: 32rpx !important;
+					font-weight: 200 !important;
+					color: #B22338;
+				}
+
+			}
+			.u-cell__body{
+				text {
+
+font-weight: 200 !important;
+color: #B22338;
+}
+			}
+		}
+
 		.group-buying-data {
 			position: relative;
 			width: 100%;
@@ -1368,6 +1405,7 @@ body {
 					align-items: center;
 					flex: 1;
 					height: 140rpx;
+					margin-top: 8rpx;
 
 					.pic {
 						position: relative;
@@ -1379,8 +1417,8 @@ body {
 						}
 
 						image {
-							width: 70rpx;
-							height: 70rpx;
+							width: 50rpx;
+							height: 50rpx;
 						}
 					}
 
@@ -1704,12 +1742,12 @@ body {
 	display: none !important;
 }
 
-.my_order{
-}
+.my_order {}
 
-.my_order_text{
+.my_order_text {
 	font-weight: bold;
 }
+
 .u-slot-title {
 
 	text {
@@ -1726,10 +1764,12 @@ body {
 
 	}
 }
-.origin{
+
+.origin {
 	margin-top: 0 !important;
 }
-	.order_menu_title{
-		color: #666666 !important;
-	}
+
+.order_menu_title {
+	color: #666666 !important;
+}
 </style>