合并分支 'Branch_liuzhen' 到 'master'

Branch liuzhen



查看合并请求 !48

@@ -3,6 +3,7 @@
 namespace app\admin\controller;
 
 use app\common\controller\Backend;
+use app\index\model\Province;
 use think\Db;
 
 /**
@@ -18,6 +19,7 @@ class Store extends Backend
      * @var \app\admin\model\Store
      */
     protected $model = null;
+    protected $noNeedRight = ['selectpage'];
 
     public function _initialize()
     {
@@ -101,6 +103,7 @@ class Store extends Backend
             $params = $this->request->post("row/a");
             if ($params) {
                 $params = $this->preExcludeFields($params);
+                $params['province_ids'] = ','.$params['province_ids'].',';
                 $result = false;
                 Db::startTrans();
                 try {
@@ -130,7 +133,17 @@ class Store extends Backend
             }
             $this->error(__('Parameter %s can not be empty', ''));
         }
+        //省份
+        $provinceModel = new Province();
+        $province = $provinceModel->selectData([]);
+        $this->view->assign('province',$province);
         $this->view->assign("row", $row);
         return $this->view->fetch();
     }
+
+    public function selectpage()
+    {
+        $this->model = new Province();
+        return parent::selectpage(); // TODO: Change the autogenerated stub
+    }
 }

@@ -43,24 +43,32 @@
             <input id="c-phone" data-rule="required" class="form-control" name="row[phone]" type="text" value="{$row.phone|htmlentities}">
         </div>
     </div>
+<!--    <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-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}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <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-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}">-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <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-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}">-->
+<!--        </div>-->
+<!--    </div>-->
+    {eq name="row.viptype" value="1"}
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('省份')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('城市列表')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <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}">
-        </div>
-    </div>
-    <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-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}">
-        </div>
-    </div>
-    <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-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}">
+            <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}">
         </div>
     </div>
+    {/eq}
     <div class="form-group address">
         <label class="control-label col-xs-12 col-sm-2">{:__('Address')}:</label>
         <div class="col-xs-12 col-sm-8">

@@ -749,6 +749,12 @@
                                         <img src="__CDN__/assets/store/images/vip.png" alt="">
                                         <span>VIP</span>
                                     </button>
+                                    <div class="vipDescDate">
+                                        <span class="vipDate">会员截止日期：{eq name="is_valid" value="1"}{$over_time}{else/}已过期{/eq}</span>
+                                        {if condition="$is_valid eq 1"}
+                                        <span class="vipContinue">会员续期</span>
+                                        {/if}
+                                    </div>
                                 </a>
                                 {else/}
                                 <a href="{:url('svip')}">