Commit c52f7474 by 陈宁

# 请求资源 页面绘制

parent 8a9c533c
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
<!-- production --> <!-- production -->
<!-- <host><![CDATA[http://10.52.16.40]]></host> --> <!-- <host><![CDATA[http://10.52.16.40]]></host> -->
<!-- testing --> <!-- testing -->
<host>http://10.52.16.40</host> <host></host>
<!--<host><![CDATA[http://118.89.99.95:7799]]></host> --> <!--<host><![CDATA[http://118.89.99.95:7799]]></host> -->
<resources> <resources>
<resource id="getDateType" uri="/Menu/GetDateType?date={0}" memo="判断是否节假日" /> <resource id="getDateType" uri="/Menu/GetDateType?date={0}" memo="判断是否节假日" />
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
<!-- production --> <!-- production -->
<!-- <host><![CDATA[http://10.52.16.40]]></host> --> <!-- <host><![CDATA[http://10.52.16.40]]></host> -->
<!-- testing --> <!-- testing -->
<host>http://10.52.16.40</host> <host></host>
<!--<host><![CDATA[http://118.89.99.95:7799]]></host> --> <!--<host><![CDATA[http://118.89.99.95:7799]]></host> -->
<resources> <resources>
<resource id="queryByShop" uri="/Query/Stock/ListByShop?shopId={0}" memo="查询门店所有商品库存" /> <resource id="queryByShop" uri="/Query/Stock/ListByShop?shopId={0}" memo="查询门店所有商品库存" />
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
</global> </global>
<global name="FreemudStore"> <global name="FreemudStore">
<!-- Testing --> <!-- Testing -->
<host>http://10.54.2.115</host> <host></host>
<!-- Production --> <!-- Production -->
<!-- <host><![CDATA[http://10.52.16.31]]></host> --> <!-- <host><![CDATA[http://10.52.16.31]]></host> -->
<resources> <resources>
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
</global> </global>
<global name="Organization"> <global name="Organization">
<!-- Testing --> <!-- Testing -->
<host>http://10.54.2.115/api/v2</host> <host></host>
<!-- Production --> <!-- Production -->
<!-- <host><![CDATA[http://10.52.16.31/api/v2]]></host> --> <!-- <host><![CDATA[http://10.52.16.31/api/v2]]></host> -->
<resources> <resources>
...@@ -233,7 +233,7 @@ ...@@ -233,7 +233,7 @@
<!-- Production --> <!-- Production -->
<!-- <host><![CDATA[http://10.10.3.130]]></host> --> <!-- <host><![CDATA[http://10.10.3.130]]></host> -->
<!-- 券码的测试环境 new coupon--> <!-- 券码的测试环境 new coupon-->
<host>http://10.53.10.10:12666</host> <host></host>
<!-- 券码的测试环境 old coupon --> <!-- 券码的测试环境 old coupon -->
<!-- <host><![CDATA[http://10.53.10.10:7878]]></host> --> <!-- <host><![CDATA[http://10.53.10.10:7878]]></host> -->
<resources> <resources>
......
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
<!-- production --> <!-- production -->
<!-- <host><![CDATA[http://10.52.16.40]]></host> --> <!-- <host><![CDATA[http://10.52.16.40]]></host> -->
<!-- testing --> <!-- testing -->
<host>http://10.52.16.40</host> <host></host>
<!--<host><![CDATA[http://118.89.99.95:7799]]></host> --> <!--<host><![CDATA[http://118.89.99.95:7799]]></host> -->
<resources> <resources>
<resource id="getDateType" uri="/Menu/GetDateType?date={0}" memo="判断是否节假日" /> <resource id="getDateType" uri="/Menu/GetDateType?date={0}" memo="判断是否节假日" />
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
<!-- production --> <!-- production -->
<!-- <host><![CDATA[http://10.52.16.40]]></host> --> <!-- <host><![CDATA[http://10.52.16.40]]></host> -->
<!-- testing --> <!-- testing -->
<host>http://10.52.16.40</host> <host></host>
<!--<host><![CDATA[http://118.89.99.95:7799]]></host> --> <!--<host><![CDATA[http://118.89.99.95:7799]]></host> -->
<resources> <resources>
<resource id="queryByShop" uri="/Query/Stock/ListByShop?shopId={0}" memo="查询门店所有商品库存" /> <resource id="queryByShop" uri="/Query/Stock/ListByShop?shopId={0}" memo="查询门店所有商品库存" />
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
</global> </global>
<global name="FreemudStore"> <global name="FreemudStore">
<!-- Testing --> <!-- Testing -->
<host>http://10.54.2.115</host> <host></host>
<!-- Production --> <!-- Production -->
<!-- <host><![CDATA[http://10.52.16.31]]></host> --> <!-- <host><![CDATA[http://10.52.16.31]]></host> -->
<resources> <resources>
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
</global> </global>
<global name="Organization"> <global name="Organization">
<!-- Testing --> <!-- Testing -->
<host>http://10.54.2.115/api/v2</host> <host></host>
<!-- Production --> <!-- Production -->
<!-- <host><![CDATA[http://10.52.16.31/api/v2]]></host> --> <!-- <host><![CDATA[http://10.52.16.31/api/v2]]></host> -->
<resources> <resources>
...@@ -233,7 +233,7 @@ ...@@ -233,7 +233,7 @@
<!-- Production --> <!-- Production -->
<!-- <host><![CDATA[http://10.10.3.130]]></host> --> <!-- <host><![CDATA[http://10.10.3.130]]></host> -->
<!-- 券码的测试环境 new coupon--> <!-- 券码的测试环境 new coupon-->
<host>http://10.53.10.10:12666</host> <host></host>
<!-- 券码的测试环境 old coupon --> <!-- 券码的测试环境 old coupon -->
<!-- <host><![CDATA[http://10.53.10.10:7878]]></host> --> <!-- <host><![CDATA[http://10.53.10.10:7878]]></host> -->
<resources> <resources>
......
...@@ -5,7 +5,14 @@ import Home from '../views/Home.vue' ...@@ -5,7 +5,14 @@ import Home from '../views/Home.vue'
import Dashboard from '../views/Dashboard.vue' import Dashboard from '../views/Dashboard.vue'
import EnvironmentConfigure from '../views/EnvironmentConfigure.vue' import EnvironmentConfigure from '../views/EnvironmentConfigure.vue'
import BeLogging from '../views/BeLogging.vue' import BeLogging from '../views/BeLogging.vue'
import CouponFunc from '../views/CouponFunc.vue' import RequestResource from '../views/requestresource/RequestResource.vue'
import CanDaoStoreSearch from '../views/requestresource/CanDaoStoreSearch.vue'
import CouponFreeze from '../views/requestresource/CouponFreeze.vue'
import CouponProductSearch from '../views/requestresource/CouponProductSearch.vue'
import OrderSearch from '../views/requestresource/OrderSearch.vue'
import ProductExtensionSearch from '../views/requestresource/ProductExtensionSearch.vue'
import ProductSearch from '../views/requestresource/ProductSearch.vue'
import UserCoupons from '../views/requestresource/UserCoupons.vue'
Vue.use(VueRouter) Vue.use(VueRouter)
...@@ -19,7 +26,20 @@ const routes = [ ...@@ -19,7 +26,20 @@ const routes = [
children: [ children: [
{ path: '/dashboard', component: Dashboard }, { path: '/dashboard', component: Dashboard },
{ path: '/environment-configure', component: EnvironmentConfigure }, { path: '/environment-configure', component: EnvironmentConfigure },
{ path: '/coupon-func', component: CouponFunc }, {
path: '/request-resource',
component: RequestResource,
redirect: '/request-resource/coupon-product',
children: [
{ path: 'candao-store', component: CanDaoStoreSearch },
{ path: 'coupon-freeze', component: CouponFreeze },
{ path: 'coupon-product', component: CouponProductSearch },
{ path: 'order', component: OrderSearch },
{ path: 'product-exentsion', component: ProductExtensionSearch },
{ path: 'product', component: ProductSearch },
{ path: 'user-coupons', component: UserCoupons }
]
},
{ path: '/be-logging', component: BeLogging } { path: '/be-logging', component: BeLogging }
] ]
} }
......
...@@ -13,9 +13,16 @@ ...@@ -13,9 +13,16 @@
<b>券码服务</b> 需要环境保持一致, 否则数据查询会对不上 <b>券码服务</b> 需要环境保持一致, 否则数据查询会对不上
</p> </p>
<p> <p>
<b>2)</b> 设置 <b>默认门店</b> / <b>测试门店</b> 时, 需要注意 <b>2)</b> 设置
<b>默认门店</b> /
<b>测试门店</b> 时, 需要注意
<b>启用开关是否开启</b>, 否则只修改默认门店会不起作用 <b>启用开关是否开启</b>, 否则只修改默认门店会不起作用
</p> </p>
<p>
<b>3)</b> 设置
<b>默认门店</b> 用作商品选择首页菜单的商品列表;
<b>测试门店</b> 用作下单的订单门店
</p>
</Alert> </Alert>
<Row :gutter="10"> <Row :gutter="10">
<Col span="8"> <Col span="8">
......
...@@ -18,13 +18,13 @@ ...@@ -18,13 +18,13 @@
<Icon type="logo-xbox" />首页 <Icon type="logo-xbox" />首页
</MenuItem> </MenuItem>
<MenuItem name="/environment-configure" to="/environment-configure"> <MenuItem name="/environment-configure" to="/environment-configure">
<Icon type="md-options" />环境切换 <Icon type="md-construct" />环境切换
</MenuItem> </MenuItem>
<MenuItem name="/coupon-func" to="/coupon-func"> <MenuItem name="/request-resource" to="/request-resource">
<Icon type="md-options" />券码功能 <Icon type="md-planet" />请求资源
</MenuItem> </MenuItem>
<MenuItem name="/be-logging" to="/be-logging"> <MenuItem name="/be-logging" to="/be-logging">
<Icon type="md-options" />日志查询 <Icon type="md-list-box" />日志查询
</MenuItem> </MenuItem>
</Menu> </Menu>
</Sider> </Sider>
......
<template> <template>
<div> <div>
<h1>券码功能</h1> <h1>can-dao store search</h1>
</div> </div>
</template> </template>
<template>
<div>
<h1>coupon-freeze</h1>
</div>
</template>
<template>
<div>
<h3>码券对应商品信息</h3>
<Form :label-width="80">
<Row>
<Col span="8">
<FormItem label="券号">
<Input></Input>
</FormItem>
</Col>
<Col span="8">
<FormItem label="门店号">
<Input></Input>
</FormItem>
</Col>
<Col span="8">
<FormItem label="渠道">
<Select>
<Option value="deliver">
<Icon type="md-bicycle" />
<span>麦乐送</span>
</Option>
<Option value="mcoffee">
<Icon type="md-cafe" />
<span>麦咖啡</span>
</Option>
<Option value="kiosk">
<Icon type="md-ice-cream" />
<span>甜品站</span>
</Option>
</Select>
</FormItem>
</Col>
<Col span="8">
<FormItem label="环境">
<Select>
<Option value="prod">正式环境</Option>
<Option value="dev">测试环境</Option>
</Select>
</FormItem>
</Col>
<Col span="8">
<FormItem>
<Button type="primary" icon="ios-search">查 询</Button>
</FormItem>
</Col>
</Row>
</Form>
</div>
</template>
<template>
<div>
<h1>order-search</h1>
</div>
</template>
<template>
<div>
<h1>product-extension-search</h1>
</div>
</template>
<template>
<div>
<h1>product-search</h1>
</div>
</template>
<template>
<div>
<h1>请求资源</h1>
<div class="request-resource">
<div class="request-resource-menu">
<Menu :accordion="true">
<Submenu name="1">
<template slot="title">
<Icon type="ios-paper" />券码相关
</template>
<MenuItem name="1-1" to="/request-resource/coupon-product">
<Icon type="md-cube" />码券对应商品信息
</MenuItem>
<MenuItem name="1-2" to="/request-resource/user-coupons">
<Icon type="md-cube" />用户券数据
</MenuItem>
<MenuItem name="1-3" to="/request-resource/coupon-freeze">
<Icon type="md-cube" />激活&冻结
</MenuItem>
</Submenu>
<Submenu name="2">
<template slot="title">
<Icon type="ios-people" />门店相关
</template>
<MenuItem name="2-1" to="/request-resource/candao-store">
<Icon type="md-cube" />餐道经纬度查询门店
</MenuItem>
</Submenu>
<Submenu name="3">
<template slot="title">
<Icon type="ios-people" />商品相关
</template>
<MenuItem name="3-5" to="/request-resource/product">
<Icon type="md-cube" />商品信息查询
</MenuItem>
<MenuItem name="3-6" to="/request-resource/product-exentsion">
<Icon type="md-cube" />商品扩展信息
</MenuItem>
</Submenu>
<Submenu name="4">
<template slot="title">
<Icon type="ios-people" />订单相关
</template>
<MenuItem name="4-1" to="/request-resource/order">
<Icon type="md-cube" />根据订单编号查询订单
</MenuItem>
</Submenu>
</Menu>
</div>
<div class="request-resource-content">
<router-view></router-view>
</div>
</div>
</div>
</template>
<script>
export default {
}
</script>
<style lang="less" scoped>
.request-resource {
display: flex;
.request-resource-menu {
flex: 0 0 240px;
}
.request-resource-content {
flex: 1;
padding: 0 5px;
height: 50px;
.ivu-form-item {
margin-bottom: 10px;
}
}
}
</style>
<template>
<div>
<h1>user-coupons</h1>
</div>
</template>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment