commit

app/admin/controller/user/User.php

@@ -433,9 +433,9 @@ class User extends AuthController
             $store_list = array_merge([['value' => 0, 'label' => '否']], $store_list);
             $f[] = Form::select('store_id', '供货商', (string)$user->getData('store_id'))->setOptions($store_list);
         }
-        $f[] = Form::radio('area_admin', '区域代理', $user->getData('area_admin'))->options([['value' => 0, 'label' => '无'], ['value' => 1, 'label' => '区代'], ['value' => 2, 'label' => '市代'], ['value' => 3, 'label' => '省代']]);
-        $f[] = Form::cityArea('area_address', '区域', $user->getData('area_province'), $user->getData('area_city'), $user->getData('area_district'));
-        $f[] = Form::radio('is_point', '节点', $user->getData('is_point'))->options([['value' => 1, 'label' => '开启'], ['value' => 0, 'label' => '关闭']]);
+//        $f[] = Form::radio('area_admin', '区域代理', $user->getData('area_admin'))->options([['value' => 0, 'label' => '无'], ['value' => 1, 'label' => '区代'], ['value' => 2, 'label' => '市代'], ['value' => 3, 'label' => '省代']]);
+//        $f[] = Form::cityArea('area_address', '区域', $user->getData('area_province'), $user->getData('area_city'), $user->getData('area_district'));
+//        $f[] = Form::radio('is_point', '节点', $user->getData('is_point'))->options([['value' => 1, 'label' => '开启'], ['value' => 0, 'label' => '关闭']]);
         $f[] = Form::radio('status', '状态', $user->getData('status'))->options([['value' => 1, 'label' => '开启'], ['value' => 0, 'label' => '锁定']]);
         $form = Form::make_post_form('添加用户通知', $f, Url::buildUrl('update', array('uid' => $uid)), 5);
         $this->assign(compact('form'));

app/admin/controller/user/UserLevel.php

@@ -38,8 +38,8 @@ class UserLevel extends AuthController
         //$field[]= Form::radio('is_pay','是否需要购买',isset($vipinfo) ? $vipinfo->is_pay : 0)->options([['label'=>'需要','value'=>1],['label'=>'免费','value'=>0]])->col(24);
 //        $field[] = Form::number('valid_date', '有效时间(天)', isset($vipinfo) ? $vipinfo->valid_date : 0)->min(0)->col(8);
         $field[] = Form::number('grade', '等级', isset($vipinfo) ? $vipinfo->grade : 0)->min(0)->col(8);
-        $field[] = Form::number('discount', '享受折扣', isset($vipinfo) ? $vipinfo->discount : 0)->min(0)->col(8);
-        $field[] = Form::number('group_award_ratio', '团队奖比例', isset($vipinfo) ? $vipinfo->group_award_ratio : 0)->min(0)->step(0.01)->col(8);
+//        $field[] = Form::number('discount', '享受折扣', isset($vipinfo) ? $vipinfo->discount : 0)->min(0)->col(8);
+//        $field[] = Form::number('group_award_ratio', '团队奖比例', isset($vipinfo) ? $vipinfo->group_award_ratio : 0)->min(0)->step(0.01)->col(8);
         $field[] = Form::number('same_level_award_ratio', '平级奖比例', isset($vipinfo) ? $vipinfo->same_level_award_ratio : 0)->min(0)->step(0.01)->col(8);
         $field[] = Form::frameImageOne('icon', '图标', Url::buildUrl('admin/widget.images/index', array('fodder' => 'icon')), isset($vipinfo) ? $vipinfo->icon : '')->icon('image')->width('100%')->height('500px');
         $field[] = Form::frameImageOne('image', '会员背景', Url::buildUrl('admin/widget.images/index', array('fodder' => 'image')), isset($vipinfo) ? $vipinfo->image : '')->icon('image')->width('100%')->height('500px');

app/admin/view/store/store_product/create.php

@@ -652,22 +652,22 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="layui-col-xs12 layui-col-sm6 layui-col-md6">
-                                    <div class="grid-demo grid-demo-bg1">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label">供货商<i class="red">*</i></label>
-                                            <div class="layui-input-block">
-                                                <select name="store_id" lay-filter="store_id">
-                                                    <option value="0">系统自营</option>
-                                                    <option :value="item.id" v-for="item in storeList"
-                                                            :selected=" item.id == formData.store_id ? true : false ">
-                                                        {{item.name}}
-                                                    </option>
-                                                </select>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
+<!--                                <div class="layui-col-xs12 layui-col-sm6 layui-col-md6">-->
+<!--                                    <div class="grid-demo grid-demo-bg1">-->
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label">供货商<i class="red">*</i></label>-->
+<!--                                            <div class="layui-input-block">-->
+<!--                                                <select name="store_id" lay-filter="store_id">-->
+<!--                                                    <option value="0">系统自营</option>-->
+<!--                                                    <option :value="item.id" v-for="item in storeList"-->
+<!--                                                            :selected=" item.id == formData.store_id ? true : false ">-->
+<!--                                                        {{item.name}}-->
+<!--                                                    </option>-->
+<!--                                                </select>-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!--                                </div>-->
                                 <div class="layui-row layui-col-space15">
                                     <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
                                         <div class="grid-demo grid-demo-bg1">

app/admin/view/store/store_product/index.php

@@ -62,14 +62,14 @@
             <div class="layui-card">
                 <div class="layui-card-body">
                     <div class="alert alert-info" role="alert">
-                        列表[虚拟销量],[库存],[排序]可进行快速修改,双击或者单击进入编辑模式,失去焦点可进行自动保存
+                        列表[虚拟销量],[排序]可进行快速修改,双击或者单击进入编辑模式,失去焦点可进行自动保存
                         <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="layui-btn-container">
                         {switch name='type'}
                             {case value="1"}
                                 <a class="layui-btn layui-btn-sm" href="{:Url('create')}">添加商品</a>
-                                <button class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('store.copy_taobao/index')}',{h:700,w:1100});">复制淘宝、天猫、1688、京东</button>
+<!--                                <button class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('store.copy_taobao/index')}',{h:700,w:1100});">复制淘宝、天猫、1688、京东</button>-->
                             {/case}
                             {case value="2"}
                                 <button class="layui-btn layui-btn-sm" data-type="show">批量上架</button>

app/admin/view/user/user_level/index.php

@@ -94,8 +94,8 @@
             {field: 'icon', title: '等级图标',templet:'#icon',align:"center",width:'10%'},
             {field: 'name', title: '等级名称',edit:'name',width:'6%',align:"center"},
             {field: 'grade', title: '等级',edit:'grade',width:'6%',align:"center"},
-            {field: 'discount', title: '享受折扣',edit:'discount',width:'8%',align:"center"},
-            {field: 'group_award_ratio', title: '团队奖比例（%）',edit:'group_award_ratio',width:'8%',align:"center"},
+            // {field: 'discount', title: '享受折扣',edit:'discount',width:'8%',align:"center"},
+            // {field: 'group_award_ratio', title: '团队奖比例（%）',edit:'group_award_ratio',width:'8%',align:"center"},
             {field: 'same_level_award_ratio', title: '平级奖比例（%）',edit:'same_level_award_ratio',width:'8%',align:"center"},
             // {field: 'valid_date', title: '有效时间',width:'12%',align:"center"},
             // {field: 'is_forever', title: '是否永久',templet:'#is_forever',width:'8%',align:"center"},