+
+
+
+ 当前定位城市{{location.city}}
+
+
+
+ 热门城市
+
+
+
+ {{city.nickName}}
+
+
+
+
+ {{city.name}}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/Loading/loading.scss b/src/components/Loading/loading.scss
new file mode 100644
index 0000000..c710c7c
--- /dev/null
+++ b/src/components/Loading/loading.scss
@@ -0,0 +1,77 @@
+ @use '@/assets/_color.scss';
+
+$size: 100rpx;
+
+%loading {
+ width: $size;
+ height: $size;
+ position: absolute;
+ z-index: 9999;
+ left: 50%;
+ top: 50%;
+ // margin-left: -$size/2;
+ // margin-top: -$size/2;
+ box-sizing: border-box;
+}
+
+.zy-loading {
+ position: fixed;
+ left: 0;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ z-index: 9999;
+ overflow: hidden;
+ .zy-loading-mask {
+ background: rgba(white, .4);
+ position: absolute;
+ left: 0;
+ top: 0;
+ bottom: 0;
+ right: 0;
+ }
+ .zy-loading-img {
+ @extend %loading;
+ background: url("data:image/png;base64,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") center center no-repeat;
+ background-size: 60%;
+ animation: jump 2s infinite ease-in-out;
+ animation-direction: alternate;
+ }
+ .zy-loading-border {
+ @extend %loading;
+ border-radius: 50%;
+ // border: 4rpx solid transparent;
+ border-top: 2rpx solid #4EB331;
+ // border-right-color: #4EB331;
+ border-bottom: 2rpx solid #4EB331;;
+ animation: loading .5s infinite ease-in-out;
+ }
+ @keyframes loading {
+ from {
+ transform: rotateZ(0);
+ }
+ to {
+ transform: rotateZ(360deg);
+ }
+ }
+ @keyframes scale {
+ from {
+ transform: scale(1)
+ }
+ to {
+ transform: scale(1.2)
+ }
+ }
+
+ @keyframes jump {
+ 0%{transform:translate(0)}
+ 10%{transform:translateY(5px) scaleX(1.2) scaleY(.8)}
+ 30%{transform:translateY(-13px) scaleX(1) scaleY(1) rotateZ(5deg)}
+ 50%{transform:translateY(0) scale(1) rotateZ(0)}
+ 55%{transform:translateY(0) scaleX(1.1) scaleY(.9) rotateZ(0)}
+ 70%{transform:translateY(-4px) scaleX(1) scaleY(1) rotateZ(-2deg)}
+ 80%{transform:translateY(0) scaleX(1) scaleY(1) rotateZ(0)}
+ 85%{transform:translateY(0) scaleX(1.05) scaleY(.95) rotateZ(0)}
+ 100%{transform:translateY(0) scaleX(1) scaleY(1)}
+ }
+}
\ No newline at end of file
diff --git a/src/components/Loading/loading.vue b/src/components/Loading/loading.vue
new file mode 100644
index 0000000..c276707
--- /dev/null
+++ b/src/components/Loading/loading.vue
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/Modal/modal.scss b/src/components/Modal/modal.scss
new file mode 100644
index 0000000..2eecb46
--- /dev/null
+++ b/src/components/Modal/modal.scss
@@ -0,0 +1,113 @@
+ @use '@/assets/bundle.scss';
+
+.y-modal {
+ position: fixed;
+ z-index: 900;
+ left: 0;
+ top: 0;
+ width: 100vw;
+ height: 100vh;
+ background: rgba(black, .6);
+ animation: bounceInUp .8s ease-in-out;
+
+ .y-modal-wrapper {
+ @extend %flex-center;
+ height: 80vh;
+ }
+}
+
+.y-promopt {
+ @extend %bgwhite;
+ width: 600rpx;
+ padding: 40rpx;
+ border-radius: 10rpx;
+ box-shadow: 0 2rpx 4rpx rgba(black, .3);
+ border: 1rpx solid #4EB331;
+ @extend %ft30;
+ color: #333;
+ box-sizing: border-box;
+ // .title {
+ // }
+ .textarea {
+ border: 1rpx solid #DCDFE6;
+ @extend %pd20;
+ @extend %ft30;
+ height: 150rpx;
+ border-radius: 10rpx;
+ margin: 40rpx 0 80rpx;
+ width: 100%;
+ box-sizing: border-box;
+ }
+ .btn-group {
+ @extend %flex-between;
+ }
+ .btn-cancel, .btn-confirm {
+ @extend %btn-base;
+ }
+ .btn-cancel {
+ margin-right: 20rpx;
+ background: #F56C6C;
+ }
+}
+
+.y-confirm-check {
+ @extend %ft32;
+ @extend %bgwhite;
+ border-radius: 6rpx;
+ width: 600rpx;
+ .title {
+ @extend %ft36;
+ padding: 32rpx 0 20rpx;
+ text-align: center;
+ }
+ .icon-text {
+ color: #909399;
+ @extend %flex-center;
+ // line-height: 0;
+ margin-top: 20rpx;
+ .ipt{
+ margin-bottom: 5rpx;
+ border: 1rpx solid #cdcdcd;
+ border-radius: 10rpx;
+ }
+ }
+ .icon-check {
+ @extend %bg-no-repeat-center;
+ background-size: 60%;
+ width: 30rpx;
+ height: 30rpx;
+ border: 1rpx solid #DCDFE6;
+ border-radius: 50%;
+ margin-right: 10rpx;
+ }
+ .checked {
+ @extend %icon-checked-main;
+ border-color: #4EB331;
+ }
+ .body {
+ padding-bottom: 48rpx;
+ }
+ .text {
+ @extend %ft30;
+ color: #909399;
+ text-align: center;
+ }
+ .btn-group {
+ box-sizing: border-box;
+ border-top: 1rpx solid #eee;
+ @extend %flex-left;
+ }
+ .btn-cancel, .btn-confirm {
+ flex: 1;
+ @extend %ft36;
+ height: 100rpx;
+ @extend %flex-center;
+ }
+ .btn-cancel {
+ color: #909399;
+ border-right: 1rpx solid #eee;
+ }
+ .btn-confirm {
+ color: #4EB331;
+ }
+}
\ No newline at end of file
diff --git a/src/components/Modal/modal.vue b/src/components/Modal/modal.vue
new file mode 100644
index 0000000..696b608
--- /dev/null
+++ b/src/components/Modal/modal.vue
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/Modal/promopt.vue b/src/components/Modal/promopt.vue
new file mode 100644
index 0000000..73d05a3
--- /dev/null
+++ b/src/components/Modal/promopt.vue
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+
+ 取消
+ 确定
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/car-group/car-group.scss b/src/components/car-group/car-group.scss
new file mode 100644
index 0000000..806b04f
--- /dev/null
+++ b/src/components/car-group/car-group.scss
@@ -0,0 +1,91 @@
+@use '@/assets/bundle.scss';
+
+.car-group {
+ overflow-y: auto;
+ margin: 20rpx auto;
+ background: #eee;
+ // width: 750rpx;
+ // box-sizing: border-box;
+ @extend %pdlr;
+ .car-item{
+ background:#fff;
+ padding:0 20rpx;
+ overflow: hidden;
+ border-radius: 20rpx;
+ }
+ .store-info {
+ @extend %flex-between;
+ font-size: 28rpx;
+ color: #333;
+ height: 100rpx;
+ border-bottom: 1rpx solid #E4E7ED;
+ // padding-left: 100rpx;
+ // border: 1rpx solid greenyellow;
+ background-color: #fff;
+ }
+ .circle{
+ width: 30rpx;
+ height: 30rpx;
+ border-radius: 50%;
+ margin-right: 20rpx;
+ background-color:#eee;
+ }
+ // .waybillSLG{
+ // border: 1rpx solid red;
+ // width: 150rpx;
+ // padding: 10rpx;
+ // white-space: nowrap;
+ // color: #4EB331;
+ // }
+ .icon-right-aw {
+ flex: none;
+ @extend %icon-aw-right-slim;
+ width: 30rpx;
+ background-position: right center;
+ background-repeat: no-repeat;
+ background-size: 30rpx;
+ }
+ .store-name {
+ flex: 1;
+ @extend %oneline;
+ }
+ .store-mobile {
+ flex: none;
+ }
+ .skuName-item{
+ display:flex;
+ // width: 90vw;
+ // border:1rpx solid red;
+ }
+ .skuName-cell {
+ @extend %flex-left;
+ // border-bottom: 1rpx solid #E4E7ED;
+
+ border: 1rpx solid #e2dfdf;
+ margin-bottom: 20rpx;
+ margin-top: 20rpx;
+ border-radius: 20rpx;
+ background-color: #fff;
+ padding: 10rpx;
+ // display: flex;
+ // width: 100vw;
+ }
+ .delButton{
+ // height: 240rpx;
+ line-height: 140rpx;
+ background: #ff0000;
+ // border: 1rpx solid green;
+ color: #fff;
+ margin-top: 10rpx;
+ margin-left:30rpx;
+ font-size: 30rpx;
+ // width: 100rpx;
+ padding:10rpx 20rpx;
+ }
+ .flex-auto {
+ @extend %flex-auto;
+ }
+ // .skuName-item:last-child{
+ // // margin-bottom: 194rpx;
+ // }
+}
\ No newline at end of file
diff --git a/src/components/car-group/car-group.vue b/src/components/car-group/car-group.vue
new file mode 100644
index 0000000..97e0ac6
--- /dev/null
+++ b/src/components/car-group/car-group.vue
@@ -0,0 +1,241 @@
+
+ {{count}}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/checkItem/check-item.scss b/src/components/checkItem/check-item.scss
new file mode 100644
index 0000000..9305db5
--- /dev/null
+++ b/src/components/checkItem/check-item.scss
@@ -0,0 +1,24 @@
+@use '@/assets/bundle.scss';
+
+.y-check-box {
+ flex: none;
+ @extend %flex-left;
+ .check-cirle {
+ width: 50rpx;
+ height: 50rpx;
+ border-radius: 50%;
+ box-sizing: border-box;
+ border: 1rpx solid #DCDFE6;
+ margin-right: 20rpx;
+ }
+ .checked {
+ @extend %icon-checked;
+ background-color: #4EB331;
+ @extend %bg-no-repeat-center;
+ background-size: 52%;
+ }
+ .y-checkbox-text {
+ font-size: 32rpx;
+ color: #333;
+ }
+}
\ No newline at end of file
diff --git a/src/components/checkItem/check-item.vue b/src/components/checkItem/check-item.vue
new file mode 100644
index 0000000..a7eb35d
--- /dev/null
+++ b/src/components/checkItem/check-item.vue
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 物料店
+
+ {{storeMap[storeID].name}}
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/commonCmp/img-lazy/img-lazy.scss b/src/components/commonCmp/img-lazy/img-lazy.scss
new file mode 100644
index 0000000..de3f56e
--- /dev/null
+++ b/src/components/commonCmp/img-lazy/img-lazy.scss
@@ -0,0 +1,31 @@
+@use '@/assets/bundle.scss';
+
+.img-lazy-load {
+ position: relative;
+ width: 100%;
+ height: 100%;
+ .img-thumb, .img-origin {
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ filter: blur(1vw);
+ object-fit: fill;
+ }
+ .img-origin {
+ animation: fadeIn .2s;
+ animation-fill-mode: both;
+ }
+}
+
+@keyframes fadeIn {
+ from {
+ filter: blur(1vw);
+ // transform: scale(1.05);
+ }
+ to {
+ filter: blur(0);
+ // transform: scale(1);
+ }
+}
\ No newline at end of file
diff --git a/src/components/commonCmp/img-lazy/img-lazy.vue b/src/components/commonCmp/img-lazy/img-lazy.vue
new file mode 100644
index 0000000..d9ef13b
--- /dev/null
+++ b/src/components/commonCmp/img-lazy/img-lazy.vue
@@ -0,0 +1,52 @@
+
+
+
+ {{text}}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/commonCmp/list-none.scss b/src/components/commonCmp/list-none.scss
new file mode 100644
index 0000000..50a58a2
--- /dev/null
+++ b/src/components/commonCmp/list-none.scss
@@ -0,0 +1,29 @@
+@use '@/assets/bundle.scss';
+
+.cmp-list-none {
+ @extend %flex-center;
+ flex-flow: column;
+ .list-none-img {
+ width: 300rpx;
+ height: 300rpx;
+ @extend %bg-no-repeat-center;
+ @extend %bg-size-100;
+ }
+ .img-noGoods {
+ @extend %img-noGoods;
+ }
+ .img-noOrders {
+ @extend %img-noOrders;
+ }
+ .img-noShopCar {
+ @extend %img-noShopCar;
+ }
+ .img-noPosition {
+ @extend %icon-no-position;
+ }
+ .list-none-msg {
+ font-size: 32rpx;
+ color: #909399;
+ padding-top: 30rpx;
+ }
+}
diff --git a/src/components/commonCmp/list-none.vue b/src/components/commonCmp/list-none.vue
new file mode 100644
index 0000000..1c5a3e6
--- /dev/null
+++ b/src/components/commonCmp/list-none.vue
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/commonCmp/search-input/search-input.scss b/src/components/commonCmp/search-input/search-input.scss
new file mode 100644
index 0000000..702c3ab
--- /dev/null
+++ b/src/components/commonCmp/search-input/search-input.scss
@@ -0,0 +1,53 @@
+ @use '@/assets/bundle.scss';
+
+.cmp-search-input {
+ @extend %flex-center;
+ .input-wrapper {
+ // position: relative;
+ flex: 1;
+ background-color: #efefef;
+ // padding: 10rpx;
+ box-sizing: border-box;
+ border-radius: 50rpx;
+ @extend %flex-center;
+ height: 60rpx;
+ }
+ .input {
+ flex: auto;
+ color: #333;
+ width: 100%;
+ font-size: 30rpx;
+ padding: 10rpx;
+ }
+ .input-placeholder {
+ color: #666;
+ }
+ .icon-search, .icon-delete {
+ flex: none;
+ // position: absolute;
+ top: 50%;
+ // transform: translateY(-50%);
+ width: 50rpx;
+ height: 50rpx;
+ @extend %bg-no-repeat-center;
+ background-size: 30rpx;
+ z-index: 10;
+ }
+ .icon-search {
+ left: 10rpx;
+ @extend %icon-search;
+ }
+ .icon-delete {
+ right: 10rpx;
+ @extend %icon-delete;
+ }
+ .btn-search {
+ font-size: 30rpx;
+ margin-left:20rpx;
+ color: #fff;
+ border-radius: 70rpx;
+ padding: 10rpx 20rpx;
+ background-color: rgb(129, 190, 78);
+ text-align: center;
+ }
+}
\ No newline at end of file
diff --git a/src/components/commonCmp/search-input/search-input.vue b/src/components/commonCmp/search-input/search-input.vue
new file mode 100644
index 0000000..d1c66b0
--- /dev/null
+++ b/src/components/commonCmp/search-input/search-input.vue
@@ -0,0 +1,67 @@
+
+ {{msg}}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/goodCmp/Search/search-btn.vue b/src/components/goodCmp/Search/search-btn.vue
new file mode 100644
index 0000000..997bd24
--- /dev/null
+++ b/src/components/goodCmp/Search/search-btn.vue
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/goodCmp/Search/search.scss b/src/components/goodCmp/Search/search.scss
new file mode 100644
index 0000000..e28da6e
--- /dev/null
+++ b/src/components/goodCmp/Search/search.scss
@@ -0,0 +1,31 @@
+ @use '@/assets/bundle.scss';
+
+.zy-search-btn {
+ height: 70rpx;
+ @extend %flex-center;
+ font-size: 30rpx;
+ border-radius: 70rpx;
+ .icon {
+ // 放大镜
+ // @include svg_icon(search, a8a8a8);
+ @extend %icon-search;
+ @extend %bg-no-repeat-center;
+ @extend %bg-size-100;
+ width: 36rpx;
+ height: 36rpx;
+ margin-right: 10rpx;
+ margin-left:10rpx;
+ }
+}
+.showBtn{
+ display: flex;
+ justify-content: space-between;
+}
+.searchBtn{
+ // 搜索按钮
+ padding:10rpx 20rpx;
+ border-radius: 25rpx;
+ margin-right: 10rpx;
+ background: rgb(129, 190, 78);
+ color:#fff;
+}
\ No newline at end of file
diff --git a/src/components/goodCmp/good-cell-index/good-cell-big.scss b/src/components/goodCmp/good-cell-index/good-cell-big.scss
new file mode 100644
index 0000000..feccb6d
--- /dev/null
+++ b/src/components/goodCmp/good-cell-index/good-cell-big.scss
@@ -0,0 +1,120 @@
+ @use '@/assets/bundle.scss';
+
+.good-cell-big {
+ @extend %pd20;
+ @extend %bgwhite;
+ box-sizing: border-box;
+ box-shadow: 0 0 4rpx rgba(#DCDFE6, 1);
+ border-radius: 10rpx;
+ .good-img {
+ width: 300rpx;
+ height: 300rpx;
+ .good-img-size{
+ width: 100%;
+ height: 100%;
+ }
+ }
+ .good-name {
+ font-size: 28rpx;
+ margin-top: 20rpx;
+ color: #333;
+ height: 4em;
+ overflow: hidden;
+ text-align: justify;
+ line-height: 1.2;
+
+ }
+ .good-price {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ }
+ .btn-wait{
+ flex: 1;
+ text-align: right;
+ }
+ .btn-self{
+ color: #fff;
+ background-color: rgba(78, 179, 49, 0.6);
+ }
+ .countTime-wrap{
+ height: 17rpx;
+ width: 100%;
+ margin-bottom: 5rpx;
+ }
+ .countTime{
+ color: #E6A23C;
+ font-size: 26rpx;
+ }
+ .stock-and-waitPirce{
+ display: flex;
+ }
+ .price {
+ display: flex;
+ align-items: baseline;
+ .unit{
+ font-size:28rpx;
+ color:#fe6263;
+ }
+ }
+ .ori-price {
+ font-size: 20rpx;
+ color: #b2b2b2;
+ margin-left: 10rpx;
+ text-decoration: line-through;
+ &:before {
+ content: "￥";
+ }
+ }
+ .act-type-wrapper {
+ height: 20rpx;
+ overflow: hidden;
+ }
+ .act-type {
+ @extend %act-type-text;
+ }
+ .check-detail{
+ font-size:28rpx;
+ color:rgba(78, 179, 49, 0.6);
+ }
+ .handle-shopcar {
+ margin-top: 20rpx;
+ height: 50rpx;
+ }
+ .add-cart{
+ height: 60rpx;
+ line-height: 60rpx;
+ font-size:30rpx;
+ background:#81be4e;
+ color:#fff;
+ text-align:center;
+ border-radius:20rpx;
+ margin-top:10rpx;
+ }
+}
+// #ifdef MP-KUAISHOU
+.viewDetail{
+ // border:1px solid red;
+ text-align: center;
+ background: rgba(78, 179, 49, 0.8);
+ border-radius: 20rpx;
+ height: 50rpx;
+ line-height: 50rpx;
+ color:#fff;
+}
+// #endif
+
+
+// .good-cell-big{
+// box-sizing: border-box;
+// box-shadow: 0 0 4rpx rgba(#DCDFE6, 1);
+// border-radius: 10rpx;
+// .good-img {
+// width: 300rpx;
+// height: 300rpx;
+// img {
+// width: 100%;
+// height: 100%;
+// }
+// }
+// }
\ No newline at end of file
diff --git a/src/components/goodCmp/good-cell-index/good-cell-big.vue b/src/components/goodCmp/good-cell-index/good-cell-big.vue
new file mode 100644
index 0000000..6ad05e8
--- /dev/null
+++ b/src/components/goodCmp/good-cell-index/good-cell-big.vue
@@ -0,0 +1,221 @@
+
+
+
+
+ {{name}}
+ 搜索
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/goodCmp/good-cell/good-cell.scss b/src/components/goodCmp/good-cell/good-cell.scss
new file mode 100644
index 0000000..06011f8
--- /dev/null
+++ b/src/components/goodCmp/good-cell/good-cell.scss
@@ -0,0 +1,129 @@
+ @use '@/assets/bundle.scss';
+
+.good-cell {
+ // @extend %pd20;
+ padding: 30rpx 0;
+ display: flex;
+ // border-bottom: 1rpx solid #F2F6FC;
+ border-bottom: 1rpx solid #dadada;
+ .good-img {
+ flex: none;
+ width: 150rpx;
+ height: 150rpx;
+ .good-img-size{
+ width: 100%;
+ height: 100%;
+ }
+ // img {
+ // width: 100%;
+ // height: 100%;
+ // }
+ }
+ .good-info {
+ flex: auto;
+ margin-left: 20rpx;
+ }
+ .lookDetail{
+ height: 60rpx;
+ line-height: 60rpx;
+ font-size:30rpx;
+ background:#81be4e;
+ color:#fff;
+ text-align:center;
+ border-radius:20rpx;
+ margin-top:10rpx;
+ }
+ .good-name {
+ font-size: 30rpx;
+ font-weight: 400;
+ color: #333;
+ min-height: 80rpx;
+ line-height: 1.1;
+ }
+ .btn-wait{
+ flex: 1;
+ }
+ .btn-self{
+ color: #fff;
+ background-color: rgba(78, 179, 49, 0.6);
+ }
+ .countTime-wrap{
+ height: 17px;
+ width: 100%;
+ margin-bottom: 5rpx;
+ }
+ .countTime{
+ color: #E6A23C;
+ font-size: 26rpx;
+ }
+ .stock-and-waitPirce{
+ display: flex;
+ }
+ .act-type-wrapper {
+ height: 20rpx;
+ overflow: hidden;
+ }
+ .act-type {
+ @extend %act-type-text;
+ }
+ .good-price {
+ @extend %flex-between;
+ flex-wrap: wrap;
+ }
+ .price {
+ display: flex;
+ align-items: baseline;
+ }
+ .cur-price {
+ font-size: 32rpx;
+ color: #fe6263;
+ font-weight: 700;;
+ &:before {
+ content: "￥";
+ font-size: 24rpx;
+ }
+ }
+ .ori-price {
+ font-size: 20rpx;
+ color: #b2b2b2;
+ margin-left: 10rpx;
+ text-decoration: line-through;
+ &:before {
+ content: "￥";
+ }
+ }
+ .handle-shopcar {
+ flex: none;
+ // background: red;
+ margin-left: auto;
+ height: 60rpx;
+ @extend %flex-center;
+ }
+ .cart-act-count {
+ font-size: 24rpx;
+ color: #606266;
+ display: flex;
+ flex-flow: column;
+ align-items: flex-end;
+ line-height: 1;
+ .act-count-show {
+ width: 220rpx;
+ @extend %flex-between;
+ }
+ }
+ .add-cart{
+ width: 200rpx;
+ height: 60rpx;
+ line-height: 60rpx;
+ font-size:30rpx;
+ background:#81be4e;
+ color:#fff;
+ text-align:center;
+ border-radius:20rpx;
+ // border:1rpx solid red;
+ }
+}
+
+.no-border{
+ border-bottom: 1rpx solid #fff !important;
+}
\ No newline at end of file
diff --git a/src/components/goodCmp/good-cell/good-cell.vue b/src/components/goodCmp/good-cell/good-cell.vue
new file mode 100644
index 0000000..c4ff3a7
--- /dev/null
+++ b/src/components/goodCmp/good-cell/good-cell.vue
@@ -0,0 +1,212 @@
+
+
+ ![加载中...]()
+
+ {{skuName.name}}
+
+
+ {{skuName.trendType===2 ? '降价' :'升价'}}还剩 {{msg}}
+
+ 每
+
+ {{skuName.unit}}
+ 斤
+ 约为
+
+ {{$filters.toFixed2(skuName.curPrice)}}
+ {{$filters.toFixed2(skuName.price*100)}}
+ {{$filters.toFixed2(skuName.curPrice)}}
+ 元(以实际价格为准)
+
+
+
+
+
+
+ ￥
+ {{newPrice }}
+
+ /{{skuName.unit}}
+
+ /斤
+ {{$filters.toFixed2(skuName.oriPrice)}}
+
+
+ {{actTypeArr[skuName.actType]}}
+ 加入购物车
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/goodCmp/good-price/good-price.scss b/src/components/goodCmp/good-price/good-price.scss
new file mode 100644
index 0000000..5cf6bc3
--- /dev/null
+++ b/src/components/goodCmp/good-price/good-price.scss
@@ -0,0 +1,20 @@
+ @use '@/assets/bundle.scss';
+
+.good-price {
+ font-size: 32rpx;
+ color: #fe6263;
+ font-weight: 500;
+ // &:before {
+ // content: "￥";
+ // font-size: 28rpx;
+ // }
+
+ &-font{
+ font-size: 38rpx;
+ &:after{
+ // content: ".";
+ font-size: 28rpx;
+ padding:0 5rpx;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/components/goodCmp/good-price/good-price.vue b/src/components/goodCmp/good-price/good-price.vue
new file mode 100644
index 0000000..c3f2c88
--- /dev/null
+++ b/src/components/goodCmp/good-price/good-price.vue
@@ -0,0 +1,31 @@
+
+
+ ![加载中...]()
+
+
+
+
+
+ {{skuName.name}}
+
+
+
+ {{skuName.trendType===2 ? '降价' :'升价'}}还剩 {{msg}}
+
+
+
+ {{actTypeArr[skuName.actType]}}
+
+
+
+
+
+
+
+
+ {{$filters.toFixed2(skuName.oriPrice)}}
+ 加入购物车
+
+
+ 查看详情
+
+
+
+
+
+
+
+
+
+
+
+ {{$filters.toFixed2(skuName.curPrice)}}
+ x1
+
+
+ {{$filters.toFixed2(skuName.oriPrice)}}
+ x{{skuName.count - 1}}
+
+
+ ￥
+ {{newPrice }}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/goodCmp/leftCats/left-cats.scss b/src/components/goodCmp/leftCats/left-cats.scss
new file mode 100644
index 0000000..54c860c
--- /dev/null
+++ b/src/components/goodCmp/leftCats/left-cats.scss
@@ -0,0 +1,33 @@
+ @use '@/assets/bundle.scss';
+
+.left-cats {
+ // height: calc(100vh - 90rpx);
+ /* #ifndef H5 */
+ height: calc(100vh - 90rpx);
+ /* #endif */
+ /* #ifdef H5 */
+ height: calc(100vh - 270rpx);
+ /* #endif */
+ .cats-item {
+ height: 110rpx;
+ font-size: 28rpx;
+ color: #666;
+ @extend %flex-center;
+ box-sizing: border-box;
+ }
+
+ .cat-name {
+ border-left: 6rpx solid transparent;
+ flex: 1;
+ height: 60rpx;
+ @extend %flex-center;
+ }
+
+ .active {
+ background: white;
+ color: #4EB331;
+ .cat-name {
+ border-left-color: #4EB331;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/components/goodCmp/leftCats/left-cats.vue b/src/components/goodCmp/leftCats/left-cats.vue
new file mode 100644
index 0000000..c15e8f9
--- /dev/null
+++ b/src/components/goodCmp/leftCats/left-cats.vue
@@ -0,0 +1,52 @@
+
+
+
+ {{cat.name}}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/goodCmp/topCats/top-cats.scss b/src/components/goodCmp/topCats/top-cats.scss
new file mode 100644
index 0000000..febb0bb
--- /dev/null
+++ b/src/components/goodCmp/topCats/top-cats.scss
@@ -0,0 +1,59 @@
+ @use '@/assets/bundle.scss';
+
+// 顶部二级菜单
+.top-cats {
+ display: flex;
+ align-items: center;
+ position: relative;
+ // 遮罩
+ &:after {
+ content: "";
+ display: block;
+ position: absolute;
+ background: linear-gradient(to left, white, rgba(white, 0));
+ right: 15%;
+ width: 80rpx;
+ height: 100%;
+ }
+ .scroll-x {
+ // white-space: nowrap;
+ width: 85%;
+ // background: red;
+
+ .scroll-area {
+ display: flex;
+ align-items: center;
+ }
+ .scroll-item {
+ // display: inline-block;
+ flex: none;
+ font-size: 28rpx;
+ padding: 20rpx;
+ }
+ .scroll-item-placeholder {
+ flex: none;
+ width: 80rpx;
+ height: 50rpx;
+ }
+ .cat-active {
+ color: #4EB331;
+ border: 1rpx solid #4EB331;
+ padding: 4rpx 10rpx;
+ background: rgb(234, 240, 227);
+ border-radius: 10rpx;
+ }
+ }
+ .btn-up-down {
+ width: 15%;
+ height: 79rpx;
+ // @include svg_icon(arraw-up, 9a9a9a);
+ background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAANRJREFUWEft1MENwjAMBVB7AlZhhLJJOcRnRuGcHOgmdARWYQKjSI0UFUKSn0Mvzr35L1+1mQ4+fHA+GcAasAasgaEGvPdzXGQisqALDQZs4Y8t+IoiIEAKV9V3BDDziYggRDcgD2fmKQJUdUURXYB9uIi8IsB7f0YRzYBSePr5UEQToBY+gqgCWsNRxF9AbziCKALQ8F7ET8BoeA/iCxBCmFT1GZdMnPM0auiqzaeDmS/OuTW/q9TAnYiW0fC8CSKaReS2f0h1CtCXt35nAGvAGrAGPjJjsyGUY8cAAAAAAElFTkSuQmCC");
+ background-size: 20rpx;
+ @extend %bg-no-repeat-center;
+ transform: rotateX(180deg);
+ transition: all .5s;
+ }
+ .arrow-active {
+ transform: rotateX(0);
+ }
+}
\ No newline at end of file
diff --git a/src/components/goodCmp/topCats/top-cats.vue b/src/components/goodCmp/topCats/top-cats.vue
new file mode 100644
index 0000000..c05a2f3
--- /dev/null
+++ b/src/components/goodCmp/topCats/top-cats.vue
@@ -0,0 +1,77 @@
+
+ 加入购物车
+
+
+
+
+ {{count}}
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/goodCmp/topCatsWall/top-cats-wall.scss b/src/components/goodCmp/topCatsWall/top-cats-wall.scss
new file mode 100644
index 0000000..c0ef51a
--- /dev/null
+++ b/src/components/goodCmp/topCatsWall/top-cats-wall.scss
@@ -0,0 +1,23 @@
+ @use '@/assets/bundle.scss';
+
+.top-cats-wall {
+ background: white;
+ font-size: 28rpx;
+ display: flex;
+ flex-flow: row wrap;
+ padding: 20rpx 0 40rpx;
+ .wall-item {
+ width: 30%;
+ // margin-left: (10% / 5);
+ margin-top: 4%;
+ box-sizing: border-box;
+ border: 2rpx solid #ddd;
+ height: 50rpx;
+ @extend %flex-center;
+ border-radius: 30rpx;
+ }
+ .active {
+ border-color: #4EB331;
+ background: rgba(#4EB331, .2);
+ }
+}
\ No newline at end of file
diff --git a/src/components/goodCmp/topCatsWall/top-cats-wall.vue b/src/components/goodCmp/topCatsWall/top-cats-wall.vue
new file mode 100644
index 0000000..964b142
--- /dev/null
+++ b/src/components/goodCmp/topCatsWall/top-cats-wall.vue
@@ -0,0 +1,35 @@
+
+
+
+
+ {{cat.name}}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/jxEmpty/index.vue b/src/components/jxEmpty/index.vue
new file mode 100644
index 0000000..86b72e9
--- /dev/null
+++ b/src/components/jxEmpty/index.vue
@@ -0,0 +1,65 @@
+
+
+ {{cat.name}}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/material-info/material-info.scss b/src/components/material-info/material-info.scss
new file mode 100644
index 0000000..01a5a90
--- /dev/null
+++ b/src/components/material-info/material-info.scss
@@ -0,0 +1,11 @@
+ @use '@/assets/bundle.scss';
+
+.material-info {
+ font-size: 30rpx;
+ color: #606266;
+ text-align: center;
+ .danger {
+ color: #F56C6C;
+ font-weight: 500;
+ }
+}
\ No newline at end of file
diff --git a/src/components/nearlyStoreCom/index.scss b/src/components/nearlyStoreCom/index.scss
new file mode 100644
index 0000000..5bbffde
--- /dev/null
+++ b/src/components/nearlyStoreCom/index.scss
@@ -0,0 +1,188 @@
+ @use '@/assets/bundle.scss';
+
+.nearlyStores{
+ margin-top:20rpx;
+ background:#fff;
+ border-radius:10rpx;
+ padding:10rpx;
+
+ // border: 1rpx solid red;
+ box-shadow: 0rpx 2rpx 10rpx rgb(207, 207, 207);
+}
+
+.storeInfo{
+ display:flex;
+ font-size:30rpx;
+ position:relative;
+}
+
+.storeImg{
+ width:120rpx;
+ height:120rpx;
+}
+
+.storeStatus{
+ position:absolute;
+ // top:80rpx;
+ bottom: 0;
+ left:0;
+ width:120rpx;
+ text-align:center;
+ background:rgba(0,0,0,0.5);
+ color:#fff;
+}
+
+.storeRight{
+ margin-left:20rpx;
+}
+
+.storeName{
+ display:flex;
+ font-weight:bold;
+ margin-bottom:4rpx;
+}
+
+.storeTime,.storeTime1,.storeTime2{
+ font-size: 24rpx;
+}
+
+.storeTime2{
+ margin-left:20rpx;
+}
+
+.storeRate{
+ display:flex !important;
+ font-size: 24rpx;
+ margin-top:6rpx
+}
+
+.fullReduce{
+ display:flex;
+ margin-bottom:20rpx;
+ justify-content:space-between;
+ font-size: 24rpx;
+ width:566rpx;
+ margin-top:6rpx;
+
+ &Fee{
+ border:1rpx solid #f16a6a;
+ text-align:center;
+ border-radius:10rpx;
+ padding:6rpx;
+ // background: #fff;
+ color: #f16a6a;
+ }
+}
+
+.storeGood{
+ // border: 1rpx solid red;
+ display:flex;
+ // margin-left:142rpx;
+ margin-left:20rpx;
+ overflow:hidden;
+ overflow-x:auto;
+ width:98%;
+ white-space:nowrap;
+
+ &Item:not(:last-child){
+ margin-right:20rpx;
+ // width: 100%;
+ }
+
+ // .storeGood:not(:last-child){
+ // // margin-left: 0;
+ // border: 1rpx solid red;
+ // }
+
+ &Img{
+ width:146rpx;
+ height:146rpx;
+ }
+
+ &Name{
+ width:120rpx;
+ white-space:nowrap;
+ overflow:hidden;
+ text-overflow:ellipsis;
+ font-size:24rpx;
+ }
+
+ &Price{
+ color:#ff0000;
+ font-size:24rpx;
+ }
+
+ &Price::before{
+ content: '￥';
+ font-size:20rpx;
+ }
+
+ &More{
+ // border: 1rpx solid green;
+ // position: relative;
+ // right: 0;
+ position:sticky;
+ right:0;
+ writing-mode:vertical-lr;
+ text-align:center;
+ background:rgba(132, 132, 132, 0.5);
+ color:#fff;
+ padding:0 12rpx;
+ }
+}
+
+.top-title_near ,.top-title{
+ background: #fff;
+ padding: 20rpx 0;
+ border-radius: 10rpx;
+ line-height: 1;
+ box-shadow: 5rpx 5rpx 4rpx rgba(194, 193, 192, 0.2);
+ }
+ .top-title{
+ @extend %flex-left;
+ }
+
+ .top-title_near{
+ display: flex;
+ justify-content: space-between !important;
+ }
+
+ .icon-border {
+ width: 6rpx;
+ background-color: #4EB331;
+ height: 30rpx;
+ margin-right: 10rpx;
+ }
+ .title {
+ font-weight: bold;
+ color: #333;
+ font-size: 36rpx;
+ }
+
+ .ranking_left,.ranking_right{
+ display:flex;
+ border:0
+ }
+
+ .operationRaking,.optimalScore,.nearlyDistance{
+ padding:4px 10px;
+ font-size:28rpx;
+ }
+
+ .active_status{
+ border-bottom:2rpx solid #4EB331;
+ color:#4EB331;
+ font-weight: bold;
+ }
+
+ .top-goods-list {
+ display: flex;
+ box-sizing: border-box;
+ flex-flow: row wrap;
+ justify-content: space-between;
+ .goods-item {
+ margin-top: 20rpx;
+ width: 345rpx;
+ flex: none ;
+ }
+ }
\ No newline at end of file
diff --git a/src/components/nearlyStoreCom/index.vue b/src/components/nearlyStoreCom/index.vue
new file mode 100644
index 0000000..2e9b6e4
--- /dev/null
+++ b/src/components/nearlyStoreCom/index.vue
@@ -0,0 +1,198 @@
+
+ 单量: {{preSaleCount}}，已选袋子件数/数量: {{totalBag.unitCount}}件/{{totalBag.totalCount}}个
+ {{bagOverload}}
+
+
+
+
+
+
+
+
+
+
+ 附近商家
+
+
+
+ 综合排序
+ 评分最优
+ 距离最近
+
+
+
+
+
+
+
+
+
+
+
+
+ 休息中
+
+
+
+
+
+ {{item.storeInfo.storeName }}
+ --
+ {{ item.storeInfo.brandName }}
+
+
+
+ 营业时间：
+ {{$filters.processingHours(item.storeInfo.openTime1)}}-{{$filters.processingHours(item.storeInfo.closeTime1)}}
+ {{$filters.processingHours(item.storeInfo.openTime2)}}-{{$filters.processingHours(item.storeInfo.closeTime2)}}
+
+
+
+ 门店评分：
+
+
+ 暂无评分
+
+
+
+ 满{{item.StoreDeductionInfo[0].deliveryFeeDeductionSill/100}}减{{item.StoreDeductionInfo[0].deliveryFeeDeductionFee/100}}
+
+
+ 距您{{item.storeInfo.distance}}m
+ 距您{{(item.storeInfo.distance/1000).toFixed(2)}}km
+
+
+
+
+
+ {{ite.skuName}}
+ {{(ite.price/100).toFixed(2)}}元/{{ite.unit}}
+ 查看更多
+
+
+
+
+
+ {{ite.skuName}}
+
+ {{(ite.curPrice/100).toFixed(2)}}元/{{ite.unit}}
+ 查看更多
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/shopCarIcon/index.scss b/src/components/shopCarIcon/index.scss
new file mode 100644
index 0000000..c1b741c
--- /dev/null
+++ b/src/components/shopCarIcon/index.scss
@@ -0,0 +1,59 @@
+ @use '@/assets/bundle.scss';
+.btn-toShopCar-new {
+ // position: fixed;
+ // left: 40rpx;
+ // bottom: 100rpx;
+ background-color: rgba(black, .6);
+ width: 120rpx;
+ height: 120rpx;
+ border-radius: 50%;
+ z-index: 10;
+ @extend %flex-center;
+ }
+ .icon-shopcar {
+ @extend %icon-shopcar-white;
+ @extend %bg-no-repeat-center;
+ width: 100rpx;
+ height: 100rpx;
+ background-size: 50rpx;
+ border-radius: 50%;
+ }
+ .fixed-box {
+ pointer-events: none; // 这里是重点，盒子可穿透操作
+ width: 100vw;
+ height: 90vh;
+ position: fixed;
+ top: 100rpx;
+ left: 0;
+ z-index: 100000;
+ }
+ .fixed-button {
+ opacity: 1;
+ // background: #ccc;
+ border-radius: 100%;
+ pointer-events: auto;
+ // width: max-content;
+ // height: auto;
+ width: 120rpx;
+ height: 120rpx;
+ overflow: hidden;
+ z-index: 9999;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ left: 20rpx;
+ top: 85vh;
+ .imger{
+ width: 52px;
+ height: 52px;
+ overflow: none;
+ }
+ }
+
+ /* 适配iphonex 有底部横条的 */
+ @supports (bottom: constant(safe-area-inset-bottom)) or (bottom: env(safe-area-inset-bottom)) {
+ .fixed-box {
+ bottom: constant(safe-area-inset-bottom);
+ bottom: env(safe-area-inset-bottom);
+ }
+ }
\ No newline at end of file
diff --git a/src/components/shopCarIcon/index.vue b/src/components/shopCarIcon/index.vue
new file mode 100644
index 0000000..b75c150
--- /dev/null
+++ b/src/components/shopCarIcon/index.vue
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+ 
+ {{storeMap[storeID[0]].name}}
+ 
+ 
+
+
+
+
+
+
+
+
diff --git a/src/pagesAddress/addressCmp/address-item.scss b/src/pagesAddress/addressCmp/address-item.scss
new file mode 100644
index 0000000..012725b
--- /dev/null
+++ b/src/pagesAddress/addressCmp/address-item.scss
@@ -0,0 +1,29 @@
+ @use '@/assets/bundle.scss';
+
+.address-item {
+ @extend %pdtb;
+ border-bottom: 1rpx solid #EBEEF5;
+ margin: 0 50rpx;
+ position: relative;
+ #{&}-title {
+ color: #333;
+ font-size: 34rpx;
+ @extend %oneline;
+ width: 500rpx;
+ }
+ #{&}-address {
+ color: #909399;
+ font-size: 28rpx;
+ padding-top: 10rpx;
+ @extend %oneline;
+ // border: 1px solid red;
+ }
+ .title{
+ display: flex;
+ justify-content: space-between;
+ }
+ &-distance{
+ color:#909399;
+ font-size: 28rpx;
+ }
+}
\ No newline at end of file
diff --git a/src/pagesAddress/addressCmp/address-item.vue b/src/pagesAddress/addressCmp/address-item.vue
new file mode 100644
index 0000000..45ebda8
--- /dev/null
+++ b/src/pagesAddress/addressCmp/address-item.vue
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesAddress/addressCmp/waybill-address.scss b/src/pagesAddress/addressCmp/waybill-address.scss
new file mode 100644
index 0000000..266efb5
--- /dev/null
+++ b/src/pagesAddress/addressCmp/waybill-address.scss
@@ -0,0 +1,43 @@
+ @use '@/assets/bundle.scss';
+
+.waybill-address {
+ border-bottom: 1rpx solid #E4E7ED;
+ @extend %flex-center;
+ // @extend %pdlr;
+ padding: 30rpx;
+ min-height: 140rpx;
+ #{&}-left {
+ flex: auto;
+
+ }
+ #{&}-right {
+ flex: none;
+ // width: 100rpx;
+ .icon-editor {
+ @extend %icon-editor;
+ @extend %bg-no-repeat-center;
+ background-size: 40rpx;
+ width: 100rpx;
+ height: 100rpx;
+ }
+ }
+ #{&}-address {
+ font-size: 30rpx;
+ color: #333;
+ margin-bottom: 10rpx;
+ }
+ #{&}-contact {
+ font-size: 30rpx;
+ color: #909399;
+ }
+ .isDefault {
+ font-size: 22rpx;
+ display: inline-block;
+ @extend %flex-center;
+ padding: 10rpx;
+ background: #F56C6C;
+ color: white;
+ border-radius: 10rpx;;
+ margin-right: 10rpx;
+ }
+}
\ No newline at end of file
diff --git a/src/pagesAddress/addressCmp/waybill-address.vue b/src/pagesAddress/addressCmp/waybill-address.vue
new file mode 100644
index 0000000..a7bfed3
--- /dev/null
+++ b/src/pagesAddress/addressCmp/waybill-address.vue
@@ -0,0 +1,43 @@
+
+
+
+ {{title}}
+ {{distance.toFixed(1)}}米
+ {{(distance/1000).toFixed(1)}}千米
+ {{address}}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesAddress/create-address-cop/create-address.scss b/src/pagesAddress/create-address-cop/create-address.scss
new file mode 100644
index 0000000..ea971cf
--- /dev/null
+++ b/src/pagesAddress/create-address-cop/create-address.scss
@@ -0,0 +1,34 @@
+ @use '@/assets/bundle.scss';
+
+.create-address {
+ padding: 20rpx 50rpx;
+ .consigneeName,
+ .consigneeMobile,
+ .map-address,
+ .address,
+ .isDefault {
+ border-bottom: 1rpx solid #E4E7ED;
+ }
+ .btn-save {
+ @extend %btn-linearGradient;
+ margin-top: 60rpx;
+ width: 100%;
+ border-radius: 0;
+ height: 80rpx;
+ }
+ .btn-delete {
+ margin-top: 60rpx;
+ @extend %flex-center;
+ .icon-delete {
+ @extend %icon-clearAll;
+ @extend %bg-no-repeat-center;
+ width: 80rpx;
+ height: 80rpx;
+ border-radius: 50%;
+ background-size: 40rpx;
+ @extend %bgwhite;
+ box-shadow: 0 4rpx 8rpx rgba(black, .3);
+ border: 1rpx solid #DCDFE6;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/pagesAddress/create-address-cop/index.vue b/src/pagesAddress/create-address-cop/index.vue
new file mode 100644
index 0000000..137f371
--- /dev/null
+++ b/src/pagesAddress/create-address-cop/index.vue
@@ -0,0 +1,223 @@
+
+
+
+
+
+ 默认
+ {{address.address}}
+
+
+ {{address.consigneeName}} {{address.consigneeMobile}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesAddress/create-address/create-address.scss b/src/pagesAddress/create-address/create-address.scss
new file mode 100644
index 0000000..59dd269
--- /dev/null
+++ b/src/pagesAddress/create-address/create-address.scss
@@ -0,0 +1,35 @@
+@use '@/assets/bundle.scss';
+
+.create-address {
+ padding: 20rpx 50rpx;
+ .consigneeName,
+ .consigneeMobile,
+ .map-address,
+ .address,
+ .isDefault {
+ border-bottom: 1rpx solid #E4E7ED;
+ }
+ .btn-save {
+ @extend %btn-linearGradient;
+ margin-top: 60rpx;
+ width: 100%;
+ border-radius: 0;
+ height: 80rpx;
+ border-radius: 20rpx;
+ }
+ .btn-delete {
+ margin-top: 60rpx;
+ @extend %flex-center;
+ .icon-delete {
+ @extend %icon-clearAll;
+ @extend %bg-no-repeat-center;
+ width: 80rpx;
+ height: 80rpx;
+ border-radius: 50%;
+ background-size: 40rpx;
+ @extend %bgwhite;
+ box-shadow: 0 4rpx 8rpx rgba(black, .3);
+ border: 1rpx solid #DCDFE6;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/pagesAddress/create-address/index.vue b/src/pagesAddress/create-address/index.vue
new file mode 100644
index 0000000..37e7226
--- /dev/null
+++ b/src/pagesAddress/create-address/index.vue
@@ -0,0 +1,248 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存地址
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesAddress/edit-address/edit-address.scss b/src/pagesAddress/edit-address/edit-address.scss
new file mode 100644
index 0000000..98f5a51
--- /dev/null
+++ b/src/pagesAddress/edit-address/edit-address.scss
@@ -0,0 +1,3 @@
+ @use '@/assets/bundle.scss';
+
+.edit-address {}
\ No newline at end of file
diff --git a/src/pagesAddress/edit-address/index.vue b/src/pagesAddress/edit-address/index.vue
new file mode 100644
index 0000000..a0d15c8
--- /dev/null
+++ b/src/pagesAddress/edit-address/index.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存地址
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesAddress/input-label/input-label.scss b/src/pagesAddress/input-label/input-label.scss
new file mode 100644
index 0000000..1a5dbfd
--- /dev/null
+++ b/src/pagesAddress/input-label/input-label.scss
@@ -0,0 +1,30 @@
+ @use '@/assets/bundle.scss';
+
+.input-label {
+ @extend %flex-left;
+ min-height: 100rpx;
+ @extend %pdtb;
+ box-sizing: border-box;
+ .label {
+ width: 160rpx;
+ flex: none;
+ font-size: 30rpx;
+ color: #333;
+ }
+ .input, .isText {
+ flex: auto;
+ font-size: 30rpx;
+ color: #333;
+ }
+ .placeholder {
+ color: #909399;
+ }
+ .icon-right-aw {
+ flex: none;
+ @extend %icon-aw-right-slim;
+ width: 30rpx;
+ height: 30rpx;
+ @extend %bg-no-repeat-center;
+ @extend %bg-size-100;
+ }
+}
\ No newline at end of file
diff --git a/src/pagesAddress/input-label/input-lebel.vue b/src/pagesAddress/input-label/input-lebel.vue
new file mode 100644
index 0000000..d91f6af
--- /dev/null
+++ b/src/pagesAddress/input-label/input-lebel.vue
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesAddress/mine-address/index.vue b/src/pagesAddress/mine-address/index.vue
new file mode 100644
index 0000000..0e3ca5a
--- /dev/null
+++ b/src/pagesAddress/mine-address/index.vue
@@ -0,0 +1,95 @@
+
+ {{label}}
+
+ {{currentValue || placeholder}}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesAddress/mine-address/mine-address.scss b/src/pagesAddress/mine-address/mine-address.scss
new file mode 100644
index 0000000..d9d8c52
--- /dev/null
+++ b/src/pagesAddress/mine-address/mine-address.scss
@@ -0,0 +1,19 @@
+ @use '@/assets/bundle.scss';
+
+.mine-address {
+ $bottomH: 100rpx;
+ #{&}-top {
+ height: calc(100vh - 100rpx);
+ overflow-y: auto;
+ box-sizing: border-box;
+ border-top: 1rpx solid #E4E7ED;
+ }
+ #{&}-bottom {
+ height: $bottomH;
+ box-sizing: border-box;;
+ background-color: #4EB331;
+ color: white;
+ @extend %flex-center;
+ font-size: 36rpx;
+ }
+}
\ No newline at end of file
diff --git a/src/pagesAddress/pick-city/index.vue b/src/pagesAddress/pick-city/index.vue
new file mode 100644
index 0000000..bc33e50
--- /dev/null
+++ b/src/pagesAddress/pick-city/index.vue
@@ -0,0 +1,111 @@
+
+
+
+
+ 新建收货地址
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesAddress/pick-city/pick-city.scss b/src/pagesAddress/pick-city/pick-city.scss
new file mode 100644
index 0000000..9b2d7b6
--- /dev/null
+++ b/src/pagesAddress/pick-city/pick-city.scss
@@ -0,0 +1,68 @@
+ @use '@/assets/bundle.scss';
+
+.pick-city {
+ #{&}-search-input {
+ @extend %pdlr;
+ box-sizing: border-box;
+ height: 100rpx;
+ border-bottom: 1rpx solid #EBEEF5;
+ }
+ .content {
+ height: calc(100vh - 100rpx);
+ overflow-y: auto;
+ }
+ .address-label {
+ @extend %flex-left;
+ @extend %pd20;
+ font-size: 30rpx;
+ color: #606266;
+ height: 60rpx;
+ border-bottom: 1rpx solid #EBEEF5;
+ .icon-position {
+ @extend %icon-position-small-text2;
+ @extend %bg-no-repeat-center;
+ @extend %bg-size-100;
+ width: 30rpx;
+ height: 30rpx;
+ flex: none;
+ margin-right: 10rpx;
+ }
+ .span {
+ padding-left: 10rpx;
+ font-weight: 600;
+ color: #333;
+ }
+ }
+ .hot-city {
+ @extend %pd20;
+ .label-title {
+ font-size: 28rpx;
+ color: #909399;
+ }
+ .city-list {
+ font-size: 28rpx;
+ @extend %flex-between;
+ flex-flow: row wrap;
+ }
+ .list-item {
+ flex: none;
+ @extend %flex-center;
+ width: 160rpx;
+ height: 70rpx;
+ background-color: #EBEEF5;
+ margin-top: 20rpx;
+ color: #333;
+ border-radius: 10rpx;
+ }
+ }
+ .search-list {
+ @extend %pd20;
+ .city-item {
+ font-size: 32rpx;
+ color: #333;
+ @extend %flex-left;
+ border-bottom: 1rpx solid #EBEEF5;
+ height: 100rpx;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/pagesAddress/pick-store/index.vue b/src/pagesAddress/pick-store/index.vue
new file mode 100644
index 0000000..2b4fbcd
--- /dev/null
+++ b/src/pagesAddress/pick-store/index.vue
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesAddress/pick-store/pick-store.scss b/src/pagesAddress/pick-store/pick-store.scss
new file mode 100644
index 0000000..4cda5e3
--- /dev/null
+++ b/src/pagesAddress/pick-store/pick-store.scss
@@ -0,0 +1,44 @@
+ @use '@/assets/bundle.scss';
+
+.pick-store {
+ .shop-item {
+ font-size: 32rpx;
+ border-bottom: 1rpx solid #E4E7ED;
+ @extend %pd20;
+ @extend %flex-between;
+ height: 100rpx;
+ box-sizing: border-box;
+ margin: 0 20rpx;
+ .name, .store-distance {
+ color: #909399;
+ }
+ .store-distance {
+ font-size: 24rpx;
+ }
+ }
+ .store-name {
+ @extend %flex-left;
+ .status {
+ background-color: #909399;
+ color: white;
+ border-radius: 50rpx;
+ font-size: 20rpx;
+ padding: 5rpx 10rpx;
+ margin-right: 10rpx;
+ }
+ }
+ .is-here {
+ background-color: rgba(#4EB331, .1);
+ border-top-left-radius: 20rpx;
+ border-top-right-radius: 20rpx;
+ }
+ .is-open {
+ .status {
+ background-color: #4EB331;
+ @extend %ani-bounceIn;
+ }
+ .name, .store-distance {
+ color: #333;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/pagesAddress/position-address/index.vue b/src/pagesAddress/position-address/index.vue
new file mode 100644
index 0000000..5f4ec7f
--- /dev/null
+++ b/src/pagesAddress/position-address/index.vue
@@ -0,0 +1,277 @@
+
+
+
+
+
+ {{item.status === 1 ? '营业中' : '休息中'}}
+ {{item.name}}
+ 距离{{item.distance}}m
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesAddress/position-address/position-address.scss b/src/pagesAddress/position-address/position-address.scss
new file mode 100644
index 0000000..8629982
--- /dev/null
+++ b/src/pagesAddress/position-address/position-address.scss
@@ -0,0 +1,77 @@
+ @use '@/assets/bundle.scss';
+
+.position-address {
+ .search-address {
+ box-sizing: border-box;
+ @extend %flex-center;
+ @extend %pd20;
+ height: 100rpx;
+ // background: #ccc;
+ border-bottom: 1rpx solid #E4E7ED;
+ }
+ .left {
+ flex: none;
+ margin-right: 10rpx;
+ }
+ .right {
+ flex: auto;
+ }
+ .btn-city-pick {
+ @extend %flex-center;
+ font-size: 30rpx;
+ color: #606266;
+ .icon-arraw-bottom {
+ @extend %icon-aw-bottom;
+ @extend %bg-no-repeat-center;
+ width: 20rpx;
+ height: 20rpx;
+ @extend %bg-size-100;
+ margin-left: 10rpx;
+ }
+ }
+ .near-address, .search-list {
+ height: calc(100vh - 100rpx);
+ overflow-y: auto;
+ }
+ .add-newAddress{
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin: 0 50rpx;
+ padding: 16rpx 0;
+ border-bottom: 1rpx solid #EBEEF5;
+ .add{
+ font-size: 28rpx;
+ color: rgb(64, 158, 255);
+ }
+ .right-aw{
+ flex: none;
+ @extend %icon-aw-right-slim;
+ width: 50rpx;
+ height: 30rpx;
+ background-position: right center;
+ background-repeat: no-repeat;
+ background-size: 30rpx;
+ }
+ }
+ .address-label {
+ @extend %flex-left;
+ @extend %pd20;
+ font-size: 28rpx;
+ color: #909399;
+ .icon-position, .icon-home {
+ @extend %bg-no-repeat-center;
+ @extend %bg-size-100;
+ width: 30rpx;
+ height: 30rpx;
+ flex: none;
+ margin-right: 10rpx;
+ }
+ .icon-position {
+ @extend %icon-position-small;
+ }
+ .icon-home {
+ @extend %icon-home;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/pagesAddress/switch-label/switch-label.scss b/src/pagesAddress/switch-label/switch-label.scss
new file mode 100644
index 0000000..9fd6826
--- /dev/null
+++ b/src/pagesAddress/switch-label/switch-label.scss
@@ -0,0 +1,12 @@
+ @use '@/assets/bundle.scss';
+
+.switch-label {
+ @extend %flex-left;
+ height: 100rpx;
+ .label {
+ width: 240rpx;
+ flex: none;
+ font-size: 30rpx;
+ color: #333;
+ }
+}
\ No newline at end of file
diff --git a/src/pagesAddress/switch-label/switch-label.vue b/src/pagesAddress/switch-label/switch-label.vue
new file mode 100644
index 0000000..8a43e23
--- /dev/null
+++ b/src/pagesAddress/switch-label/switch-label.vue
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+ {{districtName ? districtName : cityChange}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 我的收货地址
+
+
+
+
+
+
+
+
+
+
+ 新增地址
+
+
+
+
+ 附近地址
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesAuth/auth-argument/index.vue b/src/pagesAuth/auth-argument/index.vue
new file mode 100644
index 0000000..ebc5501
--- /dev/null
+++ b/src/pagesAuth/auth-argument/index.vue
@@ -0,0 +1,21 @@
+
+
+ {{label}}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesBanner/banner-template1/banner-tamplate1.scss b/src/pagesBanner/banner-template1/banner-tamplate1.scss
new file mode 100644
index 0000000..d56910a
--- /dev/null
+++ b/src/pagesBanner/banner-template1/banner-tamplate1.scss
@@ -0,0 +1,97 @@
+ @use '@/assets/bundle.scss';
+
+.banner-tamplate1 {
+ min-height: 100vh;
+ .content {
+ background:#f4f4f4;
+ }
+ .content-item {}
+ .img-wrapper {
+ .small-banner {
+ width: 750rpx;
+ // height: auto;
+ }
+ }
+ .skus-wrapper {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-around;
+ .sku-cell {
+ flex: 1;
+ width: 230rpx;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ box-sizing: border-box;
+ border: 1rpx solid #E4E7ED;
+ padding: 20rpx 10rpx;
+ margin: 20rpx 10rpx;
+ background:#fff;
+ border-radius: 15rpx;
+ }
+ .sku-img {
+ position: relative;
+ }
+ .img {
+ width: 210rpx;
+ height: 210rpx;
+ }
+ .no-sale {
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%, -50%);
+ width: 200rpx;
+ height: 200rpx;
+ @extend %no-sale;
+ @extend %bg-no-repeat-center;
+ @extend %bg-size-100;
+ }
+ .sku-name {
+ font-size: 28rpx;
+ // color: #606266;
+ margin-top: 10rpx;
+ line-height: 1.2;
+ text-align: justify;
+ height: 3rem;
+ }
+ }
+ .good-price {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ }
+ .price {
+ display: flex;
+ align-items: baseline;
+ }
+ .cur-price {
+ font-size: 28rpx;
+ color: #fe6263;
+ font-weight: 700;;
+ &:before {
+ content: "￥";
+ font-size: 24rpx;
+ }
+ }
+ .ori-price {
+ font-size: 20rpx;
+ color: #b2b2b2;
+ margin-left: 10rpx;
+ text-decoration: line-through;
+ &:before {
+ content: "￥";
+ }
+ }
+ .act-type-wrapper {
+ height: 20rpx;
+ overflow: hidden;
+ }
+ .act-type {
+ @extend %act-type-text;
+ }
+ .act-icon {
+ margin-top: 4rpx;
+ @extend %flex-center;
+ }
+}
\ No newline at end of file
diff --git a/src/pagesBanner/banner-template1/index.vue b/src/pagesBanner/banner-template1/index.vue
new file mode 100644
index 0000000..d27bb63
--- /dev/null
+++ b/src/pagesBanner/banner-template1/index.vue
@@ -0,0 +1,153 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 快手登录
+
+
+
+ 手机号快捷登录
+
+
+
+ 微信登录
+
+
+
+
+
+
+
+ 账号登录
+
+
+
+
+
+ 账号登录
+
+
+
+
+
+
+
+
+
+
+
+ 欢迎进入京西菜市
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 绑定账号
+ 绑定手机号后可以获得更优质的体验
+
+
+
+
+
+
+
+
+
+
+
+ 用户协议及隐私协议
+
+ 本协议系您与成都若溪科技有限公司就京西菜市帐号的注册和使用而订立的。成都若溪科技有限公司（如下简称“京西菜市”）在此特别提醒您认真阅读、充分理解本协议各条款，特别是涉及服务费用条款，免除或者限制京西菜市责任的条款，对您的权利限制条款，争议解决和法律适用条款等，此类条款将以加粗的形式提示您注意。请您审慎阅读并选择接受或不接受本协议（限制民事行为能力人应在监护人或法定代理人陪同下阅读）。除非您接受本协议所有条款，否则您无权注册、使用京西菜市帐号。您的注册和使用京西菜市帐号行为将视为您已充分理解本协议（即本协议及后续更新版本或开通或使用某项服务的单项协议），并同意接受本协议各项条款的约束。
+
+
+ 点击同意即代表您已阅读并同意
+ 《用户协议》
+ 《隐私协议》
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesGoods/good-detail/good-detail.scss b/src/pagesGoods/good-detail/good-detail.scss
new file mode 100644
index 0000000..5fab5df
--- /dev/null
+++ b/src/pagesGoods/good-detail/good-detail.scss
@@ -0,0 +1,254 @@
+ @use "@/assets/bundle.scss";
+
+.good-detail {
+ #pd20 {
+ @extend %pd20;
+ @extend %bgwhite;
+ }
+ .good-img-swiper {
+ width: 750rpx;
+ height: 750rpx;
+ @extend %bgwhite;
+ .good-img-item {
+ width: 750rpx;
+ height: 750rpx;
+ }
+ .good-img {
+ width: 100%;
+ height: 100%;
+ }
+ }
+ .good-name {
+ font-size: 38rpx;
+ color: #333;
+ font-weight: 600;
+ }
+ .good-price {
+ display: flex;
+ align-items: baseline;
+ @extend %pdtb;
+ .cur-price {
+ font-size: 38rpx;
+ color: #fe6263;
+ font-weight: 700;
+ &:before {
+ content: "￥";
+ font-size: 24rpx;
+ }
+ }
+ .ori-price {
+ font-size: 30rpx;
+ color: #b2b2b2;
+ margin-left: 10rpx;
+ text-decoration: line-through;
+ &:before {
+ content: "￥";
+ }
+ }
+ .act-type-wrapper {
+ margin-left: 10rpx;
+ }
+ .act-type {
+ @extend %act-type-text;
+ }
+ }
+ // #ifndef MP-TOUTIAO
+ .store-name {
+ @extend %pdtb;
+ @extend %flex-left;
+ border-top: 1rpx solid #DCDFE6;
+ .icon-store {
+ width: 40rpx;
+ height: 40rpx;
+ @extend %icon-store;
+ @extend %bg-no-repeat-center;
+ @extend %bg-size-100;
+ }
+ .name-text {
+ font-size: 24rpx;
+ color: #909399;
+ margin-left: 10rpx;
+ }
+ }
+ // #endif
+
+ // #ifdef MP-TOUTIAO
+ .storeOrFocus{
+ display:flex;
+ justify-content:space-between;
+ .store-name {
+ @extend %pdtb;
+ @extend %flex-left;
+ border-top: 1rpx solid #DCDFE6;
+ .icon-store {
+ width: 40rpx;
+ height: 40rpx;
+ @extend %icon-store;
+ @extend %bg-no-repeat-center;
+ @extend %bg-size-100;
+ }
+ .name-text {
+ font-size: 24rpx;
+ color: #909399;
+ margin-left: 10rpx;
+ }
+ }
+ .focus{
+ // border:1px solid red;
+ margin-top: 20rpx;
+ background-color: #FCEEF1;
+ display:flex;
+ text-align:center;
+ height:50rpx;
+ line-height: 50rpx;
+ padding: 4rpx 8rpx;
+ border-radius: 20rpx;
+ font-size: 30rpx;
+ &-img{
+ margin-top:10rpx;
+ width:30rpx;
+ height:30rpx;
+ }
+ &-text{
+ margin-left:10rpx;
+ color:#ef5d4a;
+ }
+ }
+ }
+ // #endif
+
+
+
+ .good-detail-introduce {
+ width: 100%;
+ overflow: hidden;
+ padding-bottom: 100rpx;
+ &:before {
+ content: "";
+ display: block;
+ height: 40rpx;
+ background-color: #eee;
+ // margin-bottom: 60rpx;
+ }
+ .desc-img {
+ width: 100%;
+ }
+ .no-introduce {
+ color: #909399;
+ @extend %pdtb;
+ text-align: center;
+ font-size: 28rpx;
+ }
+ .good-detail-title {
+ @extend %flex-left;
+ background: #fff;
+ padding: 20rpx 0;
+ border-radius: 10rpx;
+ line-height: 1;
+ margin-left:10rpx;
+ margin-bottom: 20rpx ;
+ margin-top: 20rpx;
+ .icon-border {
+ width: 6rpx;
+ background-color: #4EB331;
+ height: 30rpx;
+ margin-right: 10rpx;
+ }
+ .title {
+ font-weight: bold;
+ color: #333;
+ font-size: 36rpx;
+ }
+ }
+ }
+
+ .group-purchase-details {
+ width: 100%;
+ overflow: hidden;
+ padding-bottom: 50rpx;
+ &:before {
+ content: "";
+ display: block;
+ height: 40rpx;
+ background-color: #eee;
+ // margin-bottom: 60rpx;
+ }
+ .good-detail-title {
+ @extend %flex-left;
+ background: #fff;
+ padding: 20rpx 0;
+ border-radius: 10rpx;
+ line-height: 1;
+ margin-left:10rpx;
+ margin-bottom: 20rpx ;
+ margin-top: 20rpx;
+ .icon-border {
+ width: 6rpx;
+ background-color: #4EB331;
+ height: 30rpx;
+ margin-right: 10rpx;
+ }
+ .title {
+ font-weight: bold;
+ color: #333;
+ font-size: 36rpx;
+ }
+ }
+ // 购买须知
+ .content{
+ &-item:not(:last-child){
+ margin-bottom: 20rpx;
+ }
+ &-title{
+ margin-left: 20rpx;
+ font-size: 30rpx;
+ font-weight: bold;
+ }
+ &-description{
+ margin-top: 20rpx;
+ margin-left: 40rpx;
+ font-size: 25rpx;
+ }
+ }
+
+ }
+ .bottom-bar {
+ position: fixed;
+ padding-bottom: constant(safe-area-inset-bottom);
+ padding-bottom: env(safe-area-inset-bottom);
+ left: 0;
+ bottom: 0;
+ height: 100rpx;
+ right: 0;
+ width: 100%;
+ z-index: 10;
+ box-shadow: 6rpx 10rpx 30rpx #999;
+ background: white;
+ }
+ .good-tab{
+ width: 100%;
+ height: 80rpx;
+ display:flex;
+ justify-content: space-around;
+ position: fixed;
+ top:0rpx;
+ left: 0;
+ background: rgba(186, 187, 175,0.5);
+ z-index: 99;
+ border-bottom: 2rpx solid rgba(186, 187, 175,0.5);
+ }
+ .tab-item{
+ width: 100rpx;
+ text-align: center;
+ line-height: 80rpx;
+ }
+ .line{
+ width: 100rpx;
+ height: 10rpx;
+ margin-top: -10rpx;
+ background: #4EB331;
+ }
+ .getColor{
+ color: #4EB331;
+ }
+}
diff --git a/src/pagesGoods/good-detail/index.vue b/src/pagesGoods/good-detail/index.vue
new file mode 100644
index 0000000..543a0dd
--- /dev/null
+++ b/src/pagesGoods/good-detail/index.vue
@@ -0,0 +1,436 @@
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+ {{sku.name}}
+
+
+
+
+
+ {{$filters.toFixed2(sku.curPrice)}}
+ {{$filters.toFixed2(sku.oriPrice)}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pagesGoods/good-detail/shopCar-bottom-bar/shopCar-bottom-bar.scss b/src/pagesGoods/good-detail/shopCar-bottom-bar/shopCar-bottom-bar.scss
new file mode 100644
index 0000000..7dcfb7d
--- /dev/null
+++ b/src/pagesGoods/good-detail/shopCar-bottom-bar/shopCar-bottom-bar.scss
@@ -0,0 +1,43 @@
+ @use "@/assets/bundle.scss";
+
+.shopCar-bottom-bar {
+ @extend %flex-between;
+ @extend %pdlr;
+ height: 100rpx;
+ .bar-left {
+ @extend %flex-left;
+ }
+ .bar-right {
+ }
+ .icon-shopcar {
+ @extend %icon-shopcar;
+ @extend %bg-no-repeat-center;
+ background-size: 50rpx;
+ width: 90rpx;
+ height: 90rpx;
+ }
+ .btn-share {
+ font-size: 24rpx;
+ margin: 0;
+ margin-left: 60rpx;
+ @extend %pdlr;
+ @extend %bgwhite;
+ @extend %flex-center;
+ border:1rpx solid #eee;
+ // border: none;
+ .icon-share {
+ @extend %icon-share;
+ @extend %bg-no-repeat-center;
+ width: 50rpx;
+ height: 50rpx;
+ @extend %bg-size-100;
+ }
+ .share-text {
+ color: #333;
+ margin-left: 20rpx;
+ }
+ }
+ .btn-add {
+ @extend %btn-linearGradient;
+ }
+}
diff --git a/src/pagesGoods/good-detail/shopCar-bottom-bar/shopCar-bottom-bar.vue b/src/pagesGoods/good-detail/shopCar-bottom-bar/shopCar-bottom-bar.vue
new file mode 100644
index 0000000..30a62c6
--- /dev/null
+++ b/src/pagesGoods/good-detail/shopCar-bottom-bar/shopCar-bottom-bar.vue
@@ -0,0 +1,204 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesGoods/good-search/good-search.scss b/src/pagesGoods/good-search/good-search.scss
new file mode 100644
index 0000000..8c6719d
--- /dev/null
+++ b/src/pagesGoods/good-search/good-search.scss
@@ -0,0 +1,47 @@
+ @use '@/assets/bundle.scss';
+
+.good-search {
+ .search-input {
+ background: #fafafa;
+ @extend %pd20;
+ position: fixed;
+ left: 0;
+ top: 0;
+ right: 0;
+ z-index: 10;
+ }
+ .search-list {
+ @extend %pdlr;
+ padding-top: 100rpx;
+ }
+ .btn-toShopCar {
+ position: fixed;
+ left: 40rpx;
+ bottom: 100rpx;
+ background-color: rgba(black, .6);
+ width: 100rpx;
+ height: 100rpx;
+ border-radius: 50%;
+ z-index: 10;
+ @extend %flex-center;
+ }
+ .icon-shopcar {
+ @extend %icon-shopcar-white;
+ @extend %bg-no-repeat-center;
+ width: 100rpx;
+ height: 100rpx;
+ background-size: 50rpx;
+ border-radius: 50%;
+ }
+ .storeList{
+ text-align: center;
+ padding: 10rpx;
+ }
+ .skuImg{
+ width: 360rpx;
+ height: 360rpx;
+ }
+ .no-goods {
+ margin-top: 10vh;
+ }
+}
\ No newline at end of file
diff --git a/src/pagesGoods/good-search/index.vue b/src/pagesGoods/good-search/index.vue
new file mode 100644
index 0000000..996ffea
--- /dev/null
+++ b/src/pagesGoods/good-search/index.vue
@@ -0,0 +1,220 @@
+
+
+
+
+
+
+ 商品
+
+
+
+ 详情
+
+
+
+
+
+
+
+ {{skuName.name}}
+
+ {{stock()}}
+
+
+
+
+
+
+
+ {{$filters.toFixed2(skuName.curPrice)}}
+ {{$filters.toFixed2(skuName.oriPrice)}}
+
+
+ {{actTypeArr[skuName.actType]}}
+
+
+
+
+
+
+ {{skuName.storeName}}
+
+
+
+
+
+
+
+
+
+
+
+ {{skuName.storeName}}
+
+
+
+
+
+
+
+
+
+
+
+ 详情介绍
+ 暂无详情
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesGoods/good/good.scss b/src/pagesGoods/good/good.scss
new file mode 100644
index 0000000..03f3e59
--- /dev/null
+++ b/src/pagesGoods/good/good.scss
@@ -0,0 +1,179 @@
+ @use '@/assets/bundle.scss';
+
+%fixed {
+ position: fixed;
+ z-index: 500;
+}
+
+.shop-good {
+ // 70 + 20
+ box-sizing: border-box;
+ width: 100%;
+ overflow: hidden;
+ .top {
+ padding: 0 20rpx;
+ height: 90rpx;
+ background: white;
+ }
+ .flex-content {
+ display: flex;
+ }
+ .left {
+ flex: none;
+ top: 90rpx;
+ width: 150rpx;
+ height: 100%;
+ background: #f5f5f5;
+ }
+ .right {
+ flex: auto;
+ height: 100%;
+ overflow: hidden;
+ background: white;
+ }
+ .top2 {
+ background: white;
+ width: 100%;
+ height: 81rpx;
+ border-bottom: 1rpx solid #eee;
+ box-sizing: border-box;
+ }
+ .pick-cat2 {
+ @extend %fixed;
+ left: 150rpx;
+ top: 169rpx;
+ right: 0;
+ bottom: 0;
+ display: flex;
+ flex-flow: column;
+ .pick-cat2-top {
+ flex: none;
+ width: 100%;
+ border-bottom: 1rpx solid #eee;
+ }
+ .pick-cat2-mask {
+ flex: 100%;
+ width: 100%;
+ background: rgba(white, .5);
+ }
+ }
+ .goods-wrapper {
+ /* #ifndef H5 */
+ height: calc(100vh - 170rpx);
+ /* #endif */
+ /* #ifdef H5 */
+ height: calc(100vh - 370rpx);
+ /* #endif */
+ overflow: hidden;
+ //position: relative;
+ }
+ .content {
+ // position: relative;
+ /* #ifndef H5 */
+ height: calc(100vh - 170rpx);
+ /* #endif */
+ /* #ifdef H5 */
+ height: calc(100vh - 370rpx);
+ /* #endif */
+ overflow: hidden;
+ // -webkit-overflow-scrolling: touch;
+ // scroll-behavior:smooth;
+ top: -100rpx;
+ // z-index: 1;
+ }
+ .scroll-view {
+ padding: 0 20rpx;
+ /* #ifndef H5 */
+ height: calc(100vh - 160rpx);
+ /* #endif */
+ /* #ifdef H5 */
+ height: calc(100vh - 360rpx);
+ /* #endif */
+ box-sizing: border-box;
+ overflow-y: auto;
+ //position: absolute;
+ z-index: 2;
+ transition: transform .1s linear;
+ // -webkit-overflow-scrolling: touch;
+ // scroll-behavior: smooth;
+ background: white;
+ }
+ .release-bottom {
+ height: 50rpx;
+ font-size: 28rpx;
+ color: #909399;
+ text-align: center;
+ // @extend %flex-center;
+ // align-items: flex-end;
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ z-index: 1;
+ background: white;
+ }
+ .release-top {
+ height: 100rpx;
+ line-height: 100rpx;
+ font-size: 28rpx;
+ color: #909399;
+ text-align: center;
+ }
+ .blank-div {
+ height: 50vh;
+ }
+ // 没有商品
+ .no-goods {
+ padding-top: 10vh;
+ }
+}
+
+/* #ifdef MP-KUAISHOU */
+.btn-toShopCar {
+ background-color: rgba(black, .6);
+ width: 120rpx;
+ height: 120rpx;
+ border-radius: 50%;
+ z-index: 10;
+ @extend %flex-center;
+}
+.icon-shopcar {
+ @extend %icon-shopcar-white;
+ @extend %bg-no-repeat-center;
+ width: 100rpx;
+ height: 100rpx;
+ background-size: 50rpx;
+ border-radius: 50%;
+}
+.fixed-box1 {
+ pointer-events: none; // 这里是重点，盒子可穿透操作
+ width: 100vw;
+ height: 90vh;
+ position: fixed;
+ top: 100rpx;
+ left: 0;
+ z-index: 100000;
+}
+.fixed-button {
+ opacity: 1;
+ // background: #ccc;
+ border-radius: 100%;
+ pointer-events: auto;
+ // width: max-content;
+ // height: auto;
+ width: 120rpx;
+ height: 120rpx;
+ overflow: hidden;
+ z-index: 9999;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ left: 20rpx;
+ // top: 85vh;
+ .imger{
+ width: 52px;
+ height: 52px;
+ overflow: none;
+ }
+}
+/* #endif */
\ No newline at end of file
diff --git a/src/pagesGoods/good/index.vue b/src/pagesGoods/good/index.vue
new file mode 100644
index 0000000..f357c72
--- /dev/null
+++ b/src/pagesGoods/good/index.vue
@@ -0,0 +1,562 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesMine/my-news/index.vue b/src/pagesMine/my-news/index.vue
new file mode 100644
index 0000000..d534530
--- /dev/null
+++ b/src/pagesMine/my-news/index.vue
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesMine/my-news/my-news.scss b/src/pagesMine/my-news/my-news.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/pagesMine/my-promote/index.vue b/src/pagesMine/my-promote/index.vue
new file mode 100644
index 0000000..7ad86a3
--- /dev/null
+++ b/src/pagesMine/my-promote/index.vue
@@ -0,0 +1,149 @@
+
+
+
+ {{item.storeName}}
+
+ ![]()
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesMine/my-promote/my-promote.scss b/src/pagesMine/my-promote/my-promote.scss
new file mode 100644
index 0000000..a7074b7
--- /dev/null
+++ b/src/pagesMine/my-promote/my-promote.scss
@@ -0,0 +1,35 @@
+ @use '@/assets/bundle.scss';
+
+.my-promote {
+ @extend %flex-center;
+ flex-direction: column;
+ height: 100vh;
+ .my-code {
+ width: 400rpx;
+ height: 400rpx;
+ }
+ .descript {
+ font-size: 28rpx;
+ color: #606266;
+ // padding-bottom: 200rpx;
+ }
+ .price {
+ font-size: 28rpx;
+ color: #606266;
+ .money, .money2 {
+ color: #4EB331;
+ font-weight: 500;
+ font-size: 32rpx;
+ }
+ .money2 {
+ color: #909399
+ }
+ }
+ .download-code {
+ @extend %btn-linearGradient;
+ font-size: 30rpx;
+ padding: 0 40rpx;
+ margin: 40rpx 0;
+ margin-top: 100rpx;
+ }
+}
\ No newline at end of file
diff --git a/src/pagesMine/vip/index.vue b/src/pagesMine/vip/index.vue
new file mode 100644
index 0000000..2dc3e48
--- /dev/null
+++ b/src/pagesMine/vip/index.vue
@@ -0,0 +1,118 @@
+
+ 保存小程序推广码
+ 邀请他人注册并下单后您将获得一笔赏金
+
+ 已获得赏金: ￥{{$filters.toFixed2(selfInfo.profitSum)}}
+
+
+ 由于用户退款所欠赏金: ￥{{$filters.toFixed2(selfInfo.arrears)}}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesMine/vip/vip.scss b/src/pagesMine/vip/vip.scss
new file mode 100644
index 0000000..cf2d717
--- /dev/null
+++ b/src/pagesMine/vip/vip.scss
@@ -0,0 +1,40 @@
+.vip {
+ height: 100%;
+ padding: 10px 10px;
+ box-sizing: border-box;
+ }
+ .vip-item {
+ display: flex;
+ height: 70px;
+ align-items: center;
+ background-color: #fff;
+ border: 1px solid #fefefe;
+ padding: 10px 10px;
+ box-sizing: border-box;
+ border-radius: 10px;
+ margin-bottom: 10px;
+ .time {
+ flex: 0 0 70px;
+ border-right: 1px solid #faf3e0;
+ }
+ .discount {
+ flex: 2;
+ color: #cf9d58;
+ padding-left: 10px;
+ .sale-word {
+ font-size: 24rpx;
+ color: #ccc;
+ }
+ }
+ .openNow {
+ flex: 1;
+ color: #fff;
+ background-color: #cf9d58;
+ border-radius: 30px;
+ width: 37px;
+ height: 33px;
+ text-align: center;
+ line-height: 33px;
+ font-size: 26rpx;
+ }
+ }
\ No newline at end of file
diff --git a/src/pagesOrders/add-note/add-node.scss b/src/pagesOrders/add-note/add-node.scss
new file mode 100644
index 0000000..e21b70e
--- /dev/null
+++ b/src/pagesOrders/add-note/add-node.scss
@@ -0,0 +1,39 @@
+ @use '@/assets/bundle.scss';
+
+.add-note {
+ .wrapper {
+ @extend %pd20;
+ position: relative;
+ @extend %bgwhite;
+ }
+ .placeholder {
+ color: #666;
+ }
+ .text-area {
+ font-size: 32rpx;
+ color: #333;
+ @extend %pd20;
+ // background: #DCDFE6;
+ border: 1rpx solid #E4E7ED;
+ width: 100%;
+ height: 300rpx;
+ box-sizing: border-box;
+ background-color: #F2F6FC;
+ }
+ .word-count {
+ position: absolute;
+ color: #666;
+ font-size: 32rpx;
+ right: 30rpx;
+ bottom: 30rpx;
+ }
+ .btn-finish {
+ @extend %flex-center;
+ margin: 50rpx 20rpx 0 20rpx;
+ background-color: #4EB331;
+ color: white;
+ font-size: 32rpx;
+ height: 80rpx;
+ border-radius: 10rpx;
+ }
+}
\ No newline at end of file
diff --git a/src/pagesOrders/add-note/index.vue b/src/pagesOrders/add-note/index.vue
new file mode 100644
index 0000000..33dc6c7
--- /dev/null
+++ b/src/pagesOrders/add-note/index.vue
@@ -0,0 +1,75 @@
+
+
+
+ {{ item.price }}元/月
+
+
+ {{ item.pricePercentage }}折
+ 热销中! 超值体验
+ 马上开通
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesOrders/afsOrderCmp/afsorder-cell.scss b/src/pagesOrders/afsOrderCmp/afsorder-cell.scss
new file mode 100644
index 0000000..f66f4b5
--- /dev/null
+++ b/src/pagesOrders/afsOrderCmp/afsorder-cell.scss
@@ -0,0 +1,18 @@
+ @use '@/assets/bundle.scss';
+
+.afsorder-cell {
+ @extend %ft28;
+ @extend %pd20;
+ color: #606266;
+ .cell {
+ @extend %flex-between;
+ @extend %pd20;
+ }
+ .desc, .price {
+ border-top: 1rpx solid #E4E7ED;
+ @extend %pd20;
+ }
+ .price {
+ text-align: right;
+ }
+}
diff --git a/src/pagesOrders/afsOrderCmp/afsorder-cell.vue b/src/pagesOrders/afsOrderCmp/afsorder-cell.vue
new file mode 100644
index 0000000..561957f
--- /dev/null
+++ b/src/pagesOrders/afsOrderCmp/afsorder-cell.vue
@@ -0,0 +1,42 @@
+
+
+
+
+
+ {{wordCount}} / 50
+
+ 完成
+
+
+
+
+
+
+
diff --git a/src/pagesOrders/afsOrderCmp/pick-sku-cell.scss b/src/pagesOrders/afsOrderCmp/pick-sku-cell.scss
new file mode 100644
index 0000000..22021bb
--- /dev/null
+++ b/src/pagesOrders/afsOrderCmp/pick-sku-cell.scss
@@ -0,0 +1,21 @@
+ @use '@/assets/bundle.scss';
+
+.pick-sku-cell {
+ @extend %pd20;
+ @extend %flex-left;
+ .img {
+ width: 150rpx;
+ height: 150rpx;
+ }
+ .left {
+ flex: none;
+ margin-right: 20rpx;
+ }
+ .right {
+ flex: 1;
+ }
+ .oparator {
+ @extend %flex-between;
+ @extend %mt20;
+ }
+}
diff --git a/src/pagesOrders/afsOrderCmp/pick-sku-cell.vue b/src/pagesOrders/afsOrderCmp/pick-sku-cell.vue
new file mode 100644
index 0000000..212c535
--- /dev/null
+++ b/src/pagesOrders/afsOrderCmp/pick-sku-cell.vue
@@ -0,0 +1,59 @@
+
+
+
+
+ 创建时间: {{$filters.dateToLLLL(afsOrder.createdAt)}}
+
+
+ {{cms.orderStatus[afsOrder.status]}}
+
+
+ {{afsOrder.reasonDesc || '暂无'}}
+
+
+ 金额: ￥{{$filters.toFixed2(afsOrder.skuUserMoney)}}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesOrders/afsOrderCmp/plus-minus/plus-minus.scss b/src/pagesOrders/afsOrderCmp/plus-minus/plus-minus.scss
new file mode 100644
index 0000000..4f257a5
--- /dev/null
+++ b/src/pagesOrders/afsOrderCmp/plus-minus/plus-minus.scss
@@ -0,0 +1,56 @@
+ @use '@/assets/bundle.scss';
+
+.cmp-minus-plus, .cmp-minus-plus2 {
+ @extend %flex-center;
+ .minus-plus-wrapper {
+ @extend %flex-center;
+ }
+ .btn-minus, .btn-plus {
+ flex: none;
+ @extend %bg-no-repeat-center;
+ @extend %bgwhite;
+ background-size: 24rpx;
+ width: 60rpx;
+ height: 60rpx;
+ border-radius: 50%;
+ border: 1rpx solid #DCDFE6;
+ position: relative;
+ z-index: 1;
+ padding: 0;
+ box-sizing: content-box;
+ }
+ .btn-minus {
+ @extend %icon-minus;
+ }
+ .btn-plus {
+ @extend %icon-plus;
+ }
+ .count {
+ flex: none;
+ color: #333;
+ font-size: 34rpx;
+ width: 70rpx;
+ text-align: center;
+ margin: 0 10rpx;
+ color: #606266;
+ }
+ .input-count {
+ // background :red;
+ color: #606266;
+ }
+ // .type-shopCar {
+ // background: #DCDFE6;
+ // border-radius: 10rpx;
+ // margin: 0 10rpx;
+ // }
+ .cannot-buy {
+ color: #909399;
+ font-size: 28rpx;
+ }
+}
+
+.cmp-minus-plus2 {
+ .disabled {
+ opacity: .2;
+ }
+}
\ No newline at end of file
diff --git a/src/pagesOrders/afsOrderCmp/plus-minus/plus-minus2.vue b/src/pagesOrders/afsOrderCmp/plus-minus/plus-minus2.vue
new file mode 100644
index 0000000..e2ac030
--- /dev/null
+++ b/src/pagesOrders/afsOrderCmp/plus-minus/plus-minus2.vue
@@ -0,0 +1,43 @@
+
+
+ ![]()
+
+
+
+ {{sku.name}}
+
+
+ 可退数量: {{sku.count - sku.currentCount}}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesOrders/afsorder-detail/afsorder-detail.scss b/src/pagesOrders/afsorder-detail/afsorder-detail.scss
new file mode 100644
index 0000000..755f38c
--- /dev/null
+++ b/src/pagesOrders/afsorder-detail/afsorder-detail.scss
@@ -0,0 +1,92 @@
+ @use '@/assets/bundle.scss';
+
+page {
+ background: #f4f4f4;
+}
+
+.afsorder-detail {
+ @extend %pd20;
+ .cell2 {
+ @extend %pd20;
+ @extend %bgwhite;
+ margin-top: 20rpx;
+ }
+
+ %bordertop2 {
+ border-top: 1rpx solid #E4E7ED;
+ }
+ .wall {
+ .wall-title, .wall-content {
+ font-size: 32rpx;
+ @extend %flex-left;
+ @extend %pdtb;
+ align-items: flex-start;
+ }
+ .wall-content {
+ font-size: 28rpx;
+ color: #606266;
+ @extend %bordertop2;
+ .left {
+ flex: none;
+ font-weight: 400;
+ }
+ .right {
+ margin-left: 20rpx;
+ text-align: justify;
+ }
+ }
+ }
+ .sku-list {
+ @extend %pd20;
+ @extend %ft28;
+ @extend %mt20;
+ @extend %bgwhite;
+ color: #606266;
+ .sku-item {
+ @extend %flex-left;
+ }
+ .left {
+ flex: none;
+ margin-right: 20rpx;
+ border: 1rpx solid #DCDFE6;
+ overflow: hidden;
+ font-size: 0;
+ color: #909399;
+ }
+ .imgView {
+ width: 150rpx;
+ height: 150rpx;
+ }
+ .right {
+ flex: 1;
+ }
+ .price {
+ color: #F56C6C;
+ font-weight: 500;
+ text-align: right;
+ }
+ .count {
+ text-align: right;
+ }
+ }
+ .sku-item + .sku-item {
+ @extend %bordertop2;
+ }
+ .contact {
+ @extend %pd20;
+ @extend %flex-center;
+ @extend %ft28;
+ border-top: 1rpx solid #DCDFE6;
+ color: #409EFF;
+ }
+ .icon-tel {
+ @extend %bg-no-repeat-center;
+ @extend %icon-mobile-primary;
+ background-size: 100%;
+ width: 30rpx;
+ height: 30rpx;
+ border-radius: 100%;
+ border: 1rpx solid #409EFF;
+ margin-right: 10rpx;
+ }
+}
diff --git a/src/pagesOrders/afsorder-detail/index.vue b/src/pagesOrders/afsorder-detail/index.vue
new file mode 100644
index 0000000..1db0a92
--- /dev/null
+++ b/src/pagesOrders/afsorder-detail/index.vue
@@ -0,0 +1,159 @@
+
+
+
+
+
+ {{count}}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesOrders/create-afsorder/create-afsorder.scss b/src/pagesOrders/create-afsorder/create-afsorder.scss
new file mode 100644
index 0000000..a0f9fb3
--- /dev/null
+++ b/src/pagesOrders/create-afsorder/create-afsorder.scss
@@ -0,0 +1,58 @@
+ @use '@/assets/bundle.scss';
+
+page {
+ background: #f4f4f4;
+}
+
+.create-afsorder {
+ @extend %ft28;
+ color: #606266;
+ padding-bottom: 120rpx;
+ .title {
+ @extend %pd20;
+ @extend %bgwhite;
+ border-bottom: 1rpx solid #DCDFE6;
+ @extend %mb20;
+ }
+ .skuList {
+ @extend %pd20;
+ @extend %bgwhite;
+ @extend %mb20;
+ .sku-item {
+ border-bottom: 1rpx solid #DCDFE6;
+ }
+ }
+ .bottom-bar, .cell {
+ @extend %flex-between;
+ @extend %bgwhite;
+ @extend %pd20;
+ }
+
+ .bottom-bar {
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ height: 100rpx;
+ z-index: 10;
+ box-sizing: border-box;
+ border-top: 1rpx solid #EBEEF5;
+ }
+ .btn {
+ @extend %btn-linearGradient;
+ }
+ .active {
+ background: #4EB331;
+ color: white;
+ }
+ .reasons {
+ @extend %pd20;
+ @extend %bgwhite;
+ }
+ .reason-item {
+ @extend %pd20;
+ border-bottom: 1rpx solid #E4E7ED;
+ transition: all .2s;
+ border-radius: 10rpx;
+ }
+}
diff --git a/src/pagesOrders/create-afsorder/index.vue b/src/pagesOrders/create-afsorder/index.vue
new file mode 100644
index 0000000..cf8731f
--- /dev/null
+++ b/src/pagesOrders/create-afsorder/index.vue
@@ -0,0 +1,209 @@
+
+
+
+
+
+ 售后单信息
+
+
+ 订单号:
+ {{order.vendorOrderID}}
+
+
+ 售后单号:
+ {{afsOrder.afsOrderID}}
+
+
+ 售后状态:
+ {{cms.orderStatus[afsOrder.status]}}
+
+
+ 驳回理由:
+ {{afsOrder.refuseReason}}
+
+
+ 申请时间:
+ {{$filters.dateToLLLL(afsOrder.createdAt)}}
+
+
+ 售后描述:
+ {{afsOrder.reasonDesc}}
+
+
+
+ 退款金额:
+ ￥{{$filters.toFixed2(afsOrder.skuUserMoney)}}
+
+
+
+ 联系商家
+
+
+
+
+
+ ![]()
+
+
+
+ {{sku.name}}
+ ￥{{$filters.toFixed2(sku.userMoney)}}
+ x{{sku.count}}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesOrders/create-order/address-display/address-display.scss b/src/pagesOrders/create-order/address-display/address-display.scss
new file mode 100644
index 0000000..a4f5c89
--- /dev/null
+++ b/src/pagesOrders/create-order/address-display/address-display.scss
@@ -0,0 +1,62 @@
+ @use '@/assets/bundle.scss';
+
+.address-display {
+ width: 100vw;
+ position: fixed;
+ top:0;
+ left:0;
+ z-index: 999;
+ border-top: 1rpx solid #DCDFE6;
+ @extend %bgwhite;
+ .address-top {
+ @extend %pdtb;
+ @extend %flex-left;
+ }
+ .icon-position, .icon-right-arrow {
+ flex: none;
+ @extend %pd20;
+ width: 80rpx;
+ height: 80rpx;
+ @extend %bg-no-repeat-center;
+ }
+ .icon-position {
+ background-size: 60rpx;
+ @extend %icon-position;
+ }
+ .icon-right-arrow {
+ @extend %icon-aw-right;
+ width: 30rpx;
+ height: 30rpx;
+ background-size: 30rpx;
+ }
+ &:after {
+ content: "";
+ display: block;
+ width: 100%;
+ height: 4rpx;
+ @extend %icon-address-border;
+ background-size: contain;
+ background-position: center center;
+ }
+ .address-content {
+ flex: auto;
+ .user-info {
+ font-size: 32rpx;
+ color: #333;
+ line-height: 1.6;
+ }
+ .address-info {
+ font-size: 24rpx;
+ color: #909399;
+ line-height: 1.4;
+ }
+ .address-none {
+ font-weight: 600;
+ color: #333;
+ font-size: 32rpx;
+ }
+ .spacing {
+ margin-left: 10rpx;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/pagesOrders/create-order/address-display/address-display.vue b/src/pagesOrders/create-order/address-display/address-display.vue
new file mode 100644
index 0000000..e9f1248
--- /dev/null
+++ b/src/pagesOrders/create-order/address-display/address-display.vue
@@ -0,0 +1,83 @@
+
+ 请选择退款商品
+
+
+
+
+ 请选择退款理由
+
+
+
+
+ {{item}}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesOrders/create-order/create-order.scss b/src/pagesOrders/create-order/create-order.scss
new file mode 100644
index 0000000..784205c
--- /dev/null
+++ b/src/pagesOrders/create-order/create-order.scss
@@ -0,0 +1,106 @@
+ @use '@/assets/bundle.scss';
+
+.create-order {
+ .top-wrapper {
+ height: calc(100vh - 100rpx);
+ overflow-y: auto;
+ // margin-bottom: 20rpx;
+ padding-bottom: 20rpx;
+ box-sizing: border-box;
+ }
+ .pd-wrapper {
+ // @extend %pd20;
+ // margin-top: 200rpx;
+ margin-top: 180rpx;
+ }
+ .isSelfBox{
+ padding:10rpx
+ }
+ // 自提
+ .is-self{
+ background-image: url('https://image.jxc4.com/image/962302a3c7fac74d92ed23b2b373dbf1.png');
+ background-repeat: no-repeat;
+ background-size: cover;
+
+ height: 100rpx;
+ display: flex;
+ justify-content: flex-end;
+ align-items: center;
+ .isSelf-switch{
+ // // border: 1rpx solid green !important;
+ // position: absolute;
+ // top: 20rpx;
+ // // top: 42rpx;
+ // right:50rpx;
+ z-index:99;
+ margin-right: 20px;
+ // // border: 1rpx solid red;
+ // // height: 100rpx;
+ }
+ }
+ .list {
+ margin-top: 20rpx;
+ // @extend %pdlr;
+ }
+ .self-order{
+ width: 100vw;
+ height:100rpx;
+ line-height:100rpx;
+ text-align: center;
+ background-color: #fff;
+ font-weight: bold;
+ }
+ .btn-comment {
+ margin-top: 20rpx;
+ .comment {
+ color: #909399;
+ @extend %oneline;
+ }
+ }
+ .total-pay {
+ @extend %bgwhite;
+ border-top: 1rpx solid #DCDFE6;
+ .order-totalPay {
+ @extend %flex-left;
+ font-size: 28rpx;
+ }
+ .money {
+ font-size: 34rpx;
+ font-weight: bold;
+ color: #F56C6C;
+ }
+ .btn-pay {
+ @extend %btn-linearGradient;
+ border-radius: 0;
+ height: 70rpx;
+ width: 200rpx;
+ font-size: 28rpx;
+ }
+ }
+ .order-num{
+ // margin-top: 10rpx;
+ margin-right: 10rpx;
+ }
+ .order-freight{
+ color:#fe6263;
+ font-size:22rpx;
+ }
+ .reduce-freight{
+ display: flex;
+ justify-content: space-between;
+ width: 100vw;
+ background:#fff;
+ color:rgb(243, 144, 144);
+ padding:10rpx;
+ position: fixed;
+ top:160rpx;
+ left: 0;
+ z-index: 999;
+ border-bottom-left-radius: 10rpx;
+ font-size: 30rpx;
+ border-bottom:1rpx solid rgba(255,255,255,0.5)
+ }
+ // .add{
+ // margin-right: 20rpx;
+ // }
+}
\ No newline at end of file
diff --git a/src/pagesOrders/create-order/index.vue b/src/pagesOrders/create-order/index.vue
new file mode 100644
index 0000000..11ea7ea
--- /dev/null
+++ b/src/pagesOrders/create-order/index.vue
@@ -0,0 +1,714 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新建收货地址
+
+
+
+
+ {{waybillAddress[0].address}} {{waybillAddress[0].detailAddress}}
+
+
+
+
+
+
+
+ {{storeAddress.address}}
+ {{ storeAddress.name }}
+
+
+
+
+
+ 备注
+
+
+ {{form.note || '可输入备注要求'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 共{{validCarList && validCarList.length > 0 ? validCarList.length : 0}}件
+ 合计:
+
+
+
+
+
+
+ 不在配送范围内
+
+ 去支付
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesOrders/my-afsorder/index.vue b/src/pagesOrders/my-afsorder/index.vue
new file mode 100644
index 0000000..6d7f0a1
--- /dev/null
+++ b/src/pagesOrders/my-afsorder/index.vue
@@ -0,0 +1,118 @@
+
+
+
+ 日期:
+
+
+
+
+
+ 至
+
+
+
+ {{fromDate}}
+ {{toDate}}
+
+
+ 时间:
+
+
+
+
+
+ 至
+
+
+
+ {{startTime}}
+ {{endTime}}
+
+
+ 进货量:
+
+
+ {{num}}%
+
+
+
+ 总金额:
+ {{(totalPrice*num/100).toFixed(2)}}￥
+
+
+
+
+
+
+
+
+
+ 日期
+ 销量
+
+
+
+
+ {{item.day}}
+ {{item.week}}
+ {{item.count}}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesOrders/my-afsorder/my-afsorder.scss b/src/pagesOrders/my-afsorder/my-afsorder.scss
new file mode 100644
index 0000000..f4c2e61
--- /dev/null
+++ b/src/pagesOrders/my-afsorder/my-afsorder.scss
@@ -0,0 +1,15 @@
+ @use '@/assets/bundle.scss';
+
+page {
+ background: #f4f4f4;
+}
+
+.my-afsorder {
+ .no-order {
+ margin-top: 200rpx;
+ }
+ .order-item {
+ @extend %bgwhite;
+ margin: 20rpx 0;
+ }
+}
diff --git a/src/pagesOrders/my-order/index.vue b/src/pagesOrders/my-order/index.vue
new file mode 100644
index 0000000..669e920
--- /dev/null
+++ b/src/pagesOrders/my-order/index.vue
@@ -0,0 +1,446 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesOrders/my-order/my-order.scss b/src/pagesOrders/my-order/my-order.scss
new file mode 100644
index 0000000..cab2615
--- /dev/null
+++ b/src/pagesOrders/my-order/my-order.scss
@@ -0,0 +1,79 @@
+ @use '@/assets/bundle.scss';
+
+.my-all-order {
+ .status-tab {
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ z-index: 1;
+ }
+
+ .zy-top-tab {
+ display: flex;
+ height: 100rpx;
+ @extend %bgwhite;
+ position: relative;
+ $margin: 20rpx;
+ .tab-item {
+ flex: 1;
+ font-size: 28rpx;
+ text-align: center;
+ margin: 0 $margin;
+ // background: red
+ }
+ .tab-text {
+ height: 94rpx;
+ @extend %flex-center;
+ color: #333;
+ transition: color .2s;
+ }
+ .active {
+ color: #4EB331;
+ }
+ .bottom-border {
+ // position: absolute;
+ // bottom: 0;
+ background: #4EB331;
+ height: 6rpx;
+ border-radius: 6rpx;
+ transition: left .3s,right .2s;
+ }
+ @for $i from 1 through 4 {
+ .four-#{$i} {
+ // left: $margin * (2 * $i - 1) + ((750rpx - $margin * 2 * 4) / 4) * ($i - 1);
+ // right: $margin * (9 - 2 * $i) + ((750rpx - $margin * 2 * 4) / 4) * (4 - $i);
+ }
+ }
+ @for $i from 1 through 3 {
+ .three-#{$i} {
+ // left: $margin * (2 * $i - 1) + ((750rpx - $margin * 2 * 3) / 3) * ($i - 1);
+ // right: $margin * (7 - 2 * $i) + ((750rpx - $margin * 2 * 3) / 3) * (3 - $i);
+ }
+ }
+ @for $i from 1 through 2 {
+ .two-#{$i} {
+ // left: $margin * (2 * $i - 1) + ((750rpx - $margin * 2 * 2) / 2) * ($i - 1);
+ // right: $margin * (5 - 2 * $i) + ((750rpx - $margin * 2 * 2) / 2) * (2 - $i);
+ }
+ }
+ }
+
+
+ .content {
+ padding-top: 120rpx;
+ }
+ .order-item {
+ // @extend %pd20;
+ @extend %bgwhite;
+ padding: 40rpx 20rpx;
+ margin-bottom: 20rpx;
+ border-radius: 20rpx;
+ margin-left: 10rpx;
+ margin-right: 10rpx;
+ border: 1rpx solid rgba(189, 189, 189, 0.5);
+ }
+ .no-order {
+ margin-top: 200rpx;
+ }
+}
\ No newline at end of file
diff --git a/src/pagesOrders/online-contact/index.vue b/src/pagesOrders/online-contact/index.vue
new file mode 100644
index 0000000..7206cd9
--- /dev/null
+++ b/src/pagesOrders/online-contact/index.vue
@@ -0,0 +1,320 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesOrders/online-contact/online-contact.scss b/src/pagesOrders/online-contact/online-contact.scss
new file mode 100644
index 0000000..57a5d52
--- /dev/null
+++ b/src/pagesOrders/online-contact/online-contact.scss
@@ -0,0 +1,349 @@
+
+/* pages/socks/socks.wxss */
+
+page {
+
+ background-color: #f7f7f7;
+
+ height: 100%;
+
+ }
+
+ /* 聊天内容 */
+
+ .news {
+
+ padding-top: 30rpx;
+
+ text-align: center;
+
+ /* height:100%; */
+
+ box-sizing:border-box;
+
+ }
+
+ #flag{
+ margin-bottom: 100rpx;
+ padding-top: 20rpx;
+ height: 30rpx;
+
+ }
+
+ .chat-notice{
+
+ text-align: center;
+
+ font-size: 30rpx;
+
+ padding: 10rpx 0;
+
+ color: #666;
+
+ }
+
+ .historycon {
+
+ height: 100%;
+
+ width: 100%;
+
+ /* flex-direction: column; */
+
+ display: flex;
+
+ border-top: 0px;
+
+ }
+
+ /* 聊天 */
+
+ .chat-news{
+
+ width: 100%;
+ overflow: hidden;
+ display: flex;
+ }
+ .chat-news-my{
+ justify-content: flex-end;
+ }
+ .chat-news .my_right {
+ // float: right;
+ /* right: 40rpx; */
+ padding: 10rpx 10rpx;
+ }
+
+
+ .chat-news .you_left {
+
+ float: left;
+
+ /* left: 5rpx; */
+
+ padding: 10rpx 10rpx;
+
+ }
+
+ .selectImg{
+
+ display: inline-block;
+
+ width: 150rpx;
+
+ height: 150rpx;
+
+ margin-left: 50rpx;
+
+ }
+
+ .my_right .selectImg{
+
+ margin-right: 80rpx;
+
+ }
+
+ .new_img {
+
+ width: 60rpx;
+
+ height: 60rpx;
+
+ border-radius: 50%;
+
+ vertical-align: middle;
+
+ margin-right: 10rpx;
+
+ }
+
+ .new_txt {
+
+ max-width: 300rpx;
+
+ display: inline-block;
+
+ border-radius: 6rpx;
+
+ line-height: 60rpx;
+
+ background-color: #95d4ff;
+
+ padding: 5rpx 20rpx;
+
+ margin: 0 10rpx;
+
+ //margin-left: 50rpx;
+
+ }
+
+ .my_right .new_txt{
+ text-align: left;
+ }
+
+ .you{
+
+ background-color: lightgreen;
+
+ }
+
+ .my {
+
+ border-color: transparent transparent transparent #95d4ff;
+
+ }
+
+ .you {
+
+ border-color: transparent #95d4ff transparent transparent;
+
+ }
+
+ .hei{
+
+ margin-top: 50px;
+
+ height: 20rpx;
+
+ }
+
+ .history {
+ width: 100%;
+ height: 100%;
+ margin-top: 15px;
+ padding: 10rpx;
+ font-size: 14px;
+ line-height: 40px;
+
+ word-break: break-all;
+
+ }
+
+ ::-webkit-scrollbar {
+
+ width: 0;
+
+ height: 0;
+
+ color: transparent;
+
+ z-index: -1;
+
+ }
+
+
+
+ /* 信息输入区域 */
+
+ .message{
+
+ position: fixed;
+
+ bottom:0;
+
+ width: 100%;
+
+ }
+
+ .sendMessage{
+
+ display: block;
+
+ height: 80rpx;
+
+ padding: 10rpx 10rpx;
+
+ background-color: #fff;
+
+ border-top: 2rpx solid #eee;
+
+ border-bottom: 2rpx solid #eee;
+
+ z-index:3;
+
+ }
+
+ .sendMessage input{
+
+ float:left;
+
+ width: 66%;
+
+ height: 100%;
+
+ line-height: 80rpx;
+
+ border-bottom: 1rpx solid #ccc;
+
+ padding:0 10rpx;
+
+ font-size: 35rpx;
+
+ color: #666;
+
+ }
+
+ .sendMessage view{
+
+ display: inline-block;
+
+ width: 80rpx;
+
+ height: 80rpx;
+
+ line-height: 80rpx;
+
+ font-size: 60rpx;
+
+ text-align: center;
+
+ color: #999;
+
+ border: 1rpx solid #ccc;
+
+ border-radius: 50%;
+
+ margin-left: 10rpx;
+
+ }
+
+ .sendMessage button {
+
+ float: right;
+
+ font-size: 35rpx;
+
+ }
+
+ .increased{
+
+ width:100%;
+
+ /* height: 150rpx; */
+
+ padding: 40rpx 30rpx;
+
+ background-color: #fff;
+
+ }
+
+ .increased .image{
+
+ width: 100rpx;
+
+ height: 100rpx;
+
+ border: 3rpx solid #ccc;
+
+ line-height: 100rpx;
+
+ text-align: center;
+
+ border-radius: 8rpx;
+
+ font-size:35rpx;
+
+ }
+
+ @keyframes slidedown {
+
+ from {
+
+ transform: translateY(0);
+
+ }
+
+ to {
+
+ transform: translateY(100%);
+
+ }
+
+ }
+
+ .slidedown {
+
+ animation: slidedown 0.5s linear ;
+
+ }
+
+ .slideup {
+
+ animation: slideup 0.5s linear ;
+
+ }
+
+ @keyframes slideup {
+
+ from {
+
+ transform: translateY(100%);
+
+ }
+
+ to {
+
+ transform: translateY(0);
+
+ }
+
+ }
\ No newline at end of file
diff --git a/src/pagesOrders/order-detail/index.vue b/src/pagesOrders/order-detail/index.vue
new file mode 100644
index 0000000..e90b015
--- /dev/null
+++ b/src/pagesOrders/order-detail/index.vue
@@ -0,0 +1,665 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.content}}
+
+
+ {{ item.name }}
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+ {{item.content}}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesOrders/order-status/order-status.scss b/src/pagesOrders/order-status/order-status.scss
new file mode 100644
index 0000000..344a5ac
--- /dev/null
+++ b/src/pagesOrders/order-status/order-status.scss
@@ -0,0 +1,73 @@
+ @use '@/assets/bundle.scss';
+
+.order-status {
+ padding: 80rpx;
+ .zy-step {
+ color: #333;
+ &-item {
+ font-size: 32rpx;
+ display: flex;
+ }
+ &-head {
+ position: relative;
+ display: flex;
+ flex-flow: column;
+ align-items: center;
+ flex: none;
+ }
+ &-line {
+ width: 2rpx;
+ flex: 1;
+ position: absolute;
+ top: 22rpx;
+ height: 100%;
+ background: #DCDFE6;
+ }
+ &-icon {
+ width: 40rpx;
+ height: 40rpx;
+ // background: #DCDFE6;
+ // border-radius: 50%;
+ position: absolute;
+ top: 4rpx;
+ @extend %flex-center;
+ .dot {
+ width: 14rpx;
+ height: 14rpx;
+ background-color: #DCDFE6;
+ border-radius: 50%;
+ }
+ .first-dot {
+ width: 16rpx;
+ height: 16rpx;
+ padding: 5rpx;
+ border: 4rpx solid #4EB331;
+ background-color: #4EB331;
+ background-clip: content-box;
+ }
+ }
+ &-main {
+ flex: 1;
+ margin-left: 50rpx;
+ padding-bottom: 50rpx;
+ }
+ &-title {
+ @extend %flex-between;
+ }
+ .left {
+ font-size: 34rpx;
+ font-weight: 400;
+ }
+ .first-left {
+ color: #4EB331;
+ }
+ .right {
+ font-size: 24rpx;
+ color: #909399;
+ }
+ &-des {
+ color: #909399;
+ font-size: 24rpx;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/pagesOrders/orderCmp/goods-group/goods-group.scss b/src/pagesOrders/orderCmp/goods-group/goods-group.scss
new file mode 100644
index 0000000..d699177
--- /dev/null
+++ b/src/pagesOrders/orderCmp/goods-group/goods-group.scss
@@ -0,0 +1,76 @@
+ @use '@/assets/bundle.scss';
+
+.goods-group {
+ .store-info {
+ padding:0 10rpx;
+ @extend %flex-between;
+ height: 80rpx;
+ @extend %bgwhite;
+ }
+ .store-name {
+ @extend %flex-left;
+ // @extend %pdlr;
+ .icon-shop {
+ flex: none;
+ @extend %icon-store;
+ @extend %bg-no-repeat-center;
+ width: 40rpx;
+ height: 40rpx;
+ @extend %bg-size-100;
+ }
+ .name {
+ flex: auto;
+ @extend %oneline;
+ font-size: 30rpx;
+ color: #606266;
+ }
+ }
+ .store-mobile {
+ font-size: 30rpx;
+ color: #606266;
+ }
+ .sku-list {
+ .sku-item {
+ @extend %flex-left;
+ @extend %pdtb;
+ padding:10rpx;
+ // margin:10rpx auto;
+
+ border-bottom: 10rpx solid white;
+ font-size: 28rpx;
+ }
+ .sku-item-left {
+ flex: none;
+ .sku-item-img{
+ width: 120rpx;
+ height: 120rpx;
+ @extend %bgwhite;
+ }
+ // img {
+ // width: 120rpx;
+ // height: 120rpx;
+ // @extend %bgwhite;
+ // }
+ }
+ .sku-item-center {
+ align-self: flex-start;
+ flex: auto;
+ margin: 0 20rpx;
+ .sku-name {
+ color: #333;
+ // @extend %oneline;
+ }
+ .sku-count {
+ color: #909399;
+ }
+ }
+ .sku-item-right {
+ align-self: flex-start;
+ width: 200rpx;
+ text-align: right;
+ .sku-totalMoney {
+ color: #333;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/pagesOrders/orderCmp/goods-group/goods-group.vue b/src/pagesOrders/orderCmp/goods-group/goods-group.vue
new file mode 100644
index 0000000..bdbd657
--- /dev/null
+++ b/src/pagesOrders/orderCmp/goods-group/goods-group.vue
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{status.statusText}}
+ {{status.statusTime}}
+ {{status.remark}}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesOrders/orderCmp/order-cell/order-cell.scss b/src/pagesOrders/orderCmp/order-cell/order-cell.scss
new file mode 100644
index 0000000..f7cac51
--- /dev/null
+++ b/src/pagesOrders/orderCmp/order-cell/order-cell.scss
@@ -0,0 +1,108 @@
+ @use '@/assets/bundle.scss';
+
+%cell-bottom {
+ border-bottom: 1rpx solid #E4E7ED;
+ padding-bottom: 20rpx;
+}
+.order-cell {
+ .cell-title {
+ @extend %flex-between;
+ @extend %cell-bottom;
+ .left {
+ line-height: 1.2;
+ }
+ .store-name {
+ font-size: 30rpx;
+ color: #333;
+ font-weight: 500;
+ }
+ .order-created {
+ font-size: 24rpx;
+ color: #909399;
+ // border:1rpx solid red;
+ margin-top: 10rpx;
+ }
+ .right {
+ font-size: 28rpx;
+ color: #333;
+ }
+ }
+ .order-one-good {
+ padding: 30rpx 0;
+ @extend %flex-left;
+ font-size: 28rpx;
+ color: #606266;
+ border-bottom: 1rpx solid #E4E7ED;
+ .good-name {
+ width: 53%;
+ @extend %oneline;
+ }
+ .total-good-count {
+ width: 25%;
+ text-align: right;
+ }
+ .total-pay {
+ width: 22%;
+ text-align: right;
+ font-weight: bold;
+ color: #333;
+ }
+ }
+ .order-op {
+ padding-top: 20rpx;
+ @extend %flex-right;
+ .btn-normal {
+ font-size: 26rpx;
+ padding: 10rpx 20rpx;
+ border: 1rpx solid #409EFF;
+ color: #409EFF;
+ border-radius: 8rpx;
+ line-height: 1;
+ }
+ .btn-repay {
+ border-color: #E6A23C;
+ color: #E6A23C;
+ }
+ .btn-confirm {
+ border-color: #4EB331;
+ color: #4EB331;
+ }
+ .btn-disable {
+ opacity: .5;
+ }
+ }
+ .order-material {
+ justify-content: space-between;
+ .material-pack {
+ font-size: 30rpx;
+ color: #909399;
+ }
+ }
+}
+// 新增样式
+.order-one-good{
+ justify-content: space-around;
+}
+.order-good{
+ display:flex;
+ // border: 1rpx solid red;
+ // width: 200rpx;
+ // overflow-x: auto;
+
+}
+.order-img{
+ width:100rpx;
+ height:100rpx;
+ // border:1rpx solid red;
+}
+.good-name1{
+ width: 100rpx;
+ display: flex;
+ // border: 1rpx solid red;
+ white-space: nowrap;
+ overflow: hidden;
+ font-size: 20rpx;
+}
+.order-item{
+ padding:0 20rpx;
+}
\ No newline at end of file
diff --git a/src/pagesOrders/orderCmp/order-cell/order-cell.vue b/src/pagesOrders/orderCmp/order-cell/order-cell.vue
new file mode 100644
index 0000000..9b8b6be
--- /dev/null
+++ b/src/pagesOrders/orderCmp/order-cell/order-cell.vue
@@ -0,0 +1,127 @@
+
+
+
+
+
+
+ {{storeName ? storeName : storeMap[storeID].name}}
+ {{storeMap[storeID].mobile}}
+
+
+
+
+
+ ![]()
+
+
+
+ {{sku.name}}
+ x{{sku.count}}
+
+
+ ￥{{$filters.toFixed2((sku.curPrice * sku.count))}}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesOrders/payWebviewLkl/index.vue b/src/pagesOrders/payWebviewLkl/index.vue
new file mode 100644
index 0000000..3fbe661
--- /dev/null
+++ b/src/pagesOrders/payWebviewLkl/index.vue
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+ {{order.storeName}}
+ 下单时间：
+ {{$filters.dateToLLLL(order.orderCreatedAt)}}
+
+ {{(order.status < 100 && order.deliveryType === 'self') ? '待自提' : cms.orderStatus[order.status]}}
+
+
+
+
+ {{order.skuList[0].skuName}}
+ 等{{order.goodsCount}}件商品
+ ￥{{$filters.toFixed2(order.actualPayPrice)}}
+
+
+
+ {{order.vendorOrderID.length === 16 ? '分包' : '主包'}}
+
+ 再来一单
+ 去支付({{countDownText}})
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesPay/JX-pay/JX-pay.scss b/src/pagesPay/JX-pay/JX-pay.scss
new file mode 100644
index 0000000..ccdda8a
--- /dev/null
+++ b/src/pagesPay/JX-pay/JX-pay.scss
@@ -0,0 +1,140 @@
+
+.pay{
+ background-color: #f3f3f3;
+ height: 100vh;
+ overflow: hidden;
+ .img{
+ margin-top:16rpx;
+ margin-left:20rpx;
+ display:flex;
+ margin-top: 80rpx;
+ }
+ .img-item{
+ width: 150rpx;
+ height:150rpx;
+ }
+ .title{
+ // width: 150px;
+ // border: 1px solid red;
+ width: 100%;
+ font-size: 50rpx;
+ height: 150rpx;
+ line-height: 75rpx;
+ font-weight: bold;
+ margin-left:20rpx;
+ // margin-top: ;
+ // text-align: center;
+ }
+ .title-storeName{
+ font-size: 30rpx;
+ color:#696969;
+ }
+ .jxPaybut{
+ text-align: center;
+ height: 80rpx;
+ line-height: 80rpx;
+ width: 650rpx;
+ border-radius: 20rpx;
+ margin: 200rpx auto;
+ background-color: #4EB331;
+ color:#fff;
+ }
+ .backApp{
+ // border:1rpx solid red;
+
+ width: 100px;
+ // height: 50px;
+ // display: flex;
+ background-color: #bdbebe;
+ margin-right:50rpx;
+ color:#fff;
+ box-shadow: 1px 2px 1px 1px #838282;
+ }
+
+ // 金额输入框
+ .input-box{
+ display:flex;
+ justify-content: space-between;
+ padding:30rpx;
+ background-color: #fff;
+ margin:80rpx 40rpx;
+ border-radius: 20rpx;
+ }
+ .input{
+ // border: 1px solid rgb(70, 64, 64);
+ width: 200px;
+ text-align: right;
+ }
+ // 键盘
+ .key-board{
+ position: fixed;
+ bottom:0;
+ width:750rpx;
+ box-sizing: border-box;
+ height: calc(100%/3);
+ background-color: #fff;
+ }
+ .key-board,.key-num{
+ display: flex;
+ justify-content: space-between;
+ }
+ .key-num{
+ // border:1px solid rgb(113, 225, 61);
+ width: 100%;
+ height: calc(100%/4);
+ box-sizing: border-box;
+ &-text{
+ border: 1rpx solid rgb(178, 178, 178);
+ width: 100%;
+ text-align: center;
+ padding-top: 12px;
+ }
+ }
+ .bg_red{
+ background-color: #f0f1f0 !important;
+ }
+ .key{
+ width:calc(100%/4*3);
+ }
+ .key-text{
+ border:1rpx solid rgb(178, 178, 178);
+ width: calc(100%/4*1);
+ height: 100%;
+ box-sizing: border-box;
+ }
+ .zero{
+ width: calc(100%/3*2);
+ box-sizing: border-box;
+ border: 1rpx solid rgb(178, 178, 178);
+ padding-top: 12px;
+ padding-left:calc(100%/3*0.45);
+ }
+ .point{
+ border: 1rpx solid rgb(178, 178, 178);
+ width: calc(100%/3*1);
+ box-sizing: border-box;
+ text-align: center;
+ padding-top: 12px;
+ }
+ .del{
+ height: 25%;
+ border-bottom: 1rpx solid rgb(178, 178, 178);
+ text-align: center;
+ padding-top: 12px;
+ box-sizing: border-box;
+ background: url('@/assets/images/backspace.png') center no-repeat;
+ }
+ .sure-pay{
+ border-top: 1rpx solid rgb(178, 178, 178);
+ width: 100px;
+ height: 75%;
+ text-align: center;
+ box-sizing: border-box;
+ &-text{
+ width:40px;
+ margin: 50% auto;
+ color:#fff;
+ }
+ background-color: #4EB331;
+ }
+}
diff --git a/src/pagesPay/JX-pay/JX-pay.vue b/src/pagesPay/JX-pay/JX-pay.vue
new file mode 100644
index 0000000..b3935ac
--- /dev/null
+++ b/src/pagesPay/JX-pay/JX-pay.vue
@@ -0,0 +1,226 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 立即自取
+ {{item.viewTime}}
+ {{item.viewShippingFee}}
+ 取消
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesStore/store/index.scss b/src/pagesStore/store/index.scss
new file mode 100644
index 0000000..c2acf3e
--- /dev/null
+++ b/src/pagesStore/store/index.scss
@@ -0,0 +1,16 @@
+.store{
+ padding: 20rpx;
+}
+
+.storeItem{
+ margin: 20rpx;
+ border:1rpx solid red;
+ padding: 10rpx;
+}
+
+.toptitle{
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
diff --git a/src/pagesStore/store/index.vue b/src/pagesStore/store/index.vue
new file mode 100644
index 0000000..8f9e098
--- /dev/null
+++ b/src/pagesStore/store/index.vue
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+ 京西菜市
+ ({{ payInfor.name }})
+ 消费金额:￥
+
+
+ 立即支付
+
+
+
+
+
+
+
+
+
+
+
+ 1
+ 2
+ 3
+
+
+ 4
+ 5
+ 6
+
+
+ 7
+ 8
+ 9
+
+
+ 0
+ .
+
+
+
+
+
+
+
+ 确认支付
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/static/images/bottom-bar/icon-cart-active.png b/src/static/images/bottom-bar/icon-cart-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..6889785ca936a4cf7c00c4414c6e0a6d87aecef7
GIT binary patch
literal 372
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw3=&b&bO2I*0X`wFK-&346tz%dSwIxfM9GpM
zzhH)N_KKW6a-RzYe!P;@ynb|Zho8y()L6S|;aBASfQt5bx;Tb-9DjS&dtI}EfXl_E
z1Ot{s`t!qo-+vMO?1@yRKPqiNa$~E4XJ#a8s%?nsx`&SiQ7Wz{CE9c
z{`8HZR6KCoNiFA%;R<(H6}bLFzf?(SM+?JrKi`4-zoGT1F~-8`nx^V-CCOIcNwzPg
zI#WEmoNbKdqI?lY^r{&3;lBduQzQ+^Q0Ovsdx3SZltt7_Sx&}T*-Yi_XK}hBNmrzk
z`W5H7!&mhB=^p;ZXqR-ILzW%aNuB+jl6J_cC{Fe!sVl1a9E#$&!PeE+C9zxSuy$PP
z>g$x)o>=F3@9E@S$%q