郭盛 / store · 提交

转到一个项目

作者 李铮
提交 e8609b3066022fa817e17870223f731ac0b83200 1 个父辈 426c0b68

后台店铺编辑功能优化，我的会员优化

内嵌 并排对比
正在显示 3 个修改的文件 包含 41 行增加 和 14 行删除
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 namespace app\admin\controller; 3 namespace app\admin\controller;
4 4
5 use app\common\controller\Backend; 5 use app\common\controller\Backend;
  6 +use app\index\model\Province;
6 use think\Db; 7 use think\Db;
7 8
8 /** 9 /**
@@ -18,6 +19,7 @@ class Store extends Backend @@ -18,6 +19,7 @@ class Store extends Backend
18 * @var \app\admin\model\Store 19 * @var \app\admin\model\Store
19 */ 20 */
20 protected $model = null; 21 protected $model = null;
  22 + protected $noNeedRight = ['selectpage'];
21 23
22 public function _initialize() 24 public function _initialize()
23 { 25 {
@@ -101,6 +103,7 @@ class Store extends Backend @@ -101,6 +103,7 @@ class Store extends Backend
101 $params = $this->request->post("row/a"); 103 $params = $this->request->post("row/a");
102 if ($params) { 104 if ($params) {
103 $params = $this->preExcludeFields($params); 105 $params = $this->preExcludeFields($params);
  106 + $params['province_ids'] = ','.$params['province_ids'].',';
104 $result = false; 107 $result = false;
105 Db::startTrans(); 108 Db::startTrans();
106 try { 109 try {
@@ -130,7 +133,17 @@ class Store extends Backend @@ -130,7 +133,17 @@ class Store extends Backend
130 } 133 }
131 $this->error(__('Parameter %s can not be empty', '')); 134 $this->error(__('Parameter %s can not be empty', ''));
132 } 135 }
  136 + //省份
  137 + $provinceModel = new Province();
  138 + $province = $provinceModel->selectData([]);
  139 + $this->view->assign('province',$province);
133 $this->view->assign("row", $row); 140 $this->view->assign("row", $row);
134 return $this->view->fetch(); 141 return $this->view->fetch();
135 } 142 }
  143 +
  144 + public function selectpage()
  145 + {
  146 + $this->model = new Province();
  147 + return parent::selectpage(); // TODO: Change the autogenerated stub
  148 + }
136 } 149 }
@@ -43,24 +43,32 @@ @@ -43,24 +43,32 @@
43 <input id="c-phone" data-rule="required" class="form-control" name="row[phone]" type="text" value="{$row.phone|htmlentities}"> 43 <input id="c-phone" data-rule="required" class="form-control" name="row[phone]" type="text" value="{$row.phone|htmlentities}">
44 </div> 44 </div>
45 </div> 45 </div>
  46 +<!-- <div class="form-group">-->
  47 +<!-- <label class="control-label col-xs-12 col-sm-2">{:__('省份')}:</label>-->
  48 +<!-- <div class="col-xs-12 col-sm-8">-->
  49 +<!-- <input id="c-province_id" data-rule="required" data-order-by="id asc" data-params='{"custom[level]":"1"}' data-source="area/index" class="form-control selectpage" name="row[province_id]" type="text" value="{$row.province_id|htmlentities}">-->
  50 +<!-- </div>-->
  51 +<!-- </div>-->
  52 +<!-- <div class="form-group">-->
  53 +<!-- <label class="control-label col-xs-12 col-sm-2">{:__('城市')}:</label>-->
  54 +<!-- <div class="col-xs-12 col-sm-8">-->
  55 +<!-- <input id="c-city_id" data-rule="required" data-order-by="id asc" data-params='{"custom[level]":"2"}' data-source="area/index" class="form-control selectpage" name="row[city_id]" type="text" value="{$row.city_id|htmlentities}">-->
  56 +<!-- </div>-->
  57 +<!-- </div>-->
  58 +<!-- <div class="form-group">-->
  59 +<!-- <label class="control-label col-xs-12 col-sm-2">{:__('区/县')}:</label>-->
  60 +<!-- <div class="col-xs-12 col-sm-8">-->
  61 +<!-- <input id="c-county_id" data-rule="required" data-order-by="id asc" data-params='{"custom[level]":"3"}' data-source="area/index" class="form-control selectpage" name="row[county_id]" type="text" value="{$row.county_id|htmlentities}">-->
  62 +<!-- </div>-->
  63 +<!-- </div>-->
  64 + {eq name="row.viptype" value="1"}
46 <div class="form-group"> 65 <div class="form-group">
47 - <label class="control-label col-xs-12 col-sm-2">{:__('省份')}:</label> 66 + <label class="control-label col-xs-12 col-sm-2">{:__('城市列表')}:</label>
48 <div class="col-xs-12 col-sm-8"> 67 <div class="col-xs-12 col-sm-8">
49 - <input id="c-province_id" data-rule="required" data-order-by="id asc" data-params='{"custom[level]":"1"}' data-source="area/index" class="form-control selectpage" name="row[province_id]" type="text" value="{$row.province_id|htmlentities}">  
50 - </div>  
51 - </div>  
52 - <div class="form-group">  
53 - <label class="control-label col-xs-12 col-sm-2">{:__('城市')}:</label>  
54 - <div class="col-xs-12 col-sm-8">  
55 - <input id="c-city_id" data-rule="required" data-order-by="id asc" data-params='{"custom[level]":"2"}' data-source="area/index" class="form-control selectpage" name="row[city_id]" type="text" value="{$row.city_id|htmlentities}">  
56 - </div>  
57 - </div>  
58 - <div class="form-group">  
59 - <label class="control-label col-xs-12 col-sm-2">{:__('区/县')}:</label>  
60 - <div class="col-xs-12 col-sm-8">  
61 - <input id="c-county_id" data-rule="required" data-order-by="id asc" data-params='{"custom[level]":"3"}' data-source="area/index" class="form-control selectpage" name="row[county_id]" type="text" value="{$row.county_id|htmlentities}"> 68 + <input id="c-province_id" data-rule="" data-order-by="id asc" data-source="store/selectpage" data-multiple="true" class="form-control selectpage" name="row[province_ids]" type="text" value="{$row.province_ids|htmlentities}">
62 </div> 69 </div>
63 </div> 70 </div>
  71 + {/eq}
64 <div class="form-group address"> 72 <div class="form-group address">
65 <label class="control-label col-xs-12 col-sm-2">{:__('Address')}:</label> 73 <label class="control-label col-xs-12 col-sm-2">{:__('Address')}:</label>
66 <div class="col-xs-12 col-sm-8"> 74 <div class="col-xs-12 col-sm-8">
@@ -749,6 +749,12 @@ @@ -749,6 +749,12 @@
749 <img src="__CDN__/assets/store/images/vip.png" alt=""> 749 <img src="__CDN__/assets/store/images/vip.png" alt="">
750 <span>VIP</span> 750 <span>VIP</span>
751 </button> 751 </button>
  752 + <div class="vipDescDate">
  753 + <span class="vipDate">会员截止日期：{eq name="is_valid" value="1"}{$over_time}{else/}已过期{/eq}</span>
  754 + {if condition="$is_valid eq 1"}
  755 + <span class="vipContinue">会员续期</span>
  756 + {/if}
  757 + </div>
752 </a> 758 </a>
753 {else/} 759 {else/}
754 <a href="{:url('svip')}"> 760 <a href="{:url('svip')}">