郭盛 / store · 提交

转到一个项目

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

合并分支 'wxg' 到 'master' 

修改问题文档



查看合并请求 !90
内嵌 并排对比
正在显示 2 个修改的文件 包含 57 行增加 和 52 行删除
@@ -184,6 +184,11 @@ class Viporder extends Backend @@ -184,6 +184,11 @@ class Viporder extends Backend
184 } 184 }
185 $this->error(__('Parameter %s can not be empty', '')); 185 $this->error(__('Parameter %s can not be empty', ''));
186 } 186 }
  187 + $data = Db::name('firmstores')->where(['user_id'=>$row['user_id']])->find();
  188 + if(empty($data)){
  189 + $data = Db::name('minestore')->where(['user_id'=>$row['user_id']])->find();
  190 + }
  191 + $this->view->assign("data",$data);
187 $this->view->assign("row", $row); 192 $this->view->assign("row", $row);
188 return $this->view->fetch(); 193 return $this->view->fetch();
189 } 194 }
1 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action=""> 1 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
2 2
3 - <!--<div class="form-group">-->  
4 - <!--<label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>-->  
5 - <!--<div class="col-xs-12 col-sm-8">-->  
6 - <!--<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}">-->  
7 - <!--</div>-->  
8 - <!--</div>-->  
9 - <!--<div class="form-group">-->  
10 - <!--<label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>-->  
11 - <!--<div class="col-xs-12 col-sm-8">-->  
12 - <!--<input id="c-type" class="form-control" name="row[type]" type="number" value="{$row.type|htmlentities}">-->  
13 - <!--</div>-->  
14 - <!--</div>-->  
15 - <!--<div class="form-group">-->  
16 - <!--<label class="control-label col-xs-12 col-sm-2">{:__('Stores_id')}:</label>-->  
17 - <!--<div class="col-xs-12 col-sm-8">-->  
18 - <!--<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}">-->  
19 - <!--</div>-->  
20 - <!--</div>-->  
21 - <!--<div class="form-group">-->  
22 - <!--<label class="control-label col-xs-12 col-sm-2">{:__('Vip_type')}:</label>-->  
23 - <!--<div class="col-xs-12 col-sm-8">-->  
24 - <!--<input id="c-vip_type" class="form-control" name="row[vip_type]" type="number" value="{$row.vip_type|htmlentities}">-->  
25 - <!--</div>-->  
26 - <!--</div>-->  
27 - <!--<div class="form-group">-->  
28 - <!--<label class="control-label col-xs-12 col-sm-2">{:__('Province_ids')}:</label>-->  
29 - <!--<div class="col-xs-12 col-sm-8">-->  
30 - <!--<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}">-->  
31 - <!--</div>-->  
32 - <!--</div>-->  
33 - <!--<div class="form-group">-->  
34 - <!--<label class="control-label col-xs-12 col-sm-2">{:__('Num')}:</label>-->  
35 - <!--<div class="col-xs-12 col-sm-8">-->  
36 - <!--<input id="c-num" class="form-control" name="row[num]" type="number" value="{$row.num|htmlentities}">-->  
37 - <!--</div>-->  
38 - <!--</div>-->  
39 - <!--<div class="form-group">-->  
40 - <!--<label class="control-label col-xs-12 col-sm-2">{:__('Money')}:</label>-->  
41 - <!--<div class="col-xs-12 col-sm-8">-->  
42 - <!--<input id="c-money" class="form-control" name="row[money]" type="text" value="{$row.money|htmlentities}">-->  
43 - <!--</div>-->  
44 - <!--</div>-->  
45 - <!--<div class="form-group">-->  
46 - <!--<label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>-->  
47 - <!--<div class="col-xs-12 col-sm-8">-->  
48 - <!--<input id="c-status" class="form-control" name="row[status]" type="number" value="{$row.status|htmlentities}">-->  
49 - <!--</div>-->  
50 - <!--</div>--> 3 + <!--<div class="form-group">
  4 + <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
  5 + <div class="col-xs-12 col-sm-8">
  6 + <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}">
  7 + </div>
  8 + </div>
  9 + <div class="form-group">
  10 + <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
  11 + <div class="col-xs-12 col-sm-8">
  12 + <input id="c-type" class="form-control" name="row[type]" type="number" value="{$row.type|htmlentities}">
  13 + </div>
  14 + </div>
  15 + <div class="form-group">
  16 + <label class="control-label col-xs-12 col-sm-2">{:__('Stores_id')}:</label>
  17 + <div class="col-xs-12 col-sm-8">
  18 + <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}">
  19 + </div>
  20 + </div>
  21 + <div class="form-group">
  22 + <label class="control-label col-xs-12 col-sm-2">{:__('Vip_type')}:</label>
  23 + <div class="col-xs-12 col-sm-8">
  24 + <input id="c-vip_type" class="form-control" name="row[vip_type]" type="number" value="{$row.vip_type|htmlentities}">
  25 + </div>
  26 + </div>
  27 + <div class="form-group">
  28 + <label class="control-label col-xs-12 col-sm-2">{:__('Province_ids')}:</label>
  29 + <div class="col-xs-12 col-sm-8">
  30 + <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}">
  31 + </div>
  32 + </div>
  33 + <div class="form-group">
  34 + <label class="control-label col-xs-12 col-sm-2">{:__('Num')}:</label>
  35 + <div class="col-xs-12 col-sm-8">
  36 + <input id="c-num" class="form-control" name="row[num]" type="number" value="{$row.num|htmlentities}">
  37 + </div>
  38 + </div>
  39 + <div class="form-group">
  40 + <label class="control-label col-xs-12 col-sm-2">{:__('Money')}:</label>
  41 + <div class="col-xs-12 col-sm-8">
  42 + <input id="c-money" class="form-control" name="row[money]" type="text" value="{$row.money|htmlentities}">
  43 + </div>
  44 + </div>
  45 + <div class="form-group">
  46 + <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
  47 + <div class="col-xs-12 col-sm-8">
  48 + <input id="c-status" class="form-control" name="row[status]" type="number" value="{$row.status|htmlentities}">
  49 + </div>
  50 + </div>-->
