合并分支 '1iuzhen' 到 'master'

后台订单价格显示添加，前台数字验证添加查看合并请求 !243

合并分支 '1iuzhen' 到 'master'
后台订单价格显示添加，前台数字验证添加查看合并请求 !243
刘朕
app/admin/controller/OrderController.php
app/portal/controller/MemberSalesController.php
public/themes/admin_simpleboot3/admin/order/index.html
public/themes/admin_simpleboot3/admin/order/index_sales.html
public/themes/admin_simpleboot3/admin/order/index_sort.html
--- a/app/admin/controller/OrderController.php
查看文件 @3eaecfd
+++ b/app/admin/controller/OrderController.php
查看文件 @3eaecfd
@@ -141,8 +141,18 @@ class OrderController extends AdminBaseController
             }
         }
         $list = $this->singleData('order_view',$where,2,[],10);
+        $orderList = $list->items();
+        foreach ($orderList as $k=>$v) {
+            $v['options'] = json_decode($v['options'],true);
+            $orderList[$k]['order_price'] = 0;
+            foreach ($v['options'] as $ko=>$vo) {
+                if($vo['id'] == 64) {
+                    $orderList[$k]['order_price'] = $vo['user_choose'];
+                }
+            }
+        }
         $list->appends($param);
-        $this->assign('list',$list->items());
+        $this->assign('list',$orderList);
         $this->assign('page',$list->render());
         $this->assign('keyword',isset($param['keyword']) ? $param['keyword'] : '');
         $this->assign('sort_id',isset($param['sort_id']) ? $param['sort_id'] : '');
@@ -210,8 +220,18 @@ class OrderController extends AdminBaseController
             }
         }
         $list = $this->singleData('order_view',$where,2,[],10);
+        $orderList = $list->items();
+        foreach ($orderList as $k=>$v) {
+            $v['options'] = json_decode($v['options'],true);
+            $orderList[$k]['order_price'] = 0;
+            foreach ($v['options'] as $ko=>$vo) {
+                if($vo['id'] == 64) {
+                    $orderList[$k]['order_price'] = $vo['user_choose'];
+                }
+            }
+        }
         $list->appends($param);
-        $this->assign('list',$list->items());
+        $this->assign('list',$orderList);
         $this->assign('page',$list->render());
         $this->assign('keyword',isset($param['keyword']) ? $param['keyword'] : '');
         $this->assign('status',isset($param['status']) ? $param['status'] : '');
@@ -285,8 +305,18 @@ class OrderController extends AdminBaseController
             }
         }
         $list = $this->singleData('order_view',$where,2,[],10);
+        $orderList = $list->items();
+        foreach ($orderList as $k=>$v) {
+            $v['options'] = json_decode($v['options'],true);
+            $orderList[$k]['order_price'] = 0;
+            foreach ($v['options'] as $ko=>$vo) {
+                if($vo['id'] == 64) {
+                    $orderList[$k]['order_price'] = $vo['user_choose'];
+                }
+            }
+        }
         $list->appends($param);
-        $this->assign('list',$list->items());
+        $this->assign('list',$orderList);
         $this->assign('page',$list->render());
         $this->assign('keyword',isset($param['keyword']) ? $param['keyword'] : '');
         $this->assign('sort_id',isset($param['sort_id']) ? $param['sort_id'] : '');
--- a/app/portal/controller/MemberSalesController.php
查看文件 @3eaecfd
+++ b/app/portal/controller/MemberSalesController.php
查看文件 @3eaecfd
@@ -43,11 +43,13 @@ class MemberSalesController extends HomeBaseController
         </div>';
         $this->sort_model[2] = '<div class="text_item form_options" data-validate="{validate}" data-type="2">
             <p class="text_tit"><span class=" _validate">{name}</span>{must}</p>
-            <input type="number" name="" id="" value="{value}" class="baby_input" placeholder="请输入{name}" />
+            <input type="number" name="" onkeyup="this.value=this.value.replace(/\D/g,\'\')"
+onafterpaste="this.value=this.value.replace(/\D/g,\'\')" id="" value="{value}" class="baby_input" placeholder="请输入{name}" />
         </div>';
         $this->sort_model[3] = '<div class="text_item form_options" data-validate="{validate}" data-type="3">
             <p class="text_tit"><span class=" _validate">{name}</span>{must}</p>
