郭盛 / store · 提交

转到一个项目

作者 王晓刚
提交 0516425b1947e5a3711aae401c7329dc38a30f9e 2 个父辈 e48a1458 cd9660c5
1 个管道 的构建 通过 耗费 4 秒

合并分支 'wxg' 到 'master' 

修改问题文档



查看合并请求 !90
内嵌 并排对比
正在显示 2 个修改的文件 包含 57 行增加 和 52 行删除
... ... @@ -184,6 +184,11 @@ class Viporder extends Backend
}
$this->error(__('Parameter %s can not be empty', ''));
}
$data = Db::name('firmstores')->where(['user_id'=>$row['user_id']])->find();
if(empty($data)){
$data = Db::name('minestore')->where(['user_id'=>$row['user_id']])->find();
}
$this->view->assign("data",$data);
$this->view->assign("row", $row);
return $this->view->fetch();
}
... ...
<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
<!--<div class="form-group">-->
<!--<label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>-->
<!--<div class="col-xs-12 col-sm-8">-->
<!--<input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>-->
<!--<div class="col-xs-12 col-sm-8">-->
<!--<input id="c-type" class="form-control" name="row[type]" type="number" value="{$row.type|htmlentities}">-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label class="control-label col-xs-12 col-sm-2">{:__('Stores_id')}:</label>-->
<!--<div class="col-xs-12 col-sm-8">-->
<!--<input id="c-stores_id" data-rule="required" data-source="stores/index" class="form-control selectpage" name="row[stores_id]" type="text" value="{$row.stores_id|htmlentities}">-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label class="control-label col-xs-12 col-sm-2">{:__('Vip_type')}:</label>-->
<!--<div class="col-xs-12 col-sm-8">-->
<!--<input id="c-vip_type" class="form-control" name="row[vip_type]" type="number" value="{$row.vip_type|htmlentities}">-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label class="control-label col-xs-12 col-sm-2">{:__('Province_ids')}:</label>-->
<!--<div class="col-xs-12 col-sm-8">-->
<!--<input id="c-province_ids" data-rule="required" data-source="province/index" data-multiple="true" class="form-control selectpage" name="row[province_ids]" type="text" value="{$row.province_ids|htmlentities}">-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label class="control-label col-xs-12 col-sm-2">{:__('Num')}:</label>-->
<!--<div class="col-xs-12 col-sm-8">-->
<!--<input id="c-num" class="form-control" name="row[num]" type="number" value="{$row.num|htmlentities}">-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label class="control-label col-xs-12 col-sm-2">{:__('Money')}:</label>-->
<!--<div class="col-xs-12 col-sm-8">-->
<!--<input id="c-money" class="form-control" name="row[money]" type="text" value="{$row.money|htmlentities}">-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>-->
<!--<div class="col-xs-12 col-sm-8">-->
<!--<input id="c-status" class="form-control" name="row[status]" type="number" value="{$row.status|htmlentities}">-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-type" class="form-control" name="row[type]" type="number" value="{$row.type|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Stores_id')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-stores_id" data-rule="required" data-source="stores/index" class="form-control selectpage" name="row[stores_id]" type="text" value="{$row.stores_id|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Vip_type')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-vip_type" class="form-control" name="row[vip_type]" type="number" value="{$row.vip_type|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Province_ids')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-province_ids" data-rule="required" data-source="province/index" data-multiple="true" class="form-control selectpage" name="row[province_ids]" type="text" value="{$row.province_ids|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Num')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-num" class="form-control" name="row[num]" type="number" value="{$row.num|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Money')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-money" class="form-control" name="row[money]" type="text" value="{$row.money|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-status" class="form-control" name="row[status]" type="number" value="{$row.status|htmlentities}">
</div>
</div>-->
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Audit')}:</label>
<div class="col-xs-12 col-sm-8">
... ... @@ -70,7 +70,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('店铺名称')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-name" class="form-control" name="row[name]" type="text" value="">
<input id="c-name" class="form-control" name="row[name]" type="text" value="{notempty name='$data.name'}{$data.name}{/notempty}">
</div>
</div>
<div class="form-group">
... ... @@ -132,19 +132,19 @@
<div class="form-group address">
<label class="control-label col-xs-12 col-sm-2">{:__('详细地址')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-address" data-toggle="addresspicker" data-input-id="c-address" data-lat-id="c-latitude" data-lng-id="c-longitude" class="form-control" data-rule="required" name="row[address]" value="" type="text" readonly="true">
<input id="c-address" data-toggle="addresspicker" data-input-id="c-address" data-lat-id="c-latitude" data-lng-id="c-longitude" class="form-control" data-rule="required" name="row[address]" value="{notempty name='$data.address'}{$data.address}{/notempty}" type="text" readonly="true">
</div>
</div>
<div class="form-group hidden">
<label class="control-label col-xs-12 col-sm-2">{:__('Lng')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-longitude" class="form-control" name="row[lng]" type="text" value="">
<input id="c-longitude" class="form-control" name="row[lng]" type="text" value="{notempty name='$data.lng'}{$data.lng}{/notempty}">
</div>
</div>
<div class="form-group hidden">
<label class="control-label col-xs-12 col-sm-2">{:__('Lat')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-latitude" class="form-control" name="row[lat]" type="text" value="">
<input id="c-latitude" class="form-control" name="row[lat]" type="text" value="{notempty name='$data.lat'}{$data.lat}{/notempty}">
</div>
</div>
<div class="form-group">
... ...