Browse Source

Merge branch 'master' of http://git.huaml.com/zhh/front-end into module_s

fuwei 5 years ago
parent
commit
13034e7e75
38 changed files with 656 additions and 1504 deletions
  1. 0 1452
      ghs/src/admin/warehouse/uni2.css
  2. 47 45
      ghs/src/pages.json
  3. 0 0
      ghs/src/pagesArrears/details.vue
  4. 0 0
      ghs/src/pagesArrears/detailsItem.vue
  5. 0 0
      ghs/src/pagesArrears/list.vue
  6. 0 0
      ghs/src/pagesInvite/inviteItem.vue
  7. 0 0
      ghs/src/pagesInvite/list.vue
  8. 2 2
      ghs/src/pagesPurchase/add.vue
  9. 0 0
      ghs/src/pagesPurchase/components/Commodity.vue
  10. 0 0
      ghs/src/pagesPurchase/components/CommodityPurchase.vue
  11. 0 0
      ghs/src/pagesPurchase/components/CommodityStock.vue
  12. 0 0
      ghs/src/pagesPurchase/components/FooterCart.vue
  13. 0 0
      ghs/src/pagesPurchase/components/table.vue
  14. 0 0
      ghs/src/pagesPurchase/details.vue
  15. 0 0
      ghs/src/pagesPurchase/order.vue
  16. 0 0
      ghs/src/pagesPurchase/orderItem.vue
  17. 0 0
      ghs/src/pagesPurchase/result.vue
  18. 1 1
      ghs/src/pagesStatistics/business.vue
  19. 0 0
      ghs/src/pagesStorehouse/allot/addExDetails.vue
  20. 0 0
      ghs/src/pagesStorehouse/allot/allotEx.vue
  21. 0 0
      ghs/src/pagesStorehouse/allot/allotPut.vue
  22. 0 0
      ghs/src/pagesStorehouse/allot/exDetails.vue
  23. 0 0
      ghs/src/pagesStorehouse/allot/putDetails.vue
  24. 140 0
      ghs/src/pagesStorehouse/components/Commodity.vue
  25. 144 0
      ghs/src/pagesStorehouse/components/CommodityPurchase.vue
  26. 107 0
      ghs/src/pagesStorehouse/components/CommodityStock.vue
  27. 76 0
      ghs/src/pagesStorehouse/components/FooterCart.vue
  28. 135 0
      ghs/src/pagesStorehouse/components/table.vue
  29. 0 0
      ghs/src/pagesStorehouse/flower/manage.vue
  30. 0 0
      ghs/src/pagesStorehouse/inventory/add.vue
  31. 0 0
      ghs/src/pagesStorehouse/inventory/details.vue
  32. 0 0
      ghs/src/pagesStorehouse/inventory/list.vue
  33. 0 0
      ghs/src/pagesStorehouse/inventory/select.vue
  34. 0 0
      ghs/src/pagesStorehouse/shop/list.vue
  35. 0 0
      ghs/src/pagesStorehouse/shop/update.vue
  36. 0 0
      ghs/src/pagesStorehouse/stockWarn/detailed.vue
  37. 0 0
      ghs/src/pagesStorehouse/stockWarn/manage.vue
  38. 4 4
      mall/src/ext.json

+ 0 - 1452
ghs/src/admin/warehouse/uni2.css

