no message

common/css/common.css

@@ -1,1030 +1,1035 @@
 body {
-	background-color: #F5F5F5;
+  background-color: #F5F5F5;
 }
 
 view,
 text {
-	font-size: 24rpx;
-	color: #333;
+  font-size: 24rpx;
+  color: #333;
 }
 
 /* 隐藏scroll-view 滚动条 */
 ::-webkit-scrollbar {
-	display: none;
+  display: none;
 }
 
 .iPhone-bottom {
-	padding-bottom: constant(safe-area-inset-bottom);
-	padding-bottom: env(safe-area-inset-bottom);
+  padding-bottom: constant(safe-area-inset-bottom);
+  padding-bottom: env(safe-area-inset-bottom);
 }
 
 /* 不换行 */
 .view-nowrap {
-	white-space: nowrap;
+  white-space: nowrap;
 }
 
 .z-index-max {
-	position: relative;
-	z-index: 99999;
+  position: relative;
+  z-index: 99999;
 }
 
 /* 自动换行 */
 .view-word-wrap {
-	white-space: pre-wrap;
-	word-wrap: break-word;
+  white-space: pre-wrap;
+  word-wrap: break-word;
 }
 
 /*超出三行... */
 .text-overflow-ellipsis-t {
-	text-overflow: -o-ellipsis-lastline;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	display: -webkit-box;
-	-webkit-line-clamp: 3;
-	line-clamp: 3;
-	-webkit-box-orient: vertical;
-	white-space: pre-wrap;
-	word-wrap: break-word;
+  text-overflow: -o-ellipsis-lastline;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 3;
+  line-clamp: 3;
+  -webkit-box-orient: vertical;
+  white-space: pre-wrap;
+  word-wrap: break-word;
 }
 
 /*超出两行... */
 .text-overflow-ellipsis {
-	text-overflow: -o-ellipsis-lastline;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	display: -webkit-box;
-	-webkit-line-clamp: 2;
-	line-clamp: 2;
-	-webkit-box-orient: vertical;
-	white-space: pre-wrap;
-	word-wrap: break-word;
+  text-overflow: -o-ellipsis-lastline;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  line-clamp: 2;
+  -webkit-box-orient: vertical;
+  white-space: pre-wrap;
+  word-wrap: break-word;
 }
 
 /*超出一行... */
 .text-overflow-ellipsis-one {
-	white-space: nowrap;
-	text-overflow: ellipsis;
-	overflow: hidden;
-	word-break: break-all;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  word-break: break-all;
 }
 
 /* 内部盒子 */
 .box-border-box {
-	box-sizing: border-box;
+  box-sizing: border-box;
 }
 
 .flex-common-css {
-	width: 100%;
-	height: 100vh;
-	display: flex;
-	flex-direction: column;
+  width: 100%;
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
 }
 
 .flex-index-css {
-	width: 100%;
-	height: 100%;
-	display: flex;
-	flex-direction: column;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
 }
 
 .flex-direction {
-	display: flex;
-	flex-direction: column;
+  display: flex;
+  flex-direction: column;
 }
 
 .display-flex {
-	display: flex;
+  display: flex;
 }
 
 .flex-justify-space {
-	display: flex;
-	justify-content: space-between;
+  display: flex;
+  justify-content: space-between;
 }
 
 .flex-justify-around {
-	display: flex;
-	justify-content: space-around;
+  display: flex;
+  justify-content: space-around;
 }
 
 .flex-justify-center {
-	display: flex;
-	justify-content: center;
+  display: flex;
+  justify-content: center;
 }
 
 .flex-justify-end {
-	display: flex;
-	justify-content: flex-end;
+  display: flex;
+  justify-content: flex-end;
 }
 
 .flex-justify-start {
-	display: flex;
-	justify-content: flex-start;
+  display: flex;
+  justify-content: flex-start;
 }
 
 .align-items-center {
-	display: flex;
-	align-items: center;
+  display: flex;
+  align-items: center;
 }
 
 .align-items-baseline {
-	display: flex;
-	align-items: baseline;
+  display: flex;
+  align-items: baseline;
 }
 
 .align-items-flex-end {
-	display: flex;
-	align-items: flex-end;
+  display: flex;
+  align-items: flex-end;
 }
 
 .align-items-flex-start {
-	display: flex;
-	align-items: flex-start;
+  display: flex;
+  align-items: flex-start;
 }
 
 .align-self-flex-end {
-	display: flex;
-	align-self: flex-end;
+  display: flex;
+  align-self: flex-end;
 }
 
 .flex-wrap-wrap {
-	display: flex;
-	flex-wrap: wrap;
+  display: flex;
+  flex-wrap: wrap;
 }
 
 .common-view-css {
-	width: 100%;
-	flex: 1;
+  width: 100%;
+  flex: 1;
 }
 
 .scroll-view-css {
-	width: 100%;
-	flex: 1;
-	overflow: auto;
+  width: 100%;
+  flex: 1;
+  overflow: auto;
 }
 
 .box-sizing-border {
-	box-sizing: border-box;
+  box-sizing: border-box;
 }
 
 .text-align-center {
-	text-align: center;
+  text-align: center;
 }
 
 .text-align-right {
-	text-align: right;
+  text-align: right;
 }
 
 .text-align-left {
-	text-align: left;
+  text-align: left;
 }
 
 .letter-spacing-6 {
-	letter-spacing: 6rpx;
+  letter-spacing: 6rpx;
 }
 
 .letter-spacing-3 {
-	letter-spacing: 3rpx;
+  letter-spacing: 3rpx;
 }
 
 .flex-1 {
-	flex: 1;
+  flex: 1;
 }
 
 .flex-shrink0 {
-	flex-shrink: 0;
+  flex-shrink: 0;
 }
 
