fe / yohobuy-shop-fe2 · Commits

Go to a project

Authored by xuhongyun
Commit e5b53d56a5780b4333b9cf88be7d3e29cd1a8e54 1 parent 86152aa6

build

Inline Side-by-side
Showing 8 changed files with 34 additions and 34 deletions
... ... @@ -268,7 +268,7 @@ webpackJsonp([13],[
function findDecoration(){
common.util.__ajax(
{
url:'/shop/ShopsDecoratorRest/findShopsDecoratorDetail',
url:'/shops-proxy/ShopsDecoratorRest/findShopsDecoratorDetail',
data: {
"shopsId": shopsId,
"platformType": 2
... ... @@ -322,7 +322,7 @@ webpackJsonp([13],[
//Ajax查询店铺下销售类目
function findShopCategory() {
common.util.__ajax({
url:'/shops/shopCategory/categoryList',
url:'/shops-proxy/shopCategory/categoryList',
data: {
shopId: jsonMain.shopsId
}
... ... @@ -336,7 +336,7 @@ webpackJsonp([13],[
//Ajax最新上架商品
function findTopNewProducts(){
common.util.__ajax({
url:'/shop/ShopsDecoratorRest/findNewProductList',
url:'/shops-proxy/ShopsDecoratorRest/findNewProductList',
data: {
"shopsId": jsonMain.shopsId,
"size": 20
... ... @@ -350,7 +350,7 @@ webpackJsonp([13],[
//Ajax热销商品
function findTopHotProducts(){
common.util.__ajax({
url:'/shop/ShopsDecoratorRest/findHotProductList',
url:'/shops-proxy/ShopsDecoratorRest/findHotProductList',
data: {
"shopsId": jsonMain.shopsId,
"size": 20
... ... @@ -364,7 +364,7 @@ webpackJsonp([13],[
//Ajax热销商品---APP
function findTopHotProducts_APP(){
common.util.__ajax({
url:'/shop/ShopsDecoratorRest/findHotProductList',
url:'/shops-proxy/ShopsDecoratorRest/findHotProductList',
data: {
"shopsId": jsonMain.shopsId,
"size": 20
... ... @@ -379,7 +379,7 @@ webpackJsonp([13],[
function saveDecoration(submitStatus){
console.log(jsonMain);
common.util.__ajax({
url:'/shop/sellerDecoratorRest/saveShopsDecorator',
url:'/shops-proxy/sellerDecoratorRest/saveShopsDecorator',
data: {
"submitStatus": submitStatus,
"shopsId": jsonMain.shopsId,
... ... @@ -1583,7 +1583,7 @@ webpackJsonp([13],[
common.util.__tip("请输入正确的 SKN", "warning");
return;
}
$.post('/shop/ShopsDecoratorRest/findProductBySKN',{ productSkn: skn, shopsId: shopsId }, function (resp) {
$.post('/shops-proxy/ShopsDecoratorRest/findProductBySKN',{ productSkn: skn, shopsId: shopsId }, function (resp) {
if (resp.code != 200) {
common.util.__tip(resp.message, "warning");
return;
... ...
... ... @@ -90,9 +90,9 @@ webpackJsonp([14],[
var HtmArr = [];
if(+item.checkStatus == 200){
HtmArr.push('<a href="/supplier/shop/decorationDetail/'+item.shopsId+'/'+item.shopsType+'/view/'+item.id+'/" class="btn btn-info btn-xs">装修查看</a>');
HtmArr.push('<a href="/shops-proxy/shop/decorationDetail/'+item.shopsId+'/'+item.shopsType+'/view/'+item.id+'/" class="btn btn-info btn-xs">装修查看</a>');
}else {
HtmArr.push('<a href="/supplier/shop/decorationDetail/'+item.shopsId+'/'+item.shopsType+'/editor/'+item.id+'/" class="btn btn-success btn-xs">装修编辑</a>');
HtmArr.push('<a href="/shops-proxy/shop/decorationDetail/'+item.shopsId+'/'+item.shopsType+'/editor/'+item.id+'/" class="btn btn-success btn-xs">装修编辑</a>');
}
if(item.passStatus && +item.passStatus == 1){
... ...
... ... @@ -147,7 +147,7 @@ webpackJsonp([18],{
// 异步查询查询商品分类列表
getShopCategoryList: function() {
common.util.__ajax({
url: '/shops/shopCategory/categoryList',
url: '/shops-proxy/shopCategory/categoryList',
data: {
shopId: Bll.shopId
},
... ... @@ -162,7 +162,7 @@ webpackJsonp([18],{
// 查询模板列表
getTemplates: function() {
common.util.__ajax({
url: '/shop/ModularDecoratorRest/findDecoratorTemplates',
url: '/shops-proxy/ModularDecoratorRest/findDecoratorTemplates',
data: {
shopId: Bll.shopId,
platform: +t.active ? 0 : 1,
... ... @@ -205,7 +205,7 @@ webpackJsonp([18],{
var templateId = $(curTemplate).data('id');
common.util.__ajax({
url: '/shop/ModularDecoratorRest/queryTemplateResource',
url: '/shops-proxy/ModularDecoratorRest/queryTemplateResource',
data: {
templateId: templateId
},
... ... @@ -1885,7 +1885,7 @@ webpackJsonp([18],{
}
common.util.__ajax({
url: '/shop/sellerDecoratorRest/saveDecoratorTemplate',
url: '/shops-proxy/sellerDecoratorRest/saveDecoratorTemplate',
data: {
shopId: Bll.shopId,
platform: +t.active ? 0 : 1,
... ... @@ -1988,7 +1988,7 @@ webpackJsonp([18],{
});
common.util.__ajax({
url: "/shop/sellerDecoratorRest/updateDecoratorTemplate",
url: "/shops-proxy/sellerDecoratorRest/updateDecoratorTemplate",
data: {
templateId: templateId,
shopId: Bll.shopId,
... ... @@ -2020,7 +2020,7 @@ webpackJsonp([18],{
}
common.util.__ajax({
url: "/shop/ModularDecoratorRest/publishDecoratorTemplate",
url: "/shops-proxy/ModularDecoratorRest/publishDecoratorTemplate",
data: {
templateId: templateId
}
... ... @@ -2230,7 +2230,7 @@ webpackJsonp([18],{
common.dialog.confirm("温馨提示", "确认删除装修模板[" + templateName + "]？模板删除，装修数据会同时删除，且不可恢复!", function() {
common.util.__ajax({
url: '/shop/ModularDecoratorRest/deleteDecoratorTemplate',
url: '/shops-proxy/ModularDecoratorRest/deleteDecoratorTemplate',
data: {
templateId: templateId,
platformType: 2
... ... @@ -2655,7 +2655,7 @@ webpackJsonp([18],{
var result = true;
common.util.__ajax({
url: '/shop/ShopsDecoratorRest/findProductBySKN',
url: '/shops-proxy/ShopsDecoratorRest/findProductBySKN',
data: {
productSkn: skn,
shopsId: _self.option.shopId
... ...
... ... @@ -99,7 +99,7 @@ webpackJsonp([19],[
var HtmArr = [];
HtmArr.push('<div>');
var uri = '/shop/decorator/modulartool?shopId=' + item.shopId;
var uri = '/shops-proxy/decorator/modulartool?shopId=' + item.shopId;
uri += '&shopName=' + encodeURIComponent(item.shopName);
uri += '&appType=' + (+t.active ? 1 : 0);
HtmArr.push('<a href="' + uri + '" target="_blank" class="btn btn-primary btn-xs">APP装修</a>');
... ... @@ -123,7 +123,7 @@ webpackJsonp([19],[
$('#filter-btn').on('click', function () {
g.reload(1);
});
g.init('/shop/ModularDecoratorRest/findShopsDecorator');
g.init('/shops-proxy/ModularDecoratorRest/findShopsDecorator');
$(document).on('mouseover', '.hover-me', function() {
$(this).parent().find('.brand-tips').show();
... ...
... ... @@ -7,25 +7,25 @@ module.exports = function(app) {
});
// 店铺装修工具
app.get("/shop/decorator/modulartool", "shop.modular.Decorator");
app.get("/shops-proxy/decorator/modulartool", "shop.modular.Decorator");
//店铺列表
app.post("/shop/ModularDecoratorRest/findShopsDecorator","modularDecorator_findShopDecorator");
app.post("/shops-proxy/ModularDecoratorRest/findShopsDecorator","modularDecorator_findShopDecorator");
// 存储装修模板
app.post("/shop/ModularDecoratorRest/saveDecoratorTemplate", "modularDecorator_saveDecoratorTemplate");
// 查询店铺装修模板列表
app.post("/shop/ModularDecoratorRest/findDecoratorTemplates", "modularDecorator_findShopDecoratorTemplates");
app.post("/shops-proxy/ModularDecoratorRest/findDecoratorTemplates", "modularDecorator_findShopDecoratorTemplates");
// 查询装修模板内容
app.post("/shop/ModularDecoratorRest/queryTemplateResource", "modularDecorator_queryDecoratorTemplateResource");
app.post("/shops-proxy/ModularDecoratorRest/queryTemplateResource", "modularDecorator_queryDecoratorTemplateResource");
// 删除装修模板
app.post("/shop/ModularDecoratorRest/deleteDecoratorTemplate", "modularDecorator_deleteDecoratorTemplate");
app.post("/shops-proxy/ModularDecoratorRest/deleteDecoratorTemplate", "modularDecorator_deleteDecoratorTemplate");
// 发布装修模板
app.post("/shop/ModularDecoratorRest/publishDecoratorTemplate", "modularDecorator_publishDecoratorTemplate");
app.post("/shops-proxy/ModularDecoratorRest/publishDecoratorTemplate", "modularDecorator_publishDecoratorTemplate");
// 更新装修模板
app.post("/shop/ModularDecoratorRest/updateDecoratorTemplate", "modularDecorator_updateDecoratorTemplate");
... ...
module.exports = function(app) {
// 存储装修模板
app.post("/shop/sellerDecoratorRest/saveDecoratorTemplate", "sellerDecorator_saveDecoratorTemplate");
app.post("/shops-proxy/sellerDecoratorRest/saveDecoratorTemplate", "sellerDecorator_saveDecoratorTemplate");
// 更新装修模板
app.post("/shop/sellerDecoratorRest/updateDecoratorTemplate", "sellerDecorator_updateDecoratorTemplate");
app.post("/shops-proxy/sellerDecoratorRest/updateDecoratorTemplate", "sellerDecorator_updateDecoratorTemplate");
//店铺装修保存
app.post("/shop/sellerDecoratorRest/saveShopsDecorator","sellerDecorator_saveShopsDecorator");
app.post("/shops-proxy/sellerDecoratorRest/saveShopsDecorator","sellerDecorator_saveShopsDecorator");
}
... ...
... ... @@ -8,24 +8,24 @@ module.exports = function (app) {
};
});
app.get("/supplier/shop/decorationDetail/:shopsId/:shopType/:shopsType/:id/","shop.Decoration");
app.get("/shops-proxy/shop/decorationDetail/:shopsId/:shopType/:shopsType/:id/","shop.Decoration");
//店铺列表
app.post("/shop/ShopsDecoratorRest/findShopsDecorator","shop_findBusinessShopsDecorator");
//店铺装修详情
app.post("/shop/ShopsDecoratorRest/findShopsDecoratorDetail","shop_findShopsDecoratorDetail");
app.post("/shops-proxy/ShopsDecoratorRest/findShopsDecoratorDetail","shop_findShopsDecoratorDetail");
//店铺装修保存
app.post("/shop/ShopsDecoratorRest/saveShopsDecorator","shop_saveShopsDecorator");
//热销
app.post("/shop/ShopsDecoratorRest/findHotProductList","shop_findHotProductList");
app.post("/shops-proxy/ShopsDecoratorRest/findHotProductList","shop_findHotProductList");
//最新
app.post("/shop/ShopsDecoratorRest/findNewProductList","shop_findNewProductList");
app.post("/shops-proxy/ShopsDecoratorRest/findNewProductList","shop_findNewProductList");
// 根据 SKN 查询商品
app.post("/shop/ShopsDecoratorRest/findProductBySKN","shop_findProductBySKN");
app.post("/shops-proxy/ShopsDecoratorRest/findProductBySKN","shop_findProductBySKN");
}
... ...
... ... @@ -26,7 +26,7 @@ module.exports = function (app){
app.post("/shops/shopCategory/list","shopCategory_shopsCategoryList");
//店铺商品分类列表，仅用于装修页面，下拉选择商品分类的场景
app.post("/shops/shopCategory/categoryList", "shopCategory_selectCategoryList");
app.post("/shops-proxy/shopCategory/categoryList", "shopCategory_selectCategoryList");
//新增店铺销售类目
app.post("/shops/shopCategory/add","shopCategory_insertShopsAndLinkCategory");
... ...