diff --git a/goods-module/-goods/-goods-qrcode-poster.vue b/goods-module/-goods/-goods-qrcode-poster.vue
index c811e4de02793256bcbdfd431c5bd66d14e5a502..234cd73b88e3f87ad96423bca7e7a718472f7792 100644
--- a/goods-module/-goods/-goods-qrcode-poster.vue
+++ b/goods-module/-goods/-goods-qrcode-poster.vue
@@ -323,7 +323,7 @@
complete: (res) => {
// 生成完海报,调用上传功能
uni.uploadFile({
- url: `${api.buyer}/uploaders`,
+ url: `${api.buyer}/buyer/uploaders`,
header: { Authorization: Cache.getItem(Keys.accessToken) },
filePath: res.tempFilePath,
name: 'file',
diff --git a/mine-module/add-evaluation.vue b/mine-module/add-evaluation.vue
index 493986fbb24506d075cd0a233da600bc65f5c713..d0b5e5e7b36f791e8305aa4b6d88ac6a2e5ca4fe 100644
--- a/mine-module/add-evaluation.vue
+++ b/mine-module/add-evaluation.vue
@@ -60,7 +60,7 @@
export default {
data() {
return {
- action: `${api.buyer}/uploaders`,
+ action: `${api.buyer}/buyer/uploaders`,
header: { Authorization: Cache.getItem(Keys.accessToken) },
params: {
order_sn: '',
diff --git a/order-module/order/after-sale/after-sale-apply.vue b/order-module/order/after-sale/after-sale-apply.vue
index f4b46ed453ac5ecec8491a292c47c472857337b9..1abb9ceb0de00428f45e293d246d6774f16206f8 100644
--- a/order-module/order/after-sale/after-sale-apply.vue
+++ b/order-module/order/after-sale/after-sale-apply.vue
@@ -133,7 +133,7 @@
export default {
data() {
return {
- action: `${api.buyer}/uploaders`,
+ action: `${api.buyer}/buyer/uploaders`,
header: { Authorization: Cache.getItem(Keys.accessToken) },
value: 1,
remarkStyle: {
diff --git a/order-module/order/evaluation.vue b/order-module/order/evaluation.vue
index d8a906f41f52fcb2afdb095cb07b3141aebef164..5dc3350cce9a51c852026d9543ed7735a92e496c 100644
--- a/order-module/order/evaluation.vue
+++ b/order-module/order/evaluation.vue
@@ -64,7 +64,7 @@ export default {
return {
sku_list: [],
order_sn: '',
- action: `${api.buyer}/uploaders`,
+ action: `${api.buyer}/buyer/uploaders`,
header: { Authorization: Cache.getItem(Keys.accessToken) },
count: 5,
grade: '',
diff --git a/pages/shop/apply.vue b/pages/shop/apply.vue
index 40238fe29c91a7612c69628692b55591ec3550a0..669abfa4914285a594d6da7d18307ce1017c05ee 100644
--- a/pages/shop/apply.vue
+++ b/pages/shop/apply.vue
@@ -110,12 +110,13 @@
height: 100%;
.entry-container {
- padding: 50% 20rpx 20rpx 20rpx;
+ padding: 30% 20rpx 20rpx 20rpx;
.title {
- color: #27a9e3;
+ color: rgb(255, 80, 0);
font-size: 32rpx;
font-weight: 600;
+ margin-bottom: 60px;
}
.tips {
@@ -134,9 +135,12 @@
border: 2rpx solid #fbeed5;
.btn {
+ width: 120rpx;
+ border-radius: 4px;
font-size: 24rpx;
line-height: 70rpx;
- background-color: red;
+ text-align: center;
+ background: rgb(255, 80, 0);
color: #fff;
padding: 0 20rpx;
}
diff --git a/pages/shop/apply/auth-info.vue b/pages/shop/apply/auth-info.vue
index 76ec822ef4c480cf740ba6162f8dd636bbb23bb0..bff2e0be33000907c580056992dbeecb959bfa78 100644
--- a/pages/shop/apply/auth-info.vue
+++ b/pages/shop/apply/auth-info.vue
@@ -22,10 +22,18 @@
-
-
-
+
+
+
@@ -33,27 +41,51 @@
-
-
-
+
+
+
-
-
-
+
+
+
至
-
-
-
+
+
+
+
@@ -192,7 +224,7 @@
licence_img: [req_rule('请上传营业执照电子版!', 'change')]
},
errorType: ['toast'],
- action: `${api.buyer}/uploaders`,
+ action: `${api.buyer}/buyer/uploaders`,
header: {
Authorization: Cache.getItem(Keys.accessToken)
},
@@ -307,6 +339,10 @@
diff --git a/pages/shop/apply/success.vue b/pages/shop/apply/success.vue
index 287d8dd3f9ed85130107e828f8f7f313d7389f34..76dad45f3550f44b9eed70a3d2a808aa6edd9704 100644
--- a/pages/shop/apply/success.vue
+++ b/pages/shop/apply/success.vue
@@ -1,6 +1,6 @@
-
+
申请开店成功,等待审核......
返回首页
@@ -35,23 +35,23 @@
.tip {
display: block;
- color: #c94136;
- font-size: 52rpx;
+ color: rgb(255, 80, 0);
+ font-size: 30rpx;
font-family: '微软雅黑';
margin-top: 100rpx;
}
.back-index {
display: block;
- width: 300rpx;
- height: 100rpx;
- line-height: 100rpx;
+ width: 200rpx;
+ height: 80rpx;
+ line-height: 80rpx;
text-align: center;
color: #fff;
- font-size: 44rpx;
- background-color: #c94136;
+ font-size: 30rpx;
+ background-color: rgb(255, 80, 0);
border-radius: 10rpx;
- margin: 100rpx auto;
+ margin: 30rpx auto;
font-family: '微软雅黑';
}
}
diff --git a/pages/shop/apply/user-agreement.vue b/pages/shop/apply/user-agreement.vue
index 66c6471f9eef145c7d7d75f3f7064cfb5fc1fef3..9e22fdbaa530d099aaa7bd0661b40f6c7aae1eeb 100644
--- a/pages/shop/apply/user-agreement.vue
+++ b/pages/shop/apply/user-agreement.vue
@@ -77,10 +77,11 @@
}
.content-box {
- border: 2rpx solid #d7d7d7;
+ border: 2rpx solid #efefef;
+ border-radius: 4px;
padding: 20rpx;
margin: 20rpx;
- max-height: 750rpx;
+ height: 70vh;
overflow-y: scroll;
}
diff --git a/pages/tabs/mine/mine.vue b/pages/tabs/mine/mine.vue
index de77e1822b2e6637a79fb6ef71edf02839fea83f..7f6e0857a9c73655e7399debf3b8aa7e64587547 100644
--- a/pages/tabs/mine/mine.vue
+++ b/pages/tabs/mine/mine.vue
@@ -224,7 +224,13 @@
设置
-
+
+
+
+
+ {{user.have_shop ? '我的店铺' : '店铺入驻'}}
+
+
@@ -334,11 +340,6 @@
this.onSetting()
}
},
- // 滚动到底部
- // onReachBottom() {
- // this.$refs.goodsRecommend.params.page_no += 1
- // this.$refs.goodsRecommend.getGoodsList()
- // },
//滚动距离
onPageScroll(e) {
this.scrollTop = e.scrollTop
diff --git a/static/.DS_Store b/static/.DS_Store
index c7e2c41781ad0cfee7a21448bb2d5c36fa7cf9b2..4b0be5a3373fbd13e9d35cc35cacd84677352a56 100644
Binary files a/static/.DS_Store and b/static/.DS_Store differ
diff --git a/static/images/.DS_Store b/static/images/.DS_Store
index b414f41e1967338ece55f6524ca2ba9cefbbae3a..d1057a5b638778335891295f57c01d4cb9782a3e 100644
Binary files a/static/images/.DS_Store and b/static/images/.DS_Store differ
diff --git "a/static/images/otherServices/\345\272\227\351\223\272-fill.png" "b/static/images/otherServices/\345\272\227\351\223\272-fill.png"
new file mode 100644
index 0000000000000000000000000000000000000000..21936b4a7aa6ec89c53f07975e574e869db6b05f
Binary files /dev/null and "b/static/images/otherServices/\345\272\227\351\223\272-fill.png" differ
diff --git a/static/images/success-img.png b/static/images/success-img.png
new file mode 100644
index 0000000000000000000000000000000000000000..1cdc16dcaa8d64744117b5eac1a137955a25e270
Binary files /dev/null and b/static/images/success-img.png differ
diff --git a/uni.scss b/uni.scss
index 65bd087ea040946b206d098f7d20334f9b966cf9..5c9ec637d38c1507d11274fbbaf310abe491af18 100644
--- a/uni.scss
+++ b/uni.scss
@@ -47,7 +47,7 @@ page{
align-items: center;
}
.u-label {
- flex: 0 0 160rpx !important;
+ flex: 0 0 160rpx;
}
.u-field__input-wrap, .u-textarea-class {
font-weight: 600;