-            <input type="number" maxlength="11" name="" id="" value="{value}" class="baby_input" placeholder="请输入{name}" />
+            <input type="number" maxlength="11" onkeyup="this.value=this.value.replace(/\D/g,\'\')"
+onafterpaste="this.value=this.value.replace(/\D/g,\'\')" name="" id="" value="{value}" class="baby_input" placeholder="请输入{name}" />
         </div>';
         $this->sort_model[4] = '<div class="write_tit form_options" data-validate="{validate}" data-type="4">
             <p class="tit"><span class=" _validate">{name}</span></p>
--- a/public/themes/admin_simpleboot3/admin/order/index.html
查看文件 @3eaecfd
+++ b/public/themes/admin_simpleboot3/admin/order/index.html
查看文件 @3eaecfd
@@ -79,6 +79,7 @@
                 <th>订单类型</th>
                 <th>销售用户名</th>
                 <th>订单确认码</th>
+                <th>订单价格</th>
                 <th>订单状态</th>
                 <th>支付方式</th>
                 <th>收集状态</th>
@@ -99,6 +100,7 @@
                     <td>{$vo.sort_name}</td>
                     <td>{$vo.user_login}</td>
                     <td>{$vo.number}</td>
+                    <td>{$vo.order_price}</td>
                     <td><eq name="vo.status" value="0">未支付</eq><eq name="vo.status" value="1">已支付</eq></td>
                     <td><eq name="vo.pay_type" value="1">微信</eq><eq name="vo.pay_type" value="2">支付宝</eq></td>
                     <td><eq name="vo.is_stop" value="0">收集中</eq><eq name="vo.is_stop" value="1">已停止</eq></td>
@@ -126,6 +128,7 @@
                 <th>订单类型</th>
                 <th>销售用户名</th>
                 <th>订单确认码</th>
+                <th>订单价格</th>
                 <th>订单状态</th>
                 <th>支付方式</th>
                 <th>收集状态</th>
--- a/public/themes/admin_simpleboot3/admin/order/index_sales.html
查看文件 @3eaecfd
+++ b/public/themes/admin_simpleboot3/admin/order/index_sales.html
查看文件 @3eaecfd
@@ -74,6 +74,7 @@
                 <th>订单类型</th>
                 <th>销售用户名</th>
                 <th>订单确认码</th>
+                <th>订单价格</th>
                 <th>订单状态</th>
                 <th>收集状态</th>
                 <th width="130">发布时间</th>
@@ -91,6 +92,7 @@
                     <td>{$vo.sort_name}</td>
                     <td>{$vo.user_login}</td>
                     <td>{$vo.number}</td>
+                    <td>{$vo.order_price}</td>
                     <td><eq name="vo.status" value="0">未支付</eq><eq name="vo.status" value="1">已支付</eq></td>
                     <td><eq name="vo.is_stop" value="0">收集中</eq><eq name="vo.is_stop" value="1">已停止</eq></td>
                     <td>{:date('Y-m-d H:i',$vo.create_time)}</td>
@@ -115,6 +117,7 @@
                 <th>订单类型</th>
                 <th>销售用户名</th>
                 <th>订单确认码</th>
+                <th>订单价格</th>
                 <th>订单状态</th>
                 <th>收集状态</th>
                 <th width="130">发布时间</th>
--- a/public/themes/admin_simpleboot3/admin/order/index_sort.html
查看文件 @3eaecfd
+++ b/public/themes/admin_simpleboot3/admin/order/index_sort.html
查看文件 @3eaecfd
@@ -67,6 +67,7 @@
                 <th>订单类型</th>
                 <th>销售用户名</th>
                 <th>订单确认码</th>
+                <th>订单价格</th>
                 <th>订单状态</th>
                 <th>收集状态</th>
                 <th width="130">发布时间</th>
@@ -84,6 +85,7 @@
                     <td>{$vo.sort_name}</td>
                     <td>{$vo.user_login}</td>
                     <td>{$vo.number}</td>
+                    <td>{$vo.order_price}</td>
                     <td><eq name="vo.status" value="0">未支付</eq><eq name="vo.status" value="1">已支付</eq></td>
                     <td><eq name="vo.is_stop" value="0">收集中</eq><eq name="vo.is_stop" value="1">已停止</eq></td>
                     <td>{:date('Y-m-d H:i',$vo.create_time)}</td>
@@ -108,6 +110,7 @@
                 <th>订单类型</th>
                 <th>销售用户名</th>
                 <th>订单确认码</th>
+                <th>订单价格</th>
                 <th>订单状态</th>
                 <th>收集状态</th>
                 <th width="130">发布时间</th>