Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yohoblk-wap
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
ccbikai
9 years ago
Commit
69cf59e9d5f37321d16d5196220fbcccc852e96c
1 parent
814bbfaa
个人中心路由修改
Hide whitespace changes
Inline
Side-by-side
Showing
47 changed files
with
41 additions
and
41 deletions
public/js/common/intercept-click.js
public/js/home/coin.page.js → public/js/me/coin.page.js
public/js/home/exchange-status.page.js → public/js/me/exchange-status.page.js
public/js/home/exchange.page.js → public/js/me/exchange.page.js
public/js/home/favorite-brand.page.js → public/js/me/favorite-brand.page.js
public/js/home/favorite.page.js → public/js/me/favorite.page.js
public/js/home/feedback.page.js → public/js/me/feedback.page.js
public/js/home/index.page.js → public/js/me/index.page.js
public/js/home/logistics.page.js → public/js/me/logistics.page.js
public/js/home/mydetails.page.js → public/js/me/mydetails.page.js
public/js/home/order-detail.page.js → public/js/me/order-detail.page.js
public/js/home/order-logistic.page.js → public/js/me/order-logistic.page.js
public/js/home/order.page.js → public/js/me/order.page.js
public/js/home/refund-order.page.js → public/js/me/refund-order.page.js
public/js/home/refund.page.js → public/js/me/refund.page.js
public/scss/index.css
public/scss/home/_about-us.css → public/scss/me/_about-us.css
public/scss/home/_coin.css → public/scss/me/_coin.css
public/scss/home/_details.css → public/scss/me/_details.css
public/scss/home/_exchange-status.css → public/scss/me/_exchange-status.css
public/scss/home/_feedback.css → public/scss/me/_feedback.css
public/scss/home/_help.css → public/scss/me/_help.css
public/scss/home/_home.css → public/scss/me/_home.css
public/scss/home/_index.css → public/scss/me/_index.css
public/scss/home/_logistics.css → public/scss/me/_logistics.css
public/scss/home/_order-detail.css → public/scss/me/_order-detail.css
public/scss/home/_order.css → public/scss/me/_order.css
public/scss/home/_refund-order.css → public/scss/me/_refund-order.css
public/vue/home/coin-detail.vue → public/vue/me/coin-detail.vue
public/vue/home/exchange.vue → public/vue/me/exchange.vue
public/vue/home/exchange/item.vue → public/vue/me/exchange/item.vue
public/vue/home/fav-brand-list.vue → public/vue/me/fav-brand-list.vue
public/vue/home/fav-product-list.vue → public/vue/me/fav-product-list.vue
public/vue/home/mydetails.vue → public/vue/me/mydetails.vue
public/vue/home/order-detail.vue → public/vue/me/order-detail.vue
public/vue/home/order-logistic.vue → public/vue/me/order-logistic.vue
public/vue/home/order.vue → public/vue/me/order.vue
public/vue/home/refund-order.vue → public/vue/me/refund-order.vue
public/vue/home/refund.vue → public/vue/me/refund.vue
public/vue/home/refund/logistics-company.vue → public/vue/me/refund/logistics-company.vue
public/vue/home/refund/logistics.vue → public/vue/me/refund/logistics.vue
public/vue/home/refund/product.vue → public/vue/me/refund/product.vue
public/vue/home/return/README.MD → public/vue/me/return/README.MD
public/vue/home/return/item.vue → public/vue/me/return/item.vue
public/vue/home/return/list.vue → public/vue/me/return/list.vue
public/vue/home/return/reason.js → public/vue/me/return/reason.js
public/vue/home/return/reason.vue → public/vue/me/return/reason.vue
public/js/common/intercept-click.js
View file @
69cf59e
...
...
@@ -74,11 +74,11 @@ const titleMap = {
},
ltitle
:
{
des
:
'商品'
,
action
:
origin
+
'/
ho
me/favorite'
action
:
origin
+
'/me/favorite'
},
rtitle
:
{
des
:
'品牌'
,
action
:
origin
+
'/
ho
me/favorite?tab=brand'
action
:
origin
+
'/me/favorite?tab=brand'
},
right
:
{
des
:
'编辑'
,
...
...
@@ -129,7 +129,7 @@ const matchHeader = (url) => {
if
(
/
\/
home
\/
order-detail$/
.
test
(
path
))
{
header
=
titleMap
[
2
];
header
.
title
.
des
=
'订单详情'
;
header
.
title
.
right
.
action
=
origin
+
'/
ho
me/service'
;
header
.
title
.
right
.
action
=
origin
+
'/me/service'
;
return
header
;
}
...
...
public/js/
ho
me/coin.page.js → public/js/me/coin.page.js
View file @
69cf59e
public/js/
ho
me/exchange-status.page.js → public/js/me/exchange-status.page.js
View file @
69cf59e
public/js/
ho
me/exchange.page.js → public/js/me/exchange.page.js
View file @
69cf59e
public/js/
ho
me/favorite-brand.page.js → public/js/me/favorite-brand.page.js
View file @
69cf59e
public/js/
ho
me/favorite.page.js → public/js/me/favorite.page.js
View file @
69cf59e
public/js/
ho
me/feedback.page.js → public/js/me/feedback.page.js
View file @
69cf59e
...
...
@@ -19,7 +19,7 @@ yoho.addNativeMethod('saveFeedback', function() {
$
.
ajax
({
type
:
'post'
,
url
:
'/
ho
me/save-feedback'
,
url
:
'/me/save-feedback'
,
data
:
{
content
:
suggestText
,
}
...
...
public/js/
ho
me/index.page.js → public/js/me/index.page.js
View file @
69cf59e
public/js/
ho
me/logistics.page.js → public/js/me/logistics.page.js
View file @
69cf59e
public/js/
ho
me/mydetails.page.js → public/js/me/mydetails.page.js
View file @
69cf59e
public/js/
ho
me/order-detail.page.js → public/js/me/order-detail.page.js
View file @
69cf59e
public/js/
ho
me/order-logistic.page.js → public/js/me/order-logistic.page.js
View file @
69cf59e
public/js/
ho
me/order.page.js → public/js/me/order.page.js
View file @
69cf59e
public/js/
ho
me/refund-order.page.js → public/js/me/refund-order.page.js
View file @
69cf59e
public/js/
ho
me/refund.page.js → public/js/me/refund.page.js
View file @
69cf59e
public/scss/index.css
View file @
69cf59e
@charset
"utf-8"
;
@import
"common/index"
;
@import
"example/index"
;
@import
"
ho
me/index"
;
@import
"me/index"
;
...
...
public/scss/
ho
me/_about-us.css → public/scss/me/_about-us.css
View file @
69cf59e
public/scss/
ho
me/_coin.css → public/scss/me/_coin.css
View file @
69cf59e
public/scss/
ho
me/_details.css → public/scss/me/_details.css
View file @
69cf59e
public/scss/
ho
me/_exchange-status.css → public/scss/me/_exchange-status.css
View file @
69cf59e
public/scss/
ho
me/_feedback.css → public/scss/me/_feedback.css
View file @
69cf59e
public/scss/
ho
me/_help.css → public/scss/me/_help.css
View file @
69cf59e
public/scss/
ho
me/_home.css → public/scss/me/_home.css
View file @
69cf59e
public/scss/
ho
me/_index.css → public/scss/me/_index.css
View file @
69cf59e
public/scss/
ho
me/_logistics.css → public/scss/me/_logistics.css
View file @
69cf59e
public/scss/
ho
me/_order-detail.css → public/scss/me/_order-detail.css
View file @
69cf59e
public/scss/
ho
me/_order.css → public/scss/me/_order.css
View file @
69cf59e
public/scss/
ho
me/_refund-order.css → public/scss/me/_refund-order.css
View file @
69cf59e
public/vue/
ho
me/coin-detail.vue → public/vue/me/coin-detail.vue
View file @
69cf59e
...
...
@@ -42,7 +42,7 @@
return;
}
$.ajax({
url: '/
ho
me/coin-detail',
url: '/me/coin-detail',
data: {
page: ++this.page,
limit: this.limit
...
...
public/vue/
ho
me/exchange.vue → public/vue/me/exchange.vue
View file @
69cf59e
...
...
@@ -79,7 +79,7 @@
// 获取 换货商品
$.ajax({
url: '/
ho
me/exchange/order',
url: '/me/exchange/order',
data: {
orderId: this.orderCode
}
...
...
@@ -242,11 +242,11 @@
$.ajax({
method: 'POST',
url: '/
ho
me/exchange/submit',
url: '/me/exchange/submit',
data
}).then(result => {
if (result.code === 200) {
yoho.goNewPage({url: `/
ho
me/exchange-status?orderId=${self.orderCode}`});
yoho.goNewPage({url: `/me/exchange-status?orderId=${self.orderCode}`});
} else {
modal.alert(result.message);
}
...
...
@@ -263,7 +263,7 @@
'address.areaCode': function(newVal, oldVal) {
const self = this;
$.get('/
ho
me/exchange/delivery', {
$.get('/me/exchange/delivery', {
areaCode: newVal
})
.then(result => {
...
...
public/vue/
ho
me/exchange/item.vue → public/vue/me/exchange/item.vue
View file @
69cf59e
public/vue/
ho
me/fav-brand-list.vue → public/vue/me/fav-brand-list.vue
View file @
69cf59e
...
...
@@ -59,7 +59,7 @@
this.busy = true;
$.ajax({
url: '/
ho
me/favorite/favpaging',
url: '/me/favorite/favpaging',
data: {
page: ++_this.page,
tab: 'brand'
...
...
@@ -112,7 +112,7 @@
$.ajax({
method: 'POST',
url: '/
ho
me/del-favdel',
url: '/me/del-favdel',
data: {
favId: id,
type: 'brand'
...
...
public/vue/
ho
me/fav-product-list.vue → public/vue/me/fav-product-list.vue
View file @
69cf59e
...
...
@@ -64,7 +64,7 @@
this.busy = true;
$.ajax({
url: '/
ho
me/favorite/favpaging',
url: '/me/favorite/favpaging',
data: {
page: ++_this.page
}
...
...
@@ -129,7 +129,7 @@
$.ajax({
method: 'POST',
url: '/
ho
me/del-favdel',
url: '/me/del-favdel',
data: {
favId: id,
type: 'product'
...
...
public/vue/
ho
me/mydetails.vue → public/vue/me/mydetails.vue
View file @
69cf59e
...
...
@@ -78,7 +78,7 @@
saveDetails: function(params) {
$.ajax({
method: 'POST',
url: '/
ho
me/save-mydetails',
url: '/me/save-mydetails',
data: params
}).then(result => {
if (result.code !== 200) {
...
...
@@ -93,5 +93,5 @@
</script>
<style>
@import "../../scss/
ho
me/_details.css";
@import "../../scss/me/_details.css";
</style>
...
...
public/vue/
ho
me/order-detail.vue → public/vue/me/order-detail.vue
View file @
69cf59e
...
...
@@ -76,7 +76,7 @@
methods: {
getOrderData() {
$.ajax({
url: '/
ho
me/get-order',
url: '/me/get-order',
data: {
orderCode: this.$parent.$data.orderCode
}
...
...
@@ -87,13 +87,13 @@
{
key: this.order.isSupportRefund,
val: this.order.isSupportRefund === 'Y' ? '申请退货' : '<span class="overdue">申请退货(已过期限)</span>',
url: '/
ho
me/refund?orderId=' + this.order.orderCode,
url: '/me/refund?orderId=' + this.order.orderCode,
disabled: this.order.isSupportRefund !== 'Y'
},
{
key: this.order.isSupportExchange,
val: this.order.isSupportExchange === 'Y' ? '申请换货' : '<span class="overdue">申请换货(已过期限)</span>',
url: '/
ho
me/exchange?orderId=' + this.order.orderCode,
url: '/me/exchange?orderId=' + this.order.orderCode,
disabled: this.order.isSupportExchange !== 'Y'
},
{
...
...
@@ -129,7 +129,7 @@
let that = this;
$.ajax({
url: '/
ho
me/order/cancel-reason',
url: '/me/order/cancel-reason',
}).then(result => {
if (result.data.length > 0) {
that.options = result.data;
...
...
@@ -142,7 +142,7 @@
return {
cancel(param, success, fail) {
$.ajax({
url: '/
ho
me/cancel-order',
url: '/me/cancel-order',
type: 'post',
data: param
}).then(success).fail(fail);
...
...
@@ -174,7 +174,7 @@
Modal.confirm('确认删除订单?', '', function() {
this.hide();
$.ajax({
url: '/
ho
me/delete-order',
url: '/me/delete-order',
type: 'post',
data: {
orderCode: code
...
...
@@ -192,7 +192,7 @@
},
confirmGoods(code) {
$.ajax({
url: '/
ho
me/confirm-order',
url: '/me/confirm-order',
type: 'post',
data: {
orderCode: code
...
...
@@ -211,7 +211,7 @@
yohoAPI.goPay({orderid: code});
},
seeExpress(code) {
location.href = '/
ho
me/logistic?order_code='+code;
location.href = '/me/logistic?order_code='+code;
},
/**
...
...
@@ -244,5 +244,5 @@
};
</script>
<style>
@import "../../scss/
ho
me/_order-detail.css";
@import "../../scss/me/_order-detail.css";
</style>
\ No newline at end of file
...
...
public/vue/
ho
me/order-logistic.vue → public/vue/me/order-logistic.vue
View file @
69cf59e
...
...
@@ -177,7 +177,7 @@ $border_color_light: #eee;
};
$.ajax({
url: '/
ho
me/get-order-logistic-date',
url: '/me/get-order-logistic-date',
data: data
}).then(result => {
this.logisticDate = result;
...
...
public/vue/
ho
me/order.vue → public/vue/me/order.vue
View file @
69cf59e
...
...
@@ -22,7 +22,7 @@
<p>¥ {{goods.goodsPrice}}</p>
<p>×{{goods.buyNumber}}</p>
</div>
<a href="/
ho
me/order-detail?orderCode={{order.orderCode}}"></a>
<a href="/me/order-detail?orderCode={{order.orderCode}}"></a>
</div>
</div>
<div class="order-option">
...
...
@@ -87,7 +87,7 @@
return;
}
$.ajax({
url: '/
ho
me/get-orders',
url: '/me/get-orders',
data: {
page: ++this.page,
limit: this.limit,
...
...
@@ -128,7 +128,7 @@
let that = this;
$.ajax({
url: '/
ho
me/order/cancel-reason',
url: '/me/order/cancel-reason',
}).then(result => {
if (result.data.length > 0) {
that.options = result.data;
...
...
@@ -152,7 +152,7 @@
return {
cancel(param, success, fail) {
$.ajax({
url: '/
ho
me/cancel-order',
url: '/me/cancel-order',
type: 'post',
data: param
}).then(success).fail(fail);
...
...
@@ -174,7 +174,7 @@
Modal.confirm('确认删除订单?', '', function() {
this.hide();
$.ajax({
url: '/
ho
me/delete-order',
url: '/me/delete-order',
type: 'post',
data: {
orderCode: order.orderCode
...
...
@@ -192,7 +192,7 @@
},
confirmGoods(code) {
$.ajax({
url: '/
ho
me/confirm-order',
url: '/me/confirm-order',
type: 'post',
data: {
orderCode: code
...
...
@@ -211,7 +211,7 @@
yohoAPI.goPay({orderid: code});
},
seeExpress(code) {
location.href = '/
ho
me/logistic?order_code='+code;
location.href = '/me/logistic?order_code='+code;
},
dropDown(elementId){
let dropdown = document.getElementById(elementId);
...
...
@@ -240,7 +240,7 @@ body {
height: 100%;
}
@import "../../scss/
ho
me/_order.css";
@import "../../scss/me/_order.css";
</style>
\ No newline at end of file
...
...
public/vue/
ho
me/refund-order.vue → public/vue/me/refund-order.vue
View file @
69cf59e
...
...
@@ -70,7 +70,7 @@
return;
}
$.ajax({
url: '/
ho
me/refund/get-orders',
url: '/me/refund/get-orders',
data: {
page: ++this.page,
limit: this.limit
...
...
@@ -92,7 +92,7 @@
*/
cancelApply(id, type) {
$.ajax({
url: '/
ho
me/'+(type == 2 ? 'exchange' : 'refund')+'/cancel-apply',
url: '/me/'+(type == 2 ? 'exchange' : 'refund')+'/cancel-apply',
type: 'post',
data: {
id: id
...
...
@@ -116,6 +116,6 @@
height: 100%;
}
@import "../../scss/
ho
me/_order.css";
@import "../../scss/me/_order.css";
</style>
\ No newline at end of file
...
...
public/vue/
ho
me/refund.vue → public/vue/me/refund.vue
View file @
69cf59e
...
...
@@ -91,7 +91,7 @@
},
created() {
$.ajax({
url: '/
ho
me/refund/order',
url: '/me/refund/order',
data: {
orderId: qs.orderId
}
...
...
@@ -153,7 +153,7 @@
}
$.ajax({
method: 'POST',
url: '/
ho
me/refund/submit',
url: '/me/refund/submit',
data: this.submitData
}).then(result => {
if (result.code === 200) {
...
...
public/vue/
ho
me/refund/logistics-company.vue → public/vue/me/refund/logistics-company.vue
View file @
69cf59e
public/vue/
ho
me/refund/logistics.vue → public/vue/me/refund/logistics.vue
View file @
69cf59e
...
...
@@ -43,7 +43,7 @@
$.ajax({
method: 'POST',
url: '/
ho
me/save-logistics',
url: '/me/save-logistics',
data: {
company_id: this.company_id,
company_name: this.company_name,
...
...
@@ -69,5 +69,5 @@
</script>
<style>
@import "../../../scss/
ho
me/_logistics.css";
@import "../../../scss/me/_logistics.css";
</style>
...
...
public/vue/
ho
me/refund/product.vue → public/vue/me/refund/product.vue
View file @
69cf59e
public/vue/
ho
me/return/README.MD → public/vue/me/return/README.MD
View file @
69cf59e
public/vue/
ho
me/return/item.vue → public/vue/me/return/item.vue
View file @
69cf59e
public/vue/
ho
me/return/list.vue → public/vue/me/return/list.vue
View file @
69cf59e
public/vue/
ho
me/return/reason.js → public/vue/me/return/reason.js
View file @
69cf59e
public/vue/
ho
me/return/reason.vue → public/vue/me/return/reason.vue
View file @
69cf59e
Please
register
or
login
to post a comment