diff --git a/public/themes/admin_simpleboot3/admin/salesman/salesman_goods_add.html b/public/themes/admin_simpleboot3/admin/salesman/salesman_goods_add.html index b639dd3..11b9a8b 100755 --- a/public/themes/admin_simpleboot3/admin/salesman/salesman_goods_add.html +++ b/public/themes/admin_simpleboot3/admin/salesman/salesman_goods_add.html @@ -134,6 +134,7 @@ <option value="高中">高中</option> <option value="学龄前">学龄前</option> <option value="3-6年级">3-6年级</option> + <option value="1-2年级">1-2年级</option> </select> </td> </tr> diff --git a/public/themes/admin_simpleboot3/admin/salesman/salesman_goods_edit.html b/public/themes/admin_simpleboot3/admin/salesman/salesman_goods_edit.html index 74b1908..d27b2ae 100755 --- a/public/themes/admin_simpleboot3/admin/salesman/salesman_goods_edit.html +++ b/public/themes/admin_simpleboot3/admin/salesman/salesman_goods_edit.html @@ -133,6 +133,7 @@ <option value="高中" <eq name='$data.grade' value='高中'>selected</eq>>高中</option> <option value="学龄前" <eq name='$data.grade' value='学龄前'>selected</eq>>学龄前</option> <option value="3-6年级" <eq name='$data.grade' value='3-6年级'>selected</eq>>3-6年级</option> + <option value="1-2年级" <eq name='$data.grade' value='1-2年级'>selected</eq>>1-2年级</option> </select> </td> </tr> diff --git a/public/themes/simpleboot3/portal/salesmangoods/salesman_goods_add.html b/public/themes/simpleboot3/portal/salesmangoods/salesman_goods_add.html index f39ccfe..4a84929 100755 --- a/public/themes/simpleboot3/portal/salesmangoods/salesman_goods_add.html +++ b/public/themes/simpleboot3/portal/salesmangoods/salesman_goods_add.html @@ -63,6 +63,7 @@ <div class="three_model_school_name">高中</div> <div class="three_model_school_name">学龄前</div> <div class="three_model_school_name">3-6年级</div> + <div class="three_model_school_name">1-2年级</div> </div> </div> diff --git a/simplewind/cmf/controller/WeChatBaseController.php b/simplewind/cmf/controller/WeChatBaseController.php index 4daebb0..f2c40a6 100644 --- a/simplewind/cmf/controller/WeChatBaseController.php +++ b/simplewind/cmf/controller/WeChatBaseController.php @@ -204,7 +204,7 @@ class WeChatBaseController extends BaseController */ public function checkWeChatUserLogin() { - /*$user = Db::name('user')->where('id',7)->find(); + /*$user = Db::name('user')->where('id',2)->find(); cmf_update_current_user($user);*/ $userId = cmf_get_current_user_id(); if (empty($userId)) {