diff --git a/app.js b/app.js index 366efffb1..c5e3ae43d 100644 --- a/app.js +++ b/app.js @@ -36,11 +36,11 @@ let opts = { //app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts)); -app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts)); -app.use('/app',proxy('http://api.demo.winqi.cn:8012',opts)); +//app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts)); +//app.use('/app',proxy('http://api.demo.winqi.cn:8012',opts)); -//app.use('/callComponent',proxy('http://127.0.0.1:8012',opts)); -//app.use('/app',proxy('http://127.0.0.1:8012',opts)); +app.use('/callComponent',proxy('http://192.168.1.106:8012',opts)); +app.use('/app',proxy('http://192.168.1.106:8012',opts)); //app.use('/callComponent',proxy('http://192.168.1.16:8012',opts)); //app.use('/app',proxy('http://192.168.1.16:8012',opts)); diff --git a/public/pages/admin/auditShopCommunity/auditShopCommunity.html b/public/pages/admin/auditShopCommunity/auditShopCommunity.html new file mode 100644 index 000000000..79ecbcab4 --- /dev/null +++ b/public/pages/admin/auditShopCommunity/auditShopCommunity.html @@ -0,0 +1,57 @@ +
+
+
+
+
+
店铺入驻小区
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
小区编码小区名称商铺名称入驻时间开始时间结束时间状态操作
{{shopCommunity.communityId}}{{shopCommunity.communityName}}{{shopCommunity.shopName}}{{shopCommunity.createTime}}{{shopCommunity.startTime}}{{shopCommunity.endTime}}{{shopCommunity.stateName}} +
+ +
+
+
    +
    + + +
    +
    +
    +
    + +
    \ No newline at end of file diff --git a/public/pages/admin/auditShopCommunity/auditShopCommunity.js b/public/pages/admin/auditShopCommunity/auditShopCommunity.js new file mode 100644 index 000000000..ee18f4954 --- /dev/null +++ b/public/pages/admin/auditShopCommunity/auditShopCommunity.js @@ -0,0 +1,100 @@ +/** + 审核订单 + **/ +(function (vc) { + var DEFAULT_PAGE = 1; + var DEFAULT_ROWS = 10; + vc.extends({ + data: { + auditShopCommunityInfo: { + shopCommunitys: [], + total: 0, + records: 1, + moreCondition: false, + userName: '', + currentUserId: vc.getData('/nav/getUserInfo').userId, + conditions: { + state: '12001' + }, + orderInfo: {}, + procure: false + } + }, + _initMethod: function () { + vc.component._listAuditShopCommunitys(DEFAULT_PAGE, DEFAULT_ROWS); + }, + _initEvent: function () { + + vc.on('auditShopCommunity', 'listAuditShopCommunitys', function (_param) { + vc.component._listAuditShopCommunitys(DEFAULT_PAGE, DEFAULT_ROWS); + }); + vc.on('pagination', 'page_event', function (_currentPage) { + vc.component._listAuditShopCommunitys(_currentPage, DEFAULT_ROWS); + }); + + vc.on('auditShopCommunity', 'notifyAudit', function (_auditInfo) { + vc.component._auditOrderInfo(_auditInfo); + }); + }, + methods: { + _listAuditShopCommunitys: function (_page, _rows) { + + vc.component.auditShopCommunityInfo.conditions.page = _page; + vc.component.auditShopCommunityInfo.conditions.row = _rows; + var param = { + params: vc.component.auditShopCommunityInfo.conditions + }; + + //发送get请求 + vc.http.apiGet('/shop/queryShopCommunity', + param, + function (json, res) { + var _auditShopCommunityInfo = JSON.parse(json); + vc.component.auditShopCommunityInfo.total = _auditShopCommunityInfo.total; + vc.component.auditShopCommunityInfo.records = _auditShopCommunityInfo.records; + vc.component.auditShopCommunityInfo.shopCommunitys = _auditShopCommunityInfo.data; + vc.emit('pagination', 'init', { + total: vc.component.auditShopCommunityInfo.records, + currentPage: _page + }); + }, function (errInfo, error) { + console.log('请求失败处理'); + } + ); + }, + _openAuditShopCommunityModel: function (_auditOrder) { + vc.component.auditShopCommunityInfo.orderInfo = _auditOrder; + vc.emit('audit', 'openAuditModal', {}); + }, + _queryAuditShopCommunitysMethod: function () { + vc.component._listAuditShopCommunitys(DEFAULT_PAGE, DEFAULT_ROWS); + }, + //提交审核信息 + _auditOrderInfo: function (_auditInfo) { + console.log("提交得参数：" + _auditInfo); + //发送get请求 + _auditInfo.shopId = $that.auditShopCommunityInfo.orderInfo.shopId; + _auditInfo.storeId = $that.auditShopCommunityInfo.orderInfo.storeId; + _auditInfo.scId = $that.auditShopCommunityInfo.orderInfo.scId; + vc.http.apiPost('/shop/auditShopCommunity', + JSON.stringify(_auditInfo), + { + emulateJSON: true + }, + function (json, res) { + let _json = JSON.parse(json) + if (_json.code != 0) { + vc.toast(_json.msg); + return; + } + vc.toast("处理成功"); + vc.component._listAuditShopCommunitys(DEFAULT_PAGE, DEFAULT_ROWS); + }, function (errInfo, error) { + console.log('请求失败处理'); + vc.toast("处理失败：" + errInfo); + } + ); + } + } + }); +})(window.vc); diff --git a/public/pages/admin/shopCommunity/shopCommunity.html b/public/pages/admin/shopCommunity/shopCommunity.html new file mode 100644 index 000000000..a81acb03f --- /dev/null +++ b/public/pages/admin/shopCommunity/shopCommunity.html @@ -0,0 +1,93 @@ +
    +
    +
    +
    +
    +
    查询条件
    +
    + +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + + +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    +
    +
    +
    +
    +
    小区商铺
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    小区编码小区名称商铺名称入驻时间开始时间结束时间状态
    {{shopCommunity.communityId}}{{shopCommunity.communityName}}{{shopCommunity.shopName}}{{shopCommunity.createTime}}{{shopCommunity.startTime}}{{shopCommunity.endTime}}{{shopCommunity.stateName}}
    +
      +
      + + +
      +
      +
      +
      + +
      \ No newline at end of file diff --git a/public/pages/admin/shopCommunity/shopCommunity.js b/public/pages/admin/shopCommunity/shopCommunity.js new file mode 100644 index 000000000..510299968 --- /dev/null +++ b/public/pages/admin/shopCommunity/shopCommunity.js @@ -0,0 +1,72 @@ +/** + 审核订单 + **/ +(function (vc) { + var DEFAULT_PAGE = 1; + var DEFAULT_ROWS = 10; + vc.extends({ + data: { + shopCommunityInfo: { + shopCommunitys: [], + total: 0, + records: 1, + moreCondition: false, + userName: '', + currentUserId: vc.getData('/nav/getUserInfo').userId, + conditions: { + state: '24002', + shopName:'', + communityName:'' + }, + orderInfo: {}, + procure: false + } + }, + _initMethod: function () { + vc.component._listAuditShopCommunitys(DEFAULT_PAGE, DEFAULT_ROWS); + }, + _initEvent: function () { + + vc.on('auditShopCommunity', 'listAuditShopCommunitys', function (_param) { + vc.component._listAuditShopCommunitys(DEFAULT_PAGE, DEFAULT_ROWS); + }); + vc.on('pagination', 'page_event', function (_currentPage) { + vc.component._listAuditShopCommunitys(_currentPage, DEFAULT_ROWS); + }); + + vc.on('auditShopCommunity', 'notifyAudit', function (_auditInfo) { + vc.component._auditOrderInfo(_auditInfo); + }); + }, + methods: { + _listAuditShopCommunitys: function (_page, _rows) { + + vc.component.shopCommunityInfo.conditions.page = _page; + vc.component.shopCommunityInfo.conditions.row = _rows; + var param = { + params: vc.component.shopCommunityInfo.conditions + }; + + //发送get请求 + vc.http.apiGet('/shop/queryShopCommunity', + param, + function (json, res) { + var _shopCommunityInfo = JSON.parse(json); + vc.component.shopCommunityInfo.total = _shopCommunityInfo.total; + vc.component.shopCommunityInfo.records = _shopCommunityInfo.records; + vc.component.shopCommunityInfo.shopCommunitys = _shopCommunityInfo.data; + vc.emit('pagination', 'init', { + total: vc.component.shopCommunityInfo.records, + currentPage: _page + }); + }, function (errInfo, error) { + console.log('请求失败处理'); + } + ); + }, + _queryAuditShopCommunitysMethod: function () { + vc.component._listAuditShopCommunitys(DEFAULT_PAGE, DEFAULT_ROWS); + }, + } + }); +})(window.vc); diff --git a/public/pages/property/listStoreManage/listStoreManage.html b/public/pages/property/listStoreManage/listStoreManage.html index 3623e09f0..f17b36b56 100644 --- a/public/pages/property/listStoreManage/listStoreManage.html +++ b/public/pages/property/listStoreManage/listStoreManage.html @@ -23,7 +23,7 @@