-
+.z-3 {
+  position: relative;
+  z-index: 3;
+}
 
 /* 字体大小 */
 .fs-18 {
-	font-size: 18rpx;
+  font-size: 18rpx;
 }
 
 .fs-20 {
-	font-size: 20rpx;
+  font-size: 20rpx;
 }
 
 .fs-22 {
-	font-size: 22rpx;
+  font-size: 22rpx;
 }
 
 .fs-24 {
-	font-size: 24rpx;
+  font-size: 24rpx;
 }
 
 .fs-26 {
-	font-size: 26rpx;
+  font-size: 26rpx;
 }
 
 .fs-28 {
-	font-size: 28rpx;
+  font-size: 28rpx;
 }
 
 .fs-30 {
-	font-size: 30rpx;
+  font-size: 30rpx;
 }
 
 .fs-32 {
-	font-size: 32rpx;
+  font-size: 32rpx;
 }
 
 .fs-34 {
-	font-size: 34rpx;
+  font-size: 34rpx;
 }
 
 .fs-36 {
-	font-size: 36rpx;
+  font-size: 36rpx;
 }
 
 .fs-38 {
-	font-size: 38rpx;
+  font-size: 38rpx;
 }
 
 .fs-40 {
-	font-size: 40rpx;
+  font-size: 40rpx;
 }
 
 .fs-44 {
-	font-size: 44rpx;
+  font-size: 44rpx;
 }
 
 .fs-48 {
-	font-size: 48rpx;
+  font-size: 48rpx;
 }
 
 .fs-64 {
-	font-size: 64rpx;
+  font-size: 64rpx;
 }
 
 .fs-52 {
-	font-size: 52rpx
+  font-size: 52rpx
 }
 
 /* 字体下面横线 */
 .text-underline {
-	text-decoration: underline;
+  text-decoration: underline;
 }
 
 /* 字体中间横线 */
 .text-line-through {
-	text-decoration: line-through
+  text-decoration: line-through
 }
 
 /* 斜体 */
 .fs-i {
-	font-style: italic;
+  font-style: italic;
 }
 
 /* 字间距 */
 .l-s-2 {
-	letter-spacing: 4rpx;
+  letter-spacing: 4rpx;
 }
 
 /* 字体粗细 */
 .fw-b {
-	font-weight: bold;
+  font-weight: bold;
 }
 
 .fw-400 {
-	font-weight: 400;
+  font-weight: 400;
 }
 
 .fw-500 {
-	font-weight: 500;
+  font-weight: 500;
 }
 
 .fw-600 {
-	font-weight: 600;
+  font-weight: 600;
 }
 
 /* 字体颜色 */
 .fc-f {
-	color: #fff;
+  color: #fff;
 }
 
 .fc-0 {
-	color: #000;
+  color: #000;
 }
 
 .fc-213C45 {
-	color: #213C45;
+  color: #213C45;
 }
 
 .fc-3 {
-	color: #333;
+  color: #333;
 }
 
 .fc-a {
-	color: #aaa;
+  color: #aaa;
 }
 
 
 .fc-6 {
-	color: #666;
+  color: #666;
 }
 
 .fc-94969A {
-	color: #94969A;
+  color: #94969A;
 }
 
 .fc-9198A2 {
-	color: #9198A2;
+  color: #9198A2;
 }
 
 .fc-9 {
-	color: #999;
+  color: #999;
 }
 
 .fc-3BB5FE {
-	color: #3BB5FE;
+  color: #3BB5FE;
 }
 
 .fc-41ABF5 {
-	color: #41ABF5;
+  color: #41ABF5;
 }
 
 .fc-1089D1 {
-	color: #1089D1;
+  color: #1089D1;
 }
 
 .fc-57CAFF {
-	color: #57CAFF;
+  color: #57CAFF;
 }
 
 .fc-96ECFB {
-	color: #96ECFB;
+  color: #96ECFB;
 }
 
 .fc-4495FD {
-	color: #4495FD;
+  color: #4495FD;
 }
 
 .fc-FD5D05 {
-	color: #FD5D05;
+  color: #FD5D05;
 }
 
 .fc-FF6320 {
-	color: #FF6320;
+  color: #FF6320;
 }
 
 .fc-FB4845 {
-	color: #FB4845;
+  color: #FB4845;
 }
 
 .fc-FB3D03 {
-	color: #ff3422;
+  color: #ff3422;
 }
 
 .fc-F6ABAC {
-	color: #F6ABAC;
+  color: #F6ABAC;
 }
 
 .fc-ff3939 {
-	color: #ff3939;
+  color: #ff3939;
 }
 
 .fc-FC4642 {
-	color: #FC4642;
+  color: #FC4642;
 }
 
 .fc-F93435 {
-	color: #F93435;
+  color: #F93435;
 }
 
 .fc-F43D04 {
-	color: #F43D04;
+  color: #F43D04;
 }
 
 .fc-F0372F {
-	color: #F0372F;
+  color: #F0372F;
 }
 
 .fc-F75820 {
-	color: #F75820;
+  color: #F75820;
 }
 
 .fc-F5531E {
-	color: #F5531E;
+  color: #F5531E;
 }
 
 .fc-FF7F00 {
-	color: #FF7F00;
+  color: #FF7F00;
 }
 
 .fc-FD5C02 {
-	color: #FD5C02;
+  color: #FD5C02;
 }
 
 .fc-F7663A {
-	color: #F7663A;
+  color: #F7663A;
 }
 
 .fc-ED301D {
-	color: #ED301D;
+  color: #ED301D;
 }
 
 .fc-F6531E {
-	color: #F6531E;
+  color: #F6531E;
 }
 
 
 .fc-FF5022 {
-	color: #FF5022;
+  color: #FF5022;
 }
 
 .fc-ADADAD {
-	color: #ADADAD;
+  color: #ADADAD;
 }
 
 .fc-65420c {
-	color: #65420c;
+  color: #65420c;
 }
 
 .fc-FE9E11 {
-	color: #FE9E11;
+  color: #FE9E11;
 }
 
 .fc-FCFBF8 {
-	color: #FCFBF8;
+  color: #FCFBF8;
 }
 
 /* 背景颜色 */
 .bgc-f {
-	background-color: #fff;
+  background-color: #fff;
 }
 
 .bgc-3 {
-	background-color: #333;
+  background-color: #333;
 }
 
 .bgc-3-6 {
-	background-color: rgba(51, 51, 51, .6);
+  background-color: rgba(51, 51, 51, .6);
 }
 
 .bgc-9 {
-	background-color: #999;
+  background-color: #999;
 }
 
 .bgc-D9D9D9 {
-	background-color: #D9D9D9;
+  background-color: #D9D9D9;
 }
 
 .bgc-4FB3EF {
-	background-color: #4FB3EF;
+  background-color: #4FB3EF;
 }
 
 .bgc-5CC2FF {
-	background-color: #5CC2FF;
+  background-color: #5CC2FF;
 }
 
 .bgc-41ABF5 {
-	background-color: #41ABF5;
+  background-color: #41ABF5;
 }
 
 .bgc-E4F3FD {
-	background-color: #E4F3FD;
+  background-color: #E4F3FD;
 }
 
 .bgc-BCEAFF {
-	background-color: #BCEAFF;
+  background-color: #BCEAFF;
 }
 
 .bgc-B3DDFB {
-	background-color: #B3DDFB;
+  background-color: #B3DDFB;
 }
 
 .bgc-ECF7FE {
-	background-color: #ECF7FE;
+  background-color: #ECF7FE;
 }
 
 .bgc-FCE7E2 {
-	background-color: #FCE7E2;
+  background-color: #FCE7E2;
 }
 
 .bgc-F5F5F6 {
-	background-color: #F5F5F6;
+  background-color: #F5F5F6;
 }
 
 .bgc-F4F5F7 {
-	background-color: #F4F5F7;
+  background-color: #F4F5F7;
 }
 
 .bgc-F2F2F2 {
-	background-color: #F2F2F2;
+  background-color: #F2F2F2;
 }
 
 .bgc-E6E6E6 {
-	background-color: #E6E6E6;
+  background-color: #E6E6E6;
 }
 
 .bgc-F6F6F6 {
-	background-color: #F6F6F6;
+  background-color: #F6F6F6;
 }
 
 .bgc-F5541E {
-	background: linear-gradient(-90deg, #F5811E, #F5541E);
+  background: linear-gradient(-90deg, #F5811E, #F5541E);
 }
 
 .bgc-FF5555 {
-	background: linear-gradient(-90deg, #FF5555, #FF1111);
+  background: linear-gradient(-90deg, #FF5555, #FF1111);
 }
 
 .bgc-48D3C5 {
-	background: linear-gradient(-90deg, #48D3C5, #26B7A7);
+  background: linear-gradient(-90deg, #48D3C5, #26B7A7);
 }
 
 .bgc-4db8ff {
-	background: linear-gradient(-90deg, #4db8ff, #1aa3ff);
+  background: linear-gradient(-90deg, #4db8ff, #1aa3ff);
 }
 
 .bgc-46D1C2 {
-	background-color: #46D1C2;
+  background-color: #46D1C2;
 }
 
 .bgc-EDF6FF {
-	background-color: #EDF6FF;
+  background-color: #EDF6FF;
 }
 
 .bgc-FD492D {
-	background-color: #FD492D;
+  background-color: #FD492D;
 }
 
 .bgc-FF3E5D {
-	background-color: #FF3E5D;
+  background-color: #FF3E5D;
 }
 
 .bgc-EB5127 {
-	background-color: #EB5127;
+  background-color: #EB5127;
 }
 
 .bgc-FCEDED {
-	background-color: #FCEDED;
+  background-color: #FCEDED;
 }
 
 .bgc-FAE5E2 {
-	background-color: #FAE5E2;
+  background-color: #FAE5E2;
 }
 
 .bgc-F5811E {
-	background-color: #F5811E;
+  background-color: #F5811E;
 }
 
 .bgc-FFD977 {
-	background-color: #FFD977;
+  background-color: #FFD977;
 }
 
 .bgc-FDF3EC {
-	background-color: #FDF3EC;
+  background-color: #FDF3EC;
 }
 
 .bgc-16BB5D {
-	background-color: #16BB5D;
+  background-color: #16BB5D;
 }
 
 
 .bgc-F5F4F9 {
-	background-color: #F5F4F9;
+  background-color: #F5F4F9;
 }
 
 .bgc-F3F4F6 {
-	background-color: #F3F4F6;
+  background-color: #F3F4F6;
 }
 
 .bgc-D5EDFB {
-	background-color: #D5EDFB;
+  background-color: #D5EDFB;
 }
 
 .b-t-F9F9F9 {
-	border-top: 1rpx solid #F9F9F9;
+  border-top: 1rpx solid #F9F9F9;
 }
 
 .b-b-F9F9F9 {
-	border-bottom: 1rpx solid #F9F9F9;
+  border-bottom: 1rpx solid #F9F9F9;
 }
 
 .b-b-eee {
-	border-bottom: .5rpx solid #eee;
+  border-bottom: .5rpx solid #eee;
 }
 
 .b-b-999 {
-	border-bottom: 1rpx solid #999;
+  border-bottom: 1rpx solid #999;
 }
 
 .b-b-EAEAEC {
-	border-bottom: 1rpx solid #EAEAEC;
+  border-bottom: 1rpx solid #EAEAEC;
 }
 
 .b-b-EDEDF1 {
-	border-bottom: 1rpx solid #EDEDF1;
+  border-bottom: 1rpx solid #EDEDF1;
 }
 
 .b-r-ccc {
-	border: 1rpx solid #ccc;
+  border: 1rpx solid #ccc;
 }
 
 
 /* 圆角 */
 .b-rad-5 {
-	border-radius: 5rpx;
+  border-radius: 5rpx;
 }
 
 .b-rad-12 {
-	border-radius: 12rpx;
+  border-radius: 12rpx;
 }
 
 .b-rad-16 {
-	border-radius: 16rpx;
+  border-radius: 16rpx;
 }
 
 .b-rad-20 {
-	border-radius: 20rpx;
+  border-radius: 20rpx;
 }
 
 .b-rad-24 {
-	border-radius: 24rpx;
+  border-radius: 24rpx;
 }
 
 .b-rad-20-20-0-0 {
-	border-radius: 20rpx 20rpx 0 0;
+  border-radius: 20rpx 20rpx 0 0;
 }
 
 .b-rad-200 {
-	border-radius: 200rpx;
+  border-radius: 200rpx;
 }
 
 .b-rad-50 {
-	border-radius: 50%;
+  border-radius: 50%;
 }
 
 /* 内边距 */
 .p-8 {
-	padding: 8rpx;
+  padding: 8rpx;
+}
+.p-12 {
+  padding: 12rpx;
 }
-
 .p-16 {
-	padding: 16rpx;
+  padding: 16rpx;
 }
 
 .p-20 {
-	padding: 20rpx;
+  padding: 20rpx;
 }
 
 .p-24 {
-	padding: 24rpx;
+  padding: 24rpx;
 }
 
 .p-30 {
-	padding: 30rpx;
+  padding: 30rpx;
 }
 
 .p-32 {
-	padding: 32rpx;
+  padding: 32rpx;
 }
 
 .pr-14 {
-	padding-right: 14rpx;
+  padding-right: 14rpx;
 }
 
 .pt-48 {
-	padding-top: 48rpx;
+  padding-top: 48rpx;
 }
 
 .p-t-4 {
-	padding-top: 4rpx;
+  padding-top: 4rpx;
 }
 
 .p-t-10 {
-	padding-top: 10rpx;
+  padding-top: 10rpx;
 }
 
 .p-t-20 {
-	padding-top: 20rpx;
+  padding-top: 20rpx;
 }
 
 .pt-15 {
-	padding-top: 15rpx;
+  padding-top: 15rpx;
 }
 
 .pt-33 {
-	padding-top: 33rpx;
+  padding-top: 33rpx;
 }
 
 .pt-40 {
-	padding-top: 40rpx;
+  padding-top: 40rpx;
 }
 
 .p-t-80 {
-	padding-top: 80rpx;
+  padding-top: 80rpx;
 }
 
 .pb-5 {
-	padding-bottom: 5rpx;
+  padding-bottom: 5rpx;
 }
 
 .pb-10 {
-	padding-bottom: 10rpx;
+  padding-bottom: 10rpx;
 }
 
 .p-b-20 {
-	padding-bottom: 20rpx;
+  padding-bottom: 20rpx;
 }
 
 .pb-36 {
-	padding-bottom: 36rpx;
+  padding-bottom: 36rpx;
 }
 
 .plr-12 {
-	padding: 0 12rpx;
+  padding: 0 12rpx;
 }
 
 .plr-10 {
-	padding: 0 10rpx;
+  padding: 0 10rpx;
 }
 
 .plr-24 {
-	padding: 0 24rpx;
+  padding: 0 24rpx;
 }
 
 .p-12-30 {
-	padding: 12rpx 30rpx;
+  padding: 12rpx 30rpx;
 }
 
 .p-40-32 {
-	padding: 40rpx 32rpx;
+  padding: 40rpx 32rpx;
 }
 
 .p-20-32 {
-	padding: 20rpx 32rpx;
+  padding: 20rpx 32rpx;
 }
 
 .p-40-32-16 {
-	padding: 40rpx 32rpx 16rpx;
+  padding: 40rpx 32rpx 16rpx;
 }
 
 .plr-30 {
-	padding: 0 30rpx;
+  padding: 0 30rpx;
 }
 
 .plr-32 {
-	padding: 0 32rpx;
+  padding: 0 32rpx;
 }
 
 .ptb-15 {
-	padding: 15rpx 0;
+  padding: 15rpx 0;
 }
 
 .ptb-22 {
-	padding: 22rpx 0;
+  padding: 22rpx 0;
 }
 
 .ptb-24 {
-	padding: 24rpx 0;
+  padding: 24rpx 0;
 }
 
 .ptb-30 {
-	padding: 30rpx 0;
+  padding: 30rpx 0;
 }
 
 .p-12-24 {
-	padding: 12rpx 24rpx;
+  padding: 12rpx 24rpx;
 }
 
 .p-28-20-39 {
-	padding: 28rpx 20rpx 39rpx
+  padding: 28rpx 20rpx 39rpx
 }
 
 .p-38-20-24 {
-	padding: 38rpx 20rpx 24rpx;
+  padding: 38rpx 20rpx 24rpx;
 }
 
 .pl-15 {
-	padding-left: 15rpx;
+  padding-left: 15rpx;
 }
 
 .pl-24 {
-	padding-left: 24rpx;
+  padding-left: 24rpx;
 }
 
 .pl-42 {
-	padding-left: 42rpx;
+  padding-left: 42rpx;
 }
 
 
 .pr-24 {
-	padding-right: 24rpx;
+  padding-right: 24rpx;
 }
 
 /* 外边距 */
 .m-24 {
-	margin: 24rpx;
+  margin: 24rpx;
 }
 
 .mt-4 {
-	margin-top: 4rpx;
+  margin-top: 4rpx;
 }
 
 .mt-5 {
-	margin-top: 5rpx;
+  margin-top: 5rpx;
 }
 
 .mt-20 {
-	margin-top: 20rpx;
+  margin-top: 20rpx;
 }
 
 .mt-24 {
-	margin-top: 24rpx;
+  margin-top: 24rpx;
 }
 
 .ml-2 {
-	margin-left: 2rpx;
+  margin-left: 2rpx;
 }
 
 .ml-8 {
-	margin-left: 8rpx;
+  margin-left: 8rpx;
 }
 
 .ml-10 {
-	margin-left: 10rpx;
+  margin-left: 10rpx;
 }
 
 .ml-16 {
-	margin-left: 16rpx;
+  margin-left: 16rpx;
 }
 
 .ml-40 {
-	margin-left: 40rpx;
+  margin-left: 40rpx;
 }
 
 .mr-4 {
-	margin-right: 4rpx;
+  margin-right: 4rpx;
 }
 
 .mr-6 {
-	margin-right: 6rpx;
+  margin-right: 6rpx;
 }
 
 .mr-8 {
-	margin-right: 8rpx;
+  margin-right: 8rpx;
 }
 
 .mr-10 {
-	margin-right: 10rpx;
+  margin-right: 10rpx;
 }
 
 .mr-12 {
-	margin-right: 12rpx;
+  margin-right: 12rpx;
 }
 
 .mr-14 {
-	margin-right: 14rpx;
+  margin-right: 14rpx;
 }
 
 .mr-16 {
-	margin-right: 16rpx;
+  margin-right: 16rpx;
 }
 
 .mr-18 {
-	margin-right: 18rpx;
+  margin-right: 18rpx;
 }
 
 .mr-20 {
-	margin-right: 20rpx;
+  margin-right: 20rpx;
 }
 
 .mr-24 {
-	margin-right: 24rpx;
+  margin-right: 24rpx;
 }
 
 .mr-30 {
-	margin-right: 30rpx;
+  margin-right: 30rpx;
 }
 
 .mr-36 {
-	margin-right: 36rpx;
+  margin-right: 36rpx;
 }
 
 .mr-40 {
-	margin-right: 40px;
+  margin-right: 40px;
 }
 
 .mr-46 {
-	margin-right: 46rpx;
+  margin-right: 46rpx;
 }
 
 .mr-50 {
-	margin-right: 50rpx;
+  margin-right: 50rpx;
 }
 
 .mb-2 {
-	margin-bottom: 2rpx;
+  margin-bottom: 2rpx;
 }
 
 .mb-4 {
-	margin-bottom: 4rpx;
+  margin-bottom: 4rpx;
 }
 
 .mb-8 {
-	margin-bottom: 8rpx;
+  margin-bottom: 8rpx;
 }
 
 .mb-10 {
-	margin-bottom: 10rpx;
+  margin-bottom: 10rpx;
 }
 
 .mb-12 {
-	margin-bottom: 12rpx;
+  margin-bottom: 12rpx;
 }
 
 .mb-16 {
-	margin-bottom: 16rpx;
+  margin-bottom: 16rpx;
 }
 
 .mb-18 {
-	margin-bottom: 18rpx;
+  margin-bottom: 18rpx;
 }
 
 .mb-20 {
-	margin-bottom: 20rpx;
+  margin-bottom: 20rpx;
 }
 
 .mb-22 {
-	margin-bottom: 22rpx;
+  margin-bottom: 22rpx;
 }
 
 .mb-24 {
-	margin-bottom: 24rpx;
+  margin-bottom: 24rpx;
 }
 
 .mb-26 {
-	margin-bottom: 26rpx;
+  margin-bottom: 26rpx;
 }
 
 .mb-28 {
-	margin-bottom: 28rpx;
+  margin-bottom: 28rpx;
 }
 
 .mb-30 {
-	margin-bottom: 30rpx;
+  margin-bottom: 30rpx;
 }
 
 .mb-32 {
-	margin-bottom: 32rpx;
+  margin-bottom: 32rpx;
 }
 
 .mb-40 {
-	margin-bottom: 40rpx;
+  margin-bottom: 40rpx;
 }
 
 .mb-48 {
-	margin-bottom: 48rpx;
+  margin-bottom: 48rpx;
 }
 
 .mb-50 {
-	margin-bottom: 50rpx;
+  margin-bottom: 50rpx;
 }
 
 .mb-52 {
-	margin-bottom: 52rpx;
+  margin-bottom: 52rpx;
 }
 
 .mb-60 {
-	margin-bottom: 60rpx;
+  margin-bottom: 60rpx;
 }
 
 .mb-64 {
-	margin-bottom: 64rpx;
+  margin-bottom: 64rpx;
 }
 
 .mb-80 {
-	margin-bottom: 80rpx;
+  margin-bottom: 80rpx;
 }
 
 /* 宽度 */
 .w-100 {
-	width: 100rpx;
+  width: 100rpx;
 }
 
 .w-200 {
-	width: 200rpx;
+  width: 200rpx;
 }
 
 .w-10030 {
-	width: 30%;
+  width: 30%;
 }
 
 .b-b-F0 {
-	border-bottom: 1rpx solid #F0F0F0;
+  border-bottom: 1rpx solid #F0F0F0;
 }
 
 .b-b-EFF2F5 {
-	border-bottom: 1rpx solid #EFF2F5;
+  border-bottom: 1rpx solid #EFF2F5;
 }
 
 .b-F5541E {
-	border: 1rpx solid #F5541E;
+  border: 1rpx solid #F5541E;
 }
 
 .b-FFD7CC {
-	border: 2rpx solid #FFD7CC;
-}
+  border: 2rpx solid #FFD7CC;
+}

common/js/system-info.js

@@ -0,0 +1,70 @@
+/**
+ * 此js文件管理关于当前设备的机型系统信息
+ */
+const systemInfo = function() {
+	/****************** 所有平台共有的系统信息 ********************/
+	// 设备系统信息
+	let systemInfomations = uni.getSystemInfoSync()
+	// 机型适配比例系数
+	let scaleFactor = 750 / systemInfomations.windowWidth
+	// 当前机型-屏幕高度
+	let windowHeight = systemInfomations.windowHeight * scaleFactor //rpx
+	// 当前机型-屏幕宽度
+	let windowWidth = systemInfomations.windowWidth * scaleFactor //rpx
+	// 状态栏高度
+	let statusBarHeight = (systemInfomations.statusBarHeight) * scaleFactor //rpx
+ 
+	// 导航栏高度  注意：此导航栏高度只针对微信小程序有效 其他平台如自定义导航栏请使用：状态栏高度+自定义文本高度
+	let navHeight = 0 //rpx
+	// console.log(windowHeight,'哈哈哈哈哈');
+	
+	/****************** 微信小程序头部胶囊信息 ********************/
+	// #ifdef MP-WEIXIN
+	const menuButtonInfo = wx.getMenuButtonBoundingClientRect()
+	// 胶囊高度
+	let menuButtonHeight = menuButtonInfo.height * scaleFactor //rpx
+	// 胶囊宽度
+	let menuButtonWidth = menuButtonInfo.width * scaleFactor //rpx
+	// 胶囊上边界的坐标
+	let menuButtonTop = menuButtonInfo.top * scaleFactor //rpx
+	// 胶囊右边界的坐标
+	let menuButtonRight = menuButtonInfo.right * scaleFactor //rpx
+	// 胶囊下边界的坐标
+	let menuButtonBottom = menuButtonInfo.bottom * scaleFactor //rpx
+	// 胶囊左边界的坐标
+	let menuButtonLeft = menuButtonInfo.left * scaleFactor //rpx
+ 
+	// 微信小程序中导航栏高度 = 胶囊高度 + (顶部距离 - 状态栏高度) * 2
+	navHeight = menuButtonHeight + (menuButtonTop - statusBarHeight) * 2
+	// #endif
+ 
+ 
+	// #ifdef MP-WEIXIN
+	return {
+		scaleFactor,
+		windowHeight,
+		windowWidth,
+		statusBarHeight,
+		menuButtonHeight,
+		menuButtonWidth,
+		menuButtonTop,
+		menuButtonRight,
+		menuButtonBottom,
+		menuButtonLeft,
+		navHeight
+	}
+	// #endif
+ 
+	// #ifndef MP-WEIXIN
+	return {
+		scaleFactor,
+		windowHeight,
+		windowWidth,
+		statusBarHeight
+	}
+	// #endif
+}
+ 
+export {
+	systemInfo
+}

components/en-utils/new-nav/new-nav.vue

@@ -0,0 +1,299 @@
+<template>
+  <view>
+    <!-- 微信小程序头部导航栏 -->
+    <!-- #ifdef MP-WEIXIN -->
+    <view class="wx-head-mod" :style="{height:navHeight+'rpx',backgroundColor:navBackgroundColor}">
+      <view class="wx-head-mod-nav" :style="{height:navigationBarHeight+'rpx',top:statusBarHeight+'rpx'}">
+        <view class="wx-head-mod-nav-content"
+          :style="{height:customHeight+'rpx',justifyContent:textAlign === 'center'?'center':'left'}">
+          <!-- 文本区 -->
+          <view v-if="textType" class="wx-head-mod-nav-content-mian"
+            :style="{width:navTextWidth,lineHeight:customHeight + 'rpx',paddingLeft:textPaddingLeft*scaleFactor+'rpx',fontSize:fontSize*scaleFactor+'rpx',fontWeight:fontWeight,color:titleColor}">
+            {{textContent}}
+          </view>
+          <view v-else class="">
+          	<slot name="textContent"></slot>
+          </view>
+          <!-- 返回按钮 -->
+          <view v-if="leftShow" class="wx-head-mod-nav-content-back" :style="{display:isBackShow?'flex':'none'}" @click="backEvent">
+            <view class="wx-head-mod-nav-content-back-img"
+              :style="{width:backImageWidth*scaleFactor+'rpx',height:backImageHeight*scaleFactor+'rpx'}">
+              <uni-icons type="left" size="25" :color="leftIconColor"></uni-icons>
+              <!-- <image :src="backImageUrl" mode="" style="width: 100%;height: 100%;"></image> -->
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view :style="{height:navHeight+'rpx',backgroundColor:navBackgroundColor}">
+      
+    </view>
+    <!-- #endif -->
+
+    <!-- 除微信小程序之外的其他设备 -->
+    <!-- #ifndef MP-WEIXIN -->
+    <view class="other-head-mod"
+      :style="{height:navHeightValue*scaleFactor+statusBarHeight+'rpx',backgroundColor:navBackgroundColor}">
+      <view class="other-head-mod-mian"
+        :style="{height:navHeightValue*scaleFactor+'rpx',justifyContent:textAlign === 'center'?'center':'left'}">
+        <!-- 返回按钮 -->
+        <view class="other-head-mod-mian-back" v-show="isBackShow" @click="backEvent">
+          <view class="other-head-mod-mian-back-img"
+            :style="{width:backImageWidth*scaleFactor+'rpx',height:backImageHeight*scaleFactor+'rpx'}">
+            <image :src="backImageUrl" mode="" style="width: 100%;height: 100%;"></image>
+          </view>
+        </view>
+        <!-- 标题 -->
+        <view class="other-head-mod-mian-title" :style="{width:windowWidth - 184+'rpx',lineHeight:navHeightValue*scaleFactor+'rpx',
+					paddingLeft:textPaddingLeft*scaleFactor+'rpx',fontSize:fontSize*scaleFactor+'rpx',
+					fontWeight:fontWeight,color:titleColor}">
+          {{textContent}}
+        </view>
+      </view>
+    </view>
+    <!-- #endif -->
+  </view>
+</template>
+
+<script>
+  const app = getApp()
+  import {
+    systemInfo
+  } from '@/common/js/system-info.js'
+  export default {
+    name: "HeadView",
+    props: {
+      // 文本区域位置 left：左  center：中  
+      textAlign: {
+        type: String,
+        default: 'center'
+      },
+      // 文本区内容显示状态
+      textType: {
+        type: Boolean,
+        default: true
+      },
+      // 文本区内容
+      textContent: {
+        type: String,
+        default: '哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈就啊哈哈好借好还'
+      },
+      // 文本区离左边的距离
+      textPaddingLeft: {
+        type: Number,
+        default: 16
+      },
+      // 是否需要返回按钮
+      isBackShow: {
+        type: Boolean,
+        default: true
+      },
+      // 文本区字体大小
+      fontSize: {
+        type: Number,
+        default: 20 //px
+      },
+      // 文本区字体粗细
+      fontWeight: {
+        type: Number,
+        default: 700
+      },
+      // 文本区返回按钮图片宽
+      backImageWidth: {
+        type: Number,
+        default: 12 //px
+      },
+      // 文本区返回按钮图片高
+      backImageHeight: {
+        type: Number,
+        default: 24 //px
+      },
+      // 返回按钮是否显示
+      leftShow: {
+        type: Boolean,
+        default: true
+      },
+      // 返回按钮图标颜色
+      leftIconColor: {
+        type: String,
+        default: '#fff' 
+      },
+      // 返回按钮图标路径
+      backImageUrl: {
+        type: String,
+        default: '/static/img/toLeft.png'
+      },
+      // 导航栏整体背景颜色
+      navBackgroundColor: {
+        type: String,
+        default: 'transparent'
+      },
+      // 标题字体颜色
+      titleColor: {
+        type: String,
+        default: '#ffffff',
+      },
+
+      /******** h5端，app端需要传入自定义导航栏高度 *******/
+      navHeightValue: {
+        type: Number,
+        default: 44 //px
+      }
+    },
+    computed: {
+      // 文本区宽度
+      navTextWidth() {
+        if (this.textAlign === 'center') {
+          return (this.windowWidth - (this.windowWidth - this.menubarLeft) * 2) + 'rpx'
+        } else {
+          return this.menubarLeft + 'rpx'
+        }
+      },
+      // 文本区paddingLeft
+      textPaddingleft() {
+        if (this.textAlign === 'center') {
+          return '0'
+        } else {
+          return this.textPaddingLeft + 'rpx'
+        }
+      }
+    },
+    data() {
+      return {
+        statusBarHeight: app.globalData.statusBarHeight, //状态栏高度
+        navHeight: app.globalData.navHeight, //头部导航栏总体高度
+        navigationBarHeight: app.globalData.navigationBarHeight, //导航栏高度
+        customHeight: app.globalData.customHeight, //胶囊高度
+        scaleFactor: app.globalData.scaleFactor, //比例系数
+        menubarLeft: app.globalData.menubarLeft, //胶囊定位的左边left
+        windowWidth: app.globalData.windowWidth * app.globalData.scaleFactor
+      };
+    },
+    methods: {
+      backEvent() {
+        uni.navigateBack({
+          delta: 1
+        })
+      }
+    },
+    created() {
+      /* 获取设备信息 */
+      const SystemInfomations = systemInfo()
+      /* 通用平台 */
+      this.statusBarHeight = SystemInfomations.statusBarHeight //状态栏高度
+      this.scaleFactor = SystemInfomations.scaleFactor //比例系数
+      this.windowWidth = SystemInfomations.windowWidth //当前设备的屏幕宽度
+      /* 微信小程序平台 */
+      // #ifdef MP-WEIXIN
+      this.navHeight = SystemInfomations.navHeight + SystemInfomations.statusBarHeight //头部导航栏总高度
+      this.navigationBarHeight = SystemInfomations.navHeight //头部导航栏高度
+      this.customHeight = SystemInfomations.menuButtonHeight //胶囊高度
+      this.menubarLeft = SystemInfomations.menuButtonLeft //胶囊左边界距离左上角的距离
+      // #endif
+
+    }
+  }
+</script>
+
+<style>
+  /* #ifdef MP-WEIXIN */
+  .wx-head-mod {
+    box-sizing: border-box;
+    width: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+  }
+
+  .wx-head-mod-nav {
+    box-sizing: border-box;
+    width: 100%;
+    position: absolute;
+    left: 0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+  }
+
+  .wx-head-mod-nav-content {
+    box-sizing: border-box;
+    width: 100%;
+    display: flex;
+    justify-content: left;
+    align-items: center;
+    position: relative;
+  }
+
+  /* 文本区 */
+  .wx-head-mod-nav-content-mian {
+    box-sizing: border-box;
+    height: 100%;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+  }
+
+  /* 返回按钮 */
+  .wx-head-mod-nav-content-back {
+    box-sizing: border-box;
+    width: 60rpx;
+    height: 100%;
+    /* background-color: aqua; */
+    position: absolute;
+    top: 0;
+    left: 32rpx;
+    display: flex;
+    align-items: center;
+    justify-content: left;
+  }
+
+  .wx-head-mod-nav-content-back-img {
+    box-sizing: border-box;
+  }
+
+  /* #endif */
+
+  /* #ifndef MP-WEIXIN */
+  .other-head-mod {
+    box-sizing: border-box;
+    width: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+  }
+
+  .other-head-mod-mian {
+    box-sizing: border-box;
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: left;
+    position: absolute;
+    left: 0;
+    bottom: 0;
+  }
+
+  /* 返回按钮 */
+  .other-head-mod-mian-back {
+    box-sizing: border-box;
+    height: 100%;
+    width: 60rpx;
+    position: absolute;
+    left: 32rpx;
+    top: 0;
+    display: flex;
+    align-items: center;
+  }
+
+  /* 标题 */
+  .other-head-mod-mian-title {
+    box-sizing: border-box;
+    height: 100%;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+  }
+
+  /* #endif */
+</style>

main.js

@@ -2,8 +2,8 @@ import '.env.js'
 import App from './App'
 //引入前置路由颜值
 import {
-	router,
-	RouterMount
+  router,
+  RouterMount
 } from './service/router.js' //路径换成自己的
 Vue.use(router)
 
@@ -12,15 +12,17 @@ Vue.use(router)
 import Vue from 'vue'
 import store from './store'
 import Nav from './components/en-utils/en-nav/en-nav.vue'
+import newNav from './components/en-utils/new-nav/new-nav.vue'
 import share from './common/js/share.js'
 Vue.mixin(share)
 Vue.component('Nav', Nav)
+Vue.component('newNav', newNav)
 Vue.config.productionTip = false
 App.mpType = 'app'
 const app = new Vue({
-	...App,
-	store,
-	share
+  ...App,
+  store,
+  share
 })
 // app.$mount()
 
@@ -37,12 +39,12 @@ app.$mount(); //为了兼容小程序及app端必须这样写才有效果
 
 // #ifdef VUE3
 import {
-	createSSRApp
+  createSSRApp
 } from 'vue'
 export function createApp() {
-	const app = createSSRApp(App)
-	return {
-		app,
-	}
+  const app = createSSRApp(App)
+  return {
+    app,
+  }
 }
-// #endif
+// #endif

package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "school_webUserV2",
+  "name": "zh_order_food_xcx",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {

pages-takeout/shop.vue

@@ -1,805 +1,793 @@
 <template>
-	<view class="shop-index iPhone-bottom flex-common-css box-border-box">
-		<image class="bg-img" :src="shopsInfo.shop_logo" mode="aspectFill"></image>
-		<view class="mb-box"></view>
-		<view class="nav-box">
-			<Nav :leftShow='false' :customNav='true' bgckgroundBox='transparent'>
-				<template>
-					<view slot="custom" class="">
-						<image class="nav-img" @click="toBack()" src="@/static/img/takeout/bg-back.png"
-							mode="scaleToFill"></image>
-					</view>
-				</template>
-			</Nav>
-		</view>
-		<view class="head-box bgc-f box-border-box plr-24" :style="{height:domHeigjt + 'rpx'}">
-			<view id="shopInfoBox" class="shop-info-box bgc-f box-border-box p-24">
-				<view class="info-box-top flex-justify-space mb-10">
-					<view class="box-top-left">
-						<view class="top-left-1 fs-40 fw-600 text-overflow-ellipsis">
-							{{shopsInfo.shop_name || ""}}
-						</view>
-						<view class="align-items-center mb-8">
-							<image class="img-x mr-12" src="@/static/img/index/index-x.png" mode=""></image>
-							<view class="fs-26 fw-600 fc-FF7F00 mr-12">{{shopsInfo.shop_score|| ""}}分</view>
-							<view class="fc-6 fs-24 mr-12">| 预计{{shopsInfo.delivery_time||""}}分钟 |</view>
-							<view class="fc-6 fs-24 mr-12">{{shopsInfo.shop_sales||0}}人购买</view>
-						</view>
-					</view>
-					<image class="box-top-right" :src="shopsInfo.shop_logo" mode="scaleToFill"></image>
-				</view>
-				<view class="fs-24 fw-400 fc-9 text-overflow-ellipsis-one">
-					公告：{{shopsInfo.notice||""}}
-				</view>
-				<view class="flex-wrap-wrap p-t-20" v-if="couponData.length>0">
-					<view class="" v-for="(item,i) in couponData" :key="i" @click="openCoupon">
-						<view class="info-box-quan-list" v-if="i<=2">
-							<image src="@/static/img/takeout/quan-bg.png" mode=""></image>
-							<view class="quan-list-1 fw-b fs-32 fc-f">
-								<span class="fw-b fs-20 fc-f">￥</span>{{item.money}}
-							</view>
-							<view class="quan-list-2 fw-400 fs-24 fc-f">领</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="head-box-1 bgc-f box-border-box plr-24">
-			<view class="align-items-center shop-type-list">
-				<view class="shop-item fs-36" @click="seletShopType(item)"
-					:class="shopType === item.id?'s-item':'n-item'" v-for="(item,i) in shopTypeList" :key="i">
-					{{item.name}}
-					<!-- <view v-if="item.id == 2" class="pj-num" :class="shopType === item.id?'s-item':'n-item'">999+</view> -->
-				</view>
-				<view class="shop-item-bs" :style="{left:shopTypeBsLeft+'rpx'}"></view>
-			</view>
-		</view>
-		<view class="common-view-css bgc-f" style="overflow: hidden;">
-			<Menu style="height: 100%;" v-if="shopType === 1" :shop_id="shop_id" @setCartData="setCartData"
-				ref="goodsMenu">
-			</Menu>
-			<Evaluate style="height: 100%;" :shopId='shop_id' :shopScore='shopsInfo.shop_score'
-				v-else-if="shopType === 2">
-			</Evaluate>
-			<ShopInfo style="height: 100%;" :shopId='shop_id' v-else-if="shopType === 3"></ShopInfo>
-		</view>
-		<view v-if="shopType === 1" class="shop-buttom-money box-border-box" @click="openBuyCrad()">
-			<view class="shop-buttom-money-1 flex-justify-space align-items-center">
-				<image src="@/static/img/takeout/buy-icon.png" mode="scaleToFill"></image>
-				<view class="shop-buttom-num fs-24 fc-f text-align-center">{{cartData.total_num}}</view>
-				<view class="">
-					<view class="">
-						<span class="fw-600 fs-24 fc-f">￥</span>
-						<span class="fw-600 fs-44 fc-f">{{cartData.total_price}}</span>
-					</view>
-					<view class="fs-24 fc-ADADAD" v-if="delivery_money<=0">免配送</view>
-					<view class="fs-24 fc-f" v-else>配送费￥{{delivery_money}}</view>
-				</view>
-				<view v-if="cartData.is_place_order===1" class="shop-buttom-money-2 text-align-center fc-f fs-32 fw-600"
-					@click.stop="toConfirmOrder()">去结算
-				</view>
-				<view v-else class="err-msg fs-32 fw-600 fc-f mr-30" @click.stop="mustBut">{{cartData.err_msg}}</view>
-			</view>
-		</view>
-		<uni-popup ref="popupBuy" type="bottom" background-color="#fff">
-			<view class="buy-card flex-index-css">
-				<view class="buy-card-top box-border-box plr-32 flex-justify-space align-items-center">
-					<view class="">
-						<span class="fs-32 fc-3 mr-12">已选商品</span>
-						<span class="fs-32 fc-9">(打包费<span class="fs-32 fc-FB3D03">{{cartData.pack_price}}元</span>)</span>
-					</view>
-					<view class="fs-28 fw-400 fc-9 align-items-center" @click.stop="setShopIngDel">
-						<view class="">
-							<uni-icons type="trash" size="18" color="#999"></uni-icons>
-						</view>
-						<view class="fs-28 fw-400 fc-9">清空</view>
-					</view>
-				</view>
-				<view class="scroll-view-css box-border-box p-32">
-					<view class="buy-card-item display-flex" v-for="(goods,i) in cartData.goods_list" :key="i">
-						<image class="goods_img" :src="goods.goods_image" mode="scaleToFill"></image>
-						<view class="flex-1">
-							<view class="w-514 text-overflow-ellipsis-one fs-34 fw-600 mb-12">
-								{{goods.goods_name}}
-							</view>
-							<view class="w-514 text-overflow-ellipsis-one fs-24 fw-400 mb-18" :class="goods.status_str?'fc-FD5C02':'fc-9'">
-								{{goods.status_str?goods.status_str:goods.goods_attr}}
-							</view>
-							<view class="flex-justify-space">
-								<view class="">
-									<span class="fs-24 fc-FB3D03 fw-400">￥</span>
-									<span class="fs-40 fc-FB3D03 fw-b">{{goods.price}}</span>
-								</view>
-								<view class="display-flex align-items-center">
-									<image class="wh-44" @click.stop="setShoppingSave(goods,2)"
-										src="@/static/img/takeout/j.png" mode="">
-									</image>
-									<view class="right-only-right-2 text-align-center fs-28 fw-400">
-										{{goods.goods_number}}
-									</view>
-									<image class="wh-44" src="@/static/img/takeout/add.png"
-										@click.stop="setShoppingSave(goods,1)" mode=""></image>
-								</view>
-							</view>
-						</view>
-					</view>
-					<en-blank v-if="cartData.goods_list.length<=0" message="快去选购商品吧！~"></en-blank>
-				</view>
-				<view class="shop-buttom-money box-border-box" @click="createOrder()">
-					<view class="shop-buttom-money-1 flex-justify-space align-items-center">
-						<image src="@/static/img/takeout/buy-icon.png" mode="scaleToFill"></image>
-						<view class="shop-buttom-num fs-24 fc-f text-align-center">{{cartData.total_num}}</view>
-						<view class="">
-							<view class="">
-								<span class="fw-600 fs-24 fc-f">￥</span>
-								<span class="fw-600 fs-44 fc-f">{{cartData.total_price}}</span>
-							</view>
-							<view class="fs-24 fc-ADADAD" v-if="delivery_money<=0">免配送</view>
-							<view class="fs-24 fc-f" v-else>配送费￥{{delivery_money}}</view>
-						</view>
-						<view v-if="cartData.is_place_order===1"
-							class="shop-buttom-money-2 text-align-center fs-32 fc-f fw-600"
-							@click.stop="toConfirmOrder()">
-							去结算</view>
-						<view class="fs-32 fw-600 fc-f mr-30" v-else>{{cartData.err_msg}}</view>
-					</view>
-				</view>
-			</view>
-		</uni-popup>
-		<uni-popup ref="popupCoupon" type="bottom">
-			<view class="pop-coupon box-border-box p-24">
-				<view class="text-align-center fs-36 fw-600 box-title mb-32">
-					本店优惠券
-					<uni-icons @click="closeCoupon" class="box-close" type="closeempty" size="20"></uni-icons>
-				</view>
-				<view class="scroll-view-css">
-					<view v-if="couponData<= 0" class="blank-text fs-32 fc-6 text-align-center">
-						暂无优惠券
-					</view>
-					<!-- 					<EnBlank :customSrc='true' v-if="couponData<= 0">
+  <view class="shop-index iPhone-bottom flex-common-css box-border-box">
+    <image class="bg-img" src="@/static/img/order-food/shop-top.png" mode="aspectFill"></image>
+<!--    <Nav :leftShow='false' :customNav='true' bgckgroundBox='transparent' class="z-3 mb-32">
+      <template>
+        <view slot="custom" class="align-items-flex-end">
+          <view class="ss-box b-rad-50 mr-24 align-items-center flex-justify-center">
+            <image class="shop-search" src="@/static/img/order-food/shop-search.png" mode=""></image>
+          </view>
+          <view class="dd-box mr-24">
+            
+          </view>
+        </view>
+      </template>
+    </Nav> -->
+    <newNav :leftShow="false" :textType='false' class="z-3 mb-32">
+      <view slot="textContent" class="align-items-flex-end">
+        <view class="ss-box b-rad-50 mr-24 align-items-center flex-justify-center">
+          <image class="shop-search" src="@/static/img/order-food/shop-search.png" mode=""></image>
+        </view>
+        <view class="dd-box mr-24">
+          
+        </view>
+      </view>
+    </newNav>
+    <view class="bgc-f box-border-box plr-24 mb-32">
+      <view class="shop-info-box bgc-f box-border-box p-24 z-3 .b-rad-20">
+        <view class="fs-40 fw-600 text-overflow-ellipsis mb-16">
+          {{shopsInfo.shop_name || "山海鲜熬老灶麻辣火锅辣火锅辣火11 世家匠心传承店川"}}
+        </view>
+        <view class="fs-24 fw-400 fc-9 text-overflow-ellipsis-one">
+          公告：{{shopsInfo.notice||"第二份半价是同时下相同商品的第二份可享受半价受"}}
+        </view>
+      </view>
+    </view>
+    <!--   <view class="head-box bgc-f box-border-box plr-24">
+      <view id="shopInfoBox" class="shop-info-box bgc-f box-border-box p-24">
+        <view class="top-left-1 fs-40 fw-600 text-overflow-ellipsis">
+          {{shopsInfo.shop_name || "山海鲜熬老灶麻辣火锅辣火锅辣火11 世家匠心传承店川"}}
+        </view>
+        <view class="fs-24 fw-400 fc-9 text-overflow-ellipsis-one">
+          公告：{{shopsInfo.notice||"第二份半价是同时下相同商品的第二份可享受半价受"}}
+        </view>
+      </view>
+    </view> -->
+    <!--    <view class="head-box-1 bgc-f box-border-box plr-24">
+      <view class="align-items-center shop-type-list">
+        <view class="shop-item fs-36" @click="seletShopType(item)" :class="shopType === item.id?'s-item':'n-item'"
+          v-for="(item,i) in shopTypeList" :key="i">
+          {{item.name}}
+        </view>
+        <view class="shop-item-bs" :style="{left:shopTypeBsLeft+'rpx'}"></view>
+      </view>
+    </view> -->
+    <view class="common-view-css bgc-f" style="overflow: hidden;">
+      <Menu style="height: 100%;" v-if="shopType === 1" :shop_id="shop_id" @setCartData="setCartData" ref="goodsMenu">
+      </Menu>
+      <Evaluate style="height: 100%;" :shopId='shop_id' :shopScore='shopsInfo.shop_score' v-else-if="shopType === 2">
+      </Evaluate>
+      <ShopInfo style="height: 100%;" :shopId='shop_id' v-else-if="shopType === 3"></ShopInfo>
+    </view>
+    <view v-if="shopType === 1" class="shop-buttom-money box-border-box" @click="openBuyCrad()">
+      <view class="shop-buttom-money-1 flex-justify-space align-items-center">
+        <image src="@/static/img/takeout/buy-icon.png" mode="scaleToFill"></image>
+        <view class="shop-buttom-num fs-24 fc-f text-align-center">{{cartData.total_num}}</view>
+        <view class="">
+          <view class="">
+            <span class="fw-600 fs-24 fc-f">￥</span>
+            <span class="fw-600 fs-44 fc-f">{{cartData.total_price}}</span>
+          </view>
+          <view class="fs-24 fc-ADADAD" v-if="delivery_money<=0">免配送</view>
+          <view class="fs-24 fc-f" v-else>配送费￥{{delivery_money}}</view>
+        </view>
+        <view v-if="cartData.is_place_order===1" class="shop-buttom-money-2 text-align-center fc-f fs-32 fw-600"
+          @click.stop="toConfirmOrder()">去结算
+        </view>
+        <view v-else class="err-msg fs-32 fw-600 fc-f mr-30" @click.stop="mustBut">{{cartData.err_msg}}</view>
+      </view>
+    </view>
+    <uni-popup ref="popupBuy" type="bottom" background-color="#fff">
+      <view class="buy-card flex-index-css">
+        <view class="buy-card-top box-border-box plr-32 flex-justify-space align-items-center">
+          <view class="">
+            <span class="fs-32 fc-3 mr-12">已选商品</span>
+            <span class="fs-32 fc-9">(打包费<span class="fs-32 fc-FB3D03">{{cartData.pack_price}}元</span>)</span>
+          </view>
+          <view class="fs-28 fw-400 fc-9 align-items-center" @click.stop="setShopIngDel">
+            <view class="">
+              <uni-icons type="trash" size="18" color="#999"></uni-icons>
+            </view>
+            <view class="fs-28 fw-400 fc-9">清空</view>
+          </view>
+        </view>
+        <view class="scroll-view-css box-border-box p-32">
+          <view class="buy-card-item display-flex" v-for="(goods,i) in cartData.goods_list" :key="i">
+            <image class="goods_img" :src="goods.goods_image" mode="scaleToFill"></image>
+            <view class="flex-1">
+              <view class="w-514 text-overflow-ellipsis-one fs-34 fw-600 mb-12">
+                {{goods.goods_name}}
+              </view>
+              <view class="w-514 text-overflow-ellipsis-one fs-24 fw-400 mb-18"
+                :class="goods.status_str?'fc-FD5C02':'fc-9'">
+                {{goods.status_str?goods.status_str:goods.goods_attr}}
+              </view>
+              <view class="flex-justify-space">
+                <view class="">
+                  <span class="fs-24 fc-FB3D03 fw-400">￥</span>
+                  <span class="fs-40 fc-FB3D03 fw-b">{{goods.price}}</span>
+                </view>
+                <view class="display-flex align-items-center">
+                  <image class="wh-44" @click.stop="setShoppingSave(goods,2)" src="@/static/img/takeout/j.png" mode="">
+                  </image>
+                  <view class="right-only-right-2 text-align-center fs-28 fw-400">
+                    {{goods.goods_number}}
+                  </view>
+                  <image class="wh-44" src="@/static/img/takeout/add.png" @click.stop="setShoppingSave(goods,1)"
+                    mode=""></image>
+                </view>
+              </view>
+            </view>
+          </view>
+          <en-blank v-if="cartData.goods_list.length<=0" message="快去选购商品吧！~"></en-blank>
+        </view>
+        <view class="shop-buttom-money box-border-box" @click="createOrder()">
+          <view class="shop-buttom-money-1 flex-justify-space align-items-center">
+            <image src="@/static/img/takeout/buy-icon.png" mode="scaleToFill"></image>
+            <view class="shop-buttom-num fs-24 fc-f text-align-center">{{cartData.total_num}}</view>
+            <view class="">
+              <view class="">
+                <span class="fw-600 fs-24 fc-f">￥</span>
+                <span class="fw-600 fs-44 fc-f">{{cartData.total_price}}</span>
+              </view>
+              <view class="fs-24 fc-ADADAD" v-if="delivery_money<=0">免配送</view>
+              <view class="fs-24 fc-f" v-else>配送费￥{{delivery_money}}</view>
+            </view>
+            <view v-if="cartData.is_place_order===1" class="shop-buttom-money-2 text-align-center fs-32 fc-f fw-600"
+              @click.stop="toConfirmOrder()">
+              去结算</view>
+            <view class="fs-32 fw-600 fc-f mr-30" v-else>{{cartData.err_msg}}</view>
+          </view>
+        </view>
+      </view>
+    </uni-popup>
+    <uni-popup ref="popupCoupon" type="bottom">
+      <view class="pop-coupon box-border-box p-24">
+        <view class="text-align-center fs-36 fw-600 box-title mb-32">
+          本店优惠券
+          <uni-icons @click="closeCoupon" class="box-close" type="closeempty" size="20"></uni-icons>
+        </view>
+        <view class="scroll-view-css">
+          <view v-if="couponData<= 0" class="blank-text fs-32 fc-6 text-align-center">
+            暂无优惠券
+          </view>
+          <!-- 					<EnBlank :customSrc='true' v-if="couponData<= 0">
 						<template v-slot:blankImg>
 							<image class="black-img" src="@/static/img/common/no-order.png" mode=""></image>
 						</template>
 					</EnBlank> -->
-					<view class="item-box display-flex mb-20" v-for="(item,index) in couponData" :key="index">
-						<view class="item-right flex-direction flex-justify-center flex-1 bgc-f">
-							<view class="fs-28 mb-12 ticket-name text-overflow-ellipsis fc-3 fw-600">
-								{{item.name}}
-							</view>
-							<view class="fs-24 fc-6">
-								有效时间：{{item.time_type_str}}
-							</view>
-						</view>
-						<view class="item-hr"></view>
-						<view class="item-left flex-direction align-items-center flex-justify-center bgc-FCE7E2">
-							<view class="align-items-center">
-								<view class="fs-30 fw-600 fc-FB3D03">￥</view>
-								<view class="fs-48 fw-600 fc-FB3D03">{{item.money}}</view>
-							</view>
-							<view class="fs-24 mb-18 fc-6">
-								满{{item.full_money}}可用
-							</view>
-							<view class="but-box fs-28 fc-f" @click="receiveCode(item)">
-								立即领取
-							</view>
-							<view class="ball"></view>
-							<view class="ball-two"></view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</uni-popup>
-	</view>
+          <view class="item-box display-flex mb-20" v-for="(item,index) in couponData" :key="index">
+            <view class="item-right flex-direction flex-justify-center flex-1 bgc-f">
+              <view class="fs-28 mb-12 ticket-name text-overflow-ellipsis fc-3 fw-600">
+                {{item.name}}
+              </view>
+              <view class="fs-24 fc-6">
+                有效时间：{{item.time_type_str}}
+              </view>
+            </view>
+            <view class="item-hr"></view>
+            <view class="item-left flex-direction align-items-center flex-justify-center bgc-FCE7E2">
+              <view class="align-items-center">
+                <view class="fs-30 fw-600 fc-FB3D03">￥</view>
+                <view class="fs-48 fw-600 fc-FB3D03">{{item.money}}</view>
+              </view>
+              <view class="fs-24 mb-18 fc-6">
+                满{{item.full_money}}可用
+              </view>
+              <view class="but-box fs-28 fc-f" @click="receiveCode(item)">
+                立即领取
+              </view>
+              <view class="ball"></view>
+              <view class="ball-two"></view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </uni-popup>
+  </view>
 </template>
 
 <script>
-	import Menu from './shop-mod/menu.vue';
-	import Evaluate from './shop-mod/evaluate.vue';
-	import ShopInfo from './shop-mod/info.vue';
-	import tools from "@/service/tools";
-	import EnBlank from "@/components/en-utils/en-blank/en-blank";
-	import {
-		receiveCoupon
-	} from "@/api/coupon.js"
-	import {
-		shopInfo,
-		shopCoupon
-	} from "@/api/shop.js"
-	import {
-		getDeliveryMoney
-	} from "@/api/common";
-	import {
-		getShopIngList,
-		setShopIngDel,
-		shoppingSave
-	} from "@/api/shopping";
-	export default {
-		components: {
-			Menu,
-			Evaluate,
-			ShopInfo,
-			EnBlank
-		},
-		data() {
-			return {
-				domHeigjt: 0,
-				shopTypeList: [{
-					name: "点菜",
-					id: 1
-				}, {
-					name: "评价",
-					id: 2
-				}, {
-					name: "店铺",
-					id: 3
-				}, ],
-				shopType: 1, //组件类型
-				shopTypeBsLeft: 12,
-				shop_id: '',
-				operate_id: '',
-				shopsInfo: {},
-				couponData: [], // 可领优惠卷
-				goodsData: [], // 可领优惠卷
-				categoryData: [], // 可领优惠卷
-				delivery_money: 0, // 可领优惠卷
-				cartData: {
-					total_price: 0,
-					total_num: 0,
-					total_goods_money: 0,
-					pack_price: 0,
-					must_category: 0,
-					is_place_order: 0,
-					err_msg: 0,
-					goods_list: [],
-				},
-				isAjax: false
-			}
-		},
-		onShow() {
-			// this.getShopIngList()
-		},
-		onLoad(e) {
-			// if (e) {
-			// 	console.log(e, '^^^^^^^');
-			// 	this.shop_id = e.shop_id
-			// 	this.operate_id = uni.getStorageSync('operate_id')
-			// 	const item = {
-			// 		type: Number(e.category_id)
-			// 	}
-			// 	const goodsId = {
-			// 		goodsId: Number(e.goods_id)
-			// 	}
-			// 	console.log(item, goodsId, '00000000000');
-			// 	uni.setStorageSync('category_id', item)
-			// 	uni.setStorageSync('goods_id', goodsId)
-			// 	this.shopInfo()
-			// }
-		},
-		mounted() {
-			// this.getDomH();
-			// this.shopCoupon()
-		},
-		methods: {
-			mustBut() {
-				// 未点必选品
-				const item = {
-					type: this.cartData.must_category
-				}
-				this.$refs.goodsMenu.selectType(item)
-			},
-			setShopIngDel() {
-				uni.showModal({
-					title: '提示',
-					content: '是否清除购物车商品？',
-					success: (res) => {
-						console.log(res)
-						if (res.confirm) {
-							setShopIngDel({
-								'shop_id': this.shop_id,
-								'type': 1,
-							}).then((res) => {
-								if (res.code === 1) {
-									tools.success(res.msg)
-									this.getShopIngList()
-									this.$refs.popupBuy.close()
-								} else {
-									tools.error(res.msg)
-								}
-							})
-						}
-					}
-				});
-			},
-			setShoppingSave(item, type) {
-				if(type === 1) {
-					// 加
-					item.goods_number = item.goods_number + 1
-				}else{
-					// 减
-					if(item.goods_number<0) {
-						return
-					}
-					item.goods_number = item.goods_number - 1
-				}
-				if (this.isAjax) {
-					return
-				}
-				this.isAjax = true
-				shoppingSave({
-					'type': 1,
-					'goods_id': item.goods_id,
-					'shop_id': this.shop_id,
-					'category_id': item.category_id,
-					'goods_spec_id': item.goods_spec_id,
-					'number': item.goods_number,
-				}).then(res => {
-					if (res.code == 1) {
-						this.isAjax = false
-						this.getShopIngList()
-					} 
-				}).catch(() => {
-					this.isAjax = false
-				})
-			},
-			getShopIngList() {
-				getShopIngList({
-					'shop_id': this.shop_id,
-				}).then(res => {
-					if (res.code === 1) {
-						this.cartData = res.data
-						if (this.shopType === 1) {
-							setTimeout(() => {
-								console.log('我的数据执行了')
-								this.$refs.goodsMenu.setShopIngList(this.cartData)
-							}, 1000)
-
-						}
-					}
-				})
-			},
-			setCartData(cartData) {
-				this.cartData = cartData
-				this.getDeliveryMoney()
-			},
-			getDeliveryMoney() {
-				getDeliveryMoney({
-					'school_id': this.operate_id,
-					'shop_id': this.shop_id,
-				}).then(res => {
-					if (res.code === 1) {
-						this.delivery_money = res.data.delivery_money * 1
-					}
-				})
-			},
-			receiveCode(item) {
-				receiveCoupon({
-					grant_id: item.grant_id,
-					coupon_id: item.coupon_id
-				}).then((res) => {
-					if (res.code == 1) {
-						tools.success(res.msg)
-						this.couponData = []
-						this.shopCoupon()
-					} else {
-						tools.error(res.msg)
-					}
-				})
-			},
-			toBack() {
-				tools.leftClick()
-			},
-			getDomH(num) {
-				this.$nextTick(() => {
-					let info = uni.createSelectorQuery().select('#shopInfoBox');
-					info.boundingClientRect((data) => {
-						if (num === 1) {
-							this.domHeigjt = data.height + 72
-						} else {
-							this.domHeigjt = data.height + 72 + 48
-						}
-					}).exec()
-				})
-				// setTimeout(() => {
-
-				// }, 500)
-			},
-
-			scrolltolower() {
-				console.log('触底');
-			},
-			seletShopType(item) {
-				if (this.shopType != item.id) {
-					this.shopType = item.id;
-					if (this.shopType == 1) {
-						this.shopTypeBsLeft = 12
-					} else if (this.shopType == 2) {
-						this.shopTypeBsLeft = 166
-					} else {
-						this.shopTypeBsLeft = 160 * 2
-					}
-				}
-			},
-			openBuyCrad() {
-				this.$refs.popupBuy.open()
-			},
-			createOrder() {
-				this.$refs.popupBuy.close()
-			},
-			openCoupon() {
-				this.$refs.popupCoupon.open()
-			},
-			closeCoupon() {
-				this.$refs.popupCoupon.close()
-			},
-			toConfirmOrder() {
-				uni.navigateTo({
-					url: '/pages-takeout/goods-order?shop_id=' + this.shop_id
-				})
-			},
-			shopInfo() {
-				const operate_id = uni.getStorageSync('operate_id')
-				shopInfo({
-					operate_id: operate_id,
-					shop_id: this.shop_id
-				}).then((res) => {
-					if (res.code == 1) {
-						this.shopsInfo = res.data
-					} else {
-						tools.error(res.msg)
-						setTimeout(() => {
-							uni.navigateBack({
-								delta: 1
-							})
-						}, 1500)
-					}
-				})
-			},
-			shopCoupon() {
-				shopCoupon({
-					operate_id: this.operate_id,
-					shop_id: this.shop_id
-				}).then((res) => {
-					if (res.code == 1) {
-						if (res.data.length > 0) {
-							this.couponData = res.data
-							this.getDomH(2)
-						} else {
-							this.getDomH(1)
-							// this.domHeigjt = 156
-							// console.log(this.domHeigjt, '1111111111111111111');
-						}
-					}
-				})
-			}
-		},
-	}
+  import Menu from './shop-mod/menu.vue';
+  import Evaluate from './shop-mod/evaluate.vue';
+  import ShopInfo from './shop-mod/info.vue';
+  import tools from "@/service/tools";
+  import EnBlank from "@/components/en-utils/en-blank/en-blank";
+  import {
+    receiveCoupon
+  } from "@/api/coupon.js"
+  import {
+    shopInfo,
+    shopCoupon
+  } from "@/api/shop.js"
+  import {
+    getDeliveryMoney
+  } from "@/api/common";
+  import {
+    getShopIngList,
+    setShopIngDel,
+    shoppingSave
+  } from "@/api/shopping";
+  export default {
+    components: {
+      Menu,
+      Evaluate,
+      ShopInfo,
+      EnBlank
+    },
+    data() {
+      return {
+        domHeigjt: 0,
+        shopTypeList: [{
+          name: "点单",
+          id: 1
+        }, {
+          name: "商家",
+          id: 2
+        }],
+        shopType: 1, //组件类型
+        shopTypeBsLeft: 12,
+        shop_id: '',
+        operate_id: '',
+        shopsInfo: {},
+        couponData: [], // 可领优惠卷
+        goodsData: [], // 可领优惠卷
+        categoryData: [], // 可领优惠卷
+        delivery_money: 0, // 可领优惠卷
+        cartData: {
+          total_price: 0,
+          total_num: 0,
+          total_goods_money: 0,
+          pack_price: 0,
+          must_category: 0,
+          is_place_order: 0,
+          err_msg: 0,
+          goods_list: [],
+        },
+        isAjax: false
+      }
+    },
+    onShow() {
+      // this.getShopIngList()
+    },
+    onLoad(e) {
+      // if (e) {
+      // 	console.log(e, '^^^^^^^');
+      // 	this.shop_id = e.shop_id
+      // 	this.operate_id = uni.getStorageSync('operate_id')
+      // 	const item = {
+      // 		type: Number(e.category_id)
+      // 	}
+      // 	const goodsId = {
+      // 		goodsId: Number(e.goods_id)
+      // 	}
+      // 	console.log(item, goodsId, '00000000000');
+      // 	uni.setStorageSync('category_id', item)
+      // 	uni.setStorageSync('goods_id', goodsId)
+      // 	this.shopInfo()
+      // }
+    },
+    mounted() {
+      // this.getDomH();
+      // this.shopCoupon()
+    },
+    methods: {
+      mustBut() {
+        // 未点必选品
+        const item = {
+          type: this.cartData.must_category
+        }
+        this.$refs.goodsMenu.selectType(item)
+      },
+      setShopIngDel() {
+        uni.showModal({
+          title: '提示',
+          content: '是否清除购物车商品？',
+          success: (res) => {
+            console.log(res)
+            if (res.confirm) {
+              setShopIngDel({
+                'shop_id': this.shop_id,
+                'type': 1,
+              }).then((res) => {
+                if (res.code === 1) {
+                  tools.success(res.msg)
+                  this.getShopIngList()
+                  this.$refs.popupBuy.close()
+                } else {
+                  tools.error(res.msg)
+                }
+              })
+            }
+          }
+        });
+      },
+      setShoppingSave(item, type) {
+        if (type === 1) {
+          // 加
+          item.goods_number = item.goods_number + 1
+        } else {
+          // 减
+          if (item.goods_number < 0) {
+            return
+          }
+          item.goods_number = item.goods_number - 1
+        }
+        if (this.isAjax) {
+          return
+        }
+        this.isAjax = true
+        shoppingSave({
+          'type': 1,
+          'goods_id': item.goods_id,
+          'shop_id': this.shop_id,
+          'category_id': item.category_id,
+          'goods_spec_id': item.goods_spec_id,
+          'number': item.goods_number,
+        }).then(res => {
+          if (res.code == 1) {
+            this.isAjax = false
+            this.getShopIngList()
+          }
+        }).catch(() => {
+          this.isAjax = false
+        })
+      },
+      getShopIngList() {
+        getShopIngList({
+          'shop_id': this.shop_id,
+        }).then(res => {
+          if (res.code === 1) {
+            this.cartData = res.data
+            if (this.shopType === 1) {
+              setTimeout(() => {
+                console.log('我的数据执行了')
+                this.$refs.goodsMenu.setShopIngList(this.cartData)
+              }, 1000)
+
+            }
+          }
+        })
+      },
+      setCartData(cartData) {
+        this.cartData = cartData
+        this.getDeliveryMoney()
+      },
+      getDeliveryMoney() {
+        getDeliveryMoney({
+          'school_id': this.operate_id,
+          'shop_id': this.shop_id,
+        }).then(res => {
+          if (res.code === 1) {
+            this.delivery_money = res.data.delivery_money * 1
+          }
+        })
+      },
+      receiveCode(item) {
+        receiveCoupon({
+          grant_id: item.grant_id,
+          coupon_id: item.coupon_id
+        }).then((res) => {
+          if (res.code == 1) {
+            tools.success(res.msg)
+            this.couponData = []
+            this.shopCoupon()
+          } else {
+            tools.error(res.msg)
+          }
+        })
+      },
+      toBack() {
+        tools.leftClick()
+      },
+      getDomH(num) {
+        this.$nextTick(() => {
+          let info = uni.createSelectorQuery().select('#shopInfoBox');
+          info.boundingClientRect((data) => {
+            if (num === 1) {
+              this.domHeigjt = data.height + 72
+            } else {
+              this.domHeigjt = data.height + 72 + 48
+            }
+          }).exec()
+        })
+        // setTimeout(() => {
+
+        // }, 500)
+      },
+
+      scrolltolower() {
+        console.log('触底');
+      },
+      seletShopType(item) {
+        if (this.shopType != item.id) {
+          this.shopType = item.id;
+          if (this.shopType == 1) {
+            this.shopTypeBsLeft = 12
+          } else if (this.shopType == 2) {
+            this.shopTypeBsLeft = 166
+          } else {
+            this.shopTypeBsLeft = 160 * 2
+          }
+        }
+      },
+      openBuyCrad() {
+        this.$refs.popupBuy.open()
+      },
+      createOrder() {
+        this.$refs.popupBuy.close()
+      },
+      openCoupon() {
+        this.$refs.popupCoupon.open()
+      },
+      closeCoupon() {
+        this.$refs.popupCoupon.close()
+      },
+      toConfirmOrder() {
+        uni.navigateTo({
+          url: '/pages-takeout/goods-order?shop_id=' + this.shop_id
+        })
+      },
+      shopInfo() {
+        const operate_id = uni.getStorageSync('operate_id')
+        shopInfo({
+          operate_id: operate_id,
+          shop_id: this.shop_id
+        }).then((res) => {
+          if (res.code == 1) {
+            this.shopsInfo = res.data
+          } else {
+            tools.error(res.msg)
+            setTimeout(() => {
+              uni.navigateBack({
+                delta: 1
+              })
+            }, 1500)
+          }
+        })
+      },
+      shopCoupon() {
+        shopCoupon({
+          operate_id: this.operate_id,
+          shop_id: this.shop_id
+        }).then((res) => {
+          if (res.code == 1) {
+            if (res.data.length > 0) {
+              this.couponData = res.data
+              this.getDomH(2)
+            } else {
+              this.getDomH(1)
+              // this.domHeigjt = 156
+              // console.log(this.domHeigjt, '1111111111111111111');
+            }
+          }
+        })
+      }
+    },
+  }
 </script>
 
 <style scoped lang="scss">
-	.wh-44 {
-		width: 44rpx;
-		height: 44rpx;
-	}
-
-	.blank-text {
-		line-height: 32vh;
-	}
-
-	.pop-coupon {
-		width: 100%;
-		height: 42vh;
-		background-color: #F5F4F9;
-		border-radius: 24rpx 24rpx 0rpx 0rpx;
-		padding-top: 32rpx !important;
-		display: flex;
-		flex-direction: column;
-
-		.box-title {
-			position: relative;
-
-			.box-close {
-				position: absolute;
-				right: 22rpx;
-			}
-		}
-
-		.item-right {
-			padding: 24rpx;
-			box-sizing: border-box;
-			border-radius: 20rpx 0 0 20rpx;
-			position: relative;
-		}
-
-		.item-hr {
-			width: 0px;
-			height: auto;
-			border-right: 1rpx dashed #FB7850;
-		}
-
-		.item-hr-two {
-			width: 0px;
-			height: auto;
-			border-right: 1rpx dashed #999;
-		}
-
-		.item-left {
-			width: 220rpx;
-			height: auto;
-			padding: 20rpx 24rpx;
-			box-sizing: border-box;
-			position: relative;
-			border-radius: 0 20rpx 20rpx 0;
-		}
-
-		.but-box {
-			width: 152rpx;
-			height: 52rpx;
-			line-height: 52rpx;
-			text-align: center;
-			background: linear-gradient(225deg, #FB3D03 0%, #FF6901 100%);
-			border-radius: 200rpx;
-		}
-
-		.ball {
-			width: 24rpx;
-			height: 24rpx;
-			border-radius: 50%;
-			position: absolute;
-			top: -12rpx;
-			left: -12rpx;
-			background: #F5F5F5;
-			z-index: 2;
-		}
-
-		.ball-two {
-			width: 24rpx;
-			height: 24rpx;
-			border-radius: 50%;
-			position: absolute;
-			background: #F5F5F5;
-			z-index: 10;
-			bottom: -12rpx;
-			left: -12rpx;
-		}
-	}
-
-
-	.shop-index {
-		position: relative;
-
-		.right-only-right-red {
-			width: 44rpx;
-			height: 44rpx;
-			line-height: 40rpx;
-			border-radius: 12rpx;
-			border: 1rpx solid #41ABF5;
-			color: #41ABF5;
-		}
-
-		.right-only-right-add {
-			width: 44rpx;
-			height: 44rpx;
-			line-height: 40rpx;
-			background: linear-gradient(117deg, #57CAFF 0%, #41ABF5 100%);
-			border-radius: 12rpx;
-		}
-
-		.right-only-right-2 {
-			min-width: 50rpx;
-		}
-
-		.w-514 {
-			width: 514rpx;
-		}
-
-		.bg-img {
-			position: absolute;
-			top: 0;
-			left: 0;
-			width: 100%;
-			height: 280rpx;
-			z-index: -1;
-		}
-
-		.mb-box {
-			position: absolute;
-			top: 0;
-			left: 0;
-			width: 100%;
-			height: 280rpx;
-			z-index: -1;
-			background: rgba(51, 51, 51, 0.50);
-		}
-
-		.nav-box {
-			margin-bottom: 110rpx;
-
-			.nav-img {
-				width: 56rpx;
-				height: 56rpx;
-			}
-		}
-
-		.shop-buttom-money {
-			width: 100%;
-			height: 140rpx;
-			background: rgba(255, 255, 255, 0.8);
-			padding: 20rpx 24rpx;
-
-			.shop-buttom-money-1 {
-				width: 100%;
-				height: 100%;
-				background: #333333;
-				border-radius: 200rpx;
-				box-sizing: border-box;
-				padding-left: 136rpx;
-				// padding-right: 32rpx;
-				position: relative;
-
-				image {
-					position: absolute;
-					bottom: 0;
-					left: 8rpx;
-					width: 128rpx;
-					height: 128rpx;
-				}
-
-				.shop-buttom-num {
-					width: 32rpx;
-					height: 32rpx;
-					line-height: 32rpx;
-					background: #FB3D03;
-					border-radius: 50%;
-					position: absolute;
-					top: 36rpx;
-					left: 82rpx;
-				}
-
-				.shop-buttom-money-2 {
-					width: 200rpx;
-					height: 100rpx;
-					line-height: 100rpx;
-					background: #41ABF5;
-					border-radius: 0rpx 200rpx 200rpx 0rpx;
-				}
-			}
-		}
-
-
-		.head-box {
-			width: 100%;
-			position: relative;
-
-			.shop-info-box {
-				position: absolute;
-				top: -50rpx;
-				left: 24rpx;
-				width: 702rpx;
-				// min-height: 156rpx;
-				border-radius: 20rpx;
-				box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(0, 0, 0, 0.1);
-
-				.info-box-top {
-					.box-top-left {
-						.top-left-1 {
-							width: 480rpx;
-							margin-bottom: 8rpx;
-						}
-
-						.img-x {
-							width: 24rpx;
-							height: 24rpx;
-						}
-					}
-
-					.box-top-right {
-						width: 100rpx;
-						height: 100rpx;
-						border-radius: 12rpx;
-					}
-				}
-
-				.info-box-quan-list {
-					width: 164rpx;
-					height: 48rpx;
-					margin: 0 8rpx 8rpx 0;
-					position: relative;
-
-					image {
-						width: 164rpx;
-						height: 48rpx;
-						position: absolute;
-						top: 0;
-						left: 0;
-						z-index: 1;
-					}
-
-					.quan-list-1 {
-						position: absolute;
-						top: 3rpx;
-						left: 8rpx;
-						z-index: 2;
-					}
-
-					.quan-list-2 {
-						position: absolute;
-						top: 8rpx;
-						right: 22rpx;
-						z-index: 2;
-					}
-				}
-			}
-		}
-
-		.head-box-1 {
-			width: 100%;
-			height: 88rpx;
-			border-bottom: 1rpx solid #eee;
-
-			.shop-type-list {
-				height: 88rpx;
-				position: relative;
-
-				.shop-item-bs {
-					position: absolute;
-					bottom: 0;
-					width: 40rpx;
-					height: 6rpx;
-					border-radius: 20rpx;
-					background-color: #41ABF5;
-					transition: left 0.5s;
-				}
-
-				.shop-item {
-					margin-right: 90rpx;
-					position: relative;
-
-					.pj-num {
-						position: absolute;
-						right: -80rpx;
-						top: 0;
-						text-align: left;
-						width: 80rpx;
-					}
-				}
-
-				.s-item {
-					font-weight: 600;
-					color: #333;
-				}
-
-				.n-item {
-					font-weight: 400;
-					color: #666;
-				}
-			}
-		}
-
-		.buy-card {
-			height: 828rpx;
-			background-color: #fff;
-			border-radius: 24rpx 24rpx 0rpx 0rpx;
-
-			.buy-card-top {
-				width: 100%;
-				height: 92rpx;
-				background: #FCF5DB;
-				border-radius: 24rpx 24rpx 0rpx 0rpx;
-			}
-
-			.buy-card-item {
-				width: 100%;
-				height: 176rpx;
-				margin-bottom: 32rpx;
-
-				.goods_img {
-					width: 152rpx;
-					height: 152rpx;
-					border-radius: 12rpx;
-					margin-right: 20rpx;
-				}
-			}
-		}
-
-	}
-</style>
+  .ss-box{
+    width: 64rpx;
+    height: 64rpx;
+    background: rgba(0,0,0,0.14);
+  }
+  .shop-search{
+    width: 40rpx;
+    height: 40rpx;
+  }
+  .wh-44 {
+    width: 44rpx;
+    height: 44rpx;
+  }
+
+  .blank-text {
+    line-height: 32vh;
+  }
+
+  .box-title {
+    position: relative;
+  }
+
+  .box-close {
+    position: absolute;
+    right: 22rpx;
+  }
+
+  .pop-coupon {
+    width: 100%;
+    height: 42vh;
+    background-color: #F5F4F9;
+    border-radius: 24rpx 24rpx 0rpx 0rpx;
+    padding-top: 32rpx !important;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .item-right {
+    padding: 24rpx;
+    box-sizing: border-box;
+    border-radius: 20rpx 0 0 20rpx;
+    position: relative;
+  }
+
+  .item-hr {
+    width: 0px;
+    height: auto;
+    border-right: 1rpx dashed #FB7850;
+  }
+
+  .item-hr-two {
+    width: 0px;
+    height: auto;
+    border-right: 1rpx dashed #999;
+  }
+
+  .item-left {
+    width: 220rpx;
+    height: auto;
+    padding: 20rpx 24rpx;
+    box-sizing: border-box;
+    position: relative;
+    border-radius: 0 20rpx 20rpx 0;
+  }
+
+  .but-box {
+    width: 152rpx;
+    height: 52rpx;
+    line-height: 52rpx;
+    text-align: center;
+    background: linear-gradient(225deg, #FB3D03 0%, #FF6901 100%);
+    border-radius: 200rpx;
+  }
+
+  .ball {
+    width: 24rpx;
+    height: 24rpx;
+    border-radius: 50%;
+    position: absolute;
+    top: -12rpx;
+    left: -12rpx;
+    background: #F5F5F5;
+    z-index: 2;
+  }
+
+  .ball-two {
+    width: 24rpx;
+    height: 24rpx;
+    border-radius: 50%;
+    position: absolute;
+    background: #F5F5F5;
+    z-index: 10;
+    bottom: -12rpx;
+    left: -12rpx;
+  }
+
+  .shop-index {
+    position: relative;
+  }
+
+  .right-only-right-red {
+    width: 44rpx;
+    height: 44rpx;
+    line-height: 40rpx;
+    border-radius: 12rpx;
+    border: 1rpx solid #41ABF5;
+    color: #41ABF5;
+  }
+
+  .right-only-right-add {
+    width: 44rpx;
+    height: 44rpx;
+    line-height: 40rpx;
+    background: linear-gradient(117deg, #57CAFF 0%, #41ABF5 100%);
+    border-radius: 12rpx;
+  }
+
+  .right-only-right-2 {
+    min-width: 50rpx;
+  }
+
+  .w-514 {
+    width: 514rpx;
+  }
+
+  .bg-img {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 300rpx;
+    z-index: 0;
+  }
+
+  .mb-box {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 300rpx;
+    z-index: -1;
+  }
+
+
+  .nav-img {
+    width: 56rpx;
+    height: 56rpx;
+  }
+
+  .shop-buttom-money {
+    width: 100%;
+    height: 140rpx;
+    background: rgba(255, 255, 255, 0.8);
+    padding: 20rpx 24rpx;
+  }
+
+  .shop-buttom-num {
+    width: 32rpx;
+    height: 32rpx;
+    line-height: 32rpx;
+    background: #FB3D03;
+    border-radius: 50%;
+    position: absolute;
+    top: 36rpx;
+    left: 82rpx;
+  }
+
+  .shop-buttom-money-2 {
+    width: 200rpx;
+    height: 100rpx;
+    line-height: 100rpx;
+    background: #41ABF5;
+    border-radius: 0rpx 200rpx 200rpx 0rpx;
+  }
+
+  .info-box-top {}
+
+  .box-top-right {
+    width: 100rpx;
+    height: 100rpx;
+    border-radius: 12rpx;
+  }
+
+  .box-top-left {}
+
+  .top-left-1 {
+    width: 480rpx;
+    margin-bottom: 8rpx;
+  }
+
+  .img-x {
+    width: 24rpx;
+    height: 24rpx;
+  }
+
+  .buy-card {
+    height: 828rpx;
+    background-color: #fff;
+    border-radius: 24rpx 24rpx 0rpx 0rpx;
+  }
+
+  .buy-card-top {
+    width: 100%;
+    height: 92rpx;
+    background: #FCF5DB;
+    border-radius: 24rpx 24rpx 0rpx 0rpx;
+  }
+
+  .buy-card-item {
+    width: 100%;
+    height: 176rpx;
+    margin-bottom: 32rpx;
+  }
+
+  .goods_img {
+    width: 152rpx;
+    height: 152rpx;
+    border-radius: 12rpx;
+    margin-right: 20rpx;
+  }
+
+  .shop-buttom-money-1 {
+    width: 100%;
+    height: 100%;
+    background: #333333;
+    border-radius: 200rpx;
+    box-sizing: border-box;
+    padding-left: 136rpx;
+    // padding-right: 32rpx;
+    position: relative;
+
+    image {
+      position: absolute;
+      bottom: 0;
+      left: 8rpx;
+      width: 128rpx;
+      height: 128rpx;
+    }
+  }
+
+  .head-box {
+    width: 100%;
+    position: relative;
+  }
+
+  .shop-info-box {
+    box-shadow: 0rpx 8rpx 56rpx 0rpx rgba(154, 152, 152, 0.34);
+  }
+
+  .info-box-quan-list {
+    width: 164rpx;
+    height: 48rpx;
+    margin: 0 8rpx 8rpx 0;
+    position: relative;
+
+    image {
+      width: 164rpx;
+      height: 48rpx;
+      position: absolute;
+      top: 0;
+      left: 0;
+      z-index: 1;
+    }
+  }
+
+  .quan-list-1 {
+    position: absolute;
+    top: 3rpx;
+    left: 8rpx;
+    z-index: 2;
+  }
+
+  .quan-list-2 {
+    position: absolute;
+    top: 8rpx;
+    right: 22rpx;
+    z-index: 2;
+  }
+
+  .head-box-1 {
+    width: 100%;
+    height: 88rpx;
+    border-bottom: 1rpx solid #eee;
+  }
+
+  .shop-type-list {
+    height: 88rpx;
+    position: relative;
+  }
+
+  .shop-item {
+    margin-right: 90rpx;
+    position: relative;
+  }
+
+  .pj-num {
+    position: absolute;
+    right: -80rpx;
+    top: 0;
+    text-align: left;
+    width: 80rpx;
+  }
+
+  .shop-item-bs {
+    position: absolute;
+    bottom: 0;
+    width: 40rpx;
+    height: 6rpx;
+    border-radius: 20rpx;
+    background-color: #41ABF5;
+    transition: left 0.5s;
+  }
+
+  .s-item {
+    font-weight: 600;
+    color: #333;
+  }
+
+  .n-item {
+    font-weight: 400;
+    color: #666;
+  }
+</style>

pages.json

@@ -16,18 +16,18 @@
 				"navigationBarTitleText": "订单"
 			}
 		},
-		{
-			"path": "pages/chat/index",
-			"style": {
-				"navigationBarTitleText": "Al助手"
-			}
-		},
-		{
-			"path": "pages/me/index",
-			"style": {
-				"navigationBarTitleText": "我的"
-			}
-		},
+		// {
+		// 	"path": "pages/chat/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "Al助手"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/me/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "我的"
+		// 	}
+		// },
 		{
 			"path": "pages/index/search-record",
 			"style": {
@@ -484,7 +484,7 @@
 		"current": 0,
 		"list": [{
 				"name": "列表调试",
-				"path": "pages-takeout/help-choose",
+				"path": "pages-takeout/shop",
 				"query": "balance=2"
 			},
 			{

pages/chat/index.vue

@@ -8,8 +8,8 @@
 					查看历史消息
 				</view>
 				<view class="chat-box" id="chat-box">
-					<msgItem v-for="(item,index) in chatData" :key="index" :item="item" :showType="item.showType"
-						:msgText="item.content" @selectStyle="selectStyle" @refresh="refresh"></msgItem>
+					<!-- <msgItem v-for="(item,index) in chatData" :key="index" :item="item" :showType="item.showType"
+						:msgText="item.content" @selectStyle="selectStyle" @refresh="refresh"></msgItem> -->
 				</view>
 			</scroll-view>
 			<view class="bottom-box">
@@ -25,7 +25,7 @@
 
 <script>
 	import tools from "@/service/tools.js";
-	import msgItem from "./msg-item.vue";
+	// import msgItem from "./msg-item.vue";
 	// import {
 	// 	qianfanSend,
 	// 	qianfanMsg_list,
@@ -36,7 +36,7 @@
 	} from "@/api/ai.js"
 	export default {
 		components: {
-			msgItem
+			// msgItem
 		},
 		data() {
 			return {