mirror of
https://gitee.com/java110/MicroCommunityWeb.git
synced 2026-02-24 05:46:03 +08:00
Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunityWeb
This commit is contained in:
commit
f13d232ef3
@ -0,0 +1,28 @@
|
||||
<div class="modal fade" id="shopCommunityWithdrawModel" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
|
||||
<div class="modal-dialog" role="document">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title" id="exampleModalLabel">请确认您的操作!</h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
|
||||
<div class="form-group row">
|
||||
<label class="col-sm-3 col-form-label">撤回说明</label>
|
||||
<div class="col-sm-9">
|
||||
<textarea v-model="shopCommunityWithdrawInfo.remark" rows="3" cols="4" placeholder="必填,请填写撤回意见"
|
||||
class="form-control" style="font-size:14px;" >
|
||||
</textarea>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary" data-dismiss="modal" v-on:click="closeShopCommunityWithdrawModel()">点错了</button>
|
||||
<button type="button" class="btn btn-primary" v-on:click="updateShopCommunityWithdraw()">确认撤回</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -0,0 +1,51 @@
|
||||
(function(vc,vm){
|
||||
|
||||
vc.extends({
|
||||
data:{
|
||||
shopCommunityWithdrawInfo:{
|
||||
|
||||
}
|
||||
},
|
||||
_initMethod:function(){
|
||||
|
||||
},
|
||||
_initEvent:function(){
|
||||
vc.on('shopCommunityWithdraw','shopCommunityWithdrawModel',function(_params){
|
||||
vc.component.shopCommunityWithdrawInfo = _params;
|
||||
$('#shopCommunityWithdrawModel').modal('show');
|
||||
|
||||
});
|
||||
},
|
||||
methods:{
|
||||
//提交撤回信息
|
||||
updateShopCommunityWithdraw:function(){
|
||||
vc.component.shopCommunityWithdrawInfo.state = '12001';
|
||||
console.log(vc.component.shopCommunityWithdrawInfo);
|
||||
//发送get请求
|
||||
vc.http.apiPost('/shop/auditShopCommunity',
|
||||
JSON.stringify(vc.component.shopCommunityWithdrawInfo),
|
||||
{
|
||||
emulateJSON: true
|
||||
},
|
||||
function (json, res) {
|
||||
let _json = JSON.parse(json)
|
||||
if (_json.code != 0) {
|
||||
vc.toast(_json.msg);
|
||||
return;
|
||||
}
|
||||
vc.toast("处理成功");
|
||||
$('#shopCommunityWithdrawModel').modal('hide');
|
||||
vc.emit('auditShopCommunity', 'listAuditShopCommunitys',{});
|
||||
}, function (errInfo, error) {
|
||||
console.log('请求失败处理');
|
||||
vc.toast("处理失败:" + errInfo);
|
||||
}
|
||||
);
|
||||
},
|
||||
closeShopCommunityWithdrawModel:function(){
|
||||
$('#shopCommunityWithdrawModel').modal('hide');
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
})(window.vc,window.vc.component);
|
||||
26
public/components/common/shopWithdraw/shopWithdraw.html
Normal file
26
public/components/common/shopWithdraw/shopWithdraw.html
Normal file
@ -0,0 +1,26 @@
|
||||
<div class="modal fade" id="shopWithdrawModel" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
|
||||
<div class="modal-dialog" role="document">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title" id="exampleModalLabel">请确认您的操作!</h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="form-group row">
|
||||
<label class="col-sm-3 col-form-label">撤回说明</label>
|
||||
<div class="col-sm-9">
|
||||
<textarea v-model="shopWithdrawInfo.remark" rows="3" cols="4" placeholder="必填,请填写撤回意见"
|
||||
class="form-control" style="font-size:14px;" >
|
||||
</textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary" data-dismiss="modal" v-on:click="closeShopWithdrawModel()">点错了</button>
|
||||
<button type="button" class="btn btn-primary" v-on:click="updateShopWithdraw()">确认撤回</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
51
public/components/common/shopWithdraw/shopWithdraw.js
Normal file
51
public/components/common/shopWithdraw/shopWithdraw.js
Normal file
@ -0,0 +1,51 @@
|
||||
(function(vc,vm){
|
||||
|
||||
vc.extends({
|
||||
data:{
|
||||
shopWithdrawInfo:{
|
||||
|
||||
}
|
||||
},
|
||||
_initMethod:function(){
|
||||
|
||||
},
|
||||
_initEvent:function(){
|
||||
vc.on('shopWithdraw','shopWithdrawModel',function(_params){
|
||||
vc.component.shopWithdrawInfo = _params;
|
||||
$('#shopWithdrawModel').modal('show');
|
||||
|
||||
});
|
||||
},
|
||||
methods:{
|
||||
//提交撤回信息
|
||||
updateShopWithdraw:function(){
|
||||
vc.component.shopWithdrawInfo.state = '001';
|
||||
console.log(vc.component.shopWithdrawInfo);
|
||||
//发送get请求
|
||||
vc.http.apiPost('/shop/auditShop',
|
||||
JSON.stringify(vc.component.shopWithdrawInfo),
|
||||
{
|
||||
emulateJSON: true
|
||||
},
|
||||
function (json, res) {
|
||||
let _json = JSON.parse(json)
|
||||
if (_json.code != 0) {
|
||||
vc.toast(_json.msg);
|
||||
return;
|
||||
}
|
||||
vc.toast("处理成功");
|
||||
$('#shopWithdrawModel').modal('hide');
|
||||
vc.emit('shop', 'shopManage',{});
|
||||
}, function (errInfo, error) {
|
||||
console.log('请求失败处理');
|
||||
vc.toast("处理失败:" + errInfo);
|
||||
}
|
||||
);
|
||||
},
|
||||
closeShopWithdrawModel:function(){
|
||||
$('#shopWithdrawModel').modal('hide');
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
})(window.vc,window.vc.component);
|
||||
@ -34,7 +34,9 @@
|
||||
<option selected disabled value="">必填,请选择投放位置</option>
|
||||
<option value="1000">小区内设备</option>
|
||||
<option value="2000">业主首页</option>
|
||||
<option value="3000">商城首页</option>
|
||||
<option value="3000">商圈首页</option>
|
||||
<option value="5000">家政首页</option>
|
||||
<option value="6000">便民首页</option>
|
||||
<option value="4000">员工首页</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
@ -35,7 +35,9 @@
|
||||
<option selected disabled value="">必填,请选择投放位置</option>
|
||||
<option value="1000">小区内设备</option>
|
||||
<option value="2000">业主首页</option>
|
||||
<option value="3000">商城首页</option>
|
||||
<option value="3000">商圈首页</option>
|
||||
<option value="5000">家政首页</option>
|
||||
<option value="6000">便民首页</option>
|
||||
<option value="4000">员工首页</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
@ -62,6 +62,7 @@
|
||||
<th class="text-center">开始时间</th>
|
||||
<th class="text-center">结束时间</th>
|
||||
<th class="text-center">状态</th>
|
||||
<th class="text-center">操作</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -73,6 +74,13 @@
|
||||
<td class="text-center">{{shopCommunity.startTime}}</td>
|
||||
<td class="text-center">{{shopCommunity.endTime}}</td>
|
||||
<td class="text-center">{{shopCommunity.stateName}}</td>
|
||||
<td class="text-center">
|
||||
<div class="btn-group">
|
||||
<button class="btn-white btn btn-xs"
|
||||
v-on:click="_openShopCommunityWithdrawModel(shopCommunity)">撤回
|
||||
</button>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
<tfoot>
|
||||
@ -90,4 +98,5 @@
|
||||
</div>
|
||||
</div>
|
||||
<vc:create path="common/audit" callBackListener="auditShopCommunity" callBackFunction="notifyAudit"></vc:create>
|
||||
<vc:create path="common/shopCommunityWithdraw"></vc:create>
|
||||
</div>
|
||||
@ -64,6 +64,9 @@
|
||||
}
|
||||
);
|
||||
},
|
||||
_openShopCommunityWithdrawModel: function(_shopCommunity){
|
||||
vc.emit('shopCommunityWithdraw','shopCommunityWithdrawModel', _shopCommunity);
|
||||
},
|
||||
_queryAuditShopCommunitysMethod: function () {
|
||||
vc.component._listAuditShopCommunitys(DEFAULT_PAGE, DEFAULT_ROWS);
|
||||
},
|
||||
|
||||
@ -66,7 +66,7 @@
|
||||
<th class="text-center">联系电话</th>
|
||||
<th class="text-center">店铺状态</th>
|
||||
<th class="text-center">创建时间</th>
|
||||
<!-- <th class="text-center">操作</th> -->
|
||||
<th class="text-center">操作</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -83,13 +83,13 @@
|
||||
<td class="text-center">{{shop.stateName}}</td>
|
||||
<td class="text-center">{{shop.createTime}}</td>
|
||||
|
||||
<!-- <td class="text-center">
|
||||
<td class="text-center">
|
||||
<div class="btn-group">
|
||||
<button class="btn-white btn btn-xs"
|
||||
v-on:click="_openDetailPurchaseApplyModel(auditOrder)">查看
|
||||
v-on:click="_openShopWithdrawModel(shop)">撤回
|
||||
</button>
|
||||
</div>
|
||||
</td>-->
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
<tfoot>
|
||||
@ -106,5 +106,5 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<vc:create path="common/shopWithdraw"></vc:create>
|
||||
</div>
|
||||
@ -29,6 +29,9 @@
|
||||
vc.on('pagination', 'page_event', function (_currentPage) {
|
||||
vc.component._listShops(_currentPage, DEFAULT_ROWS);
|
||||
});
|
||||
vc.on('shop', 'shopManage', function () {
|
||||
vc.component._listShops(DEFAULT_PAGE,DEFAULT_ROWS);
|
||||
});
|
||||
},
|
||||
methods: {
|
||||
_listShops: function (_page, _rows) {
|
||||
@ -58,6 +61,9 @@
|
||||
_queryOrdersMethod: function () {
|
||||
vc.component._listShops(DEFAULT_PAGE, DEFAULT_ROWS);
|
||||
},
|
||||
_openShopWithdrawModel: function(_shop){
|
||||
vc.emit('shopWithdraw','shopWithdrawModel', _shop);
|
||||
},
|
||||
_openOrderDetailModel: function (_order) {
|
||||
vc.component.shopManageInfo.orderDetail = true;
|
||||
vc.emit('orderDetailManage', 'listOrderDetails', _order.cBusiness);
|
||||
|
||||
@ -35,8 +35,8 @@
|
||||
<td class="text-center">{{item.feeName}}</td>
|
||||
<td class="text-center">{{item.objName}}</td>
|
||||
<td class="text-center" v-if="item.preDegrees">
|
||||
{{vc.dateFormat(item.startTime)}}至{{vc.dateSubOneDay(vc.dateFormat(item.startTime),vc.dateFormat(item.endTime),item.feeFlag)}}
|
||||
{{item.preDegrees}} 至 {{item.curDegree}}
|
||||
{{vc.dateFormat(item.startTime)}}至{{vc.dateSubOneDay(vc.dateFormat(item.startTime),vc.dateFormat(item.endTime),item.feeFlag)}}</br>
|
||||
{{item.preDegrees}} 至 {{item.curDegrees}}
|
||||
</td>
|
||||
<td class="text-center" v-else>
|
||||
{{vc.dateFormat(item.startTime)}}至{{vc.dateSubOneDay(vc.dateFormat(item.startTime),vc.dateFormat(item.endTime),item.feeFlag)}}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user