@@ -1,1452 +0,0 @@
-@font-face {
-	font-family: uniicons;
-	font-weight: normal;
-	font-style: normal;
-	src: url('https://img-cdn-qiniu.dcloud.net.cn/fonts/uni.ttf') format('truetype');
-}
-
-/*通用 */
-/*view{*/
-/* 	font-size: 24px;*/
-/* }*/
-/* view  uni-button{*/
-/*	font-size: 28px;*/
-/* }*/
-.uni-list-cell__content-title{
-	font-size: 28upx !important;
-}
-
-progress, checkbox-group{
-	width: 100%;
-}
-form {
-	width: 100%;
-}
-.uni-flex {
-	display: flex;
-	flex-direction: row;
-}
-.uni-flex-item {
-	flex: 1;
-}
-.uni-row {
-	flex-direction: row;
-}
-.uni-column {
-	flex-direction: column;
-}
-.uni-link{
-	color:#576B95;
-	font-size:26upx;
-}
-.uni-center{
-	text-align:center;
-}
-.uni-inline-item{
-	display: flex;
-	flex-direction: row;
-	align-items:center;
-}
-.uni-inline-item text{
-	margin-right: 20upx;
-}
-.uni-inline-item text:last-child{
-	margin-right: 0upx;
-	margin-left: 20upx;
-}
-
-/* page */
-.uni-page-head{
-	padding:35upx;
-	text-align: center;
-}
-.uni-page-head-title {
-	display: inline-block;
-	padding: 0 40upx;
-	font-size: 30upx;
-	height: 88upx;
-	line-height: 88upx;
-	color: #BEBEBE;
-	box-sizing: border-box;
-	border-bottom: 2upx solid #D8D8D8;
-}
-.uni-page-body {
-	width: 100%;
-	flex-grow: 1;
-	overflow-x: hidden;
-}
-.uni-padding-wrap{
-	width:690upx;
-	padding:0 30upx;
-}
-.uni-word {
-	text-align: center;
-	padding:200upx 100upx;
-}
-.uni-title {
-	font-size:30upx;
-	font-weight:500;
-	padding:20upx 0;
-	line-height:1.5;
-}
-.uni-text{
-	font-size:28upx;
-}
-.uni-title text{
-	font-size:24upx;
-	color:#888;
-}
-
-.uni-text-gray{
-	color: #ccc;
-}
-.uni-text-small {
-	font-size:24upx;
-}
-.uni-common-mb{
-	margin-bottom:30upx;
-}
-.uni-common-pb{
-	padding-bottom:30upx;
-}
-.uni-common-pl{
-	padding-left:30upx;
-}
-.uni-common-mt{
-	margin-top:30upx;
-}
-/* 背景色 */
-.uni-bg-red{
-	background:#F76260; color:#FFF;
-}
-.uni-bg-green{
-	background:#09BB07; color:#FFF;
-}
-.uni-bg-blue{
-	background:#007AFF; color:#FFF;
-}
-/* 标题 */
-.uni-h1 {font-size: 80upx; font-weight:700;}
-.uni-h2 {font-size: 60upx; font-weight:700;}
-.uni-h3 {font-size: 48upx; font-weight:700;}
-.uni-h4 {font-size: 36upx; font-weight:700;}
-.uni-h5 {font-size: 28upx; color: #8f8f94;}
-.uni-h6 {font-size: 24upx; color: #8f8f94;}
-.uni-bold{font-weight:bold;}
-
-/* 文本溢出隐藏 */
-.uni-ellipsis {overflow: hidden; white-space: nowrap; text-overflow: ellipsis;}
-
-/* 竖向百分百按钮 */
-.uni-btn-v{
-	padding:10upx 0;
-}
-.uni-btn-v button{margin:20upx 0;}
-
-/* 表单 */
-.uni-form-item{
-	display:flex;
-	width:100%;
-	padding:10upx 0;
-}
-.uni-form-item .title{
-	padding:10upx 25upx;
-}
-.uni-label {
-	width: 210upx;
-	word-wrap: break-word;
-	word-break: break-all;
-	text-indent:20upx;
-}
-/*.uni-input {*/
-/*	height: 50upx;*/
-/*	padding: 15upx 25upx;*/
-/*	line-height:50upx;*/
-/*	font-size:28upx;*/
-/*	background:#FFF;*/
-/*	flex: 1;*/
-/*}*/
-radio-group, checkbox-group{
-	width:100%;
-}
-radio-group label, checkbox-group label{
-	padding-right:20upx;
-}
-.uni-form-item .with-fun{
-	display:flex;
-	flex-wrap:nowrap;
-	background:#FFFFFF;
-}
-.uni-form-item .with-fun .uni-icon{
-	width:40px;
-	height:80upx;
-	line-height:80upx;
-	flex-shrink:0;
-}
-
-/* loadmore */
-.uni-loadmore{
-	height:80upx;
-	line-height:80upx;
-	text-align:center;
-	padding-bottom:30upx;
-}
-/*数字角标*/
-.uni-badge,
-.uni-badge-default {
-	font-family: 'Helvetica Neue', Helvetica, sans-serif;
-	font-size: 12px;
-	line-height: 1;
-	display: inline-block;
-	padding: 3px 6px;
-	color: #333;
-	border-radius: 100px;
-	background-color: rgba(0, 0, 0, .15);
-}
-.uni-badge.uni-badge-inverted {
-	padding: 0 5px 0 0;
-	color: #929292;
-	background-color: transparent
-}
-.uni-badge-primary {
-	color: #fff;
-	background-color: #007aff
-}
-.uni-badge-blue.uni-badge-inverted,
-.uni-badge-primary.uni-badge-inverted {
-	color: #007aff;
-	background-color: transparent
-}
-.uni-badge-green,
-.uni-badge-success {
-	color: #fff;
-	background-color: #4cd964;
-}
-.uni-badge-green.uni-badge-inverted,
-.uni-badge-success.uni-badge-inverted {
-	color: #4cd964;
-	background-color: transparent
-}
-.uni-badge-warning,
-.uni-badge-yellow {
-	color: #fff;
-	background-color: #f0ad4e
-}
-.uni-badge-warning.uni-badge-inverted,
-.uni-badge-yellow.uni-badge-inverted {
-	color: #f0ad4e;
-	background-color: transparent
-}
-.uni-badge-danger,
-.uni-badge-red {
-	color: #fff;
-	background-color: #dd524d
-}
-.uni-badge-danger.uni-badge-inverted,
-.uni-badge-red.uni-badge-inverted {
-	color: #dd524d;
-	background-color: transparent
-}
-.uni-badge-purple,
-.uni-badge-royal {
-	color: #fff;
-	background-color: #8a6de9
-}
-.uni-badge-purple.uni-badge-inverted,
-.uni-badge-royal.uni-badge-inverted {
-	color: #8a6de9;
-	background-color: transparent
-}
-
-/*折叠面板 */
-.uni-collapse-content {
-	height: 0;
-	width: 100%;
-	overflow: hidden;
-}
-.uni-collapse-content.uni-active {
-	height: auto;
-}
-
-/*卡片视图 */
-.uni-card {
-	background: #fff;
-	border-radius: 8upx;
-	margin:20upx 0;
-	position: relative;
-	box-shadow: 0 2upx 4upx rgba(0, 0, 0, .3);
-}
-.uni-card-content {
-	font-size: 30upx;
-}
-.uni-card-content.image-view{
-    width: 100%;
-    margin: 0;
-}
-.uni-card-content-inner {
-	position: relative;
-	padding: 30upx;
-}
-.uni-card-footer,
-.uni-card-header {
-	position: relative;
-	display: flex;
-	min-height: 50upx;
-	padding: 20upx 30upx;
-	justify-content: space-between;
-	align-items: center;
-}
-.uni-card-header {
-	font-size: 36upx;
-}
-.uni-card-footer {
-	color: #6d6d72;
-}
-.uni-card-footer:before,
-.uni-card-header:after {
-	position: absolute;
-	top: 0;
-	right: 0;
-	left: 0;
-	height: 2upx;
-	content: '';
-	-webkit-transform: scaleY(.5);
-	transform: scaleY(.5);
-	background-color: #c8c7cc;
-}
-.uni-card-header:after {
-	top: auto;
-	bottom: 0;
-}
-.uni-card-media {
-	justify-content: flex-start;
-}
-.uni-card-media-logo {
-	height: 84upx;
-	width: 84upx;
-	margin-right: 20upx;
-}
-.uni-card-media-body {
-	height: 84upx;
-	display: flex;
-	flex-direction: column;
-	justify-content: space-between;
-	align-items: flex-start;
-}
-.uni-card-media-text-top {
-	line-height: 36upx;
-	font-size: 34upx;
-}
-.uni-card-media-text-bottom {
-	line-height: 30upx;
-	font-size: 28upx;
-	color: #8f8f94;
-}
-.uni-card-link {
-	color: #007AFF;
-}
-
-/* 列表 */
-.uni-list {
-	background-color: #FFFFFF;
-	position: relative;
-	width: 100%;
-	display: flex;
-	flex-direction: column;
-}
-.uni-list:after {
-	position: absolute;
-	z-index: 10;
-	right: 0;
-	bottom: 0;
-	left: 0;
-	height: 1px;
-	content: '';
-	-webkit-transform: scaleY(.5);
-	transform: scaleY(.5);
-	background-color: #c8c7cc;
-}
-.uni-list::before {
-	position: absolute;
-	z-index: 10;
-	right: 0;
-	top: 0;
-	left: 0;
-	height: 1px;
-	content: '';
-	-webkit-transform: scaleY(.5);
-	transform: scaleY(.5);
-	background-color: #c8c7cc;
-}
-.uni-list-cell {
-	position: relative;
-	display: flex;
-	flex-direction: row;
-	justify-content: space-between;
-	align-items: center;
-}
-.uni-list-cell-hover {
-	background-color: #eee;
-}
-.uni-list-cell-pd {
-	padding: 22upx 30upx;
-}
-.uni-list-cell-left {
-	font-size:28upx;
-	padding: 0 30upx;
-}
-.uni-list-cell-db,
-.uni-list-cell-right {
-	flex: 1;
-}
-.uni-list-cell::after {
-	position: absolute;
-  z-index: 3;
-	right: 0;
-	bottom: 0;
-	left: 30upx;
-	height: 1px;
-	content: '';
-	-webkit-transform: scaleY(.5);
-	transform: scaleY(.5);
-	background-color: #c8c7cc;
-}
-.uni-list .uni-list-cell:last-child::after {
-	height: 0upx;
-}
-.uni-list-cell-last.uni-list-cell::after {
-	height: 0upx;
-}
-.uni-list-cell-divider {
-	position: relative;
-	display: flex;
-	color: #999;
-	background-color: #f7f7f7;
-	padding:15upx 20upx;
-}
-.uni-list-cell-divider::before {
-	position: absolute;
-	right: 0;
-	top: 0;
-	left: 0;
-	height: 1px;
-	content: '';
-	-webkit-transform: scaleY(.5);
-	transform: scaleY(.5);
-	background-color: #c8c7cc;
-}
-.uni-list-cell-divider::after {
-	position: absolute;
-	right: 0;
-	bottom: 0;
-	left: 0upx;
-	height: 1px;
-	content: '';
-	-webkit-transform: scaleY(.5);
-	transform: scaleY(.5);
-	background-color: #c8c7cc;
-}
-.uni-list-cell-navigate {
-	font-size:30upx;
-	padding: 22upx 30upx;
-	line-height: 48upx;
-	position: relative;
-	display: flex;
-	box-sizing: border-box;
-	width: 100%;
-	flex: 1;
-	justify-content: space-between;
-	align-items: center;
-}
-.uni-list-cell-navigate {
-	padding-right: 36upx;
-}
-.uni-navigate-badge {
-	padding-right: 50upx;
-}
-.uni-list-cell-navigate.uni-navigate-right:after {
-	font-family: uniicons;
-	content: '\e583';
-	position: absolute;
-	right: 24upx;
-	top: 50%;
-	color: #bbb;
-	-webkit-transform: translateY(-50%);
-	transform: translateY(-50%);
-}
-.uni-list-cell-navigate.uni-navigate-bottom:after {
-	font-family: uniicons;
-	content: '\e581';
-	position: absolute;
-	right: 24upx;
-	top: 50%;
-	color: #bbb;
-	-webkit-transform: translateY(-50%);
-	transform: translateY(-50%);
-}
-.uni-list-cell-navigate.uni-navigate-bottom.uni-active::after {
-	font-family: uniicons;
-	content: '\e580';
-	position: absolute;
-	right: 24upx;
-	top: 50%;
-	color: #bbb;
-	-webkit-transform: translateY(-50%);
-	transform: translateY(-50%);
-}
-.uni-collapse.uni-list-cell {
-	flex-direction: column;
-}
-.uni-list-cell-navigate.uni-active {
-	background: #eee;
-}
-.uni-list.uni-collapse {
-	box-sizing: border-box;
-	height: 0;
-	overflow: hidden;
-}
-.uni-collapse .uni-list-cell {
-	padding-left: 20upx;
-}
-.uni-collapse .uni-list-cell::after {
-	left: 52upx;
-}
-.uni-list.uni-active {
-	height: auto;
-}
-
-/* 三行列表 */
-.uni-triplex-row {
-	display: flex;
-	flex: 1;
-	width: 100%;
-	box-sizing: border-box;
-	flex-direction: row;
-	padding: 22upx 30upx;
-}
-.uni-triplex-right,
-.uni-triplex-left {
-	display: flex;
-	flex-direction: column;
-}
-.uni-triplex-left {
-	width: 84%;
-}
-.uni-triplex-left .uni-title{
-	padding:8upx 0;
-}
-.uni-triplex-left .uni-text, .uni-triplex-left .uni-text-small{color:#999999;}
-.uni-triplex-right {
-	width: 16%;
-	text-align: right;
-}
-
-/* 图文列表 */
-.uni-media-list {
-	padding: 22upx 30upx;
-	box-sizing: border-box;
-	display: flex;
-	width: 100%;
-	flex-direction: row;
-}
-.uni-navigate-right.uni-media-list {
-	padding-right: 74upx;
-}
-.uni-pull-right {
-	flex-direction: row-reverse;
-}
-.uni-pull-right>.uni-media-list-logo {
-	margin-right: 0upx;
-	margin-left: 20upx;
-}
-.uni-media-list-logo {
-	height: 84upx;
-	width: 84upx;
-	margin-right: 20upx;
-}
-.uni-media-list-logo image {
-	height: 100%;
-	width: 100%;
-}
-.uni-media-list-body {
-	height: 84upx;
-	display: flex;
-	flex: 1;
-	flex-direction: column;
-	justify-content: space-between;
-	align-items: flex-start;
-	overflow: hidden;
-}
-.uni-media-list-text-top {
-	width: 100%;
-	line-height: 36upx;
-	font-size: 30upx;
-}
-.uni-media-list-text-bottom {
-	width: 100%;
-	line-height: 30upx;
-	font-size: 26upx;
-	color: #8f8f94;
-}
-
-/* 九宫格 */
-.uni-grid-9 {
-	background: #f2f2f2;
-	width: 750upx;
-	display: flex;
-	flex-direction: row;
-	flex-wrap: wrap;
-	border-top: 2upx solid #eee;
-}
-.uni-grid-9-item {
-	width: 250upx;
-	height: 200upx;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-	border-bottom: 2upx solid;
-	border-right: 2upx solid;
-	border-color: #eee;
-	box-sizing: border-box;
-}
-.no-border-right {
-	border-right: none;
-}
-.uni-grid-9-image {
-	width: 100upx;
-	height: 100upx;
-}
-.uni-grid-9-text {
-	width: 250upx;
-	line-height: 4upx;
-	height: 40upx;
-	text-align: center;
-	font-size: 30upx;
-}
-.uni-grid-9-item-hover {
-	background: rgba(0, 0, 0, 0.1);
-}
-
-/* 上传 */
-.uni-uploader {
-	flex: 1;
-	flex-direction: column;
-}
-.uni-uploader-head {
-	display: flex;
-	flex-direction: row;
-	justify-content: space-between;
-}
-.uni-uploader-info {
-	color: #B2B2B2;
-}
-.uni-uploader-body {
-	margin-top: 16upx;
-}
-.uni-uploader__files {
-	display: flex;
-	flex-direction: row;
-	flex-wrap: wrap;
-}
-.uni-uploader__file {
-	margin: 10upx;
-	width: 210upx;
-	height: 210upx;
-}
-.uni-uploader__img {
-	display: block;
-	width: 210upx;
-	height: 210upx;
-}
-.uni-uploader__input-box {
-	position: relative;
-	margin:10upx;
-	width: 208upx;
-	height: 208upx;
-	border: 2upx solid #D9D9D9;
-}
-.uni-uploader__input-box:before,
-.uni-uploader__input-box:after {
-	content: " ";
-	position: absolute;
-	top: 50%;
-	left: 50%;
-	-webkit-transform: translate(-50%, -50%);
-	transform: translate(-50%, -50%);
-	background-color: #D9D9D9;
-}
-.uni-uploader__input-box:before {
-	width: 4upx;
-	height: 79upx;
-}
-.uni-uploader__input-box:after {
-	width: 79upx;
-	height: 4upx;
-}
-.uni-uploader__input-box:active {
-	border-color: #999999;
-}
-.uni-uploader__input-box:active:before,
-.uni-uploader__input-box:active:after {
-	background-color: #999999;
-}
-.uni-uploader__input {
-	position: absolute;
-	z-index: 1;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	opacity: 0;
-}
-
-/*问题反馈*/
-.feedback-title {
-	display: flex;
-	flex-direction: row;
-	justify-content: space-between;
-	align-items: center;
-	padding: 20upx;
-	color: #8f8f94;
-	font-size: 28upx;
-}
-.feedback-star-view.feedback-title {
-	justify-content: flex-start;
-	margin: 0;
-}
-.feedback-quick {
-	position: relative;
-	padding-right: 40upx;
-}
-.feedback-quick:after {
-	font-family: uniicons;
-	font-size: 40upx;
-	content: '\e581';
-	position: absolute;
-	right: 0;
-	top: 50%;
-	color: #bbb;
-	-webkit-transform: translateY(-50%);
-	transform: translateY(-50%);
-}
-.feedback-body {
-	background: #fff;
-}
-.feedback-textare {
-	height: 200upx;
-	font-size: 34upx;
-	line-height: 50upx;
-	width: 100%;
-	box-sizing: border-box;
-	padding: 20upx 30upx 0;
-}
-.feedback-input {
-	font-size: 34upx;
-	height: 50upx;
-	min-height: 50upx;
-	padding: 15upx 20upx;
-	line-height: 50upx;
-}
-.feedback-uploader {
-	padding: 22upx 20upx;
-}
-.feedback-star {
-	font-family: uniicons;
-	font-size: 40upx;
-	margin-left: 6upx;
-}
-.feedback-star-view {
-	margin-left: 20upx;
-}
-.feedback-star:after {
-	content: '\e408';
-}
-.feedback-star.active {
-	color: #FFB400;
-}
-.feedback-star.active:after {
-	content: '\e438';
-}
-.feedback-submit {
-	background: #007AFF;
-	color: #FFFFFF;
-	margin: 20upx;
-}
-
-/* input group */
-.uni-input_group {
-	position: relative;
-	padding: 0;
-	border: 0;
-	background-color: #fff;
-}
-
-.uni-input_group:before {
-	position: absolute;
-	top: 0;
-	right: 0;
-	left: 0;
-	height: 2upx;
-	content: '';
-	transform: scaleY(.5);
-	background-color: #c8c7cc;
-}
-
-.uni-input_group:after {
-	position: absolute;
-	right: 0;
-	bottom: 0;
-	left: 0;
-	height: 2upx;
-	content: '';
-	transform: scaleY(.5);
-	background-color: #c8c7cc;
-}
-
-.uni-input-row {
-	position: relative;
-	display: flex;
-	flex-direction: row;
-	font-size:28upx;
-	padding: 22upx 30upx;
-	justify-content: space-between;
-}
-
-.uni-input_group .uni-input-row:after {
-	position: absolute;
-	right: 0;
-	bottom: 0;
-	left: 30upx;
-	height: 2upx;
-	content: '';
-	transform: scaleY(.5);
-	background-color: #c8c7cc;
-}
-
-.uni-input-row label {
-	line-height: 70upx;
-}
-
-/* textarea */
-.uni-textarea{
-	width:100%;
-	background:#FFF;
-}
-.uni-textarea textarea{
-	width:96%;
-	padding:18upx 2%;
-	line-height:1.6;
-	font-size:28upx;
-	height:150upx;
-}
-
-/* tab bar */
-.uni-tab-bar {
-	display: flex;
-	flex: 1;
-	flex-direction: column;
-	overflow: hidden;
-	height: 100%;
-}
-
-.uni-tab-bar .list {
-	width: 750upx;
-	height: 100%;
-}
-
-.uni-swiper-tab {
-	width: 100%;
-	white-space: nowrap;
-	line-height: 100upx;
-	height: 100upx;
-	border-bottom: 1px solid #c8c7cc;
-}
-
-.swiper-tab-list {
-	font-size: 30upx;
-	width: 150upx;
-	display: inline-block;
-	text-align: center;
-	color: #555;
-}
-
-.uni-tab-bar .active {
-	color: #007AFF;
-}
-
-.uni-tab-bar .swiper-box {
-	flex: 1;
-	width: 100%;
-	height: calc(100% - 100upx);
-}
-
-.uni-tab-bar-loading{
-	padding:20upx 0;
-}
-
-/* comment */
-.uni-comment{padding:5rpx 0; display: flex; flex-grow:1; flex-direction: column;}
-.uni-comment-list{flex-wrap:nowrap; padding:10rpx 0; margin:10rpx 0; width:100%; display: flex;}
-.uni-comment-face{width:70upx; height:70upx; border-radius:100%; margin-right:20upx; flex-shrink:0; overflow:hidden;}
-.uni-comment-face image{width:100%; border-radius:100%;}
-.uni-comment-body{width:100%;}
-.uni-comment-top{line-height:1.5em; justify-content:space-between;}
-.uni-comment-top text{color:#0A98D5; font-size:24upx;}
-.uni-comment-date{line-height:38upx; flex-direction:row; justify-content:space-between; display:flex !important; flex-grow:1;}
-.uni-comment-date view{color:#666666; font-size:24upx; line-height:38upx;}
-.uni-comment-content{line-height:1.6em; font-size:28upx; padding:8rpx 0;}
-.uni-comment-replay-btn{background:#FFF; font-size:24upx; line-height:28upx; padding:5rpx 20upx; border-radius:30upx; color:#333 !important; margin:0 10upx;}
-
-/* swiper msg */
-.uni-swiper-msg{width:100%; padding:12rpx 0; flex-wrap:nowrap; display:flex;}
-.uni-swiper-msg-icon{width:50upx; margin-right:20upx;}
-.uni-swiper-msg-icon image{width:100%; flex-shrink:0;}
-.uni-swiper-msg swiper{width:100%; height:50upx;}
-.uni-swiper-msg swiper-item{line-height:50upx;}
-
-/* product */
-.uni-product-list {
-    display: flex;
-    width: 100%;
-    flex-wrap: wrap;
-    flex-direction: row;
-}
-
-.uni-product {
-    padding: 20upx;
-    display: flex;
-    flex-direction: column;
-}
-
-.image-view {
-    height: 330upx;
-    width: 330upx;
-	margin:12upx 0;
-}
-
-.uni-product-image {
-    height: 330upx;
-    width: 330upx;
-}
-
-.uni-product-title {
-    width: 300upx;
-    word-break: break-all;
-    display: -webkit-box;
-    overflow: hidden;
-	line-height:1.5;
-    text-overflow: ellipsis;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
-}
-
-.uni-product-price {
-	margin-top:10upx;
-    font-size: 28upx;
-	line-height:1.5;
-    position: relative;
-}
-
-.uni-product-price-original {
-    color: #e80080;
-}
-
-.uni-product-price-favour {
-    color: #888888;
-    text-decoration: line-through;
-    margin-left: 10upx;
-}
-
-.uni-product-tip {
-    position: absolute;
-    right: 10upx;
-    background-color: #ff3333;
-    color: #ffffff;
-    padding: 0 10upx;
-    border-radius: 5upx;
-}
-
-/* timeline */
-.uni-timeline {
-		margin: 35upx 0;
-		display: flex;
-		flex-direction: column;
-		position: relative;
-	}
-
-
-	.uni-timeline-item {
-		display: flex;
-		flex-direction: row;
-		position: relative;
-		padding-bottom: 20upx;
-		box-sizing: border-box;
-		overflow: hidden;
-
-	}
-
-	.uni-timeline-item .uni-timeline-item-keynode {
-		width: 160upx;
-		flex-shrink: 0;
-		box-sizing: border-box;
-		padding-right: 20upx;
-		text-align: right;
-		line-height: 65upx;
-	}
-
-	.uni-timeline-item .uni-timeline-item-divider {
-		flex-shrink: 0;
-		position: relative;
-		width: 30upx;
-		height: 30upx;
-		top: 15upx;
-		border-radius: 50%;
-		background-color: #bbb;
-	}
-
-
-
-	.uni-timeline-item-divider::before,
-	.uni-timeline-item-divider::after {
-		position: absolute;
-		left: 15upx;
-		width: 1upx;
-		height: 100vh;
-		content: '';
-		background: inherit;
-	}
-
-	.uni-timeline-item-divider::before {
-		bottom: 100%;
-	}
-
-	.uni-timeline-item-divider::after {
-		top: 100%;
-	}
-
-
-	.uni-timeline-last-item .uni-timeline-item-divider:after {
-		display: none;
-	}
-
-	.uni-timeline-first-item .uni-timeline-item-divider:before {
-		display: none;
-	}
-
-	.uni-timeline-item .uni-timeline-item-content {
-		padding-left: 20upx;
-	}
-
-	.uni-timeline-last-item .bottom-border::after{
-		display: none;
-	}
-
-	.uni-timeline-item-content .datetime{
-		color: #CCCCCC;
-	}
-
-	/* 自定义节点颜色 */
-	.uni-timeline-last-item .uni-timeline-item-divider{
-		background-color: #1AAD19;
-	}
-
-
-/* uni-icon */
-
-.uni-icon {
-	font-family: uniicons;
-	font-size: 24px;
-	font-weight: normal;
-	font-style: normal;
-	line-height: 1;
-	display: inline-block;
-	text-decoration: none;
-	-webkit-font-smoothing: antialiased;
-}
-
-.uni-icon.uni-active {
-	color: #007aff;
-}
-
-.uni-icon-contact:before {
-	content: '\e100';
-}
-
-.uni-icon-person:before {
-	content: '\e101';
-}
-
-.uni-icon-personadd:before {
-	content: '\e102';
-}
-
-.uni-icon-contact-filled:before {
-	content: '\e130';
-}
-
-.uni-icon-person-filled:before {
-	content: '\e131';
-}
-
-.uni-icon-personadd-filled:before {
-	content: '\e132';
-}
-
-.uni-icon-phone:before {
-	content: '\e200';
-}
-
-.uni-icon-email:before {
-	content: '\e201';
-}
-
-.uni-icon-chatbubble:before {
-	content: '\e202';
-}
-
-.uni-icon-chatboxes:before {
-	content: '\e203';
-}
-
-.uni-icon-phone-filled:before {
-	content: '\e230';
-}
-
-.uni-icon-email-filled:before {
-	content: '\e231';
-}
-
-.uni-icon-chatbubble-filled:before {
-	content: '\e232';
-}
-
-.uni-icon-chatboxes-filled:before {
-	content: '\e233';
-}
-
-.uni-icon-weibo:before {
-	content: '\e260';
-}
-
-.uni-icon-weixin:before {
-	content: '\e261';
-}
-
-.uni-icon-pengyouquan:before {
-	content: '\e262';
-}
-
-.uni-icon-chat:before {
-	content: '\e263';
-}
-
-.uni-icon-qq:before {
-	content: '\e264';
-}
-
-.uni-icon-videocam:before {
-	content: '\e300';
-}
-
-.uni-icon-camera:before {
-	content: '\e301';
-}
-
-.uni-icon-mic:before {
-	content: '\e302';
-}
-
-.uni-icon-location:before {
-	content: '\e303';
-}
-
-.uni-icon-mic-filled:before,
-.uni-icon-speech:before {
-	content: '\e332';
-}
-
-.uni-icon-location-filled:before {
-	content: '\e333';
-}
-
-.uni-icon-micoff:before {
-	content: '\e360';
-}
-
-.uni-icon-image:before {
-	content: '\e363';
-}
-
-.uni-icon-map:before {
-	content: '\e364';
-}
-
-.uni-icon-compose:before {
-	content: '\e400';
-}
-
-.uni-icon-trash:before {
-	content: '\e401';
-}
-
-.uni-icon-upload:before {
-	content: '\e402';
-}
-
-.uni-icon-download:before {
-	content: '\e403';
-}
-
-.uni-icon-close:before {
-	content: '\e404';
-}
-
-.uni-icon-redo:before {
-	content: '\e405';
-}
-
-.uni-icon-undo:before {
-	content: '\e406';
-}
-
-.uni-icon-refresh:before {
-	content: '\e407';
-}
-
-.uni-icon-star:before {
-	content: '\e408';
-}
-
-.uni-icon-plus:before {
-	content: '\e409';
-}
-
-.uni-icon-minus:before {
-	content: '\e410';
-}
-
-.uni-icon-circle:before,
-.uni-icon-checkbox:before {
-	content: '\e411';
-}
-
-.uni-icon-close-filled:before,
-.uni-icon-clear:before {
-	content: '\e434';
-}
-
-.uni-icon-refresh-filled:before {
-	content: '\e437';
-}
-
-.uni-icon-star-filled:before {
-	content: '\e438';
-}
-
-.uni-icon-plus-filled:before {
-	content: '\e439';
-}
-
-.uni-icon-minus-filled:before {
-	content: '\e440';
-}
-
-.uni-icon-circle-filled:before {
-	content: '\e441';
-}
-.uni-icon-checkbox-filled:before {
-	content: '\e442';
-}
-
-.uni-icon-closeempty:before {
-	content: '\e460';
-}
-
-.uni-icon-refreshempty:before {
-	content: '\e461';
-}
-
-.uni-icon-reload:before {
-	content: '\e462';
-}
-
-.uni-icon-starhalf:before {
-	content: '\e463';
-}
-
-.uni-icon-spinner:before {
-	content: '\e464';
-}
-
-.uni-icon-spinner-cycle:before {
-	content: '\e465';
-}
-
-.uni-icon-search:before {
-	content: '\e466';
-}
-
-.uni-icon-plusempty:before {
-	content: '\e468';
-}
-
-.uni-icon-forward:before {
-	content: '\e470';
-}
-
-.uni-icon-back:before,
-.uni-icon-left-nav:before {
-	content: '\e471';
-}
-
-.uni-icon-checkmarkempty:before {
-	content: '\e472';
-}
-
-.uni-icon-home:before {
-	content: '\e500';
-}
-
-.uni-icon-navigate:before {
-	content: '\e501';
-}
-
-.uni-icon-gear:before {
-	content: '\e502';
-}
-
-.uni-icon-paperplane:before {
-	content: '\e503';
-}
-
-.uni-icon-info:before {
-	content: '\e504';
-}
-
-.uni-icon-help:before {
-	content: '\e505';
-}
-
-.uni-icon-locked:before {
-	content: '\e506';
-}
-
-.uni-icon-more:before {
-	content: '\e507';
-}
-
-.uni-icon-flag:before {
-	content: '\e508';
-}
-
-.uni-icon-home-filled:before {
-	content: '\e530';
-}
-
-.uni-icon-gear-filled:before {
-	content: '\e532';
-}
-
-.uni-icon-info-filled:before {
-	content: '\e534';
-}
-
-.uni-icon-help-filled:before {
-	content: '\e535';
-}
-
-.uni-icon-more-filled:before {
-	content: '\e537';
-}
-
-.uni-icon-settings:before {
-	content: '\e560';
-}
-
-.uni-icon-list:before {
-	content: '\e562';
-}
-
-.uni-icon-bars:before {
-	content: '\e563';
-}
-
-.uni-icon-loop:before {
-	content: '\e565';
-}
-
-.uni-icon-paperclip:before {
-	content: '\e567';
-}
-
-.uni-icon-eye:before {
-	content: '\e568';
-}
-
-.uni-icon-arrowup:before {
-	content: '\e580';
-}
-
-.uni-icon-arrowdown:before {
-	content: '\e581';
-}
-
-.uni-icon-arrowleft:before {
-	content: '\e582';
-}
-
-.uni-icon-arrowright:before {
-	content: '\e583';
-}
-
-.uni-icon-arrowthinup:before {
-	content: '\e584';
-}
-
-.uni-icon-arrowthindown:before {
-	content: '\e585';
-}
-
-.uni-icon-arrowthinleft:before {
-	content: '\e586';
-}
-
-.uni-icon-arrowthinright:before {
-	content: '\e587';
-}
-
-.uni-icon-pulldown:before {
-	content: '\e588';
-}
-
-.uni-icon-scan:before {
-    content: "\e612";
-}
-
-/* 分界线 */
-.uni-divider{
-    height: 110upx;
-    display: flex;
-    align-items:center;
-    justify-content: center;
-    position: relative;
-}
-.uni-divider__content{
-    font-size: 28upx;
-    color: #999;
-    padding: 0 20upx;
-    position: relative;
-    z-index: 101;
-    background: #F4F5F6;
-}
-.uni-divider__line{
-    background-color: #CCCCCC;
-    height: 1px;
-    width: 100%;
-    position: absolute;
-    z-index: 100;
-    top: 50%;
-    left: 0;
-    transform: translateY(50%);
-}

+ 47 - 45
ghs/src/pages.json

@@ -115,6 +115,7 @@
 				}
 			]
 		},
+
 		{
 			"root": "pagesShare",
 			"pages": [
@@ -425,45 +426,27 @@
 				}
 			]
 		},
+
 		{
-			"root": "admin/warehouse/allot/",
+			"root": "pagesStorehouse/shop/",
 			"pages": [
 				{
-					"path": "exDetails",
-					"style": {
-						"navigationBarTitleText": "出库详情"
-					}
-				},
-				{
-					"path": "addExDetails",
-					"style": {
-						"navigationBarTitleText": "新增"
-					}
-				},
-				{
-					"path": "allotEx",
+					"path": "list",
 					"style": {
-						"navigationBarTitleText": "调拨出库",
+						"navigationBarTitleText": "门店管理",
 						"enablePullDownRefresh": true
 					}
 				},
 				{
-					"path": "putDetails",
-					"style": {
-						"navigationBarTitleText": "入库详情"
-					}
-				},
-				{
-					"path": "allotPut",
+					"path": "update",
 					"style": {
-						"navigationBarTitleText": "调拨入库",
-						"enablePullDownRefresh": true
+						"navigationBarTitleText": "门店编辑"
 					}
 				}
 			]
 		},
 		{
-			"root": "admin/warehouse/inventory/",
+			"root": "pagesStorehouse/inventory/",
 			"pages": [
 				{
 					"path": "list",
@@ -493,56 +476,75 @@
 			]
 		},
 		{
-			"root": "admin/warehouse/shop/",
+			"root": "pagesStorehouse/allot/",
 			"pages": [
 				{
-					"path": "list",
+					"path": "exDetails",
 					"style": {
-						"navigationBarTitleText": "盘点",
+						"navigationBarTitleText": "出库详情"
+					}
+				},
+				{
+					"path": "addExDetails",
+					"style": {
+						"navigationBarTitleText": "新增"
+					}
+				},
+				{
+					"path": "allotEx",
+					"style": {
+						"navigationBarTitleText": "调拨出库",
 						"enablePullDownRefresh": true
 					}
 				},
 				{
-					"path": "update",
+					"path": "putDetails",
 					"style": {
-						"navigationBarTitleText": "门店编辑"
+						"navigationBarTitleText": "入库详情"
+					}
+				},
+				{
+					"path": "allotPut",
+					"style": {
+						"navigationBarTitleText": "调拨入库",
+						"enablePullDownRefresh": true
 					}
 				}
 			]
 		},
 		{
-			"root": "admin/warehouse/stockWarn/",
+			"root": "pagesStorehouse/flower/",
 			"pages": [
 				{
 					"path": "manage",
 					"style": {
-						"navigationBarTitleText": "库存",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "detailed",
-					"style": {
-						"navigationBarTitleText": "明细",
+						"navigationBarTitleText": "花材",
 						"enablePullDownRefresh": true
 					}
 				}
 			]
 		},
 		{
-			"root": "admin/warehouse/flower/",
+			"root": "pagesStorehouse/stockWarn/",
 			"pages": [
 				{
 					"path": "manage",
 					"style": {
-						"navigationBarTitleText": "花材",
+						"navigationBarTitleText": "库存",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "detailed",
+					"style": {
+						"navigationBarTitleText": "明细",
 						"enablePullDownRefresh": true
 					}
 				}
 			]
 		},
 		{
-			"root": "admin/warehouse/purchase/",
+			"root": "pagesPurchase",
 			"pages": [
 				{
 					"path": "result",
@@ -573,7 +575,7 @@
 			]
 		},
 		{
-			"root": "admin/warehouse/arrears/",
+			"root": "pagesArrears",
 			"pages": [
 				{
 					"path": "list",
@@ -592,7 +594,7 @@
 			]
 		},
 		{
-			"root": "admin/warehouse/invite/",
+			"root": "pagesInvite",
 			"pages": [
 				{
 					"path": "list",
@@ -604,7 +606,7 @@
 			]
 		},
 		{
-			"root": "admin/warehouse/statistics/",
+			"root": "pagesStatistics",
 			"pages": [
 				{
 					"path": "business",

+ 0 - 0
ghs/src/admin/warehouse/arrears/details.vue → ghs/src/pagesArrears/details.vue


+ 0 - 0
ghs/src/admin/warehouse/arrears/detailsItem.vue → ghs/src/pagesArrears/detailsItem.vue


+ 0 - 0
ghs/src/admin/warehouse/arrears/list.vue → ghs/src/pagesArrears/list.vue


+ 0 - 0
ghs/src/admin/warehouse/invite/inviteItem.vue → ghs/src/pagesInvite/inviteItem.vue


+ 0 - 0
ghs/src/admin/warehouse/invite/list.vue → ghs/src/pagesInvite/list.vue


+ 2 - 2
ghs/src/admin/warehouse/purchase/add.vue → ghs/src/pagesPurchase/add.vue

@@ -90,9 +90,9 @@
 import AppSearchModule from "@/components/module/app-search";
 import AppTabs from "@/components/plugin/tabs";
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
-import CommodityPurchase from "../components/CommodityPurchase";
+import CommodityPurchase from "./components/CommodityPurchase";
 import ModalModule from "@/components/plugin/modal";
-import FooterCart from "../components/FooterCart";
+import FooterCart from "./components/FooterCart";
 export default {
 	name: "Billing", // 开单
 	components: {

+ 0 - 0
ghs/src/admin/warehouse/components/Commodity.vue → ghs/src/pagesPurchase/components/Commodity.vue


+ 0 - 0
ghs/src/admin/warehouse/components/CommodityPurchase.vue → ghs/src/pagesPurchase/components/CommodityPurchase.vue


+ 0 - 0
ghs/src/admin/warehouse/components/CommodityStock.vue → ghs/src/pagesPurchase/components/CommodityStock.vue


+ 0 - 0
ghs/src/admin/warehouse/components/FooterCart.vue → ghs/src/pagesPurchase/components/FooterCart.vue


+ 0 - 0
ghs/src/admin/warehouse/components/table.vue → ghs/src/pagesPurchase/components/table.vue


+ 0 - 0
ghs/src/admin/warehouse/purchase/details.vue → ghs/src/pagesPurchase/details.vue


+ 0 - 0
ghs/src/admin/warehouse/purchase/order.vue → ghs/src/pagesPurchase/order.vue


+ 0 - 0
ghs/src/admin/warehouse/purchase/orderItem.vue → ghs/src/pagesPurchase/orderItem.vue


+ 0 - 0
ghs/src/admin/warehouse/purchase/result.vue → ghs/src/pagesPurchase/result.vue


+ 1 - 1
ghs/src/admin/warehouse/statistics/business.vue → ghs/src/pagesStatistics/business.vue

@@ -363,7 +363,7 @@ export default {
 		height: 300upx;
 		padding: 30upx;
 		// background: linear-gradient(30deg, #3ab7ff, #38a6ff, #3386ff);
-		background: url(../../../static/images/admin/bg2.png) no-repeat;
+		background: url(../static/images/admin/bg2.png) no-repeat;
 		background-size: 100% 100%;
 		color: #fff;
 

+ 0 - 0
ghs/src/admin/warehouse/allot/addExDetails.vue → ghs/src/pagesStorehouse/allot/addExDetails.vue


+ 0 - 0
ghs/src/admin/warehouse/allot/allotEx.vue → ghs/src/pagesStorehouse/allot/allotEx.vue


+ 0 - 0
ghs/src/admin/warehouse/allot/allotPut.vue → ghs/src/pagesStorehouse/allot/allotPut.vue


+ 0 - 0
ghs/src/admin/warehouse/allot/exDetails.vue → ghs/src/pagesStorehouse/allot/exDetails.vue


+ 0 - 0
ghs/src/admin/warehouse/allot/putDetails.vue → ghs/src/pagesStorehouse/allot/putDetails.vue


+ 140 - 0
ghs/src/pagesStorehouse/components/Commodity.vue

@@ -0,0 +1,140 @@
+<template>
+	<view class="item-cmd_bx">
+		<view class="img_bx">
+			<app-img
+				src="https://img.huaml.com/uploads/12358/202005/29/de74c55596d304b85e79154958e8bf57_small.jpeg"
+				alt="商品图"
+				mode="aspectFit"
+				:height="160"
+			/>
+		</view>
+		<view class="cmd-info_bx">
+			<view class="tit">天使美人</view>
+			<view class="kc">B级</view>
+			<view class="num-open_bx">
+				<view class="price">库存19/82</view>
+				<template v-if="isEdit">
+					<view class="open-bx" v-if="type == COMMODITY_TYPE.COMMON">
+						<i class="iconfont iconjianqu" @click="subtractEvent"></i>
+						<text class="num" @click="customNum">5/2</text>
+						<i class="iconfont icontianjia" @click="addEvent"></i>
+					</view>
+					<view class="open-bx" v-else-if="type == COMMODITY_TYPE.CHANGE">
+						<input class="change-input" type="text" placeholder="自动调价" />
+						<i class="iconfont icondelete" @click="delEvent"></i>
+					</view>
+				</template>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import { COMMODITY_TYPE } from "@/utils/declare";
+import AppImg from "@/components/app-img";
+export default {
+	name: "Commodity",
+	components: {
+		AppImg
+	},
+	props: {
+		type: {
+			type: String,
+			default: COMMODITY_TYPE.COMMON
+		},
+		isEdit: {
+			type: Boolean,
+			default: true
+		}
+	},
+	data() {
+		return {
+			COMMODITY_TYPE
+		};
+	},
+	methods: {
+		customNum() {
+			this.$emit("customNum");
+		},
+		addEvent() {
+			this.$emit("add");
+		},
+		subtractEvent() {
+			this.$emit("subtract");
+		},
+		delEvent() {
+			this.$emit("del");
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.item-cmd_bx {
+	position: relative;
+	margin-bottom: 20px;
+	.img_bx {
+		height: 160px;
+		width: 160px;
+		position: absolute;
+		left: 0px;
+		top: 0px;
+	}
+	.cmd-info_bx {
+		padding-left: 177px;
+		& .tit {
+			font-size: 28px;
+			font-weight: 400;
+			color: #333333;
+			padding-top: 10px;
+		}
+		& .kc {
+			color: #999999;
+			font-size: 24px;
+			padding: 10px 0 24px;
+		}
+		& .num-open_bx {
+			display: flex;
+			align-items: center;
+			& .price {
+				font-size: 28px;
+				color: #999999;
+				flex: 1;
+			}
+			& .open-bx {
+				display: flex;
+				align-items: center;
+				& .iconfont {
+					color: #3385ff;
+					font-size: 40px;
+				}
+				.icondelete {
+					margin: 0 10px 0 30px;
+					color: #ccc;
+					&.edit {
+						color: #3385ff;
+					}
+				}
+				& > .num {
+					display: inline-block;
+					margin: 0 8px;
+					color: #333333;
+					border-radius: 22px;
+					background-color: #f5f5f5;
+					padding: 5px 36px;
+				}
+				.change-input {
+					width: 164px;
+					height: 60px;
+					line-height: 60px;
+					text-align: center;
+					background: #ffffff;
+					border: 1px solid #dddddd;
+					border-radius: 4px;
+					font-size: 28px;
+				}
+			}
+		}
+	}
+}
+</style>

+ 144 - 0
ghs/src/pagesStorehouse/components/CommodityPurchase.vue

@@ -0,0 +1,144 @@
+<template>
+	<view class="item-cmd_bx">
+		<view class="img_bx">
+			<app-img
+				src="https://img.huaml.com/uploads/12358/202005/29/de74c55596d304b85e79154958e8bf57_small.jpeg"
+				alt="商品图"
+				mode="aspectFit"
+				:height="160"
+			/>
+		</view>
+		<view class="cmd-info_bx">
+			<view class="tit">天使美人</view>
+			<view class="kc">B级</view>
+			<view class="num-open_bx">
+				<view class="price"><text class="unit">¥</text><text>42</text></view>
+				<template v-if="isEdit">
+					<view class="open-bx" v-if="type == COMMODITY_TYPE.COMMON">
+						<i class="iconfont iconjianqu" @click="subtractEvent"></i>
+						<text class="num" @click="customNum">5/2</text>
+						<i class="iconfont icontianjia" @click="addEvent"></i>
+					</view>
+					<view class="open-bx" v-else-if="type == COMMODITY_TYPE.CHANGE">
+						<input class="change-input" type="text" placeholder="自动调价" />
+						<i class="iconfont icondelete" @click="delEvent"></i>
+					</view>
+				</template>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import { COMMODITY_TYPE } from "@/utils/declare";
+import AppImg from "@/components/app-img";
+export default {
+	name: "Commodity",
+	components: {
+		AppImg
+	},
+	props: {
+		type: {
+			type: String,
+			default: COMMODITY_TYPE.COMMON
+		},
+		isEdit: {
+			type: Boolean,
+			default: true
+		}
+	},
+	data() {
+		return {
+			COMMODITY_TYPE
+		};
+	},
+	methods: {
+		customNum() {
+			this.$emit("customNum");
+		},
+		addEvent() {
+			this.$emit("add");
+		},
+		subtractEvent() {
+			this.$emit("subtract");
+		},
+		delEvent() {
+			this.$emit("del");
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.item-cmd_bx {
+	position: relative;
+	margin-bottom: 20px;
+	.img_bx {
+		height: 160px;
+		width: 160px;
+		position: absolute;
+		left: 0px;
+		top: 0px;
+	}
+	.cmd-info_bx {
+		padding-left: 177px;
+		& .tit {
+			font-size: 28px;
+			font-weight: 400;
+			color: #333333;
+			padding-top: 10px;
+		}
+		& .kc {
+			color: #999999;
+			font-size: 24px;
+			padding: 10px 0 24px;
+		}
+		& .num-open_bx {
+			display: flex;
+			align-items: center;
+			& .price {
+				flex: 1;
+
+				font-size: 32upx;
+				color: #333;
+				.unit {
+					font-size: 22upx;
+				}
+			}
+			& .open-bx {
+				display: flex;
+				align-items: center;
+				& .iconfont {
+					color: #3385ff;
+					font-size: 40px;
+				}
+				.icondelete {
+					margin: 0 10px 0 30px;
+					color: #ccc;
+					&.edit {
+						color: #3385ff;
+					}
+				}
+				& > .num {
+					display: inline-block;
+					margin: 0 8px;
+					color: #333333;
+					border-radius: 22px;
+					background-color: #f5f5f5;
+					padding: 5px 36px;
+				}
+				.change-input {
+					width: 164px;
+					height: 60px;
+					line-height: 60px;
+					text-align: center;
+					background: #ffffff;
+					border: 1px solid #dddddd;
+					border-radius: 4px;
+					font-size: 28px;
+				}
+			}
+		}
+	}
+}
+</style>

+ 107 - 0
ghs/src/pagesStorehouse/components/CommodityStock.vue

@@ -0,0 +1,107 @@
+<template>
+	<view class="item-cmd_bx">
+		<view class="img_bx">
+			<app-img
+				src="https://img.huaml.com/uploads/12358/202005/29/de74c55596d304b85e79154958e8bf57_small.jpeg"
+				alt="商品图"
+				mode="aspectFit"
+				:height="160"
+			/>
+		</view>
+		<view class="cmd-info_bx">
+			<view class="tit">天使美人</view>
+			<view class="kc">B级</view>
+			<view class="num-open_bx">
+				<view class="price"><text class="unit">¥</text><text>42</text></view>
+
+				<view :class="['open-bx', { light: type == STOCK_TYPE.WARN }]">
+					库存2/5
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import { STOCK_TYPE } from "@/utils/declare";
+import AppImg from "@/components/app-img";
+export default {
+	name: "Commodity",
+	components: {
+		AppImg
+	},
+	props: {
+		type: {
+			type: String,
+			default: STOCK_TYPE.WARN
+		}
+	},
+	data() {
+		return {
+			STOCK_TYPE
+		};
+	},
+	methods: {
+		customNum() {
+			this.$emit("customNum");
+		},
+		addEvent() {
+			this.$emit("add");
+		},
+		subtractEvent() {
+			this.$emit("subtract");
+		},
+		delEvent() {
+			this.$emit("del");
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.item-cmd_bx {
+	position: relative;
+	margin-bottom: 20px;
+	.img_bx {
+		height: 160px;
+		width: 160px;
+		position: absolute;
+		left: 0px;
+		top: 0px;
+	}
+	.cmd-info_bx {
+		padding-left: 177px;
+		& .tit {
+			font-size: 28px;
+			font-weight: 400;
+			color: #333333;
+			padding-top: 10px;
+		}
+		& .kc {
+			color: #999999;
+			font-size: 24px;
+			padding: 10px 0 24px;
+		}
+		& .num-open_bx {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			& .price {
+				font-size: 32upx;
+				color: #333;
+				.unit {
+					font-size: 22upx;
+				}
+			}
+			& .open-bx {
+				display: flex;
+				align-items: center;
+				font-size: 32upx;
+				&.light {
+					color: $redColor;
+				}
+			}
+		}
+	}
+}
+</style>

+ 76 - 0
ghs/src/pagesStorehouse/components/FooterCart.vue

@@ -0,0 +1,76 @@
+<template>
+  <div class="cart-ft_bx">
+    <div class="cart-ct_bx">
+      <view class="cart-lf_bx">
+        <view class="cart-dot_bx">
+          <i class="iconfont icongouwuche"></i>
+        </view>
+        <view class="price">
+          ¥3566.88
+        </view>
+      </view>
+      <view class="cart-rg_bx">
+        选好了
+      </view>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'FooterCart',
+}
+</script>
+
+<style lang="scss" scoped>
+.cart-ft_bx {
+  width: 702px;
+  height: 88px;
+  background-color: #444444;
+  position: fixed;
+  bottom: 15px;
+  border-radius: 50px;
+  left: 50%;
+  transform: translate(-50%, 0);
+  z-index: 200;
+  overflow: hidden;
+  & .cart-ct_bx {
+    display: flex;
+    align-items: center;
+    height: 100%;
+    & .cart-lf_bx {
+      flex: 1;
+      display: flex;
+      align-items: center;
+      & .cart-dot_bx {
+        width: 72px;
+        height: 72px;
+        border-radius: 50%;
+        background-color: #3385ff;
+        text-align: center;
+        line-height: 72px;
+        margin-left: 6px;
+        .iconfont {
+          font-size: 40px;
+          color: #fff;
+        }
+      }
+      & .price {
+        font-weight: 500;
+        color: #ffffff;
+        font-size: 36px;
+        padding-left: 24px;
+      }
+    }
+    & .cart-rg_bx {
+      height: 100%;
+      width: 200px;
+      text-align: center;
+      font-size: 28px;
+      color: #ffffff;
+      background-color: #3385ff;
+      line-height: 88px;
+    }
+  }
+}
+</style>

+ 135 - 0
ghs/src/pagesStorehouse/components/table.vue

@@ -0,0 +1,135 @@
+<template>
+	<view class="table-view">
+		<view
+			class="table-header"
+			:style="{ backgroundColor: headerBackgroundColor }"
+		>
+			<view
+				class="table-th"
+				v-for="(item, index) in columns"
+				:key="index"
+				:style="{
+					flex: item.width ? `0 0 ${item.width}rpx` : '1',
+					textAlign: item.align || 'left',
+					fontSzie: `${headerFontSize}rpx`,
+					margin: `0 ${gutter}rpx`
+				}"
+			>
+				<!-- <slot :name="item.dataIndex" > -->
+				{{ item.name || "" }}
+				<!-- </slot> -->
+			</view>
+		</view>
+		<view class="table-tr" v-for="(item, index) in dataList" :key="index">
+			<view
+				class="table-td"
+				v-for="(column, columnIndex) in columns"
+				:key="columnIndex"
+				:style="{
+					flex: column.width ? `0 0 ${column.width}rpx` : '1',
+					textAlign: column.align || 'left',
+					fontSzie: `${fontSize}rpx`,
+					margin: `0 ${gutter}rpx`
+				}"
+			>
+				<!-- {{ item[column.dataIndex] || "" }} -->
+
+				<slot
+					v-if="column.custom"
+					:row="item"
+					:column="column"
+					:index="index"
+					:parentData="parentData"
+				>
+					{{ item[column.dataIndex] || "" }}
+				</slot>
+				<text v-else :class="[column.color || '']">
+					{{ (column.dataIndex && item[column.dataIndex]) || "" }}
+				</text>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	props: {
+		parentData: {},
+		columns: {
+			type: Array,
+			default: []
+		},
+		dataList: {
+			type: Array,
+			default: []
+		},
+		headerBackgroundColor: {
+			type: String,
+			default: "#ffffff"
+		},
+		fontSize: {
+			type: Number,
+			default: 24
+		},
+		headerFontSize: {
+			type: Number,
+			default: 24
+		},
+		gutter: {
+			type: Number,
+			default: 10
+		}
+	},
+	mounted() {
+		for (let index = 0; index < this.$children.length; index++) {
+			const element = this.$children[index];
+			console.log(33333, element, element.$attrs);
+		}
+	},
+	methods: {
+		childrenItem(name) {
+			let item = null;
+			for (let index = 0; index < this.$children.length; index++) {
+				const element = this.$children[index];
+				if (element.$options.name == "table-item") {
+				}
+			}
+			return;
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.table-view {
+	.table-header {
+		display: flex;
+		padding: 20upx 30upx;
+
+		box-shadow: 0px 1px 0px 0px #eeeeee;
+		color: #999999;
+		.table-th {
+			white-space: nowrap;
+		}
+	}
+	.table-tr {
+		display: flex;
+		align-items: center;
+		padding: 20upx 30upx;
+		border-bottom: 1px solid #eeeeee;
+		color: #999999;
+		.table-td {
+			.warn {
+				color: #ffaf1d;
+			}
+			.fail {
+				color: #f51608;
+			}
+			.success {
+				color: #09bb07;
+			}
+			.info {
+				color: #333;
+			}
+		}
+	}
+}
+</style>

+ 0 - 0
ghs/src/admin/warehouse/flower/manage.vue → ghs/src/pagesStorehouse/flower/manage.vue


+ 0 - 0
ghs/src/admin/warehouse/inventory/add.vue → ghs/src/pagesStorehouse/inventory/add.vue


+ 0 - 0
ghs/src/admin/warehouse/inventory/details.vue → ghs/src/pagesStorehouse/inventory/details.vue


+ 0 - 0
ghs/src/admin/warehouse/inventory/list.vue → ghs/src/pagesStorehouse/inventory/list.vue


+ 0 - 0
ghs/src/admin/warehouse/inventory/select.vue → ghs/src/pagesStorehouse/inventory/select.vue


+ 0 - 0
ghs/src/admin/warehouse/shop/list.vue → ghs/src/pagesStorehouse/shop/list.vue


+ 0 - 0
ghs/src/admin/warehouse/shop/update.vue → ghs/src/pagesStorehouse/shop/update.vue


+ 0 - 0
ghs/src/admin/warehouse/stockWarn/detailed.vue → ghs/src/pagesStorehouse/stockWarn/detailed.vue


+ 0 - 0
ghs/src/admin/warehouse/stockWarn/manage.vue → ghs/src/pagesStorehouse/stockWarn/manage.vue


+ 4 - 4
mall/src/ext.json

@@ -1,11 +1,11 @@
 {
   "extEnable": true,
-  "extAppid": "wxe41bd5816affd0ba",
+  "extAppid": "wxe994a9f5fd036f69",
   "directCommit": false,
   "ext": {
     "account": 12358,
-    "apiHost": "https://api.mall.huaml.com",
-    "imgHost": "https://img.huaml.com",
-    "merchantName":"中花卉"
+    "apiHost": "https://api.mall.huahb.com",
+    "imgHost": "https://img.huahb.com",
+    "merchantName":"国兰花尚"
   }
 }