51 <div class="form-group"> 51 <div class="form-group">
52 <label class="control-label col-xs-12 col-sm-2">{:__('Audit')}:</label> 52 <label class="control-label col-xs-12 col-sm-2">{:__('Audit')}:</label>
53 <div class="col-xs-12 col-sm-8"> 53 <div class="col-xs-12 col-sm-8">
@@ -70,7 +70,7 @@ @@ -70,7 +70,7 @@
70 <div class="form-group"> 70 <div class="form-group">
71 <label class="control-label col-xs-12 col-sm-2">{:__('店铺名称')}:</label> 71 <label class="control-label col-xs-12 col-sm-2">{:__('店铺名称')}:</label>
72 <div class="col-xs-12 col-sm-8"> 72 <div class="col-xs-12 col-sm-8">
73 - <input id="c-name" class="form-control" name="row[name]" type="text" value=""> 73 + <input id="c-name" class="form-control" name="row[name]" type="text" value="{notempty name='$data.name'}{$data.name}{/notempty}">
74 </div> 74 </div>
75 </div> 75 </div>
76 <div class="form-group"> 76 <div class="form-group">
@@ -132,19 +132,19 @@ @@ -132,19 +132,19 @@
132 <div class="form-group address"> 132 <div class="form-group address">
133 <label class="control-label col-xs-12 col-sm-2">{:__('详细地址')}:</label> 133 <label class="control-label col-xs-12 col-sm-2">{:__('详细地址')}:</label>
134 <div class="col-xs-12 col-sm-8"> 134 <div class="col-xs-12 col-sm-8">
135 - <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"> 135 + <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">
136 </div> 136 </div>
137 </div> 137 </div>
138 <div class="form-group hidden"> 138 <div class="form-group hidden">
139 <label class="control-label col-xs-12 col-sm-2">{:__('Lng')}:</label> 139 <label class="control-label col-xs-12 col-sm-2">{:__('Lng')}:</label>
140 <div class="col-xs-12 col-sm-8"> 140 <div class="col-xs-12 col-sm-8">
141 - <input id="c-longitude" class="form-control" name="row[lng]" type="text" value=""> 141 + <input id="c-longitude" class="form-control" name="row[lng]" type="text" value="{notempty name='$data.lng'}{$data.lng}{/notempty}">
142 </div> 142 </div>
143 </div> 143 </div>
144 <div class="form-group hidden"> 144 <div class="form-group hidden">
145 <label class="control-label col-xs-12 col-sm-2">{:__('Lat')}:</label> 145 <label class="control-label col-xs-12 col-sm-2">{:__('Lat')}:</label>
146 <div class="col-xs-12 col-sm-8"> 146 <div class="col-xs-12 col-sm-8">
147 - <input id="c-latitude" class="form-control" name="row[lat]" type="text" value=""> 147 + <input id="c-latitude" class="form-control" name="row[lat]" type="text" value="{notempty name='$data.lat'}{$data.lat}{/notempty}">
148 </div> 148 </div>
149 </div> 149 </div>
150 <div class="form-group"> 150 <div class="form-group">